From 77faf190d8ba16f017a929621ee1e9dd0cf73440 Mon Sep 17 00:00:00 2001 From: Andy Williams Date: Tue, 21 Jan 2025 10:15:21 +0000 Subject: [PATCH 01/22] Add option to use FyshOS screen saver Make it the default. And include it in the embedded mode too. --- desk.go | 3 ++ go.mod | 1 + go.sum | 2 + internal/ui/desk.go | 88 +++++++++++++++++++++++++++------- internal/ui/embed_wm.go | 63 +++++++++++++++++++++++- internal/ui/menu.go | 8 ++-- internal/ui/settings.go | 43 +++++++++++++++++ internal/ui/settings_ui.go | 19 +++++++- internal/x11/wm/desk.go | 7 ++- internal/x11/wm/screensaver.go | 62 ++++++++++++++++++++++++ settings.go | 3 ++ test/desktop.go | 4 ++ test/settings.go | 15 +++++- wm.go | 4 ++ 14 files changed, 295 insertions(+), 27 deletions(-) create mode 100644 internal/x11/wm/screensaver.go diff --git a/desk.go b/desk.go index 900b00a0..2e89b2c7 100644 --- a/desk.go +++ b/desk.go @@ -25,6 +25,9 @@ type Desktop interface { Desktop() int SetDesktop(int) + + DelayScreensaver() + TriggerScreensaver(bool) } var instance Desktop diff --git a/go.mod b/go.mod index dda53a64..a1ce6819 100644 --- a/go.mod +++ b/go.mod @@ -8,6 +8,7 @@ require ( github.com/BurntSushi/xgbutil v0.0.0-20160919175755-f7c97cef3b4e github.com/FyshOS/appie v0.0.0-20250103204932-22db4d5f2ac4 github.com/FyshOS/backgrounds v0.0.0-20230616202904-0a8b6ebaa184 + github.com/FyshOS/saver v0.0.0-20250121095006-5664671ee7e6 github.com/Knetic/govaluate v3.0.0+incompatible github.com/disintegration/imaging v1.6.2 github.com/godbus/dbus/v5 v5.1.0 diff --git a/go.sum b/go.sum index 5be5855f..986a4c6f 100644 --- a/go.sum +++ b/go.sum @@ -59,6 +59,8 @@ github.com/FyshOS/appie v0.0.0-20250103204932-22db4d5f2ac4 h1:lVFM6baY1PmVRonsFc github.com/FyshOS/appie v0.0.0-20250103204932-22db4d5f2ac4/go.mod h1:Gtvb1fKDXbE9HjMtoYdB2MPSSGy6PdtMl0TC9dSF8q0= github.com/FyshOS/backgrounds v0.0.0-20230616202904-0a8b6ebaa184 h1:Za0NHFsT0CCXf/X4hEaywjvEECccrM/xVVL8BzAy6JI= github.com/FyshOS/backgrounds v0.0.0-20230616202904-0a8b6ebaa184/go.mod h1:cOUmJ3HUVmH3W3u9Gj5hM73ZgrDxGNHKMr5T/sBKqLU= +github.com/FyshOS/saver v0.0.0-20250121095006-5664671ee7e6 h1:jxlIwF6vRAmpFfQ3yMvgzz1St7EATnAe4NRELD/WgCM= +github.com/FyshOS/saver v0.0.0-20250121095006-5664671ee7e6/go.mod h1:yIuAuYqnEyKaiNU4MD4xmyLcZl9QdDr2uTmT7lt02tI= github.com/Knetic/govaluate v3.0.0+incompatible h1:7o6+MAPhYTCF0+fdvoz1xDedhRb4f6s9Tn1Tt7/WTEg= github.com/Knetic/govaluate v3.0.0+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= diff --git a/internal/ui/desk.go b/internal/ui/desk.go index dcc8d3af..77e84a0f 100644 --- a/internal/ui/desk.go +++ b/internal/ui/desk.go @@ -4,14 +4,18 @@ import ( "math" "os/exec" "strconv" + "time" "fyshos.com/fynedesk/internal/notify" "github.com/FyshOS/appie" + "github.com/FyshOS/saver" "fyne.io/fyne/v2" "fyne.io/fyne/v2/canvas" "fyne.io/fyne/v2/container" deskDriver "fyne.io/fyne/v2/driver/desktop" + "fyne.io/fyne/v2/theme" + "fyne.io/fyne/v2/widget" "fyshos.com/fynedesk" wmtheme "fyshos.com/fynedesk/theme" @@ -115,7 +119,12 @@ func (l *desktop) ShowMenuAt(menu *fyne.Menu, pos fyne.Position) { } func (l *desktop) updateBackgrounds(path string) { - l.root.Content().(*fyne.Container).Objects[0].(*background).updateBackground(path) + root := l.root.Content().(*fyne.Container).Objects[0] + if back, ok := root.(*background); ok { + back.updateBackground(path) + } else { // embed mode has another container + root.(*fyne.Container).Objects[0].(*background).updateBackground(path) + } } func (l *desktop) createPrimaryContent() fyne.CanvasObject { @@ -150,6 +159,7 @@ func (l *desktop) RecentApps() []appie.AppData { func (l *desktop) Run() { go l.wm.Run() + go l.watchScreenActivity() l.run() // use the configured run method } @@ -353,7 +363,9 @@ func (l *desktop) registerShortcuts() { l.AddShortcut(fynedesk.NewShortcut("Calculator", fynedesk.KeyCalculator, 0), l.calculator) l.AddShortcut(fynedesk.NewShortcut("Lock screen", fyne.KeyL, fynedesk.UserModifier), - l.lockScreen) + func() { + l.TriggerScreensaver(true) + }) } func (l *desktop) startXscreensaver() { @@ -368,6 +380,44 @@ func (l *desktop) startXscreensaver() { } } +func (l *desktop) TriggerScreensaver(lock bool) { + s := saver.NewScreenSaver(nil) + s.ClockFormat = l.settings.ClockFormatting() + if l.settings.ScreenSaverClock() { + s.Label = "(clock)" + } else { + s.Label = l.settings.ScreenSaverLabel() + } + s.Lock = lock + + l.wm.ShowScreensaver(s) +} + +var lastActivity time.Time + +func (l *desktop) DelayScreensaver() { + lastActivity = time.Now() +} + +var idle bool + +func (l *desktop) watchScreenActivity() { + to := time.NewTicker(5 * time.Second) + + for range to.C { + if lastActivity.Add(time.Minute * 5).Before(time.Now()) { + + if !idle { + idle = true + + l.TriggerScreensaver(false) + } + } else { + idle = false + } + } +} + // Screens returns the screens provider of the current desktop environment for access to screen functionality. func (l *desktop) Screens() fynedesk.ScreenList { return l.screens @@ -384,7 +434,9 @@ func NewDesktop(app fyne.App, mgr fynedesk.WindowManager, icons appie.Provider, desk.setupRoot() wm.StartAuthAgent() - go desk.startXscreensaver() + if desk.Settings().ScreenSaverType() == "XScreensaver" { + go desk.startXscreensaver() + } return desk } @@ -398,7 +450,8 @@ func NewEmbeddedDesktop(app fyne.App, icons appie.Provider) fynedesk.Desktop { desk.showMenu = desk.showMenuEmbed desk.root = desk.newDesktopWindowEmbed() - desk.root.SetContent(desk.createPrimaryContent()) + over := wm.setWindow(desk.root) + desk.root.SetContent(container.NewStack(desk.createPrimaryContent(), over)) return desk } @@ -421,16 +474,17 @@ func (l *desktop) calculator() { } } -func (l *desktop) lockScreen() { - _, err := exec.LookPath("xscreensaver-command") - if err != nil { - fyne.LogError("xscreensaver-command not found", err) - l.WindowManager().Blank() - return - } - err = exec.Command("xscreensaver-command", "-lock").Start() - if err != nil { - fyne.LogError("Failed to lock screen", err) - l.WindowManager().Blank() - } -} +//func (l *desktop) runCommand() { +// w := l.app.NewWindow("Run Command") +// input := widget.NewEntry() +// // TODO add history etc... +// run := widget.NewButton("Run", func() { +// +// }) +// run.Importance = widget.HighImportance +// +// w.SetContent(container.NewVBox(widget.NewLabel("Enter command to run:"), +// container.NewBorder(nil, nil, nil, run, input))) +// w.Resize(fyne.NewSize(250, 40)) +// w.Show() +//} diff --git a/internal/ui/embed_wm.go b/internal/ui/embed_wm.go index 3761a6aa..1f38acc5 100644 --- a/internal/ui/embed_wm.go +++ b/internal/ui/embed_wm.go @@ -2,14 +2,21 @@ package ui import ( "image" - - "fyne.io/fyne/v2" + "image/color" "fyshos.com/fynedesk" + "github.com/FyshOS/saver" + + "fyne.io/fyne/v2" + "fyne.io/fyne/v2/canvas" + "fyne.io/fyne/v2/container" + deskDriver "fyne.io/fyne/v2/driver/desktop" + "fyne.io/fyne/v2/widget" ) type embededWM struct { windows []fynedesk.Window + root fyne.Window } func (e *embededWM) AddWindow(win fynedesk.Window) { @@ -79,3 +86,55 @@ func (e *embededWM) Close() { windows[0].Close() // ensure our root is asked to close as well } } + +var visible bool + +func (e *embededWM) ShowScreensaver(s *saver.ScreenSaver) { + if visible { + return + } + + visible = true + over := container.NewStack(canvas.NewRectangle(color.Black)) + + s.OnUnlocked = func() { + visible = false + e.root.Canvas().Overlays().Remove(over) + } + + over.Add(s.MakeUI(e.root)) + over.Resize(e.root.Canvas().Size()) + e.root.Canvas().Overlays().Add(over) +} + +func (e *embededWM) setWindow(win fyne.Window) fyne.CanvasObject { + e.root = win + + return newSaverMonitor(fynedesk.Instance().DelayScreensaver) +} + +type saverMonitor struct { + widget.BaseWidget + + cb func() +} + +func newSaverMonitor(cb func()) fyne.CanvasObject { + s := &saverMonitor{cb: cb} + s.ExtendBaseWidget(s) + return s +} + +func (s *saverMonitor) CreateRenderer() fyne.WidgetRenderer { + return widget.NewSimpleRenderer(canvas.NewRectangle(color.Transparent)) +} + +func (s *saverMonitor) MouseIn(*deskDriver.MouseEvent) { +} + +func (s *saverMonitor) MouseMoved(*deskDriver.MouseEvent) { + s.cb() +} + +func (s *saverMonitor) MouseOut() { +} diff --git a/internal/ui/menu.go b/internal/ui/menu.go index fe75ed12..c7089022 100644 --- a/internal/ui/menu.go +++ b/internal/ui/menu.go @@ -109,11 +109,11 @@ func (w *widgetPanel) showAccountMenu(_ fyne.CanvasObject) { w2.Close() }}} isEmbed := w.desk.(*desktop).root.Title() != RootWindowName + items1 = append(items1, &widget.Button{Icon: wmtheme.LockIcon, Importance: widget.LowImportance, OnTapped: func() { + w2.Close() + w.desk.TriggerScreensaver(true) + }}) if !isEmbed { - items1 = append(items1, &widget.Button{Icon: wmtheme.LockIcon, Importance: widget.LowImportance, OnTapped: func() { - w2.Close() - w.desk.(*desktop).lockScreen() - }}) if os.Getenv("FYNE_DESK_RUNNER") != "" { items1 = append(items1, &widget.Button{Icon: theme.ViewRefreshIcon(), Importance: widget.LowImportance, OnTapped: func() { os.Exit(5) diff --git a/internal/ui/settings.go b/internal/ui/settings.go index 590a936d..13829919 100644 --- a/internal/ui/settings.go +++ b/internal/ui/settings.go @@ -2,6 +2,7 @@ package ui import ( "os" + "os/exec" "runtime" "strings" "sync" @@ -27,6 +28,8 @@ type deskSettings struct { moduleNames []string narrowPanel, narrowLeftLauncher bool + screenSaverClock bool + screenSaver, screenSaverLabel string listenerLock sync.Mutex changeListeners []chan fynedesk.DeskSettings @@ -76,6 +79,18 @@ func (d *deskSettings) NarrowLeftLauncher() bool { return d.narrowLeftLauncher } +func (d *deskSettings) ScreenSaverClock() bool { + return d.screenSaverClock +} + +func (d *deskSettings) ScreenSaverType() string { + return d.screenSaver +} + +func (d *deskSettings) ScreenSaverLabel() string { + return d.screenSaverLabel +} + func (d *deskSettings) BorderButtonPosition() string { return d.borderButtonPosition } @@ -182,6 +197,31 @@ func (d *deskSettings) setNarrowWidgetPanel(narrow bool) { d.apply() } +func (d *deskSettings) setScreenSaver(saver string) { + oldSaver := d.screenSaver + d.screenSaver = saver + + fyne.CurrentApp().Preferences().SetString("savertype", saver) + + if oldSaver == "XScreensaver" && saver != "XScreensaver" { + cmd := exec.Command("xscreensaver-command", "-exit") + _ = cmd.Start() + } else if oldSaver != "XScreensaver" && saver == "XScreensaver" { + cmd := exec.Command("xscreensaver", "--no-splash") + _ = cmd.Start() + } +} + +func (d *deskSettings) setScreenSaverClock(show bool) { + d.screenSaverClock = show + fyne.CurrentApp().Preferences().SetBool("saverclock", show) +} + +func (d *deskSettings) setScreenSaverLabel(text string) { + d.screenSaverLabel = text + fyne.CurrentApp().Preferences().SetString("saverlabel", text) +} + func (d *deskSettings) setBorderButtonPosition(pos string) { d.borderButtonPosition = pos fyne.CurrentApp().Preferences().SetString("borderbuttonposition", d.borderButtonPosition) @@ -249,6 +289,9 @@ func (d *deskSettings) load() { d.narrowPanel = fyne.CurrentApp().Preferences().BoolWithFallback("narrowpanel", true) d.borderButtonPosition = fyne.CurrentApp().Preferences().StringWithFallback("borderbuttonposition", "Left") + d.screenSaver = fyne.CurrentApp().Preferences().StringWithFallback("savertype", "FyshOS") + d.screenSaverClock = fyne.CurrentApp().Preferences().BoolWithFallback("saverclock", true) + d.screenSaverLabel = fyne.CurrentApp().Preferences().StringWithFallback("saverlabel", "FyneDesk") d.clockFormatting = fyne.CurrentApp().Preferences().StringWithFallback("clockformatting", "12h") d.loadRecents() diff --git a/internal/ui/settings_ui.go b/internal/ui/settings_ui.go index 276f4df6..d47f68d3 100644 --- a/internal/ui/settings_ui.go +++ b/internal/ui/settings_ui.go @@ -111,6 +111,14 @@ func (d *settingsUI) loadAppearanceScreen() fyne.CanvasObject { borderButton := &widget.Select{Options: []string{"Left", "Right"}} borderButton.SetSelected(d.settings.BorderButtonPosition()) + saverLabel := widget.NewLabelWithStyle("Screensaver", fyne.TextAlignCenter, fyne.TextStyle{Bold: true}) + saverType := &widget.RadioGroup{Options: []string{"FyshOS", "XScreensaver"}, Required: true, Horizontal: true} + saverType.SetSelected(d.settings.ScreenSaverType()) + saverText := widget.NewEntry() + saverText.SetText(d.settings.ScreenSaverLabel()) + saverClock := widget.NewCheck("Clock", nil) + saverClock.Checked = d.settings.ScreenSaverClock() + themeLabel := widget.NewLabel(d.settings.IconTheme()) themeIcons := container.NewHBox() d.populateThemeIcons(themeIcons, d.settings.IconTheme()) @@ -129,7 +137,9 @@ func (d *settingsUI) loadAppearanceScreen() fyne.CanvasObject { lay := container.NewBorder(nil, nil, layoutLabel, container.NewGridWithColumns(2, narrowBar, narrowWidget)) border := container.NewBorder(nil, nil, borderButtonLabel, borderButton) - top := container.NewVBox(bg, time, lay, border) + saver := container.NewBorder(nil, nil, container.NewVBox(saverLabel, widget.NewLabel("")), + container.NewVBox(saverType, container.NewBorder(nil, nil, saverClock, nil, saverText))) + top := container.NewVBox(bg, time, lay, border, saver) themeFormLabel := widget.NewLabelWithStyle("Icon Theme", fyne.TextAlignCenter, fyne.TextStyle{Bold: true}) themeCurrent := container.NewHBox(layout.NewSpacer(), themeLabel, themeIcons) @@ -143,6 +153,9 @@ func (d *settingsUI) loadAppearanceScreen() fyne.CanvasObject { d.settings.setBorderButtonPosition(borderButton.Selected) d.settings.setNarrowLeftLauncher(narrowBar.Checked) d.settings.setNarrowWidgetPanel(narrowWidget.Checked) + d.settings.setScreenSaver(saverType.Selected) + d.settings.setScreenSaverClock(saverClock.Checked) + d.settings.setScreenSaverLabel(saverText.Text) }}) return container.NewBorder(top, applyButton, nil, nil, bottom) @@ -401,7 +414,9 @@ func (d *settingsUI) loadThemeScreen() fyne.CanvasObject { fyne.LogError("Unable to list themes - missing?", err) } else { for _, l := range list { - themeList = append(themeList, l.Name()) + if false { // TODO with 1.21 } !slices.Contains(themeList, l.Name()) { + themeList = append(themeList, l.Name()) + } } } diff --git a/internal/x11/wm/desk.go b/internal/x11/wm/desk.go index 676b0992..b9aae914 100644 --- a/internal/x11/wm/desk.go +++ b/internal/x11/wm/desk.go @@ -15,6 +15,7 @@ import ( "github.com/BurntSushi/xgb" "github.com/BurntSushi/xgb/randr" + "github.com/BurntSushi/xgb/screensaver" "github.com/BurntSushi/xgb/xproto" "github.com/BurntSushi/xgbutil" "github.com/BurntSushi/xgbutil/ewmh" @@ -125,7 +126,8 @@ func NewX11WindowManager(a fyne.App) (fynedesk.WindowManager, error) { xproto.EventMaskButtonRelease | xproto.EventMaskKeyPress | xproto.EventMaskStructureNotify | - xproto.EventMaskSubstructureRedirect + xproto.EventMaskSubstructureRedirect | + screensaver.EventNotifyMask | screensaver.EventCycleMask if err := xproto.ChangeWindowAttributesChecked(conn.Conn(), root, xproto.CwEventMask, []uint32{uint32(eventMask)}).Check(); err != nil { conn.Conn().Close() @@ -163,6 +165,7 @@ func NewX11WindowManager(a fyne.App) (fynedesk.WindowManager, error) { } x11.LoadCursors(conn) + mgr.initScreensaver() listener := make(chan fyne.Settings) a.Settings().AddChangeListener(listener) @@ -456,6 +459,8 @@ func (x *x11WM) runLoop() { x.hideWindow(ev.Window) case xproto.VisibilityNotifyEvent: x.handleVisibilityChange(ev) + case screensaver.NotifyEvent: + // screensaver activate, except we manage it with an internal timer } } diff --git a/internal/x11/wm/screensaver.go b/internal/x11/wm/screensaver.go new file mode 100644 index 00000000..ad26f301 --- /dev/null +++ b/internal/x11/wm/screensaver.go @@ -0,0 +1,62 @@ +package wm + +import ( + "log" + "os/exec" + "time" + + "fyshos.com/fynedesk" + "github.com/BurntSushi/xgb/screensaver" + "github.com/BurntSushi/xgb/xproto" + "github.com/FyshOS/saver" +) + +func (x *x11WM) initScreensaver() { + err := screensaver.Init(x.x.Conn()) + log.Println("ERR", err) + + //screensaver.SelectInput(conn.Conn(), xproto.Drawable(conn.Screen().Root), + // screensaver.EventNotifyMask) + go x.watchScreensaver() +} + +func (x *x11WM) watchScreensaver() { + to := time.NewTicker(5 * time.Second) + + for range to.C { + info, err := screensaver.QueryInfo(x.x.Conn(), xproto.Drawable(x.x.Screen().Root)).Reply() + if err != nil { + log.Println("ERR", err) + continue + } + + if info.MsSinceUserInput <= 5500 { + fynedesk.Instance().DelayScreensaver() + } + } +} + +var visible bool + +func (x *x11WM) ShowScreensaver(s *saver.ScreenSaver) { + if fynedesk.Instance().Settings().ScreenSaverType() == "XScreensaver" { + task := "-activate" + if s.Lock { + task = "-lock" + } + cmd := exec.Command("xscreensaver-command", task) + cmd.Start() + return + } + + if visible { + return + } + + visible = true + s.OnUnlocked = func() { + visible = false + } + + s.ShowWindow() +} diff --git a/settings.go b/settings.go index 15a1d64b..35ecab27 100644 --- a/settings.go +++ b/settings.go @@ -19,6 +19,9 @@ type DeskSettings interface { KeyboardModifier() fyne.KeyModifier ModuleNames() []string + ScreenSaverType() string + ScreenSaverClock() bool + ScreenSaverLabel() string AddChangeListener(listener chan DeskSettings) } diff --git a/test/desktop.go b/test/desktop.go index 9e533e8c..4fb79bb1 100644 --- a/test/desktop.go +++ b/test/desktop.go @@ -120,3 +120,7 @@ func (td *Desktop) ShowMenuAt(menu *fyne.Menu, pos fyne.Position) { func (td *Desktop) WindowManager() fynedesk.WindowManager { return td.wm } + +func (td *Desktop) DelayScreensaver() {} + +func (td *Desktop) TriggerScreensaver(bool) {} diff --git a/test/settings.go b/test/settings.go index bac62761..9cb5b294 100644 --- a/test/settings.go +++ b/test/settings.go @@ -1,8 +1,9 @@ package test import ( - "fyne.io/fyne/v2" "fyshos.com/fynedesk" + + "fyne.io/fyne/v2" ) // Settings is a simple struct for managing settings within our tests @@ -157,6 +158,18 @@ func (s *Settings) ClockFormatting() string { return s.clockFormatting } +func (s *Settings) ScreenSaverClock() bool { + return true +} + +func (s *Settings) ScreenSaverLabel() string { + return "(clock)" +} + +func (s *Settings) ScreenSaverType() string { + return "FyshOS" +} + // SetClockFormatting support setting the format that the clock should display func (s *Settings) SetClockFormatting(format string) { if format == "24h" { diff --git a/wm.go b/wm.go index 47ad37e7..8169687a 100644 --- a/wm.go +++ b/wm.go @@ -3,6 +3,8 @@ package fynedesk import ( "image" + "github.com/FyshOS/saver" + "fyne.io/fyne/v2" ) @@ -18,6 +20,8 @@ type WindowManager interface { ShowOverlay(fyne.Window, fyne.Size, fyne.Position) ShowMenuOverlay(*fyne.Menu, fyne.Size, fyne.Position) ShowModal(fyne.Window, fyne.Size) + + ShowScreensaver(saver *saver.ScreenSaver) } // Stack describes an ordered list of windows. From e4e59c4443b9ce42c6f8f10e441228566ca70883 Mon Sep 17 00:00:00 2001 From: Andy Williams Date: Tue, 21 Jan 2025 10:53:17 +0000 Subject: [PATCH 02/22] Merge from develop --- go.mod | 4 ++-- go.sum | 8 ++++---- internal/ui/desk.go | 5 ++--- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/go.mod b/go.mod index a1ce6819..74645604 100644 --- a/go.mod +++ b/go.mod @@ -21,7 +21,7 @@ require ( github.com/BurntSushi/toml v1.4.0 // indirect github.com/fyne-io/image v0.0.0-20240417123036-dc0ee9e7c964 // indirect github.com/jackmordaunt/icns v1.0.1-0.20200413110149-9e181b441ab2 // indirect - github.com/jeandeaual/go-locale v0.0.0-20240223122105-ce5225dcaa49 // indirect + github.com/jeandeaual/go-locale v0.0.0-20241217141322-fcc2cadd6f08 // indirect github.com/nicksnyder/go-i18n/v2 v2.4.0 // indirect github.com/rymdport/portal v0.3.0 // indirect howett.net/plist v1.0.1 // indirect @@ -54,7 +54,7 @@ require ( golang.org/x/image v0.18.0 // indirect golang.org/x/mobile v0.0.0-20231127183840-76ac6878050a // indirect golang.org/x/net v0.25.0 // indirect - golang.org/x/sys v0.20.0 // indirect + golang.org/x/sys v0.27.0 // indirect golang.org/x/text v0.16.0 gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index 986a4c6f..62e21453 100644 --- a/go.sum +++ b/go.sum @@ -223,8 +223,8 @@ github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1: github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/jackmordaunt/icns v1.0.1-0.20200413110149-9e181b441ab2 h1:2bRhR5GcMudCdaY4p8ip89hsvSyxYehLSicCNtygyVY= github.com/jackmordaunt/icns v1.0.1-0.20200413110149-9e181b441ab2/go.mod h1:Hj3TV9xrdt+g9apvBagVi/VzE41gSliEBypxaQDq5QA= -github.com/jeandeaual/go-locale v0.0.0-20240223122105-ce5225dcaa49 h1:Po+wkNdMmN+Zj1tDsJQy7mJlPlwGNQd9JZoPjObagf8= -github.com/jeandeaual/go-locale v0.0.0-20240223122105-ce5225dcaa49/go.mod h1:YiutDnxPRLk5DLUFj6Rw4pRBBURZY07GFr54NdV9mQg= +github.com/jeandeaual/go-locale v0.0.0-20241217141322-fcc2cadd6f08 h1:wMeVzrPO3mfHIWLZtDcSaGAe2I4PW9B/P5nMkRSwCAc= +github.com/jeandeaual/go-locale v0.0.0-20241217141322-fcc2cadd6f08/go.mod h1:ZDXo8KHryOWSIqnsb/CiDq7hQUYryCgdVnxbj8tDG7o= github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= @@ -488,8 +488,8 @@ golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y= -golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.27.0 h1:wBqf8DvsY9Y/2P8gAfPDEYNuS30J4lPHJxXSb/nJZ+s= +golang.org/x/sys v0.27.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/internal/ui/desk.go b/internal/ui/desk.go index 77e84a0f..792b0f73 100644 --- a/internal/ui/desk.go +++ b/internal/ui/desk.go @@ -14,8 +14,6 @@ import ( "fyne.io/fyne/v2/canvas" "fyne.io/fyne/v2/container" deskDriver "fyne.io/fyne/v2/driver/desktop" - "fyne.io/fyne/v2/theme" - "fyne.io/fyne/v2/widget" "fyshos.com/fynedesk" wmtheme "fyshos.com/fynedesk/theme" @@ -445,7 +443,8 @@ func NewDesktop(app fyne.App, mgr fynedesk.WindowManager, icons appie.Provider, // If run during CI for testing it will return an in-memory window using the // fyne/test package. func NewEmbeddedDesktop(app fyne.App, icons appie.Provider) fynedesk.Desktop { - desk := newDesktop(app, &embededWM{}, icons) + wm := &embededWM{} + desk := newDesktop(app, wm, icons) desk.run = desk.runEmbed desk.showMenu = desk.showMenuEmbed From 3ce905aa58e3cac56988b6bb6fb8cfc6cd11302a Mon Sep 17 00:00:00 2001 From: Andy Williams Date: Sat, 25 Jan 2025 21:18:16 +0000 Subject: [PATCH 03/22] Refactor screensaver X11 code to new file --- internal/ui/desk.go | 52 --------------------------------- internal/ui/screensaver.go | 59 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+), 52 deletions(-) create mode 100644 internal/ui/screensaver.go diff --git a/internal/ui/desk.go b/internal/ui/desk.go index 792b0f73..46ba484a 100644 --- a/internal/ui/desk.go +++ b/internal/ui/desk.go @@ -4,11 +4,9 @@ import ( "math" "os/exec" "strconv" - "time" "fyshos.com/fynedesk/internal/notify" "github.com/FyshOS/appie" - "github.com/FyshOS/saver" "fyne.io/fyne/v2" "fyne.io/fyne/v2/canvas" @@ -366,56 +364,6 @@ func (l *desktop) registerShortcuts() { }) } -func (l *desktop) startXscreensaver() { - _, err := exec.LookPath("xscreensaver") - if err != nil { - fyne.LogError("xscreensaver command not found", err) - return - } - err = exec.Command("xscreensaver", "-no-splash").Start() - if err != nil { - fyne.LogError("Failed to lock screen", err) - } -} - -func (l *desktop) TriggerScreensaver(lock bool) { - s := saver.NewScreenSaver(nil) - s.ClockFormat = l.settings.ClockFormatting() - if l.settings.ScreenSaverClock() { - s.Label = "(clock)" - } else { - s.Label = l.settings.ScreenSaverLabel() - } - s.Lock = lock - - l.wm.ShowScreensaver(s) -} - -var lastActivity time.Time - -func (l *desktop) DelayScreensaver() { - lastActivity = time.Now() -} - -var idle bool - -func (l *desktop) watchScreenActivity() { - to := time.NewTicker(5 * time.Second) - - for range to.C { - if lastActivity.Add(time.Minute * 5).Before(time.Now()) { - - if !idle { - idle = true - - l.TriggerScreensaver(false) - } - } else { - idle = false - } - } -} - // Screens returns the screens provider of the current desktop environment for access to screen functionality. func (l *desktop) Screens() fynedesk.ScreenList { return l.screens diff --git a/internal/ui/screensaver.go b/internal/ui/screensaver.go new file mode 100644 index 00000000..863dfb28 --- /dev/null +++ b/internal/ui/screensaver.go @@ -0,0 +1,59 @@ +package ui + +import ( + "os/exec" + "time" + + "github.com/FyshOS/saver" + + "fyne.io/fyne/v2" +) + +func (l *desktop) startXscreensaver() { + _, err := exec.LookPath("xscreensaver") + if err != nil { + fyne.LogError("xscreensaver command not found", err) + return + } + err = exec.Command("xscreensaver", "-no-splash").Start() + if err != nil { + fyne.LogError("Failed to lock screen", err) + } +} + +func (l *desktop) TriggerScreensaver(lock bool) { + s := saver.NewScreenSaver(nil) + s.ClockFormat = l.settings.ClockFormatting() + if l.settings.ScreenSaverClock() { + s.Label = "(clock)" + } else { + s.Label = l.settings.ScreenSaverLabel() + } + s.Lock = lock + + go l.wm.ShowScreensaver(s) +} + +var lastActivity time.Time + +func (l *desktop) DelayScreensaver() { + lastActivity = time.Now() +} + +func (l *desktop) watchScreenActivity() { + idle := false + to := time.NewTicker(5 * time.Second) + + for range to.C { + if lastActivity.Add(time.Minute * 5).Before(time.Now()) { + + if !idle { + idle = true + + l.TriggerScreensaver(false) + } + } else { + idle = false + } + } +} From 0719c0ad9a0b1b9d7e71636c2ebc2023e00597c4 Mon Sep 17 00:00:00 2001 From: Andy Williams Date: Sat, 25 Jan 2025 21:20:09 +0000 Subject: [PATCH 04/22] Don't allow system keys when screensaver up --- internal/x11/wm/events.go | 8 ++++++++ internal/x11/wm/screensaver.go | 13 ++++++++----- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/internal/x11/wm/events.go b/internal/x11/wm/events.go index c600816e..3eb7d1e5 100644 --- a/internal/x11/wm/events.go +++ b/internal/x11/wm/events.go @@ -170,6 +170,10 @@ func (x *x11WM) handleInitialHints(ev xproto.ClientMessageEvent, hint string) { } func (x *x11WM) handleKeyPress(ev xproto.KeyPressEvent) { + if screenSaverActive { + return + } + userMod := ev.State&xproto.ModMask4 != 0 if fynedesk.Instance().Settings().KeyboardModifier() == fyne.KeyModifierAlt { userMod = ev.State&xproto.ModMask1 != 0 @@ -216,6 +220,10 @@ func (x *x11WM) handleKeyPress(ev xproto.KeyPressEvent) { } func (x *x11WM) handleKeyRelease(ev xproto.KeyReleaseEvent) { + if screenSaverActive { + return + } + userMod := keyCodeSuper if fynedesk.Instance().Settings().KeyboardModifier() == fyne.KeyModifierAlt { userMod = keyCodeAlt diff --git a/internal/x11/wm/screensaver.go b/internal/x11/wm/screensaver.go index ad26f301..a150ba1d 100644 --- a/internal/x11/wm/screensaver.go +++ b/internal/x11/wm/screensaver.go @@ -13,7 +13,10 @@ import ( func (x *x11WM) initScreensaver() { err := screensaver.Init(x.x.Conn()) - log.Println("ERR", err) + if err != nil { + log.Println("Failed to init screensaver extension") + return + } //screensaver.SelectInput(conn.Conn(), xproto.Drawable(conn.Screen().Root), // screensaver.EventNotifyMask) @@ -36,7 +39,7 @@ func (x *x11WM) watchScreensaver() { } } -var visible bool +var screenSaverActive bool func (x *x11WM) ShowScreensaver(s *saver.ScreenSaver) { if fynedesk.Instance().Settings().ScreenSaverType() == "XScreensaver" { @@ -49,13 +52,13 @@ func (x *x11WM) ShowScreensaver(s *saver.ScreenSaver) { return } - if visible { + if screenSaverActive { return } - visible = true + screenSaverActive = true s.OnUnlocked = func() { - visible = false + screenSaverActive = false } s.ShowWindow() From 1c6b1d2950163fc8b648a21d6def8c4e69a38cb6 Mon Sep 17 00:00:00 2001 From: Andy Williams Date: Sat, 25 Jan 2025 21:22:25 +0000 Subject: [PATCH 05/22] Latest saver library --- go.mod | 2 +- go.sum | 4 ++-- internal/ui/menu.go | 5 ++++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index d65905a3..3661d7cd 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,7 @@ require ( github.com/BurntSushi/xgbutil v0.0.0-20160919175755-f7c97cef3b4e github.com/FyshOS/appie v0.0.0-20250103211310-00f097d8e19d github.com/FyshOS/backgrounds v0.0.0-20230616202904-0a8b6ebaa184 - github.com/FyshOS/saver v0.0.0-20250121095006-5664671ee7e6 + github.com/FyshOS/saver v0.0.0-20250125211336-528339462781 github.com/Knetic/govaluate v3.0.0+incompatible github.com/disintegration/imaging v1.6.2 github.com/godbus/dbus/v5 v5.1.0 diff --git a/go.sum b/go.sum index 895c3af1..8d8d02e7 100644 --- a/go.sum +++ b/go.sum @@ -59,8 +59,8 @@ github.com/FyshOS/appie v0.0.0-20250103211310-00f097d8e19d h1:bkIQPpxGMalOufoLbL github.com/FyshOS/appie v0.0.0-20250103211310-00f097d8e19d/go.mod h1:Gtvb1fKDXbE9HjMtoYdB2MPSSGy6PdtMl0TC9dSF8q0= github.com/FyshOS/backgrounds v0.0.0-20230616202904-0a8b6ebaa184 h1:Za0NHFsT0CCXf/X4hEaywjvEECccrM/xVVL8BzAy6JI= github.com/FyshOS/backgrounds v0.0.0-20230616202904-0a8b6ebaa184/go.mod h1:cOUmJ3HUVmH3W3u9Gj5hM73ZgrDxGNHKMr5T/sBKqLU= -github.com/FyshOS/saver v0.0.0-20250121095006-5664671ee7e6 h1:jxlIwF6vRAmpFfQ3yMvgzz1St7EATnAe4NRELD/WgCM= -github.com/FyshOS/saver v0.0.0-20250121095006-5664671ee7e6/go.mod h1:yIuAuYqnEyKaiNU4MD4xmyLcZl9QdDr2uTmT7lt02tI= +github.com/FyshOS/saver v0.0.0-20250125211336-528339462781 h1:jGmHNeimIf4DDEe8jkoUNX9r10+qGtkUG+3PMpjGSEs= +github.com/FyshOS/saver v0.0.0-20250125211336-528339462781/go.mod h1:yIuAuYqnEyKaiNU4MD4xmyLcZl9QdDr2uTmT7lt02tI= github.com/Knetic/govaluate v3.0.0+incompatible h1:7o6+MAPhYTCF0+fdvoz1xDedhRb4f6s9Tn1Tt7/WTEg= github.com/Knetic/govaluate v3.0.0+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= diff --git a/internal/ui/menu.go b/internal/ui/menu.go index c7089022..f530b46e 100644 --- a/internal/ui/menu.go +++ b/internal/ui/menu.go @@ -111,7 +111,10 @@ func (w *widgetPanel) showAccountMenu(_ fyne.CanvasObject) { isEmbed := w.desk.(*desktop).root.Title() != RootWindowName items1 = append(items1, &widget.Button{Icon: wmtheme.LockIcon, Importance: widget.LowImportance, OnTapped: func() { w2.Close() - w.desk.TriggerScreensaver(true) + go func() { + time.Sleep(time.Millisecond * 300) + w.desk.TriggerScreensaver(true) + }() }}) if !isEmbed { if os.Getenv("FYNE_DESK_RUNNER") != "" { From f3484b0d8a7634ecd725805e52ce0a2bd10349a1 Mon Sep 17 00:00:00 2001 From: Andy Williams Date: Sat, 25 Jan 2025 21:36:41 +0000 Subject: [PATCH 06/22] Always lock --- desk.go | 2 +- internal/ui/desk.go | 2 +- internal/ui/menu.go | 2 +- internal/ui/screensaver.go | 6 +++--- test/desktop.go | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/desk.go b/desk.go index 2e89b2c7..64bf63d5 100644 --- a/desk.go +++ b/desk.go @@ -27,7 +27,7 @@ type Desktop interface { SetDesktop(int) DelayScreensaver() - TriggerScreensaver(bool) + TriggerScreensaver() } var instance Desktop diff --git a/internal/ui/desk.go b/internal/ui/desk.go index 46ba484a..49960324 100644 --- a/internal/ui/desk.go +++ b/internal/ui/desk.go @@ -360,7 +360,7 @@ func (l *desktop) registerShortcuts() { l.calculator) l.AddShortcut(fynedesk.NewShortcut("Lock screen", fyne.KeyL, fynedesk.UserModifier), func() { - l.TriggerScreensaver(true) + l.TriggerScreensaver() }) } diff --git a/internal/ui/menu.go b/internal/ui/menu.go index f530b46e..5b17b75e 100644 --- a/internal/ui/menu.go +++ b/internal/ui/menu.go @@ -113,7 +113,7 @@ func (w *widgetPanel) showAccountMenu(_ fyne.CanvasObject) { w2.Close() go func() { time.Sleep(time.Millisecond * 300) - w.desk.TriggerScreensaver(true) + w.desk.TriggerScreensaver() }() }}) if !isEmbed { diff --git a/internal/ui/screensaver.go b/internal/ui/screensaver.go index 863dfb28..fc640612 100644 --- a/internal/ui/screensaver.go +++ b/internal/ui/screensaver.go @@ -21,7 +21,7 @@ func (l *desktop) startXscreensaver() { } } -func (l *desktop) TriggerScreensaver(lock bool) { +func (l *desktop) TriggerScreensaver() { s := saver.NewScreenSaver(nil) s.ClockFormat = l.settings.ClockFormatting() if l.settings.ScreenSaverClock() { @@ -29,7 +29,7 @@ func (l *desktop) TriggerScreensaver(lock bool) { } else { s.Label = l.settings.ScreenSaverLabel() } - s.Lock = lock + s.Lock = true go l.wm.ShowScreensaver(s) } @@ -50,7 +50,7 @@ func (l *desktop) watchScreenActivity() { if !idle { idle = true - l.TriggerScreensaver(false) + l.TriggerScreensaver() } } else { idle = false diff --git a/test/desktop.go b/test/desktop.go index 4fb79bb1..9990286d 100644 --- a/test/desktop.go +++ b/test/desktop.go @@ -123,4 +123,4 @@ func (td *Desktop) WindowManager() fynedesk.WindowManager { func (td *Desktop) DelayScreensaver() {} -func (td *Desktop) TriggerScreensaver(bool) {} +func (td *Desktop) TriggerScreensaver() {} From db1b915dd2b78e3814aa05f31fd5786f84a46164 Mon Sep 17 00:00:00 2001 From: Andy Williams Date: Sat, 25 Jan 2025 21:39:43 +0000 Subject: [PATCH 07/22] Working CI --- .github/workflows/platform_tests.yml | 2 +- .github/workflows/static_analysis.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/platform_tests.yml b/.github/workflows/platform_tests.yml index 07102071..153f18f3 100644 --- a/.github/workflows/platform_tests.yml +++ b/.github/workflows/platform_tests.yml @@ -21,7 +21,7 @@ jobs: go-version: ${{ matrix.go-version }} - name: Get dependencies - run: sudo apt-get update && sudo apt-get install gcc libgl1-mesa-dev libegl1-mesa-dev libgles2-mesa-dev libx11-dev xorg-dev bc + run: sudo apt-get update && sudo apt-get install gcc libgl1-mesa-dev libegl1-mesa-dev libgles2-mesa-dev libx11-dev xorg-dev bc libpam-dev if: ${{ runner.os == 'Linux' }} - name: Tests diff --git a/.github/workflows/static_analysis.yml b/.github/workflows/static_analysis.yml index ba75b1c9..9e6e1816 100644 --- a/.github/workflows/static_analysis.yml +++ b/.github/workflows/static_analysis.yml @@ -16,7 +16,7 @@ jobs: - name: Get dependencies run: | - sudo apt-get update && sudo apt-get install gcc libgl1-mesa-dev libegl1-mesa-dev libgles2-mesa-dev libx11-dev xorg-dev + sudo apt-get update && sudo apt-get install gcc libgl1-mesa-dev libegl1-mesa-dev libgles2-mesa-dev libx11-dev xorg-dev libpam-dev go install golang.org/x/tools/cmd/goimports@latest go install github.com/fzipp/gocyclo/cmd/gocyclo@latest go install golang.org/x/lint/golint@latest From 2290787cdf31728cb2ebbf67a733ed1ef10ed0d4 Mon Sep 17 00:00:00 2001 From: Andy Williams Date: Sat, 25 Jan 2025 22:13:14 +0000 Subject: [PATCH 08/22] Reduce cyclo --- internal/x11/wm/desk.go | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/internal/x11/wm/desk.go b/internal/x11/wm/desk.go index b9aae914..dfbf78e6 100644 --- a/internal/x11/wm/desk.go +++ b/internal/x11/wm/desk.go @@ -424,9 +424,7 @@ func (x *x11WM) runLoop() { case xproto.ClientMessageEvent: x.handleClientMessage(ev) case xproto.ConfigureNotifyEvent: - if ev.Window == x.x.RootWin() { - x.configureRoots() - } + x.notifyConfigure(ev) case xproto.ConfigureRequestEvent: x.configureWindow(ev.Window, ev) case xproto.CreateNotifyEvent: @@ -523,6 +521,12 @@ func (x *x11WM) configureRoots() { go x.updateBackgrounds() } +func (x *x11WM) notifyConfigure(ev xproto.ConfigureNotifyEvent) { + if ev.Window == x.x.RootWin() { + x.configureRoots() + } +} + func (x *x11WM) configureWindow(win xproto.Window, ev xproto.ConfigureRequestEvent) { c := x.clientForWin(win) xcoord := ev.X From 13e3be5ef08db25bdaf4b446a9e2d6eb9cc36b2b Mon Sep 17 00:00:00 2001 From: Andy Williams Date: Sat, 25 Jan 2025 22:16:07 +0000 Subject: [PATCH 09/22] Fix test failure with overlay --- internal/ui/desk_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/ui/desk_test.go b/internal/ui/desk_test.go index dc372e84..9f87a694 100644 --- a/internal/ui/desk_test.go +++ b/internal/ui/desk_test.go @@ -66,7 +66,7 @@ func TestBackgroundChange(t *testing.T) { l.settings = wmTest.NewSettings() l.setupRoot() - bg := l.root.Content().(*fyne.Container).Objects[0].(*background) + bg := l.root.Content().(*fyne.Container).Objects[0].(*fyne.Container).Objects[0].(*background) workingDir, err := os.Getwd() if err != nil { From b2d6c595b88505d11dd918de96aeae7d14cb18cc Mon Sep 17 00:00:00 2001 From: Andy Williams Date: Sat, 25 Jan 2025 22:19:22 +0000 Subject: [PATCH 10/22] Fix header for macOS preview build --- internal/x11/wm/screensaver.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/internal/x11/wm/screensaver.go b/internal/x11/wm/screensaver.go index a150ba1d..7883bd1d 100644 --- a/internal/x11/wm/screensaver.go +++ b/internal/x11/wm/screensaver.go @@ -1,3 +1,6 @@ +//go:build linux || openbsd || freebsd || netbsd +// +build linux openbsd freebsd netbsd + package wm import ( From 403a6b33a7069bb745fe527084d21b6977c91ecf Mon Sep 17 00:00:00 2001 From: Andy Williams Date: Sun, 26 Jan 2025 19:06:18 +0000 Subject: [PATCH 11/22] Fix lint errors --- desk.go | 4 ++-- internal/ui/desk.go | 2 +- internal/ui/embed_wm.go | 2 +- internal/ui/menu.go | 2 +- internal/ui/screensaver.go | 6 +++--- internal/x11/wm/screensaver.go | 2 +- test/desktop.go | 6 ++++-- test/settings.go | 5 ++++- 8 files changed, 17 insertions(+), 12 deletions(-) diff --git a/desk.go b/desk.go index 64bf63d5..c04b8193 100644 --- a/desk.go +++ b/desk.go @@ -26,8 +26,8 @@ type Desktop interface { Desktop() int SetDesktop(int) - DelayScreensaver() - TriggerScreensaver() + DelayScreenSaver() + TriggerScreenSaver() } var instance Desktop diff --git a/internal/ui/desk.go b/internal/ui/desk.go index 49960324..40e50bfb 100644 --- a/internal/ui/desk.go +++ b/internal/ui/desk.go @@ -360,7 +360,7 @@ func (l *desktop) registerShortcuts() { l.calculator) l.AddShortcut(fynedesk.NewShortcut("Lock screen", fyne.KeyL, fynedesk.UserModifier), func() { - l.TriggerScreensaver() + l.TriggerScreenSaver() }) } diff --git a/internal/ui/embed_wm.go b/internal/ui/embed_wm.go index 1f38acc5..73d49688 100644 --- a/internal/ui/embed_wm.go +++ b/internal/ui/embed_wm.go @@ -110,7 +110,7 @@ func (e *embededWM) ShowScreensaver(s *saver.ScreenSaver) { func (e *embededWM) setWindow(win fyne.Window) fyne.CanvasObject { e.root = win - return newSaverMonitor(fynedesk.Instance().DelayScreensaver) + return newSaverMonitor(fynedesk.Instance().DelayScreenSaver) } type saverMonitor struct { diff --git a/internal/ui/menu.go b/internal/ui/menu.go index 5b17b75e..3894efdd 100644 --- a/internal/ui/menu.go +++ b/internal/ui/menu.go @@ -113,7 +113,7 @@ func (w *widgetPanel) showAccountMenu(_ fyne.CanvasObject) { w2.Close() go func() { time.Sleep(time.Millisecond * 300) - w.desk.TriggerScreensaver() + w.desk.TriggerScreenSaver() }() }}) if !isEmbed { diff --git a/internal/ui/screensaver.go b/internal/ui/screensaver.go index fc640612..9b2a62b5 100644 --- a/internal/ui/screensaver.go +++ b/internal/ui/screensaver.go @@ -21,7 +21,7 @@ func (l *desktop) startXscreensaver() { } } -func (l *desktop) TriggerScreensaver() { +func (l *desktop) TriggerScreenSaver() { s := saver.NewScreenSaver(nil) s.ClockFormat = l.settings.ClockFormatting() if l.settings.ScreenSaverClock() { @@ -36,7 +36,7 @@ func (l *desktop) TriggerScreensaver() { var lastActivity time.Time -func (l *desktop) DelayScreensaver() { +func (l *desktop) DelayScreenSaver() { lastActivity = time.Now() } @@ -50,7 +50,7 @@ func (l *desktop) watchScreenActivity() { if !idle { idle = true - l.TriggerScreensaver() + l.TriggerScreenSaver() } } else { idle = false diff --git a/internal/x11/wm/screensaver.go b/internal/x11/wm/screensaver.go index 7883bd1d..09e60cfe 100644 --- a/internal/x11/wm/screensaver.go +++ b/internal/x11/wm/screensaver.go @@ -37,7 +37,7 @@ func (x *x11WM) watchScreensaver() { } if info.MsSinceUserInput <= 5500 { - fynedesk.Instance().DelayScreensaver() + fynedesk.Instance().DelayScreenSaver() } } } diff --git a/test/desktop.go b/test/desktop.go index 9990286d..5b8f6c5f 100644 --- a/test/desktop.go +++ b/test/desktop.go @@ -121,6 +121,8 @@ func (td *Desktop) WindowManager() fynedesk.WindowManager { return td.wm } -func (td *Desktop) DelayScreensaver() {} +// DelayScreenSaver is called each time the user interacts with the system. +func (td *Desktop) DelayScreenSaver() {} -func (td *Desktop) TriggerScreensaver() {} +// TriggerScreenSaver can be called to immediately show the screensaver. +func (td *Desktop) TriggerScreenSaver() {} diff --git a/test/settings.go b/test/settings.go index 9cb5b294..a8f36497 100644 --- a/test/settings.go +++ b/test/settings.go @@ -158,14 +158,17 @@ func (s *Settings) ClockFormatting() string { return s.clockFormatting } +// ScreenSaverClock returns if the text on the screensaver should be a clock. func (s *Settings) ScreenSaverClock() bool { return true } +// ScreenSaverLabel returns the string to use in the screensaver (if not a clock). func (s *Settings) ScreenSaverLabel() string { - return "(clock)" + return "FyshOS" } +// ScreenSaverType returns whether this user should use FyshOS or XScreensaver savers. func (s *Settings) ScreenSaverType() string { return "FyshOS" } From 6bae5fff9e53b0fa3661538d1f1e6b1bf2339186 Mon Sep 17 00:00:00 2001 From: Andy Williams Date: Sat, 8 Feb 2025 22:07:14 +0000 Subject: [PATCH 12/22] Using Fyne develop without patches --- go.mod | 2 +- go.sum | 4 ++-- internal/x11/win/frame.go | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index d4690880..7f005ae8 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module fyshos.com/fynedesk go 1.19 require ( - fyne.io/fyne/v2 v2.5.5-0.20250208132135-967702162d53 + fyne.io/fyne/v2 v2.5.5-0.20250208220124-36dce94b9595 github.com/BurntSushi/xgb v0.0.0-20201008132610-5f9e7b3c49cd github.com/BurntSushi/xgbutil v0.0.0-20160919175755-f7c97cef3b4e github.com/FyshOS/appie v0.0.0-20250103211310-00f097d8e19d diff --git a/go.sum b/go.sum index 1dc99b27..69ad9d3b 100644 --- a/go.sum +++ b/go.sum @@ -37,8 +37,8 @@ cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohl cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= -fyne.io/fyne/v2 v2.5.5-0.20250208132135-967702162d53 h1:qXq2uL+bCtlg9uNnlXGdj+9eamAjMhuL4fQVDJrHVqo= -fyne.io/fyne/v2 v2.5.5-0.20250208132135-967702162d53/go.mod h1:6/uEYg4FEhspAcWgsokutm9wFMHDNSYuEHCKTYWSho8= +fyne.io/fyne/v2 v2.5.5-0.20250208220124-36dce94b9595 h1:oWbNIUNmmRx3DjnGQ5lKzKGvmEemtxcSrcAZKvSY/IE= +fyne.io/fyne/v2 v2.5.5-0.20250208220124-36dce94b9595/go.mod h1:6/uEYg4FEhspAcWgsokutm9wFMHDNSYuEHCKTYWSho8= fyne.io/systray v1.11.0 h1:D9HISlxSkx+jHSniMBR6fCFOUjk1x/OOOJLa9lJYAKg= fyne.io/systray v1.11.0/go.mod h1:RVwqP9nYMo7h5zViCBHri2FgjXF7H2cub7MAq4NSoLs= github.com/ActiveState/termtest/conpty v0.5.0 h1:JLUe6YDs4Jw4xNPCU+8VwTpniYOGeKzQg4SM2YHQNA8= diff --git a/internal/x11/win/frame.go b/internal/x11/win/frame.go index 415742fd..d0eada7c 100644 --- a/internal/x11/win/frame.go +++ b/internal/x11/win/frame.go @@ -607,7 +607,7 @@ func (f *frame) mouseMotion(x, y int16) { cursor := x11.DefaultCursor if obj != nil { if cur, ok := obj.(desktop.Cursorable); ok { - if cur.Cursor() == wm.CloseCursor { + if cur.Cursor() == desktop.PointerCursor { cursor = x11.CloseCursor } } From 979b078ae3bd269d2dd68b1b8806eb81ea4d9b5e Mon Sep 17 00:00:00 2001 From: Andy Williams Date: Tue, 11 Feb 2025 21:09:37 +0000 Subject: [PATCH 13/22] Don't invoke screensaver automatically if inhinbited Videos etc playing will ask screensaver not to show. --- internal/ui/screensaver.go | 65 +++++++++++++++++++++++++++++++++++++- 1 file changed, 64 insertions(+), 1 deletion(-) diff --git a/internal/ui/screensaver.go b/internal/ui/screensaver.go index 9b2a62b5..84b113a5 100644 --- a/internal/ui/screensaver.go +++ b/internal/ui/screensaver.go @@ -1,14 +1,24 @@ +// Note that you need to have github.com/knightpp/dbus-codegen-go installed +// +//go:generate dbus-codegen-go -prefix org.freedesktop -package screensaver -output generated/screensaver.go dbus/ScreenSaver.xml package ui import ( + "math/rand" "os/exec" "time" + screensaver "fyshos.com/fynedesk/internal/ui/generated" "github.com/FyshOS/saver" + "github.com/godbus/dbus/v5" + "github.com/godbus/dbus/v5/introspect" + "github.com/godbus/dbus/v5/prop" "fyne.io/fyne/v2" ) +var inhibitCount = 0 + func (l *desktop) startXscreensaver() { _, err := exec.LookPath("xscreensaver") if err != nil { @@ -41,11 +51,12 @@ func (l *desktop) DelayScreenSaver() { } func (l *desktop) watchScreenActivity() { + watchDBus() idle := false to := time.NewTicker(5 * time.Second) for range to.C { - if lastActivity.Add(time.Minute * 5).Before(time.Now()) { + if inhibitCount == 0 && lastActivity.Add(time.Minute*5).Before(time.Now()) { if !idle { idle = true @@ -57,3 +68,55 @@ func (l *desktop) watchScreenActivity() { } } } + +func watchDBus() { + conn, err := dbus.ConnectSessionBus() + if err != nil { + fyne.LogError("failed to connect to DBus to watch for screensaver inhibits", err) + return + } + + name := "org.freedesktop.ScreenSaver" + r, err := conn.RequestName(name, dbus.NameFlagDoNotQueue) + if err != nil || r != dbus.RequestNameReplyPrimaryOwner { + fyne.LogError("could not watch DBus screensaver, another is registered", err) + return + } + + s := &screenSaverWatcher{} + path := "/org/freedesktop/ScreenSaver" + err = conn.ExportAll(s, dbus.ObjectPath(path), "org.freedesktop.ScreenSaver") + if err != nil { + fyne.LogError("failed to export inhibits", err) + return + } + + node := introspect.Node{ + Name: path, + Interfaces: []introspect.Interface{ + introspect.IntrospectData, + prop.IntrospectData, + screensaver.IntrospectDataScreenSaver, + }, + } + err = conn.Export(introspect.NewIntrospectable(&node), dbus.ObjectPath(path), + "org.freedesktop.DBus.Introspectable") + if err != nil { + fyne.LogError("could not export our node data", err) + } +} + +type screenSaverWatcher struct { +} + +func (s *screenSaverWatcher) Inhibit(_ dbus.Sender, _, _ string) (uint, *dbus.Error) { + id := rand.Uint32() + inhibitCount++ + + return uint(id), nil +} + +func (s *screenSaverWatcher) UnInhibit(_ dbus.Sender, _ uint32) *dbus.Error { + inhibitCount-- + return nil +} From 4f215e81bf21565fbb86847ef0e7b43b2f6f6589 Mon Sep 17 00:00:00 2001 From: Andy Williams Date: Tue, 11 Feb 2025 21:15:54 +0000 Subject: [PATCH 14/22] Added missing generated file --- internal/ui/dbus/ScreenSaver.xml | 13 ++++ internal/ui/generated/screensaver.go | 92 ++++++++++++++++++++++++++++ 2 files changed, 105 insertions(+) create mode 100644 internal/ui/dbus/ScreenSaver.xml create mode 100644 internal/ui/generated/screensaver.go diff --git a/internal/ui/dbus/ScreenSaver.xml b/internal/ui/dbus/ScreenSaver.xml new file mode 100644 index 00000000..9966828b --- /dev/null +++ b/internal/ui/dbus/ScreenSaver.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/internal/ui/generated/screensaver.go b/internal/ui/generated/screensaver.go new file mode 100644 index 00000000..e9305f71 --- /dev/null +++ b/internal/ui/generated/screensaver.go @@ -0,0 +1,92 @@ +// Code generated by dbus-codegen-go DO NOT EDIT. +package screensaver + +import ( + "context" + "github.com/godbus/dbus/v5" + "github.com/godbus/dbus/v5/introspect" +) + +var ( + // Introspection for org.freedesktop.ScreenSaver + IntrospectDataScreenSaver = introspect.Interface{ + Name: "org.freedesktop.ScreenSaver", + Methods: []introspect.Method{{Name: "Inhibit", Args: []introspect.Arg{ + {Name: "application_name", Type: "s", Direction: "in"}, + {Name: "reason_for_inhibit", Type: "s", Direction: "in"}, + {Name: "cookie", Type: "u", Direction: "out"}, + }}, + {Name: "UnInhibit", Args: []introspect.Arg{ + {Name: "cookie", Type: "u", Direction: "in"}, + }}, + }, + Signals: []introspect.Signal{}, + Properties: []introspect.Property{}, + Annotations: []introspect.Annotation{}, + } +) + +// Interface name constants. +const ( + InterfaceScreenSaver = "org.freedesktop.ScreenSaver" +) + +// ScreenSaverer is org.freedesktop.ScreenSaver interface. +type ScreenSaverer interface { + // Inhibit is org.freedesktop.ScreenSaver.Inhibit method. + Inhibit(applicationName string, reasonForInhibit string) (cookie uint32, err *dbus.Error) + // UnInhibit is org.freedesktop.ScreenSaver.UnInhibit method. + UnInhibit(cookie uint32) (err *dbus.Error) +} + +// ExportScreenSaver exports the given object that implements org.freedesktop.ScreenSaver on the bus. +func ExportScreenSaver(conn *dbus.Conn, path dbus.ObjectPath, v ScreenSaverer) error { + return conn.ExportSubtreeMethodTable(map[string]interface{}{ + "Inhibit": v.Inhibit, + "UnInhibit": v.UnInhibit, + }, path, InterfaceScreenSaver) +} + +// UnexportScreenSaver unexports org.freedesktop.ScreenSaver interface on the named path. +func UnexportScreenSaver(conn *dbus.Conn, path dbus.ObjectPath) error { + return conn.Export(nil, path, InterfaceScreenSaver) +} + +// UnimplementedScreenSaver can be embedded to have forward compatible server implementations. +type UnimplementedScreenSaver struct{} + +func (*UnimplementedScreenSaver) iface() string { + return InterfaceScreenSaver +} + +func (*UnimplementedScreenSaver) Inhibit(applicationName string, reasonForInhibit string) (cookie uint32, err *dbus.Error) { + err = &dbus.ErrMsgUnknownMethod + return +} + +func (*UnimplementedScreenSaver) UnInhibit(cookie uint32) (err *dbus.Error) { + err = &dbus.ErrMsgUnknownMethod + return +} + +// NewScreenSaver creates and allocates org.freedesktop.ScreenSaver. +func NewScreenSaver(object dbus.BusObject) *ScreenSaver { + return &ScreenSaver{object} +} + +// ScreenSaver implements org.freedesktop.ScreenSaver D-Bus interface. +type ScreenSaver struct { + object dbus.BusObject +} + +// Inhibit calls org.freedesktop.ScreenSaver.Inhibit method. +func (o *ScreenSaver) Inhibit(ctx context.Context, applicationName string, reasonForInhibit string) (cookie uint32, err error) { + err = o.object.CallWithContext(ctx, InterfaceScreenSaver+".Inhibit", 0, applicationName, reasonForInhibit).Store(&cookie) + return +} + +// UnInhibit calls org.freedesktop.ScreenSaver.UnInhibit method. +func (o *ScreenSaver) UnInhibit(ctx context.Context, cookie uint32) (err error) { + err = o.object.CallWithContext(ctx, InterfaceScreenSaver+".UnInhibit", 0, cookie).Store() + return +} From e577e1a7b79e7df7b2460361e7896060c36211e5 Mon Sep 17 00:00:00 2001 From: Andy Williams Date: Tue, 11 Feb 2025 21:20:19 +0000 Subject: [PATCH 15/22] Fix output format of generated file --- internal/ui/generated/screensaver.go | 1 + 1 file changed, 1 insertion(+) diff --git a/internal/ui/generated/screensaver.go b/internal/ui/generated/screensaver.go index e9305f71..d4f96fef 100644 --- a/internal/ui/generated/screensaver.go +++ b/internal/ui/generated/screensaver.go @@ -3,6 +3,7 @@ package screensaver import ( "context" + "github.com/godbus/dbus/v5" "github.com/godbus/dbus/v5/introspect" ) From 65978aee92a5a1edad34328ffe4c1b25977e0667 Mon Sep 17 00:00:00 2001 From: Andy Williams Date: Tue, 11 Feb 2025 21:23:42 +0000 Subject: [PATCH 16/22] Don't confuse comment with package doc --- internal/ui/screensaver.go | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/internal/ui/screensaver.go b/internal/ui/screensaver.go index 84b113a5..2a20e168 100644 --- a/internal/ui/screensaver.go +++ b/internal/ui/screensaver.go @@ -1,6 +1,6 @@ // Note that you need to have github.com/knightpp/dbus-codegen-go installed -// //go:generate dbus-codegen-go -prefix org.freedesktop -package screensaver -output generated/screensaver.go dbus/ScreenSaver.xml + package ui import ( @@ -41,7 +41,9 @@ func (l *desktop) TriggerScreenSaver() { } s.Lock = true - go l.wm.ShowScreensaver(s) + fyne.Do(func() { + l.wm.ShowScreensaver(s) + }) } var lastActivity time.Time @@ -109,14 +111,16 @@ func watchDBus() { type screenSaverWatcher struct { } -func (s *screenSaverWatcher) Inhibit(_ dbus.Sender, _, _ string) (uint, *dbus.Error) { +func (s *screenSaverWatcher) Inhibit(_ dbus.Sender, who, why string) (uint, *dbus.Error) { id := rand.Uint32() inhibitCount++ + // TODO also check these are still alive every so often return uint(id), nil } -func (s *screenSaverWatcher) UnInhibit(_ dbus.Sender, _ uint32) *dbus.Error { +func (s *screenSaverWatcher) UnInhibit(_ dbus.Sender, cookie uint32) *dbus.Error { + // TODO compare to the cookies logged inhibitCount-- return nil } From 7733c8f294fdc8fcc13448cc843d29402661476a Mon Sep 17 00:00:00 2001 From: Andy Williams Date: Sat, 1 Mar 2025 13:57:33 +0000 Subject: [PATCH 17/22] Upgrade to the Fyne 2.6 beta --- go.mod | 24 +- go.sum | 632 ++---------------------------------- internal/ui/menu.go | 11 +- internal/ui/settings.go | 8 +- internal/ui/switcher.go | 4 +- internal/ui/widgetpanel.go | 2 +- internal/x11/wm/desk.go | 6 +- internal/x11/wm/switcher.go | 8 +- modules/desktops/pager.go | 4 +- modules/status/battery.go | 4 +- 10 files changed, 66 insertions(+), 637 deletions(-) diff --git a/go.mod b/go.mod index 7f005ae8..22afa84c 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module fyshos.com/fynedesk go 1.19 require ( - fyne.io/fyne/v2 v2.5.5-0.20250208220124-36dce94b9595 + fyne.io/fyne/v2 v2.6.0-alpha1.0.20250301134653-b47b0c1141a3 github.com/BurntSushi/xgb v0.0.0-20201008132610-5f9e7b3c49cd github.com/BurntSushi/xgbutil v0.0.0-20160919175755-f7c97cef3b4e github.com/FyshOS/appie v0.0.0-20250103211310-00f097d8e19d @@ -19,10 +19,10 @@ require ( require ( github.com/BurntSushi/toml v1.4.0 // indirect - github.com/fyne-io/image v0.0.0-20240417123036-dc0ee9e7c964 // indirect + github.com/fyne-io/image v0.1.0 // indirect github.com/jackmordaunt/icns v1.0.1-0.20200413110149-9e181b441ab2 // indirect github.com/jeandeaual/go-locale v0.0.0-20241217141322-fcc2cadd6f08 // indirect - github.com/nicksnyder/go-i18n/v2 v2.4.0 // indirect + github.com/nicksnyder/go-i18n/v2 v2.5.1 // indirect github.com/rymdport/portal v0.3.0 // indirect howett.net/plist v1.0.1 // indirect ) @@ -37,25 +37,23 @@ require ( github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/fredbi/uri v1.1.0 // indirect github.com/fsnotify/fsnotify v1.7.0 // indirect - github.com/fyne-io/gl-js v0.0.0-20220119005834-d2da28d9ccfe // indirect - github.com/fyne-io/glfw-js v0.0.0-20241126112943-313d8a0fe1d0 // indirect + github.com/fyne-io/gl-js v0.1.0 // indirect + github.com/fyne-io/glfw-js v0.2.0 // indirect github.com/fyne-io/terminal v0.0.0-20240728203942-56c3b98b9208 - github.com/go-gl/gl v0.0.0-20211210172815-726fda9656d6 // indirect + github.com/go-gl/gl v0.0.0-20231021071112-07e5d0ea2e71 // indirect github.com/go-gl/glfw/v3.3/glfw v0.0.0-20240506104042-037f3cc74f2a // indirect github.com/go-text/render v0.2.0 // indirect - github.com/go-text/typesetting v0.2.0 // indirect - github.com/gopherjs/gopherjs v1.17.2 // indirect + github.com/go-text/typesetting v0.2.1 // indirect github.com/jsummers/gobmp v0.0.0-20230614200233-a9de23ed2e25 // indirect github.com/pkg/errors v0.8.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/srwiley/oksvg v0.0.0-20221011165216-be6e8873101c // indirect github.com/srwiley/rasterx v0.0.0-20220730225603-2ab79fcdd4ef // indirect - github.com/yuin/goldmark v1.7.1 // indirect - golang.org/x/image v0.23.0 // indirect - golang.org/x/mobile v0.0.0-20231127183840-76ac6878050a // indirect + github.com/yuin/goldmark v1.7.8 // indirect + golang.org/x/image v0.24.0 // indirect golang.org/x/net v0.25.0 // indirect - golang.org/x/sys v0.27.0 // indirect - golang.org/x/text v0.21.0 + golang.org/x/sys v0.30.0 // indirect + golang.org/x/text v0.22.0 gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index 69ad9d3b..c50fb6a6 100644 --- a/go.sum +++ b/go.sum @@ -1,44 +1,5 @@ -cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= -cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU= -cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= -cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc= -cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0= -cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To= -cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4= -cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M= -cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc= -cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKVk= -cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs= -cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc= -cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY= -cloud.google.com/go v0.72.0/go.mod h1:M+5Vjvlc2wnp6tjzE102Dw08nGShTscUx2nZMufOKPI= -cloud.google.com/go v0.74.0/go.mod h1:VV1xSbzvo+9QJOxLDaJfTjx5e+MePCpCWwvftOeQmWk= -cloud.google.com/go v0.78.0/go.mod h1:QjdrLG0uq+YwhjoVOLsS1t7TW8fs36kLs4XO5R5ECHg= -cloud.google.com/go v0.79.0/go.mod h1:3bzgcEeQlzbuEAYu4mrWhKqWjmpprinYgKJLgKHnbb8= -cloud.google.com/go v0.81.0/go.mod h1:mk/AM35KwGk/Nm2YSeZbxXdrNK3KZOYHmLkOqC2V6E0= -cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= -cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= -cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= -cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg= -cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc= -cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ= -cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= -cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= -cloud.google.com/go/firestore v1.1.0/go.mod h1:ulACoGHTpvq5r8rxGJ4ddJZBZqakUQqClKRT5SZwBmk= -cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= -cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw= -cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA= -cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU= -cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw= -cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos= -cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= -cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= -cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= -dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= -fyne.io/fyne/v2 v2.5.5-0.20250208220124-36dce94b9595 h1:oWbNIUNmmRx3DjnGQ5lKzKGvmEemtxcSrcAZKvSY/IE= -fyne.io/fyne/v2 v2.5.5-0.20250208220124-36dce94b9595/go.mod h1:6/uEYg4FEhspAcWgsokutm9wFMHDNSYuEHCKTYWSho8= +fyne.io/fyne/v2 v2.6.0-alpha1.0.20250301134653-b47b0c1141a3 h1:Yqv/w3+9+pouEQFIXj0oozumyWu+QS2Y7nur4bdJCj0= +fyne.io/fyne/v2 v2.6.0-alpha1.0.20250301134653-b47b0c1141a3/go.mod h1:Osm71ZDuJ2XM36ECf0g2FpmsnYQJj6wX0+6Ym90rAKs= fyne.io/systray v1.11.0 h1:D9HISlxSkx+jHSniMBR6fCFOUjk1x/OOOJLa9lJYAKg= fyne.io/systray v1.11.0/go.mod h1:RVwqP9nYMo7h5zViCBHri2FgjXF7H2cub7MAq4NSoLs= github.com/ActiveState/termtest/conpty v0.5.0 h1:JLUe6YDs4Jw4xNPCU+8VwTpniYOGeKzQg4SM2YHQNA8= @@ -49,10 +10,8 @@ github.com/BurntSushi/freetype-go v0.0.0-20160129220410-b763ddbfe298 h1:1qlsVAQJ github.com/BurntSushi/freetype-go v0.0.0-20160129220410-b763ddbfe298/go.mod h1:D+QujdIlUNfa0igpNMk6UIvlb6C252URs4yupRUV4lQ= github.com/BurntSushi/graphics-go v0.0.0-20160129215708-b43f31a4a966 h1:lTG4HQym5oPKjL7nGs+csTgiDna685ZXjxijkne828g= github.com/BurntSushi/graphics-go v0.0.0-20160129215708-b43f31a4a966/go.mod h1:Mid70uvE93zn9wgF92A/r5ixgnvX8Lh68fxp9KQBaI0= -github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/toml v1.4.0 h1:kuoIxZQy2WRRk1pttg9asf+WVv6tWQuBNVmK8+nqPr0= github.com/BurntSushi/toml v1.4.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho= -github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/BurntSushi/xgb v0.0.0-20201008132610-5f9e7b3c49cd h1:u7K2oMFMd8APDV3fM1j2rO3U/XJf1g1qC3DDTKou8iM= github.com/BurntSushi/xgb v0.0.0-20201008132610-5f9e7b3c49cd/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/FyshOS/appie v0.0.0-20250103211310-00f097d8e19d h1:bkIQPpxGMalOufoLbLDXQ/vrVwGUbtw1jbVZE8Y6nZI= @@ -63,630 +22,87 @@ github.com/FyshOS/saver v0.0.0-20250125211336-528339462781 h1:jGmHNeimIf4DDEe8jk github.com/FyshOS/saver v0.0.0-20250125211336-528339462781/go.mod h1:yIuAuYqnEyKaiNU4MD4xmyLcZl9QdDr2uTmT7lt02tI= github.com/Knetic/govaluate v3.0.0+incompatible h1:7o6+MAPhYTCF0+fdvoz1xDedhRb4f6s9Tn1Tt7/WTEg= github.com/Knetic/govaluate v3.0.0+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0= -github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= -github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= -github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= -github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= -github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= -github.com/bketelsen/crypt v0.0.4/go.mod h1:aI6NrJ0pMGgvZKL1iVgXLnfIFJtfV+bKCoqOes/6LfM= -github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= -github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= -github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= -github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= -github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= -github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= -github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= -github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= -github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= -github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/creack/pty v1.1.21 h1:1/QdRyBaHHJP61QkWMXlOIBfsgdDeeKfK8SYVUWJKf0= github.com/creack/pty v1.1.21/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4= -github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/disintegration/imaging v1.6.2 h1:w1LecBlG2Lnp8B3jk5zSuNqd7b4DXhcjwek1ei82L+c= github.com/disintegration/imaging v1.6.2/go.mod h1:44/5580QXChDfwIclfc/PCwrr44amcmDAg8hxG0Ewe4= -github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= -github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= -github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= -github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po= -github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= -github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= -github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/felixge/fgprof v0.9.3 h1:VvyZxILNuCiUCSXtPtYmmtGvb65nqXh2QFWc0Wpf2/g= github.com/fredbi/uri v1.1.0 h1:OqLpTXtyRg9ABReqvDGdJPqZUxs8cyBDOMXBbskCaB8= github.com/fredbi/uri v1.1.0/go.mod h1:aYTUoAXBOq7BLfVJ8GnKmfcuURosB1xyHDIfWeC/iW4= -github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= -github.com/fyne-io/gl-js v0.0.0-20220119005834-d2da28d9ccfe h1:A/wiwvQ0CAjPkuJytaD+SsXkPU0asQ+guQEIg1BJGX4= -github.com/fyne-io/gl-js v0.0.0-20220119005834-d2da28d9ccfe/go.mod h1:d4clgH0/GrRwWjRzJJQXxT/h1TyuNSfF/X64zb/3Ggg= -github.com/fyne-io/glfw-js v0.0.0-20241126112943-313d8a0fe1d0 h1:/1YRWFv9bAWkoo3SuxpFfzpXH0D/bQnTjNXyF4ih7Os= -github.com/fyne-io/glfw-js v0.0.0-20241126112943-313d8a0fe1d0/go.mod h1:gsGA2dotD4v0SR6PmPCYvS9JuOeMwAtmfvDE7mbYXMY= -github.com/fyne-io/image v0.0.0-20240417123036-dc0ee9e7c964 h1:0pTELtjlVAVGSazfwRNcqTVzqmkWb1GsNozCmmZfdZA= -github.com/fyne-io/image v0.0.0-20240417123036-dc0ee9e7c964/go.mod h1:J9Uunu842kOcTjzQj4Eq8XIDmF55szvT1PTS1cUb1UE= +github.com/fyne-io/gl-js v0.1.0 h1:8luJzNs0ntEAJo+8x8kfUOXujUlP8gB3QMOxO2mUdpM= +github.com/fyne-io/gl-js v0.1.0/go.mod h1:ZcepK8vmOYLu96JoxbCKJy2ybr+g1pTnaBDdl7c3ajI= +github.com/fyne-io/glfw-js v0.2.0 h1:8GUZtN2aCoTPNqgRDxK5+kn9OURINhBEBc7M4O1KrmM= +github.com/fyne-io/glfw-js v0.2.0/go.mod h1:Ri6te7rdZtBgBpxLW19uBpp3Dl6K9K/bRaYdJ22G8Jk= +github.com/fyne-io/image v0.1.0 h1:Vm2TQJ2PWGHCf3jYi1/XroaNNMu+GfI/O2QpSbZd4XQ= +github.com/fyne-io/image v0.1.0/go.mod h1:xrfYBh6yspc+KjkgdZU/ifUC9sPA5Iv7WYUBzQKK7JM= github.com/fyne-io/terminal v0.0.0-20240728203942-56c3b98b9208 h1:ZMTEq3IAv6EQv6XuMpF6KSBT+c0/ou/O9uxoQvPyA2c= github.com/fyne-io/terminal v0.0.0-20240728203942-56c3b98b9208/go.mod h1:uTxDe2dNdJWfmUAgWwG+leivgNxSfCY50t+AiNdPmiM= github.com/fyne-io/xgbutil v0.0.0-20191220152344-7d838166824d h1:8+poQtDqiRfAZmeyYRlInuaIBsQEflmxtpJeZklvNuE= github.com/fyne-io/xgbutil v0.0.0-20191220152344-7d838166824d/go.mod h1:vPqYMuTmTyrLNDQWQXy9lqdnV+WRQn6jhaSon8TppBs= -github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= -github.com/go-gl/gl v0.0.0-20211210172815-726fda9656d6 h1:zDw5v7qm4yH7N8C8uWd+8Ii9rROdgWxQuGoJ9WDXxfk= -github.com/go-gl/gl v0.0.0-20211210172815-726fda9656d6/go.mod h1:9YTyiznxEY1fVinfM7RvRcjRHbw2xLBJ3AAGIT0I4Nw= -github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= -github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= -github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= +github.com/go-gl/gl v0.0.0-20231021071112-07e5d0ea2e71 h1:5BVwOaUSBTlVZowGO6VZGw2H/zl9nrd3eCZfYV+NfQA= +github.com/go-gl/gl v0.0.0-20231021071112-07e5d0ea2e71/go.mod h1:9YTyiznxEY1fVinfM7RvRcjRHbw2xLBJ3AAGIT0I4Nw= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20240506104042-037f3cc74f2a h1:vxnBhFDDT+xzxf1jTJKMKZw3H0swfWk9RpWbBbDK5+0= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20240506104042-037f3cc74f2a/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-text/render v0.2.0 h1:LBYoTmp5jYiJ4NPqDc2pz17MLmA3wHw1dZSVGcOdeAc= github.com/go-text/render v0.2.0/go.mod h1:CkiqfukRGKJA5vZZISkjSYrcdtgKQWRa2HIzvwNN5SU= -github.com/go-text/typesetting v0.2.0 h1:fbzsgbmk04KiWtE+c3ZD4W2nmCRzBqrqQOvYlwAOdho= -github.com/go-text/typesetting v0.2.0/go.mod h1:2+owI/sxa73XA581LAzVuEBZ3WEEV2pXeDswCH/3i1I= -github.com/go-text/typesetting-utils v0.0.0-20240317173224-1986cbe96c66 h1:GUrm65PQPlhFSKjLPGOZNPNxLCybjzjYBzjfoBGaDUY= -github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= +github.com/go-text/typesetting v0.2.1 h1:x0jMOGyO3d1qFAPI0j4GSsh7M0Q3Ypjzr4+CEVg82V8= +github.com/go-text/typesetting v0.2.1/go.mod h1:mTOxEwasOFpAMBjEQDhdWRckoLLeI/+qrQeBCTGEt6M= +github.com/go-text/typesetting-utils v0.0.0-20241103174707-87a29e9e6066 h1:qCuYC+94v2xrb1PoS4NIDe7DGYtLnU2wWiQe9a1B1c0= github.com/godbus/dbus/v5 v5.1.0 h1:4KLkAxT3aOY8Li4FRJe/KvhoNFFxo0m6fNuFUO8QJUk= github.com/godbus/dbus/v5 v5.1.0/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= -github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= -github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= -github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= -github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= -github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y= -github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= -github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= -github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= -github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4= -github.com/golang/mock v1.5.0/go.mod h1:CWnOUgYIOo4TcNZ0wHX3YZCqsaM1I1Jvs6v3mP3KVu8= -github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= -github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= -github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk= -github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= -github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= -github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= -github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= -github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= -github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= -github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= -github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= -github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= -github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM= -github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= -github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= -github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= -github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= -github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= -github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= -github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= -github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= -github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20211214055906-6f57359322fd h1:1FjCyPC+syAzJ5/2S8fqdZK1R22vvA0J7JZKcuOIQ7Y= -github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= -github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= -github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= -github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= -github.com/gopherjs/gopherjs v0.0.0-20211219123610-ec9572f70e60/go.mod h1:cz9oNYuRUWGdHmLF2IodMLkAhcPtXeULvcBNagUrxTI= -github.com/gopherjs/gopherjs v1.17.2 h1:fQnZVsXk8uxXIStYb0N4bGk7jeyTalG/wsZjQ25dO0g= -github.com/gopherjs/gopherjs v1.17.2/go.mod h1:pRRIvn/QzFLrKfvEz3qUuEhtE/zLCWfreZ6J5gM2i+k= -github.com/goxjs/gl v0.0.0-20210104184919-e3fafc6f8f2a/go.mod h1:dy/f2gjY09hwVfIyATps4G2ai7/hLwLkc5TrPqONuXY= -github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= -github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q= -github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= -github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= -github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= -github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= -github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= -github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= -github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU= -github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU= -github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4= -github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= -github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= -github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90= -github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= -github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= -github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= -github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= -github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ= -github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= -github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= -github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= -github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= -github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/jackmordaunt/icns v1.0.1-0.20200413110149-9e181b441ab2 h1:2bRhR5GcMudCdaY4p8ip89hsvSyxYehLSicCNtygyVY= github.com/jackmordaunt/icns v1.0.1-0.20200413110149-9e181b441ab2/go.mod h1:Hj3TV9xrdt+g9apvBagVi/VzE41gSliEBypxaQDq5QA= github.com/jeandeaual/go-locale v0.0.0-20241217141322-fcc2cadd6f08 h1:wMeVzrPO3mfHIWLZtDcSaGAe2I4PW9B/P5nMkRSwCAc= github.com/jeandeaual/go-locale v0.0.0-20241217141322-fcc2cadd6f08/go.mod h1:ZDXo8KHryOWSIqnsb/CiDq7hQUYryCgdVnxbj8tDG7o= github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= -github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= -github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= -github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= github.com/jsummers/gobmp v0.0.0-20230614200233-a9de23ed2e25 h1:YLvr1eE6cdCqjOe972w/cYF+FjW34v27+9Vo5106B4M= github.com/jsummers/gobmp v0.0.0-20230614200233-a9de23ed2e25/go.mod h1:kLgvv7o6UM+0QSf0QjAse3wReFDsb9qbZJdfexWlrQw= -github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= -github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= -github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= -github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= -github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= -github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= -github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/mafik/pulseaudio v0.0.0-20200511091429-8449222912dd h1:gn6oLpDCn3wY+1WfbbP0OwxXL+2eHi3mxF/DsNyPHUM= github.com/mafik/pulseaudio v0.0.0-20200511091429-8449222912dd/go.mod h1:dlpd1fnLAhI6g9tM/aCobgN/Yka1/SkHrBTfAgDdb9Q= -github.com/magiconair/properties v1.8.5/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= -github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= -github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= -github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= -github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= -github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= -github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= -github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS42BGNg= -github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY= -github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= -github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= -github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= -github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= -github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= -github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= -github.com/neelance/astrewrite v0.0.0-20160511093645-99348263ae86/go.mod h1:kHJEU3ofeGjhHklVoIGuVj85JJwZ6kWPaJwCIxgnFmo= -github.com/neelance/sourcemap v0.0.0-20200213170602-2833bce08e4c/go.mod h1:Qr6/a/Q4r9LP1IltGz7tA7iOK1WonHEYhu1HRBA7ZiM= github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 h1:zYyBkD/k9seD2A7fsi6Oo2LfFZAehjjQMERAvZLEDnQ= github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646/go.mod h1:jpp1/29i3P1S/RLdc7JQKbRpFeM1dOBd8T9ki5s+AY8= -github.com/nicksnyder/go-i18n/v2 v2.4.0 h1:3IcvPOAvnCKwNm0TB0dLDTuawWEj+ax/RERNC+diLMM= -github.com/nicksnyder/go-i18n/v2 v2.4.0/go.mod h1:nxYSZE9M0bf3Y70gPQjN9ha7XNHX7gMc814+6wVyEI4= +github.com/nicksnyder/go-i18n/v2 v2.5.1 h1:IxtPxYsR9Gp60cGXjfuR/llTqV8aYMsC472zD0D1vHk= +github.com/nicksnyder/go-i18n/v2 v2.5.1/go.mod h1:DrhgsSDZxoAfvVrBVLXoxZn/pN5TXqaDbq7ju94viiQ= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs= -github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= -github.com/pelletier/go-toml v1.9.3/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/profile v1.7.0 h1:hnbDkaNWPCLMO9wGLdBFTIZvzDrDfBM2072E1S9gJkA= -github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= -github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= -github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= -github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= github.com/rymdport/portal v0.3.0 h1:QRHcwKwx3kY5JTQcsVhmhC3TGqGQb9LFghVNUy8AdB8= github.com/rymdport/portal v0.3.0/go.mod h1:kFF4jslnJ8pD5uCi17brj/ODlfIidOxlgUDTO5ncnC4= -github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= -github.com/shurcooL/go v0.0.0-20200502201357-93f07166e636/go.mod h1:TDJrrUr11Vxrven61rcy3hJMUqaf/CLWYhHNPmT14Lk= -github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749/go.mod h1:ZY1cvUeJuFPAdZ/B6v7RHavJWZn2YPVFQ1OSXhCGOkg= -github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= -github.com/shurcooL/vfsgen v0.0.0-20200824052919-0d455de96546/go.mod h1:TrYk7fJVaAttu97ZZKrO9UbRa8izdowaMIZcxYMbVaw= -github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= -github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= -github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I= -github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= -github.com/spf13/cobra v1.2.1/go.mod h1:ExllRjgxM/piMAM+3tAZvg8fsklGAf3tPfi+i8t68Nk= -github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo= github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= -github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= -github.com/spf13/viper v1.8.1/go.mod h1:o0Pch8wJ9BVSWGQMbra6iw0oQ5oktSIBaujf1rJH9Ns= github.com/srwiley/oksvg v0.0.0-20221011165216-be6e8873101c h1:km8GpoQut05eY3GiYWEedbTT0qnSxrCjsVbb7yKY1KE= github.com/srwiley/oksvg v0.0.0-20221011165216-be6e8873101c/go.mod h1:cNQ3dwVJtS5Hmnjxy6AgTPd0Inb3pW05ftPSX7NZO7Q= github.com/srwiley/rasterx v0.0.0-20220730225603-2ab79fcdd4ef h1:Ch6Q+AZUxDBCVqdkI8FSpFyZDtCVBc2VmejdNrm5rRQ= github.com/srwiley/rasterx v0.0.0-20220730225603-2ab79fcdd4ef/go.mod h1:nXTWP6+gD5+LUJ8krVhhoeHjvHTutPxMYl5SvkcnJNE= -github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= -github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= -github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= -github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= -github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= -github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= -github.com/yuin/goldmark v1.4.0/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= -github.com/yuin/goldmark v1.7.1 h1:3bajkSilaCbjdKVsKdZjZCLBNPL9pYzrCakKaf4U49U= -github.com/yuin/goldmark v1.7.1/go.mod h1:uzxRWxtg69N339t3louHJ7+O03ezfj6PlliRlaOzY1E= -go.etcd.io/etcd/api/v3 v3.5.0/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs= -go.etcd.io/etcd/client/pkg/v3 v3.5.0/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= -go.etcd.io/etcd/client/v2 v2.305.0/go.mod h1:h9puh54ZTgAKtEbut2oe9P4L/oqKCVB6xsXlzd7alYQ= -go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= -go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= -go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= -go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= -go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= -golang.org/x/exp v0.0.0-20190731235908-ec7cb31e5a56/go.mod h1:JhuoJpWY28nO4Vef9tZUw9qufEGTyX1+7lmHxV5q5G4= -golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek= -golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY= -golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= -golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= -golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= -golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= -golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= -golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= -golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= +github.com/yuin/goldmark v1.7.8 h1:iERMLn0/QJeHFhxSt3p6PeN9mGnvIKSpG9YYorDMnic= +github.com/yuin/goldmark v1.7.8/go.mod h1:uzxRWxtg69N339t3louHJ7+O03ezfj6PlliRlaOzY1E= golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= -golang.org/x/image v0.23.0 h1:HseQ7c2OpPKTPVzNjG5fwJsOTCiiwS4QdsYi5XU6H68= -golang.org/x/image v0.23.0/go.mod h1:wJJBTdLfCCf3tiHa1fNxpZmUI4mmoZvwMCPP0ddoNKY= -golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= -golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= -golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= -golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs= -golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= -golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= -golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= -golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= -golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= -golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= -golang.org/x/mobile v0.0.0-20211207041440-4e6c2922fdee/go.mod h1:pe2sM7Uk+2Su1y7u/6Z8KJ24D7lepUjFZbhFOrmDfuQ= -golang.org/x/mobile v0.0.0-20231127183840-76ac6878050a h1:sYbmY3FwUWCBTodZL1S3JUuOvaW6kM2o+clDzzDNBWg= -golang.org/x/mobile v0.0.0-20231127183840-76ac6878050a/go.mod h1:Ede7gF0KGoHlj822RtphAHK1jLdrcuRBZg0sF1Q+SPc= -golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= -golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY= -golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= -golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= -golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= -golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= -golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= -golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= -golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc= -golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= -golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/image v0.24.0 h1:AN7zRgVsbvmTfNyqIbbOraYL8mSwcKncEj8ofjgzcMQ= +golang.org/x/image v0.24.0/go.mod h1:4b/ITuLfqYq1hqZcjofwctIhi7sZh2WaCjvsBNjjya8= golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac= golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= -golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= -golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210402161424-2e8d93401602/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200428200454-593003d681fa/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.27.0 h1:wBqf8DvsY9Y/2P8gAfPDEYNuS30J4lPHJxXSb/nJZ+s= -golang.org/x/sys v0.27.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc= +golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= -golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo= -golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ= -golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= -golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= -golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= -golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= -golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE= -golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= -golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= -golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= -golang.org/x/tools v0.1.8-0.20211022200916-316ba0b74098/go.mod h1:LGqMHiF4EqQNHR1JncWGqT5BVaXmza+X+BDGol+dOxo= -golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= -google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= -google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= -google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= -google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= -google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= -google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= -google.golang.org/api v0.17.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.18.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.19.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.20.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.22.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= -google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= -google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM= -google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc= -google.golang.org/api v0.35.0/go.mod h1:/XrVsuzM0rZmrsbjJutiuftIzeuTQcEeaYcSk/mQ1dg= -google.golang.org/api v0.36.0/go.mod h1:+z5ficQTmoYpPn8LCUNVpK5I7hwkpjbcgqA7I34qYtE= -google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjRCQ8= -google.golang.org/api v0.41.0/go.mod h1:RkxM5lITDfTzmyKFPt+wGrCJbVfniCr2ool8kTBzRTU= -google.golang.org/api v0.43.0/go.mod h1:nQsDGjRXMo4lvh5hP0TKqF244gqhGcr/YSIykhUk/94= -google.golang.org/api v0.44.0/go.mod h1:EBOGZqzyhtvMDoxwS97ctnh0zUmYY6CxqXsc1AvkYD8= -google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= -google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= -google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= -google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= -google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= -google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= -google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= -google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= -google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= -google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= -google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8= -google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod h1:GmwEX6Z4W5gMy59cAlVYjN9JhxgbQH6Gn+gFDQe2lzA= -google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U= -google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= -google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA= -google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210222152913-aa3ee6e6a81c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210303154014-9728d6b83eeb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210310155132-4ce2db91004e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210319143718-93e7006c17a6/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210402141018-6c239bbf2bb1/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A= -google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= -google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= -google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= -google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= -google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= -google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= -google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= -google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= -google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= -google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60= -google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= -google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= -google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= -google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= -google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0= -google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= -google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8= -google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= -google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= -google.golang.org/grpc v1.36.1/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= -google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= -google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= -google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= -google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= -google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= -google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= -google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= -google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= -google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= -google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= +golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM= +golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU= -gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= -gopkg.in/ini.v1 v1.62.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/yaml.v1 v1.0.0-20140924161607-9f9df34309c0/go.mod h1:WDnlLJ4WF5VGsH/HVa3CI79GS0ol3YnhVnKP89i0kNg= -gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= -gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= -gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= -honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= howett.net/plist v1.0.1 h1:37GdZ8tP09Q35o9ych3ehygcsL+HqKSwzctveSlarvM= howett.net/plist v1.0.1/go.mod h1:lqaXoTrLY4hg8tnEzNru53gicrbv7rrk+2xJA/7hw9g= -rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= -rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= -rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= diff --git a/internal/ui/menu.go b/internal/ui/menu.go index 3894efdd..db3838e7 100644 --- a/internal/ui/menu.go +++ b/internal/ui/menu.go @@ -50,8 +50,11 @@ func (w *widgetPanel) appendAppCategories(acc *widget.Accordion, win fyne.Window accList = append(accList, widget.NewAccordionItem(cat, container.NewVBox(items...))) } - acc.Items = accList - acc.Refresh() + + fyne.Do(func() { + acc.Items = accList + acc.Refresh() + }) } func (w *widgetPanel) askLogout() { @@ -172,5 +175,7 @@ func (w *widgetPanel) newAppButton(app appie.AppData, w2 fyne.Window) *widget.Bu func (w *widgetPanel) loadIcon(app appie.AppData, btn *widget.Button) { iconRes := app.Icon(w.desk.Settings().IconTheme(), int(64*w.desk.Screens().Primary().CanvasScale())) - btn.SetIcon(iconRes) + fyne.Do(func() { + btn.SetIcon(iconRes) + }) } diff --git a/internal/ui/settings.go b/internal/ui/settings.go index 7c3687db..78914be2 100644 --- a/internal/ui/settings.go +++ b/internal/ui/settings.go @@ -109,9 +109,11 @@ func (d *deskSettings) apply() { d.listenerLock.Lock() defer d.listenerLock.Unlock() - for _, listener := range d.changeListeners { - listener(d) - } + fyne.Do(func() { + for _, listener := range d.changeListeners { + listener(d) + } + }) } func isModuleEnabled(name string, settings fynedesk.DeskSettings) bool { diff --git a/internal/ui/switcher.go b/internal/ui/switcher.go index 702e4b1c..f94cdfc5 100644 --- a/internal/ui/switcher.go +++ b/internal/ui/switcher.go @@ -227,10 +227,10 @@ func (s *Switcher) HideApply() { // HideCancel dismisses the application Switcher without changing window order. func (s *Switcher) HideCancel() { - go func() { + fyne.Do(func() { time.Sleep(time.Millisecond * 100) s.win.Hide() - }() + }) } // Show the app switcher, it would then be hidden with HideApply or HideCancel. diff --git a/internal/ui/widgetpanel.go b/internal/ui/widgetpanel.go index b55bbde8..4ccab2e3 100644 --- a/internal/ui/widgetpanel.go +++ b/internal/ui/widgetpanel.go @@ -80,7 +80,7 @@ func (w *widgetPanel) clockTick() { go func() { for { <-tick.C - w.clockRefresh() + fyne.Do(w.clockRefresh) } }() } diff --git a/internal/x11/wm/desk.go b/internal/x11/wm/desk.go index 1494ef60..89bb6d60 100644 --- a/internal/x11/wm/desk.go +++ b/internal/x11/wm/desk.go @@ -242,9 +242,9 @@ func (x *x11WM) ShowOverlay(w fyne.Window, s fyne.Size, p fyne.Position) { w.SetFixedSize(true) w.Resize(s) - w.Show() x.menuSize = s x.menuPos = p + w.Show() } func (x *x11WM) ShowMenuOverlay(m *fyne.Menu, s fyne.Size, p fyne.Position) { @@ -625,7 +625,9 @@ func (x *x11WM) RootID() xproto.Window { func (x *x11WM) NotifyWindowMoved(win fynedesk.Window) { for _, l := range x.listeners { - go l.WindowMoved(win) + fyne.Do(func() { + l.WindowMoved(win) + }) } } diff --git a/internal/x11/wm/switcher.go b/internal/x11/wm/switcher.go index 5d01b6f7..24710b45 100644 --- a/internal/x11/wm/switcher.go +++ b/internal/x11/wm/switcher.go @@ -10,6 +10,8 @@ import ( "fyshos.com/fynedesk" "fyshos.com/fynedesk/internal/ui" + + "fyne.io/fyne/v2" ) var ( @@ -25,12 +27,12 @@ var ( func (x *x11WM) applyAppSwitcher() { if switcherInstance == nil { ignoreSwitcher = true - go func() { + fyne.Do(func() { time.Sleep(time.Second / 4) ignoreSwitcher = false - }() + }) } else { - go switcherInstance.HideApply() + fyne.Do(switcherInstance.HideApply) } xproto.UngrabKeyboard(x.x.Conn(), xproto.TimeCurrentTime) diff --git a/modules/desktops/pager.go b/modules/desktops/pager.go index 2cc410ef..a3a1060e 100644 --- a/modules/desktops/pager.go +++ b/modules/desktops/pager.go @@ -65,7 +65,9 @@ func (p *pager) WindowStateChanged(_ fynedesk.Window) { func (p *pager) refresh() { desk := fynedesk.Instance() - p.refreshFrom(desk.Desktop()) + fyne.Do(func() { + p.refreshFrom(desk.Desktop()) + }) } func (p *pager) refreshFrom(oldID int) { diff --git a/modules/status/battery.go b/modules/status/battery.go index 82dda25b..9644454f 100644 --- a/modules/status/battery.go +++ b/modules/status/battery.go @@ -41,7 +41,9 @@ func (b *battery) batteryTick() { for !b.done { <-tick.C val, _ := b.value() - b.setValue(val) + fyne.Do(func() { + b.setValue(val) + }) } }() } From 7e259b3d2733c06c5b894a09d0d17fb9667b901d Mon Sep 17 00:00:00 2001 From: Andy Williams Date: Sat, 1 Mar 2025 14:37:23 +0000 Subject: [PATCH 18/22] More threading changes --- internal/ui/menu.go | 9 ++++----- internal/ui/switcher.go | 9 ++++++--- internal/x11/wm/switcher.go | 35 +++++++++++++++-------------------- 3 files changed, 25 insertions(+), 28 deletions(-) diff --git a/internal/ui/menu.go b/internal/ui/menu.go index db3838e7..0c7e9e67 100644 --- a/internal/ui/menu.go +++ b/internal/ui/menu.go @@ -51,10 +51,8 @@ func (w *widgetPanel) appendAppCategories(acc *widget.Accordion, win fyne.Window container.NewVBox(items...))) } - fyne.Do(func() { - acc.Items = accList - acc.Refresh() - }) + acc.Items = accList + acc.Refresh() } func (w *widgetPanel) askLogout() { @@ -146,7 +144,8 @@ func (w *widgetPanel) showAccountMenu(_ fyne.CanvasObject) { for _, app := range w.desk.RecentApps() { btn := w.newAppButton(app, w2) recent = append(recent, btn) - defer w.loadIcon(app, btn) + + btn.Icon = app.Icon(w.desk.Settings().IconTheme(), int(64*w.desk.Screens().Primary().CanvasScale())) } acc := widget.NewAccordion(widget.NewAccordionItem("Recent", diff --git a/internal/ui/switcher.go b/internal/ui/switcher.go index f94cdfc5..c7b0ee23 100644 --- a/internal/ui/switcher.go +++ b/internal/ui/switcher.go @@ -227,10 +227,13 @@ func (s *Switcher) HideApply() { // HideCancel dismisses the application Switcher without changing window order. func (s *Switcher) HideCancel() { - fyne.Do(func() { + go func() { time.Sleep(time.Millisecond * 100) - s.win.Hide() - }) + + fyne.Do(func() { + s.win.Hide() + }) + }() } // Show the app switcher, it would then be hidden with HideApply or HideCancel. diff --git a/internal/x11/wm/switcher.go b/internal/x11/wm/switcher.go index 24710b45..044c86e6 100644 --- a/internal/x11/wm/switcher.go +++ b/internal/x11/wm/switcher.go @@ -48,7 +48,7 @@ func (x *x11WM) cancelAppSwitcher() { ignoreSwitcher = false }() } else { - go switcherInstance.HideCancel() + switcherInstance.HideCancel() } xproto.UngrabKeyboard(x.x.Conn(), xproto.TimeCurrentTime) @@ -60,7 +60,7 @@ func (x *x11WM) nextAppSwitcher() { return } - go switcherInstance.Next() + fyne.Do(switcherInstance.Next) } func (x *x11WM) previousAppSwitcher() { @@ -68,7 +68,7 @@ func (x *x11WM) previousAppSwitcher() { return } - go switcherInstance.Previous() + fyne.Do(switcherInstance.Previous) } func (x *x11WM) showOrSelectAppSwitcher(reverse bool) { @@ -85,32 +85,27 @@ func (x *x11WM) showOrSelectAppSwitcher(reverse bool) { if switcherInstance != nil { if reverse { - switcherInstance.Previous() + fyne.Do(switcherInstance.Previous) } else { - switcherInstance.Next() + fyne.Do(switcherInstance.Next) } return } go func() { + var win *ui.Switcher if reverse { - win := ui.NewAppSwitcherReverse(x.Windows(), fynedesk.Instance().IconProvider()) - - if ignoreSwitcher { - ignoreSwitcher = false - } else { - switcherInstance = win - win.Show() - } + win = ui.NewAppSwitcherReverse(x.Windows(), fynedesk.Instance().IconProvider()) } else { - win := ui.NewAppSwitcher(x.Windows(), fynedesk.Instance().IconProvider()) - if ignoreSwitcher { - ignoreSwitcher = false - } else { - switcherInstance = win - win.Show() - } + win = ui.NewAppSwitcher(x.Windows(), fynedesk.Instance().IconProvider()) + } + + if ignoreSwitcher { + ignoreSwitcher = false + } else { + switcherInstance = win + fyne.Do(win.Show) } }() } From f0cfc33a798d0b465356b38400b22ce657f8f240 Mon Sep 17 00:00:00 2001 From: Andy Williams Date: Sat, 1 Mar 2025 14:42:05 +0000 Subject: [PATCH 19/22] Update more deps --- go.mod | 4 ++-- go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 22afa84c..4a064124 100644 --- a/go.mod +++ b/go.mod @@ -6,9 +6,9 @@ require ( fyne.io/fyne/v2 v2.6.0-alpha1.0.20250301134653-b47b0c1141a3 github.com/BurntSushi/xgb v0.0.0-20201008132610-5f9e7b3c49cd github.com/BurntSushi/xgbutil v0.0.0-20160919175755-f7c97cef3b4e - github.com/FyshOS/appie v0.0.0-20250103211310-00f097d8e19d + github.com/FyshOS/appie v0.0.0-20250210200903-09e0fadae9b2 github.com/FyshOS/backgrounds v0.0.0-20230616202904-0a8b6ebaa184 - github.com/FyshOS/saver v0.0.0-20250125211336-528339462781 + github.com/FyshOS/saver v0.0.0-20250210195851-194e0eaf4d56 github.com/Knetic/govaluate v3.0.0+incompatible github.com/disintegration/imaging v1.6.2 github.com/godbus/dbus/v5 v5.1.0 diff --git a/go.sum b/go.sum index c50fb6a6..12db55f1 100644 --- a/go.sum +++ b/go.sum @@ -14,12 +14,12 @@ github.com/BurntSushi/toml v1.4.0 h1:kuoIxZQy2WRRk1pttg9asf+WVv6tWQuBNVmK8+nqPr0 github.com/BurntSushi/toml v1.4.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho= github.com/BurntSushi/xgb v0.0.0-20201008132610-5f9e7b3c49cd h1:u7K2oMFMd8APDV3fM1j2rO3U/XJf1g1qC3DDTKou8iM= github.com/BurntSushi/xgb v0.0.0-20201008132610-5f9e7b3c49cd/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= -github.com/FyshOS/appie v0.0.0-20250103211310-00f097d8e19d h1:bkIQPpxGMalOufoLbLDXQ/vrVwGUbtw1jbVZE8Y6nZI= -github.com/FyshOS/appie v0.0.0-20250103211310-00f097d8e19d/go.mod h1:Gtvb1fKDXbE9HjMtoYdB2MPSSGy6PdtMl0TC9dSF8q0= +github.com/FyshOS/appie v0.0.0-20250210200903-09e0fadae9b2 h1:Ex95hOld+SfPXlkCus1UYJmejIyj4I68Vmf1gyweqDk= +github.com/FyshOS/appie v0.0.0-20250210200903-09e0fadae9b2/go.mod h1:Gtvb1fKDXbE9HjMtoYdB2MPSSGy6PdtMl0TC9dSF8q0= github.com/FyshOS/backgrounds v0.0.0-20230616202904-0a8b6ebaa184 h1:Za0NHFsT0CCXf/X4hEaywjvEECccrM/xVVL8BzAy6JI= github.com/FyshOS/backgrounds v0.0.0-20230616202904-0a8b6ebaa184/go.mod h1:cOUmJ3HUVmH3W3u9Gj5hM73ZgrDxGNHKMr5T/sBKqLU= -github.com/FyshOS/saver v0.0.0-20250125211336-528339462781 h1:jGmHNeimIf4DDEe8jkoUNX9r10+qGtkUG+3PMpjGSEs= -github.com/FyshOS/saver v0.0.0-20250125211336-528339462781/go.mod h1:yIuAuYqnEyKaiNU4MD4xmyLcZl9QdDr2uTmT7lt02tI= +github.com/FyshOS/saver v0.0.0-20250210195851-194e0eaf4d56 h1:8dYR5LoiKtMPvvl75plKGBViCHn9obus5iKwHqNf4TQ= +github.com/FyshOS/saver v0.0.0-20250210195851-194e0eaf4d56/go.mod h1:Wt7jZKpGxGT8pqUUdyvCwsA/NsyDfWz3avRrcU5DXls= github.com/Knetic/govaluate v3.0.0+incompatible h1:7o6+MAPhYTCF0+fdvoz1xDedhRb4f6s9Tn1Tt7/WTEg= github.com/Knetic/govaluate v3.0.0+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0= github.com/creack/pty v1.1.21 h1:1/QdRyBaHHJP61QkWMXlOIBfsgdDeeKfK8SYVUWJKf0= From 6424cf169bfd352c7472f8677f501d1a96607847 Mon Sep 17 00:00:00 2001 From: Andy Williams Date: Sun, 2 Mar 2025 21:20:51 +0000 Subject: [PATCH 20/22] And latest terminal --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index aadc3fed..3be59fde 100644 --- a/go.mod +++ b/go.mod @@ -39,7 +39,7 @@ require ( github.com/fsnotify/fsnotify v1.7.0 // indirect github.com/fyne-io/gl-js v0.1.0 // indirect github.com/fyne-io/glfw-js v0.2.0 // indirect - github.com/fyne-io/terminal v0.0.0-20240728203942-56c3b98b9208 + github.com/fyne-io/terminal v0.0.0-20250302210544-1a7f9ea2f681 github.com/go-gl/gl v0.0.0-20231021071112-07e5d0ea2e71 // indirect github.com/go-gl/glfw/v3.3/glfw v0.0.0-20240506104042-037f3cc74f2a // indirect github.com/go-text/render v0.2.0 // indirect diff --git a/go.sum b/go.sum index 9b3dbe08..d7acc1ef 100644 --- a/go.sum +++ b/go.sum @@ -41,6 +41,8 @@ github.com/fyne-io/image v0.1.0 h1:Vm2TQJ2PWGHCf3jYi1/XroaNNMu+GfI/O2QpSbZd4XQ= github.com/fyne-io/image v0.1.0/go.mod h1:xrfYBh6yspc+KjkgdZU/ifUC9sPA5Iv7WYUBzQKK7JM= github.com/fyne-io/terminal v0.0.0-20240728203942-56c3b98b9208 h1:ZMTEq3IAv6EQv6XuMpF6KSBT+c0/ou/O9uxoQvPyA2c= github.com/fyne-io/terminal v0.0.0-20240728203942-56c3b98b9208/go.mod h1:uTxDe2dNdJWfmUAgWwG+leivgNxSfCY50t+AiNdPmiM= +github.com/fyne-io/terminal v0.0.0-20250302210544-1a7f9ea2f681 h1:OThqPVULAuWylUx5m2v3BNTIDJZ2rqGQn1kuuwTXqgY= +github.com/fyne-io/terminal v0.0.0-20250302210544-1a7f9ea2f681/go.mod h1:KiQFSJttY9GjCibmQsDxNknyl9cYmYsqi3ws+3tQfKU= github.com/fyne-io/xgbutil v0.0.0-20191220152344-7d838166824d h1:8+poQtDqiRfAZmeyYRlInuaIBsQEflmxtpJeZklvNuE= github.com/fyne-io/xgbutil v0.0.0-20191220152344-7d838166824d/go.mod h1:vPqYMuTmTyrLNDQWQXy9lqdnV+WRQn6jhaSon8TppBs= github.com/go-gl/gl v0.0.0-20231021071112-07e5d0ea2e71 h1:5BVwOaUSBTlVZowGO6VZGw2H/zl9nrd3eCZfYV+NfQA= From e56e82b7961994175a8ca31995323718fe9788b9 Mon Sep 17 00:00:00 2001 From: Andy Williams Date: Fri, 28 Mar 2025 12:01:32 +0000 Subject: [PATCH 21/22] Fix menu layout --- go.mod | 6 +++--- go.sum | 14 ++++++-------- internal/ui/menu.go | 3 +++ 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/go.mod b/go.mod index 3be59fde..bbe1726c 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module fyshos.com/fynedesk go 1.19 require ( - fyne.io/fyne/v2 v2.6.0-alpha1.0.20250301171938-b0a22071c873 + fyne.io/fyne/v2 v2.6.0-beta1.0.20250328115133-21733d97c2c4 github.com/BurntSushi/xgb v0.0.0-20201008132610-5f9e7b3c49cd github.com/BurntSushi/xgbutil v0.0.0-20160919175755-f7c97cef3b4e github.com/FyshOS/appie v0.0.0-20250210200903-09e0fadae9b2 @@ -11,6 +11,7 @@ require ( github.com/FyshOS/saver v0.0.0-20250210195851-194e0eaf4d56 github.com/Knetic/govaluate v3.0.0+incompatible github.com/disintegration/imaging v1.6.2 + github.com/fyne-io/image v0.1.1 github.com/godbus/dbus/v5 v5.1.0 github.com/mafik/pulseaudio v0.0.0-20200511091429-8449222912dd github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 @@ -19,11 +20,10 @@ require ( require ( github.com/BurntSushi/toml v1.4.0 // indirect - github.com/fyne-io/image v0.1.0 // indirect github.com/jackmordaunt/icns v1.0.1-0.20200413110149-9e181b441ab2 // indirect github.com/jeandeaual/go-locale v0.0.0-20241217141322-fcc2cadd6f08 // indirect github.com/nicksnyder/go-i18n/v2 v2.5.1 // indirect - github.com/rymdport/portal v0.3.0 // indirect + github.com/rymdport/portal v0.4.1 // indirect howett.net/plist v1.0.1 // indirect ) diff --git a/go.sum b/go.sum index d7acc1ef..1cafee0d 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,5 @@ -fyne.io/fyne/v2 v2.6.0-alpha1.0.20250301171938-b0a22071c873 h1:5MyeevqZG1Nn0Qh2SatH4GSU1ngMvNbUsuqUNJnrCBw= -fyne.io/fyne/v2 v2.6.0-alpha1.0.20250301171938-b0a22071c873/go.mod h1:Osm71ZDuJ2XM36ECf0g2FpmsnYQJj6wX0+6Ym90rAKs= +fyne.io/fyne/v2 v2.6.0-beta1.0.20250328115133-21733d97c2c4 h1:BXYJGO84Waor/sYARbHFtz4Accs6n0CnzKxWLFZg6Sc= +fyne.io/fyne/v2 v2.6.0-beta1.0.20250328115133-21733d97c2c4/go.mod h1:ON11afuS9jVyN+nfEtITv3jX1H+JD+Z50gxCiEC1zLw= fyne.io/systray v1.11.0 h1:D9HISlxSkx+jHSniMBR6fCFOUjk1x/OOOJLa9lJYAKg= fyne.io/systray v1.11.0/go.mod h1:RVwqP9nYMo7h5zViCBHri2FgjXF7H2cub7MAq4NSoLs= github.com/ActiveState/termtest/conpty v0.5.0 h1:JLUe6YDs4Jw4xNPCU+8VwTpniYOGeKzQg4SM2YHQNA8= @@ -37,10 +37,8 @@ github.com/fyne-io/gl-js v0.1.0 h1:8luJzNs0ntEAJo+8x8kfUOXujUlP8gB3QMOxO2mUdpM= github.com/fyne-io/gl-js v0.1.0/go.mod h1:ZcepK8vmOYLu96JoxbCKJy2ybr+g1pTnaBDdl7c3ajI= github.com/fyne-io/glfw-js v0.2.0 h1:8GUZtN2aCoTPNqgRDxK5+kn9OURINhBEBc7M4O1KrmM= github.com/fyne-io/glfw-js v0.2.0/go.mod h1:Ri6te7rdZtBgBpxLW19uBpp3Dl6K9K/bRaYdJ22G8Jk= -github.com/fyne-io/image v0.1.0 h1:Vm2TQJ2PWGHCf3jYi1/XroaNNMu+GfI/O2QpSbZd4XQ= -github.com/fyne-io/image v0.1.0/go.mod h1:xrfYBh6yspc+KjkgdZU/ifUC9sPA5Iv7WYUBzQKK7JM= -github.com/fyne-io/terminal v0.0.0-20240728203942-56c3b98b9208 h1:ZMTEq3IAv6EQv6XuMpF6KSBT+c0/ou/O9uxoQvPyA2c= -github.com/fyne-io/terminal v0.0.0-20240728203942-56c3b98b9208/go.mod h1:uTxDe2dNdJWfmUAgWwG+leivgNxSfCY50t+AiNdPmiM= +github.com/fyne-io/image v0.1.1 h1:WH0z4H7qfvNUw5l4p3bC1q70sa5+YWVt6HCj7y4VNyA= +github.com/fyne-io/image v0.1.1/go.mod h1:xrfYBh6yspc+KjkgdZU/ifUC9sPA5Iv7WYUBzQKK7JM= github.com/fyne-io/terminal v0.0.0-20250302210544-1a7f9ea2f681 h1:OThqPVULAuWylUx5m2v3BNTIDJZ2rqGQn1kuuwTXqgY= github.com/fyne-io/terminal v0.0.0-20250302210544-1a7f9ea2f681/go.mod h1:KiQFSJttY9GjCibmQsDxNknyl9cYmYsqi3ws+3tQfKU= github.com/fyne-io/xgbutil v0.0.0-20191220152344-7d838166824d h1:8+poQtDqiRfAZmeyYRlInuaIBsQEflmxtpJeZklvNuE= @@ -78,8 +76,8 @@ github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE github.com/pkg/profile v1.7.0 h1:hnbDkaNWPCLMO9wGLdBFTIZvzDrDfBM2072E1S9gJkA= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/rymdport/portal v0.3.0 h1:QRHcwKwx3kY5JTQcsVhmhC3TGqGQb9LFghVNUy8AdB8= -github.com/rymdport/portal v0.3.0/go.mod h1:kFF4jslnJ8pD5uCi17brj/ODlfIidOxlgUDTO5ncnC4= +github.com/rymdport/portal v0.4.1 h1:2dnZhjf5uEaeDjeF/yBIeeRo6pNI2QAKm7kq1w/kbnA= +github.com/rymdport/portal v0.4.1/go.mod h1:kFF4jslnJ8pD5uCi17brj/ODlfIidOxlgUDTO5ncnC4= github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/srwiley/oksvg v0.0.0-20221011165216-be6e8873101c h1:km8GpoQut05eY3GiYWEedbTT0qnSxrCjsVbb7yKY1KE= diff --git a/internal/ui/menu.go b/internal/ui/menu.go index 0c7e9e67..71f1534d 100644 --- a/internal/ui/menu.go +++ b/internal/ui/menu.go @@ -8,6 +8,8 @@ import ( "github.com/FyshOS/appie" + _ "github.com/fyne-io/image/xpm" + "fyne.io/fyne/v2" "fyne.io/fyne/v2/canvas" "fyne.io/fyne/v2/container" @@ -99,6 +101,7 @@ func (w *widgetPanel) askLogout() { func (w *widgetPanel) showAccountMenu(_ fyne.CanvasObject) { w2 := fyne.CurrentApp().Driver().(deskDriver.Driver).CreateSplashWindow() + w2.SetPadded(true) w2.Canvas().SetOnTypedKey(func(k *fyne.KeyEvent) { if k.Name == fyne.KeyEscape { w2.Close() From e60e14d82b35356fb78deb6c008c647db70b4faa Mon Sep 17 00:00:00 2001 From: Andy Williams Date: Wed, 2 Apr 2025 19:53:40 +0100 Subject: [PATCH 22/22] Complete upgrade to fyne 2.6.0 and innerwindow draw --- go.mod | 7 +++++-- go.sum | 14 ++++++++++---- internal/ui/settings.go | 3 ++- internal/x11/win/frame.go | 15 +++++++++------ internal/x11/win/theme.go | 29 +++++++++++++++++++++++++++++ 5 files changed, 55 insertions(+), 13 deletions(-) create mode 100644 internal/x11/win/theme.go diff --git a/go.mod b/go.mod index bbe1726c..12cc24d2 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module fyshos.com/fynedesk go 1.19 require ( - fyne.io/fyne/v2 v2.6.0-beta1.0.20250328115133-21733d97c2c4 + fyne.io/fyne/v2 v2.6.0-rc2 github.com/BurntSushi/xgb v0.0.0-20201008132610-5f9e7b3c49cd github.com/BurntSushi/xgbutil v0.0.0-20160919175755-f7c97cef3b4e github.com/FyshOS/appie v0.0.0-20250210200903-09e0fadae9b2 @@ -20,6 +20,9 @@ require ( require ( github.com/BurntSushi/toml v1.4.0 // indirect + github.com/fyne-io/oksvg v0.1.0 // indirect + github.com/hack-pad/go-indexeddb v0.3.2 // indirect + github.com/hack-pad/safejs v0.1.0 // indirect github.com/jackmordaunt/icns v1.0.1-0.20200413110149-9e181b441ab2 // indirect github.com/jeandeaual/go-locale v0.0.0-20241217141322-fcc2cadd6f08 // indirect github.com/nicksnyder/go-i18n/v2 v2.5.1 // indirect @@ -51,7 +54,7 @@ require ( github.com/srwiley/rasterx v0.0.0-20220730225603-2ab79fcdd4ef // indirect github.com/yuin/goldmark v1.7.8 // indirect golang.org/x/image v0.24.0 // indirect - golang.org/x/net v0.25.0 // indirect + golang.org/x/net v0.35.0 // indirect golang.org/x/sys v0.30.0 // indirect golang.org/x/text v0.22.0 gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/go.sum b/go.sum index 1cafee0d..00589ea9 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,5 @@ -fyne.io/fyne/v2 v2.6.0-beta1.0.20250328115133-21733d97c2c4 h1:BXYJGO84Waor/sYARbHFtz4Accs6n0CnzKxWLFZg6Sc= -fyne.io/fyne/v2 v2.6.0-beta1.0.20250328115133-21733d97c2c4/go.mod h1:ON11afuS9jVyN+nfEtITv3jX1H+JD+Z50gxCiEC1zLw= +fyne.io/fyne/v2 v2.6.0-rc2 h1:khreEwgchrCbuJBhn54yYSn38wWWHpy+VH03vt7IcYY= +fyne.io/fyne/v2 v2.6.0-rc2/go.mod h1:YZt7SksjvrSNJCwbWFV32WON3mE1Sr7L41D29qMZ/lU= fyne.io/systray v1.11.0 h1:D9HISlxSkx+jHSniMBR6fCFOUjk1x/OOOJLa9lJYAKg= fyne.io/systray v1.11.0/go.mod h1:RVwqP9nYMo7h5zViCBHri2FgjXF7H2cub7MAq4NSoLs= github.com/ActiveState/termtest/conpty v0.5.0 h1:JLUe6YDs4Jw4xNPCU+8VwTpniYOGeKzQg4SM2YHQNA8= @@ -39,6 +39,8 @@ github.com/fyne-io/glfw-js v0.2.0 h1:8GUZtN2aCoTPNqgRDxK5+kn9OURINhBEBc7M4O1KrmM github.com/fyne-io/glfw-js v0.2.0/go.mod h1:Ri6te7rdZtBgBpxLW19uBpp3Dl6K9K/bRaYdJ22G8Jk= github.com/fyne-io/image v0.1.1 h1:WH0z4H7qfvNUw5l4p3bC1q70sa5+YWVt6HCj7y4VNyA= github.com/fyne-io/image v0.1.1/go.mod h1:xrfYBh6yspc+KjkgdZU/ifUC9sPA5Iv7WYUBzQKK7JM= +github.com/fyne-io/oksvg v0.1.0 h1:7EUKk3HV3Y2E+qypp3nWqMXD7mum0hCw2KEGhI1fnBw= +github.com/fyne-io/oksvg v0.1.0/go.mod h1:dJ9oEkPiWhnTFNCmRgEze+YNprJF7YRbpjgpWS4kzoI= github.com/fyne-io/terminal v0.0.0-20250302210544-1a7f9ea2f681 h1:OThqPVULAuWylUx5m2v3BNTIDJZ2rqGQn1kuuwTXqgY= github.com/fyne-io/terminal v0.0.0-20250302210544-1a7f9ea2f681/go.mod h1:KiQFSJttY9GjCibmQsDxNknyl9cYmYsqi3ws+3tQfKU= github.com/fyne-io/xgbutil v0.0.0-20191220152344-7d838166824d h1:8+poQtDqiRfAZmeyYRlInuaIBsQEflmxtpJeZklvNuE= @@ -55,6 +57,10 @@ github.com/go-text/typesetting-utils v0.0.0-20241103174707-87a29e9e6066 h1:qCuYC github.com/godbus/dbus/v5 v5.1.0 h1:4KLkAxT3aOY8Li4FRJe/KvhoNFFxo0m6fNuFUO8QJUk= github.com/godbus/dbus/v5 v5.1.0/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/google/pprof v0.0.0-20211214055906-6f57359322fd h1:1FjCyPC+syAzJ5/2S8fqdZK1R22vvA0J7JZKcuOIQ7Y= +github.com/hack-pad/go-indexeddb v0.3.2 h1:DTqeJJYc1usa45Q5r52t01KhvlSN02+Oq+tQbSBI91A= +github.com/hack-pad/go-indexeddb v0.3.2/go.mod h1:QvfTevpDVlkfomY498LhstjwbPW6QC4VC/lxYb0Kom0= +github.com/hack-pad/safejs v0.1.0 h1:qPS6vjreAqh2amUqj4WNG1zIw7qlRQJ9K10eDKMCnE8= +github.com/hack-pad/safejs v0.1.0/go.mod h1:HdS+bKF1NrE72VoXZeWzxFOVQVUSqZJAG0xNCnb+Tio= github.com/jackmordaunt/icns v1.0.1-0.20200413110149-9e181b441ab2 h1:2bRhR5GcMudCdaY4p8ip89hsvSyxYehLSicCNtygyVY= github.com/jackmordaunt/icns v1.0.1-0.20200413110149-9e181b441ab2/go.mod h1:Hj3TV9xrdt+g9apvBagVi/VzE41gSliEBypxaQDq5QA= github.com/jeandeaual/go-locale v0.0.0-20241217141322-fcc2cadd6f08 h1:wMeVzrPO3mfHIWLZtDcSaGAe2I4PW9B/P5nMkRSwCAc= @@ -91,8 +97,8 @@ github.com/yuin/goldmark v1.7.8/go.mod h1:uzxRWxtg69N339t3louHJ7+O03ezfj6PlliRla golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/image v0.24.0 h1:AN7zRgVsbvmTfNyqIbbOraYL8mSwcKncEj8ofjgzcMQ= golang.org/x/image v0.24.0/go.mod h1:4b/ITuLfqYq1hqZcjofwctIhi7sZh2WaCjvsBNjjya8= -golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac= -golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= +golang.org/x/net v0.35.0 h1:T5GQRQb2y08kTAByq9L4/bz8cipCdA8FbRTXewonqY8= +golang.org/x/net v0.35.0/go.mod h1:EglIi67kWsHKlRzzVMUD93VMSWGFOMSZgxFjparz1Qk= golang.org/x/sys v0.0.0-20200428200454-593003d681fa/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc= golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= diff --git a/internal/ui/settings.go b/internal/ui/settings.go index 78914be2..3906663f 100644 --- a/internal/ui/settings.go +++ b/internal/ui/settings.go @@ -107,10 +107,11 @@ func (d *deskSettings) AddChangeListener(listener func(fynedesk.DeskSettings)) { func (d *deskSettings) apply() { d.listenerLock.Lock() + listeners := d.changeListeners defer d.listenerLock.Unlock() fyne.Do(func() { - for _, listener := range d.changeListeners { + for _, listener := range listeners { listener(d) } }) diff --git a/internal/x11/win/frame.go b/internal/x11/win/frame.go index f84b85ad..79c32b60 100644 --- a/internal/x11/win/frame.go +++ b/internal/x11/win/frame.go @@ -17,6 +17,7 @@ import ( "github.com/BurntSushi/xgbutil/xwindow" "fyne.io/fyne/v2" + "fyne.io/fyne/v2/container" "fyne.io/fyne/v2/driver/desktop" "fyne.io/fyne/v2/driver/software" "fyne.io/fyne/v2/test" @@ -318,7 +319,7 @@ func (f *frame) createPixmaps(depth byte) error { backR, backG, backB, _ := theme.Color(theme.ColorNameDisabledButton).RGBA() if f.client.Focused() { - backR, backG, backB, _ = theme.Color(theme.ColorNameBackground).RGBA() + backR, backG, backB, _ = theme.Color(theme.ColorNameOverlayBackground).RGBA() } bgColor := uint32(uint8(backR))<<16 | uint32(uint8(backG))<<8 | uint32(uint8(backB)) @@ -377,13 +378,15 @@ func (f *frame) drawDecoration(pidTop xproto.Pixmap, drawTop xproto.Gcontext, pi } if f.canvas == nil { - canvas := software.NewCanvas() - canvas.SetPadded(false) + cnv := software.NewCanvas() + cnv.SetPadded(false) - canvas.SetContent(wm.NewBorder(f.client, f.client.Properties().Icon(), canMaximize)) - f.canvas = canvas + b := wm.NewBorder(f.client, f.client.Properties().Icon(), canMaximize) + trans := &transparentTheme{Theme: theme.DefaultTheme(), frame: f} + cnv.SetContent(container.NewThemeOverride(b, trans)) + f.canvas = cnv } else { - b := f.canvas.Content().(*wm.Border) + b := f.canvas.Content().(*container.ThemeOverride).Content.(*wm.Border) b.CloseIntercept = func() { f.client.Close() } diff --git a/internal/x11/win/theme.go b/internal/x11/win/theme.go new file mode 100644 index 00000000..8b43ce9d --- /dev/null +++ b/internal/x11/win/theme.go @@ -0,0 +1,29 @@ +package win + +import ( + "image/color" + + "fyne.io/fyne/v2" + "fyne.io/fyne/v2/theme" +) + +type transparentTheme struct { + fyne.Theme + + frame *frame +} + +func (t *transparentTheme) Color(n fyne.ThemeColorName, v fyne.ThemeVariant) color.Color { + switch n { + case theme.ColorNameShadow: + return color.Transparent + case theme.ColorNameBackground, theme.ColorNameOverlayBackground: + if t.frame.client.Focused() { + n = theme.ColorNameOverlayBackground + } else { + n = theme.ColorNameDisabledButton + } + } + + return t.Theme.Color(n, v) +}