StreetLight
/
libxkbcommon
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add xkbcommon macro for XkbKSIsKeypad and XkbKSIsDeadKey(k) 

IsKeypad is used in symbols, but we'll just grab them both. It might be
better to split parts of XKBfile.h out eventually.
master
Dan Nicholson 2009-03-28 15:51:06 -07:00
parent a53b9b1ed3
commit 28de09e515
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/X11/extensions/XKBcommon.h
View File

@ -52,6 +52,11 @@ typedef struct _XkbcDesc {
XkbGeometryPtr geom;
} XkbcDescRec, *XkbcDescPtr;
#define XkbcKSIsKeypad(k) \
(((k) >= XK_KP_Space) && ((k) <= XK_KP_Equal))
#define XkbcKSIsDeadKey(k) \
(((k) >= XK_dead_grave) && ((k) <= XK_dead_semivoiced_sound))
_XFUNCPROTOBEGIN
extern char *

4
src/xkbcomp/symbols.c
View File

@ -1802,7 +1802,7 @@ FindAutomaticType(int width, KeySym * syms, Atom * typeNameRtrn,
{
*typeNameRtrn = XkbcInternAtom("ALPHABETIC", False);
}
else if (syms && (XkbKSIsKeypad(syms[0]) || XkbKSIsKeypad(syms[1])))
else if (syms && (XkbcKSIsKeypad(syms[0]) || XkbcKSIsKeypad(syms[1])))
{
*typeNameRtrn = XkbcInternAtom("KEYPAD", False);
*autoType = True;
@ -1823,7 +1823,7 @@ FindAutomaticType(int width, KeySym * syms, Atom * typeNameRtrn,
*typeNameRtrn = XkbcInternAtom("FOUR_LEVEL_SEMIALPHABETIC",
False);
else if (syms && (XkbKSIsKeypad(syms[0]) || XkbKSIsKeypad(syms[1])))
else if (syms && (XkbcKSIsKeypad(syms[0]) || XkbcKSIsKeypad(syms[1])))
*typeNameRtrn = XkbcInternAtom("FOUR_LEVEL_KEYPAD", False);
else
*typeNameRtrn = XkbcInternAtom("FOUR_LEVEL", False);