From ad3db5212d10059bfe8af3ed75b60711d5705955 Mon Sep 17 00:00:00 2001
From: Dominik Honnef <dominik@honnef.co>
Date: Mon, 3 Apr 2023 22:55:51 +0200
Subject: [PATCH] app: [Wayland] avoid stuck primary button when invoking
 window management

Clicking on the window border or the title bar initiates resizing and
moving of the window respectively. This commit fixes a bug where this
would cause a stuck pressed primary button, as we won't receive a
release event. The fix is to only update the set of pressed buttons
after we've decided not to invoke window management.

This fixes a regression introduced by
2957d007a25ff4ec8c6858a056cfd40275393695.

Signed-off-by: Dominik Honnef <dominik@honnef.co>
---
 app/os_wayland.go | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/app/os_wayland.go b/app/os_wayland.go
index 8d2602a1..7b992c49 100644
--- a/app/os_wayland.go
+++ b/app/os_wayland.go
@@ -903,18 +903,7 @@ func gio_onPointerButton(data unsafe.Pointer, p *C.struct_wl_pointer, serial, t,
 	default:
 		return
 	}
-	var typ pointer.Type
-	switch state {
-	case 0:
-		w.pointerBtns &^= btn
-		typ = pointer.Release
-		// Move or resize gestures no longer applies.
-		w.inCompositor = false
-	case 1:
-		w.pointerBtns |= btn
-		typ = pointer.Press
-	}
-	if typ == pointer.Press && btn == pointer.ButtonPrimary {
+	if state == 1 && btn == pointer.ButtonPrimary {
 		if _, edge := w.systemGesture(); edge != 0 {
 			w.resize(serial, edge)
 			return
@@ -928,6 +917,17 @@ func gio_onPointerButton(data unsafe.Pointer, p *C.struct_wl_pointer, serial, t,
 			}
 		}
 	}
+	var typ pointer.Type
+	switch state {
+	case 0:
+		w.pointerBtns &^= btn
+		typ = pointer.Release
+		// Move or resize gestures no longer applies.
+		w.inCompositor = false
+	case 1:
+		w.pointerBtns |= btn
+		typ = pointer.Press
+	}
 	w.flushScroll()
 	w.resetFling()
 	w.w.Event(pointer.Event{
-- 
2.38.5