Changeset 3433

Timestamp:

09/04/04 10:50:19 (4 years ago)

Author:

miyoshi

Message:

* xdisp.c (make_cursor_line_fully_visible): Sync up with Emacs CVS
HEAD.
(try_scrolling): Ditto.
(redisplay_window): Partially sync up with Emacs CVS HEAD.

* window.h (WINDOW_TOTAL_LINES): New macro.

* lisp.h (MOST_NEGATIVE_FIXNUM): New macro from Emacs CVS HEAD.
(MOST_POSITIVE_FIXNUM): Ditto.

Files:

• branches/2.2/src/ChangeLog.Meadow (modified) (1 diff)
• branches/2.2/src/lisp.h (modified) (1 diff)
• branches/2.2/src/window.h (modified) (2 diffs)
• branches/2.2/src/xdisp.c (modified) (29 diffs)

branches/2.2/src/ChangeLog.Meadow

@@ +1 @@
+2004-09-04  MIYOSHI Masanori  <miyoshi@meadowy.org>
+
+        * xdisp.c (make_cursor_line_fully_visible): Sync up with Emacs CVS
+        HEAD.
+        (try_scrolling): Ditto.
+        (redisplay_window): Partially sync up with Emacs CVS HEAD.
+
+        * window.h (WINDOW_TOTAL_LINES): New macro.
+
+        * lisp.h (MOST_NEGATIVE_FIXNUM): New macro from Emacs CVS HEAD.
+        (MOST_POSITIVE_FIXNUM): Ditto.
+
-2004-08-29  MIYOSHI Masanori  <miyoshi@meadowy.org>
-

branches/2.2/src/lisp.h

@@ -471 +471 @@
-
-#endif /* NO_UNION_TYPE */
+
+/* Largest and smallest representable fixnum values.  These are the C
+   values.  */
+
+#define MOST_NEGATIVE_FIXNUM    - ((EMACS_INT) 1 << (VALBITS - 1))
+#define MOST_POSITIVE_FIXNUM    (((EMACS_INT) 1 << (VALBITS - 1)) - 1)
-
-/* Extract a value or address from a Lisp_Object.  */

branches/2.2/src/window.h

@@ -282 +282 @@
-#define MINI_WINDOW_P(W)        (!EQ ((W)->mini_p, Qnil))
-
+/* A handy macro.  */
+
+/* Return the frame height in canonical line units.
+   This includes header and mode lines, if any.  */
+
+#define WINDOW_TOTAL_LINES(W) \
+  (XFASTINT ((W)->height))
+
-/* Return the window column at which the text in window W starts.
-   This is different from the `left' field because it does not include
@@ -316 +324 @@
-     (WINDOW_RIGHT_EDGE (W) == FRAME_WINDOW_WIDTH (XFRAME (WINDOW_FRAME (W))))
-
+/* Pixel height of window W without mode and header line.  */
+
+#define WINDOW_BOX_TEXT_HEIGHT(W)               \
+     (WINDOW_DISPLAY_PIXEL_HEIGHT ((W))         \
+      - WINDOW_DISPLAY_MODE_LINE_HEIGHT ((W))   \
+      - WINDOW_DISPLAY_HEADER_LINE_HEIGHT (W));
-
-/* This is the window in which the terminal's cursor should

branches/2.2/src/xdisp.c

@@ -721 +721 @@
-static void extend_face_to_end_of_line P_ ((struct it *));
-static int append_space P_ ((struct it *, int));
-
-int
+, int
+EMACS_INT, EMACS_INT
-static int try_cursor_movement P_ ((Lisp_Object, struct text_pos, int *));
-static int trailing_whitespace_p P_ ((int));
@@ -9364 +9364 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-static int
-
+, force_p
-     struct window *w;
+     int force_p;
-{
-  struct glyph_matrix *matrix;
@@ -9385 +9392 @@
-  row = MATRIX_ROW (matrix, w->cursor.vpos);
-
-
-
+
-  if (!MATRIX_ROW_PARTIALLY_VISIBLE_P (row))
-    return 1;
@@ -9394 +9400 @@
-  window_height = window_box_height (w);
-  if (row->height >= window_height)
-
+
+
+
+
+
+
+
+
+
+
-
-  if (MATRIX_ROW_PARTIALLY_VISIBLE_AT_TOP_P (w, row))
@@ -9427 +9442 @@
-
-  return 1;
+#endif /* 0 */
-}
-
@@ -9436 +9452 @@
-   the case that only the cursor has moved.
-
+   LAST_LINE_MISFIT should be nonzero if we're scrolling because the
+   last screen line's vertical height extends past the end of the screen.
+
-   Value is
-
@@ -9454 +9473 @@
-static int
-try_scrolling (window, just_this_one_p, scroll_conservatively,
-
+, last_line_misfit
-     Lisp_Object window;
-     int just_this_one_p;
-int
+EMACS_INT
-     int temp_scroll_step;
+     int last_line_misfit;
-{
-  struct window *w = XWINDOW (window);
@@ -9474 +9494 @@
-  Lisp_Object aggressive;
-  int height;
+  int extra_scroll_margin_lines = last_line_misfit ? 1 : 0;
-
-#if GLYPH_DEBUG
@@ -9485 +9506 @@
-  if (scroll_margin > 0)
-    {
-XINT (w->height
-CANON_Y_UNI
+WINDOW_TOTAL_LINES (w
+FRAME_LINE_HEIGH
-    }
-  else
-    this_scroll_margin = 0;
+
+  /* Force scroll_conservatively to have a reasonable value so it doesn't
+     cause an overflow while computing how much to scroll.  */
+  if (scroll_conservatively)
+    scroll_conservatively = min (scroll_conservatively,
+                                 MOST_POSITIVE_FIXNUM / FRAME_LINE_HEIGHT (f));
-
-  /* Compute how much we should try to scroll maximally to bring point
@@ -9504 +9531 @@
-  else
-    scroll_max = 0;
-CANON_Y_UNI
+FRAME_LINE_HEIGH
-
-  /* Decide whether we have to scroll down.  Start at the window end
@@ -9510 +9537 @@
-     margin.  */
-  window_end = Fwindow_end (window, Qt);
+
+ too_near_end:
+
-  CHARPOS (scroll_margin_pos) = XINT (window_end);
-  BYTEPOS (scroll_margin_pos) = CHAR_TO_BYTE (CHARPOS (scroll_margin_pos));
-
+
+
-    {
-      start_display (&it, w, scroll_margin_pos);
-
+
+
+
+
-      scroll_margin_pos = it.current.pos;
-    }
@@ -9547 +9581 @@
-
-      if (scroll_conservatively)
+        /* Set AMOUNT_TO_SCROLL to at least one line,
+           and at most scroll_conservatively lines.  */
-        amount_to_scroll
-ax (max (dy, CANON_Y_UNI
-CANON_Y_UNIT (f) * max (scroll_step, temp_scroll_step)
+in (max (dy, FRAME_LINE_HEIGH
+FRAME_LINE_HEIGHT (f) * scroll_conservatively
-      else if (scroll_step || temp_scroll_step)
-        amount_to_scroll = scroll_max;
@@ -9555 +9591 @@
-        {
-          aggressive = current_buffer->scroll_up_aggressively;
-
-
+
-          if (NUMBERP (aggressive))
-
+
+
+
+
+
+
-        }
-
@@ -9564 +9604 @@
-        return SCROLLING_FAILED;
-
+      /* If moving by amount_to_scroll leaves STARTP unchanged,
+         move it down one screen line.  */
+
-      move_it_vertically (&it, amount_to_scroll);
+      if (CHARPOS (it.current.pos) == CHARPOS (startp))
+        move_it_by_lines (&it, 1, 1);
-      startp = it.current.pos;
-    }
@@ -9603 +9648 @@
-          if (scroll_conservatively)
-            amount_to_scroll =
-CANON_Y_UNI
+FRAME_LINE_HEIGH
-          else if (scroll_step || temp_scroll_step)
-            amount_to_scroll = scroll_max;
@@ -9609 +9654 @@
-            {
-              aggressive = current_buffer->scroll_down_aggressively;
-
-
+
-              if (NUMBERP (aggressive))
-
+
+
+
+
+
+
-            }
-
@@ -9643 +9692 @@
-        w->base_line_number = Qnil;
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-    }
-
@@ -9935 +9986 @@
-                {
-                  set_cursor_from_row (w, row, w->current_matrix, 0, 0, 0, 0);
-
-
-
+
+
-                  else
-                    rc = CURSOR_MOVEMENT_SUCCESS;
@@ -9975 +10025 @@
-  int current_matrix_up_to_date_p = 0;
-  int temp_scroll_step = 0;
-BINDING_STACK_SIZE
+SPECPDL_INDEX
-  int rc;
+  int centering_position;
+  int last_line_misfit = 0;
-
-  SET_TEXT_POS (lpoint, PT, PT_BYTE);
@@ -10151 +10203 @@
-      || w->frozen_window_start_p)
-    {
+      /* We set this later on if we have to adjust point.  */
+      int new_vpos = -1;
+
-      w->force_start = Qnil;
-      w->vscroll = 0;
@@ -10188 +10243 @@
-          w->force_start = Qt;
-          clear_glyph_matrix (w->desired_matrix);
-finish_scroll_bar
+need_larger_matrice
-        }
-
@@ -10196 +10251 @@
-             appear. The desired matrix has been built above, so we
-             can use it here.  */
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-          struct glyph_row *row;
-
-          window_height = window_box_height (w) / 2;
-          row = MATRIX_FIRST_TEXT_ROW (w->desired_matrix);
-window_height
+new_vpos
-            ++row;
-
@@ -10225 +10292 @@
-        }
-
-      if (!make_cursor_line_fully_visible (w))
-        goto need_larger_matrices;
-#if GLYPH_DEBUG
-      debug_method_add (w, "forced window start");
@@ -10234 +10299 @@
-
-  /* Handle case where text has not changed, only point, and it has
-
+
+
-  if (current_matrix_up_to_date_p
-      && (rc = try_cursor_movement (window, startp, &temp_scroll_step),
@@ -10321 +10387 @@
-            w->base_line_number = Qnil;
-
-
-
-
+
+
+
+
+
+
+
+
-        }
-      else
@@ -10356 +10427 @@
-                              scroll_conservatively,
-                              scroll_step,
-
+, last_line_misfit
-      switch (rc)
-        {
@@ -10376 +10447 @@
-
- recenter:
+  centering_position = window_box_height (w) / 2;
+
+ point_at_top:
+  /* Jump here with centering_position already set to 0.  */
-
-#if GLYPH_DEBUG
@@ -10391 +10466 @@
-  init_iterator (&it, w, PT, PT_BYTE, NULL, DEFAULT_FACE_ID);
-  it.current_y = it.last_visible_y;
-window_box_height (w) / 2
+centering_position
-  xassert (IT_CHARPOS (it) >= BEGV);
-
@@ -10471 +10546 @@
-    }
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
- done: