Change libswmhack.so to use RTLD_NEXT functionality when _GNU_SOURCE is defined,...

[spectrwm] / lib / swm_hack.c

diff --git a/lib/swm_hack.c b/lib/swm_hack.c
index 34550d81a8215001aed91db57a2c977402a679d2..40fa2246322261cc313b966ac3f95b6f9fd86fb7 100644 (file)
--- a/lib/swm_hack.c
+++ b/lib/swm_hack.c
@@ -1,4 +1,3 @@
-/* $scrotwm$ */
 /*
  * Copyright (c) 2009 Marco Peereboom <marco@peereboom.us>
  * Copyright (c) 2009 Ryan McBride <mcbride@countersiege.com>
@@ -56,7 +55,9 @@ static void           *lib_xtlib = NULL;
 
 static Window          root = None;
 static int             xterm = 0;
-static Display         *dpy = NULL;
+static Display         *display = NULL;
+
+void   set_property(Display *, Window, char *, char *);
 
 /* Find our root window */
 static              Window
@@ -91,24 +92,37 @@ set_property(Display *dpy, Window id, char *name, char *val)
 {
        Atom                    atom = 0;
        char                    prop[SWM_PROPLEN];
-
-       static XIA              *xia = NULL;
-       static XCP              *xcp = NULL;
-
+       static XIA              *xia = NULL;
+       static XCP              *xcp = NULL;
+
+#ifdef _GNU_SOURCE
+       /* load the function pointer with RTLD_NEXT
+        * this might be the real X function or another
+        * preloaded intercept
+        */
+       if (!lib_xlib)
+               lib_xlib = RTLD_NEXT;
+#else
        /* find the real Xlib and the real X function */
        if (!lib_xlib)
                lib_xlib = dlopen("libX11.so", RTLD_GLOBAL | RTLD_LAZY);
-       if (!xia)
+#endif
+       if (lib_xlib && !xia)
                xia = (XIA *) dlsym(lib_xlib, "XInternAtom");
-       if (!xcp)
+       if (lib_xlib && !xcp)
                xcp = (XCP *) dlsym(lib_xlib, "XChangeProperty");
+       if (!xia || !xcp) {
+               fprintf(stderr, "libswmhack.so: ERROR: %s\n", dlerror());
+               return;
+       }
 
        /* Try to update the window's workspace property */
        atom = (*xia)(dpy, name, False);
-       if (atom) 
+       if (atom)
                if (snprintf(prop, SWM_PROPLEN, "%s", val) < SWM_PROPLEN)
                        (*xcp)(dpy, id, atom, XA_STRING,
-                           8, PropModeReplace, prop, SWM_PROPLEN);
+                           8, PropModeReplace, (unsigned char *)prop,
+                           strlen((char *)prop));
 }
 
 typedef             Window(CWF) (Display * _display, Window _parent, int _x,
@@ -121,7 +135,7 @@ typedef             Window(CWF) (Display * _display, Window _parent, int _x,
 
 /* XCreateWindow intercept hack */
 Window
-XCreateWindow(Display * display, Window parent, int x, int y,
+XCreateWindow(Display *dpy, Window parent, int x, int y,
    unsigned int width, unsigned int height,
    unsigned int border_width,
    int depth, unsigned int clss, Visual * visual,
@@ -131,25 +145,38 @@ XCreateWindow(Display * display, Window parent, int x, int y,
        char            *env;
        Window          id;
 
+#ifdef _GNU_SOURCE
+       /* load the function pointer with RTLD_NEXT
+        * this might be the real X function or another
+        * preloaded intercept
+        */
+       if (!lib_xlib)
+               lib_xlib = RTLD_NEXT;
+#else
        /* find the real Xlib and the real X function */
        if (!lib_xlib)
                lib_xlib = dlopen("libX11.so", RTLD_GLOBAL | RTLD_LAZY);
-       if (!func) {
+#endif
+       if (lib_xlib && !func) {
                func = (CWF *) dlsym(lib_xlib, "XCreateWindow");
-               dpy = display;
+               display = dpy;
+       }
+       if (!func) {
+               fprintf(stderr, "libswmhack.so: ERROR: %s\n", dlerror());
+               return BadImplementation;
        }
 
-       if (parent == DefaultRootWindow(display))
-               parent = MyRoot(display);
+       if (parent == DefaultRootWindow(dpy))
+               parent = MyRoot(dpy);
        
-       id = (*func) (display, parent, x, y, width, height, border_width,
+       id = (*func) (dpy, parent, x, y, width, height, border_width,
            depth, clss, visual, valuemask, attributes);
 
        if (id) {
                if ((env = getenv("_SWM_WS")) != NULL) 
-                       set_property(display, id, "_SWM_WS", env);
+                       set_property(dpy, id, "_SWM_WS", env);
                if ((env = getenv("_SWM_PID")) != NULL)
-                       set_property(display, id, "_SWM_PID", env);
+                       set_property(dpy, id, "_SWM_PID", env);
                if ((env = getenv("_SWM_XTERM_FONTADJ")) != NULL) {
                        unsetenv("_SWM_XTERM_FONTADJ");
                        xterm = 1;
@@ -167,7 +194,7 @@ typedef             Window(CSWF) (Display * _display, Window _parent, int _x,
 
 /* XCreateSimpleWindow intercept hack */
 Window
-XCreateSimpleWindow(Display * display, Window parent, int x, int y,
+XCreateSimpleWindow(Display *dpy, Window parent, int x, int y,
     unsigned int width, unsigned int height,
     unsigned int border_width,
     unsigned long border, unsigned long background)
@@ -176,23 +203,36 @@ XCreateSimpleWindow(Display * display, Window parent, int x, int y,
        char            *env;
        Window          id;
 
+#ifdef _GNU_SOURCE
+       /* load the function pointer with RTLD_NEXT
+        * this might be the real X function or another
+        * preloaded intercept
+        */
+       if (!lib_xlib)
+               lib_xlib = RTLD_NEXT;
+#else
        /* find the real Xlib and the real X function */
        if (!lib_xlib)
                lib_xlib = dlopen("libX11.so", RTLD_GLOBAL | RTLD_LAZY);
-       if (!func)
+#endif
+       if (lib_xlib && !func)
                func = (CSWF *) dlsym(lib_xlib, "XCreateSimpleWindow");
+       if (!func) {
+               fprintf(stderr, "libswmhack.so: ERROR: %s\n", dlerror());
+               return BadImplementation;
+       }
 
-       if (parent == DefaultRootWindow(display))
-               parent = MyRoot(display);
+       if (parent == DefaultRootWindow(dpy))
+               parent = MyRoot(dpy);
 
-       id = (*func) (display, parent, x, y, width, height,
+       id = (*func) (dpy, parent, x, y, width, height,
            border_width, border, background);
 
        if (id) {
                if ((env = getenv("_SWM_WS")) != NULL) 
-                       set_property(display, id, "_SWM_WS", env);
+                       set_property(dpy, id, "_SWM_WS", env);
                if ((env = getenv("_SWM_PID")) != NULL)
-                       set_property(display, id, "_SWM_PID", env);
+                       set_property(dpy, id, "_SWM_PID", env);
                if ((env = getenv("_SWM_XTERM_FONTADJ")) != NULL) {
                        unsetenv("_SWM_XTERM_FONTADJ");
                        xterm = 1;
@@ -206,20 +246,33 @@ typedef int         (RWF) (Display * _display, Window _window, Window _parent,
 
 /* XReparentWindow intercept hack */
 int
-XReparentWindow(Display * display, Window window, Window parent, int x, int y)
+XReparentWindow(Display *dpy, Window window, Window parent, int x, int y)
 {
        static RWF         *func = NULL;
 
+#ifdef _GNU_SOURCE
+       /* load the function pointer with RTLD_NEXT
+        * this might be the real X function or another
+        * preloaded intercept
+        */
+       if (!lib_xlib)
+               lib_xlib = RTLD_NEXT;
+#else
        /* find the real Xlib and the real X function */
        if (!lib_xlib)
                lib_xlib = dlopen("libX11.so", RTLD_GLOBAL | RTLD_LAZY);
-       if (!func)
+#endif
+       if (lib_xlib && !func)
                func = (RWF *) dlsym(lib_xlib, "XReparentWindow");
+       if (!func) {
+               fprintf(stderr, "libswmhack.so: ERROR: %s\n", dlerror());
+               return BadImplementation;
+       }
 
-       if (parent == DefaultRootWindow(display))
-               parent = MyRoot(display);
+       if (parent == DefaultRootWindow(dpy))
+               parent = MyRoot(dpy);
 
-       return (*func) (display, window, parent, x, y);
+       return (*func) (dpy, window, parent, x, y);
 }
 
 typedef                void (ANEF) (XtAppContext app_context, XEvent *event_return);
@@ -235,18 +288,31 @@ void
 XtAppNextEvent(XtAppContext app_context, XEvent *event_return)
 {
        static ANEF     *func = NULL;
-       static int      kp_add = 0, kp_subtract = 0;
+       static KeyCode  kp_add = 0, kp_subtract = 0;
 
+#ifdef _GNU_SOURCE
+       /* load the function pointer with RTLD_NEXT
+        * this might be the real X function or another
+        * preloaded intercept
+        */
+       if (!lib_xtlib)
+               lib_xtlib = RTLD_NEXT;
+#else
        /* find the real Xlib and the real X function */
        if (!lib_xtlib)
                lib_xtlib = dlopen("libXt.so", RTLD_GLOBAL | RTLD_LAZY);
-       if (!func) {
+#endif
+       if (lib_xtlib && !func) {
                func = (ANEF *) dlsym(lib_xtlib, "XtAppNextEvent");
-               if (dpy != NULL) {
-                       kp_add = XKeysymToKeycode(dpy, XK_KP_Add);
-                       kp_subtract = XKeysymToKeycode(dpy, XK_KP_Subtract);
+               if (display != NULL) {
+                       kp_add = XKeysymToKeycode(display, XK_KP_Add);
+                       kp_subtract = XKeysymToKeycode(display, XK_KP_Subtract);
                }
        }
+       if (!func) {
+               fprintf(stderr, "libswmhack.so: ERROR: %s\n", dlerror());
+               return;
+       }
 
        (*func) (app_context, event_return);