Add ctrl+u password reset

[i3/i3lock] / xcb.c

diff --git a/xcb.c b/xcb.c
index 95870525c7de3db7ccc91d5b7631550835b56000..6498241419a2f016fdd204d1d5516700a999e9a0 100644 (file)
--- a/xcb.c
+++ b/xcb.c
@@ -1,14 +1,13 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * © 2010 Michael Stapelberg
+ * © 2010-2012 Michael Stapelberg
  *
  * xcb.c: contains all functions which use XCB to talk to X11. Mostly wrappers
  *        around the rather complicated/ugly parts of the XCB API.
  *
  */
 #include <xcb/xcb.h>
-#include <xcb/xcb_keysyms.h>
 #include <xcb/xcb_image.h>
 #include <xcb/dpms.h>
 #include <stdio.h>
@@ -20,6 +19,9 @@
 
 #include "cursors.h"
 
+xcb_connection_t *conn;
+xcb_screen_t *screen;
+
 #define curs_invisible_width 8
 #define curs_invisible_height 8
 
@@ -53,7 +55,7 @@ static uint32_t get_colorpixel(char *hex) {
                          (strtol(strgroups[2], NULL, 16))};
 
     return (rgb16[0] << 16) + (rgb16[1] << 8) + rgb16[2];
-}       
+}
 
 xcb_visualtype_t *get_root_visual_type(xcb_screen_t *screen) {
     xcb_visualtype_t *visual_type = NULL;
@@ -78,13 +80,35 @@ xcb_visualtype_t *get_root_visual_type(xcb_screen_t *screen) {
     return NULL;
 }
 
-xcb_window_t open_fullscreen_window(xcb_connection_t *conn, xcb_screen_t *scr, char *color) {
+xcb_pixmap_t create_bg_pixmap(xcb_connection_t *conn, xcb_screen_t *scr, u_int32_t* resolution, char *color) {
+    xcb_pixmap_t bg_pixmap = xcb_generate_id(conn);
+    xcb_create_pixmap(conn, scr->root_depth, bg_pixmap, scr->root,
+                      resolution[0], resolution[1]);
+
+    /* Generate a Graphics Context and fill the pixmap with background color
+     * (for images that are smaller than your screen) */
+    xcb_gcontext_t gc = xcb_generate_id(conn);
+    uint32_t values[] = { get_colorpixel(color) };
+    xcb_create_gc(conn, gc, bg_pixmap, XCB_GC_FOREGROUND, values);
+    xcb_rectangle_t rect = { 0, 0, resolution[0], resolution[1] };
+    xcb_poly_fill_rectangle(conn, bg_pixmap, gc, 1, &rect);
+    xcb_free_gc(conn, gc);
+
+    return bg_pixmap;
+}
+
+xcb_window_t open_fullscreen_window(xcb_connection_t *conn, xcb_screen_t *scr, char *color, xcb_pixmap_t pixmap) {
     uint32_t mask = 0;
     uint32_t values[3];
     xcb_window_t win = xcb_generate_id(conn);
 
-    mask |= XCB_CW_BACK_PIXEL;
-    values[0] = get_colorpixel(color);
+    if (pixmap == XCB_NONE) {
+        mask |= XCB_CW_BACK_PIXEL;
+        values[0] = get_colorpixel(color);
+    } else {
+        mask |= XCB_CW_BACK_PIXMAP;
+        values[0] = pixmap;
+    }
 
     mask |= XCB_CW_OVERRIDE_REDIRECT;
     values[1] = 1;
@@ -93,10 +117,11 @@ xcb_window_t open_fullscreen_window(xcb_connection_t *conn, xcb_screen_t *scr, c
     values[2] = XCB_EVENT_MASK_EXPOSURE |
                 XCB_EVENT_MASK_KEY_PRESS |
                 XCB_EVENT_MASK_KEY_RELEASE |
-                XCB_EVENT_MASK_VISIBILITY_CHANGE;
+                XCB_EVENT_MASK_VISIBILITY_CHANGE |
+                XCB_EVENT_MASK_STRUCTURE_NOTIFY;
 
     xcb_create_window(conn,
-                      24,
+                      XCB_COPY_FROM_PARENT,
                       win, /* the window id */
                       scr->root, /* parent == root */
                       0, 0,
@@ -118,37 +143,6 @@ xcb_window_t open_fullscreen_window(xcb_connection_t *conn, xcb_screen_t *scr, c
     return win;
 }
 
-/*
- * Returns the mask for Mode_switch (to be used for looking up keysymbols by
- * keycode).
- *
- */
-uint32_t get_mod_mask(xcb_connection_t *conn, xcb_key_symbols_t *symbols, uint32_t keycode) {
-    xcb_get_modifier_mapping_reply_t *modmap_r;
-    xcb_keycode_t *modmap, kc;
-    xcb_keycode_t *modeswitchcodes = xcb_key_symbols_get_keycode(symbols, keycode);
-    if (modeswitchcodes == NULL)
-        return 0;
-
-    modmap_r = xcb_get_modifier_mapping_reply(conn, xcb_get_modifier_mapping(conn), NULL);
-    modmap = xcb_get_modifier_mapping_keycodes(modmap_r);
-
-    for (int i = 0; i < 8; i++)
-        for (int j = 0; j < modmap_r->keycodes_per_modifier; j++) {
-            kc = modmap[i * modmap_r->keycodes_per_modifier + j];
-            for (xcb_keycode_t *ktest = modeswitchcodes; *ktest; ktest++) {
-                if (*ktest != kc)
-                    continue;
-
-                free(modeswitchcodes);
-                free(modmap_r);
-                return (1 << i);
-            }
-        }
-
-    return 0;
-}
-
 void dpms_turn_off_screen(xcb_connection_t *conn) {
     xcb_dpms_enable(conn);
     xcb_dpms_force_level(conn, XCB_DPMS_DPMS_MODE_OFF);