summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Ramsay <i.am@jimramsay.com>2009-03-10 15:28:31 (GMT)
committerJim Ramsay <i.am@jimramsay.com>2009-05-26 20:46:40 (GMT)
commitafb4f17938134329e13a220427219809249e8409 (patch)
treeb6cae07bd9171b892b73d2b9dc9210ec90d27bc9
parent520b4393a552077f2f5306c499d7c294f5e38f7b (diff)
downloadfluxbox_lack-afb4f17938134329e13a220427219809249e8409.zip
fluxbox_lack-afb4f17938134329e13a220427219809249e8409.tar.bz2
'SetHead 0' -> Send to current headsendto-current
The SetHead command will now accept the special value of '0' to send windows to the currently active head (that is, the head with the mouse pointer).
-rw-r--r--doc/asciidoc/fluxbox-keys.txt4
-rw-r--r--doc/fluxbox-keys.5.in5
-rw-r--r--src/CurrentWindowCmd.cc2
3 files changed, 8 insertions, 3 deletions
diff --git a/doc/asciidoc/fluxbox-keys.txt b/doc/asciidoc/fluxbox-keys.txt
index 399fc6b..d70495a 100644
--- a/doc/asciidoc/fluxbox-keys.txt
+++ b/doc/asciidoc/fluxbox-keys.txt
@@ -305,7 +305,9 @@ two arguments;;
305 305
306*SetHead* 'number':: 306*SetHead* 'number'::
307 Moves the window to the given display head. Only available when fluxbox 307 Moves the window to the given display head. Only available when fluxbox
308 has been compiled with Xinerama support. 308 has been compiled with Xinerama support. Heads are numbered starting at *1*,
309 with the special value *0* meaning "Move to the head where the mouse pointer
310 currently resides".
309 311
310*SendToNextHead* ['offset'] / *SendToPrevHead* ['offset']:: 312*SendToNextHead* ['offset'] / *SendToPrevHead* ['offset']::
311 Sends the current window to the next/previous display head. If you 313 Sends the current window to the next/previous display head. If you
diff --git a/doc/fluxbox-keys.5.in b/doc/fluxbox-keys.5.in
index 799a8d4..6d69b48 100644
--- a/doc/fluxbox-keys.5.in
+++ b/doc/fluxbox-keys.5.in
@@ -614,7 +614,10 @@ First value becomes the focused alpha, second becomes the unfocused alpha value\
614.PP 614.PP
615\fBSetHead\fR \fInumber\fR 615\fBSetHead\fR \fInumber\fR
616.RS 4 616.RS 4
617Moves the window to the given display head\&. Only available when fluxbox has been compiled with Xinerama support\&. 617Moves the window to the given display head\&. Only available when fluxbox has been compiled with Xinerama support\&. Heads are numbered starting at
618\fB1\fR, with the special value
619\fB0\fR
620meaning "Move to the head where the mouse pointer currently resides"\&.
618.RE 621.RE
619.PP 622.PP
620\fBSendToNextHead\fR [\fIoffset\fR] / \fBSendToPrevHead\fR [\fIoffset\fR] 623\fBSendToNextHead\fR [\fIoffset\fR] / \fBSendToPrevHead\fR [\fIoffset\fR]
diff --git a/src/CurrentWindowCmd.cc b/src/CurrentWindowCmd.cc
index 0300c80..9d97151 100644
--- a/src/CurrentWindowCmd.cc
+++ b/src/CurrentWindowCmd.cc
@@ -213,7 +213,7 @@ void SetHeadCmd::real_execute() {
213 int num = m_head; 213 int num = m_head;
214 int total = fbwindow().screen().numHeads(); 214 int total = fbwindow().screen().numHeads();
215 if (num < 0) num += total + 1; 215 if (num < 0) num += total + 1;
216 if (num < 1) num = 1; 216 if (num < 1) num = fbwindow().screen().getCurrHead();
217 if (num > total) num = total; 217 if (num > total) num = total;
218 fbwindow().setOnHead(num); 218 fbwindow().setOnHead(num);
219} 219}