X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=i3lock.c;h=52fd5bb80eba4f0001dc0f29de132c1a09fa9eb7;hb=a395006844adbd538c0ab0f201fc956b0e7d7bc6;hp=208e4acba4ae5533d37b7bf7d5371ccef248923c;hpb=14667d8304382bb766ddbab5c58c2c81bfe16b6c;p=i3%2Fi3lock diff --git a/i3lock.c b/i3lock.c index 208e4ac..52fd5bb 100644 --- a/i3lock.c +++ b/i3lock.c @@ -6,6 +6,8 @@ * See LICENSE for licensing information * */ +#include + #include #include #include @@ -17,6 +19,7 @@ #include #include #include +#include #include #ifdef __OpenBSD__ #include @@ -35,12 +38,20 @@ #ifdef __OpenBSD__ #include /* explicit_bzero(3) */ #endif +#include +#include +#if defined(__linux__) +#include +#include +#include +#endif #include "i3lock.h" #include "xcb.h" #include "cursors.h" #include "unlock_indicator.h" -#include "xinerama.h" +#include "randr.h" +#include "dpi.h" #define TSTAMP_N_SECS(n) (n * 1.0) #define TSTAMP_N_MINS(n) (60 * TSTAMP_N_SECS(n)) @@ -84,6 +95,7 @@ static struct xkb_compose_table *xkb_compose_table; static struct xkb_compose_state *xkb_compose_state; static uint8_t xkb_base_event; static uint8_t xkb_base_error; +static int randr_base = -1; cairo_surface_t *img = NULL; bool tile = false; @@ -175,7 +187,7 @@ 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; - for (int c = 0; c < sizeof(password); c++) + for (size_t c = 0; c < sizeof(password); c++) /* We store a non-random pattern which consists of the (irrelevant) * index plus (!) the value of the beep variable. This prevents the * compiler from optimizing the calls away, since the value of 'beep' @@ -278,7 +290,8 @@ static void input_done(void) { DEBUG("successfully authenticated\n"); clear_password_memory(); - exit(0); + ev_break(EV_DEFAULT, EVBREAK_ALL); + return; } #else if (pam_authenticate(pam_handle, 0) == PAM_SUCCESS) { @@ -292,7 +305,8 @@ static void input_done(void) { pam_setcred(pam_handle, PAM_REFRESH_CRED); pam_end(pam_handle, PAM_SUCCESS); - exit(0); + ev_break(EV_DEFAULT, EVBREAK_ALL); + return; } #endif @@ -436,6 +450,12 @@ static void handle_key_press(xcb_key_press_event_t *event) { return; default: skip_repeated_empty_password = false; + // A new password is being entered, but a previous one is pending. + // Discard the old one and clear the retry_verification flag. + if (retry_verification) { + retry_verification = false; + clear_input(); + } } switch (ksym) { @@ -445,14 +465,9 @@ static void handle_key_press(xcb_key_press_event_t *event) { ksym == XKB_KEY_Escape) { DEBUG("C-u pressed\n"); clear_input(); - /* Hide the unlock indicator after a bit if the password buffer is - * empty. */ - if (unlock_indicator) { - START_TIMER(clear_indicator_timeout, 1.0, clear_indicator_cb); - unlock_state = STATE_BACKSPACE_ACTIVE; - redraw_screen(); - unlock_state = STATE_KEY_PRESSED; - } + /* Also hide the unlock indicator */ + if (unlock_indicator) + clear_indicator(); return; } break; @@ -470,8 +485,12 @@ static void handle_key_press(xcb_key_press_event_t *event) { if (ksym == XKB_KEY_h && !ctrl) break; - if (input_position == 0) + if (input_position == 0) { + START_TIMER(clear_indicator_timeout, 1.0, clear_indicator_cb); + unlock_state = STATE_NOTHING_TO_DELETE; + redraw_screen(); return; + } /* decrement input_position to point to the previous glyph */ u8_dec(password, &input_position); @@ -486,7 +505,7 @@ static void handle_key_press(xcb_key_press_event_t *event) { return; } - if ((input_position + 8) >= sizeof(password)) + if ((input_position + 8) >= (int)sizeof(password)) return; #if 0 @@ -622,10 +641,40 @@ void handle_screen_resize(void) { xcb_configure_window(conn, win, mask, last_resolution); xcb_flush(conn); - xinerama_query_screens(); + randr_query(screen->root); redraw_screen(); } +static bool verify_png_image(const char *image_path) { + if (!image_path) { + return false; + } + + /* Check file exists and has correct PNG header */ + FILE *png_file = fopen(image_path, "r"); + if (png_file == NULL) { + fprintf(stderr, "Image file path \"%s\" cannot be opened: %s\n", image_path, strerror(errno)); + return false; + } + unsigned char png_header[8]; + memset(png_header, '\0', sizeof(png_header)); + int bytes_read = fread(png_header, 1, sizeof(png_header), png_file); + fclose(png_file); + if (bytes_read != sizeof(png_header)) { + fprintf(stderr, "Could not read PNG header from \"%s\"\n", image_path); + return false; + } + + // Check PNG header according to the specification, available at: + // https://www.w3.org/TR/2003/REC-PNG-20031110/#5PNG-file-signature + static unsigned char PNG_REFERENCE_HEADER[8] = {137, 80, 78, 71, 13, 10, 26, 10}; + if (memcmp(PNG_REFERENCE_HEADER, png_header, sizeof(png_header)) != 0) { + fprintf(stderr, "File \"%s\" does not start with a PNG header. i3lock currently only supports loading PNG files.\n", image_path); + return false; + } + return true; +} + #ifndef __OpenBSD__ /* * Callback function for PAM. We only react on password request callbacks. @@ -701,7 +750,7 @@ static void xcb_check_cb(EV_P_ ev_check *w, int revents) { xcb_generic_event_t *event; if (xcb_connection_has_error(conn)) - errx(EXIT_FAILURE, "X11 connection broke, did your server terminate?\n"); + errx(EXIT_FAILURE, "X11 connection broke, did your server terminate?"); while ((event = xcb_poll_for_event(conn)) != NULL) { if (event->response_type == 0) { @@ -745,8 +794,14 @@ static void xcb_check_cb(EV_P_ ev_check *w, int revents) { break; default: - if (type == xkb_base_event) + if (type == xkb_base_event) { process_xkb_event(event); + } + if (randr_base > -1 && + type == randr_base + XCB_RANDR_SCREEN_CHANGE_NOTIFY) { + randr_query(screen->root); + handle_screen_resize(); + } } free(event); @@ -764,9 +819,8 @@ static void raise_loop(xcb_window_t window) { 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"); + if (xcb_connection_has_error((conn = xcb_connect(NULL, &screens))) > 0) + errx(EXIT_FAILURE, "Cannot open display"); /* We need to know about the window being obscured or getting destroyed. */ xcb_change_window_attributes(conn, window, XCB_CW_EVENT_MASK, @@ -817,9 +871,14 @@ int main(int argc, char *argv[]) { int ret; struct pam_conv conv = {conv_callback, NULL}; #endif +#if defined(__linux__) + bool lock_tty_switching = false; + int term = -1; +#endif + int curs_choice = CURS_NONE; int o; - int optind = 0; + int longoptind = 0; struct option longopts[] = { {"version", no_argument, NULL, 'v'}, {"nofork", no_argument, NULL, 'n'}, @@ -835,18 +894,19 @@ int main(int argc, char *argv[]) { {"ignore-empty-password", no_argument, NULL, 'e'}, {"inactivity-timeout", required_argument, NULL, 'I'}, {"show-failed-attempts", no_argument, NULL, 'f'}, + {"lock-console", no_argument, NULL, 'l'}, {NULL, no_argument, NULL, 0}}; if ((pw = getpwuid(getuid())) == NULL) err(EXIT_FAILURE, "getpwuid() failed"); if ((username = pw->pw_name) == NULL) - errx(EXIT_FAILURE, "pw->pw_name is NULL.\n"); + errx(EXIT_FAILURE, "pw->pw_name is NULL."); - char *optstring = "hvnbdc:p:ui:teI:f"; - while ((o = getopt_long(argc, argv, optstring, longopts, &optind)) != -1) { + char *optstring = "hvnbdc:p:ui:teI:fl"; + while ((o = getopt_long(argc, argv, optstring, longopts, &longoptind)) != -1) { switch (o) { case 'v': - errx(EXIT_SUCCESS, "version " VERSION " © 2010 Michael Stapelberg"); + errx(EXIT_SUCCESS, "version " I3LOCK_VERSION " © 2010 Michael Stapelberg"); case 'n': dont_fork = true; break; @@ -868,7 +928,7 @@ int main(int argc, char *argv[]) { arg++; if (strlen(arg) != 6 || sscanf(arg, "%06[0-9a-fA-F]", color) != 1) - errx(EXIT_FAILURE, "color is invalid, it must be given in 3-byte hexadecimal format: rrggbb\n"); + errx(EXIT_FAILURE, "color is invalid, it must be given in 3-byte hexadecimal format: rrggbb"); break; } @@ -887,22 +947,29 @@ int main(int argc, char *argv[]) { } else if (!strcmp(optarg, "default")) { curs_choice = CURS_DEFAULT; } else { - errx(EXIT_FAILURE, "i3lock: Invalid pointer type given. Expected one of \"win\" or \"default\".\n"); + errx(EXIT_FAILURE, "i3lock: Invalid pointer type given. Expected one of \"win\" or \"default\"."); } break; case 'e': ignore_empty_password = true; break; case 0: - if (strcmp(longopts[optind].name, "debug") == 0) + if (strcmp(longopts[longoptind].name, "debug") == 0) debug_mode = true; break; case 'f': show_failed_attempts = true; break; + case 'l': +#if defined(__linux__) + lock_tty_switching = true; +#else + errx(EXIT_FAILURE, "TTY switch locking is only supported on Linux."); +#endif + break; default: errx(EXIT_FAILURE, "Syntax: i3lock [-v] [-n] [-b] [-d] [-c color] [-u] [-p win|default]" - " [-i image.png] [-t] [-e] [-I timeout] [-f]"); + " [-i image.png] [-t] [-e] [-I timeout] [-f] [-l]"); } } @@ -989,18 +1056,20 @@ int main(int argc, char *argv[]) { load_compose_table(locale); - xinerama_init(); - xinerama_query_screens(); - screen = xcb_setup_roots_iterator(xcb_get_setup(conn)).data; + init_dpi(); + + randr_init(&randr_base, screen->root); + randr_query(screen->root); + 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}); - if (image_path) { + if (verify_png_image(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. */ @@ -1009,12 +1078,14 @@ int main(int argc, char *argv[]) { image_path, cairo_status_to_string(cairo_surface_status(img))); img = NULL; } - free(image_path); } + free(image_path); /* Pixmap on which the image is rendered to (if any) */ xcb_pixmap_t bg_pixmap = draw_image(last_resolution); + xcb_window_t stolen_focus = find_focused_window(conn, screen->root); + /* Open the fullscreen window, already with the correct pixmap in place */ win = open_fullscreen_window(conn, screen, color, bg_pixmap); xcb_free_pixmap(conn, bg_pixmap); @@ -1023,7 +1094,23 @@ int main(int argc, char *argv[]) { /* Display the "locking…" message while trying to grab the pointer/keyboard. */ auth_state = STATE_AUTH_LOCK; - grab_pointer_and_keyboard(conn, screen, cursor); + if (!grab_pointer_and_keyboard(conn, screen, cursor, 1000)) { + DEBUG("stole focus from X11 window 0x%08x\n", stolen_focus); + + /* Set the focus to i3lock, possibly closing context menus which would + * otherwise prevent us from grabbing keyboard/pointer. + * + * We cannot use set_focused_window because _NET_ACTIVE_WINDOW only + * works for managed windows, but i3lock uses an unmanaged window + * (override_redirect=1). */ + xcb_set_input_focus(conn, XCB_INPUT_FOCUS_PARENT /* revert_to */, win, XCB_CURRENT_TIME); + if (!grab_pointer_and_keyboard(conn, screen, cursor, 9000)) { + auth_state = STATE_I3LOCK_LOCK_FAILED; + redraw_screen(); + sleep(1); + errx(EXIT_FAILURE, "Cannot grab pointer/keyboard"); + } + } pid_t pid = fork(); /* The pid == -1 case is intentionally ignored here: @@ -1046,7 +1133,22 @@ int main(int argc, char *argv[]) { /* Initialize the libev event loop. */ main_loop = EV_DEFAULT; if (main_loop == NULL) - errx(EXIT_FAILURE, "Could not initialize libev. Bad LIBEV_FLAGS?\n"); + errx(EXIT_FAILURE, "Could not initialize libev. Bad LIBEV_FLAGS?"); + +#if defined(__linux__) + + /* Lock tty switching */ + if (lock_tty_switching) { + if ((term = open("/dev/console", O_RDWR)) == -1) { + perror("error locking TTY switching: opening console failed"); + } + + if (term != -1 && (ioctl(term, VT_LOCKSWITCH)) == -1) { + perror("error locking TTY switching: locking console failed"); + } + } + +#endif /* Explicitly call the screen redraw in case "locking…" message was displayed */ auth_state = STATE_AUTH_IDLE; @@ -1070,4 +1172,29 @@ int main(int argc, char *argv[]) { * file descriptor becomes readable). */ ev_invoke(main_loop, xcb_check, 0); ev_loop(main_loop, 0); + + if (stolen_focus == XCB_NONE) { + return 0; + } + +#if defined(__linux__) + /* Restore tty switching */ + if (lock_tty_switching) { + if (term != -1 && (ioctl(term, VT_UNLOCKSWITCH)) == -1) { + perror("error unlocking TTY switching: unlocking console failed"); + } + + close(term); + } + +#endif + + DEBUG("restoring focus to X11 window 0x%08x\n", stolen_focus); + xcb_ungrab_pointer(conn, XCB_CURRENT_TIME); + xcb_ungrab_keyboard(conn, XCB_CURRENT_TIME); + xcb_destroy_window(conn, win); + set_focused_window(conn, screen->root, stolen_focus); + xcb_aux_sync(conn); + + return 0; }