nilix/fluxbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix a couple of keybindings

Browse source
This commit is contained in:
rathnor 2003-07-26 13:44:00 +00:00
parent 868728e97b
commit 2b7aace6b3
3 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,5 +1,9 @@
(Format: Year/Month/Day)
Changes for 0.9.5:
*03/07/26:
* Fix some keybinding issues with ShadeWindow, StickWindow,
SendToWorkspace, NextGroup, PrevGroup (Simon)
CurrentWindowCmd.cc FbCommandFactory.cc
*03/07/25:
* Make fbrun work properly on multiple screens (Simon)
FbRun.hh/cc

4
src/CurrentWindowCmd.cc
View file

@ -20,7 +20,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
// $Id: CurrentWindowCmd.cc,v 1.1 2003/06/30 14:35:11 fluxgen Exp $
// $Id: CurrentWindowCmd.cc,v 1.2 2003/07/26 13:44:00 rathnor Exp $
#include "CurrentWindowCmd.hh"
@ -42,7 +42,7 @@ void KillWindowCmd::real_execute() {
}
void SendToWorkspaceCmd::real_execute() {
if (m_workspace_num > 0 && m_workspace_num < window().screen().getNumberOfWorkspaces())
if (m_workspace_num >= 0 && m_workspace_num < window().screen().getNumberOfWorkspaces())
window().screen().sendToWorkspace(m_workspace_num, &window());
}

13
src/FbCommandFactory.cc
View file

@ -20,7 +20,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
// $Id: FbCommandFactory.cc,v 1.9 2003/07/24 03:19:02 rathnor Exp $
// $Id: FbCommandFactory.cc,v 1.10 2003/07/26 13:44:00 rathnor Exp $
#include "FbCommandFactory.hh"
@ -30,6 +30,7 @@
#include "WorkspaceCmd.hh"
#include "fluxbox.hh"
#include "SimpleCommand.hh"
#include "Screen.hh"
// autoregister this module to command parser
FbCommandFactory FbCommandFactory::s_autoreg;
@ -61,7 +62,9 @@ FbCommandFactory::FbCommandFactory() {
"lower",
"close",
"shade",
"shadewindow",
"stick",
"stickwindow",
"toggledecor",
"sendtoworkspace",
"killwindow",
@ -75,6 +78,8 @@ FbCommandFactory::FbCommandFactory() {
"workspace",
"nextwindow",
"prevwindow",
"nextgroup",
"prevgroup",
"showdesktop",
"arrangewindows",
"rootmenu",
@ -139,7 +144,7 @@ FbTk::Command *FbCommandFactory::stringToCommand(const std::string &command,
else if (command == "toggledecor")
return new CurrentWindowCmd(&FluxboxWindow::toggleDecoration);
else if (command == "sendtoworkspace")
return new SendToWorkspaceCmd(atoi(arguments.c_str()));
return new SendToWorkspaceCmd(atoi(arguments.c_str()) - 1); // make 1-indexed to user
else if (command == "killwindow")
return new KillWindowCmd();
else if (command == "nexttab")
@ -168,6 +173,10 @@ FbTk::Command *FbCommandFactory::stringToCommand(const std::string &command,
return new NextWindowCmd(atoi(arguments.c_str()));
else if (command == "prevwindow")
return new PrevWindowCmd(atoi(arguments.c_str()));
else if (command == "nextgroup")
return new NextWindowCmd(atoi(arguments.c_str()) ^ BScreen::CYCLEGROUPS);
else if (command == "prevgroup")
return new PrevWindowCmd(atoi(arguments.c_str()) ^ BScreen::CYCLEGROUPS);
else if (command == "arrangewindows")
return new ArrangeWindowsCmd();
else if (command == "showdesktop")