Commit 3dee8ac99970f4d9dfabee19a271816f1cfc38da
2009-04-12T12:14:36
misc: Coding-style cleanup
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149
diff --git a/src/misc.c b/src/misc.c
index dcdc26f..744c588 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -192,82 +192,70 @@ XkbcEnsureSafeMapName(char *name)
unsigned
_XkbcKSCheckCase(KeySym ks)
{
-unsigned set,rtrn;
+ unsigned set = (ks & (~0xff)) >> 8;
+ unsigned rtrn = 0;
- set= (ks & (~0xff)) >> 8;
- rtrn= 0;
switch (set) {
- case 0: /* latin 1 */
- if (((ks>=XK_A)&&(ks<=XK_Z))||
- ((ks>=XK_Agrave)&&(ks<=XK_THORN)&&(ks!=XK_multiply))) {
- rtrn|= _XkbKSUpper;
- }
- if (((ks>=XK_a)&&(ks<=XK_z))||
- ((ks>=XK_agrave)&&(ks<=XK_ydiaeresis))) {
- rtrn|= _XkbKSLower;
- }
- break;
- case 1: /* latin 2 */
- if (((ks>=XK_Aogonek)&&(ks<=XK_Zabovedot)&&(ks!=XK_breve))||
- ((ks>=XK_Racute)&&(ks<=XK_Tcedilla))) {
- rtrn|= _XkbKSUpper;
- }
- if (((ks>=XK_aogonek)&&(ks<=XK_zabovedot)&&(ks!=XK_caron))||
- ((ks>=XK_racute)&&(ks<=XK_tcedilla))) {
- rtrn|= _XkbKSLower;
- }
- break;
- case 2: /* latin 3 */
- if (((ks>=XK_Hstroke)&&(ks<=XK_Jcircumflex))||
- ((ks>=XK_Cabovedot)&&(ks<=XK_Scircumflex))) {
- rtrn|= _XkbKSUpper;
- }
- if (((ks>=XK_hstroke)&&(ks<=XK_jcircumflex))||
- ((ks>=XK_cabovedot)&&(ks<=XK_scircumflex))) {
- rtrn|= _XkbKSLower;
- }
- break;
- case 3: /* latin 4 */
- if (((ks>=XK_Rcedilla)&&(ks<=XK_Tslash))||
- (ks==XK_ENG)||
- ((ks>=XK_Amacron)&&(ks<=XK_Umacron))) {
- rtrn|= _XkbKSUpper;
- }
- if (((ks>=XK_rcedilla)&&(ks<=XK_tslash))||
- (ks==XK_eng)||
- ((ks>=XK_amacron)&&(ks<=XK_umacron))) {
- rtrn|= _XkbKSLower;
- }
- break;
- case 18: /* latin 8 */
- if ((ks==XK_Babovedot)||
- ((ks>=XK_Dabovedot)&&(ks<=XK_Wacute))||
- ((ks>=XK_Ygrave)&&(ks<=XK_Fabovedot))||
- (ks==XK_Mabovedot)||
- (ks==XK_Pabovedot)||
- (ks==XK_Sabovedot)||
- (ks==XK_Wdiaeresis)||
- ((ks>=XK_Wcircumflex)&&(ks<=XK_Ycircumflex))) {
- rtrn|= _XkbKSUpper;
- }
- if ((ks==XK_babovedot)||
- (ks==XK_dabovedot)||
- (ks==XK_fabovedot)||
- (ks==XK_mabovedot)||
- ((ks>=XK_wgrave)&&(ks<=XK_wacute))||
- (ks==XK_ygrave)||
- ((ks>=XK_wdiaeresis)&&(ks<=XK_ycircumflex))) {
- rtrn|= _XkbKSLower;
- }
- break;
- case 19: /* latin 9 */
- if ((ks==XK_OE)||(ks==XK_Ydiaeresis)) {
- rtrn|= _XkbKSUpper;
- }
- if (ks==XK_oe) {
- rtrn|= _XkbKSLower;
- }
- break;
+ case 0: /* latin 1 */
+ if ((ks >= XK_A && ks <= XK_Z) ||
+ (ks >= XK_Agrave && ks <= XK_THORN && ks != XK_multiply))
+ rtrn |= _XkbKSUpper;
+ if ((ks >= XK_a && ks <= XK_z) ||
+ (ks >= XK_agrave && ks <= XK_ydiaeresis))
+ rtrn |= _XkbKSLower;
+ break;
+ case 1: /* latin 2 */
+ if ((ks >= XK_Aogonek && ks <= XK_Zabovedot && ks != XK_breve) ||
+ (ks >= XK_Racute && ks<=XK_Tcedilla))
+ rtrn |= _XkbKSUpper;
+ if ((ks >= XK_aogonek && ks <= XK_zabovedot && ks != XK_caron) ||
+ (ks >= XK_racute && ks <= XK_tcedilla))
+ rtrn |= _XkbKSLower;
+ break;
+ case 2: /* latin 3 */
+ if ((ks >= XK_Hstroke && ks <= XK_Jcircumflex) ||
+ (ks >= XK_Cabovedot && ks <= XK_Scircumflex))
+ rtrn |= _XkbKSUpper;
+ if ((ks >= XK_hstroke && ks <= XK_jcircumflex) ||
+ (ks >= XK_cabovedot && ks <= XK_scircumflex))
+ rtrn |= _XkbKSLower;
+ break;
+ case 3: /* latin 4 */
+ if ((ks >= XK_Rcedilla && ks <= XK_Tslash) ||
+ (ks == XK_ENG) ||
+ (ks >= XK_Amacron && ks <= XK_Umacron))
+ rtrn |= _XkbKSUpper;
+ if ((ks >= XK_rcedilla && ks <= XK_tslash) ||
+ (ks == XK_eng) ||
+ (ks >= XK_amacron && ks <= XK_umacron))
+ rtrn |= _XkbKSLower;
+ break;
+ case 18: /* latin 8 */
+ if ((ks == XK_Babovedot) ||
+ (ks >= XK_Dabovedot && ks <= XK_Wacute) ||
+ (ks >= XK_Ygrave && ks <= XK_Fabovedot) ||
+ (ks == XK_Mabovedot) ||
+ (ks == XK_Pabovedot) ||
+ (ks == XK_Sabovedot) ||
+ (ks == XK_Wdiaeresis) ||
+ (ks >= XK_Wcircumflex && ks <= XK_Ycircumflex))
+ rtrn |= _XkbKSUpper;
+ if ((ks == XK_babovedot) ||
+ (ks == XK_dabovedot) ||
+ (ks == XK_fabovedot) ||
+ (ks == XK_mabovedot) ||
+ (ks >= XK_wgrave && ks <= XK_wacute) ||
+ (ks == XK_ygrave) ||
+ (ks >= XK_wdiaeresis && ks <= XK_ycircumflex))
+ rtrn |= _XkbKSLower;
+ break;
+ case 19: /* latin 9 */
+ if (ks == XK_OE || ks == XK_Ydiaeresis)
+ rtrn |= _XkbKSUpper;
+ if (ks == XK_oe)
+ rtrn |= _XkbKSLower;
+ break;
}
+
return rtrn;
}