aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/hw/xwin/winconfig.h
diff options
context:
space:
mode:
Diffstat (limited to 'xorg-server/hw/xwin/winconfig.h')
-rw-r--r--xorg-server/hw/xwin/winconfig.h24
1 files changed, 1 insertions, 23 deletions
diff --git a/xorg-server/hw/xwin/winconfig.h b/xorg-server/hw/xwin/winconfig.h
index 4b56d639c..63d621112 100644
--- a/xorg-server/hw/xwin/winconfig.h
+++ b/xorg-server/hw/xwin/winconfig.h
@@ -194,15 +194,11 @@ typedef struct
#ifdef XWIN_XF86CONFIG
char *keyboard;
#endif
-#ifdef XKB
- Bool noXkbExtension;
- char *xkbMap;
char *xkbRules;
char *xkbModel;
char *xkbLayout;
char *xkbVariant;
char *xkbOptions;
-#endif
/* layout */
char *screenname;
/* mouse settings */
@@ -309,25 +305,7 @@ typedef struct
long rate;
}
keyboard;
-#ifdef XKB
- struct
- {
- Bool disable;
- char *rules;
- char *model;
- char *layout;
- char *variant;
- char *options;
- char *initialMap;
- char *keymap;
- char *types;
- char *compat;
- char *keycodes;
- char *symbols;
- char *geometry;
- }
- xkb;
-#endif
+ XkbRMLVOSet xkb;
struct
{
Bool emulate3Buttons;