Port the pointer-code to xcb

[i3/i3lock] / i3lock.c

diff --git a/i3lock.c b/i3lock.c
index cb671d56838b3720f8036a8394b94236d9763bd6..5df9f268beb5c46f7542e97d7c69a146da69747a 100644 (file)
--- a/i3lock.c
+++ b/i3lock.c
@@ -27,6 +27,7 @@
 #include "keysym2ucs.h"
 #include "ucs2_to_utf8.h"
 #include "xcb.h"
+#include "cursors.h"
 
 static xcb_connection_t *conn;
 static xcb_key_symbols_t *symbols;
@@ -75,14 +76,14 @@ static void handle_expose_event() {
  *
  */
 static void handle_key_release(xcb_key_release_event_t *event) {
-    printf("releasing %d, state raw = %d\n", event->detail, event->state);
+    //printf("releasing %d, state raw = %d\n", event->detail, event->state);
 
     /* fix state */
     event->state &= ~numlockmask;
 
     xcb_keysym_t sym = xcb_key_press_lookup_keysym(symbols, event, event->state);
     if (sym == XK_Mode_switch) {
-        printf("Mode switch disabled\n");
+        //printf("Mode switch disabled\n");
         modeswitch_active = false;
     }
 }
@@ -94,7 +95,7 @@ static void handle_key_release(xcb_key_release_event_t *event) {
  *
  */
 static void handle_key_press(xcb_key_press_event_t *event) {
-    printf("keypress %d, state raw = %d\n", event->detail, event->state);
+    //printf("keypress %d, state raw = %d\n", event->detail, event->state);
 
     /* fix state */
     if (modeswitch_active)
@@ -111,7 +112,7 @@ static void handle_key_press(xcb_key_press_event_t *event) {
     xcb_keysym_t sym = xcb_key_press_lookup_keysym(symbols, event, event->state);
     switch (sym) {
     case XK_Mode_switch:
-        printf("Mode switch enabled\n");
+        //printf("Mode switch enabled\n");
         modeswitch_active = true;
         return;
 
@@ -133,6 +134,7 @@ static void handle_key_press(xcb_key_press_event_t *event) {
         return;
     }
 
+#if 0
     /* FIXME: handle all of these? */
     printf("is_keypad_key = %d\n", xcb_is_keypad_key(sym));
     printf("is_private_keypad_key = %d\n", xcb_is_private_keypad_key(sym));
@@ -141,11 +143,12 @@ static void handle_key_press(xcb_key_press_event_t *event) {
     printf("xcb_is_function_key = %d\n", xcb_is_function_key(sym));
     printf("xcb_is_misc_function_key = %d\n", xcb_is_misc_function_key(sym));
     printf("xcb_is_modifier_key = %d\n", xcb_is_modifier_key(sym));
+#endif
 
     if (xcb_is_modifier_key(sym) || xcb_is_cursor_key(sym))
             return;
 
-    printf("sym = %c (%d)\n", sym, sym);
+    //printf("sym = %c (%d)\n", sym, sym);
 
     /* convert the keysym to UCS */
     uint16_t ucs = keysym2ucs(sym);
@@ -160,7 +163,26 @@ static void handle_key_press(xcb_key_press_event_t *event) {
     /* store it in the password array as UTF-8 */
     input_position += convert_ucs_to_utf8((char*)inp, password + input_position);
     password[input_position] = '\0';
-    printf("current password = %s\n", password);
+    //printf("current password = %s\n", password);
+}
+
+/*
+ * A visibility notify event will be received when the visibility (= can the
+ * user view the complete window) changes, so for example when a popup overlays
+ * some area of the i3lock window.
+ *
+ * In this case, we raise our window on top so that the popup (or whatever is
+ * hiding us) gets hidden.
+ *
+ */
+void handle_visibility_notify(xcb_visibility_notify_event_t *event) {
+    printf("visibility notify (window 0x%08x, state %d)\n", event->window, event->state);
+    if (event->state != XCB_VISIBILITY_UNOBSCURED) {
+        printf("window is obscured (not fully visible), raising\n");
+        uint32_t values[] = { XCB_STACK_MODE_ABOVE };
+        xcb_configure_window(conn, event->window, XCB_CONFIG_WINDOW_STACK_MODE, values);
+        xcb_flush(conn);
+    }
 }
 
 /*
@@ -209,6 +231,8 @@ int main(int argc, char *argv[]) {
     xcb_generic_event_t *event;
     xcb_screen_t *scr;
     xcb_window_t win;
+    xcb_cursor_t cursor;
+    int curs_choice = CURS_NONE;
     char o;
     int optind = 0;
     struct option longopts[] = {
@@ -258,7 +282,12 @@ int main(int argc, char *argv[]) {
             /* TODO: tile image */
             break;
         case 'p':
-            /* TODO: cursor */
+            if (!strcmp(optarg, "win")) {
+                curs_choice = CURS_WIN;
+            }
+            if (!strcmp(optarg, "default")) {
+                curs_choice = CURS_DEFAULT;
+            }
             break;
         default:
             errx(1, "i3lock: Unknown option. Syntax: i3lock [-v] [-n] [-b] [-d] [-i image.png] [-c color] [-t] [-p win|default]\n");
@@ -298,7 +327,9 @@ int main(int argc, char *argv[]) {
      * ready to handle the expose event immediately afterwards) */
     win = open_fullscreen_window(conn, scr, color);
 
-    grab_pointer_and_keyboard(conn, scr);
+    cursor = create_cursor(conn, scr, win, curs_choice);
+
+    grab_pointer_and_keyboard(conn, scr, cursor);
 
     if (image_path)
         img = cairo_image_surface_create_from_png(image_path);
@@ -351,6 +382,11 @@ int main(int argc, char *argv[]) {
             continue;
         }
 
+        if (type == XCB_VISIBILITY_NOTIFY) {
+            handle_visibility_notify((xcb_visibility_notify_event_t*)event);
+            continue;
+        }
+
         printf("WARNING: unhandled event of type %d\n", type);
     }