Silence format string warnings with debug enabled;

[spectrwm.git] / scrotwm.c

diff --git a/scrotwm.c b/scrotwm.c
index 595b207..e129b42 100644 (file)
--- a/scrotwm.c
+++ b/scrotwm.c
@@ -50,7 +50,7 @@
 
 static const char      *cvstag = "$scrotwm$";
 
-#define        SWM_VERSION     "0.6"
+#define        SWM_VERSION     "0.7"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -181,6 +181,7 @@ char                        *bar_fonts[] = {
 /* terminal + args */
 char                   *spawn_term[] = { "xterm", NULL };
 char                   *spawn_screenshot[] = { "screenshot.sh", NULL, NULL };
+char                   *spawn_lock[] = { "xlock", NULL };
 char                   *spawn_menu[] = { "dmenu_run", "-fn", NULL, "-nb", NULL,
                            "-nf", NULL, "-sb", NULL, "-sf", NULL, NULL };
 
@@ -1687,6 +1688,7 @@ struct key {
        { MODKEY | ShiftMask,   XK_s,           screenshot,     {.id = SWM_ARG_ID_SS_WINDOW} },
        { MODKEY,               XK_t,           floating_toggle,{0} },
        { MODKEY | ShiftMask,   XK_v,           version,        {0} },
+       { MODKEY | ShiftMask,   XK_Delete,      spawn,          {.argv = spawn_lock} },
 };
 
 void
@@ -1721,7 +1723,7 @@ resize(struct ws_win *win, union arg *args)
        XEvent                  ev;
        Time                    time = 0;
 
-       DNPRINTF(SWM_D_MOUSE, "resize: win %d floating %d trans %d\n",
+       DNPRINTF(SWM_D_MOUSE, "resize: win %lu floating %d trans %d\n",
            win->id, win->floating, win->transient);
 
        if (!(win->transient != 0 || win->floating != 0))
@@ -1796,7 +1798,7 @@ move(struct ws_win *win, union arg *args)
        Time                    time = 0;
        int                     restack = 0;
 
-       DNPRINTF(SWM_D_MOUSE, "move: win %d floating %d trans %d\n",
+       DNPRINTF(SWM_D_MOUSE, "move: win %lu floating %d trans %d\n",
            win->id, win->floating, win->transient);
 
        if (win->floating == 0) {
@@ -2029,9 +2031,10 @@ manage_window(Window id)
        if (prop && win->transient == 0) {
                DNPRINTF(SWM_D_PROP, "got property _SWM_WS=%s\n", prop);
                ws_idx = strtonum(prop, 0, 9, &errstr);
-               if (errstr)
+               if (errstr) {
                        DNPRINTF(SWM_D_EVENT, "window idx is %s: %s",
                            errstr, prop);
+               }
                ws = &r->s->ws[ws_idx];
        } else
                ws = r->ws;