aboutsummaryrefslogtreecommitdiff
path: root/src/Keys.cc
diff options
context:
space:
mode:
authorrathnor <rathnor>2003-02-02 16:32:41 (GMT)
committerrathnor <rathnor>2003-02-02 16:32:41 (GMT)
commit1b063dcea92e0a7ac5008518fc5c13f03c055f54 (patch)
tree29d5b622c0870f06a94086ed463ab90e23bc673e /src/Keys.cc
parent5244fc32447d2649a52a06dc84d96da94e9fd715 (diff)
downloadfluxbox_pavel-1b063dcea92e0a7ac5008518fc5c13f03c055f54.zip
fluxbox_pavel-1b063dcea92e0a7ac5008518fc5c13f03c055f54.tar.bz2
Integration of new Layering code, plus updates to the layering code itself
- new KeyActions: Raise/LowerLayer, AlwaysOnTop/Bottom, Top/BottomLayer Added a "Quit" KeyAction
Diffstat (limited to 'src/Keys.cc')
-rw-r--r--src/Keys.cc12
1 files changed, 10 insertions, 2 deletions
diff --git a/src/Keys.cc b/src/Keys.cc
index 96452d3..5343634 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.21 2002/12/01 13:41:57 rathnor Exp $ 22//$Id: Keys.cc,v 1.22 2003/02/02 16:32:37 rathnor Exp $
23 23
24 24
25#include "Keys.hh" 25#include "Keys.hh"
@@ -72,6 +72,12 @@ Keys::t_actionstr Keys::m_actionlist[] = {
72 {"Minimize", ICONIFY}, 72 {"Minimize", ICONIFY},
73 {"Raise", RAISE}, 73 {"Raise", RAISE},
74 {"Lower", LOWER}, 74 {"Lower", LOWER},
75 {"RaiseLayer", RAISELAYER},
76 {"LowerLayer", LOWERLAYER},
77 {"TopLayer", TOPLAYER},
78 {"BottomLayer", BOTTOMLAYER},
79 {"AlwaysOnTop", TOPLAYER},
80 {"AlwaysOnBottom", BOTTOMLAYER},
75 {"Close", CLOSE}, 81 {"Close", CLOSE},
76 {"AbortKeychain", ABORTKEYCHAIN}, 82 {"AbortKeychain", ABORTKEYCHAIN},
77 {"Workspace", WORKSPACE}, 83 {"Workspace", WORKSPACE},
@@ -122,6 +128,7 @@ Keys::t_actionstr Keys::m_actionlist[] = {
122 {"ToggleDecor", TOGGLEDECOR}, 128 {"ToggleDecor", TOGGLEDECOR},
123 {"ToggleTab", TOGGLETAB}, 129 {"ToggleTab", TOGGLETAB},
124 {"RootMenu", ROOTMENU}, 130 {"RootMenu", ROOTMENU},
131 {"Quit", QUIT},
125 {0, LASTKEYGRAB} 132 {0, LASTKEYGRAB}
126}; 133};
127 134
@@ -249,8 +256,9 @@ bool Keys::load(const char *filename) {
249 256
250 for (i=0; i< LASTKEYGRAB; i++) { 257 for (i=0; i< LASTKEYGRAB; i++) {
251 // +1 on the val[argc] because we dont want to compare the ':' 258 // +1 on the val[argc] because we dont want to compare the ':'
252 if (strcasecmp(m_actionlist[i].string, val[argc].c_str()+1) == 0) 259 if (strcasecmp(m_actionlist[i].string, val[argc].c_str()+1) == 0) {
253 break; 260 break;
261 }
254 } 262 }
255 263
256 if (i < LASTKEYGRAB ) { 264 if (i < LASTKEYGRAB ) {