Commit 56c3e7440ed92e03e46d2b7b77f14b917d8d9c53
2009-03-19T11:34:54
keysym: Coding style cleanup Mostly tab-to-space conversion plus a few style nits. Dropped the register keywords as I'm pretty sure modern compilers can be trusted to do the right thing.
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 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212
diff --git a/src/keysym.c b/src/keysym.c
index 216d6e0..9a419ba 100644
--- a/src/keysym.c
+++ b/src/keysym.c
@@ -36,123 +36,140 @@ authorization from the authors.
#include "ks_tables.h"
-char *XkbcKeysymToString(KeySym ks)
+char *
+XkbcKeysymToString(KeySym ks)
{
- register int i, n;
- int h;
- register int idx;
+ int i, n, h, idx;
const unsigned char *entry;
unsigned char val1, val2, val3, val4;
if (!ks || (ks & ((unsigned long) ~0x1fffffff)) != 0)
- return ((char *)NULL);
+ return NULL;
+
if (ks == XK_VoidSymbol)
- ks = 0;
- if (ks <= 0x1fffffff)
- {
- val1 = ks >> 24;
- val2 = (ks >> 16) & 0xff;
- val3 = (ks >> 8) & 0xff;
- val4 = ks & 0xff;
- i = ks % VTABLESIZE;
- h = i + 1;
- n = VMAXHASH;
- while ((idx = hashKeysym[i]))
- {
- entry = &_XkeyTable[idx];
- if ((entry[0] == val1) && (entry[1] == val2) &&
+ ks = 0;
+
+ if (ks <= 0x1fffffff) {
+ val1 = ks >> 24;
+ val2 = (ks >> 16) & 0xff;
+ val3 = (ks >> 8) & 0xff;
+ val4 = ks & 0xff;
+ i = ks % VTABLESIZE;
+ h = i + 1;
+ n = VMAXHASH;
+
+ while ((idx = hashKeysym[i])) {
+ entry = &_XkeyTable[idx];
+
+ if ((entry[0] == val1) && (entry[1] == val2) &&
(entry[2] == val3) && (entry[3] == val4))
- return ((char *)entry + 4);
- if (!--n)
- break;
- i += h;
- if (i >= VTABLESIZE)
- i -= VTABLESIZE;
- }
+ return ((char *)entry + 4);
+
+ if (!--n)
+ break;
+
+ i += h;
+ if (i >= VTABLESIZE)
+ i -= VTABLESIZE;
+ }
}
if (ks >= 0x01000100 && ks <= 0x0110ffff) {
KeySym val = ks & 0xffffff;
char *s;
int i;
+
if (val & 0xff0000)
i = 10;
else
i = 6;
+
s = malloc(i);
- if (s == NULL)
+ if (!s)
return s;
+
i--;
s[i--] = '\0';
- for (; i; i--){
+ for (; i; i--) {
val1 = val & 0xf;
val >>= 4;
if (val1 < 10)
- s[i] = '0'+ val1;
+ s[i] = '0' + val1;
else
- s[i] = 'A'+ val1 - 10;
+ s[i] = 'A' + val1 - 10;
}
s[i] = 'U';
return s;
}
- return ((char *) NULL);
+
+ return NULL;
}
KeySym
XkbcStringToKeysym(const char *s)
{
- register int i, n;
- int h;
- register unsigned long sig = 0;
- register const char *p = s;
- register int c;
- register int idx;
+ int i, n, h, c, idx;
+ unsigned long sig = 0;
+ const char *p = s;
const unsigned char *entry;
unsigned char sig1, sig2;
KeySym val;
while ((c = *p++))
- sig = (sig << 1) + c;
+ sig = (sig << 1) + c;
+
i = sig % KTABLESIZE;
h = i + 1;
sig1 = (sig >> 8) & 0xff;
sig2 = sig & 0xff;
n = KMAXHASH;
- while ((idx = hashString[i]))
- {
- entry = &_XkeyTable[idx];
- if ((entry[0] == sig1) && (entry[1] == sig2) &&
- !strcmp(s, (char *)entry + 6))
- {
- val = (entry[2] << 24) | (entry[3] << 16) |
- (entry[4] << 8) | entry[5];
- if (!val)
- val = XK_VoidSymbol;
- return val;
- }
- if (!--n)
- break;
- i += h;
- if (i >= KTABLESIZE)
- i -= KTABLESIZE;
+
+ while ((idx = hashString[i])) {
+ entry = &_XkeyTable[idx];
+
+ if ((entry[0] == sig1) && (entry[1] == sig2) &&
+ !strcmp(s, (char *)entry + 6))
+ {
+ val = (entry[2] << 24) | (entry[3] << 16) |
+ (entry[4] << 8) | entry[5];
+ if (!val)
+ val = XK_VoidSymbol;
+ return val;
+ }
+
+ if (!--n)
+ break;
+
+ i += h;
+ if (i >= KTABLESIZE)
+ i -= KTABLESIZE;
}
if (*s == 'U') {
- val = 0;
+ val = 0;
+
for (p = &s[1]; *p; p++) {
c = *p;
- if ('0' <= c && c <= '9') val = (val<<4)+c-'0';
- else if ('a' <= c && c <= 'f') val = (val<<4)+c-'a'+10;
- else if ('A' <= c && c <= 'F') val = (val<<4)+c-'A'+10;
- else return NoSymbol;
- if (val > 0x10ffff)
- return NoSymbol;
- }
- if (val < 0x20 || (val > 0x7e && val < 0xa0))
- return NoSymbol;
- if (val < 0x100)
- return val;
+
+ if ('0' <= c && c <= '9')
+ val = (val << 4) + c - '0';
+ else if ('a' <= c && c <= 'f')
+ val = (val << 4) + c - 'a' + 10;
+ else if ('A' <= c && c <= 'F')
+ val = (val << 4) + c - 'A' + 10;
+ else
+ return NoSymbol;
+
+ if (val > 0x10ffff)
+ return NoSymbol;
+ }
+
+ if (val < 0x20 || (val > 0x7e && val < 0xa0))
+ return NoSymbol;
+ if (val < 0x100)
+ return val;
return val | 0x01000000;
}
+
return NoSymbol;
}