mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-25 17:31:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

input: Avoid creating the PAD device multiple times

Browse source 
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>
This commit is contained in:
Olivier Fourdan 2020-03-11 15:03:03 +01:00 committed by Drew DeVault
parent 5efdde8868
commit 7dd9cd29a6
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sway/input/seat.c
View file

@ -723,7 +723,7 @@ static void seat_configure_tablet_tool(struct sway_seat *seat,
static void seat_configure_tablet_pad(struct sway_seat *seat, static void seat_configure_tablet_pad(struct sway_seat *seat,
struct sway_seat_device *sway_device) { 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_device->tablet_pad = sway_tablet_pad_create(seat, sway_device);
} }
sway_configure_tablet_pad(sway_device->tablet_pad); sway_configure_tablet_pad(sway_device->tablet_pad);

4
sway/input/tablet.c
View file

@ -56,8 +56,10 @@ void sway_configure_tablet(struct sway_tablet *tablet) {
seat_configure_xcursor(seat); seat_configure_xcursor(seat);
} }
if (!tablet->tablet_v2) {
tablet->tablet_v2 = tablet->tablet_v2 =
wlr_tablet_create(server.tablet_v2, seat->wlr_seat, device); wlr_tablet_create(server.tablet_v2, seat->wlr_seat, device);
}
/* Search for a sibling tablet pad */ /* Search for a sibling tablet pad */
if (!wlr_input_device_is_libinput(device)) { 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; tablet_pad->seat_device->input_device->wlr_device;
struct sway_seat *seat = tablet_pad->seat_device->sway_seat; struct sway_seat *seat = tablet_pad->seat_device->sway_seat;
if (!tablet_pad->tablet_v2_pad) {
tablet_pad->tablet_v2_pad = tablet_pad->tablet_v2_pad =
wlr_tablet_pad_create(server.tablet_v2, seat->wlr_seat, device); wlr_tablet_pad_create(server.tablet_v2, seat->wlr_seat, device);
}
wl_list_remove(&tablet_pad->attach.link); wl_list_remove(&tablet_pad->attach.link);
tablet_pad->attach.notify = handle_tablet_pad_attach; tablet_pad->attach.notify = handle_tablet_pad_attach;