Improve input method

Author: akiyosi

editor/cursor.go

@@ -2,7 +2,6 @@ package editor
 
 import (
 	"math"
-	"runtime"
 
 	"github.com/akiyosi/goneovim/util"
 	"github.com/therecipe/qt/core"
@@ -320,10 +319,12 @@ func (c *Cursor) getDrawingPos(x, y, xprime, yprime, deltax, deltay float64) (fl
 func (c *Cursor) move() {
 	X, Y := c.getDrawingPos(c.x, c.y, c.xprime, c.yprime, c.deltax, c.deltay)
 
-	c.Move2(
-		int(X),
-		int(Y),
-	)
+	iX := int(X)
+	iY := int(Y)
+
+	iX += c.ws.screen.tooltip.cursorVisualPos
+
+	c.Move2(iX, iY)
 }
 
 func (c *Cursor) updateFont(targetWin *Window, font *Font) {
@@ -670,9 +671,7 @@ func (c *Cursor) redraw() {
 	c.paint()
 
 	// Fix #119: Wrong candidate window position when using ibus
-	if runtime.GOOS == "linux" {
-		gui.QGuiApplication_InputMethod().Update(core.Qt__ImCursorRectangle)
-	}
+	editor.app.InputMethod().Update(core.Qt__ImCursorRectangle)
 }
 
 // paint() is to request update cursor widget.

editor/handleime.cpp

@@ -0,0 +1,82 @@
+#include "handleime.h"
+
+#include <QInputMethodEvent>
+
+
+int selectionLengthInPreeditStrOnDarwin(void* ptr, int cursorpos) {
+
+    QInputMethodEvent* event = static_cast<QInputMethodEvent*>(ptr);
+
+    QList<QInputMethodEvent::Attribute> attributes;
+    attributes = {};
+    attributes = event->attributes();
+    int ret = attributes.size();
+
+    for (int i = 0; i < attributes.size(); i++) {
+
+	const QInputMethodEvent::Attribute &a = event->attributes().at(i);
+
+	if (a.type == QInputMethodEvent::TextFormat) {
+
+	    if (a.start + a.length == cursorpos) {
+		ret = a.length;
+	    }
+
+	}
+
+    }
+
+    return ret;
+}
+
+int selectionLengthInPreeditStr(void* ptr, int cursorpos) {
+
+    QInputMethodEvent* event = static_cast<QInputMethodEvent*>(ptr);
+
+    QList<QInputMethodEvent::Attribute> attributes;
+    attributes = {};
+    attributes = event->attributes();
+    int ret = attributes.size();
+
+    for (int i = 0; i < attributes.size(); i++) {
+
+	const QInputMethodEvent::Attribute &a = event->attributes().at(i);
+
+	if (a.type == QInputMethodEvent::TextFormat) {
+
+	    if (a.start == cursorpos) {
+		ret = a.length;
+	    }
+
+	}
+
+    }
+
+    return ret;
+}
+
+int cursorPosInPreeditStr(void* ptr) {
+
+    QInputMethodEvent* event = static_cast<QInputMethodEvent*>(ptr);
+
+
+    QList<QInputMethodEvent::Attribute> attributes;
+    attributes = {};
+    attributes = event->attributes();
+    int ret = attributes.size();
+
+    for (int i = 0; i < attributes.size(); i++) {
+
+	const QInputMethodEvent::Attribute &a = event->attributes().at(i);
+
+	if (a.type == QInputMethodEvent::Cursor) {
+
+	    ret = a.start;
+
+	}
+
+    }
+
+    return ret;
+
+}

editor/handleime.go

@@ -0,0 +1,22 @@
+package editor
+
+//#include <stdint.h>
+//#include "handleime.h"
+import "C"
+import (
+	"runtime"
+
+	"github.com/therecipe/qt/gui"
+)
+
+func selectionPosInPreeditStr(event *gui.QInputMethodEvent) (cursorPos, selectionLength int) {
+	cursorPos = int(C.cursorPosInPreeditStr(event.Pointer()))
+
+	if runtime.GOOS == "darwin" {
+		selectionLength = int(C.selectionLengthInPreeditStrOnDarwin(event.Pointer(), C.int(cursorPos)))
+	} else {
+		selectionLength = int(C.selectionLengthInPreeditStr(event.Pointer(), C.int(cursorPos)))
+	}
+
+	return
+}

editor/handleime.h

@@ -0,0 +1,21 @@
+#pragma once
+
+#ifndef GO_HANDLEIME_H
+#define GO_HANDLEIME_H
+
+#include <stdint.h>
+#include <stdio.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+int selectionLengthInPreeditStr(void* ptr, int cursorpos);
+int selectionLengthInPreeditStrOnDarwin(void* ptr, int cursorpos);
+int cursorPosInPreeditStr(void* ptr);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif