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>
This commit is contained in:
Daniel Stone 2008-07-18 16:29:35 +03:00
commit 1ad80678d8
9 changed files with 17 additions and 61 deletions

View file

@ -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 */,

View file

@ -69,7 +69,6 @@ typedef struct _XkbRF_Rule {
char * types;
char * compat;
char * geometry;
char * keymap;
unsigned flags;
} XkbRF_RuleRec,*XkbRF_RulePtr;

View file

@ -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;

View file

@ -527,7 +527,6 @@ typedef struct _XkbChanges {
* database.
*/
typedef struct _XkbComponentNames {
char * keymap;
char * keycodes;
char * types;
char * compat;