CI: Use git master for xkeyboard-config on Linux

[platform/upstream/libxkbcommon.git] / tools / interactive-evdev.c

diff --git a/tools/interactive-evdev.c b/tools/interactive-evdev.c
index 0868b4f..6cacae6 100644 (file)
--- a/tools/interactive-evdev.c
+++ b/tools/interactive-evdev.c
@@ -31,6 +31,7 @@
 #include <getopt.h>
 #include <limits.h>
 #include <locale.h>
+#include <poll.h>
 #include <signal.h>
 #include <stdbool.h>
 #include <stdio.h>
@@ -38,7 +39,6 @@
 #include <string.h>
 #include <unistd.h>
 
-#include <sys/epoll.h>
 #include <linux/input.h>
 
 #include "xkbcommon/xkbcommon.h"
@@ -59,6 +59,7 @@ static bool report_state_changes;
 static bool with_compose;
 static enum xkb_consumed_mode consumed_mode = XKB_CONSUMED_MODE_XKB;
 
+#define DEFAULT_INCLUDE_PATH_PLACEHOLDER "__defaults__"
 #define NLONGS(n) (((n) + LONG_BIT - 1) / LONG_BIT)
 
 static bool
@@ -313,33 +314,25 @@ read_keyboard(struct keyboard *kbd)
 static int
 loop(struct keyboard *kbds)
 {
-    int i, ret = 1;
-    int epfd = -1;
+    int ret = -1;
     struct keyboard *kbd;
-    struct epoll_event ev;
-    struct epoll_event evs[16];
+    nfds_t nfds, i;
+    struct pollfd *fds = NULL;
 
-    epfd = epoll_create1(0);
-    if (epfd < 0) {
-        fprintf(stderr, "Couldn't create epoll instance: %s\n",
-                strerror(errno));
+    for (kbd = kbds, nfds = 0; kbd; kbd = kbd->next, nfds++) {}
+    fds = calloc(nfds, sizeof(*fds));
+    if (fds == NULL) {
+        fprintf(stderr, "Out of memory");
         goto out;
     }
 
-    for (kbd = kbds; kbd; kbd = kbd->next) {
-        memset(&ev, 0, sizeof(ev));
-        ev.events = EPOLLIN;
-        ev.data.ptr = kbd;
-        ret = epoll_ctl(epfd, EPOLL_CTL_ADD, kbd->fd, &ev);
-        if (ret) {
-            fprintf(stderr, "Couldn't add %s to epoll: %s\n",
-                    kbd->path, strerror(errno));
-            goto out;
-        }
+    for (i = 0, kbd = kbds; kbd; kbd = kbd->next, i++) {
+        fds[i].fd = kbd->fd;
+        fds[i].events = POLLIN;
     }
 
     while (!terminate) {
-        ret = epoll_wait(epfd, evs, 16, -1);
+        ret = poll(fds, nfds, -1);
         if (ret < 0) {
             if (errno == EINTR)
                 continue;
@@ -348,18 +341,19 @@ loop(struct keyboard *kbds)
             goto out;
         }
 
-        for (i = 0; i < ret; i++) {
-            kbd = evs[i].data.ptr;
-            ret = read_keyboard(kbd);
-            if (ret) {
-                goto out;
+        for (i = 0, kbd = kbds; kbd; kbd = kbd->next, i++) {
+            if (fds[i].revents != 0) {
+                ret = read_keyboard(kbd);
+                if (ret) {
+                    goto out;
+                }
             }
         }
     }
 
     ret = 0;
 out:
-    close(epfd);
+    free(fds);
     return ret;
 }
 
@@ -372,15 +366,18 @@ sigintr_handler(int signum)
 static void
 usage(FILE *fp, char *progname)
 {
-        fprintf(fp, "Usage: %s [--rules <rules>] [--model <model>] "
-                "[--layout <layout>] [--variant <variant>] [--options <options>]\n",
+        fprintf(fp, "Usage: %s [--include=<path>] [--include-defaults] "
+                "[--rules=<rules>] [--model=<model>] [--layout=<layout>] "
+                "[--variant=<variant>] [--options=<options>]\n",
                 progname);
         fprintf(fp, "      or: %s --keymap <path to keymap file>\n",
                 progname);
         fprintf(fp, "For both:\n"
                         "          --report-state-changes (report changes to the state)\n"
-                        "          --enable-compose (enable compose)\n"
-                        "          --consumed-mode={gtk|xkb} (select the consumed mode)\n");
+                        "          --enable-compose (enable Compose)\n"
+                        "          --consumed-mode={xkb|gtk} (select the consumed modifiers mode, default: xkb)\n"
+                        "          --without-x11-offset (don't add X11 keycode offset)\n"
+        );
 }
 
 int
@@ -391,6 +388,8 @@ main(int argc, char *argv[])
     struct xkb_context *ctx = NULL;
     struct xkb_keymap *keymap = NULL;
     struct xkb_compose_table *compose_table = NULL;
+    const char *includes[64];
+    size_t num_includes = 0;
     const char *rules = NULL;
     const char *model = NULL;
     const char *layout = NULL;
@@ -400,18 +399,23 @@ main(int argc, char *argv[])
     const char *locale;
     struct sigaction act;
     enum options {
+        OPT_INCLUDE,
+        OPT_INCLUDE_DEFAULTS,
         OPT_RULES,
         OPT_MODEL,
         OPT_LAYOUT,
         OPT_VARIANT,
         OPT_OPTION,
         OPT_KEYMAP,
+        OPT_WITHOUT_X11_OFFSET,
         OPT_CONSUMED_MODE,
         OPT_COMPOSE,
         OPT_REPORT_STATE,
     };
     static struct option opts[] = {
         {"help",                 no_argument,            0, 'h'},
+        {"include",              required_argument,      0, OPT_INCLUDE},
+        {"include-defaults",     no_argument,            0, OPT_INCLUDE_DEFAULTS},
         {"rules",                required_argument,      0, OPT_RULES},
         {"model",                required_argument,      0, OPT_MODEL},
         {"layout",               required_argument,      0, OPT_LAYOUT},
@@ -421,6 +425,7 @@ main(int argc, char *argv[])
         {"consumed-mode",        required_argument,      0, OPT_CONSUMED_MODE},
         {"enable-compose",       no_argument,            0, OPT_COMPOSE},
         {"report-state-changes", no_argument,            0, OPT_REPORT_STATE},
+        {"without-x11-offset",   no_argument,            0, OPT_WITHOUT_X11_OFFSET},
         {0, 0, 0, 0},
     };
 
@@ -435,6 +440,20 @@ main(int argc, char *argv[])
             break;
 
         switch (opt) {
+        case OPT_INCLUDE:
+            if (num_includes >= ARRAY_SIZE(includes)) {
+                fprintf(stderr, "error: too many includes\n");
+                exit(EXIT_INVALID_USAGE);
+            }
+            includes[num_includes++] = optarg;
+            break;
+        case OPT_INCLUDE_DEFAULTS:
+            if (num_includes >= ARRAY_SIZE(includes)) {
+                fprintf(stderr, "error: too many includes\n");
+                exit(EXIT_INVALID_USAGE);
+            }
+            includes[num_includes++] = DEFAULT_INCLUDE_PATH_PLACEHOLDER;
+            break;
         case OPT_RULES:
             rules = optarg;
             break;
@@ -453,6 +472,9 @@ main(int argc, char *argv[])
         case OPT_KEYMAP:
             keymap_path = optarg;
             break;
+        case OPT_WITHOUT_X11_OFFSET:
+            evdev_offset = 0;
+            break;
         case OPT_REPORT_STATE:
             report_state_changes = true;
             break;
@@ -465,6 +487,7 @@ main(int argc, char *argv[])
             } else if (strcmp(optarg, "xkb") == 0) {
                 consumed_mode = XKB_CONSUMED_MODE_XKB;
             } else {
+                fprintf(stderr, "error: invalid --consumed-mode \"%s\"\n", optarg);
                 usage(stderr, argv[0]);
                 return EXIT_INVALID_USAGE;
             }
@@ -478,12 +501,23 @@ main(int argc, char *argv[])
         }
     }
 
-    ctx = xkb_context_new(XKB_CONTEXT_NO_FLAGS);
+    ctx = xkb_context_new(XKB_CONTEXT_NO_DEFAULT_INCLUDES);
     if (!ctx) {
         fprintf(stderr, "Couldn't create xkb context\n");
         goto out;
     }
 
+    if (num_includes == 0)
+        includes[num_includes++] = DEFAULT_INCLUDE_PATH_PLACEHOLDER;
+
+    for (size_t i = 0; i < num_includes; i++) {
+        const char *include = includes[i];
+        if (strcmp(include, DEFAULT_INCLUDE_PATH_PLACEHOLDER) == 0)
+            xkb_context_include_path_append_default(ctx);
+        else
+            xkb_context_include_path_append(ctx, include);
+    }
+
     if (keymap_path) {
         FILE *file = fopen(keymap_path, "rb");
         if (!file) {