all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Eli Zaretskii <eliz@gnu.org>
To: Lars Ingebrigtsen <larsi@gnus.org>
Cc: contovob@tcd.ie, 34476@debbugs.gnu.org
Subject: bug#34476: fluffy whitespace in the mode-line, despite it running off the screen
Date: Sat, 08 Aug 2020 15:55:25 +0300	[thread overview]
Message-ID: <83sgcx5mbm.fsf@gnu.org> (raw)
In-Reply-To: <87k0y94c8p.fsf@gnus.org> (message from Lars Ingebrigtsen on Sat,  08 Aug 2020 13:18:30 +0200)

> From: Lars Ingebrigtsen <larsi@gnus.org>
> Cc: contovob@tcd.ie,  34476@debbugs.gnu.org,  jidanni@jidanni.org
> Date: Sat, 08 Aug 2020 13:18:30 +0200
> 
> > Should I perhaps post the post-processing code I had in mind?
> 
> Yes, please.  :-)

Something like the below, tested very lightly (need test cases with
various non-default faces and fonts in the mode line, and also
images).

Note a few subtle issues:

 . I've limited the feature to the mode line; programs that set
   header-line and tab-line either don't want this, or should format
   those lines to not waste screen space to begin with;
 . I've refrained from squeezing spaces if they have non-default
   faces, on the assumption that those spaces are significant -- the
   result is that the trailing spaces of the buffer name are not
   squeezed, but I think we have no choice here, as down that path
   lies madness (think a mode line that plays some fancy games with
   font sizes).

diff --git a/src/xdisp.c b/src/xdisp.c
index 4fe1c42..24a621d 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -25228,6 +25228,51 @@ display_mode_line (struct window *w, enum face_id face_id, Lisp_Object format)
 
   unbind_to (count, Qnil);
 
+  /* Optionally, squeeze embedded whitespace in the mode line to
+     prevent unnecessary truncation of meaningful data shown there.  */
+  if ((face_id == MODE_LINE_FACE_ID
+       || face_id == MODE_LINE_INACTIVE_FACE_ID)
+      && Vmode_line_compact)
+    {
+      /* Find the last non-blank glyph.  */
+      int last_idx = it.glyph_row->used[TEXT_AREA] - 1;
+      struct glyph *glyphs = it.glyph_row->glyphs[TEXT_AREA];
+      for ( ; last_idx > 0; last_idx--)
+	{
+	  if (!(glyphs[last_idx].type == CHAR_GLYPH
+		&& glyphs[last_idx].u.ch == ' '))
+	    break;
+	}
+
+      /* Now squeeeze embedded repeating spaces.  */
+      int from_idx, to_idx;
+      last_idx++;
+      for (from_idx = 0, to_idx = 0; from_idx < last_idx; to_idx++)
+	{
+	  if (to_idx != from_idx)
+	    glyphs[to_idx] = glyphs[from_idx];
+	  if (glyphs[from_idx].type == CHAR_GLYPH
+	      /* Leave alone spaces that have non-default face ID.  */
+	      && glyphs[from_idx].face_id == face_id
+	      && glyphs[from_idx].u.ch == ' ')
+	    {
+	      from_idx++;
+	      while (from_idx < last_idx
+		     && glyphs[from_idx].face_id == face_id
+		     && glyphs[from_idx].type == CHAR_GLYPH
+		     && glyphs[from_idx].u.ch == ' ')
+		{
+		  it.current_x -= glyphs[from_idx].pixel_width;
+		  from_idx++;
+		}
+	    }
+	  else
+	    from_idx++;
+	}
+      /* Update the count of the glyph slots we've used.  */
+      it.glyph_row->used[TEXT_AREA] -= from_idx - to_idx;
+    }
+
   /* Fill up with spaces.  */
   display_string (" ", Qnil, Qnil, 0, 0, &it, 10000, -1, -1, 0);
 





  reply	other threads:[~2020-08-08 12:55 UTC|newest]

Thread overview: 39+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-02-14 13:34 bug#34476: fluffy whitespace in the mode-line, despite it running off the screen 積丹尼 Dan Jacobson
2019-07-09 16:43 ` Lars Ingebrigtsen
2019-07-09 20:46   ` Basil L. Contovounesios
2019-07-09 21:44     ` Lars Ingebrigtsen
2020-08-07  8:00       ` Lars Ingebrigtsen
2020-08-07  8:31         ` Lars Ingebrigtsen
2020-08-07 11:32           ` Eli Zaretskii
2020-08-07 11:41             ` Lars Ingebrigtsen
2020-08-07 11:59               ` Eli Zaretskii
2020-08-07 12:15                 ` Lars Ingebrigtsen
2020-08-07 13:52                   ` Eli Zaretskii
2020-08-08  9:11                     ` Lars Ingebrigtsen
2020-08-08  9:48                       ` Eli Zaretskii
2020-08-08 10:01                         ` Eli Zaretskii
2020-08-08 11:18                           ` Lars Ingebrigtsen
2020-08-08 12:55                             ` Eli Zaretskii [this message]
2020-08-08 14:16                               ` Lars Ingebrigtsen
2020-08-08 15:00                                 ` Eli Zaretskii
2020-08-09  9:56                                   ` Lars Ingebrigtsen
2020-08-09 14:07                                     ` Eli Zaretskii
2020-08-10 14:46                                       ` Eli Zaretskii
2020-08-10 14:56                                         ` Lars Ingebrigtsen
2020-08-14 10:46                                         ` Eli Zaretskii
2020-08-14 12:00                                           ` Lars Ingebrigtsen
2020-08-14 13:16                                             ` Eli Zaretskii
2020-08-15  8:47                                           ` Eli Zaretskii
2020-08-15 10:55                                             ` Lars Ingebrigtsen
2020-08-15 15:12                                               ` Eli Zaretskii
2020-08-16 11:21                                                 ` Lars Ingebrigtsen
2020-08-16 14:43                                                   ` Eli Zaretskii
2020-08-17  8:33                                                     ` Lars Ingebrigtsen
2020-08-17 14:17                                                       ` Eli Zaretskii
2020-12-29  3:54                                                         ` Lars Ingebrigtsen
2020-12-29 15:02                                                           ` Eli Zaretskii
2020-12-29 15:07                                                             ` Lars Ingebrigtsen
2020-12-29 15:54                                                               ` Eli Zaretskii
2020-12-29 17:04                                                                 ` martin rudalics
2020-12-30  2:36                                                                   ` Lars Ingebrigtsen
2020-08-08 11:18                         ` 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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=83sgcx5mbm.fsf@gnu.org \
    --to=eliz@gnu.org \
    --cc=34476@debbugs.gnu.org \
    --cc=contovob@tcd.ie \
    --cc=larsi@gnus.org \
    /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 external index

	https://git.savannah.gnu.org/cgit/emacs.git
	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.