xemacs-beta: src/redisplay.c comparison

comparison src/redisplay.c @ 771:943eaba38521

[xemacs-hg @ 2002-03-13 08:51:24 by ben] The big ben-mule-21-5 check-in! Various files were added and deleted. See CHANGES-ben-mule. There are still some test suite failures. No crashes, though. Many of the failures have to do with problems in the test suite itself rather than in the actual code. I'll be addressing these in the next day or so -- none of the test suite failures are at all critical. Meanwhile I'll be trying to address the biggest issues -- i.e. build or run failures, which will almost certainly happen on various platforms. All comments should be sent to ben@xemacs.org -- use a Cc: if necessary when sending to mailing lists. There will be pre- and post- tags, something like pre-ben-mule-21-5-merge-in, and post-ben-mule-21-5-merge-in.

author	ben
date	Wed, 13 Mar 2002 08:54:06 +0000
parents	fdefd0186b75
children	e38acbeb1cae

comparison

equal deleted inserted replaced

-:336a418893b5
+:943eaba38521
 /* Display generation from window structure and buffer text.
 Copyright (C) 1994, 1995, 1996 Board of Trustees, University of Illinois.
 Copyright (C) 1995 Free Software Foundation, Inc.
-Copyright (C) 1995, 1996 Ben Wing.
+Copyright (C) 1995, 1996, 2000, 2001, 2002 Ben Wing.
 Copyright (C) 1995 Sun Microsystems, Inc.
 Copyright (C) 1996 Chuck Thompson.
 This file is part of XEmacs.
 #include "process.h"
 #include "redisplay.h"
 #include "toolbar.h"
 #include "window.h"
 #include "line-number.h"
-#ifdef FILE_CODING
 #include "file-coding.h"
-#endif
 #include "sysfile.h"
 #ifdef HAVE_TTY
 #include "console-tty.h"
 	    }
 	  else
 	    data->font_is_bogus = 0;
 	  fi = XFONT_INSTANCE (font_instance);
-	  if (!fi->proportional_p)
+	  if (!fi->proportional_p || data->font_is_bogus)
-	    /* sweetness and light. */
+	    {
-	    data->last_char_width = fi->width;
+	      Emchar ch = data->font_is_bogus ? '~' : data->ch;
+	      data->last_char_width =
+		redisplay_text_width_emchar_string (XWINDOW (data->window),
+						    data->findex, &ch, 1);
+	    }
 	  else
 	    data->last_char_width = -1;
 	  data->new_ascent  = max (data->new_ascent,  (int) fi->ascent);
 	  data->new_descent = max (data->new_descent, (int) fi->descent);
 	  data->last_charset = charset;
 	  data->last_findex = data->findex;
 	}
 width = data->last_char_width;
-if (width < 0)
+if (width < 0) /* proportional fonts */
-	{
+	width = redisplay_text_width_emchar_string (XWINDOW (data->window),
-	  /* bummer.  Proportional fonts. */
+						    data->findex,
-	  width = redisplay_text_width_emchar_string (XWINDOW (data->window),
+						    &data->ch, 1);
-						      data->findex,
-						      &data->ch, 1);
-	}
 }
 if (data->max_pixpos != -1 && (data->pixpos + width > data->max_pixpos))
 {
 return ADD_FAILED;
 	crb->charbpos =
 	  bytebpos_to_charbpos (XBUFFER (WINDOW_BUFFER (XWINDOW (data->window))),
 			    data->bi_charbpos);
 else
 	crb->charbpos =
-	  bytecount_to_charcount (XSTRING_DATA (data->string), data->bi_charbpos);
+	  XSTRING_INDEX_BYTE_TO_CHAR (data->string, data->bi_charbpos);
 }
 else if (data->is_modeline)
 crb->charbpos = data->modeline_charpos;
 else
 /* Text but not in buffer */
 Intbyte *strdata;
 struct buffer *buf = XBUFFER (WINDOW_BUFFER (w));
 in_modeline_generation = 1;
+sledgehammer_check_ascii_begin (result_str);
 detach_all_extents (result_str);
 resize_string (XSTRING (result_str), -1,
 data.bytepos - XSTRING_LENGTH (result_str));
 strdata = XSTRING_DATA (result_str);
 len += (set_charptr_emchar
 (strdata + len, Dynarr_atp (db->runes,
 elt)->object.chr.ch));
 }
 }
+init_string_ascii_begin (result_str);
+bump_string_modiff (result_str);
+sledgehammer_check_ascii_begin (result_str);
 for (elt = 0; elt < Dynarr_length (formatted_string_extent_dynarr);
 elt++)
 {
 Lisp_Object extent = Qnil;
 dl->ypos = WINDOW_BOTTOM (w) - dl->descent - ypos_adj;
 }
 static Charcount
 add_string_to_fstring_db_runes (pos_data *data, const Intbyte *str,
-Charcount pos, Charcount min_pos, Charcount max_pos)
+Charcount pos, Charcount min_pos,
+				Charcount max_pos)
 {
 /* This function has been Mule-ized. */
 Charcount end;
 const Intbyte *cur_pos = str;
 struct display_block *db = data->db;
 * - If first element is a string or a cons, process all the elements
 *   and effectively concatenate them.
 * - If first element is a negative number, truncate displaying cdr to
 *   at most that many characters.  If positive, pad (with spaces)
 *   to at least that many characters.
-* - If first element is another symbol, process the cadr or caddr
+* - If first element is another symbol or a boolean specifier, process
-*   recursively according to whether the symbol's value is non-nil or
+*   the cadr or caddr recursively according to whether the symbol's
-*   nil.
+*   value or specifier's instance is non-nil or nil.
+* - If first element is , process the cadr or caddr
+*   recursively according to whether the instance of the specifier in
+*   the modeline's window is non-nil or nil.
 * - If first element is an extent, process the cdr recursively
 *   and handle the extent's face.
 */
 Lisp_Object car, tem;
 car = XCAR (elt);
-if (SYMBOLP (car))
+if (SYMBOLP (car) || BOOLEAN_SPECIFIERP (car))
 	{
 	  elt = XCDR (elt);
 	  if (!CONSP (elt))
 	    goto invalid;
-	  tem = symbol_value_in_buffer (car, w->buffer);
+	  if (SYMBOLP (car))
+	    tem = symbol_value_in_buffer (car, w->buffer);
+	  else
+	    tem = specifier_instance_no_quit (car, Qunbound, wrap_window (w),
+					      ERROR_ME_NOT, 0, Qzero);
 	  /* elt is now the cdr, and we know it is a cons cell.
 	     Use its car if CAR has a non-nil value.  */
-	  if (!UNBOUNDP (tem))
+	  if (!UNBOUNDP (tem) && !NILP (tem))
 	    {
-	      if (!NILP (tem))
+	      elt = XCAR (elt);
-		{
+	      goto tail_recurse;
-		  elt = XCAR (elt);
-		  goto tail_recurse;
-		}
 	    }
-	  /* Symbol's value is nil (or symbol is unbound)
+	  /* Symbol's value or specifier's instance is nil or unbound
 	   * Get the cddr of the original list
 	   * and if possible find the caddr and use that.
 	   */
 	  elt = XCDR (elt);
 	  if (NILP (elt))
 Lisp_String* s = XSTRING (disp_string);
 /* we're working with these a lot so precalculate them */
 Bytecount slen = XSTRING_LENGTH (disp_string);
 Bytecount bi_string_zv = slen;
-Bytebpos bi_start_pos = charcount_to_bytecount (string_data (s), start_pos);
+Bytebpos bi_start_pos = string_index_char_to_byte (s, start_pos);
 pos_data data;
 int truncate_win = b ? window_truncation_on (w) : 0;
 int end_glyph_width = 0;
 it so that regenerate_window will exit properly.  This is bogus.
 The main loop should get fixed so that it isn't necessary to call
 this function if we are already at EOB. */
 if (data.bi_charbpos == bi_string_zv && bi_start_pos == bi_string_zv)
-return bytecount_to_charcount (string_data (s), data.bi_charbpos) + 1; /* Yuck! */
+return string_index_byte_to_char (s, data.bi_charbpos) + 1; /* Yuck! */
 else
-return bytecount_to_charcount (string_data (s), data.bi_charbpos);
+return string_index_byte_to_char (s, data.bi_charbpos);
 }
 /* Given a display line and a starting position, ensure that the
 contents of the display line accurately represent the visual
 representation of the buffer contents starting from the given
 size_changed = 0;
 reset_buffer_changes ();
 done:
-unbind_to (count, Qnil);
+unbind_to (count);
 }
 void
 redisplay (void)
 {
 	goto decode_mode_spec_done;
 }
 /* print the file coding system */
 case 'C':
-#ifdef FILE_CODING
 {
 Lisp_Object codesys = b->buffer_file_coding_system;
 /* Be very careful here not to get an error. */
 	if (NILP (codesys) || SYMBOLP (codesys) || CODING_SYSTEMP (codesys))
 {
-codesys = Ffind_coding_system (codesys);
+codesys = find_coding_system_for_text_file (codesys, 0);
 	    if (CODING_SYSTEMP (codesys))
 obj = XCODING_SYSTEM_MNEMONIC (codesys);
 }
 }
-#endif /* FILE_CODING */
 break;
 /* print the current line number */
 case 'l':
 str = window_line_number (w, type);
 redisplay_frame (f, 1);
 /* See the comment in Fredisplay_frame. */
 RESET_CHANGED_SET_FLAGS;
-return unbind_to (count, Qnil);
+return unbind_to (count);
 }
 DEFUN ("redisplay-frame", Fredisplay_frame, 0, 2, 0, /*
 Ensure that FRAME's contents are correctly displayed.
 This differs from `redraw-frame' in that it only redraws what needs to
 calling Fredisplay_frame while updating another frame. We assume
 that if you know what you are doing you will not be that
 stupid. */
 RESET_CHANGED_SET_FLAGS;
-return unbind_to (count, Qnil);
+return unbind_to (count);
 }
 DEFUN ("redraw-device", Fredraw_device, 0, 2, 0, /*
 Clear device DEVICE and output again what is supposed to appear on it.
 DEVICE defaults to the selected device if omitted.
 redisplay_device (d, 0);
 /* See the comment in Fredisplay_frame. */
 RESET_CHANGED_SET_FLAGS;
-return unbind_to (count, Qnil);
+return unbind_to (count);
 }
 DEFUN ("redisplay-device", Fredisplay_device, 0, 2, 0, /*
 Ensure that DEVICE's contents are correctly displayed.
 This differs from `redraw-device' in that it only redraws what needs to
 redisplay_device (d, 0);
 /* See the comment in Fredisplay_frame. */
 RESET_CHANGED_SET_FLAGS;
-return unbind_to (count, Qnil);
+return unbind_to (count);
 }
 /* Big lie.  Big lie.  This will force all modelines to be updated
 regardless if the all flag is set or not.  It remains in existence
 solely for backwards compatibility. */
 stderr_out ("XEmacs: standard input is not a tty\n");
 exit (1);
 }
 /* Look at the TERM variable */
-if (!getenv ("TERM"))
+if (!egetenv ("TERM"))
 {
 stderr_out ("Please set the environment variable TERM; see tset(1).\n");
 exit (1);
 }

Mercurial > hg > xemacs-beta

comparison src/redisplay.c @ 771:943eaba38521