ui,internal/ops,internal/opconst: move OpsReader to internal ops package

To avoid import cycles, move the op constants to its own package,
internal/opconst.

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

ui/app/internal/input/key.go

@@ -5,6 +5,7 @@ package input
 import (
 	"gioui.org/ui"
 	"gioui.org/ui/input"
+	"gioui.org/ui/internal/opconst"
 	"gioui.org/ui/internal/ops"
 	"gioui.org/ui/key"
 )
@@ -14,7 +15,7 @@ type TextInputState uint8
 type keyQueue struct {
 	focus    input.Key
 	handlers map[input.Key]*keyHandler
-	reader   ui.OpsReader
+	reader   ops.Reader
 	state    TextInputState
 }
 
@@ -94,8 +95,8 @@ func (q *keyQueue) resolveFocus(events *handlerEvents) (input.Key, listenerPrior
 	var hide bool
 loop:
 	for encOp, ok := q.reader.Decode(); ok; encOp, ok = q.reader.Decode() {
-		switch ops.OpType(encOp.Data[0]) {
-		case ops.TypeKeyHandler:
+		switch opconst.OpType(encOp.Data[0]) {
+		case opconst.TypeKeyHandler:
 			var op key.HandlerOp
 			op.Decode(encOp.Data, encOp.Refs)
 			var newPri listenerPriority
@@ -119,15 +120,15 @@ loop:
 				events.Set(op.Key, []input.Event{key.FocusEvent{Focus: false}})
 			}
 			h.active = true
-		case ops.TypeHideInput:
+		case opconst.TypeHideInput:
 			hide = true
-		case ops.TypePush:
+		case opconst.TypePush:
 			newK, newPri, h := q.resolveFocus(events)
 			hide = hide || h
 			if newPri.replaces(pri) {
 				k, pri = newK, newPri
 			}
-		case ops.TypePop:
+		case opconst.TypePop:
 			break loop
 		}
 	}

ui/app/internal/input/pointer.go

@@ -9,6 +9,7 @@ import (
 	"gioui.org/ui"
 	"gioui.org/ui/f32"
 	"gioui.org/ui/input"
+	"gioui.org/ui/internal/opconst"
 	"gioui.org/ui/internal/ops"
 	"gioui.org/ui/pointer"
 )
@@ -18,7 +19,7 @@ type pointerQueue struct {
 	areas    []areaNode
 	handlers map[input.Key]*pointerHandler
 	pointers []pointerInfo
-	reader   ui.OpsReader
+	reader   ops.Reader
 	scratch  []input.Key
 }
 
@@ -63,18 +64,18 @@ const (
 	areaEllipse
 )
 
-func (q *pointerQueue) collectHandlers(r *ui.OpsReader, events *handlerEvents, t ui.TransformOp, area, node int, pass bool) {
+func (q *pointerQueue) collectHandlers(r *ops.Reader, events *handlerEvents, t ui.TransformOp, area, node int, pass bool) {
 	for encOp, ok := r.Decode(); ok; encOp, ok = r.Decode() {
-		switch ops.OpType(encOp.Data[0]) {
-		case ops.TypePush:
+		switch opconst.OpType(encOp.Data[0]) {
+		case opconst.TypePush:
 			q.collectHandlers(r, events, t, area, node, pass)
-		case ops.TypePop:
+		case opconst.TypePop:
 			return
-		case ops.TypePass:
+		case opconst.TypePass:
 			var op pointer.PassOp
 			op.Decode(encOp.Data)
 			pass = op.Pass
-		case ops.TypeArea:
+		case opconst.TypeArea:
 			var op areaOp
 			op.Decode(encOp.Data)
 			q.areas = append(q.areas, areaNode{trans: t, next: area, area: op})
@@ -85,11 +86,11 @@ func (q *pointerQueue) collectHandlers(r *ui.OpsReader, events *handlerEvents, t
 				pass: pass,
 			})
 			node = len(q.hitTree) - 1
-		case ops.TypeTransform:
+		case opconst.TypeTransform:
 			var op ui.TransformOp
 			op.Decode(encOp.Data)
 			t = t.Multiply(op)
-		case ops.TypePointerHandler:
+		case opconst.TypePointerHandler:
 			var op pointer.HandlerOp
 			op.Decode(encOp.Data, encOp.Refs)
 			q.hitTree = append(q.hitTree, hitNode{
@@ -264,7 +265,7 @@ func (q *pointerQueue) Push(e pointer.Event, events *handlerEvents) {
 }
 
 func (op *areaOp) Decode(d []byte) {
-	if ops.OpType(d[0]) != ops.TypeArea {
+	if opconst.OpType(d[0]) != opconst.TypeArea {
 		panic("invalid op")
 	}
 	bo := binary.LittleEndian

ui/app/internal/input/router.go

@@ -7,6 +7,7 @@ import (
 
 	"gioui.org/ui"
 	"gioui.org/ui/input"
+	"gioui.org/ui/internal/opconst"
 	"gioui.org/ui/internal/ops"
 	"gioui.org/ui/key"
 	"gioui.org/ui/pointer"
@@ -21,7 +22,7 @@ type Router struct {
 
 	handlers handlerEvents
 
-	reader ui.OpsReader
+	reader ops.Reader
 
 	// InvalidateOp summary.
 	wakeup     bool
@@ -71,15 +72,15 @@ func (q *Router) TextInputState() TextInputState {
 
 func (q *Router) collect() {
 	for encOp, ok := q.reader.Decode(); ok; encOp, ok = q.reader.Decode() {
-		switch ops.OpType(encOp.Data[0]) {
-		case ops.TypeInvalidate:
+		switch opconst.OpType(encOp.Data[0]) {
+		case opconst.TypeInvalidate:
 			var op ui.InvalidateOp
 			op.Decode(encOp.Data)
 			if !q.wakeup || op.At.Before(q.wakeupTime) {
 				q.wakeup = true
 				q.wakeupTime = op.At
 			}
-		case ops.TypeProfile:
+		case opconst.TypeProfile:
 			var op system.ProfileOp
 			op.Decode(encOp.Data, encOp.Refs)
 			q.profHandlers = append(q.profHandlers, op.Key)