summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorOwain Ainsworth <oga@cvs.openbsd.org>2008-06-25 22:40:28 +0000
committerOwain Ainsworth <oga@cvs.openbsd.org>2008-06-25 22:40:28 +0000
commitc9a31a5a314b7051b33797420c484c817703b18f (patch)
tree418649b0211e93fe990129cf46610311bd39277e /app
parent3813bdb515b134f2caf6c83af9bb444f17eb1aae (diff)
Support mod4 (windows key) in mouse bindings too.
Diffstat (limited to 'app')
-rw-r--r--app/cwm/conf.c6
-rw-r--r--app/cwm/cwmrc.54
2 files changed, 8 insertions, 2 deletions
diff --git a/app/cwm/conf.c b/app/cwm/conf.c
index f3fa60aa1..d25936564 100644
--- a/app/cwm/conf.c
+++ b/app/cwm/conf.c
@@ -15,7 +15,7 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
- * $Id: conf.c,v 1.44 2008/06/25 22:38:36 oga Exp $
+ * $Id: conf.c,v 1.45 2008/06/25 22:40:27 oga Exp $
*/
#include "headers.h"
@@ -434,6 +434,10 @@ conf_mousebind(struct conf *c, char *name, char *binding)
strchr(name, 'S') < strchr(name, '-'))
current_binding->modmask |= ShiftMask;
+ if (strchr(name, '4') != NULL &&
+ strchr(name, '4') < strchr(name, '-'))
+ current_binding->modmask |= Mod4Mask;
+
substring = strchr(name, '-') + 1;
if (strchr(name, '-') == NULL)
diff --git a/app/cwm/cwmrc.5 b/app/cwm/cwmrc.5
index 3d7ec0c78..c2b5dd5ca 100644
--- a/app/cwm/cwmrc.5
+++ b/app/cwm/cwmrc.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: cwmrc.5,v 1.12 2008/06/25 22:38:36 oga Exp $
+.\" $OpenBSD: cwmrc.5,v 1.13 2008/06/25 22:40:27 oga Exp $
.\"
.\" Copyright (c) 2004,2005 Marius Aamodt Eriksen <marius@monkey.org>
.\"
@@ -141,6 +141,8 @@ The Control key.
The Meta key.
.It S
The Shift key.
+.It 4
+The Mod4 key (normally the windows key).
.El
.Pp
The