rpms/xorg-x11-server
7
0
Fork 0
Code Issues Pull Requests Releases Activity

server 1.12.3

Browse Source
This commit is contained in:
Peter Hutterer 2012-07-09 11:40:05 +10:00
parent 85bb2fe435
commit 7c84331bc6
4 changed files with 7 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -14,3 +14,4 @@ xorg-server-1.9.1.tar.bz2
/xorg-server-1.12.0.tar.bz2
/xorg-server-1.12.1.tar.bz2
/xorg-server-1.12.2.tar.bz2
/xorg-server-1.12.3.tar.bz2

2
sources
View File

@ -1 +1 @@
791f0323b886abb7954de7f042bb7dc6 xorg-server-1.12.2.tar.bz2
65a53b11bc01dcc97ee9b201dc620c32 xorg-server-1.12.3.tar.bz2

8
xorg-x11-server.spec
View File

@ -47,8 +47,8 @@
Summary: X.Org X11 X server
Name: xorg-x11-server
Version: 1.12.2
Release: 4%{?gitdate:.%{gitdate}}%{dist}
Version: 1.12.3
Release: 1%{?gitdate:.%{gitdate}}%{dist}
URL: http://www.x.org
License: MIT
Group: User Interface/X
@ -110,7 +110,6 @@ Patch7017: xserver-1.12.2-xorg-touch-test.patch
Patch7018: xserver-1.12-os-print-newline-after-printing-display-name.patch
# send keycode/event type for slow keys enable (#816764)
Patch7019: xserver-1.12-xkb-warn-if-XKB-SlowKeys-have-been-automatically-ena.patch
Patch7020: xserver-1.12-xkb-fill-in-keycode-and-event-type-for-slow-keys-ena.patch
%define moduledir %{_libdir}/xorg/modules
@ -582,6 +581,9 @@ rm -rf $RPM_BUILD_ROOT
%{xserver_source_dir}
%changelog
* Mon Jul 09 2012 Peter Hutterer <peter.hutterer@redhat.com> 1.12.3-1
- server 1.12.3
* Tue Jun 26 2012 Peter Hutterer <peter.hutterer@redhat.com> 1.12.2-4
- send keycode/event type down the wire when SlowKeys enable, otherwise
GNOME won't warn about it (#816764)

43
xserver-1.12-xkb-warn-if-XKB-SlowKeys-have-been-automatically-ena.patch
View File

@ -1,43 +0,0 @@
From 2503936e2be820220ba0c4d80e45e268d433c063 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed, 6 Jun 2012 14:38:49 +1000
Subject: [PATCH] xkb: warn if XKB SlowKeys have been automatically enabled
Slow keys are enabled when the XKB AccessX features are generally enabled
(ctrls->enabled_ctrls & XkbAccessXKeysMask) and either shift key is held for
8 seconds. For the unsuspecting user this appears as if the keyboard
suddenly stops working.
Print a warning to the log, so we can later tell them "told you so".
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
---
xkb/xkbAccessX.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/xkb/xkbAccessX.c b/xkb/xkbAccessX.c
index 111bf9f..765772b 100644
--- a/xkb/xkbAccessX.c
+++ b/xkb/xkbAccessX.c
@@ -295,10 +295,15 @@ AccessXKRGExpire(OsTimerPtr timer, CARD32 now, pointer arg)
cn.eventType = 0;
cn.requestMajor = 0;
cn.requestMinor = 0;
- if (xkbi->desc->ctrls->enabled_ctrls & XkbSlowKeysMask)
+ if (xkbi->desc->ctrls->enabled_ctrls & XkbSlowKeysMask) {
AccessXKRGTurnOff((DeviceIntPtr) arg, &cn);
- else
+ LogMessage(X_INFO, "XKB SlowKeys are disabled.\n");
+ }
+ else {
AccessXKRGTurnOn((DeviceIntPtr) arg, XkbSlowKeysMask, &cn);
+ LogMessage(X_INFO, "XKB SlowKeys are now enabled. Hold shift to disable.\n");
+ }
+
return 0;
}
--
1.7.10.2