M src/FbTk/KeyUtil.cc → src/FbTk/KeyUtil.cc

@@ -19,7 +19,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: KeyUtil.cc,v 1.5 2003/12/30 18:11:44 fluxgen Exp $
+// $Id: KeyUtil.cc,v 1.6 2003/12/31 11:57:47 fluxgen Exp $
 
 #include "KeyUtil.hh"
 #include "App.hh"
@@ -102,9 +102,9 @@ and with numlock,capslock and scrollock
 */
 void KeyUtil::grabKey(unsigned int key, unsigned int mod) {
     Display *display = App::instance()->display();
-    const unsigned int capsmod = instance().m_capslock;
-    const unsigned int nummod = instance().m_numlock;
-    const unsigned int scrollmod = instance().m_scrolllock;
+    const unsigned int capsmod = instance().capslock();
+    const unsigned int nummod = instance().numlock();
+    const unsigned int scrollmod = instance().scrolllock();
     
     for (int screen=0; screen<ScreenCount(display); screen++) {
 		

M src/FbTk/KeyUtil.hh → src/FbTk/KeyUtil.hh

@@ -19,7 +19,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: KeyUtil.hh,v 1.6 2003/12/31 00:39:26 fluxgen Exp $
+// $Id: KeyUtil.hh,v 1.7 2003/12/31 11:57:47 fluxgen Exp $
 
 #ifndef FBTK_KEYUTIL_HH
 #define FBTK_KEYUTIL_HH
@@ -67,7 +67,7 @@ @return the cleaned state number
     */
     unsigned int cleanMods(unsigned int mods) {
         //remove numlock, capslock and scrolllock
-         return mods & ~(m_capslock | m_numlock | m_scrolllock);
+         return mods & ~(capslock() | numlock() | scrolllock());
     }
 
     /**
@@ -75,9 +75,9 @@ Convert the specified key into appropriate modifier mask
        @return corresponding modifier mask
     */
     static unsigned int keycodeToModmask(unsigned int keycode);
-    int numlock() const { return m_numlock; }
-    int capslock() const { return m_capslock; }
-    int scrolllock() const { return m_scrolllock; }
+    int numlock() const { return Mod2Mask; } //m_numlock; }
+    int capslock() const { return LockMask; } //m_capslock; }
+    int scrolllock() const { return Mod5Mask; } //m_scrolllock; }
 private:
     void loadModmap();