X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/ba8810f92acb0df8645d79ae682c6ee0e6c7f7f2..eddd51c2807805e47aa70008234111b601e9a050:/src/macros.c diff --git a/src/macros.c b/src/macros.c index 71ecb86cf6..9054fb5bfe 100644 --- a/src/macros.c +++ b/src/macros.c @@ -1,5 +1,5 @@ /* Keyboard macros. - Copyright (C) 1985, 1986, 1992 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1993 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -15,38 +15,41 @@ 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. */ +the Free Software Foundation, Inc., 59 Temple Place - Suite 330, +Boston, MA 02111-1307, USA. */ -#include "config.h" +#include #include "lisp.h" #include "macros.h" #include "commands.h" #include "buffer.h" #include "window.h" +#include "keyboard.h" Lisp_Object Qexecute_kbd_macro; -int defining_kbd_macro; +/* Kbd macro currently being executed (a string or vector). */ -/* The start of storage for the current keyboard macro, and its size. */ -Lisp_Object *kbd_macro_buffer; -int kbd_macro_bufsize; +Lisp_Object Vexecuting_macro; -/* Where to store the next keystroke of the macro. */ -Lisp_Object *kbd_macro_ptr; +/* Index of next character to fetch from that macro. */ -/* 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; +int executing_macro_index; -Lisp_Object Vlast_kbd_macro; +/* Number of successful iterations so far + for innermost keyboard macro. + This is not bound at each level, + so after an error, it describes the innermost interrupted macro. */ -Lisp_Object Vexecuting_macro; -int executing_macro_index; +int executing_macro_iterations; + +/* This is the macro that was executing. + This is not bound at each level, + so after an error, it describes the innermost interrupted macro. + We use it only as a kind of flag, so no need to protect it. */ + +Lisp_Object executing_macro; Lisp_Object Fexecute_kbd_macro (); @@ -60,23 +63,37 @@ Non-nil arg (prefix arg) means append to last macro defined;\n\ (append) Lisp_Object append; { - if (defining_kbd_macro) + if (!NILP (current_kboard->defining_kbd_macro)) error ("Already defining kbd macro"); + if (!current_kboard->kbd_macro_buffer) + { + current_kboard->kbd_macro_bufsize = 30; + current_kboard->kbd_macro_buffer + = (Lisp_Object *)xmalloc (30 * sizeof (Lisp_Object)); + } update_mode_lines++; if (NILP (append)) { - kbd_macro_ptr = kbd_macro_buffer; - kbd_macro_end = kbd_macro_buffer; - message("Defining kbd macro..."); + if (current_kboard->kbd_macro_bufsize > 200) + { + current_kboard->kbd_macro_bufsize = 30; + current_kboard->kbd_macro_buffer + = (Lisp_Object *)xrealloc (current_kboard->kbd_macro_buffer, + 30 * sizeof (Lisp_Object)); + } + current_kboard->kbd_macro_ptr = current_kboard->kbd_macro_buffer; + current_kboard->kbd_macro_end = current_kboard->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)); + message ("Appending to kbd macro..."); + current_kboard->kbd_macro_ptr = current_kboard->kbd_macro_end; + Fexecute_kbd_macro (current_kboard->Vlast_kbd_macro, + make_number (1)); } - defining_kbd_macro++; + current_kboard->defining_kbd_macro = Qt; return Qnil; } @@ -91,33 +108,35 @@ under that name.\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; + (repeat) + Lisp_Object repeat; { - if (!defining_kbd_macro) - error ("Not defining kbd macro."); + if (NILP (current_kboard->defining_kbd_macro)) + error ("Not defining kbd macro."); - if (NILP (arg)) - XFASTINT (arg) = 1; + if (NILP (repeat)) + XSETFASTINT (repeat, 1); else - CHECK_NUMBER (arg, 0); + CHECK_NUMBER (repeat, 0); - if (defining_kbd_macro) + if (!NILP (current_kboard->defining_kbd_macro)) { - defining_kbd_macro = 0; + current_kboard->defining_kbd_macro = Qnil; update_mode_lines++; - Vlast_kbd_macro = make_event_array (kbd_macro_end - kbd_macro_buffer, - kbd_macro_buffer); - message("Keyboard macro defined"); + current_kboard->Vlast_kbd_macro + = make_event_array ((current_kboard->kbd_macro_end + - current_kboard->kbd_macro_buffer), + current_kboard->kbd_macro_buffer); + message ("Keyboard macro defined"); } - if (XFASTINT (arg) == 0) - Fexecute_kbd_macro (Vlast_kbd_macro, arg); + if (XFASTINT (repeat) == 0) + Fexecute_kbd_macro (current_kboard->Vlast_kbd_macro, repeat); else { - XSETINT (arg, XINT (arg)-1); - if (XINT (arg) > 0) - Fexecute_kbd_macro (Vlast_kbd_macro, arg); + XSETINT (repeat, XINT (repeat)-1); + if (XINT (repeat) > 0) + Fexecute_kbd_macro (current_kboard->Vlast_kbd_macro, repeat); } return Qnil; } @@ -127,19 +146,24 @@ An argument of zero means repeat until error.") store_kbd_macro_char (c) Lisp_Object c; { - if (defining_kbd_macro) + if (!NILP (current_kboard->defining_kbd_macro)) { - if (kbd_macro_ptr - kbd_macro_buffer == kbd_macro_bufsize) + if ((current_kboard->kbd_macro_ptr + - current_kboard->kbd_macro_buffer) + == current_kboard->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; + register Lisp_Object *new; + current_kboard->kbd_macro_bufsize *= 2; + new = (Lisp_Object *)xrealloc (current_kboard->kbd_macro_buffer, + (current_kboard->kbd_macro_bufsize + * sizeof (Lisp_Object))); + current_kboard->kbd_macro_ptr + += new - current_kboard->kbd_macro_buffer; + current_kboard->kbd_macro_end + += new - current_kboard->kbd_macro_buffer; + current_kboard->kbd_macro_buffer = new; } - *kbd_macro_ptr++ = c; + *current_kboard->kbd_macro_ptr++ = c; } } @@ -148,7 +172,25 @@ store_kbd_macro_char (c) finalize_kbd_macro_chars () { - kbd_macro_end = kbd_macro_ptr; + current_kboard->kbd_macro_end = current_kboard->kbd_macro_ptr; +} + +DEFUN ("cancel-kbd-macro-events", Fcancel_kbd_macro_events, + Scancel_kbd_macro_events, 0, 0, 0, + "Cancel the events added to a keyboard macro for this command.") + () +{ + current_kboard->kbd_macro_ptr = current_kboard->kbd_macro_end; +} + +DEFUN ("store-kbd-macro-event", Fstore_kbd_macro_event, + Sstore_kbd_macro_event, 1, 1, 0, + "Store EVENT into the keyboard macro being defined.") + (event) + Lisp_Object event; +{ + store_kbd_macro_char (event); + return Qnil; } DEFUN ("call-last-kbd-macro", Fcall_last_kbd_macro, Scall_last_kbd_macro, @@ -162,17 +204,28 @@ defining others, use \\[name-last-kbd-macro].") (prefix) Lisp_Object prefix; { - if (defining_kbd_macro) + /* Don't interfere with recognition of the previous command + from before this macro started. */ + this_command = current_kboard->Vlast_command; + + if (! NILP (current_kboard->defining_kbd_macro)) error ("Can't execute anonymous macro while defining one"); - else if (NILP (Vlast_kbd_macro)) + else if (NILP (current_kboard->Vlast_kbd_macro)) error ("No kbd macro has been defined"); else - Fexecute_kbd_macro (Vlast_kbd_macro, prefix); + Fexecute_kbd_macro (current_kboard->Vlast_kbd_macro, prefix); + + /* command_loop_1 sets this to nil before it returns; + get back the last command within the macro + so that it can be last, again, after we return. */ + this_command = current_kboard->Vlast_command; + 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; @@ -188,25 +241,27 @@ 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; + (macro, count) + Lisp_Object macro, count; { Lisp_Object final; Lisp_Object tem; - int count = specpdl_ptr - specpdl; + int pdlcount = specpdl_ptr - specpdl; int repeat = 1; struct gcpro gcpro1; + int success_count = 0; - if (!NILP (prefixarg)) - prefixarg = Fprefix_numeric_value (prefixarg), - repeat = XINT (prefixarg); + if (!NILP (count)) + { + count = Fprefix_numeric_value (count); + repeat = XINT (count); + } final = indirect_function (macro); - if (XTYPE (final) != Lisp_String - && XTYPE (final) != Lisp_Vector) + if (!STRINGP (final) && !VECTORP (final)) error ("Keyboard macros must be strings or vectors."); - XFASTINT (tem) = executing_macro_index; + XSETFASTINT (tem, executing_macro_index); tem = Fcons (Vexecuting_macro, tem); record_unwind_protect (pop_kbd_macro, tem); @@ -214,33 +269,33 @@ COUNT is a repeat count, or nil for once, or 0 for infinite loop.") do { Vexecuting_macro = final; + executing_macro = final; executing_macro_index = 0; + current_kboard->Vprefix_arg = Qnil; command_loop_1 (); + executing_macro_iterations = ++success_count; + QUIT; } - while (--repeat && (XTYPE (Vexecuting_macro) == Lisp_String - || XTYPE (Vexecuting_macro) == Lisp_Vector)); + while (--repeat + && (STRINGP (Vexecuting_macro) || VECTORP (Vexecuting_macro))); + + executing_macro = Qnil; UNGCPRO; - return unbind_to (count, Qnil); + return unbind_to (pdlcount, Qnil); } init_macros () { - Vlast_kbd_macro = Qnil; - defining_kbd_macro = 0; - Vexecuting_macro = Qnil; + executing_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); @@ -248,18 +303,20 @@ syms_of_macros () defsubr (&Send_kbd_macro); defsubr (&Scall_last_kbd_macro); defsubr (&Sexecute_kbd_macro); + defsubr (&Scancel_kbd_macro_events); + defsubr (&Sstore_kbd_macro_event); - DEFVAR_BOOL ("defining-kbd-macro", &defining_kbd_macro, + DEFVAR_KBOARD ("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."); + "Currently executing keyboard macro (string or vector); nil if none executing."); DEFVAR_LISP_NOPRO ("executing-kbd-macro", &Vexecuting_macro, - "Currently executing keyboard macro (a string); nil if none executing."); + "Currently executing keyboard macro (string or vector); nil if none executing."); - DEFVAR_LISP ("last-kbd-macro", &Vlast_kbd_macro, - "Last kbd macro defined, as a string; nil if none defined."); + DEFVAR_KBOARD ("last-kbd-macro", Vlast_kbd_macro, + "Last kbd macro defined, as a string or vector; nil if none defined."); } keys_of_macros ()