xemacs-beta: src/redisplay.c comparison

comparison src/redisplay.c @ 404:2f8bb876ab1d r21-2-32

Import from CVS: tag r21-2-32

author	cvs
date	Mon, 13 Aug 2007 11:16:07 +0200
parents	a86b2b5e0111
children	b8cc9ab3f761

comparison

equal deleted inserted replaced

-:9f011ab08d48
+:2f8bb876ab1d
 hscroll, control-arrow, etc) is in need of updating
 somewhere. */
 int glyphs_changed;
 int glyphs_changed_set;
-/* non-zero if any displayed subwindow is in need of updating
+/* non-zero if any subwindow has been deleted. */
-somewhere. */
 int subwindows_changed;
 int subwindows_changed_set;
 /* non-zero if any displayed subwindow is in need of updating
 somewhere. */
 /* If non-nil, use vertical bar cursor. */
 Lisp_Object Vbar_cursor;
 Lisp_Object Qbar_cursor;
-int visible_bell;	/* If true and the terminal will support it
+Lisp_Object Vvisible_bell;	/* If true and the terminal will support it
-			   then the frame will flash instead of
+				   then the frame will flash instead of
-			   beeping when an error occurs */
+				   beeping when an error occurs */
 /* Nonzero means no need to redraw the entire frame on resuming
 a suspended Emacs.  This is useful on terminals with multiple pages,
 where one page is used for Emacs and another for all else. */
 int no_redraw_on_reenter;
 Lisp_Object Vminimum_line_ascent, Vminimum_line_descent;
 Lisp_Object Vuse_left_overflow, Vuse_right_overflow;
 Lisp_Object Vtext_cursor_visible_p;
 int column_number_start_at_one;
+Lisp_Object Qtop_bottom;
 #define WINDOW_SCROLLED(w) \
 (w->hscroll > 0 || w->left_xoffset)
 /* If window faces changed, and glyph instance is text, then
 glyph sizes might have changed too */
 invalidate_glyph_geometry_maybe (gb->glyph, w);
 /* This makes sure the glyph is in the cachels.
-#### We need to change this so that we hold onto the glyph_index
+#### We do this to make sure the glyph is in the glyph cachels,
-here, not the glyph itself. */
+so that the dirty flag can be reset after redisplay has
+finished. We should do this some other way, maybe by iterating
+over the window cache of subwindows. */
 get_glyph_cachel_index (w, gb->glyph);
 /* A nil extent indicates a special glyph (ex. truncator). */
 if (NILP (gb->extent)
 || (pos_type == BEGIN_GLYPHS &&
 dl->ascent = DEVMETH (d, divider_height, ());
 dl->descent = 0;
 /* The modeline is at the bottom of the gutters. */
 dl->ypos = WINDOW_BOTTOM (w);
-/* adjust for the bottom gutter */
-if (window_is_lowest (w))
-	dl->ypos -= FRAME_BOTTOM_GUTTER_BOUNDS (f);
 rb.findex = MODELINE_INDEX;
 rb.xpos = dl->bounds.left_out;
 rb.width = dl->bounds.right_out - dl->bounds.left_out;
 rb.bufpos = 0;
 rb.endpos = 0;
 /* The modeline is at the bottom of the gutters.  We have to wait to
 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;
-/* adjust for the bottom gutter */
-if (window_is_lowest (w))
-dl->ypos -= FRAME_BOTTOM_GUTTER_BOUNDS (f);
 }
 static Charcount
 add_string_to_fstring_db_runes (pos_data *data, const Bufbyte *str,
 Charcount pos, Charcount min_pos, Charcount max_pos)
 Dynarr_add (prop, pb);
 }
 else
 prop = 0;
+/* Make sure this is set always */
+/* Note the conversion at end */
+w->window_end_pos[type] = start_pos;
 while (ypos < yend)
 {
 struct display_line dl;
 struct display_line *dlp;
 int local;
 if (prop)
 Dynarr_free (prop);
 /* #### More not quite right, but close enough. */
-/* #### Ben sez: apparently window_end_pos[] is measured
+/* Ben sez: apparently window_end_pos[] is measured
 as the number of characters between the window end and the
 end of the buffer?  This seems rather weirdo.  What's
-the justification for this? */
+the justification for this?
+JV sez: Because BUF_Z (b) would be a good initial value, however
+that can change. This representation allows initalizing with 0.
+*/
 w->window_end_pos[type] = BUF_Z (b) - w->window_end_pos[type];
 if (need_modeline)
 {
 /* We know that this is the right thing to use because we put it
 return 0;
 }
 /* Ensure that all windows on the given frame are correctly displayed. */
-static int
+int
 redisplay_frame (struct frame *f, int preemption_check)
 {
 struct device *d = XDEVICE (f->device);
 if (preemption_check)
 the menubar's visibility.  This way we avoid having flashing
 caused by an Expose event generated by the visibility change
 being handled. */
 update_frame_menubars (f);
 #endif /* HAVE_MENUBARS */
-/* widgets are similar to menus in that they can call lisp to
-determine activation etc. Therefore update them before we get
-into redisplay. This is primarily for connected widgets such as
-radio buttons. */
-update_frame_subwindows (f);
 #ifdef HAVE_TOOLBARS
 /* Update the toolbars. */
 update_frame_toolbars (f);
 #endif /* HAVE_TOOLBARS */
+/* Gutter update proper has to be done inside display when no frame
+size changes can occur, thus we separately update the gutter
+geometry here if it needs it. */
+update_frame_gutter_geometry (f);
 /* If we clear the frame we have to force its contents to be redrawn. */
 if (f->clear)
 f->frame_changed = 1;
-/* invalidate the subwindow cache. We use subwindows_changed here to
+/* Invalidate the subwindow cache. We use subwindows_changed here to
 cause subwindows to get instantiated. This is because
 subwindows_state_changed is less strict - dealing with things
 like the clicked state of button. We have to do this before
 redisplaying the gutters as subwindows get unmapped in the
 process.*/
-if (!Dynarr_length (f->subwindow_cachels)
+if (f->frame_changed || f->subwindows_changed)
-|| f->subwindows_changed
-|| f->faces_changed
-|| f->frame_changed)
 {
 reset_subwindow_cachels (f);
 /* we have to do this so the gutter gets regenerated. */
 reset_gutter_display_lines (f);
 }
 else
 mark_subwindow_cachels_as_not_updated (f);
-/* We can now update the gutters, safe in the knowledge that our
-efforts won't get undone. */
-/* #### This can call lisp, it may be that if the subwindow cachels
-have been reset there are no remaining references to the
-displayed glyphs and so they get garbage collected. We should
-consider putting this call inside the critical redisplay
-section. */
-update_frame_gutters (f);
 hold_frame_size_changes ();
 /* ----------------- BEGIN CRITICAL REDISPLAY SECTION ---------------- */
 /* Within this section, we are defenseless and assume that the
 If garbage collection is called during this critical section,
 we simply return. #### We should abort instead.
 #### If a frame-size change does occur we should probably
 actually be preempting redisplay. */
+/* We can now update the gutters, safe in the knowledge that our
+efforts won't get undone. */
+/* This can call lisp, but redisplay is protected by binding
+inhibit_quit.  More importantly the code involving display lines
+*assumes* that GC will not happen and so does not GCPRO
+anything. Since we use this code the whole time with the gutters
+we cannot allow GC to happen when manipulating the gutters. */
+update_frame_gutters (f);
 /* Erase the frame before outputting its contents. */
 if (f->clear)
 {
 DEVMETH (d, clear_frame, (f));
 /* For the given window W, if display starts at STARTP, what will be
 the buffer position at the beginning or end of the last line
 displayed.  The end of the last line is also know as the window end
 position.
+WARNING: It is possible that rediplay failed to layout any lines for the
+windows. Under normal circumstances this is rare. However it seems that it
+does occur in the following situation: A mouse event has come in and we
+need to compute its location in a window. That code (in
+pixel_to_glyph_translation) already can handle 0 as an error return value.
 #### With a little work this could probably be reworked as just a
 call to start_with_line_at_pixpos. */
 static Bufpos
-start_end_of_last_line (struct window *w, Bufpos startp, int end)
+start_end_of_last_line (struct window *w, Bufpos startp, int end,
+int may_error)
 {
 struct buffer *b = XBUFFER (w->buffer);
 line_start_cache_dynarr *cache = w->line_start_cache;
 int pixpos = 0;
 int bottom = WINDOW_TEXT_HEIGHT (w);
 startp = BUF_ZV (b);
 cur_start = startp;
 start_elt = point_in_line_start_cache (w, cur_start, 0);
 if (start_elt == -1)
-abort ();	/* this had better never happen */
+return may_error ? 0 : startp;
 while (1)
 {
 int height = Dynarr_atp (cache, start_elt)->height;
 the buffer position at the beginning of the last line displayed. */
 Bufpos
 start_of_last_line (struct window *w, Bufpos startp)
 {
-return start_end_of_last_line (w, startp, 0);
+return start_end_of_last_line (w, startp, 0 , 0);
 }
 /* For the given window W, if display starts at STARTP, what will be
 the buffer position at the end of the last line displayed.  This is
 also know as the window end position. */
 Bufpos
 end_of_last_line (struct window *w, Bufpos startp)
 {
-return start_end_of_last_line (w, startp, 1);
+return start_end_of_last_line (w, startp, 1, 0);
 }
+static Bufpos
+end_of_last_line_may_error (struct window *w, Bufpos startp)
+{
+return start_end_of_last_line (w, startp, 1, 1);
+}
 /* For window W, what does the starting position have to be so that
 the line containing POINT will cover pixel position PIXPOS. */
 Bufpos
 /* #### This should be checked out some more to determine what
 should really be going on. */
 if (!MARKERP ((*w)->start[CURRENT_DISP]))
 *closest = 0;
 else
-*closest = end_of_last_line (*w,
+*closest = end_of_last_line_may_error (*w,
 				 marker_position ((*w)->start[CURRENT_DISP]));
 *col = 0;
 UPDATE_CACHE_RETURN;
 }
 #undef UPDATE_CACHE_RETURN
 }
 f->clear = 1;
 redisplay_frame (f, 1);
+/* See the comment in Fredisplay_frame. */
+RESET_CHANGED_SET_FLAGS;
 return unbind_to (count, Qnil);
 }
 DEFUN ("redisplay-frame", Fredisplay_frame, 0, 2, 0, /*
 Ensure that FRAME's contents are correctly displayed.
 disable_preemption++;
 }
 redisplay_frame (f, 1);
+/* If we don't reset the global redisplay flafs here, subsequent
+changes to the display will not get registered by redisplay
+because it thinks it already has registered changes. If you
+really knew what you were doing you could confuse redisplay by
+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);
 }
 DEFUN ("redraw-device", Fredraw_device, 0, 2, 0, /*
 Clear device DEVICE and output again what is supposed to appear on it.
 DEVICE_FRAME_LOOP (frmcons, d)
 {
 XFRAME (XCAR (frmcons))->clear = 1;
 }
 redisplay_device (d, 0);
+/* See the comment in Fredisplay_frame. */
+RESET_CHANGED_SET_FLAGS;
 return unbind_to (count, Qnil);
 }
 DEFUN ("redisplay-device", Fredisplay_device, 0, 2, 0, /*
 			     make_int (disable_preemption));
 disable_preemption++;
 }
 redisplay_device (d, 0);
+/* See the comment in Fredisplay_frame. */
+RESET_CHANGED_SET_FLAGS;
 return unbind_to (count, Qnil);
 }
 /* Big lie.  Big lie.  This will force all modelines to be updated
 #endif /* INHIBIT_REDISPLAY_HOOKS */
 defsymbol (&Qdisplay_warning_buffer, "display-warning-buffer");
 defsymbol (&Qbar_cursor, "bar-cursor");
 defsymbol (&Qredisplay_end_trigger_functions,
 	     "redisplay-end-trigger-functions");
+defsymbol (&Qtop_bottom, "top-bottom");
 DEFSUBR (Fredisplay_echo_area);
 DEFSUBR (Fredraw_frame);
 DEFSUBR (Fredisplay_frame);
 DEFSUBR (Fredraw_device);
 *Non-nil means truncate lines in all windows less than full frame wide.
 */ ,
 		     redisplay_variable_changed);
 truncate_partial_width_windows = 1;
-DEFVAR_BOOL ("visible-bell", &visible_bell /*
+DEFVAR_LISP ("visible-bell", &Vvisible_bell /*
-*Non-nil means try to flash the frame to represent a bell.
+*Non-nil substitutes a visual signal for the audible bell.
+Default behavior is to flash the whole screen.  On some platforms,
+special effects are available using the following values:
+'display       Flash the whole screen (ie, the default behavior).
+'top-bottom    Flash only the top and bottom lines of the selected frame.
+When effects are unavailable on a platform, the visual bell is the
+default, whole screen.  (Currently only X supports any special effects.)
 */ );
-visible_bell = 0;
+Vvisible_bell = Qnil;
 DEFVAR_BOOL ("no-redraw-on-reenter", &no_redraw_on_reenter /*
 *Non-nil means no need to redraw entire frame after suspending.
 A non-nil value is useful if the terminal can automatically preserve
 Emacs's frame display when you reenter Emacs.

Mercurial > hg > xemacs-beta

comparison src/redisplay.c @ 404:2f8bb876ab1d r21-2-32