rpms/xorg-x11-server/devel xserver-1.6.0-restore-zap.patch, NONE, 1.1 xorg-x11-server.spec, 1.429, 1.430
Peter Hutterer
whot at fedoraproject.org
Thu Apr 9 05:40:04 UTC 2009
- Previous message: rpms/skychart/devel skychart.spec,1.15,1.16
- Next message: rpms/grnotify/F-9 grnotify-1.1.2-fixurl.patch, NONE, 1.1 grnotify-setup.py, NONE, 1.1 grnotify.spec, 1.1, 1.2 setup.py, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: whot
Update of /cvs/pkgs/rpms/xorg-x11-server/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28617
Modified Files:
xorg-x11-server.spec
Added Files:
xserver-1.6.0-restore-zap.patch
Log Message:
* Thu Apr 09 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.6.0-18
- xserver-1.6.0-restore-zap.patch: Restore default off for DontZap.
xserver-1.6.0-restore-zap.patch:
--- NEW FILE xserver-1.6.0-restore-zap.patch ---
>From 41da426ebe0d8dc0734ff9dc5bcbfac9d9bd97b9 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer at who-t.net>
Date: Thu, 9 Apr 2009 10:12:27 +1000
Subject: [PATCH] xfree86: restore default off for DontZap
Zapping is triggered by xkb nowawdays, so make a note in the man page that
it's the Terminate_Server action. Since it's XKB, the correct way of disabling
it is through xkb rulesets.
Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
---
doc/Xserver.man.pre | 2 +-
hw/xfree86/common/xf86Config.c | 5 ++---
hw/xfree86/doc/man/xorg.conf.man.pre | 11 +++++------
3 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/doc/Xserver.man.pre b/doc/Xserver.man.pre
index 8897e1a..dd81223 100644
--- a/doc/Xserver.man.pre
+++ b/doc/Xserver.man.pre
@@ -223,7 +223,7 @@ turns on auto-repeat.
starts the stipple with the classic stipple and cursor visible. The default
is to start with a black root window, and to suppress display of the cursor
until the first time an application calls XDefineCursor(). For the Xorg
-server, this also changes the default for the DontZap option to FALSE. For
+server, this also sets the default for the DontZap option to FALSE. For
kdrive servers, this implies -zap.
.TP 8
.B \-s \fIminutes\fP
diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
index 17223a1..54c835d 100644
--- a/hw/xfree86/common/xf86Config.c
+++ b/hw/xfree86/common/xf86Config.c
@@ -733,7 +733,7 @@ static OptionInfoRec FlagOptions[] = {
{ FLAG_DONTVTSWITCH, "DontVTSwitch", OPTV_BOOLEAN,
{0}, FALSE },
{ FLAG_DONTZAP, "DontZap", OPTV_BOOLEAN,
- {0}, TRUE },
+ {0}, FALSE },
{ FLAG_DONTZOOM, "DontZoom", OPTV_BOOLEAN,
{0}, FALSE },
{ FLAG_DISABLEVIDMODE, "DisableVidModeExtension", OPTV_BOOLEAN,
@@ -845,8 +845,7 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts)
xf86GetOptValBool(FlagOptions, FLAG_NOTRAPSIGNALS, &xf86Info.notrapSignals);
xf86GetOptValBool(FlagOptions, FLAG_DONTVTSWITCH, &xf86Info.dontVTSwitch);
- if (!xf86GetOptValBool(FlagOptions, FLAG_DONTZAP, &xf86Info.dontZap))
- xf86Info.dontZap = !party_like_its_1989;
+ xf86GetOptValBool(FlagOptions, FLAG_DONTZAP, &xf86Info.dontZap);
xf86GetOptValBool(FlagOptions, FLAG_DONTZOOM, &xf86Info.dontZoom);
xf86GetOptValBool(FlagOptions, FLAG_IGNORE_ABI, &xf86Info.ignoreABI);
diff --git a/hw/xfree86/doc/man/xorg.conf.man.pre b/hw/xfree86/doc/man/xorg.conf.man.pre
index d45c3b8..a0230cd 100644
--- a/hw/xfree86/doc/man/xorg.conf.man.pre
+++ b/hw/xfree86/doc/man/xorg.conf.man.pre
@@ -464,12 +464,11 @@ Default: off.
.TP 7
.BI "Option \*qDontZap\*q \*q" boolean \*q
This disallows the use of the
-.B Ctrl+Alt+Backspace
-sequence.
-That sequence is normally used to terminate the __xservername__ server.
-When this option is enabled (as per default), that key sequence has no
-special meaning.
-Default: on.
+.B Terminate_Server
+XKB action (usually on Ctrl+Alt+Backspace, depending on XKB options).
+This action is normally used to terminate the __xservername__ server.
+When this option is enabled, the action has no effect.
+Default: off.
.TP 7
.BI "Option \*qDontZoom\*q \*q" boolean \*q
This disallows the use of the
--
1.6.2.2.447.g4afa7
Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.429
retrieving revision 1.430
diff -u -r1.429 -r1.430
--- xorg-x11-server.spec 6 Apr 2009 20:09:11 -0000 1.429
+++ xorg-x11-server.spec 9 Apr 2009 05:39:34 -0000 1.430
@@ -19,7 +19,7 @@
Summary: X.Org X11 X server
Name: xorg-x11-server
Version: 1.6.0
-Release: 17%{?dist}
+Release: 18%{?dist}
URL: http://www.x.org
License: MIT
Group: User Interface/X
@@ -110,6 +110,8 @@
# ajax needs to upstream this
Patch6027: xserver-1.6.0-displayfd.patch
+Patch6028: xserver-1.6.0-restore-zap.patch
+
%define moduledir %{_libdir}/xorg/modules
%define drimoduledir %{_libdir}/dri
%define sdkdir %{_includedir}/xorg
@@ -526,6 +528,9 @@
%changelog
+* Thu Apr 09 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.6.0-18
+- xserver-1.6.0-restore-zap.patch: Restore default off for DontZap.
+
* Mon Apr 06 2009 Adam Jackson <ajax at redhat.com> 1.6.0-17
- xserver-1.6.0-displayfd.patch: Add -displayfd commandline option.
- Previous message: rpms/skychart/devel skychart.spec,1.15,1.16
- Next message: rpms/grnotify/F-9 grnotify-1.1.2-fixurl.patch, NONE, 1.1 grnotify-setup.py, NONE, 1.1 grnotify.spec, 1.1, 1.2 setup.py, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list