Mercurial > emacs
diff src/frame.c @ 765:e4093444f9f8
*** empty log message ***
| author | Jim Blandy <jimb@redhat.com> |
|---|---|
| date | Mon, 13 Jul 1992 20:53:59 +0000 |
| parents | 0276f8eb306f |
| children | c99faf9381bb |
line wrap: on
line diff
--- a/src/frame.c Mon Jul 13 19:54:34 1992 +0000 +++ b/src/frame.c Mon Jul 13 20:53:59 1992 +0000 @@ -1,4 +1,4 @@ -/* Generic screen functions. +/* Generic frame functions. Copyright (C) 1989, 1992 Free Software Foundation. This file is part of GNU Emacs. @@ -21,36 +21,36 @@ #include "config.h" -#ifdef MULTI_SCREEN +#ifdef MULTI_FRAME #include "lisp.h" -#include "screen.h" +#include "frame.h" #include "window.h" #include "termhooks.h" Lisp_Object Vemacs_iconified; -Lisp_Object Qscreenp; -Lisp_Object Qlive_screen_p; -Lisp_Object Vscreen_list; -Lisp_Object Vterminal_screen; -Lisp_Object Vdefault_minibuffer_screen; -Lisp_Object Vdefault_screen_alist; +Lisp_Object Qframep; +Lisp_Object Qlive_frame_p; +Lisp_Object Vframe_list; +Lisp_Object Vterminal_frame; +Lisp_Object Vdefault_minibuffer_frame; +Lisp_Object Vdefault_frame_alist; Lisp_Object Qminibuffer; extern Lisp_Object Vminibuffer_list; extern Lisp_Object get_minibuffer (); -DEFUN ("screenp", Fscreenp, Sscreenp, 1, 1, 0, - "Return non-nil if OBJECT is a screen.\n\ -Value is t for a termcap screen (a character-only terminal),\n\ -`x' for an Emacs screen that is really an X window.\n\ -Also see `live-screen-p'.") +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\ +Also see `live-frame-p'.") (object) Lisp_Object object; { - if (XTYPE (object) != Lisp_Screen) + if (XTYPE (object) != Lisp_Frame) return Qnil; - switch (XSCREEN (object)->output_method) + switch (XFRAME (object)->output_method) { case output_termcap: return Qt; @@ -61,53 +61,53 @@ } } -DEFUN ("live-screen-p", Flive_screen_p, Slive_screen_p, 1, 1, 0, - "Return non-nil if OBJECT is a screen which has not been deleted.\n\ -Value is nil if OBJECT is not a live screen. If object is a live\n\ -screen, the return value indicates what sort of output device it is\n\ -displayed on. Value is t for a termcap screen (a character-only\n\ -terminal), `x' for an Emacs screen being displayed in an X window.") +DEFUN ("live-frame-p", Flive_frame_p, Slive_frame_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) Lisp_Object object; { - return ((SCREENP (object) - && SCREEN_LIVE_P (XSCREEN (object))) - ? Fscreenp (object) + return ((FRAMEP (object) + && FRAME_LIVE_P (XFRAME (object))) + ? Fframep (object) : Qnil); } -struct screen * -make_screen (mini_p) +struct frame * +make_frame (mini_p) int mini_p; { - Lisp_Object screen; - register struct screen *s; + Lisp_Object frame; + register struct frame *f; register Lisp_Object root_window; register Lisp_Object mini_window; - screen = Fmake_vector (((sizeof (struct screen) - (sizeof (Lisp_Vector) + frame = Fmake_vector (((sizeof (struct frame) - (sizeof (Lisp_Vector) - sizeof (Lisp_Object))) / sizeof (Lisp_Object)), make_number (0)); - XSETTYPE (screen, Lisp_Screen); - s = XSCREEN (screen); + XSETTYPE (frame, Lisp_Frame); + f = XFRAME (frame); - s->cursor_x = 0; - s->cursor_y = 0; - s->current_glyphs = 0; - s->desired_glyphs = 0; - s->visible = 0; - s->display.nothing = 0; - s->iconified = 0; - s->wants_modeline = 1; - s->auto_raise = 0; - s->auto_lower = 0; - s->no_split = 0; - s->garbaged = 0; - s->has_minibuffer = mini_p; - s->focus_screen = screen; + f->cursor_x = 0; + f->cursor_y = 0; + f->current_glyphs = 0; + f->desired_glyphs = 0; + f->visible = 0; + f->display.nothing = 0; + f->iconified = 0; + f->wants_modeline = 1; + f->auto_raise = 0; + f->auto_lower = 0; + f->no_split = 0; + f->garbaged = 0; + f->has_minibuffer = mini_p; + f->focus_frame = frame; - s->param_alist = Qnil; + f->param_alist = Qnil; root_window = make_window (0); if (mini_p) @@ -116,24 +116,24 @@ XWINDOW (root_window)->next = mini_window; XWINDOW (mini_window)->prev = root_window; XWINDOW (mini_window)->mini_p = Qt; - XWINDOW (mini_window)->screen = screen; - s->minibuffer_window = mini_window; + XWINDOW (mini_window)->frame = frame; + f->minibuffer_window = mini_window; } else { mini_window = Qnil; XWINDOW (root_window)->next = Qnil; - s->minibuffer_window = Qnil; + f->minibuffer_window = Qnil; } - XWINDOW (root_window)->screen = screen; + XWINDOW (root_window)->frame = frame; /* 10 is arbitrary, just so that there is "something there." - Correct size will be set up later with change_screen_size. */ + Correct size will be set up later with change_frame_size. */ - s->width = 10; - s->height = 10; + f->width = 10; + f->height = 10; XFASTINT (XWINDOW (root_window)->width) = 10; XFASTINT (XWINDOW (root_window)->height) = (mini_p ? 9 : 10); @@ -145,7 +145,7 @@ XFASTINT (XWINDOW (mini_window)->height) = 1; } - /* Choose a buffer for the screen's root window. */ + /* Choose a buffer for the frame's root window. */ { Lisp_Object buf; @@ -167,82 +167,82 @@ : Fcar (Vminibuffer_list))); } - s->root_window = root_window; - s->selected_window = root_window; + f->root_window = root_window; + f->selected_window = root_window; /* Make sure this window seems more recently used than a newly-created, never-selected window. */ - XFASTINT (XWINDOW (s->selected_window)->use_time) = ++window_select_count; + XFASTINT (XWINDOW (f->selected_window)->use_time) = ++window_select_count; - Vscreen_list = Fcons (screen, Vscreen_list); + Vframe_list = Fcons (frame, Vframe_list); - return s; + return f; } -/* Make a screen using a separate minibuffer window on another screen. +/* 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). */ -struct screen * -make_screen_without_minibuffer (mini_window) +struct frame * +make_frame_without_minibuffer (mini_window) register Lisp_Object mini_window; { - register struct screen *s; + register struct frame *f; /* Choose the minibuffer window to use. */ if (NILP (mini_window)) { - if (XTYPE (Vdefault_minibuffer_screen) != Lisp_Screen) - error ("default-minibuffer-screen must be set when creating minibufferless screens"); - if (! SCREEN_LIVE_P (XSCREEN (Vdefault_minibuffer_screen))) - error ("default-minibuffer-screen must be a live screen"); - mini_window = XSCREEN (Vdefault_minibuffer_screen)->minibuffer_window; + if (XTYPE (Vdefault_minibuffer_frame) != Lisp_Frame) + error ("default-minibuffer-frame must be set when creating minibufferless frames"); + if (! FRAME_LIVE_P (XFRAME (Vdefault_minibuffer_frame))) + error ("default-minibuffer-frame must be a live frame"); + mini_window = XFRAME (Vdefault_minibuffer_frame)->minibuffer_window; } else { CHECK_WINDOW (mini_window, 0); } - /* Make a screen containing just a root window. */ - s = make_screen (0); + /* Make a frame containing just a root window. */ + f = make_frame (0); /* Install the chosen minibuffer window, with proper buffer. */ - s->minibuffer_window = mini_window; + f->minibuffer_window = mini_window; Fset_window_buffer (mini_window, (NILP (Vminibuffer_list) ? get_minibuffer (0) : Fcar (Vminibuffer_list))); - return s; + return f; } -/* Make a screen containing only a minibuffer window. */ +/* Make a frame containing only a minibuffer window. */ -struct screen * -make_minibuffer_screen () +struct frame * +make_minibuffer_frame () { - /* First make a screen containing just a root window, no minibuffer. */ + /* First make a frame containing just a root window, no minibuffer. */ - register struct screen *s = make_screen (0); + register struct frame *f = make_frame (0); register Lisp_Object mini_window; - register Lisp_Object screen; + register Lisp_Object frame; - XSET (screen, Lisp_Screen, s); + XSET (frame, Lisp_Frame, f); /* ??? Perhaps leave it to the user program to set auto_raise. */ - s->auto_raise = 1; - s->auto_lower = 0; - s->no_split = 1; - s->wants_modeline = 0; - s->has_minibuffer = 1; + f->auto_raise = 1; + f->auto_lower = 0; + f->no_split = 1; + f->wants_modeline = 0; + f->has_minibuffer = 1; /* Now label the root window as also being the minibuffer. Avoid infinite looping on the window chain by marking next pointer as nil. */ - mini_window = s->minibuffer_window = s->root_window; + mini_window = f->minibuffer_window = f->root_window; XWINDOW (mini_window)->mini_p = Qt; XWINDOW (mini_window)->next = Qnil; XWINDOW (mini_window)->prev = mini_window; - XWINDOW (mini_window)->screen = screen; + XWINDOW (mini_window)->frame = frame; /* Put the proper buffer in that window. */ @@ -250,347 +250,347 @@ (NILP (Vminibuffer_list) ? get_minibuffer (0) : Fcar (Vminibuffer_list))); - return s; + return f; } -/* Construct a screen that refers to the terminal (stdin and stdout). */ +/* Construct a frame that refers to the terminal (stdin and stdout). */ -struct screen * -make_terminal_screen () +struct frame * +make_terminal_frame () { - register struct screen *s; + register struct frame *f; - Vscreen_list = Qnil; - s = make_screen (1); - s->name = build_string ("terminal"); - s->visible = 1; - s->display.nothing = 1; /* Nonzero means screen isn't deleted. */ - XSET (Vterminal_screen, Lisp_Screen, s); - return s; + Vframe_list = Qnil; + f = make_frame (1); + f->name = build_string ("terminal"); + f->visible = 1; + f->display.nothing = 1; /* Nonzero means frame isn't deleted. */ + XSET (Vterminal_frame, Lisp_Frame, f); + return f; } -DEFUN ("select-screen", Fselect_screen, Sselect_screen, 1, 2, 0, - "Select the screen S. S's selected window becomes \"the\"\n\ +DEFUN ("select-frame", Fselect_frame, Sselect_frame, 1, 2, 0, + "Select the frame FRAME. FRAMES's selected window becomes \"the\"\n\ selected window. If the optional parameter NO-ENTER is non-nil, don't\n\ -focus on that screen.") - (screen, no_enter) - Lisp_Object screen, no_enter; +focus on that frame.") + (frame, no_enter) + Lisp_Object frame, no_enter; { - CHECK_LIVE_SCREEN (screen, 0); + CHECK_LIVE_FRAME (frame, 0); - if (selected_screen == XSCREEN (screen)) - return screen; + if (selected_frame == XFRAME (frame)) + return frame; - selected_screen = XSCREEN (screen); - if (! SCREEN_MINIBUF_ONLY_P (selected_screen)) - last_nonminibuf_screen = selected_screen; + selected_frame = XFRAME (frame); + if (! FRAME_MINIBUF_ONLY_P (selected_frame)) + last_nonminibuf_frame = selected_frame; - Fselect_window (XSCREEN (screen)->selected_window); + Fselect_window (XFRAME (frame)->selected_window); #ifdef HAVE_X_WINDOWS -#ifdef MULTI_SCREEN - if (SCREEN_IS_X (XSCREEN (screen)) +#ifdef MULTI_FRAME + if (FRAME_IS_X (XFRAME (frame)) && NILP (no_enter)) { - Ffocus_screen (screen); + Ffocus_frame (frame); } #endif #endif - choose_minibuf_screen (); + choose_minibuf_frame (); - return screen; + return frame; } -DEFUN ("selected-screen", Fselected_screen, Sselected_screen, 0, 0, 0, - "Return the screen that is now selected.") +DEFUN ("selected-frame", Fselected_frame, Sselected_frame, 0, 0, 0, + "Return the frame that is now selected.") () { Lisp_Object tem; - XSET (tem, Lisp_Screen, selected_screen); + XSET (tem, Lisp_Frame, selected_frame); return tem; } -DEFUN ("window-screen", Fwindow_screen, Swindow_screen, 1, 1, 0, - "Return the screen object that window WINDOW is on.") +DEFUN ("window-frame", Fwindow_frame, Swindow_frame, 1, 1, 0, + "Return the frame object that window WINDOW is on.") (window) Lisp_Object window; { CHECK_WINDOW (window, 0); - return XWINDOW (window)->screen; + return XWINDOW (window)->frame; } -DEFUN ("screen-root-window", Fscreen_root_window, Sscreen_root_window, 0, 1, 0, - "Returns the root-window of SCREEN.") - (screen) - Lisp_Object screen; +DEFUN ("frame-root-window", Fframe_root_window, Sframe_root_window, 0, 1, 0, + "Returns the root-window of FRAME.") + (frame) + Lisp_Object frame; { - if (NILP (screen)) - XSET (screen, Lisp_Screen, selected_screen); + if (NILP (frame)) + XSET (frame, Lisp_Frame, selected_frame); else - CHECK_LIVE_SCREEN (screen, 0); + CHECK_LIVE_FRAME (frame, 0); - return XSCREEN (screen)->root_window; + return XFRAME (frame)->root_window; } -DEFUN ("screen-selected-window", Fscreen_selected_window, - Sscreen_selected_window, 0, 1, 0, - "Return the selected window of screen object SCREEN.") - (screen) - Lisp_Object screen; +DEFUN ("frame-selected-window", Fframe_selected_window, + Sframe_selected_window, 0, 1, 0, + "Return the selected window of frame object FRAME.") + (frame) + Lisp_Object frame; { - if (NILP (screen)) - XSET (screen, Lisp_Screen, selected_screen); + if (NILP (frame)) + XSET (frame, Lisp_Frame, selected_frame); else - CHECK_LIVE_SCREEN (screen, 0); + CHECK_LIVE_FRAME (frame, 0); - return XSCREEN (screen)->selected_window; + return XFRAME (frame)->selected_window; } -DEFUN ("screen-list", Fscreen_list, Sscreen_list, +DEFUN ("frame-list", Fframe_list, Sframe_list, 0, 0, 0, - "Return a list of all screens.") + "Return a list of all frames.") () { - return Fcopy_sequence (Vscreen_list); + return Fcopy_sequence (Vframe_list); } -#ifdef MULTI_SCREEN +#ifdef MULTI_FRAME -/* Return the next screen in the screen list after SCREEN. - If MINIBUF is non-nil, include all screens. - If MINIBUF is nil, exclude minibuffer-only screens. - If MINIBUF is a window, include only screens using that window for +/* Return the next frame in the frame list after FRAME. + If MINIBUF is non-nil, include all frames. + If MINIBUF is nil, exclude minibuffer-only frames. + If MINIBUF is a window, include only frames using that window for their minibuffer. */ Lisp_Object -next_screen (screen, minibuf) - Lisp_Object screen; +next_frame (frame, minibuf) + Lisp_Object frame; Lisp_Object minibuf; { Lisp_Object tail; int passed = 0; - /* There must always be at least one screen in Vscreen_list. */ - if (! CONSP (Vscreen_list)) + /* There must always be at least one frame in Vframe_list. */ + if (! CONSP (Vframe_list)) abort (); while (1) - for (tail = Vscreen_list; CONSP (tail); tail = XCONS (tail)->cdr) + for (tail = Vframe_list; CONSP (tail); tail = XCONS (tail)->cdr) { if (passed) { - Lisp_Object s = XCONS (tail)->car; + Lisp_Object f = XCONS (tail)->car; - /* Decide whether this screen is eligible to be returned, + /* Decide whether this frame is eligible to be returned, according to minibuf. */ - if ((NILP (minibuf) && ! SCREEN_MINIBUF_ONLY_P (XSCREEN (s))) + if ((NILP (minibuf) && ! FRAME_MINIBUF_ONLY_P (XFRAME (f))) || XTYPE (minibuf) != Lisp_Window - || EQ (SCREEN_MINIBUF_WINDOW (XSCREEN (s)), minibuf) - || EQ (s, screen)) - return s; + || EQ (FRAME_MINIBUF_WINDOW (XFRAME (f)), minibuf) + || EQ (f, frame)) + return f; } - if (EQ (screen, XCONS (tail)->car)) + if (EQ (frame, XCONS (tail)->car)) passed++; } } -/* Return the previous screen in the screen list before SCREEN. - If MINIBUF is non-nil, include all screens. - If MINIBUF is nil, exclude minibuffer-only screens. - If MINIBUF is a window, include only screens using that window for +/* Return the previous frame in the frame list before FRAME. + If MINIBUF is non-nil, include all frames. + If MINIBUF is nil, exclude minibuffer-only frames. + If MINIBUF is a window, include only frames using that window for their minibuffer. */ Lisp_Object -prev_screen (screen, minibuf) - Lisp_Object screen; +prev_frame (frame, minibuf) + Lisp_Object frame; Lisp_Object minibuf; { Lisp_Object tail; Lisp_Object prev; - /* There must always be at least one screen in Vscreen_list. */ - if (! CONSP (Vscreen_list)) + /* There must always be at least one frame in Vframe_list. */ + if (! CONSP (Vframe_list)) abort (); prev = Qnil; while (1) { - for (tail = Vscreen_list; CONSP (tail); tail = XCONS (tail)->cdr) + for (tail = Vframe_list; CONSP (tail); tail = XCONS (tail)->cdr) { Lisp_Object scr = XCONS (tail)->car; - if (XTYPE (scr) != Lisp_Screen) + if (XTYPE (scr) != Lisp_Frame) abort (); - if (EQ (screen, scr) && !NILP (prev)) + if (EQ (frame, scr) && !NILP (prev)) return prev; - /* Decide whether this screen is eligible to be returned, + /* Decide whether this frame is eligible to be returned, according to minibuf. */ - if ((NILP (minibuf) && ! SCREEN_MINIBUF_ONLY_P (XSCREEN (scr))) + if ((NILP (minibuf) && ! FRAME_MINIBUF_ONLY_P (XFRAME (scr))) || XTYPE (minibuf) != Lisp_Window - || EQ (SCREEN_MINIBUF_WINDOW (XSCREEN (scr)), minibuf)) + || EQ (FRAME_MINIBUF_WINDOW (XFRAME (scr)), minibuf)) prev = scr; } if (NILP (prev)) - /* We went through the whole screen list without finding a single - acceptable screen. Return the original screen. */ - prev = screen; + /* We went through the whole frame list without finding a single + acceptable frame. Return the original frame. */ + prev = frame; } } -DEFUN ("next-screen", Fnext_screen, Snext_screen, 0, 2, 0, - "Return the next screen in the screen list after SCREEN.\n\ -If optional argument MINIBUF is non-nil, include all screens. If\n\ -MINIBUF is nil or omitted, exclude minibuffer-only screens. If\n\ -MINIBUF is a window, include only screens using that window for their\n\ +DEFUN ("next-frame", Fnext_frame, Snext_frame, 0, 2, 0, + "Return the next frame in the frame list after FRAME.\n\ +If optional argument MINIBUF is non-nil, include all frames. If\n\ +MINIBUF is nil or omitted, exclude minibuffer-only frames. If\n\ +MINIBUF is a window, include only frames using that window for their\n\ minibuffer.") - (screen, miniscreen) -Lisp_Object screen, miniscreen; + (frame, miniframe) +Lisp_Object frame, miniframe; { Lisp_Object tail; - if (NILP (screen)) - XSET (screen, Lisp_Screen, selected_screen); + if (NILP (frame)) + XSET (frame, Lisp_Frame, selected_frame); else - CHECK_LIVE_SCREEN (screen, 0); + CHECK_LIVE_FRAME (frame, 0); - return next_screen (screen, miniscreen); + return next_frame (frame, miniframe); } -#endif /* MULTI_SCREEN */ +#endif /* MULTI_FRAME */ -DEFUN ("delete-screen", Fdelete_screen, Sdelete_screen, 0, 1, "", - "Delete SCREEN, permanently eliminating it from use.\n\ -If omitted, SCREEN defaults to the selected screen.\n\ -A screen may not be deleted if its minibuffer is used by other screens.") - (screen) - Lisp_Object screen; +DEFUN ("delete-frame", Fdelete_frame, Sdelete_frame, 0, 1, "", + "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.") + (frame) + Lisp_Object frame; { - struct screen *s; + struct frame *f; union display displ; - if (EQ (screen, Qnil)) + if (EQ (frame, Qnil)) { - s = selected_screen; - XSET (screen, Lisp_Screen, s); + f = selected_frame; + XSET (frame, Lisp_Frame, f); } else { - CHECK_SCREEN (screen, 0); - s = XSCREEN (screen); + CHECK_FRAME (frame, 0); + f = XFRAME (frame); } - if (! SCREEN_LIVE_P (s)) + if (! FRAME_LIVE_P (f)) return; - /* Are there any other screens besides this one? */ - if (s == selected_screen && EQ (next_screen (screen, Qt), screen)) - error ("Attempt to delete the only screen"); + /* Are there any other frames besides this one? */ + if (f == selected_frame && EQ (next_frame (frame, Qt), frame)) + error ("Attempt to delete the only frame"); - /* Does this screen have a minibuffer, and is it the surrogate - minibuffer for any other screen? */ - if (SCREEN_HAS_MINIBUF (XSCREEN (screen))) + /* Does this frame have a minibuffer, and is it the surrogate + minibuffer for any other frame? */ + if (FRAME_HAS_MINIBUF (XFRAME (frame))) { - Lisp_Object screens; + Lisp_Object frames; - for (screens = Vscreen_list; - CONSP (screens); - screens = XCONS (screens)->cdr) + for (frames = Vframe_list; + CONSP (frames); + frames = XCONS (frames)->cdr) { - Lisp_Object this = XCONS (screens)->car; + Lisp_Object this = XCONS (frames)->car; - if (! EQ (this, screen) - && EQ (screen, - (WINDOW_SCREEN + if (! EQ (this, frame) + && EQ (frame, + (WINDOW_FRAME (XWINDOW - (SCREEN_MINIBUF_WINDOW - (XSCREEN (this))))))) - error ("Attempt to delete a surrogate minibuffer screen"); + (FRAME_MINIBUF_WINDOW + (XFRAME (this))))))) + error ("Attempt to delete a surrogate minibuffer frame"); } } - /* Don't let the screen remain selected. */ - if (s == selected_screen) - Fselect_screen (next_screen (screen, Qt)); + /* Don't let the frame remain selected. */ + if (f == selected_frame) + Fselect_frame (next_frame (frame, Qt)); - /* Don't allow minibuf_window to remain on a deleted screen. */ - if (EQ (s->minibuffer_window, minibuf_window)) + /* Don't allow minibuf_window to remain on a deleted frame. */ + if (EQ (f->minibuffer_window, minibuf_window)) { - Fset_window_buffer (selected_screen->minibuffer_window, + Fset_window_buffer (selected_frame->minibuffer_window, XWINDOW (minibuf_window)->buffer); - minibuf_window = selected_screen->minibuffer_window; + minibuf_window = selected_frame->minibuffer_window; } - Vscreen_list = Fdelq (screen, Vscreen_list); - s->visible = 0; - displ = s->display; - s->display.nothing = 0; + Vframe_list = Fdelq (frame, Vframe_list); + f->visible = 0; + displ = f->display; + f->display.nothing = 0; #ifdef HAVE_X_WINDOWS - if (SCREEN_IS_X (s)) - x_destroy_window (s, displ); + if (FRAME_IS_X (f)) + x_destroy_window (f, displ); #endif - /* If we've deleted the last_nonminibuf_screen, then try to find + /* If we've deleted the last_nonminibuf_frame, then try to find another one. */ - if (s == last_nonminibuf_screen) + if (f == last_nonminibuf_frame) { - Lisp_Object screens; + Lisp_Object frames; - last_nonminibuf_screen = 0; + last_nonminibuf_frame = 0; - for (screens = Vscreen_list; - CONSP (screens); - screens = XCONS (screens)->cdr) + for (frames = Vframe_list; + CONSP (frames); + frames = XCONS (frames)->cdr) { - s = XSCREEN (XCONS (screens)->car); - if (!SCREEN_MINIBUF_ONLY_P (s)) + f = XFRAME (XCONS (frames)->car); + if (!FRAME_MINIBUF_ONLY_P (f)) { - last_nonminibuf_screen = s; + last_nonminibuf_frame = f; break; } } } - /* If we've deleted Vdefault_minibuffer_screen, try to find another - one. Prefer minibuffer-only screens, but also notice screens + /* If we've deleted Vdefault_minibuffer_frame, try to find another + one. Prefer minibuffer-only frames, but also notice frames with other windows. */ - if (EQ (screen, Vdefault_minibuffer_screen)) + if (EQ (frame, Vdefault_minibuffer_frame)) { - Lisp_Object screens; + Lisp_Object frames; - /* The last screen we saw with a minibuffer, minibuffer-only or not. */ - Lisp_Object screen_with_minibuf = Qnil; + /* The last frame we saw with a minibuffer, minibuffer-only or not. */ + Lisp_Object frame_with_minibuf = Qnil; - for (screens = Vscreen_list; - CONSP (screens); - screens = XCONS (screens)->cdr) + for (frames = Vframe_list; + CONSP (frames); + frames = XCONS (frames)->cdr) { - Lisp_Object this = XCONS (screens)->car; + Lisp_Object this = XCONS (frames)->car; - if (XTYPE (this) != Lisp_Screen) + if (XTYPE (this) != Lisp_Frame) abort (); - s = XSCREEN (this); + f = XFRAME (this); - if (SCREEN_HAS_MINIBUF (s)) + if (FRAME_HAS_MINIBUF (f)) { - screen_with_minibuf = this; - if (SCREEN_MINIBUF_ONLY_P (s)) + frame_with_minibuf = this; + if (FRAME_MINIBUF_ONLY_P (f)) break; } } - /* We know that there must be some screen with a minibuffer out - there. If this were not true, all of the screens present + /* We know that there must be some frame with a minibuffer out + there. If this were not true, all of the frames present would have to be minibufferless, which implies that at some - point their minibuffer screens must have been deleted, but + point their minibuffer frames must have been deleted, but that is prohibited at the top; you can't delete surrogate - minibuffer screens. */ - if (NILP (screen_with_minibuf)) + minibuffer frames. */ + if (NILP (frame_with_minibuf)) abort (); - Vdefault_minibuffer_screen = screen_with_minibuf; + Vdefault_minibuffer_frame = frame_with_minibuf; } return Qnil; @@ -599,41 +599,41 @@ /* Return mouse position in character cell units. */ DEFUN ("mouse-position", Fmouse_position, Smouse_position, 0, 0, 0, - "Return a list (SCREEN X . Y) giving the current mouse screen and position.\n\ + "Return a list (FRAME X . Y) giving the current mouse frame and position.\n\ If Emacs is running on a mouseless terminal or hasn't been programmed\n\ -to read the mouse position, it returns the selected screen for SCREEN\n\ +to read the mouse position, it returns the selected frame for FRAME\n\ and nil for X and Y.") () { Lisp_Object x, y, dummy; - SCREEN_PTR s; + FRAME_PTR f; if (mouse_position_hook) - (*mouse_position_hook) (&s, &x, &y, &dummy); + (*mouse_position_hook) (&f, &x, &y, &dummy); else { - s = selected_screen; + f = selected_frame; x = y = Qnil; } - XSET (dummy, Lisp_Screen, s); + XSET (dummy, Lisp_Frame, f); return Fcons (dummy, Fcons (make_number (x), make_number (y))); } DEFUN ("set-mouse-position", Fset_mouse_position, Sset_mouse_position, 3, 3, 0, - "Move the mouse pointer to the center of cell (X,Y) in SCREEN.\n\ -WARNING: If you use this under X, you should do `unfocus-screen' afterwards.") - (screen, x, y) - Lisp_Object screen, x, y; + "Move the mouse pointer to the center of cell (X,Y) in FRAME.\n\ +WARNING: If you use this under X, you should do `unfocus-frame' afterwards.") + (frame, x, y) + Lisp_Object frame, x, y; { - CHECK_LIVE_SCREEN (screen, 0); + CHECK_LIVE_FRAME (frame, 0); CHECK_NUMBER (x, 2); CHECK_NUMBER (y, 1); #ifdef HAVE_X_WINDOWS - if (SCREEN_IS_X (XSCREEN (screen))) + if (FRAME_IS_X (XFRAME (frame))) /* Warping the mouse will cause enternotify and focus events. */ - x_set_mouse_position (XSCREEN (screen), x, y); + x_set_mouse_position (XFRAME (frame), x, y); #endif return Qnil; @@ -643,20 +643,20 @@ /* ??? Can this be replaced with a Lisp function? It is used in minibuf.c. Can we get rid of that? Yes. All uses in minibuf.c are gone, and parallels to these - functions have been defined in screen.el. */ + functions have been defined in frame.el. */ -DEFUN ("screen-configuration", Fscreen_configuration, Sscreen_configuration, +DEFUN ("frame-configuration", Fframe_configuration, Sframe_configuration, 0, 0, 0, - "Return object describing current screen configuration.\n\ -The screen configuration is the current mouse position and selected screen.\n\ -This object can be given to `restore-screen-configuration'\n\ -to restore this screen configuration.") + "Return object describing current frame configuration.\n\ +The frame configuration is the current mouse position and selected frame.\n\ +This object can be given to `restore-frame-configuration'\n\ +to restore this frame configuration.") () { Lisp_Object c, time; c = Fmake_vector (make_number(4), Qnil); - XVECTOR (c)->contents[0] = Fselected_screen(); + XVECTOR (c)->contents[0] = Fselected_frame(); if (mouse_position_hook) (*mouse_position_hook) (&XVECTOR (c)->contents[1] &XVECTOR (c)->contents[2], @@ -665,174 +665,174 @@ return c; } -DEFUN ("restore-screen-configuration", Frestore_screen_configuration, - Srestore_screen_configuration, +DEFUN ("restore-frame-configuration", Frestore_frame_configuration, + Srestore_frame_configuration, 1, 1, 0, - "Restores screen configuration CONFIGURATION.") + "Restores frame configuration CONFIGURATION.") (config) Lisp_Object config; { - Lisp_Object x_pos, y_pos, screen; + Lisp_Object x_pos, y_pos, frame; CHECK_VECTOR (config, 0); if (XVECTOR (config)->size != 3) { - error ("Wrong size vector passed to restore-screen-configuration"); + error ("Wrong size vector passed to restore-frame-configuration"); } - screen = XVECTOR (config)->contents[0]; - CHECK_LIVE_SCREEN (screen, 0); + frame = XVECTOR (config)->contents[0]; + CHECK_LIVE_FRAME (frame, 0); - Fselect_screen (screen, Qnil); + Fselect_frame (frame, Qnil); #if 0 - /* This seems to interfere with the screen selection mechanism. jla */ + /* This seems to interfere with the frame selection mechanism. jla */ x_pos = XVECTOR (config)->contents[2]; y_pos = XVECTOR (config)->contents[3]; - set_mouse_position (screen, XINT (x_pos), XINT (y_pos)); + set_mouse_position (frame, XINT (x_pos), XINT (y_pos)); #endif - return screen; + return frame; } #endif -DEFUN ("make-screen-visible", Fmake_screen_visible, Smake_screen_visible, +DEFUN ("make-frame-visible", Fmake_frame_visible, Smake_frame_visible, 1, 1, 0, - "Make the screen SCREEN visible (assuming it is an X-window).\n\ -Also raises the screen so that nothing obscures it.") - (screen) - Lisp_Object screen; + "Make the frame FRAME visible (assuming it is an X-window).\n\ +Also raises the frame so that nothing obscures it.") + (frame) + Lisp_Object frame; { - CHECK_LIVE_SCREEN (screen, 0); + CHECK_LIVE_FRAME (frame, 0); - if (SCREEN_IS_X (XSCREEN (screen))) - x_make_screen_visible (XSCREEN (screen)); + if (FRAME_IS_X (XFRAME (frame))) + x_make_frame_visible (XFRAME (frame)); - return screen; + return frame; } -DEFUN ("make-screen-invisible", Fmake_screen_invisible, Smake_screen_invisible, +DEFUN ("make-frame-invisible", Fmake_frame_invisible, Smake_frame_invisible, 1, 1, 0, - "Make the screen SCREEN invisible (assuming it is an X-window).") - (screen) - Lisp_Object screen; + "Make the frame FRAME invisible (assuming it is an X-window).") + (frame) + Lisp_Object frame; { - CHECK_LIVE_SCREEN (screen, 0); + CHECK_LIVE_FRAME (frame, 0); - if (SCREEN_IS_X (XSCREEN (screen))) - x_make_screen_invisible (XSCREEN (screen)); + if (FRAME_IS_X (XFRAME (frame))) + x_make_frame_invisible (XFRAME (frame)); return Qnil; } -DEFUN ("iconify-screen", Ficonify_screen, Siconify_screen, +DEFUN ("iconify-frame", Ficonify_frame, Siconify_frame, 1, 1, 0, - "Make the screen SCREEN into an icon.") - (screen) - Lisp_Object screen; + "Make the frame FRAME into an icon.") + (frame) + Lisp_Object frame; { - CHECK_LIVE_SCREEN (screen, 0); + CHECK_LIVE_FRAME (frame, 0); - if (SCREEN_IS_X (XSCREEN (screen))) - x_iconify_screen (XSCREEN (screen)); + if (FRAME_IS_X (XFRAME (frame))) + x_iconify_frame (XFRAME (frame)); return Qnil; } -DEFUN ("screen-visible-p", Fscreen_visible_p, Sscreen_visible_p, +DEFUN ("frame-visible-p", Fframe_visible_p, Sframe_visible_p, 1, 1, 0, - "Return t if SCREEN is now \"visible\" (actually in use for display).\n\ -A screen that is not \"visible\" is not updated and, if it works through\n\ + "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 window is visible only as an icon.") - (screen) - Lisp_Object screen; + (frame) + Lisp_Object frame; { - CHECK_LIVE_SCREEN (screen, 0); + CHECK_LIVE_FRAME (frame, 0); - if (XSCREEN (screen)->visible) + if (XFRAME (frame)->visible) return Qt; - if (XSCREEN (screen)->iconified) + if (XFRAME (frame)->iconified) return intern ("icon"); return Qnil; } -DEFUN ("visible-screen-list", Fvisible_screen_list, Svisible_screen_list, +DEFUN ("visible-frame-list", Fvisible_frame_list, Svisible_frame_list, 0, 0, 0, - "Return a list of all screens now \"visible\" (being updated).") + "Return a list of all frames now \"visible\" (being updated).") () { - Lisp_Object tail, screen; - struct screen *s; + Lisp_Object tail, frame; + struct frame *f; Lisp_Object value; value = Qnil; - for (tail = Vscreen_list; CONSP (tail); tail = XCONS (tail)->cdr) + for (tail = Vframe_list; CONSP (tail); tail = XCONS (tail)->cdr) { - screen = XCONS (tail)->car; - if (XTYPE (screen) != Lisp_Screen) + frame = XCONS (tail)->car; + if (XTYPE (frame) != Lisp_Frame) continue; - s = XSCREEN (screen); - if (s->visible) - value = Fcons (screen, value); + f = XFRAME (frame); + if (f->visible) + value = Fcons (frame, value); } return value; } -DEFUN ("redirect-screen-focus", Fredirect_screen_focus, Sredirect_screen_focus, +DEFUN ("redirect-frame-focus", Fredirect_frame_focus, Sredirect_frame_focus, 1, 2, 0, - "Arrange for keystrokes typed at SCREEN to be sent to FOCUS-SCREEN.\n\ -This means that, after reading a keystroke typed at SCREEN,\n\ -`last-event-screen' will be FOCUS-SCREEN.\n\ + "Arrange for keystrokes typed at FRAME to be sent to FOCUS-FRAME.\n\ +This means that, after reading a keystroke typed at FRAME,\n\ +`last-event-frame' will be FOCUS-FRAME.\n\ \n\ -If FOCUS-SCREEN is omitted or eq to SCREEN, any existing redirection is\n\ -cancelled, and the screen again receives its own keystrokes.\n\ +If FOCUS-FRAME is omitted or eq to FRAME, any existing redirection is\n\ +cancelled, and the frame again receives its own keystrokes.\n\ \n\ -The redirection lasts until the next call to `redirect-screen-focus'\n\ -or `select-screen'.\n\ +The redirection lasts until the next call to `redirect-frame-focus'\n\ +or `select-frame'.\n\ \n\ This is useful for temporarily redirecting keystrokes to the minibuffer\n\ -window when a screen doesn't have its own minibuffer.") - (screen, focus_screen) - Lisp_Object screen, focus_screen; +window when a frame doesn't have its own minibuffer.") + (frame, focus_frame) + Lisp_Object frame, focus_frame; { - CHECK_LIVE_SCREEN (screen, 0); + CHECK_LIVE_FRAME (frame, 0); - if (NILP (focus_screen)) - focus_screen = screen; + if (NILP (focus_frame)) + focus_frame = frame; else - CHECK_LIVE_SCREEN (focus_screen, 1); + CHECK_LIVE_FRAME (focus_frame, 1); - XSCREEN (screen)->focus_screen = focus_screen; + XFRAME (frame)->focus_frame = focus_frame; - if (screen_rehighlight_hook) - (*screen_rehighlight_hook) (); + if (frame_rehighlight_hook) + (*frame_rehighlight_hook) (); return Qnil; } -DEFUN ("screen-focus", Fscreen_focus, Sscreen_focus, 1, 1, 0, - "Return the screen to which SCREEN's keystrokes are currently being sent.\n\ -See `redirect-screen-focus'.") - (screen) - Lisp_Object screen; +DEFUN ("frame-focus", Fframe_focus, Sframe_focus, 1, 1, 0, + "Return the frame to which FRAME's keystrokes are currently being sent.\n\ +See `redirect-frame-focus'.") + (frame) + Lisp_Object frame; { - CHECK_LIVE_SCREEN (screen, 0); - return SCREEN_FOCUS_SCREEN (XSCREEN (screen)); + CHECK_LIVE_FRAME (frame, 0); + return FRAME_FOCUS_FRAME (XFRAME (frame)); } Lisp_Object -get_screen_param (screen, prop) - register struct screen *screen; +get_frame_param (frame, prop) + register struct frame *frame; Lisp_Object prop; { register Lisp_Object tem; - tem = Fassq (prop, screen->param_alist); + tem = Fassq (prop, frame->param_alist); if (EQ (tem, Qnil)) return tem; return Fcdr (tem); @@ -855,15 +855,15 @@ } void -store_screen_param (s, prop, val) - struct screen *s; +store_frame_param (f, prop, val) + struct frame *f; Lisp_Object prop, val; { register Lisp_Object tem; - tem = Fassq (prop, s->param_alist); + tem = Fassq (prop, f->param_alist); if (EQ (tem, Qnil)) - s->param_alist = Fcons (Fcons (prop, val), s->param_alist); + f->param_alist = Fcons (Fcons (prop, val), f->param_alist); else Fsetcdr (tem, val); @@ -873,214 +873,214 @@ if (! MINI_WINDOW_P (XWINDOW (val))) error ("Surrogate minibuffer windows must be minibuffer windows."); - if (SCREEN_HAS_MINIBUF (s) || SCREEN_MINIBUF_ONLY_P (s)) - error ("Can't change the surrogate minibuffer of a screen with its own minibuffer."); + if (FRAME_HAS_MINIBUF (f) || FRAME_MINIBUF_ONLY_P (f)) + error ("Can't change the surrogate minibuffer of a frame with its own minibuffer."); /* Install the chosen minibuffer window, with proper buffer. */ - s->minibuffer_window = val; + f->minibuffer_window = val; } } -DEFUN ("screen-parameters", Fscreen_parameters, Sscreen_parameters, 0, 1, 0, - "Return the parameters-alist of screen SCREEN.\n\ +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 screen.") - (screen) - Lisp_Object screen; +The meaningful PARMs depend on the kind of frame.") + (frame) + Lisp_Object frame; { Lisp_Object alist; - struct screen *s; + struct frame *f; - if (EQ (screen, Qnil)) - s = selected_screen; + if (EQ (frame, Qnil)) + f = selected_frame; else { - CHECK_SCREEN (screen, 0); - s = XSCREEN (screen); + CHECK_FRAME (frame, 0); + f = XFRAME (frame); } - if (s->display.nothing == 0) + if (f->display.nothing == 0) return Qnil; - alist = Fcopy_alist (s->param_alist); - store_in_alist (&alist, "name", s->name); - store_in_alist (&alist, "height", make_number (s->height)); - store_in_alist (&alist, "width", make_number (s->width)); - store_in_alist (&alist, "modeline", (s->wants_modeline ? Qt : Qnil)); + alist = Fcopy_alist (f->param_alist); + store_in_alist (&alist, "name", f->name); + store_in_alist (&alist, "height", make_number (f->height)); + store_in_alist (&alist, "width", make_number (f->width)); + store_in_alist (&alist, "modeline", (f->wants_modeline ? Qt : Qnil)); store_in_alist (&alist, "minibuffer", - (SCREEN_HAS_MINIBUF (s) - ? (SCREEN_MINIBUF_ONLY_P (s) ? intern ("only") : Qt) - : SCREEN_MINIBUF_WINDOW (s))); - store_in_alist (&alist, "unsplittable", (s->no_split ? Qt : Qnil)); + (FRAME_HAS_MINIBUF (f) + ? (FRAME_MINIBUF_ONLY_P (f) ? intern ("only") : Qt) + : FRAME_MINIBUF_WINDOW (f))); + store_in_alist (&alist, "unsplittable", (f->no_split ? Qt : Qnil)); - if (SCREEN_IS_X (s)) - x_report_screen_params (s, &alist); + if (FRAME_IS_X (f)) + x_report_frame_params (f, &alist); return alist; } -DEFUN ("modify-screen-parameters", Fmodify_screen_parameters, - Smodify_screen_parameters, 2, 2, 0, - "Modify the parameters of screen SCREEN according to ALIST.\n\ +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 screen; undefined PARMs are ignored.") - (screen, alist) - Lisp_Object screen, alist; +The meaningful PARMs depend on the kind of frame; undefined PARMs are ignored.") + (frame, alist) + Lisp_Object frame, alist; { - register struct screen *s; + register struct frame *f; register Lisp_Object tail, elt, prop, val; - if (EQ (screen, Qnil)) - s = selected_screen; + if (EQ (frame, Qnil)) + f = selected_frame; else { - CHECK_LIVE_SCREEN (screen, 0); - s = XSCREEN (screen); + CHECK_LIVE_FRAME (frame, 0); + f = XFRAME (frame); } - if (SCREEN_IS_X (s)) + if (FRAME_IS_X (f)) for (tail = alist; !EQ (tail, Qnil); tail = Fcdr (tail)) { elt = Fcar (tail); prop = Fcar (elt); val = Fcdr (elt); - x_set_screen_param (s, prop, val, - get_screen_param (s, prop)); - store_screen_param (s, prop, val); + x_set_frame_param (f, prop, val, + get_frame_param (f, prop)); + store_frame_param (f, prop, val); } return Qnil; } -DEFUN ("screen-pixel-size", Fscreen_pixel_size, - Sscreen_pixel_size, 1, 1, 0, - "Return a cons (width . height) of SCREEN's size in pixels.") - (screen) - Lisp_Object screen; +DEFUN ("frame-pixel-size", Fframe_pixel_size, + Sframe_pixel_size, 1, 1, 0, + "Return a cons (width . height) of FRAME's size in pixels.") + (frame) + Lisp_Object frame; { - register struct screen *s; + register struct frame *f; int width, height; - CHECK_LIVE_SCREEN (screen, 0); - s = XSCREEN (screen); + CHECK_LIVE_FRAME (frame, 0); + f = XFRAME (frame); - return Fcons (make_number (x_pixel_width (s)), - make_number (x_pixel_height (s))); + return Fcons (make_number (x_pixel_width (f)), + make_number (x_pixel_height (f))); } -DEFUN ("screen-height", Fscreen_height, Sscreen_height, 0, 0, 0, - "Return number of lines available for display on selected screen.") +DEFUN ("frame-height", Fframe_height, Sframe_height, 0, 0, 0, + "Return number of lines available for display on selected frame.") () { - return make_number (SCREEN_HEIGHT (selected_screen)); + return make_number (FRAME_HEIGHT (selected_frame)); } -DEFUN ("screen-width", Fscreen_width, Sscreen_width, 0, 0, 0, - "Return number of columns available for display on selected screen.") +DEFUN ("frame-width", Fframe_width, Sframe_width, 0, 0, 0, + "Return number of columns available for display on selected frame.") () { - return make_number (SCREEN_WIDTH (selected_screen)); + return make_number (FRAME_WIDTH (selected_frame)); } -DEFUN ("set-screen-height", Fset_screen_height, Sset_screen_height, 2, 3, 0, - "Specify that the screen SCREEN has LINES lines.\n\ +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 screen should not be changed.") - (screen, rows, pretend) +but that the idea of the actual height of the frame should not be changed.") + (frame, rows, pretend) Lisp_Object rows, pretend; { - register struct screen *s; + register struct frame *f; CHECK_NUMBER (rows, 0); - if (NILP (screen)) - s = selected_screen; + if (NILP (frame)) + f = selected_frame; else { - CHECK_LIVE_SCREEN (screen, 0); - s = XSCREEN (screen); + CHECK_LIVE_FRAME (frame, 0); + f = XFRAME (frame); } - if (SCREEN_IS_X (s)) + if (FRAME_IS_X (f)) { - if (XINT (rows) != s->width) - x_set_window_size (s, s->width, XINT (rows)); + if (XINT (rows) != f->width) + x_set_window_size (f, f->width, XINT (rows)); } else - change_screen_size (s, XINT (rows), 0, !NILP (pretend)); + change_frame_size (f, XINT (rows), 0, !NILP (pretend)); return Qnil; } -DEFUN ("set-screen-width", Fset_screen_width, Sset_screen_width, 2, 3, 0, - "Specify that the screen SCREEN has COLS columns.\n\ +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 screen should not be changed.") - (screen, cols, pretend) +but that the idea of the actual width of the frame should not be changed.") + (frame, cols, pretend) Lisp_Object cols, pretend; { - register struct screen *s; + register struct frame *f; CHECK_NUMBER (cols, 0); - if (NILP (screen)) - s = selected_screen; + if (NILP (frame)) + f = selected_frame; else { - CHECK_LIVE_SCREEN (screen, 0); - s = XSCREEN (screen); + CHECK_LIVE_FRAME (frame, 0); + f = XFRAME (frame); } - if (SCREEN_IS_X (s)) + if (FRAME_IS_X (f)) { - if (XINT (cols) != s->width) - x_set_window_size (s, XINT (cols), s->height); + if (XINT (cols) != f->width) + x_set_window_size (f, XINT (cols), f->height); } else - change_screen_size (selected_screen, 0, XINT (cols), !NILP (pretend)); + change_frame_size (selected_frame, 0, XINT (cols), !NILP (pretend)); return Qnil; } -DEFUN ("set-screen-size", Fset_screen_size, Sset_screen_size, 3, 3, 0, - "Sets size of SCREEN to COLS by ROWS, measured in characters.") - (screen, cols, rows) - Lisp_Object screen, cols, rows; +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) + Lisp_Object frame, cols, rows; { - register struct screen *s; + register struct frame *f; int mask; - CHECK_LIVE_SCREEN (screen, 0); + CHECK_LIVE_FRAME (frame, 0); CHECK_NUMBER (cols, 2); CHECK_NUMBER (rows, 1); - s = XSCREEN (screen); + f = XFRAME (frame); - if (SCREEN_IS_X (s)) + if (FRAME_IS_X (f)) { - if (XINT (rows) != s->height || XINT (cols) != s->width) - x_set_window_size (s, XINT (cols), XINT (rows)); + if (XINT (rows) != f->height || XINT (cols) != f->width) + x_set_window_size (f, XINT (cols), XINT (rows)); } else - change_screen_size (s, XINT (rows), XINT (cols), 0); + change_frame_size (f, XINT (rows), XINT (cols), 0); return Qnil; } -DEFUN ("set-screen-position", Fset_screen_position, - Sset_screen_position, 3, 3, 0, - "Sets position of SCREEN in pixels to XOFFSET by YOFFSET.\n\ +DEFUN ("set-frame-position", Fset_frame_position, + Sset_frame_position, 3, 3, 0, + "Sets position of FRAME in pixels to XOFFSET by YOFFSET.\n\ If XOFFSET or YOFFSET are negative, they are interpreted relative to\n\ -the leftmost or bottommost position SCREEN could occupy without going\n\ -off the screen.") - (screen, xoffset, yoffset) - Lisp_Object screen, xoffset, yoffset; +the leftmost or bottommost position FRAME could occupy without going\n\ +off the frame.") + (frame, xoffset, yoffset) + Lisp_Object frame, xoffset, yoffset; { - register struct screen *s; + register struct frame *f; int mask; - CHECK_LIVE_SCREEN (screen, 0); + CHECK_LIVE_FRAME (frame, 0); CHECK_NUMBER (xoffset, 1); CHECK_NUMBER (yoffset, 2); - s = XSCREEN (screen); + f = XFRAME (frame); - if (SCREEN_IS_X (s)) - x_set_offset (s, XINT (xoffset), XINT (yoffset)); + if (FRAME_IS_X (f)) + x_set_offset (f, XINT (xoffset), XINT (yoffset)); return Qt; } @@ -1088,14 +1088,14 @@ #ifndef HAVE_X11 DEFUN ("rubber-band-rectangle", Frubber_band_rectangle, Srubber_band_rectangle, 3, 3, "", - "Ask user to specify a window position and size on SCREEN with the mouse.\n\ -Arguments are SCREEN, NAME and GEO. NAME is a name to be displayed as\n\ + "Ask user to specify a window position and size on FRAME with the mouse.\n\ +Arguments are FRAME, NAME and GEO. NAME is a name to be displayed as\n\ the purpose of this rectangle. GEO is an X-windows size spec that can\n\ specify defaults for some sizes/positions. If GEO specifies everything,\n\ the mouse is not used.\n\ -Returns a list of five values: (SCREEN LEFT TOP WIDTH HEIGHT).") - (screen, name, geo) - Lisp_Object screen; +Returns a list of five values: (FRAME LEFT TOP WIDTH HEIGHT).") + (frame, name, geo) + Lisp_Object frame; Lisp_Object name; Lisp_Object geo; { @@ -1103,14 +1103,14 @@ Lisp_Object nums[4]; int i; - CHECK_SCREEN (screen, 0); + CHECK_FRAME (frame, 0); CHECK_STRING (name, 1); CHECK_STRING (geo, 2); - switch (XSCREEN (screen)->output_method) + switch (XFRAME (frame)->output_method) { case output_x_window: - x_rubber_band (XSCREEN (screen), &vals[0], &vals[1], &vals[2], &vals[3], + x_rubber_band (XFRAME (frame), &vals[0], &vals[1], &vals[2], &vals[3], XSTRING (geo)->data, XSTRING (name)->data); break; @@ -1120,102 +1120,102 @@ for (i = 0; i < 4; i++) XFASTINT (nums[i]) = vals[i]; - return Fcons (screen, Flist (4, nums)); + return Fcons (frame, Flist (4, nums)); return Qnil; } #endif /* not HAVE_X11 */ -choose_minibuf_screen () +choose_minibuf_frame () { - /* For lowest-level minibuf, put it on currently selected screen - if screen has a minibuffer. */ + /* For lowest-level minibuf, put it on currently selected frame + if frame has a minibuffer. */ if (minibuf_level == 0 - && selected_screen != 0 - && !EQ (minibuf_window, selected_screen->minibuffer_window) - && !EQ (Qnil, selected_screen->minibuffer_window)) + && selected_frame != 0 + && !EQ (minibuf_window, selected_frame->minibuffer_window) + && !EQ (Qnil, selected_frame->minibuffer_window)) { - Fset_window_buffer (selected_screen->minibuffer_window, + Fset_window_buffer (selected_frame->minibuffer_window, XWINDOW (minibuf_window)->buffer); - minibuf_window = selected_screen->minibuffer_window; + minibuf_window = selected_frame->minibuffer_window; } } -syms_of_screen () +syms_of_frame () { - Qscreenp = intern ("screenp"); - Qlive_screen_p = intern ("live_screen_p"); + Qframep = intern ("framep"); + Qlive_frame_p = intern ("live_frame_p"); Qminibuffer = intern ("minibuffer"); - staticpro (&Qscreenp); - staticpro (&Qlive_screen_p); + staticpro (&Qframep); + staticpro (&Qlive_frame_p); staticpro (&Qminibuffer); - staticpro (&Vscreen_list); + staticpro (&Vframe_list); - DEFVAR_LISP ("terminal-screen", &Vterminal_screen, - "The initial screen-object, which represents Emacs's stdout."); + DEFVAR_LISP ("terminal-frame", &Vterminal_frame, + "The initial frame-object, which represents Emacs's stdout."); DEFVAR_LISP ("emacs-iconified", &Vemacs_iconified, - "Non-nil if all of emacs is iconified and screen updates are not needed."); + "Non-nil if all of emacs is iconified and frame updates are not needed."); Vemacs_iconified = Qnil; - DEFVAR_LISP ("default-minibuffer-screen", &Vdefault_minibuffer_screen, - "Minibufferless screens use this screen's minibuffer.\n\ + DEFVAR_LISP ("default-minibuffer-frame", &Vdefault_minibuffer_frame, + "Minibufferless frames use this frame's minibuffer.\n\ \n\ -Emacs cannot create minibufferless screens unless this is set to an\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\ -screens; once the screen is created, it sticks with its assigned\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 screens, or where the minibuffer is currently being\n\ +current set of frames, or where the minibuffer is currently being\n\ displayed."); - Vdefault_minibuffer_screen = Qnil; + Vdefault_minibuffer_frame = Qnil; - DEFVAR_LISP ("default-screen-alist", &Vdefault_screen_alist, - "Alist of default values for screen creation.\n\ + 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-screen-alist '((width . 80) (height . 55)))\n\ + (setq default-frame-alist '((width . 80) (height . 55)))\n\ These override values given in window system configuration data, like\n\ X Windows' defaults database.\n\ -For values specific to the first Emacs screen, see `initial-screen-alist'.\n\ -For values specific to the separate minibuffer screen, see\n\ -`minibuffer-screen-alist'."); - Vdefault_screen_alist = Qnil; +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'."); + Vdefault_frame_alist = Qnil; - defsubr (&Sscreenp); - defsubr (&Slive_screen_p); - defsubr (&Sselect_screen); - defsubr (&Sselected_screen); - defsubr (&Swindow_screen); - defsubr (&Sscreen_root_window); - defsubr (&Sscreen_selected_window); - defsubr (&Sscreen_list); - defsubr (&Snext_screen); - defsubr (&Sdelete_screen); + defsubr (&Sframep); + defsubr (&Slive_frame_p); + defsubr (&Sselect_frame); + defsubr (&Sselected_frame); + defsubr (&Swindow_frame); + defsubr (&Sframe_root_window); + defsubr (&Sframe_selected_window); + defsubr (&Sframe_list); + defsubr (&Snext_frame); + defsubr (&Sdelete_frame); defsubr (&Smouse_position); defsubr (&Sset_mouse_position); #if 0 - defsubr (&Sscreen_configuration); - defsubr (&Srestore_screen_configuration); + defsubr (&Sframe_configuration); + defsubr (&Srestore_frame_configuration); #endif - defsubr (&Smake_screen_visible); - defsubr (&Smake_screen_invisible); - defsubr (&Siconify_screen); - defsubr (&Sscreen_visible_p); - defsubr (&Svisible_screen_list); - defsubr (&Sredirect_screen_focus); - defsubr (&Sscreen_focus); - defsubr (&Sscreen_parameters); - defsubr (&Smodify_screen_parameters); - defsubr (&Sscreen_pixel_size); - defsubr (&Sscreen_height); - defsubr (&Sscreen_width); - defsubr (&Sset_screen_height); - defsubr (&Sset_screen_width); - defsubr (&Sset_screen_size); - defsubr (&Sset_screen_position); + defsubr (&Smake_frame_visible); + defsubr (&Smake_frame_invisible); + defsubr (&Siconify_frame); + defsubr (&Sframe_visible_p); + defsubr (&Svisible_frame_list); + defsubr (&Sredirect_frame_focus); + defsubr (&Sframe_focus); + defsubr (&Sframe_parameters); + defsubr (&Smodify_frame_parameters); + defsubr (&Sframe_pixel_size); + defsubr (&Sframe_height); + defsubr (&Sframe_width); + defsubr (&Sset_frame_height); + defsubr (&Sset_frame_width); + defsubr (&Sset_frame_size); + defsubr (&Sset_frame_position); #ifndef HAVE_X11 defsubr (&Srubber_band_rectangle); #endif /* HAVE_X11 */