Commit dd85790c73064715436b96fec5af7704e229a3d9
2012-07-13T17:51:26
Move InitCanonicalKeyTypes to keytypes.c It's only got one call site and it's in keytypes.c, so move it there and make it static. Signed-off-by: Ran Benita <ran234@gmail.com>
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 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309
diff --git a/src/misc.c b/src/misc.c
index 1cb9baf..7a7ed7f 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -27,138 +27,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include "xkb-priv.h"
#include "alloc.h"
-static struct xkb_kt_map_entry map2Level[]= {
- {
- .level = ShiftMask,
- .mods = {.mask = 1, .vmods = ShiftMask, .real_mods = 0 }
- }
-};
-
-static struct xkb_kt_map_entry mapAlpha[]= {
- {
- .level = ShiftMask,
- .mods = { .mask = 1, .vmods = ShiftMask, .real_mods = 0 }
- },
- {
- .level = LockMask,
- .mods = { .mask = 0, .vmods = LockMask, .real_mods = 0 }
- }
-};
-
-static struct xkb_mods preAlpha[]= {
- { .mask = 0, .vmods = 0, .real_mods = 0 },
- { .mask = LockMask, .vmods = LockMask, .real_mods = 0 }
-};
-
-#define NL_VMOD_MASK 0
-static struct xkb_kt_map_entry mapKeypad[]= {
- {
- .level = ShiftMask,
- .mods = { .mask = 1, .vmods = ShiftMask, .real_mods = 0 }
- },
- {
- .level = 0,
- .mods = { .mask = 1, .vmods = 0, .real_mods = NL_VMOD_MASK }
- }
-};
-
-static const struct xkb_key_type canonicalTypes[XkbNumRequiredTypes] = {
- {
- .mods = { .mask = 0, .vmods = 0, .real_mods = 0 },
- .num_levels = 1,
- .preserve = NULL,
- .name = NULL,
- .level_names = NULL
- },
- {
- .mods = { .mask = ShiftMask, .vmods = ShiftMask, .real_mods = 0 },
- .num_levels = 2,
- .map = darray_lit(map2Level),
- .preserve = NULL,
- .name = NULL,
- .level_names = NULL
- },
- {
- .mods = { .mask = ShiftMask|LockMask, .vmods = ShiftMask|LockMask, .real_mods = 0 },
- .num_levels = 2,
- .map = darray_lit(mapAlpha),
- .preserve = preAlpha,
- .name = NULL,
- .level_names = NULL
- },
- {
- .mods = { .mask = ShiftMask, .vmods = ShiftMask, .real_mods = NL_VMOD_MASK },
- .num_levels = 2,
- .map = darray_lit(mapKeypad),
- .preserve = NULL,
- .name = NULL,
- .level_names = NULL
- }
-};
-
-int
-XkbcInitCanonicalKeyTypes(struct xkb_keymap *keymap, unsigned which,
- int keypadVMod)
-{
- struct xkb_client_map * map;
- const struct xkb_key_type *from;
- int rtrn;
-
- if (!keymap)
- return BadMatch;
-
- rtrn = XkbcAllocClientMap(keymap, XkbKeyTypesMask, XkbNumRequiredTypes);
- if (rtrn != Success)
- return rtrn;
-
- map = keymap->map;
- if ((which & XkbAllRequiredTypes) == 0)
- return Success;
-
- rtrn = Success;
- from = canonicalTypes;
-
- if (which & XkbOneLevelMask)
- rtrn = XkbcCopyKeyType(&from[XkbOneLevelIndex],
- &darray_item(map->types, XkbOneLevelIndex));
-
- if ((which & XkbTwoLevelMask) && (rtrn == Success))
- rtrn = XkbcCopyKeyType(&from[XkbTwoLevelIndex],
- &darray_item(map->types, XkbTwoLevelIndex));
-
- if ((which & XkbAlphabeticMask) && (rtrn == Success))
- rtrn = XkbcCopyKeyType(&from[XkbAlphabeticIndex],
- &darray_item(map->types, XkbAlphabeticIndex));
-
- if ((which & XkbKeypadMask) && (rtrn == Success)) {
- struct xkb_key_type * type;
-
- rtrn = XkbcCopyKeyType(&from[XkbKeypadIndex],
- &darray_item(map->types, XkbKeypadIndex));
- type = &darray_item(map->types, XkbKeypadIndex);
-
- if ((keypadVMod >= 0) && (keypadVMod < XkbNumVirtualMods) &&
- (rtrn == Success)) {
- struct xkb_kt_map_entry *entry;
- type->mods.vmods = (1 << keypadVMod);
-
- entry = &darray_item(type->map, 0);
- entry->mods.mask = ShiftMask;
- entry->mods.real_mods = ShiftMask;
- entry->mods.vmods = 0;
- entry->level = 1;
-
- entry = &darray_item(type->map, 1);
- entry->mods.mask = 0;
- entry->mods.real_mods = 0;
- entry->mods.vmods = (1 << keypadVMod);
- entry->level = 1;
- }
- }
-
- return Success;
-}
-
unsigned
_XkbcKSCheckCase(xkb_keysym_t ks)
{
diff --git a/src/xkb-priv.h b/src/xkb-priv.h
index 02b847c..59d2821 100644
--- a/src/xkb-priv.h
+++ b/src/xkb-priv.h
@@ -456,10 +456,6 @@ xkb_map_new_from_kccgst(struct xkb_context *ctx,
extern int
xkb_context_take_file_id(struct xkb_context *ctx);
-extern int
-XkbcInitCanonicalKeyTypes(struct xkb_keymap *keymap, unsigned which,
- int keypadVMod);
-
extern unsigned
_XkbcKSCheckCase(xkb_keysym_t sym);
diff --git a/src/xkbcomp/keytypes.c b/src/xkbcomp/keytypes.c
index 900c345..c38ac4f 100644
--- a/src/xkbcomp/keytypes.c
+++ b/src/xkbcomp/keytypes.c
@@ -1079,6 +1079,137 @@ CopyDefToKeyType(struct xkb_keymap *keymap, struct xkb_key_type *type,
return ComputeEffectiveMap(keymap, type);
}
+static struct xkb_kt_map_entry map2Level[]= {
+ {
+ .level = ShiftMask,
+ .mods = {.mask = 1, .vmods = ShiftMask, .real_mods = 0 }
+ }
+};
+
+static struct xkb_kt_map_entry mapAlpha[]= {
+ {
+ .level = ShiftMask,
+ .mods = { .mask = 1, .vmods = ShiftMask, .real_mods = 0 }
+ },
+ {
+ .level = LockMask,
+ .mods = { .mask = 0, .vmods = LockMask, .real_mods = 0 }
+ }
+};
+
+static struct xkb_mods preAlpha[]= {
+ { .mask = 0, .vmods = 0, .real_mods = 0 },
+ { .mask = LockMask, .vmods = LockMask, .real_mods = 0 }
+};
+
+static struct xkb_kt_map_entry mapKeypad[]= {
+ {
+ .level = ShiftMask,
+ .mods = { .mask = 1, .vmods = ShiftMask, .real_mods = 0 }
+ },
+ {
+ .level = 0,
+ .mods = { .mask = 1, .vmods = 0, .real_mods = 0 }
+ }
+};
+
+static const struct xkb_key_type canonicalTypes[XkbNumRequiredTypes] = {
+ {
+ .mods = { .mask = 0, .vmods = 0, .real_mods = 0 },
+ .num_levels = 1,
+ .preserve = NULL,
+ .name = NULL,
+ .level_names = NULL
+ },
+ {
+ .mods = { .mask = ShiftMask, .vmods = ShiftMask, .real_mods = 0 },
+ .num_levels = 2,
+ .map = darray_lit(map2Level),
+ .preserve = NULL,
+ .name = NULL,
+ .level_names = NULL
+ },
+ {
+ .mods = {
+ .mask = ShiftMask|LockMask,
+ .vmods = ShiftMask|LockMask,
+ .real_mods = 0
+ },
+ .num_levels = 2,
+ .map = darray_lit(mapAlpha),
+ .preserve = preAlpha,
+ .name = NULL,
+ .level_names = NULL
+ },
+ {
+ .mods = { .mask = ShiftMask, .vmods = ShiftMask, .real_mods = 0 },
+ .num_levels = 2,
+ .map = darray_lit(mapKeypad),
+ .preserve = NULL,
+ .name = NULL,
+ .level_names = NULL
+ }
+};
+
+static int
+InitCanonicalKeyTypes(struct xkb_keymap *keymap, unsigned which, int keypadVMod)
+{
+ struct xkb_client_map *map;
+ const struct xkb_key_type *from;
+ int rtrn;
+
+ rtrn = XkbcAllocClientMap(keymap, XkbKeyTypesMask, XkbNumRequiredTypes);
+ if (rtrn != Success)
+ return rtrn;
+
+ map = keymap->map;
+ if ((which & XkbAllRequiredTypes) == 0)
+ return Success;
+
+ rtrn = Success;
+ from = canonicalTypes;
+
+ if (which & XkbOneLevelMask)
+ rtrn = XkbcCopyKeyType(&from[XkbOneLevelIndex],
+ &darray_item(map->types, XkbOneLevelIndex));
+
+ if ((which & XkbTwoLevelMask) && rtrn == Success)
+ rtrn = XkbcCopyKeyType(&from[XkbTwoLevelIndex],
+ &darray_item(map->types, XkbTwoLevelIndex));
+
+ if ((which & XkbAlphabeticMask) && rtrn == Success)
+ rtrn = XkbcCopyKeyType(&from[XkbAlphabeticIndex],
+ &darray_item(map->types, XkbAlphabeticIndex));
+
+ if ((which & XkbKeypadMask) && rtrn == Success) {
+ struct xkb_key_type *type;
+
+ rtrn = XkbcCopyKeyType(&from[XkbKeypadIndex],
+ &darray_item(map->types, XkbKeypadIndex));
+ type = &darray_item(map->types, XkbKeypadIndex);
+
+ if (keypadVMod >= 0 && keypadVMod < XkbNumVirtualMods &&
+ rtrn == Success) {
+ struct xkb_kt_map_entry *entry;
+ type->mods.vmods = (1 << keypadVMod);
+
+ entry = &darray_item(type->map, 0);
+ entry->mods.mask = ShiftMask;
+ entry->mods.real_mods = ShiftMask;
+ entry->mods.vmods = 0;
+ entry->level = 1;
+
+ entry = &darray_item(type->map, 1);
+ entry->mods.mask = 0;
+ entry->mods.real_mods = 0;
+ entry->mods.vmods = (1 << keypadVMod);
+ entry->level = 1;
+ }
+ }
+
+ return Success;
+}
+
bool
CompileKeyTypes(XkbFile *file, struct xkb_keymap *keymap, enum merge_mode merge)
{
@@ -1124,7 +1255,7 @@ CompileKeyTypes(XkbFile *file, struct xkb_keymap *keymap, enum merge_mode merge)
missing = XkbAllRequiredTypes & (~info.stdPresent);
keypadVMod = FindKeypadVMod(keymap);
- if (XkbcInitCanonicalKeyTypes(keymap, missing, keypadVMod) != Success) {
+ if (InitCanonicalKeyTypes(keymap, missing, keypadVMod) != Success) {
WSGO("Couldn't initialize canonical key types\n");
goto err_info;
}