diff options
author | Alan Coopersmith <alan.coopersmith@sun.com> | 2008-12-02 12:59:57 -0800 |
---|---|---|
committer | Alan Coopersmith <alan.coopersmith@sun.com> | 2008-12-02 13:09:22 -0800 |
commit | 3a690598cf18c4cdc6aadd10a1ecf0772cacd34b (patch) | |
tree | cb811bbc70629e665e9ca724d0885b9f13b5f3d0 | |
parent | 1dfed222e93f4684c2a450944a9a0ea9e085c43f (diff) |
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
-rw-r--r-- | hw/xfree86/common/xf86Config.c | 19 | ||||
-rw-r--r-- | hw/xfree86/common/xf86Globals.c | 1 | ||||
-rw-r--r-- | hw/xfree86/common/xf86Privstr.h | 7 | ||||
-rw-r--r-- | hw/xfree86/doc/man/Xorg.man.pre | 9 | ||||
-rw-r--r-- | hw/xfree86/doc/man/xorg.conf.man.pre | 20 |
5 files changed, 3 insertions, 53 deletions
diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c index 28707d8ad..5abfb4dc3 100644 --- a/hw/xfree86/common/xf86Config.c +++ b/hw/xfree86/common/xf86Config.c | |||
@@ -803,8 +803,6 @@ static OptionInfoRec FlagOptions[] = { | |||
803 | {0}, FALSE }, | 803 | {0}, FALSE }, |
804 | { FLAG_RENDER_COLORMAP_MODE, "RenderColormapMode", OPTV_STRING, | 804 | { FLAG_RENDER_COLORMAP_MODE, "RenderColormapMode", OPTV_STRING, |
805 | {0}, FALSE }, | 805 | {0}, FALSE }, |
806 | { FLAG_HANDLE_SPECIAL_KEYS, "HandleSpecialKeys", OPTV_STRING, | ||
807 | {0}, FALSE }, | ||
808 | { FLAG_RANDR, "RandR", OPTV_BOOLEAN, | 806 | { FLAG_RANDR, "RandR", OPTV_BOOLEAN, |
809 | {0}, FALSE }, | 807 | {0}, FALSE }, |
810 | { FLAG_AIGLX, "AIGLX", OPTV_BOOLEAN, | 808 | { FLAG_AIGLX, "AIGLX", OPTV_BOOLEAN, |
@@ -975,22 +973,7 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts) | |||
975 | } | 973 | } |
976 | } | 974 | } |
977 | #endif | 975 | #endif |
978 | { | 976 | |
979 | if ((s = xf86GetOptValString(FlagOptions, FLAG_HANDLE_SPECIAL_KEYS))) { | ||
980 | if (!xf86NameCmp(s,"always")) { | ||
981 | xf86Msg(X_CONFIG, "Always handling special keys in DDX\n"); | ||
982 | xf86Info.ddxSpecialKeys = SKAlways; | ||
983 | } else if (!xf86NameCmp(s,"whenneeded")) { | ||
984 | xf86Msg(X_CONFIG, "Special keys handled in DDX only if needed\n"); | ||
985 | xf86Info.ddxSpecialKeys = SKWhenNeeded; | ||
986 | } else if (!xf86NameCmp(s,"never")) { | ||
987 | xf86Msg(X_CONFIG, "Never handling special keys in DDX\n"); | ||
988 | xf86Info.ddxSpecialKeys = SKNever; | ||
989 | } else { | ||
990 | xf86Msg(X_WARNING,"Unknown HandleSpecialKeys option\n"); | ||
991 | } | ||
992 | } | ||
993 | } | ||
994 | #ifdef RANDR | 977 | #ifdef RANDR |
995 | xf86Info.disableRandR = FALSE; | 978 | xf86Info.disableRandR = FALSE; |
996 | xf86Info.randRFrom = X_DEFAULT; | 979 | xf86Info.randRFrom = X_DEFAULT; |
diff --git a/hw/xfree86/common/xf86Globals.c b/hw/xfree86/common/xf86Globals.c index 385c3e197..c01f485ab 100644 --- a/hw/xfree86/common/xf86Globals.c +++ b/hw/xfree86/common/xf86Globals.c | |||
@@ -101,7 +101,6 @@ _X_EXPORT xf86InfoRec xf86Info = { | |||
101 | .consoleFd = -1, | 101 | .consoleFd = -1, |
102 | .vtno = -1, | 102 | .vtno = -1, |
103 | .vtSysreq = FALSE, | 103 | .vtSysreq = FALSE, |
104 | .ddxSpecialKeys = SKWhenNeeded, | ||
105 | .lastEventTime = -1, | 104 | .lastEventTime = -1, |
106 | .vtRequestsPending = FALSE, | 105 | .vtRequestsPending = FALSE, |
107 | .dontVTSwitch = FALSE, | 106 | .dontVTSwitch = FALSE, |
diff --git a/hw/xfree86/common/xf86Privstr.h b/hw/xfree86/common/xf86Privstr.h index 6a7a6dc86..52960e5dd 100644 --- a/hw/xfree86/common/xf86Privstr.h +++ b/hw/xfree86/common/xf86Privstr.h | |||
@@ -44,12 +44,6 @@ typedef enum { | |||
44 | } Log; | 44 | } Log; |
45 | 45 | ||
46 | typedef enum { | 46 | typedef enum { |
47 | SKNever, | ||
48 | SKWhenNeeded, | ||
49 | SKAlways | ||
50 | } SpecialKeysInDDX; | ||
51 | |||
52 | typedef enum { | ||
53 | XF86_GlxVisualsMinimal, | 47 | XF86_GlxVisualsMinimal, |
54 | XF86_GlxVisualsTypical, | 48 | XF86_GlxVisualsTypical, |
55 | XF86_GlxVisualsAll, | 49 | XF86_GlxVisualsAll, |
@@ -65,7 +59,6 @@ typedef struct { | |||
65 | int consoleFd; | 59 | int consoleFd; |
66 | int vtno; | 60 | int vtno; |
67 | Bool vtSysreq; | 61 | Bool vtSysreq; |
68 | SpecialKeysInDDX ddxSpecialKeys; | ||
69 | 62 | ||
70 | /* event handler part */ | 63 | /* event handler part */ |
71 | int lastEventTime; | 64 | int lastEventTime; |
diff --git a/hw/xfree86/doc/man/Xorg.man.pre b/hw/xfree86/doc/man/Xorg.man.pre index bf29fcbde..867b349fd 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 | |||
432 | of key presses that instruct the server to perform some action, rather | 432 | of key presses that instruct the server to perform some action, rather |
433 | than just sending the key press event to a client application. The | 433 | than just sending the key press event to a client application. The |
434 | default XKEYBOARD keymap defines the key combinations listed below. | 434 | default XKEYBOARD keymap defines the key combinations listed below. |
435 | The server also has these key combinations builtin to its event handler | 435 | The kbd (__drivermansuffix__) driver also has these key combinations |
436 | builtin to its event handler | ||
436 | for cases where the XKEYBOARD extension is not being used. When using | 437 | for cases where the XKEYBOARD extension is not being used. When using |
437 | the XKEYBOARD extension, which key combinations perform which actions | 438 | the XKEYBOARD extension, which key combinations perform which actions |
438 | is completely configurable. | 439 | is completely configurable. |
439 | .PP | 440 | .PP |
440 | For more information about when the builtin event handler | ||
441 | is used to recognize the special key combinations, see | ||
442 | the documentation on the | ||
443 | .B HandleSpecialKeys | ||
444 | option in the __xconfigfile__(__filemansuffix__) man page. | ||
445 | .PP | ||
446 | The special combinations of key presses recognized directly | 441 | The special combinations of key presses recognized directly |
447 | by | 442 | by |
448 | .B __xservername__ | 443 | .B __xservername__ |
diff --git a/hw/xfree86/doc/man/xorg.conf.man.pre b/hw/xfree86/doc/man/xorg.conf.man.pre index 4f1ba003b..d54896fb9 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. | |||
615 | enable or disable XINERAMA extension. | 615 | enable or disable XINERAMA extension. |
616 | Default is disabled. | 616 | Default is disabled. |
617 | .TP 7 | 617 | .TP 7 |
618 | .BI "Option \*qHandleSpecialKeys\*q \*q" when \*q | ||
619 | This option controls when the server uses the builtin handler to process | ||
620 | special key combinations (such as | ||
621 | .BR Ctrl+Alt+Backspace ). | ||
622 | Normally the XKEYBOARD extension keymaps will provide mappings for each of | ||
623 | the special key combinations, so the builtin handler is not needed unless | ||
624 | the XKEYBOARD extension is disabled. | ||
625 | The value of | ||
626 | .I when | ||
627 | can be | ||
628 | .BR Always , | ||
629 | .BR Never , | ||
630 | or | ||
631 | .BR WhenNeeded . | ||
632 | Default: Use the builtin handler only if needed. | ||
633 | The server will scan the keymap for a mapping to the | ||
634 | .B Terminate | ||
635 | action and, if found, use XKEYBOARD for processing actions, otherwise | ||
636 | the builtin handler will be used. | ||
637 | .TP 7 | ||
638 | .BI "Option \*qAIGLX\*q \*q" boolean \*q | 618 | .BI "Option \*qAIGLX\*q \*q" boolean \*q |
639 | enable or disable AIGLX. AIGLX is enabled by default. | 619 | enable or disable AIGLX. AIGLX is enabled by default. |
640 | .TP 7 | 620 | .TP 7 |