Add webkitgtk6 option

v2/internal/frontend/desktop/linux/clipboard.go

@@ -4,24 +4,56 @@
 package linux
 
 /*
-#cgo linux pkg-config: gtk+-3.0
-#cgo !webkit2_41 pkg-config: webkit2gtk-4.0
+#cgo webkit_6 CFLAGS: -DWEBKIT_6
+#cgo !webkit_6 pkg-config: gtk+-3.0
+#cgo webkit_6 pkg-config: gtk4
+#cgo !(webkit2_41 || webkit_6) pkg-config: webkit2gtk-4.0
 #cgo webkit2_41 pkg-config: webkit2gtk-4.1
+#cgo webkit_6 pkg-config: webkitgtk-6.0
 
 #include "gtk/gtk.h"
+
+#ifdef WEBKIT_6
+#include "webkit/webkit.h"
+#else
 #include "webkit2/webkit2.h"
+#endif
 
 static gchar* GetClipboardText() {
-	GtkClipboard *clip = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);
-	return gtk_clipboard_wait_for_text(clip);
+	#ifdef WEBKIT_6
+		GdkClipboard *clip = gdk_display_get_primary_clipboard(gdk_display_get_default());
+		GdkContentProvider *provider = gdk_clipboard_get_content(clip);
+
+		GValue value = G_VALUE_INIT;
+		g_value_init(&value, G_TYPE_STRING);
+
+		if(!gdk_content_provider_get_value(provider, &value, NULL)) {
+			return "";
+		}
+
+		return g_value_get_string(&value);
+	#else
+		GtkClipboard *clip = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);
+		return gtk_clipboard_wait_for_text(clip);
+	#endif
 }
 
 static void SetClipboardText(gchar* text) {
-	GtkClipboard *clip = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);
-	gtk_clipboard_set_text(clip, text, -1);
+	#ifdef WEBKIT_6
+		GdkDisplay *display = gdk_display_get_default();
+
+		GdkClipboard *clip = gdk_display_get_primary_clipboard(display);
+		gdk_clipboard_set_text(clip, text);
+
+		clip = gdk_display_get_clipboard(display);
+		gdk_clipboard_set_text(clip, text);
+	#else
+		GtkClipboard *clip = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);
+		gtk_clipboard_set_text(clip, text, -1);
 
-	clip = gtk_clipboard_get(GDK_SELECTION_PRIMARY);
-	gtk_clipboard_set_text(clip, text, -1);
+		clip = gtk_clipboard_get(GDK_SELECTION_PRIMARY);
+		gtk_clipboard_set_text(clip, text, -1);
+	#endif
 }
 */
 import "C"

v2/internal/frontend/desktop/linux/frontend.go

@@ -4,12 +4,20 @@
 package linux
 
 /*
-#cgo linux pkg-config: gtk+-3.0
-#cgo !webkit2_41 pkg-config: webkit2gtk-4.0
+#cgo webkit_6 CFLAGS: -DWEBKIT_6
+#cgo !webkit_6 pkg-config: gtk+-3.0
+#cgo webkit_6 pkg-config: gtk4
+#cgo !(webkit2_41 || webkit_6) pkg-config: webkit2gtk-4.0
 #cgo webkit2_41 pkg-config: webkit2gtk-4.1
+#cgo webkit_6 pkg-config: webkitgtk-6.0
 
 #include "gtk/gtk.h"
+
+#ifdef WEBKIT_6
+#include "webkit/webkit.h"
+#else
 #include "webkit2/webkit2.h"
+#endif
 
 // CREDIT: https://github.com/rainycape/magick
 #include <errno.h>
@@ -130,7 +138,7 @@ type Frontend struct {
 }
 
 func (f *Frontend) RunMainLoop() {
-	C.gtk_main()
+	runMainLoop()
 }
 
 func (f *Frontend) WindowClose() {
@@ -146,7 +154,7 @@ func NewFrontend(ctx context.Context, appoptions *options.App, myLogger *logger.
 			_ = os.Setenv("GDK_BACKEND", "x11")
 		}
 
-		if ok := C.gtk_init_check(nil, nil); ok != 1 {
+		if ok := initGtk(); ok != 1 {
 			panic(errors.New("failed to init GTK"))
 		}
 	})
@@ -419,17 +427,6 @@ func (f *Frontend) Notify(name string, data ...interface{}) {
 	f.mainWindow.ExecJS(`window.wails.EventsNotify('` + template.JSEscapeString(string(payload)) + `');`)
 }
 
-var edgeMap = map[string]uintptr{
-	"n-resize":  C.GDK_WINDOW_EDGE_NORTH,
-	"ne-resize": C.GDK_WINDOW_EDGE_NORTH_EAST,
-	"e-resize":  C.GDK_WINDOW_EDGE_EAST,
-	"se-resize": C.GDK_WINDOW_EDGE_SOUTH_EAST,
-	"s-resize":  C.GDK_WINDOW_EDGE_SOUTH,
-	"sw-resize": C.GDK_WINDOW_EDGE_SOUTH_WEST,
-	"w-resize":  C.GDK_WINDOW_EDGE_WEST,
-	"nw-resize": C.GDK_WINDOW_EDGE_NORTH_WEST,
-}
-
 func (f *Frontend) processMessage(message string) {
 	if message == "DomReady" {
 		if f.frontendOptions.OnDomReady != nil {

v2/internal/frontend/desktop/linux/frontend_c.go

@@ -0,0 +1,71 @@
+//go:build linux
+// +build linux
+
+package linux
+
+/*
+#cgo webkit_6 CFLAGS: -DWEBKIT_6
+#cgo !webkit_6 pkg-config: gtk+-3.0
+#cgo webkit_6 pkg-config: gtk4
+
+#include "gtk/gtk.h"
+
+#ifdef WEBKIT_6
+const GdkSurfaceEdge N_RESIZE = GDK_SURFACE_EDGE_NORTH;
+const GdkSurfaceEdge NE_RESIZE = GDK_SURFACE_EDGE_NORTH_EAST;
+const GdkSurfaceEdge E_RESIZE = GDK_SURFACE_EDGE_EAST;
+const GdkSurfaceEdge SE_RESIZE = GDK_SURFACE_EDGE_SOUTH_EAST;
+const GdkSurfaceEdge S_RESIZE = GDK_SURFACE_EDGE_SOUTH;
+const GdkSurfaceEdge SW_RESIZE = GDK_SURFACE_EDGE_SOUTH_WEST;
+const GdkSurfaceEdge W_RESIZE = GDK_SURFACE_EDGE_WEST;
+const GdkSurfaceEdge NW_RESIZE = GDK_SURFACE_EDGE_NORTH_WEST;
+#else
+const GdkWindowEdge N_RESIZE = GDK_WINDOW_EDGE_NORTH;
+const GdkWindowEdge NE_RESIZE = GDK_WINDOW_EDGE_NORTH_EAST;
+const GdkWindowEdge E_RESIZE = GDK_WINDOW_EDGE_EAST;
+const GdkWindowEdge SE_RESIZE = GDK_WINDOW_EDGE_SOUTH_EAST;
+const GdkWindowEdge S_RESIZE = GDK_WINDOW_EDGE_SOUTH;
+const GdkWindowEdge SW_RESIZE = GDK_WINDOW_EDGE_SOUTH_WEST;
+const GdkWindowEdge W_RESIZE = GDK_WINDOW_EDGE_WEST;
+const GdkWindowEdge NW_RESIZE = GDK_WINDOW_EDGE_NORTH_WEST;
+#endif
+
+void runMainLoop() {
+	#ifdef WEBKIT_6
+	GMainLoop *mainLoop = g_main_loop_new(NULL, true);
+	setMainLoop(mainLoop);
+	g_main_loop_run(mainLoop);
+	#else
+	gtk_main();
+	#endif
+}
+
+gboolean initGtk() {
+	#ifdef WEBKIT_6
+	return gtk_init_check();
+	#else
+	return gtk_init_check(NULL, NULL);
+	#endif
+}
+
+*/
+import "C"
+
+var edgeMap = map[string]uintptr{
+	"n-resize":  C.N_RESIZE,
+	"ne-resize": C.NE_RESIZE,
+	"e-resize":  C.E_RESIZE,
+	"se-resize": C.SE_RESIZE,
+	"s-resize":  C.S_RESIZE,
+	"sw-resize": C.SW_RESIZE,
+	"w-resize":  C.W_RESIZE,
+	"nw-resize": C.NW_RESIZE,
+}
+
+func runMainLoop() {
+	C.runMainLoop()
+}
+
+func initGtk() C.gboolean {
+	return C.initGtk()
+}

v2/internal/frontend/desktop/linux/gtk.go

@@ -1,10 +1,10 @@
-//go:build linux
-// +build linux
+//go:build linux && !webkit_6
+// +build linux,!webkit_6
 
 package linux
 
 /*
-#cgo linux pkg-config: gtk+-3.0
+#cgo pkg-config: gtk+-3.0
 #cgo !webkit2_41 pkg-config: webkit2gtk-4.0
 #cgo webkit2_41 pkg-config: webkit2gtk-4.1
 

v2/internal/frontend/desktop/linux/gtk_webkit6.go

@@ -0,0 +1,65 @@
+//go:build linux && webkit_6
+// +build linux,webkit_6
+
+package linux
+
+import "C"
+import (
+	"github.com/wailsapp/wails/v2/pkg/menu"
+)
+
+//export handleMenuRadioItemClick
+func handleMenuRadioItemClick(rName *C.char, prev *C.char, curr *C.char) {
+	radioActionName := C.GoString(rName)
+	prevId := C.GoString(prev)
+	itemId := C.GoString(curr)
+
+	actionName := radioActionName + "::" + itemId
+	it, ok := gActionIdToMenuItem.Load(actionName)
+	if !ok {
+		return
+	}
+
+	item := it.(*menu.MenuItem)
+
+	prevActionId := radioActionName + "::" + prevId
+	prevIt, ok := gActionIdToMenuItem.Load(prevActionId)
+	if !ok {
+		return
+	}
+
+	prevItem := prevIt.(*menu.MenuItem)
+
+	prevItem.Checked = false
+	item.Checked = true
+
+	go item.Click(&menu.CallbackData{MenuItem: item})
+}
+
+//export handleMenuCheckItemClick
+func handleMenuCheckItemClick(aName *C.char, checked C.int) {
+	actionName := C.GoString(aName)
+	it, ok := gActionIdToMenuItem.Load(actionName)
+	if !ok {
+		return
+	}
+
+	item := it.(*menu.MenuItem)
+
+	item.Checked = int(checked) == 1
+
+	go item.Click(&menu.CallbackData{MenuItem: item})
+}
+
+//export handleMenuItemClick
+func handleMenuItemClick(aName *C.char) {
+	actionName := C.GoString(aName)
+	it, ok := gActionIdToMenuItem.Load(actionName)
+	if !ok {
+		return
+	}
+
+	item := it.(*menu.MenuItem)
+
+	go item.Click(&menu.CallbackData{MenuItem: item})
+}

v2/internal/frontend/desktop/linux/invoke.go

@@ -4,7 +4,8 @@
 package linux
 
 /*
-#cgo linux pkg-config: gtk+-3.0
+#cgo !webkit_6 pkg-config: gtk+-3.0
+#cgo webkit_6 pkg-config: gtk4
 
 #include <stdio.h>
 #include "gtk/gtk.h"

v2/internal/frontend/desktop/linux/keys.go

@@ -4,13 +4,21 @@
 package linux
 
 /*
-#cgo linux pkg-config: gtk+-3.0 
-#cgo !webkit2_41 pkg-config: webkit2gtk-4.0
+#cgo webkit_6 CFLAGS: -DWEBKIT_6
+#cgo !webkit_6 pkg-config: gtk+-3.0
+#cgo webkit_6 pkg-config: gtk4
+#cgo !(webkit2_41 || webkit_6) pkg-config: webkit2gtk-4.0
 #cgo webkit2_41 pkg-config: webkit2gtk-4.1
+#cgo webkit_6 pkg-config: webkitgtk-6.0
 
 
 #include "gtk/gtk.h"
 
+#ifdef WEBKIT_6
+const GdkModifierType ALT_KEY_MASK = GDK_ALT_MASK;
+#else
+const GdkModifierType ALT_KEY_MASK = GDK_MOD1_MASK;
+#endif
 */
 import "C"
 import (
@@ -103,7 +111,7 @@ func parseModifiers(modifiers []keys.Modifier) C.GdkModifierType {
 		case keys.ControlKey, keys.CmdOrCtrlKey:
 			result |= C.GDK_CONTROL_MASK
 		case keys.OptionOrAltKey:
-			result |= C.GDK_MOD1_MASK
+			result |= C.ALT_KEY_MASK
 		}
 	}
 	return result

v2/internal/frontend/desktop/linux/loop_webkit6.go

@@ -0,0 +1,20 @@
+//go:build linux && webkit_6
+// +build linux,webkit_6
+
+package linux
+
+/*
+#cgo pkg-config: gtk4
+
+#include "gtk/gtk.h"
+
+extern void setMainLoop(GMainLoop *loop);
+*/
+import "C"
+
+var mainLoop *C.GMainLoop
+
+//export setMainLoop
+func setMainLoop(loop *C.GMainLoop) {
+	mainLoop = loop
+}

v2/internal/frontend/desktop/linux/menu.go

@@ -1,10 +1,10 @@
-//go:build linux
-// +build linux
+//go:build linux && !webkit_6
+// +build linux,!webkit_6
 
 package linux
 
 /*
-#cgo linux pkg-config: gtk+-3.0
+#cgo pkg-config: gtk+-3.0
 #cgo !webkit2_41 pkg-config: webkit2gtk-4.0
 #cgo webkit2_41 pkg-config: webkit2gtk-4.1
 
@@ -34,8 +34,11 @@ void addAccelerator(GtkWidget* menuItem, GtkAccelGroup* group, guint key, GdkMod
 }
 */
 import "C"
-import "github.com/wailsapp/wails/v2/pkg/menu"
-import "unsafe"
+import (
+	"unsafe"
+
+	"github.com/wailsapp/wails/v2/pkg/menu"
+)
 
 var menuIdCounter int
 var menuItemToId map[*menu.MenuItem]int