#include <xcb/xcb.h>
#include <xcb/xkb.h>
#include <err.h>
+#include <errno.h>
#include <assert.h>
#ifdef __OpenBSD__
#include <bsd_auth.h>
#endif
#include <xcb/xcb_aux.h>
#include <xcb/randr.h>
+#if defined(__linux__)
+#include <fcntl.h>
+#include <linux/vt.h>
+#include <sys/ioctl.h>
+#endif
#include "i3lock.h"
#include "xcb.h"
#include "cursors.h"
#include "unlock_indicator.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))
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) {
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);
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.
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) {
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,
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 longoptind = 0;
{"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";
+ char *optstring = "hvnbdc:p:ui:teI:fl";
while ((o = getopt_long(argc, argv, optstring, longopts, &longoptind)) != -1) {
switch (o) {
case 'v':
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;
}
} 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':
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]");
}
}
screen = xcb_setup_roots_iterator(xcb_get_setup(conn)).data;
+ init_dpi();
+
randr_init(&randr_base, screen->root);
randr_query(screen->root);
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. */
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);
/* 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;
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);
projects / i3 / i3lock / blobdiff