Attachment 53926 Details for Bug 43165 – 0001-Xi-when-removing-a-device-reset-ClientPointers-where.patch

[patch] 0001-Xi-when-removing-a-device-reset-ClientPointers-where.patch

0001-Xi-when-removing-a-device-reset-ClientPointers-where.patch (text/plain), 1.31 KB, created by Peter Hutterer on 2011-11-28 22:24:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Peter Hutterer

Created: 2011-11-28 22:24:43 UTC

Size: 1.31 KB

patch

obsolete

>From b11e555554000944f42aa977927a96efb79b4f8d Mon Sep 17 00:00:00 2001
>From: Peter Hutterer <peter.hutterer@who-t.net>
>Date: Tue, 29 Nov 2011 16:15:37 +1000
>Subject: [PATCH] Xi: when removing a device, reset ClientPointers where
> needed
>
>if a client had the to-be-removed device as ClientPointer, reset to NULL.
>
>Fixes #43165
>
>Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
>---
> Xi/xichangehierarchy.c |   15 +++++++++++++++
> 1 files changed, 15 insertions(+), 0 deletions(-)
>
>diff --git a/Xi/xichangehierarchy.c b/Xi/xichangehierarchy.c
>index 614d231..a8bc761 100644
>--- a/Xi/xichangehierarchy.c
>+++ b/Xi/xichangehierarchy.c
>@@ -201,6 +201,19 @@ unwind:
> }
> 
> static int
>+disable_clientpointer(DeviceIntPtr dev)
>+{
>+    int i;
>+
>+    for (i = 0; i < currentMaxClients; i++)
>+    {
>+        ClientPtr client = clients[i];
>+        if (client && client->clientPtr == dev)
>+            client->clientPtr = NULL;
>+    }
>+}
>+
>+static int
> remove_master(ClientPtr client, xXIRemoveMasterInfo *r,
>               int flags[MAXDEVICES])
> {
>@@ -250,6 +263,8 @@ remove_master(ClientPtr client, xXIRemoveMasterInfo *r,
>     if (rc != Success)
>         goto unwind;
> 
>+    disable_clientpointer(ptr);
>+
>     /* Disabling sends the devices floating, reattach them if
>      * desired. */
>     if (r->return_mode == XIAttachToMaster)
>-- 
>1.7.7.1
>

Actions: View | Splinter Review

Attachments on bug 43165: 53765 | 53766 | 53926

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.