Mercurial > emacs
view src/macros.c @ 1785:19755499df90
* 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.
* xdisp.c (display_string): Add new variable `f', to be W's
frame. Use it to set desired_glyphs, and to get the frame's width
to decide whether or not to draw vertical bars.
* xdisp.c (display_text_line): If we're using vertical scrollbars,
don't draw the vertical bars separating side-by-side windows.
(display_string): Same thing. Draw spaces to fill in the part of
the mode line that is under the scrollbar in partial-width
windows.
* xdisp.c (display_text_line): Use the usable internal width of
the window, as calculated above, as the limit on the length of the
overlay arrow's image, rather than using the window's width field,
less one.
* xdisp.c (redisplay): Call condemn_scrollbars_hook and
judge_scrollbars_hook whenever they are set, not just when the
frame has vertical scrollbars.
* 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.
* xdisp.c (echo_area_display): Move the assignment of f and the
check for visibility out of the "#ifdef MULTI_FRAME" clause; they
should work under any circumstances.
* xdisp.c (redisplay_window): If we're not going to redisplay this
window because it's a minibuffer whose contents have already been
updated, go ahead and jump to the scrollbar refreshing code
anyway; they still need to be updated. Initialize opoint, so it's
known to be valid when we jump. Calculate the scrollbar settings
properly for minibuffers, no matter what they are displaying at
the time.
* xdisp.c (redisplay_windows): Don't restore the current buffer
and its point before refreshing the scrollbars; we need the buffer
accurate.
author | Jim Blandy <jimb@redhat.com> |
---|---|
date | Thu, 14 Jan 1993 15:18:53 +0000 |
parents | af0995b9b142 |
children | 4fe063d2aecf |
line wrap: on
line source
/* Keyboard macros. Copyright (C) 1985, 1986, 1992 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 2, 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 "macros.h" #include "commands.h" #include "buffer.h" #include "window.h" Lisp_Object Qexecute_kbd_macro; int defining_kbd_macro; /* The start of storage for the current keyboard macro, and its size. */ Lisp_Object *kbd_macro_buffer; int kbd_macro_bufsize; /* Where to store the next keystroke of the macro. */ Lisp_Object *kbd_macro_ptr; /* The finalized section of the macro starts at kbd_macro_buffer and ends before this. This is not the same as kbd_macro_pointer, because we advance this to kbd_macro_pointer when a key's command is complete. This way, the keystrokes for "end-kbd-macro" are not included in the macro. */ Lisp_Object *kbd_macro_end; Lisp_Object Vlast_kbd_macro; Lisp_Object Vexecuting_macro; int executing_macro_index; Lisp_Object Fexecute_kbd_macro (); DEFUN ("start-kbd-macro", Fstart_kbd_macro, Sstart_kbd_macro, 1, 1, "P", "Record subsequent keyboard input, defining a keyboard macro.\n\ The commands are recorded even as they are executed.\n\ Use \\[end-kbd-macro] to finish recording and make the macro available.\n\ Use \\[name-last-kbd-macro] to give it a permanent name.\n\ Non-nil arg (prefix arg) means append to last macro defined;\n\ This begins by re-executing that macro as if you typed it again.") (append) Lisp_Object append; { if (defining_kbd_macro) error ("Already defining kbd macro"); update_mode_lines++; if (NILP (append)) { kbd_macro_ptr = kbd_macro_buffer; kbd_macro_end = kbd_macro_buffer; message("Defining kbd macro..."); } else { message("Appending to kbd macro..."); kbd_macro_ptr = kbd_macro_end; Fexecute_kbd_macro (Vlast_kbd_macro, make_number (1)); } defining_kbd_macro++; return Qnil; } DEFUN ("end-kbd-macro", Fend_kbd_macro, Send_kbd_macro, 0, 1, "p", "Finish defining a keyboard macro.\n\ The definition was started by \\[start-kbd-macro].\n\ The macro is now available for use via \\[call-last-kbd-macro],\n\ or it can be given a name with \\[name-last-kbd-macro] and then invoked\n\ under that name.\n\ \n\ With numeric arg, repeat macro now that many times,\n\ counting the definition just completed as the first repetition.\n\ An argument of zero means repeat until error.") (arg) Lisp_Object arg; { if (!defining_kbd_macro) error ("Not defining kbd macro."); if (NILP (arg)) XFASTINT (arg) = 1; else CHECK_NUMBER (arg, 0); if (defining_kbd_macro) { defining_kbd_macro = 0; update_mode_lines++; Vlast_kbd_macro = make_array (kbd_macro_end - kbd_macro_buffer, kbd_macro_buffer); message("Keyboard macro defined"); } if (XFASTINT (arg) == 0) Fexecute_kbd_macro (Vlast_kbd_macro, arg); else { XSETINT (arg, XINT (arg)-1); if (XINT (arg) > 0) Fexecute_kbd_macro (Vlast_kbd_macro, arg); } return Qnil; } /* Store character c into kbd macro being defined */ store_kbd_macro_char (c) Lisp_Object c; { if (defining_kbd_macro) { if (kbd_macro_ptr - kbd_macro_buffer == kbd_macro_bufsize) { register Lisp_Object *new = (Lisp_Object *) xrealloc (kbd_macro_buffer, ((kbd_macro_bufsize *= 2) * sizeof (Lisp_Object))); kbd_macro_ptr += new - kbd_macro_buffer; kbd_macro_end += new - kbd_macro_buffer; kbd_macro_buffer = new; } *kbd_macro_ptr++ = c; } } /* Declare that all chars stored so far in the kbd macro being defined really belong to it. This is done in between editor commands. */ finalize_kbd_macro_chars () { kbd_macro_end = kbd_macro_ptr; } DEFUN ("call-last-kbd-macro", Fcall_last_kbd_macro, Scall_last_kbd_macro, 0, 1, "p", "Call the last keyboard macro that you defined with \\[start-kbd-macro].\n\ \n\ A prefix argument serves as a repeat count. Zero means repeat until error.\n\ \n\ To make a macro permanent so you can call it even after\n\ defining others, use \\[name-last-kbd-macro].") (prefix) Lisp_Object prefix; { if (defining_kbd_macro) error ("Can't execute anonymous macro while defining one"); else if (NILP (Vlast_kbd_macro)) error ("No kbd macro has been defined"); else Fexecute_kbd_macro (Vlast_kbd_macro, prefix); return Qnil; } /* Restore Vexecuting_macro and executing_macro_index - called when the unwind-protect in Fexecute_kbd_macro gets invoked. */ static Lisp_Object pop_kbd_macro (info) Lisp_Object info; { Lisp_Object tem; Vexecuting_macro = Fcar (info); tem = Fcdr (info); executing_macro_index = XINT (tem); return Qnil; } DEFUN ("execute-kbd-macro", Fexecute_kbd_macro, Sexecute_kbd_macro, 1, 2, 0, "Execute MACRO as string of editor command characters.\n\ If MACRO is a symbol, its function definition is used.\n\ COUNT is a repeat count, or nil for once, or 0 for infinite loop.") (macro, prefixarg) Lisp_Object macro, prefixarg; { Lisp_Object final; Lisp_Object tem; int count = specpdl_ptr - specpdl; int repeat = 1; struct gcpro gcpro1; if (!NILP (prefixarg)) prefixarg = Fprefix_numeric_value (prefixarg), repeat = XINT (prefixarg); final = indirect_function (macro); if (XTYPE (final) != Lisp_String && XTYPE (final) != Lisp_Vector) error ("Keyboard macros must be strings or vectors."); XFASTINT (tem) = executing_macro_index; tem = Fcons (Vexecuting_macro, tem); record_unwind_protect (pop_kbd_macro, tem); GCPRO1 (final); do { Vexecuting_macro = final; executing_macro_index = 0; command_loop_1 (); QUIT; } while (--repeat && (XTYPE (Vexecuting_macro) == Lisp_String || XTYPE (Vexecuting_macro) == Lisp_Vector)); UNGCPRO; return unbind_to (count, Qnil); } init_macros () { Vlast_kbd_macro = Qnil; defining_kbd_macro = 0; Vexecuting_macro = Qnil; } syms_of_macros () { kbd_macro_bufsize = 100; kbd_macro_buffer = (Lisp_Object *) malloc (kbd_macro_bufsize * sizeof (Lisp_Object)); Qexecute_kbd_macro = intern ("execute-kbd-macro"); staticpro (&Qexecute_kbd_macro); defsubr (&Sstart_kbd_macro); defsubr (&Send_kbd_macro); defsubr (&Scall_last_kbd_macro); defsubr (&Sexecute_kbd_macro); DEFVAR_BOOL ("defining-kbd-macro", &defining_kbd_macro, "Non-nil while a keyboard macro is being defined. Don't set this!"); DEFVAR_LISP ("executing-macro", &Vexecuting_macro, "Currently executing keyboard macro (a string); nil if none executing."); DEFVAR_LISP_NOPRO ("executing-kbd-macro", &Vexecuting_macro, "Currently executing keyboard macro (a string); nil if none executing."); DEFVAR_LISP ("last-kbd-macro", &Vlast_kbd_macro, "Last kbd macro defined, as a string; nil if none defined."); } keys_of_macros () { initial_define_key (control_x_map, ('e'), "call-last-kbd-macro"); initial_define_key (control_x_map, ('('), "start-kbd-macro"); initial_define_key (control_x_map, (')'), "end-kbd-macro"); }