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

kbproto unentanglement: XkbNumVirtualMods 

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
master
Daniel Stone 2012-08-21 12:48:20 +01:00
parent 74ec4c1c3f
commit b04d896ab2
8 changed files with 32 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/keymap-dump.c
View File

@ -135,7 +135,7 @@ write_vmods(struct xkb_keymap *keymap, struct buf *buf)
int num_vmods = 0; int num_vmods = 0;
int i; int i;
for (i = 0; i < XkbNumVirtualMods; i++) { for (i = 0; i < XKB_NUM_VIRTUAL_MODS; i++) {
if (!keymap->vmod_names[i]) if (!keymap->vmod_names[i])
continue; continue;
if (num_vmods == 0) if (num_vmods == 0)
@ -686,7 +686,7 @@ write_symbols(struct xkb_keymap *keymap, struct buf *buf)
if (key->vmodmap && (key->explicit & XkbExplicitVModMapMask)) { if (key->vmodmap && (key->explicit & XkbExplicitVModMapMask)) {
/* XXX: vmodmap cmask? */ /* XXX: vmodmap cmask? */
write_buf(buf, "\n\t\t\tvirtualMods= %s,", write_buf(buf, "\n\t\t\tvirtualMods= %s,",
VModMaskText(keymap, key->vmodmap << XkbNumModifiers)); VModMaskText(keymap, key->vmodmap << XKB_NUM_CORE_MODS));
} }
switch (key->out_of_range_group_action) { switch (key->out_of_range_group_action) {
@ -749,7 +749,7 @@ write_symbols(struct xkb_keymap *keymap, struct buf *buf)
if (key->modmap == 0) if (key->modmap == 0)
continue; continue;
for (mod = 0; mod < XkbNumModifiers; mod++) { for (mod = 0; mod < XKB_NUM_CORE_MODS; mod++) {
if (!(key->modmap & (1 << mod))) if (!(key->modmap & (1 << mod)))
continue; continue;

10
src/map.c
View File

@ -113,13 +113,13 @@ xkb_map_num_mods(struct xkb_keymap *keymap)
{ {
xkb_mod_index_t i; xkb_mod_index_t i;
for (i = 0; i < XkbNumVirtualMods; i++) for (i = 0; i < XKB_NUM_VIRTUAL_MODS; i++)
if (!keymap->vmod_names[i]) if (!keymap->vmod_names[i])
break; break;
/* We always have all the core modifiers (for now), plus any virtual /* We always have all the core modifiers (for now), plus any virtual
* modifiers we may have defined. */ * modifiers we may have defined. */
return i + XkbNumModifiers; return i + XKB_NUM_CORE_MODS;
} }
/** /**
@ -138,7 +138,7 @@ xkb_map_mod_get_name(struct xkb_keymap *keymap, xkb_mod_index_t idx)
name = ModIndexToName(idx); name = ModIndexToName(idx);
if (!name) if (!name)
name = xkb_atom_text(keymap->ctx, name = xkb_atom_text(keymap->ctx,
keymap->vmod_names[idx - XkbNumModifiers]); keymap->vmod_names[idx - XKB_NUM_CORE_MODS]);
return name; return name;
} }
@ -160,11 +160,11 @@ xkb_map_mod_get_index(struct xkb_keymap *keymap, const char *name)
if (atom == XKB_ATOM_NONE) if (atom == XKB_ATOM_NONE)
return XKB_MOD_INVALID; return XKB_MOD_INVALID;
for (i = 0; i < XkbNumVirtualMods; i++) { for (i = 0; i < XKB_NUM_VIRTUAL_MODS; i++) {
if (keymap->vmod_names[i] == XKB_ATOM_NONE) if (keymap->vmod_names[i] == XKB_ATOM_NONE)
break; break;
if (keymap->vmod_names[i] == atom) if (keymap->vmod_names[i] == atom)
return i + XkbNumModifiers; return i + XKB_NUM_CORE_MODS;
} }
return XKB_MOD_INVALID; return XKB_MOD_INVALID;

16
src/text.c
View File

@ -231,7 +231,7 @@ GetBuffer(size_t size)
/* /*
* Get a vmod name's text, where the vmod index is zero based * Get a vmod name's text, where the vmod index is zero based
* (0..XkbNumVirtualMods-1). * (0..XKB_NUM_VIRTUAL_MODS-1).
*/ */
static const char * static const char *
VModIndexText(struct xkb_keymap *keymap, xkb_mod_index_t ndx) VModIndexText(struct xkb_keymap *keymap, xkb_mod_index_t ndx)
@ -241,7 +241,7 @@ VModIndexText(struct xkb_keymap *keymap, xkb_mod_index_t ndx)
const char *tmp = NULL; const char *tmp = NULL;
char buf[20]; char buf[20];
if (ndx >= XkbNumVirtualMods) if (ndx >= XKB_NUM_VIRTUAL_MODS)
tmp = "illegal"; tmp = "illegal";
else else
tmp = xkb_atom_text(keymap->ctx, keymap->vmod_names[ndx]); tmp = xkb_atom_text(keymap->ctx, keymap->vmod_names[ndx]);
@ -274,7 +274,7 @@ VModMaskText(struct xkb_keymap *keymap, xkb_mod_mask_t cmask)
char buf[BUFFER_SIZE]; char buf[BUFFER_SIZE];
rmask = cmask & 0xff; rmask = cmask & 0xff;
vmask = cmask >> XkbNumModifiers; vmask = cmask >> XKB_NUM_CORE_MODS;
if (rmask == 0 && vmask == 0) if (rmask == 0 && vmask == 0)
return "none"; return "none";
@ -287,7 +287,7 @@ VModMaskText(struct xkb_keymap *keymap, xkb_mod_mask_t cmask)
rem = BUFFER_SIZE; rem = BUFFER_SIZE;
if (vmask != 0) { if (vmask != 0) {
for (i = 0, bit = 1; i < XkbNumVirtualMods && rem > 1; i++, bit <<= for (i = 0, bit = 1; i < XKB_NUM_VIRTUAL_MODS && rem > 1; i++, bit <<=
1) { 1) {
if (!(vmask & bit)) if (!(vmask & bit))
continue; continue;
@ -325,7 +325,7 @@ VModMaskText(struct xkb_keymap *keymap, xkb_mod_mask_t cmask)
* ShiftMapIndex, LockMapIndex, etc. from X11/X.h. Take note before * ShiftMapIndex, LockMapIndex, etc. from X11/X.h. Take note before
* changing. * changing.
*/ */
static const char *modNames[XkbNumModifiers] = { static const char *modNames[XKB_NUM_CORE_MODS] = {
"Shift", "Shift",
"Lock", "Lock",
"Control", "Control",
@ -341,7 +341,7 @@ ModNameToIndex(const char *name)
{ {
xkb_mod_index_t i; xkb_mod_index_t i;
for (i = 0; i < XkbNumModifiers; i++) for (i = 0; i < XKB_NUM_CORE_MODS; i++)
if (istreq(name, modNames[i])) if (istreq(name, modNames[i]))
return i; return i;
@ -351,7 +351,7 @@ ModNameToIndex(const char *name)
const char * const char *
ModIndexToName(xkb_mod_index_t ndx) ModIndexToName(xkb_mod_index_t ndx)
{ {
if (ndx < XkbNumModifiers) if (ndx < XKB_NUM_CORE_MODS)
return modNames[ndx]; return modNames[ndx];
return NULL; return NULL;
} }
@ -393,7 +393,7 @@ ModMaskText(xkb_mod_mask_t mask)
buf = GetBuffer(rem); buf = GetBuffer(rem);
str = buf; str = buf;
buf[0] = '\0'; buf[0] = '\0';
for (i = 0, bit = 1; i < XkbNumModifiers && rem > 1; i++, bit <<= 1) { for (i = 0, bit = 1; i < XKB_NUM_CORE_MODS && rem > 1; i++, bit <<= 1) {
int len; int len;
if (!(mask & bit)) if (!(mask & bit))

6
src/xkb-priv.h
View File

@ -100,6 +100,8 @@ typedef uint32_t xkb_atom_t;
/* These should all be dynamic. */ /* These should all be dynamic. */
#define XKB_NUM_GROUPS 4 #define XKB_NUM_GROUPS 4
#define XKB_NUM_INDICATORS 32 #define XKB_NUM_INDICATORS 32
#define XKB_NUM_VIRTUAL_MODS 16
#define XKB_NUM_CORE_MODS 8
struct xkb_context { struct xkb_context {
int refcnt; int refcnt;
@ -352,8 +354,8 @@ struct xkb_keymap {
darray(struct xkb_sym_interpret) sym_interpret; darray(struct xkb_sym_interpret) sym_interpret;
/* vmod -> mod mapping */ /* vmod -> mod mapping */
xkb_mod_mask_t vmods[XkbNumVirtualMods]; xkb_mod_mask_t vmods[XKB_NUM_VIRTUAL_MODS];
xkb_atom_t vmod_names[XkbNumVirtualMods]; xkb_atom_t vmod_names[XKB_NUM_VIRTUAL_MODS];
/* Number of groups in the key with the most groups. */ /* Number of groups in the key with the most groups. */
xkb_group_index_t num_groups; xkb_group_index_t num_groups;

2
src/xkbcomp/action.c
View File

@ -915,7 +915,7 @@ HandleRedirectKey(struct xkb_keymap *keymap, union xkb_action *action,
else else
act->mods &= ~(t2 & 0xff); act->mods &= ~(t2 & 0xff);
t2 = (t2 >> XkbNumModifiers) & 0xffff; t2 = (t2 >> XKB_NUM_CORE_MODS) & 0xffff;
act->vmods_mask |= t2; act->vmods_mask |= t2;
if (field == ACTION_FIELD_MODIFIERS) if (field == ACTION_FIELD_MODIFIERS)
act->vmods |= t2; act->vmods |= t2;

8
src/xkbcomp/keymap.c
View File

@ -30,12 +30,12 @@ static void
ComputeEffectiveMask(struct xkb_keymap *keymap, struct xkb_mods *mods) ComputeEffectiveMask(struct xkb_keymap *keymap, struct xkb_mods *mods)
{ {
xkb_mod_index_t i; xkb_mod_index_t i;
xkb_mod_mask_t vmask = mods->mods >> XkbNumModifiers; xkb_mod_mask_t vmask = mods->mods >> XKB_NUM_CORE_MODS;
/* The effective mask is only real mods for now. */ /* The effective mask is only real mods for now. */
mods->mask = mods->mods & 0xff; mods->mask = mods->mods & 0xff;
for (i = 0; i < XkbNumVirtualMods; i++) { for (i = 0; i < XKB_NUM_VIRTUAL_MODS; i++) {
if (!(vmask & (1 << i))) if (!(vmask & (1 << i)))
continue; continue;
mods->mask |= keymap->vmods[i]; mods->mask |= keymap->vmods[i];
@ -212,14 +212,14 @@ UpdateDerivedKeymapFields(struct xkb_keymap *keymap)
return false; return false;
/* Update keymap->vmods, the virtual -> real mod mapping. */ /* Update keymap->vmods, the virtual -> real mod mapping. */
for (vmod = 0; vmod < XkbNumVirtualMods; vmod++) for (vmod = 0; vmod < XKB_NUM_VIRTUAL_MODS; vmod++)
keymap->vmods[vmod] = 0; keymap->vmods[vmod] = 0;
xkb_foreach_key(key, keymap) { xkb_foreach_key(key, keymap) {
if (!key->vmodmap) if (!key->vmodmap)
continue; continue;
for (vmod = 0; vmod < XkbNumVirtualMods; vmod++) { for (vmod = 0; vmod < XKB_NUM_VIRTUAL_MODS; vmod++) {
if (!(key->vmodmap & (1 << vmod))) if (!(key->vmodmap & (1 << vmod)))
continue; continue;
keymap->vmods[vmod] |= key->modmap; keymap->vmods[vmod] |= key->modmap;

2
src/xkbcomp/symbols.c
View File

@ -1065,7 +1065,7 @@ SetSymbolsField(SymbolsInfo *info, KeyInfo *keyi, const char *field,
ok = ExprResolveVModMask(info->keymap, value, &mask); ok = ExprResolveVModMask(info->keymap, value, &mask);
if (ok) { if (ok) {
keyi->vmodmap = (mask >> XkbNumModifiers) & 0xffff; keyi->vmodmap = (mask >> XKB_NUM_CORE_MODS) & 0xffff;
keyi->defined |= KEY_FIELD_VMODMAP; keyi->defined |= KEY_FIELD_VMODMAP;
} }
else { else {

12
src/xkbcomp/vmod.c
View File

@ -36,7 +36,7 @@ InitVModInfo(VModInfo *info, struct xkb_keymap *keymap)
info->defined = info->available = 0; info->defined = info->available = 0;
for (i = 0; i < XkbNumVirtualMods; i++) for (i = 0; i < XKB_NUM_VIRTUAL_MODS; i++)
if (keymap->vmod_names[i]) if (keymap->vmod_names[i])
info->defined |= (1 << i); info->defined |= (1 << i);
} }
@ -61,7 +61,7 @@ HandleVModDef(VModDef *stmt, struct xkb_keymap *keymap,
"Value ignored\n"); "Value ignored\n");
nextFree = -1; nextFree = -1;
for (i = 0, bit = 1; i < XkbNumVirtualMods; i++, bit <<= 1) { for (i = 0, bit = 1; i < XKB_NUM_VIRTUAL_MODS; i++, bit <<= 1) {
if (!(info->defined & bit)) { if (!(info->defined & bit)) {
if (nextFree < 0) if (nextFree < 0)
nextFree = i; nextFree = i;
@ -82,7 +82,7 @@ HandleVModDef(VModDef *stmt, struct xkb_keymap *keymap,
if (nextFree < 0) { if (nextFree < 0) {
log_err(keymap->ctx, log_err(keymap->ctx,
"Too many virtual modifiers defined (maximum %d)\n", "Too many virtual modifiers defined (maximum %d)\n",
XkbNumVirtualMods); XKB_NUM_VIRTUAL_MODS);
return false; return false;
} }
@ -102,7 +102,7 @@ LookupVModIndex(const struct xkb_keymap *keymap, xkb_atom_t field,
if (type != EXPR_TYPE_INT) if (type != EXPR_TYPE_INT)
return false; return false;
for (i = 0; i < XkbNumVirtualMods; i++) { for (i = 0; i < XKB_NUM_VIRTUAL_MODS; i++) {
if (keymap->vmod_names[i] == field) { if (keymap->vmod_names[i] == field) {
*val_rtrn = i; *val_rtrn = i;
return true; return true;
@ -122,7 +122,7 @@ LookupVModMask(struct xkb_context *ctx, const void *priv, xkb_atom_t field,
return true; return true;
} }
else if (LookupVModIndex(priv, field, type, &ndx)) { else if (LookupVModIndex(priv, field, type, &ndx)) {
*val_rtrn = (1 << (XkbNumModifiers + ndx)); *val_rtrn = (1 << (XKB_NUM_CORE_MODS + ndx));
return true; return true;
} }
@ -144,7 +144,7 @@ ResolveVirtualModifier(ExprDef *def, struct xkb_keymap *keymap,
return false; return false;
} }
for (i = 0; i < XkbNumVirtualMods; i++) { for (i = 0; i < XKB_NUM_VIRTUAL_MODS; i++) {
if ((info->available & (1 << i)) && keymap->vmod_names[i] == name) { if ((info->available & (1 << i)) && keymap->vmod_names[i] == name) {
*ndx_rtrn = i; *ndx_rtrn = i;
return true; return true;