procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't set callbacks on XIC when adjusting spot if callbacks are off

Browse source 
* src/xfns.c (xic_set_preeditarea): Don't set callbacks if the
XIC style is not XIMPreeditCallbacks.  (bug#53146)
This commit is contained in:
Po Lu 2022-01-10 14:36:21 +08:00
parent d5cf772cad
commit f591835838
1 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/xfns.c
View file

@ -2816,20 +2816,24 @@ free_frame_xic (struct frame *f)
void
xic_set_preeditarea (struct window *w, int x, int y)
{
struct frame *f = XFRAME (w->frame);
struct frame *f = WINDOW_XFRAME (w);
XVaNestedList attr;
XPoint spot;
if (FRAME_XIC (WINDOW_XFRAME (w)))
if (FRAME_XIC (f))
{
spot.x = WINDOW_TO_FRAME_PIXEL_X (w, x) + WINDOW_LEFT_FRINGE_WIDTH (w) + WINDOW_LEFT_MARGIN_WIDTH(w);
spot.y = WINDOW_TO_FRAME_PIXEL_Y (w, y) + FONT_BASE (FRAME_FONT (f));
attr = XVaCreateNestedList (0, XNSpotLocation, &spot,
XNPreeditStartCallback, &Xxic_preedit_start_callback,
XNPreeditDoneCallback, &Xxic_preedit_done_callback,
XNPreeditDrawCallback, &Xxic_preedit_draw_callback,
XNPreeditCaretCallback, &Xxic_preedit_caret_callback,
NULL);
if (FRAME_XIC_STYLE (f) & XIMPreeditCallbacks)
attr = XVaCreateNestedList (0, XNSpotLocation, &spot,
XNPreeditStartCallback, &Xxic_preedit_start_callback,
XNPreeditDoneCallback, &Xxic_preedit_done_callback,
XNPreeditDrawCallback, &Xxic_preedit_draw_callback,
XNPreeditCaretCallback, &Xxic_preedit_caret_callback,
NULL);
else
attr = XVaCreateNestedList (0, XNSpotLocation, &spot, NULL);
XSetICValues (FRAME_XIC (f), XNPreeditAttributes, attr, NULL);
XFree (attr);
}