github/wails
5
0
Fork 0
mirror of https://github.com/wailsapp/wails.git synced 2025-05-08 11:42:04 +08:00
Code Projects Activity

[linux] support clipboard

Browse Source
This commit is contained in:
Lea Anthony 2023-10-02 20:47:04 +11:00
parent aea0db5919
commit 9d615463f4
No known key found for this signature in database
GPG Key ID: 33DAF7BB90A58405
4 changed files with 45 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
v3/pkg/application/clipboard.go
View File

@ -16,9 +16,11 @@ func newClipboard() *Clipboard {
}
func (c *Clipboard) SetText(text string) bool {
return c.impl.setText(text)
return InvokeSyncWithResult(func() bool {
return c.impl.setText(text)
})
}
func (c *Clipboard) Text() (string, bool) {
return c.impl.text()
return InvokeSyncWithResultAndOther(c.impl.text)
}

36
v3/pkg/application/clipboard_linux.go
View File

@ -2,8 +2,29 @@
package application
/*
#cgo linux pkg-config: gtk+-3.0 webkit2gtk-4.0
#include "gtk/gtk.h"
#include "webkit2/webkit2.h"
static gchar* getClipboardText() {
GtkClipboard *clip = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);
return gtk_clipboard_wait_for_text(clip);
}
static void setClipboardText(gchar* text) {
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);
}
*/
import "C"
import (
"sync"
"unsafe"
)
var clipboardLock sync.RWMutex
@ -13,19 +34,18 @@ type linuxClipboard struct{}
func (m linuxClipboard) setText(text string) bool {
clipboardLock.Lock()
defer clipboardLock.Unlock()
// cText := C.CString(text)
// success := C.setClipboardText(cText)
// C.free(unsafe.Pointer(cText))
success := false
return bool(success)
cText := C.CString(text)
C.setClipboardText(cText)
C.free(unsafe.Pointer(cText))
return true
}
func (m linuxClipboard) text() (string, bool) {
clipboardLock.RLock()
defer clipboardLock.RUnlock()
// clipboardText := C.getClipboardText()
// result := C.GoString(clipboardText)
return "", false
clipboardText := C.getClipboardText()
result := C.GoString(clipboardText)
return result, true
}
func newClipboardImpl() *linuxClipboard {

2
v3/pkg/application/linux_cgo.go
View File

@ -119,7 +119,7 @@ static void* gtkFileChooserDialogNew(char* title, GtkWindow* window, GtkFileChoo
GTK_RESPONSE_CANCEL,
acceptLabel,
GTK_RESPONSE_ACCEPT,
0);
NULL);
}
typedef struct Screen {

12
v3/pkg/application/mainthread.go
View File

@ -67,6 +67,18 @@ func InvokeSyncWithResultAndError[T any](fn func() (T, error)) (res T, err error
return res, err
}
func InvokeSyncWithResultAndOther[T any, U any](fn func() (T, U)) (res T, other U) {
var wg sync.WaitGroup
wg.Add(1)
globalApplication.dispatchOnMainThread(func() {
defer processPanicHandlerRecover()
res, other = fn()
wg.Done()
})
wg.Wait()
return res, other
}
func InvokeAsync(fn func()) {
globalApplication.dispatchOnMainThread(func() {
defer processPanicHandlerRecover()