mirror of
https://github.com/X11Libre/xserver.git
synced 2026-09-27 21:22:26 +00:00
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:
parent
133e0bd6f1
commit
1ad80678d8
9 changed files with 17 additions and 61 deletions
|
|
@ -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 */,
|
||||
|
|
|
|||
|
|
@ -69,7 +69,6 @@ typedef struct _XkbRF_Rule {
|
|||
char * types;
|
||||
char * compat;
|
||||
char * geometry;
|
||||
char * keymap;
|
||||
unsigned flags;
|
||||
} XkbRF_RuleRec,*XkbRF_RulePtr;
|
||||
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -527,7 +527,6 @@ typedef struct _XkbChanges {
|
|||
* database.
|
||||
*/
|
||||
typedef struct _XkbComponentNames {
|
||||
char * keymap;
|
||||
char * keycodes;
|
||||
char * types;
|
||||
char * compat;
|
||||
|
|
|
|||
Loading…
Reference in a new issue