aboutsummaryrefslogtreecommitdiff
path: root/src/FbTk/KeyUtil.hh
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2003-12-30 18:11:44 (GMT)
committerfluxgen <fluxgen>2003-12-30 18:11:44 (GMT)
commit06eaec00ca01b38d5f431e58d55915401f99425b (patch)
treeb8e3f16962d39f42a932a28482ae60e4b9fba7fe /src/FbTk/KeyUtil.hh
parent35394a486cf9e08b585a532e885c462a4beddea1 (diff)
downloadfluxbox_paul-06eaec00ca01b38d5f431e58d55915401f99425b.zip
fluxbox_paul-06eaec00ca01b38d5f431e58d55915401f99425b.tar.bz2
use real mods for caps, num and scroll
Diffstat (limited to 'src/FbTk/KeyUtil.hh')
-rw-r--r--src/FbTk/KeyUtil.hh9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/FbTk/KeyUtil.hh b/src/FbTk/KeyUtil.hh
index d1f1706..5b5cb3e 100644
--- a/src/FbTk/KeyUtil.hh
+++ b/src/FbTk/KeyUtil.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: KeyUtil.hh,v 1.4 2003/12/16 17:06:51 fluxgen Exp $ 22// $Id: KeyUtil.hh,v 1.5 2003/12/30 18:10:43 fluxgen Exp $
23 23
24#ifndef FBTK_KEYUTIL_HH 24#ifndef FBTK_KEYUTIL_HH
25#define FBTK_KEYUTIL_HH 25#define FBTK_KEYUTIL_HH
@@ -65,9 +65,9 @@ public:
65 Strip out modifiers we want to ignore 65 Strip out modifiers we want to ignore
66 @return the cleaned state number 66 @return the cleaned state number
67 */ 67 */
68 static unsigned int cleanMods(unsigned int mods) { 68 unsigned int cleanMods(unsigned int mods) {
69 //remove numlock(Mod2), capslock and scrolllock(Mod5) 69 //remove numlock, capslock and scrolllock
70 return mods & ~(LockMask | Mod2Mask | Mod5Mask); 70 return mods & ~(m_capslock | m_numlock | m_scrolllock);
71 } 71 }
72 72
73 /** 73 /**
@@ -80,6 +80,7 @@ private:
80 void loadModmap(); 80 void loadModmap();
81 81
82 XModifierKeymap *m_modmap; 82 XModifierKeymap *m_modmap;
83 int m_capslock, m_numlock, m_scrolllock;
83 static std::auto_ptr<KeyUtil> s_keyutil; 84 static std::auto_ptr<KeyUtil> s_keyutil;
84}; 85};
85 86