mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2024-12-15 09:47:20 +00:00
(xfont_draw): Use BLOCK_INPUT and UNBLOCK_INPUT.
This commit is contained in:
parent
1c5c216ba9
commit
d45fefc73c
@ -781,9 +781,11 @@ xfont_draw (s, from, to, x, y, with_background)
|
||||
XGCValues xgcv;
|
||||
Display_Info *dpyinfo = FRAME_X_DISPLAY_INFO (s->f);
|
||||
|
||||
BLOCK_INPUT;
|
||||
XGetGCValues (s->display, gc, GCFont, &xgcv);
|
||||
if (xgcv.font != xfont->fid)
|
||||
XSetFont (s->display, gc, xfont->fid);
|
||||
UNBLOCK_INPUT;
|
||||
}
|
||||
|
||||
if (xfont->min_byte1 == 0 && xfont->max_byte1 == 0)
|
||||
@ -795,22 +797,26 @@ xfont_draw (s, from, to, x, y, with_background)
|
||||
SAFE_ALLOCA (str, char *, len);
|
||||
for (i = 0; i < len ; i++)
|
||||
str[i] = XCHAR2B_BYTE2 (s->char2b + from + i);
|
||||
BLOCK_INPUT;
|
||||
if (with_background > 0)
|
||||
XDrawImageString (FRAME_X_DISPLAY (s->f), FRAME_X_WINDOW (s->f),
|
||||
gc, x, y, str, len);
|
||||
else
|
||||
XDrawString (FRAME_X_DISPLAY (s->f), FRAME_X_WINDOW (s->f),
|
||||
gc, x, y, str, len);
|
||||
UNBLOCK_INPUT;
|
||||
SAFE_FREE ();
|
||||
return s->nchars;
|
||||
}
|
||||
|
||||
BLOCK_INPUT;
|
||||
if (with_background > 0)
|
||||
XDrawImageString16 (FRAME_X_DISPLAY (s->f), FRAME_X_WINDOW (s->f),
|
||||
gc, x, y, s->char2b + from, len);
|
||||
else
|
||||
XDrawString16 (FRAME_X_DISPLAY (s->f), FRAME_X_WINDOW (s->f),
|
||||
gc, x, y, s->char2b + from, len);
|
||||
UNBLOCK_INPUT;
|
||||
|
||||
return len;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user