fixes #682 views/app uses deprecated PostEventWait

views/app.go

@@ -1,4 +1,4 @@
-// Copyright 2018 The Tcell Authors
+// Copyright 2024 The Tcell Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use file except in compliance with the License.
@@ -22,12 +22,15 @@ import (
 
 // Application represents an event-driven application running on a screen.
 type Application struct {
-	widget Widget
+	widget   Widget
-	screen tcell.Screen
+	screen   tcell.Screen
-	style  tcell.Style
+	style    tcell.Style
-	err    error
+	err      error
-	wg     sync.WaitGroup
+	wg       sync.WaitGroup
-	paste  bool
+	paste    bool
+	stopQ    chan struct{}
+	eventQ   chan tcell.Event
+	stopOnce sync.Once
 }
 
 // SetRootWidget sets the primary (root, main) Widget to be displayed.
@@ -56,30 +59,23 @@ func (app *Application) initialize() error {
 // Quit causes the application to shutdown gracefully.  It does not wait
 // for the application to exit, but returns immediately.
 func (app *Application) Quit() {
-	ev := &eventAppQuit{}
+	app.stopOnce.Do(func() { close(app.stopQ) })
-	ev.SetEventNow()
-	if scr := app.screen; scr != nil {
-		go func() { scr.PostEventWait(ev) }()
-	}
 }
 
 // Refresh causes the application forcibly redraw everything.  Use this
 // to clear up screen corruption, etc.
 func (app *Application) Refresh() {
-	ev := &eventAppRefresh{}
-	ev.SetEventNow()
 	if scr := app.screen; scr != nil {
-		go func() { scr.PostEventWait(ev) }()
+		scr.Sync()
 	}
 }
 
 // Update asks the application to draw any screen updates that have not
-// been drawn yet.
+// been drawn yet.  It is not necessary to call this from inside an
+// event handler, as a draw will be done implicitly after handling events.
 func (app *Application) Update() {
-	ev := &eventAppUpdate{}
-	ev.SetEventNow()
 	if scr := app.screen; scr != nil {
-		go func() { scr.PostEventWait(ev) }()
+		scr.Show()
 	}
 }
 
@@ -140,6 +136,10 @@ func (app *Application) run() {
 	screen.Clear()
 	widget.SetView(screen)
 
+	app.eventQ = make(chan tcell.Event, 16)
+	app.stopQ = make(chan struct{})
+	go screen.ChannelEvents(app.eventQ, app.stopQ)
+
 loop:
 	for {
 		if widget = app.widget; widget == nil {
@@ -148,14 +148,13 @@ loop:
 		widget.Draw()
 		screen.Show()
 
-		ev := screen.PollEvent()
+		ev := <-app.eventQ
-		switch nev := ev.(type) {
+		// ev := screen.PollEvent()
-		case *eventAppQuit:
+		if ev == nil {
+			screen.Fini()
 			break loop
-		case *eventAppUpdate:
+		}
-			screen.Show()
+		switch nev := ev.(type) {
-		case *eventAppRefresh:
-			screen.Sync()
 		case *eventAppFunc:
 			nev.fn()
 		case *tcell.EventResize:
@@ -188,18 +187,6 @@ func (app *Application) Run() error {
 	return app.Wait()
 }
 
-type eventAppUpdate struct {
-	tcell.EventTime
-}
-
-type eventAppQuit struct {
-	tcell.EventTime
-}
-
-type eventAppRefresh struct {
-	tcell.EventTime
-}
-
 type eventAppFunc struct {
 	tcell.EventTime
 	fn func()