|
 |
fdb82f |
From 9ce66b9d059e3552ca6feea171aa8541fc1a5cb3 Mon Sep 17 00:00:00 2001
|
|
|
fdb82f |
From: Sebastian Keller <skeller@gnome.org>
|
|
|
fdb82f |
Date: Mon, 27 Jan 2020 01:02:29 +0100
|
|
|
fdb82f |
Subject: [PATCH 2/2] gdk/x11: Properly unref removed device in XI2 device
|
|
|
fdb82f |
manager
|
|
|
fdb82f |
|
|
|
fdb82f |
When a device is added, there are two references to it by the device
|
|
|
fdb82f |
manager, the initial one and the one used for the id_table. Removing a
|
|
|
fdb82f |
device only removed the reference added by the id_table resulting in the
|
|
|
fdb82f |
GdkDevice being leaked.
|
|
|
fdb82f |
|
|
|
fdb82f |
https://gitlab.gnome.org/GNOME/gtk/merge_requests/1359
|
|
|
fdb82f |
---
|
|
|
fdb82f |
gdk/x11/gdkdevicemanager-xi2.c | 10 +++++-----
|
|
|
fdb82f |
1 file changed, 5 insertions(+), 5 deletions(-)
|
|
|
fdb82f |
|
|
|
fdb82f |
diff --git a/gdk/x11/gdkdevicemanager-xi2.c b/gdk/x11/gdkdevicemanager-xi2.c
|
|
|
fdb82f |
index 135a0512aa..00e64d2a84 100644
|
|
|
fdb82f |
--- a/gdk/x11/gdkdevicemanager-xi2.c
|
|
|
fdb82f |
+++ b/gdk/x11/gdkdevicemanager-xi2.c
|
|
|
fdb82f |
@@ -616,68 +616,68 @@ add_device (GdkX11DeviceManagerXI2 *device_manager,
|
|
|
fdb82f |
|
|
|
fdb82f |
return device;
|
|
|
fdb82f |
}
|
|
|
fdb82f |
|
|
|
fdb82f |
static void
|
|
|
fdb82f |
detach_from_seat (GdkDevice *device)
|
|
|
fdb82f |
{
|
|
|
fdb82f |
GdkSeat *seat = gdk_device_get_seat (device);
|
|
|
fdb82f |
|
|
|
fdb82f |
if (!seat)
|
|
|
fdb82f |
return;
|
|
|
fdb82f |
|
|
|
fdb82f |
if (gdk_device_get_device_type (device) == GDK_DEVICE_TYPE_MASTER)
|
|
|
fdb82f |
gdk_display_remove_seat (gdk_device_get_display (device), seat);
|
|
|
fdb82f |
else if (gdk_device_get_device_type (device) == GDK_DEVICE_TYPE_SLAVE)
|
|
|
fdb82f |
gdk_seat_default_remove_slave (GDK_SEAT_DEFAULT (seat), device);
|
|
|
fdb82f |
}
|
|
|
fdb82f |
|
|
|
fdb82f |
static void
|
|
|
fdb82f |
remove_device (GdkX11DeviceManagerXI2 *device_manager,
|
|
|
fdb82f |
gint device_id)
|
|
|
fdb82f |
{
|
|
|
fdb82f |
GdkDevice *device;
|
|
|
fdb82f |
|
|
|
fdb82f |
device = g_hash_table_lookup (device_manager->id_table,
|
|
|
fdb82f |
GINT_TO_POINTER (device_id));
|
|
|
fdb82f |
|
|
|
fdb82f |
if (device)
|
|
|
fdb82f |
{
|
|
|
fdb82f |
detach_from_seat (device);
|
|
|
fdb82f |
- device_manager->devices = g_list_remove (device_manager->devices, device);
|
|
|
fdb82f |
-
|
|
|
fdb82f |
- g_signal_emit_by_name (device_manager, "device-removed", device);
|
|
|
fdb82f |
-
|
|
|
fdb82f |
- g_object_run_dispose (G_OBJECT (device));
|
|
|
fdb82f |
|
|
|
fdb82f |
g_hash_table_remove (device_manager->id_table,
|
|
|
fdb82f |
GINT_TO_POINTER (device_id));
|
|
|
fdb82f |
+
|
|
|
fdb82f |
+ device_manager->devices = g_list_remove (device_manager->devices, device);
|
|
|
fdb82f |
+ g_signal_emit_by_name (device_manager, "device-removed", device);
|
|
|
fdb82f |
+ g_object_run_dispose (G_OBJECT (device));
|
|
|
fdb82f |
+ g_object_unref (device);
|
|
|
fdb82f |
}
|
|
|
fdb82f |
}
|
|
|
fdb82f |
|
|
|
fdb82f |
static void
|
|
|
fdb82f |
relate_masters (gpointer key,
|
|
|
fdb82f |
gpointer value,
|
|
|
fdb82f |
gpointer user_data)
|
|
|
fdb82f |
{
|
|
|
fdb82f |
GdkX11DeviceManagerXI2 *device_manager;
|
|
|
fdb82f |
GdkDevice *device, *relative;
|
|
|
fdb82f |
|
|
|
fdb82f |
device_manager = user_data;
|
|
|
fdb82f |
device = g_hash_table_lookup (device_manager->id_table, key);
|
|
|
fdb82f |
relative = g_hash_table_lookup (device_manager->id_table, value);
|
|
|
fdb82f |
|
|
|
fdb82f |
_gdk_device_set_associated_device (device, relative);
|
|
|
fdb82f |
_gdk_device_set_associated_device (relative, device);
|
|
|
fdb82f |
ensure_seat_for_device_pair (device_manager, device, relative);
|
|
|
fdb82f |
}
|
|
|
fdb82f |
|
|
|
fdb82f |
static void
|
|
|
fdb82f |
relate_slaves (gpointer key,
|
|
|
fdb82f |
gpointer value,
|
|
|
fdb82f |
gpointer user_data)
|
|
|
fdb82f |
{
|
|
|
fdb82f |
GdkX11DeviceManagerXI2 *device_manager;
|
|
|
fdb82f |
GdkDevice *slave, *master;
|
|
|
fdb82f |
GdkSeat *seat;
|
|
|
fdb82f |
|
|
|
fdb82f |
device_manager = user_data;
|
|
|
fdb82f |
--
|
|
|
fdb82f |
2.25.1
|
|
|
fdb82f |
|