callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Win32 IME: Use CFS_EXCLUDE to specify cursor position

Browse Source 
That mode of operation requires an exclude rectangle, which maps
better to the info provided on gtk_im_context_set_cursor_location(),
coincidentally also fixes the offset seen on the IME preedit window.

https://gitlab.gnome.org/GNOME/gtk/-/issues/374
https://bugzilla.gnome.org/show_bug.cgi?id=663096
This commit is contained in:
Carlos Garnacho 2022-02-19 17:26:09 +01:00 committed by Luca Bacci
parent 45d265c851
commit ed08a4e929
1 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
modules/input/gtkimcontextime.c
View File

@ -942,25 +942,18 @@ gtk_im_context_ime_message_filter (GdkXEvent *xevent,
{ {
gint wx = 0, wy = 0; gint wx = 0, wy = 0;
CANDIDATEFORM cf; CANDIDATEFORM cf;
guint scale = gdk_window_get_scale_factor (context_ime->client_window); gint scale = gdk_window_get_scale_factor (context_ime->client_window);
get_window_position (context_ime->client_window, &wx, &wy); get_window_position (context_ime->client_window, &wx, &wy);
/* FIXME! */
{
POINT pt;
RECT rc;
GetWindowRect (hwnd, &rc);
pt.x = wx * scale;
pt.y = wy * scale;
ClientToScreen (hwnd, &pt);
wx = (pt.x - rc.left) / scale;
wy = (pt.y - rc.top) / scale;
}
cf.dwIndex = 0; cf.dwIndex = 0;
cf.dwStyle = CFS_CANDIDATEPOS; cf.dwStyle = CFS_EXCLUDE;
cf.ptCurrentPos.x = (wx + context_ime->cursor_location.x) * scale; cf.ptCurrentPos.x = (wx + context_ime->cursor_location.x) * scale;
cf.ptCurrentPos.y = (wy + context_ime->cursor_location.y cf.ptCurrentPos.y = (wy + context_ime->cursor_location.y) * scale;
+ context_ime->cursor_location.height) * scale; cf.rcArea.left = (wx + context_ime->cursor_location.x) * scale;
cf.rcArea.right = (wx + context_ime->cursor_location.x + context_ime->cursor_location.width) * scale;
cf.rcArea.top = (wy + context_ime->cursor_location.y) * scale;
cf.rcArea.bottom = (wy + context_ime->cursor_location.y + context_ime->cursor_location.height) * scale;
ImmSetCandidateWindow (himc, &cf); ImmSetCandidateWindow (himc, &cf);
if ((msg->lParam & GCS_COMPSTR)) if ((msg->lParam & GCS_COMPSTR))