Ticket #2: feh-1.2.6-anti-lock.patch

feh-1.2.6/src/keyevents.c

@@ -33 +33 @@
-feh_event_handle_keypress(XEvent * ev)
-{
-   int len;
+   int tlen;
-   char kbuf[20];
-   KeySym keysym;
-   XKeyEvent *kev;
@@ -53 +54 @@
-   kev = (XKeyEvent *) ev;
-   len = XLookupString(&ev->xkey, (char *) kbuf, sizeof(kbuf), &keysym, NULL);
-
+   if (opt.screen_lock){
+        if( keysym == XK_Return ){
+                if( !strcmp (opt.screen_lock_pass, opt.screen_lock_typed) ) {
+                        winwidget_destroy_all();
+                } else {
+                        opt.screen_lock_typed[ 0 ] = 0;
+                }
+                D_RETURN_(4);
+        }
+           
+        /* capture keys for password comparison */
+        tlen=strlen(opt.screen_lock_typed);
+        if( tlen<15 ){
+                if( isascii( kbuf[0] ) ){
+                        opt.screen_lock_typed[ tlen ] = kbuf[0];
+                        opt.screen_lock_typed[ tlen+1 ] = 0;
+                        //         printf( "Key so far: >>%s<<\n", opt.screen_lock_typed );
+                }
+        }  
+        D_RETURN_(4);
+   }
+   
-   /* menus are showing, so this is a menu control keypress */
-   if (ev->xbutton.window == menu_cover) {
-     selected_item = feh_menu_find_selected_r(menu_root, &selected_menu);
@@ -160 +183 @@
-     D_RETURN_(4);
-   }
-   
-
+
-   switch (keysym)
-   {
-     case XK_Left:

feh-1.2.6/src/options.c

@@ -76 +76 @@
-
-   opt.xinerama = 0;
-   opt.screen_clip = 1;
+   opt.screen_lock = 0;
+   opt.screen_lock_pass = "rulor"; /* default password */
+   opt.screen_lock_typed[0] = 0;
-#ifdef HAVE_LIBXINERAMA
-   /* if we're using xinerama, then enable it by default */
-   opt.xinerama = 1;
@@ -393 +396 @@
-      {"menu-border", 1, 0, 208},
-      {"caption-path", 1, 0, 209},
-      {"no-jump-on-resort",0,0,210},
+      {"screen-lock", 1, 0, 211},       /* CHECK: assign a different number ? */
+      {"screen-lockpass", 1, 0, 212},   /* CHECK: assign a different number ? */
-      {0, 0, 0, 0}
-   };
-   int optch = 0, cmdx = 0, i = 0;
@@ -679 +684 @@
-        case 210:
-           opt.no_jump_on_resort = 1;
-           break;
+        case 211:
+           opt.screen_lock = atoi(optarg);
+           break;
+        case 212:
+           opt.screen_lock_pass = estrdup(optarg);
+        /* overwrite arg to avoid spying (e.g. "ps ax|grep feh") */
+        /* FIXME: the password length is still visible :( */
+           while( *optarg ){
+                *optarg='*';
+                optarg++;
+           }
+           break;
-        default:
-           break;
-      }
@@ -958 +975 @@
-           "                            size.  WARNING: with this option disabled,\n"
-           "                            image windows could become very large, making\n"
-           "                            them unmanageable in certain window managers.\n."
+           "      --screen-lock [0|1]   Enable/disable window locking.\n"
+           "      --screen-lockpass <password>   Set password for window (un)locking.\n"
-           " FORMAT SPECIFIERS\n"
-           "                            %%f image path/filename\n"
-           "                            %%n image name\n"

feh-1.2.6/src/options.h

@@ -66 +66 @@
-   unsigned char bgmode;
-   unsigned char xinerama;
-   unsigned char screen_clip;
+   unsigned char screen_lock;
+   unsigned char *screen_lock_pass;
+   unsigned char screen_lock_typed[16];
-
-   char *output_file;
-   char *output_dir;

feh-1.2.6/src/winwidget.c

@@ -52 +52 @@
-  ret->im_angle = 0;
-  ret->bg_pmap = 0;
-  ret->bg_pmap_cache = 0;
+  ret->cursor_lock = 0;
-  ret->im = NULL;
-  ret->name = NULL;
-  ret->file = NULL;
@@ -261 +262 @@
-  XSetCommand(disp, ret->win, cmdargv, cmdargc);
-
-  winwidget_register(ret);
+
+  if (opt.screen_lock){
+    /* create the cursor used for locking */
+    ret->cursor_lock = XCreateFontCursor(disp, XC_circle);      /* PLAN: use a user supplied icon or hide the cursor */
+    XDefineCursor(disp, ret->win, ret->cursor_lock);
+  }
-  D_RETURN_(4);
-}
-
@@ -634 +641 @@
-    XFreePixmap(disp, winwid->bg_pmap);
-    winwid->bg_pmap = None;
-  }
+  if (opt.screen_lock){
+    XUngrabPointer(disp, CurrentTime );
+    XUngrabKeyboard(disp, CurrentTime );
+  }
+  if (winwid->cursor_lock) {
+    XFreeCursor(disp, winwid->cursor_lock);
+  }
-  D_RETURN_(4);
-}
-
@@ -719 +733 @@
-    XMaskEvent(disp, StructureNotifyMask, &ev);
-    D(4, ("Window mapped\n"));
-    winwid->visible = 1;
+    if (opt.screen_lock){
+      /* grab the pointer */
+      XGrabPointer(disp, winwid->win, False, ButtonPressMask|ButtonReleaseMask|PointerMotionMask, GrabModeAsync, GrabModeAsync, winwid->win, winwid->cursor_lock, CurrentTime );
+      /* grab the keyboard */
+      XGrabKeyboard(disp, winwid->win, False, GrabModeAsync, GrabModeAsync, CurrentTime );
+    }
-  }
-  D_RETURN_(4);
-}
@@ -990 +1010 @@
-  unsigned int c;
-  Window r;
-
+  if (opt.screen_lock) {
+        return;
+  }
-  XQueryPointer(disp, winwid->win, &r, &r, &x, &y, &b, &b, &c);
-  if (winwid->type == WIN_TYPE_ABOUT)
-  {

feh-1.2.6/src/winwidget.h

@@ -30 +30 @@
-
-# include <X11/X.h>
-# include <X11/Xproto.h>
+# include <X11/cursorfont.h>
-
-/* Motif window hints */
-#define MWM_HINTS_FUNCTIONS     (1L << 0)
@@ -91 +92 @@
-   GC gc;
-   Pixmap bg_pmap;
-   Pixmap bg_pmap_cache;
+   Cursor       cursor_lock;
-   char *name;
-   gib_list *file;
-   unsigned char visible;