aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Tiefenbruck <mark@fluxbox.org>2008-11-02 00:03:32 (GMT)
committerMark Tiefenbruck <mark@fluxbox.org>2008-11-02 00:03:32 (GMT)
commitf5fdbab98c437fe4eb5f74d82152a9a9ef7a47ed (patch)
tree11c703b7633fc4723075453165cd0a5906e55530
parent3b9611b61ddc023225092a85b21867131fb363cc (diff)
downloadfluxbox-f5fdbab98c437fe4eb5f74d82152a9a9ef7a47ed.zip
fluxbox-f5fdbab98c437fe4eb5f74d82152a9a9ef7a47ed.tar.bz2
don't reload keys file on modifier map events, just re-grab keys
-rw-r--r--ChangeLog3
-rw-r--r--src/Keys.cc4
-rw-r--r--src/Keys.hh3
-rw-r--r--src/fluxbox.cc2
4 files changed, 11 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 67ee11d..bc9f25a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
1 (Format: Year/Month/Day) 1 (Format: Year/Month/Day)
2Changes for 1.1.2 2Changes for 1.1.2
3*08/11/01:
4 * Don't reload keys file when modifier map changes, just regrab (Mark)
5 Keys.cc/hh fluxbox.cc
3*08/10/15: 6*08/10/15:
4 * Don't allow resizing to negative dimensions (Mathias) 7 * Don't allow resizing to negative dimensions (Mathias)
5 Window.cc/hh 8 Window.cc/hh
diff --git a/src/Keys.cc b/src/Keys.cc
index 658820e..ac25588 100644
--- a/src/Keys.cc
+++ b/src/Keys.cc
@@ -571,6 +571,10 @@ void Keys::reconfigure() {
571 m_reloader->checkReload(); 571 m_reloader->checkReload();
572} 572}
573 573
574void Keys::regrab() {
575 setKeyMode(m_keylist);
576}
577
574void Keys::keyMode(const string& keyMode) { 578void Keys::keyMode(const string& keyMode) {
575 keyspace_t::iterator it = m_map.find(keyMode + ":"); 579 keyspace_t::iterator it = m_map.find(keyMode + ":");
576 if (it == m_map.end()) 580 if (it == m_map.end())
diff --git a/src/Keys.hh b/src/Keys.hh
index 9502643..af64a1d 100644
--- a/src/Keys.hh
+++ b/src/Keys.hh
@@ -73,6 +73,9 @@ public:
73 /// unregister window 73 /// unregister window
74 void unregisterWindow(Window win); 74 void unregisterWindow(Window win);
75 75
76 /// grab keys again when keymap changes
77 void regrab();
78
76 const std::string& filename() const { return m_filename; } 79 const std::string& filename() const { return m_filename; }
77 /** 80 /**
78 Load configuration from file 81 Load configuration from file
diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index 706556c..93768da 100644
--- a/src/fluxbox.cc
+++ b/src/fluxbox.cc
@@ -772,7 +772,7 @@ void Fluxbox::handleEvent(XEvent * const e) {
772 XRefreshKeyboardMapping(&e->xmapping); 772 XRefreshKeyboardMapping(&e->xmapping);
773 FbTk::KeyUtil::instance().init(); // reinitialise the key utils 773 FbTk::KeyUtil::instance().init(); // reinitialise the key utils
774 // reconfigure keys (if the mapping changes, they don't otherwise update 774 // reconfigure keys (if the mapping changes, they don't otherwise update
775 m_key->reload(); 775 m_key->regrab();
776 } 776 }
777 break; 777 break;
778 case CreateNotify: 778 case CreateNotify: