Remove KS macros available in XKBfilecommon.h now

A couple of the XkbcKS* macros become redundant with XKBfilecommon.h
split out in kbproto.

diff --git a/include/X11/extensions/XKBcommon.h b/include/X11/extensions/XKBcommon.h
index 21f8908..fa6d136 100644 (file)
--- a/include/X11/extensions/XKBcommon.h
+++ b/include/X11/extensions/XKBcommon.h
@@ -129,15 +129,8 @@ typedef struct _XkbcDesc {
     XkbGeometryPtr      geom;
 } XkbcDescRec, *XkbcDescPtr;
 
-#define _XkbcKSLower (1 << 0)
-#define _XkbcKSUpper (1 << 1)
-
 #define XkbcKSIsLower(k) (_XkbcKSCheckCase(k) & _XkbcKSLower)
 #define XkbcKSIsUpper(k) (_XkbcKSCheckCase(k) & _XkbcKSUpper)
-#define XkbcKSIsKeypad(k) \
-    (((k) >= XK_KP_Space) && ((k) <= XK_KP_Equal))
-#define XkbcKSIsDeadKey(k) \
-    (((k) >= XK_dead_grave) && ((k) <= XK_dead_semivoiced_sound))
 
 _XFUNCPROTOBEGIN
 

diff --git a/src/misc.c b/src/misc.c
index 98bdfc2..b42ab89 100644 (file)
--- a/src/misc.c
+++ b/src/misc.c
@@ -197,43 +197,43 @@ unsigned  set,rtrn;
        case 0:         /* latin 1 */
            if (((ks>=XK_A)&&(ks<=XK_Z))||
                ((ks>=XK_Agrave)&&(ks<=XK_THORN)&&(ks!=XK_multiply))) {
-               rtrn|= _XkbcKSUpper;
+               rtrn|= _XkbKSUpper;
            }
            if (((ks>=XK_a)&&(ks<=XK_z))||
                ((ks>=XK_agrave)&&(ks<=XK_ydiaeresis))) {
-               rtrn|= _XkbcKSLower;
+               rtrn|= _XkbKSLower;
            }
            break;
        case 1:         /* latin 2 */
            if (((ks>=XK_Aogonek)&&(ks<=XK_Zabovedot)&&(ks!=XK_breve))||
                ((ks>=XK_Racute)&&(ks<=XK_Tcedilla))) {
-               rtrn|= _XkbcKSUpper;
+               rtrn|= _XkbKSUpper;
            }
            if (((ks>=XK_aogonek)&&(ks<=XK_zabovedot)&&(ks!=XK_caron))||
                ((ks>=XK_racute)&&(ks<=XK_tcedilla))) {
-               rtrn|= _XkbcKSLower;
+               rtrn|= _XkbKSLower;
            }
            break;
        case 2:         /* latin 3 */
            if (((ks>=XK_Hstroke)&&(ks<=XK_Jcircumflex))||
                ((ks>=XK_Cabovedot)&&(ks<=XK_Scircumflex))) {
-               rtrn|= _XkbcKSUpper;
+               rtrn|= _XkbKSUpper;
            }
            if (((ks>=XK_hstroke)&&(ks<=XK_jcircumflex))||
                ((ks>=XK_cabovedot)&&(ks<=XK_scircumflex))) {
-               rtrn|= _XkbcKSLower;
+               rtrn|= _XkbKSLower;
            }
            break;
        case 3:         /* latin 4 */
            if (((ks>=XK_Rcedilla)&&(ks<=XK_Tslash))||
                (ks==XK_ENG)||
                ((ks>=XK_Amacron)&&(ks<=XK_Umacron))) {
-               rtrn|= _XkbcKSUpper;
+               rtrn|= _XkbKSUpper;
            }
            if (((ks>=XK_rcedilla)&&(ks<=XK_tslash))||
                (ks==XK_eng)||
                ((ks>=XK_amacron)&&(ks<=XK_umacron))) {
-               rtrn|= _XkbcKSLower;
+               rtrn|= _XkbKSLower;
            }
            break;
        case 18:                /* latin 8 */
@@ -245,7 +245,7 @@ unsigned    set,rtrn;
                (ks==XK_Sabovedot)||
                (ks==XK_Wdiaeresis)||
                ((ks>=XK_Wcircumflex)&&(ks<=XK_Ycircumflex))) {
-               rtrn|= _XkbcKSUpper;
+               rtrn|= _XkbKSUpper;
            }
            if ((ks==XK_babovedot)||
                (ks==XK_dabovedot)||
@@ -254,15 +254,15 @@ unsigned  set,rtrn;
                 ((ks>=XK_wgrave)&&(ks<=XK_wacute))||
                (ks==XK_ygrave)||
                ((ks>=XK_wdiaeresis)&&(ks<=XK_ycircumflex))) {
-               rtrn|= _XkbcKSLower;
+               rtrn|= _XkbKSLower;
            }
            break;
        case 19:                /* latin 9 */
            if ((ks==XK_OE)||(ks==XK_Ydiaeresis)) {
-               rtrn|= _XkbcKSUpper;
+               rtrn|= _XkbKSUpper;
            }
            if (ks==XK_oe) {
-               rtrn|= _XkbcKSLower;
+               rtrn|= _XkbKSLower;
            }
            break;
     }

diff --git a/src/xkbcomp/symbols.c b/src/xkbcomp/symbols.c
index 14f2f2f..8ac5fb5 100644 (file)
--- a/src/xkbcomp/symbols.c
+++ b/src/xkbcomp/symbols.c
@@ -1779,7 +1779,7 @@ FindAutomaticType(int width, KeySym * syms, Atom * typeNameRtrn,
         {
             *typeNameRtrn = XkbcInternAtom("ALPHABETIC", False);
         }
-        else if (syms && (XkbcKSIsKeypad(syms[0]) || XkbcKSIsKeypad(syms[1])))
+        else if (syms && (XkbKSIsKeypad(syms[0]) || XkbKSIsKeypad(syms[1])))
         {
             *typeNameRtrn = XkbcInternAtom("KEYPAD", False);
             *autoType = True;
@@ -1800,7 +1800,7 @@ FindAutomaticType(int width, KeySym * syms, Atom * typeNameRtrn,
                 *typeNameRtrn = XkbcInternAtom("FOUR_LEVEL_SEMIALPHABETIC",
                                               False);
 
-        else if (syms && (XkbcKSIsKeypad(syms[0]) || XkbcKSIsKeypad(syms[1])))
+        else if (syms && (XkbKSIsKeypad(syms[0]) || XkbKSIsKeypad(syms[1])))
             *typeNameRtrn = XkbcInternAtom("FOUR_LEVEL_KEYPAD", False);
         else
             *typeNameRtrn = XkbcInternAtom("FOUR_LEVEL", False);