aboutsummaryrefslogtreecommitdiff
path: root/src/FbTk
diff options
context:
space:
mode:
Diffstat (limited to 'src/FbTk')
-rw-r--r--src/FbTk/KeyUtil.cc8
-rw-r--r--src/FbTk/KeyUtil.hh10
2 files changed, 9 insertions, 9 deletions
diff --git a/src/FbTk/KeyUtil.cc b/src/FbTk/KeyUtil.cc
index 952463c..34f2e4d 100644
--- a/src/FbTk/KeyUtil.cc
+++ b/src/FbTk/KeyUtil.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: KeyUtil.cc,v 1.5 2003/12/30 18:11:44 fluxgen Exp $ 22// $Id: KeyUtil.cc,v 1.6 2003/12/31 11:57:47 fluxgen Exp $
23 23
24#include "KeyUtil.hh" 24#include "KeyUtil.hh"
25#include "App.hh" 25#include "App.hh"
@@ -102,9 +102,9 @@ void KeyUtil::loadModmap() {
102*/ 102*/
103void KeyUtil::grabKey(unsigned int key, unsigned int mod) { 103void KeyUtil::grabKey(unsigned int key, unsigned int mod) {
104 Display *display = App::instance()->display(); 104 Display *display = App::instance()->display();
105 const unsigned int capsmod = instance().m_capslock; 105 const unsigned int capsmod = instance().capslock();
106 const unsigned int nummod = instance().m_numlock; 106 const unsigned int nummod = instance().numlock();
107 const unsigned int scrollmod = instance().m_scrolllock; 107 const unsigned int scrollmod = instance().scrolllock();
108 108
109 for (int screen=0; screen<ScreenCount(display); screen++) { 109 for (int screen=0; screen<ScreenCount(display); screen++) {
110 110
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; }
81private: 81private:
82 void loadModmap(); 82 void loadModmap();
83 83