Remove unused vtSysreq
Signed-off-by: Alexandr Shadchin <Alexandr.Shadchin@gmail.com> Reviewed-by: Jamey Sharp <jamey@minilop.net> Tested-by: Matthieu Herrb <matthieu.herrb@laas.fr>
This commit is contained in:
parent
0be1640dbb
commit
ac5881d6d0
|
@ -670,7 +670,6 @@ typedef enum {
|
||||||
FLAG_DISABLEVIDMODE,
|
FLAG_DISABLEVIDMODE,
|
||||||
FLAG_ALLOWNONLOCAL,
|
FLAG_ALLOWNONLOCAL,
|
||||||
FLAG_ALLOWMOUSEOPENFAIL,
|
FLAG_ALLOWMOUSEOPENFAIL,
|
||||||
FLAG_VTSYSREQ,
|
|
||||||
FLAG_SAVER_BLANKTIME,
|
FLAG_SAVER_BLANKTIME,
|
||||||
FLAG_DPMS_STANDBYTIME,
|
FLAG_DPMS_STANDBYTIME,
|
||||||
FLAG_DPMS_SUSPENDTIME,
|
FLAG_DPMS_SUSPENDTIME,
|
||||||
|
@ -711,8 +710,6 @@ static OptionInfoRec FlagOptions[] = {
|
||||||
{0}, FALSE },
|
{0}, FALSE },
|
||||||
{ FLAG_ALLOWMOUSEOPENFAIL, "AllowMouseOpenFail", OPTV_BOOLEAN,
|
{ FLAG_ALLOWMOUSEOPENFAIL, "AllowMouseOpenFail", OPTV_BOOLEAN,
|
||||||
{0}, FALSE },
|
{0}, FALSE },
|
||||||
{ FLAG_VTSYSREQ, "VTSysReq", OPTV_BOOLEAN,
|
|
||||||
{0}, FALSE },
|
|
||||||
{ FLAG_SAVER_BLANKTIME, "BlankTime" , OPTV_INTEGER,
|
{ FLAG_SAVER_BLANKTIME, "BlankTime" , OPTV_INTEGER,
|
||||||
{0}, FALSE },
|
{0}, FALSE },
|
||||||
{ FLAG_DPMS_STANDBYTIME, "StandbyTime", OPTV_INTEGER,
|
{ FLAG_DPMS_STANDBYTIME, "StandbyTime", OPTV_INTEGER,
|
||||||
|
@ -850,16 +847,6 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts)
|
||||||
if (xf86GetOptValBool(FlagOptions, FLAG_ALLOWMOUSEOPENFAIL, &value))
|
if (xf86GetOptValBool(FlagOptions, FLAG_ALLOWMOUSEOPENFAIL, &value))
|
||||||
xf86Info.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;
|
xf86Info.pmFlag = TRUE;
|
||||||
if (xf86GetOptValBool(FlagOptions, FLAG_NOPM, &value))
|
if (xf86GetOptValBool(FlagOptions, FLAG_NOPM, &value))
|
||||||
xf86Info.pmFlag = !value;
|
xf86Info.pmFlag = !value;
|
||||||
|
|
|
@ -96,7 +96,6 @@ InputInfoPtr xf86InputDevs = NULL;
|
||||||
xf86InfoRec xf86Info = {
|
xf86InfoRec xf86Info = {
|
||||||
.consoleFd = -1,
|
.consoleFd = -1,
|
||||||
.vtno = -1,
|
.vtno = -1,
|
||||||
.vtSysreq = FALSE,
|
|
||||||
.lastEventTime = -1,
|
.lastEventTime = -1,
|
||||||
.vtRequestsPending = FALSE,
|
.vtRequestsPending = FALSE,
|
||||||
#ifdef sun
|
#ifdef sun
|
||||||
|
|
|
@ -57,7 +57,6 @@ typedef enum {
|
||||||
typedef struct {
|
typedef struct {
|
||||||
int consoleFd;
|
int consoleFd;
|
||||||
int vtno;
|
int vtno;
|
||||||
Bool vtSysreq;
|
|
||||||
|
|
||||||
/* event handler part */
|
/* event handler part */
|
||||||
int lastEventTime;
|
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.
|
It has no effect on the evdev(__drivermansuffix__) or other drivers.
|
||||||
Default: false.
|
Default: false.
|
||||||
.TP 7
|
.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
|
.BI "Option \*qBlankTime\*q \*q" time \*q
|
||||||
sets the inactivity timeout for the
|
sets the inactivity timeout for the
|
||||||
.B blank
|
.B blank
|
||||||
|
|
|
@ -168,11 +168,6 @@
|
||||||
# define POSIX_TTY
|
# define POSIX_TTY
|
||||||
# endif /* SVR4 */
|
# endif /* SVR4 */
|
||||||
|
|
||||||
|
|
||||||
# if defined(sun) && defined(HAS_USL_VTS)
|
|
||||||
# define USE_VT_SYSREQ
|
|
||||||
# endif
|
|
||||||
|
|
||||||
#endif /* (SYSV || SVR4) */
|
#endif /* (SYSV || SVR4) */
|
||||||
|
|
||||||
/**************************************************************************/
|
/**************************************************************************/
|
||||||
|
@ -207,7 +202,6 @@
|
||||||
# define LDSMAP PIO_SCRNMAP
|
# define LDSMAP PIO_SCRNMAP
|
||||||
# define LDNMAP LDSMAP
|
# define LDNMAP LDSMAP
|
||||||
# define CLEARDTR_SUPPORT
|
# define CLEARDTR_SUPPORT
|
||||||
# define USE_VT_SYSREQ
|
|
||||||
# endif
|
# endif
|
||||||
|
|
||||||
# define POSIX_TTY
|
# define POSIX_TTY
|
||||||
|
@ -343,10 +337,6 @@
|
||||||
|
|
||||||
# define CLEARDTR_SUPPORT
|
# define CLEARDTR_SUPPORT
|
||||||
|
|
||||||
# if defined(SYSCONS_SUPPORT) || defined(PCVT_SUPPORT) || defined(WSCONS_SUPPORT)
|
|
||||||
# define USE_VT_SYSREQ
|
|
||||||
# endif
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
/* __FreeBSD_kernel__ || __NetBSD__ || __OpenBSD__ || __bsdi__ */
|
/* __FreeBSD_kernel__ || __NetBSD__ || __OpenBSD__ || __bsdi__ */
|
||||||
|
|
||||||
|
|
|
@ -207,8 +207,6 @@ typedef enum {
|
||||||
XKBLAYOUT,
|
XKBLAYOUT,
|
||||||
XKBVARIANT,
|
XKBVARIANT,
|
||||||
XKBOPTIONS,
|
XKBOPTIONS,
|
||||||
/* The next two have become ServerFlags options */
|
|
||||||
VTSYSREQ,
|
|
||||||
/* Obsolete keyboard tokens */
|
/* Obsolete keyboard tokens */
|
||||||
SERVERNUM,
|
SERVERNUM,
|
||||||
LEFTALT,
|
LEFTALT,
|
||||||
|
|
Loading…
Reference in New Issue