sway

commit 7dd9cd29a6cb0f075f7face47f8a0629bf13f0c6
parent 5efdde8868f34b4658125148428eadd01caf8162
Author: Olivier Fourdan <ofourdan@redhat.com>
Date:   Wed, 11 Mar 2020 15:03:03 +0100

input: Avoid creating the PAD device multiple times

If a pad device for a tablet exists, reloading the configuration,
removing/reading the device or even suspending the system will recreate
the same Wayland input device multiple times.

Make sure we don't re-create the same Wayland device more than
necessary.

Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>

Diffstat:
M
sway/input/seat.c
 | 
2
+-
M
sway/input/tablet.c
 | 
12
++++++++----

2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/sway/input/seat.c b/sway/input/seat.c
@@ -723,7 +723,7 @@ static void seat_configure_tablet_tool(struct sway_seat *seat,
 
 static void seat_configure_tablet_pad(struct sway_seat *seat,
 		struct sway_seat_device *sway_device) {
-	if (!sway_device->tablet) {
+	if (!sway_device->tablet_pad) {
 		sway_device->tablet_pad = sway_tablet_pad_create(seat, sway_device);
 	}
 	sway_configure_tablet_pad(sway_device->tablet_pad);
diff --git a/sway/input/tablet.c b/sway/input/tablet.c
@@ -56,8 +56,10 @@ void sway_configure_tablet(struct sway_tablet *tablet) {
 		seat_configure_xcursor(seat);
 	}
 
-	tablet->tablet_v2 =
-		wlr_tablet_create(server.tablet_v2, seat->wlr_seat, device);
+	if (!tablet->tablet_v2) {
+		tablet->tablet_v2 =
+			wlr_tablet_create(server.tablet_v2, seat->wlr_seat, device);
+	}
 
 	/* Search for a sibling tablet pad */
 	if (!wlr_input_device_is_libinput(device)) {
@@ -238,8 +240,10 @@ void sway_configure_tablet_pad(struct sway_tablet_pad *tablet_pad) {
 		tablet_pad->seat_device->input_device->wlr_device;
 	struct sway_seat *seat = tablet_pad->seat_device->sway_seat;
 
-	tablet_pad->tablet_v2_pad =
-		wlr_tablet_pad_create(server.tablet_v2, seat->wlr_seat, device);
+	if (!tablet_pad->tablet_v2_pad) {
+		tablet_pad->tablet_v2_pad =
+			wlr_tablet_pad_create(server.tablet_v2, seat->wlr_seat, device);
+	}
 
 	wl_list_remove(&tablet_pad->attach.link);
 	tablet_pad->attach.notify = handle_tablet_pad_attach;