summaryrefslogtreecommitdiff
authorAlan Coopersmith <alan.coopersmith@sun.com>2008-12-02 20:59:57 (GMT)
committer Alan Coopersmith <alan.coopersmith@sun.com>2008-12-02 21:09:22 (GMT)
commit3a690598cf18c4cdc6aadd10a1ecf0772cacd34b (patch) (side-by-side diff)
treecb811bbc70629e665e9ca724d0885b9f13b5f3d0
parent1dfed222e93f4684c2a450944a9a0ea9e085c43f (diff)
downloadxserver-3a690598cf18c4cdc6aadd10a1ecf0772cacd34b.zip
xserver-3a690598cf18c4cdc6aadd10a1ecf0772cacd34b.tar.gz
Remove unused HandleSpecialKeys config option
Was only used by "keyboard" driver - the last place the value was checked was in xf86PostKbdEvent, which was removed in commit 60ea7b51fe2b8a19a08b63db48504971a7a50ee6
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--hw/xfree86/common/xf86Config.c19
-rw-r--r--hw/xfree86/common/xf86Globals.c1
-rw-r--r--hw/xfree86/common/xf86Privstr.h7
-rw-r--r--hw/xfree86/doc/man/Xorg.man.pre9
-rw-r--r--hw/xfree86/doc/man/xorg.conf.man.pre20
5 files changed, 3 insertions, 53 deletions
diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
index 28707d8..5abfb4d 100644
--- a/hw/xfree86/common/xf86Config.c
+++ b/hw/xfree86/common/xf86Config.c
@@ -803,8 +803,6 @@ static OptionInfoRec FlagOptions[] = {
{0}, FALSE },
{ FLAG_RENDER_COLORMAP_MODE, "RenderColormapMode", OPTV_STRING,
{0}, FALSE },
- { FLAG_HANDLE_SPECIAL_KEYS, "HandleSpecialKeys", OPTV_STRING,
- {0}, FALSE },
{ FLAG_RANDR, "RandR", OPTV_BOOLEAN,
{0}, FALSE },
{ FLAG_AIGLX, "AIGLX", OPTV_BOOLEAN,
@@ -975,22 +973,7 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts)
}
}
#endif
- {
- if ((s = xf86GetOptValString(FlagOptions, FLAG_HANDLE_SPECIAL_KEYS))) {
- if (!xf86NameCmp(s,"always")) {
- xf86Msg(X_CONFIG, "Always handling special keys in DDX\n");
- xf86Info.ddxSpecialKeys = SKAlways;
- } else if (!xf86NameCmp(s,"whenneeded")) {
- xf86Msg(X_CONFIG, "Special keys handled in DDX only if needed\n");
- xf86Info.ddxSpecialKeys = SKWhenNeeded;
- } else if (!xf86NameCmp(s,"never")) {
- xf86Msg(X_CONFIG, "Never handling special keys in DDX\n");
- xf86Info.ddxSpecialKeys = SKNever;
- } else {
- xf86Msg(X_WARNING,"Unknown HandleSpecialKeys option\n");
- }
- }
- }
+
#ifdef RANDR
xf86Info.disableRandR = FALSE;
xf86Info.randRFrom = X_DEFAULT;
diff --git a/hw/xfree86/common/xf86Globals.c b/hw/xfree86/common/xf86Globals.c
index 385c3e1..c01f485 100644
--- a/hw/xfree86/common/xf86Globals.c
+++ b/hw/xfree86/common/xf86Globals.c
@@ -101,7 +101,6 @@ _X_EXPORT xf86InfoRec xf86Info = {
.consoleFd = -1,
.vtno = -1,
.vtSysreq = FALSE,
- .ddxSpecialKeys = SKWhenNeeded,
.lastEventTime = -1,
.vtRequestsPending = FALSE,
.dontVTSwitch = FALSE,
diff --git a/hw/xfree86/common/xf86Privstr.h b/hw/xfree86/common/xf86Privstr.h
index 6a7a6dc..52960e5 100644
--- a/hw/xfree86/common/xf86Privstr.h
+++ b/hw/xfree86/common/xf86Privstr.h
@@ -44,12 +44,6 @@ typedef enum {
} Log;
typedef enum {
- SKNever,
- SKWhenNeeded,
- SKAlways
-} SpecialKeysInDDX;
-
-typedef enum {
XF86_GlxVisualsMinimal,
XF86_GlxVisualsTypical,
XF86_GlxVisualsAll,
@@ -65,7 +59,6 @@ typedef struct {
int consoleFd;
int vtno;
Bool vtSysreq;
- SpecialKeysInDDX ddxSpecialKeys;
/* event handler part */
int lastEventTime;
diff --git a/hw/xfree86/doc/man/Xorg.man.pre b/hw/xfree86/doc/man/Xorg.man.pre
index bf29fcb..867b349 100644
--- a/hw/xfree86/doc/man/Xorg.man.pre
+++ b/hw/xfree86/doc/man/Xorg.man.pre
@@ -432,17 +432,12 @@ server is normally configured to recognize various special combinations
of key presses that instruct the server to perform some action, rather
than just sending the key press event to a client application. The
default XKEYBOARD keymap defines the key combinations listed below.
-The server also has these key combinations builtin to its event handler
+The kbd (__drivermansuffix__) driver also has these key combinations
+builtin to its event handler
for cases where the XKEYBOARD extension is not being used. When using
the XKEYBOARD extension, which key combinations perform which actions
is completely configurable.
.PP
-For more information about when the builtin event handler
-is used to recognize the special key combinations, see
-the documentation on the
-.B HandleSpecialKeys
-option in the __xconfigfile__(__filemansuffix__) man page.
-.PP
The special combinations of key presses recognized directly
by
.B __xservername__
diff --git a/hw/xfree86/doc/man/xorg.conf.man.pre b/hw/xfree86/doc/man/xorg.conf.man.pre
index 4f1ba00..d54896f 100644
--- a/hw/xfree86/doc/man/xorg.conf.man.pre
+++ b/hw/xfree86/doc/man/xorg.conf.man.pre
@@ -615,26 +615,6 @@ Default: PM enabled on platforms that support it.
enable or disable XINERAMA extension.
Default is disabled.
.TP 7
-.BI "Option \*qHandleSpecialKeys\*q \*q" when \*q
-This option controls when the server uses the builtin handler to process
-special key combinations (such as
-.BR Ctrl+Alt+Backspace ).
-Normally the XKEYBOARD extension keymaps will provide mappings for each of
-the special key combinations, so the builtin handler is not needed unless
-the XKEYBOARD extension is disabled.
-The value of
-.I when
-can be
-.BR Always ,
-.BR Never ,
-or
-.BR WhenNeeded .
-Default: Use the builtin handler only if needed.
-The server will scan the keymap for a mapping to the
-.B Terminate
-action and, if found, use XKEYBOARD for processing actions, otherwise
-the builtin handler will be used.
-.TP 7
.BI "Option \*qAIGLX\*q \*q" boolean \*q
enable or disable AIGLX. AIGLX is enabled by default.
.TP 7