xemacs-beta: src/redisplay.c comparison

comparison src/redisplay.c @ 259:11cf20601dec r20-5b28

Import from CVS: tag r20-5b28

author	cvs
date	Mon, 13 Aug 2007 10:23:02 +0200
parents	65c19d2020f7
children	8efd647ea9ca

comparison

equal deleted inserted replaced

-:58424f6abf56
+:11cf20601dec
 #include "process.h"
 #include "redisplay.h"
 #include "toolbar.h"
 #include "window.h"
 #include "line-number.h"
+#ifdef FILE_CODING
-#ifdef MULE
+#include "file-coding.h"
-#include "mule-coding.h"
 #endif
 #ifdef HAVE_TTY
 #include "console-tty.h"
 #endif
 					  face_index findex, int min_pixpos,
 					  int max_pixpos, int type,
 					  int modeline);
 static Charcount generate_fstring_runes (struct window *w, pos_data *data,
 					 Charcount pos, Charcount min_pos,
-					 Charcount max_pos, Lisp_Object elt,
+					 Charcount max_pos, int no_limit,
+					 Lisp_Object elt,
 					 int depth, int max_pixsize,
 					 face_index findex, int type);
 static prop_block_dynarr *add_emchar_rune (pos_data *data);
 static prop_block_dynarr *add_bufbyte_string_runes (pos_data *data,
 						    Bufbyte *c_string,
 This recursively builds up the modeline or the title/icon string.
 In case of a modeline, we use a negative start position to indicate
 the current modeline horizontal scroll. */
 generate_fstring_runes
 (w, &data,
 (modeline && WINDOW_HAS_MODELINE_P (w)) ? - w->modeline_hscroll : 0,
-0, -1, format_str, 0, max_pixpos - min_pixpos, findex, type);
+(modeline && WINDOW_HAS_MODELINE_P (w)) ? - w->modeline_hscroll : 0,
+0, /* no limit */ 1, format_str, 0, max_pixpos - min_pixpos, findex,
+type);
 if (Dynarr_length (db->runes))
 {
 struct rune *rb =
 	Dynarr_atp (db->runes, Dynarr_length (db->runes) - 1);
 /* D. Verna Feb. 1998. Rewrote this function to handle the case of a
 scrolled modeline */
 static Charcount
 add_string_to_fstring_db_runes (pos_data *data, CONST Bufbyte *str,
-				Charcount pos, Charcount min_pos, Charcount max_pos)
+				Charcount pos, Charcount min_pos,
+				Charcount max_pos, int no_limit)
 {
 /* This function has been Mule-ized. */
 Charcount initial_pos = pos;
 CONST Bufbyte *cur_pos = str;
 struct display_block *db = data->db;
 int add_something;
 data->blank_width = space_width (XWINDOW (data->window));
 add_something = ((pos < min_pos)
-		   || ((*cur_pos) && (max_pos == -1))
+		   || ((*cur_pos) && no_limit)
 		   || ((*cur_pos) && (pos < max_pos)));
 while (add_something)
 {
-if (((initial_pos < 0) && (pos == 1)) || (pos == initial_pos))
+if ((initial_pos >= 0) && (pos == initial_pos))
 	while (Dynarr_length (db->runes) < pos)
 	  add_blank_rune (data, NULL, 0);
 if (pos < 0) /* just pretend we're adding something */
 	{
 		INC_CHARPTR (cur_pos);
 	      pos += 1;
 	    }
 	}
 add_something = ((pos < min_pos)
-		       || ((*cur_pos) && (max_pos == -1))
+		       || ((*cur_pos) && no_limit)
 		       || ((*cur_pos) && (pos < max_pos)));
 }
 return pos;
 }
 /* #### Urk!  Should also handle begin-glyphs and end-glyphs in
 modeline extents. */
 static Charcount
 add_glyph_to_fstring_db_runes (pos_data *data, Lisp_Object glyph,
-			       Charcount pos, Charcount min_pos, Charcount max_pos)
+			       Charcount pos, Charcount min_pos,
+			       Charcount max_pos, int no_limit)
 {
 /* This function has been Mule-ized. */
 Charcount end;
 struct display_block *db = data->db;
 struct glyph_block gb;
 data->blank_width = space_width (XWINDOW (data->window));
 while (Dynarr_length (db->runes) < pos)
 add_blank_rune (data, NULL, 0);
 end = Dynarr_length (db->runes) + 1;
-if (max_pos != -1)
+if (!no_limit)
 end = min (max_pos, end);
 gb.glyph = glyph;
 gb.extent = Qnil;
 add_glyph_rune (data, &gb, BEGIN_GLYPHS, 0, 0);
 not in terms of columns.  This is necessary to make the formatting
 work correctly when proportional width fonts are used in the
 modeline. */
 static Charcount
 generate_fstring_runes (struct window *w, pos_data *data, Charcount pos,
-			Charcount min_pos, Charcount max_pos,
+			Charcount min_pos, Charcount max_pos, int no_limit,
 			Lisp_Object elt, int depth, int max_pixsize,
 			face_index findex, int type)
 {
 /* This function has been Mule-ized. */
 /* #### The other losing things in this function are:
 /* A string.  Add to the display line and check for %-constructs
 within it. */
 Bufbyte *this = XSTRING_DATA (elt);
-while ((pos < max_pos || max_pos == -1) && *this)
+while ((no_limit || pos < max_pos) && *this)
 	{
 	  Bufbyte *last = this;
 	  while (*this && *this != '%')
 	    this++;
 	  if (this != last)
 	    {
 	      /* The string is just a string. */
 	      Charcount size =
 		bytecount_to_charcount (last, this - last) + pos;
-	      Charcount tmp_max = (max_pos == -1 ? size : min (size, max_pos));
+	      Charcount tmp_max = (no_limit ? size : min (size, max_pos));
 	      pos = add_string_to_fstring_db_runes (data, last, pos, pos,
-						    tmp_max);
+						    tmp_max, /* limit */0);
 	    }
 	  else /* *this == '%' */
 	    {
 	      Charcount spec_width = 0;
 	      spec_width += pos;
 	      if (*this == 'M')
 		{
 		  pos = generate_fstring_runes (w, data, pos, spec_width,
-						max_pos, Vglobal_mode_string,
+						max_pos, no_limit,
+						Vglobal_mode_string,
 						depth, max_pixsize, findex,
 						type);
 		}
 	      else if (*this == '-')
 		{
 		  Charcount num_to_add;
 		  if (max_pixsize < 0)
 		    num_to_add = 0;
-		  else if (max_pos != -1)
+		  else if (! no_limit)
 		    num_to_add = max_pos - pos;
 		  else
 		    {
 		      int cur_pixsize;
 		      int dash_pixsize;
 		      num_to_add++;
 		    }
 		  while (num_to_add--)
 		    pos = add_string_to_fstring_db_runes
-		      (data, (CONST Bufbyte *) "-", pos, pos, max_pos);
+		      (data, (CONST Bufbyte *) "-",
+		       pos, pos, max_pos, no_limit);
 		}
 	      else if (*this != 0)
 		{
 		  Bufbyte *str;
 		  Emchar ch = charptr_emchar (this);
 		  decode_mode_spec (w, ch, type);
 		  str = Dynarr_atp (mode_spec_bufbyte_string, 0);
 		  pos = add_string_to_fstring_db_runes (data,str, pos, pos,
-							max_pos);
+							max_pos, no_limit);
 		}
 	      /* NOT this++.  There could be any sort of character at
 		 the current position. */
 	      INC_CHARPTR (this);
 don't check for % within it.  */
 if (STRINGP (tem))
 {
 	      pos =
 		add_string_to_fstring_db_runes
-		(data, XSTRING_DATA (tem), pos, min_pos, max_pos);
+		(data, XSTRING_DATA (tem), pos, min_pos, max_pos, no_limit);
 }
 /* Give up right away for nil or t.  */
 else if (!EQ (tem, elt))
 	    {
 	      elt = tem;
 	      /* Negative int means reduce maximum width.
 	       * DO NOT change MIN_PIXPOS here!
 	       * (20 -10 . foo) should truncate foo to 10 col
 	       * and then pad to 20.
 	       */
-	      if (max_pos == -1)
+	      if (no_limit)
 		max_pos = pos - lim;
 	      else
 		max_pos = min (max_pos, pos - lim);
 	    }
 else if (lim > 0)
 {
 /* Padding specified.  Don't let it be more than
 * current maximum.
 */
 lim += pos;
-if (max_pos != -1 && lim > max_pos)
+if (!no_limit && lim > max_pos)
 lim = max_pos;
 /* If that's more padding than already wanted, queue it.
 * But don't reduce padding already specified even if
 * that is beyond the current truncation point.
 */
 if (lim > min_pos)
 min_pos = lim;
 }
+	  no_limit = 0;
 goto tail_recurse;
 }
 else if (STRINGP (car) || CONSP (car))
 {
 int limit = 50;
 /* LIMIT is to protect against circular lists.  */
-while (CONSP (elt) && --limit > 0
+while (CONSP (elt) && --limit > 0 && (no_limit || pos < max_pos))
-&& (pos < max_pos || max_pos == -1))
 {
 	      pos = generate_fstring_runes (w, data, pos, pos, max_pos,
+					    no_limit,
 					    XCAR (elt), depth,
 					    max_pixsize, findex, type);
 elt = XCDR (elt);
 }
 }
 		}
 	      else
 		new_findex = old_findex;
 	      data->findex = new_findex;
 	      pos = generate_fstring_runes (w, data, pos, pos, max_pos,
+					    no_limit,
 					    XCDR (elt), depth - 1,
 					    max_pixsize, new_findex, type);
 	      data->findex = old_findex;
 	      Dynarr_add (formatted_string_extent_dynarr, ext);
 	      Dynarr_add (formatted_string_extent_start_dynarr, start);
 	    }
 	}
 }
 else if (GLYPHP (elt))
 {
-pos = add_glyph_to_fstring_db_runes (data, elt, pos, pos, max_pos);
+pos = add_glyph_to_fstring_db_runes
+	(data, elt, pos, pos, max_pos, no_limit);
 }
 else
 {
 invalid:
 pos =
 	add_string_to_fstring_db_runes
-	  (data, (CONST Bufbyte *) GETTEXT ("*invalid*"), pos, min_pos,
+	(data, (CONST Bufbyte *) GETTEXT ("*invalid*"), pos, min_pos, max_pos,
-	   max_pos);
+	 no_limit);
 }
 if (min_pos > pos)
 {
 add_string_to_fstring_db_runes (data, (CONST Bufbyte *) "", pos, min_pos,
-				      -1);
+				      0, /* no limit */ 1);
 }
 return pos;
 }
 	Dynarr_add_many (mode_spec_bufbyte_string,
 			 (CONST Bufbyte *) buf, strlen (buf));
 	goto decode_mode_spec_done;
 }
+#ifdef FILE_CODING
-#ifdef MULE
 /* print the file coding system */
 case 'C':
 {
 Lisp_Object codesys = b->buffer_file_coding_system;
 /* Be very careful here not to get an error. */
 	    if (CODING_SYSTEMP (codesys))
 obj = Fcoding_system_property (codesys, Qmnemonic);
 }
 }
 break;
-#endif /* MULE */
+#endif
 /* print the current line number */
 case 'l':
 str = window_line_number (w, type);
 break;

Mercurial > hg > xemacs-beta

comparison src/redisplay.c @ 259:11cf20601dec r20-5b28