seatop_down: Call seatop_begin_default after sending touch events

hrdl-github · hrdl-github · commit 73c4eb2a5db4 · 2023-05-11T11:16:51.000+02:00
This is consistent with pointer tablet and button events. Fixes swaywm#7577.
diff --git a/sway/input/seatop_down.c b/sway/input/seatop_down.c
@@ -64,11 +64,11 @@ static void handle_touch_up(struct sway_seat *seat,
 		}
 	}
 
+	wlr_seat_touch_notify_up(seat->wlr_seat, event->time_msec, event->touch_id);
+
 	if (wl_list_empty(&e->point_events)) {
 		seatop_begin_default(seat);
 	}
-
-	wlr_seat_touch_notify_up(seat->wlr_seat, event->time_msec, event->touch_id);
 }
 
 static void handle_touch_down(struct sway_seat *seat,
@@ -117,13 +117,13 @@ static void handle_touch_cancel(struct sway_seat *seat,
 		}
 	}
 
-	if (wl_list_empty(&e->point_events)) {
-		seatop_begin_default(seat);
-	}
-
 	if (e->surface) {
 		wlr_seat_touch_notify_cancel(seat->wlr_seat, e->surface);
 	}
+
+	if (wl_list_empty(&e->point_events)) {
+		seatop_begin_default(seat);
+	}
 }
 
 static void handle_pointer_axis(struct sway_seat *seat,

Original file line number	Diff line number	Diff line change
`@@ -64,11 +64,11 @@ static void handle_touch_up(struct sway_seat *seat,`
`64`	`64`	`}`
`65`	`65`	`}`
`66`	`66`
	`67`	`+ wlr_seat_touch_notify_up(seat->wlr_seat, event->time_msec, event->touch_id);`
	`68`	`+`
`67`	`69`	`if (wl_list_empty(&e->point_events)) {`
`68`	`70`	`seatop_begin_default(seat);`
`69`	`71`	`}`
`70`		`-`
`71`		`- wlr_seat_touch_notify_up(seat->wlr_seat, event->time_msec, event->touch_id);`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`static void handle_touch_down(struct sway_seat *seat,`
`@@ -117,13 +117,13 @@ static void handle_touch_cancel(struct sway_seat *seat,`
`117`	`117`	`}`
`118`	`118`	`}`
`119`	`119`
`120`		`- if (wl_list_empty(&e->point_events)) {`
`121`		`- seatop_begin_default(seat);`
`122`		`- }`
`123`		`-`
`124`	`120`	`if (e->surface) {`
`125`	`121`	`wlr_seat_touch_notify_cancel(seat->wlr_seat, e->surface);`
`126`	`122`	`}`
	`123`	`+`
	`124`	`+ if (wl_list_empty(&e->point_events)) {`
	`125`	`+ seatop_begin_default(seat);`
	`126`	`+ }`
`127`	`127`	`}`
`128`	`128`
`129`	`129`	`static void handle_pointer_axis(struct sway_seat *seat,`