Merge pull request #131 from nwg-piotr/calc

add a simple calculator in the search box

README.md

@@ -206,6 +206,12 @@ You may want to exclude some paths inside your XDG user directories from searchi
 node_modules
 ```
 
+### Calculations in the search box
+
+If the search box is not empty, and you press Enter, the search box content will be evaluated as an arithmetic operation.
+If the result is not an error, it will be displayed in a small window, and copied to the clipboard with wl-copy.
+Press any key to close the window.
+
 ## Credits
 
 This program uses some great libraries:
@@ -217,3 +223,4 @@ Copyright (c) 2015-2018 gotk3 contributors
 - [go-singleinstance](github.com/allan-simon/go-singleinstance) Copyright (c) 2015 Allan Simon
 - [logrus](https://github.com/sirupsen/logrus) Copyright (c) 2014 Simon Eskildsen
 - [fsnotify](https://github.com/fsnotify/fsnotify) Copyright (c) 2012-2019 fsnotify Authors
+- [expr](https://github.com/expr-lang/expr) Copyright (c) 2018 Anton Medvedev

go.mod

@@ -1,19 +1,20 @@
 module github.com/nwg-piotr/nwg-drawer
 
-go 1.22
+go 1.23
 
 require (
 	github.com/allan-simon/go-singleinstance v0.0.0-20210120080615-d0997106ab37
 	github.com/dlasky/gotk3-layershell v0.0.0-20240515133811-5c5115f0d774
 	github.com/fsnotify/fsnotify v1.7.0
-	github.com/gotk3/gotk3 v0.6.3
+	github.com/gotk3/gotk3 v0.6.5-0.20240618185848-ff349ae13f56
 	github.com/joshuarubin/go-sway v1.2.0
 	github.com/sirupsen/logrus v1.9.3
 )
 
 require (
+	github.com/expr-lang/expr v1.16.9 // indirect
 	github.com/joshuarubin/lifecycle v1.1.4 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
-	golang.org/x/sync v0.7.0 // indirect
-	golang.org/x/sys v0.21.0 // indirect
+	golang.org/x/sync v0.8.0 // indirect
+	golang.org/x/sys v0.25.0 // indirect
 )

go.sum

@@ -3,23 +3,15 @@ github.com/allan-simon/go-singleinstance v0.0.0-20210120080615-d0997106ab37/go.m
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/dlasky/gotk3-layershell v0.0.0-20221218201547-1f6674a3f872 h1:16qcNl+UgbvudN7wPv+zq4mmDSYJWdLv5jbVhS7+OVI=
-github.com/dlasky/gotk3-layershell v0.0.0-20221218201547-1f6674a3f872/go.mod h1:JHLx2Wz4mAPVwn4PFhC69ydwyHP4A3wQvlg7HKVVc1U=
-github.com/dlasky/gotk3-layershell v0.0.0-20230802002603-b0c42cd8474f h1:qDnUQAD7tVX/gnL6uSgouzfGNA4xXH+B/fd6Ko19GgM=
-github.com/dlasky/gotk3-layershell v0.0.0-20230802002603-b0c42cd8474f/go.mod h1:JHLx2Wz4mAPVwn4PFhC69ydwyHP4A3wQvlg7HKVVc1U=
 github.com/dlasky/gotk3-layershell v0.0.0-20240515133811-5c5115f0d774 h1:o87OVL4olQBlVwN3+NSVQpS6gj9FWUYtxOfHXWZigUE=
 github.com/dlasky/gotk3-layershell v0.0.0-20240515133811-5c5115f0d774/go.mod h1:JHLx2Wz4mAPVwn4PFhC69ydwyHP4A3wQvlg7HKVVc1U=
-github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY=
-github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw=
+github.com/expr-lang/expr v1.16.9 h1:WUAzmR0JNI9JCiF0/ewwHB1gmcGw5wW7nWt8gc6PpCI=
+github.com/expr-lang/expr v1.16.9/go.mod h1:8/vRC7+7HBzESEqt5kKpYXxrxkr31SaO8r40VO/1IT4=
 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/gotk3/gotk3 v0.6.1/go.mod h1:/hqFpkNa9T3JgNAE2fLvCdov7c5bw//FHNZrZ3Uv9/Q=
-github.com/gotk3/gotk3 v0.6.2 h1:sx/PjaKfKULJPTPq8p2kn2ZbcNFxpOJqi4VLzMbEOO8=
-github.com/gotk3/gotk3 v0.6.2/go.mod h1:/hqFpkNa9T3JgNAE2fLvCdov7c5bw//FHNZrZ3Uv9/Q=
-github.com/gotk3/gotk3 v0.6.3 h1:+Ke4WkM1TQUNOlM2TZH6szqknqo+zNbX3BZWVXjSHYw=
-github.com/gotk3/gotk3 v0.6.3/go.mod h1:/hqFpkNa9T3JgNAE2fLvCdov7c5bw//FHNZrZ3Uv9/Q=
-github.com/gotk3/gotk3 v0.6.4 h1:5ur/PRr86PwCG8eSj98D1eXvhrNNK6GILS2zq779dCg=
-github.com/gotk3/gotk3 v0.6.4/go.mod h1:/hqFpkNa9T3JgNAE2fLvCdov7c5bw//FHNZrZ3Uv9/Q=
+github.com/gotk3/gotk3 v0.6.5-0.20240618185848-ff349ae13f56 h1:eR+xxC8qqKuPMTucZqaklBxLIT7/4L7dzhlwKMrDbj8=
+github.com/gotk3/gotk3 v0.6.5-0.20240618185848-ff349ae13f56/go.mod h1:/hqFpkNa9T3JgNAE2fLvCdov7c5bw//FHNZrZ3Uv9/Q=
 github.com/joshuarubin/go-sway v1.2.0 h1:t3eqW504//uj9PDwFf0+IVfkD+WoOGaDX5gYIe0BHyM=
 github.com/joshuarubin/go-sway v1.2.0/go.mod h1:qcDd6f25vJ0++wICwA1BainIcRC67p2Mb4lsrZ0k3/k=
 github.com/joshuarubin/lifecycle v1.0.0/go.mod h1:sRy++ATvR9Ee21tkRdFkQeywAWvDsue66V70K0Dnl54=
@@ -38,26 +30,16 @@ go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/
 go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
 go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
 golang.org/x/sync v0.0.0-20190412183630-56d357773e84/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E=
-golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
-golang.org/x/sync v0.5.0 h1:60k92dhOjHxJkrqnwsfl8KuaHbn/5dl0lUPUklKo3qE=
-golang.org/x/sync v0.5.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
-golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ=
-golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
 golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ=
+golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA=
-golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q=
-golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU=
-golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y=
-golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws=
 golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34=
+golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/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=

main.go

@@ -3,6 +3,7 @@ package main
 import (
 	"flag"
 	"fmt"
+	"github.com/expr-lang/expr"
 	"os"
 	"os/signal"
 	"path"
@@ -21,7 +22,7 @@ import (
 	"github.com/gotk3/gotk3/gtk"
 )
 
-const version = "0.4.9"
+const version = "0.5.1"
 
 var (
 	appDirs          []string
@@ -171,7 +172,7 @@ var itemSpacing = flag.Uint("spacing", 20, "icon spacing")
 var lang = flag.String("lang", "", "force lang, e.g. \"en\", \"pl\"")
 var fileManager = flag.String("fm", "thunar", "File Manager")
 var term = flag.String("term", defaultTermIfBlank(os.Getenv("TERM"), "foot"), "Terminal emulator")
-var wm = flag.String("wm", "", "use swaymsg exec (with 'sway' argument) or hyprctl dispatch exec (with 'hyprland') to launch programs")
+var wm = flag.String("wm", "", "use swaymsg exec (with 'sway' argument) or hyprctl dispatch exec (with 'hyprland') or riverctl spawn (with 'river') to launch programs")
 var nameLimit = flag.Int("fslen", 80, "File Search name LENgth Limit")
 var noCats = flag.Bool("nocats", false, "Disable filtering by category")
 var noFS = flag.Bool("nofs", false, "Disable file search")
@@ -419,7 +420,6 @@ func main() {
 	err = cssProvider.LoadFromPath(*cssFileName)
 	if err != nil {
 		log.Errorf("ERROR: %s css file not found or erroneous. Using GTK styling.", *cssFileName)
-		log.Errorf("%s", err)
 	} else {
 		log.Info(fmt.Sprintf("Using style from %s", *cssFileName))
 		screen, _ := gdk.ScreenGetDefault()
@@ -438,7 +438,7 @@ func main() {
 		if *targetOutput != "" {
 			// We want to assign layershell to a monitor, but we only know the output name!
 			output2mon, err = mapOutputs()
-			fmt.Println(">>>", output2mon)
+			log.Debugf("output2mon: %s", output2mon)
 			if err == nil {
 				monitor := output2mon[*targetOutput]
 				layershell.SetMonitor(win, monitor)
@@ -494,12 +494,26 @@ func main() {
 				}
 			}
 			return true
+
 		} else if key.KeyVal() == gdk.KEY_Tab {
 			if firstPowerBtn != nil {
 				firstPowerBtn.ToWidget().GrabFocus()
 			}
+
+		} else if key.KeyVal() == gdk.KEY_Return {
+			s, _ := searchEntry.GetText()
+			if s != "" {
+				// Check if the search box content is an arithmetic expression. If so, display the result
+				// and copy to the clipboard with wl-copy.
+				result, err := expr.Eval(s, nil)
+				if err == nil {
+					log.Debugf("Setting up mathemathical operation result window. Operation: %s, result: %v", s, result)
+					setUpOperationResultWindow(s, fmt.Sprintf("%v", result))
 				}
-		return false
+			}
+			return true
+		}
+		return true
 	})
 
 	win.Connect("key-press-event", func(_ *gtk.Window, event *gdk.Event) bool {
@@ -513,8 +527,8 @@ func main() {
 			if !searchEntry.IsFocus() {
 				searchEntry.GrabFocusWithoutSelecting()
 			}
-			return false
 		}
+		return false
 	})
 
 	/*

tools.go

@@ -571,7 +571,7 @@ func savePinned() {
 	}
 }
 
-func launch(command string, terminal bool) {
+func launch(command string, terminal bool, terminate bool) {
 	// trim % and everything afterwards
 	if strings.Contains(command, "%") {
 		cutAt := strings.Index(command, "%")
@@ -611,9 +611,11 @@ func launch(command string, terminal bool) {
 		cmd = exec.Command("swaymsg", "exec", strings.Join(elements, " "))
 	} else if *wm == "hyprland" || *wm == "Hyprland" {
 		cmd = exec.Command("hyprctl", "dispatch", "exec", strings.Join(elements, " "))
+	} else if *wm == "river" {
+		cmd = exec.Command("riverctl", "spawn", strings.Join(elements, " "))
 	}
 
-	msg := fmt.Sprintf("command: %q; args: %q\n", cmd.Args[0], cmd.Args[1:])
+	msg := fmt.Sprintf("Executing command: %q; args: %q\n", cmd.Args[0], cmd.Args[1:])
 	log.Info(msg)
 
 	cmd.SysProcAttr = &syscall.SysProcAttr{
@@ -630,11 +632,13 @@ func launch(command string, terminal bool) {
 		}()
 	}
 
+	if terminate {
 		if *resident {
 			restoreStateAndHide()
 		} else {
 			gtk.MainQuit()
 		}
+	}
 }
 
 func open(filePath string, xdgOpen bool) {
@@ -687,14 +691,9 @@ func mapOutputs() (map[string]*gdk.Monitor, error) {
 			num := display.GetNMonitors()
 			for i := 0; i < num; i++ {
 				mon, _ := display.GetMonitor(i)
-				geometry := mon.GetGeometry()
-				// assign output to monitor on the basis of the same x, y coordinates
-				for _, output := range hyprlandMonitors {
-					if int(output.X) == geometry.GetX() && int(output.Y) == geometry.GetY() {
+				output := hyprlandMonitors[i]
 				result[output.Name] = mon
 			}
-				}
-			}
 		} else {
 			return nil, err
 		}
@@ -721,14 +720,9 @@ func mapOutputs() (map[string]*gdk.Monitor, error) {
 		num := display.GetNMonitors()
 		for i := 0; i < num; i++ {
 			mon, _ := display.GetMonitor(i)
-			geometry := mon.GetGeometry()
-			// assign output to monitor on the basis of the same x, y coordinates
-			for _, output := range outputs {
-				if int(output.Rect.X) == geometry.GetX() && int(output.Rect.Y) == geometry.GetY() {
+			output := outputs[i]
 			result[output.Name] = mon
 		}
-			}
-		}
 	} else {
 		return nil, errors.New("output assignment only supported on sway and Hyprland")
 	}
@@ -754,7 +748,15 @@ func substring(s string, start int, end int) string {
 
 func hyprctl(cmd string) ([]byte, error) {
 	his := os.Getenv("HYPRLAND_INSTANCE_SIGNATURE")
-	socketFile := fmt.Sprintf("/tmp/hypr/%s/.socket.sock", his)
+	xdgRuntimeDir := os.Getenv("XDG_RUNTIME_DIR")
+	hyprDir := ""
+	if xdgRuntimeDir != "" {
+		hyprDir = fmt.Sprintf("%s/hypr", xdgRuntimeDir)
+	} else {
+		hyprDir = "/tmp/hypr"
+	}
+
+	socketFile := fmt.Sprintf("%s/%s/.socket.sock", hyprDir, his)
 	conn, err := net.Dial("unix", socketFile)
 	if err != nil {
 		return nil, err

uicomponents.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"fmt"
+	"github.com/dlasky/gotk3-layershell/layershell"
 	"io/fs"
 	"path/filepath"
 	"strings"
@@ -66,7 +67,7 @@ func setUpPinnedFlowBox() *gtk.FlowBox {
 			btn.Connect("button-release-event", func(row *gtk.Button, e *gdk.Event) bool {
 				btnEvent := gdk.EventButtonNewFromEvent(e)
 				if btnEvent.Button() == 1 {
-					launch(entry.Exec, entry.Terminal)
+					launch(entry.Exec, entry.Terminal, true)
 					return true
 				} else if btnEvent.Button() == 3 {
 					unpinItem(entry.DesktopID)
@@ -75,7 +76,7 @@ func setUpPinnedFlowBox() *gtk.FlowBox {
 				return false
 			})
 			btn.Connect("activate", func() {
-				launch(entry.Exec, entry.Terminal)
+				launch(entry.Exec, entry.Terminal, true)
 			})
 			btn.Connect("enter-notify-event", func() {
 				statusLabel.SetText(entry.CommentLoc)
@@ -274,7 +275,7 @@ func flowBoxButton(entry desktopEntry) *gtk.Button {
 		btnEvent := gdk.EventButtonNewFromEvent(e)
 		if btnEvent.Button() == 1 {
 			if !beenScrolled {
-				launch(exec, terminal)
+				launch(exec, terminal, true)
 				return true
 			}
 		} else if btnEvent.Button() == 3 {
@@ -284,7 +285,7 @@ func flowBoxButton(entry desktopEntry) *gtk.Button {
 		return false
 	})
 	button.Connect("activate", func() {
-		launch(exec, terminal)
+		launch(exec, terminal, true)
 	})
 	button.Connect("enter-notify-event", func() {
 		statusLabel.SetText(desc)
@@ -322,13 +323,13 @@ func powerButton(iconPathOrName, command string) *gtk.Button {
 	button.Connect("button-release-event", func(btn *gtk.Button, e *gdk.Event) bool {
 		btnEvent := gdk.EventButtonNewFromEvent(e)
 		if btnEvent.Button() == 1 {
-			launch(command, false)
+			launch(command, false, true)
 			return true
 		}
 		return false
 	})
 	button.Connect("activate", func() {
-		launch(command, false)
+		launch(command, false, true)
 	})
 	button.Connect("enter-notify-event", func() {
 		statusLabel.SetText(command)
@@ -584,3 +585,53 @@ func setUpUserFileSearchResultButton(fileName, filePath string) *gtk.Box {
 	box.PackStart(button, false, true, 0)
 	return box
 }
+
+func setUpOperationResultWindow(operation string, result string) {
+	win, err := gtk.WindowNew(gtk.WINDOW_TOPLEVEL)
+	if err != nil {
+		log.Fatal("Unable to create result window:", err)
+	}
+	win.SetModal(true)
+
+	if wayland() {
+		layershell.InitForWindow(win)
+		layershell.SetLayer(win, layershell.LAYER_SHELL_LAYER_OVERLAY)
+		layershell.SetKeyboardMode(win, layershell.LAYER_SHELL_KEYBOARD_MODE_EXCLUSIVE)
+	}
+
+	// any key to close the window
+	win.Connect("key-release-event", func(_ *gtk.Window, event *gdk.Event) bool {
+		win.Destroy()
+		return true
+	})
+
+	// any button to close the window
+	win.Connect("button-release-event", func(_ *gtk.Window, event *gdk.Event) bool {
+		win.Destroy()
+		return true
+	})
+
+	outerVBox, _ := gtk.BoxNew(gtk.ORIENTATION_VERTICAL, 6)
+	win.Add(outerVBox)
+
+	vBox, _ := gtk.BoxNew(gtk.ORIENTATION_HORIZONTAL, 5)
+	outerVBox.PackStart(vBox, true, true, 6)
+	lbl, _ := gtk.LabelNew(fmt.Sprintf("%s = %s", operation, result))
+	vBox.PackStart(lbl, true, true, 12)
+
+	mRefProvider, _ := gtk.CssProviderNew()
+	css := "window { background-color: rgba (0, 0, 0, 255); color: #fff; font-weight: bold; border: solid 1px grey; border-radius: 5px}"
+	err = mRefProvider.LoadFromData(css)
+	if err != nil {
+		log.Warn(err)
+	}
+	ctx, _ := win.GetStyleContext()
+	ctx.AddProvider(mRefProvider, gtk.STYLE_PROVIDER_PRIORITY_APPLICATION)
+
+	win.ShowAll()
+
+	if wayland() {
+		cmd := fmt.Sprintf("wl-copy %v", result)
+		launch(cmd, false, false)
+	}
+}