Mercurial > emacs
annotate src/macros.c @ 1720:4f5e3ac5d822
* 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.c (x_set_mouse_position): Clip mouse position to be within
frame.
* xterm.c: Adjust the first line of each page to have a reasonable
description. This makes pages-directory more useful.
* xterm.c (x_do_pending_expose): Declare this routine only if
HAVE_X11 is not #defined; X11 doesn't need it.
(XTread_socket): Protect call to x_do_pending_expose with `#ifdef
HAVE_X11'.
* xterm.c (notice_mouse_movement): Deleted; obsolete and unused.
Properly handle focus shift events, so the cursor is filled and
hollow at the appropriate times, even in titleless windows.
* xterm.c (x_focus_event_frame): New variable.
(XTread_socket): When we receive a FocusIn event that's not
NotifyPointer, record the frame in x_focus_event_frame. When we
receive a FocusOut event that's not NotifyPointer, clear it. When
we get a LeaveNotify event, don't take it seriously if we still
have focus.
* xterm.c (XTread_socket): Remove special code in EnterNotify case
to handle scrollbars and fake mouse motion events.
Change the meaning of focus redirection to make switching windows
work properly. Fredirect_frame_focus has the details.
* frame.h (focus_frame): Doc fix.
[not MULTI_FRAME] (FRAME_FOCUS_FRAME): Make this Qnil, which
indicates no focus redirection, instead of zero, which is
selected_frame.
* frame.c (make_frame): Initialize f->focus_frame to Qnil, rather
than making it point to frame itself.
(Fselect_frame): If changing the selected frame from FOO to BAR,
make all redirections to FOO shift to BAR as well. Doc fix.
(Fredirect_frame_focus): Doc fix. Accept nil as a valid
redirection, not just as a default for FRAME.
(Fframe_focus): Doc fix.
* keyboard.c (kbd_buffer_store_event, kbd_buffer_get_event): Deal
with focus redirections being nil.
* xterm.c (XTframe_rehighlight): Doc fix. Deal with focus
redirections being nil.
* xterm.c (x_error_quitter): Just abort, so we can look at the
core to see what happened.
It's a pain to remember that you can't assign to FRAME->visible.
Let's change all references to the `visible' member of struct
frame to use the accessor macros, and then write a setter for the
`visible' field that does the right thing.
* frame.h (FRAME_VISIBLE_P): Make this not an l-value.
(FRAME_SET_VISIBLE): New macro.
* frame.c (make_terminal_frame, Fdelete_frame): Use FRAME_SET_VISIBLE.
(Fframe_visible_p, Fvisible_frame_list): Use FRAME_VISIBLE_P and
FRAME_ICONIFIED_P.
* dispnew.c (Fredraw_display): Use the FRAME_VISIBLE_P and
FRAME_GARBAGED_P accessors.
* xdisp.c (redisplay): Use the FRAME_VISIBLE_P accessor.
* xfns.c (x_set_foreground_color, x_set_background_color,
x_set_cursor_color, x_set_border_pixel, x_set_icon_type): Use the
FRAME_VISIBLE_P accessor.
(Fx_create_frame): Use FRAME_SET_VISIBILITY.
* xterm.c (clear_cursor, x_display_bar_cursor,
x_display_box_cursor): Use FRAME_SET_VISIBILITY.
author | Jim Blandy <jimb@redhat.com> |
---|---|
date | Thu, 24 Dec 1992 06:21:14 +0000 |
parents | af0995b9b142 |
children | 4fe063d2aecf |
rev | line source |
---|---|
246 | 1 /* Keyboard macros. |
647 | 2 Copyright (C) 1985, 1986, 1992 Free Software Foundation, Inc. |
246 | 3 |
4 This file is part of GNU Emacs. | |
5 | |
6 GNU Emacs is free software; you can redistribute it and/or modify | |
7 it under the terms of the GNU General Public License as published by | |
647 | 8 the Free Software Foundation; either version 2, or (at your option) |
246 | 9 any later version. |
10 | |
11 GNU Emacs is distributed in the hope that it will be useful, | |
12 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
13 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
14 GNU General Public License for more details. | |
15 | |
16 You should have received a copy of the GNU General Public License | |
17 along with GNU Emacs; see the file COPYING. If not, write to | |
18 the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ | |
19 | |
20 | |
21 #include "config.h" | |
22 #include "lisp.h" | |
23 #include "macros.h" | |
24 #include "commands.h" | |
25 #include "buffer.h" | |
26 #include "window.h" | |
27 | |
28 Lisp_Object Qexecute_kbd_macro; | |
29 | |
30 int defining_kbd_macro; | |
31 | |
32 /* The start of storage for the current keyboard macro, and its size. */ | |
33 Lisp_Object *kbd_macro_buffer; | |
34 int kbd_macro_bufsize; | |
35 | |
36 /* Where to store the next keystroke of the macro. */ | |
37 Lisp_Object *kbd_macro_ptr; | |
38 | |
39 /* The finalized section of the macro starts at kbd_macro_buffer and | |
40 ends before this. This is not the same as kbd_macro_pointer, because | |
41 we advance this to kbd_macro_pointer when a key's command is complete. | |
42 This way, the keystrokes for "end-kbd-macro" are not included in the | |
43 macro. */ | |
44 Lisp_Object *kbd_macro_end; | |
45 | |
46 Lisp_Object Vlast_kbd_macro; | |
47 | |
48 Lisp_Object Vexecuting_macro; | |
49 int executing_macro_index; | |
50 | |
51 Lisp_Object Fexecute_kbd_macro (); | |
52 | |
53 DEFUN ("start-kbd-macro", Fstart_kbd_macro, Sstart_kbd_macro, 1, 1, "P", | |
54 "Record subsequent keyboard input, defining a keyboard macro.\n\ | |
55 The commands are recorded even as they are executed.\n\ | |
56 Use \\[end-kbd-macro] to finish recording and make the macro available.\n\ | |
57 Use \\[name-last-kbd-macro] to give it a permanent name.\n\ | |
58 Non-nil arg (prefix arg) means append to last macro defined;\n\ | |
59 This begins by re-executing that macro as if you typed it again.") | |
60 (append) | |
61 Lisp_Object append; | |
62 { | |
63 if (defining_kbd_macro) | |
64 error ("Already defining kbd macro"); | |
65 | |
66 update_mode_lines++; | |
485 | 67 if (NILP (append)) |
246 | 68 { |
69 kbd_macro_ptr = kbd_macro_buffer; | |
70 kbd_macro_end = kbd_macro_buffer; | |
71 message("Defining kbd macro..."); | |
72 } | |
73 else | |
74 { | |
75 message("Appending to kbd macro..."); | |
76 kbd_macro_ptr = kbd_macro_end; | |
77 Fexecute_kbd_macro (Vlast_kbd_macro, make_number (1)); | |
78 } | |
79 defining_kbd_macro++; | |
80 | |
81 return Qnil; | |
82 } | |
83 | |
84 DEFUN ("end-kbd-macro", Fend_kbd_macro, Send_kbd_macro, 0, 1, "p", | |
85 "Finish defining a keyboard macro.\n\ | |
86 The definition was started by \\[start-kbd-macro].\n\ | |
87 The macro is now available for use via \\[call-last-kbd-macro],\n\ | |
88 or it can be given a name with \\[name-last-kbd-macro] and then invoked\n\ | |
89 under that name.\n\ | |
90 \n\ | |
91 With numeric arg, repeat macro now that many times,\n\ | |
92 counting the definition just completed as the first repetition.\n\ | |
93 An argument of zero means repeat until error.") | |
94 (arg) | |
95 Lisp_Object arg; | |
96 { | |
97 if (!defining_kbd_macro) | |
98 error ("Not defining kbd macro."); | |
99 | |
485 | 100 if (NILP (arg)) |
246 | 101 XFASTINT (arg) = 1; |
102 else | |
103 CHECK_NUMBER (arg, 0); | |
104 | |
105 if (defining_kbd_macro) | |
106 { | |
107 defining_kbd_macro = 0; | |
108 update_mode_lines++; | |
434 | 109 Vlast_kbd_macro = make_array (kbd_macro_end - kbd_macro_buffer, |
110 kbd_macro_buffer); | |
246 | 111 message("Keyboard macro defined"); |
112 } | |
113 | |
114 if (XFASTINT (arg) == 0) | |
115 Fexecute_kbd_macro (Vlast_kbd_macro, arg); | |
116 else | |
117 { | |
1682
af0995b9b142
* macros.c (Fend_kbd_macro): Don't use XFASTINT to check if arg is
Jim Blandy <jimb@redhat.com>
parents:
647
diff
changeset
|
118 XSETINT (arg, XINT (arg)-1); |
af0995b9b142
* macros.c (Fend_kbd_macro): Don't use XFASTINT to check if arg is
Jim Blandy <jimb@redhat.com>
parents:
647
diff
changeset
|
119 if (XINT (arg) > 0) |
246 | 120 Fexecute_kbd_macro (Vlast_kbd_macro, arg); |
121 } | |
122 return Qnil; | |
123 } | |
124 | |
125 /* Store character c into kbd macro being defined */ | |
126 | |
127 store_kbd_macro_char (c) | |
128 Lisp_Object c; | |
129 { | |
130 if (defining_kbd_macro) | |
131 { | |
132 if (kbd_macro_ptr - kbd_macro_buffer == kbd_macro_bufsize) | |
133 { | |
134 register Lisp_Object *new | |
135 = (Lisp_Object *) xrealloc (kbd_macro_buffer, | |
136 ((kbd_macro_bufsize *= 2) | |
137 * sizeof (Lisp_Object))); | |
138 kbd_macro_ptr += new - kbd_macro_buffer; | |
139 kbd_macro_end += new - kbd_macro_buffer; | |
140 kbd_macro_buffer = new; | |
141 } | |
142 *kbd_macro_ptr++ = c; | |
143 } | |
144 } | |
145 | |
146 /* Declare that all chars stored so far in the kbd macro being defined | |
147 really belong to it. This is done in between editor commands. */ | |
148 | |
149 finalize_kbd_macro_chars () | |
150 { | |
151 kbd_macro_end = kbd_macro_ptr; | |
152 } | |
153 | |
154 DEFUN ("call-last-kbd-macro", Fcall_last_kbd_macro, Scall_last_kbd_macro, | |
155 0, 1, "p", | |
156 "Call the last keyboard macro that you defined with \\[start-kbd-macro].\n\ | |
157 \n\ | |
158 A prefix argument serves as a repeat count. Zero means repeat until error.\n\ | |
159 \n\ | |
160 To make a macro permanent so you can call it even after\n\ | |
161 defining others, use \\[name-last-kbd-macro].") | |
162 (prefix) | |
163 Lisp_Object prefix; | |
164 { | |
165 if (defining_kbd_macro) | |
166 error ("Can't execute anonymous macro while defining one"); | |
485 | 167 else if (NILP (Vlast_kbd_macro)) |
246 | 168 error ("No kbd macro has been defined"); |
169 else | |
170 Fexecute_kbd_macro (Vlast_kbd_macro, prefix); | |
171 return Qnil; | |
172 } | |
173 | |
174 /* Restore Vexecuting_macro and executing_macro_index - called when | |
175 the unwind-protect in Fexecute_kbd_macro gets invoked. */ | |
176 static Lisp_Object | |
177 pop_kbd_macro (info) | |
178 Lisp_Object info; | |
179 { | |
180 Lisp_Object tem; | |
181 Vexecuting_macro = Fcar (info); | |
182 tem = Fcdr (info); | |
183 executing_macro_index = XINT (tem); | |
184 return Qnil; | |
185 } | |
186 | |
187 DEFUN ("execute-kbd-macro", Fexecute_kbd_macro, Sexecute_kbd_macro, 1, 2, 0, | |
188 "Execute MACRO as string of editor command characters.\n\ | |
189 If MACRO is a symbol, its function definition is used.\n\ | |
190 COUNT is a repeat count, or nil for once, or 0 for infinite loop.") | |
191 (macro, prefixarg) | |
192 Lisp_Object macro, prefixarg; | |
193 { | |
194 Lisp_Object final; | |
195 Lisp_Object tem; | |
196 int count = specpdl_ptr - specpdl; | |
197 int repeat = 1; | |
198 struct gcpro gcpro1; | |
199 | |
485 | 200 if (!NILP (prefixarg)) |
246 | 201 prefixarg = Fprefix_numeric_value (prefixarg), |
202 repeat = XINT (prefixarg); | |
203 | |
647 | 204 final = indirect_function (macro); |
246 | 205 if (XTYPE (final) != Lisp_String |
206 && XTYPE (final) != Lisp_Vector) | |
207 error ("Keyboard macros must be strings or vectors."); | |
208 | |
209 XFASTINT (tem) = executing_macro_index; | |
210 tem = Fcons (Vexecuting_macro, tem); | |
211 record_unwind_protect (pop_kbd_macro, tem); | |
212 | |
213 GCPRO1 (final); | |
214 do | |
215 { | |
216 Vexecuting_macro = final; | |
217 executing_macro_index = 0; | |
218 | |
219 command_loop_1 (); | |
1682
af0995b9b142
* macros.c (Fend_kbd_macro): Don't use XFASTINT to check if arg is
Jim Blandy <jimb@redhat.com>
parents:
647
diff
changeset
|
220 |
af0995b9b142
* macros.c (Fend_kbd_macro): Don't use XFASTINT to check if arg is
Jim Blandy <jimb@redhat.com>
parents:
647
diff
changeset
|
221 QUIT; |
246 | 222 } |
223 while (--repeat && (XTYPE (Vexecuting_macro) == Lisp_String | |
224 || XTYPE (Vexecuting_macro) == Lisp_Vector)); | |
225 | |
226 UNGCPRO; | |
227 return unbind_to (count, Qnil); | |
228 } | |
229 | |
230 init_macros () | |
231 { | |
232 Vlast_kbd_macro = Qnil; | |
233 defining_kbd_macro = 0; | |
234 | |
235 Vexecuting_macro = Qnil; | |
236 } | |
237 | |
238 syms_of_macros () | |
239 { | |
240 kbd_macro_bufsize = 100; | |
241 kbd_macro_buffer = (Lisp_Object *) malloc (kbd_macro_bufsize | |
242 * sizeof (Lisp_Object)); | |
243 | |
244 Qexecute_kbd_macro = intern ("execute-kbd-macro"); | |
245 staticpro (&Qexecute_kbd_macro); | |
246 | |
247 defsubr (&Sstart_kbd_macro); | |
248 defsubr (&Send_kbd_macro); | |
249 defsubr (&Scall_last_kbd_macro); | |
250 defsubr (&Sexecute_kbd_macro); | |
251 | |
252 DEFVAR_BOOL ("defining-kbd-macro", &defining_kbd_macro, | |
253 "Non-nil while a keyboard macro is being defined. Don't set this!"); | |
254 | |
255 DEFVAR_LISP ("executing-macro", &Vexecuting_macro, | |
256 "Currently executing keyboard macro (a string); nil if none executing."); | |
257 | |
258 DEFVAR_LISP_NOPRO ("executing-kbd-macro", &Vexecuting_macro, | |
259 "Currently executing keyboard macro (a string); nil if none executing."); | |
260 | |
261 DEFVAR_LISP ("last-kbd-macro", &Vlast_kbd_macro, | |
262 "Last kbd macro defined, as a string; nil if none defined."); | |
263 } | |
264 | |
265 keys_of_macros () | |
266 { | |
267 initial_define_key (control_x_map, ('e'), "call-last-kbd-macro"); | |
268 initial_define_key (control_x_map, ('('), "start-kbd-macro"); | |
269 initial_define_key (control_x_map, (')'), "end-kbd-macro"); | |
270 } |