Mercurial > emacs
view src/marker.c @ 1783:8e7932110418
* window.c (window_internal_width): New function, which accounts
for scrollbars if present.
* lisp.h (window_internal_height, window_internal_width): Add
extern declarations for these.
* dispnew.c (direct_output_for_insert, direct_output_forward_char,
buffer_posn_from_coords): Use window_internal_width instead of
writing out its definition.
* indent.c (compute_motion): Doc fix; mention scrollbars and
window_internal_width.
(pos_tab_offset, Fvertical_motion): Use window_internal_width
instead of writing it out.
* window.c (Fpos_visible_in_window_p, Fwindow_width, Fscroll_left,
Fscroll_right): Same.
* xdisp.c (redisplay, try_window, try_window_id,
display_text_line): Same.
* termhooks.h (mouse_position_hook): Doc fix.
(set_vertical_scrollbar_hook): This doesn't return anything any
more, and doesn't take a struct scrollbar * argument any more.
(condemn_scrollbars_hook, redeem_scrollbar_hook,
judge_scrollbars_hook): Doc fixes.
* term.c (mouse_position_hook): Doc fix.
(set_vertical_scrollbar_hook): This doesn't return
anything any more. Doc fixes.
* keyboard.c (kbd_buffer_get_event): Receive the scrollbar's
window from *mouse_position_hook and pass it to
make_lispy_movement, instead of working with a pointer to a struct
scrollbar.
(make_lispy_event): We don't need a window_from_scrollbar function
anymore; we are given the window directly in *EVENT.
Unify the code which generates
text-area mouse clicks and scrollbar clicks; use the same code to
distinguish clicks from drags on the scrollbar as in the text area.
Distinguish clicks from drags by storing a copy of the lispy
position list returned as part of the event.
(button_down_location): Make this a lisp vector, rather than an
array of random structures.
(struct mouse_position): Remove this; it's been replaced by a lisp
list.
(make_lispy_movement): Accept the scrollbar's window as a
parameter, rather than the scrollbar itself.
If FRAME is zero, assume that the other arguments are garbage.
(syms_of_keyboard): No need to staticpro each window of
button_down_location now; just initialize and staticpro it.
* window.c (window_from_scrollbar): Function deleted; no longer
needed.
* xdisp.c (redisplay_window): Just pass the window to
set_vertical_scrollbar hook; don't pass the scrollbar object too.
* xterm.c (XTmouse_position): Don't return a pointer to the
scrollbar for scrollbar motion; instead, return the scrollbar's
window.
author | Jim Blandy <jimb@redhat.com> |
---|---|
date | Thu, 14 Jan 1993 15:17:11 +0000 |
parents | 3165b2697c78 |
children | 1fc792473491 |
line wrap: on
line source
/* Markers: examining, setting and killing. Copyright (C) 1985 Free Software Foundation, Inc. This file is part of GNU Emacs. GNU Emacs is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 1, or (at your option) any later version. GNU Emacs is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ #include "config.h" #include "lisp.h" #include "buffer.h" /* Operations on markers. */ DEFUN ("marker-buffer", Fmarker_buffer, Smarker_buffer, 1, 1, 0, "Return the buffer that MARKER points into, or nil if none.\n\ Returns nil if MARKER points into a dead buffer.") (marker) register Lisp_Object marker; { register Lisp_Object buf; CHECK_MARKER (marker, 0); if (XMARKER (marker)->buffer) { XSET (buf, Lisp_Buffer, XMARKER (marker)->buffer); /* Return marker's buffer only if it is not dead. */ if (!NILP (XBUFFER (buf)->name)) return buf; } return Qnil; } DEFUN ("marker-position", Fmarker_position, Smarker_position, 1, 1, 0, "Return the position MARKER points at, as a character number.") (marker) Lisp_Object marker; { register Lisp_Object pos; register int i; register struct buffer *buf; CHECK_MARKER (marker, 0); if (XMARKER (marker)->buffer) { buf = XMARKER (marker)->buffer; i = XMARKER (marker)->bufpos; if (i > BUF_GPT (buf) + BUF_GAP_SIZE (buf)) i -= BUF_GAP_SIZE (buf); else if (i > BUF_GPT (buf)) i = BUF_GPT (buf); if (i < BUF_BEG (buf) || i > BUF_Z (buf)) abort (); XFASTINT (pos) = i; return pos; } return Qnil; } DEFUN ("set-marker", Fset_marker, Sset_marker, 2, 3, 0, "Position MARKER before character number NUMBER in BUFFER.\n\ BUFFER defaults to the current buffer.\n\ If NUMBER is nil, makes marker point nowhere.\n\ Then it no longer slows down editing in any buffer.\n\ Returns MARKER.") (marker, pos, buffer) Lisp_Object marker, pos, buffer; { register int charno; register struct buffer *b; register struct Lisp_Marker *m; CHECK_MARKER (marker, 0); /* If position is nil or a marker that points nowhere, make this marker point nowhere. */ if (NILP (pos) || (XTYPE (pos) == Lisp_Marker && !XMARKER (pos)->buffer)) { unchain_marker (marker); return marker; } CHECK_NUMBER_COERCE_MARKER (pos, 1); if (NILP (buffer)) b = current_buffer; else { CHECK_BUFFER (buffer, 1); b = XBUFFER (buffer); /* If buffer is dead, set marker to point nowhere. */ if (EQ (b->name, Qnil)) { unchain_marker (marker); return marker; } } charno = XINT (pos); m = XMARKER (marker); if (charno < BUF_BEG (b)) charno = BUF_BEG (b); if (charno > BUF_Z (b)) charno = BUF_Z (b); if (charno > BUF_GPT (b)) charno += BUF_GAP_SIZE (b); m->bufpos = charno; if (m->buffer != b) { unchain_marker (marker); m->chain = b->markers; b->markers = marker; m->buffer = b; } return marker; } /* This version of Fset_marker won't let the position be outside the visible part. */ Lisp_Object set_marker_restricted (marker, pos, buffer) Lisp_Object marker, pos, buffer; { register int charno; register struct buffer *b; register struct Lisp_Marker *m; CHECK_MARKER (marker, 0); /* If position is nil or a marker that points nowhere, make this marker point nowhere. */ if (NILP (pos) || (XTYPE (pos) == Lisp_Marker && !XMARKER (pos)->buffer)) { unchain_marker (marker); return marker; } CHECK_NUMBER_COERCE_MARKER (pos, 1); if (NILP (buffer)) b = current_buffer; else { CHECK_BUFFER (buffer, 1); b = XBUFFER (buffer); /* If buffer is dead, set marker to point nowhere. */ if (EQ (b->name, Qnil)) { unchain_marker (marker); return marker; } } charno = XINT (pos); m = XMARKER (marker); if (charno < BUF_BEGV (b)) charno = BUF_BEGV (b); if (charno > BUF_ZV (b)) charno = BUF_ZV (b); if (charno > BUF_GPT (b)) charno += BUF_GAP_SIZE (b); m->bufpos = charno; if (m->buffer != b) { unchain_marker (marker); m->chain = b->markers; b->markers = marker; m->buffer = b; } return marker; } /* This is called during garbage collection, so we must be careful to ignore and preserve mark bits, including those in chain fields of markers. */ unchain_marker (marker) register Lisp_Object marker; { register Lisp_Object tail, prev, next; register int omark; register struct buffer *b; b = XMARKER (marker)->buffer; if (b == 0) return; if (EQ (b->name, Qnil)) abort (); tail = b->markers; prev = Qnil; while (XSYMBOL (tail) != XSYMBOL (Qnil)) { next = XMARKER (tail)->chain; XUNMARK (next); if (XMARKER (marker) == XMARKER (tail)) { if (NILP (prev)) { b->markers = next; /* Deleting first marker from the buffer's chain. Crash if new first marker in chain does not say it belongs to this buffer. */ if (!EQ (next, Qnil) && b != XMARKER (next)->buffer) abort (); } else { omark = XMARKBIT (XMARKER (prev)->chain); XMARKER (prev)->chain = next; XSETMARKBIT (XMARKER (prev)->chain, omark); } break; } else prev = tail; tail = next; } XMARKER (marker)->buffer = 0; } marker_position (marker) Lisp_Object marker; { register struct Lisp_Marker *m = XMARKER (marker); register struct buffer *buf = m->buffer; register int i = m->bufpos; if (!buf) error ("Marker does not point anywhere"); if (i > BUF_GPT (buf) + BUF_GAP_SIZE (buf)) i -= BUF_GAP_SIZE (buf); else if (i > BUF_GPT (buf)) i = BUF_GPT (buf); if (i < BUF_BEG (buf) || i > BUF_Z (buf)) abort (); return i; } DEFUN ("copy-marker", Fcopy_marker, Scopy_marker, 1, 1, 0, "Return a new marker pointing at the same place as MARKER.\n\ If argument is a number, makes a new marker pointing\n\ at that position in the current buffer.") (marker) register Lisp_Object marker; { register Lisp_Object new; while (1) { if (XTYPE (marker) == Lisp_Int || XTYPE (marker) == Lisp_Marker) { new = Fmake_marker (); Fset_marker (new, marker, ((XTYPE (marker) == Lisp_Marker) ? Fmarker_buffer (marker) : Qnil)); return new; } else marker = wrong_type_argument (Qinteger_or_marker_p, marker); } } syms_of_marker () { defsubr (&Smarker_position); defsubr (&Smarker_buffer); defsubr (&Sset_marker); defsubr (&Scopy_marker); }