emacs: src/xdisp.c comparison

comparison src/xdisp.c @ 56118:6fbabfb26a3c

(try_cursor_movement): Exclude header line from scroll margin at top of window. (try_window_reusing_current_matrix): Calculate proper cursor position after scrolling up with non-zero scroll margin, as the old cursor position corresponds to value of PT before executing this command. (try_window_id): Consider scroll margin at bottom of window too; otherwise we fail to scroll when hl-line-mode is enabled.

author	Kim F. Storm <storm@cua.dk>
date	Tue, 15 Jun 2004 10:35:05 +0000
parents	a64ca0d0e4c5
children	abdb38fe88c5 4c90ffeb71c5

comparison

equal deleted inserted replaced

-:75f76430cc6c
+:6fbabfb26a3c
 && INTEGERP (w->window_end_vpos)
 && XFASTINT (w->window_end_vpos) < w->current_matrix->nrows
 && (FRAME_WINDOW_P (f)
 	  || !overlay_arrow_in_current_buffer_p ()))
 {
-int this_scroll_margin;
+int this_scroll_margin, top_scroll_margin;
 struct glyph_row *row = NULL;
 #if GLYPH_DEBUG
 debug_method_add (w, "cursor movement");
 #endif
 /* Scroll if point within this distance from the top or bottom
 	 of the window.  This is a pixel value.  */
 this_scroll_margin = max (0, scroll_margin);
 this_scroll_margin = min (this_scroll_margin, WINDOW_TOTAL_LINES (w) / 4);
 this_scroll_margin *= FRAME_LINE_HEIGHT (f);
+top_scroll_margin = this_scroll_margin;
+if (WINDOW_WANTS_HEADER_LINE_P (w))
+	top_scroll_margin += CURRENT_HEADER_LINE_HEIGHT (w);
 /* Start with the row the cursor was displayed during the last
 	 not paused redisplay.  Give up if that row is not valid.  */
 if (w->last_cursor.vpos < 0
 	  || w->last_cursor.vpos >= w->current_matrix->nrows)
 		 if-statement.  */
 	      while (!row->mode_line_p
 		     && (MATRIX_ROW_START_CHARPOS (row) > PT
 			 || (MATRIX_ROW_START_CHARPOS (row) == PT
 			     && MATRIX_ROW_STARTS_IN_MIDDLE_OF_CHAR_P (row)))
-		     && (row->y > this_scroll_margin
+		     && (row->y > top_scroll_margin
 			 || CHARPOS (startp) == BEGV))
 		{
 		  xassert (row->enabled_p);
 		  --row;
 		}
 		     && MATRIX_ROW_END_CHARPOS (row) == PT
 		     && !cursor_row_p (w, row))
 		++row;
 	      /* If within the scroll margin, scroll.  */
-	      if (row->y < this_scroll_margin
+	      if (row->y < top_scroll_margin
 		  && CHARPOS (startp) != BEGV)
 		scroll_p = 1;
 	    }
 	  if (PT < MATRIX_ROW_START_CHARPOS (row)
 /* If point is in a reused row, adjust y and vpos of the cursor
 	 position.  */
 if (pt_row)
 	{
-	  w->cursor.vpos -= MATRIX_ROW_VPOS (first_reusable_row,
+	  w->cursor.vpos -= nrows_scrolled;
-					     w->current_matrix);
+	  w->cursor.y -= first_reusable_row->y - start_row->y;
-	  w->cursor.y -= first_reusable_row->y;
 	}
 /* Scroll the display.  */
 run.current_y = first_reusable_row->y;
 run.desired_y = WINDOW_HEADER_LINE_HEIGHT (w);
 		     -nrows_scrolled);
 /* Disable rows not reused.  */
 for (row -= nrows_scrolled; row < bottom_row; ++row)
 	row->enabled_p = 0;
+/* Point may have moved to a different line, so we cannot assume that
+	 the previous cursor position is valid; locate the correct row.  */
+if (pt_row)
+	{
+	  for (row = MATRIX_ROW (w->current_matrix, w->cursor.vpos);
+	       row < bottom_row && PT >= MATRIX_ROW_END_CHARPOS (row);
+	       row++)
+	    {
+	      w->cursor.vpos++;
+	      w->cursor.y = row->y;
+	    }
+	  if (row < bottom_row)
+	    {
+	      struct glyph *glyph = row->glyphs[TEXT_AREA] + w->cursor.hpos;
+	      while (glyph->charpos < PT)
+		{
+		  w->cursor.hpos++;
+		  w->cursor.x += glyph->pixel_width;
+		  glyph++;
+		}
+	    }
+	}
 /* Adjust window end.  A null value of last_text_row means that
 	 the window end is in reused rows which in turn means that
 	 only its vpos can have changed.  */
 if (last_text_row)
 this_scroll_margin *= FRAME_LINE_HEIGHT (it.f);
 cursor_height = MATRIX_ROW (w->desired_matrix, w->cursor.vpos)->height;
 if ((w->cursor.y < this_scroll_margin
 	 && CHARPOS (start) > BEGV)
-	/* Don't take scroll margin into account at the bottom because
+	/* Old redisplay didn't take scroll margin into account at the bottom,
-	   old redisplay didn't do it either.  */
+	   but then global-hl-line-mode doesn't scroll.  KFS 2004-06-14 */
-	|| w->cursor.y + cursor_height > it.last_visible_y)
+	|| w->cursor.y + cursor_height + this_scroll_margin > it.last_visible_y)
 {
 	w->cursor.vpos = -1;
 	clear_glyph_matrix (w->desired_matrix);
 	return -1;
 }

Mercurial > emacs

comparison src/xdisp.c @ 56118:6fbabfb26a3c