xemacs-beta: src/redisplay.c comparison

comparison src/redisplay.c @ 4967:0d4c9d0f6a8d

rewrite dynarr code -------------------- ChangeLog entries follow: -------------------- src/ChangeLog addition: 2010-02-03 Ben Wing <ben@xemacs.org> * device-x.c (x_get_resource_prefix): * device-x.c (Fx_get_resource): * device-x.c (Fx_get_resource_prefix): * device-x.c (Fx_put_resource): * dialog-msw.c: * dialog-msw.c (handle_question_dialog_box): * dired-msw.c (mswindows_sort_files): * dired-msw.c (mswindows_get_files): * extents.c (extent_fragment_sort_by_priority): * extents.c (Fset_extent_parent): * file-coding.c (coding_reader): * file-coding.c (coding_writer): * file-coding.c (gzip_convert): * frame.c (generate_title_string): * gutter.c (calculate_gutter_size_from_display_lines): * indent.c (vmotion_1): * lread.c (read_bit_vector): * mule-coding.c (iso2022_decode): * rangetab.c: * rangetab.c (Fcopy_range_table): * rangetab.c (Fget_range_table): * rangetab.c (unified_range_table_copy_data): * redisplay-msw.c (mswindows_output_string): * redisplay-output.c (output_display_line): * redisplay-output.c (redisplay_move_cursor): * redisplay-output.c (redisplay_clear_bottom_of_window): * redisplay-tty.c (tty_output_ichar_dynarr): * redisplay-tty.c (set_foreground_to): * redisplay-tty.c (set_background_to): * redisplay-xlike-inc.c (XLIKE_output_string): * redisplay.c (redisplay_window_text_width_string): * redisplay.c (redisplay_text_width_string): * redisplay.c (create_text_block): * redisplay.c (SET_CURRENT_MODE_CHARS_PIXSIZE): * redisplay.c (generate_fstring_runes): * redisplay.c (regenerate_modeline): * redisplay.c (ensure_modeline_generated): * redisplay.c (real_current_modeline_height): * redisplay.c (create_string_text_block): * redisplay.c (regenerate_window): * redisplay.c (REGEN_INC_FIND_START_END): * redisplay.c (point_visible): * redisplay.c (redisplay_window): * redisplay.c (mark_glyph_block_dynarr): * redisplay.c (line_start_cache_start): * redisplay.c (start_with_line_at_pixpos): * redisplay.c (update_line_start_cache): * redisplay.c (glyph_to_pixel_translation): * redisplay.c (pixel_to_glyph_translation): * sysdep.c (qxe_readdir): * text.c (dfc_convert_to_external_format): * text.c (dfc_convert_to_internal_format): * toolbar-common.c (common_output_toolbar_button): * window.c (window_modeline_height): * window.c (Fwindow_last_line_visible_height): * window.c (window_displayed_height): * window.c (window_scroll): * window.c (get_current_pixel_pos): Use Dynarr_begin() in place of Dynarr_atp (foo, 0). * dynarr.c (Dynarr_realloc): * dynarr.c (Dynarr_lisp_realloc): * dynarr.c (Dynarr_resize): * dynarr.c (Dynarr_insert_many): * dynarr.c (Dynarr_delete_many): * dynarr.c (Dynarr_memory_usage): * dynarr.c (stack_like_malloc): * dynarr.c (stack_like_free): * lisp.h: * lisp.h (DECLARE_DYNARR_LISP_IMP): * lisp.h (XD_DYNARR_DESC): * lisp.h (Dynarr_pop): * gutter.c (output_gutter): * redisplay-output.c (sync_rune_structs): * redisplay-output.c (redisplay_output_window): Redo the dynarr code, add greater checks. Rename the `len', `largest' and `max' members to `len_', `largest_' and `max_' to try and catch existing places that might directly modify these values. Make new accessors Dynarr_largest() and Dynarr_max() and make them and existing Dynarr_length() be non-lvalues by adding '+ 0' to them; fix a couple of places in the redisplay code that tried to modify the length directly by setting Dynarr_length(). Use the accessors whenever possible even in the dynarr code itself. The accessors also verify that 0 <= len <= largest <= max. Rename settor function Dynarr_set_size() to Dynarr_set_length() and use it more consistently; also create lower-level Dynarr_set_length_1(). This latter function should be the only function that directly modifies the `len_' member of a Dynarr, and in the process makes sure that the `largest' value is kept correct. Consistently use ERROR_CHECK_STRUCTURES instead of ERROR_CHECK_TYPES for error-checking code. Reintroduce the temporarily disabled verification code on the positions of Dynarr_at(), Dynarr_atp() and Dynarr_atp_past_end(). Also create Dynarr_resize_if() in place of a repeated code fragment. Clean up all the functions that modify Dynarrs to use the new macros and functions and verify the correctness of the Dynarr both before and after the change. Note that there are two kinds of verification -- one for accessing and one for modifying. The difference is that the modify verification additionally checks to make sure that the Dynarr isn't locked. (This is used in redisplay to check for problems with reentrancy.) * lrecord.h: Move XD_DYNARR_DESC to lisp.h, grouping with the dynarr code.

author	Ben Wing <ben@xemacs.org>
date	Wed, 03 Feb 2010 20:51:18 -0600
parents	19a72041c5ed
children	4d35e52790f8

comparison

equal deleted inserted replaced

-:48b63cd88a21
+:0d4c9d0f6a8d
 fixup_internal_substring (nonreloc, reloc, offset, &len);
 if (STRINGP (reloc))
 nonreloc = XSTRING_DATA (reloc);
 convert_ibyte_string_into_ichar_dynarr (nonreloc, len, rtw_ichar_dynarr);
 return redisplay_window_text_width_ichar_string
-(w, findex, Dynarr_atp (rtw_ichar_dynarr, 0),
+(w, findex, Dynarr_begin (rtw_ichar_dynarr),
 Dynarr_length (rtw_ichar_dynarr));
 }
 int
 redisplay_text_width_string (Lisp_Object domain, Lisp_Object face,
 		     and then we need to either fix the callers to pass in
 		     a window, or change *text_width() to take a domain
 		     argument. */
 		  text_width, (XWINDOW (window),
 			       &cachel,
-			       Dynarr_atp (rtw_ichar_dynarr, 0),
+			       Dynarr_begin (rtw_ichar_dynarr),
 			       Dynarr_length (rtw_ichar_dynarr)));
 }
 /* Return the display block from DL of the given TYPE.  A display line
 can have only one display block of each possible type.  If DL does
 	     propagation data then we are clipping the glyph and there
 	     can be no propagation data before that point. The theory
 	     works because we always recalculate the extent-fragments
 	     for propagated data, we never actually propagate the
 	     fragments that still need to be displayed. */
-	  if (*prop && Dynarr_atp (*prop, 0)->type == PROP_GLYPH)
+	  if (*prop && Dynarr_begin (*prop)->type == PROP_GLYPH)
 	    {
-	      last_glyph = Dynarr_atp (*prop, 0)->data.p_glyph.glyph;
+	      last_glyph = Dynarr_begin (*prop)->data.p_glyph.glyph;
 	      Dynarr_free (*prop);
 	      *prop = 0;
 	    }
 	  /* Now compute the face and begin/end-glyph information. */
 	  data.findex =
 /* If max_pos is == -1, it is considered to be infinite.  The same is
 true of max_pixsize. */
 #define SET_CURRENT_MODE_CHARS_PIXSIZE                                  \
 if (Dynarr_length (data->db->runes))                                  \
-cur_pixsize = data->pixpos - Dynarr_atp (data->db->runes, 0)->xpos; \
+cur_pixsize = data->pixpos - Dynarr_begin (data->db->runes)->xpos; \
 else                                                                  \
 cur_pixsize = 0;
 /* Note that this function does "positions" in terms of characters and
 not in terms of columns.  This is necessary to make the formatting
 		  Ibyte *str;
 		  Charcount size;
 		  decode_mode_spec (w, ch, type);
-		  str = Dynarr_atp (mode_spec_ibyte_string, 0);
+		  str = Dynarr_begin (mode_spec_ibyte_string);
 		  size = bytecount_to_charcount
 		    /* Skip the null character added by `decode_mode_spec' */
 		    (str, Dynarr_length (mode_spec_ibyte_string)) - 1;
 		  if (size <= *offset)
 static void
 regenerate_modeline (struct window *w)
 {
 display_line_dynarr *dla = window_display_lines (w, DESIRED_DISP);
-if (!Dynarr_length (dla) || !Dynarr_atp (dla, 0)->modeline)
+if (!Dynarr_length (dla) || !Dynarr_begin (dla)->modeline)
 return;
 else
 {
-generate_modeline (w, Dynarr_atp (dla, 0), DESIRED_DISP);
+generate_modeline (w, Dynarr_begin (dla), DESIRED_DISP);
 redisplay_update_line (w, 0, 0, 0);
 }
 }
 /* Make sure that modeline display line is present in the given
 	}
 /* If we're adding a new place marker go ahead and generate the
 	 modeline so that it is available for use by
 	 window_modeline_height. */
-generate_modeline (w, Dynarr_atp (dla, 0), type);
+generate_modeline (w, Dynarr_begin (dla), type);
 }
 return need_modeline;
 }
 {
 display_line_dynarr *dla = window_display_lines (w, CMOTION_DISP);
 if (Dynarr_length (dla))
 	{
-	  if (Dynarr_atp (dla, 0)->modeline)
+	  if (Dynarr_begin (dla)->modeline)
-	    return (Dynarr_atp (dla, 0)->ascent +
+	    return (Dynarr_begin (dla)->ascent +
-		    Dynarr_atp (dla, 0)->descent);
+		    Dynarr_begin (dla)->descent);
 	}
 }
 return 0;
 }
 /* Check for face changes. */
 if (initial || (!no_more_frags && data.byte_charpos == data.ef->end))
 	{
 	  Lisp_Object last_glyph = Qnil;
 	  /* Deal with clipped glyphs that we have already displayed. */
-	  if (*prop && Dynarr_atp (*prop, 0)->type == PROP_GLYPH)
+	  if (*prop && Dynarr_begin (*prop)->type == PROP_GLYPH)
 	    {
-	      last_glyph = Dynarr_atp (*prop, 0)->data.p_glyph.glyph;
+	      last_glyph = Dynarr_begin (*prop)->data.p_glyph.glyph;
 	      Dynarr_free (*prop);
 	      *prop = 0;
 	    }
 	  /* Now compute the face and begin/end-glyph information. */
 	  data.findex =
 if (need_modeline)
 {
 /* We know that this is the right thing to use because we put it
 	 there when we first started working in this function. */
-generate_modeline (w, Dynarr_atp (dla, 0), type);
+generate_modeline (w, Dynarr_begin (dla), type);
 }
 if (depth >= 0)
 exit_redisplay_critical_section (depth);
 }
 /* Determine start and end of lines. */				      \
 if (!Dynarr_length (cdla))						      \
 return 0;								      \
 else								      \
 {									      \
-	if (Dynarr_atp (cdla, 0)->modeline && Dynarr_atp (ddla, 0)->modeline) \
+	if (Dynarr_begin (cdla)->modeline && Dynarr_begin (ddla)->modeline) \
 	  {								      \
 	    dla_start = 1;						      \
 	  }								      \
-	else if (!Dynarr_atp (cdla, 0)->modeline			      \
+	else if (!Dynarr_begin (cdla)->modeline			      \
-		 && !Dynarr_atp (ddla, 0)->modeline)			      \
+		 && !Dynarr_begin (ddla)->modeline)			      \
 	  {								      \
 	    dla_start = 0;						      \
 	  }								      \
 	else								      \
 	  ABORT ();	/* structs differ */				      \
 {
 struct buffer *b = XBUFFER (w->buffer);
 display_line_dynarr *dla = window_display_lines (w, type);
 int first_line;
-if (Dynarr_length (dla) && Dynarr_atp (dla, 0)->modeline)
+if (Dynarr_length (dla) && Dynarr_begin (dla)->modeline)
 first_line = 1;
 else
 first_line = 0;
 if (Dynarr_length (dla) > first_line)
 static void
 mark_glyph_block_dynarr (glyph_block_dynarr *gba)
 {
 if (gba)
 {
-glyph_block *gb = Dynarr_atp (gba, 0);
+glyph_block *gb = Dynarr_begin (gba);
 glyph_block *gb_last = Dynarr_past_lastp (gba);
 for (; gb < gb_last; gb++)
 	{
 	  if (!NILP (gb->glyph))
 line_start_cache_dynarr *cache = w->line_start_cache;
 if (!Dynarr_length (cache))
 return -1;
 else
-return Dynarr_atp (cache, 0)->start;
+return Dynarr_begin (cache)->start;
 }
 /* Return the very last buffer position contained in the given
 window's cache, or -1 if the cache is empty.  Assumes that the
 cache is valid. */
 	     explicit window-start not at a newline character etc.
 	     The existence of those are indeed known to create crashes
 	     on that assert.  So we have no option but to continue the
 	     search if we found point at the top of the line_start_cache
 	     again. */
-	  cur_pos = Dynarr_atp (w->line_start_cache,0)->start;
+	  cur_pos = Dynarr_begin (w->line_start_cache)->start;
 	}
 prev_pos = cur_pos;
 }
 }
 	    Dynarr_reset (cache);
 	}
 if (!Dynarr_length (cache))
 	{
-	  Dynarr_add_many (cache, Dynarr_atp (internal_cache, 0),
+	  Dynarr_add_many (cache, Dynarr_begin (internal_cache),
 			   Dynarr_length (internal_cache));
 	  w->line_cache_validation_override--;
 	  return;
 	}
 	    }
 	  if (!(ic_elt >= 0))
 	    {
 	      Dynarr_reset (cache);
-	      Dynarr_add_many (cache, Dynarr_atp (internal_cache, 0),
+	      Dynarr_add_many (cache, Dynarr_begin (internal_cache),
 			       Dynarr_length (internal_cache));
 	      w->line_cache_validation_override--;
 	      return;
 	    }
-	  Dynarr_insert_many_at_start (cache, Dynarr_atp (internal_cache, 0),
+	  Dynarr_insert_many_at_start (cache, Dynarr_begin (internal_cache),
 			      ic_elt + 1);
 	}
 if (end > high_bound)
 	{
 	    }
 	  if (!(ic_elt < Dynarr_length (internal_cache)))
 	    {
 	      Dynarr_reset (cache);
-	      Dynarr_add_many (cache, Dynarr_atp (internal_cache, 0),
+	      Dynarr_add_many (cache, Dynarr_begin (internal_cache),
 			       Dynarr_length (internal_cache));
 	      w->line_cache_validation_override--;
 	      return;
 	    }
 	  /* If this assert is triggered then regenerate_window failed
 	     to layout a single line. This is not possible since we
 	     force at least a single line to be layout for CMOTION_DISP */
 	  assert (Dynarr_length (internal_cache));
-	  assert (startp == Dynarr_atp (internal_cache, 0)->start);
+	  assert (startp == Dynarr_begin (internal_cache)->start);
 	  ic_elt = Dynarr_length (internal_cache) - 1;
 	  if (low_bound != -1)
 	    {
 	      while (ic_elt >= 0)
 	      ic_elt--;
 	    }
 	  if (ic_elt >= 0)       /* we still have lines to add.. */
 	    {
-	      Dynarr_insert_many (cache, Dynarr_atp (internal_cache, 0),
+	      Dynarr_insert_many (cache, Dynarr_begin (internal_cache),
 				  ic_elt + 1, marker);
 	      marker += (ic_elt + 1);
 	    }
 	  if (startp < low_bound || low_bound == -1)
 	  update_internal_cache_list (w, CMOTION_DISP);
 	  /* See comment above about regenerate_window failing. */
 	  assert (Dynarr_length (internal_cache));
-	  Dynarr_add_many (cache, Dynarr_atp (internal_cache, 0),
+	  Dynarr_add_many (cache, Dynarr_begin (internal_cache),
 			   Dynarr_length (internal_cache));
 	  high_bound = Dynarr_lastp (cache)->end;
 	  startp = high_bound + 1;
 	}
 while (to > high_bound);
 num_disp_lines = Dynarr_length (dla);
 modeline = 0;
 if (num_disp_lines)
 {
-if (Dynarr_atp (dla, 0)->modeline)
+if (Dynarr_begin (dla)->modeline)
 	{
 	  num_disp_lines--;
 	  modeline = 1;
 	}
 }
 	      if (Dynarr_length (db->runes))
 		{
 		  if (x_check <= left_bound)
 		    {
 		      if (dl->modeline)
-			*modeline_closest = Dynarr_atp (db->runes, 0)->charpos;
+			*modeline_closest = Dynarr_begin (db->runes)->charpos;
 		      else
-			*closest = Dynarr_atp (db->runes, 0)->charpos;
+			*closest = Dynarr_begin (db->runes)->charpos;
 		    }
 		  else
 		    {
 		      if (dl->modeline)
 			*modeline_closest = Dynarr_lastp (db->runes)->charpos;

Mercurial > hg > xemacs-beta

comparison src/redisplay.c @ 4967:0d4c9d0f6a8d