xemacs-beta: src/redisplay.c comparison

comparison src/redisplay.c @ 380:8626e4521993 r21-2-5

Import from CVS: tag r21-2-5

author	cvs
date	Mon, 13 Aug 2007 11:07:10 +0200
parents	6240c7796c7a
children	bbff43aa5eb7

comparison

equal deleted inserted replaced

-:76b7d63099ad
+:8626e4521993
 #include "buffer.h"
 #include "commands.h"
 #include "debug.h"
 #include "device.h"
+#include "elhash.h"
 #include "extents.h"
 #include "faces.h"
 #include "frame.h"
 #include "glyphs.h"
 #include "insdel.h"
 of what a display table is.  Currently it's only allowed
 to be a 256-entry vector.  Instead, it should be something
 like:
 a) A 256-entry vector, for backward compatibility
-b) Some sort of hashtable, mapping characters to values
+b) Some sort of hash table, mapping characters to values
 c) A list that specifies a range of values and the
 mapping to provide for those values.
 Also, extend the concept of "mapping" to include a
 printf-like spec.  Then, you could make all extended
 position. */
 if (data.ch == '\n')
 	{
 	  /* If data.start_col_enabled is still true, then the window is
 scrolled far enough so that nothing on this line is visible.
-We need to stick a trunctation glyph at the beginning of the
+We need to stick a truncation glyph at the beginning of the
 line in that case unless the line is completely blank. */
 	  if (data.bi_start_col_enabled)
 	    {
 	      if (data.cursor_type == CURSOR_ON)
 		{
 /* Determine how many inside margin glyphs we can display and where
 they should start.  The inside margin glyphs get whatever space
 is left after the whitespace glyphs have been displayed.  These
 are tricky to calculate since if we decide to use the overflow
-area we basicaly have to start over.  So for these we build up a
+area we basically have to start over.  So for these we build up a
 list of just the inside margin glyphs and manipulate it to
 determine the needed info. */
 {
 glyph_block_dynarr *ib;
 int avail_in, avail_out;
 while (elt < Dynarr_length (dl->left_glyphs))
 {
 struct glyph_block *gb = Dynarr_atp (dl->left_glyphs, elt);
 if (NILP (gb->extent))
-	abort ();	/* these should have beeb handled in add_glyph_rune */
+	abort ();	/* these should have been handled in add_glyph_rune */
 if (extent_begin_glyph_layout (XEXTENT (gb->extent)) ==
 	  GL_OUTSIDE_MARGIN)
 	{
 	  int width = glyph_width (gb->glyph, Qnil, gb->findex, window);
 /* Determine how many inside margin glyphs we can display and where
 they should start.  The inside margin glyphs get whatever space
 is left after the whitespace glyphs have been displayed.  These
 are tricky to calculate since if we decide to use the overflow
-area we basicaly have to start over.  So for these we build up a
+area we basically have to start over.  So for these we build up a
 list of just the inside margin glyphs and manipulate it to
 determine the needed info. */
 {
 glyph_block_dynarr *ib;
 int avail_in, avail_out;
 while (elt < Dynarr_length (dl->right_glyphs))
 {
 struct glyph_block *gb = Dynarr_atp (dl->right_glyphs, elt);
 if (NILP (gb->extent))
-	abort ();	/* these should have beeb handled in add_glyph_rune */
+	abort ();	/* these should have been handled in add_glyph_rune */
 if (extent_end_glyph_layout (XEXTENT (gb->extent)) == GL_OUTSIDE_MARGIN)
 	{
 	  int width = glyph_width (gb->glyph, Qnil, gb->findex, window);
 generate_formatted_string_db (b->modeline_format,
 				b->generated_modeline_string, w, dl, db,
 				MODELINE_INDEX, min_pixpos, max_pixpos, type);
 /* The modeline is at the bottom of the gutters.  We have to wait to
-set this until we've generated teh modeline in order to account
+set this until we've generated the modeline in order to account
 for any embedded faces. */
 dl->ypos = WINDOW_BOTTOM (w) - dl->descent - ypos_adj;
 }
 static void
 	    BUF_SET_PT (b, pointm);
 	  Fset_marker (w->pointm[DESIRED_DISP], make_int (pointm),
 		       the_buffer);
-	  /* #### BUFU amounts of overkil just to get the cursor
+	  /* #### BUFU amounts of overkill just to get the cursor
 location marked properly.  FIX ME FIX ME FIX ME */
 	  regenerate_window (w, startp, pointm, DESIRED_DISP);
 	}
 goto regeneration_done;
 update_line_start_cache (w, start, end, pointm, 1);
 redisplay_output_window (w);
 /*
 * If we just displayed the echo area, the line start cache is
-* no longer valid, because the minibuffer window is assocaited
+* no longer valid, because the minibuffer window is associated
 * with the window now.
 */
 if (echo_active)
 	w->line_cache_last_updated = make_int (-1);
 }
 any which are already pending. */
 if (f->size_change_pending)
 change_frame_size (f, f->new_height, f->new_width, 0);
 /* If frame size might need to be changed, due to changed size
-of toolbars, scroolabrs etc, change it now */
+of toolbars, scrollbars etc, change it now */
 if (f->size_slipped)
 {
 adjust_frame_size (f);
 assert (!f->size_slipped);
 }
 /* The menubar, toolbar, and icon updates must be done before
 hold_frame_size_changes is called and we are officially
 'in_display'.  They may eval lisp code which may call Fsignal.
 If in_display is set Fsignal will abort. */
 static char *
 window_line_number (struct window *w, int type)
 {
 struct device *d = XDEVICE (XFRAME (w->frame)->device);
 struct buffer *b = XBUFFER (w->buffer);
-/* Be careful in the order of these tests. The first clasue will
+/* Be careful in the order of these tests. The first clause will
 fail if DEVICE_SELECTED_FRAME == Qnil (since w->frame cannot be).
 This can occur when the frame title is computed really early */
 Bufpos pos =
 ((EQ(DEVICE_SELECTED_FRAME(d), w->frame) &&
 (w == XWINDOW (FRAME_SELECTED_WINDOW (device_selected_frame(d)))) &&
 EQ(DEVICE_CONSOLE(d), Vselected_console) &&
 XDEVICE(CONSOLE_SELECTED_DEVICE(XCONSOLE(DEVICE_CONSOLE(d)))) == d )
 glyph_block *gb = Dynarr_atp (gba, 0);
 glyph_block *gb_last = Dynarr_atp (gba, Dynarr_length (gba));
 for (; gb < gb_last; gb++)
 	{
-	  if (!NILP (gb->glyph))  ((markobj) (gb->glyph));
+	  if (!NILP (gb->glyph))
-	  if (!NILP (gb->extent)) ((markobj) (gb->extent));
+	    markobj (gb->glyph);
+	  if (!NILP (gb->extent))
+	    markobj (gb->extent);
 	}
 }
 }
 static void
 	  for (; r < r_last; r++)
 	    {
 	      if (r->type == RUNE_DGLYPH)
 		{
 		  if (!NILP (r->object.dglyph.glyph))
-		    ((markobj) (r->object.dglyph.glyph));
+		    markobj (r->object.dglyph.glyph);
 		  if (!NILP (r->object.dglyph.extent))
-		    ((markobj) (r->object.dglyph.extent));
+		    markobj (r->object.dglyph.extent);
 		}
 	    }
 	}
 mark_glyph_block_dynarr (dl->left_glyphs,  markobj);
 {
 /* f->extents_changed used to be in here because extent face and
 size changes can cause text shifting.  However, the extent
 covering the region is constantly having its face set and
 priority altered by the mouse code.  This means that the line
-start cache is constanty being invalidated.  This is bad
+start cache is constantly being invalidated.  This is bad
 since the mouse code also triggers heavy usage of the cache.
 Since it is an unlikely that f->extents being changed
 indicates that the cache really needs to be updated and if it
 does redisplay will catch it pretty quickly we no longer
 invalidate the cache if it is set.  This greatly speeds up
 	  new_startp = Dynarr_atp (internal_cache, ic_elt)->end + 1;
 /*
 * Handle invisible text properly:
 * If the last line we're inserting has the same end as the
 * line before which it will be added, merge the two lines.
 */
 if (Dynarr_length (cache)  &&
 Dynarr_atp (internal_cache, ic_elt)->end ==
 Dynarr_atp (cache, marker)->end)
 d->pixel_to_glyph_cache.closest = *closest;				\
 d->pixel_to_glyph_cache.modeline_closest = *modeline_closest;	\
 d->pixel_to_glyph_cache.obj1 = *obj1;				\
 d->pixel_to_glyph_cache.obj2 = *obj2;				\
 d->pixel_to_glyph_cache.retval = position;				\
-RETURN__ position;							\
+RETURN_SANS_WARNINGS position;					\
 } while (0)
 /* Given x and y coordinates in pixels relative to a frame, return
 information about what is located under those coordinates.
 redisplay_glyph_changed (Lisp_Object glyph, Lisp_Object property,
 			 Lisp_Object locale)
 {
 if (WINDOWP (locale))
 {
-struct frame *f = XFRAME (WINDOW_FRAME (XWINDOW (locale)));
+MARK_FRAME_GLYPHS_CHANGED (XFRAME (WINDOW_FRAME (XWINDOW (locale))));
-MARK_FRAME_GLYPHS_CHANGED (f);
 }
 else if (FRAMEP (locale))
 {
-struct frame *f = XFRAME (locale);
+MARK_FRAME_GLYPHS_CHANGED (XFRAME (locale));
-MARK_FRAME_GLYPHS_CHANGED (f);
 }
 else if (DEVICEP (locale))
 {
 Lisp_Object frmcons;
 DEVICE_FRAME_LOOP (frmcons, XDEVICE (locale))
-	{
+	MARK_FRAME_GLYPHS_CHANGED (XFRAME (XCAR (frmcons)));
-	  struct frame *f = XFRAME (XCAR (frmcons));
-	  MARK_FRAME_GLYPHS_CHANGED (f);
-	}
 }
 else if (CONSOLEP (locale))
 {
 Lisp_Object frmcons, devcons;
 CONSOLE_FRAME_LOOP_NO_BREAK (frmcons, devcons, XCONSOLE (locale))
-	{
+	MARK_FRAME_GLYPHS_CHANGED (XFRAME (XCAR (frmcons)));
-	  struct frame *f = XFRAME (XCAR (frmcons));
-	  MARK_FRAME_GLYPHS_CHANGED (f);
-	}
 }
 else /* global or buffer */
 {
 Lisp_Object frmcons, devcons, concons;
 FRAME_LOOP_NO_BREAK (frmcons, devcons, concons)
-	{
+	MARK_FRAME_GLYPHS_CHANGED (XFRAME (XCAR (frmcons)));
-	  struct frame *f = XFRAME (XCAR (frmcons));
-	  MARK_FRAME_GLYPHS_CHANGED (f);
-	}
 }
 }
 static void
 text_cursor_visible_p_changed (Lisp_Object specifier, struct window *w,
 DEFVAR_INT_MAGIC ("pixel-vertical-clip-threshold", &vertical_clip /*
 Minimum pixel height for clipped bottom display line.
 A clipped line shorter than this won't be displayed.
 */ ,
-		   redisplay_variable_changed);
+		    redisplay_variable_changed);
 vertical_clip = 5;
 DEFVAR_INT_MAGIC ("pixel-horizontal-clip-threshold", &horizontal_clip /*
 Minimum visible area for clipped glyphs at right boundary.
 Clipped glyphs shorter than this won't be displayed.
 Only pixmap glyph instances are currently allowed to be clipped.
 */ ,
-	      redisplay_variable_changed);
+		    redisplay_variable_changed);
 horizontal_clip = 5;
 DEFVAR_LISP ("global-mode-string", &Vglobal_mode_string /*
 String displayed by modeline-format's "%m" specification.
 */ );
 DEFVAR_LISP_MAGIC ("overlay-arrow-position", &Voverlay_arrow_position /*
 Marker for where to display an arrow on top of the buffer text.
 This must be the beginning of a line in order to work.
 See also `overlay-arrow-string'.
-*/ , redisplay_variable_changed);
+*/ ,
+		     redisplay_variable_changed);
 Voverlay_arrow_position = Qnil;
 DEFVAR_LISP_MAGIC ("overlay-arrow-string", &Voverlay_arrow_string /*
 String to display as an arrow.  See also `overlay-arrow-position'.
 */ ,
-		    redisplay_variable_changed);
+		     redisplay_variable_changed);
 Voverlay_arrow_string = Qnil;
 DEFVAR_INT ("scroll-step", &scroll_step /*
 *The number of lines to try scrolling a window by when point moves out.
 If that fails to bring point back on frame, point is centered instead.
 DEFVAR_BOOL_MAGIC ("truncate-partial-width-windows",
 		     &truncate_partial_width_windows /*
 *Non-nil means truncate lines in all windows less than full frame wide.
 */ ,
-		    redisplay_variable_changed);
+		     redisplay_variable_changed);
 truncate_partial_width_windows = 1;
 DEFVAR_BOOL ("visible-bell", &visible_bell /*
 *Non-nil means try to flash the frame to represent a bell.
 */ );

Mercurial > hg > xemacs-beta

comparison src/redisplay.c @ 380:8626e4521993 r21-2-5