diff options
| author | Daniel Stone <daniel@fooishbar.org> | 2008-02-03 23:43:18 +1100 |
|---|---|---|
| committer | Daniel Stone <daniel@fooishbar.org> | 2008-02-17 22:52:07 +0200 |
| commit | 1332343910a1880854bae21a790cff198855cd24 (patch) | |
| tree | 0cc6b9746171f7eea6ee5b122cebd829addfd928 /xkb/xkbfmisc.c | |
| parent | 534fc5140b039a8c98ab715d0a6740d513b41209 (diff) | |
XKB: Remove usage of client-side types
Since we're no longer sharing with Xlib, don't pass Displays and XPointers
everywhere.
Diffstat (limited to 'xkb/xkbfmisc.c')
| -rw-r--r-- | xkb/xkbfmisc.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/xkb/xkbfmisc.c b/xkb/xkbfmisc.c index 06d3519af..4182c3a34 100644 --- a/xkb/xkbfmisc.c +++ b/xkb/xkbfmisc.c @@ -160,7 +160,6 @@ _AddIncl( FILE * file, Bool XkbWriteXKBKeymapForNames( FILE * file, XkbComponentNamesPtr names, - Display * dpy, XkbDescPtr xkb, unsigned want, unsigned need) @@ -233,7 +232,7 @@ XkbFileInfo finfo; if ((xkb!=NULL) && (old_names!=NULL)) { if (wantNames&XkmTypesMask) { if (old_names->types!=None) { - tmp= XkbAtomGetString(dpy,old_names->types); + tmp= XkbAtomGetString(old_names->types); names->types= _XkbDupString(tmp); } else { @@ -243,7 +242,7 @@ XkbFileInfo finfo; } if (wantNames&XkmCompatMapMask) { if (old_names->compat!=None) { - tmp= XkbAtomGetString(dpy,old_names->compat); + tmp= XkbAtomGetString(old_names->compat); names->compat= _XkbDupString(tmp); } else wantDflts|= XkmCompatMapMask; @@ -252,13 +251,13 @@ XkbFileInfo finfo; if (wantNames&XkmSymbolsMask) { if (old_names->symbols==None) return False; - tmp= XkbAtomGetString(dpy,old_names->symbols); + tmp= XkbAtomGetString(old_names->symbols); names->symbols= _XkbDupString(tmp); complete|= XkmSymbolsMask; } if (wantNames&XkmKeyNamesMask) { if (old_names->keycodes!=None) { - tmp= XkbAtomGetString(dpy,old_names->keycodes); + tmp= XkbAtomGetString(old_names->keycodes); names->keycodes= _XkbDupString(tmp); } else wantDflts|= XkmKeyNamesMask; @@ -267,7 +266,7 @@ XkbFileInfo finfo; if (wantNames&XkmGeometryMask) { if (old_names->geometry==None) return False; - tmp= XkbAtomGetString(dpy,old_names->geometry); + tmp= XkbAtomGetString(old_names->geometry); names->geometry= _XkbDupString(tmp); complete|= XkmGeometryMask; wantNames&= ~XkmGeometryMask; |