Skip to content

Commit

Permalink
tools: make debug-events accept multiple device nodes
Browse files Browse the repository at this point in the history 
For interaction between devices it's necessary to look at more than one device
at a time.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
  • Loading branch information
@whot
whot committed Nov 26, 2019
1 parent 765f791 commit 490131f
Show file tree
Hide file tree
Showing 8 changed files with 63 additions and 28 deletions.
37 changes: 30 additions & 7 deletions tools/libinput-debug-events.c
View file
Expand Up @@ -38,6 +38,8 @@
#include <libinput.h>
#include <libevdev/libevdev.h>

#include "util-strings.h"
#include "util-macros.h"
#include "shared.h"

static uint32_t start_time;
Expand Down Expand Up @@ -924,15 +926,16 @@ mainloop(struct libinput *li)

static void
usage(void) {
printf("Usage: libinput debug-events [options] [--udev <seat>|--device /dev/input/event0]\n");
printf("Usage: libinput debug-events [options] [--udev <seat>|--device /dev/input/event0 ...]\n");
}

int
main(int argc, char **argv)
{
struct libinput *li;
enum tools_backend backend = BACKEND_NONE;
const char *seat_or_device = "seat0";
char *seat_or_devices[64] = {NULL};
size_t ndevices = 0;
bool grab = false;
bool verbose = false;
struct sigaction act;
Expand Down Expand Up @@ -981,12 +984,25 @@ main(int argc, char **argv)
be_quiet = true;
break;
case OPT_DEVICE:
if (backend == BACKEND_UDEV ||
ndevices >= ARRAY_LENGTH(seat_or_devices)) {
usage();
return EXIT_INVALID_USAGE;

}
backend = BACKEND_DEVICE;
seat_or_device = optarg;
seat_or_devices[ndevices++] = safe_strdup(optarg);
break;
case OPT_UDEV:
if (backend == BACKEND_DEVICE ||
ndevices >= ARRAY_LENGTH(seat_or_devices)) {
usage();
return EXIT_INVALID_USAGE;

}
backend = BACKEND_UDEV;
seat_or_device = optarg;
seat_or_devices[0] = safe_strdup(optarg);
ndevices = 1;
break;
case OPT_GRAB:
grab = true;
Expand All @@ -1005,14 +1021,18 @@ main(int argc, char **argv)
}

if (optind < argc) {
if (optind < argc - 1 || backend != BACKEND_NONE) {
if (backend == BACKEND_UDEV) {
usage();
return EXIT_INVALID_USAGE;
}
backend = BACKEND_DEVICE;
seat_or_device = argv[optind];
do {
seat_or_devices[ndevices++] = safe_strdup(argv[optind]);
} while(++optind < argc);
} else if (backend == BACKEND_NONE) {
backend = BACKEND_UDEV;
seat_or_devices[0] = safe_strdup("seat0");
ndevices = 1;
}

memset(&act, 0, sizeof(act));
Expand All @@ -1025,10 +1045,13 @@ main(int argc, char **argv)
return EXIT_FAILURE;
}

li = tools_open_backend(backend, seat_or_device, verbose, &grab);
li = tools_open_backend(backend, seat_or_devices, verbose, &grab);
if (!li)
return EXIT_FAILURE;

while (ndevices-- > 0)
free(seat_or_devices[ndevices]);

mainloop(li);

libinput_unref(li);
Expand Down
4 changes: 2 additions & 2 deletions tools/libinput-debug-events.man
View file
Expand Up @@ -6,7 +6,7 @@ libinput\-debug\-events \- debug helper for libinput
.PP
.B libinput debug\-events \fI[options]\fB \-\-udev \fI<seat>\fB
.PP
.B libinput debug\-events \fI[options]\fB [\-\-device] \fI/dev/input/event0\fB
.B libinput debug\-events \fI[options]\fB [\-\-device] \fI/dev/input/event0\fB [\fI/dev/input/event1\fB...]
.SH DESCRIPTION
.PP
The
Expand All @@ -21,7 +21,7 @@ This tool usually needs to be run as root to have access to the
.SH OPTIONS
.TP 8
.B \-\-device \fI/dev/input/event0\fR
Use the given device with the path backend. The \fB\-\-device\fR argument may be
Use the given device(s) with the path backend. The \fB\-\-device\fR argument may be
omitted.
.TP 8
.B \-\-grab
Expand Down
8 changes: 4 additions & 4 deletions tools/libinput-debug-gui.c
View file
Expand Up @@ -1519,7 +1519,7 @@ main(int argc, char **argv)
struct tools_options options;
struct libinput *li;
enum tools_backend backend = BACKEND_NONE;
const char *seat_or_device = "seat0";
char *seat_or_device[2] = {"seat0", NULL};
bool verbose = false;

if (!gtk_init_check(&argc, &argv))
Expand Down Expand Up @@ -1562,11 +1562,11 @@ main(int argc, char **argv)
break;
case OPT_DEVICE:
backend = BACKEND_DEVICE;
seat_or_device = optarg;
seat_or_device[0] = optarg;
break;
case OPT_UDEV:
backend = BACKEND_UDEV;
seat_or_device = optarg;
seat_or_device[0] = optarg;
break;
case OPT_GRAB:
w.grab = true;
Expand All @@ -1590,7 +1590,7 @@ main(int argc, char **argv)
return EXIT_INVALID_USAGE;
}
backend = BACKEND_DEVICE;
seat_or_device = argv[optind];
seat_or_device[0] = argv[optind];
} else if (backend == BACKEND_NONE) {
backend = BACKEND_UDEV;
}
Expand Down
8 changes: 4 additions & 4 deletions tools/libinput-debug-tablet.c
View file
Expand Up @@ -511,7 +511,7 @@ main(int argc, char **argv)
struct context ctx;
struct libinput *li;
enum tools_backend backend = BACKEND_NONE;
const char *seat_or_device = "seat0";
char *seat_or_device[2] = {"seat0", NULL};
struct sigaction act;
bool grab = false;

Expand Down Expand Up @@ -548,11 +548,11 @@ main(int argc, char **argv)
break;
case OPT_DEVICE:
backend = BACKEND_DEVICE;
seat_or_device = optarg;
seat_or_device[0] = optarg;
break;
case OPT_UDEV:
backend = BACKEND_UDEV;
seat_or_device = optarg;
seat_or_device[0] = optarg;
break;
}

Expand All @@ -564,7 +564,7 @@ main(int argc, char **argv)
return EXIT_INVALID_USAGE;
}
backend = BACKEND_DEVICE;
seat_or_device = argv[optind];
seat_or_device[0] = argv[optind];
} else if (backend == BACKEND_NONE) {
backend = BACKEND_UDEV;
}
Expand Down
3 changes: 2 additions & 1 deletion tools/libinput-list-devices.c
View file
Expand Up @@ -376,6 +376,7 @@ main(int argc, char **argv)
struct libinput *li;
struct libinput_event *ev;
bool grab = false;
char *seat[2] = {"seat0", NULL};

/* This is kept for backwards-compatibility with the old
libinput-list-devices */
Expand All @@ -392,7 +393,7 @@ main(int argc, char **argv)
}
}

li = tools_open_backend(BACKEND_UDEV, "seat0", false, &grab);
li = tools_open_backend(BACKEND_UDEV, seat, false, &grab);
if (!li)
return 1;

Expand Down
23 changes: 14 additions & 9 deletions tools/shared.c
View file
Expand Up @@ -305,14 +305,15 @@ tools_open_udev(const char *seat, bool verbose, bool *grab)
}

static struct libinput *
tools_open_device(const char *path, bool verbose, bool *grab)
tools_open_device(char **paths, bool verbose, bool *grab)
{
struct libinput_device *device;
struct libinput *li;
char **p = paths;

li = libinput_path_create_context(&interface, grab);
if (!li) {
fprintf(stderr, "Failed to initialize context from %s\n", path);
fprintf(stderr, "Failed to initialize path context\n");
return NULL;
}

Expand All @@ -321,11 +322,15 @@ tools_open_device(const char *path, bool verbose, bool *grab)
libinput_log_set_priority(li, LIBINPUT_LOG_PRIORITY_DEBUG);
}

device = libinput_path_add_device(li, path);
if (!device) {
fprintf(stderr, "Failed to initialize device %s\n", path);
libinput_unref(li);
li = NULL;
while (*p) {
device = libinput_path_add_device(li, *p);
if (!device) {
fprintf(stderr, "Failed to initialize device %s\n", *p);
libinput_unref(li);
li = NULL;
break;
}
p++;
}

return li;
Expand All @@ -343,7 +348,7 @@ tools_setenv_quirks_dir(void)

struct libinput *
tools_open_backend(enum tools_backend which,
const char *seat_or_device,
char **seat_or_device,
bool verbose,
bool *grab)
{
Expand All @@ -353,7 +358,7 @@ tools_open_backend(enum tools_backend which,

switch (which) {
case BACKEND_UDEV:
li = tools_open_udev(seat_or_device, verbose, grab);
li = tools_open_udev(seat_or_device[0], verbose, grab);
break;
case BACKEND_DEVICE:
li = tools_open_device(seat_or_device, verbose, grab);
Expand Down
2 changes: 1 addition & 1 deletion tools/shared.h
View file
Expand Up @@ -116,7 +116,7 @@ int tools_parse_option(int option,
const char *optarg,
struct tools_options *options);
struct libinput* tools_open_backend(enum tools_backend which,
const char *seat_or_device,
char **seat_or_devices,
bool verbose,
bool *grab);
void tools_device_apply_config(struct libinput_device *device,
Expand Down
6 changes: 6 additions & 0 deletions tools/test-tool-option-parsing.py
View file
Expand Up @@ -205,6 +205,12 @@ def test_invalid_arguments(self):
self.run_command_unrecognized_option(['--foo'])
self.run_command_unrecognized_option(['--version'])

def test_multiple_devices(self):
self.run_command_success(['--device', '/dev/input/event0', '/dev/input/event1'])
# same event path multiple times? meh, your problem
self.run_command_success(['--device', '/dev/input/event0', '/dev/input/event0'])
self.run_command_success(['/dev/input/event0', '/dev/input/event1'])


class TestDebugGUI(TestToolWithOptions, TestLibinputTool):
subtool = 'debug-gui'
Expand Down

0 comments on commit 490131f

Please sign in to comment.