diff options
| author | Daniel Stone <daniel@fooishbar.org> | 2008-07-18 16:29:35 +0300 |
|---|---|---|
| committer | Daniel Stone <daniel@fooishbar.org> | 2009-01-22 15:08:56 +1100 |
| commit | 1ad80678d88525159e55bb814205fd4eaca060a3 (patch) | |
| tree | 1c44006af6a88624333e1f6ec46bd14d21607a73 /include | |
| parent | 133e0bd6f1cc147a2ddbbe1519d10300e7dbe669 (diff) | |
XKB: Remove support for setting combined keymaps
We don't do full keymaps anymore. Deal.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/xkbfile.h | 4 | ||||
| -rw-r--r-- | include/xkbrules.h | 1 | ||||
| -rw-r--r-- | include/xkbsrv.h | 13 | ||||
| -rw-r--r-- | include/xkbstr.h | 1 |
4 files changed, 6 insertions, 13 deletions
diff --git a/include/xkbfile.h b/include/xkbfile.h index 346f213ec..a4b99ee07 100644 --- a/include/xkbfile.h +++ b/include/xkbfile.h @@ -284,10 +284,6 @@ extern _X_EXPORT Bool XkbWriteXKBGeometry( void * /* priv */ ); -extern _X_EXPORT void XkbEnsureSafeMapName( - char * /* name */ -); - extern _X_EXPORT Bool XkbWriteXKBKeymapForNames( FILE * /* file */, XkbComponentNamesPtr /* names */, diff --git a/include/xkbrules.h b/include/xkbrules.h index 0001481cd..0a15de2e0 100644 --- a/include/xkbrules.h +++ b/include/xkbrules.h @@ -69,7 +69,6 @@ typedef struct _XkbRF_Rule { char * types; char * compat; char * geometry; - char * keymap; unsigned flags; } XkbRF_RuleRec,*XkbRF_RulePtr; diff --git a/include/xkbsrv.h b/include/xkbsrv.h index a28967c22..b2b173627 100644 --- a/include/xkbsrv.h +++ b/include/xkbsrv.h @@ -962,13 +962,12 @@ extern Bool XkbCopyKeymap( #include <X11/extensions/XKMformat.h> #include "xkbrules.h" -#define _XkbListKeymaps 0 -#define _XkbListKeycodes 1 -#define _XkbListTypes 2 -#define _XkbListCompat 3 -#define _XkbListSymbols 4 -#define _XkbListGeometry 5 -#define _XkbListNumComponents 6 +#define _XkbListKeycodes 0 +#define _XkbListTypes 1 +#define _XkbListCompat 2 +#define _XkbListSymbols 3 +#define _XkbListGeometry 4 +#define _XkbListNumComponents 5 typedef struct _XkbSrvListInfo { int szPool; diff --git a/include/xkbstr.h b/include/xkbstr.h index 5eebe41e3..ba7debb6e 100644 --- a/include/xkbstr.h +++ b/include/xkbstr.h @@ -527,7 +527,6 @@ typedef struct _XkbChanges { * database. */ typedef struct _XkbComponentNames { - char * keymap; char * keycodes; char * types; char * compat; |