frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xkb: remove XConvertCase. 

Since it's typedef'd to XkbConvertCase anyway and the headers are now split
from the client headers, simply get rid of it altogether.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
Peter Hutterer 2010-01-15 15:32:11 +10:00 committed by Keith Packard
parent d627dd9d1e
commit c8076f317e
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/xkbsrv.h
View File

@ -310,7 +310,6 @@ extern _X_EXPORT int DeviceButtonPress,DeviceButtonRelease;
#define _XkbIsPressEvent(t) (((t)==KeyPress)||((t)==DeviceKeyPress)) #define _XkbIsPressEvent(t) (((t)==KeyPress)||((t)==DeviceKeyPress))
#define _XkbIsReleaseEvent(t) (((t)==KeyRelease)||((t)==DeviceKeyRelease)) #define _XkbIsReleaseEvent(t) (((t)==KeyRelease)||((t)==DeviceKeyRelease))
#define XConvertCase(s,l,u) XkbConvertCase(s,l,u)
#undef IsKeypadKey #undef IsKeypadKey
#define IsKeypadKey(s) XkbKSIsKeypad(s) #define IsKeypadKey(s) XkbKSIsKeypad(s)

4
xkb/XKBMisc.c
View File

@ -162,7 +162,7 @@ BOOL replicated = FALSE;
syms= &xkb_syms_rtrn[XKB_OFFSET(i,0)]; syms= &xkb_syms_rtrn[XKB_OFFSET(i,0)];
if ((nSyms[i]>1)&&(syms[1]==NoSymbol)&&(syms[0]!=NoSymbol)) { if ((nSyms[i]>1)&&(syms[1]==NoSymbol)&&(syms[0]!=NoSymbol)) {
KeySym upper,lower; KeySym upper,lower;
XConvertCase(syms[0],&lower,&upper); XkbConvertCase(syms[0],&lower,&upper);
if (upper!=lower) { if (upper!=lower) {
xkb_syms_rtrn[XKB_OFFSET(i,0)]= lower; xkb_syms_rtrn[XKB_OFFSET(i,0)]= lower;
xkb_syms_rtrn[XKB_OFFSET(i,1)]= upper; xkb_syms_rtrn[XKB_OFFSET(i,1)]= upper;
@ -179,7 +179,7 @@ BOOL replicated = FALSE;
types_inout[i]= XkbKeypadIndex; types_inout[i]= XkbKeypadIndex;
else { else {
KeySym upper,lower; KeySym upper,lower;
XConvertCase(syms[0],&lower,&upper); XkbConvertCase(syms[0],&lower,&upper);
if ((syms[0]==lower)&&(syms[1]==upper)) if ((syms[0]==lower)&&(syms[1]==upper))
types_inout[i]= XkbAlphabeticIndex; types_inout[i]= XkbAlphabeticIndex;
} }