Changeset 1492

Timestamp:

1998年02月17日 01時45分04秒 (11 years ago)

Author:

himi

Message:

Import Original Emacs 21.0.104.

Files:

• branches/GNU/src/dispextern.h (modified) (6 diffs)
• branches/GNU/src/dispnew.c (modified) (23 diffs)
• branches/GNU/src/doprnt.c (added)
• branches/GNU/src/dosfns.h (added)
• branches/GNU/src/frame.c (modified) (3 diffs)
• branches/GNU/src/keymap.c (modified) (5 diffs)
• branches/GNU/src/lread.c (added)
• branches/GNU/src/makefile.nt (added)
• branches/GNU/src/msdos.c (added)

branches/GNU/src/dispextern.h

@@ -698 +698 @@
-  /* 1 means some glyphs in this row are displayed in mouse-face.  */
-  unsigned mouse_face_p : 1;
-
-  /* 1 means this row was ended by a newline from a string.  */
-  unsigned ends_in_newline_from_string_p : 1;
-
-  /* Continuation lines width at the start of the row.  */
@@ -1205 +1202 @@
-  XFontStruct *font;
-
-
-
-
+
+
-
-#else /* not HAVE_WINDOW_SYSTEM */
@@ -1379 +1375 @@
-  /* The allocated size, and number of used slots of faces_by_id.  */
-  int size, used;
-
-  /* Flag indicating that attributes of the `menu' face have been
-     changed.  */
-  unsigned menu_face_changed_p : 1;
-};
-
@@ -1599 +1591 @@
-     dpvec is set to ctl_chars when a control character is translated.
-     This vector is also used for incomplete multibyte character
-4
-6
-6
+3
+2
+2
-
-  /* Current buffer or string position of the iterator, including
@@ -2161 +2153 @@
-/* Defined in xdisp.c */
-
-struct glyph_row *row_containing_pos P_ ((struct window *, int,
-                                          struct glyph_row *,
-                                          struct glyph_row *));
-int string_buffer_position P_ ((struct window *, Lisp_Object, int));
-int line_bottom_y P_ ((struct it *));
-int display_prop_intangible_p P_ ((Lisp_Object));
-e
+a
-int resize_mini_window P_ ((struct window *, int));
-int try_window P_ ((Lisp_Object, struct text_pos));
@@ -2291 +2280 @@
-
-extern int inverse_video;
-
-
-
-
+
+
-extern void redraw_frame P_ ((struct frame *));
-extern void redraw_garbaged_frames P_ ((void));

branches/GNU/src/dispnew.c

@@ -132 +132 @@
-static void update_frame_line P_ ((struct frame *, int));
-static struct dim allocate_matrices_for_frame_redisplay
-
-
+
+
+
-static int realloc_glyph_pool P_ ((struct glyph_pool *, struct dim));
-static void adjust_frame_glyphs P_ ((struct frame *));
@@ -797 +798 @@
-              && matrix->window_width == window_width)
-            {
-
-
-
-
-
-
-
+
+
+
+
+
-
-              /* Window end is invalid, if inside of the rows that
- below
+
-              if (INTEGERP (w->window_end_vpos)
-                  && XFASTINT (w->window_end_vpos) >= i)
@@ -994 +993 @@
-      
-      row->y += dy;
-      row->visible_height = row->height;
-      
-      if (row->y < min_y)
-
-
-
+
+
+
+
+
-    }
-}
@@ -1153 +1153 @@
-  row->ascent = row->phys_ascent = 0;
-  row->height = row->phys_height = CANON_Y_UNIT (XFRAME (w->frame));
-
-
+
-  if (row->y < min_y)
-
-
-
+
+
+
+
+
-
-  row->enabled_p = 1;
@@ -1857 +1858 @@
-
-static struct dim
-dim_only_p
-
+ch_dim
+dim_only_p, 
-     Lisp_Object window;
-     int x, y;
+     struct dim ch_dim;
-     int dim_only_p;
-     int *window_change_flags;
@@ -1890 +1892 @@
-         on whether this a combination or a leaf window.  */
-      if (!NILP (w->hchild))
-
+ch_dim,
-                                                     dim_only_p,
-                                                     window_change_flags);
-      else if (!NILP (w->vchild))
-
+ch_dim,
-                                                     dim_only_p,
-                                                     window_change_flags);
@@ -1909 +1911 @@
-          /* Width and height MUST be chosen so that there are no
-             holes in the frame matrix.  */
-required_matrix_width (w
-required_matrix_height (w
+XINT (w->width
+XINT (w->height
-
-          /* Will matrix be re-allocated?  */
@@ -1975 +1977 @@
-
-
-/* Return the required height of glyph matrices for window W.  */
-
-int
-required_matrix_height (w)
-     struct window *w;
-{
-#ifdef HAVE_WINDOW_SYSTEM
-  struct frame *f = XFRAME (w->frame);
-  
-  if (FRAME_WINDOW_P (f))
-    {
-      int ch_height = FRAME_SMALLEST_FONT_HEIGHT (f);
-      int window_pixel_height = window_box_height (w) + abs (w->vscroll);
-      return (((window_pixel_height + ch_height - 1)
-               / ch_height)
-              /* One partially visible line at the top and
-                 bottom of the window.  */
-              + 2
-              /* 2 for top and mode line.  */
-              + 2);
-    }
-#endif /* HAVE_WINDOW_SYSTEM */
-      
-  return XINT (w->height);
-}
-
-
-/* Return the required width of glyph matrices for window W.  */
-
-int
-required_matrix_width (w)
-     struct window *w;
-{
-#ifdef HAVE_WINDOW_SYSTEM
-  struct frame *f = XFRAME (w->frame);
-  if (FRAME_WINDOW_P (f))
-    {
-      int ch_width = FRAME_SMALLEST_CHAR_WIDTH (f);
-      int window_pixel_width = XFLOATINT (w->width) * CANON_X_UNIT (f);
-  
-      /* Compute number of glyphs needed in a glyph row.  */
-      return (((window_pixel_width + ch_width - 1)
-               / ch_width)
-              /* 2 partially visible columns in the text area.  */
-              + 2
-              /* One partially visible column at the right
-                 edge of each marginal area.  */
-              + 1 + 1);
-    }
-#endif /* HAVE_WINDOW_SYSTEM */
-
-  return XINT (w->width);
-}
-
-
-/* Allocate window matrices for window-based redisplay.  W is the
-   window whose matrices must be allocated/reallocated.  CH_DIM is the
@@ -2035 +1982 @@
-   
-static void
-
+, ch_dim
-     struct window *w;
-
+
+
+
+
-  while (w)
-    {
-      if (!NILP (w->vchild))
-
+, ch_dim
-      else if (!NILP (w->hchild))
-
+, ch_dim
-      else
-        {
-          /* W is a leaf window.  */
+          int window_pixel_width = XFLOATINT (w->width) * CANON_X_UNIT (f);
+          int window_pixel_height = window_box_height (w) + abs (w->vscroll);
-          struct dim dim;
-
@@ -2056 +2008 @@
-            }
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-          adjust_glyph_matrix (w, w->desired_matrix, 0, 0, dim);
-          adjust_glyph_matrix (w, w->current_matrix, 0, 0, dim);
@@ -2305 +2274 @@
-    = allocate_matrices_for_frame_redisplay (FRAME_ROOT_WINDOW (f),
-                                             0, top_window_y,
-
+ch_dim, 
-                                             &window_change_flags);
-
@@ -2321 +2290 @@
-      /* Do it for window matrices.  */
-      allocate_matrices_for_frame_redisplay (FRAME_ROOT_WINDOW (f),
-
+ch_dim, 
-                                             &window_change_flags);
-
@@ -2381 +2350 @@
-    
-  /* Allocate/reallocate window matrices.  */
-
+
+
-
-  /* Allocate/ reallocate matrices of the dummy window used to display
@@ -2404 +2374 @@
-    XSETFASTINT (w->height, FRAME_MENU_BAR_LINES (f));
-    XSETFASTINT (w->width, FRAME_WINDOW_WIDTH (f));
-
+, ch_dim
-  }
-#endif /* not USE_X_TOOLKIT */
@@ -2424 +2394 @@
-  XSETFASTINT (w->height, FRAME_TOOL_BAR_LINES (f));
-  XSETFASTINT (w->width, FRAME_WINDOW_WIDTH (f));
-
+, ch_dim
-}
-
@@ -3513 +3483 @@
-  it.end_charpos = PT;
-  it.stop_charpos = min (PT, it.stop_charpos);
-  it.stop_charpos = max (IT_CHARPOS (it), it.stop_charpos);
-
-  /* More than one display element may be returned for PT - 1 if
@@ -3618 +3587 @@
-     and updated_row.  */
-  updated_row = glyph_row;
-  updated_area = TEXT_AREA;
-  update_begin (f);
-  if (rif)
@@ -4086 +4054 @@
-      struct glyph_row *row, *end;
-      struct glyph_row *mode_line_row;
-
+ = NULL
-      int yb, changed_p = 0, mouse_face_overwritten_p = 0, n_updated;
-
@@ -4096 +4064 @@
-      row = desired_matrix->rows;
-      end = row + desired_matrix->nrows - 1;
-      
-      if (row->mode_line_p)
-
-
-
-
-
-
+
-
-      /* Update the mode line, if necessary.  */
@@ -4124 +4086 @@
-      /* Try reusing part of the display by copying.  */
-      if (row < end && !desired_matrix->no_scrolling_p)
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-      /* Update the top mode line after scrolling because a new top
@@ -4182 +4133 @@
-      paused_p = row < end;
-      
-    set_cursor:
-      
-      /* Fix the appearance of overlapping(overlapped rows.  */
-      if (!paused_p && !w->pseudo_window_p)
@@ -4207 +4156 @@
-#endif
-
-
-
-
-
-
+
+
-    }
-  else
@@ -4571 +4517 @@
-
-          last_row = NULL;
-
-
-
-
+
+
+
-            {
-              if (row->used[TEXT_AREA]
-                  && row->glyphs[TEXT_AREA][0].charpos >= 0)
-                last_row = row;
-
+
+
+
-            }
-          
-          if (last_row)
-            {
-last_
-last_
+
+
-
-              while (last > start && last->charpos < 0)

branches/GNU/src/frame.c

@@ -1319 +1319 @@
-to read the mouse position, it returns the selected frame for FRAME\n\
-and nil for X and Y.\n\
-
-
-
+
+
-  ()
-{
@@ -2491 +2490 @@
-
-  DEFVAR_LISP ("mouse-position-function", &Vmouse_position_function,
-
-
-
-
+
+
-which need to do mouse handling at the Lisp level.");
-  Vmouse_position_function = Qnil;
@@ -2509 +2506 @@
-this variable doesn't necessarily say anything meaningful about the\n\
-current set of frames, or where the minibuffer is currently being\n\
-
-
-
+
-
-  staticpro (&Vframe_list);

branches/GNU/src/keymap.c

@@ -503 +503 @@
-    Lisp_Object tail;
-    Lisp_Object t_binding;
-    Lisp_Object generic_binding;
-
-    t_binding = Qnil;
-    generic_binding = Qnil;
-    
-    for (tail = XCDR (map);
-         (CONSP (tail)
@@ -525 +522 @@
-        else if (CONSP (binding))
-          {
-
-
-
-
+
-              {
-                val = XCDR (binding);
@@ -537 +531 @@
-                return get_keyelt (val, autoload);
-              }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-              t_binding = XCDR (binding);
-          }
@@ -574 +552 @@
-               All character codes without modifiers are included.  */
-            if (NATNUMP (idx)
-
+
+
+
-              {
-                val = Faref (binding, idx);
@@ -587 +567 @@
-        QUIT;
-      }
-
-    if (!NILP (generic_binding))
-      return get_keyelt (generic_binding, autoload);
-
-    return get_keyelt (t_binding, autoload);