io/router: merge grab and types for multiple InputOps for same handler

Signed-off-by: Elias Naur <mail@eliasnaur.com>

io/router/pointer.go

@@ -109,8 +109,8 @@ func (q *pointerQueue) collectHandlers(r *ops.Reader, events *handlerEvents, t o
 			}
 			h.active = true
 			h.area = area
-			h.wantsGrab = op.Grab
-			h.types = op.Types
+			h.wantsGrab = h.wantsGrab || op.Grab
+			h.types = h.types | op.Types
 		}
 	}
 }
@@ -169,6 +169,8 @@ func (q *pointerQueue) Frame(root *op.Ops, events *handlerEvents) {
 	for _, h := range q.handlers {
 		// Reset handler.
 		h.active = false
+		h.wantsGrab = false
+		h.types = 0
 	}
 	q.hitTree = q.hitTree[:0]
 	q.areas = q.areas[:0]

io/router/pointer_test.go

@@ -242,7 +242,12 @@ func TestMultipleAreas(t *testing.T) {
 	var ops op.Ops
 
 	addPointerHandler(&ops, handler, image.Rect(0, 0, 100, 100))
-	addPointerHandler(&ops, handler, image.Rect(50, 50, 200, 200))
+	st := op.Push(&ops)
+	pointer.Rect(image.Rect(50, 50, 200, 200)).Add(&ops)
+	// Second area has no Types set, yet should receive events because
+	// Types for the same handles are or-ed together.
+	pointer.InputOp{Tag: handler}.Add(&ops)
+	st.Pop()
 
 	var r Router
 	r.Frame(&ops)