diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2010-01-15 15:32:13 +1000 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2010-01-25 09:29:19 +1300 |
| commit | c8bba14a390fe3fa16027e6b2433a314b3ea00c3 (patch) | |
| tree | 9892c7ac689e72e0ced447a1b0c4d36cd01afde3 | |
| parent | f37799c9712afb7769f369162b904d9ea2dbd608 (diff) | |
xkb: remove XkbAtomGetString, replace with NameForAtom.
XKB really XKBdoes not XKBneed its own XKBdefines for XKBeverything.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Fernando Carrijo <fcarrijo@yahoo.com.br>
Signed-off-by: Keith Packard <keithp@keithp.com>
| -rw-r--r-- | include/xkbsrv.h | 2 | ||||
| -rw-r--r-- | xkb/xkbfmisc.c | 10 | ||||
| -rw-r--r-- | xkb/xkbout.c | 2 | ||||
| -rw-r--r-- | xkb/xkbtext.c | 4 |
4 files changed, 8 insertions, 10 deletions
diff --git a/include/xkbsrv.h b/include/xkbsrv.h index ed3779a21..6b702e8cb 100644 --- a/include/xkbsrv.h +++ b/include/xkbsrv.h @@ -990,6 +990,4 @@ extern _X_EXPORT XkbDescPtr XkbCompileKeymap( XkbRMLVOSet * /* rmlvo */ ); -#define XkbAtomGetString(s) NameForAtom(s) - #endif /* _XKBSRV_H_ */ diff --git a/xkb/xkbfmisc.c b/xkb/xkbfmisc.c index 52ef6362c..804ef2080 100644 --- a/xkb/xkbfmisc.c +++ b/xkb/xkbfmisc.c @@ -240,7 +240,7 @@ unsigned wantNames,wantConfig,wantDflts; if ((xkb!=NULL) && (old_names!=NULL)) { if (wantNames&XkmTypesMask) { if (old_names->types!=None) { - tmp= XkbAtomGetString(old_names->types); + tmp= NameForAtom(old_names->types); names->types= _XkbDupString(tmp); } else { @@ -250,7 +250,7 @@ unsigned wantNames,wantConfig,wantDflts; } if (wantNames&XkmCompatMapMask) { if (old_names->compat!=None) { - tmp= XkbAtomGetString(old_names->compat); + tmp= NameForAtom(old_names->compat); names->compat= _XkbDupString(tmp); } else wantDflts|= XkmCompatMapMask; @@ -259,13 +259,13 @@ unsigned wantNames,wantConfig,wantDflts; if (wantNames&XkmSymbolsMask) { if (old_names->symbols==None) return False; - tmp= XkbAtomGetString(old_names->symbols); + tmp= NameForAtom(old_names->symbols); names->symbols= _XkbDupString(tmp); complete|= XkmSymbolsMask; } if (wantNames&XkmKeyNamesMask) { if (old_names->keycodes!=None) { - tmp= XkbAtomGetString(old_names->keycodes); + tmp= NameForAtom(old_names->keycodes); names->keycodes= _XkbDupString(tmp); } else wantDflts|= XkmKeyNamesMask; @@ -274,7 +274,7 @@ unsigned wantNames,wantConfig,wantDflts; if (wantNames&XkmGeometryMask) { if (old_names->geometry==None) return False; - tmp= XkbAtomGetString(old_names->geometry); + tmp= NameForAtom(old_names->geometry); names->geometry= _XkbDupString(tmp); complete|= XkmGeometryMask; wantNames&= ~XkmGeometryMask; diff --git a/xkb/xkbout.c b/xkb/xkbout.c index b1c30d052..53f68411a 100644 --- a/xkb/xkbout.c +++ b/xkb/xkbout.c @@ -233,7 +233,7 @@ WriteXKBIndicatorMap( FILE * file, void * priv) { - fprintf(file," indicator \"%s\" {\n",XkbAtomGetString(name)); + fprintf(file," indicator \"%s\" {\n",NameForAtom(name)); if (led->flags&XkbIM_NoExplicit) fprintf(file," !allowExplicit;\n"); if (led->flags&XkbIM_LEDDrivesKB) diff --git a/xkb/xkbtext.c b/xkb/xkbtext.c index 95ad01378..324254dd3 100644 --- a/xkb/xkbtext.c +++ b/xkb/xkbtext.c @@ -74,7 +74,7 @@ XkbAtomText(Atom atm,unsigned format) const char *atmstr; char *rtrn,*tmp; - atmstr = XkbAtomGetString(atm); + atmstr = NameForAtom(atm); if (atmstr != NULL) { int len; len= strlen(atmstr)+1; @@ -118,7 +118,7 @@ char numBuf[20]; if (ndx>=XkbNumVirtualMods) tmp= "illegal"; else if (vmodNames&&(vmodNames[ndx]!=None)) - tmp= XkbAtomGetString(vmodNames[ndx]); + tmp= NameForAtom(vmodNames[ndx]); if (tmp==NULL) { sprintf(numBuf,"%d",ndx); tmp = numBuf; |