[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs/src ChangeLog w32term.c xterm.c
From: |
Chong Yidong |
Subject: |
[Emacs-diffs] emacs/src ChangeLog w32term.c xterm.c |
Date: |
Mon, 22 Jun 2009 02:01:58 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Chong Yidong <cyd> 09/06/22 02:01:58
Modified files:
src : ChangeLog w32term.c xterm.c
Log message:
* w32term.c (x_draw_glyph_string): Use the glyph string's width
rather than its background_width for drawing the overline and
underline (Bug#489).
* xterm.c (x_draw_glyph_string): Use the glyph string's width
rather than its background_width for drawing the overline and
underline (Bug#489).
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ChangeLog?cvsroot=emacs&r1=1.7589&r2=1.7590
http://cvs.savannah.gnu.org/viewcvs/emacs/src/w32term.c?cvsroot=emacs&r1=1.326&r2=1.327
http://cvs.savannah.gnu.org/viewcvs/emacs/src/xterm.c?cvsroot=emacs&r1=1.1028&r2=1.1029
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/src/ChangeLog,v
retrieving revision 1.7589
retrieving revision 1.7590
diff -u -b -r1.7589 -r1.7590
--- ChangeLog 22 Jun 2009 01:53:11 -0000 1.7589
+++ ChangeLog 22 Jun 2009 02:01:56 -0000 1.7590
@@ -1,5 +1,13 @@
2009-06-22 Chong Yidong <address@hidden>
+ * w32term.c (x_draw_glyph_string): Use the glyph string's width
+ rather than its background_width for drawing the overline and
+ underline (Bug#489).
+
+ * xterm.c (x_draw_glyph_string): Use the glyph string's width
+ rather than its background_width for drawing the overline and
+ underline (Bug#489).
+
* xdisp.c (Qbefore_string, Qafter_string): Add externs.
(load_overlay_strings): Remove externs.
(fast_find_position): Function deleted.
Index: w32term.c
===================================================================
RCS file: /sources/emacs/emacs/src/w32term.c,v
retrieving revision 1.326
retrieving revision 1.327
diff -u -b -r1.326 -r1.327
--- w32term.c 21 Jun 2009 13:16:21 -0000 1.326
+++ w32term.c 22 Jun 2009 02:01:57 -0000 1.327
@@ -2401,12 +2401,12 @@
if (s->face->underline_defaulted_p)
{
w32_fill_area (s->f, s->hdc, s->gc->foreground, s->x,
- y, s->background_width, 1);
+ y, s->width, 1);
}
else
{
w32_fill_area (s->f, s->hdc, s->face->underline_color, s->x,
- y, s->background_width, 1);
+ y, s->width, 1);
}
}
/* Draw overline. */
@@ -2417,12 +2417,12 @@
if (s->face->overline_color_defaulted_p)
{
w32_fill_area (s->f, s->hdc, s->gc->foreground, s->x,
- s->y + dy, s->background_width, h);
+ s->y + dy, s->width, h);
}
else
{
w32_fill_area (s->f, s->hdc, s->face->overline_color, s->x,
- s->y + dy, s->background_width, h);
+ s->y + dy, s->width, h);
}
}
Index: xterm.c
===================================================================
RCS file: /sources/emacs/emacs/src/xterm.c,v
retrieving revision 1.1028
retrieving revision 1.1029
diff -u -b -r1.1028 -r1.1029
--- xterm.c 15 Jun 2009 10:49:59 -0000 1.1028
+++ xterm.c 22 Jun 2009 02:01:58 -0000 1.1029
@@ -2793,14 +2793,14 @@
y = s->ybase + position;
if (s->face->underline_defaulted_p)
XFillRectangle (s->display, s->window, s->gc,
- s->x, y, s->background_width, thickness);
+ s->x, y, s->width, thickness);
else
{
XGCValues xgcv;
XGetGCValues (s->display, s->gc, GCForeground, &xgcv);
XSetForeground (s->display, s->gc, s->face->underline_color);
XFillRectangle (s->display, s->window, s->gc,
- s->x, y, s->background_width, thickness);
+ s->x, y, s->width, thickness);
XSetForeground (s->display, s->gc, xgcv.foreground);
}
}
@@ -2812,14 +2812,14 @@
if (s->face->overline_color_defaulted_p)
XFillRectangle (s->display, s->window, s->gc, s->x, s->y + dy,
- s->background_width, h);
+ s->width, h);
else
{
XGCValues xgcv;
XGetGCValues (s->display, s->gc, GCForeground, &xgcv);
XSetForeground (s->display, s->gc, s->face->overline_color);
XFillRectangle (s->display, s->window, s->gc, s->x, s->y + dy,
- s->background_width, h);
+ s->width, h);
XSetForeground (s->display, s->gc, xgcv.foreground);
}
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs/src ChangeLog w32term.c xterm.c,
Chong Yidong <=