Make cwm default keybindings always exist. Additional keybindings now

overlap with the new ones, overriding them. Also a new "unmap" keyword
in binding definitions now unmaps a binding without adding a new one.

This seriously shrinks the ~/.calmwm/.keys directory of anyone who defines
their own bindings whilst wanting some of the defaults.

Looked over, liked and ok todd@

1 files changed, 10 insertions, 3 deletions

diff --git a/cwm.1 b/cwm.1
index 35846fe..57ac99a 100644
--- a/cwm.1
+++ b/cwm.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: cwm.1,v 1.15 2007/11/16 23:04:56 jmc Exp $
+.\"	$OpenBSD: cwm.1,v 1.16 2007/11/19 22:18:16 oga Exp $
 .\"
 .\" The following requests are required for all man pages.
 .Dd June 29, 2007
@@ -286,8 +286,8 @@ will cause any instances of
 to not have borders.
 .It Pa ~/.calmwm/.keys
 Symlinks in this directory cause the creation of keyboard shortcuts.
-If the directory does not exist, then the default shortcuts will be
-created; otherwise only the shortcuts defined will be created.
+The default shortcuts will always be created. In case of conflict, 
+user-defined shortcuts take precidence.
 The name of a link here is first the modifier keys, followed by a ``-''.
 The following modifiers are recognised:
 .Bl -tag -width Ds
@@ -312,6 +312,9 @@ The target of the link should be either the name of a task from the
 structure in
 .Pa /usr/src/xenocara/app/cwm/conf.c ,
 or, alternatively it should be the commandline that is wished to be executed.
+A special case is the ``unmap'' keyword, which causes any bindings using the 
+named shortcut to be removed. This can be used to remove a binding which conflicts
+with an application.
 For example, to cause
 .Ic C-M-r
 to add a label to a window:
@@ -324,6 +327,10 @@ with C-S-Enter:
 .Bd -literal -offset indent
 $ ln -s "/usr/X11R6/bin/xterm -e top" ~/.calmwm/.keys/CS-Return
 .Ed
+Remove a keybinding for Mod4-o
+.Bd -literal -offset indent
+$ ln -s "unmap" 4-o
+.Ed
 .El
 .Sh AUTHORS
 .An -nosplit