Merge pull request #599 from hien-ngo29/ibus-lotus-fix

Fix mouse capture bugs and super-space problem on Wayland (ibus-lotus)

Author: t1ld3x

config/flags.go

@@ -40,17 +40,17 @@ const (
 	IBspellCheckWithRules
 	IBspellCheckWithDicts
 	IBautoCommitWithDelay
-	IBautoCommitWithMouseMovement
-	_IBemojiDisabled //deprecated
+	_IBautoCommitWithMouseMovement //deprecated
+	_IBemojiDisabled               //deprecated
 	IBpreeditElimination
 	_IBinputModeLookupTableEnabled //deprecated
 	IBautoCapitalizeMacro
 	_IBimQuickSwitchEnabled     //deprecated
 	_IBrestoreKeyStrokesEnabled //deprecated
-	IBmouseCapturing
+	_IBmouseCapturing           //deprecated
 	IBworkaroundForFBMessenger
 	IBworkaroundForWPS
 	IBstdFlags = IBspellCheckEnabled | IBspellCheckWithRules | IBautoNonVnRestore | IBddFreeStyle |
-		IBmouseCapturing | IBautoCapitalizeMacro | IBnoUnderline | IBworkaroundForWPS
+		IBautoCapitalizeMacro | IBnoUnderline | IBworkaroundForWPS
 	IBUsStdFlags = 0
 )

engine.go

@@ -124,11 +124,6 @@ func (e *IBusBambooEngine) FocusIn() *dbus.Error {
 	if e.config.IBflags&config.IBspellCheckWithDicts != 0 && len(dictionary) == 0 {
 		dictionary, _ = loadDictionary(DictVietnameseCm)
 	}
-	if inStringList(disabledMouseCapturingList, e.getWmClass()) {
-		stopMouseCapturing()
-	} else if e.config.IBflags&config.IBmouseCapturing != 0 {
-		startMouseCapturing()
-	}
 	fmt.Printf("WM_CLASS=(%s)\n", e.getWmClass())
 	return nil
 }
@@ -141,7 +136,7 @@ func (e *IBusBambooEngine) FocusOut() *dbus.Error {
 func (e *IBusBambooEngine) Reset() *dbus.Error {
 	fmt.Print("Reset.\n")
 	if e.checkInputMode(config.PreeditIM) {
-		e.commitPreeditAndReset(e.getPreeditString())
+		e.preeditor.Reset()
 	}
 	return nil
 }
@@ -333,17 +328,6 @@ func (e *IBusBambooEngine) PropertyActivate(propName string, propState uint32) *
 			e.config.IBflags &= ^config.IBspellCheckWithDicts
 		}
 	}
-	if propName == PropKeyMouseCapturing {
-		if propState == ibus.PROP_STATE_CHECKED {
-			e.config.IBflags |= config.IBmouseCapturing
-			startMouseCapturing()
-			startMouseRecording()
-		} else {
-			e.config.IBflags &= ^config.IBmouseCapturing
-			stopMouseCapturing()
-			stopMouseRecording()
-		}
-	}
 	if propName == PropKeyMacroEnabled {
 		if propState == ibus.PROP_STATE_CHECKED {
 			e.config.IBflags |= config.IBmacroEnabled

engine_preedit.go

@@ -91,11 +91,6 @@ func (e *IBusBambooEngine) expandMacro(str string) string {
 }
 
 func (e *IBusBambooEngine) updatePreedit(processedStr string) {
-	defer func() {
-		if e.config.IBflags&config.IBmouseCapturing != 0 {
-			mouseCaptureUnlock()
-		}
-	}()
 	var encodedStr = e.encodeText(processedStr)
 	var preeditLen = uint32(len([]rune(encodedStr)))
 	if preeditLen == 0 {

engine_utils.go

@@ -27,7 +27,6 @@ import (
 	"os"
 	"strconv"
 	"strings"
-	"sync"
 	"sync/atomic"
 	"time"
 	"unicode"
@@ -86,39 +85,6 @@ func (e *IBusBambooEngine) init() {
 		}
 	}
 	keyPressHandler = e.keyPressForwardHandler
-
-	if e.config.IBflags&config.IBmouseCapturing != 0 {
-		startMouseCapturing()
-		startMouseRecording()
-	}
-	var mouseMutex sync.Mutex
-	onMouseMove = func() {
-		mouseMutex.Lock()
-		defer mouseMutex.Unlock()
-		if e.checkInputMode(config.PreeditIM) {
-			if e.getRawKeyLen() == 0 {
-				return
-			}
-			e.commitPreeditAndReset(e.getPreeditString())
-		}
-	}
-	onMouseClick = func() {
-		mouseMutex.Lock()
-		defer mouseMutex.Unlock()
-		if e.isEmojiLTOpened {
-			e.refreshEmojiCandidate()
-		} else {
-			e.resetFakeBackspace()
-			e.resetBuffer()
-			e.keyPressDelay = KeypressDelayMs
-			if e.capabilities&IBusCapSurroundingText != 0 {
-				//e.ForwardKeyEvent(IBUS_Shift_R, XK_Shift_R-8, 0)
-				x11SendShiftR()
-				e.isSurroundingTextReady = true
-				e.keyPressDelay = KeypressDelayMs * 10
-			}
-		}
-	}
 }
 
 func initConfigFiles(engineName string) {
@@ -418,6 +384,7 @@ func (e *IBusBambooEngine) updateInputModeLT() {
 func isValidState(state uint32) bool {
 	if state&IBusControlMask != 0 ||
 		state&IBusMod1Mask != 0 ||
+		state&IBusMod4Mask != 0 ||
 		state&IBusIgnoredMask != 0 ||
 		state&IBusSuperMask != 0 ||
 		state&IBusHyperMask != 0 ||

ibus_const.go

@@ -24,6 +24,7 @@ const (
 	IBusLockMask    = 1 << 1
 	IBusControlMask = 1 << 2
 	IBusMod1Mask    = 1 << 3
+	IBusMod4Mask    = 1 << 6
 
 	/* The next few modifiers are used by XKB so we skip to the end.
 	 * Bits 15 - 23 are currently unused. Bit 29 is used internally.
@@ -41,7 +42,7 @@ const (
 	IBusReleaseMask = 1 << 30
 
 	IBusModifierMask   = 0x5f001fff
-	IBusDefaultModMask = IBusControlMask | IBusShiftMask | IBusMod1Mask | IBusSuperMask | IBusHyperMask | IBusMetaMask
+	IBusDefaultModMask = IBusControlMask | IBusShiftMask | IBusMod1Mask | IBusMod4Mask | IBusSuperMask | IBusHyperMask | IBusMetaMask | 0xffeb
 )
 
 const (

prop.go

@@ -36,7 +36,6 @@ const (
 	PropKeySpellCheckByDicts            = "spell_check_by_dicts"
 	PropKeyPreeditInvisibility          = "preedit_invisibility"
 	PropKeyVnCharsetConvert             = "charset_convert_page"
-	PropKeyMouseCapturing               = "mouse_capturing"
 	PropKeyMacroEnabled                 = "macro_enabled"
 	PropKeyMacroTable                   = "open_macro_table"
 	PropKeyEmojiEnabled                 = "emoji_enabled"
@@ -369,10 +368,6 @@ func GetOptionsPropListByConfig(c *config.Config) *ibus.PropList {
 	toneFreeMarkingChecked := ibus.PROP_STATE_UNCHECKED
 	preeditInvisibilityChecked := ibus.PROP_STATE_UNCHECKED
 	x11FakeBackspaceChecked := ibus.PROP_STATE_UNCHECKED
-	mouseCapturingChecked := ibus.PROP_STATE_UNCHECKED
-	if c.IBflags&config.IBmouseCapturing != 0 {
-		mouseCapturingChecked = ibus.PROP_STATE_CHECKED
-	}
 
 	if c.Flags&bamboo.EstdToneStyle != 0 {
 		toneStdChecked = ibus.PROP_STATE_CHECKED
@@ -424,18 +419,6 @@ func GetOptionsPropListByConfig(c *config.Config) *ibus.PropList {
 			Symbol:    dbus.MakeVariant(ibus.NewText("P")),
 			SubProps:  dbus.MakeVariant(*ibus.NewPropList()),
 		},
-		&ibus.Property{
-			Name:      "IBusProperty",
-			Key:       PropKeyMouseCapturing,
-			Type:      ibus.PROP_TYPE_TOGGLE,
-			Label:     dbus.MakeVariant(ibus.NewText("Bắt sự kiện chuột")),
-			Tooltip:   dbus.MakeVariant(ibus.NewText("Mouse capturing")),
-			Sensitive: true,
-			Visible:   true,
-			State:     mouseCapturingChecked,
-			Symbol:    dbus.MakeVariant(ibus.NewText("F")),
-			SubProps:  dbus.MakeVariant(*ibus.NewPropList()),
-		},
 		&ibus.Property{
 			Name:      "IBusProperty",
 			Key:       PropKeyPreeditElimination,

utils.go

@@ -64,18 +64,12 @@ var enabledAuxiliaryTextList = []string{
 	"wpsoffice:wpsoffice",
 }
 
-var disabledMouseCapturingList = []string{
-	"DesktopEditors",                //onlyoffice
-	"DesktopEditors:DesktopEditors", //onlyoffice
-}
-
 var DefaultBrowserList = []string{
 	"Navigator:Firefox",
 	"google-chrome:Google-chrome",
 	"chromium-browser:Chromium-browser",
 }
 
-
 func getEngineSubFile(fileName string) string {
 	if _, err := os.Stat(fileName); err == nil {
 		// return source code data/macro.tpl.txt path

x11.go

@@ -29,12 +29,6 @@ extern void x11Paste(int);
 extern void clipboard_init();
 extern void clipboard_exit();
 extern void x11ClipboardReset();
-extern void mouse_capture_init();
-extern void mouse_capture_exit();
-extern void mouse_capture_unlock();
-extern void mouse_capture_start_or_unlock();
-extern void mouse_recording_init();
-extern void mouse_recording_exit();
 extern void x11SendBackspace(int n, int timeout);
 extern void x11SendShiftR();
 extern void x11SendShiftLeft(int n, int r, int timeout);
@@ -58,19 +52,6 @@ func init() {
 	C.setXIgnoreErrorHandler()
 }
 
-//export mouse_move_handler
-func mouse_move_handler() {
-	onMouseMove()
-}
-
-//export mouse_click_handler
-func mouse_click_handler() {
-	onMouseClick()
-}
-
-var onMouseMove func()
-var onMouseClick func()
-
 func x11StartWindowInspector() {
 	C.x11StartWindowInspector()
 }
@@ -79,48 +60,6 @@ func x11StopWindowInspector() {
 	C.x11StopWindowInspector()
 }
 
-func startMouseRecording() {
-	C.mouse_recording_init()
-}
-
-func stopMouseRecording() {
-	C.mouse_recording_exit()
-}
-
-func startMouseCapturing() {
-	mcapMutex.Lock()
-	defer mcapMutex.Unlock()
-	if !mcapRunning {
-		C.mouse_capture_init()
-		mcapRunning = true
-	}
-}
-
-func stopMouseCapturing() {
-	mcapMutex.RLock()
-	defer mcapMutex.RUnlock()
-	if mcapRunning {
-		C.mouse_capture_exit()
-	}
-}
-
-func mouseCaptureStartOrUnlock() {
-	mcapMutex.Lock()
-	defer mcapMutex.Unlock()
-	if !mcapRunning {
-		C.mouse_capture_start_or_unlock()
-		mcapRunning = true
-	}
-}
-
-func mouseCaptureUnlock() {
-	mcapMutex.RLock()
-	defer mcapMutex.RUnlock()
-	if mcapRunning {
-		C.mouse_capture_unlock()
-	}
-}
-
 func x11Copy(str string) {
 	cs := C.CString(str)
 	defer C.free(unsafe.Pointer(cs))