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
60ea7b51fe
This commit is contained in:
parent
1dfed222e9
commit
3a690598cf
|
@ -803,8 +803,6 @@ static OptionInfoRec FlagOptions[] = {
|
||||||
{0}, FALSE },
|
{0}, FALSE },
|
||||||
{ FLAG_RENDER_COLORMAP_MODE, "RenderColormapMode", OPTV_STRING,
|
{ FLAG_RENDER_COLORMAP_MODE, "RenderColormapMode", OPTV_STRING,
|
||||||
{0}, FALSE },
|
{0}, FALSE },
|
||||||
{ FLAG_HANDLE_SPECIAL_KEYS, "HandleSpecialKeys", OPTV_STRING,
|
|
||||||
{0}, FALSE },
|
|
||||||
{ FLAG_RANDR, "RandR", OPTV_BOOLEAN,
|
{ FLAG_RANDR, "RandR", OPTV_BOOLEAN,
|
||||||
{0}, FALSE },
|
{0}, FALSE },
|
||||||
{ FLAG_AIGLX, "AIGLX", OPTV_BOOLEAN,
|
{ FLAG_AIGLX, "AIGLX", OPTV_BOOLEAN,
|
||||||
|
@ -975,22 +973,7 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endif
|
#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
|
#ifdef RANDR
|
||||||
xf86Info.disableRandR = FALSE;
|
xf86Info.disableRandR = FALSE;
|
||||||
xf86Info.randRFrom = X_DEFAULT;
|
xf86Info.randRFrom = X_DEFAULT;
|
||||||
|
|
|
@ -101,7 +101,6 @@ _X_EXPORT xf86InfoRec xf86Info = {
|
||||||
.consoleFd = -1,
|
.consoleFd = -1,
|
||||||
.vtno = -1,
|
.vtno = -1,
|
||||||
.vtSysreq = FALSE,
|
.vtSysreq = FALSE,
|
||||||
.ddxSpecialKeys = SKWhenNeeded,
|
|
||||||
.lastEventTime = -1,
|
.lastEventTime = -1,
|
||||||
.vtRequestsPending = FALSE,
|
.vtRequestsPending = FALSE,
|
||||||
.dontVTSwitch = FALSE,
|
.dontVTSwitch = FALSE,
|
||||||
|
|
|
@ -43,12 +43,6 @@ typedef enum {
|
||||||
LogSync
|
LogSync
|
||||||
} Log;
|
} Log;
|
||||||
|
|
||||||
typedef enum {
|
|
||||||
SKNever,
|
|
||||||
SKWhenNeeded,
|
|
||||||
SKAlways
|
|
||||||
} SpecialKeysInDDX;
|
|
||||||
|
|
||||||
typedef enum {
|
typedef enum {
|
||||||
XF86_GlxVisualsMinimal,
|
XF86_GlxVisualsMinimal,
|
||||||
XF86_GlxVisualsTypical,
|
XF86_GlxVisualsTypical,
|
||||||
|
@ -65,7 +59,6 @@ typedef struct {
|
||||||
int consoleFd;
|
int consoleFd;
|
||||||
int vtno;
|
int vtno;
|
||||||
Bool vtSysreq;
|
Bool vtSysreq;
|
||||||
SpecialKeysInDDX ddxSpecialKeys;
|
|
||||||
|
|
||||||
/* event handler part */
|
/* event handler part */
|
||||||
int lastEventTime;
|
int lastEventTime;
|
||||||
|
|
|
@ -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
|
of key presses that instruct the server to perform some action, rather
|
||||||
than just sending the key press event to a client application. The
|
than just sending the key press event to a client application. The
|
||||||
default XKEYBOARD keymap defines the key combinations listed below.
|
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
|
for cases where the XKEYBOARD extension is not being used. When using
|
||||||
the XKEYBOARD extension, which key combinations perform which actions
|
the XKEYBOARD extension, which key combinations perform which actions
|
||||||
is completely configurable.
|
is completely configurable.
|
||||||
.PP
|
.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
|
The special combinations of key presses recognized directly
|
||||||
by
|
by
|
||||||
.B __xservername__
|
.B __xservername__
|
||||||
|
|
|
@ -615,26 +615,6 @@ Default: PM enabled on platforms that support it.
|
||||||
enable or disable XINERAMA extension.
|
enable or disable XINERAMA extension.
|
||||||
Default is disabled.
|
Default is disabled.
|
||||||
.TP 7
|
.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
|
.BI "Option \*qAIGLX\*q \*q" boolean \*q
|
||||||
enable or disable AIGLX. AIGLX is enabled by default.
|
enable or disable AIGLX. AIGLX is enabled by default.
|
||||||
.TP 7
|
.TP 7
|
||||||
|
|
Loading…
Reference in New Issue
Block a user