diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2010-01-15 15:32:13 +1000 |
|---|---|---|
| committer | Ulrich Sibiller <uli42@gmx.de> | 2017-03-03 21:33:34 +0100 |
| commit | 9e29588dd09eec1824b3b49fb9368f22e78ce790 (patch) | |
| tree | 826cdbe667bba1c722b7747dc661037dba4bd20c /nx-X11/programs/Xserver/xkb | |
| parent | bdfb52193b5a2c5e44969b11d997ce19f0310af9 (diff) | |
| download | nx-libs-9e29588dd09eec1824b3b49fb9368f22e78ce790.tar.gz nx-libs-9e29588dd09eec1824b3b49fb9368f22e78ce790.tar.bz2 nx-libs-9e29588dd09eec1824b3b49fb9368f22e78ce790.zip | |
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>
Backported-to-NX-by: Ulrich Sibiller <uli42@gmx.de>
Diffstat (limited to 'nx-X11/programs/Xserver/xkb')
| -rw-r--r-- | nx-X11/programs/Xserver/xkb/xkbfmisc.c | 10 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/xkb/xkbout.c | 2 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/xkb/xkbtext.c | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/nx-X11/programs/Xserver/xkb/xkbfmisc.c b/nx-X11/programs/Xserver/xkb/xkbfmisc.c index 3f5a57e93..1c040cd2e 100644 --- a/nx-X11/programs/Xserver/xkb/xkbfmisc.c +++ b/nx-X11/programs/Xserver/xkb/xkbfmisc.c @@ -333,7 +333,7 @@ XkbFileInfo finfo; if ((xkb!=NULL) && (old_names!=NULL)) { if (wantNames&XkmTypesMask) { if (old_names->types!=None) { - tmp= XkbAtomGetString(dpy,old_names->types); + tmp= NameForAtom(old_names->types); names->types= Xstrdup(tmp); } else { @@ -343,7 +343,7 @@ XkbFileInfo finfo; } if (wantNames&XkmCompatMapMask) { if (old_names->compat!=None) { - tmp= XkbAtomGetString(dpy,old_names->compat); + tmp= NameForAtom(old_names->compat); names->compat= Xstrdup(tmp); } else wantDflts|= XkmCompatMapMask; @@ -352,13 +352,13 @@ XkbFileInfo finfo; if (wantNames&XkmSymbolsMask) { if (old_names->symbols==None) return False; - tmp= XkbAtomGetString(dpy,old_names->symbols); + tmp= NameForAtom(old_names->symbols); names->symbols= Xstrdup(tmp); complete|= XkmSymbolsMask; } if (wantNames&XkmKeyNamesMask) { if (old_names->keycodes!=None) { - tmp= XkbAtomGetString(dpy,old_names->keycodes); + tmp= NameForAtom(old_names->keycodes); names->keycodes= Xstrdup(tmp); } else wantDflts|= XkmKeyNamesMask; @@ -367,7 +367,7 @@ XkbFileInfo finfo; if (wantNames&XkmGeometryMask) { if (old_names->geometry==None) return False; - tmp= XkbAtomGetString(dpy,old_names->geometry); + tmp= NameForAtom(old_names->geometry); names->geometry= Xstrdup(tmp); complete|= XkmGeometryMask; wantNames&= ~XkmGeometryMask; diff --git a/nx-X11/programs/Xserver/xkb/xkbout.c b/nx-X11/programs/Xserver/xkb/xkbout.c index 1e546d1cb..b76617963 100644 --- a/nx-X11/programs/Xserver/xkb/xkbout.c +++ b/nx-X11/programs/Xserver/xkb/xkbout.c @@ -250,7 +250,7 @@ WriteXKBIndicatorMap( FILE * file, XkbDescPtr xkb; xkb= result->xkb; - fprintf(file," indicator \"%s\" {\n",XkbAtomGetString(xkb->dpy,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/nx-X11/programs/Xserver/xkb/xkbtext.c b/nx-X11/programs/Xserver/xkb/xkbtext.c index 273ba5aae..7c22d25c8 100644 --- a/nx-X11/programs/Xserver/xkb/xkbtext.c +++ b/nx-X11/programs/Xserver/xkb/xkbtext.c @@ -75,7 +75,7 @@ XkbAtomText(Display *dpy,Atom atm,unsigned format) { char *rtrn,*tmp; - tmp= (char *)XkbAtomGetString(dpy,atm); + tmp= (char *)NameForAtom(atm); if (tmp!=NULL) { int len; len= strlen(tmp)+1; @@ -118,7 +118,7 @@ char numBuf[20]; if (ndx>=XkbNumVirtualMods) tmp= "illegal"; else if (vmodNames&&(vmodNames[ndx]!=None)) - tmp= (char *)XkbAtomGetString(dpy,vmodNames[ndx]); + tmp= (char *)NameForAtom(vmodNames[ndx]); if (tmp==NULL) sprintf(tmp=numBuf,"%d",ndx); |