fixes: #561 double deletion

Author: pchampio

internal/keyboard/keyboard_darwin.go

@@ -2,12 +2,6 @@ package keyboard
 
 import "github.com/go-gl/glfw/v3.3/glfw"
 
-// DetectWordMod returns true if the modifiers pressed
-// correspond to the word movement modifier
-func DetectWordMod(mods glfw.ModifierKey) bool {
-	return mods&glfw.ModAlt != 0
-}
-
 // DetectTextInputDoneMod returns true if the modifiers pressed
 // indicate the typed text can be committed
 func DetectTextInputDoneMod(mods glfw.ModifierKey) bool {

internal/keyboard/keyboard_pc.go

@@ -4,12 +4,6 @@ package keyboard
 
 import "github.com/go-gl/glfw/v3.3/glfw"
 
-// DetectWordMod returns true if the modifiers pressed
-// correspond to the word movement modifier
-func DetectWordMod(mods glfw.ModifierKey) bool {
-	return mods&glfw.ModControl != 0
-}
-
 // DetectTextInputDoneMod returns true if the modifiers pressed
 // indicate the typed text can be committed
 func DetectTextInputDoneMod(mods glfw.ModifierKey) bool {

messenger.go

@@ -56,16 +56,17 @@ func (m *messenger) SendWithReply(channel string, binaryMessage []byte) (binaryR
 		ResponseHandle: responseHandle,
 	}
 
-	replyErr := make(chan error)
-	defer close(replyErr)
-
-	glfw.PostEmptyEvent()
-	go m.engineTasker.Do(func() {
-		replyErr <- m.engine.SendPlatformMessage(msg)
-	})
-	err = <-replyErr
-	if err != nil {
-		return nil, err
+	if m.engine.TaskRunnerRunOnCurrentThread() {
+		err = m.engine.SendPlatformMessage(msg)
+	} else {
+		replyErr := make(chan error)
+		defer close(replyErr)
+
+		glfw.PostEmptyEvent()
+		go m.engineTasker.Do(func() {
+			replyErr <- m.engine.SendPlatformMessage(msg)
+		})
+		err = <-replyErr
 	}
 
 	// wait for a reply and return
@@ -79,14 +80,19 @@ func (m *messenger) Send(channel string, binaryMessage []byte) (err error) {
 		Channel: channel,
 		Message: binaryMessage,
 	}
-	replyErr := make(chan error)
-	defer close(replyErr)
 
-	glfw.PostEmptyEvent()
-	go m.engineTasker.Do(func() {
-		replyErr <- m.engine.SendPlatformMessage(msg)
-	})
-	err = <-replyErr
+	if m.engine.TaskRunnerRunOnCurrentThread() {
+		err = m.engine.SendPlatformMessage(msg)
+	} else {
+		replyErr := make(chan error)
+		defer close(replyErr)
+
+		glfw.PostEmptyEvent()
+		go m.engineTasker.Do(func() {
+			replyErr <- m.engine.SendPlatformMessage(msg)
+		})
+		err = <-replyErr
+	}
 	if err != nil {
 		return err
 	}

text-input.go

@@ -71,8 +71,10 @@ func (p *textinputPlugin) InitPlugin(messenger plugin.BinaryMessenger) error {
 	})
 	// Ignored: This information is used by the flutter Web Engine
 	p.channel.HandleFuncSync("TextInput.setStyle", func(_ interface{}) (interface{}, error) { return nil, nil })
-	// Ignored: This information is used by the flutter Web Engine
+	// Ignored: GLFW dosn't support setting the input method of the current cursor location #426
 	p.channel.HandleFuncSync("TextInput.setEditableSizeAndTransform", func(_ interface{}) (interface{}, error) { return nil, nil })
+	// Ignored: GLFW dosn't support setting the input method of the current cursor location #426
+	p.channel.HandleFuncSync("TextInput.setMarkedTextRect", func(_ interface{}) (interface{}, error) { return nil, nil })
 	// Ignored: This information is used by flutter on Android, iOS and web
 	p.channel.HandleFuncSync("TextInput.requestAutofill", func(_ interface{}) (interface{}, error) { return nil, nil })
 
@@ -178,33 +180,6 @@ func (p *textinputPlugin) glfwKeyCallback(window *glfw.Window, key glfw.Key, sca
 			// this action is described by argSetClientConf.
 			p.performAction(p.clientConf.InputAction)
 		}
-		// Backspace
-		if key == glfw.KeyBackspace {
-			// Selection Backspace
-			if p.removeSelectedText() {
-				p.updateEditingState()
-				return
-			}
-			// Word Backspace
-			if keyboard.DetectWordMod(mods) {
-				// Remove whitespace to the left
-				for p.ed.SelectionBase != 0 && unicode.IsSpace(utf16.Decode([]uint16{p.ed.utf16Text[p.ed.SelectionBase-1]})[0]) {
-					p.sliceLeftChar()
-				}
-				// Remove non-whitespace to the left
-				for {
-					if p.ed.SelectionBase == 0 || unicode.IsSpace(utf16.Decode([]uint16{p.ed.utf16Text[p.ed.SelectionBase-1]})[0]) {
-						break
-					}
-					p.sliceLeftChar()
-				}
-				p.updateEditingState()
-				return
-			}
-			// single char Backspace
-			p.sliceLeftChar()
-			p.updateEditingState()
-		}
 		// Mapping to some text navigation shortcut that are already implemented in
 		// the flutter framework.
 		// Home
@@ -284,16 +259,3 @@ func (p *textinputPlugin) getSelectedText() (int, int) {
 	return selectionIndex[0],
 		selectionIndex[1]
 }
-
-func (p *textinputPlugin) sliceLeftChar() {
-	if len(p.ed.utf16Text) > 0 && p.ed.SelectionBase > 0 {
-		count := 1
-		// Check if code point appear in a surrogate pair
-		if utf16.IsSurrogate(rune(p.ed.utf16Text[p.ed.SelectionBase-1])) {
-			count = 2
-		}
-		p.ed.utf16Text = append(p.ed.utf16Text[:p.ed.SelectionBase-count], p.ed.utf16Text[p.ed.SelectionBase:]...)
-		p.ed.SelectionBase -= count
-		p.ed.SelectionExtent = p.ed.SelectionBase
-	}
-}