oliver/nwg-drawer
Public Access
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use a channel and a goroutine instead of busy polling a boolean flag to reduce cpu consumption

Browse Source
This commit is contained in:
Raphael Ludwig
2022-02-13 23:21:21 +01:00
parent b781f58097
commit 058f8684aa
1 changed files with 44 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
main.go
View File

@@ -100,7 +100,6 @@ var (
statusLabel *gtk.Label statusLabel *gtk.Label
status string status string
ignore string ignore string
showWindowTrigger bool
desktopTrigger bool desktopTrigger bool
pinnedTrigger bool pinnedTrigger bool
) )
@@ -148,6 +147,7 @@ func main() {
// Gentle SIGTERM handler thanks to reiki4040 https://gist.github.com/reiki4040/be3705f307d3cd136e85 // Gentle SIGTERM handler thanks to reiki4040 https://gist.github.com/reiki4040/be3705f307d3cd136e85
// v0.2: we also need to support SIGUSR from now on // v0.2: we also need to support SIGUSR from now on
showWindowChannel := make(chan interface{}, 1)
signalChan := make(chan os.Signal, 1) signalChan := make(chan os.Signal, 1)
signal.Notify(signalChan, syscall.SIGTERM, syscall.SIGUSR1) signal.Notify(signalChan, syscall.SIGTERM, syscall.SIGUSR1)
@@ -164,7 +164,7 @@ func main() {
// let's just set e helper variable here. We'll be checking it with glib.TimeoutAdd. // let's just set e helper variable here. We'll be checking it with glib.TimeoutAdd.
if !win.IsVisible() { if !win.IsVisible() {
log.Debug("SIGUSR1 received, showing the window") log.Debug("SIGUSR1 received, showing the window")
showWindowTrigger = true showWindowChannel <- struct{}{}
} else { } else {
log.Debug("SIGUSR1 received, hiding the window") log.Debug("SIGUSR1 received, hiding the window")
restoreStateAndHide() restoreStateAndHide()
@@ -492,41 +492,51 @@ func main() {
log.Info(fmt.Sprintf("UI created in %v ms. Thank you for your patience.", t.Sub(timeStart).Milliseconds())) log.Info(fmt.Sprintf("UI created in %v ms. Thank you for your patience.", t.Sub(timeStart).Milliseconds()))
// Check if showing the window has been requested (SIGUSR1) // Check if showing the window has been requested (SIGUSR1)
glib.TimeoutAdd(uint(1), func() bool { go func() {
if showWindowTrigger && win != nil && !win.IsVisible() { for {
win.ShowAll() <-showWindowChannel
if fileSearchResultWrapper != nil {
fileSearchResultWrapper.Hide() log.Debug("SHOW WINDOW")
} glib.TimeoutAdd(0, func() bool {
// focus 1st element if win != nil && !win.IsVisible() {
b := appFlowBox.GetChildAtIndex(0)
if b != nil { // Refresh files before displaying the root window
button, err := b.GetChild() // some .desktop file changed
if err == nil { if desktopTrigger {
button.ToWidget().GrabFocus() log.Debug(".desktop file changed")
desktopFiles = listDesktopFiles()
status = parseDesktopFiles(desktopFiles)
appFlowBox = setUpAppsFlowBox(nil, "")
desktopTrigger = false
}
// pinned file changed
if pinnedTrigger {
log.Debug("pinned file changed")
pinnedTrigger = false
pinned, _ = loadTextFile(pinnedFile)
pinnedFlowBox = setUpPinnedFlowBox()
}
// Show window and focus the search box
win.ShowAll()
if fileSearchResultWrapper != nil {
fileSearchResultWrapper.Hide()
}
// focus 1st element
b := appFlowBox.GetChildAtIndex(0)
if b != nil {
button, err := b.GetChild()
if err == nil {
button.ToWidget().GrabFocus()
}
}
} }
}
}
showWindowTrigger = false
// some .desktop file changed return false
if desktopTrigger { })
log.Debug(".desktop file changed")
desktopFiles = listDesktopFiles()
status = parseDesktopFiles(desktopFiles)
appFlowBox = setUpAppsFlowBox(nil, "")
desktopTrigger = false
} }
}()
// pinned file changed
if pinnedTrigger {
log.Debug("pinned file changed")
pinnedTrigger = false
pinned, _ = loadTextFile(pinnedFile)
pinnedFlowBox = setUpPinnedFlowBox()
}
return true
})
go watchFiles() go watchFiles()