Change search_win's key binding to M-f since M-s is already taken by

screenshot_all (oops!)

Spotted by thib.

While there, change the example key binding for firefox from M-f to
M-S-b.

"groovy" marco

diff --git a/scrotwm.1 b/scrotwm.1
index 7991701..f1234e3 100644 (file)
--- a/scrotwm.1
+++ b/scrotwm.1
@@ -13,7 +13,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"

-.Dd $Mdocdate: November 28 2011 $
+.Dd $Mdocdate: November 29 2011 $

 .Dt SCROTWM 1
 .Os
 .Sh NAME
 .Dt SCROTWM 1
 .Os
 .Sh NAME

@@ -317,12 +317,12 @@ fields and will be substituted for values at the time the program is spawned:
 Example:
 .Bd -literal -offset indent
 program[ff] = /usr/local/bin/firefox http://scrotwm.org/
 Example:
 .Bd -literal -offset indent
 program[ff] = /usr/local/bin/firefox http://scrotwm.org/

-bind[ff] = Mod+f # Now Mod+F launched firefox
+bind[ff] = Mod+Shift+b # Now Mod+Shift+B launches firefox

 .Ed
 .Pp
 To undo the previous:
 .Bd -literal -offset indent
 .Ed
 .Pp
 To undo the previous:
 .Bd -literal -offset indent

-bind[] = Mod+f
+bind[] = Mod+Shift+b

 program[ff] =
 .Ed
 .Sh BINDINGS
 program[ff] =
 .Ed
 .Sh BINDINGS

diff --git a/scrotwm.c b/scrotwm.c
index 48ddf00..44b614c 100644 (file)
--- a/scrotwm.c
+++ b/scrotwm.c
@@ -4731,7 +4731,7 @@ setup_keys(void)
        setkeybinding(MODKEY|ShiftMask, XK_bracketright,kf_move_down,   NULL);
        setkeybinding(MODKEY|ShiftMask, XK_slash,       kf_name_workspace,NULL);
        setkeybinding(MODKEY,           XK_slash,       kf_search_workspace,NULL);
        setkeybinding(MODKEY|ShiftMask, XK_bracketright,kf_move_down,   NULL);
        setkeybinding(MODKEY|ShiftMask, XK_slash,       kf_name_workspace,NULL);
        setkeybinding(MODKEY,           XK_slash,       kf_search_workspace,NULL);

-       setkeybinding(MODKEY,           XK_s,           kf_search_win,  NULL);
+       setkeybinding(MODKEY,           XK_f,           kf_search_win,  NULL);

 #ifdef SWM_DEBUG
        setkeybinding(MODKEY|ShiftMask, XK_d,           kf_dumpwins,    NULL);
 #endif
 #ifdef SWM_DEBUG
        setkeybinding(MODKEY|ShiftMask, XK_d,           kf_dumpwins,    NULL);
 #endif

diff --git a/scrotwm.conf b/scrotwm.conf
index 20eb22b..caca87e 100644 (file)
--- a/scrotwm.conf
+++ b/scrotwm.conf
@@ -81,4 +81,4 @@ dialog_ratio          = 0.6
 
 # EXAMPLE: define firefox program and bind to key
 # program[firefox]     = firefox http://scrotwm.org/
 
 # EXAMPLE: define firefox program and bind to key
 # program[firefox]     = firefox http://scrotwm.org/

-# bind[firefox]                = MOD+f
+# bind[firefox]                = MOD+Shift+b

diff --git a/scrotwm_cz.conf b/scrotwm_cz.conf
index ea4e5fe..7229b2a 100644 (file)
--- a/scrotwm_cz.conf
+++ b/scrotwm_cz.conf
@@ -69,4 +69,4 @@ bind[move_up]         = MOD+Shift+uacute
 bind[move_down]                = MOD+Shift+parenright
 bind[name_workspace]   = MOD+Shift+slash
 bind[search_workspace] = MOD+slash
 bind[move_down]                = MOD+Shift+parenright
 bind[name_workspace]   = MOD+Shift+slash
 bind[search_workspace] = MOD+slash

-bind[search_win]       = MOD+s
+bind[search_win]       = MOD+f

diff --git a/scrotwm_es.conf b/scrotwm_es.conf
index f7afbb6..67d8ee6 100644 (file)
--- a/scrotwm_es.conf
+++ b/scrotwm_es.conf
@@ -69,4 +69,4 @@ bind[move_up]         = MOD+Shift+dead_grave
 bind[move_down]                = MOD+Shift+plus
 bind[name_workspace]   = MOD+Shift+slash
 bind[search_workspace] = MOD+slash
 bind[move_down]                = MOD+Shift+plus
 bind[name_workspace]   = MOD+Shift+slash
 bind[search_workspace] = MOD+slash

-bind[search_win]       = MOD+s
+bind[search_win]       = MOD+f

diff --git a/scrotwm_fr.conf b/scrotwm_fr.conf
index 639193b..b2bc883 100644 (file)
--- a/scrotwm_fr.conf
+++ b/scrotwm_fr.conf
@@ -69,4 +69,4 @@ bind[move_up]         = MOD+Shift+ugrave
 bind[move_down]                = MOD+Shift+asterisk
 bind[name_workspace]   = MOD+Shift+slash
 bind[search_workspace] = MOD+slash
 bind[move_down]                = MOD+Shift+asterisk
 bind[name_workspace]   = MOD+Shift+slash
 bind[search_workspace] = MOD+slash

-bind[search_win]       = MOD+s
+bind[search_win]       = MOD+f

diff --git a/scrotwm_us.conf b/scrotwm_us.conf
index 5f7efc2..bfdf2dd 100644 (file)
--- a/scrotwm_us.conf
+++ b/scrotwm_us.conf
@@ -69,4 +69,4 @@ bind[move_up]         = MOD+Shift+bracketleft
 bind[move_down]                = MOD+Shift+bracketright
 bind[name_workspace]   = MOD+Shift+slash
 bind[search_workspace] = MOD+slash
 bind[move_down]                = MOD+Shift+bracketright
 bind[name_workspace]   = MOD+Shift+slash
 bind[search_workspace] = MOD+slash

-bind[search_win]       = MOD+s
+bind[search_win]       = MOD+f