mirror of
https://git.sr.ht/~eliasnaur/gio
synced 2026-07-06 09:55:40 +00:00
ui/app: add input queue to Window
I see no point in forcing the client to manage input events. Let's put it on Window for now. Signed-off-by: Elias Naur <mail@eliasnaur.com>
This commit is contained in:
+10
-2
@@ -46,6 +46,7 @@ type Window struct {
|
|||||||
nextFrame time.Time
|
nextFrame time.Time
|
||||||
delayedDraw *time.Timer
|
delayedDraw *time.Timer
|
||||||
|
|
||||||
|
router input.Router
|
||||||
reader ui.OpsReader
|
reader ui.OpsReader
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -98,6 +99,10 @@ func (w *Window) Err() error {
|
|||||||
return w.err
|
return w.err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (w *Window) Queue() input.Queue {
|
||||||
|
return &w.router
|
||||||
|
}
|
||||||
|
|
||||||
func (w *Window) Draw(root *ui.Ops) {
|
func (w *Window) Draw(root *ui.Ops) {
|
||||||
w.mu.Lock()
|
w.mu.Lock()
|
||||||
var drawDur time.Duration
|
var drawDur time.Duration
|
||||||
@@ -109,6 +114,7 @@ func (w *Window) Draw(root *ui.Ops) {
|
|||||||
sync := w.syncGPU
|
sync := w.syncGPU
|
||||||
w.syncGPU = false
|
w.syncGPU = false
|
||||||
alive := w.isAlive()
|
alive := w.isAlive()
|
||||||
|
size := w.size
|
||||||
w.mu.Unlock()
|
w.mu.Unlock()
|
||||||
if !alive || stage < StageRunning {
|
if !alive || stage < StageRunning {
|
||||||
return
|
return
|
||||||
@@ -134,11 +140,13 @@ func (w *Window) Draw(root *ui.Ops) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
w.gpu.Draw(w.Profiling, size, root)
|
||||||
|
w.router.Frame(root)
|
||||||
|
w.SetTextInput(w.router.InputState())
|
||||||
w.reader.Reset(root)
|
w.reader.Reset(root)
|
||||||
redrawTime, redraw := collectRedraws(&w.reader)
|
redrawTime, redraw := collectRedraws(&w.reader)
|
||||||
now := time.Now()
|
now := time.Now()
|
||||||
w.mu.Lock()
|
w.mu.Lock()
|
||||||
size := w.size
|
|
||||||
frameDur := now.Sub(w.lastFrame)
|
frameDur := now.Sub(w.lastFrame)
|
||||||
frameDur = frameDur.Truncate(100 * time.Microsecond)
|
frameDur = frameDur.Truncate(100 * time.Microsecond)
|
||||||
w.lastFrame = now
|
w.lastFrame = now
|
||||||
@@ -152,7 +160,6 @@ func (w *Window) Draw(root *ui.Ops) {
|
|||||||
}
|
}
|
||||||
w.updateAnimation()
|
w.updateAnimation()
|
||||||
w.mu.Unlock()
|
w.mu.Unlock()
|
||||||
w.gpu.Draw(w.Profiling, size, root)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func collectRedraws(r *ui.OpsReader) (time.Time, bool) {
|
func collectRedraws(r *ui.OpsReader) (time.Time, bool) {
|
||||||
@@ -235,6 +242,7 @@ func (w *Window) event(e Event) {
|
|||||||
needAck := false
|
needAck := false
|
||||||
switch e := e.(type) {
|
switch e := e.(type) {
|
||||||
case input.Event:
|
case input.Event:
|
||||||
|
w.router.Add(e)
|
||||||
w.setNextFrame(time.Time{})
|
w.setNextFrame(time.Time{})
|
||||||
case *CommandEvent:
|
case *CommandEvent:
|
||||||
needAck = true
|
needAck = true
|
||||||
|
|||||||
Reference in New Issue
Block a user