forked from pool/xorg-x11-server
- U_BellProc-Send-bell-event-on-core-protocol-bell-when-requested.patch
Send XKB bell event on core protocol bell if such an event is requested. This allows to override the system beep by a desktop provided sound instead of silently ignore it (bnc#890323). OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-server?expand=0&rev=528
This commit is contained in:
parent
b7864b65ed
commit
4fe2418668
@ -0,0 +1,39 @@
|
|||||||
|
From: Egbert Eich <eich@freedesktop.org>
|
||||||
|
Date: Mon Aug 4 19:16:30 2014 +0200
|
||||||
|
Subject: [PATCH] BellProc: Send bell event on core protocol bell when requested
|
||||||
|
Patch-mainline: Upstream
|
||||||
|
Git-commit: e6c8c7e46c79b2837a7d0b12079a47734eff1eb7
|
||||||
|
Git-repo: git://anongit.freedesktop.org/git/xorg/xserver
|
||||||
|
References: bnc#890323
|
||||||
|
Signed-off-by: Egbert Eich <eich@suse.com>
|
||||||
|
|
||||||
|
XKB allows to override the BellProc() ringing the 'keyboard bell':
|
||||||
|
instead an event is sent to an X client which can perform an
|
||||||
|
appropriate action.
|
||||||
|
In most cases this effectively prevents the core protocol bell
|
||||||
|
from ringing: if no BellProc() is set for the device, no attempt
|
||||||
|
is made to ring a bell.
|
||||||
|
This patch ensures that an XKB bell event is sent also when
|
||||||
|
the core protocol bell is rung end thus an appropriate action
|
||||||
|
can be taken by a client.
|
||||||
|
|
||||||
|
Signed-off-by: Egbert Eich <eich@freedesktop.org>
|
||||||
|
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||||||
|
Signed-off-by: Keith Packard <keithp@keithp.com>
|
||||||
|
---
|
||||||
|
dix/devices.c | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/dix/devices.c b/dix/devices.c
|
||||||
|
index 7f079ff..5d26fae 100644
|
||||||
|
--- a/dix/devices.c
|
||||||
|
+++ b/dix/devices.c
|
||||||
|
@@ -2257,7 +2257,7 @@ ProcBell(ClientPtr client)
|
||||||
|
for (dev = inputInfo.devices; dev; dev = dev->next) {
|
||||||
|
if ((dev == keybd ||
|
||||||
|
(!IsMaster(dev) && GetMaster(dev, MASTER_KEYBOARD) == keybd)) &&
|
||||||
|
- dev->kbdfeed && dev->kbdfeed->BellProc) {
|
||||||
|
+ ((dev->kbdfeed && dev->kbdfeed->BellProc) || dev->xkb_interest)) {
|
||||||
|
|
||||||
|
rc = XaceHook(XACE_DEVICE_ACCESS, client, dev, DixBellAccess);
|
||||||
|
if (rc != Success)
|
@ -1,3 +1,11 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Aug 5 06:19:04 UTC 2014 - eich@suse.com
|
||||||
|
|
||||||
|
- U_BellProc-Send-bell-event-on-core-protocol-bell-when-requested.patch
|
||||||
|
Send XKB bell event on core protocol bell if such an event is requested.
|
||||||
|
This allows to override the system beep by a desktop provided sound
|
||||||
|
instead of silently ignore it (bnc#890323).
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Thu Jul 17 15:50:10 UTC 2014 - tobias.johannes.klausmann@mni.thm.de
|
Thu Jul 17 15:50:10 UTC 2014 - tobias.johannes.klausmann@mni.thm.de
|
||||||
|
|
||||||
|
@ -151,11 +151,13 @@ Patch106: u_exa-only-draw-valid-trapezoids.patch
|
|||||||
Patch110: u_connection-avoid-crash-when-CloseWellKnownConnections-gets-called-twice.patch
|
Patch110: u_connection-avoid-crash-when-CloseWellKnownConnections-gets-called-twice.patch
|
||||||
Patch111: u_CloseConsole-Don-t-report-FatalError-when-shutting-down.patch
|
Patch111: u_CloseConsole-Don-t-report-FatalError-when-shutting-down.patch
|
||||||
Patch112: u_render-Cast-color-masks-to-unsigned-long-before-shifting-them.patch
|
Patch112: u_render-Cast-color-masks-to-unsigned-long-before-shifting-them.patch
|
||||||
|
Patch130: U_BellProc-Send-bell-event-on-core-protocol-bell-when-requested.patch
|
||||||
|
|
||||||
Patch162: b_cache-xkbcomp-output-for-fast-start-up.patch
|
Patch1000: n_xserver-optimus-autoconfig-hack.patch
|
||||||
Patch211: b_0001-Prevent-XSync-Alarms-from-senslessly-calling-CheckTr.patch
|
|
||||||
Patch222: b_sync-fix.patch
|
Patch1162: b_cache-xkbcomp-output-for-fast-start-up.patch
|
||||||
Patch223: n_xserver-optimus-autoconfig-hack.patch
|
Patch1211: b_0001-Prevent-XSync-Alarms-from-senslessly-calling-CheckTr.patch
|
||||||
|
Patch1222: b_sync-fix.patch
|
||||||
|
|
||||||
%description
|
%description
|
||||||
This package contains the X.Org Server.
|
This package contains the X.Org Server.
|
||||||
@ -228,15 +230,15 @@ cp %{SOURCE90} .
|
|||||||
%patch110 -p1
|
%patch110 -p1
|
||||||
%patch111 -p1
|
%patch111 -p1
|
||||||
%patch112 -p1
|
%patch112 -p1
|
||||||
|
%patch130 -p1
|
||||||
|
%patch1000 -p1
|
||||||
|
|
||||||
### disabled for now
|
### disabled for now
|
||||||
#%patch162 -p1
|
#%patch1162 -p1
|
||||||
### disabled for now
|
### disabled for now
|
||||||
#%patch211 -p1
|
#%patch1211 -p1
|
||||||
### patch222 might not be applicable anymore
|
### patch222 might not be applicable anymore
|
||||||
#%patch222 -p1
|
#%patch1222 -p1
|
||||||
|
|
||||||
%patch223 -p1
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
autoreconf -fi
|
autoreconf -fi
|
||||||
|
Loading…
Reference in New Issue
Block a user