io/input,io/clipboard: [API] replace WriteOp with command

Signed-off-by: Elias Naur <mail@eliasnaur.com>

io/input/clipboard.go

@@ -3,6 +3,9 @@
 package input
 
 import (
+	"io"
+
+	"gioui.org/io/clipboard"
 	"gioui.org/io/event"
 )
 
@@ -10,18 +13,19 @@ type clipboardQueue struct {
 	receivers map[event.Tag]struct{}
 	// request avoid read clipboard every frame while waiting.
 	requested bool
-	text      *string
+	mime      string
+	text      []byte
 }
 
-// WriteClipboard returns the most recent text to be copied
+// WriteClipboard returns the most recent data to be copied
 // to the clipboard, if any.
-func (q *clipboardQueue) WriteClipboard() (string, bool) {
+func (q *clipboardQueue) WriteClipboard() (mime string, content []byte, ok bool) {
 	if q.text == nil {
-		return "", false
+		return "", nil, false
 	}
-	text := *q.text
+	content = q.text
 	q.text = nil
-	return text, true
+	return q.mime, content, true
 }
 
 // ReadClipboard reports if any new handler is waiting
@@ -41,8 +45,14 @@ func (q *clipboardQueue) Push(e event.Event, events *handlerEvents) {
 	}
 }
 
-func (q *clipboardQueue) ProcessWriteClipboard(refs []interface{}) {
-	q.text = refs[0].(*string)
+func (q *clipboardQueue) ProcessWriteClipboard(req clipboard.WriteCmd) {
+	defer req.Data.Close()
+	content, err := io.ReadAll(req.Data)
+	if err != nil {
+		return
+	}
+	q.mime = req.Type
+	q.text = content
 }
 
 func (q *clipboardQueue) ProcessReadClipboard(refs []interface{}) {

io/input/clipboard_test.go

@@ -3,6 +3,8 @@
 package input
 
 import (
+	"io"
+	"strings"
 	"testing"
 
 	"gioui.org/io/clipboard"
@@ -84,23 +86,24 @@ func TestQueueProcessWriteClipboard(t *testing.T) {
 	ops, router := new(op.Ops), new(Router)
 	ops.Reset()
 
-	clipboard.WriteOp{Text: "Write 1"}.Add(ops)
+	const mime = "application/text"
+	router.Source().Queue(clipboard.WriteCmd{Type: mime, Data: io.NopCloser(strings.NewReader("Write 1"))})
 
 	router.Frame(ops)
-	assertClipboardWriteOp(t, router, "Write 1")
+	assertClipboardWriteCmd(t, router, mime, "Write 1")
 	ops.Reset()
 
-	// No WriteOp
+	// No WriteCmd
 
 	router.Frame(ops)
-	assertClipboardWriteOp(t, router, "")
+	assertClipboardWriteCmd(t, router, "", "")
 	ops.Reset()
 
-	clipboard.WriteOp{Text: "Write 2"}.Add(ops)
+	router.Source().Queue(clipboard.WriteCmd{Type: mime, Data: io.NopCloser(strings.NewReader("Write 2"))})
 
 	router.Frame(ops)
 	assertClipboardReadOp(t, router, 0)
-	assertClipboardWriteOp(t, router, "Write 2")
+	assertClipboardWriteCmd(t, router, mime, "Write 2")
 	ops.Reset()
 }
 
@@ -141,16 +144,19 @@ func assertClipboardReadOpDuplicated(t *testing.T, router *Router, expected int)
 	}
 }
 
-func assertClipboardWriteOp(t *testing.T, router *Router, expected string) {
+func assertClipboardWriteCmd(t *testing.T, router *Router, mimeExp, expected string) {
 	t.Helper()
 	if (router.cqueue.text != nil) != (expected != "") {
 		t.Error("text not defined")
 	}
-	text, ok := router.cqueue.WriteClipboard()
+	mime, text, ok := router.cqueue.WriteClipboard()
 	if ok != (expected != "") {
 		t.Error("duplicated requests")
 	}
-	if text != expected {
+	if string(mime) != mimeExp {
+		t.Errorf("got MIME type %s, expected %s", mime, mimeExp)
+	}
+	if string(text) != expected {
 		t.Errorf("got text %s, expected %s", text, expected)
 	}
 }

io/input/router.go

@@ -222,6 +222,8 @@ func (q *Router) executeCommands() {
 			q.key.queue.setSnippet(req)
 		case transfer.OfferCmd:
 			q.pointer.queue.offerData(req, &q.handlers)
+		case clipboard.WriteCmd:
+			q.cqueue.ProcessWriteClipboard(req)
 		}
 	}
 	q.commands = nil
@@ -374,9 +376,9 @@ func (q *Router) TextInputHint() (key.InputHint, bool) {
 	return q.key.queue.InputHint()
 }
 
-// WriteClipboard returns the most recent text to be copied
+// WriteClipboard returns the most recent content to be copied
 // to the clipboard, if any.
-func (q *Router) WriteClipboard() (string, bool) {
+func (q *Router) WriteClipboard() (mime string, content []byte, ok bool) {
 	return q.cqueue.WriteClipboard()
 }
 
@@ -429,8 +431,6 @@ func (q *Router) collect() {
 			}
 		case ops.TypeClipboardRead:
 			q.cqueue.ProcessReadClipboard(encOp.Refs)
-		case ops.TypeClipboardWrite:
-			q.cqueue.ProcessWriteClipboard(encOp.Refs)
 		case ops.TypeSave:
 			id := ops.DecodeSave(encOp.Data)
 			if extra := id - len(q.savedTrans) + 1; extra > 0 {