X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=i3lock.c;h=2a437504cfb6d9cc08682d16d053c03b59d4f72e;hb=09e74c4fd1041d80515f6383b591b4fe33c181f4;hp=c8341d6c328fb69495febbcbbe191225d923595d;hpb=7128f80020a65b9e600f1791e2891f27793b2e52;p=i3%2Fi3lock diff --git a/i3lock.c b/i3lock.c index c8341d6..2a43750 100644 --- a/i3lock.c +++ b/i3lock.c @@ -42,16 +42,59 @@ static int input_position = 0; /* holds the password you enter (in UTF-8) */ static char password[512]; static bool modeswitch_active = false; +static bool iso_level3_shift_active = false; static int modeswitchmask; static int numlockmask; static bool beep = false; +static bool debug_mode = false; + +#define DEBUG(fmt, ...) do { \ + if (debug_mode) \ + printf("[i3lock-debug] " fmt, ##__VA_ARGS__); \ +} while (0) #ifndef NOLIBCAIRO static cairo_surface_t *img = NULL; -static cairo_t *ctx = NULL; static bool tile = false; #endif +/* + * Draws global image with fill color onto a pixmap with the given + * resolution and returns it. + * + */ +xcb_pixmap_t draw_image(xcb_visualtype_t *vistype, u_int32_t* resolution, char* color) { + xcb_pixmap_t bg_pixmap = XCB_NONE; + +#ifndef NOLIBCAIRO + if (!img) + return bg_pixmap; + + bg_pixmap = create_bg_pixmap(conn, scr, resolution, color); + /* Initialize cairo */ + cairo_surface_t *output; + output = cairo_xcb_surface_create(conn, bg_pixmap, vistype, + resolution[0], resolution[1]); + cairo_t *ctx = cairo_create(output); + if (!tile) { + cairo_set_source_surface(ctx, img, 0, 0); + cairo_paint(ctx); + } else { + /* create a pattern and fill a rectangle as big as the screen */ + cairo_pattern_t *pattern; + pattern = cairo_pattern_create_for_surface(img); + cairo_set_source(ctx, pattern); + cairo_pattern_set_extend(pattern, CAIRO_EXTEND_REPEAT); + cairo_rectangle(ctx, 0, 0, resolution[0], resolution[1]); + cairo_fill(ctx); + cairo_pattern_destroy(pattern); + } + cairo_surface_destroy(output); + cairo_destroy(ctx); +#endif + return bg_pixmap; +} + static void input_done() { if (input_position == 0) return; @@ -71,47 +114,28 @@ static void input_done() { } } -/* - * Called when we should draw the image (if any). - * - */ -static void handle_expose_event() { -#ifndef NOLIBCAIRO - if (!ctx) - return; - - if (tile) { - /* create a pattern and fill a rectangle as big as the screen */ - cairo_pattern_t *pattern; - pattern = cairo_pattern_create_for_surface(img); - cairo_set_source(ctx, pattern); - cairo_pattern_set_extend(pattern, CAIRO_EXTEND_REPEAT); - cairo_rectangle(ctx, 0, 0, scr->width_in_pixels, scr->height_in_pixels); - cairo_fill(ctx); - } else { - /* otherwise, just paint the image */ - cairo_paint(ctx); - } -#endif - xcb_flush(conn); -} - /* * Called when the user releases a key. We need to leave the Mode_switch * state when the user releases the Mode_switch key. * */ static void handle_key_release(xcb_key_release_event_t *event) { - //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); + DEBUG("releasing key %d, state raw = %d, modeswitch_active = %d, iso_level3_shift_active = %d\n", + event->detail, event->state, modeswitch_active, iso_level3_shift_active); + + /* We don’t care about the column here and just use the first symbol. Since + * we only check for Mode_switch and ISO_Level3_Shift, this *should* work. + * Also, if we would use the current column, we would look in the wrong + * place. */ + xcb_keysym_t sym = xcb_key_press_lookup_keysym(symbols, event, 0); if (sym == XK_Mode_switch) { //printf("Mode switch disabled\n"); modeswitch_active = false; + } else if (sym == XK_ISO_Level3_Shift) { + iso_level3_shift_active = false; } + DEBUG("release done. modeswitch_active = %d, iso_level3_shift_active = %d\n", + modeswitch_active, iso_level3_shift_active); } /* @@ -121,22 +145,57 @@ 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); + DEBUG("keypress %d, state raw = %d, modeswitch_active = %d, iso_level3_shift_active = %d\n", + event->detail, event->state, modeswitch_active, iso_level3_shift_active); xcb_keysym_t sym0, sym1, sym; - if (modeswitch_active) { - sym0 = xcb_key_press_lookup_keysym(symbols, event, 4); - sym1 = xcb_key_press_lookup_keysym(symbols, event, 5); - } else { - sym0 = xcb_key_press_lookup_keysym(symbols, event, 0); - sym1 = xcb_key_press_lookup_keysym(symbols, event, 1); - } + /* For each keycode, there is a list of symbols. The list could look like this: + * $ xmodmap -pke | grep 'keycode 38' + * keycode 38 = a A adiaeresis Adiaeresis o O + * In non-X11 terminology, the symbols for the keycode 38 (the key labeled + * with "a" on my keyboard) are "a A ä Ä o O". + * Another form to display the same information is using xkbcomp: + * $ xkbcomp $DISPLAY /tmp/xkb.dump + * Then open /tmp/xkb.dump and search for '\' (in VIM regexp-language): + * + * symbols[Group1]= [ a, A, o, O ], + * symbols[Group2]= [ adiaeresis, Adiaeresis ] + * + * So there are two *groups*, one containing 'a A' and one containing 'ä + * Ä'. You can use Mode_switch to switch between these groups. You can use + * ISO_Level3_Shift to reach the 'o O' part of the first group (it’s the + * same group, just an even higher shift level). + * + * So, using the "logical" XKB information, the following lookup will be + * performed: + * + * Neither Mode_switch nor ISO_Level3_Shift active: group 1, column 0 and 1 + * Mode_switch active: group 2, column 0 and 1 + * ISO_Level3_Shift active: group 1, column 2 and 3 + * + * Using the column index which xcb_key_press_lookup_keysym uses (and + * xmodmap prints out), the following lookup will be performed: + * + * Neither Mode_switch nor ISO_Level3_Shift active: column 0 and 1 + * Mode_switch active: column 2 and 3 + * ISO_Level3_Shift active: column 4 and 5 + */ + int base_column = 0; + if (modeswitch_active) + base_column = 2; + if (iso_level3_shift_active) + base_column = 4; + sym0 = xcb_key_press_lookup_keysym(symbols, event, base_column); + sym1 = xcb_key_press_lookup_keysym(symbols, event, base_column + 1); switch (sym0) { case XK_Mode_switch: - //printf("Mode switch enabled\n"); + DEBUG("Mode switch enabled\n"); modeswitch_active = true; return; - + case XK_ISO_Level3_Shift: + DEBUG("ISO_Level3_Shift enabled\n"); + iso_level3_shift_active = true; + return; case XK_Return: case XK_KP_Enter: input_done(); @@ -182,24 +241,25 @@ static void handle_key_press(xcb_key_press_event_t *event) { #endif if (xcb_is_modifier_key(sym) || xcb_is_cursor_key(sym)) - return; + return; - //printf("sym = %c (%d)\n", sym, sym); + DEBUG("resolved to keysym = %c (%d)\n", sym, sym); /* convert the keysym to UCS */ uint16_t ucs = keysym2ucs(sym); if ((int16_t)ucs == -1) { - fprintf(stderr, "Keysym could not be converted to UCS, skipping\n"); - return; + fprintf(stderr, "Keysym could not be converted to UCS, skipping\n"); + return; } /* store the UCS in a string to convert it */ uint8_t inp[3] = {(ucs & 0xFF00) >> 8, (ucs & 0xFF), 0}; + DEBUG("input part = %s\n", inp); /* 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); + DEBUG("current password = %s\n", password); } /* @@ -211,10 +271,8 @@ static void handle_key_press(xcb_key_press_event_t *event) { * 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); +static void handle_visibility_notify(xcb_visibility_notify_event_t *event) { 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); @@ -222,21 +280,45 @@ void handle_visibility_notify(xcb_visibility_notify_event_t *event) { } /* - * Called when the keyboard mapping changes. We update our symbols and re-grab - * pointer/keyboard. + * Called when the keyboard mapping changes. We update our symbols. * */ -void handle_mapping_notify(xcb_mapping_notify_event_t *event) { - printf("mapping notify\n"); +static void handle_mapping_notify(xcb_mapping_notify_event_t *event) { xcb_refresh_keyboard_mapping(symbols, event); - xcb_ungrab_pointer(conn, XCB_CURRENT_TIME); - xcb_ungrab_keyboard(conn, XCB_CURRENT_TIME); - grab_pointer_and_keyboard(conn, scr, cursor); - modeswitchmask = get_mod_mask(conn, symbols, XK_Mode_switch); numlockmask = get_mod_mask(conn, symbols, XK_Num_Lock); +} + +/* + * Called when the properties on the root window change, e.g. when the screen + * resolution changes. If so we update the window to cover the whole screen + * and also redraw the image, if any. + * + */ +void handle_screen_resize(xcb_visualtype_t *vistype, xcb_window_t win, uint32_t* last_resolution, char* color) { + xcb_get_geometry_cookie_t geomc; + xcb_get_geometry_reply_t *geom; + geomc = xcb_get_geometry(conn, scr->root); + if ((geom = xcb_get_geometry_reply(conn, geomc, 0)) == NULL) { + return; + } + + if (last_resolution[0] == geom->width && last_resolution[1] == geom->height) + return; + + last_resolution[0] = geom->width; + last_resolution[1] = geom->height; +#ifndef NOLIBCAIRO + if (img) { + xcb_pixmap_t bg_pixmap = draw_image(vistype, last_resolution, color); + xcb_change_window_attributes(conn, win, XCB_CW_BACK_PIXMAP, (uint32_t[1]){ bg_pixmap }); + } +#endif + + uint32_t mask = XCB_CONFIG_WINDOW_WIDTH | XCB_CONFIG_WINDOW_HEIGHT; + xcb_configure_window(conn, win, mask, last_resolution); xcb_flush(conn); } @@ -296,6 +378,8 @@ int main(int argc, char *argv[]) { {"dpms", no_argument, NULL, 'd'}, {"color", required_argument, NULL, 'c'}, {"pointer", required_argument, NULL , 'p'}, + {"debug", no_argument, NULL, 0}, + {"help", no_argument, NULL, 'h'}, #ifndef NOLIBCAIRO {"image", required_argument, NULL, 'i'}, {"tiling", no_argument, NULL, 't'}, @@ -306,14 +390,14 @@ int main(int argc, char *argv[]) { if ((username = getenv("USER")) == NULL) errx(1, "USER environment variable not set, please set it.\n"); - while ((o = getopt_long(argc, argv, "vnbdc:p:" + while ((o = getopt_long(argc, argv, "hvnbdc:p:" #ifndef NOLIBCAIRO "i:t" #endif , longopts, &optind)) != -1) { switch (o) { case 'v': - errx(EXIT_SUCCESS, "version " VERSION " © 2010-2011 Michael Stapelberg\n"); + errx(EXIT_SUCCESS, "version " VERSION " © 2010-2011 Michael Stapelberg"); case 'n': dont_fork = true; break; @@ -346,19 +430,24 @@ int main(int argc, char *argv[]) { case 'p': if (!strcmp(optarg, "win")) { curs_choice = CURS_WIN; - } - if (!strcmp(optarg, "default")) { + } else if (!strcmp(optarg, "default")) { curs_choice = CURS_DEFAULT; + } else { + errx(1, "i3lock: Invalid pointer type given. Expected one of \"win\" or \"default\".\n"); } break; + case 0: + if (strcmp(longopts[optind].name, "debug") == 0) + debug_mode = true; + break; default: - errx(1, "i3lock: Unknown option. Syntax: i3lock [-v] [-n] [-b] [-d] [-c color] [-p win|default]" + errx(1, "Syntax: i3lock [-v] [-n] [-b] [-d] [-c color] [-p win|default]" #ifndef NOLIBCAIRO " [-i image.png] [-t]" #else " (compiled with NOLIBCAIRO)" #endif - "\n"); + ); } } @@ -391,10 +480,22 @@ int main(int argc, char *argv[]) { scr = xcb_setup_roots_iterator(xcb_get_setup(conn)).data; vistype = get_root_visual_type(scr); - /* open the fullscreen window and flush immediately afterwards so that X11 - * can generate an expose event while we load the PNG file (so that we are - * ready to handle the expose event immediately afterwards) */ - win = open_fullscreen_window(conn, scr, color); + uint32_t last_resolution[2] = {scr->width_in_pixels, scr->height_in_pixels}; + + + +#ifndef NOLIBCAIRO + if (image_path) { + /* Create a pixmap to render on, fill it with the background color */ + img = cairo_image_surface_create_from_png(image_path); + } +#endif + + /* Pixmap on which the image is rendered to (if any) */ + xcb_pixmap_t bg_pixmap = draw_image(vistype, last_resolution, color); + + /* open the fullscreen window, already with the correct pixmap in place */ + win = open_fullscreen_window(conn, scr, color, bg_pixmap); cursor = create_cursor(conn, scr, win, curs_choice); @@ -404,23 +505,6 @@ int main(int argc, char *argv[]) { modeswitchmask = get_mod_mask(conn, symbols, XK_Mode_switch); numlockmask = get_mod_mask(conn, symbols, XK_Num_Lock); -#ifndef NOLIBCAIRO - if (image_path) - img = cairo_image_surface_create_from_png(image_path); - - if (img) { - /* Initialize cairo */ - cairo_surface_t *output; - output = cairo_xcb_surface_create(conn, win, vistype, - scr->width_in_pixels, scr->height_in_pixels); - ctx = cairo_create(output); - if (!tile) - cairo_set_source_surface(ctx, img, 0, 0); - - handle_expose_event(); - } -#endif - if (dpms) dpms_turn_off_screen(conn); @@ -431,11 +515,6 @@ int main(int argc, char *argv[]) { /* Strip off the highest bit (set if the event is generated) */ int type = (event->response_type & 0x7F); - if (type == XCB_EXPOSE) { - handle_expose_event(); - continue; - } - if (type == XCB_KEY_PRESS) { handle_key_press((xcb_key_press_event_t*)event); continue; @@ -462,6 +541,11 @@ int main(int argc, char *argv[]) { continue; } + if (type == XCB_CONFIGURE_NOTIFY) { + handle_screen_resize(vistype, win, last_resolution, color); + continue; + } + printf("WARNING: unhandled event of type %d\n", type); }