ipc: add active flag

[i3/i3] / src / sighandler.c

diff --git a/src/sighandler.c b/src/sighandler.c
index 4b7840415f5170af37dd28c1d3596334a4d09da1..590608b63636fd3a139743664e47673c2314f12b 100644 (file)
--- a/src/sighandler.c
+++ b/src/sighandler.c
@@ -31,7 +31,7 @@
 #include "xcb.h"
 #include "log.h"
 #include "config.h"
-#include "xinerama.h"
+#include "randr.h"
 
 static xcb_gcontext_t pixmap_gc;
 static xcb_pixmap_t pixmap;
@@ -78,7 +78,6 @@ static int sig_draw_window(xcb_connection_t *conn, xcb_window_t win, int width,
         return 1;
 }
 
-
 /*
  * Handles keypresses of 'e' or 'r' to exit or restart i3
  *
@@ -87,7 +86,7 @@ static int sig_handle_key_press(void *ignored, xcb_connection_t *conn, xcb_key_p
         xcb_keysym_t sym = xcb_key_press_lookup_keysym(keysyms, event, event->state);
 
         if (sym == 'e') {
-                LOG("User issued exit-command, raising error again.\n");
+                DLOG("User issued exit-command, raising error again.\n");
                 raise(raised_signal);
                 exit(1);
         }
@@ -107,7 +106,7 @@ static xcb_window_t open_input_window(xcb_connection_t *conn, Rect screen_rect,
         xcb_window_t win = xcb_generate_id(conn);
 
         uint32_t mask = 0;
-        uint32_t values[3];
+        uint32_t values[2];
 
         mask |= XCB_CW_BACK_PIXEL;
         values[0] = 0;
@@ -115,12 +114,9 @@ static xcb_window_t open_input_window(xcb_connection_t *conn, Rect screen_rect,
         mask |= XCB_CW_OVERRIDE_REDIRECT;
         values[1] = 1;
 
-        mask |= XCB_CW_EVENT_MASK;
-        values[2] = XCB_EVENT_MASK_EXPOSURE;
-
         /* center each popup on the specified screen */
-        uint32_t x = screen_rect.x + ((screen_rect.width / 2) - (width/2)),
-                 y = screen_rect.y + ((screen_rect.height / 2) - (height/2));
+        uint32_t x = screen_rect.x + ((screen_rect.width / 2) - (width / 2)),
+                 y = screen_rect.y + ((screen_rect.height / 2) - (height / 2));
 
         xcb_create_window(conn,
                         XCB_COPY_FROM_PARENT,
@@ -146,7 +142,7 @@ static xcb_window_t open_input_window(xcb_connection_t *conn, Rect screen_rect,
  *
  */
 void handle_signal(int sig, siginfo_t *info, void *data) {
-        LOG("i3 crashed. SIG: %d\n", sig);
+        DLOG("i3 crashed. SIG: %d\n", sig);
 
         struct sigaction action;
         action.sa_handler = SIG_DFL;
@@ -174,11 +170,11 @@ void handle_signal(int sig, siginfo_t *info, void *data) {
         int width = font_width + 20;
 
         /* Open a popup window on each virtual screen */
-        i3Screen *screen;
+        Output *screen;
         xcb_window_t win;
-        TAILQ_FOREACH(screen, virtual_screens, screens) {
-                LOG("%d, %d, %d, %d\n", screen->rect.width, screen->rect.height, screen->rect.x, screen->rect.y);
-
+        TAILQ_FOREACH(screen, &outputs, outputs) {
+                if (!screen->active)
+                        continue;
                 win = open_input_window(conn, screen->rect, width, height);
 
                 /* Create pixmap */
@@ -193,6 +189,10 @@ void handle_signal(int sig, siginfo_t *info, void *data) {
                 /* Grab the keyboard to get all input */
                 xcb_grab_keyboard(conn, false, win, XCB_CURRENT_TIME, XCB_GRAB_MODE_ASYNC, XCB_GRAB_MODE_ASYNC);
 
+                /* Grab the cursor inside the popup */
+                xcb_grab_pointer(conn, false, win, XCB_NONE, XCB_GRAB_MODE_ASYNC,
+                                 XCB_GRAB_MODE_ASYNC, win, XCB_NONE, XCB_CURRENT_TIME);
+
                 sig_draw_window(conn, win, width, height, font->height);
                 xcb_flush(conn);
         }
@@ -210,6 +210,8 @@ void setup_signal_handler() {
         action.sa_sigaction = handle_signal;
         action.sa_flags = SA_NODEFER | SA_RESETHAND | SA_SIGINFO;
         sigemptyset(&action.sa_mask);
-        sigaction(SIGSEGV, &action, NULL);
-        sigaction(SIGFPE, &action, NULL);
+
+        if (sigaction(SIGSEGV, &action, NULL) == -1 ||
+            sigaction(SIGFPE, &action, NULL) == -1)
+                ELOG("Could not setup signal handler");
 }