joejulian/gio-patched
1
0
Fork 0
forked from joejulian/gio
Code Pull Requests 1 Activity

io/system,app: [API] move DestroyEvent, StageEvent, Stage to package app

Browse Source 
They're only useful at the top-level event loop in combination with an
app.Window.

Signed-off-by: Elias Naur <mail@eliasnaur.com>
This commit is contained in:
Elias Naur
2023-10-12 18:15:17 -05:00
parent d7636ea273
commit d2085ab7c5
9 changed files with 64 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/os_android.go
+10 -10
View File
@@ -158,7 +158,7 @@ type window struct {
fontScale float32
insets pixelInsets
stage system.Stage
stage Stage
started bool
animating bool
@@ -503,7 +503,7 @@ func Java_org_gioui_GioView_onCreateView(env *C.JNIEnv, class C.jclass, view C.j
w.loadConfig(env, class)
w.Configure(wopts.options)
w.SetInputHint(key.HintAny)
w.setStage(system.StagePaused)
w.setStage(StagePaused)
w.callbacks.Event(ViewEvent{View: uintptr(view)})
return C.jlong(w.handle)
}
@@ -518,7 +518,7 @@ func Java_org_gioui_GioView_onDestroyView(env *C.JNIEnv, class C.jclass, handle
func Java_org_gioui_GioView_onStopView(env *C.JNIEnv, class C.jclass, handle C.jlong) {
w := cgo.Handle(handle).Value().(*window)
w.started = false
w.setStage(system.StagePaused)
w.setStage(StagePaused)
}
//export Java_org_gioui_GioView_onStartView
@@ -534,7 +534,7 @@ func Java_org_gioui_GioView_onStartView(env *C.JNIEnv, class C.jclass, handle C.
func Java_org_gioui_GioView_onSurfaceDestroyed(env *C.JNIEnv, class C.jclass, handle C.jlong) {
w := cgo.Handle(handle).Value().(*window)
w.win = nil
w.setStage(system.StagePaused)
w.setStage(StagePaused)
}
//export Java_org_gioui_GioView_onSurfaceChanged
@@ -556,7 +556,7 @@ func Java_org_gioui_GioView_onLowMemory(env *C.JNIEnv, class C.jclass) {
func Java_org_gioui_GioView_onConfigurationChanged(env *C.JNIEnv, class C.jclass, view C.jlong) {
w := cgo.Handle(view).Value().(*window)
w.loadConfig(env, class)
if w.stage >= system.StageInactive {
if w.stage >= StageInactive {
w.draw(env, true)
}
}
@@ -567,7 +567,7 @@ func Java_org_gioui_GioView_onFrameCallback(env *C.JNIEnv, class C.jclass, view
if !exist {
return
}
if w.stage < system.StageInactive {
if w.stage < StageInactive {
return
}
if w.animating {
@@ -600,7 +600,7 @@ func Java_org_gioui_GioView_onWindowInsets(env *C.JNIEnv, class C.jclass, view C
left: int(left),
right: int(right),
}
if w.stage >= system.StageInactive {
if w.stage >= StageInactive {
w.draw(env, true)
}
}
@@ -779,16 +779,16 @@ func (w *window) setVisible(env *C.JNIEnv) {
if width == 0 || height == 0 {
return
}
w.setStage(system.StageRunning)
w.setStage(StageRunning)
w.draw(env, true)
}
func (w *window) setStage(stage system.Stage) {
func (w *window) setStage(stage Stage) {
if stage == w.stage {
return
}
w.stage = stage
w.callbacks.Event(system.StageEvent{stage})
w.callbacks.Event(StageEvent{stage})
}
func (w *window) setVisual(visID int) error {
app/os_ios.go
+4 -4
View File
@@ -131,7 +131,7 @@ func onCreate(view, controller C.CFTypeRef) {
w.w.SetDriver(w)
views[view] = w
w.Configure(wopts.options)
w.w.Event(system.StageEvent{Stage: system.StagePaused})
w.w.Event(StageEvent{Stage: StagePaused})
w.w.Event(ViewEvent{ViewController: uintptr(controller)})
}
@@ -149,7 +149,7 @@ func (w *window) draw(sync bool) {
wasVisible := w.visible
w.visible = true
if !wasVisible {
w.w.Event(system.StageEvent{Stage: system.StageRunning})
w.w.Event(StageEvent{Stage: StageRunning})
}
const inchPrDp = 1.0 / 163
m := unit.Metric{
@@ -180,7 +180,7 @@ func (w *window) draw(sync bool) {
func onStop(view C.CFTypeRef) {
w := views[view]
w.visible = false
w.w.Event(system.StageEvent{Stage: system.StagePaused})
w.w.Event(StageEvent{Stage: StagePaused})
}
//export onDestroy
@@ -188,7 +188,7 @@ func onDestroy(view C.CFTypeRef) {
w := views[view]
delete(views, view)
w.w.Event(ViewEvent{})
w.w.Event(system.DestroyEvent{})
w.w.Event(DestroyEvent{})
w.displayLink.Close()
w.view = 0
}
app/os_js.go
+4 -4
View File
@@ -120,7 +120,7 @@ func newWindow(win *callbacks, options []Option) error {
w.Configure(options)
w.blur()
w.w.Event(ViewEvent{Element: cont})
w.w.Event(system.StageEvent{Stage: system.StageRunning})
w.w.Event(StageEvent{Stage: StageRunning})
w.resize()
w.draw(true)
for {
@@ -213,12 +213,12 @@ func (w *window) addEventListeners() {
return w.browserHistory.Call("back")
})
w.addEventListener(w.document, "visibilitychange", func(this js.Value, args []js.Value) interface{} {
ev := system.StageEvent{}
ev := StageEvent{}
switch w.document.Get("visibilityState").String() {
case "hidden", "prerender", "unloaded":
ev.Stage = system.StagePaused
ev.Stage = StagePaused
default:
ev.Stage = system.StageRunning
ev.Stage = StageRunning
}
w.w.Event(ev)
return nil
app/os_macos.go
+12 -12
View File
@@ -249,7 +249,7 @@ type ViewEvent struct {
type window struct {
view C.CFTypeRef
w *callbacks
stage system.Stage
stage Stage
displayLink *displayLink
// redraw is a single entry channel for making sure only one
// display link redraw request is in flight.
@@ -488,12 +488,12 @@ func (w *window) runOnMain(f func()) {
})
}
func (w *window) setStage(stage system.Stage) {
func (w *window) setStage(stage Stage) {
if stage == w.stage {
return
}
w.stage = stage
w.w.Event(system.StageEvent{Stage: stage})
w.w.Event(StageEvent{Stage: stage})
}
//export gio_onKeys
@@ -583,11 +583,11 @@ func gio_onDraw(view C.CFTypeRef) {
func gio_onFocus(view C.CFTypeRef, focus C.int) {
w := mustView(view)
w.w.Event(key.FocusEvent{Focus: focus == 1})
if w.stage >= system.StageInactive {
if w.stage >= StageInactive {
if focus == 0 {
w.setStage(system.StageInactive)
w.setStage(StageInactive)
} else {
w.setStage(system.StageRunning)
w.setStage(StageRunning)
}
}
w.SetCursor(w.cursor)
@@ -782,7 +782,7 @@ func (w *window) draw() {
return
}
cfg := configFor(w.scale)
w.setStage(system.StageRunning)
w.setStage(StageRunning)
w.w.Event(frameEvent{
FrameEvent: FrameEvent{
Now: time.Now(),
@@ -804,7 +804,7 @@ func configFor(scale float32) unit.Metric {
func gio_onClose(view C.CFTypeRef) {
w := mustView(view)
w.w.Event(ViewEvent{})
w.w.Event(system.DestroyEvent{})
w.w.Event(DestroyEvent{})
w.displayLink.Close()
w.displayLink = nil
deleteView(view)
@@ -815,13 +815,13 @@ func gio_onClose(view C.CFTypeRef) {
//export gio_onHide
func gio_onHide(view C.CFTypeRef) {
w := mustView(view)
w.setStage(system.StagePaused)
w.setStage(StagePaused)
}
//export gio_onShow
func gio_onShow(view C.CFTypeRef) {
w := mustView(view)
w.setStage(system.StageRunning)
w.setStage(StageRunning)
}
//export gio_onFullscreen
@@ -841,14 +841,14 @@ func gio_onWindowed(view C.CFTypeRef) {
//export gio_onAppHide
func gio_onAppHide() {
for _, w := range viewMap {
w.setStage(system.StagePaused)
w.setStage(StagePaused)
}
}
//export gio_onAppShow
func gio_onAppShow() {
for _, w := range viewMap {
w.setStage(system.StageRunning)
w.setStage(StageRunning)
}
}
app/os_wayland.go
+7 -7
View File
@@ -194,7 +194,7 @@ type window struct {
dir f32.Point
}
stage system.Stage
stage Stage
dead bool
lastFrameCallback *C.struct_wl_callback
@@ -277,7 +277,7 @@ func newWLWindow(callbacks *callbacks, options []Option) error {
err := w.loop()
w.w.Event(WaylandViewEvent{})
w.w.Event(system.DestroyEvent{Err: err})
w.w.Event(DestroyEvent{Err: err})
}()
return nil
}
@@ -551,7 +551,7 @@ func gio_onXdgSurfaceConfigure(data unsafe.Pointer, wmSurf *C.struct_xdg_surface
w.serial = serial
w.redraw = true
C.xdg_surface_ack_configure(wmSurf, serial)
w.setStage(system.StageRunning)
w.setStage(StageRunning)
}
//export gio_onToplevelClose
@@ -1677,9 +1677,9 @@ func (w *window) updateOutputs() {
w.redraw = true
}
if !found {
w.setStage(system.StagePaused)
w.setStage(StagePaused)
} else {
w.setStage(system.StageRunning)
w.setStage(StageRunning)
w.redraw = true
}
}
@@ -1725,12 +1725,12 @@ func (w *window) draw() {
})
}
func (w *window) setStage(s system.Stage) {
func (w *window) setStage(s Stage) {
if s == w.stage {
return
}
w.stage = s
w.w.Event(system.StageEvent{Stage: s})
w.w.Event(StageEvent{Stage: s})
}
func (w *window) display() *C.struct_wl_display {
app/os_windows.go
+10 -10
View File
@@ -37,7 +37,7 @@ type window struct {
hwnd syscall.Handle
hdc syscall.Handle
w *callbacks
stage system.Stage
stage Stage
pointerBtns pointer.Buttons
// cursorIn tracks whether the cursor was inside the window according
@@ -269,11 +269,11 @@ func windowProc(hwnd syscall.Handle, msg uint32, wParam, lParam uintptr) uintptr
w.focused = false
w.w.Event(key.FocusEvent{Focus: false})
case windows.WM_NCACTIVATE:
if w.stage >= system.StageInactive {
if w.stage >= StageInactive {
if wParam == windows.TRUE {
w.setStage(system.StageRunning)
w.setStage(StageRunning)
} else {
w.setStage(system.StageInactive)
w.setStage(StageInactive)
}
}
case windows.WM_NCHITTEST:
@@ -302,7 +302,7 @@ func windowProc(hwnd syscall.Handle, msg uint32, wParam, lParam uintptr) uintptr
w.scrollEvent(wParam, lParam, true, getModifiers())
case windows.WM_DESTROY:
w.w.Event(ViewEvent{})
w.w.Event(system.DestroyEvent{})
w.w.Event(DestroyEvent{})
if w.hdc != 0 {
windows.ReleaseDC(w.hdc)
w.hdc = 0
@@ -339,15 +339,15 @@ func windowProc(hwnd syscall.Handle, msg uint32, wParam, lParam uintptr) uintptr
switch wParam {
case windows.SIZE_MINIMIZED:
w.config.Mode = Minimized
w.setStage(system.StagePaused)
w.setStage(StagePaused)
case windows.SIZE_MAXIMIZED:
w.config.Mode = Maximized
w.setStage(system.StageRunning)
w.setStage(StageRunning)
case windows.SIZE_RESTORED:
if w.config.Mode != Fullscreen {
w.config.Mode = Windowed
}
w.setStage(system.StageRunning)
w.setStage(StageRunning)
}
case windows.WM_GETMINMAXINFO:
mm := (*windows.MinMaxInfo)(unsafe.Pointer(uintptr(lParam)))
@@ -608,10 +608,10 @@ func (w *window) Wakeup() {
}
}
func (w *window) setStage(s system.Stage) {
func (w *window) setStage(s Stage) {
if s != w.stage {
w.stage = s
w.w.Event(system.StageEvent{Stage: s})
w.w.Event(StageEvent{Stage: s})
}
}
app/os_x11.go
+5 -5
View File
@@ -93,7 +93,7 @@ type x11Window struct {
// _NET_WM_STATE_MAXIMIZED_VERT
wmStateMaximizedVert C.Atom
}
stage system.Stage
stage Stage
metric unit.Metric
notify struct {
read, write int
@@ -395,12 +395,12 @@ func (w *x11Window) window() (C.Window, int, int) {
return w.xw, w.config.Size.X, w.config.Size.Y
}
func (w *x11Window) setStage(s system.Stage) {
func (w *x11Window) setStage(s Stage) {
if s == w.stage {
return
}
w.stage = s
w.w.Event(system.StageEvent{Stage: s})
w.w.Event(StageEvent{Stage: s})
}
func (w *x11Window) loop() {
@@ -837,10 +837,10 @@ func newX11Window(gioWin *callbacks, options []Option) error {
C.XMapWindow(dpy, win)
w.Configure(options)
w.w.Event(X11ViewEvent{Display: unsafe.Pointer(dpy), Window: uintptr(win)})
w.setStage(system.StageRunning)
w.setStage(StageRunning)
w.loop()
w.w.Event(X11ViewEvent{})
w.w.Event(system.DestroyEvent{Err: nil})
w.w.Event(DestroyEvent{Err: nil})
w.destroy()
}()
return nil
io/system/system.go → app/system.go
+1 -3
View File
@@ -1,8 +1,6 @@
// SPDX-License-Identifier: Unlicense OR MIT
// Package system contains events usually handled at the top-level
// program level.
package system
package app
// DestroyEvent is the last event sent through
// a window event channel.
app/window.go
+11 -11
View File
@@ -67,7 +67,7 @@ type Window struct {
frameAck chan struct{}
destroy chan struct{}
stage system.Stage
stage Stage
animating bool
hasNextFrame bool
nextFrame time.Time
@@ -374,8 +374,8 @@ func (w *Window) Option(opts ...Option) {
// Run f in the same thread as the native window event loop, and wait for f to
// return or the window to close. Run is guaranteed not to deadlock if it is
// invoked during the handling of a ViewEvent, system.FrameEvent,
// system.StageEvent; call Run in a separate goroutine to avoid deadlock in all
// invoked during the handling of a ViewEvent, FrameEvent,
// StageEvent; call Run in a separate goroutine to avoid deadlock in all
// other cases.
//
// Note that most programs should not call Run; configuring a Window with
@@ -404,7 +404,7 @@ func (w *Window) driverDefer(f func(d driver)) {
func (w *Window) updateAnimation(d driver) {
animate := false
if w.stage >= system.StageInactive && w.hasNextFrame {
if w.stage >= StageInactive && w.hasNextFrame {
if dt := time.Until(w.nextFrame); dt <= 0 {
animate = true
} else {
@@ -801,8 +801,8 @@ func (w *Window) processEvent(d driver, e event.Event) bool {
default:
}
switch e2 := e.(type) {
case system.StageEvent:
if e2.Stage < system.StageInactive {
case StageEvent:
if e2.Stage < StageInactive {
if w.gpu != nil {
w.ctx.Lock()
w.gpu.Release()
@@ -818,7 +818,7 @@ func (w *Window) processEvent(d driver, e event.Event) bool {
if e2.Size == (image.Point{}) {
panic(errors.New("internal error: zero-sized Draw"))
}
if w.stage < system.StageInactive {
if w.stage < StageInactive {
// No drawing if not visible.
break
}
@@ -862,13 +862,13 @@ func (w *Window) processEvent(d driver, e event.Event) bool {
deco.Add(wrapper)
if err := w.validateAndProcess(d, viewSize, e2.Sync, wrapper, signal); err != nil {
w.destroyGPU()
w.out <- system.DestroyEvent{Err: err}
w.out <- DestroyEvent{Err: err}
close(w.destroy)
break
}
w.processFrame(d)
w.updateCursor(d)
case system.DestroyEvent:
case DestroyEvent:
w.destroyGPU()
w.out <- e2
close(w.destroy)
@@ -920,7 +920,7 @@ func (w *Window) processEvent(d driver, e event.Event) bool {
}
// NextEvent blocks until an event is received from the window, such as
// [io/system.FrameEvent]. It blocks forever if called after [io/system.DestroyEvent]
// [FrameEvent]. It blocks forever if called after [DestroyEvent]
// has been returned.
func (w *Window) NextEvent() event.Event {
state := &w.eventState
@@ -928,7 +928,7 @@ func (w *Window) NextEvent() event.Event {
state.created = true
if err := newWindow(&w.callbacks, state.initialOpts); err != nil {
close(w.destroy)
return system.DestroyEvent{Err: err}
return DestroyEvent{Err: err}
}
}
for {