debian/changelog | 1 debian/patches/08_xkb_infinite_loop.diff | 34 ------------------------------- debian/patches/series | 1 3 files changed, 1 insertion(+), 35 deletions(-)
New commits: commit 69769a13d25ba4cc83b2db654246131203b159f2 Author: David Nusinow <[EMAIL PROTECTED]> Date: Sat Jan 5 18:42:13 2008 -0500 + Drop 08_xkb_infinite_loop.diff, it's upstream now diff --git a/debian/changelog b/debian/changelog index 1ce5204..9af28af 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ xorg-server (2:1.4.1~git20080105-1) UNRELEASED; urgency=low * Don't reference non-existent bug-reporting.txt file in xvfb-run.1 * New upstream git pull, again from the server-1.4-branch + + Drop 08_xkb_infinite_loop.diff, it's upstream now -- David Nusinow <[EMAIL PROTECTED]> Sat, 05 Jan 2008 17:48:05 -0500 diff --git a/debian/patches/08_xkb_infinite_loop.diff b/debian/patches/08_xkb_infinite_loop.diff deleted file mode 100644 index efe3f28..0000000 --- a/debian/patches/08_xkb_infinite_loop.diff +++ /dev/null @@ -1,34 +0,0 @@ -http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=451989 -https://bugs.freedesktop.org/show_bug.cgi?id=13511 ------- Comment #1 From Peter Hutterer 2007-12-04 22:45:39 PST [reply] ------- - -(In reply to comment #0) -> When some window is opened by some grabbed key, grabbing all keys and they -> destroyed (like the window ratpoison opened uppon C-t :, or the window icewm -> shows when doing Alt-Tab), the xserver is caught in an endless loop within -> PlayReleasedEvents in dix/events.c. - -interesting bug... tricky to track down. - -The bug only occurs if Xkb triggers an autorepeat. In this case, -XkbHandleActions overwrites dev->public.realInputProc with EnqueueEvent. When -the device is unfrozen, the realInputProc is written back to the -processInputProc and the whole thing craps out. - -Here's a preliminary hack to fix it. It stops the loop occuring (tested with -ratpoison) but I'm not sure what other implications it has. It most probably is -not the correct solution. - -diff --git a/include/xkbsrv.h b/include/xkbsrv.h -index 167dbec..9f7f0d6 100644 ---- a/include/xkbsrv.h -+++ b/include/xkbsrv.h -@@ -258,7 +258,8 @@ typedef struct - device->public.processInputProc = proc; \ - oldprocs->processInputProc = \ - oldprocs->realInputProc = device->public.realInputProc; \ -- device->public.realInputProc = proc; \ -+ if (proc != device->public.enqueueInputProc) \ -+ device->public.realInputProc = proc; \ - oldprocs->unwrapProc = device->unwrapProc; \ - device->unwrapProc = unwrapproc; diff --git a/debian/patches/series b/debian/patches/series index c3abaee..f9cca17 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -5,7 +5,6 @@ 05_kill_type1.diff 06_use_proc_instead_of_sysfs_for_pci_domains.diff 07_autoconfig_screen_with_device_section.diff -08_xkb_infinite_loop.diff 10_dont_look_in_home_for_config.diff -p0 13_debian_add_xkbpath_env_variable.diff 14_default_screen_section.diff -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]