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

layout,io/input: move disabling events from layout.Context to input.Source

Browse Source 
The fix for #605 moved the disabling of event delivery from Source
to Context to enable disabled Contexts to still react to commands
(invalidate, focus etc.). However, that change in turn caused #641 where
the exported Context.Source field would no longer know not to deliver
events.

This change partially reverts the fix for #605 by moving disabledness
back to Source, fixing #641. Disabled Sources are left capable of
executing commands, thus keeping #605 fixed.

Thanks to Chris et al for keeping the use-cases straight enough for me
to come up with this (hopefully final) fix.

Signed-off-by: Elias Naur <mail@eliasnaur.com>
Fixes: https://todo.sr.ht/~eliasnaur/gio/641
References: https://todo.sr.ht/~eliasnaur/gio/605
This commit is contained in:
Elias Naur
2025-03-24 08:45:51 +01:00
parent 72a72a2bc2
commit fff2375470
2 changed files with 18 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
io/input/router.go
+17 -8
View File
@@ -62,7 +62,8 @@ type Router struct {
// Source implements the interface between a Router and user interface widgets.
// The zero-value Source is disabled.
type Source struct {
r *Router
r *Router
disabled bool
}
// Command represents a request such as moving the focus, or initiating a clipboard read.
@@ -171,30 +172,38 @@ func (q *Router) Source() Source {
// Execute a command.
func (s Source) Execute(c Command) {
if !s.enabled() {
if !s.Enabled() {
return
}
s.r.execute(c)
}
// enabled reports whether the source is enabled. Only enabled
// Sources deliver events and respond to commands.
func (s Source) enabled() bool {
return s.r != nil
// Disabled returns a copy of this source that don't deliver any events.
func (s Source) Disabled() Source {
s2 := s
s2.disabled = true
return s2
}
// Enabled reports whether the source is enabled. Only enabled
// Sources deliver events.
func (s Source) Enabled() bool {
return s.r != nil && !s.disabled
}
// Focused reports whether tag is focused, according to the most recent
// [key.FocusEvent] delivered.
func (s Source) Focused(tag event.Tag) bool {
if !s.enabled() {
if !s.Enabled() {
return false
}
return s.r.state().keyState.focus == tag
}
// Event returns the next event that matches at least one of filters.
// If the source is disabled, no events will be reported.
func (s Source) Event(filters ...event.Filter) (event.Event, bool) {
if !s.enabled() {
if !s.Enabled() {
return nil, false
}
return s.r.Event(filters...)