diff options
Diffstat (limited to 'src/FbTk/KeyUtil.hh')
-rw-r--r-- | src/FbTk/KeyUtil.hh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/FbTk/KeyUtil.hh b/src/FbTk/KeyUtil.hh index a5a224a..c00d64d 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.6 2003/12/31 00:39:26 fluxgen Exp $ | 22 | // $Id: KeyUtil.hh,v 1.7 2003/12/31 11:57:47 fluxgen Exp $ |
23 | 23 | ||
24 | #ifndef FBTK_KEYUTIL_HH | 24 | #ifndef FBTK_KEYUTIL_HH |
25 | #define FBTK_KEYUTIL_HH | 25 | #define FBTK_KEYUTIL_HH |
@@ -67,7 +67,7 @@ public: | |||
67 | */ | 67 | */ |
68 | unsigned int cleanMods(unsigned int mods) { | 68 | unsigned int cleanMods(unsigned int mods) { |
69 | //remove numlock, capslock and scrolllock | 69 | //remove numlock, capslock and scrolllock |
70 | return mods & ~(m_capslock | m_numlock | m_scrolllock); | 70 | return mods & ~(capslock() | numlock() | scrolllock()); |
71 | } | 71 | } |
72 | 72 | ||
73 | /** | 73 | /** |
@@ -75,9 +75,9 @@ public: | |||
75 | @return corresponding modifier mask | 75 | @return corresponding modifier mask |
76 | */ | 76 | */ |
77 | static unsigned int keycodeToModmask(unsigned int keycode); | 77 | static unsigned int keycodeToModmask(unsigned int keycode); |
78 | int numlock() const { return m_numlock; } | 78 | int numlock() const { return Mod2Mask; } //m_numlock; } |
79 | int capslock() const { return m_capslock; } | 79 | int capslock() const { return LockMask; } //m_capslock; } |
80 | int scrolllock() const { return m_scrolllock; } | 80 | int scrolllock() const { return Mod5Mask; } //m_scrolllock; } |
81 | private: | 81 | private: |
82 | void loadModmap(); | 82 | void loadModmap(); |
83 | 83 | ||