/* Generic frame functions.
- Copyright (C) 1993, 1994, 1995 Free Software Foundation.
+ Copyright (C) 1993, 1994, 1995, 1997 Free Software Foundation.
This file is part of GNU Emacs.
#include <config.h>
#include <stdio.h>
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
#include "lisp.h"
+#include "charset.h"
+#ifdef HAVE_WINDOW_SYSTEM
+#include "fontset.h"
+#include "xterm.h"
+#endif
#include "frame.h"
#include "termhooks.h"
+#include "dispextern.h"
#include "window.h"
#ifdef MSDOS
#include "msdos.h"
Lisp_Object Qmenu_bar_lines;
Lisp_Object Qwidth;
Lisp_Object Qx;
-Lisp_Object Qwin32;
+Lisp_Object Qw32;
Lisp_Object Qpc;
Lisp_Object Qvisible;
Lisp_Object Qbuffer_predicate;
+Lisp_Object Qbuffer_list;
Lisp_Object Qtitle;
Lisp_Object Vterminal_frame;
staticpro (&Qwidth);
Qx = intern ("x");
staticpro (&Qx);
- Qwin32 = intern ("win32");
- staticpro (&Qwin32);
+ 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);
}
}
-static void
+void
set_menu_bar_lines (f, value, oldval)
struct frame *f;
Lisp_Object value, oldval;
return Qt;
case output_x_window:
return Qx;
- case output_win32:
- return Qwin32;
+ case output_w32:
+ return Qw32;
case output_msdos_raw:
return Qpc;
default:
f->menu_bar_vector = Qnil;
f->menu_bar_items_used = 0;
f->buffer_predicate = Qnil;
+ f->buffer_list = Qnil;
#ifdef MULTI_KBOARD
f->kboard = initial_kboard;
#endif
if (XSTRING (Fbuffer_name (buf))->data[0] == ' ')
buf = Fother_buffer (buf, Qnil);
Fset_window_buffer (root_window, buf);
+
+ f->buffer_list = Fcons (buf, Qnil);
}
if (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;
}
\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). */
: Fcar (Vminibuffer_list)));
return f;
}
+#endif /* HAVE_WINDOW_SYSTEM */
\f
/* Construct a frame that refers to the terminal (stdin and stdout). */
Vframe_list = Fcons (frame, Vframe_list);
terminal_frame_count++;
- if (terminal_frame_count == 1)
- {
- f->name = build_string ("Emacs");
- }
- else
- {
- sprintf (name, "Emacs-%d", terminal_frame_count);
- f->name = build_string (name);
- }
+ sprintf (name, "F%d", terminal_frame_count);
+ f->name = build_string (name);
f->visible = 1; /* FRAME_SET_VISIBLE wd set frame_garbaged. */
f->async_visible = 1; /* Don't let visible be cleared later. */
if (NILP (force) && !other_visible_frames (f))
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))
+ error ("Attempt to delete the only frame");
+#endif
+
/* Does this frame have a minibuffer, and is it the surrogate
minibuffer for any other frame? */
if (FRAME_HAS_MINIBUF_P (XFRAME (frame)))
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_INSERTN_COST (f));
if (FRAME_DELETE_COST (f))
free (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
/* 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
FRAME_KBOARD (f)->Vdefault_minibuffer_frame = Qnil;
}
+ /* Cause frame titles to update--necessary if we now have just one frame. */
+ update_mode_lines = 1;
+
return Qnil;
}
\f
#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);
#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);
#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);
+ x_set_mouse_position (XFRAME (frame), XINT (x), XINT (y));
#else
#if defined (MSDOS) && defined (HAVE_MOUSE)
if (FRAME_MSDOS_P (XFRAME (frame)))
#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);
+ x_set_mouse_pixel_position (XFRAME (frame), XINT (x), XINT (y));
#else
#if defined (MSDOS) && defined (HAVE_MOUSE)
if (FRAME_MSDOS_P (XFRAME (frame)))
return selected_frame->buffer_predicate;
}
+/* Return the buffer-list of the selected frame. */
+
+Lisp_Object
+frame_buffer_list ()
+{
+ return selected_frame->buffer_list;
+}
+
+/* Set the buffer-list of the selected frame. */
+
+void
+set_frame_buffer_list (list)
+ Lisp_Object list;
+{
+ selected_frame->buffer_list = list;
+}
+
+/* Discard BUFFER from the buffer-list of each frame. */
+
+void
+frames_discard_buffer (buffer)
+ Lisp_Object buffer;
+{
+ Lisp_Object frame, tail;
+
+ FOR_EACH_FRAME (tail, frame)
+ {
+ XFRAME (frame)->buffer_list
+ = Fdelq (buffer, XFRAME (frame)->buffer_list);
+ }
+}
+
+/* Move BUFFER to the end of the buffer-list of each frame. */
+
+void
+frames_bury_buffer (buffer)
+ Lisp_Object buffer;
+{
+ Lisp_Object frame, tail;
+
+ FOR_EACH_FRAME (tail, frame)
+ {
+ XFRAME (frame)->buffer_list
+ = nconc2 (Fdelq (buffer, XFRAME (frame)->buffer_list),
+ Fcons (buffer, Qnil));
+ }
+}
+
/* Modify the alist in *ALISTPTR to associate PROP with VAL.
If the alist already has an element for PROP, we change it. */
Fsetcdr (tem, val);
}
+static int
+frame_name_fnn_p (str, len)
+ char *str;
+ int len;
+{
+ if (len > 1 && str[0] == 'F')
+ {
+ char *end_ptr;
+ long num = 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<num>. */
+ 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, 0);
+
+ /* 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<num>, 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<num> are usurped by Emacs");
+ }
+
+ f->name = name;
+ update_mode_lines = 1;
+}
+
void
store_frame_param (f, prop, val)
struct frame *f;
{
register Lisp_Object tem;
+ if (EQ (prop, Qbuffer_list))
+ {
+ f->buffer_list = val;
+ return;
+ }
+
tem = Fassq (prop, f->param_alist);
if (EQ (tem, Qnil))
f->param_alist = Fcons (Fcons (prop, val), f->param_alist);
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))
- error ("can't change the surrogate minibuffer of a frame with its own minibuffer");
+ 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");
/* Install the chosen minibuffer window, with proper buffer. */
f->minibuffer_window = val;
: 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 ());
/* I think this should be done with a hook. */
#ifdef HAVE_WINDOW_SYSTEM
"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; undefined PARMs are ignored.")
+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)
Lisp_Object frame, alist;
{
IT_set_frame_parameters (f, alist);
else
#endif
- for (tail = alist; !EQ (tail, Qnil); tail = Fcdr (tail))
- {
- elt = Fcar (tail);
- prop = Fcar (elt);
- val = Fcdr (elt);
- store_frame_param (f, prop, val);
- }
+ {
+ int length = XINT (Flength (alist));
+ int i;
+ Lisp_Object *parms
+ = (Lisp_Object *) alloca (length * sizeof (Lisp_Object));
+ Lisp_Object *values
+ = (Lisp_Object *) alloca (length * sizeof (Lisp_Object));
+
+ /* Extract parm names and values into those vectors. */
+
+ i = 0;
+ for (tail = alist; CONSP (tail); tail = Fcdr (tail))
+ {
+ Lisp_Object elt, prop, val;
+
+ elt = Fcar (tail);
+ parms[i] = Fcar (elt);
+ values[i] = Fcdr (elt);
+ i++;
+ }
+
+ /* Now process them in reverse of specified order. */
+ for (i--; i >= 0; i--)
+ {
+ prop = parms[i];
+ val = values[i];
+ store_frame_param (f, prop, val);
+ }
+ }
return Qnil;
}
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)
}
\f
+void
syms_of_frame ()
{
syms_of_frame_1 ();
defsubr (&Sset_frame_position);
}
+void
keys_of_frame ()
{
initial_define_lispy_key (global_map, "switch-frame", "handle-switch-frame");
HCoop / bpt / emacs.git / blobdiff