Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

list-local-devices improvements #828

Merged
merged 3 commits into from
Nov 10, 2024
Merged

list-local-devices improvements #828

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c99b62e
tools/list-local-devices: fix and improve indentation of the yaml output
whot Nov 7, 2024
18ca640
tools/list-local-devices: print the stylus VID as well
whot Nov 7, 2024
159cc69
tools/list-local-devices: print vid/pid as number
whot Nov 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 16 additions & 15 deletions tools/list-local-devices.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ print_devnode(gpointer data, gpointer user_data)

g_free(basename);
if (g_file_get_contents(path, &name, &size, &error)) {
printf(" - %s: '%.*s'\n", devnode, (int)(size - 1), name);
printf(" - %s: '%.*s'\n", devnode, (int)(size - 1), name);
} else {
fprintf(stderr, "%s\n", error->message);
}
Expand Down Expand Up @@ -134,15 +134,15 @@ tablet_print_yaml(gpointer data, gpointer user_data)
break;
}

printf("- name: '%s'\n", name);
printf(" bus: '%s'\n", bus);
printf(" vid: '0x%04x'\n", vid);
printf(" pid: '0x%04x'\n", pid);
printf(" nodes: \n");
printf(" - name: '%s'\n", name);
printf(" bus: '%s'\n", bus);
printf(" vid: 0x%04x\n", vid);
printf(" pid: 0x%04x\n", pid);
printf(" nodes: \n");
g_list_foreach(d->nodes, print_devnode, NULL);

styli = libwacom_get_styli(d->dev, &nstyli);
printf(" styli:%s\n", nstyli > 0 ? "" : " []");
printf(" styli:%s\n", nstyli > 0 ? "" : " []");
for (int i = 0; i < nstyli; i++) {
const WacomStylus *stylus = styli[i];
const char *type = "invalid";
Expand All @@ -166,16 +166,17 @@ tablet_print_yaml(gpointer data, gpointer user_data)
case WSTYLUS_3D: type = "3D"; break;
case WSTYLUS_MOBILE: type = "mobile"; break;
}
printf(" - id: 0x%x\n", libwacom_stylus_get_id(stylus));
printf(" name: '%s'\n", libwacom_stylus_get_name(stylus));
printf(" type: '%s'\n", type);
printf(" axes: ['x', 'y' %s%s%s%s%s]\n",
printf(" - id: 0x%x\n", libwacom_stylus_get_id(stylus));
printf(" vid: 0x%04x\n", libwacom_stylus_get_vendor_id(stylus));
printf(" name: '%s'\n", libwacom_stylus_get_name(stylus));
printf(" type: '%s'\n", type);
printf(" axes: ['x', 'y' %s%s%s%s%s]\n",
axes & WACOM_AXIS_TYPE_TILT ? ", 'tilt'" : "",
axes & WACOM_AXIS_TYPE_ROTATION_Z ? ", 'rotation'" : "",
axes & WACOM_AXIS_TYPE_DISTANCE ? ", 'distance'" : "",
axes & WACOM_AXIS_TYPE_PRESSURE ? ", 'pressure'" : "",
axes & WACOM_AXIS_TYPE_SLIDER ? ", 'slider'" : "");
printf(" buttons: %d\n", libwacom_stylus_get_num_buttons(stylus));
printf(" buttons: %d\n", libwacom_stylus_get_num_buttons(stylus));

switch (eraser_type) {
case WACOM_ERASER_UNKNOWN: etype = "unknown"; break;
Expand All @@ -185,10 +186,10 @@ tablet_print_yaml(gpointer data, gpointer user_data)
}

if (libwacom_stylus_is_eraser(stylus)) {
printf(" is_eraser: 'true'\n");
printf(" eraser_type: '%s'\n", etype);
printf(" is_eraser: 'true'\n");
printf(" eraser_type: '%s'\n", etype);
} else {
printf(" erasers: [");
printf(" erasers: [");
if (libwacom_stylus_has_eraser(stylus)) {
int npaired;
const WacomStylus **paired = libwacom_stylus_get_paired_styli(stylus, &npaired);
Expand Down