Commit f613a4c8 authored by Kenichi Handa's avatar Kenichi Handa
Browse files

(dumpglyphs): Draw glyphs one by one if the font for

them is narrower than required.
(x_connection_closed): Put # at the beginning of line.
(x_load_font): Cast to (char *) before assigning to FONTNAME.
parent a81ed99e
...@@ -896,10 +896,10 @@ dumpglyphs (f, left, top, gp, n, hl, just_foreground, cmpcharp) ...@@ -896,10 +896,10 @@ dumpglyphs (f, left, top, gp, n, hl, just_foreground, cmpcharp)
if (!cmpcharp) if (!cmpcharp)
{ {
if (require_clipping) if (require_clipping || FONT_WIDTH (font) != glyph_width)
for (i = 0; i < len; i++) for (i = 0; i < len; i++)
{ {
if (i > 0) if (require_clipping && i > 0)
XSetClipOrigin (FRAME_X_DISPLAY (f), gc, XSetClipOrigin (FRAME_X_DISPLAY (f), gc,
glyph_width * i, 0); glyph_width * i, 0);
if (background_filled) if (background_filled)
...@@ -5096,9 +5096,9 @@ x_connection_closed (display, error_message) ...@@ -5096,9 +5096,9 @@ x_connection_closed (display, error_message)
/* Indicate that this display is dead. */ /* Indicate that this display is dead. */
#ifdef USE_X_TOOLKIT #ifdef USE_X_TOOLKIT
XtCloseDisplay (display); XtCloseDisplay (display);
#endif #endif
dpyinfo->display = 0; dpyinfo->display = 0;
...@@ -6416,7 +6416,7 @@ x_load_font (f, fontname, size) ...@@ -6416,7 +6416,7 @@ x_load_font (f, fontname, size)
unsigned long value; unsigned long value;
if (!NILP (font_names)) if (!NILP (font_names))
fontname = XSTRING (XCONS (font_names)->car)->data; fontname = (char *) XSTRING (XCONS (font_names)->car)->data;
BLOCK_INPUT; BLOCK_INPUT;
font = (XFontStruct *) XLoadQueryFont (FRAME_X_DISPLAY (f), fontname); font = (XFontStruct *) XLoadQueryFont (FRAME_X_DISPLAY (f), fontname);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment