X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=i3lock.c;h=28a93f081e1312dc874833bff04318bdcc4c2f84;hb=d91fdc368e4e119f4673e23741dbf2718624de45;hp=48ab06baf45d8b8d1b0ecc5a9e37bd14946ab358;hpb=e1d86a327945111b99148650dc536c9ad8598cc1;p=i3%2Fi3lock diff --git a/i3lock.c b/i3lock.c index 48ab06b..28a93f0 100644 --- a/i3lock.c +++ b/i3lock.c @@ -1,7 +1,7 @@ /* * vim:ts=4:sw=4:expandtab * - * © 2010-2012 Michael Stapelberg + * © 2010-2013 Michael Stapelberg * * See LICENSE for licensing information * @@ -25,12 +25,8 @@ #include #include #include - - -#ifndef NOLIBCAIRO #include #include -#endif #include "i3lock.h" #include "xcb.h" @@ -62,10 +58,9 @@ static struct xkb_state *xkb_state; static struct xkb_context *xkb_context; static struct xkb_keymap *xkb_keymap; -#ifndef NOLIBCAIRO cairo_surface_t *img = NULL; bool tile = false; -#endif +bool ignore_empty_password = false; /* isutf, u8_dec © 2005 Jeff Bezanson, public domain */ #define isutf(c) (((c) & 0xC0) != 0x80) @@ -78,6 +73,16 @@ void u8_dec(char *s, int *i) { (void)(isutf(s[--(*i)]) || isutf(s[--(*i)]) || isutf(s[--(*i)]) || --(*i)); } +static void turn_monitors_on(void) { + if (dpms) + dpms_set_mode(conn, XCB_DPMS_DPMS_MODE_ON); +} + +static void turn_monitors_off(void) { + if (dpms) + dpms_set_mode(conn, XCB_DPMS_DPMS_MODE_OFF); +} + /* * Loads the XKB keymap from the X11 server and feeds it to xkbcommon. * Necessary so that we can properly let xkbcommon track the keyboard state and @@ -86,6 +91,9 @@ void u8_dec(char *s, int *i) { * Ideally, xkbcommon would ship something like this itself, but as of now * (version 0.2.0), it doesn’t. * + * TODO: Once xcb-xkb is enabled by default and released, we should port this + * code to xcb-xkb. See also https://github.com/xkbcommon/libxkbcommon/issues/1 + * */ static bool load_keymap(void) { bool ret = false; @@ -132,6 +140,16 @@ static bool load_keymap(void) { goto out; } + /* Get the initial modifier state to be in sync with the X server. + * See https://github.com/xkbcommon/libxkbcommon/issues/1 for why we ignore + * the base and latched fields. */ + XkbStateRec state_rec; + XkbGetState(display, XkbUseCoreKbd, &state_rec); + + xkb_state_update_mask(new_state, + 0, 0, state_rec.locked_mods, + 0, 0, state_rec.locked_group); + if (xkb_state != NULL) xkb_state_unref(xkb_state); xkb_state = new_state; @@ -178,10 +196,20 @@ static void clear_pam_wrong(EV_P_ ev_timer *w, int revents) { clear_pam_wrong_timeout = NULL; } -static void input_done(void) { - if (input_position == 0) - return; +static void clear_input(void) { + input_position = 0; + clear_password_memory(); + password[input_position] = '\0'; + + /* Hide the unlock indicator after a bit if the password buffer is + * empty. */ + start_clear_indicator_timeout(); + unlock_state = STATE_BACKSPACE_ACTIVE; + redraw_screen(); + unlock_state = STATE_KEY_PRESSED; +} +static void input_done(void) { if (clear_pam_wrong_timeout) { ev_timer_stop(main_loop, clear_pam_wrong_timeout); free(clear_pam_wrong_timeout); @@ -194,6 +222,9 @@ static void input_done(void) { if (pam_authenticate(pam_handle, 0) == PAM_SUCCESS) { DEBUG("successfully authenticated\n"); clear_password_memory(); + /* Turn the screen on, as it may have been turned off + * on release of the 'enter' key. */ + turn_monitors_on(); exit(0); } @@ -201,6 +232,7 @@ static void input_done(void) { fprintf(stderr, "Authentication failure\n"); pam_state = STATE_PAM_WRONG; + clear_input(); redraw_screen(); /* Clear this state after 2 seconds (unless the user enters another @@ -248,8 +280,10 @@ static void handle_key_press(xcb_key_press_event_t *event) { xkb_keysym_t ksym; char buffer[128]; int n; + bool ctrl; ksym = xkb_state_key_get_one_sym(xkb_state, event->detail); + ctrl = xkb_state_mod_name_is_active(xkb_state, "Control", XKB_STATE_MODS_DEPRESSED); xkb_state_update_key(xkb_state, event->detail, XKB_KEY_DOWN); /* The buffer will be null-terminated, so n >= 2 for 1 actual character. */ @@ -259,19 +293,27 @@ static void handle_key_press(xcb_key_press_event_t *event) { switch (ksym) { case XKB_KEY_Return: case XKB_KEY_KP_Enter: + case XKB_KEY_XF86ScreenSaver: + if (ignore_empty_password && input_position == 0) { + clear_input(); + return; + } password[input_position] = '\0'; + unlock_state = STATE_KEY_PRESSED; + redraw_screen(); input_done(); - case XKB_KEY_Escape: - input_position = 0; - clear_password_memory(); - password[input_position] = '\0'; + return; - /* Hide the unlock indicator after a bit if the password buffer is - * empty. */ - start_clear_indicator_timeout(); - unlock_state = STATE_BACKSPACE_ACTIVE; - redraw_screen(); - unlock_state = STATE_KEY_PRESSED; + case XKB_KEY_u: + if (ctrl) { + DEBUG("C-u pressed\n"); + clear_input(); + return; + } + break; + + case XKB_KEY_Escape: + clear_input(); return; case XKB_KEY_BackSpace: @@ -311,7 +353,7 @@ static void handle_key_press(xcb_key_press_event_t *event) { /* store it in the password array as UTF-8 */ memcpy(password+input_position, buffer, n-1); input_position += n-1; - DEBUG("current password = %s\n", password); + DEBUG("current password = %.*s\n", input_position, password); unlock_state = STATE_KEY_ACTIVE; redraw_screen(); @@ -335,7 +377,8 @@ static void handle_key_press(xcb_key_press_event_t *event) { * hiding us) gets hidden. * */ -static void handle_visibility_notify(xcb_visibility_notify_event_t *event) { +static void handle_visibility_notify(xcb_connection_t *conn, + xcb_visibility_notify_event_t *event) { if (event->state != XCB_VISIBILITY_UNOBSCURED) { uint32_t values[] = { XCB_STACK_MODE_ABOVE }; xcb_configure_window(conn, event->window, XCB_CONFIG_WINDOW_STACK_MODE, values); @@ -377,9 +420,7 @@ void handle_screen_resize(void) { free(geom); -#ifndef NOLIBCAIRO redraw_screen(); -#endif uint32_t mask = XCB_CONFIG_WINDOW_WIDTH | XCB_CONFIG_WINDOW_HEIGHT; xcb_configure_window(conn, win, mask, last_resolution); @@ -468,13 +509,13 @@ static void xcb_check_cb(EV_P_ ev_check *w, int revents) { /* If this was the backspace or escape key we are back at an * empty input, so turn off the screen if DPMS is enabled */ - if (dpms && input_position == 0) - dpms_turn_off_screen(conn); + if (input_position == 0) + turn_monitors_off(); break; case XCB_VISIBILITY_NOTIFY: - handle_visibility_notify((xcb_visibility_notify_event_t*)event); + handle_visibility_notify(conn, (xcb_visibility_notify_event_t*)event); break; case XCB_MAP_NOTIFY: @@ -486,6 +527,8 @@ static void xcb_check_cb(EV_P_ ev_check *w, int revents) { /* In the parent process, we exit */ if (fork() != 0) exit(0); + + ev_loop_fork(EV_DEFAULT); } break; @@ -502,11 +545,66 @@ static void xcb_check_cb(EV_P_ ev_check *w, int revents) { } } +/* + * This function is called from a fork()ed child and will raise the i3lock + * window when the window is obscured, even when the main i3lock process is + * blocked due to PAM. + * + */ +static void raise_loop(xcb_window_t window) { + xcb_connection_t *conn; + xcb_generic_event_t *event; + int screens; + + if ((conn = xcb_connect(NULL, &screens)) == NULL || + xcb_connection_has_error(conn)) + errx(EXIT_FAILURE, "Cannot open display\n"); + + /* We need to know about the window being obscured or getting destroyed. */ + xcb_change_window_attributes(conn, window, XCB_CW_EVENT_MASK, + (uint32_t[]){ + XCB_EVENT_MASK_VISIBILITY_CHANGE | + XCB_EVENT_MASK_STRUCTURE_NOTIFY + }); + xcb_flush(conn); + + DEBUG("Watching window 0x%08x\n", window); + while ((event = xcb_wait_for_event(conn)) != NULL) { + if (event->response_type == 0) { + xcb_generic_error_t *error = (xcb_generic_error_t*)event; + DEBUG("X11 Error received! sequence 0x%x, error_code = %d\n", + error->sequence, error->error_code); + free(event); + continue; + } + /* Strip off the highest bit (set if the event is generated) */ + int type = (event->response_type & 0x7F); + DEBUG("Read event of type %d\n", type); + switch (type) { + case XCB_VISIBILITY_NOTIFY: + handle_visibility_notify(conn, (xcb_visibility_notify_event_t*)event); + break; + case XCB_UNMAP_NOTIFY: + DEBUG("UnmapNotify for 0x%08x\n", (((xcb_unmap_notify_event_t*)event)->window)); + if (((xcb_unmap_notify_event_t*)event)->window == window) + exit(EXIT_SUCCESS); + break; + case XCB_DESTROY_NOTIFY: + DEBUG("DestroyNotify for 0x%08x\n", (((xcb_destroy_notify_event_t*)event)->window)); + if (((xcb_destroy_notify_event_t*)event)->window == window) + exit(EXIT_SUCCESS); + break; + default: + DEBUG("Unhandled event type %d\n", type); + break; + } + free(event); + } +} + int main(int argc, char *argv[]) { char *username; -#ifndef NOLIBCAIRO char *image_path = NULL; -#endif int ret; struct pam_conv conv = {conv_callback, NULL}; int curs_choice = CURS_NONE; @@ -522,21 +620,16 @@ int main(int argc, char *argv[]) { {"debug", no_argument, NULL, 0}, {"help", no_argument, NULL, 'h'}, {"no-unlock-indicator", no_argument, NULL, 'u'}, -#ifndef NOLIBCAIRO {"image", required_argument, NULL, 'i'}, {"tiling", no_argument, NULL, 't'}, -#endif + {"ignore-empty-password", no_argument, NULL, 'e'}, {NULL, no_argument, NULL, 0} }; if ((username = getenv("USER")) == NULL) errx(1, "USER environment variable not set, please set it.\n"); - while ((o = getopt_long(argc, argv, "hvnbdc:p:u" -#ifndef NOLIBCAIRO - "i:t" -#endif - , longopts, &optind)) != -1) { + while ((o = getopt_long(argc, argv, "hvnbdc:p:ui:te", longopts, &optind)) != -1) { switch (o) { case 'v': errx(EXIT_SUCCESS, "version " VERSION " © 2010-2012 Michael Stapelberg"); @@ -557,21 +650,19 @@ int main(int argc, char *argv[]) { arg++; if (strlen(arg) != 6 || sscanf(arg, "%06[0-9a-fA-F]", color) != 1) - errx(1, "color is invalid, color must be given in 6-byte format: rrggbb\n"); + errx(1, "color is invalid, it must be given in 3-byte hexadecimal format: rrggbb\n"); break; } case 'u': unlock_indicator = false; break; -#ifndef NOLIBCAIRO case 'i': image_path = strdup(optarg); break; case 't': tile = true; break; -#endif case 'p': if (!strcmp(optarg, "win")) { curs_choice = CURS_WIN; @@ -581,17 +672,16 @@ int main(int argc, char *argv[]) { errx(1, "i3lock: Invalid pointer type given. Expected one of \"win\" or \"default\".\n"); } break; + case 'e': + ignore_empty_password = true; + break; case 0: if (strcmp(longopts[optind].name, "debug") == 0) debug_mode = true; break; default: errx(1, "Syntax: i3lock [-v] [-n] [-b] [-d] [-c color] [-u] [-p win|default]" -#ifndef NOLIBCAIRO - " [-i image.png] [-t]" -#else - " (compiled with NOLIBCAIRO)" -#endif + " [-i image.png] [-t] [-e]" ); } } @@ -655,18 +745,16 @@ int main(int argc, char *argv[]) { xcb_change_window_attributes(conn, screen->root, XCB_CW_EVENT_MASK, (uint32_t[]){ XCB_EVENT_MASK_STRUCTURE_NOTIFY }); -#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); /* In case loading failed, we just pretend no -i was specified. */ if (cairo_surface_status(img) != CAIRO_STATUS_SUCCESS) { - fprintf(stderr, "Could not load image \"%s\": cairo surface status %d\n", - image_path, cairo_surface_status(img)); + fprintf(stderr, "Could not load image \"%s\": %s\n", + image_path, cairo_status_to_string(cairo_surface_status(img))); img = NULL; } } -#endif /* Pixmap on which the image is rendered to (if any) */ xcb_pixmap_t bg_pixmap = draw_image(last_resolution); @@ -675,12 +763,27 @@ int main(int argc, char *argv[]) { win = open_fullscreen_window(conn, screen, color, bg_pixmap); xcb_free_pixmap(conn, bg_pixmap); + pid_t pid = fork(); + /* The pid == -1 case is intentionally ignored here: + * While the child process is useful for preventing other windows from + * popping up while i3lock blocks, it is not critical. */ + if (pid == 0) { + /* Child */ + close(xcb_get_file_descriptor(conn)); + raise_loop(win); + exit(EXIT_SUCCESS); + } + cursor = create_cursor(conn, screen, win, curs_choice); grab_pointer_and_keyboard(conn, screen, cursor); + /* Load the keymap again to sync the current modifier state. Since we first + * loaded the keymap, there might have been changes, but starting from now, + * we should get all key presses/releases due to having grabbed the + * keyboard. */ + (void)load_keymap(); - if (dpms) - dpms_turn_off_screen(conn); + turn_monitors_off(); /* Initialize the libev event loop. */ main_loop = EV_DEFAULT;