X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/e48f782ce41d744e80486b9356222d02ab4e0380..3c53a3cf83c218772d9bcfde4cd60c1face33e93:/src/frame.c diff --git a/src/frame.c b/src/frame.c index 3b6d549628..93c6838851 100644 --- a/src/frame.c +++ b/src/frame.c @@ -1,5 +1,6 @@ /* Generic frame functions. - Copyright (C) 1993, 1994, 1995, 1997 Free Software Foundation. + Copyright (C) 1993, 1994, 1995, 1997, 1999, 2000, 2001 + Free Software Foundation. This file is part of GNU Emacs. @@ -23,50 +24,31 @@ Boston, MA 02111-1307, USA. */ #include #include "lisp.h" #include "charset.h" +#ifdef HAVE_X_WINDOWS +#include "xterm.h" +#endif +#ifdef WINDOWSNT +#include "w32term.h" +#endif +#ifdef macintosh +#include "macterm.h" +#endif +#include "buffer.h" +/* These help us bind and responding to switch-frame events. */ +#include "commands.h" +#include "keyboard.h" +#include "frame.h" #ifdef HAVE_WINDOW_SYSTEM #include "fontset.h" #endif -#include "frame.h" #include "termhooks.h" +#include "dispextern.h" #include "window.h" #ifdef MSDOS #include "msdos.h" +#include "dosfns.h" #endif -/* Evaluate this expression to rebuild the section of syms_of_frame - that initializes and staticpros the symbols declared below. Note - that Emacs 18 has a bug that keeps C-x C-e from being able to - evaluate this expression. - -(progn - ;; Accumulate a list of the symbols we want to initialize from the - ;; declarations at the top of the file. - (goto-char (point-min)) - (search-forward "/\*&&& symbols declared here &&&*\/\n") - (let (symbol-list) - (while (looking-at "Lisp_Object \\(Q[a-z_]+\\)") - (setq symbol-list - (cons (buffer-substring (match-beginning 1) (match-end 1)) - symbol-list)) - (forward-line 1)) - (setq symbol-list (nreverse symbol-list)) - ;; Delete the section of syms_of_... where we initialize the symbols. - (search-forward "\n /\*&&& init symbols here &&&*\/\n") - (let ((start (point))) - (while (looking-at "^ Q") - (forward-line 2)) - (kill-region start (point))) - ;; Write a new symbol initialization section. - (while symbol-list - (insert (format " %s = intern (\"" (car symbol-list))) - (let ((start (point))) - (insert (substring (car symbol-list) 1)) - (subst-char-in-region start (point) ?_ ?-)) - (insert (format "\");\n staticpro (&%s);\n" (car symbol-list))) - (setq symbol-list (cdr symbol-list))))) - */ - -/*&&& symbols declared here &&&*/ Lisp_Object Qframep; Lisp_Object Qframe_live_p; Lisp_Object Qheight; @@ -77,72 +59,26 @@ Lisp_Object Qname; Lisp_Object Qonly; Lisp_Object Qunsplittable; Lisp_Object Qmenu_bar_lines; +Lisp_Object Qtool_bar_lines; Lisp_Object Qwidth; Lisp_Object Qx; Lisp_Object Qw32; Lisp_Object Qpc; +Lisp_Object Qmac; Lisp_Object Qvisible; Lisp_Object Qbuffer_predicate; Lisp_Object Qbuffer_list; Lisp_Object Qtitle; +Lisp_Object Qdisplay_type; +Lisp_Object Qbackground_mode; +Lisp_Object Qinhibit_default_face_x_resources; +Lisp_Object Qleft_fringe; +Lisp_Object Qright_fringe; +Lisp_Object Qtty_color_mode; Lisp_Object Vterminal_frame; Lisp_Object Vdefault_frame_alist; - -static void -syms_of_frame_1 () -{ - /*&&& init symbols here &&&*/ - Qframep = intern ("framep"); - staticpro (&Qframep); - Qframe_live_p = intern ("frame-live-p"); - staticpro (&Qframe_live_p); - Qheight = intern ("height"); - staticpro (&Qheight); - Qicon = intern ("icon"); - staticpro (&Qicon); - Qminibuffer = intern ("minibuffer"); - staticpro (&Qminibuffer); - Qmodeline = intern ("modeline"); - staticpro (&Qmodeline); - Qname = intern ("name"); - staticpro (&Qname); - Qonly = intern ("only"); - staticpro (&Qonly); - Qunsplittable = intern ("unsplittable"); - staticpro (&Qunsplittable); - Qmenu_bar_lines = intern ("menu-bar-lines"); - staticpro (&Qmenu_bar_lines); - Qwidth = intern ("width"); - staticpro (&Qwidth); - Qx = intern ("x"); - staticpro (&Qx); - Qw32 = intern ("w32"); - staticpro (&Qw32); - Qpc = intern ("pc"); - staticpro (&Qpc); - Qvisible = intern ("visible"); - staticpro (&Qvisible); - Qbuffer_predicate = intern ("buffer-predicate"); - staticpro (&Qbuffer_predicate); - Qbuffer_list = intern ("buffer-list"); - staticpro (&Qbuffer_list); - Qtitle = intern ("title"); - staticpro (&Qtitle); - - DEFVAR_LISP ("default-frame-alist", &Vdefault_frame_alist, - "Alist of default values for frame creation.\n\ -These may be set in your init file, like this:\n\ - (setq default-frame-alist '((width . 80) (height . 55) (menu-bar-lines . 1))\n\ -These override values given in window system configuration data,\n\ - including X Windows' defaults database.\n\ -For values specific to the first Emacs frame, see `initial-frame-alist'.\n\ -For values specific to the separate minibuffer frame, see\n\ - `minibuffer-frame-alist'.\n\ -The `menu-bar-lines' element of the list controls whether new frames\n\ - have menu bars; `menu-bar-mode' works by altering this element."); - Vdefault_frame_alist = Qnil; -} +Lisp_Object Vmouse_position_function; static void set_menu_bar_lines_1 (window, n) @@ -154,6 +90,11 @@ set_menu_bar_lines_1 (window, n) XSETFASTINT (w->last_modified, 0); XSETFASTINT (w->top, XFASTINT (w->top) + n); XSETFASTINT (w->height, XFASTINT (w->height) - n); + + if (INTEGERP (w->orig_top)) + XSETFASTINT (w->orig_top, XFASTINT (w->orig_top) + n); + if (INTEGERP (w->orig_height)) + XSETFASTINT (w->orig_height, XFASTINT (w->orig_height) - n); /* Handle just the top child in a vertical split. */ if (!NILP (w->vchild)) @@ -193,18 +134,15 @@ set_menu_bar_lines (f, value, oldval) FRAME_WINDOW_SIZES_CHANGED (f) = 1; FRAME_MENU_BAR_LINES (f) = nlines; set_menu_bar_lines_1 (f->root_window, nlines - olines); + adjust_glyphs (f); } } -#include "buffer.h" - -/* These help us bind and responding to switch-frame events. */ -#include "commands.h" -#include "keyboard.h" - Lisp_Object Vemacs_iconified; Lisp_Object Vframe_list; +struct x_output tty_display; + extern Lisp_Object Vminibuffer_list; extern Lisp_Object get_minibuffer (); extern Lisp_Object Fhandle_switch_frame (); @@ -212,12 +150,14 @@ extern Lisp_Object Fredirect_frame_focus (); extern Lisp_Object x_get_focus_frame (); DEFUN ("framep", Fframep, Sframep, 1, 1, 0, - "Return non-nil if OBJECT is a frame.\n\ -Value is t for a termcap frame (a character-only terminal),\n\ -`x' for an Emacs frame that is really an X window,\n\ -`pc' for a direct-write MS-DOS frame.\n\ -See also `frame-live-p'.") - (object) + doc: /* Return non-nil if OBJECT is a frame. +Value is t for a termcap frame (a character-only terminal), +`x' for an Emacs frame that is really an X window, +`w32' for an Emacs frame that is a window on MS-Windows display, +`mac' for an Emacs frame on a Macintosh display, +`pc' for a direct-write MS-DOS frame. +See also `frame-live-p'. */) + (object) Lisp_Object object; { if (!FRAMEP (object)) @@ -232,18 +172,20 @@ See also `frame-live-p'.") return Qw32; case output_msdos_raw: return Qpc; + case output_mac: + return Qmac; default: abort (); } } DEFUN ("frame-live-p", Fframe_live_p, Sframe_live_p, 1, 1, 0, - "Return non-nil if OBJECT is a frame which has not been deleted.\n\ -Value is nil if OBJECT is not a live frame. If object is a live\n\ -frame, the return value indicates what sort of output device it is\n\ -displayed on. Value is t for a termcap frame (a character-only\n\ -terminal), `x' for an Emacs frame being displayed in an X window.") - (object) + doc: /* Return non-nil if OBJECT is a frame which has not been deleted. +Value is nil if OBJECT is not a live frame. If object is a live +frame, the return value indicates what sort of output device it is +displayed on. See the documentation of `framep' for possible +return values. */) + (object) Lisp_Object object; { return ((FRAMEP (object) @@ -260,20 +202,16 @@ make_frame (mini_p) register struct frame *f; register Lisp_Object root_window; register Lisp_Object mini_window; - register struct Lisp_Vector *vec; - int i; - - vec = allocate_vectorlike ((EMACS_INT) VECSIZE (struct frame)); - for (i = 0; i < VECSIZE (struct frame); i++) - XSETFASTINT (vec->contents[i], 0); - vec->size = VECSIZE (struct frame); - f = (struct frame *)vec; + + f = allocate_frame (); XSETFRAME (frame, f); - f->cursor_x = 0; - f->cursor_y = 0; - f->current_glyphs = 0; - f->desired_glyphs = 0; + f->desired_matrix = 0; + f->current_matrix = 0; + f->desired_pool = 0; + f->current_pool = 0; + f->glyphs_initialized_p = 0; + f->decode_mode_spec_buffer = 0; f->visible = 0; f->async_visible = 0; f->output_data.nothing = 0; @@ -283,7 +221,7 @@ make_frame (mini_p) f->auto_raise = 0; f->auto_lower = 0; f->no_split = 0; - f->garbaged = 0; + f->garbaged = 1; f->has_minibuffer = mini_p; f->focus_frame = Qnil; f->explicit_name = 0; @@ -293,6 +231,7 @@ make_frame (mini_p) f->scroll_bars = Qnil; f->condemned_scroll_bars = Qnil; f->face_alist = Qnil; + f->face_cache = NULL; f->menu_bar_items = Qnil; f->menu_bar_vector = Qnil; f->menu_bar_items_used = 0; @@ -303,6 +242,11 @@ make_frame (mini_p) #endif f->namebuf = 0; f->title = Qnil; + f->menu_bar_window = Qnil; + f->tool_bar_window = Qnil; + f->tool_bar_items = Qnil; + f->desired_tool_bar_string = f->current_tool_bar_string = Qnil; + f->n_tool_bar_items = 0; root_window = make_window (); if (mini_p) @@ -349,19 +293,26 @@ make_frame (mini_p) /* If buf is a 'hidden' buffer (i.e. one whose name starts with a space), try to find another one. */ if (XSTRING (Fbuffer_name (buf))->data[0] == ' ') - buf = Fother_buffer (buf, Qnil); - Fset_window_buffer (root_window, buf); - + buf = Fother_buffer (buf, Qnil, Qnil); + + /* Use set_window_buffer, not Fset_window_buffer, and don't let + hooks be run by it. The reason is that the whole frame/window + arrangement is not yet fully intialized at this point. Windows + don't have the right size, glyph matrices aren't initialized + etc. Running Lisp functions at this point surely ends in a + SEGV. */ + set_window_buffer (root_window, buf, 0); f->buffer_list = Fcons (buf, Qnil); } if (mini_p) { XWINDOW (mini_window)->buffer = Qt; - Fset_window_buffer (mini_window, - (NILP (Vminibuffer_list) - ? get_minibuffer (0) - : Fcar (Vminibuffer_list))); + set_window_buffer (mini_window, + (NILP (Vminibuffer_list) + ? get_minibuffer (0) + : Fcar (Vminibuffer_list)), + 0); } f->root_window = root_window; @@ -370,13 +321,10 @@ make_frame (mini_p) a newly-created, never-selected window. */ XSETFASTINT (XWINDOW (f->selected_window)->use_time, ++window_select_count); -#ifdef HAVE_WINDOW_SYSTEM - f->fontset_data = alloc_fontset_data (); -#endif - return f; } +#ifdef HAVE_WINDOW_SYSTEM /* Make a frame using a separate minibuffer window on another frame. MINI_WINDOW is the minibuffer window to use. nil means use the default (the global minibuffer). */ @@ -391,7 +339,7 @@ make_frame_without_minibuffer (mini_window, kb, display) struct gcpro gcpro1; if (!NILP (mini_window)) - CHECK_LIVE_WINDOW (mini_window, 0); + CHECK_LIVE_WINDOW (mini_window); #ifdef MULTI_KBOARD if (!NILP (mini_window) @@ -470,6 +418,7 @@ make_minibuffer_frame () : Fcar (Vminibuffer_list))); return f; } +#endif /* HAVE_WINDOW_SYSTEM */ /* Construct a frame that refers to the terminal (stdin and stdout). */ @@ -509,67 +458,134 @@ make_terminal_frame () f->async_visible = 1; /* Don't let visible be cleared later. */ #ifdef MSDOS f->output_data.x = &the_only_x_display; - f->output_method = output_msdos_raw; - init_frame_faces (f); -#else /* not MSDOS */ - f->output_data.nothing = 1; /* Nonzero means frame isn't deleted. */ -#endif + if (!inhibit_window_system + && (!FRAMEP (selected_frame) || !FRAME_LIVE_P (XFRAME (selected_frame)) + || XFRAME (selected_frame)->output_method == output_msdos_raw)) + { + f->output_method = output_msdos_raw; + /* This initialization of foreground and background pixels is + only important for the initial frame created in temacs. If + we don't do that, we get black background and foreground in + the dumped Emacs because the_only_x_display is a static + variable, hence it is born all-zeroes, and zero is the code + for the black color. Other frames all inherit their pixels + from what's already in the_only_x_display. */ + if ((!FRAMEP (selected_frame) || !FRAME_LIVE_P (XFRAME (selected_frame))) + && f->output_data.x->background_pixel == 0 + && f->output_data.x->foreground_pixel == 0) + { + f->output_data.x->background_pixel = FACE_TTY_DEFAULT_BG_COLOR; + f->output_data.x->foreground_pixel = FACE_TTY_DEFAULT_FG_COLOR; + } + } + else + f->output_method = output_termcap; +#else +#ifdef WINDOWSNT + f->output_method = output_termcap; + f->output_data.x = &tty_display; +#else +#ifdef macintosh + make_mac_terminal_frame (f); +#else + f->output_data.x = &tty_display; +#endif /* macintosh */ +#endif /* WINDOWSNT */ +#endif /* MSDOS */ + + if (!noninteractive) + init_frame_faces (f); + return f; } DEFUN ("make-terminal-frame", Fmake_terminal_frame, Smake_terminal_frame, - 1, 1, 0, "Create an additional terminal frame.\n\ -You can create multiple frames on a text-only terminal in this way.\n\ -Only the selected terminal frame is actually displayed.\n\ -This function takes one argument, an alist specifying frame parameters.\n\ -In practice, generally you don't need to specify any parameters.\n\ -Note that changing the size of one terminal frame automatically affects all.") - (parms) + 1, 1, 0, + doc: /* Create an additional terminal frame. +You can create multiple frames on a text-only terminal in this way. +Only the selected terminal frame is actually displayed. +This function takes one argument, an alist specifying frame parameters. +In practice, generally you don't need to specify any parameters. +Note that changing the size of one terminal frame automatically affects all. */) + (parms) Lisp_Object parms; { struct frame *f; - Lisp_Object frame; + Lisp_Object frame, tem; + struct frame *sf = SELECTED_FRAME (); #ifdef MSDOS - if (selected_frame->output_method != output_msdos_raw) + if (sf->output_method != output_msdos_raw + && sf->output_method != output_termcap) abort (); +#else /* not MSDOS */ + +#ifdef macintosh + if (sf->output_method != output_mac) + error ("Not running on a Macintosh screen; cannot make a new Macintosh frame"); #else - if (selected_frame->output_method != output_termcap) + if (sf->output_method != output_termcap) error ("Not using an ASCII terminal now; cannot make a new ASCII frame"); #endif +#endif /* not MSDOS */ f = make_terminal_frame (); - change_frame_size (f, FRAME_HEIGHT (selected_frame), - FRAME_WIDTH (selected_frame), 0, 0); - remake_frame_glyphs (f); + + change_frame_size (f, FRAME_HEIGHT (sf), + FRAME_WIDTH (sf), 0, 0, 0); + adjust_glyphs (f); calculate_costs (f); XSETFRAME (frame, f); Fmodify_frame_parameters (frame, Vdefault_frame_alist); Fmodify_frame_parameters (frame, parms); - f->face_alist = selected_frame->face_alist; + + /* Make the frame face alist be frame-specific, so that each + frame could change its face definitions independently. */ + f->face_alist = Fcopy_alist (sf->face_alist); + /* Simple Fcopy_alist isn't enough, because we need the contents of + the vectors which are the CDRs of associations in face_alist to + be copied as well. */ + for (tem = f->face_alist; CONSP (tem); tem = XCDR (tem)) + XSETCDR (XCAR (tem), Fcopy_sequence (XCDR (XCAR (tem)))); return frame; } + +/* Perform the switch to frame FRAME. + + If FRAME is a switch-frame event `(switch-frame FRAME1)', use + FRAME1 as frame. + + If TRACK is non-zero and the frame that currently has the focus + redirects its focus to the selected frame, redirect that focused + frame's focus to FRAME instead. + + FOR_DELETION non-zero means that the selected frame is being + deleted, which includes the possibility that the frame's display + is dead. */ + Lisp_Object -do_switch_frame (frame, no_enter, track) - Lisp_Object frame, no_enter; - int track; +do_switch_frame (frame, track, for_deletion) + Lisp_Object frame; + int track, for_deletion; { + struct frame *sf = SELECTED_FRAME (); + /* If FRAME is a switch-frame event, extract the frame we should switch to. */ if (CONSP (frame) - && EQ (XCONS (frame)->car, Qswitch_frame) - && CONSP (XCONS (frame)->cdr)) - frame = XCONS (XCONS (frame)->cdr)->car; + && EQ (XCAR (frame), Qswitch_frame) + && CONSP (XCDR (frame))) + frame = XCAR (XCDR (frame)); /* This used to say CHECK_LIVE_FRAME, but apparently it's possible for a switch-frame event to arrive after a frame is no longer live, especially when deleting the initial frame during startup. */ - CHECK_FRAME (frame, 0); + CHECK_FRAME (frame); if (! FRAME_LIVE_P (XFRAME (frame))) return Qnil; - if (selected_frame == XFRAME (frame)) + if (sf == XFRAME (frame)) return frame; /* This is too greedy; it causes inappropriate focus redirection @@ -586,23 +602,23 @@ do_switch_frame (frame, no_enter, track) { Lisp_Object tail; - for (tail = Vframe_list; CONSP (tail); tail = XCONS (tail)->cdr) + for (tail = Vframe_list; CONSP (tail); tail = XCDR (tail)) { Lisp_Object focus; - if (!FRAMEP (XCONS (tail)->car)) + if (!FRAMEP (XCAR (tail))) abort (); - focus = FRAME_FOCUS_FRAME (XFRAME (XCONS (tail)->car)); + focus = FRAME_FOCUS_FRAME (XFRAME (XCAR (tail))); - if (FRAMEP (focus) && XFRAME (focus) == selected_frame) - Fredirect_frame_focus (XCONS (tail)->car, frame); + if (FRAMEP (focus) && XFRAME (focus) == SELECTED_FRAME ()) + Fredirect_frame_focus (XCAR (tail), frame); } } #else /* ! 0 */ /* Instead, apply it only to the frame we're pointing to. */ #ifdef HAVE_WINDOW_SYSTEM - if (track && (FRAME_WINDOW_P (XFRAME (frame)))) + if (track && FRAME_WINDOW_P (XFRAME (frame))) { Lisp_Object focus, xfocus; @@ -610,19 +626,39 @@ do_switch_frame (frame, no_enter, track) if (FRAMEP (xfocus)) { focus = FRAME_FOCUS_FRAME (XFRAME (xfocus)); - if (FRAMEP (focus) && XFRAME (focus) == selected_frame) + if (FRAMEP (focus) && XFRAME (focus) == SELECTED_FRAME ()) Fredirect_frame_focus (xfocus, frame); } } #endif /* HAVE_X_WINDOWS */ #endif /* ! 0 */ - selected_frame = XFRAME (frame); - if (! FRAME_MINIBUF_ONLY_P (selected_frame)) - last_nonminibuf_frame = selected_frame; + if (!for_deletion && FRAME_HAS_MINIBUF_P (sf)) + resize_mini_window (XWINDOW (FRAME_MINIBUF_WINDOW (sf)), 1); + + selected_frame = frame; + if (! FRAME_MINIBUF_ONLY_P (XFRAME (selected_frame))) + last_nonminibuf_frame = XFRAME (selected_frame); Fselect_window (XFRAME (frame)->selected_window); +#ifndef WINDOWSNT + /* Make sure to switch the tty color mode to that of the newly + selected frame. */ + sf = SELECTED_FRAME (); + if (FRAME_TERMCAP_P (sf)) + { + Lisp_Object color_mode_spec, color_mode; + + color_mode_spec = assq_no_quit (Qtty_color_mode, sf->param_alist); + if (CONSP (color_mode_spec)) + color_mode = XCDR (color_mode_spec); + else + color_mode = make_number (0); + set_tty_color_mode (sf, color_mode); + } +#endif /* !WINDOWSNT */ + /* We want to make sure that the next event generates a frame-switch event to the appropriate frame. This seems kludgy to me, but before you take it out, make sure that evaluating something like @@ -635,39 +671,39 @@ do_switch_frame (frame, no_enter, track) } DEFUN ("select-frame", Fselect_frame, Sselect_frame, 1, 2, "e", - "Select the frame FRAME.\n\ -Subsequent editing commands apply to its selected window.\n\ -The selection of FRAME lasts until the next time the user does\n\ -something to select a different frame, or until the next time this\n\ -function is called.") + doc: /* Select the frame FRAME. +Subsequent editing commands apply to its selected window. +The selection of FRAME lasts until the next time the user does +something to select a different frame, or until the next time this +function is called. */) (frame, no_enter) Lisp_Object frame, no_enter; { - return do_switch_frame (frame, no_enter, 1); + return do_switch_frame (frame, 1, 0); } DEFUN ("handle-switch-frame", Fhandle_switch_frame, Shandle_switch_frame, 1, 2, "e", - "Handle a switch-frame event EVENT.\n\ -Switch-frame events are usually bound to this function.\n\ -A switch-frame event tells Emacs that the window manager has requested\n\ -that the user's events be directed to the frame mentioned in the event.\n\ -This function selects the selected window of the frame of EVENT.\n\ -\n\ -If EVENT is frame object, handle it as if it were a switch-frame event\n\ -to that frame.") - (event, no_enter) + doc: /* Handle a switch-frame event EVENT. +Switch-frame events are usually bound to this function. +A switch-frame event tells Emacs that the window manager has requested +that the user's events be directed to the frame mentioned in the event. +This function selects the selected window of the frame of EVENT. + +If EVENT is frame object, handle it as if it were a switch-frame event +to that frame. */) + (event, no_enter) Lisp_Object event, no_enter; { /* Preserve prefix arg that the command loop just cleared. */ current_kboard->Vprefix_arg = Vcurrent_prefix_arg; call1 (Vrun_hooks, Qmouse_leave_buffer_hook); - return do_switch_frame (event, no_enter, 0); + return do_switch_frame (event, 0, 0); } DEFUN ("ignore-event", Fignore_event, Signore_event, 0, 0, "", - "Do nothing, but preserve any prefix argument already specified.\n\ -This is a suitable binding for iconify-frame and make-frame-visible.") + doc: /* Do nothing, but preserve any prefix argument already specified. +This is a suitable binding for iconify-frame and make-frame-visible. */) () { current_kboard->Vprefix_arg = Vcurrent_prefix_arg; @@ -675,36 +711,34 @@ This is a suitable binding for iconify-frame and make-frame-visible.") } DEFUN ("selected-frame", Fselected_frame, Sselected_frame, 0, 0, 0, - "Return the frame that is now selected.") - () + doc: /* Return the frame that is now selected. */) + () { - Lisp_Object tem; - XSETFRAME (tem, selected_frame); - return tem; + return selected_frame; } DEFUN ("window-frame", Fwindow_frame, Swindow_frame, 1, 1, 0, - "Return the frame object that window WINDOW is on.") - (window) + doc: /* Return the frame object that window WINDOW is on. */) + (window) Lisp_Object window; { - CHECK_LIVE_WINDOW (window, 0); + CHECK_LIVE_WINDOW (window); return XWINDOW (window)->frame; } DEFUN ("frame-first-window", Fframe_first_window, Sframe_first_window, 0, 1, 0, - "Returns the topmost, leftmost window of FRAME.\n\ -If omitted, FRAME defaults to the currently selected frame.") - (frame) + doc: /* Returns the topmost, leftmost window of FRAME. +If omitted, FRAME defaults to the currently selected frame. */) + (frame) Lisp_Object frame; { Lisp_Object w; if (NILP (frame)) - w = selected_frame->root_window; + w = SELECTED_FRAME ()->root_window; else { - CHECK_LIVE_FRAME (frame, 0); + CHECK_LIVE_FRAME (frame); w = XFRAME (frame)->root_window; } while (NILP (XWINDOW (w)->buffer)) @@ -721,60 +755,69 @@ If omitted, FRAME defaults to the currently selected frame.") DEFUN ("active-minibuffer-window", Factive_minibuffer_window, Sactive_minibuffer_window, 0, 0, 0, - "Return the currently active minibuffer window, or nil if none.") - () + doc: /* Return the currently active minibuffer window, or nil if none. */) + () { return minibuf_level ? minibuf_window : Qnil; } DEFUN ("frame-root-window", Fframe_root_window, Sframe_root_window, 0, 1, 0, - "Returns the root-window of FRAME.\n\ -If omitted, FRAME defaults to the currently selected frame.") - (frame) + doc: /* Returns the root-window of FRAME. +If omitted, FRAME defaults to the currently selected frame. */) + (frame) Lisp_Object frame; { + Lisp_Object window; + if (NILP (frame)) - XSETFRAME (frame, selected_frame); + window = SELECTED_FRAME ()->root_window; else - CHECK_LIVE_FRAME (frame, 0); - - return XFRAME (frame)->root_window; + { + CHECK_LIVE_FRAME (frame); + window = XFRAME (frame)->root_window; + } + + return window; } DEFUN ("frame-selected-window", Fframe_selected_window, Sframe_selected_window, 0, 1, 0, - "Return the selected window of frame object FRAME.\n\ -If omitted, FRAME defaults to the currently selected frame.") - (frame) + doc: /* Return the selected window of frame object FRAME. +If omitted, FRAME defaults to the currently selected frame. */) + (frame) Lisp_Object frame; { + Lisp_Object window; + if (NILP (frame)) - XSETFRAME (frame, selected_frame); + window = SELECTED_FRAME ()->selected_window; else - CHECK_LIVE_FRAME (frame, 0); + { + CHECK_LIVE_FRAME (frame); + window = XFRAME (frame)->selected_window; + } - return XFRAME (frame)->selected_window; + return window; } DEFUN ("set-frame-selected-window", Fset_frame_selected_window, Sset_frame_selected_window, 2, 2, 0, - "Set the selected window of frame object FRAME to WINDOW.\n\ -If FRAME is nil, the selected frame is used.\n\ -If FRAME is the selected frame, this makes WINDOW the selected window.") - (frame, window) + doc: /* Set the selected window of frame object FRAME to WINDOW. +If FRAME is nil, the selected frame is used. +If FRAME is the selected frame, this makes WINDOW the selected window. */) + (frame, window) Lisp_Object frame, window; { if (NILP (frame)) - XSETFRAME (frame, selected_frame); - else - CHECK_LIVE_FRAME (frame, 0); - - CHECK_LIVE_WINDOW (window, 1); + frame = selected_frame; + + CHECK_LIVE_FRAME (frame); + CHECK_LIVE_WINDOW (window); if (! EQ (frame, WINDOW_FRAME (XWINDOW (window)))) error ("In `set-frame-selected-window', WINDOW is not on FRAME"); - if (XFRAME (frame) == selected_frame) + if (EQ (frame, selected_frame)) return Fselect_window (window); return XFRAME (frame)->selected_window = window; @@ -782,10 +825,16 @@ If FRAME is the selected frame, this makes WINDOW the selected window.") DEFUN ("frame-list", Fframe_list, Sframe_list, 0, 0, 0, - "Return a list of all frames.") - () + doc: /* Return a list of all frames. */) + () { - return Fcopy_sequence (Vframe_list); + Lisp_Object frames; + frames = Fcopy_sequence (Vframe_list); +#ifdef HAVE_WINDOW_SYSTEM + if (FRAMEP (tip_frame)) + frames = Fdelq (tip_frame, frames); +#endif + return frames; } /* Return the next frame in the frame list after FRAME. @@ -810,14 +859,14 @@ next_frame (frame, minibuf) /* If this frame is dead, it won't be in Vframe_list, and we'll loop forever. Forestall that. */ - CHECK_LIVE_FRAME (frame, 0); + CHECK_LIVE_FRAME (frame); while (1) - for (tail = Vframe_list; CONSP (tail); tail = XCONS (tail)->cdr) + for (tail = Vframe_list; CONSP (tail); tail = XCDR (tail)) { Lisp_Object f; - f = XCONS (tail)->car; + f = XCAR (tail); if (passed && FRAME_KBOARD (XFRAME (f)) == FRAME_KBOARD (XFRAME (frame))) @@ -841,7 +890,7 @@ next_frame (frame, minibuf) if (FRAME_VISIBLE_P (XFRAME (f))) return f; } - else if (XFASTINT (minibuf) == 0) + else if (INTEGERP (minibuf) && XINT (minibuf) == 0) { FRAME_SAMPLE_VISIBILITY (XFRAME (f)); if (FRAME_VISIBLE_P (XFRAME (f)) @@ -851,11 +900,9 @@ next_frame (frame, minibuf) else if (WINDOWP (minibuf)) { if (EQ (FRAME_MINIBUF_WINDOW (XFRAME (f)), minibuf) - /* Check that F either is, or has forwarded its focus to, - MINIBUF's frame. */ - && (EQ (WINDOW_FRAME (XWINDOW (minibuf)), f) - || EQ (WINDOW_FRAME (XWINDOW (minibuf)), - FRAME_FOCUS_FRAME (XFRAME (f))))) + || EQ (WINDOW_FRAME (XWINDOW (minibuf)), f) + || EQ (WINDOW_FRAME (XWINDOW (minibuf)), + FRAME_FOCUS_FRAME (XFRAME (f)))) return f; } else @@ -888,11 +935,11 @@ prev_frame (frame, minibuf) abort (); prev = Qnil; - for (tail = Vframe_list; CONSP (tail); tail = XCONS (tail)->cdr) + for (tail = Vframe_list; CONSP (tail); tail = XCDR (tail)) { Lisp_Object f; - f = XCONS (tail)->car; + f = XCAR (tail); if (!FRAMEP (f)) abort (); @@ -911,11 +958,9 @@ prev_frame (frame, minibuf) else if (WINDOWP (minibuf)) { if (EQ (FRAME_MINIBUF_WINDOW (XFRAME (f)), minibuf) - /* Check that F either is, or has forwarded its focus to, - MINIBUF's frame. */ - && (EQ (WINDOW_FRAME (XWINDOW (minibuf)), f) - || EQ (WINDOW_FRAME (XWINDOW (minibuf)), - FRAME_FOCUS_FRAME (XFRAME (f))))) + || EQ (WINDOW_FRAME (XWINDOW (minibuf)), f) + || EQ (WINDOW_FRAME (XWINDOW (minibuf)), + FRAME_FOCUS_FRAME (XFRAME (f)))) prev = f; } else if (EQ (minibuf, Qvisible)) @@ -950,50 +995,43 @@ prev_frame (frame, minibuf) DEFUN ("next-frame", Fnext_frame, Snext_frame, 0, 2, 0, - "Return the next frame in the frame list after FRAME.\n\ -It considers only frames on the same terminal as FRAME.\n\ -By default, skip minibuffer-only frames.\n\ -If omitted, FRAME defaults to the selected frame.\n\ -If optional argument MINIFRAME is nil, exclude minibuffer-only frames.\n\ -If MINIFRAME is a window, include only its own frame\n\ -and any frame now using that window as the minibuffer.\n\ -If MINIFRAME is `visible', include all visible frames.\n\ -If MINIFRAME is 0, include all visible and iconified frames.\n\ -Otherwise, include all frames.") - (frame, miniframe) + doc: /* Return the next frame in the frame list after FRAME. +It considers only frames on the same terminal as FRAME. +By default, skip minibuffer-only frames. +If omitted, FRAME defaults to the selected frame. +If optional argument MINIFRAME is nil, exclude minibuffer-only frames. +If MINIFRAME is a window, include only its own frame +and any frame now using that window as the minibuffer. +If MINIFRAME is `visible', include all visible frames. +If MINIFRAME is 0, include all visible and iconified frames. +Otherwise, include all frames. */) + (frame, miniframe) Lisp_Object frame, miniframe; { - Lisp_Object tail; - if (NILP (frame)) - XSETFRAME (frame, selected_frame); - else - CHECK_LIVE_FRAME (frame, 0); - + frame = selected_frame; + + CHECK_LIVE_FRAME (frame); return next_frame (frame, miniframe); } DEFUN ("previous-frame", Fprevious_frame, Sprevious_frame, 0, 2, 0, - "Return the previous frame in the frame list before FRAME.\n\ -It considers only frames on the same terminal as FRAME.\n\ -By default, skip minibuffer-only frames.\n\ -If omitted, FRAME defaults to the selected frame.\n\ -If optional argument MINIFRAME is nil, exclude minibuffer-only frames.\n\ -If MINIFRAME is a window, include only its own frame\n\ -and any frame now using that window as the minibuffer.\n\ -If MINIFRAME is `visible', include all visible frames.\n\ -If MINIFRAME is 0, include all visible and iconified frames.\n\ -Otherwise, include all frames.") - (frame, miniframe) + doc: /* Return the previous frame in the frame list before FRAME. +It considers only frames on the same terminal as FRAME. +By default, skip minibuffer-only frames. +If omitted, FRAME defaults to the selected frame. +If optional argument MINIFRAME is nil, exclude minibuffer-only frames. +If MINIFRAME is a window, include only its own frame +and any frame now using that window as the minibuffer. +If MINIFRAME is `visible', include all visible frames. +If MINIFRAME is 0, include all visible and iconified frames. +Otherwise, include all frames. */) + (frame, miniframe) Lisp_Object frame, miniframe; { - Lisp_Object tail; - if (NILP (frame)) - XSETFRAME (frame, selected_frame); - else - CHECK_LIVE_FRAME (frame, 0); - + frame = selected_frame; + CHECK_LIVE_FRAME (frame); return prev_frame (frame, miniframe); } @@ -1007,18 +1045,18 @@ other_visible_frames (f) { /* We know the selected frame is visible, so if F is some other frame, it can't be the sole visible one. */ - if (f == selected_frame) + if (f == SELECTED_FRAME ()) { Lisp_Object frames; int count = 0; for (frames = Vframe_list; CONSP (frames); - frames = XCONS (frames)->cdr) + frames = XCDR (frames)) { Lisp_Object this; - this = XCONS (frames)->car; + this = XCAR (frames); /* Verify that the frame's window still exists and we can still talk to it. And note any recent change in visibility. */ @@ -1043,38 +1081,48 @@ other_visible_frames (f) } DEFUN ("delete-frame", Fdelete_frame, Sdelete_frame, 0, 2, "", - "Delete FRAME, permanently eliminating it from use.\n\ -If omitted, FRAME defaults to the selected frame.\n\ -A frame may not be deleted if its minibuffer is used by other frames.\n\ -Normally, you may not delete a frame if all other frames are invisible,\n\ -but if the second optional argument FORCE is non-nil, you may do so.") - (frame, force) + doc: /* Delete FRAME, permanently eliminating it from use. +If omitted, FRAME defaults to the selected frame. +A frame may not be deleted if its minibuffer is used by other frames. +Normally, you may not delete a frame if all other frames are invisible, +but if the second optional argument FORCE is non-nil, you may do so. + +This function runs `delete-frame-hook' before actually deleting the +frame. The hook is called with one argument FRAME. */) + (frame, force) Lisp_Object frame, force; { struct frame *f; + struct frame *sf = SELECTED_FRAME (); int minibuffer_selected; if (EQ (frame, Qnil)) { - f = selected_frame; + f = sf; XSETFRAME (frame, f); } else { - CHECK_FRAME (frame, 0); + CHECK_FRAME (frame); f = XFRAME (frame); } if (! FRAME_LIVE_P (f)) return Qnil; - if (NILP (force) && !other_visible_frames (f)) + if (NILP (force) && !other_visible_frames (f) +#ifdef macintosh + /* Terminal frame deleted before any other visible frames are + created. */ + && strcmp (XSTRING (f->name)->data, "F1") != 0 +#endif + ) error ("Attempt to delete the sole visible or iconified frame"); #if 0 /* This is a nice idea, but x_connection_closed needs to be able to delete the last frame, if it is gone. */ - if (NILP (XCONS (Vframe_list)->cdr)) + if (NILP (XCDR (Vframe_list))) error ("Attempt to delete the only frame"); #endif @@ -1086,10 +1134,10 @@ but if the second optional argument FORCE is non-nil, you may do so.") for (frames = Vframe_list; CONSP (frames); - frames = XCONS (frames)->cdr) + frames = XCDR (frames)) { Lisp_Object this; - this = XCONS (frames)->car; + this = XCAR (frames); if (! EQ (this, frame) && EQ (frame, @@ -1099,10 +1147,19 @@ but if the second optional argument FORCE is non-nil, you may do so.") } } + /* Run `delete-frame-hook'. */ + if (!NILP (Vrun_hooks)) + { + Lisp_Object args[2]; + args[0] = intern ("delete-frame-hook"); + args[1] = frame; + Frun_hook_with_args (2, args); + } + minibuffer_selected = EQ (minibuf_window, selected_window); /* Don't let the frame remain selected. */ - if (f == selected_frame) + if (f == sf) { Lisp_Object tail, frame1; @@ -1119,15 +1176,16 @@ but if the second optional argument FORCE is non-nil, you may do so.") } } - do_switch_frame (frame1, Qnil, 0); + do_switch_frame (frame1, 0, 1); + sf = SELECTED_FRAME (); } /* Don't allow minibuf_window to remain on a deleted frame. */ if (EQ (f->minibuffer_window, minibuf_window)) { - Fset_window_buffer (selected_frame->minibuffer_window, + Fset_window_buffer (sf->minibuffer_window, XWINDOW (minibuf_window)->buffer); - minibuf_window = selected_frame->minibuffer_window; + minibuf_window = sf->minibuffer_window; /* If the dying minibuffer window was selected, select the new one. */ @@ -1135,12 +1193,22 @@ but if the second optional argument FORCE is non-nil, you may do so.") Fselect_window (minibuf_window); } + /* Don't let echo_area_window to remain on a deleted frame. */ + if (EQ (f->minibuffer_window, echo_area_window)) + echo_area_window = sf->minibuffer_window; + /* Clear any X selections for this frame. */ #ifdef HAVE_X_WINDOWS if (FRAME_X_P (f)) x_clear_frame_selections (f); #endif + /* Free glyphs. + This function must be called before the window tree of the + frame is deleted because windows contain dynamically allocated + memory. */ + free_glyphs (f); + /* Mark all the windows that used to be on FRAME as deleted, and then remove the reference to them. */ delete_all_subwindows (XWINDOW (f->root_window)); @@ -1149,35 +1217,18 @@ but if the second optional argument FORCE is non-nil, you may do so.") Vframe_list = Fdelq (frame, Vframe_list); FRAME_SET_VISIBLE (f, 0); - if (echo_area_glyphs == FRAME_MESSAGE_BUF (f)) - { - echo_area_glyphs = 0; - previous_echo_glyphs = 0; - } - if (f->namebuf) - free (f->namebuf); - if (FRAME_CURRENT_GLYPHS (f)) - free_frame_glyphs (f, FRAME_CURRENT_GLYPHS (f)); - if (FRAME_DESIRED_GLYPHS (f)) - free_frame_glyphs (f, FRAME_DESIRED_GLYPHS (f)); - if (FRAME_TEMP_GLYPHS (f)) - free_frame_glyphs (f, FRAME_TEMP_GLYPHS (f)); + xfree (f->namebuf); if (FRAME_INSERT_COST (f)) - free (FRAME_INSERT_COST (f)); + xfree (FRAME_INSERT_COST (f)); if (FRAME_DELETEN_COST (f)) - free (FRAME_DELETEN_COST (f)); + xfree (FRAME_DELETEN_COST (f)); if (FRAME_INSERTN_COST (f)) - free (FRAME_INSERTN_COST (f)); + xfree (FRAME_INSERTN_COST (f)); if (FRAME_DELETE_COST (f)) - free (FRAME_DELETE_COST (f)); + xfree (FRAME_DELETE_COST (f)); if (FRAME_MESSAGE_BUF (f)) - free (FRAME_MESSAGE_BUF (f)); - -#ifdef HAVE_WINDOW_SYSTEM - /* Free all fontset data. */ - free_fontset_data (FRAME_FONTSET_DATA (f)); -#endif + xfree (FRAME_MESSAGE_BUF (f)); /* Since some events are handled at the interrupt level, we may get an event for f at any time; if we zero out the frame's display @@ -1203,9 +1254,9 @@ but if the second optional argument FORCE is non-nil, you may do so.") for (frames = Vframe_list; CONSP (frames); - frames = XCONS (frames)->cdr) + frames = XCDR (frames)) { - f = XFRAME (XCONS (frames)->car); + f = XFRAME (XCAR (frames)); if (!FRAME_MINIBUF_ONLY_P (f)) { last_nonminibuf_frame = f; @@ -1231,12 +1282,12 @@ but if the second optional argument FORCE is non-nil, you may do so.") for (frames = Vframe_list; CONSP (frames); - frames = XCONS (frames)->cdr) + frames = XCDR (frames)) { Lisp_Object this; struct frame *f1; - this = XCONS (frames)->car; + this = XCAR (frames); if (!FRAMEP (this)) abort (); f1 = XFRAME (this); @@ -1282,28 +1333,32 @@ but if the second optional argument FORCE is non-nil, you may do so.") /* Return mouse position in character cell units. */ DEFUN ("mouse-position", Fmouse_position, Smouse_position, 0, 0, 0, - "Return a list (FRAME X . Y) giving the current mouse frame and position.\n\ -The position is given in character cells, where (0, 0) is the\n\ -upper-left corner.\n\ -If Emacs is running on a mouseless terminal or hasn't been programmed\n\ -to read the mouse position, it returns the selected frame for FRAME\n\ -and nil for X and Y.") - () + doc: /* Return a list (FRAME X . Y) giving the current mouse frame and position. +The position is given in character cells, where (0, 0) is the +upper-left corner. +If Emacs is running on a mouseless terminal or hasn't been programmed +to read the mouse position, it returns the selected frame for FRAME +and nil for X and Y. +If `mouse-position-function' is non-nil, `mouse-position' calls it, +passing the normal return value to that function as an argument, +and returns whatever that function returns. */) + () { FRAME_PTR f; Lisp_Object lispy_dummy; enum scroll_bar_part party_dummy; - Lisp_Object x, y; + Lisp_Object x, y, retval; int col, row; unsigned long long_dummy; + struct gcpro gcpro1; - f = selected_frame; + f = SELECTED_FRAME (); x = y = Qnil; #ifdef HAVE_MOUSE /* It's okay for the hook to refrain from storing anything. */ if (mouse_position_hook) - (*mouse_position_hook) (&f, 0, + (*mouse_position_hook) (&f, -1, &lispy_dummy, &party_dummy, &x, &y, &long_dummy); @@ -1317,33 +1372,36 @@ and nil for X and Y.") } #endif XSETFRAME (lispy_dummy, f); - return Fcons (lispy_dummy, Fcons (x, y)); + retval = Fcons (lispy_dummy, Fcons (x, y)); + GCPRO1 (retval); + if (!NILP (Vmouse_position_function)) + retval = call1 (Vmouse_position_function, retval); + RETURN_UNGCPRO (retval); } DEFUN ("mouse-pixel-position", Fmouse_pixel_position, Smouse_pixel_position, 0, 0, 0, - "Return a list (FRAME X . Y) giving the current mouse frame and position.\n\ -The position is given in pixel units, where (0, 0) is the\n\ -upper-left corner.\n\ -If Emacs is running on a mouseless terminal or hasn't been programmed\n\ -to read the mouse position, it returns the selected frame for FRAME\n\ -and nil for X and Y.") - () + doc: /* Return a list (FRAME X . Y) giving the current mouse frame and position. +The position is given in pixel units, where (0, 0) is the +upper-left corner. +If Emacs is running on a mouseless terminal or hasn't been programmed +to read the mouse position, it returns the selected frame for FRAME +and nil for X and Y. */) + () { FRAME_PTR f; Lisp_Object lispy_dummy; enum scroll_bar_part party_dummy; Lisp_Object x, y; - int col, row; unsigned long long_dummy; - f = selected_frame; + f = SELECTED_FRAME (); x = y = Qnil; #ifdef HAVE_MOUSE /* It's okay for the hook to refrain from storing anything. */ if (mouse_position_hook) - (*mouse_position_hook) (&f, 0, + (*mouse_position_hook) (&f, -1, &lispy_dummy, &party_dummy, &x, &y, &long_dummy); @@ -1353,23 +1411,27 @@ and nil for X and Y.") } DEFUN ("set-mouse-position", Fset_mouse_position, Sset_mouse_position, 3, 3, 0, - "Move the mouse pointer to the center of character cell (X,Y) in FRAME.\n\ -Note, this is a no-op for an X frame that is not visible.\n\ -If you have just created a frame, you must wait for it to become visible\n\ -before calling this function on it, like this.\n\ - (while (not (frame-visible-p frame)) (sleep-for .5))") + doc: /* Move the mouse pointer to the center of character cell (X,Y) in FRAME. +Coordinates are relative to the frame, not a window, +so the coordinates of the top left character in the frame +may be nonzero due to left-hand scroll bars or the menu bar. + +This function is a no-op for an X frame that is not visible. +If you have just created a frame, you must wait for it to become visible +before calling this function on it, like this. + (while (not (frame-visible-p frame)) (sleep-for .5)) */) (frame, x, y) Lisp_Object frame, x, y; { - CHECK_LIVE_FRAME (frame, 0); - CHECK_NUMBER (x, 2); - CHECK_NUMBER (y, 1); + CHECK_LIVE_FRAME (frame); + CHECK_NUMBER (x); + CHECK_NUMBER (y); /* I think this should be done with a hook. */ #ifdef HAVE_WINDOW_SYSTEM if (FRAME_WINDOW_P (XFRAME (frame))) - /* Warping the mouse will cause enternotify and focus events. */ - x_set_mouse_position (XFRAME (frame), x, y); + /* Warping the mouse will cause enternotify and focus events. */ + x_set_mouse_position (XFRAME (frame), XINT (x), XINT (y)); #else #if defined (MSDOS) && defined (HAVE_MOUSE) if (FRAME_MSDOS_P (XFRAME (frame))) @@ -1385,23 +1447,23 @@ before calling this function on it, like this.\n\ DEFUN ("set-mouse-pixel-position", Fset_mouse_pixel_position, Sset_mouse_pixel_position, 3, 3, 0, - "Move the mouse pointer to pixel position (X,Y) in FRAME.\n\ -Note, this is a no-op for an X frame that is not visible.\n\ -If you have just created a frame, you must wait for it to become visible\n\ -before calling this function on it, like this.\n\ - (while (not (frame-visible-p frame)) (sleep-for .5))") + doc: /* Move the mouse pointer to pixel position (X,Y) in FRAME. +Note, this is a no-op for an X frame that is not visible. +If you have just created a frame, you must wait for it to become visible +before calling this function on it, like this. + (while (not (frame-visible-p frame)) (sleep-for .5)) */) (frame, x, y) Lisp_Object frame, x, y; { - CHECK_LIVE_FRAME (frame, 0); - CHECK_NUMBER (x, 2); - CHECK_NUMBER (y, 1); + CHECK_LIVE_FRAME (frame); + CHECK_NUMBER (x); + CHECK_NUMBER (y); /* I think this should be done with a hook. */ #ifdef HAVE_WINDOW_SYSTEM if (FRAME_WINDOW_P (XFRAME (frame))) - /* Warping the mouse will cause enternotify and focus events. */ - x_set_mouse_pixel_position (XFRAME (frame), x, y); + /* Warping the mouse will cause enternotify and focus events. */ + x_set_mouse_pixel_position (XFRAME (frame), XINT (x), XINT (y)); #else #if defined (MSDOS) && defined (HAVE_MOUSE) if (FRAME_MSDOS_P (XFRAME (frame))) @@ -1415,17 +1477,19 @@ before calling this function on it, like this.\n\ return Qnil; } +static void make_frame_visible_1 P_ ((Lisp_Object)); + DEFUN ("make-frame-visible", Fmake_frame_visible, Smake_frame_visible, 0, 1, "", - "Make the frame FRAME visible (assuming it is an X-window).\n\ -If omitted, FRAME defaults to the currently selected frame.") - (frame) + doc: /* Make the frame FRAME visible (assuming it is an X window). +If omitted, FRAME defaults to the currently selected frame. */) + (frame) Lisp_Object frame; { if (NILP (frame)) - XSETFRAME (frame, selected_frame); + frame = selected_frame; - CHECK_LIVE_FRAME (frame, 0); + CHECK_LIVE_FRAME (frame); /* I think this should be done with a hook. */ #ifdef HAVE_WINDOW_SYSTEM @@ -1436,41 +1500,67 @@ If omitted, FRAME defaults to the currently selected frame.") } #endif - /* Make menu bar update for the Buffers and Frams menus. */ + make_frame_visible_1 (XFRAME (frame)->root_window); + + /* Make menu bar update for the Buffers and Frames menus. */ windows_or_buffers_changed++; return frame; } +/* Update the display_time slot of the buffers shown in WINDOW + and all its descendents. */ + +static void +make_frame_visible_1 (window) + Lisp_Object window; +{ + struct window *w; + + for (;!NILP (window); window = w->next) + { + w = XWINDOW (window); + + if (!NILP (w->buffer)) + XBUFFER (w->buffer)->display_time = Fcurrent_time (); + + if (!NILP (w->vchild)) + make_frame_visible_1 (w->vchild); + if (!NILP (w->hchild)) + make_frame_visible_1 (w->hchild); + } +} + DEFUN ("make-frame-invisible", Fmake_frame_invisible, Smake_frame_invisible, 0, 2, "", - "Make the frame FRAME invisible (assuming it is an X-window).\n\ -If omitted, FRAME defaults to the currently selected frame.\n\ -Normally you may not make FRAME invisible if all other frames are invisible,\n\ -but if the second optional argument FORCE is non-nil, you may do so.") + doc: /* Make the frame FRAME invisible (assuming it is an X window). +If omitted, FRAME defaults to the currently selected frame. +Normally you may not make FRAME invisible if all other frames are invisible, +but if the second optional argument FORCE is non-nil, you may do so. */) (frame, force) Lisp_Object frame, force; { if (NILP (frame)) - XSETFRAME (frame, selected_frame); + frame = selected_frame; - CHECK_LIVE_FRAME (frame, 0); + CHECK_LIVE_FRAME (frame); if (NILP (force) && !other_visible_frames (XFRAME (frame))) error ("Attempt to make invisible the sole visible or iconified frame"); #if 0 /* This isn't logically necessary, and it can do GC. */ /* Don't let the frame remain selected. */ - if (XFRAME (frame) == selected_frame) - do_switch_frame (next_frame (frame, Qt), Qnil, 0) + if (EQ (frame, selected_frame)) + do_switch_frame (next_frame (frame, Qt), 0, 0) #endif /* Don't allow minibuf_window to remain on a deleted frame. */ if (EQ (XFRAME (frame)->minibuffer_window, minibuf_window)) { - Fset_window_buffer (selected_frame->minibuffer_window, + struct frame *sf = XFRAME (selected_frame); + Fset_window_buffer (sf->minibuffer_window, XWINDOW (minibuf_window)->buffer); - minibuf_window = selected_frame->minibuffer_window; + minibuf_window = sf->minibuffer_window; } /* I think this should be done with a hook. */ @@ -1479,7 +1569,7 @@ but if the second optional argument FORCE is non-nil, you may do so.") x_make_frame_invisible (XFRAME (frame)); #endif - /* Make menu bar update for the Buffers and Frams menus. */ + /* Make menu bar update for the Buffers and Frames menus. */ windows_or_buffers_changed++; return Qnil; @@ -1487,28 +1577,29 @@ but if the second optional argument FORCE is non-nil, you may do so.") DEFUN ("iconify-frame", Ficonify_frame, Siconify_frame, 0, 1, "", - "Make the frame FRAME into an icon.\n\ -If omitted, FRAME defaults to the currently selected frame.") + doc: /* Make the frame FRAME into an icon. +If omitted, FRAME defaults to the currently selected frame. */) (frame) Lisp_Object frame; { if (NILP (frame)) - XSETFRAME (frame, selected_frame); + frame = selected_frame; - CHECK_LIVE_FRAME (frame, 0); + CHECK_LIVE_FRAME (frame); #if 0 /* This isn't logically necessary, and it can do GC. */ /* Don't let the frame remain selected. */ - if (XFRAME (frame) == selected_frame) + if (EQ (frame, selected_frame)) Fhandle_switch_frame (next_frame (frame, Qt), Qnil); #endif /* Don't allow minibuf_window to remain on a deleted frame. */ if (EQ (XFRAME (frame)->minibuffer_window, minibuf_window)) { - Fset_window_buffer (selected_frame->minibuffer_window, + struct frame *sf = XFRAME (selected_frame); + Fset_window_buffer (sf->minibuffer_window, XWINDOW (minibuf_window)->buffer); - minibuf_window = selected_frame->minibuffer_window; + minibuf_window = sf->minibuffer_window; } /* I think this should be done with a hook. */ @@ -1517,7 +1608,7 @@ If omitted, FRAME defaults to the currently selected frame.") x_iconify_frame (XFRAME (frame)); #endif - /* Make menu bar update for the Buffers and Frams menus. */ + /* Make menu bar update for the Buffers and Frames menus. */ windows_or_buffers_changed++; return Qnil; @@ -1525,14 +1616,14 @@ If omitted, FRAME defaults to the currently selected frame.") DEFUN ("frame-visible-p", Fframe_visible_p, Sframe_visible_p, 1, 1, 0, - "Return t if FRAME is now \"visible\" (actually in use for display).\n\ -A frame that is not \"visible\" is not updated and, if it works through\n\ -a window system, it may not show at all.\n\ -Return the symbol `icon' if frame is visible only as an icon.") - (frame) + doc: /* Return t if FRAME is now \"visible\" (actually in use for display). +A frame that is not \"visible\" is not updated and, if it works through +a window system, it may not show at all. +Return the symbol `icon' if frame is visible only as an icon. */) + (frame) Lisp_Object frame; { - CHECK_LIVE_FRAME (frame, 0); + CHECK_LIVE_FRAME (frame); FRAME_SAMPLE_VISIBILITY (XFRAME (frame)); @@ -1545,7 +1636,7 @@ Return the symbol `icon' if frame is visible only as an icon.") DEFUN ("visible-frame-list", Fvisible_frame_list, Svisible_frame_list, 0, 0, 0, - "Return a list of all frames now \"visible\" (being updated).") + doc: /* Return a list of all frames now \"visible\" (being updated). */) () { Lisp_Object tail, frame; @@ -1553,9 +1644,9 @@ DEFUN ("visible-frame-list", Fvisible_frame_list, Svisible_frame_list, Lisp_Object value; value = Qnil; - for (tail = Vframe_list; CONSP (tail); tail = XCONS (tail)->cdr) + for (tail = Vframe_list; CONSP (tail); tail = XCDR (tail)) { - frame = XCONS (tail)->car; + frame = XCAR (tail); if (!FRAMEP (frame)) continue; f = XFRAME (frame); @@ -1567,18 +1658,18 @@ DEFUN ("visible-frame-list", Fvisible_frame_list, Svisible_frame_list, DEFUN ("raise-frame", Fraise_frame, Sraise_frame, 0, 1, "", - "Bring FRAME to the front, so it occludes any frames it overlaps.\n\ -If FRAME is invisible, make it visible.\n\ -If you don't specify a frame, the selected frame is used.\n\ -If Emacs is displaying on an ordinary terminal or some other device which\n\ -doesn't support multiple overlapping frames, this function does nothing.") - (frame) + doc: /* Bring FRAME to the front, so it occludes any frames it overlaps. +If FRAME is invisible, make it visible. +If you don't specify a frame, the selected frame is used. +If Emacs is displaying on an ordinary terminal or some other device which +doesn't support multiple overlapping frames, this function does nothing. */) + (frame) Lisp_Object frame; { if (NILP (frame)) - XSETFRAME (frame, selected_frame); + frame = selected_frame; - CHECK_LIVE_FRAME (frame, 0); + CHECK_LIVE_FRAME (frame); /* Do like the documentation says. */ Fmake_frame_visible (frame); @@ -1591,17 +1682,17 @@ doesn't support multiple overlapping frames, this function does nothing.") /* Should we have a corresponding function called Flower_Power? */ DEFUN ("lower-frame", Flower_frame, Slower_frame, 0, 1, "", - "Send FRAME to the back, so it is occluded by any frames that overlap it.\n\ -If you don't specify a frame, the selected frame is used.\n\ -If Emacs is displaying on an ordinary terminal or some other device which\n\ -doesn't support multiple overlapping frames, this function does nothing.") - (frame) + doc: /* Send FRAME to the back, so it is occluded by any frames that overlap it. +If you don't specify a frame, the selected frame is used. +If Emacs is displaying on an ordinary terminal or some other device which +doesn't support multiple overlapping frames, this function does nothing. */) + (frame) Lisp_Object frame; { if (NILP (frame)) - XSETFRAME (frame, selected_frame); + frame = selected_frame; - CHECK_LIVE_FRAME (frame, 0); + CHECK_LIVE_FRAME (frame); if (frame_raise_lower_hook) (*frame_raise_lower_hook) (XFRAME (frame), 0); @@ -1612,39 +1703,39 @@ doesn't support multiple overlapping frames, this function does nothing.") DEFUN ("redirect-frame-focus", Fredirect_frame_focus, Sredirect_frame_focus, 1, 2, 0, - "Arrange for keystrokes typed at FRAME to be sent to FOCUS-FRAME.\n\ -In other words, switch-frame events caused by events in FRAME will\n\ -request a switch to FOCUS-FRAME, and `last-event-frame' will be\n\ -FOCUS-FRAME after reading an event typed at FRAME.\n\ -\n\ -If FOCUS-FRAME is omitted or nil, any existing redirection is\n\ -cancelled, and the frame again receives its own keystrokes.\n\ -\n\ -Focus redirection is useful for temporarily redirecting keystrokes to\n\ -a surrogate minibuffer frame when a frame doesn't have its own\n\ -minibuffer window.\n\ -\n\ -A frame's focus redirection can be changed by select-frame. If frame\n\ -FOO is selected, and then a different frame BAR is selected, any\n\ -frames redirecting their focus to FOO are shifted to redirect their\n\ -focus to BAR. This allows focus redirection to work properly when the\n\ -user switches from one frame to another using `select-window'.\n\ -\n\ -This means that a frame whose focus is redirected to itself is treated\n\ -differently from a frame whose focus is redirected to nil; the former\n\ -is affected by select-frame, while the latter is not.\n\ -\n\ -The redirection lasts until `redirect-frame-focus' is called to change it.") - (frame, focus_frame) - Lisp_Object frame, focus_frame; + doc: /* Arrange for keystrokes typed at FRAME to be sent to FOCUS-FRAME. +In other words, switch-frame events caused by events in FRAME will +request a switch to FOCUS-FRAME, and `last-event-frame' will be +FOCUS-FRAME after reading an event typed at FRAME. + +If FOCUS-FRAME is omitted or nil, any existing redirection is +cancelled, and the frame again receives its own keystrokes. + +Focus redirection is useful for temporarily redirecting keystrokes to +a surrogate minibuffer frame when a frame doesn't have its own +minibuffer window. + +A frame's focus redirection can be changed by select-frame. If frame +FOO is selected, and then a different frame BAR is selected, any +frames redirecting their focus to FOO are shifted to redirect their +focus to BAR. This allows focus redirection to work properly when the +user switches from one frame to another using `select-window'. + +This means that a frame whose focus is redirected to itself is treated +differently from a frame whose focus is redirected to nil; the former +is affected by select-frame, while the latter is not. + +The redirection lasts until `redirect-frame-focus' is called to change it. */) + (frame, focus_frame) + Lisp_Object frame, focus_frame; { /* Note that we don't check for a live frame here. It's reasonable to redirect the focus of a frame you're about to delete, if you know what other frame should receive those keystrokes. */ - CHECK_FRAME (frame, 0); + CHECK_FRAME (frame); if (! NILP (focus_frame)) - CHECK_LIVE_FRAME (focus_frame, 1); + CHECK_LIVE_FRAME (focus_frame); XFRAME (frame)->focus_frame = focus_frame; @@ -1656,13 +1747,13 @@ The redirection lasts until `redirect-frame-focus' is called to change it.") DEFUN ("frame-focus", Fframe_focus, Sframe_focus, 1, 1, 0, - "Return the frame to which FRAME's keystrokes are currently being sent.\n\ -This returns nil if FRAME's focus is not redirected.\n\ -See `redirect-frame-focus'.") - (frame) - Lisp_Object frame; + doc: /* Return the frame to which FRAME's keystrokes are currently being sent. +This returns nil if FRAME's focus is not redirected. +See `redirect-frame-focus'. */) + (frame) + Lisp_Object frame; { - CHECK_LIVE_FRAME (frame, 0); + CHECK_LIVE_FRAME (frame); return FRAME_FOCUS_FRAME (XFRAME (frame)); } @@ -1687,26 +1778,28 @@ get_frame_param (frame, prop) /* Return the buffer-predicate of the selected frame. */ Lisp_Object -frame_buffer_predicate () +frame_buffer_predicate (frame) + Lisp_Object frame; { - return selected_frame->buffer_predicate; + return XFRAME (frame)->buffer_predicate; } /* Return the buffer-list of the selected frame. */ Lisp_Object -frame_buffer_list () +frame_buffer_list (frame) + Lisp_Object frame; { - return selected_frame->buffer_list; + return XFRAME (frame)->buffer_list; } /* Set the buffer-list of the selected frame. */ void -set_frame_buffer_list (list) - Lisp_Object list; +set_frame_buffer_list (frame, list) + Lisp_Object frame, list; { - selected_frame->buffer_list = list; + XFRAME (frame)->buffer_list = list; } /* Discard BUFFER from the buffer-list of each frame. */ @@ -1734,9 +1827,13 @@ frames_bury_buffer (buffer) FOR_EACH_FRAME (tail, frame) { - XFRAME (frame)->buffer_list - = nconc2 (Fdelq (buffer, XFRAME (frame)->buffer_list), - Fcons (buffer, Qnil)); + struct frame *f = XFRAME (frame); + Lisp_Object found; + + found = Fmemq (buffer, f->buffer_list); + if (!NILP (found)) + f->buffer_list = nconc2 (Fdelq (buffer, f->buffer_list), + Fcons (buffer, Qnil)); } } @@ -1757,38 +1854,131 @@ store_in_alist (alistptr, prop, val) Fsetcdr (tem, val); } +static int +frame_name_fnn_p (str, len) + char *str; + int len; +{ + if (len > 1 && str[0] == 'F') + { + char *end_ptr; + + strtol (str + 1, &end_ptr, 10); + + if (end_ptr == str + len) + return 1; + } + return 0; +} + +/* Set the name of the terminal frame. Also used by MSDOS frames. + Modeled after x_set_name which is used for WINDOW frames. */ + +void +set_term_frame_name (f, name) + struct frame *f; + Lisp_Object name; +{ + f->explicit_name = ! NILP (name); + + /* If NAME is nil, set the name to F. */ + if (NILP (name)) + { + char namebuf[20]; + + /* Check for no change needed in this very common case + before we do any consing. */ + if (frame_name_fnn_p (XSTRING (f->name)->data, + STRING_BYTES (XSTRING (f->name)))) + return; + + terminal_frame_count++; + sprintf (namebuf, "F%d", terminal_frame_count); + name = build_string (namebuf); + } + else + { + CHECK_STRING (name); + + /* Don't change the name if it's already NAME. */ + if (! NILP (Fstring_equal (name, f->name))) + return; + + /* Don't allow the user to set the frame name to F, so it + doesn't clash with the names we generate for terminal frames. */ + if (frame_name_fnn_p (XSTRING (name)->data, STRING_BYTES (XSTRING (name)))) + error ("Frame names of the form F are usurped by Emacs"); + } + + f->name = name; + update_mode_lines = 1; +} + void store_frame_param (f, prop, val) struct frame *f; Lisp_Object prop, val; { - register Lisp_Object tem; + register Lisp_Object old_alist_elt; + /* The buffer-alist parameter is stored in a special place and is + not in the alist. */ if (EQ (prop, Qbuffer_list)) { f->buffer_list = val; return; } - tem = Fassq (prop, f->param_alist); - if (EQ (tem, Qnil)) + /* If PROP is a symbol which is supposed to have frame-local values, + and it is set up based on this frame, switch to the global + binding. That way, we can create or alter the frame-local binding + without messing up the symbol's status. */ + if (SYMBOLP (prop)) + { + Lisp_Object valcontents; + valcontents = SYMBOL_VALUE (prop); + if ((BUFFER_LOCAL_VALUEP (valcontents) + || SOME_BUFFER_LOCAL_VALUEP (valcontents)) + && XBUFFER_LOCAL_VALUE (valcontents)->check_frame + && XFRAME (XBUFFER_LOCAL_VALUE (valcontents)->frame) == f) + swap_in_global_binding (prop); + } + +#ifndef WINDOWSNT + /* The tty color mode needs to be set before the frame's parameter + alist is updated with the new value, because set_tty_color_mode + wants to look at the old mode. */ + if (FRAME_TERMCAP_P (f) && EQ (prop, Qtty_color_mode)) + set_tty_color_mode (f, val); +#endif + + /* Update the frame parameter alist. */ + old_alist_elt = Fassq (prop, f->param_alist); + if (EQ (old_alist_elt, Qnil)) f->param_alist = Fcons (Fcons (prop, val), f->param_alist); else - Fsetcdr (tem, val); + Fsetcdr (old_alist_elt, val); + /* Update some other special parameters in their special places + in addition to the alist. */ + if (EQ (prop, Qbuffer_predicate)) f->buffer_predicate = val; if (! FRAME_WINDOW_P (f)) - if (EQ (prop, Qmenu_bar_lines)) - set_menu_bar_lines (f, val, make_number (FRAME_MENU_BAR_LINES (f))); + { + if (EQ (prop, Qmenu_bar_lines)) + set_menu_bar_lines (f, val, make_number (FRAME_MENU_BAR_LINES (f))); + else if (EQ (prop, Qname)) + set_term_frame_name (f, val); + } if (EQ (prop, Qminibuffer) && WINDOWP (val)) { if (! MINI_WINDOW_P (XWINDOW (val))) error ("Surrogate minibuffer windows must be minibuffer windows."); - if (FRAME_HAS_MINIBUF_P (f) || FRAME_MINIBUF_ONLY_P (f) + if ((FRAME_HAS_MINIBUF_P (f) || FRAME_MINIBUF_ONLY_P (f)) && !EQ (val, f->minibuffer_window)) error ("Can't change the surrogate minibuffer of a frame with its own minibuffer"); @@ -1798,45 +1988,73 @@ store_frame_param (f, prop, val) } DEFUN ("frame-parameters", Fframe_parameters, Sframe_parameters, 0, 1, 0, - "Return the parameters-alist of frame FRAME.\n\ -It is a list of elements of the form (PARM . VALUE), where PARM is a symbol.\n\ -The meaningful PARMs depend on the kind of frame.\n\ -If FRAME is omitted, return information on the currently selected frame.") - (frame) + doc: /* Return the parameters-alist of frame FRAME. +It is a list of elements of the form (PARM . VALUE), where PARM is a symbol. +The meaningful PARMs depend on the kind of frame. +If FRAME is omitted, return information on the currently selected frame. */) + (frame) Lisp_Object frame; { Lisp_Object alist; FRAME_PTR f; int height, width; + struct gcpro gcpro1; - if (EQ (frame, Qnil)) - f = selected_frame; - else - { - CHECK_FRAME (frame, 0); - f = XFRAME (frame); - } + if (NILP (frame)) + frame = selected_frame; + + CHECK_FRAME (frame); + f = XFRAME (frame); if (!FRAME_LIVE_P (f)) return Qnil; alist = Fcopy_alist (f->param_alist); -#ifdef MSDOS - if (FRAME_MSDOS_P (f)) + GCPRO1 (alist); + + if (!FRAME_WINDOW_P (f)) { - static char *colornames[16] = + int fg = FRAME_FOREGROUND_PIXEL (f); + int bg = FRAME_BACKGROUND_PIXEL (f); + Lisp_Object elt; + + /* If the frame's parameter alist says the colors are + unspecified and reversed, take the frame's background pixel + for foreground and vice versa. */ + elt = Fassq (Qforeground_color, alist); + if (!NILP (elt) && CONSP (elt) && STRINGP (XCDR (elt))) { - "black", "blue", "green", "cyan", "red", "magenta", "brown", - "lightgray", "darkgray", "lightblue", "lightgreen", "lightcyan", - "lightred", "lightmagenta", "yellow", "white" - }; - store_in_alist (&alist, intern ("foreground-color"), - build_string (colornames[FRAME_FOREGROUND_PIXEL (f)])); - store_in_alist (&alist, intern ("background-color"), - build_string (colornames[FRAME_BACKGROUND_PIXEL (f)])); + if (strncmp (XSTRING (XCDR (elt))->data, + unspecified_bg, + XSTRING (XCDR (elt))->size) == 0) + store_in_alist (&alist, Qforeground_color, tty_color_name (f, bg)); + else if (strncmp (XSTRING (XCDR (elt))->data, + unspecified_fg, + XSTRING (XCDR (elt))->size) == 0) + store_in_alist (&alist, Qforeground_color, tty_color_name (f, fg)); + } + else + store_in_alist (&alist, Qforeground_color, tty_color_name (f, fg)); + elt = Fassq (Qbackground_color, alist); + if (!NILP (elt) && CONSP (elt) && STRINGP (XCDR (elt))) + { + if (strncmp (XSTRING (XCDR (elt))->data, + unspecified_fg, + XSTRING (XCDR (elt))->size) == 0) + store_in_alist (&alist, Qbackground_color, tty_color_name (f, fg)); + else if (strncmp (XSTRING (XCDR (elt))->data, + unspecified_bg, + XSTRING (XCDR (elt))->size) == 0) + store_in_alist (&alist, Qbackground_color, tty_color_name (f, bg)); + } + else + store_in_alist (&alist, Qbackground_color, tty_color_name (f, bg)); + store_in_alist (&alist, intern ("font"), + build_string (FRAME_MSDOS_P (f) + ? "ms-dos" + : FRAME_W32_P (f) ? "w32term" + :"tty")); } - store_in_alist (&alist, intern ("font"), build_string ("default")); -#endif store_in_alist (&alist, Qname, f->name); height = (FRAME_NEW_HEIGHT (f) ? FRAME_NEW_HEIGHT (f) : FRAME_HEIGHT (f)); store_in_alist (&alist, Qheight, make_number (height)); @@ -1848,7 +2066,7 @@ If FRAME is omitted, return information on the currently selected frame.") : FRAME_MINIBUF_ONLY_P (f) ? Qonly : FRAME_MINIBUF_WINDOW (f))); store_in_alist (&alist, Qunsplittable, (FRAME_NO_SPLIT_P (f) ? Qt : Qnil)); - store_in_alist (&alist, Qbuffer_list, frame_buffer_list ()); + store_in_alist (&alist, Qbuffer_list, frame_buffer_list (frame)); /* I think this should be done with a hook. */ #ifdef HAVE_WINDOW_SYSTEM @@ -1862,30 +2080,121 @@ If FRAME is omitted, return information on the currently selected frame.") XSETFASTINT (lines, FRAME_MENU_BAR_LINES (f)); store_in_alist (&alist, Qmenu_bar_lines, lines); } + + UNGCPRO; return alist; } + +DEFUN ("frame-parameter", Fframe_parameter, Sframe_parameter, 2, 2, 0, + doc: /* Return FRAME's value for parameter PARAMETER. +If FRAME is nil, describe the currently selected frame. */) + (frame, parameter) + Lisp_Object frame, parameter; +{ + struct frame *f; + Lisp_Object value; + + if (NILP (frame)) + frame = selected_frame; + else + CHECK_FRAME (frame); + CHECK_SYMBOL (parameter); + + f = XFRAME (frame); + value = Qnil; + + if (FRAME_LIVE_P (f)) + { + /* Avoid consing in frequent cases. */ + if (EQ (parameter, Qname)) + value = f->name; +#ifdef HAVE_X_WINDOWS + else if (EQ (parameter, Qdisplay) && FRAME_X_P (f)) + value = XCAR (FRAME_X_DISPLAY_INFO (f)->name_list_element); +#endif /* HAVE_X_WINDOWS */ + else if (EQ (parameter, Qbackground_color) + || EQ (parameter, Qforeground_color)) + { + value = Fassq (parameter, f->param_alist); + if (CONSP (value)) + { + value = XCDR (value); + /* Fframe_parameters puts the actual fg/bg color names, + even if f->param_alist says otherwise. This is + important when param_alist's notion of colors is + "unspecified". We need to do the same here. */ + if (STRINGP (value) && !FRAME_WINDOW_P (f)) + { + char *color_name; + EMACS_INT csz; + + if (EQ (parameter, Qbackground_color)) + { + color_name = XSTRING (value)->data; + csz = XSTRING (value)->size; + if (strncmp (color_name, unspecified_bg, csz) == 0) + value = tty_color_name (f, FRAME_BACKGROUND_PIXEL (f)); + else if (strncmp (color_name, unspecified_fg, csz) == 0) + value = tty_color_name (f, FRAME_FOREGROUND_PIXEL (f)); + } + else if (EQ (parameter, Qforeground_color)) + { + color_name = XSTRING (value)->data; + csz = XSTRING (value)->size; + if (strncmp (color_name, unspecified_fg, csz) == 0) + value = tty_color_name (f, FRAME_FOREGROUND_PIXEL (f)); + else if (strncmp (color_name, unspecified_bg, csz) == 0) + value = tty_color_name (f, FRAME_BACKGROUND_PIXEL (f)); + } + } + } + else + value = Fcdr (Fassq (parameter, Fframe_parameters (frame))); + } + else if (EQ (parameter, Qdisplay_type) + || EQ (parameter, Qbackground_mode)) + value = Fcdr (Fassq (parameter, f->param_alist)); + else + value = Fcdr (Fassq (parameter, Fframe_parameters (frame))); + } + + return value; +} + + DEFUN ("modify-frame-parameters", Fmodify_frame_parameters, Smodify_frame_parameters, 2, 2, 0, - "Modify the parameters of frame FRAME according to ALIST.\n\ -ALIST is an alist of parameters to change and their new values.\n\ -Each element of ALIST has the form (PARM . VALUE), where PARM is a symbol.\n\ -The meaningful PARMs depend on the kind of frame.\n\ -Undefined PARMs are ignored, but stored in the frame's parameter list\n\ -so that `frame-parameters' will return them.") - (frame, alist) + doc: /* Modify the parameters of frame FRAME according to ALIST. +If FRAME is nil, it defaults to the selected frame. +ALIST is an alist of parameters to change and their new values. +Each element of ALIST has the form (PARM . VALUE), where PARM is a symbol. +The meaningful PARMs depend on the kind of frame. +Undefined PARMs are ignored, but stored in the frame's parameter list +so that `frame-parameters' will return them. + +The value of frame parameter FOO can also be accessed +as a frame-local binding for the variable FOO, if you have +enabled such bindings for that variable with `make-variable-frame-local'. */) + (frame, alist) Lisp_Object frame, alist; { FRAME_PTR f; - register Lisp_Object tail, elt, prop, val; + register Lisp_Object tail, prop, val; + int count = BINDING_STACK_SIZE (); + + /* Bind this to t to inhibit initialization of the default face from + X resources in face-set-after-frame-default. If we don't inhibit + this, modifying the `font' frame parameter, for example, while + there is a `default.attributeFont' X resource, won't work, + because `default's font is reset to the value of the X resource + and that resets the `font' frame parameter. */ + specbind (Qinhibit_default_face_x_resources, Qt); if (EQ (frame, Qnil)) - f = selected_frame; - else - { - CHECK_LIVE_FRAME (frame, 0); - f = XFRAME (frame); - } + frame = selected_frame; + CHECK_LIVE_FRAME (frame); + f = XFRAME (frame); /* I think this should be done with a hook. */ #ifdef HAVE_WINDOW_SYSTEM @@ -1898,6 +2207,7 @@ so that `frame-parameters' will return them.") IT_set_frame_parameters (f, alist); else #endif + { int length = XINT (Flength (alist)); int i; @@ -1911,7 +2221,7 @@ so that `frame-parameters' will return them.") i = 0; for (tail = alist; CONSP (tail); tail = Fcdr (tail)) { - Lisp_Object elt, prop, val; + Lisp_Object elt; elt = Fcar (tail); parms[i] = Fcar (elt); @@ -1928,26 +2238,23 @@ so that `frame-parameters' will return them.") } } - return Qnil; + return unbind_to (count, Qnil); } DEFUN ("frame-char-height", Fframe_char_height, Sframe_char_height, - 0, 1, 0, - "Height in pixels of a line in the font in frame FRAME.\n\ -If FRAME is omitted, the selected frame is used.\n\ -For a terminal frame, the value is always 1.") + 0, 1, 0, + doc: /* Height in pixels of a line in the font in frame FRAME. +If FRAME is omitted, the selected frame is used. +For a terminal frame, the value is always 1. */) (frame) Lisp_Object frame; { struct frame *f; if (NILP (frame)) - f = selected_frame; - else - { - CHECK_FRAME (frame, 0); - f = XFRAME (frame); - } + frame = selected_frame; + CHECK_FRAME (frame); + f = XFRAME (frame); #ifdef HAVE_WINDOW_SYSTEM if (FRAME_WINDOW_P (f)) @@ -1959,24 +2266,21 @@ For a terminal frame, the value is always 1.") DEFUN ("frame-char-width", Fframe_char_width, Sframe_char_width, - 0, 1, 0, - "Width in pixels of characters in the font in frame FRAME.\n\ -If FRAME is omitted, the selected frame is used.\n\ -The width is the same for all characters, because\n\ -currently Emacs supports only fixed-width fonts.\n\ -For a terminal screen, the value is always 1.") - (frame) + 0, 1, 0, + doc: /* Width in pixels of characters in the font in frame FRAME. +If FRAME is omitted, the selected frame is used. +The width is the same for all characters, because +currently Emacs supports only fixed-width fonts. +For a terminal screen, the value is always 1. */) + (frame) Lisp_Object frame; { struct frame *f; if (NILP (frame)) - f = selected_frame; - else - { - CHECK_FRAME (frame, 0); - f = XFRAME (frame); - } + frame = selected_frame; + CHECK_FRAME (frame); + f = XFRAME (frame); #ifdef HAVE_WINDOW_SYSTEM if (FRAME_WINDOW_P (f)) @@ -1988,23 +2292,20 @@ For a terminal screen, the value is always 1.") DEFUN ("frame-pixel-height", Fframe_pixel_height, Sframe_pixel_height, 0, 1, 0, - "Return a FRAME's height in pixels.\n\ -This counts only the height available for text lines,\n\ -not menu bars on window-system Emacs frames.\n\ -For a terminal frame, the result really gives the height in characters.\n\ -If FRAME is omitted, the selected frame is used.") - (frame) + doc: /* Return a FRAME's height in pixels. +This counts only the height available for text lines, +not menu bars on window-system Emacs frames. +For a terminal frame, the result really gives the height in characters. +If FRAME is omitted, the selected frame is used. */) + (frame) Lisp_Object frame; { struct frame *f; if (NILP (frame)) - f = selected_frame; - else - { - CHECK_FRAME (frame, 0); - f = XFRAME (frame); - } + frame = selected_frame; + CHECK_FRAME (frame); + f = XFRAME (frame); #ifdef HAVE_WINDOW_SYSTEM if (FRAME_WINDOW_P (f)) @@ -2016,21 +2317,18 @@ If FRAME is omitted, the selected frame is used.") DEFUN ("frame-pixel-width", Fframe_pixel_width, Sframe_pixel_width, 0, 1, 0, - "Return FRAME's width in pixels.\n\ -For a terminal frame, the result really gives the width in characters.\n\ -If FRAME is omitted, the selected frame is used.") - (frame) + doc: /* Return FRAME's width in pixels. +For a terminal frame, the result really gives the width in characters. +If FRAME is omitted, the selected frame is used. */) + (frame) Lisp_Object frame; { struct frame *f; if (NILP (frame)) - f = selected_frame; - else - { - CHECK_FRAME (frame, 0); - f = XFRAME (frame); - } + frame = selected_frame; + CHECK_FRAME (frame); + f = XFRAME (frame); #ifdef HAVE_WINDOW_SYSTEM if (FRAME_WINDOW_P (f)) @@ -2041,22 +2339,19 @@ If FRAME is omitted, the selected frame is used.") } DEFUN ("set-frame-height", Fset_frame_height, Sset_frame_height, 2, 3, 0, - "Specify that the frame FRAME has LINES lines.\n\ -Optional third arg non-nil means that redisplay should use LINES lines\n\ -but that the idea of the actual height of the frame should not be changed.") - (frame, lines, pretend) + doc: /* Specify that the frame FRAME has LINES lines. +Optional third arg non-nil means that redisplay should use LINES lines +but that the idea of the actual height of the frame should not be changed. */) + (frame, lines, pretend) Lisp_Object frame, lines, pretend; { register struct frame *f; - CHECK_NUMBER (lines, 0); + CHECK_NUMBER (lines); if (NILP (frame)) - f = selected_frame; - else - { - CHECK_LIVE_FRAME (frame, 0); - f = XFRAME (frame); - } + frame = selected_frame; + CHECK_LIVE_FRAME (frame); + f = XFRAME (frame); /* I think this should be done with a hook. */ #ifdef HAVE_WINDOW_SYSTEM @@ -2064,29 +2359,27 @@ but that the idea of the actual height of the frame should not be changed.") { if (XINT (lines) != f->height) x_set_window_size (f, 1, f->width, XINT (lines)); + do_pending_window_change (0); } else #endif - change_frame_size (f, XINT (lines), 0, !NILP (pretend), 0); + change_frame_size (f, XINT (lines), 0, !NILP (pretend), 0, 0); return Qnil; } DEFUN ("set-frame-width", Fset_frame_width, Sset_frame_width, 2, 3, 0, - "Specify that the frame FRAME has COLS columns.\n\ -Optional third arg non-nil means that redisplay should use COLS columns\n\ -but that the idea of the actual width of the frame should not be changed.") - (frame, cols, pretend) + doc: /* Specify that the frame FRAME has COLS columns. +Optional third arg non-nil means that redisplay should use COLS columns +but that the idea of the actual width of the frame should not be changed. */) + (frame, cols, pretend) Lisp_Object frame, cols, pretend; { register struct frame *f; - CHECK_NUMBER (cols, 0); + CHECK_NUMBER (cols); if (NILP (frame)) - f = selected_frame; - else - { - CHECK_LIVE_FRAME (frame, 0); - f = XFRAME (frame); - } + frame = selected_frame; + CHECK_LIVE_FRAME (frame); + f = XFRAME (frame); /* I think this should be done with a hook. */ #ifdef HAVE_WINDOW_SYSTEM @@ -2094,24 +2387,24 @@ but that the idea of the actual width of the frame should not be changed.") { if (XINT (cols) != f->width) x_set_window_size (f, 1, XINT (cols), f->height); + do_pending_window_change (0); } else #endif - change_frame_size (f, 0, XINT (cols), !NILP (pretend), 0); + change_frame_size (f, 0, XINT (cols), !NILP (pretend), 0, 0); return Qnil; } DEFUN ("set-frame-size", Fset_frame_size, Sset_frame_size, 3, 3, 0, - "Sets size of FRAME to COLS by ROWS, measured in characters.") - (frame, cols, rows) + doc: /* Sets size of FRAME to COLS by ROWS, measured in characters. */) + (frame, cols, rows) Lisp_Object frame, cols, rows; { register struct frame *f; - int mask; - CHECK_LIVE_FRAME (frame, 0); - CHECK_NUMBER (cols, 2); - CHECK_NUMBER (rows, 1); + CHECK_LIVE_FRAME (frame); + CHECK_NUMBER (cols); + CHECK_NUMBER (rows); f = XFRAME (frame); /* I think this should be done with a hook. */ @@ -2121,29 +2414,29 @@ DEFUN ("set-frame-size", Fset_frame_size, Sset_frame_size, 3, 3, 0, if (XINT (rows) != f->height || XINT (cols) != f->width || FRAME_NEW_HEIGHT (f) || FRAME_NEW_WIDTH (f)) x_set_window_size (f, 1, XINT (cols), XINT (rows)); + do_pending_window_change (0); } else #endif - change_frame_size (f, XINT (rows), XINT (cols), 0, 0); + change_frame_size (f, XINT (rows), XINT (cols), 0, 0, 0); return Qnil; } DEFUN ("set-frame-position", Fset_frame_position, Sset_frame_position, 3, 3, 0, - "Sets position of FRAME in pixels to XOFFSET by YOFFSET.\n\ -This is actually the position of the upper left corner of the frame.\n\ -Negative values for XOFFSET or YOFFSET are interpreted relative to\n\ -the rightmost or bottommost possible position (that stays within the screen).") - (frame, xoffset, yoffset) + doc: /* Sets position of FRAME in pixels to XOFFSET by YOFFSET. +This is actually the position of the upper left corner of the frame. +Negative values for XOFFSET or YOFFSET are interpreted relative to +the rightmost or bottommost possible position (that stays within the screen). */) + (frame, xoffset, yoffset) Lisp_Object frame, xoffset, yoffset; { register struct frame *f; - int mask; - CHECK_LIVE_FRAME (frame, 0); - CHECK_NUMBER (xoffset, 1); - CHECK_NUMBER (yoffset, 2); + CHECK_LIVE_FRAME (frame); + CHECK_NUMBER (xoffset); + CHECK_NUMBER (yoffset); f = XFRAME (frame); /* I think this should be done with a hook. */ @@ -2156,31 +2449,108 @@ the rightmost or bottommost possible position (that stays within the screen).") } +void syms_of_frame () { - syms_of_frame_1 (); + Qframep = intern ("framep"); + staticpro (&Qframep); + Qframe_live_p = intern ("frame-live-p"); + staticpro (&Qframe_live_p); + Qheight = intern ("height"); + staticpro (&Qheight); + Qicon = intern ("icon"); + staticpro (&Qicon); + Qminibuffer = intern ("minibuffer"); + staticpro (&Qminibuffer); + Qmodeline = intern ("modeline"); + staticpro (&Qmodeline); + Qname = intern ("name"); + staticpro (&Qname); + Qonly = intern ("only"); + staticpro (&Qonly); + Qunsplittable = intern ("unsplittable"); + staticpro (&Qunsplittable); + Qmenu_bar_lines = intern ("menu-bar-lines"); + staticpro (&Qmenu_bar_lines); + Qtool_bar_lines = intern ("tool-bar-lines"); + staticpro (&Qtool_bar_lines); + Qwidth = intern ("width"); + staticpro (&Qwidth); + Qx = intern ("x"); + staticpro (&Qx); + Qw32 = intern ("w32"); + staticpro (&Qw32); + Qpc = intern ("pc"); + staticpro (&Qpc); + Qmac = intern ("mac"); + staticpro (&Qmac); + Qvisible = intern ("visible"); + staticpro (&Qvisible); + Qbuffer_predicate = intern ("buffer-predicate"); + staticpro (&Qbuffer_predicate); + Qbuffer_list = intern ("buffer-list"); + staticpro (&Qbuffer_list); + Qtitle = intern ("title"); + staticpro (&Qtitle); + Qdisplay_type = intern ("display-type"); + staticpro (&Qdisplay_type); + Qbackground_mode = intern ("background-mode"); + staticpro (&Qbackground_mode); + Qleft_fringe = intern ("left-fringe"); + staticpro (&Qleft_fringe); + Qright_fringe = intern ("right-fringe"); + staticpro (&Qright_fringe); + Qtty_color_mode = intern ("tty-color-mode"); + staticpro (&Qtty_color_mode); - staticpro (&Vframe_list); + DEFVAR_LISP ("default-frame-alist", &Vdefault_frame_alist, + doc: /* Alist of default values for frame creation. +These may be set in your init file, like this: + (setq default-frame-alist '((width . 80) (height . 55) (menu-bar-lines . 1)) +These override values given in window system configuration data, + including X Windows' defaults database. +For values specific to the first Emacs frame, see `initial-frame-alist'. +For values specific to the separate minibuffer frame, see + `minibuffer-frame-alist'. +The `menu-bar-lines' element of the list controls whether new frames + have menu bars; `menu-bar-mode' works by altering this element. */); + Vdefault_frame_alist = Qnil; + + Qinhibit_default_face_x_resources + = intern ("inhibit-default-face-x-resources"); + staticpro (&Qinhibit_default_face_x_resources); DEFVAR_LISP ("terminal-frame", &Vterminal_frame, - "The initial frame-object, which represents Emacs's stdout."); + doc: /* The initial frame-object, which represents Emacs's stdout. */); DEFVAR_LISP ("emacs-iconified", &Vemacs_iconified, - "Non-nil if all of emacs is iconified and frame updates are not needed."); + doc: /* Non-nil if all of emacs is iconified and frame updates are not needed. */); Vemacs_iconified = Qnil; + DEFVAR_LISP ("mouse-position-function", &Vmouse_position_function, + doc: /* If non-nil, function to transform normal value of `mouse-position'. +`mouse-position' calls this function, passing its usual return value as +argument, and returns whatever this function returns. +This abnormal hook exists for the benefit of packages like `xt-mouse.el' +which need to do mouse handling at the Lisp level. */); + Vmouse_position_function = Qnil; + DEFVAR_KBOARD ("default-minibuffer-frame", Vdefault_minibuffer_frame, - "Minibufferless frames use this frame's minibuffer.\n\ -\n\ -Emacs cannot create minibufferless frames unless this is set to an\n\ -appropriate surrogate.\n\ -\n\ -Emacs consults this variable only when creating minibufferless\n\ -frames; once the frame is created, it sticks with its assigned\n\ -minibuffer, no matter what this variable is set to. This means that\n\ -this variable doesn't necessarily say anything meaningful about the\n\ -current set of frames, or where the minibuffer is currently being\n\ -displayed."); + doc: /* Minibufferless frames use this frame's minibuffer. + +Emacs cannot create minibufferless frames unless this is set to an +appropriate surrogate. + +Emacs consults this variable only when creating minibufferless +frames; once the frame is created, it sticks with its assigned +minibuffer, no matter what this variable is set to. This means that +this variable doesn't necessarily say anything meaningful about the +current set of frames, or where the minibuffer is currently being +displayed. + +This variable is local to the current terminal and cannot be buffer-local. */); + + staticpro (&Vframe_list); defsubr (&Sactive_minibuffer_window); defsubr (&Sframep); @@ -2217,6 +2587,7 @@ displayed."); defsubr (&Sredirect_frame_focus); defsubr (&Sframe_focus); defsubr (&Sframe_parameters); + defsubr (&Sframe_parameter); defsubr (&Smodify_frame_parameters); defsubr (&Sframe_char_height); defsubr (&Sframe_char_width); @@ -2227,11 +2598,3 @@ displayed."); defsubr (&Sset_frame_size); defsubr (&Sset_frame_position); } - -keys_of_frame () -{ - initial_define_lispy_key (global_map, "switch-frame", "handle-switch-frame"); - initial_define_lispy_key (global_map, "delete-frame", "handle-delete-frame"); - initial_define_lispy_key (global_map, "iconify-frame", "ignore-event"); - initial_define_lispy_key (global_map, "make-frame-visible", "ignore-event"); -}