X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=i3lock.c;h=28a93f081e1312dc874833bff04318bdcc4c2f84;hb=d91fdc368e4e119f4673e23741dbf2718624de45;hp=b694f6e884771163839c7640529bfe3cd6c9b826;hpb=6ea3fbdc213e7b9503cc6645e6fbc56c305166b9;p=i3%2Fi3lock diff --git a/i3lock.c b/i3lock.c index b694f6e..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 * @@ -14,70 +14,159 @@ #include #include #include -#include #include #include #include -/* FIXME: can we get rid of this header? */ -#include +#include #include #include #include #include - - -#ifndef NOLIBCAIRO +#include +#include +#include #include #include -#endif -#include "keysym2ucs.h" -#include "ucs2_to_utf8.h" +#include "i3lock.h" #include "xcb.h" #include "cursors.h" #include "unlock_indicator.h" +#include "xinerama.h" +/* We need this for libxkbfile */ +static Display *display; char color[7] = "ffffff"; uint32_t last_resolution[2]; xcb_window_t win; static xcb_cursor_t cursor; -static xcb_key_symbols_t *symbols; static pam_handle_t *pam_handle; -static int input_position = 0; +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 bool iso_level5_shift_active = false; -static int modeswitchmask; -static int numlockmask; static bool beep = false; -static bool debug_mode = false; +bool debug_mode = false; static bool dpms = false; bool unlock_indicator = true; static bool dont_fork = false; -static struct ev_loop *main_loop; +struct ev_loop *main_loop; static struct ev_timer *clear_pam_wrong_timeout; -static struct ev_timer *clear_indicator_timeout; extern unlock_state_t unlock_state; extern pam_state_t pam_state; -#define DEBUG(fmt, ...) do { \ - if (debug_mode) \ - printf("[i3lock-debug] " fmt, ##__VA_ARGS__); \ -} while (0) +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) + +/* + * Decrements i to point to the previous unicode glyph + * + */ +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 + * translate keypresses to utf-8. + * + * 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; + XkbFileInfo result; + memset(&result, '\0', sizeof(result)); + result.xkb = XkbGetKeyboard(display, XkbAllMapComponentsMask, XkbUseCoreKbd); + if (result.xkb == NULL) { + fprintf(stderr, "[i3lock] XKB: XkbGetKeyboard failed\n"); + return false; + } + + FILE *temp = tmpfile(); + if (temp == NULL) { + fprintf(stderr, "[i3lock] could not create tempfile\n"); + return false; + } + + bool ok = XkbWriteXKBKeymap(temp, &result, false, false, NULL, NULL); + if (!ok) { + fprintf(stderr, "[i3lock] XkbWriteXKBKeymap failed\n"); + goto out; + } + + rewind(temp); + + if (xkb_context == NULL) { + if ((xkb_context = xkb_context_new(0)) == NULL) { + fprintf(stderr, "[i3lock] could not create xkbcommon context\n"); + goto out; + } + } + + if (xkb_keymap != NULL) + xkb_keymap_unref(xkb_keymap); + + if ((xkb_keymap = xkb_keymap_new_from_file(xkb_context, temp, XKB_KEYMAP_FORMAT_TEXT_V1, 0)) == NULL) { + fprintf(stderr, "[i3lock] xkb_keymap_new_from_file failed\n"); + goto out; + } + + struct xkb_state *new_state = xkb_state_new(xkb_keymap); + if (new_state == NULL) { + fprintf(stderr, "[i3lock] xkb_state_new failed\n"); + 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; + + ret = true; +out: + XkbFreeKeyboard(result.xkb, XkbAllComponentsMask, true); + fclose(temp); + return ret; +} /* * Clears the memory which stored the password to be a bit safer against * cold-boot attacks. * */ -static void clear_password_memory() { +static void clear_password_memory(void) { /* A volatile pointer to the password buffer to prevent the compiler from * optimizing this out. */ volatile char *vpassword = password; @@ -100,44 +189,30 @@ static void clear_pam_wrong(EV_P_ ev_timer *w, int revents) { pam_state = STATE_PAM_IDLE; unlock_state = STATE_STARTED; redraw_screen(); -} -/* - * Hides the unlock indicator completely when there is no content in the - * password buffer. - * - */ -static void clear_indicator(EV_P_ ev_timer *w, int revents) { - if (input_position == 0) { - DEBUG("Clear indicator\n"); - unlock_state = STATE_STARTED; - } else unlock_state = STATE_KEY_PRESSED; - redraw_screen(); + /* Now free this timeout. */ + ev_timer_stop(main_loop, clear_pam_wrong_timeout); + free(clear_pam_wrong_timeout); + clear_pam_wrong_timeout = NULL; } -/* - * (Re-)starts the clear_indicator timeout. Called after pressing backspace or - * after an unsuccessful authentication attempt. - * - */ -static void start_clear_indicator_timeout() { - if (clear_indicator_timeout) { - ev_timer_stop(main_loop, clear_indicator_timeout); - ev_timer_set(clear_indicator_timeout, 1.0, 0.); - ev_timer_start(main_loop, clear_indicator_timeout); - } else { - clear_indicator_timeout = calloc(sizeof(struct ev_timer), 1); - ev_timer_init(clear_indicator_timeout, clear_indicator, 1.0, 0.); - ev_timer_start(main_loop, clear_indicator_timeout); - } -} +static void clear_input(void) { + input_position = 0; + clear_password_memory(); + password[input_position] = '\0'; -static void input_done() { - if (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; +} +static void input_done(void) { if (clear_pam_wrong_timeout) { ev_timer_stop(main_loop, clear_pam_wrong_timeout); + free(clear_pam_wrong_timeout); clear_pam_wrong_timeout = NULL; } @@ -145,29 +220,32 @@ static void input_done() { redraw_screen(); if (pam_authenticate(pam_handle, 0) == PAM_SUCCESS) { - printf("successfully authenticated\n"); + 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); } - fprintf(stderr, "Authentication failure\n"); + if (debug_mode) + 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 * password during that time). */ ev_now_update(main_loop); - clear_pam_wrong_timeout = calloc(sizeof(struct ev_timer), 1); - ev_timer_init(clear_pam_wrong_timeout, clear_pam_wrong, 2.0, 0.); - ev_timer_start(main_loop, clear_pam_wrong_timeout); + if ((clear_pam_wrong_timeout = calloc(sizeof(struct ev_timer), 1))) { + ev_timer_init(clear_pam_wrong_timeout, clear_pam_wrong, 2.0, 0.); + ev_timer_start(main_loop, clear_pam_wrong_timeout); + } /* Cancel the clear_indicator_timeout, it would hide the unlock indicator * too early. */ - if (clear_indicator_timeout) { - ev_timer_stop(main_loop, clear_indicator_timeout); - clear_indicator_timeout = NULL; - } + stop_clear_indicator_timeout(); /* beep on authentication failure, if enabled */ if (beep) { @@ -182,28 +260,14 @@ static void input_done() { * */ static void handle_key_release(xcb_key_release_event_t *event) { - DEBUG("releasing key %d, state raw = %d, modeswitch_active = %d, iso_level3_shift_active = %d, iso_level5_shift_active = %d\n", - event->detail, event->state, modeswitch_active, iso_level3_shift_active, iso_level5_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; - } else if (sym == XK_ISO_Level5_Shift) { - iso_level5_shift_active = false; - } - DEBUG("release done. modeswitch_active = %d, iso_level3_shift_active = %d, iso_level5_shift_active = %d\n", - modeswitch_active, iso_level3_shift_active, iso_level5_shift_active); + xkb_state_update_key(xkb_state, event->detail, XKB_KEY_UP); } static void redraw_timeout(EV_P_ ev_timer *w, int revents) { redraw_screen(); + + ev_timer_stop(main_loop, w); + free(w); } /* @@ -213,73 +277,46 @@ static void redraw_timeout(EV_P_ ev_timer *w, int revents) { * */ static void handle_key_press(xcb_key_press_event_t *event) { - 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; - /* 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; - if (iso_level5_shift_active) - base_column = 6; - 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: - 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_ISO_Level5_Shift: - DEBUG("ISO_Level5_Shift enabled\n"); - iso_level5_shift_active = true; - return; - case XK_Return: - case XK_KP_Enter: - input_done(); - case XK_Escape: - input_position = 0; - clear_password_memory(); + 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. */ + memset(buffer, '\0', sizeof(buffer)); + n = xkb_keysym_to_utf8(ksym, buffer, sizeof(buffer)); + + 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(); + return; + + case XKB_KEY_u: + if (ctrl) { + DEBUG("C-u pressed\n"); + clear_input(); + return; + } + break; + + case XKB_KEY_Escape: + clear_input(); return; - case XK_BackSpace: + case XKB_KEY_BackSpace: if (input_position == 0) return; @@ -287,30 +324,18 @@ static void handle_key_press(xcb_key_press_event_t *event) { u8_dec(password, &input_position); password[input_position] = '\0'; - /* Clear this state after 2 seconds (unless the user enters another - * password during that time). */ + /* 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; - //printf("new input position = %d, new password = %s\n", input_position, password); return; } if ((input_position + 8) >= sizeof(password)) return; - if ((event->state & numlockmask) && xcb_is_keypad_key(sym1)) { - /* this key was a keypad key */ - if ((event->state & XCB_MOD_MASK_SHIFT)) - sym = sym0; - else sym = sym1; - } else { - if ((event->state & XCB_MOD_MASK_SHIFT)) - sym = sym1; - else sym = sym0; - } - #if 0 /* FIXME: handle all of these? */ printf("is_keypad_key = %d\n", xcb_is_keypad_key(sym)); @@ -322,39 +347,25 @@ static void handle_key_press(xcb_key_press_event_t *event) { printf("xcb_is_modifier_key = %d\n", xcb_is_modifier_key(sym)); #endif - if (xcb_is_modifier_key(sym) || xcb_is_cursor_key(sym)) + if (n < 2) return; - 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; - } - - /* 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'; - DEBUG("current password = %s\n", password); + memcpy(password+input_position, buffer, n-1); + input_position += n-1; + DEBUG("current password = %.*s\n", input_position, password); unlock_state = STATE_KEY_ACTIVE; redraw_screen(); unlock_state = STATE_KEY_PRESSED; struct ev_timer *timeout = calloc(sizeof(struct ev_timer), 1); - ev_timer_init(timeout, redraw_timeout, 0.25, 0.); - ev_timer_start(main_loop, timeout); - - if (clear_indicator_timeout) { - ev_timer_stop(main_loop, clear_indicator_timeout); - clear_indicator_timeout = NULL; + if (timeout) { + ev_timer_init(timeout, redraw_timeout, 0.25, 0.); + ev_timer_start(main_loop, timeout); } + + stop_clear_indicator_timeout(); } /* @@ -366,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); @@ -379,10 +391,9 @@ static void handle_visibility_notify(xcb_visibility_notify_event_t *event) { * */ static void handle_mapping_notify(xcb_mapping_notify_event_t *event) { - xcb_refresh_keyboard_mapping(symbols, event); - - modeswitchmask = get_mod_mask(conn, symbols, XK_Mode_switch); - numlockmask = get_mod_mask(conn, symbols, XK_Num_Lock); + /* We ignore errors — if the new keymap cannot be loaded it’s better if the + * screen stays locked and the user intervenes by using killall i3lock. */ + (void)load_keymap(); } /* @@ -391,7 +402,7 @@ static void handle_mapping_notify(xcb_mapping_notify_event_t *event) { * and also redraw the image, if any. * */ -void handle_screen_resize() { +void handle_screen_resize(void) { xcb_get_geometry_cookie_t geomc; xcb_get_geometry_reply_t *geom; geomc = xcb_get_geometry(conn, screen->root); @@ -409,13 +420,14 @@ void handle_screen_resize() { 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); xcb_flush(conn); + + xinerama_query_screens(); + redraw_screen(); } /* @@ -429,7 +441,7 @@ static int conv_callback(int num_msg, const struct pam_message **msg, return 1; /* PAM expects an array of responses, one for each message */ - if ((*resp = calloc(num_msg, sizeof(struct pam_message))) == NULL) { + if ((*resp = calloc(num_msg, sizeof(struct pam_response))) == NULL) { perror("calloc"); return 1; } @@ -478,75 +490,125 @@ static void xcb_check_cb(EV_P_ ev_check *w, int revents) { while ((event = xcb_poll_for_event(conn)) != NULL) { if (event->response_type == 0) { xcb_generic_error_t *error = (xcb_generic_error_t*)event; - fprintf(stderr, "X11 Error received! sequence 0x%x, error_code = %d\n", - error->sequence, error->error_code); + if (debug_mode) + fprintf(stderr, "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); - - if (type == XCB_KEY_PRESS) { - handle_key_press((xcb_key_press_event_t*)event); - continue; + switch (type) { + case XCB_KEY_PRESS: + handle_key_press((xcb_key_press_event_t*)event); + break; + + case XCB_KEY_RELEASE: + handle_key_release((xcb_key_release_event_t*)event); + + /* 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 (input_position == 0) + turn_monitors_off(); + + break; + + case XCB_VISIBILITY_NOTIFY: + handle_visibility_notify(conn, (xcb_visibility_notify_event_t*)event); + break; + + case XCB_MAP_NOTIFY: + if (!dont_fork) { + /* After the first MapNotify, we never fork again. We don’t + * expect to get another MapNotify, but better be sure… */ + dont_fork = true; + + /* In the parent process, we exit */ + if (fork() != 0) + exit(0); + + ev_loop_fork(EV_DEFAULT); + } + break; + + case XCB_MAPPING_NOTIFY: + handle_mapping_notify((xcb_mapping_notify_event_t*)event); + break; + + case XCB_CONFIGURE_NOTIFY: + handle_screen_resize(); + break; } - if (type == XCB_KEY_RELEASE) { - handle_key_release((xcb_key_release_event_t*)event); - - /* 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); - - continue; - } - - if (type == XCB_VISIBILITY_NOTIFY) { - handle_visibility_notify((xcb_visibility_notify_event_t*)event); - continue; - } + free(event); + } +} - if (type == XCB_MAP_NOTIFY) { - if (!dont_fork) { - /* After the first MapNotify, we never fork again. We don’t - * expect to get another MapNotify, but better be sure… */ - dont_fork = true; +/* + * 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; - /* In the parent process, we exit */ - if (fork() != 0) - exit(0); - } - continue; - } + 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); - if (type == XCB_MAPPING_NOTIFY) { - handle_mapping_notify((xcb_mapping_notify_event_t*)event); + 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; } - - if (type == XCB_CONFIGURE_NOTIFY) { - handle_screen_resize(); - 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; } - - printf("WARNING: unhandled event of type %d\n", type); - 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 nscreen; int curs_choice = CURS_NONE; - char o; + int o; int optind = 0; struct option longopts[] = { {"version", no_argument, NULL, 'v'}, @@ -558,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"); @@ -593,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; @@ -617,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]" ); } } @@ -641,24 +695,45 @@ int main(int argc, char *argv[]) { if (ret != PAM_SUCCESS) errx(EXIT_FAILURE, "PAM: %s", pam_strerror(pam_handle, ret)); +/* Using mlock() as non-super-user seems only possible in Linux. Users of other + * operating systems should use encrypted swap/no swap (or remove the ifdef and + * run i3lock as super-user). */ +#if defined(__linux__) /* Lock the area where we store the password in memory, we don’t want it to * be swapped to disk. Since Linux 2.6.9, this does not require any * privileges, just enough bytes in the RLIMIT_MEMLOCK limit. */ if (mlock(password, sizeof(password)) != 0) err(EXIT_FAILURE, "Could not lock page in memory, check RLIMIT_MEMLOCK"); +#endif /* Initialize connection to X11 */ - if ((conn = xcb_connect(NULL, &nscreen)) == NULL || - xcb_connection_has_error(conn)) + if ((display = XOpenDisplay(NULL)) == NULL) errx(EXIT_FAILURE, "Could not connect to X11, maybe you need to set DISPLAY?"); + XSetEventQueueOwner(display, XCBOwnsEventQueue); + conn = XGetXCBConnection(display); + + /* Double checking that connection is good and operatable with xcb */ + if (xcb_connection_has_error(conn)) + errx(EXIT_FAILURE, "Could not connect to X11, maybe you need to set DISPLAY?"); + + /* When we cannot initially load the keymap, we better exit */ + if (!load_keymap()) + errx(EXIT_FAILURE, "Could not load keymap"); + + xinerama_init(); + xinerama_query_screens(); /* if DPMS is enabled, check if the X server really supports it */ if (dpms) { xcb_dpms_capable_cookie_t dpmsc = xcb_dpms_capable(conn); xcb_dpms_capable_reply_t *dpmsr; - if ((dpmsr = xcb_dpms_capable_reply(conn, dpmsc, NULL)) && !dpmsr->capable) { - fprintf(stderr, "Disabling DPMS, X server not DPMS capable\n"); - dpms = false; + if ((dpmsr = xcb_dpms_capable_reply(conn, dpmsc, NULL))) { + if (!dpmsr->capable) { + if (debug_mode) + fprintf(stderr, "Disabling DPMS, X server not DPMS capable\n"); + dpms = false; + } + free(dpmsr); } } @@ -667,13 +742,19 @@ int main(int argc, char *argv[]) { last_resolution[0] = screen->width_in_pixels; last_resolution[1] = screen->height_in_pixels; + 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\": %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); @@ -682,16 +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(); - symbols = xcb_key_symbols_alloc(conn); - modeswitchmask = get_mod_mask(conn, symbols, XK_Mode_switch); - numlockmask = get_mod_mask(conn, symbols, XK_Num_Lock); - - if (dpms) - dpms_turn_off_screen(conn); + turn_monitors_off(); /* Initialize the libev event loop. */ main_loop = EV_DEFAULT; @@ -711,6 +803,9 @@ int main(int argc, char *argv[]) { ev_prepare_init(xcb_prepare, xcb_prepare_cb); ev_prepare_start(main_loop, xcb_prepare); - xcb_flush(conn); + /* Invoke the event callback once to catch all the events which were + * received up until now. ev will only pick up new events (when the X11 + * file descriptor becomes readable). */ + ev_invoke(main_loop, xcb_check, 0); ev_loop(main_loop, 0); }