xemacs-beta: src/redisplay.c comparison

comparison src/redisplay.c @ 434:9d177e8d4150 r21-2-25

Import from CVS: tag r21-2-25

author	cvs
date	Mon, 13 Aug 2007 11:30:53 +0200
parents	a5df635868b2
children	84b14dcb0985

comparison

equal deleted inserted replaced

-:892ca416f0fb
+:9d177e8d4150
 			   (those off the left side of the screen) need
 			   to be skipped before anything is displayed. */
 Bytind bi_start_col_enabled;
 int start_col_xoffset;	/* Number of pixels that still need to
 			   be skipped.  This is used for
 			   horizontal scrolling of glyphs, where we want
 			   to be able to scroll over part of the glyph. */
 int hscroll_glyph_width_adjust;  /* how much the width of the hscroll
 				      glyph differs from space_width (w).
 				      0 if no hscroll glyph was used,
 only lines that start with less than selective_display columns of
 space will be displayed.  If selective_display is t then all text
 after a ^M is invisible. */
 int selective = (INTP (b->selective_display)
 		   ? XINT (b->selective_display)
-		   : ((!NILP (b->selective_display) ? -1 : 0)));
+		   : (!NILP (b->selective_display) ? -1 : 0));
 /* The variable ctl-arrow allows the user to specify what characters
 can actually be displayed and which octal should be used for.
 #### This variable should probably have some rethought done to
 it.
 	      int next_tab_start;
 	      int char_tab_width;
 	      int prop_width = 0;
 	      if (data.start_col > 1)
 		tab_start_pixpos -= (space_width (w) * (data.start_col - 1))
 		  + data.start_col_xoffset;
 	      next_tab_start =
 		next_tab_position (w, tab_start_pixpos,
 				   dl->bounds.left_in +
 dl->left_margin_findex = default_face;
 dl->right_margin_findex = default_face;
 }
 else
 {
 dl->left_margin_findex =
 	get_builtin_face_cache_index (w, Vleft_margin_face);
 dl->right_margin_findex =
 	get_builtin_face_cache_index (w, Vright_margin_face);
 }
 xzero (data);
 data.ef = extent_fragment_new (disp_string, f);
 data.cursor_type = NO_CURSOR;
 data.cursor_x = -1;
 data.start_col = 0;
 /* I don't think we want this, string areas should not scroll with
 the window
 data.start_col = w->hscroll;
 data.bi_start_col_enabled = (w->hscroll ? bi_start_pos : 0);
 */
 data.bi_start_col_enabled = 0;
 data.hscroll_glyph_width_adjust = 0;
 if (data.bi_bufpos > bi_string_zv)
 dl->end_bufpos = buffer_or_string_bytind_to_bufpos (disp_string, bi_string_zv);
 else
 dl->end_bufpos = buffer_or_string_bytind_to_bufpos (disp_string, data.bi_bufpos) - 1;
 if (truncate_win)
 data.dl->num_chars =
 string_column_at_point (s, dl->end_bufpos, b ? XINT (b->tab_width) : 8);
 else
 /* This doesn't correctly take into account tabs and control
 characters but if the window isn't being truncated then this
 value isn't going to end up being used anyhow. */
 /* 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
 position when displayed in the given window.  The display line ends
 when the contents of the line reach the right boundary of the given
 window.
 This is very similar to generate_display_line but with the same
 limitations as create_string_text_block. I have taken the liberty
 of fixing the bytind stuff though.*/
 static Bufpos
 			      face_index default_face)
 {
 Bufpos ret_bufpos;
 /* you must set bounds before calling this. */
 /* Reset what this line is using. */
 if (dl->display_blocks)
 Dynarr_reset (dl->display_blocks);
 if (dl->left_glyphs)
 {
 dlp->ypos = (ypos + dlp->ascent) - yclip;
 ypos = dlp->ypos + dlp->descent;
 /* See if we've been asked to start midway through a line, for
 partial display line scrolling. */
 if (yclip)
 	{
 	  dlp->top_clip = yclip;
 	  yclip = 0;
 	}
 else
 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)
 || 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);
 if (dl->modeline)
 	continue;
 else
 	{
 	  struct line_start_cache lsc;
 	  lsc.start = dl->bufpos;
 	  lsc.end = dl->end_bufpos;
 	  lsc.height = dl->ascent + dl->descent;
 	  Dynarr_add (internal_cache, lsc);
 	  cur_elt = point_in_line_start_cache (w, cur_pos, 2) - 1;
 	  assert (cur_elt >= -1);
 	  /* This used to be cur_elt>=0 under the assumption that if
 	     point is in the top line and not at BUF_BEGV, then
 	     setting the window_start to a newline before the start of
 	     the first line will always cause scrolling.
 	     However in my (jv) opinion this is wrong.  That new line
 	     can be hidden in various ways: invisible extents, an
 	     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;
 	}
 prev_pos = cur_pos;
 }
 }

Mercurial > hg > xemacs-beta

comparison src/redisplay.c @ 434:9d177e8d4150 r21-2-25