aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrathnor <rathnor>2003-07-26 13:44:00 (GMT)
committerrathnor <rathnor>2003-07-26 13:44:00 (GMT)
commit2b7aace6b304fc46ae4f948feb531ae60b39251e (patch)
tree2af48a48e5ade95584a0230ce72828fa9d13f1b4
parent868728e97b9803cd9ac7a72d320a8fbe15023930 (diff)
downloadfluxbox-2b7aace6b304fc46ae4f948feb531ae60b39251e.zip
fluxbox-2b7aace6b304fc46ae4f948feb531ae60b39251e.tar.bz2
fix a couple of keybindings
-rw-r--r--ChangeLog4
-rw-r--r--src/CurrentWindowCmd.cc4
-rw-r--r--src/FbCommandFactory.cc13
3 files changed, 17 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index f4d3d29..cbfa7cc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
1(Format: Year/Month/Day) 1(Format: Year/Month/Day)
2Changes for 0.9.5: 2Changes for 0.9.5:
3*03/07/26:
4 * Fix some keybinding issues with ShadeWindow, StickWindow,
5 SendToWorkspace, NextGroup, PrevGroup (Simon)
6 CurrentWindowCmd.cc FbCommandFactory.cc
3*03/07/25: 7*03/07/25:
4 * Make fbrun work properly on multiple screens (Simon) 8 * Make fbrun work properly on multiple screens (Simon)
5 FbRun.hh/cc 9 FbRun.hh/cc
diff --git a/src/CurrentWindowCmd.cc b/src/CurrentWindowCmd.cc
index 8e0a70c..f4d4af7 100644
--- a/src/CurrentWindowCmd.cc
+++ b/src/CurrentWindowCmd.cc
@@ -20,7 +20,7 @@
20// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 20// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
21// DEALINGS IN THE SOFTWARE. 21// DEALINGS IN THE SOFTWARE.
22 22
23// $Id: CurrentWindowCmd.cc,v 1.1 2003/06/30 14:35:11 fluxgen Exp $ 23// $Id: CurrentWindowCmd.cc,v 1.2 2003/07/26 13:44:00 rathnor Exp $
24 24
25#include "CurrentWindowCmd.hh" 25#include "CurrentWindowCmd.hh"
26 26
@@ -42,7 +42,7 @@ void KillWindowCmd::real_execute() {
42} 42}
43 43
44void SendToWorkspaceCmd::real_execute() { 44void SendToWorkspaceCmd::real_execute() {
45 if (m_workspace_num > 0 && m_workspace_num < window().screen().getNumberOfWorkspaces()) 45 if (m_workspace_num >= 0 && m_workspace_num < window().screen().getNumberOfWorkspaces())
46 window().screen().sendToWorkspace(m_workspace_num, &window()); 46 window().screen().sendToWorkspace(m_workspace_num, &window());
47} 47}
48 48
diff --git a/src/FbCommandFactory.cc b/src/FbCommandFactory.cc
index 59a01bd..2194bd6 100644
--- a/src/FbCommandFactory.cc
+++ b/src/FbCommandFactory.cc
@@ -20,7 +20,7 @@
20// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 20// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
21// DEALINGS IN THE SOFTWARE. 21// DEALINGS IN THE SOFTWARE.
22 22
23// $Id: FbCommandFactory.cc,v 1.9 2003/07/24 03:19:02 rathnor Exp $ 23// $Id: FbCommandFactory.cc,v 1.10 2003/07/26 13:44:00 rathnor Exp $
24 24
25#include "FbCommandFactory.hh" 25#include "FbCommandFactory.hh"
26 26
@@ -30,6 +30,7 @@
30#include "WorkspaceCmd.hh" 30#include "WorkspaceCmd.hh"
31#include "fluxbox.hh" 31#include "fluxbox.hh"
32#include "SimpleCommand.hh" 32#include "SimpleCommand.hh"
33#include "Screen.hh"
33 34
34// autoregister this module to command parser 35// autoregister this module to command parser
35FbCommandFactory FbCommandFactory::s_autoreg; 36FbCommandFactory FbCommandFactory::s_autoreg;
@@ -61,7 +62,9 @@ FbCommandFactory::FbCommandFactory() {
61 "lower", 62 "lower",
62 "close", 63 "close",
63 "shade", 64 "shade",
65 "shadewindow",
64 "stick", 66 "stick",
67 "stickwindow",
65 "toggledecor", 68 "toggledecor",
66 "sendtoworkspace", 69 "sendtoworkspace",
67 "killwindow", 70 "killwindow",
@@ -75,6 +78,8 @@ FbCommandFactory::FbCommandFactory() {
75 "workspace", 78 "workspace",
76 "nextwindow", 79 "nextwindow",
77 "prevwindow", 80 "prevwindow",
81 "nextgroup",
82 "prevgroup",
78 "showdesktop", 83 "showdesktop",
79 "arrangewindows", 84 "arrangewindows",
80 "rootmenu", 85 "rootmenu",
@@ -139,7 +144,7 @@ FbTk::Command *FbCommandFactory::stringToCommand(const std::string &command,
139 else if (command == "toggledecor") 144 else if (command == "toggledecor")
140 return new CurrentWindowCmd(&FluxboxWindow::toggleDecoration); 145 return new CurrentWindowCmd(&FluxboxWindow::toggleDecoration);
141 else if (command == "sendtoworkspace") 146 else if (command == "sendtoworkspace")
142 return new SendToWorkspaceCmd(atoi(arguments.c_str())); 147 return new SendToWorkspaceCmd(atoi(arguments.c_str()) - 1); // make 1-indexed to user
143 else if (command == "killwindow") 148 else if (command == "killwindow")
144 return new KillWindowCmd(); 149 return new KillWindowCmd();
145 else if (command == "nexttab") 150 else if (command == "nexttab")
@@ -168,6 +173,10 @@ FbTk::Command *FbCommandFactory::stringToCommand(const std::string &command,
168 return new NextWindowCmd(atoi(arguments.c_str())); 173 return new NextWindowCmd(atoi(arguments.c_str()));
169 else if (command == "prevwindow") 174 else if (command == "prevwindow")
170 return new PrevWindowCmd(atoi(arguments.c_str())); 175 return new PrevWindowCmd(atoi(arguments.c_str()));
176 else if (command == "nextgroup")
177 return new NextWindowCmd(atoi(arguments.c_str()) ^ BScreen::CYCLEGROUPS);
178 else if (command == "prevgroup")
179 return new PrevWindowCmd(atoi(arguments.c_str()) ^ BScreen::CYCLEGROUPS);
171 else if (command == "arrangewindows") 180 else if (command == "arrangewindows")
172 return new ArrangeWindowsCmd(); 181 return new ArrangeWindowsCmd();
173 else if (command == "showdesktop") 182 else if (command == "showdesktop")