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

changeWorkspaceHorz() now cycles

Browse source
This commit is contained in:
Scott Moynes 2002-08-21 01:50:01 +00:00
parent 5c284ecc83
commit 9be80896ef
1 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
util/epist/screen.cc
View file

@ -614,6 +614,7 @@ void screen::changeWorkspaceHorz(const int num) const {
assert(_managed); assert(_managed);
const Config *conf = _epist->getConfig(); const Config *conf = _epist->getConfig();
int width = conf->getNumberValue(Config::workspaceColumns); int width = conf->getNumberValue(Config::workspaceColumns);
int wnum;
if (width > _num_desktops || width <= 0) if (width > _num_desktops || width <= 0)
return; return;
@ -621,15 +622,22 @@ void screen::changeWorkspaceHorz(const int num) const {
if (num < 0) { if (num < 0) {
if (_active_desktop % width != 0) if (_active_desktop % width != 0)
changeWorkspace(_active_desktop - 1); changeWorkspace(_active_desktop - 1);
else else {
changeWorkspace(_active_desktop + width - 1); wnum = _active_desktop + width - 1;
if (wnum >= _num_desktops)
wnum = _num_desktops - 1;
}
} }
else { else {
if (_active_desktop % width != width - 1) if (_active_desktop % width != width - 1) {
changeWorkspace(_active_desktop + 1); wnum = _active_desktop + 1;
if (wnum >= _num_desktops)
wnum = _num_desktops / width * width;
}
else else
changeWorkspace(_active_desktop - width + 1); wnum = _active_desktop - width + 1;
} }
changeWorkspace(wnum);
} }
void screen::grabKey(const KeyCode keyCode, const int modifierMask) const { void screen::grabKey(const KeyCode keyCode, const int modifierMask) const {