Revert "Dont use dlopen in gsr-global-hotkeys"

This reverts commit b0def958c7.

meson.build

@@ -71,10 +71,7 @@ executable(
         'tools/gsr-global-hotkeys/main.c'
     ],
     c_args : '-fstack-protector-all',
-    install : true,
+    install : true
-    dependencies: [
-        dependency('x11'),
-    ]
 )
 
 executable(

tools/gsr-global-hotkeys/hotplug.c

@@ -7,7 +7,7 @@
 #include <unistd.h>
 #include <sys/socket.h>
 
-/* Linux */
+/* LINUX */
 #include <linux/types.h>
 #include <linux/netlink.h>
 

tools/gsr-global-hotkeys/keyboard_event.c

@@ -13,13 +13,10 @@
 #include <dirent.h>
 #include <sys/poll.h>
 
-/* Linux */
+/* LINUX */
 #include <linux/input.h>
 #include <linux/uinput.h>
 
-/* System */
-#include <X11/keysym.h>
-
 #define GSR_UI_VIRTUAL_KEYBOARD_NAME "gsr-ui virtual keyboard"
 
 #define KEY_RELEASE 0
@@ -30,6 +27,22 @@
 
 #define KEYCODE_TO_XKB_KEYCODE(key) ((key) + 8)
 
+#define XK_Shift_L                       0xffe1  /* Left shift */
+#define XK_Shift_R                       0xffe2  /* Right shift */
+#define XK_Control_L                     0xffe3  /* Left control */
+#define XK_Control_R                     0xffe4  /* Right control */
+#define XK_Alt_L                         0xffe9  /* Left alt */
+#define XK_Alt_R                         0xffea  /* Right alt */
+#define XK_Super_L                       0xffeb  /* Left super */
+#define XK_Super_R                       0xffec  /* Right super */
+
+#define XK_z                             0x007a
+#define XK_F7                            0xffc4
+#define XK_F8                            0xffc5
+#define XK_F9                            0xffc6
+#define XK_F10                           0xffc7
+#define XK_F11                           0xffc8
+
 static inline int count_num_bits_set(unsigned char c) {
     int n = 0;
     n += (c & 1);
@@ -124,8 +137,8 @@ static void keyboard_event_process_key_state_change(keyboard_event *self, struct
 
 static uint32_t keycode_to_keysym(keyboard_event *self, uint16_t keycode) {
     const unsigned long xkb_keycode = KEYCODE_TO_XKB_KEYCODE(keycode);
-    if(self->display && xkb_keycode <= 255)
+    if(self->x_context.display && self->x_context.XKeycodeToKeysym && xkb_keycode <= 255)
-        return XKeycodeToKeysym(self->display, xkb_keycode, 0);
+        return self->x_context.XKeycodeToKeysym(self->x_context.display, xkb_keycode, 0);
     else
         return 0;
 }
@@ -446,12 +459,12 @@ static int setup_virtual_keyboard_input(const char *name) {
     return fd;
 }
 
-bool keyboard_event_init(keyboard_event *self, bool poll_stdout_error, bool exclusive_grab, keyboard_grab_type grab_type, Display *display) {
+bool keyboard_event_init(keyboard_event *self, bool poll_stdout_error, bool exclusive_grab, keyboard_grab_type grab_type, x11_context x_context) {
     memset(self, 0, sizeof(*self));
     self->stdout_event_index = -1;
     self->hotplug_event_index = -1;
     self->grab_type = grab_type;
-    self->display = display;
+    self->x_context = x_context;
 
     if(exclusive_grab) {
         self->uinput_fd = setup_virtual_keyboard_input(GSR_UI_VIRTUAL_KEYBOARD_NAME);
@@ -531,16 +544,18 @@ static void on_device_added_callback(const char *devname, void *userdata) {
     keyboard_event_try_add_device_if_keyboard(keyboard_ev, dev_input_filepath);
 }
 
+#define MappingNotify 34
+
 static void keyboard_event_poll_x11_events(keyboard_event *self) {
-    if(!self->display)
+    if(!self->x_context.display || !self->x_context.XPending || !self->x_context.XNextEvent || !self->x_context.XRefreshKeyboardMapping)
         return;
 
     XEvent xev;
-    while(XPending(self->display)) {
+    while(self->x_context.XPending(self->x_context.display)) {
         xev.type = 0;
-        XNextEvent(self->display, &xev);
+        self->x_context.XNextEvent(self->x_context.display, &xev);
         if(xev.type == MappingNotify)
-            XRefreshKeyboardMapping(&xev.xmapping);
+            self->x_context.XRefreshKeyboardMapping(xev.data);
     }
 }
 

tools/gsr-global-hotkeys/keyboard_event.h

@@ -12,14 +12,31 @@
 /* POSIX */
 #include <sys/poll.h>
 
-/* Linux */
+/* LINUX */
 #include <linux/input-event-codes.h>
 
-/* System */
-#include <X11/Xlib.h>
-
 #define MAX_EVENT_POLLS 32
 
+typedef struct {
+    union {
+        int type;
+        unsigned char data[192];
+    };
+} XEvent;
+
+typedef unsigned long (*XKeycodeToKeysym_FUNC)(void *display, unsigned char keycode, int index);
+typedef int (*XPending_FUNC)(void *display);
+typedef int (*XNextEvent_FUNC)(void *display, XEvent *event_return);
+typedef int (*XRefreshKeyboardMapping_FUNC)(void* event_map);
+
+typedef struct {
+    void *display;
+    XKeycodeToKeysym_FUNC XKeycodeToKeysym;
+    XPending_FUNC XPending;
+    XNextEvent_FUNC XNextEvent;
+    XRefreshKeyboardMapping_FUNC XRefreshKeyboardMapping;
+} x11_context;
+
 typedef enum {
     KEYBOARD_MODKEY_LALT   = 1 << 0,
     KEYBOARD_MODKEY_RALT   = 1 << 2,
@@ -55,7 +72,7 @@ typedef struct {
     int uinput_fd;
     bool stdout_failed;
     keyboard_grab_type grab_type;
-    Display *display;
+    x11_context x_context;
 
     hotplug_event hotplug_ev;
 
@@ -73,7 +90,7 @@ typedef struct {
 /* Return true to allow other applications to receive the key input (when using exclusive grab) */
 typedef bool (*key_callback)(uint32_t key, uint32_t modifiers, int press_status, void *userdata);
 
-bool keyboard_event_init(keyboard_event *self, bool poll_stdout_error, bool exclusive_grab, keyboard_grab_type grab_type, Display *display);
+bool keyboard_event_init(keyboard_event *self, bool poll_stdout_error, bool exclusive_grab, keyboard_grab_type grab_type, x11_context x_context);
 void keyboard_event_deinit(keyboard_event *self);
 
 /* If |timeout_milliseconds| is -1 then wait until an event is received */

tools/gsr-global-hotkeys/main.c

@@ -46,12 +46,76 @@ static void usage(void) {
     fprintf(stderr, "  --virtual    Grab all virtual devices only.\n");
 }
 
-static int x_ignore_error(Display *display, XErrorEvent *ee) {
+typedef void* (*XOpenDisplay_FUNC)(const char*);
+typedef int (*XErrorHandler_FUNC)(void *display, void* error_event);
+typedef XErrorHandler_FUNC (*XSetErrorHandler_FUNC)(XErrorHandler_FUNC handler);
+
+static int x_ignore_error(void *display, void *ee) {
     (void)display;
     (void)ee;
     return 0;
 }
 
+static x11_context setup_x11_context(void) {
+    x11_context x_context = {0};
+    XSetErrorHandler_FUNC XSetErrorHandler = NULL;
+
+    void *x11_lib = dlopen("libX11.so.6", RTLD_LAZY);
+    if(!x11_lib) {
+        fprintf(stderr, "Warning: dlopen libX11.so.6 failed\n");
+        return x_context;
+    }
+
+    XOpenDisplay_FUNC XOpenDisplay = dlsym(x11_lib, "XOpenDisplay");
+    if(!XOpenDisplay) {
+        fprintf(stderr, "Warning: dlsym XOpenDisplay failed\n");
+        goto fail;
+    }
+
+    x_context.XKeycodeToKeysym = dlsym(x11_lib, "XKeycodeToKeysym");
+    if(!x_context.XKeycodeToKeysym) {
+        fprintf(stderr, "Warning: dlsym XKeycodeToKeysym failed\n");
+        goto fail;
+    }
+
+    x_context.XPending = dlsym(x11_lib, "XPending");
+    if(!x_context.XPending) {
+        fprintf(stderr, "Warning: dlsym XPending failed\n");
+        goto fail;
+    }
+
+    x_context.XNextEvent = dlsym(x11_lib, "XNextEvent");
+    if(!x_context.XNextEvent) {
+        fprintf(stderr, "Warning: dlsym XNextEvent failed\n");
+        goto fail;
+    }
+
+    x_context.XRefreshKeyboardMapping = dlsym(x11_lib, "XRefreshKeyboardMapping");
+    if(!x_context.XRefreshKeyboardMapping) {
+        fprintf(stderr, "Warning: dlsym XRefreshKeyboardMapping failed\n");
+        goto fail;
+    }
+
+    x_context.display = XOpenDisplay(NULL);
+    if(!x_context.display) {
+        fprintf(stderr, "Warning: XOpenDisplay failed\n");
+        goto fail;
+    }
+
+    XSetErrorHandler = dlsym(x11_lib, "XSetErrorHandler");
+    if(XSetErrorHandler)
+        XSetErrorHandler(x_ignore_error);
+    else
+        fprintf(stderr, "Warning: dlsym XSetErrorHandler failed\n");
+
+    return x_context;
+
+    fail:
+    memset(&x_context, 0, sizeof(x_context));
+    dlclose(x11_lib);
+    return x_context;
+}
+
 int main(int argc, char **argv) {
     keyboard_grab_type grab_type = KEYBOARD_GRAB_TYPE_ALL;
     if(argc == 2) {
@@ -71,11 +135,7 @@ int main(int argc, char **argv) {
         return 1;
     }
 
-    Display *display = XOpenDisplay(NULL);
+    x11_context x_context = setup_x11_context();
-    if(display)
-        XSetErrorHandler(x_ignore_error);
-    else
-        fprintf(stderr, "Warning: XOpenDisplay failed\n");
 
     const uid_t user_id = getuid();
     if(geteuid() != 0) {
@@ -86,7 +146,7 @@ int main(int argc, char **argv) {
     }
 
     keyboard_event keyboard_ev;
-    if(!keyboard_event_init(&keyboard_ev, true, true, grab_type, display)) {
+    if(!keyboard_event_init(&keyboard_ev, true, true, grab_type, x_context)) {
         fprintf(stderr, "Error: failed to setup hotplugging and no keyboard input devices were found\n");
         setuid(user_id);
         return 1;