From: Eli Zaretskii <eliz@gnu.org>
To: Po Lu <luangruo@yahoo.com>
Cc: larsi@gnus.org, 50660@debbugs.gnu.org
Subject: bug#50660: 28.0.50; Text artifacting when the cursor moves over text under mouse face that originally displayed a box
Date: Fri, 15 Oct 2021 16:43:56 +0300 [thread overview]
Message-ID: <83v91yiesj.fsf@gnu.org> (raw)
In-Reply-To: <871r4njcum.fsf@yahoo.com> (message from Po Lu on Fri, 15 Oct 2021 09:28:17 +0800)
> From: Po Lu <luangruo@yahoo.com>
> Cc: larsi@gnus.org, 50660@debbugs.gnu.org
> Date: Fri, 15 Oct 2021 09:28:17 +0800
>
> @@ -28281,6 +28303,16 @@ fill_glyph_string (struct glyph_string *s, int face_id,
> break;
> }
>
> + if (s->hl == DRAW_MOUSE_FACE
> + || (s->hl == DRAW_CURSOR && cursor_in_mouse_face_p (s->w)))
> + {
> + Mouse_HLInfo *hlinfo = MOUSE_HL_INFO (s->f);
> + struct face *face
> + = FACE_FROM_ID (s->f, hlinfo->mouse_face_face_id);
> + s->face
> + = FACE_FROM_ID (s->f, FACE_FOR_CHAR (s->f, face,
> + s->first_glyph->u.ch, -1, Qnil));
> + }
> s->font = s->face->font;
This part doesn't look right to me: FACE_FOR_CHAR could potentially
yield a face with a different font, but the glyph codes in the glyph
string will reference the previous font, because
get_glyph_face_and_encoding was called before the face was changed.
Also, why did you not follow the more cautious code of xterm.c:
> - /* What face has to be used last for the mouse face? */
> - face_id = MOUSE_HL_INFO (s->f)->mouse_face_face_id;
> - face = FACE_FROM_ID_OR_NULL (s->f, face_id);
> - if (face == NULL)
> - face = FACE_FROM_ID (s->f, MOUSE_FACE_ID);
FACE_FROM_ID can abort if the face is not in the face cache.
> @@ -28620,7 +28679,67 @@ set_glyph_string_background_width (struct glyph_string *s, int start, int last_x
> if (s->extends_to_end_of_line_p)
> s->background_width = last_x - s->x + 1;
> else
> - s->background_width = s->width;
> + {
> + s->background_width = s->width;
> +#ifdef HAVE_WINDOW_SYSTEM
> + if (FRAME_WINDOW_P (s->f)
> + && s->hl == DRAW_CURSOR
> + && cursor_in_mouse_face_p (s->w))
> + {
> + /* We will have to adjust the background width of the string
> + in this situation, because the glyph's pixel_width might
> + be inconsistent with the box of the mouse face, which
> + leads to an ugly over-wide cursor. */
> +
> + struct glyph *g = s->first_glyph;
> + struct face *regular_face = FACE_FROM_ID (s->f, g->face_id);
> +
> + bool do_left_box_p = g->left_box_line_p;
> + bool do_right_box_p = g->right_box_line_p;
> +
> + /* This is required because we test some parameters
> + of the image slice before applying the box in
> + produce_image_glyph. */
> +
> + if (g->type == IMAGE_GLYPH)
> + {
> + if (!s->row->reversed_p)
> + {
> + struct image *img = IMAGE_FROM_ID (s->f, g->u.img_id);
> + do_left_box_p = g->left_box_line_p &&
> + g->slice.img.x == 0;
> + do_right_box_p = g->right_box_line_p &&
> + g->slice.img.x + g->slice.img.width == img->width;
> + }
> + else
> + {
> + struct image *img = IMAGE_FROM_ID (s->f, g->u.img_id);
> + do_left_box_p = g->left_box_line_p &&
> + g->slice.img.x + g->slice.img.width == img->width;
> + do_right_box_p = g->right_box_line_p &&
> + g->slice.img.x == 0;
> + }
> + }
> +
> + /* If the glyph has a left box line, subtract it from the
> + offset. */
> + if (do_left_box_p)
> + s->background_width -= max (0, regular_face->box_vertical_line_width);
> + /* Likewise with the right box line, as there may be a
> + box there as well. */
> + if (do_right_box_p)
> + s->background_width -= max (0, regular_face->box_vertical_line_width);
> + /* Now add the line widths from the new face. */
> + if (g->left_box_line_p)
> + s->background_width += max (0, s->face->box_vertical_line_width);
> + if (g->right_box_line_p)
> + s->background_width += max (0, s->face->box_vertical_line_width);
> +
> + /* s->width is probably worth adjusting here as well. */
> + s->width = s->background_width;
> + }
> +#endif
This looks like the same code we have elsewhere, so can't we have a
function to call in both places?
Also, the indentation with/without TABs seems wrong here.
And finally, please always leave TWO spaces after the final period in
a comment, like this:
/* s->width is probably worth adjusting here as well. */
^^^
next prev parent reply other threads:[~2021-10-15 13:43 UTC|newest]
Thread overview: 83+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <87czp6ysw7.fsf.ref@yahoo.com>
2021-09-18 12:23 ` bug#50660: 28.0.50; Text artifacting when the cursor moves over text under mouse face that originally displayed a box Po Lu via Bug reports for GNU Emacs, the Swiss army knife of text editors
2021-09-18 13:48 ` Lars Ingebrigtsen
2021-09-19 0:33 ` Po Lu via Bug reports for GNU Emacs, the Swiss army knife of text editors
2021-09-19 5:47 ` Eli Zaretskii
2021-09-19 13:55 ` Po Lu via Bug reports for GNU Emacs, the Swiss army knife of text editors
2021-09-19 15:13 ` Lars Ingebrigtsen
2021-09-19 17:01 ` Eli Zaretskii
2021-09-20 1:00 ` Po Lu via Bug reports for GNU Emacs, the Swiss army knife of text editors
2021-09-20 5:19 ` Eli Zaretskii
2021-09-20 5:34 ` Eli Zaretskii
2021-09-20 8:02 ` Po Lu via Bug reports for GNU Emacs, the Swiss army knife of text editors
2021-09-20 7:07 ` Eli Zaretskii
2021-09-20 7:34 ` Eli Zaretskii
2021-09-20 8:18 ` Po Lu via Bug reports for GNU Emacs, the Swiss army knife of text editors
2021-09-20 9:47 ` Eli Zaretskii
2021-09-20 10:27 ` Po Lu via Bug reports for GNU Emacs, the Swiss army knife of text editors
2021-09-20 10:51 ` Eli Zaretskii
2021-09-20 11:08 ` Po Lu via Bug reports for GNU Emacs, the Swiss army knife of text editors
2021-09-20 12:07 ` Eli Zaretskii
2021-09-20 12:36 ` Eli Zaretskii
2021-09-21 0:38 ` Po Lu via Bug reports for GNU Emacs, the Swiss army knife of text editors
2021-09-21 6:11 ` Eli Zaretskii
2021-09-21 7:34 ` Po Lu via Bug reports for GNU Emacs, the Swiss army knife of text editors
2021-09-21 8:45 ` Eli Zaretskii
2021-09-21 9:20 ` Po Lu via Bug reports for GNU Emacs, the Swiss army knife of text editors
2021-09-21 9:37 ` Eli Zaretskii
2021-09-21 9:45 ` Po Lu via Bug reports for GNU Emacs, the Swiss army knife of text editors
2021-09-21 10:17 ` Eli Zaretskii
2021-09-21 10:41 ` Eli Zaretskii
2021-09-21 12:26 ` Eli Zaretskii
2021-09-20 11:09 ` Po Lu via Bug reports for GNU Emacs, the Swiss army knife of text editors
2021-09-21 12:46 ` Po Lu via Bug reports for GNU Emacs, the Swiss army knife of text editors
2021-09-21 13:10 ` Eli Zaretskii
2021-09-21 13:36 ` Po Lu via Bug reports for GNU Emacs, the Swiss army knife of text editors
2021-09-21 13:47 ` Eli Zaretskii
2021-09-23 23:53 ` Po Lu via Bug reports for GNU Emacs, the Swiss army knife of text editors
2021-09-24 6:47 ` Eli Zaretskii
2021-09-26 6:46 ` Po Lu via Bug reports for GNU Emacs, the Swiss army knife of text editors
2021-09-26 7:04 ` Eli Zaretskii
2021-09-26 9:56 ` Po Lu via Bug reports for GNU Emacs, the Swiss army knife of text editors
2021-09-27 11:52 ` Eli Zaretskii
2021-09-29 1:35 ` Po Lu via Bug reports for GNU Emacs, the Swiss army knife of text editors
2021-10-02 8:43 ` Eli Zaretskii
2021-10-02 9:46 ` Po Lu via Bug reports for GNU Emacs, the Swiss army knife of text editors
2021-10-02 12:52 ` Po Lu via Bug reports for GNU Emacs, the Swiss army knife of text editors
2021-10-14 8:58 ` Eli Zaretskii
2021-10-14 10:52 ` Po Lu via Bug reports for GNU Emacs, the Swiss army knife of text editors
2021-10-14 11:11 ` Robert Pluim
2021-10-14 11:25 ` Po Lu via Bug reports for GNU Emacs, the Swiss army knife of text editors
2021-10-14 11:35 ` Eli Zaretskii
2021-10-14 11:54 ` Po Lu via Bug reports for GNU Emacs, the Swiss army knife of text editors
2021-10-14 12:10 ` Eli Zaretskii
2021-10-14 12:16 ` Po Lu via Bug reports for GNU Emacs, the Swiss army knife of text editors
2021-10-14 12:20 ` Eli Zaretskii
2021-10-14 12:27 ` Po Lu via Bug reports for GNU Emacs, the Swiss army knife of text editors
2021-10-14 12:44 ` Eli Zaretskii
2021-10-14 13:11 ` Po Lu via Bug reports for GNU Emacs, the Swiss army knife of text editors
2021-10-14 15:51 ` Eli Zaretskii
2021-10-15 1:28 ` Po Lu via Bug reports for GNU Emacs, the Swiss army knife of text editors
2021-10-15 13:43 ` Eli Zaretskii [this message]
2021-10-16 0:18 ` Po Lu via Bug reports for GNU Emacs, the Swiss army knife of text editors
2021-10-16 6:09 ` Eli Zaretskii
2021-10-16 6:16 ` Po Lu via Bug reports for GNU Emacs, the Swiss army knife of text editors
2021-10-16 6:28 ` Eli Zaretskii
2021-10-16 6:39 ` Po Lu via Bug reports for GNU Emacs, the Swiss army knife of text editors
2021-10-16 7:00 ` Eli Zaretskii
2021-10-16 7:13 ` Po Lu via Bug reports for GNU Emacs, the Swiss army knife of text editors
2021-10-16 7:26 ` Eli Zaretskii
2021-10-16 7:52 ` Po Lu via Bug reports for GNU Emacs, the Swiss army knife of text editors
2021-10-16 10:10 ` Eli Zaretskii
2021-10-16 12:12 ` Po Lu via Bug reports for GNU Emacs, the Swiss army knife of text editors
2021-10-16 12:25 ` Eli Zaretskii
2021-10-16 12:36 ` Po Lu via Bug reports for GNU Emacs, the Swiss army knife of text editors
2021-10-16 12:45 ` Eli Zaretskii
2021-10-16 13:18 ` Po Lu via Bug reports for GNU Emacs, the Swiss army knife of text editors
2021-10-16 13:46 ` Eli Zaretskii
2021-10-17 0:32 ` Po Lu via Bug reports for GNU Emacs, the Swiss army knife of text editors
2021-10-17 12:15 ` Eli Zaretskii
2021-10-17 12:39 ` Po Lu via Bug reports for GNU Emacs, the Swiss army knife of text editors
2021-09-20 8:02 ` Po Lu via Bug reports for GNU Emacs, the Swiss army knife of text editors
2021-09-20 6:33 ` Po Lu via Bug reports for GNU Emacs, the Swiss army knife of text editors
2021-09-19 0:50 ` Po Lu via Bug reports for GNU Emacs, the Swiss army knife of text editors
2021-09-19 15:10 ` Lars Ingebrigtsen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=83v91yiesj.fsf@gnu.org \
--to=eliz@gnu.org \
--cc=50660@debbugs.gnu.org \
--cc=larsi@gnus.org \
--cc=luangruo@yahoo.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).