andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove remnants of XkbCF code.

Browse Source
This commit is contained in:
Daniel Stone 2006-03-27 22:25:56 +00:00
parent 7257590651
commit 9e202dfe40
3 changed files with 3 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -8,6 +8,8 @@
* xkb/xkbconfig.c:
* xkb/ddxConfig.c:
* xkb/xkbInit.c:
* hw/xgl/glx/xglx.c:
* hw/xnest/Keyboard.c:
Remove weirdo XkbCF pre-configuration code.
* xkb/xkb.h:

21
hw/xgl/glx/xglx.c
View File

@ -1195,27 +1195,6 @@ xglxKeybdProc (DeviceIntPtr pDevice,
names.keymap = XkbInitialMap;
}
file = fopen (XKB_BASE_DIRECTORY XKB_CONFIG_FILE, "r");
if (file)
{
XkbConfigRtrnRec config;
if (XkbCFParse (file, XkbCFDflts, desc, &config))
{
if (config.rules_file)
rules = config.rules_file;
if (config.model)
model = config.model;
if (config.layout)
layout = config.layout;
if (config.variant)
variants = config.variant;
if (config.options)
options = config.options;
}
fclose (file);
}
XkbSetRulesDflts (rules, model, layout, variants, options);
ret = XkbInitKeyboardDeviceStruct ((pointer) pDev,

22
hw/xnest/Keyboard.c
View File

@ -1,5 +1,5 @@
/* $Xorg: Keyboard.c,v 1.3 2000/08/17 19:53:28 cpqbld Exp $ */
/* $XdotOrg: xc/programs/Xserver/hw/xnest/Keyboard.c,v 1.4 2005/06/25 21:28:48 ajax Exp $ */
/* $XdotOrg: xserver/xorg/hw/xnest/Keyboard.c,v 1.8 2005/07/14 03:36:44 kem Exp $ */
/*
Copyright 1993 by Davor Matic
@ -235,26 +235,6 @@ XkbError:
names.keymap = XkbInitialMap;
}
if ((file = fopen(XKB_BASE_DIRECTORY XKB_CONFIG_FILE, "r")) != NULL) {
if (XkbCFParse(file, XkbCFDflts, xkb, &config) == 0) {
ErrorF("Error parsing config file.\n");
fclose(file);
goto XkbError;
}
if (config.rules_file)
rules = config.rules_file;
if (config.model)
model = config.model;
if (config.layout)
layout = config.layout;
if (config.variant)
variants = config.variant;
if (config.options)
options = config.options;
fclose(file);
}
XkbSetRulesDflts(rules, model, layout, variants, options);
XkbInitKeyboardDeviceStruct(pDev, &names, &keySyms, modmap,
xnestBell, xnestChangeKeyboardControl);