Fix bar_print() so that the background of the text matches the bar color.

[spectrwm.git] / spectrwm.c

diff --git a/spectrwm.c b/spectrwm.c
index fb70aca..7fd6790 100644 (file)
--- a/spectrwm.c
+++ b/spectrwm.c
@@ -145,6 +145,7 @@ static const char   *buildstr = SPECTRWM_VERSION;
 #define xcb_icccm_get_wm_protocols             xcb_get_wm_protocols
 #define xcb_icccm_get_wm_protocols_reply       xcb_get_wm_protocols_reply
 #define xcb_icccm_get_wm_protocols_reply_t     xcb_get_wm_protocols_reply_t
+#define xcb_icccm_get_wm_protocols_reply_wipe  xcb_get_wm_protocols_reply_wipe
 #define xcb_icccm_get_wm_transient_for         xcb_get_wm_transient_for
 #define xcb_icccm_get_wm_transient_for_reply   xcb_get_wm_transient_for_reply
 #define xcb_icccm_wm_hints_t                   xcb_wm_hints_t
@@ -1501,6 +1502,8 @@ bar_print(struct swm_region *r, const char *s)
                sizeof(rect), &rect);
 
        /* draw back buffer */
+       gcv[0] = r->s->c[SWM_S_COLOR_BAR].color;
+       xcb_change_gc(conn, r->s->bar_gc, XCB_GC_BACKGROUND, gcv);
        gcv[0] = r->s->c[SWM_S_COLOR_BAR_FONT].color;
        xcb_change_gc(conn, r->s->bar_gc, XCB_GC_FOREGROUND, gcv);
        xcb_image_text_8(conn, len, r->bar->buffer, r->s->bar_gc, x,
@@ -5573,7 +5576,7 @@ grabkeys(void)
 {
        int                     num_screens;
        unsigned int            j, k;
-       KeyCode                 code;
+       xcb_keycode_t           *code;
        unsigned int            modifiers[] =
            { 0, LockMask, numlockmask, numlockmask | LockMask };
        struct key              *kp;
@@ -5588,12 +5591,14 @@ grabkeys(void)
                xcb_ungrab_key(conn, XCB_GRAB_ANY, screens[k].root,
                        XCB_MOD_MASK_ANY);
                RB_FOREACH(kp, key_tree, &keys) {
-                       if ((code = XKeysymToKeycode(display, kp->keysym)))
+                       if ((code = xcb_key_symbols_get_keycode(syms,
+                                       kp->keysym)))
                                for (j = 0; j < LENGTH(modifiers); j++)
-                                       XGrabKey(display, code,
+                                       xcb_grab_key(conn, True,
+                                           screens[k].root,
                                            kp->mod | modifiers[j],
-                                           screens[k].root, True,
-                                           GrabModeAsync, GrabModeAsync);
+                                           *code, XCB_GRAB_MODE_ASYNC,
+                                           XCB_GRAB_MODE_ASYNC);
                }
        }
 }