X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=driver%2Ftimers.c;h=9ab7ae6e050586f2620f9502721b1c99da7a131d;hp=584a6d0d49f8f621df814661a9ad8fe571b1e15b;hb=7b34ef992563d7bcbb64cc5597dc45fa24470b05;hpb=c1b9b55ad8d59dc05ef55e316aebf5863e7dfa56

diff --git a/driver/timers.c b/driver/timers.c
index 584a6d0d..9ab7ae6e 100644
--- a/driver/timers.c
+++ b/driver/timers.c
@@ -612,6 +612,7 @@ swallow_unlock_typeahead_events (saver_info *si, XEvent *e)
               break;
             case '\025': case '\030':			/* Erase line */
             case '\012': case '\015':			/* Enter */
+            case '\033':				/* ESC */
               i = 0;
               break;
             case '\040':				/* Space */
@@ -817,9 +818,12 @@ sleep_until_idle (saver_info *si, Bool until_idle_p)
 	break;
 
       case KeyPress:
-      case KeyRelease:
       case ButtonPress:
-      case ButtonRelease:
+      /* Ignore release events so that hitting ESC at the password dialog
+         doesn't result in the password dialog coming right back again when
+         the fucking release key is seen! */
+      /* case KeyRelease:*/
+      /* case ButtonRelease:*/
       case MotionNotify:
 
 	if (p->debug_p)
@@ -1083,8 +1087,6 @@ sleep_until_idle (saver_info *si, Bool until_idle_p)
 
   if (until_idle_p && si->cycle_id)	/* no cycle timer when inactive */
     abort ();
-
-  return;
 }