aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrathnor <rathnor>2003-06-15 11:38:35 (GMT)
committerrathnor <rathnor>2003-06-15 11:38:35 (GMT)
commit77f43591ce5fca89e646a4d1140bc95cbe082025 (patch)
tree2cec63ed363046a549bf45d3d875025abcdbf423
parent1856480901f1aed0235300f17ebcf827c9bf9aac (diff)
downloadfluxbox_pavel-77f43591ce5fca89e646a4d1140bc95cbe082025.zip
fluxbox_pavel-77f43591ce5fca89e646a4d1140bc95cbe082025.tar.bz2
new keys for cycling through groups - NextGroup/PrevGroup (they are an alias
for NextWindow/PrevWindow 1
-rw-r--r--src/Keys.cc11
-rw-r--r--src/Keys.hh3
-rw-r--r--src/fluxbox.cc4
3 files changed, 15 insertions, 3 deletions
diff --git a/src/Keys.cc b/src/Keys.cc
index 5913b2b..64ca79d 100644
--- a/src/Keys.cc
+++ b/src/Keys.cc
@@ -19,7 +19,7 @@
19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
20// DEALINGS IN THE SOFTWARE. 20// DEALINGS IN THE SOFTWARE.
21 21
22//$Id: Keys.cc,v 1.30 2003/06/10 12:18:26 fluxgen Exp $ 22//$Id: Keys.cc,v 1.31 2003/06/15 11:38:35 rathnor Exp $
23 23
24 24
25#include "Keys.hh" 25#include "Keys.hh"
@@ -102,6 +102,8 @@ Keys::t_actionstr Keys::m_actionlist[] = {
102 {"KillWindow", KILLWINDOW}, 102 {"KillWindow", KILLWINDOW},
103 {"NextWindow", NEXTWINDOW}, 103 {"NextWindow", NEXTWINDOW},
104 {"PrevWindow", PREVWINDOW}, 104 {"PrevWindow", PREVWINDOW},
105 {"NextGroup", NEXTGROUP},
106 {"PrevGroup", PREVGROUP},
105 {"NextTab", NEXTTAB}, 107 {"NextTab", NEXTTAB},
106 {"PrevTab", PREVTAB}, 108 {"PrevTab", PREVTAB},
107 {"FirstTab", FIRSTTAB}, 109 {"FirstTab", FIRSTTAB},
@@ -320,6 +322,13 @@ bool Keys::load(const char *filename) {
320 else 322 else
321 last_key->param = 0; 323 last_key->param = 0;
322 break; 324 break;
325 case NEXTGROUP:
326 case PREVGROUP:
327 if (argc + 1 < val.size())
328 last_key->param = atoi( val[argc+1].c_str()) ^ 1;
329 else
330 last_key->param = 1;
331 break;
323 case NEXTWINDOW: 332 case NEXTWINDOW:
324 case PREVWINDOW: 333 case PREVWINDOW:
325 if (argc + 1 < val.size()) 334 if (argc + 1 < val.size())
diff --git a/src/Keys.hh b/src/Keys.hh
index b78f7e7..99bc48d 100644
--- a/src/Keys.hh
+++ b/src/Keys.hh
@@ -19,7 +19,7 @@
19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
20// DEALINGS IN THE SOFTWARE. 20// DEALINGS IN THE SOFTWARE.
21 21
22// $Id: Keys.hh,v 1.24 2003/06/08 14:32:28 rathnor Exp $ 22// $Id: Keys.hh,v 1.25 2003/06/15 11:38:35 rathnor Exp $
23 23
24#ifndef KEYS_HH 24#ifndef KEYS_HH
25#define KEYS_HH 25#define KEYS_HH
@@ -50,6 +50,7 @@ public:
50 NEXTWORKSPACE, PREVWORKSPACE, 50 NEXTWORKSPACE, PREVWORKSPACE,
51 LEFTWORKSPACE, RIGHTWORKSPACE, 51 LEFTWORKSPACE, RIGHTWORKSPACE,
52 KILLWINDOW, NEXTWINDOW, PREVWINDOW, 52 KILLWINDOW, NEXTWINDOW, PREVWINDOW,
53 NEXTGROUP, PREVGROUP,
53 NEXTTAB, PREVTAB, FIRSTTAB, LASTTAB, MOVETABPREV, MOVETABNEXT, 54 NEXTTAB, PREVTAB, FIRSTTAB, LASTTAB, MOVETABPREV, MOVETABNEXT,
54 ATTACHLAST, DETACHCLIENT, 55 ATTACHLAST, DETACHCLIENT,
55 FOCUSUP, FOCUSDOWN, FOCUSLEFT, FOCUSRIGHT, 56 FOCUSUP, FOCUSDOWN, FOCUSLEFT, FOCUSRIGHT,
diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index f84c513..02d27b0 100644
--- a/src/fluxbox.cc
+++ b/src/fluxbox.cc
@@ -22,7 +22,7 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: fluxbox.cc,v 1.157 2003/06/12 14:32:08 fluxgen Exp $ 25// $Id: fluxbox.cc,v 1.158 2003/06/15 11:38:35 rathnor Exp $
26 26
27#include "fluxbox.hh" 27#include "fluxbox.hh"
28 28
@@ -1213,6 +1213,7 @@ void Fluxbox::handleKeyEvent(XKeyEvent &ke) {
1213 m_focused_window->clientWindow()); 1213 m_focused_window->clientWindow());
1214 } 1214 }
1215 break; 1215 break;
1216 case Keys::NEXTGROUP: //activate next group (params set right in Keys)
1216 case Keys::NEXTWINDOW: { //activate next window 1217 case Keys::NEXTWINDOW: { //activate next window
1217 unsigned int mods = Keys::cleanMods(ke.state); 1218 unsigned int mods = Keys::cleanMods(ke.state);
1218 if (mousescreen == 0) 1219 if (mousescreen == 0)
@@ -1229,6 +1230,7 @@ void Fluxbox::handleKeyEvent(XKeyEvent &ke) {
1229 mousescreen->nextFocus(m_key->getParam()); 1230 mousescreen->nextFocus(m_key->getParam());
1230 break; 1231 break;
1231 } 1232 }
1233 case Keys::PREVGROUP: //activate prev group (params set right in Keys)
1232 case Keys::PREVWINDOW: {//activate prev window 1234 case Keys::PREVWINDOW: {//activate prev window
1233 unsigned int mods = Keys::cleanMods(ke.state); 1235 unsigned int mods = Keys::cleanMods(ke.state);
1234 if (mousescreen == 0) 1236 if (mousescreen == 0)