aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2002-02-26 22:19:51 (GMT)
committerfluxgen <fluxgen>2002-02-26 22:19:51 (GMT)
commit5250540d6ca954989c7e7222d77418fd167f303f (patch)
treee13cc85dab7411a6142a32288300a208bf32d6b7
parentbdb0d00f2fb667f252defdc94b7701e89819f91a (diff)
downloadfluxbox_pavel-5250540d6ca954989c7e7222d77418fd167f303f.zip
fluxbox_pavel-5250540d6ca954989c7e7222d77418fd167f303f.tar.bz2
added SendToWorkspace
-rw-r--r--src/Keys.cc4
-rw-r--r--src/Keys.hh11
2 files changed, 11 insertions, 4 deletions
diff --git a/src/Keys.cc b/src/Keys.cc
index d52fdbf..ffc7a6e 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.11 2002/02/21 00:39:08 fluxgen Exp $ 22//$Id: Keys.cc,v 1.12 2002/02/26 22:19:43 fluxgen Exp $
23 23
24#ifdef HAVE_CONFIG_H 24#ifdef HAVE_CONFIG_H
25# include "config.h" 25# include "config.h"
@@ -94,6 +94,7 @@ Keys::t_actionstr Keys::m_actionlist[] = {
94 {"Workspace10", WORKSPACE10}, 94 {"Workspace10", WORKSPACE10},
95 {"Workspace11", WORKSPACE11}, 95 {"Workspace11", WORKSPACE11},
96 {"Workspace12", WORKSPACE12}, 96 {"Workspace12", WORKSPACE12},
97 {"SendToWorkspace", SENDTOWORKSPACE},
97 {"NextWorkspace", NEXTWORKSPACE}, 98 {"NextWorkspace", NEXTWORKSPACE},
98 {"PrevWorkspace", PREVWORKSPACE}, 99 {"PrevWorkspace", PREVWORKSPACE},
99 {"LeftWorkspace", LEFTWORKSPACE}, 100 {"LeftWorkspace", LEFTWORKSPACE},
@@ -279,6 +280,7 @@ bool Keys::load(char *filename) {
279 strlen(getActionStr(Keys::EXECUTE))); 280 strlen(getActionStr(Keys::EXECUTE)));
280 break; 281 break;
281 case WORKSPACE: 282 case WORKSPACE:
283 case SENDTOWORKSPACE:
282 if (argc + 1 < val.size()) 284 if (argc + 1 < val.size())
283 last_key->param = atoi( val[argc+1].c_str()); 285 last_key->param = atoi( val[argc+1].c_str());
284 else 286 else
diff --git a/src/Keys.hh b/src/Keys.hh
index 8c018bb..330a609 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.7 2002/02/20 23:10:48 fluxgen Exp $ 22// $Id: Keys.hh,v 1.8 2002/02/26 22:19:51 fluxgen Exp $
23 23
24#ifndef KEYS_HH 24#ifndef KEYS_HH
25#define KEYS_HH 25#define KEYS_HH
@@ -31,15 +31,20 @@
31class Keys 31class Keys
32{ 32{
33public: 33public:
34enum KeyAction{ 34
35 enum KeyAction{
35 ICONIFY=0, 36 ICONIFY=0,
36 RAISE, LOWER, 37 RAISE, LOWER,
37 CLOSE, 38 CLOSE,
38 ABORTKEYCHAIN, 39 ABORTKEYCHAIN,
39 WORKSPACE, 40 WORKSPACE,
40 WORKSPACE1, WORKSPACE2, WORKSPACE3, WORKSPACE4, 41 WORKSPACE1, WORKSPACE2, WORKSPACE3, WORKSPACE4,
41 WORKSPACE5, WORKSPACE6, WORKSPACE7, WORKSPACE8, 42 WORKSPACE5, WORKSPACE6, WORKSPACE7, WORKSPACE8,
42 WORKSPACE9, WORKSPACE10, WORKSPACE11, WORKSPACE12, 43 WORKSPACE9, WORKSPACE10, WORKSPACE11, WORKSPACE12,
44 SENDTOWORKSPACE,
45 SENDTOWORKSPACE1, SENDTOWORKSPACE2, SENDTOWORKSPACE3, SENDTOWORKSPACE4,
46 SENDTOWORKSPACE5, SENDTOWORKSPACE6, SENDTOWORKSPACE7, SENDTOWORKSPACE8,
47 SENDTOWORKSPACE9, SENDTOWORKSPACE10, SENDTOWORKSPACE11, SENDTOWORKSPACE12,
43 NEXTWORKSPACE, PREVWORKSPACE, 48 NEXTWORKSPACE, PREVWORKSPACE,
44 LEFTWORKSPACE, RIGHTWORKSPACE, 49 LEFTWORKSPACE, RIGHTWORKSPACE,
45 KILLWINDOW, NEXTWINDOW, PREVWINDOW, 50 KILLWINDOW, NEXTWINDOW, PREVWINDOW,