Mercurial > emacs
view src/mocklisp.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 | a7f08730f7ae |
children | 96b55f2f19cd |
line wrap: on
line source
/* Mocklisp compatibility functions for GNU Emacs Lisp interpreter. Copyright (C) 1985, 1986 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. */ /* Compatibility for mocklisp */ #include "config.h" #include "lisp.h" #include "buffer.h" /* Now in lisp code ("macrocode...") * DEFUN ("ml-defun", Fml_defun, Sml_defun, 0, UNEVALLED, 0, * "Define mocklisp functions") * (args) * Lisp_Object args; * { * Lisp_Object elt; * * while (!NILP (args)) * { * elt = Fcar (args); * Ffset (Fcar (elt), Fcons (Qmocklisp, Fcdr (elt))); * args = Fcdr (args); * } * return Qnil; * } */ DEFUN ("ml-if", Fml_if, Sml_if, 0, UNEVALLED, 0, "Mocklisp version of `if'.") (args) Lisp_Object args; { register Lisp_Object val; struct gcpro gcpro1; GCPRO1 (args); while (!NILP (args)) { val = Feval (Fcar (args)); args = Fcdr (args); if (NILP (args)) break; if (XINT (val)) { val = Feval (Fcar (args)); break; } args = Fcdr (args); } UNGCPRO; return val; } /* Now converted to regular "while" by hairier conversion code. * DEFUN ("ml-while", Fml_while, Sml_while, 1, UNEVALLED, 0, "while for mocklisp programs") * (args) * Lisp_Object args; * { * Lisp_Object test, body, tem; * struct gcpro gcpro1, gcpro2; * * GCPRO2 (test, body); * * test = Fcar (args); * body = Fcdr (args); * while (tem = Feval (test), XINT (tem)) * { * QUIT; * Fprogn (body); * } * * UNGCPRO; * return Qnil; *} /* This is the main entry point to mocklisp execution. When eval sees a mocklisp function being called, it calls here with the unevaluated argument list */ Lisp_Object ml_apply (function, args) Lisp_Object function, args; { register int count = specpdl_ptr - specpdl; register Lisp_Object val; specbind (Qmocklisp_arguments, args); val = Fprogn (Fcdr (function)); return unbind_to (count, val); } DEFUN ("ml-nargs", Fml_nargs, Sml_nargs, 0, 0, 0, "Number of arguments to currently executing mocklisp function.") () { if (EQ (Vmocklisp_arguments, Qinteractive)) return make_number (0); return Flength (Vmocklisp_arguments); } DEFUN ("ml-arg", Fml_arg, Sml_arg, 1, 2, 0, "Argument number N to currently executing mocklisp function.") (n, prompt) Lisp_Object n, prompt; { if (EQ (Vmocklisp_arguments, Qinteractive)) return Fread_string (prompt, Qnil); CHECK_NUMBER (n, 0); XSETINT (n, XINT (n) - 1); /* Mocklisp likes to be origin-1 */ return Fcar (Fnthcdr (n, Vmocklisp_arguments)); } DEFUN ("ml-interactive", Fml_interactive, Sml_interactive, 0, 0, 0, "True if currently executing mocklisp function was called interactively.") () { return (EQ (Vmocklisp_arguments, Qinteractive)) ? Qt : Qnil; } DEFUN ("ml-provide-prefix-argument", Fml_provide_prefix_argument, Sml_provide_prefix_argument, 2, UNEVALLED, 0, "Evaluate second argument, using first argument as prefix arg value.") (args) Lisp_Object args; { struct gcpro gcpro1; GCPRO1 (args); Vcurrent_prefix_arg = Feval (Fcar (args)); UNGCPRO; return Feval (Fcar (Fcdr (args))); } DEFUN ("ml-prefix-argument-loop", Fml_prefix_argument_loop, Sml_prefix_argument_loop, 0, UNEVALLED, 0, "") (args) Lisp_Object args; { register Lisp_Object tem; register int i; struct gcpro gcpro1; /* Set `arg' in case we call a built-in function that looks at it. Still are a few. */ if (NILP (Vcurrent_prefix_arg)) i = 1; else { tem = Vcurrent_prefix_arg; if (CONSP (tem)) tem = Fcar (tem); if (EQ (tem, Qminus)) i = -1; else i = XINT (tem); } GCPRO1 (args); while (i-- > 0) Fprogn (args); UNGCPRO; return Qnil; } #if 0 /* Now in mlsupport.el */ DEFUN ("ml-substr", Fml_substr, Sml_substr, 3, 3, 0, "Return a substring of STRING, starting at index FROM and of length LENGTH.\n\ If either FROM or LENGTH is negative, the length of STRING is added to it.") (string, from, to) Lisp_Object string, from, to; { CHECK_STRING (string, 0); CHECK_NUMBER (from, 1); CHECK_NUMBER (to, 2); if (XINT (from) < 0) XSETINT (from, XINT (from) + XSTRING (string)->size); if (XINT (to) < 0) XSETINT (to, XINT (to) + XSTRING (string)->size); XSETINT (to, XINT (to) + XINT (from)); return Fsubstring (string, from, to); } #endif /* 0 */ DEFUN ("insert-string", Finsert_string, Sinsert_string, 0, MANY, 0, "Mocklisp-compatibility insert function.\n\ Like the function `insert' except that any argument that is a number\n\ is converted into a string by expressing it in decimal.") (nargs, args) int nargs; Lisp_Object *args; { register int argnum; register Lisp_Object tem; for (argnum = 0; argnum < nargs; argnum++) { tem = args[argnum]; retry: if (XTYPE (tem) == Lisp_Int) tem = Fint_to_string (tem); if (XTYPE (tem) == Lisp_String) insert1 (tem); else { tem = wrong_type_argument (Qstringp, tem); goto retry; } } return Qnil; } syms_of_mocklisp () { Qmocklisp = intern ("mocklisp"); staticpro (&Qmocklisp); /*defsubr (&Sml_defun);*/ defsubr (&Sml_if); /*defsubr (&Sml_while);*/ defsubr (&Sml_arg); defsubr (&Sml_nargs); defsubr (&Sml_interactive); defsubr (&Sml_provide_prefix_argument); defsubr (&Sml_prefix_argument_loop); /*defsubr (&Sml_substr);*/ defsubr (&Sinsert_string); }