Extending underline/overline/strikethrough to window edge on X

Extending underline/overline/strikethrough to window edge on X

[David De La Harpe Golden]

[-- Attachment #1: Type: text/plain, Size: 1403 bytes --]

On 02/03/2008, David De La Harpe Golden
<david.delaharpe.golden@gmail.com> wrote:
> Working on that, noticed a difference between underlining on X and in
>  terminals: if a face has only underline set on a terminal and the
>  overlay with that face passes the narrower-than-window-width line end,
>  then the underline extends to the right edge of the window - in this
>  case desirable to get a line all the way across the window.
>
>  If a face has only underline set on X, that doesn't happen,
>  only happens if the face also has a different background set to the
>  frame background.
>
>  Not really up to speed on the C code, but I guess to fix the issue
>  xdisp.c/extend_face_to_end_of_line() probably just needs a small
>  change to extend if underline is set, not just boxes, different
>  backgrounds and stipples.
>

Anyhow,

attached trivial patch fixes issue (and for overline and strikethrough too),
assuming it is an issue.

Note that the underline/overline was always drawn to edge if the
background happened to be different, so this only changes the
behaviour from existing behaviour when the face background is unset or
happens to match the frame background.  As such, it improves
consistency IMO.

strikethrough is a slightly different matter - unlike underline/overline it was
using the width not the background_width when drawn, but for
consistency it probably should use the same.

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: xdisp_extend_underline_to_edge.diff --]
[-- Type: text/x-diff; name=xdisp_extend_underline_to_edge.diff, Size: 1224 bytes --]

Index: src/xdisp.c
===================================================================
RCS file: /sources/emacs/emacs/src/xdisp.c,v
retrieving revision 1.1198
diff -u -r1.1198 xdisp.c
--- src/xdisp.c	29 Feb 2008 03:12:27 -0000	1.1198
+++ src/xdisp.c	2 Mar 2008 04:42:46 -0000
@@ -15968,6 +15968,9 @@
   if (FRAME_WINDOW_P (f)
       && it->glyph_row->displays_text_p
       && face->box == FACE_NO_BOX
+      && !face->underline_p
+      && !face->overline_p
+      && !face->strike_through_p
       && face->background == FRAME_BACKGROUND_PIXEL (f)
       && !face->stipple)
     return;
Index: src/xterm.c
===================================================================
RCS file: /sources/emacs/emacs/src/xterm.c,v
retrieving revision 1.980
diff -u -r1.980 xterm.c
--- src/xterm.c	1 Mar 2008 14:59:06 -0000	1.980
+++ src/xterm.c	2 Mar 2008 04:42:56 -0000
@@ -3024,7 +3024,7 @@
 	      XGetGCValues (s->display, s->gc, GCForeground, &xgcv);
 	      XSetForeground (s->display, s->gc, s->face->strike_through_color);
 	      XFillRectangle (s->display, s->window, s->gc, s->x, s->y + dy,
-			      s->width, h);
+			      s->background_width, h);
 	      XSetForeground (s->display, s->gc, xgcv.foreground);
 	    }
 	}

Re: Extending underline/overline/strikethrough to window edge on X

[David De La Harpe Golden]

David De La Harpe Golden wrote:
> On 02/03/2008, David De La Harpe Golden
> <david.delaharpe.golden@gmail.com> wrote:
>> Working on that, noticed a difference between underlining on X and in
>>  terminals: if a face has only underline set on a terminal and the
>>  overlay with that face passes the narrower-than-window-width line end,
>>  then the underline extends to the right edge of the window - in this
>>  case desirable to get a line all the way across the window.
>>
>>  If a face has only underline set on X, that doesn't happen,
>>  only happens if the face also has a different background set to the
>>  frame background.

filed as bug #26 in test tracker, including the trivial fix.
http://emacsbugs.donarmstrong.com/cgi-bin/bugreport.cgi?bug=26