joejulian/gio
1
0
Fork 1
mirror of https://git.sr.ht/~eliasnaur/gio synced 2026-07-04 08:55:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

ui/app: return a concrete Queue from Window.Queue

Browse Source 
Signed-off-by: Elias Naur <mail@eliasnaur.com>
This commit is contained in:
Elias Naur
2019-07-20 14:20:59 +02:00
parent 4a9b6f3007
commit 0b6e6c58dd
1 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ui/app/window.go
+21 -10
View File
@@ -41,7 +41,14 @@ type Window struct {
nextFrame time.Time nextFrame time.Time
delayedDraw *time.Timer delayedDraw *time.Timer
router iinput.Router queue Queue
}
// Queue is an input.Queue implementation that distributes
// system input events to the input handlers declared through
// Draw.
type Queue struct {
q iinput.Router
} }
// driverEvent is sent when a new native driver // driverEvent is sent when a new native driver
@@ -106,8 +113,8 @@ func (w *Window) setTextInput(s key.TextInputState) {
w.inputState = s w.inputState = s
} }
func (w *Window) Queue() input.Queue { func (w *Window) Queue() *Queue {
return &w.router return &w.queue
} }
func (w *Window) Draw(frame *ui.Ops) { func (w *Window) Draw(frame *ui.Ops) {
@@ -120,20 +127,20 @@ func (w *Window) draw(size image.Point, frame *ui.Ops) {
drawDur = time.Since(w.drawStart) drawDur = time.Since(w.drawStart)
w.drawStart = time.Time{} w.drawStart = time.Time{}
} }
w.gpu.Draw(w.router.Profiling(), size, frame) w.gpu.Draw(w.queue.q.Profiling(), size, frame)
w.router.Frame(frame) w.queue.q.Frame(frame)
now := time.Now() now := time.Now()
w.setTextInput(w.router.InputState()) w.setTextInput(w.queue.q.InputState())
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
if w.router.Profiling() { if w.queue.q.Profiling() {
q := 100 * time.Microsecond q := 100 * time.Microsecond
timings := fmt.Sprintf("tot:%7s cpu:%7s %s", frameDur.Round(q), drawDur.Round(q), w.gpu.Timings()) timings := fmt.Sprintf("tot:%7s cpu:%7s %s", frameDur.Round(q), drawDur.Round(q), w.gpu.Timings())
w.router.AddProfile(system.ProfileEvent{Timings: timings}) w.queue.q.AddProfile(system.ProfileEvent{Timings: timings})
w.setNextFrame(time.Time{}) w.setNextFrame(time.Time{})
} }
if t, ok := w.router.WakeupTime(); ok { if t, ok := w.queue.q.WakeupTime(); ok {
w.setNextFrame(t) w.setNextFrame(t)
} }
w.updateAnimation() w.updateAnimation()
@@ -285,7 +292,7 @@ func (w *Window) run(opts *WindowOptions) {
w.out <- e w.out <- e
w.waitAck() w.waitAck()
case input.Event: case input.Event:
if w.router.Add(e2) { if w.queue.q.Add(e2) {
w.setNextFrame(time.Time{}) w.setNextFrame(time.Time{})
w.updateAnimation() w.updateAnimation()
} }
@@ -302,4 +309,8 @@ func (w *Window) run(opts *WindowOptions) {
} }
} }
func (q *Queue) Events(k input.Key) []input.Event {
return q.q.Events(k)
}
func (_ driverEvent) ImplementsEvent() {} func (_ driverEvent) ImplementsEvent() {}