Option to not show failure color on clear

diff --git a/config.def.h b/config.def.h
index 4bccb5d..fca0ae0 100644 (file)
--- a/config.def.h
+++ b/config.def.h
@@ -3,3 +3,4 @@ static const char *colorname[NUMCOLS] = {
        "#005577",   /* during input */
        "#CC3333",   /* failed/cleared the input */
 };
        "#005577",   /* during input */
        "#CC3333",   /* failed/cleared the input */
 };

+static const Bool failonclear = True;

diff --git a/slock.c b/slock.c
index 6502c86..1551a9e 100644 (file)
--- a/slock.c
+++ b/slock.c
@@ -26,7 +26,7 @@
 enum {
        INIT,
        INPUT,
 enum {
        INIT,
        INPUT,

-       EMPTY,
+       FAILED,

        NUMCOLS
 };
 
        NUMCOLS
 };
 


@@ -42,6 +42,7 @@ typedef struct {
 static Lock **locks;
 static int nscreens;
 static Bool running = True;
 static Lock **locks;
 static int nscreens;
 static Bool running = True;

+static Bool failure = False;

 static Bool rr;
 static int rrevbase;
 static int rrerrbase;
 static Bool rr;
 static int rrevbase;
 static int rrerrbase;


@@ -153,8 +154,10 @@ readpw(Display *dpy, const char *pws)
 #else
                                running = !!strcmp(crypt(passwd, pws), pws);
 #endif
 #else
                                running = !!strcmp(crypt(passwd, pws), pws);
 #endif

-                               if (running)
+                               if (running) {

                                        XBell(dpy, 100);
                                        XBell(dpy, 100);

+                                       failure = True;
+                               }

                                len = 0;
                                break;
                        case XK_Escape:
                                len = 0;
                                break;
                        case XK_Escape:


@@ -178,7 +181,7 @@ readpw(Display *dpy, const char *pws)
                                }
                        } else if (llen != 0 && len == 0) {
                                for (screen = 0; screen < nscreens; screen++) {
                                }
                        } else if (llen != 0 && len == 0) {
                                for (screen = 0; screen < nscreens; screen++) {

-                                       XSetWindowBackground(dpy, locks[screen]->win, locks[screen]->colors[EMPTY]);
+                                       XSetWindowBackground(dpy, locks[screen]->win, locks[screen]->colors[failure || failonclear ? FAILED : INIT]);

                                        XClearWindow(dpy, locks[screen]->win);
                                }
                        }
                                        XClearWindow(dpy, locks[screen]->win);
                                }
                        }