summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2010-01-14 17:12:07 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2010-01-19 14:39:46 +1300
commit5d3fd45431f17dfac15e0b289ee7651de1fb3f86 (patch)
tree3700ce763aadd6942b6425161e32a72871051583
parenta478ecaec9c7392df423ffdab89966f3ccad0e46 (diff)
xkb: remove IsKeypadKey define, only used in two places.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Fernando Carrijo <fcarrijo@yahoo.com.br>
-rw-r--r--include/xkbsrv.h3
-rw-r--r--xkb/XKBMisc.c2
2 files changed, 1 insertions, 4 deletions
diff --git a/include/xkbsrv.h b/include/xkbsrv.h
index 7b8a96eb3..d2c16d745 100644
--- a/include/xkbsrv.h
+++ b/include/xkbsrv.h
@@ -311,9 +311,6 @@ extern _X_EXPORT int DeviceButtonPress,DeviceButtonRelease;
#define _XkbIsReleaseEvent(t) (((t)==KeyRelease)||((t)==DeviceKeyRelease))
#define XConvertCase(s,l,u) XkbConvertCase(s,l,u)
-#undef IsKeypadKey
-#define IsKeypadKey(s) XkbKSIsKeypad(s)
-
#define Status int
#ifndef True
diff --git a/xkb/XKBMisc.c b/xkb/XKBMisc.c
index 71fa04467..f39e06a23 100644
--- a/xkb/XKBMisc.c
+++ b/xkb/XKBMisc.c
@@ -175,7 +175,7 @@ BOOL replicated = FALSE;
}
}
if (((protected&(1<<i))==0)&&(types_inout[i]==XkbTwoLevelIndex)) {
- if (IsKeypadKey(syms[0])||IsKeypadKey(syms[1]))
+ if (XkbKSIsKeypad(syms[0])||XkbKSIsKeypad(syms[1]))
types_inout[i]= XkbKeypadIndex;
else {
KeySym upper,lower;