Add control to known keys. from Juergen Daubert <jue@jue.li>

[spectrwm.git] / scrotwm.c

diff --git a/scrotwm.c b/scrotwm.c
index f6a175c..3f48ca6 100644 (file)
--- a/scrotwm.c
+++ b/scrotwm.c
@@ -912,7 +912,8 @@ version(struct swm_region *r, union arg *args)
 {
        bar_version = !bar_version;
        if (bar_version)
-               strlcpy(bar_vertext, cvstag, sizeof bar_vertext);
+               snprintf(bar_vertext, sizeof bar_vertext, "Version: %s CVS: %s",
+                   SWM_VERSION, cvstag);
        else
                strlcpy(bar_vertext, "", sizeof bar_vertext);
        bar_update();
@@ -1566,7 +1567,7 @@ stack_master(struct workspace *ws, struct swm_geometry *g, int rot, int flip)
        int                     w_inc = 1, h_inc, w_base = 1, h_base;
        int                     hrh, extra = 0, h_slice, last_h = 0;
        int                     split, colno, winno, mwin, msize, mscale;
-       int                     remain, missing, v_slice;;
+       int                     remain, missing, v_slice;
        unsigned int            mask;
 
        DNPRINTF(SWM_D_STACK, "stack_master: workspace: %d\n rot=%s flip=%s",
@@ -2248,6 +2249,8 @@ parsekeys(char *keystr, unsigned int currmod, unsigned int *mod, KeySym *ks)
                        *mod |= Mod4Mask;
                else if (strncasecmp(name, "SHIFT", SWM_MODNAME_SIZE) == 0)
                        *mod |= ShiftMask;
+               else if (strncasecmp(name, "CONTROL", SWM_MODNAME_SIZE) == 0)
+                       *mod |= ControlMask;
                else {
                        *ks = XStringToKeysym(name);
                        XConvertCase(*ks, ks, &uks);