Mercurial > emacs
view src/undo.c @ 1721:6ba3bca4c3de
* frame.h (struct frame): New fields `can_have_scrollbars' and
`has_vertical_scrollbars'.
(FRAME_CAN_HAVE_SCROLLBARS, FRAME_HAS_VERTICAL_SCROLLBARS): New
accessors, for both the MULTI_FRAME and non-MULTI_FRAME.
(VERTICAL_SCROLLBAR_WIDTH, WINDOW_VERTICAL_SCROLLBAR,
WINDOW_VERTICAL_SCROLLBAR_COLUMN,
WINDOW_VERTICAL_SCROLLBAR_HEIGHT): New macros.
* window.h (struct window): New field `vertical_scrollbar'.
* xterm.h (struct x_display): vertical_scrollbars,
judge_timestamp, vertical_scrollbar_extra: New fields.
(struct scrollbar): New struct.
(VERTICAL_SCROLLBAR_PIXEL_WIDTH, VERTICAL_SCROLLBAR_PIXEL_HEIGHT,
VERTICAL_SCROLLBAR_LEFT_BORDER, VERTICAL_SCROLLBAR_RIGHT_BORDER,
VERTICAL_SCROLLBAR_TOP_BORDER, VERTICAL_SCROLLBAR_BOTTOM_BORDER,
CHAR_TO_PIXEL_WIDTH, CHAR_TO_PIXEL_HEIGHT, PIXEL_TO_CHAR_WIDTH,
PIXEL_TO_CHAR_HEIGHT): New accessors and macros.
* frame.c (make_frame): Initialize the `can_have_scrollbars' and
`has_vertical_scrollbars' fields of the frame.
* term.c (term_init): Note that TERMCAP terminals don't support
scrollbars.
(mouse_position_hook): Document new args.
(set_vertical_scrollbar_hook, condemn_scrollbars_hook,
redeem_scrollbar_hook, judge_scrollbars_hook): New hooks.
* termhooks.h: Declare and document them.
(enum scrollbar_part): New type.
(struct input_event): Describe the new form of the scrollbar_click
event type. Change `part' from a Lisp_Object to an enum
scrollbar_part. Add a new field `scrollbar'.
* keyboard.c (kbd_buffer_get_event): Pass appropriate new
parameters to *mouse_position_hook, and make_lispy_movement.
* xfns.c (x_set_vertical_scrollbar): New function.
(x_figure_window_size): Use new macros to calculate frame size.
(Fx_create_frame): Note that X Windows frames do support scroll
bars. Default to "yes".
* xterm.c: #include <X11/cursorfont.h> and "window.h".
(x_vertical_scrollbar_cursor): New variable.
(x_term_init): Initialize it.
(last_mouse_bar, last_mouse_bar_frame, last_mouse_part,
last_mouse_scroll_range_start, last_mouse_scroll_range_end): New
variables.
(XTmouse_position): Use them to return scrollbar movement events.
Take new arguments, for that purpose.
(x_window_to_scrollbar, x_scrollbar_create,
x_scrollbar_set_handle, x_scrollbar_remove, x_scrollbar_move,
XTset_scrollbar, XTcondemn_scrollbars, XTredeem_scrollbar,
XTjudge_scrollbars, x_scrollbar_expose,
x_scrollbar_background_expose, x_scrollbar_handle_click,
x_scrollbar_handle_motion): New functions to implement scrollbars.
(x_term_init): Set the termhooks.h hooks to point to them.
(x_set_window_size): Use new macros to calculate frame size. Set
vertical_scrollbar_extra field.
(x_make_frame_visible): Use the frame accessor
FRAME_HAS_VERTICAL_SCROLLBARS to decide if we need to map the
frame's subwindows as well.
(XTread_socket): Use new size-calculation macros from xterm.h when
processing ConfigureNotify events.
(x_wm_set_size_hint): Use PIXEL_TO_CHAR_WIDTH and
PIXEL_TO_CHAR_HEIGHT macros.
* ymakefile (xdisp.o): This now depends on termhooks.h.
(xterm.o): This now depends on window.h.
* xterm.h (struct x_display): Delete v_scrollbar, v_thumbup,
v_thumbdown, v_slider, h_scrollbar, h_thumbup,
h_thumbdown, h_slider, v_scrollbar_width, h_scrollbar_height
fields.
* keyboard.c (Qvscrollbar_part, Qvslider_part, Qvthumbup_part,
Qvthumbdown_part, Qhscrollbar_part, Qhslider_part, Qhthumbup_part,
Qhthumbdown_part, Qscrollbar_click): Deleted; part of an obsolete
interface.
(head_table): Removed from here as well.
(syms_of_keyboard): And here.
* keyboard.h: And here.
(POSN_SCROLLBAR_BUTTON): Removed.
* xscrollbar.h: File removed - no longer necessary.
* xfns.c: Don't #include it any more.
(Qhorizontal_scroll_bar, Qvertical_scroll_bar): Deleted.
(syms_of_xfns): Don't initialize or staticpro them.
(gray_bits): Salvaged from xscrollbar.h.
(x_window_to_scrollbar): Deleted.
(x_set_horizontal_scrollbar): Deleted.
(enum x_frame_parm, x_frame_parms): Remove references to
x_set_horizontal_scrollbar.
(x_set_foreground_color, x_set_background_color,
x_set_border_pixel): Remove special code to support scrollbars.
(Fx_create_frame): Remove old scrollbar setup code.
(install_vertical_scrollbar, install_horizontal_scrollbar,
adjust_scrollbars, x_resize_scrollbars): Deleted.
* xterm.c (construct_mouse_click): This doesn't need to take care of
scrollbar clicks anymore.
(XTread_socket): Remove old code to support scrollbars. Call new
functions instead for events which occur in scrollbar windows.
(XTupdate_end): Remove call to adjust_scrollbars; the main
redisplay code takes care of that now.
(enum window_type): Deleted.
* ymakefile: Note that xfns.o no longer depends on xscrollbar.h.
* xterm.h (PIXEL_WIDTH, PIXEL_HEIGHT): Change name of parameter
from `s' to `f'; it's a frame pointer.
author | Jim Blandy <jimb@redhat.com> |
---|---|
date | Thu, 24 Dec 1992 06:23:08 +0000 |
parents | 3e9dadf2d13c |
children | de0a0ed7318e |
line wrap: on
line source
/* undo handling for GNU Emacs. Copyright (C) 1990 Free Software Foundation, Inc. This file is part of GNU Emacs. GNU Emacs is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY. No author or distributor accepts responsibility to anyone for the consequences of using it or for whether it serves any particular purpose or works at all, unless he says so in writing. Refer to the GNU Emacs General Public License for full details. Everyone is granted permission to copy, modify and redistribute GNU Emacs, but only under the conditions described in the GNU Emacs General Public License. A copy of this license is supposed to have been given to you along with GNU Emacs so you can know your rights and responsibilities. It should be in a file named COPYING. Among other things, the copyright notice and this notice must be preserved on all copies. */ #include "config.h" #include "lisp.h" #include "buffer.h" /* Last buffer for which undo information was recorded. */ Lisp_Object last_undo_buffer; /* Record an insertion that just happened or is about to happen, for LENGTH characters at position BEG. (It is possible to record an insertion before or after the fact because we don't need to record the contents.) */ record_insert (beg, length) Lisp_Object beg, length; { Lisp_Object lbeg, lend; if (current_buffer != XBUFFER (last_undo_buffer)) Fundo_boundary (); XSET (last_undo_buffer, Lisp_Buffer, current_buffer); if (EQ (current_buffer->undo_list, Qt)) return; if (MODIFF <= current_buffer->save_modified) record_first_change (); /* If this is following another insertion and consecutive with it in the buffer, combine the two. */ if (XTYPE (current_buffer->undo_list) == Lisp_Cons) { Lisp_Object elt; elt = XCONS (current_buffer->undo_list)->car; if (XTYPE (elt) == Lisp_Cons && XTYPE (XCONS (elt)->car) == Lisp_Int && XTYPE (XCONS (elt)->cdr) == Lisp_Int && XINT (XCONS (elt)->cdr) == XINT (beg)) { XSETINT (XCONS (elt)->cdr, XINT (beg) + XINT (length)); return; } } lbeg = beg; XSET (lend, Lisp_Int, XINT (beg) + XINT (length)); current_buffer->undo_list = Fcons (Fcons (lbeg, lend), current_buffer->undo_list); } /* Record that a deletion is about to take place, for LENGTH characters at location BEG. */ record_delete (beg, length) int beg, length; { Lisp_Object lbeg, lend, sbeg; if (current_buffer != XBUFFER (last_undo_buffer)) Fundo_boundary (); XSET (last_undo_buffer, Lisp_Buffer, current_buffer); if (EQ (current_buffer->undo_list, Qt)) return; if (MODIFF <= current_buffer->save_modified) record_first_change (); if (point == beg + length) XSET (sbeg, Lisp_Int, -beg); else XFASTINT (sbeg) = beg; XFASTINT (lbeg) = beg; XFASTINT (lend) = beg + length; /* If point isn't at start of deleted range, record where it is. */ if (PT != sbeg) current_buffer->undo_list = Fcons (make_number (PT), current_buffer->undo_list); current_buffer->undo_list = Fcons (Fcons (Fbuffer_substring (lbeg, lend), sbeg), current_buffer->undo_list); } /* Record that a replacement is about to take place, for LENGTH characters at location BEG. The replacement does not change the number of characters. */ record_change (beg, length) int beg, length; { record_delete (beg, length); record_insert (beg, length); } /* Record that an unmodified buffer is about to be changed. Record the file modification date so that when undoing this entry we can tell whether it is obsolete because the file was saved again. */ record_first_change () { Lisp_Object high, low; XFASTINT (high) = (current_buffer->modtime >> 16) & 0xffff; XFASTINT (low) = current_buffer->modtime & 0xffff; current_buffer->undo_list = Fcons (Fcons (Qt, Fcons (high, low)), current_buffer->undo_list); } DEFUN ("undo-boundary", Fundo_boundary, Sundo_boundary, 0, 0, 0, "Mark a boundary between units of undo.\n\ An undo command will stop at this point,\n\ but another undo command will undo to the previous boundary.") () { Lisp_Object tem; if (EQ (current_buffer->undo_list, Qt)) return Qnil; tem = Fcar (current_buffer->undo_list); if (!NILP (tem)) current_buffer->undo_list = Fcons (Qnil, current_buffer->undo_list); return Qnil; } /* At garbage collection time, make an undo list shorter at the end, returning the truncated list. MINSIZE and MAXSIZE are the limits on size allowed, as described below. In practice, these are the values of undo-limit and undo-strong-limit. */ Lisp_Object truncate_undo_list (list, minsize, maxsize) Lisp_Object list; int minsize, maxsize; { Lisp_Object prev, next, last_boundary; int size_so_far = 0; prev = Qnil; next = list; last_boundary = Qnil; /* Always preserve at least the most recent undo record. If the first element is an undo boundary, skip past it. Skip, skip, skip the undo, skip, skip, skip the undo, Skip, skip, skip the undo, skip to the undo bound'ry. (Get it? "Skip to my Loo?") */ if (XTYPE (next) == Lisp_Cons && NILP (XCONS (next)->car)) { /* Add in the space occupied by this element and its chain link. */ size_so_far += sizeof (struct Lisp_Cons); /* Advance to next element. */ prev = next; next = XCONS (next)->cdr; } while (XTYPE (next) == Lisp_Cons && ! NILP (XCONS (next)->car)) { Lisp_Object elt; elt = XCONS (next)->car; /* Add in the space occupied by this element and its chain link. */ size_so_far += sizeof (struct Lisp_Cons); if (XTYPE (elt) == Lisp_Cons) { size_so_far += sizeof (struct Lisp_Cons); if (XTYPE (XCONS (elt)->car) == Lisp_String) size_so_far += (sizeof (struct Lisp_String) - 1 + XSTRING (XCONS (elt)->car)->size); } /* Advance to next element. */ prev = next; next = XCONS (next)->cdr; } if (XTYPE (next) == Lisp_Cons) last_boundary = prev; while (XTYPE (next) == Lisp_Cons) { Lisp_Object elt; elt = XCONS (next)->car; /* When we get to a boundary, decide whether to truncate either before or after it. The lower threshold, MINSIZE, tells us to truncate after it. If its size pushes past the higher threshold MAXSIZE as well, we truncate before it. */ if (NILP (elt)) { if (size_so_far > maxsize) break; last_boundary = prev; if (size_so_far > minsize) break; } /* Add in the space occupied by this element and its chain link. */ size_so_far += sizeof (struct Lisp_Cons); if (XTYPE (elt) == Lisp_Cons) { size_so_far += sizeof (struct Lisp_Cons); if (XTYPE (XCONS (elt)->car) == Lisp_String) size_so_far += (sizeof (struct Lisp_String) - 1 + XSTRING (XCONS (elt)->car)->size); } /* Advance to next element. */ prev = next; next = XCONS (next)->cdr; } /* If we scanned the whole list, it is short enough; don't change it. */ if (NILP (next)) return list; /* Truncate at the boundary where we decided to truncate. */ if (!NILP (last_boundary)) { XCONS (last_boundary)->cdr = Qnil; return list; } else return Qnil; } DEFUN ("primitive-undo", Fprimitive_undo, Sprimitive_undo, 2, 2, 0, "Undo N records from the front of the list LIST.\n\ Return what remains of the list.") (count, list) Lisp_Object count, list; { register int arg = XINT (count); #if 0 /* This is a good feature, but would make undo-start unable to do what is expected. */ Lisp_Object tem; /* If the head of the list is a boundary, it is the boundary preceding this command. Get rid of it and don't count it. */ tem = Fcar (list); if (NILP (tem)) list = Fcdr (list); #endif while (arg > 0) { while (1) { Lisp_Object next; next = Fcar (list); list = Fcdr (list); /* Exit inner loop at undo boundary. */ if (NILP (next)) break; /* Handle an integer by setting point to that value. */ if (XTYPE (next) == Lisp_Int) SET_PT (clip_to_bounds (BEGV, XINT (next), ZV)); else if (XTYPE (next) == Lisp_Cons) { Lisp_Object car, cdr; car = Fcar (next); cdr = Fcdr (next); if (EQ (car, Qt)) { /* Element (t high . low) records previous modtime. */ Lisp_Object high, low; int mod_time; high = Fcar (cdr); low = Fcdr (cdr); mod_time = (high << 16) + low; /* If this records an obsolete save (not matching the actual disk file) then don't mark unmodified. */ if (mod_time != current_buffer->modtime) break; #ifdef CLASH_DETECTION Funlock_buffer (); #endif /* CLASH_DETECTION */ Fset_buffer_modified_p (Qnil); } else if (XTYPE (car) == Lisp_Int && XTYPE (cdr) == Lisp_Int) { /* Element (BEG . END) means range was inserted. */ Lisp_Object end; if (XINT (car) < BEGV || XINT (cdr) > ZV) error ("Changes to be undone are outside visible portion of buffer"); /* Set point first thing, so that undoing this undo does not send point back to where it is now. */ Fgoto_char (car); Fdelete_region (car, cdr); } else if (XTYPE (car) == Lisp_String && XTYPE (cdr) == Lisp_Int) { /* Element (STRING . POS) means STRING was deleted. */ Lisp_Object membuf; int pos = XINT (cdr); membuf = car; if (pos < 0) { if (-pos < BEGV || -pos > ZV) error ("Changes to be undone are outside visible portion of buffer"); SET_PT (-pos); Finsert (1, &membuf); } else { if (pos < BEGV || pos > ZV) error ("Changes to be undone are outside visible portion of buffer"); SET_PT (pos); /* Insert before markers so that if the mark is currently on the boundary of this deletion, it ends up on the other side of the now-undeleted text from point. Since undo doesn't even keep track of the mark, this isn't really necessary, but it may lead to better behavior in certain situations. */ Finsert_before_markers (1, &membuf); SET_PT (pos); } } } } arg--; } return list; } syms_of_undo () { defsubr (&Sprimitive_undo); defsubr (&Sundo_boundary); }