Commit ac5881d6 authored by Alexandr Shadchin's avatar Alexandr Shadchin

Remove unused vtSysreq

Signed-off-by: default avatarAlexandr Shadchin <Alexandr.Shadchin@gmail.com>
Reviewed-by: Jamey Sharp's avatarJamey Sharp <jamey@minilop.net>
Tested-by: default avatarMatthieu Herrb <matthieu.herrb@laas.fr>
parent 0be1640d
......@@ -670,7 +670,6 @@ typedef enum {
FLAG_DISABLEVIDMODE,
FLAG_ALLOWNONLOCAL,
FLAG_ALLOWMOUSEOPENFAIL,
FLAG_VTSYSREQ,
FLAG_SAVER_BLANKTIME,
FLAG_DPMS_STANDBYTIME,
FLAG_DPMS_SUSPENDTIME,
......@@ -711,8 +710,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,
......@@ -850,16 +847,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;
......
......@@ -96,7 +96,6 @@ InputInfoPtr xf86InputDevs = NULL;
xf86InfoRec xf86Info = {
.consoleFd = -1,
.vtno = -1,
.vtSysreq = FALSE,
.lastEventTime = -1,
.vtRequestsPending = FALSE,
#ifdef sun
......
......@@ -57,7 +57,6 @@ typedef enum {
typedef struct {
int consoleFd;
int vtno;
Bool vtSysreq;
/* event handler part */
int lastEventTime;
......
......@@ -560,18 +560,6 @@ drivers to not report failure if the mouse device can't be opened/initialised.
It has no effect on the evdev(__drivermansuffix__) or other drivers.
Default: false.
.TP 7
.BI "Option \*qVTSysReq\*q \*q" boolean \*q
enables the SYSV\-style VT switch sequence for non\-SYSV systems
which support VT switching.
This sequence is
.B Alt\-SysRq
followed by a function key
.RB ( Fn ).
This prevents the __xservername__ server trapping the
keys used for the default VT switch sequence, which means that clients can
access them.
Default: off.
.TP 7
.BI "Option \*qBlankTime\*q \*q" time \*q
sets the inactivity timeout for the
.B blank
......
......@@ -168,11 +168,6 @@
# define POSIX_TTY
# endif /* SVR4 */
# if defined(sun) && defined(HAS_USL_VTS)
# define USE_VT_SYSREQ
# endif
#endif /* (SYSV || SVR4) */
/**************************************************************************/
......@@ -207,7 +202,6 @@
# define LDSMAP PIO_SCRNMAP
# define LDNMAP LDSMAP
# define CLEARDTR_SUPPORT
# define USE_VT_SYSREQ
# endif
# define POSIX_TTY
......@@ -343,10 +337,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__ */
......
......@@ -207,8 +207,6 @@ typedef enum {
XKBLAYOUT,
XKBVARIANT,
XKBOPTIONS,
/* The next two have become ServerFlags options */
VTSYSREQ,
/* Obsolete keyboard tokens */
SERVERNUM,
LEFTALT,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment