From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RrqVj-0007wF-5C for garchives@archives.gentoo.org; Mon, 30 Jan 2012 12:39:03 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C1DA6E08C8; Mon, 30 Jan 2012 12:38:54 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 7C920E08CD for ; Mon, 30 Jan 2012 12:38:54 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B9CBE1B400C for ; Mon, 30 Jan 2012 12:38:53 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2265) id 8929120032; Mon, 30 Jan 2012 12:38:52 +0000 (UTC) From: "Chi-Thanh Christopher Nguyen (chithanh)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, chithanh@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in x11-base/xorg-server/files: xorg-server-1.11-dix-send-focus-events.patch xorg-server-1.11-dix-pointerrootwin-send-focusin.patch X-VCS-Repository: gentoo-x86 X-VCS-Files: xorg-server-1.11-dix-send-focus-events.patch xorg-server-1.11-dix-pointerrootwin-send-focusin.patch X-VCS-Directories: x11-base/xorg-server/files X-VCS-Committer: chithanh X-VCS-Committer-Name: Chi-Thanh Christopher Nguyen Content-Type: text/plain; charset=utf8 Message-Id: <20120130123852.8929120032@flycatcher.gentoo.org> Date: Mon, 30 Jan 2012 12:38:52 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 1b7c710c-d2d1-4009-ad9b-88c29981d4c9 X-Archives-Hash: 84fd1c8d9d43e624c50a06d159ede2de chithanh 12/01/30 12:38:52 Added: xorg-server-1.11-dix-send-focus-events.patch xorg-server-1.11-dix-pointerrootwin-send-focusin.= patch Log: Version bumps. Include upstream patches to address gtk+:3.3 triggered i= ssues. Raise dependency on xkeyboard-config to avoid security bug #399347= . =20 (Portage version: 2.2.0_alpha84/cvs/Linux x86_64) Revision Changes Path 1.1 x11-base/xorg-server/files/xorg-server-1.11-dix-send= -focus-events.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-base/xorg-serv= er/files/xorg-server-1.11-dix-send-focus-events.patch?rev=3D1.1&view=3Dma= rkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-base/xorg-serv= er/files/xorg-server-1.11-dix-send-focus-events.patch?rev=3D1.1&content-t= ype=3Dtext/plain Index: xorg-server-1.11-dix-send-focus-events.patch =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D >From a125aabda3a5cf27aa98cb61f16e49280b66f451 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Thu, 05 Jan 2012 12:02:51 +0000 Subject: dix: send focus events to the immediate parent (#44079) For a transition from windows A to B, A->parent did not receive an event. DeviceFocusOutEvents sends to windows ]from, to[, so start with the actua= l window, not it's parent. X.Org Bug 44079 Signed-off-by: Peter Hutterer Reviewed-by: Chase Douglas Reviewed-by: Keith Packard --- diff --git a/dix/enterleave.c b/dix/enterleave.c index a39e640..2b8c7c5 100644 --- a/dix/enterleave.c +++ b/dix/enterleave.c @@ -1292,7 +1292,7 @@ DeviceFocusEvents(DeviceIntPtr dev, NotifyPointer); DeviceFocusEvent(dev, XI_FocusOut, mode, NotifyNonlinear, fr= om); /* next call catches the root too, if the screen changed */ - DeviceFocusOutEvents(dev, from->parent, NullWindow, mode, + DeviceFocusOutEvents(dev, from, NullWindow, mode, NotifyNonlinearVirtual); } /* Notify all the roots */ @@ -1321,7 +1321,7 @@ DeviceFocusEvents(DeviceIntPtr dev, if (IsParent(to, from)) { DeviceFocusEvent(dev, XI_FocusOut, mode, NotifyAncestor,= from); - DeviceFocusOutEvents(dev, from->parent, to, mode, + DeviceFocusOutEvents(dev, from, to, mode, NotifyVirtual); DeviceFocusEvent(dev, XI_FocusIn, mode, NotifyInferior, = to); if ((IsParent(to, sprite->win)) && @@ -1353,7 +1353,7 @@ DeviceFocusEvents(DeviceIntPtr dev, NotifyPointer); DeviceFocusEvent(dev, XI_FocusOut, mode, NotifyNonli= near, from); if (from->parent !=3D NullWindow) - DeviceFocusOutEvents(dev, from->parent, common, = mode, + DeviceFocusOutEvents(dev, from, common, mode, NotifyNonlinearVirtual); if (to->parent !=3D NullWindow) DeviceFocusInEvents(dev, common, to, mode, Notif= yNonlinearVirtual); -- cgit v0.9.0.2-2-gbebe 1.1 x11-base/xorg-server/files/xorg-server-1.11-dix-poin= terrootwin-send-focusin.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-base/xorg-serv= er/files/xorg-server-1.11-dix-pointerrootwin-send-focusin.patch?rev=3D1.1= &view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-base/xorg-serv= er/files/xorg-server-1.11-dix-pointerrootwin-send-focusin.patch?rev=3D1.1= &content-type=3Dtext/plain Index: xorg-server-1.11-dix-pointerrootwin-send-focusin.patch =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D >From 3ce102c362cadcd7087bdcf48440d9498eaf77d0 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Thu, 05 Jan 2012 12:08:01 +0000 Subject: dix: on PointerRootWin send a FocusIn to the sprite window too XTS XSetDeviceFocus-7 Signed-off-by: Peter Hutterer Reviewed-by: Chase Douglas --- diff --git a/dix/enterleave.c b/dix/enterleave.c index 2b8c7c5..89a82ab 100644 --- a/dix/enterleave.c +++ b/dix/enterleave.c @@ -1299,7 +1299,10 @@ DeviceFocusEvents(DeviceIntPtr dev, for (i =3D 0; i < nscreens; i++) DeviceFocusEvent(dev, XI_FocusIn, mode, in, screenInfo.scree= ns[i]->root); if (to =3D=3D PointerRootWin) + { DeviceFocusInEvents(dev, GetCurrentRootWindow(dev), sprite->= win, mode, NotifyPointer); + DeviceFocusEvent(dev, XI_FocusIn, mode, NotifyPointer, sprit= e->win); + } } else { -- cgit v0.9.0.2-2-gbebe