f89a222 refactor(ui): move input kinds and modifiers to input.go, add ModAlt and ModSuper · nefergui

M internal/ui/controls_extra_test.go +2 -3


@@ -3,7 +3,6 @@ package ui
3	3		import (
4	4		"github.com/bnema/nefergui/internal/css"
5	5		"github.com/bnema/nefergui/internal/edit"
6		-	"github.com/bnema/nefergui/internal/keyboard"
7	6		"testing"
8	7		)
9	8

@@ -85,7 +84,7 @@ func TestDisabledEditorRejectsFocusAndText(t *testing.T) {
85	84		if r.state.focus != nil {
86	85		t.Fatalf("disabled input focused: %s", idKey(r.state.focus))
87	86		}
88		-	r.route(platformInput{Kind: "key", Key: keyboard.Key{Name: "q", Text: "x", Pressed: true}})
	87	+	r.route(platformInput{Kind: "key", Key: keyEvent{Name: "q", Text: "x", Pressed: true}})
89	88		r.Build(view)
90	89		if value != "keep" {
91	90		t.Fatalf("disabled input edited: %q", value)

@@ -101,7 +100,7 @@ func TestEditFocusIMEAndClipboard(t *testing.T) {
101	100		r.clipboard = &clip{data: []byte("paste")}
102	101		r.route(key("Tab"))
103	102		r.Build(view)
104		-	r.route(platformInput{Kind: "key", Key: keyboard.Key{Name: "q", Text: "x", Pressed: true}})
	103	+	r.route(platformInput{Kind: "key", Key: keyEvent{Name: "q", Text: "x", Pressed: true}})
105	104		r.Build(view)
106	105		if value != "x" \|\| r.committed.children[0].text != "•" {
107	106		t.Fatalf("value=%q display=%q focus=%s", value, r.committed.children[0].text, idKey(r.state.focus))

 import (
 	"github.com/bnema/nefergui/internal/css"
 	"github.com/bnema/nefergui/internal/edit"
-	"github.com/bnema/nefergui/internal/keyboard"
 	"testing"
 )
 	if r.state.focus != nil {
 		t.Fatalf("disabled input focused: %s", idKey(r.state.focus))
 	}
-	r.route(platformInput{Kind: "key", Key: keyboard.Key{Name: "q", Text: "x", Pressed: true}})
+	r.route(platformInput{Kind: "key", Key: keyEvent{Name: "q", Text: "x", Pressed: true}})
 	r.Build(view)
 	if value != "keep" {
 		t.Fatalf("disabled input edited: %q", value)
 	r.clipboard = &clip{data: []byte("paste")}
 	r.route(key("Tab"))
 	r.Build(view)
-	r.route(platformInput{Kind: "key", Key: keyboard.Key{Name: "q", Text: "x", Pressed: true}})
+	r.route(platformInput{Kind: "key", Key: keyEvent{Name: "q", Text: "x", Pressed: true}})
 	r.Build(view)
 	if value != "x" || r.committed.children[0].text != "•" {
 		t.Fatalf("value=%q display=%q focus=%s", value, r.committed.children[0].text, idKey(r.state.focus))

M internal/ui/hooks.go +0 -23


@@ -12,29 +12,6 @@ import (
12	12		"github.com/bnema/nefergui/internal/platform/wayland"
13	13		)
14	14
15		-	// InputKind classifies an InputEvent.
16		-	type InputKind uint8
17		-
18		-	const (
19		-	InputPointerMotion InputKind = iota + 1
20		-	InputPointerPress
21		-	InputPointerRelease
22		-	InputPointerAxis
23		-	InputPointerLeave
24		-	InputKey
25		-	InputFocusIn
26		-	InputFocusOut
27		-	InputReset // platform dropped queued input; treat held state as released
28		-	)
29		-
30		-	// Modifiers is a bit set of keyboard modifiers held during a key event.
31		-	type Modifiers uint8
32		-
33		-	const (
34		-	ModShift Modifiers = 1 << iota
35		-	ModCtrl
36		-	)
37		-
38	15		// InputEvent is a raw platform event, delivered on the owner loop before the
39	16		// normal control routing. Coordinates are logical, surface-local pixels.
40	17		// Size changes are not input; use OnResize and Frame.Size. Which fields are set


@@ -12,29 +12,6 @@ import (
12		"github.com/bnema/nefergui/internal/platform/wayland"	12	"github.com/bnema/nefergui/internal/platform/wayland"
13		)	13	)
14			14
15	-	// InputKind classifies an InputEvent.
16	-	type InputKind uint8
17	-
18	-	const (
19	-	InputPointerMotion InputKind = iota + 1
20	-	InputPointerPress
21	-	InputPointerRelease
22	-	InputPointerAxis
23	-	InputPointerLeave
24	-	InputKey
25	-	InputFocusIn
26	-	InputFocusOut
27	-	InputReset // platform dropped queued input; treat held state as released
28	-	)
29	-
30	-	// Modifiers is a bit set of keyboard modifiers held during a key event.
31	-	type Modifiers uint8
32	-
33	-	const (
34	-	ModShift Modifiers = 1 << iota
35	-	ModCtrl
36	-	)
37	-
38		// InputEvent is a raw platform event, delivered on the owner loop before the	15	// InputEvent is a raw platform event, delivered on the owner loop before the
39		// normal control routing. Coordinates are logical, surface-local pixels.	16	// normal control routing. Coordinates are logical, surface-local pixels.
40		// Size changes are not input; use OnResize and Frame.Size. Which fields are set	17	// Size changes are not input; use OnResize and Frame.Size. Which fields are set

M internal/ui/ime_return_test.go +1 -2


@@ -4,11 +4,10 @@ import (
4	4		"testing"
5	5
6	6		"github.com/bnema/nefergui/internal/edit"
7		-	"github.com/bnema/nefergui/internal/keyboard"
8	7		)
9	8
10	9		func typed(name, text string) platformInput {
11		-	return platformInput{Kind: "key", Key: keyboard.Key{Name: name, Text: text, Pressed: true}}
	10	+	return platformInput{Kind: "key", Key: keyEvent{Name: name, Text: text, Pressed: true}}
12	11		}
13	12
14	13		// With text-input v3 the compositor routes keys to a grabbing input method;

 	"testing"
 	"github.com/bnema/nefergui/internal/edit"
-	"github.com/bnema/nefergui/internal/keyboard"
 )
 func typed(name, text string) platformInput {
-	return platformInput{Kind: "key", Key: keyboard.Key{Name: name, Text: text, Pressed: true}}
+	return platformInput{Kind: "key", Key: keyEvent{Name: name, Text: text, Pressed: true}}
 }
 // With text-input v3 the compositor routes keys to a grabbing input method;

A internal/ui/input.go +26 -0

@@ -0,0 +1,26 @@
	1	+	package ui
	2	+
	3	+	// InputKind classifies an InputEvent.
	4	+	type InputKind uint8
	5	+
	6	+	const (
	7	+	InputPointerMotion InputKind = iota + 1
	8	+	InputPointerPress
	9	+	InputPointerRelease
	10	+	InputPointerAxis
	11	+	InputPointerLeave
	12	+	InputKey
	13	+	InputFocusIn
	14	+	InputFocusOut
	15	+	InputReset // platform dropped queued input; treat held state as released
	16	+	)
	17	+
	18	+	// Modifiers is a bit set of keyboard modifiers held during a key event.
	19	+	type Modifiers uint8
	20	+
	21	+	const (
	22	+	ModShift Modifiers = 1 << iota
	23	+	ModCtrl
	24	+	ModAlt
	25	+	ModSuper
	26	+	)

@@ -0,0 +1,26 @@
	1	+	package ui
	2	+
	3	+	// InputKind classifies an InputEvent.
	4	+	type InputKind uint8
	5	+
	6	+	const (
	7	+	InputPointerMotion InputKind = iota + 1
	8	+	InputPointerPress
	9	+	InputPointerRelease
	10	+	InputPointerAxis
	11	+	InputPointerLeave
	12	+	InputKey
	13	+	InputFocusIn
	14	+	InputFocusOut
	15	+	InputReset // platform dropped queued input; treat held state as released
	16	+	)
	17	+
	18	+	// Modifiers is a bit set of keyboard modifiers held during a key event.
	19	+	type Modifiers uint8
	20	+
	21	+	const (
	22	+	ModShift Modifiers = 1 << iota
	23	+	ModCtrl
	24	+	ModAlt
	25	+	ModSuper
	26	+	)

M internal/ui/interaction.go +8 -2


@@ -8,7 +8,6 @@ import (
8	8
9	9		"github.com/bnema/nefergui/internal/css"
10	10		"github.com/bnema/nefergui/internal/edit"
11		-	"github.com/bnema/nefergui/internal/keyboard"
12	11		"github.com/bnema/nefergui/internal/layout"
13	12		"github.com/bnema/nefergui/internal/text"
14	13		)

@@ -19,13 +18,20 @@ type platformInput struct {
19	18		Kind string // motion, press, release, axis, leave, key, focus-in, focus-out, resize
20	19		X, Y, DX, DY float64
21	20		Width, Height, Scale float64
22		-	Key keyboard.Key
	21	+	Key keyEvent
23	22		Button uint32 // evdev button code (BTN_LEFT is primary)
24	23		Shift, Ctrl bool
25	24		IME edit.IMEBatch
26	25		Time time.Time // optional event timestamp; zero uses receipt time
27	26		}
28	27
	28	+	// keyEvent is the key part of a platformInput.
	29	+	type keyEvent struct {
	30	+	Name, Text string
	31	+	Pressed, Repeat bool
	32	+	Shift, Ctrl bool
	33	+	}
	34	+
29	35		const pointerPrimary uint32 = 0x110 // Linux BTN_LEFT
30	36
31	37		type interactionState struct {

 	"github.com/bnema/nefergui/internal/css"
 	"github.com/bnema/nefergui/internal/edit"
-	"github.com/bnema/nefergui/internal/keyboard"
 	"github.com/bnema/nefergui/internal/layout"
 	"github.com/bnema/nefergui/internal/text"
 )
 	Kind                 string // motion, press, release, axis, leave, key, focus-in, focus-out, resize
 	X, Y, DX, DY         float64
 	Width, Height, Scale float64
-	Key                  keyboard.Key
+	Key                  keyEvent
 	Button               uint32 // evdev button code (BTN_LEFT is primary)
 	Shift, Ctrl          bool
 	IME                  edit.IMEBatch
 	Time                 time.Time // optional event timestamp; zero uses receipt time
 }
+// keyEvent is the key part of a platformInput.
+type keyEvent struct {
+	Name, Text      string
+	Pressed, Repeat bool
+	Shift, Ctrl     bool
+}
 const pointerPrimary uint32 = 0x110 // Linux BTN_LEFT
 type interactionState struct {

M internal/ui/interaction_test.go +6 -7


@@ -6,13 +6,12 @@ import (
6	6		"testing"
7	7
8	8		"github.com/bnema/nefergui/internal/css"
9		-	"github.com/bnema/nefergui/internal/keyboard"
10	9		"github.com/bnema/nefergui/internal/platform/wayland"
11	10		"github.com/bnema/nefergui/internal/text"
12	11		)
13	12
14	13		func key(name string) platformInput {
15		-	return platformInput{Kind: "key", Key: keyboard.Key{Name: name, Pressed: true}}
	14	+	return platformInput{Kind: "key", Key: keyEvent{Name: name, Pressed: true}}
16	15		}
17	16		func shell(r runtime, activated int) func(*Frame) {
18	17		return func(f *Frame) {

@@ -67,7 +66,7 @@ func TestShellStyleAndFocus(t *testing.T) {
67	66		if !r.state.focus.same(r.Target(3)) {
68	67		t.Fatal("disabled included in tab order")
69	68		}
70		-	r.route(platformInput{Kind: "key", Shift: true, Key: keyboard.Key{Name: "Tab", Pressed: true}})
	69	+	r.route(platformInput{Kind: "key", Shift: true, Key: keyEvent{Name: "Tab", Pressed: true}})
71	70		r.Build(view)
72	71		if !r.state.focus.same(r.Target(1)) {
73	72		t.Fatal("reverse tab")

@@ -361,7 +360,7 @@ func TestKeyboardActivationLifecycle(t *testing.T) {
361	360		if count != 1 \|\| r.state.space == nil \|\| r.state.flags(r.committed.children[0])&css.Active == 0 {
362	361		t.Fatal("space press should only set active")
363	362		}
364		-	r.route(platformInput{Kind: "key", Key: keyboard.Key{Name: "space"}})
	363	+	r.route(platformInput{Kind: "key", Key: keyEvent{Name: "space"}})
365	364		r.Build(view)
366	365		if count != 2 \|\| r.state.space != nil {
367	366		t.Fatal("space release should activate once", count)

@@ -369,7 +368,7 @@ func TestKeyboardActivationLifecycle(t *testing.T) {
369	368		r.route(space)
370	369		r.route(key("Escape"))
371	370		r.Build(view)
372		-	r.route(platformInput{Kind: "key", Key: keyboard.Key{Name: "space"}})
	371	+	r.route(platformInput{Kind: "key", Key: keyEvent{Name: "space"}})
373	372		if r.Build(view) {
374	373		t.Fatal("cancelled release redrew")
375	374		}

@@ -379,7 +378,7 @@ func TestKeyboardActivationLifecycle(t *testing.T) {
379	378		r.route(space)
380	379		r.route(platformInput{Kind: "focus-out"})
381	380		r.Build(view)
382		-	r.route(platformInput{Kind: "key", Key: keyboard.Key{Name: "space"}})
	381	+	r.route(platformInput{Kind: "key", Key: keyEvent{Name: "space"}})
383	382		if r.Build(view) \|\| count != 2 {
384	383		t.Fatal("focus loss failed to cancel")
385	384		}

@@ -388,7 +387,7 @@ func TestKeyboardActivationLifecycle(t *testing.T) {
388	387		r.route(space)
389	388		r.route(key("Tab"))
390	389		r.Build(view)
391		-	r.route(platformInput{Kind: "key", Key: keyboard.Key{Name: "space"}})
	390	+	r.route(platformInput{Kind: "key", Key: keyEvent{Name: "space"}})
392	391		if r.Build(view) \|\| count != 2 {
393	392		t.Fatal("focus change failed to cancel")
394	393		}

 	"testing"
 	"github.com/bnema/nefergui/internal/css"
-	"github.com/bnema/nefergui/internal/keyboard"
 	"github.com/bnema/nefergui/internal/platform/wayland"
 	"github.com/bnema/nefergui/internal/text"
 )
 func key(name string) platformInput {
-	return platformInput{Kind: "key", Key: keyboard.Key{Name: name, Pressed: true}}
+	return platformInput{Kind: "key", Key: keyEvent{Name: name, Pressed: true}}
 }
 func shell(r *runtime, activated *int) func(*Frame) {
 	return func(f *Frame) {
 	if !r.state.focus.same(r.Target(3)) {
 		t.Fatal("disabled included in tab order")
 	}
-	r.route(platformInput{Kind: "key", Shift: true, Key: keyboard.Key{Name: "Tab", Pressed: true}})
+	r.route(platformInput{Kind: "key", Shift: true, Key: keyEvent{Name: "Tab", Pressed: true}})
 	r.Build(view)
 	if !r.state.focus.same(r.Target(1)) {
 		t.Fatal("reverse tab")
 	if count != 1 || r.state.space == nil || r.state.flags(r.committed.children[0])&css.Active == 0 {
 		t.Fatal("space press should only set active")
 	}
-	r.route(platformInput{Kind: "key", Key: keyboard.Key{Name: "space"}})
+	r.route(platformInput{Kind: "key", Key: keyEvent{Name: "space"}})
 	r.Build(view)
 	if count != 2 || r.state.space != nil {
 		t.Fatal("space release should activate once", count)
 	r.route(space)
 	r.route(key("Escape"))
 	r.Build(view)
-	r.route(platformInput{Kind: "key", Key: keyboard.Key{Name: "space"}})
+	r.route(platformInput{Kind: "key", Key: keyEvent{Name: "space"}})
 	if r.Build(view) {
 		t.Fatal("cancelled release redrew")
 	}
 	r.route(space)
 	r.route(platformInput{Kind: "focus-out"})
 	r.Build(view)
-	r.route(platformInput{Kind: "key", Key: keyboard.Key{Name: "space"}})
+	r.route(platformInput{Kind: "key", Key: keyEvent{Name: "space"}})
 	if r.Build(view) || count != 2 {
 		t.Fatal("focus loss failed to cancel")
 	}
 	r.route(space)
 	r.route(key("Tab"))
 	r.Build(view)
-	r.route(platformInput{Kind: "key", Key: keyboard.Key{Name: "space"}})
+	r.route(platformInput{Kind: "key", Key: keyEvent{Name: "space"}})
 	if r.Build(view) || count != 2 {
 		t.Fatal("focus change failed to cancel")
 	}

M internal/ui/platform.go +1 -1


@@ -28,5 +28,5 @@ func (r *runtime) routeInput(in wayland.Input) {
28	28		if in.Kind == "axis" && in.DX == 0 && in.DY == 0 {
29	29		return
30	30		}
31		-	r.route(platformInput{Kind: in.Kind, X: in.X, Y: in.Y, DX: in.DX, DY: in.DY, Button: in.Button, Key: in.Key, Shift: in.Key.Shift, Ctrl: in.Key.Ctrl})
	31	+	r.route(platformInput{Kind: in.Kind, X: in.X, Y: in.Y, DX: in.DX, DY: in.DY, Button: in.Button, Key: keyEvent{Name: in.Key.Name, Text: in.Key.Text, Pressed: in.Key.Pressed, Repeat: in.Key.Repeat, Shift: in.Key.Shift, Ctrl: in.Key.Ctrl}, Shift: in.Key.Shift, Ctrl: in.Key.Ctrl})
32	32		}


@@ -28,5 +28,5 @@ func (r *runtime) routeInput(in wayland.Input) {
28		if in.Kind == "axis" && in.DX == 0 && in.DY == 0 {	28		if in.Kind == "axis" && in.DX == 0 && in.DY == 0 {
29		return	29		return
30		}	30		}
31	-	r.route(platformInput{Kind: in.Kind, X: in.X, Y: in.Y, DX: in.DX, DY: in.DY, Button: in.Button, Key: in.Key, Shift: in.Key.Shift, Ctrl: in.Key.Ctrl})	31	+	r.route(platformInput{Kind: in.Kind, X: in.X, Y: in.Y, DX: in.DX, DY: in.DY, Button: in.Button, Key: keyEvent{Name: in.Key.Name, Text: in.Key.Text, Pressed: in.Key.Pressed, Repeat: in.Key.Repeat, Shift: in.Key.Shift, Ctrl: in.Key.Ctrl}, Shift: in.Key.Shift, Ctrl: in.Key.Ctrl})
32		}	32		}