#include <xcb/dpms.h>
#include <xcb/xcb_keysyms.h>
#include <err.h>
-#include <cairo.h>
#include <assert.h>
#include <security/pam_appl.h>
/* FIXME: can we get rid of this header? */
#include <getopt.h>
#include <string.h>
+#ifndef NOLIBCAIRO
+#include <cairo.h>
+#include <cairo/cairo-xcb.h>
+#endif
+
#include "keysym2ucs.h"
#include "ucs2_to_utf8.h"
#include "xcb.h"
+#include "cursors.h"
static xcb_connection_t *conn;
static xcb_key_symbols_t *symbols;
-static cairo_t *ctx = NULL;
+static xcb_screen_t *scr;
static pam_handle_t *pam_handle;
static int input_position = 0;
/* holds the password you enter (in UTF-8) */
static int numlockmask;
static bool beep = false;
+#ifndef NOLIBCAIRO
+static cairo_surface_t *img = NULL;
+static cairo_t *ctx = NULL;
+static bool tile = false;
+#endif
+
static void input_done() {
if (input_position == 0)
return;
*
*/
static void handle_expose_event() {
+#ifndef NOLIBCAIRO
if (!ctx)
return;
- cairo_paint(ctx);
+ 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);
}
*
*/
static void handle_key_release(xcb_key_release_event_t *event) {
- printf("releasing %d, state raw = %d\n", event->detail, event->state);
+ //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);
if (sym == XK_Mode_switch) {
- printf("Mode switch disabled\n");
+ //printf("Mode switch disabled\n");
modeswitch_active = false;
}
}
*
*/
static void handle_key_press(xcb_key_press_event_t *event) {
- printf("keypress %d, state raw = %d\n", event->detail, event->state);
+ //printf("keypress %d, state raw = %d\n", event->detail, event->state);
/* fix state */
if (modeswitch_active)
* keysyms, we remove the numlock flag from the event state */
event->state &= ~numlockmask;
- if ((input_position + 8) >= sizeof(password))
- return;
-
xcb_keysym_t sym = xcb_key_press_lookup_keysym(symbols, event, event->state);
switch (sym) {
case XK_Mode_switch:
- printf("Mode switch enabled\n");
+ //printf("Mode switch enabled\n");
modeswitch_active = true;
return;
/* decrement input_position to point to the previous glyph */
u8_dec(password, &input_position);
password[input_position] = '\0';
- printf("new input position = %d, new password = %s\n", input_position, password);
+ //printf("new input position = %d, new password = %s\n", input_position, password);
return;
}
+ if ((input_position + 8) >= sizeof(password))
+ return;
+
+#if 0
/* FIXME: handle all of these? */
printf("is_keypad_key = %d\n", xcb_is_keypad_key(sym));
printf("is_private_keypad_key = %d\n", xcb_is_private_keypad_key(sym));
printf("xcb_is_function_key = %d\n", xcb_is_function_key(sym));
printf("xcb_is_misc_function_key = %d\n", xcb_is_misc_function_key(sym));
printf("xcb_is_modifier_key = %d\n", xcb_is_modifier_key(sym));
+#endif
if (xcb_is_modifier_key(sym) || xcb_is_cursor_key(sym))
return;
- printf("sym = %c (%d)\n", sym, sym);
+ //printf("sym = %c (%d)\n", sym, sym);
/* convert the keysym to UCS */
uint16_t ucs = keysym2ucs(sym);
/* 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);
+ //printf("current password = %s\n", password);
+}
+
+/*
+ * A visibility notify event will be received when the visibility (= can the
+ * user view the complete window) changes, so for example when a popup overlays
+ * some area of the i3lock window.
+ *
+ * In this case, we raise our window on top so that the popup (or whatever is
+ * 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);
+ 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);
+ }
}
/*
bool dpms = false;
char color[7] = "ffffff";
char *username;
+#ifndef NOLIBCAIRO
char *image_path = NULL;
+#endif
int ret;
struct pam_conv conv = {conv_callback, NULL};
int screen;
- cairo_surface_t *img = NULL;
xcb_visualtype_t *vistype;
xcb_generic_event_t *event;
- xcb_screen_t *scr;
xcb_window_t win;
+ xcb_cursor_t cursor;
+ int curs_choice = CURS_NONE;
char o;
int optind = 0;
struct option longopts[] = {
{"nofork", no_argument, NULL, 'n'},
{"beep", no_argument, NULL, 'b'},
{"dpms", no_argument, NULL, 'd'},
- {"image", required_argument, NULL, 'i'},
{"color", required_argument, NULL, 'c'},
- {"tiling", no_argument, NULL, 't'},
{"pointer", required_argument, NULL , 'p'},
+#ifndef NOLIBCAIRO
+ {"image", required_argument, NULL, 'i'},
+ {"tiling", no_argument, NULL, 't'},
+#endif
{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, "vnbdi:c:tp:", longopts, &optind)) != -1) {
+ while ((o = getopt_long(argc, argv, "vnbdc:p:"
+#ifndef NOLIBCAIRO
+ "i:t"
+#endif
+ , longopts, &optind)) != -1) {
switch (o) {
case 'v':
- errx(EXIT_SUCCESS, "i3lock © 2010 Michael Stapelberg\n");
+ errx(EXIT_SUCCESS, "version " VERSION " © 2010 Michael Stapelberg\n");
case 'n':
dont_fork = true;
break;
case 'd':
dpms = true;
break;
- case 'i':
- image_path = strdup(optarg);
- break;
case 'c': {
char *arg = optarg;
break;
}
+#ifndef NOLIBCAIRO
+ case 'i':
+ image_path = strdup(optarg);
+ break;
case 't':
- /* TODO: tile image */
+ tile = true;
break;
+#endif
case 'p':
- /* TODO: cursor */
+ if (!strcmp(optarg, "win")) {
+ curs_choice = CURS_WIN;
+ }
+ if (!strcmp(optarg, "default")) {
+ curs_choice = CURS_DEFAULT;
+ }
break;
default:
- errx(1, "i3lock: Unknown option. Syntax: i3lock [-v] [-n] [-b] [-d] [-i image.png] [-c color] [-t] [-p win|default]\n");
+ errx(1, "i3lock: Unknown option. Syntax: i3lock [-v] [-n] [-b] [-d] [-c color] [-p win|default]"
+#ifndef NOLIBCAIRO
+ " [-i image.png] [-t]"
+#else
+ " (compiled with NOLIBCAIRO)"
+#endif
+ "\n");
}
}
* ready to handle the expose event immediately afterwards) */
win = open_fullscreen_window(conn, scr, color);
- grab_pointer_and_keyboard(conn, scr);
+ cursor = create_cursor(conn, scr, win, curs_choice);
- if (image_path)
- img = cairo_image_surface_create_from_png(image_path);
+ grab_pointer_and_keyboard(conn, scr, cursor);
symbols = xcb_key_symbols_alloc(conn);
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);
- /* TODO: tiling of the image */
ctx = cairo_create(output);
- cairo_set_source_surface(ctx, img, 0, 0);
+ if (!tile)
+ cairo_set_source_surface(ctx, img, 0, 0);
handle_expose_event();
}
+#endif
if (dpms)
dpms_turn_off_screen(conn);
while ((event = xcb_wait_for_event(conn))) {
- int type = x_event_type(event);
+ if (event->response_type == 0)
+ errx(1, "XCB: Invalid event received");
+
+ /* 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_VISIBILITY_NOTIFY) {
+ handle_visibility_notify((xcb_visibility_notify_event_t*)event);
+ continue;
+ }
+
printf("WARNING: unhandled event of type %d\n", type);
}
projects / i3 / i3lock / blobdiff