Merge branch 'dev' for release v3.1.1 (rebuild)

Author: AandStep

build-linux.sh

@@ -52,7 +52,10 @@ if command -v linuxdeploy >/dev/null 2>&1; then
   rm -rf "$APPDIR"
   mkdir -p "$APPDIR/usr/bin" "$APPDIR/usr/share/applications" "$APPDIR/usr/share/icons/hicolor/512x512/apps"
   cp "$BIN_PATH" "$APPDIR/usr/bin/resultv"
-  cp build/linux/resultv.desktop "$APPDIR/usr/share/applications/resultv.desktop"
+  # AppImage requires Exec= to be a relative command (just "resultv"),
+  # not the absolute /usr/bin/resultv used by the .deb/.rpm packages.
+  sed 's|^Exec=.*|Exec=resultv %u|' build/linux/resultv.desktop \
+    > "$APPDIR/usr/share/applications/resultv.desktop"
   cp public/logo.png "$APPDIR/usr/share/icons/hicolor/512x512/apps/resultv.png"
   ARCH=x86_64 linuxdeploy --appdir "$APPDIR" --output appimage --desktop-file "$APPDIR/usr/share/applications/resultv.desktop"
   mv ResultV*.AppImage "$OUT_DIR/" 2>/dev/null || true

internal/getlantern_systray/systray_darwin.go

@@ -26,25 +26,95 @@ import (
 	"unsafe"
 )
 
+func registerSystray() {
+	C.registerSystray()
+}
 
+func nativeLoop() {
+	C.nativeLoop()
+}
 
+func quit() {
+	C.quit()
+}
 
+func SetIcon(iconBytes []byte) {
+	cstr := (*C.char)(unsafe.Pointer(&iconBytes[0]))
+	C.setIcon(cstr, (C.int)(len(iconBytes)), false)
+}
 
-func SetTemplateIcon(templateIconBytes []byte, regularIconBytes []byte) {
-	cstr := (*C.char)(unsafe.Pointer(&templateIconBytes[0]))
-	C.setIcon(cstr, (C.int)(len(templateIconBytes)), true)
+func SetTitle(title string) {
+	C.setTitle(C.CString(title))
 }
 
+func SetTooltip(tooltip string) {
+	C.setTooltip(C.CString(tooltip))
+}
 
+func addOrUpdateMenuItem(item *MenuItem) {
+	var disabled C.short
+	if item.disabled {
+		disabled = 1
+	}
+	var checked C.short
+	if item.checked {
+		checked = 1
+	}
+	var isCheckable C.short
+	if item.isCheckable {
+		isCheckable = 1
+	}
+	var parentID uint32 = 0
+	if item.parent != nil {
+		parentID = item.parent.id
+	}
+	C.add_or_update_menu_item(
+		C.int(item.id),
+		C.int(parentID),
+		C.CString(item.title),
+		C.CString(item.tooltip),
+		disabled,
+		checked,
+		isCheckable,
+	)
+}
 
-func (item *MenuItem) SetIcon(iconBytes []byte) {
-	cstr := (*C.char)(unsafe.Pointer(&iconBytes[0]))
-	C.setMenuItemIcon(cstr, (C.int)(len(iconBytes)), C.int(item.id), false)
+func addSeparator(id uint32) {
+	C.add_separator(C.int(id))
 }
 
+func hideMenuItem(item *MenuItem) {
+	C.hide_menu_item(C.int(item.id))
+}
 
+func showMenuItem(item *MenuItem) {
+	C.show_menu_item(C.int(item.id))
+}
 
+//export systray_ready
+func systray_ready() {
+	systrayReady()
+}
+
+//export systray_on_exit
+func systray_on_exit() {
+	systrayExit()
+}
+
+//export systray_menu_item_selected
+func systray_menu_item_selected(cID C.int) {
+	systrayMenuItemSelected(uint32(cID))
+}
+
+func SetTemplateIcon(templateIconBytes []byte, regularIconBytes []byte) {
+	cstr := (*C.char)(unsafe.Pointer(&templateIconBytes[0]))
+	C.setIcon(cstr, (C.int)(len(templateIconBytes)), true)
+}
 
+func (item *MenuItem) SetIcon(iconBytes []byte) {
+	cstr := (*C.char)(unsafe.Pointer(&iconBytes[0]))
+	C.setMenuItemIcon(cstr, (C.int)(len(iconBytes)), C.int(item.id), false)
+}
 
 func (item *MenuItem) SetTemplateIcon(templateIconBytes []byte, regularIconBytes []byte) {
 	cstr := (*C.char)(unsafe.Pointer(&templateIconBytes[0]))

internal/getlantern_systray/systray_nonwindows.go

@@ -13,8 +13,8 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-// +build !windows
-
+// +build !windows,!darwin
+//go:build !windows && !darwin
 
 package systray