aboutsummaryrefslogtreecommitdiff
path: root/nx-X11
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2018-07-05 23:23:11 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2018-11-09 15:31:57 +0100
commiteb07ed57bb9afdde7bf0f1e501ce08d5fd3de30e (patch)
tree17b8a332625d7d0f5b56b058c32a013606bd5a90 /nx-X11
parent11a1f31d70c189bf6c5f4420f196468267755a0d (diff)
downloadnx-libs-eb07ed57bb9afdde7bf0f1e501ce08d5fd3de30e.tar.gz
nx-libs-eb07ed57bb9afdde7bf0f1e501ce08d5fd3de30e.tar.bz2
nx-libs-eb07ed57bb9afdde7bf0f1e501ce08d5fd3de30e.zip
Keyboard.c: do not define own RLMVO defaults
use the ones from xkb
Diffstat (limited to 'nx-X11')
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Keyboard.c99
1 files changed, 5 insertions, 94 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c
index d943ec2c4..2ffdde1c2 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c
@@ -135,25 +135,6 @@ extern Status XkbGetControls(
#endif
);
-#ifndef XKB_DFLT_RULES_FILE
-#define XKB_DFLT_RULES_FILE "base"
-#endif
-#ifndef XKB_ALTS_RULES_FILE
-#define XKB_ALTS_RULES_FILE "xorg"
-#endif
-#ifndef XKB_DFLT_KB_LAYOUT
-#define XKB_DFLT_KB_LAYOUT "us"
-#endif
-#ifndef XKB_DFLT_KB_MODEL
-#define XKB_DFLT_KB_MODEL "pc102"
-#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
-
extern int XkbDfltRepeatDelay;
extern int XkbDfltRepeatInterval;
@@ -180,8 +161,6 @@ XkbWrapperRec nxagentXkbWrapper;
extern char *nxagentKeyboard;
-static char *nxagentXkbGetRules(void);
-
unsigned int nxagentAltMetaMask;
unsigned int nxagentAltMask;
unsigned int nxagentMetaMask;
@@ -481,73 +460,6 @@ static int nxagentRestoreKeyboardDeviceData(DeviceIntPtr devBackup, DeviceIntPtr
static int nxagentFreeKeyboardDeviceData(DeviceIntPtr dev);
-static char *nxagentXkbGetRules()
-{
- int ret;
- char *path;
- struct stat buf;
-
- #ifdef TEST
- fprintf(stderr, "nxagentXkbGetRules: XkbBaseDirectory [%s].\n",
- XkbBaseDirectory);
- #endif
-
- if (-1 == asprintf(&path, "%s/rules/%s", XkbBaseDirectory, XKB_DFLT_RULES_FILE))
- {
- FatalError("nxagentXkbGetRules: malloc failed.");
- }
-
- #ifdef TEST
- fprintf(stderr, "nxagentXkbGetRules: checking rules file [%s]\n", path);
- #endif
- ret = stat(path, &buf);
-
- if (ret == 0)
- {
- free(path);
- #ifdef TEST
- fprintf(stderr, "nxagentXkbGetRules: returning default rules file [%s]\n", XKB_DFLT_RULES_FILE);
- #endif
- return XKB_DFLT_RULES_FILE;
- }
-
- #ifdef TEST
- fprintf(stderr, "nxagentXkbGetRules: WARNING! Failed to stat file [%s]: %s.\n", path, strerror(ret));
- #endif
-
- free(path);
- path = NULL;
-
- if (-1 == asprintf(&path, "%s/rules/%s", XkbBaseDirectory, XKB_ALTS_RULES_FILE))
- {
- FatalError("nxagentXkbGetRules: malloc failed.");
- }
-
- #ifdef TEST
- fprintf(stderr, "nxagentXkbGetRules: checking rules file [%s]\n", path);
- #endif
- ret = stat(path, &buf);
-
- if (ret == 0)
- {
- free(path);
- #ifdef TEST
- fprintf(stderr, "nxagentXkbGetRules: returning alternative rules file [%s]\n", XKB_ALTS_RULES_FILE);
- #endif
- return XKB_ALTS_RULES_FILE;
- }
-
- #ifdef WARNING
- fprintf(stderr, "nxagentXkbGetRules: WARNING! Failed to stat file [%s]: %s.\n", path, strerror(ret));
- #endif
-
- free(path);
- #ifdef TEST
- fprintf(stderr, "nxagentXkbGetRules: returning default rules file [%s]\n", XKB_DFLT_RULES_FILE);
- #endif
- return XKB_DFLT_RULES_FILE;
-}
-
void nxagentBell(int volume, DeviceIntPtr pDev, void * ctrl, int cls)
{
XBell(nxagentDisplay, volume);
@@ -843,8 +755,7 @@ XkbError:
fprintf(stderr, "nxagentKeyboardProc: nxagentKeyboard is [%s].\n", nxagentKeyboard ? nxagentKeyboard : "NULL");
#endif
-
- rules = nxagentXkbGetRules();
+ rules = NULL; /* use xkb default */
/*
from nxagent changelog:
@@ -901,8 +812,8 @@ XkbError:
}
else
{
- layout = XKB_DFLT_KB_LAYOUT;
- model = XKB_DFLT_KB_MODEL;
+ layout = NULL; /* use xkb default */
+ model = NULL; /* use xkb default */
#ifdef TEST
fprintf(stderr, "nxagentKeyboardProc: Using default keyboard: model [%s] layout [%s].\n",
@@ -910,8 +821,8 @@ XkbError:
#endif
}
- variants = XKB_DFLT_KB_VARIANT;
- options = XKB_DFLT_KB_OPTIONS;
+ variants = NULL; /* use xkb default */
+ options = NULL; /* use xkb default */
#ifdef TEST
fprintf(stderr, "nxagentKeyboardProc: Init XKB extension.\n");