diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-07-11 17:07:14 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-11 17:07:14 +0200 |
| commit | a5bb77d5232668045fc2fb82637b00b5295b8741 (patch) | |
| tree | 4d90c5017f1557b381d43eb7d4b805e9c3b0d9f0 /platform/x11/os_x11.cpp | |
| parent | faae28c9551a8e57577762e8e7ed84d0d66c0744 (diff) | |
| parent | 7358766ff69e064d8a31b18c54e3c1e22e303cb6 (diff) | |
Merge pull request #9366 from GodotExplorer/pr-ime-position-flow-cursor
IME window follow the input cursor.
Diffstat (limited to 'platform/x11/os_x11.cpp')
| -rw-r--r-- | platform/x11/os_x11.cpp | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/platform/x11/os_x11.cpp b/platform/x11/os_x11.cpp index 790182794e..4aca1468b1 100644 --- a/platform/x11/os_x11.cpp +++ b/platform/x11/os_x11.cpp @@ -508,22 +508,17 @@ void OS_X11::xim_destroy_callback(::XIM im, ::XPointer client_data, os->xic = NULL; } -void OS_X11::set_ime_position(short x, short y) { +void OS_X11::set_ime_position(const Point2 &p_pos) { - if (!xic) { + if (!xic) return; - } + ::XPoint spot; - spot.x = x; - spot.y = y; - XVaNestedList preedit_attr = XVaCreateNestedList(0, - XNSpotLocation, &spot, - NULL); - XSetICValues(xic, - XNPreeditAttributes, preedit_attr, - NULL); + spot.x = short(p_pos.x); + spot.y = short(p_pos.y); + XVaNestedList preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &spot, NULL); + XSetICValues(xic, XNPreeditAttributes, preedit_attr, NULL); XFree(preedit_attr); - return; } void OS_X11::finalize() { @@ -1489,7 +1484,7 @@ void OS_X11::process_xevents() { case ConfigureNotify: if (xic) { // Not portable. - set_ime_position(0, 1); + set_ime_position(Point2(0, 1)); } /* call resizeGLScene only if our window-size changed */ |