X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fsighandler.c;h=92cbc5cb3abb7e7bfdc5abba914d83ccb4276cbb;hb=6a1c34d2c584271d26f4dcc214798421c097a1ac;hp=9eeb2398cb857b6eb8bc20d580a0e53c9b8d75ec;hpb=614b360bd4e49cb9f8639e35f01534c619c89304;p=i3%2Fi3 diff --git a/src/sighandler.c b/src/sighandler.c index 9eeb2398..92cbc5cb 100644 --- a/src/sighandler.c +++ b/src/sighandler.c @@ -3,8 +3,8 @@ * * i3 - an improved dynamic tiling window manager * - * © 2009 Michael Stapelberg and contributors - * © 2009 Jan-Erik Rediger + * © 2009-2010 Michael Stapelberg and contributors + * © 2009-2010 Jan-Erik Rediger * * See file LICENSE for license information. * @@ -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; @@ -52,7 +52,8 @@ static int crash_text_longest = 1; */ static int sig_draw_window(xcb_connection_t *conn, xcb_window_t win, int width, int height, int font_height) { /* re-draw the background */ - xcb_rectangle_t border = {0, 0, width, height}, inner = {2, 2, width-4, height-4}; + xcb_rectangle_t border = { 0, 0, width, height}, + inner = { 2, 2, width - 4, height - 4}; xcb_change_gc_single(conn, pixmap_gc, XCB_GC_FOREGROUND, get_colorpixel(conn, "#FF0000")); xcb_poly_fill_rectangle(conn, pixmap, pixmap_gc, 1, &border); xcb_change_gc_single(conn, pixmap_gc, XCB_GC_FOREGROUND, get_colorpixel(conn, "#000000")); @@ -61,15 +62,12 @@ static int sig_draw_window(xcb_connection_t *conn, xcb_window_t win, int width, /* restore font color */ xcb_change_gc_single(conn, pixmap_gc, XCB_GC_FOREGROUND, get_colorpixel(conn, "#FFFFFF")); - char *full_text; - int text_len; - int i; - int crash_text_num = sizeof(crash_text) / sizeof(char*); - for (i = 0; i < crash_text_num; i++) { - text_len = strlen(crash_text[i]); - full_text = convert_utf8_to_ucs2(crash_text[i], &text_len); + for (int i = 0; i < sizeof(crash_text) / sizeof(char*); i++) { + int text_len = strlen(crash_text[i]); + char *full_text = convert_utf8_to_ucs2(crash_text[i], &text_len); xcb_image_text_16(conn, text_len, pixmap, pixmap_gc, 8 /* X */, - 3 + (i+1)*font_height /* Y = baseline of font */, (xcb_char2b_t*)full_text); + 3 + (i + 1) * font_height /* Y = baseline of font */, + (xcb_char2b_t*)full_text); free(full_text); } @@ -80,19 +78,26 @@ 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 * */ static int sig_handle_key_press(void *ignored, xcb_connection_t *conn, xcb_key_press_event_t *event) { - xcb_keysym_t sym = xcb_key_press_lookup_keysym(keysyms, event, event->state); + uint16_t state = event->state; + + /* Apparantly, after activating numlock once, the numlock modifier + * stays turned on (use xev(1) to verify). So, to resolve useful + * keysyms, we remove the numlock flag from the event state */ + state &= ~xcb_numlock_mask; + + xcb_keysym_t sym = xcb_key_press_lookup_keysym(keysyms, 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); } + if (sym == 'r') i3_restart(); @@ -108,7 +113,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; @@ -116,12 +121,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, @@ -147,7 +149,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; @@ -156,7 +158,7 @@ void handle_signal(int sig, siginfo_t *info, void *data) { xcb_connection_t *conn = global_conn; - /* Set up event handlers for key press and key release */ + /* setup event handler for key presses */ xcb_event_handlers_t sig_evenths; memset(&sig_evenths, 0, sizeof(xcb_event_handlers_t)); xcb_event_handlers_init(conn, &sig_evenths); @@ -174,12 +176,12 @@ void handle_signal(int sig, siginfo_t *info, void *data) { int font_width = predict_text_width(conn, config.font, longest_text, text_len); int width = font_width + 20; - /* Open an popup window on each virtual screen */ - i3Screen *screen; + /* Open a popup window on each virtual 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 */ @@ -194,6 +196,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); } @@ -207,9 +213,12 @@ void handle_signal(int sig, siginfo_t *info, void *data) { */ void setup_signal_handler() { struct sigaction action; + 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"); }