Re: [PATCH 1/2] randr: Don't recurse into mieqProcessInputEvents() from RRTellChanged().

[Keith Packard]

Andy Ritger  writes:

> Call UpdateCurrentTimeIf(), not UpdateCurrentTime(), from RRTellChanged().
> The latter calls ProcessInputEvents(), which can trigger a recursion
> into mieqProcessInputEvents().  The former omits the call to
> ProcessInputEvents().

Merged.
   8dc70ac..dae317e  master -> master

-- 
keith.pack...@intel.com


pgpiXTPMf9fhG.pgp
Description: PGP signature
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel

Re: [PATCH 1/2] randr: Don't recurse into mieqProcessInputEvents() from RRTellChanged().

[Jeremy Huddleston]

Ok, I failed to actually notice the patch was already on the list in my deluge 
of unread messages.  Seeing as how this is exactly what I just described in my 
previous email,

Reviewed-by: Jeremy Huddleston 

Thanks,
Jeremy

On Jun 14, 2012, at 9:15 AM, Andy Ritger  wrote:

> Call UpdateCurrentTimeIf(), not UpdateCurrentTime(), from RRTellChanged().
> The latter calls ProcessInputEvents(), which can trigger a recursion
> into mieqProcessInputEvents().  The former omits the call to
> ProcessInputEvents().
> 
> Signed-off-by: Andy Ritger 
> ---
> randr/randr.c |2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/randr/randr.c b/randr/randr.c
> index a64aae3..4d4298a 100644
> --- a/randr/randr.c
> +++ b/randr/randr.c
> @@ -416,7 +416,7 @@ RRTellChanged(ScreenPtr pScreen)
> int i;
> 
> if (pScrPriv->changed) {
> -UpdateCurrentTime();
> +UpdateCurrentTimeIf();
> if (pScrPriv->configChanged) {
> pScrPriv->lastConfigTime = currentTime;
> pScrPriv->configChanged = FALSE;
> -- 
> 1.7.7
> 
> ___
> xorg-devel@lists.x.org: X.Org development
> Archives: http://lists.x.org/archives/xorg-devel
> Info: http://lists.x.org/mailman/listinfo/xorg-devel
> 

___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel

[PATCH 1/2] randr: Don't recurse into mieqProcessInputEvents() from RRTellChanged().

[Andy Ritger]

Call UpdateCurrentTimeIf(), not UpdateCurrentTime(), from RRTellChanged().
The latter calls ProcessInputEvents(), which can trigger a recursion
into mieqProcessInputEvents().  The former omits the call to
ProcessInputEvents().

Signed-off-by: Andy Ritger 
---
 randr/randr.c |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/randr/randr.c b/randr/randr.c
index a64aae3..4d4298a 100644
--- a/randr/randr.c
+++ b/randr/randr.c
@@ -416,7 +416,7 @@ RRTellChanged(ScreenPtr pScreen)
 int i;
 
 if (pScrPriv->changed) {
-UpdateCurrentTime();
+UpdateCurrentTimeIf();
 if (pScrPriv->configChanged) {
 pScrPriv->lastConfigTime = currentTime;
 pScrPriv->configChanged = FALSE;
-- 
1.7.7

___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel