[PATCH] xfree86: Remove vtSysReq option.

[Alan Coopersmith]

Looks like this got reviewed but never applied:
http://patchwork.freedesktop.org/patch/1413/

A conversation with a user on IRC today pointed out that we still document
this option even though it doesn't work, so this patch should probably be
resubmitted for the now open 1.11 merge window with the additional change
of removing the Option VTSysReq section from hw/xfree86/doc/man/xorg.conf.man.

The user requesting it wanted it to be able to distinguish the switch keys for
VT's in his VM window from his main desktop - seems like a xkb-config option
might suffice to replace VTSysReq for that.   Anyone want to figure out how
hard that would be to add and submit a patch to xkb-config?

	-alan-

On 08/ 1/10 04:01 PM, Jesse Adkins wrote:
> vtSysReq only says that it's on if it's on.
> There was a token for the option in parser, but that was never used.
> Removed USE_VT_SYSREQ defining by xf86_OSlib.h
> 
> Signed-off-by: Jesse Adkins <jesserayadkins at gmail.com>
> ---
>  hw/xfree86/common/xf86Config.c     |   13 -------------
>  hw/xfree86/common/xf86Globals.c    |    1 -
>  hw/xfree86/common/xf86Privstr.h    |    1 -
>  hw/xfree86/os-support/xf86_OSlib.h |    9 ---------
>  hw/xfree86/parser/xf86tokens.h     |    2 --
>  5 files changed, 0 insertions(+), 26 deletions(-)
> 
> diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
> index 28786ba..4a915a7 100644
> --- a/hw/xfree86/common/xf86Config.c
> +++ b/hw/xfree86/common/xf86Config.c
> @@ -693,7 +693,6 @@ typedef enum {
>      FLAG_DISABLEVIDMODE,
>      FLAG_ALLOWNONLOCAL,
>      FLAG_ALLOWMOUSEOPENFAIL,
> -    FLAG_VTSYSREQ,
>      FLAG_SAVER_BLANKTIME,
>      FLAG_DPMS_STANDBYTIME,
>      FLAG_DPMS_SUSPENDTIME,
> @@ -735,8 +734,6 @@ static OptionInfoRec FlagOptions[] = {
>  	{0}, FALSE },
>    { FLAG_ALLOWMOUSEOPENFAIL,	"AllowMouseOpenFail",		OPTV_BOOLEAN,
>  	{0}, FALSE },
> -  { FLAG_VTSYSREQ,		"VTSysReq",			OPTV_BOOLEAN,
> -	{0}, FALSE },
>    { FLAG_SAVER_BLANKTIME,	"BlankTime"		,	OPTV_INTEGER,
>  	{0}, FALSE },
>    { FLAG_DPMS_STANDBYTIME,	"StandbyTime",			OPTV_INTEGER,
> @@ -893,16 +890,6 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts)
>      if (xf86GetOptValBool(FlagOptions, FLAG_ALLOWMOUSEOPENFAIL, &value))
>  	xf86Info.allowMouseOpenFail = value;
>  
> -    if (xf86GetOptValBool(FlagOptions, FLAG_VTSYSREQ, &value)) {
> -#ifdef USE_VT_SYSREQ
> -	xf86Info.vtSysreq = value;
> -	xf86Msg(X_CONFIG, "VTSysReq %s\n", value ? "enabled" : "disabled");
> -#else
> -	if (value)
> -	    xf86Msg(X_WARNING, "VTSysReq is not supported on this OS\n");
> -#endif
> -    }
> -
>      xf86Info.pmFlag = TRUE;
>      if (xf86GetOptValBool(FlagOptions, FLAG_NOPM, &value)) 
>  	xf86Info.pmFlag = !value;
> diff --git a/hw/xfree86/common/xf86Globals.c b/hw/xfree86/common/xf86Globals.c
> index 42feac3..0ff0849 100644
> --- a/hw/xfree86/common/xf86Globals.c
> +++ b/hw/xfree86/common/xf86Globals.c
> @@ -97,7 +97,6 @@ InputInfoPtr xf86InputDevs = NULL;
>  xf86InfoRec xf86Info = {
>      .consoleFd                  = -1,
>      .vtno                       = -1,
> -    .vtSysreq                   = FALSE,
>      .lastEventTime              = -1,
>      .vtRequestsPending          = FALSE,
>  #ifdef sun
> diff --git a/hw/xfree86/common/xf86Privstr.h b/hw/xfree86/common/xf86Privstr.h
> index 39cd230..9482b60 100644
> --- a/hw/xfree86/common/xf86Privstr.h
> +++ b/hw/xfree86/common/xf86Privstr.h
> @@ -57,7 +57,6 @@ typedef enum {
>  typedef struct {
>      int			consoleFd;
>      int			vtno;
> -    Bool		vtSysreq;
>  
>      /* event handler part */
>      int			lastEventTime;
> diff --git a/hw/xfree86/os-support/xf86_OSlib.h b/hw/xfree86/os-support/xf86_OSlib.h
> index c53fc0d..719e763 100644
> --- a/hw/xfree86/os-support/xf86_OSlib.h
> +++ b/hw/xfree86/os-support/xf86_OSlib.h
> @@ -196,10 +196,6 @@
>  # endif /* SVR4 */
>  
>  
> -# if defined(sun) && defined(HAS_USL_VTS)
> -#  define USE_VT_SYSREQ
> -# endif
> -
>  #endif /* (SYSV || SVR4) */
>  
>  /**************************************************************************/
> @@ -234,7 +230,6 @@
>  #  define LDSMAP PIO_SCRNMAP
>  #  define LDNMAP LDSMAP
>  #  define CLEARDTR_SUPPORT
> -#  define USE_VT_SYSREQ
>  # endif
>  
>  # define POSIX_TTY
> @@ -388,10 +383,6 @@
>  
>  # define CLEARDTR_SUPPORT
>  
> -# if defined(SYSCONS_SUPPORT) || defined(PCVT_SUPPORT) || defined(WSCONS_SUPPORT)
> -#  define USE_VT_SYSREQ
> -# endif
> -
>  #endif
>  /* __FreeBSD_kernel__ || __NetBSD__ || __OpenBSD__ || __bsdi__ */
>  
> diff --git a/hw/xfree86/parser/xf86tokens.h b/hw/xfree86/parser/xf86tokens.h
> index c16a8f5..be35f36 100644
> --- a/hw/xfree86/parser/xf86tokens.h
> +++ b/hw/xfree86/parser/xf86tokens.h
> @@ -208,8 +208,6 @@ typedef enum {
>      XKBLAYOUT,
>      XKBVARIANT,
>      XKBOPTIONS,
> -    /* The next two have become ServerFlags options */
> -    VTSYSREQ,
>      /* Obsolete keyboard tokens */
>      SERVERNUM,
>      LEFTALT,


-- 
	-Alan Coopersmith-        alan.coopersmith at oracle.com
	 Oracle Solaris Platform Engineering: X Window System