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

xkbcomp: Drop unused Display argument in Atom functions 

The xkbcommon Atom implementation doesn't take Display into account.
master
Dan Nicholson 2009-03-28 06:56:26 -07:00
parent 72df9bb35f
commit 8544cde52e
11 changed files with 141 additions and 144 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/xkbcomp/action.c
View File

@ -372,7 +372,7 @@ CheckModifierField(XkbcDescPtr xkb,
if (value->op == ExprIdent) if (value->op == ExprIdent)
{ {
register char *valStr; register char *valStr;
valStr = XkbcAtomGetString(NULL, value->value.str); valStr = XkbcAtomGetString(value->value.str);
if (valStr && ((uStrCaseCmp(valStr, "usemodmapmods") == 0) || if (valStr && ((uStrCaseCmp(valStr, "usemodmapmods") == 0) ||
(uStrCaseCmp(valStr, "modmapmods") == 0))) (uStrCaseCmp(valStr, "modmapmods") == 0)))
{ {
@ -1311,7 +1311,7 @@ HandleActionDef(ExprDef * def,
exprOpText(def->op)); exprOpText(def->op));
return False; return False;
} }
str = XkbcAtomGetString(NULL, def->value.action.name); str = XkbcAtomGetString(def->value.action.name);
if (!str) if (!str)
{ {
WSGO("Missing name in action definition!!\n"); WSGO("Missing name in action definition!!\n");
@ -1454,12 +1454,12 @@ ActionsInit(void)
constTrue.common.next = NULL; constTrue.common.next = NULL;
constTrue.op = ExprIdent; constTrue.op = ExprIdent;
constTrue.type = TypeBoolean; constTrue.type = TypeBoolean;
constTrue.value.str = XkbcInternAtom(NULL, "true", False); constTrue.value.str = XkbcInternAtom("true", False);
constFalse.common.stmtType = StmtExpr; constFalse.common.stmtType = StmtExpr;
constFalse.common.next = NULL; constFalse.common.next = NULL;
constFalse.op = ExprIdent; constFalse.op = ExprIdent;
constFalse.type = TypeBoolean; constFalse.type = TypeBoolean;
constFalse.value.str = XkbcInternAtom(NULL, "false", False); constFalse.value.str = XkbcInternAtom("false", False);
actionsInitialized = 1; actionsInitialized = 1;
} }
return; return;

2
src/xkbcomp/compat.c
View File

@ -831,7 +831,7 @@ CompileCompatMap(XkbFile *file, XkbcDescPtr xkb, unsigned merge,
{ {
if (XkbAllocNames(xkb, XkbCompatNameMask, 0, 0) == Success) if (XkbAllocNames(xkb, XkbCompatNameMask, 0, 0) == Success)
xkb->names->compat = xkb->names->compat =
XkbcInternAtom(xkb->dpy, info.name, False); XkbcInternAtom(info.name, False);
else else
{ {
WSGO("Couldn't allocate space for compat name\n"); WSGO("Couldn't allocate space for compat name\n");

28
src/xkbcomp/expr.c
View File

@ -135,17 +135,17 @@ ExprResolveLhs(ExprDef * expr,
{ {
case ExprIdent: case ExprIdent:
elem_rtrn->str = NULL; elem_rtrn->str = NULL;
field_rtrn->str = XkbcAtomGetString(NULL, expr->value.str); field_rtrn->str = XkbcAtomGetString(expr->value.str);
*index_rtrn = NULL; *index_rtrn = NULL;
return True; return True;
case ExprFieldRef: case ExprFieldRef:
elem_rtrn->str = XkbcAtomGetString(NULL, expr->value.field.element); elem_rtrn->str = XkbcAtomGetString(expr->value.field.element);
field_rtrn->str = XkbcAtomGetString(NULL, expr->value.field.field); field_rtrn->str = XkbcAtomGetString(expr->value.field.field);
*index_rtrn = NULL; *index_rtrn = NULL;
return True; return True;
case ExprArrayRef: case ExprArrayRef:
elem_rtrn->str = XkbcAtomGetString(NULL, expr->value.array.element); elem_rtrn->str = XkbcAtomGetString(expr->value.array.element);
field_rtrn->str = XkbcAtomGetString(NULL, expr->value.array.field); field_rtrn->str = XkbcAtomGetString(expr->value.array.field);
*index_rtrn = expr->value.array.entry; *index_rtrn = expr->value.array.entry;
return True; return True;
} }
@ -166,7 +166,7 @@ SimpleLookup(char * priv,
{ {
return False; return False;
} }
str = XkbcAtomGetString(NULL, field); str = XkbcAtomGetString(field);
for (entry = (LookupEntry *) priv; for (entry = (LookupEntry *) priv;
(entry != NULL) && (entry->name != NULL); entry++) (entry != NULL) && (entry->name != NULL); entry++)
{ {
@ -190,7 +190,7 @@ RadioLookup(char * priv,
if ((field == None) || (elem != None) || (type != TypeInt)) if ((field == None) || (elem != None) || (type != TypeInt))
return False; return False;
str = XkbcAtomGetString(NULL, field); str = XkbcAtomGetString(field);
if (str) if (str)
{ {
if (uStrCasePrefix("group", str)) if (uStrCasePrefix("group", str))
@ -218,7 +218,7 @@ TableLookup(char * priv,
if ((priv == NULL) || (field == None) || (type != TypeInt)) if ((priv == NULL) || (field == None) || (type != TypeInt))
return False; return False;
str = XkbcAtomGetString(NULL, elem); str = XkbcAtomGetString(elem);
while (tbl) while (tbl)
{ {
if (((str == NULL) && (tbl->element == NULL)) || if (((str == NULL) && (tbl->element == NULL)) ||
@ -264,7 +264,7 @@ LookupModMask(char * priv,
if ((elem != None) || (type != TypeInt)) if ((elem != None) || (type != TypeInt))
return False; return False;
str = XkbcAtomGetString(NULL, field); str = XkbcAtomGetString(field);
if (str == NULL) if (str == NULL)
return False; return False;
if (uStrCaseCmp(str, "all") == 0) if (uStrCaseCmp(str, "all") == 0)
@ -397,7 +397,7 @@ ExprResolveBoolean(ExprDef * expr,
val_rtrn->ival = expr->value.ival; val_rtrn->ival = expr->value.ival;
return True; return True;
case ExprIdent: case ExprIdent:
bogus = XkbcAtomGetString(NULL, expr->value.str); bogus = XkbcAtomGetString(expr->value.str);
if (bogus) if (bogus)
{ {
if ((uStrCaseCmp(bogus, "true") == 0) || if ((uStrCaseCmp(bogus, "true") == 0) ||
@ -487,7 +487,7 @@ ExprResolveFloat(ExprDef * expr,
if (expr->type == TypeString) if (expr->type == TypeString)
{ {
register char *str; register char *str;
str = XkbcAtomGetString(NULL, expr->value.str); str = XkbcAtomGetString(expr->value.str);
if ((str != NULL) && (strlen(str) == 1)) if ((str != NULL) && (strlen(str) == 1))
{ {
val_rtrn->uval = str[0] * XkbGeomPtsPerMM; val_rtrn->uval = str[0] * XkbGeomPtsPerMM;
@ -600,7 +600,7 @@ ExprResolveInteger(ExprDef * expr,
if (expr->type == TypeString) if (expr->type == TypeString)
{ {
register char *str; register char *str;
str = XkbcAtomGetString(NULL, expr->value.str); str = XkbcAtomGetString(expr->value.str);
if (str != NULL) if (str != NULL)
switch (strlen(str)) switch (strlen(str))
{ {
@ -726,7 +726,7 @@ ExprResolveString(ExprDef * expr,
exprTypeText(expr->type)); exprTypeText(expr->type));
return False; return False;
} }
val_rtrn->str = XkbcAtomGetString(NULL, expr->value.str); val_rtrn->str = XkbcAtomGetString(expr->value.str);
if (val_rtrn->str == NULL) if (val_rtrn->str == NULL)
{ {
static char *empty = ""; static char *empty = "";
@ -1051,7 +1051,7 @@ ExprResolveKeySym(ExprDef * expr,
if (expr->op == ExprIdent) if (expr->op == ExprIdent)
{ {
char *str; char *str;
str = XkbcAtomGetString(NULL, expr->value.str); str = XkbcAtomGetString(expr->value.str);
if ((str != NULL) && ((sym = XStringToKeysym(str)) != NoSymbol)) if ((str != NULL) && ((sym = XStringToKeysym(str)) != NoSymbol))
{ {
val_rtrn->uval = sym; val_rtrn->uval = sym;

116
src/xkbcomp/geometry.c
View File

@ -540,7 +540,7 @@ InitSectionInfo(SectionInfo * si, GeometryInfo * info)
{ {
*si = info->dfltSection; *si = info->dfltSection;
si->defs.defined &= ~_GS_Default; si->defs.defined &= ~_GS_Default;
si->name = XkbcInternAtom(info->dpy, "unknown", False); si->name = XkbcInternAtom("unknown", False);
si->priority = info->nextPriority++; si->priority = info->nextPriority++;
if (info->nextPriority > XkbGeomMaxPriority) if (info->nextPriority > XkbGeomMaxPriority)
info->nextPriority = XkbGeomMaxPriority; info->nextPriority = XkbGeomMaxPriority;
@ -552,7 +552,7 @@ InitSectionInfo(SectionInfo * si, GeometryInfo * info)
si->defs.merge = info->merge; si->defs.merge = info->merge;
si->defs.next = NULL; si->defs.next = NULL;
si->geometry = info; si->geometry = info;
si->name = XkbcInternAtom(info->dpy, "default", False); si->name = XkbcInternAtom("default", False);
InitRowInfo(&si->dfltRow, si, info); InitRowInfo(&si->dfltRow, si, info);
} }
return; return;
@ -584,7 +584,7 @@ ClearSectionInfo(SectionInfo * si, GeometryInfo * info)
{ {
si->defs.defined &= ~_GS_Default; si->defs.defined &= ~_GS_Default;
si->name = XkbcInternAtom(info->dpy, "default", False); si->name = XkbcInternAtom("default", False);
si->top = si->left = 0; si->top = si->left = 0;
si->width = si->height = 0; si->width = si->height = 0;
si->angle = 0; si->angle = 0;
@ -1498,7 +1498,7 @@ SetShapeDoodadField(DoodadInfo * di,
return ReportBadType(typeName, field, ddText(info->dpy, di), return ReportBadType(typeName, field, ddText(info->dpy, di),
"string"); "string");
} }
di->shape = XkbcInternAtom(info->dpy, tmp.str, False); di->shape = XkbcInternAtom(tmp.str, False);
di->defs.defined |= _GD_Shape; di->defs.defined |= _GD_Shape;
return True; return True;
} }
@ -1633,7 +1633,7 @@ SetTextDoodadField(DoodadInfo * di,
"string"); "string");
} }
di->defs.defined |= def; di->defs.defined |= def;
*pField.str = XkbcInternAtom(NULL, tmp.str, False); *pField.str = XkbcInternAtom(tmp.str, False);
} }
else else
{ {
@ -1687,17 +1687,17 @@ SetIndicatorDoodadField(DoodadInfo * di,
if (uStrCaseCmp(field, "oncolor") == 0) if (uStrCaseCmp(field, "oncolor") == 0)
{ {
di->defs.defined |= _GD_Color; di->defs.defined |= _GD_Color;
di->color = XkbcInternAtom(NULL, tmp.str, False); di->color = XkbcInternAtom(tmp.str, False);
} }
else if (uStrCaseCmp(field, "offcolor") == 0) else if (uStrCaseCmp(field, "offcolor") == 0)
{ {
di->defs.defined |= _GD_OffColor; di->defs.defined |= _GD_OffColor;
di->offColor = XkbcInternAtom(NULL, tmp.str, False); di->offColor = XkbcInternAtom(tmp.str, False);
} }
else if (uStrCaseCmp(field, "shape") == 0) else if (uStrCaseCmp(field, "shape") == 0)
{ {
di->defs.defined |= _GD_Shape; di->defs.defined |= _GD_Shape;
di->shape = XkbcInternAtom(info->dpy, tmp.str, False); di->shape = XkbcInternAtom(tmp.str, False);
} }
return True; return True;
} }
@ -1761,7 +1761,7 @@ SetLogoDoodadField(DoodadInfo * di,
return ReportBadType(typeName, field, ddText(info->dpy, di), return ReportBadType(typeName, field, ddText(info->dpy, di),
"string"); "string");
} }
di->shape = XkbcInternAtom(info->dpy, tmp.str, False); di->shape = XkbcInternAtom(tmp.str, False);
di->defs.defined |= _GD_Shape; di->defs.defined |= _GD_Shape;
return True; return True;
} }
@ -1867,7 +1867,7 @@ SetDoodadField(DoodadInfo * di,
"string"); "string");
} }
di->defs.defined |= _GD_Color; di->defs.defined |= _GD_Color;
di->color = XkbcInternAtom(NULL, tmp.str, False); di->color = XkbcInternAtom(tmp.str, False);
return True; return True;
} }
switch (di->type) switch (di->type)
@ -2077,7 +2077,7 @@ SetKeyField(KeyInfo * key,
return ReportBadType("key", field, keyText(key), "string"); return ReportBadType("key", field, keyText(key), "string");
} }
key->defs.defined |= _GK_Shape; key->defs.defined |= _GK_Shape;
key->shape = XkbcInternAtom(info->dpy, tmp.str, False); key->shape = XkbcInternAtom(tmp.str, False);
} }
else if ((uStrCaseCmp(field, "color") == 0) || else if ((uStrCaseCmp(field, "color") == 0) ||
(uStrCaseCmp(field, "keycolor") == 0)) (uStrCaseCmp(field, "keycolor") == 0))
@ -2093,7 +2093,7 @@ SetKeyField(KeyInfo * key,
return ReportBadType("key", field, keyText(key), "string"); return ReportBadType("key", field, keyText(key), "string");
} }
key->defs.defined |= _GK_Color; key->defs.defined |= _GK_Color;
key->color = XkbcInternAtom(NULL, tmp.str, False); key->color = XkbcInternAtom(tmp.str, False);
} }
else if ((uStrCaseCmp(field, "name") == 0) else if ((uStrCaseCmp(field, "name") == 0)
|| (uStrCaseCmp(field, "keyname") == 0)) || (uStrCaseCmp(field, "keyname") == 0))
@ -2351,7 +2351,7 @@ HandleGeometryVar(VarDef * stmt, XkbcDescPtr xkb, GeometryInfo * info)
info->errorCount++; info->errorCount++;
return ReportBadType("keyboard", field.str, "geometry", "string"); return ReportBadType("keyboard", field.str, "geometry", "string");
} }
info->baseColor = XkbcInternAtom(NULL, tmp.str, False); info->baseColor = XkbcInternAtom(tmp.str, False);
return True; return True;
} }
else if (uStrCaseCmp(field.str, "labelcolor") == 0) else if (uStrCaseCmp(field.str, "labelcolor") == 0)
@ -2366,7 +2366,7 @@ HandleGeometryVar(VarDef * stmt, XkbcDescPtr xkb, GeometryInfo * info)
info->errorCount++; info->errorCount++;
return ReportBadType("keyboard", field.str, "geometry", "string"); return ReportBadType("keyboard", field.str, "geometry", "string");
} }
info->labelColor = XkbcInternAtom(NULL, tmp.str, False); info->labelColor = XkbcInternAtom(tmp.str, False);
return True; return True;
} }
else else
@ -2384,7 +2384,7 @@ HandleGeometryVar(VarDef * stmt, XkbcDescPtr xkb, GeometryInfo * info)
info->errorCount++; info->errorCount++;
return ReportBadType("keyboard", field.str, "geometry", "string"); return ReportBadType("keyboard", field.str, "geometry", "string");
} }
*pField = XkbcInternAtom(NULL, tmp.str, False); *pField = XkbcInternAtom(tmp.str, False);
return True; return True;
} }
@ -2420,7 +2420,7 @@ HandleShapeBody(ShapeDef * def, ShapeInfo * si, unsigned merge,
{ {
if (ol->nPoints < 1) if (ol->nPoints < 1)
{ {
SetShapeField(si, XkbcAtomGetString(NULL, ol->field), NULL, SetShapeField(si, XkbcAtomGetString(ol->field), NULL,
ol->points, info); ol->points, info);
continue; continue;
} }
@ -2499,7 +2499,7 @@ HandleShapeDef(ShapeDef * def, XkbcDescPtr xkb, unsigned merge,
bzero(&si, sizeof(ShapeInfo)); bzero(&si, sizeof(ShapeInfo));
si.defs.merge = merge; si.defs.merge = merge;
si.name = si.name =
XkbcInternAtom(info->dpy, XkbcAtomGetString(NULL, def->name), False); XkbcInternAtom(info->dpy, XkbcAtomGetString(def->name), False);
si.dfltCornerRadius = info->dfltCornerRadius; si.dfltCornerRadius = info->dfltCornerRadius;
if (!HandleShapeBody(def, &si, merge, info)) if (!HandleShapeBody(def, &si, merge, info))
return False; return False;
@ -2526,7 +2526,7 @@ HandleDoodadDef(DoodadDef * def,
} }
InitDoodadInfo(&new, def->type, si, info); InitDoodadInfo(&new, def->type, si, info);
new.name = new.name =
XkbcInternAtom(info->dpy, XkbcAtomGetString(NULL, def->name), False); XkbcInternAtom(info->dpy, XkbcAtomGetString(def->name), False);
for (var = def->body; var != NULL; var = (VarDef *) var->common.next) for (var = def->body; var != NULL; var = (VarDef *) var->common.next)
{ {
if (ExprResolveLhs(var->name, &elem, &field, &ndx) == 0) if (ExprResolveLhs(var->name, &elem, &field, &ndx) == 0)
@ -2566,7 +2566,7 @@ HandleOverlayDef(OverlayDef * def,
} }
bzero(&ol, sizeof(OverlayInfo)); bzero(&ol, sizeof(OverlayInfo));
ol.name = ol.name =
XkbcInternAtom(info->dpy, XkbcAtomGetString(NULL, def->name), False); XkbcInternAtom(info->dpy, XkbcAtomGetString(def->name), False);
for (keyDef = def->keys; keyDef; for (keyDef = def->keys; keyDef;
keyDef = (OverlayKeyDef *) keyDef->common.next) keyDef = (OverlayKeyDef *) keyDef->common.next)
{ {
@ -2818,7 +2818,7 @@ HandleSectionDef(SectionDef * def,
merge = def->merge; merge = def->merge;
InitSectionInfo(&si, info); InitSectionInfo(&si, info);
si.defs.merge = merge; si.defs.merge = merge;
str = XkbcAtomGetString(NULL, def->name); str = XkbcAtomGetString(def->name);
if ((str == NULL) || (strlen(str) < 1)) if ((str == NULL) || (strlen(str) < 1))
{ {
ERROR("Section defined without a name\n"); ERROR("Section defined without a name\n");
@ -2826,7 +2826,7 @@ HandleSectionDef(SectionDef * def,
return False; return False;
} }
si.name = si.name =
XkbcInternAtom(info->dpy, XkbcAtomGetString(NULL, def->name), False); XkbcInternAtom(info->dpy, XkbcAtomGetString(def->name), False);
if (!HandleSectionBody(def, &si, merge, info)) if (!HandleSectionBody(def, &si, merge, info))
return False; return False;
if (!AddSection(info, &si)) if (!AddSection(info, &si))
@ -2926,7 +2926,7 @@ CopyShapeDef(Display * dpy, XkbGeometryPtr geom, ShapeInfo * si)
Atom name; Atom name;
si->index = geom->num_shapes; si->index = geom->num_shapes;
name = XkbcInternAtom(dpy, XkbcAtomGetString(NULL, si->name), False); name = XkbcInternAtom(dpy, XkbcAtomGetString(si->name), False);
shape = XkbAddGeomShape(geom, name, si->nOutlines); shape = XkbAddGeomShape(geom, name, si->nOutlines);
if (!shape) if (!shape)
{ {
@ -3015,7 +3015,7 @@ VerifyDoodadInfo(DoodadInfo * di, GeometryInfo * info)
WARN1("No color for doodad %s\n", ddText(info->dpy, di)); WARN1("No color for doodad %s\n", ddText(info->dpy, di));
ACTION("Using black\n"); ACTION("Using black\n");
} }
di->color = XkbcInternAtom(NULL, "black", False); di->color = XkbcInternAtom("black", False);
} }
break; break;
case XkbTextDoodad: case XkbTextDoodad:
@ -3036,7 +3036,7 @@ VerifyDoodadInfo(DoodadInfo * di, GeometryInfo * info)
ddText(info->dpy, di)); ddText(info->dpy, di));
ACTION("Using black\n"); ACTION("Using black\n");
} }
di->color = XkbcInternAtom(NULL, "black", False); di->color = XkbcInternAtom("black", False);
} }
if ((di->defs.defined & _GD_FontSpec) != 0) if ((di->defs.defined & _GD_FontSpec) != 0)
{ {
@ -3060,7 +3060,7 @@ VerifyDoodadInfo(DoodadInfo * di, GeometryInfo * info)
ddText(info->dpy, di)); ddText(info->dpy, di));
ACTION1("Using \"%s\"\n", DFLT_FONT); ACTION1("Using \"%s\"\n", DFLT_FONT);
} }
di->font = XkbcInternAtom(NULL, DFLT_FONT, False); di->font = XkbcInternAtom(DFLT_FONT, False);
} }
if ((di->defs.defined & _GD_FontSlant) == 0) if ((di->defs.defined & _GD_FontSlant) == 0)
{ {
@ -3070,7 +3070,7 @@ VerifyDoodadInfo(DoodadInfo * di, GeometryInfo * info)
ddText(info->dpy, di)); ddText(info->dpy, di));
ACTION1("Using \"%s\"\n", DFLT_SLANT); ACTION1("Using \"%s\"\n", DFLT_SLANT);
} }
di->fontSlant = XkbcInternAtom(NULL, DFLT_SLANT, False); di->fontSlant = XkbcInternAtom(DFLT_SLANT, False);
} }
if ((di->defs.defined & _GD_FontWeight) == 0) if ((di->defs.defined & _GD_FontWeight) == 0)
{ {
@ -3080,7 +3080,7 @@ VerifyDoodadInfo(DoodadInfo * di, GeometryInfo * info)
ddText(info->dpy, di)); ddText(info->dpy, di));
ACTION1("Using \"%s\"\n", DFLT_WEIGHT); ACTION1("Using \"%s\"\n", DFLT_WEIGHT);
} }
di->fontWeight = XkbcInternAtom(NULL, DFLT_WEIGHT, False); di->fontWeight = XkbcInternAtom(DFLT_WEIGHT, False);
} }
if ((di->defs.defined & _GD_FontSetWidth) == 0) if ((di->defs.defined & _GD_FontSetWidth) == 0)
{ {
@ -3090,7 +3090,7 @@ VerifyDoodadInfo(DoodadInfo * di, GeometryInfo * info)
ddText(info->dpy, di)); ddText(info->dpy, di));
ACTION1("Using \"%s\"\n", DFLT_SET_WIDTH); ACTION1("Using \"%s\"\n", DFLT_SET_WIDTH);
} }
di->fontSetWidth = XkbcInternAtom(NULL, DFLT_SET_WIDTH, False); di->fontSetWidth = XkbcInternAtom(DFLT_SET_WIDTH, False);
} }
if ((di->defs.defined & _GD_FontVariant) == 0) if ((di->defs.defined & _GD_FontVariant) == 0)
{ {
@ -3100,7 +3100,7 @@ VerifyDoodadInfo(DoodadInfo * di, GeometryInfo * info)
ddText(info->dpy, di)); ddText(info->dpy, di));
ACTION1("Using \"%s\"\n", DFLT_VARIANT); ACTION1("Using \"%s\"\n", DFLT_VARIANT);
} }
di->fontVariant = XkbcInternAtom(NULL, DFLT_VARIANT, False); di->fontVariant = XkbcInternAtom(DFLT_VARIANT, False);
} }
if ((di->defs.defined & _GD_FontEncoding) == 0) if ((di->defs.defined & _GD_FontEncoding) == 0)
{ {
@ -3110,7 +3110,7 @@ VerifyDoodadInfo(DoodadInfo * di, GeometryInfo * info)
ddText(info->dpy, di)); ddText(info->dpy, di));
ACTION1("Using \"%s\"\n", DFLT_ENCODING); ACTION1("Using \"%s\"\n", DFLT_ENCODING);
} }
di->fontEncoding = XkbcInternAtom(NULL, DFLT_ENCODING, False); di->fontEncoding = XkbcInternAtom(DFLT_ENCODING, False);
} }
if ((di->defs.defined & _GD_FontSize) == 0) if ((di->defs.defined & _GD_FontSize) == 0)
{ {
@ -3129,7 +3129,7 @@ VerifyDoodadInfo(DoodadInfo * di, GeometryInfo * info)
char *tmp; char *tmp;
size = (di->fontSize * 120) / 100; size = (di->fontSize * 120) / 100;
size = (size * 254) / 720; /* convert to mm/10 */ size = (size * 254) / 720; /* convert to mm/10 */
for (nLines = 1, tmp = XkbcAtomGetString(NULL, di->text); *tmp; for (nLines = 1, tmp = XkbcAtomGetString(di->text); *tmp;
tmp++) tmp++)
{ {
if (*tmp == '\n') if (*tmp == '\n')
@ -3150,7 +3150,7 @@ VerifyDoodadInfo(DoodadInfo * di, GeometryInfo * info)
unsigned width, tmp; unsigned width, tmp;
char *str; char *str;
width = tmp = 0; width = tmp = 0;
for (str = XkbcAtomGetString(NULL, di->text); *str; str++) for (str = XkbcAtomGetString(di->text); *str; str++)
{ {
if (*str != '\n') if (*str != '\n')
tmp++; tmp++;
@ -3204,7 +3204,7 @@ VerifyDoodadInfo(DoodadInfo * di, GeometryInfo * info)
ddText(info->dpy, di)); ddText(info->dpy, di));
ACTION("Using green\n"); ACTION("Using green\n");
} }
di->color = XkbcInternAtom(NULL, "green", False); di->color = XkbcInternAtom("green", False);
} }
if ((di->defs.defined & _GD_OffColor) == 0) if ((di->defs.defined & _GD_OffColor) == 0)
{ {
@ -3214,7 +3214,7 @@ VerifyDoodadInfo(DoodadInfo * di, GeometryInfo * info)
ddText(info->dpy, di)); ddText(info->dpy, di));
ACTION("Using black\n"); ACTION("Using black\n");
} }
di->offColor = XkbcInternAtom(NULL, "black", False); di->offColor = XkbcInternAtom("black", False);
} }
break; break;
case XkbLogoDoodad: case XkbLogoDoodad:
@ -3253,7 +3253,7 @@ VerifyDoodadInfo(DoodadInfo * di, GeometryInfo * info)
WARN1("No color for doodad %s\n", ddText(info->dpy, di)); WARN1("No color for doodad %s\n", ddText(info->dpy, di));
ACTION("Using black\n"); ACTION("Using black\n");
} }
di->color = XkbcInternAtom(NULL, "black", False); di->color = XkbcInternAtom("black", False);
} }
break; break;
default: default:
@ -3276,19 +3276,19 @@ FontFromParts(Atom fontTok,
char *font, *weight, *slant, *setWidth, *variant, *encoding; char *font, *weight, *slant, *setWidth, *variant, *encoding;
char *rtrn; char *rtrn;
font = (fontTok != None ? XkbcAtomGetString(NULL, fontTok) : DFLT_FONT); font = (fontTok != None ? XkbcAtomGetString(fontTok) : DFLT_FONT);
weight = weight =
(weightTok != None ? XkbcAtomGetString(NULL, weightTok) : DFLT_WEIGHT); (weightTok != None ? XkbcAtomGetString(weightTok) : DFLT_WEIGHT);
slant = slant =
(slantTok != None ? XkbcAtomGetString(NULL, slantTok) : DFLT_SLANT); (slantTok != None ? XkbcAtomGetString(slantTok) : DFLT_SLANT);
setWidth = setWidth =
(setWidthTok != (setWidthTok !=
None ? XkbcAtomGetString(NULL, setWidthTok) : DFLT_SET_WIDTH); None ? XkbcAtomGetString(setWidthTok) : DFLT_SET_WIDTH);
variant = variant =
(varTok != None ? XkbcAtomGetString(NULL, varTok) : DFLT_VARIANT); (varTok != None ? XkbcAtomGetString(varTok) : DFLT_VARIANT);
encoding = encoding =
(encodingTok != (encodingTok !=
None ? XkbcAtomGetString(NULL, encodingTok) : DFLT_ENCODING); None ? XkbcAtomGetString(encodingTok) : DFLT_ENCODING);
if (size == 0) if (size == 0)
size = DFLT_SIZE; size = DFLT_SIZE;
totalSize = totalSize =
@ -3315,7 +3315,7 @@ CopyDoodadDef(XkbGeometryPtr geom,
if (!VerifyDoodadInfo(di, info)) if (!VerifyDoodadInfo(di, info))
return False; return False;
name = XkbcInternAtom(NULL, XkbcAtomGetString(NULL, di->name), False); name = XkbcInternAtom(XkbcAtomGetString(di->name), False);
doodad = XkbAddGeomDoodad(geom, section, name); doodad = XkbAddGeomDoodad(geom, section, name);
if (!doodad) if (!doodad)
{ {
@ -3337,7 +3337,7 @@ CopyDoodadDef(XkbGeometryPtr geom,
return False; return False;
doodad->shape.angle = di->angle; doodad->shape.angle = di->angle;
color = color =
XkbAddGeomColor(geom, XkbcAtomGetString(NULL, di->color), XkbAddGeomColor(geom, XkbcAtomGetString(di->color),
geom->num_colors); geom->num_colors);
shape = &geom->shapes[si->index]; shape = &geom->shapes[si->index];
XkbSetShapeDoodadColor(geom, &doodad->shape, color); XkbSetShapeDoodadColor(geom, &doodad->shape, color);
@ -3354,10 +3354,10 @@ CopyDoodadDef(XkbGeometryPtr geom,
di->fontVariant, di->fontSize, di->fontVariant, di->fontSize,
di->fontEncoding); di->fontEncoding);
else else
doodad->text.font = XkbcAtomGetString(NULL, di->fontSpec); doodad->text.font = XkbcAtomGetString(di->fontSpec);
doodad->text.text = XkbcAtomGetString(NULL, di->text); doodad->text.text = XkbcAtomGetString(di->text);
color = color =
XkbAddGeomColor(geom, XkbcAtomGetString(NULL, di->color), XkbAddGeomColor(geom, XkbcAtomGetString(di->color),
geom->num_colors); geom->num_colors);
XkbSetTextDoodadColor(geom, &doodad->text, color); XkbSetTextDoodadColor(geom, &doodad->text, color);
break; break;
@ -3367,12 +3367,12 @@ CopyDoodadDef(XkbGeometryPtr geom,
return False; return False;
shape = &geom->shapes[si->index]; shape = &geom->shapes[si->index];
color = color =
XkbAddGeomColor(geom, XkbcAtomGetString(NULL, di->color), XkbAddGeomColor(geom, XkbcAtomGetString(di->color),
geom->num_colors); geom->num_colors);
XkbSetIndicatorDoodadShape(geom, &doodad->indicator, shape); XkbSetIndicatorDoodadShape(geom, &doodad->indicator, shape);
XkbSetIndicatorDoodadOnColor(geom, &doodad->indicator, color); XkbSetIndicatorDoodadOnColor(geom, &doodad->indicator, color);
color = color =
XkbAddGeomColor(geom, XkbcAtomGetString(NULL, di->offColor), XkbAddGeomColor(geom, XkbcAtomGetString(di->offColor),
geom->num_colors); geom->num_colors);
XkbSetIndicatorDoodadOffColor(geom, &doodad->indicator, color); XkbSetIndicatorDoodadOffColor(geom, &doodad->indicator, color);
break; break;
@ -3382,7 +3382,7 @@ CopyDoodadDef(XkbGeometryPtr geom,
return False; return False;
doodad->logo.angle = di->angle; doodad->logo.angle = di->angle;
color = color =
XkbAddGeomColor(geom, XkbcAtomGetString(NULL, di->color), XkbAddGeomColor(geom, XkbcAtomGetString(di->color),
geom->num_colors); geom->num_colors);
shape = &geom->shapes[si->index]; shape = &geom->shapes[si->index];
XkbSetLogoDoodadColor(geom, &doodad->logo, color); XkbSetLogoDoodadColor(geom, &doodad->logo, color);
@ -3510,7 +3510,7 @@ CopyOverlayDef(XkbGeometryPtr geom,
if (!VerifyOverlayInfo(geom, section, oi, info, rowMap, rowSize)) if (!VerifyOverlayInfo(geom, section, oi, info, rowMap, rowSize))
return False; return False;
name = XkbcInternAtom(NULL, XkbcAtomGetString(NULL, oi->name), False); name = XkbcInternAtom(XkbcAtomGetString(oi->name), False);
ol = XkbAddGeomOverlay(section, name, oi->nRows); ol = XkbAddGeomOverlay(section, name, oi->nRows);
if (!ol) if (!ol)
{ {
@ -3560,7 +3560,7 @@ CopySectionDef(XkbGeometryPtr geom, SectionInfo * si, GeometryInfo * info)
RowInfo *ri; RowInfo *ri;
Atom name; Atom name;
name = XkbcInternAtom(NULL, XkbcAtomGetString(NULL, si->name), False); name = XkbcInternAtom(XkbcAtomGetString(si->name), False);
section = section =
XkbAddGeomSection(geom, name, si->nRows, si->nDoodads, si->nOverlays); XkbAddGeomSection(geom, name, si->nRows, si->nDoodads, si->nOverlays);
if (section == NULL) if (section == NULL)
@ -3620,7 +3620,7 @@ CopySectionDef(XkbGeometryPtr geom, SectionInfo * si, GeometryInfo * info)
if (ki->color != None) if (ki->color != None)
color = color =
XkbAddGeomColor(geom, XkbAddGeomColor(geom,
XkbcAtomGetString(NULL, ki->color), XkbcAtomGetString(ki->color),
geom->num_colors); geom->num_colors);
else else
color = XkbAddGeomColor(geom, "white", geom->num_colors); color = XkbAddGeomColor(geom, "white", geom->num_colors);
@ -3689,13 +3689,13 @@ CompileGeometry(XkbFile *file, XkbcDescPtr xkb, unsigned merge)
geom->height_mm = info.heightMM; geom->height_mm = info.heightMM;
if (info.name != NULL) if (info.name != NULL)
{ {
geom->name = XkbcInternAtom(xkb->dpy, info.name, False); geom->name = XkbcInternAtom(info.name, False);
if (XkbAllocNames(xkb, XkbGeometryNameMask, 0, 0) == Success) if (XkbAllocNames(xkb, XkbGeometryNameMask, 0, 0) == Success)
xkb->names->geometry = geom->name; xkb->names->geometry = geom->name;
} }
if (info.fontSpec != None) if (info.fontSpec != None)
geom->label_font = geom->label_font =
uStringDup(XkbcAtomGetString(NULL, info.fontSpec)); uStringDup(XkbcAtomGetString(info.fontSpec));
else else
geom->label_font = FontFromParts(info.font, info.fontWeight, geom->label_font = FontFromParts(info.font, info.fontWeight,
info.fontSlant, info.fontSlant,
@ -3707,14 +3707,14 @@ CompileGeometry(XkbFile *file, XkbcDescPtr xkb, unsigned merge)
XkbAddGeomColor(geom, "white", geom->num_colors); XkbAddGeomColor(geom, "white", geom->num_colors);
if (info.baseColor == None) if (info.baseColor == None)
info.baseColor = XkbcInternAtom(NULL, "white", False); info.baseColor = XkbcInternAtom("white", False);
if (info.labelColor == None) if (info.labelColor == None)
info.labelColor = XkbcInternAtom(NULL, "black", False); info.labelColor = XkbcInternAtom("black", False);
geom->base_color = geom->base_color =
XkbAddGeomColor(geom, XkbcAtomGetString(NULL, info.baseColor), XkbAddGeomColor(geom, XkbcAtomGetString(info.baseColor),
geom->num_colors); geom->num_colors);
geom->label_color = geom->label_color =
XkbAddGeomColor(geom, XkbcAtomGetString(NULL, info.labelColor), XkbAddGeomColor(geom, XkbcAtomGetString(info.labelColor),
geom->num_colors); geom->num_colors);
if (info.props) if (info.props)

8
src/xkbcomp/indicators.c
View File

@ -47,7 +47,7 @@
void void
ClearIndicatorMapInfo(Display * dpy, LEDInfo * info) ClearIndicatorMapInfo(Display * dpy, LEDInfo * info)
{ {
info->name = XkbcInternAtom(dpy, "default", False); info->name = XkbcInternAtom("default", False);
info->indicator = _LED_NotBound; info->indicator = _LED_NotBound;
info->flags = info->which_mods = info->real_mods = 0; info->flags = info->which_mods = info->real_mods = 0;
info->vmods = 0; info->vmods = 0;
@ -481,7 +481,7 @@ BindIndicators(XkbcDescPtr xkb, Bool force, LEDInfo *unbound,
ERROR("No unnamed indicators found\n"); ERROR("No unnamed indicators found\n");
ACTION1 ACTION1
("Virtual indicator map \"%s\" not bound\n", ("Virtual indicator map \"%s\" not bound\n",
XkbcAtomGetString(xkb->dpy, led->name)); XkbcAtomGetString(led->name));
continue; continue;
} }
} }
@ -516,8 +516,8 @@ BindIndicators(XkbcDescPtr xkb, Bool force, LEDInfo *unbound,
ERROR1("Multiple names bound to indicator %d\n", ERROR1("Multiple names bound to indicator %d\n",
(unsigned int) led->indicator); (unsigned int) led->indicator);
ACTION2("Using %s, ignoring %s\n", ACTION2("Using %s, ignoring %s\n",
XkbcAtomGetString(xkb->dpy, old), XkbcAtomGetString(old),
XkbcAtomGetString(xkb->dpy, led->name)); XkbcAtomGetString(led->name));
led->indicator = _LED_NotBound; led->indicator = _LED_NotBound;
if (force) if (force)
{ {

6
src/xkbcomp/keycodes.c
View File

@ -728,7 +728,7 @@ HandleIndicatorNameDef(IndicatorNameDef * def,
info->errorCount++; info->errorCount++;
return ReportBadType("indicator", "name", buf, "string"); return ReportBadType("indicator", "name", buf, "string");
} }
ii.name = XkbcInternAtom(NULL, tmp.str, False); ii.name = XkbcInternAtom(tmp.str, False);
ii.virtual = def->virtual; ii.virtual = def->virtual;
if (!AddIndicatorName(info, &ii)) if (!AddIndicatorName(info, &ii))
return False; return False;
@ -845,7 +845,7 @@ CompileKeycodes(XkbFile *file, XkbcDescPtr xkb, unsigned merge)
== Success) == Success)
{ {
register int i; register int i;
xkb->names->keycodes = XkbcInternAtom(xkb->dpy, info.name, False); xkb->names->keycodes = XkbcInternAtom(info.name, False);
uDEBUG2(1, "key range: %d..%d\n", xkb->min_key_code, uDEBUG2(1, "key range: %d..%d\n", xkb->min_key_code,
xkb->max_key_code); xkb->max_key_code);
for (i = info.computedMin; i <= info.computedMax; i++) for (i = info.computedMin; i <= info.computedMax; i++)
@ -873,7 +873,7 @@ CompileKeycodes(XkbFile *file, XkbcDescPtr xkb, unsigned merge)
{ {
xkb->names->indicators[ii->ndx - 1] = xkb->names->indicators[ii->ndx - 1] =
XkbcInternAtom(xkb->dpy, XkbcInternAtom(xkb->dpy,
XkbcAtomGetString(NULL, ii->name), False); XkbcAtomGetString(ii->name), False);
if (xkb->indicators != NULL) if (xkb->indicators != NULL)
{ {
register unsigned bit; register unsigned bit;

16
src/xkbcomp/keytypes.c
View File

@ -128,10 +128,10 @@ extern Bool AddLevelName(KeyTypeInfo * /* type */ ,
static void static void
InitKeyTypesInfo(KeyTypesInfo * info, XkbcDescPtr xkb, KeyTypesInfo * from) InitKeyTypesInfo(KeyTypesInfo * info, XkbcDescPtr xkb, KeyTypesInfo * from)
{ {
tok_ONE_LEVEL = XkbcInternAtom(NULL, "ONE_LEVEL", False); tok_ONE_LEVEL = XkbcInternAtom("ONE_LEVEL", False);
tok_TWO_LEVEL = XkbcInternAtom(NULL, "TWO_LEVEL", False); tok_TWO_LEVEL = XkbcInternAtom("TWO_LEVEL", False);
tok_ALPHABETIC = XkbcInternAtom(NULL, "ALPHABETIC", False); tok_ALPHABETIC = XkbcInternAtom("ALPHABETIC", False);
tok_KEYPAD = XkbcInternAtom(NULL, "KEYPAD", False); tok_KEYPAD = XkbcInternAtom("KEYPAD", False);
info->dpy = NULL; info->dpy = NULL;
info->name = uStringDup("default"); info->name = uStringDup("default");
info->errorCount = 0; info->errorCount = 0;
@ -327,7 +327,7 @@ AddKeyType(XkbcDescPtr xkb, KeyTypesInfo * info, KeyTypeInfo * new)
&& (warningLevel > 0)) || (warningLevel > 9)) && (warningLevel > 0)) || (warningLevel > 9))
{ {
WARN1("Multiple definitions of the %s key type\n", WARN1("Multiple definitions of the %s key type\n",
XkbcAtomGetString(NULL, new->name)); XkbcAtomGetString(new->name));
ACTION("Earlier definition ignored\n"); ACTION("Earlier definition ignored\n");
} }
FreeKeyTypeInfo(old); FreeKeyTypeInfo(old);
@ -343,7 +343,7 @@ AddKeyType(XkbcDescPtr xkb, KeyTypesInfo * info, KeyTypeInfo * new)
if (report) if (report)
{ {
WARN1("Multiple definitions of the %s key type\n", WARN1("Multiple definitions of the %s key type\n",
XkbcAtomGetString(NULL, new->name)); XkbcAtomGetString(new->name));
ACTION("Later definition ignored\n"); ACTION("Later definition ignored\n");
} }
FreeKeyTypeInfo(new); FreeKeyTypeInfo(new);
@ -865,7 +865,7 @@ SetLevelName(KeyTypeInfo * type, ExprDef * arrayNdx, ExprDef * value)
return False; return False;
} }
return return
AddLevelName(type, level, XkbcInternAtom(NULL, rtrn.str, False), True, AddLevelName(type, level, XkbcInternAtom(rtrn.str, False), True,
True); True);
} }
@ -1222,7 +1222,7 @@ CompileKeyTypes(XkbFile *file, XkbcDescPtr xkb, unsigned merge)
if (info.name != NULL) if (info.name != NULL)
{ {
if (XkbAllocNames(xkb, XkbTypesNameMask, 0, 0) == Success) if (XkbAllocNames(xkb, XkbTypesNameMask, 0, 0) == Success)
xkb->names->types = XkbcInternAtom(xkb->dpy, info.name, False); xkb->names->types = XkbcInternAtom(info.name, False);
else else
{ {
WSGO("Couldn't allocate space for types name\n"); WSGO("Couldn't allocate space for types name\n");

31
src/xkbcomp/symbols.c
View File

@ -242,9 +242,9 @@ InitSymbolsInfo(SymbolsInfo * info, XkbcDescPtr xkb)
{ {
register int i; register int i;
tok_ONE_LEVEL = XkbcInternAtom(NULL, "ONE_LEVEL", False); tok_ONE_LEVEL = XkbcInternAtom("ONE_LEVEL", False);
tok_TWO_LEVEL = XkbcInternAtom(NULL, "TWO_LEVEL", False); tok_TWO_LEVEL = XkbcInternAtom("TWO_LEVEL", False);
tok_KEYPAD = XkbcInternAtom(NULL, "KEYPAD", False); tok_KEYPAD = XkbcInternAtom("KEYPAD", False);
info->name = NULL; info->name = NULL;
info->explicit_group = 0; info->explicit_group = 0;
info->errorCount = 0; info->errorCount = 0;
@ -1134,7 +1134,7 @@ SetSymbolsField(KeyInfo * key,
} }
if (arrayNdx == NULL) if (arrayNdx == NULL)
{ {
key->dfltType = XkbcInternAtom(NULL, tmp.str, False); key->dfltType = XkbcInternAtom(tmp.str, False);
key->defs.defined |= _Key_Type_Dflt; key->defs.defined |= _Key_Type_Dflt;
} }
else if (!ExprResolveInteger(arrayNdx, &ndx, SimpleLookup, else if (!ExprResolveInteger(arrayNdx, &ndx, SimpleLookup,
@ -1155,7 +1155,7 @@ SetSymbolsField(KeyInfo * key,
} }
else else
{ {
key->types[ndx.uval - 1] = XkbcInternAtom(NULL, tmp.str, False); key->types[ndx.uval - 1] = XkbcInternAtom(tmp.str, False);
key->typesDefined |= (1 << (ndx.uval - 1)); key->typesDefined |= (1 << (ndx.uval - 1));
} }
} }
@ -1396,7 +1396,7 @@ SetGroupName(SymbolsInfo * info, ExprDef * arrayNdx, ExprDef * value)
return False; return False;
} }
info->groupNames[tmp.uval - 1 + info->explicit_group] = info->groupNames[tmp.uval - 1 + info->explicit_group] =
XkbcInternAtom(NULL, name.str, False); XkbcInternAtom(name.str, False);
return True; return True;
} }
@ -1794,23 +1794,23 @@ FindAutomaticType(int width, KeySym * syms, Atom * typeNameRtrn,
*autoType = False; *autoType = False;
if ((width == 1) || (width == 0)) if ((width == 1) || (width == 0))
{ {
*typeNameRtrn = XkbcInternAtom(NULL, "ONE_LEVEL", False); *typeNameRtrn = XkbcInternAtom("ONE_LEVEL", False);
*autoType = True; *autoType = True;
} }
else if (width == 2) else if (width == 2)
{ {
if (syms && KSIsLower(syms[0]) && KSIsUpper(syms[1])) if (syms && KSIsLower(syms[0]) && KSIsUpper(syms[1]))
{ {
*typeNameRtrn = XkbcInternAtom(NULL, "ALPHABETIC", False); *typeNameRtrn = XkbcInternAtom("ALPHABETIC", False);
} }
else if (syms && (XkbKSIsKeypad(syms[0]) || XkbKSIsKeypad(syms[1]))) else if (syms && (XkbKSIsKeypad(syms[0]) || XkbKSIsKeypad(syms[1])))
{ {
*typeNameRtrn = XkbcInternAtom(NULL, "KEYPAD", False); *typeNameRtrn = XkbcInternAtom("KEYPAD", False);
*autoType = True; *autoType = True;
} }
else else
{ {
*typeNameRtrn = XkbcInternAtom(NULL, "TWO_LEVEL", False); *typeNameRtrn = XkbcInternAtom("TWO_LEVEL", False);
*autoType = True; *autoType = True;
} }
} }
@ -1819,16 +1819,15 @@ FindAutomaticType(int width, KeySym * syms, Atom * typeNameRtrn,
if (syms && KSIsLower(syms[0]) && KSIsUpper(syms[1])) if (syms && KSIsLower(syms[0]) && KSIsUpper(syms[1]))
if (KSIsLower(syms[2]) && KSIsUpper(syms[3])) if (KSIsLower(syms[2]) && KSIsUpper(syms[3]))
*typeNameRtrn = *typeNameRtrn =
XkbcInternAtom(NULL, "FOUR_LEVEL_ALPHABETIC", False); XkbcInternAtom("FOUR_LEVEL_ALPHABETIC", False);
else else
*typeNameRtrn = XkbcInternAtom(NULL, *typeNameRtrn = XkbcInternAtom("FOUR_LEVEL_SEMIALPHABETIC",
"FOUR_LEVEL_SEMIALPHABETIC",
False); False);
else if (syms && (XkbKSIsKeypad(syms[0]) || XkbKSIsKeypad(syms[1]))) else if (syms && (XkbKSIsKeypad(syms[0]) || XkbKSIsKeypad(syms[1])))
*typeNameRtrn = XkbcInternAtom(NULL, "FOUR_LEVEL_KEYPAD", False); *typeNameRtrn = XkbcInternAtom("FOUR_LEVEL_KEYPAD", False);
else else
*typeNameRtrn = XkbcInternAtom(NULL, "FOUR_LEVEL", False); *typeNameRtrn = XkbcInternAtom("FOUR_LEVEL", False);
/* XXX: why not set autoType here? */ /* XXX: why not set autoType here? */
} }
return ((width >= 0) && (width <= 4)); return ((width >= 0) && (width <= 4));
@ -2243,7 +2242,7 @@ CompileSymbols(XkbFile *file, XkbcDescPtr xkb, unsigned merge)
} }
/* now copy info into xkb. */ /* now copy info into xkb. */
xkb->names->symbols = XkbcInternAtom(xkb->dpy, info.name, False); xkb->names->symbols = XkbcInternAtom(info.name, False);
if (info.aliases) if (info.aliases)
ApplyAliases(xkb, False, &info.aliases); ApplyAliases(xkb, False, &info.aliases);
for (i = 0; i < XkbNumKbdGroups; i++) for (i = 0; i < XkbNumKbdGroups; i++)

14
src/xkbcomp/vmod.c
View File

@ -88,9 +88,7 @@ HandleVModDef(VModDef * stmt, unsigned mergeMode, VModInfo * info)
srv = info->xkb->server; srv = info->xkb->server;
names = info->xkb->names; names = info->xkb->names;
stmtName = stmtName = XkbcInternAtom(XkbcAtomGetString(stmt->name), False);
XkbcInternAtom(info->xkb->dpy, XkbcAtomGetString(NULL, stmt->name),
False);
for (i = 0, bit = 1, nextFree = -1; i < XkbNumVirtualMods; i++, bit <<= 1) for (i = 0, bit = 1, nextFree = -1; i < XkbNumVirtualMods; i++, bit <<= 1)
{ {
if (info->defined & bit) if (info->defined & bit)
@ -182,7 +180,7 @@ LookupVModIndex(char * priv,
return False; return False;
} }
/* get the actual name */ /* get the actual name */
fieldStr = XkbcAtomGetString(xkb->dpy, field); fieldStr = XkbcAtomGetString(field);
if (fieldStr == NULL) if (fieldStr == NULL)
return False; return False;
/* For each named modifier, get the name and compare it to the one passed /* For each named modifier, get the name and compare it to the one passed
@ -192,7 +190,7 @@ LookupVModIndex(char * priv,
*/ */
for (i = 0; i < XkbNumVirtualMods; i++) for (i = 0; i < XkbNumVirtualMods; i++)
{ {
modStr = XkbcAtomGetString(xkb->dpy, xkb->names->vmods[i]); modStr = XkbcAtomGetString(xkb->names->vmods[i]);
if ((modStr != NULL) && (uStrCaseCmp(fieldStr, modStr) == 0)) if ((modStr != NULL) && (uStrCaseCmp(fieldStr, modStr) == 0))
{ {
val_rtrn->uval = i; val_rtrn->uval = i;
@ -231,7 +229,7 @@ FindKeypadVMod(XkbcDescPtr xkb)
Atom name; Atom name;
ExprResult rtrn; ExprResult rtrn;
name = XkbcInternAtom(xkb->dpy, "NumLock", False); name = XkbcInternAtom("NumLock", False);
if ((xkb) && LookupVModIndex((char *) xkb, None, name, TypeInt, &rtrn)) if ((xkb) && LookupVModIndex((char *) xkb, None, name, TypeInt, &rtrn))
{ {
return rtrn.ival; return rtrn.ival;
@ -251,8 +249,8 @@ ResolveVirtualModifier(ExprDef * def, ExprResult * val_rtrn, VModInfo * info)
for (i = 0, bit = 1; i < XkbNumVirtualMods; i++, bit <<= 1) for (i = 0, bit = 1; i < XkbNumVirtualMods; i++, bit <<= 1)
{ {
char *str1, *str2; char *str1, *str2;
str1 = XkbcAtomGetString(info->xkb->dpy, names->vmods[i]); str1 = XkbcAtomGetString(names->vmods[i]);
str2 = XkbcAtomGetString(NULL, def->value.str); str2 = XkbcAtomGetString(def->value.str);
if ((info->available & bit) && (uStrCaseCmp(str1, str2) == Equal)) if ((info->available & bit) && (uStrCaseCmp(str1, str2) == Equal))
{ {
val_rtrn->uval = i; val_rtrn->uval = i;

28
src/xkbcomp/xkbparse.c
View File

@ -2596,57 +2596,57 @@ yyreduce:
case 118: case 118:
#line 630 "xkbparse.y" #line 630 "xkbparse.y"
{ (yyval.sval)= XkbcInternAtom(NULL,"action",False); } { (yyval.sval)= XkbcInternAtom("action",False); }
break; break;
case 119: case 119:
#line 632 "xkbparse.y" #line 632 "xkbparse.y"
{ (yyval.sval)= XkbcInternAtom(NULL,"interpret",False); } { (yyval.sval)= XkbcInternAtom("interpret",False); }
break; break;
case 120: case 120:
#line 634 "xkbparse.y" #line 634 "xkbparse.y"
{ (yyval.sval)= XkbcInternAtom(NULL,"type",False); } { (yyval.sval)= XkbcInternAtom("type",False); }
break; break;
case 121: case 121:
#line 636 "xkbparse.y" #line 636 "xkbparse.y"
{ (yyval.sval)= XkbcInternAtom(NULL,"key",False); } { (yyval.sval)= XkbcInternAtom("key",False); }
break; break;
case 122: case 122:
#line 638 "xkbparse.y" #line 638 "xkbparse.y"
{ (yyval.sval)= XkbcInternAtom(NULL,"group",False); } { (yyval.sval)= XkbcInternAtom("group",False); }
break; break;
case 123: case 123:
#line 640 "xkbparse.y" #line 640 "xkbparse.y"
{(yyval.sval)=XkbcInternAtom(NULL,"modifier_map",False);} {(yyval.sval)=XkbcInternAtom("modifier_map",False);}
break; break;
case 124: case 124:
#line 642 "xkbparse.y" #line 642 "xkbparse.y"
{ (yyval.sval)= XkbcInternAtom(NULL,"indicator",False); } { (yyval.sval)= XkbcInternAtom("indicator",False); }
break; break;
case 125: case 125:
#line 644 "xkbparse.y" #line 644 "xkbparse.y"
{ (yyval.sval)= XkbcInternAtom(NULL,"shape",False); } { (yyval.sval)= XkbcInternAtom("shape",False); }
break; break;
case 126: case 126:
#line 646 "xkbparse.y" #line 646 "xkbparse.y"
{ (yyval.sval)= XkbcInternAtom(NULL,"row",False); } { (yyval.sval)= XkbcInternAtom("row",False); }
break; break;
case 127: case 127:
#line 648 "xkbparse.y" #line 648 "xkbparse.y"
{ (yyval.sval)= XkbcInternAtom(NULL,"section",False); } { (yyval.sval)= XkbcInternAtom("section",False); }
break; break;
case 128: case 128:
#line 650 "xkbparse.y" #line 650 "xkbparse.y"
{ (yyval.sval)= XkbcInternAtom(NULL,"text",False); } { (yyval.sval)= XkbcInternAtom("text",False); }
break; break;
case 129: case 129:
@ -2974,17 +2974,17 @@ yyreduce:
case 179: case 179:
#line 844 "xkbparse.y" #line 844 "xkbparse.y"
{ (yyval.sval)= XkbcInternAtom(NULL,scanStr,False); } { (yyval.sval)= XkbcInternAtom(scanStr,False); }
break; break;
case 180: case 180:
#line 845 "xkbparse.y" #line 845 "xkbparse.y"
{ (yyval.sval)= XkbcInternAtom(NULL,"default",False); } { (yyval.sval)= XkbcInternAtom("default",False); }
break; break;
case 181: case 181:
#line 848 "xkbparse.y" #line 848 "xkbparse.y"
{ (yyval.sval)= XkbcInternAtom(NULL,scanStr,False); } { (yyval.sval)= XkbcInternAtom(scanStr,False); }
break; break;
case 182: case 182:

28
src/xkbcomp/xkbparse.y
View File

@ -558,27 +558,27 @@ FieldSpec : Ident { $$= $1; }
; ;
Element : ACTION_TOK Element : ACTION_TOK
{ $$= XkbcInternAtom(NULL,"action",False); } { $$= XkbcInternAtom("action",False); }
| INTERPRET | INTERPRET
{ $$= XkbcInternAtom(NULL,"interpret",False); } { $$= XkbcInternAtom("interpret",False); }
| TYPE | TYPE
{ $$= XkbcInternAtom(NULL,"type",False); } { $$= XkbcInternAtom("type",False); }
| KEY | KEY
{ $$= XkbcInternAtom(NULL,"key",False); } { $$= XkbcInternAtom("key",False); }
| GROUP | GROUP
{ $$= XkbcInternAtom(NULL,"group",False); } { $$= XkbcInternAtom("group",False); }
| MODIFIER_MAP | MODIFIER_MAP
{$$=XkbcInternAtom(NULL,"modifier_map",False);} {$$=XkbcInternAtom("modifier_map",False);}
| INDICATOR | INDICATOR
{ $$= XkbcInternAtom(NULL,"indicator",False); } { $$= XkbcInternAtom("indicator",False); }
| SHAPE | SHAPE
{ $$= XkbcInternAtom(NULL,"shape",False); } { $$= XkbcInternAtom("shape",False); }
| ROW | ROW
{ $$= XkbcInternAtom(NULL,"row",False); } { $$= XkbcInternAtom("row",False); }
| SECTION | SECTION
{ $$= XkbcInternAtom(NULL,"section",False); } { $$= XkbcInternAtom("section",False); }
| TEXT | TEXT
{ $$= XkbcInternAtom(NULL,"text",False); } { $$= XkbcInternAtom("text",False); }
; ;
OptMergeMode : MergeMode { $$= $1; } OptMergeMode : MergeMode { $$= $1; }
@ -764,11 +764,11 @@ Integer : INTEGER { $$= scanInt; }
KeyName : KEYNAME { $$= scanStr; scanStr= NULL; } KeyName : KEYNAME { $$= scanStr; scanStr= NULL; }
; ;
Ident : IDENT { $$= XkbcInternAtom(NULL,scanStr,False); } Ident : IDENT { $$= XkbcInternAtom(scanStr,False); }
| DEFAULT { $$= XkbcInternAtom(NULL,"default",False); } | DEFAULT { $$= XkbcInternAtom("default",False); }
; ;
String : STRING { $$= XkbcInternAtom(NULL,scanStr,False); } String : STRING { $$= XkbcInternAtom(scanStr,False); }
; ;
OptMapName : MapName { $$= $1; } OptMapName : MapName { $$= $1; }