aboutsummaryrefslogtreecommitdiff
path: root/nx-X11
diff options
context:
space:
mode:
Diffstat (limited to 'nx-X11')
-rw-r--r--nx-X11/programs/Xserver/include/xkbfile.h5
-rw-r--r--nx-X11/programs/Xserver/include/xkbsrv.h2
-rw-r--r--nx-X11/programs/Xserver/xkb/xkbfmisc.c10
-rw-r--r--nx-X11/programs/Xserver/xkb/xkbout.c2
-rw-r--r--nx-X11/programs/Xserver/xkb/xkbtext.c4
5 files changed, 8 insertions, 15 deletions
diff --git a/nx-X11/programs/Xserver/include/xkbfile.h b/nx-X11/programs/Xserver/include/xkbfile.h
index c042ef2ad..e99de6c9c 100644
--- a/nx-X11/programs/Xserver/include/xkbfile.h
+++ b/nx-X11/programs/Xserver/include/xkbfile.h
@@ -236,11 +236,6 @@ extern Bool XkbLookupGroupAndLevel(
/***====================================================================***/
-extern char * XkbAtomGetString(
- Display * /* dpy */,
- Atom /* atm */
-);
-
extern Atom XkbInternAtom(
Display * /* dpy */,
char * /* name */,
diff --git a/nx-X11/programs/Xserver/include/xkbsrv.h b/nx-X11/programs/Xserver/include/xkbsrv.h
index d5036b6fd..533a30930 100644
--- a/nx-X11/programs/Xserver/include/xkbsrv.h
+++ b/nx-X11/programs/Xserver/include/xkbsrv.h
@@ -1176,8 +1176,6 @@ extern int _XkbStrCaseCmp(
_XFUNCPROTOEND
-#define XkbAtomGetString(d,s) NameForAtom(s)
-
#endif /* _XKBSRV_H_ */
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);