summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarkt <markt>2007-03-18 19:39:30 (GMT)
committermarkt <markt>2007-03-18 19:39:30 (GMT)
commit4945b88e1b08fe88bcae8f0c8b571b8b379045b5 (patch)
tree64e605f1367b4f6a1a0593ea8c5bf996c6600766
parent7ba4f04a869328fd3233c7069dca6da605c9a0b4 (diff)
downloadfluxbox_lack-4945b88e1b08fe88bcae8f0c8b571b8b379045b5.zip
fluxbox_lack-4945b88e1b08fe88bcae8f0c8b571b8b379045b5.tar.bz2
function to find already existing keychains wasn't working properly
-rw-r--r--ChangeLog3
-rw-r--r--src/Keys.hh2
2 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 9959509..8955409 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
1 (Format: Year/Month/Day) 1 (Format: Year/Month/Day)
2Changes for 1.0rc3: 2Changes for 1.0rc3:
3*07/03/18:
4 * Fixed problem with new mouse binding code when using emacs keychains (Mark)
5 Keys.cc/hh
3*07/03/17: 6*07/03/17:
4 * Iconified, stuck windows weren't being moved to different workspaces (Mark) 7 * Iconified, stuck windows weren't being moved to different workspaces (Mark)
5 Screen.cc 8 Screen.cc
diff --git a/src/Keys.hh b/src/Keys.hh
index 0365cf8..c075d38 100644
--- a/src/Keys.hh
+++ b/src/Keys.hh
@@ -111,6 +111,8 @@ private:
111 111
112 t_key *find(int type_, unsigned int mod_, unsigned int key_, 112 t_key *find(int type_, unsigned int mod_, unsigned int key_,
113 int context_) { 113 int context_) {
114 // t_key ctor sets context_ of 0 to GLOBAL, so we must here too
115 context_ = context_ ? context_ : GLOBAL;
114 for (size_t i = 0; i < keylist.size(); i++) { 116 for (size_t i = 0; i < keylist.size(); i++) {
115 if (keylist[i]->type == type_ && keylist[i]->key == key_ && 117 if (keylist[i]->type == type_ && keylist[i]->key == key_ &&
116 (keylist[i]->context & context_) > 0 && keylist[i]->mod == 118 (keylist[i]->context & context_) > 0 && keylist[i]->mod ==