[PATCH keyboard] Removing unused variables vtSwitchSupported and VTSwitchEnabled
Alan Coopersmith
alan.coopersmith at oracle.com
Mon Nov 29 11:09:54 PST 2010
Looks like a leftover of the SpecialKey handling that should have
gone away with the rest of it in d12d2d2c789e8439ae6f2e63526c49c76c385c8e.
Reviewed-by: Alan Coopersmith <alan.coopersmith at oracle.com>
-alan-
Alexandr Shadchin wrote:
> Signed-off-by: Alexandr Shadchin <Alexandr.Shadchin at gmail.com>
> ---
> src/bsd_kbd.c | 9 ---------
> src/hurd_kbd.c | 1 -
> src/lnx_kbd.c | 6 ------
> src/sun_kbd.c | 1 -
> src/xf86OSKbd.h | 1 -
> 5 files changed, 0 insertions(+), 18 deletions(-)
>
> diff --git a/src/bsd_kbd.c b/src/bsd_kbd.c
> index 3653042..35d3649 100644
> --- a/src/bsd_kbd.c
> +++ b/src/bsd_kbd.c
> @@ -29,8 +29,6 @@
> extern void KbdGetMapping(InputInfoPtr pInfo, KeySymsPtr pKeySyms,
> CARD8 *pModMap);
>
> -extern Bool VTSwitchEnabled;
> -
> static KbdProtocolRec protocols[] = {
> {"standard", PROT_STD },
> #ifdef WSCONS_SUPPORT
> @@ -406,12 +404,6 @@ OpenKeyboard(InputInfoPtr pInfo)
> xfree(s);
> }
>
> -#if defined (SYSCONS_SUPPORT) || defined (PCVT_SUPPORT)
> - if (pKbd->isConsole &&
> - ((pKbd->consType == SYSCONS) || (pKbd->consType == PCVT)))
> - pKbd->vtSwitchSupported = TRUE;
> -#endif
> -
> #ifdef WSCONS_SUPPORT
> if( prot == PROT_WSCONS) {
> pKbd->consType = WSCONS;
> @@ -474,7 +466,6 @@ xf86OSKbdPreInit(InputInfoPtr pInfo)
> pKbd->RemapScanCode = NULL;
>
> pKbd->OpenKeyboard = OpenKeyboard;
> - pKbd->vtSwitchSupported = FALSE;
> pKbd->CustomKeycodes = FALSE;
>
> pKbd->private = xcalloc(sizeof(BsdKbdPrivRec), 1);
> diff --git a/src/hurd_kbd.c b/src/hurd_kbd.c
> index 6063b4b..27746da 100644
> --- a/src/hurd_kbd.c
> +++ b/src/hurd_kbd.c
> @@ -165,7 +165,6 @@ xf86OSKbdPreInit(InputInfoPtr pInfo)
> pKbd->KbdGetMapping = KbdGetMapping;
> pKbd->RemapScanCode = ATScancode;
> pKbd->OpenKeyboard = OpenKeyboard;
> - pKbd->vtSwitchSupported = FALSE;
> pKbd->CustomKeycodes = FALSE;
> pKbd->private = NULL;
> pInfo->read_input = ReadInput;
> diff --git a/src/lnx_kbd.c b/src/lnx_kbd.c
> index 9b3aae3..63b51d9 100644
> --- a/src/lnx_kbd.c
> +++ b/src/lnx_kbd.c
> @@ -37,8 +37,6 @@ static KbdProtocolRec protocols[] = {
> { NULL, PROT_UNKNOWN_KBD }
> };
>
> -extern Bool VTSwitchEnabled;
> -
> static void
> SoundBell(InputInfoPtr pInfo, int loudness, int pitch, int duration)
> {
> @@ -203,9 +201,6 @@ OpenKeyboard(InputInfoPtr pInfo)
> free(s);
> }
>
> - if (pKbd->isConsole)
> - pKbd->vtSwitchSupported = TRUE;
> -
> return TRUE;
> }
>
> @@ -225,7 +220,6 @@ xf86OSKbdPreInit(InputInfoPtr pInfo)
> pKbd->RemapScanCode = NULL;
>
> pKbd->OpenKeyboard = OpenKeyboard;
> - pKbd->vtSwitchSupported = FALSE;
>
> pKbd->private = calloc(sizeof(LnxKbdPrivRec), 1);
> if (pKbd->private == NULL) {
> diff --git a/src/sun_kbd.c b/src/sun_kbd.c
> index 3f98c4e..86b8f97 100644
> --- a/src/sun_kbd.c
> +++ b/src/sun_kbd.c
> @@ -538,7 +538,6 @@ xf86OSKbdPreInit(InputInfoPtr pInfo)
>
> pKbd->OpenKeyboard = OpenKeyboard;
>
> - pKbd->vtSwitchSupported = FALSE;
> pKbd->CustomKeycodes = FALSE;
>
> pKbd->private = xcalloc(sizeof(sunKbdPrivRec), 1);
> diff --git a/src/xf86OSKbd.h b/src/xf86OSKbd.h
> index 176bcd0..0e9fa4d 100644
> --- a/src/xf86OSKbd.h
> +++ b/src/xf86OSKbd.h
> @@ -73,7 +73,6 @@ typedef struct {
> unsigned long xledsMask;
> unsigned long keyLeds;
> int scanPrefix;
> - Bool vtSwitchSupported;
> Bool CustomKeycodes;
> Bool isConsole;
> TransMapPtr scancodeMap;
--
-Alan Coopersmith- alan.coopersmith at oracle.com
Oracle Solaris Platform Engineering: X Window System
More information about the xorg-devel
mailing list