print version number when invoked with -v

[i3/i3lock] / i3lock.c

diff --git a/i3lock.c b/i3lock.c
index 6e45c596bff8b4dd72dda29bedd6f0317cccb70a..d1add207cf8d3efde9bd1303e5e16fec333d20ec 100644 (file)
--- a/i3lock.c
+++ b/i3lock.c
@@ -17,6 +17,7 @@
 #include <xcb/xcb_keysyms.h>
 #include <err.h>
 #include <cairo.h>
+#include <cairo/cairo-xcb.h>
 #include <assert.h>
 #include <security/pam_appl.h>
 /* FIXME: can we get rid of this header? */
@@ -27,10 +28,13 @@
 #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_surface_t *img = NULL;
 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) */
@@ -39,6 +43,7 @@ static bool modeswitch_active = false;
 static int modeswitchmask;
 static int numlockmask;
 static bool beep = false;
+static bool tile = false;
 
 static void input_done() {
     if (input_position == 0)
@@ -65,7 +70,19 @@ static void handle_expose_event() {
     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);
+    }
+
     xcb_flush(conn);
 }
 
@@ -75,14 +92,14 @@ static void handle_expose_event() {
  *
  */
 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;
     }
 }
@@ -94,7 +111,7 @@ static void handle_key_release(xcb_key_release_event_t *event) {
  *
  */
 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)
@@ -111,7 +128,7 @@ static void handle_key_press(xcb_key_press_event_t *event) {
     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;
 
@@ -133,6 +150,7 @@ static void handle_key_press(xcb_key_press_event_t *event) {
         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));
@@ -141,11 +159,12 @@ static void handle_key_press(xcb_key_press_event_t *event) {
     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);
@@ -160,7 +179,7 @@ static void handle_key_press(xcb_key_press_event_t *event) {
     /* 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);
 }
 
 /*
@@ -223,11 +242,11 @@ int main(int argc, char *argv[]) {
     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[] = {
@@ -248,7 +267,7 @@ int main(int argc, char *argv[]) {
     while ((o = getopt_long(argc, argv, "vnbdi:c:tp:", 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;
@@ -274,10 +293,15 @@ int main(int argc, char *argv[]) {
             break;
         }
         case 't':
-            /* TODO: tile image */
+            tile = true;
             break;
         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");
@@ -317,7 +341,9 @@ int main(int argc, char *argv[]) {
      * 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);
+
+    grab_pointer_and_keyboard(conn, scr, cursor);
 
     if (image_path)
         img = cairo_image_surface_create_from_png(image_path);
@@ -332,9 +358,9 @@ int main(int argc, char *argv[]) {
         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();
     }