frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update xorg-server.h.in & Xnest to use new XKB default #defines

This commit is contained in:
Alan Coopersmith 2009-01-21 14:45:06 -08:00
parent cdf216aa17
commit 3208eff2d7
2 changed files with 9 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
hw/xnest/Keyboard.c
View File

@ -59,29 +59,6 @@ extern Status XkbGetControls(
unsigned long /* which */, unsigned long /* which */,
XkbDescPtr /* desc */ XkbDescPtr /* desc */
); );
#ifndef XKB_BASE_DIRECTORY
#define XKB_BASE_DIRECTORY "/usr/X11R6/lib/X11/xkb/"
#endif
#ifndef XKB_CONFIG_FILE
#define XKB_CONFIG_FILE "X0-config.keyboard"
#endif
#ifndef XKB_DFLT_RULES_FILE
#define XKB_DFLT_RULES_FILE XKB_DFLT_RULES
#endif
#ifndef XKB_DFLT_KB_LAYOUT
#define XKB_DFLT_KB_LAYOUT "us"
#endif
#ifndef XKB_DFLT_KB_MODEL
#define XKB_DFLT_KB_MODEL "pc101"
#endif
#ifndef XKB_DFLT_KB_VARIANT
#define XKB_DFLT_KB_VARIANT NULL
#endif
#ifndef XKB_DFLT_KB_OPTIONS
#define XKB_DFLT_KB_OPTIONS NULL
#endif
#endif #endif
DeviceIntPtr xnestKeyboardDevice = NULL; DeviceIntPtr xnestKeyboardDevice = NULL;
@ -222,11 +199,11 @@ XkbError:
XkbGetControls(xnestDisplay, XkbAllControlsMask, xkb); XkbGetControls(xnestDisplay, XkbAllControlsMask, xkb);
memset(&names, 0, sizeof(XkbComponentNamesRec)); memset(&names, 0, sizeof(XkbComponentNamesRec));
rules = XKB_DFLT_RULES_FILE; rules = XKB_DFLT_RULES;
model = XKB_DFLT_KB_MODEL; model = XKB_DFLT_MODEL;
layout = XKB_DFLT_KB_LAYOUT; layout = XKB_DFLT_LAYOUT;
variants = XKB_DFLT_KB_VARIANT; variants = XKB_DFLT_VARIANT;
options = XKB_DFLT_KB_OPTIONS; options = XKB_DFLT_OPTIONS;
XkbSetRulesDflts(rules, model, layout, variants, options); XkbSetRulesDflts(rules, model, layout, variants, options);
XkbInitKeyboardDeviceStruct(pDev, &names, &keySyms, modmap, XkbInitKeyboardDeviceStruct(pDev, &names, &keySyms, modmap,

8
include/xorg-server.h.in
View File

@ -106,7 +106,10 @@
/* Enable XKB per default */ /* Enable XKB per default */
#undef XKB_DFLT_DISABLED #undef XKB_DFLT_DISABLED
/* Build XKB server */ /* XKB default rules */
#undef XKB_DFLT_RULES
/* Build XKB support in server */
#undef XKB_IN_SERVER #undef XKB_IN_SERVER
/* Support loadable input and output drivers */ /* Support loadable input and output drivers */
@ -160,9 +163,6 @@
/* Location of configuration file */ /* Location of configuration file */
#undef __XCONFIGFILE__ #undef __XCONFIGFILE__
/* XKB default rules */
#undef __XKBDEFRULES__
/* Name of X server */ /* Name of X server */
#undef __XSERVERNAME__ #undef __XSERVERNAME__