Fix reading clipboard internally for OSC52

internal/clipboard/clipboard.go

@@ -70,8 +70,14 @@ func Write(text string, r Register) error {
 
 // ReadMulti reads text from a clipboard register for a certain multi-cursor
 func ReadMulti(r Register, num int) (string, error) {
-	s := multi.getText(r, num)
-	return s, nil
+	clip, err := Read(r)
+	if err != nil {
+		return "", err
+	}
+	if ValidMulti(r, clip) {
+		return multi.getText(r, num), nil
+	}
+	return clip, nil
 }
 
 // WriteMulti writes text to a clipboard register for a certain multi-cursor
@@ -81,12 +87,8 @@ func WriteMulti(text string, r Register, num int) error {
 
 // ValidMulti checks if the internal multi-clipboard is valid and up-to-date
 // with the system clipboard
-func ValidMulti(r Register, ncursors int) bool {
-	clip, err := Read(r)
-	if err != nil {
-		return false
-	}
-	return multi.isValid(r, ncursors, clip)
+func ValidMulti(r Register, clip string) bool {
+	return multi.isValid(r, clip)
 }
 
 func writeMulti(text string, r Register, num int, m Method) error {
@@ -112,11 +114,9 @@ func read(r Register, m Method) (string, error) {
 		case ClipboardReg:
 			// terminal paste works by sending an esc sequence to the
 			// terminal to trigger a paste event
-			err := terminal.read("clipboard")
-			return "", err
+			return terminal.read("clipboard")
 		case PrimaryReg:
-			err := terminal.read("primary")
-			return "", err
+			return terminal.read("primary")
 		default:
 			return internal.read(r), nil
 		}

internal/clipboard/multi.go

@@ -43,9 +43,9 @@ func hash(s string) uint32 {
 // text stored in the system clipboard (provided as an argument), and therefore
 // if it is safe to use the multi-clipboard for pasting instead of the system
 // clipboard.
-func (c multiClipboard) isValid(r Register, ncursors int, clipboard string) bool {
+func (c multiClipboard) isValid(r Register, clipboard string) bool {
 	content := c[r]
-	if content == nil || len(content) != ncursors {
+	if content == nil {
 		return false
 	}
 

internal/clipboard/terminal.go

@@ -1,13 +1,31 @@
 package clipboard
 
-import "github.com/zyedidia/micro/v2/internal/screen"
+import (
+	"errors"
+	"time"
+
+	"github.com/zyedidia/micro/v2/internal/screen"
+	"github.com/zyedidia/tcell"
+)
 
 type terminalClipboard struct{}
 
 var terminal terminalClipboard
 
-func (t terminalClipboard) read(reg string) error {
-	return screen.Screen.GetClipboard(reg)
+func (t terminalClipboard) read(reg string) (string, error) {
+	screen.Screen.GetClipboard(reg)
+	// wait at most 200ms for response
+	for {
+		select {
+		case event := <-screen.Events:
+			e, ok := event.(*tcell.EventPaste)
+			if ok {
+				return e.Text(), nil
+			}
+		case <-time.After(200 * time.Millisecond):
+			return "", errors.New("No clipboard received from terminal")
+		}
+	}
 }
 
 func (t terminalClipboard) write(text, reg string) error {