Mercurial > emacs
annotate src/frame.c @ 41743:d5bce152d420
(Marking Objects): `M-h' accepts prefix arg.
author | Kai Großjohann <kgrossjo@eu.uu.net> |
---|---|
date | Sat, 01 Dec 2001 13:06:43 +0000 |
parents | 0ef9924a634f |
children | 1e6231c9c359 |
rev | line source |
---|---|
765 | 1 /* Generic frame functions. |
36433
20b42ba5a623
(make_frame): Use allocate_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
35817
diff
changeset
|
2 Copyright (C) 1993, 1994, 1995, 1997, 1999, 2000, 2001 |
20b42ba5a623
(make_frame): Use allocate_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
35817
diff
changeset
|
3 Free Software Foundation. |
286 | 4 |
5 This file is part of GNU Emacs. | |
6 | |
7 GNU Emacs is free software; you can redistribute it and/or modify | |
8 it under the terms of the GNU General Public License as published by | |
708 | 9 the Free Software Foundation; either version 2, or (at your option) |
286 | 10 any later version. |
11 | |
12 GNU Emacs is distributed in the hope that it will be useful, | |
13 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
15 GNU General Public License for more details. | |
16 | |
17 You should have received a copy of the GNU General Public License | |
18 along with GNU Emacs; see the file COPYING. If not, write to | |
14186
ee40177f6c68
Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents:
14077
diff
changeset
|
19 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
ee40177f6c68
Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents:
14077
diff
changeset
|
20 Boston, MA 02111-1307, USA. */ |
286 | 21 |
7900
60795e826dad
Put stdio.h after config.h.
Richard M. Stallman <rms@gnu.org>
parents:
7646
diff
changeset
|
22 #include <config.h> |
363 | 23 |
7900
60795e826dad
Put stdio.h after config.h.
Richard M. Stallman <rms@gnu.org>
parents:
7646
diff
changeset
|
24 #include <stdio.h> |
987
afb21e974ed2
* frame.c (make_frame): Stop passing zero to make_window; it's not
Jim Blandy <jimb@redhat.com>
parents:
965
diff
changeset
|
25 #include "lisp.h" |
17032 | 26 #include "charset.h" |
21825
697991d2a2c4
Conditionally include xterm.h using HAVE_X_WINDOWS.
Geoff Voelker <voelker@cs.washington.edu>
parents:
21524
diff
changeset
|
27 #ifdef HAVE_X_WINDOWS |
21514 | 28 #include "xterm.h" |
17032 | 29 #endif |
27633
ab6c81c6edf8
[WINDOWSNT]: Include w32term.h.
Andrew Innes <andrewi@gnu.org>
parents:
27575
diff
changeset
|
30 #ifdef WINDOWSNT |
ab6c81c6edf8
[WINDOWSNT]: Include w32term.h.
Andrew Innes <andrewi@gnu.org>
parents:
27575
diff
changeset
|
31 #include "w32term.h" |
ab6c81c6edf8
[WINDOWSNT]: Include w32term.h.
Andrew Innes <andrewi@gnu.org>
parents:
27575
diff
changeset
|
32 #endif |
32752
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32545
diff
changeset
|
33 #ifdef macintosh |
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32545
diff
changeset
|
34 #include "macterm.h" |
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32545
diff
changeset
|
35 #endif |
31102
6a0caa788013
Include keyboard.h before frame.h.
Andrew Innes <andrewi@gnu.org>
parents:
29995
diff
changeset
|
36 #include "buffer.h" |
6a0caa788013
Include keyboard.h before frame.h.
Andrew Innes <andrewi@gnu.org>
parents:
29995
diff
changeset
|
37 /* These help us bind and responding to switch-frame events. */ |
6a0caa788013
Include keyboard.h before frame.h.
Andrew Innes <andrewi@gnu.org>
parents:
29995
diff
changeset
|
38 #include "commands.h" |
6a0caa788013
Include keyboard.h before frame.h.
Andrew Innes <andrewi@gnu.org>
parents:
29995
diff
changeset
|
39 #include "keyboard.h" |
987
afb21e974ed2
* frame.c (make_frame): Stop passing zero to make_window; it's not
Jim Blandy <jimb@redhat.com>
parents:
965
diff
changeset
|
40 #include "frame.h" |
23515
1e52542fb338
Include frame.h before fontset.h.
Kenichi Handa <handa@m17n.org>
parents:
22188
diff
changeset
|
41 #ifdef HAVE_WINDOW_SYSTEM |
1e52542fb338
Include frame.h before fontset.h.
Kenichi Handa <handa@m17n.org>
parents:
22188
diff
changeset
|
42 #include "fontset.h" |
1e52542fb338
Include frame.h before fontset.h.
Kenichi Handa <handa@m17n.org>
parents:
22188
diff
changeset
|
43 #endif |
5392
d8d5844c3ba6
Always include termhooks.h.
Richard M. Stallman <rms@gnu.org>
parents:
5231
diff
changeset
|
44 #include "termhooks.h" |
21514 | 45 #include "dispextern.h" |
7162
06a13bf36a8c
(Fframe_parameters) [!MULTI_FRAME]: Unstub it again.
Karl Heuer <kwzh@gnu.org>
parents:
7134
diff
changeset
|
46 #include "window.h" |
9572 | 47 #ifdef MSDOS |
48 #include "msdos.h" | |
25117
f6f34f0bc1af
(make_terminal_frame) [MSDOS]: Don't call
Eli Zaretskii <eliz@gnu.org>
parents:
25030
diff
changeset
|
49 #include "dosfns.h" |
9572 | 50 #endif |
732 | 51 |
965
0eb68c6c452a
* frame.c (Qheight, Qicon, Qmodeline, Qname, Qnone, Qonly,
Jim Blandy <jimb@redhat.com>
parents:
886
diff
changeset
|
52 Lisp_Object Qframep; |
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1809
diff
changeset
|
53 Lisp_Object Qframe_live_p; |
965
0eb68c6c452a
* frame.c (Qheight, Qicon, Qmodeline, Qname, Qnone, Qonly,
Jim Blandy <jimb@redhat.com>
parents:
886
diff
changeset
|
54 Lisp_Object Qheight; |
0eb68c6c452a
* frame.c (Qheight, Qicon, Qmodeline, Qname, Qnone, Qonly,
Jim Blandy <jimb@redhat.com>
parents:
886
diff
changeset
|
55 Lisp_Object Qicon; |
539 | 56 Lisp_Object Qminibuffer; |
965
0eb68c6c452a
* frame.c (Qheight, Qicon, Qmodeline, Qname, Qnone, Qonly,
Jim Blandy <jimb@redhat.com>
parents:
886
diff
changeset
|
57 Lisp_Object Qmodeline; |
0eb68c6c452a
* frame.c (Qheight, Qicon, Qmodeline, Qname, Qnone, Qonly,
Jim Blandy <jimb@redhat.com>
parents:
886
diff
changeset
|
58 Lisp_Object Qname; |
0eb68c6c452a
* frame.c (Qheight, Qicon, Qmodeline, Qname, Qnone, Qonly,
Jim Blandy <jimb@redhat.com>
parents:
886
diff
changeset
|
59 Lisp_Object Qonly; |
0eb68c6c452a
* frame.c (Qheight, Qicon, Qmodeline, Qname, Qnone, Qonly,
Jim Blandy <jimb@redhat.com>
parents:
886
diff
changeset
|
60 Lisp_Object Qunsplittable; |
2131
468df2d7e371
(x_frame_parms): Add elts for visibility and menu-bar-lines.
Richard M. Stallman <rms@gnu.org>
parents:
2068
diff
changeset
|
61 Lisp_Object Qmenu_bar_lines; |
25544
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25523
diff
changeset
|
62 Lisp_Object Qtool_bar_lines; |
965
0eb68c6c452a
* frame.c (Qheight, Qicon, Qmodeline, Qname, Qnone, Qonly,
Jim Blandy <jimb@redhat.com>
parents:
886
diff
changeset
|
63 Lisp_Object Qwidth; |
0eb68c6c452a
* frame.c (Qheight, Qicon, Qmodeline, Qname, Qnone, Qonly,
Jim Blandy <jimb@redhat.com>
parents:
886
diff
changeset
|
64 Lisp_Object Qx; |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16568
diff
changeset
|
65 Lisp_Object Qw32; |
15391
d4cec5d7566d
(Fset_mouse_position): Remove the DOS-specific
Richard M. Stallman <rms@gnu.org>
parents:
15062
diff
changeset
|
66 Lisp_Object Qpc; |
25523
9e9eeb68482e
(Fframep) [macintosh]: Handle mac frame type.
Richard M. Stallman <rms@gnu.org>
parents:
25350
diff
changeset
|
67 Lisp_Object Qmac; |
6246
128dc040e121
(next_frame, prev_frame): If MINIBUF is `visible',
Richard M. Stallman <rms@gnu.org>
parents:
6157
diff
changeset
|
68 Lisp_Object Qvisible; |
10207
e6618f52efe9
(Fmodify_frame_parameters): For non-X frames,
Richard M. Stallman <rms@gnu.org>
parents:
9972
diff
changeset
|
69 Lisp_Object Qbuffer_predicate; |
17221
0530a375eb21
(frame_buffer_list, set_frame_buffer_list): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
17032
diff
changeset
|
70 Lisp_Object Qbuffer_list; |
14217
673d1913844b
(syms_of_frame_1): Initialize Qtitle.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
71 Lisp_Object Qtitle; |
31399
db831ffcd565
(Qdisplay_type): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31102
diff
changeset
|
72 Lisp_Object Qdisplay_type; |
31448
70b366918608
(Fframe_parameter): Handle `name' and `background-mode'
Gerd Moellmann <gerd@gnu.org>
parents:
31442
diff
changeset
|
73 Lisp_Object Qbackground_mode; |
33509
a7d245e080d1
(syms_of_frame_1): Removed; code moved to syms_of_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
33005
diff
changeset
|
74 Lisp_Object Qinhibit_default_face_x_resources; |
41718
0ef9924a634f
(Qleft_fringe, Qright_fringe): New vars.
Kim F. Storm <storm@cua.dk>
parents:
41263
diff
changeset
|
75 Lisp_Object Qleft_fringe; |
0ef9924a634f
(Qleft_fringe, Qright_fringe): New vars.
Kim F. Storm <storm@cua.dk>
parents:
41263
diff
changeset
|
76 Lisp_Object Qright_fringe; |
286 | 77 |
12761
bffb5ea6fb43
Move various Q... vars to top of file, unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
12742
diff
changeset
|
78 Lisp_Object Vterminal_frame; |
13522
6a97ea1245b5
(syms_of_frame_1): Set up Vdefault_frame_alist here.
Richard M. Stallman <rms@gnu.org>
parents:
13498
diff
changeset
|
79 Lisp_Object Vdefault_frame_alist; |
27795
83292274bbd4
(Vmouse_position_function): New variable.
Dave Love <fx@gnu.org>
parents:
27725
diff
changeset
|
80 Lisp_Object Vmouse_position_function; |
12761
bffb5ea6fb43
Move various Q... vars to top of file, unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
12742
diff
changeset
|
81 |
bffb5ea6fb43
Move various Q... vars to top of file, unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
12742
diff
changeset
|
82 static void |
bffb5ea6fb43
Move various Q... vars to top of file, unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
12742
diff
changeset
|
83 set_menu_bar_lines_1 (window, n) |
bffb5ea6fb43
Move various Q... vars to top of file, unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
12742
diff
changeset
|
84 Lisp_Object window; |
bffb5ea6fb43
Move various Q... vars to top of file, unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
12742
diff
changeset
|
85 int n; |
bffb5ea6fb43
Move various Q... vars to top of file, unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
12742
diff
changeset
|
86 { |
bffb5ea6fb43
Move various Q... vars to top of file, unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
12742
diff
changeset
|
87 struct window *w = XWINDOW (window); |
bffb5ea6fb43
Move various Q... vars to top of file, unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
12742
diff
changeset
|
88 |
13498
c10046894834
(set_menu_bar_lines): Record the fact that the window configuration changes.
Richard M. Stallman <rms@gnu.org>
parents:
13412
diff
changeset
|
89 XSETFASTINT (w->last_modified, 0); |
12761
bffb5ea6fb43
Move various Q... vars to top of file, unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
12742
diff
changeset
|
90 XSETFASTINT (w->top, XFASTINT (w->top) + n); |
bffb5ea6fb43
Move various Q... vars to top of file, unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
12742
diff
changeset
|
91 XSETFASTINT (w->height, XFASTINT (w->height) - n); |
28010
5e3c139838a6
(x_set_menu_bar_lines_1): Adjust window's orig_top and
Gerd Moellmann <gerd@gnu.org>
parents:
27800
diff
changeset
|
92 |
5e3c139838a6
(x_set_menu_bar_lines_1): Adjust window's orig_top and
Gerd Moellmann <gerd@gnu.org>
parents:
27800
diff
changeset
|
93 if (INTEGERP (w->orig_top)) |
5e3c139838a6
(x_set_menu_bar_lines_1): Adjust window's orig_top and
Gerd Moellmann <gerd@gnu.org>
parents:
27800
diff
changeset
|
94 XSETFASTINT (w->orig_top, XFASTINT (w->orig_top) + n); |
5e3c139838a6
(x_set_menu_bar_lines_1): Adjust window's orig_top and
Gerd Moellmann <gerd@gnu.org>
parents:
27800
diff
changeset
|
95 if (INTEGERP (w->orig_height)) |
5e3c139838a6
(x_set_menu_bar_lines_1): Adjust window's orig_top and
Gerd Moellmann <gerd@gnu.org>
parents:
27800
diff
changeset
|
96 XSETFASTINT (w->orig_height, XFASTINT (w->orig_height) - n); |
12761
bffb5ea6fb43
Move various Q... vars to top of file, unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
12742
diff
changeset
|
97 |
bffb5ea6fb43
Move various Q... vars to top of file, unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
12742
diff
changeset
|
98 /* Handle just the top child in a vertical split. */ |
bffb5ea6fb43
Move various Q... vars to top of file, unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
12742
diff
changeset
|
99 if (!NILP (w->vchild)) |
bffb5ea6fb43
Move various Q... vars to top of file, unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
12742
diff
changeset
|
100 set_menu_bar_lines_1 (w->vchild, n); |
bffb5ea6fb43
Move various Q... vars to top of file, unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
12742
diff
changeset
|
101 |
bffb5ea6fb43
Move various Q... vars to top of file, unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
12742
diff
changeset
|
102 /* Adjust all children in a horizontal split. */ |
bffb5ea6fb43
Move various Q... vars to top of file, unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
12742
diff
changeset
|
103 for (window = w->hchild; !NILP (window); window = w->next) |
bffb5ea6fb43
Move various Q... vars to top of file, unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
12742
diff
changeset
|
104 { |
bffb5ea6fb43
Move various Q... vars to top of file, unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
12742
diff
changeset
|
105 w = XWINDOW (window); |
bffb5ea6fb43
Move various Q... vars to top of file, unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
12742
diff
changeset
|
106 set_menu_bar_lines_1 (window, n); |
bffb5ea6fb43
Move various Q... vars to top of file, unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
12742
diff
changeset
|
107 } |
bffb5ea6fb43
Move various Q... vars to top of file, unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
12742
diff
changeset
|
108 } |
bffb5ea6fb43
Move various Q... vars to top of file, unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
12742
diff
changeset
|
109 |
20038
bb460edc7187
(set_menu_bar_lines): Make the function external instead
Eli Zaretskii <eliz@gnu.org>
parents:
19532
diff
changeset
|
110 void |
12761
bffb5ea6fb43
Move various Q... vars to top of file, unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
12742
diff
changeset
|
111 set_menu_bar_lines (f, value, oldval) |
bffb5ea6fb43
Move various Q... vars to top of file, unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
12742
diff
changeset
|
112 struct frame *f; |
bffb5ea6fb43
Move various Q... vars to top of file, unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
12742
diff
changeset
|
113 Lisp_Object value, oldval; |
bffb5ea6fb43
Move various Q... vars to top of file, unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
12742
diff
changeset
|
114 { |
bffb5ea6fb43
Move various Q... vars to top of file, unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
12742
diff
changeset
|
115 int nlines; |
bffb5ea6fb43
Move various Q... vars to top of file, unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
12742
diff
changeset
|
116 int olines = FRAME_MENU_BAR_LINES (f); |
bffb5ea6fb43
Move various Q... vars to top of file, unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
12742
diff
changeset
|
117 |
bffb5ea6fb43
Move various Q... vars to top of file, unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
12742
diff
changeset
|
118 /* Right now, menu bars don't work properly in minibuf-only frames; |
bffb5ea6fb43
Move various Q... vars to top of file, unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
12742
diff
changeset
|
119 most of the commands try to apply themselves to the minibuffer |
16051
ccf489f8596e
Removed support for !MULTI_FRAME.
Karl Heuer <kwzh@gnu.org>
parents:
15696
diff
changeset
|
120 frame itself, and get an error because you can't switch buffers |
12761
bffb5ea6fb43
Move various Q... vars to top of file, unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
12742
diff
changeset
|
121 in or split the minibuffer window. */ |
bffb5ea6fb43
Move various Q... vars to top of file, unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
12742
diff
changeset
|
122 if (FRAME_MINIBUF_ONLY_P (f)) |
bffb5ea6fb43
Move various Q... vars to top of file, unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
12742
diff
changeset
|
123 return; |
bffb5ea6fb43
Move various Q... vars to top of file, unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
12742
diff
changeset
|
124 |
bffb5ea6fb43
Move various Q... vars to top of file, unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
12742
diff
changeset
|
125 if (INTEGERP (value)) |
bffb5ea6fb43
Move various Q... vars to top of file, unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
12742
diff
changeset
|
126 nlines = XINT (value); |
bffb5ea6fb43
Move various Q... vars to top of file, unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
12742
diff
changeset
|
127 else |
bffb5ea6fb43
Move various Q... vars to top of file, unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
12742
diff
changeset
|
128 nlines = 0; |
bffb5ea6fb43
Move various Q... vars to top of file, unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
12742
diff
changeset
|
129 |
13498
c10046894834
(set_menu_bar_lines): Record the fact that the window configuration changes.
Richard M. Stallman <rms@gnu.org>
parents:
13412
diff
changeset
|
130 if (nlines != olines) |
c10046894834
(set_menu_bar_lines): Record the fact that the window configuration changes.
Richard M. Stallman <rms@gnu.org>
parents:
13412
diff
changeset
|
131 { |
c10046894834
(set_menu_bar_lines): Record the fact that the window configuration changes.
Richard M. Stallman <rms@gnu.org>
parents:
13412
diff
changeset
|
132 windows_or_buffers_changed++; |
c10046894834
(set_menu_bar_lines): Record the fact that the window configuration changes.
Richard M. Stallman <rms@gnu.org>
parents:
13412
diff
changeset
|
133 FRAME_WINDOW_SIZES_CHANGED (f) = 1; |
c10046894834
(set_menu_bar_lines): Record the fact that the window configuration changes.
Richard M. Stallman <rms@gnu.org>
parents:
13412
diff
changeset
|
134 FRAME_MENU_BAR_LINES (f) = nlines; |
c10046894834
(set_menu_bar_lines): Record the fact that the window configuration changes.
Richard M. Stallman <rms@gnu.org>
parents:
13412
diff
changeset
|
135 set_menu_bar_lines_1 (f->root_window, nlines - olines); |
25030
c69d9e48269b
(make_frame): Set n_current_toolbar_items to 0.
Gerd Moellmann <gerd@gnu.org>
parents:
23746
diff
changeset
|
136 adjust_glyphs (f); |
13498
c10046894834
(set_menu_bar_lines): Record the fact that the window configuration changes.
Richard M. Stallman <rms@gnu.org>
parents:
13412
diff
changeset
|
137 } |
12761
bffb5ea6fb43
Move various Q... vars to top of file, unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
12742
diff
changeset
|
138 } |
bffb5ea6fb43
Move various Q... vars to top of file, unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
12742
diff
changeset
|
139 |
bffb5ea6fb43
Move various Q... vars to top of file, unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
12742
diff
changeset
|
140 Lisp_Object Vemacs_iconified; |
bffb5ea6fb43
Move various Q... vars to top of file, unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
12742
diff
changeset
|
141 Lisp_Object Vframe_list; |
bffb5ea6fb43
Move various Q... vars to top of file, unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
12742
diff
changeset
|
142 |
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26164
diff
changeset
|
143 struct x_output tty_display; |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26164
diff
changeset
|
144 |
286 | 145 extern Lisp_Object Vminibuffer_list; |
146 extern Lisp_Object get_minibuffer (); | |
5172
9aa201005b16
(Fhandle_switch_frame, Fredirect_frame_focus): Declared.
Richard M. Stallman <rms@gnu.org>
parents:
5105
diff
changeset
|
147 extern Lisp_Object Fhandle_switch_frame (); |
9aa201005b16
(Fhandle_switch_frame, Fredirect_frame_focus): Declared.
Richard M. Stallman <rms@gnu.org>
parents:
5105
diff
changeset
|
148 extern Lisp_Object Fredirect_frame_focus (); |
12005 | 149 extern Lisp_Object x_get_focus_frame (); |
286 | 150 |
765 | 151 DEFUN ("framep", Fframep, Sframep, 1, 1, 0, |
40105
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
152 doc: /* Return non-nil if OBJECT is a frame. |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
153 Value is t for a termcap frame (a character-only terminal), |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
154 `x' for an Emacs frame that is really an X window, |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
155 `w32' for an Emacs frame that is a window on MS-Windows display, |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
156 `mac' for an Emacs frame on a Macintosh display, |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
157 `pc' for a direct-write MS-DOS frame. |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
158 See also `frame-live-p'. */) |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
159 (object) |
454 | 160 Lisp_Object object; |
286 | 161 { |
9127
0b4836daa8e1
(Fframep, make_frame_without_minibuffer, do_switch_frame, prev_frame,
Karl Heuer <kwzh@gnu.org>
parents:
9032
diff
changeset
|
162 if (!FRAMEP (object)) |
286 | 163 return Qnil; |
765 | 164 switch (XFRAME (object)->output_method) |
286 | 165 { |
166 case output_termcap: | |
167 return Qt; | |
168 case output_x_window: | |
965
0eb68c6c452a
* frame.c (Qheight, Qicon, Qmodeline, Qname, Qnone, Qonly,
Jim Blandy <jimb@redhat.com>
parents:
886
diff
changeset
|
169 return Qx; |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16568
diff
changeset
|
170 case output_w32: |
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16568
diff
changeset
|
171 return Qw32; |
15391
d4cec5d7566d
(Fset_mouse_position): Remove the DOS-specific
Richard M. Stallman <rms@gnu.org>
parents:
15062
diff
changeset
|
172 case output_msdos_raw: |
d4cec5d7566d
(Fset_mouse_position): Remove the DOS-specific
Richard M. Stallman <rms@gnu.org>
parents:
15062
diff
changeset
|
173 return Qpc; |
25523
9e9eeb68482e
(Fframep) [macintosh]: Handle mac frame type.
Richard M. Stallman <rms@gnu.org>
parents:
25350
diff
changeset
|
174 case output_mac: |
9e9eeb68482e
(Fframep) [macintosh]: Handle mac frame type.
Richard M. Stallman <rms@gnu.org>
parents:
25350
diff
changeset
|
175 return Qmac; |
286 | 176 default: |
177 abort (); | |
178 } | |
179 } | |
180 | |
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1809
diff
changeset
|
181 DEFUN ("frame-live-p", Fframe_live_p, Sframe_live_p, 1, 1, 0, |
40105
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
182 doc: /* Return non-nil if OBJECT is a frame which has not been deleted. |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
183 Value is nil if OBJECT is not a live frame. If object is a live |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
184 frame, the return value indicates what sort of output device it is |
41239 | 185 displayed on. See the documentation of `framep' for possible |
40568 | 186 return values. */) |
40105
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
187 (object) |
454 | 188 Lisp_Object object; |
189 { | |
765 | 190 return ((FRAMEP (object) |
191 && FRAME_LIVE_P (XFRAME (object))) | |
192 ? Fframep (object) | |
454 | 193 : Qnil); |
194 } | |
195 | |
765 | 196 struct frame * |
197 make_frame (mini_p) | |
286 | 198 int mini_p; |
199 { | |
765 | 200 Lisp_Object frame; |
201 register struct frame *f; | |
286 | 202 register Lisp_Object root_window; |
203 register Lisp_Object mini_window; | |
204 | |
36433
20b42ba5a623
(make_frame): Use allocate_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
35817
diff
changeset
|
205 f = allocate_frame (); |
9972
92b33538b36a
(make_frame): Use allocate_vectorlike and VECSIZE.
Karl Heuer <kwzh@gnu.org>
parents:
9901
diff
changeset
|
206 XSETFRAME (frame, f); |
286 | 207 |
25030
c69d9e48269b
(make_frame): Set n_current_toolbar_items to 0.
Gerd Moellmann <gerd@gnu.org>
parents:
23746
diff
changeset
|
208 f->desired_matrix = 0; |
c69d9e48269b
(make_frame): Set n_current_toolbar_items to 0.
Gerd Moellmann <gerd@gnu.org>
parents:
23746
diff
changeset
|
209 f->current_matrix = 0; |
c69d9e48269b
(make_frame): Set n_current_toolbar_items to 0.
Gerd Moellmann <gerd@gnu.org>
parents:
23746
diff
changeset
|
210 f->desired_pool = 0; |
c69d9e48269b
(make_frame): Set n_current_toolbar_items to 0.
Gerd Moellmann <gerd@gnu.org>
parents:
23746
diff
changeset
|
211 f->current_pool = 0; |
c69d9e48269b
(make_frame): Set n_current_toolbar_items to 0.
Gerd Moellmann <gerd@gnu.org>
parents:
23746
diff
changeset
|
212 f->glyphs_initialized_p = 0; |
c69d9e48269b
(make_frame): Set n_current_toolbar_items to 0.
Gerd Moellmann <gerd@gnu.org>
parents:
23746
diff
changeset
|
213 f->decode_mode_spec_buffer = 0; |
765 | 214 f->visible = 0; |
1652
93497cd89204
* frame.c (make_frame): Initialize async_visible and
Jim Blandy <jimb@redhat.com>
parents:
1514
diff
changeset
|
215 f->async_visible = 0; |
12667
a3466dad7d6d
Renamings: frame->display => frame->output, struct x_display -> sruct x_output.
Richard M. Stallman <rms@gnu.org>
parents:
12630
diff
changeset
|
216 f->output_data.nothing = 0; |
765 | 217 f->iconified = 0; |
1652
93497cd89204
* frame.c (make_frame): Initialize async_visible and
Jim Blandy <jimb@redhat.com>
parents:
1514
diff
changeset
|
218 f->async_iconified = 0; |
765 | 219 f->wants_modeline = 1; |
220 f->auto_raise = 0; | |
221 f->auto_lower = 0; | |
222 f->no_split = 0; | |
27725
fb13a4706619
(make_frame): Set frame initiallly to `garbaged'.
Gerd Moellmann <gerd@gnu.org>
parents:
27633
diff
changeset
|
223 f->garbaged = 1; |
765 | 224 f->has_minibuffer = mini_p; |
1709
b86b3237e017
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1691
diff
changeset
|
225 f->focus_frame = Qnil; |
1006
a13ee72d74a2
* frame.c (make_frame): Clear the explicit_name member of the new
Jim Blandy <jimb@redhat.com>
parents:
987
diff
changeset
|
226 f->explicit_name = 0; |
1989
b1c1ab20f810
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1920
diff
changeset
|
227 f->can_have_scroll_bars = 0; |
16263
a369af16e836
(make_frame): Switch from boolean `has_vertical_scrollbars' integer to
Richard M. Stallman <rms@gnu.org>
parents:
16184
diff
changeset
|
228 f->vertical_scroll_bar_type = vertical_scroll_bar_none; |
765 | 229 f->param_alist = Qnil; |
1989
b1c1ab20f810
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1920
diff
changeset
|
230 f->scroll_bars = Qnil; |
b1c1ab20f810
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1920
diff
changeset
|
231 f->condemned_scroll_bars = Qnil; |
2417
8c07933beed9
(make_frame): Init face_alist field.
Richard M. Stallman <rms@gnu.org>
parents:
2298
diff
changeset
|
232 f->face_alist = Qnil; |
25030
c69d9e48269b
(make_frame): Set n_current_toolbar_items to 0.
Gerd Moellmann <gerd@gnu.org>
parents:
23746
diff
changeset
|
233 f->face_cache = NULL; |
6130
d4e5878462cb
(make_frame): Init menu_bar_items field to 0.
Richard M. Stallman <rms@gnu.org>
parents:
6054
diff
changeset
|
234 f->menu_bar_items = Qnil; |
7095
098b87bde5a7
(make_frame): Initialize fields menu_bar_vector and menu_bar_items_used.
Richard M. Stallman <rms@gnu.org>
parents:
7055
diff
changeset
|
235 f->menu_bar_vector = Qnil; |
098b87bde5a7
(make_frame): Initialize fields menu_bar_vector and menu_bar_items_used.
Richard M. Stallman <rms@gnu.org>
parents:
7055
diff
changeset
|
236 f->menu_bar_items_used = 0; |
10207
e6618f52efe9
(Fmodify_frame_parameters): For non-X frames,
Richard M. Stallman <rms@gnu.org>
parents:
9972
diff
changeset
|
237 f->buffer_predicate = Qnil; |
17221
0530a375eb21
(frame_buffer_list, set_frame_buffer_list): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
17032
diff
changeset
|
238 f->buffer_list = Qnil; |
11017
f7c4ece024d5
(make_frame): Initialize kboard member.
Karl Heuer <kwzh@gnu.org>
parents:
10853
diff
changeset
|
239 #ifdef MULTI_KBOARD |
f7c4ece024d5
(make_frame): Initialize kboard member.
Karl Heuer <kwzh@gnu.org>
parents:
10853
diff
changeset
|
240 f->kboard = initial_kboard; |
f7c4ece024d5
(make_frame): Initialize kboard member.
Karl Heuer <kwzh@gnu.org>
parents:
10853
diff
changeset
|
241 #endif |
14303
48e3ee5005cd
(make_frame): Initialize title parameter to Qnil.
Karl Heuer <kwzh@gnu.org>
parents:
14223
diff
changeset
|
242 f->namebuf = 0; |
14223
596bb10704dd
(make_frame): Initialize frame title field to nil.
Erik Naggum <erik@naggum.no>
parents:
14217
diff
changeset
|
243 f->title = Qnil; |
25030
c69d9e48269b
(make_frame): Set n_current_toolbar_items to 0.
Gerd Moellmann <gerd@gnu.org>
parents:
23746
diff
changeset
|
244 f->menu_bar_window = Qnil; |
25544
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25523
diff
changeset
|
245 f->tool_bar_window = Qnil; |
33760
22dc6e2e7410
(make_frame): Change initialization of tool bar
Gerd Moellmann <gerd@gnu.org>
parents:
33512
diff
changeset
|
246 f->tool_bar_items = Qnil; |
25544
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25523
diff
changeset
|
247 f->desired_tool_bar_string = f->current_tool_bar_string = Qnil; |
33760
22dc6e2e7410
(make_frame): Change initialization of tool bar
Gerd Moellmann <gerd@gnu.org>
parents:
33512
diff
changeset
|
248 f->n_tool_bar_items = 0; |
286 | 249 |
987
afb21e974ed2
* frame.c (make_frame): Stop passing zero to make_window; it's not
Jim Blandy <jimb@redhat.com>
parents:
965
diff
changeset
|
250 root_window = make_window (); |
286 | 251 if (mini_p) |
252 { | |
987
afb21e974ed2
* frame.c (make_frame): Stop passing zero to make_window; it's not
Jim Blandy <jimb@redhat.com>
parents:
965
diff
changeset
|
253 mini_window = make_window (); |
286 | 254 XWINDOW (root_window)->next = mini_window; |
255 XWINDOW (mini_window)->prev = root_window; | |
256 XWINDOW (mini_window)->mini_p = Qt; | |
765 | 257 XWINDOW (mini_window)->frame = frame; |
258 f->minibuffer_window = mini_window; | |
286 | 259 } |
260 else | |
261 { | |
262 mini_window = Qnil; | |
263 XWINDOW (root_window)->next = Qnil; | |
765 | 264 f->minibuffer_window = Qnil; |
286 | 265 } |
266 | |
765 | 267 XWINDOW (root_window)->frame = frame; |
286 | 268 |
269 /* 10 is arbitrary, | |
270 just so that there is "something there." | |
765 | 271 Correct size will be set up later with change_frame_size. */ |
286 | 272 |
16263
a369af16e836
(make_frame): Switch from boolean `has_vertical_scrollbars' integer to
Richard M. Stallman <rms@gnu.org>
parents:
16184
diff
changeset
|
273 SET_FRAME_WIDTH (f, 10); |
765 | 274 f->height = 10; |
286 | 275 |
9309
27370f65dfa1
(make_frame, Fframe_parameters, Fselected_frame, syms_of_frame): Don't use
Karl Heuer <kwzh@gnu.org>
parents:
9268
diff
changeset
|
276 XSETFASTINT (XWINDOW (root_window)->width, 10); |
27370f65dfa1
(make_frame, Fframe_parameters, Fselected_frame, syms_of_frame): Don't use
Karl Heuer <kwzh@gnu.org>
parents:
9268
diff
changeset
|
277 XSETFASTINT (XWINDOW (root_window)->height, (mini_p ? 9 : 10)); |
286 | 278 |
279 if (mini_p) | |
280 { | |
9309
27370f65dfa1
(make_frame, Fframe_parameters, Fselected_frame, syms_of_frame): Don't use
Karl Heuer <kwzh@gnu.org>
parents:
9268
diff
changeset
|
281 XSETFASTINT (XWINDOW (mini_window)->width, 10); |
27370f65dfa1
(make_frame, Fframe_parameters, Fselected_frame, syms_of_frame): Don't use
Karl Heuer <kwzh@gnu.org>
parents:
9268
diff
changeset
|
282 XSETFASTINT (XWINDOW (mini_window)->top, 9); |
27370f65dfa1
(make_frame, Fframe_parameters, Fselected_frame, syms_of_frame): Don't use
Karl Heuer <kwzh@gnu.org>
parents:
9268
diff
changeset
|
283 XSETFASTINT (XWINDOW (mini_window)->height, 1); |
286 | 284 } |
285 | |
765 | 286 /* Choose a buffer for the frame's root window. */ |
386 | 287 { |
288 Lisp_Object buf; | |
289 | |
290 XWINDOW (root_window)->buffer = Qt; | |
291 buf = Fcurrent_buffer (); | |
292 /* If buf is a 'hidden' buffer (i.e. one whose name starts with | |
293 a space), try to find another one. */ | |
294 if (XSTRING (Fbuffer_name (buf))->data[0] == ' ') | |
22188
9fba463768ec
(frame_buffer_predicate): New arg FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
21825
diff
changeset
|
295 buf = Fother_buffer (buf, Qnil, Qnil); |
17221
0530a375eb21
(frame_buffer_list, set_frame_buffer_list): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
17032
diff
changeset
|
296 |
25030
c69d9e48269b
(make_frame): Set n_current_toolbar_items to 0.
Gerd Moellmann <gerd@gnu.org>
parents:
23746
diff
changeset
|
297 /* Use set_window_buffer, not Fset_window_buffer, and don't let |
c69d9e48269b
(make_frame): Set n_current_toolbar_items to 0.
Gerd Moellmann <gerd@gnu.org>
parents:
23746
diff
changeset
|
298 hooks be run by it. The reason is that the whole frame/window |
c69d9e48269b
(make_frame): Set n_current_toolbar_items to 0.
Gerd Moellmann <gerd@gnu.org>
parents:
23746
diff
changeset
|
299 arrangement is not yet fully intialized at this point. Windows |
c69d9e48269b
(make_frame): Set n_current_toolbar_items to 0.
Gerd Moellmann <gerd@gnu.org>
parents:
23746
diff
changeset
|
300 don't have the right size, glyph matrices aren't initialized |
c69d9e48269b
(make_frame): Set n_current_toolbar_items to 0.
Gerd Moellmann <gerd@gnu.org>
parents:
23746
diff
changeset
|
301 etc. Running Lisp functions at this point surely ends in a |
c69d9e48269b
(make_frame): Set n_current_toolbar_items to 0.
Gerd Moellmann <gerd@gnu.org>
parents:
23746
diff
changeset
|
302 SEGV. */ |
c69d9e48269b
(make_frame): Set n_current_toolbar_items to 0.
Gerd Moellmann <gerd@gnu.org>
parents:
23746
diff
changeset
|
303 set_window_buffer (root_window, buf, 0); |
17221
0530a375eb21
(frame_buffer_list, set_frame_buffer_list): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
17032
diff
changeset
|
304 f->buffer_list = Fcons (buf, Qnil); |
386 | 305 } |
306 | |
286 | 307 if (mini_p) |
308 { | |
309 XWINDOW (mini_window)->buffer = Qt; | |
25030
c69d9e48269b
(make_frame): Set n_current_toolbar_items to 0.
Gerd Moellmann <gerd@gnu.org>
parents:
23746
diff
changeset
|
310 set_window_buffer (mini_window, |
c69d9e48269b
(make_frame): Set n_current_toolbar_items to 0.
Gerd Moellmann <gerd@gnu.org>
parents:
23746
diff
changeset
|
311 (NILP (Vminibuffer_list) |
c69d9e48269b
(make_frame): Set n_current_toolbar_items to 0.
Gerd Moellmann <gerd@gnu.org>
parents:
23746
diff
changeset
|
312 ? get_minibuffer (0) |
c69d9e48269b
(make_frame): Set n_current_toolbar_items to 0.
Gerd Moellmann <gerd@gnu.org>
parents:
23746
diff
changeset
|
313 : Fcar (Vminibuffer_list)), |
c69d9e48269b
(make_frame): Set n_current_toolbar_items to 0.
Gerd Moellmann <gerd@gnu.org>
parents:
23746
diff
changeset
|
314 0); |
286 | 315 } |
316 | |
765 | 317 f->root_window = root_window; |
318 f->selected_window = root_window; | |
363 | 319 /* Make sure this window seems more recently used than |
320 a newly-created, never-selected window. */ | |
9309
27370f65dfa1
(make_frame, Fframe_parameters, Fselected_frame, syms_of_frame): Don't use
Karl Heuer <kwzh@gnu.org>
parents:
9268
diff
changeset
|
321 XSETFASTINT (XWINDOW (f->selected_window)->use_time, ++window_select_count); |
286 | 322 |
765 | 323 return f; |
286 | 324 } |
325 | |
21359
f66e706fc9d6
(make_frame_without_minibuffer): Conditionalize on HAVE_WINDOW_SYSTEM.
Richard M. Stallman <rms@gnu.org>
parents:
21244
diff
changeset
|
326 #ifdef HAVE_WINDOW_SYSTEM |
765 | 327 /* Make a frame using a separate minibuffer window on another frame. |
286 | 328 MINI_WINDOW is the minibuffer window to use. nil means use the |
329 default (the global minibuffer). */ | |
330 | |
765 | 331 struct frame * |
12010
57eb365d32f0
(make_frame_without_minibuffer): New arg DISPLAY.
Karl Heuer <kwzh@gnu.org>
parents:
12006
diff
changeset
|
332 make_frame_without_minibuffer (mini_window, kb, display) |
286 | 333 register Lisp_Object mini_window; |
11775
fe7852953b75
(make_frame_without_minibuffer): New arg KB.
Karl Heuer <kwzh@gnu.org>
parents:
11773
diff
changeset
|
334 KBOARD *kb; |
12010
57eb365d32f0
(make_frame_without_minibuffer): New arg DISPLAY.
Karl Heuer <kwzh@gnu.org>
parents:
12006
diff
changeset
|
335 Lisp_Object display; |
286 | 336 { |
765 | 337 register struct frame *f; |
15555
5ceed3aa6a1c
(make_frame_without_minibuffer): GCPRO the frame f.
Richard M. Stallman <rms@gnu.org>
parents:
15396
diff
changeset
|
338 struct gcpro gcpro1; |
286 | 339 |
12010
57eb365d32f0
(make_frame_without_minibuffer): New arg DISPLAY.
Karl Heuer <kwzh@gnu.org>
parents:
12006
diff
changeset
|
340 if (!NILP (mini_window)) |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
341 CHECK_LIVE_WINDOW (mini_window); |
286 | 342 |
11775
fe7852953b75
(make_frame_without_minibuffer): New arg KB.
Karl Heuer <kwzh@gnu.org>
parents:
11773
diff
changeset
|
343 #ifdef MULTI_KBOARD |
12010
57eb365d32f0
(make_frame_without_minibuffer): New arg DISPLAY.
Karl Heuer <kwzh@gnu.org>
parents:
12006
diff
changeset
|
344 if (!NILP (mini_window) |
57eb365d32f0
(make_frame_without_minibuffer): New arg DISPLAY.
Karl Heuer <kwzh@gnu.org>
parents:
12006
diff
changeset
|
345 && XFRAME (XWINDOW (mini_window)->frame)->kboard != kb) |
11775
fe7852953b75
(make_frame_without_minibuffer): New arg KB.
Karl Heuer <kwzh@gnu.org>
parents:
11773
diff
changeset
|
346 error ("frame and minibuffer must be on the same display"); |
fe7852953b75
(make_frame_without_minibuffer): New arg KB.
Karl Heuer <kwzh@gnu.org>
parents:
11773
diff
changeset
|
347 #endif |
fe7852953b75
(make_frame_without_minibuffer): New arg KB.
Karl Heuer <kwzh@gnu.org>
parents:
11773
diff
changeset
|
348 |
765 | 349 /* Make a frame containing just a root window. */ |
350 f = make_frame (0); | |
286 | 351 |
12010
57eb365d32f0
(make_frame_without_minibuffer): New arg DISPLAY.
Karl Heuer <kwzh@gnu.org>
parents:
12006
diff
changeset
|
352 if (NILP (mini_window)) |
57eb365d32f0
(make_frame_without_minibuffer): New arg DISPLAY.
Karl Heuer <kwzh@gnu.org>
parents:
12006
diff
changeset
|
353 { |
57eb365d32f0
(make_frame_without_minibuffer): New arg DISPLAY.
Karl Heuer <kwzh@gnu.org>
parents:
12006
diff
changeset
|
354 /* Use default-minibuffer-frame if possible. */ |
57eb365d32f0
(make_frame_without_minibuffer): New arg DISPLAY.
Karl Heuer <kwzh@gnu.org>
parents:
12006
diff
changeset
|
355 if (!FRAMEP (kb->Vdefault_minibuffer_frame) |
57eb365d32f0
(make_frame_without_minibuffer): New arg DISPLAY.
Karl Heuer <kwzh@gnu.org>
parents:
12006
diff
changeset
|
356 || ! FRAME_LIVE_P (XFRAME (kb->Vdefault_minibuffer_frame))) |
57eb365d32f0
(make_frame_without_minibuffer): New arg DISPLAY.
Karl Heuer <kwzh@gnu.org>
parents:
12006
diff
changeset
|
357 { |
15555
5ceed3aa6a1c
(make_frame_without_minibuffer): GCPRO the frame f.
Richard M. Stallman <rms@gnu.org>
parents:
15396
diff
changeset
|
358 Lisp_Object frame_dummy; |
5ceed3aa6a1c
(make_frame_without_minibuffer): GCPRO the frame f.
Richard M. Stallman <rms@gnu.org>
parents:
15396
diff
changeset
|
359 |
5ceed3aa6a1c
(make_frame_without_minibuffer): GCPRO the frame f.
Richard M. Stallman <rms@gnu.org>
parents:
15396
diff
changeset
|
360 XSETFRAME (frame_dummy, f); |
5ceed3aa6a1c
(make_frame_without_minibuffer): GCPRO the frame f.
Richard M. Stallman <rms@gnu.org>
parents:
15396
diff
changeset
|
361 GCPRO1 (frame_dummy); |
12010
57eb365d32f0
(make_frame_without_minibuffer): New arg DISPLAY.
Karl Heuer <kwzh@gnu.org>
parents:
12006
diff
changeset
|
362 /* If there's no minibuffer frame to use, create one. */ |
15555
5ceed3aa6a1c
(make_frame_without_minibuffer): GCPRO the frame f.
Richard M. Stallman <rms@gnu.org>
parents:
15396
diff
changeset
|
363 kb->Vdefault_minibuffer_frame = |
5ceed3aa6a1c
(make_frame_without_minibuffer): GCPRO the frame f.
Richard M. Stallman <rms@gnu.org>
parents:
15396
diff
changeset
|
364 call1 (intern ("make-initial-minibuffer-frame"), display); |
5ceed3aa6a1c
(make_frame_without_minibuffer): GCPRO the frame f.
Richard M. Stallman <rms@gnu.org>
parents:
15396
diff
changeset
|
365 UNGCPRO; |
12010
57eb365d32f0
(make_frame_without_minibuffer): New arg DISPLAY.
Karl Heuer <kwzh@gnu.org>
parents:
12006
diff
changeset
|
366 } |
15555
5ceed3aa6a1c
(make_frame_without_minibuffer): GCPRO the frame f.
Richard M. Stallman <rms@gnu.org>
parents:
15396
diff
changeset
|
367 |
12010
57eb365d32f0
(make_frame_without_minibuffer): New arg DISPLAY.
Karl Heuer <kwzh@gnu.org>
parents:
12006
diff
changeset
|
368 mini_window = XFRAME (kb->Vdefault_minibuffer_frame)->minibuffer_window; |
57eb365d32f0
(make_frame_without_minibuffer): New arg DISPLAY.
Karl Heuer <kwzh@gnu.org>
parents:
12006
diff
changeset
|
369 } |
15001
c74ce6421d04
(make_frame_without_minibuffer): Don't change the
Richard M. Stallman <rms@gnu.org>
parents:
14966
diff
changeset
|
370 |
765 | 371 f->minibuffer_window = mini_window; |
15001
c74ce6421d04
(make_frame_without_minibuffer): Don't change the
Richard M. Stallman <rms@gnu.org>
parents:
14966
diff
changeset
|
372 |
c74ce6421d04
(make_frame_without_minibuffer): Don't change the
Richard M. Stallman <rms@gnu.org>
parents:
14966
diff
changeset
|
373 /* Make the chosen minibuffer window display the proper minibuffer, |
c74ce6421d04
(make_frame_without_minibuffer): Don't change the
Richard M. Stallman <rms@gnu.org>
parents:
14966
diff
changeset
|
374 unless it is already showing a minibuffer. */ |
c74ce6421d04
(make_frame_without_minibuffer): Don't change the
Richard M. Stallman <rms@gnu.org>
parents:
14966
diff
changeset
|
375 if (NILP (Fmemq (XWINDOW (mini_window)->buffer, Vminibuffer_list))) |
c74ce6421d04
(make_frame_without_minibuffer): Don't change the
Richard M. Stallman <rms@gnu.org>
parents:
14966
diff
changeset
|
376 Fset_window_buffer (mini_window, |
c74ce6421d04
(make_frame_without_minibuffer): Don't change the
Richard M. Stallman <rms@gnu.org>
parents:
14966
diff
changeset
|
377 (NILP (Vminibuffer_list) |
c74ce6421d04
(make_frame_without_minibuffer): Don't change the
Richard M. Stallman <rms@gnu.org>
parents:
14966
diff
changeset
|
378 ? get_minibuffer (0) |
c74ce6421d04
(make_frame_without_minibuffer): Don't change the
Richard M. Stallman <rms@gnu.org>
parents:
14966
diff
changeset
|
379 : Fcar (Vminibuffer_list))); |
765 | 380 return f; |
286 | 381 } |
382 | |
765 | 383 /* Make a frame containing only a minibuffer window. */ |
286 | 384 |
765 | 385 struct frame * |
386 make_minibuffer_frame () | |
286 | 387 { |
765 | 388 /* First make a frame containing just a root window, no minibuffer. */ |
286 | 389 |
765 | 390 register struct frame *f = make_frame (0); |
286 | 391 register Lisp_Object mini_window; |
765 | 392 register Lisp_Object frame; |
286 | 393 |
9268
cb55d0155265
(make_minibuffer_frame, make_terminal_frame, Fselected_frame,
Karl Heuer <kwzh@gnu.org>
parents:
9214
diff
changeset
|
394 XSETFRAME (frame, f); |
286 | 395 |
1006
a13ee72d74a2
* frame.c (make_frame): Clear the explicit_name member of the new
Jim Blandy <jimb@redhat.com>
parents:
987
diff
changeset
|
396 f->auto_raise = 0; |
765 | 397 f->auto_lower = 0; |
398 f->no_split = 1; | |
399 f->wants_modeline = 0; | |
400 f->has_minibuffer = 1; | |
286 | 401 |
402 /* Now label the root window as also being the minibuffer. | |
403 Avoid infinite looping on the window chain by marking next pointer | |
404 as nil. */ | |
405 | |
765 | 406 mini_window = f->minibuffer_window = f->root_window; |
286 | 407 XWINDOW (mini_window)->mini_p = Qt; |
408 XWINDOW (mini_window)->next = Qnil; | |
1006
a13ee72d74a2
* frame.c (make_frame): Clear the explicit_name member of the new
Jim Blandy <jimb@redhat.com>
parents:
987
diff
changeset
|
409 XWINDOW (mini_window)->prev = Qnil; |
765 | 410 XWINDOW (mini_window)->frame = frame; |
286 | 411 |
412 /* Put the proper buffer in that window. */ | |
413 | |
414 Fset_window_buffer (mini_window, | |
485 | 415 (NILP (Vminibuffer_list) |
286 | 416 ? get_minibuffer (0) |
417 : Fcar (Vminibuffer_list))); | |
765 | 418 return f; |
286 | 419 } |
21359
f66e706fc9d6
(make_frame_without_minibuffer): Conditionalize on HAVE_WINDOW_SYSTEM.
Richard M. Stallman <rms@gnu.org>
parents:
21244
diff
changeset
|
420 #endif /* HAVE_WINDOW_SYSTEM */ |
286 | 421 |
765 | 422 /* Construct a frame that refers to the terminal (stdin and stdout). */ |
286 | 423 |
10768
938451cf1b10
(Fmake_terminal_frame): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10676
diff
changeset
|
424 static int terminal_frame_count; |
938451cf1b10
(Fmake_terminal_frame): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10676
diff
changeset
|
425 |
765 | 426 struct frame * |
427 make_terminal_frame () | |
286 | 428 { |
765 | 429 register struct frame *f; |
5231
6646271e8d32
(make_terminal_frame): Add frame to Vframe_list.
Richard M. Stallman <rms@gnu.org>
parents:
5172
diff
changeset
|
430 Lisp_Object frame; |
10768
938451cf1b10
(Fmake_terminal_frame): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10676
diff
changeset
|
431 char name[20]; |
286 | 432 |
11017
f7c4ece024d5
(make_frame): Initialize kboard member.
Karl Heuer <kwzh@gnu.org>
parents:
10853
diff
changeset
|
433 #ifdef MULTI_KBOARD |
f7c4ece024d5
(make_frame): Initialize kboard member.
Karl Heuer <kwzh@gnu.org>
parents:
10853
diff
changeset
|
434 if (!initial_kboard) |
f7c4ece024d5
(make_frame): Initialize kboard member.
Karl Heuer <kwzh@gnu.org>
parents:
10853
diff
changeset
|
435 { |
f7c4ece024d5
(make_frame): Initialize kboard member.
Karl Heuer <kwzh@gnu.org>
parents:
10853
diff
changeset
|
436 initial_kboard = (KBOARD *) xmalloc (sizeof (KBOARD)); |
f7c4ece024d5
(make_frame): Initialize kboard member.
Karl Heuer <kwzh@gnu.org>
parents:
10853
diff
changeset
|
437 init_kboard (initial_kboard); |
11364
9c609a5bd245
(make_terminal_frame): all_kboards means initial_kboard too.
Karl Heuer <kwzh@gnu.org>
parents:
11355
diff
changeset
|
438 initial_kboard->next_kboard = all_kboards; |
9c609a5bd245
(make_terminal_frame): all_kboards means initial_kboard too.
Karl Heuer <kwzh@gnu.org>
parents:
11355
diff
changeset
|
439 all_kboards = initial_kboard; |
11017
f7c4ece024d5
(make_frame): Initialize kboard member.
Karl Heuer <kwzh@gnu.org>
parents:
10853
diff
changeset
|
440 } |
f7c4ece024d5
(make_frame): Initialize kboard member.
Karl Heuer <kwzh@gnu.org>
parents:
10853
diff
changeset
|
441 #endif |
f7c4ece024d5
(make_frame): Initialize kboard member.
Karl Heuer <kwzh@gnu.org>
parents:
10853
diff
changeset
|
442 |
10768
938451cf1b10
(Fmake_terminal_frame): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10676
diff
changeset
|
443 /* The first call must initialize Vframe_list. */ |
938451cf1b10
(Fmake_terminal_frame): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10676
diff
changeset
|
444 if (! (NILP (Vframe_list) || CONSP (Vframe_list))) |
938451cf1b10
(Fmake_terminal_frame): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10676
diff
changeset
|
445 Vframe_list = Qnil; |
938451cf1b10
(Fmake_terminal_frame): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10676
diff
changeset
|
446 |
765 | 447 f = make_frame (1); |
5231
6646271e8d32
(make_terminal_frame): Add frame to Vframe_list.
Richard M. Stallman <rms@gnu.org>
parents:
5172
diff
changeset
|
448 |
9268
cb55d0155265
(make_minibuffer_frame, make_terminal_frame, Fselected_frame,
Karl Heuer <kwzh@gnu.org>
parents:
9214
diff
changeset
|
449 XSETFRAME (frame, f); |
5231
6646271e8d32
(make_terminal_frame): Add frame to Vframe_list.
Richard M. Stallman <rms@gnu.org>
parents:
5172
diff
changeset
|
450 Vframe_list = Fcons (frame, Vframe_list); |
6646271e8d32
(make_terminal_frame): Add frame to Vframe_list.
Richard M. Stallman <rms@gnu.org>
parents:
5172
diff
changeset
|
451 |
10768
938451cf1b10
(Fmake_terminal_frame): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10676
diff
changeset
|
452 terminal_frame_count++; |
17857
c39f34ef5d76
(make_terminal_frame): Don't add `Emacs' to frame name.
Richard M. Stallman <rms@gnu.org>
parents:
17573
diff
changeset
|
453 sprintf (name, "F%d", terminal_frame_count); |
c39f34ef5d76
(make_terminal_frame): Don't add `Emacs' to frame name.
Richard M. Stallman <rms@gnu.org>
parents:
17573
diff
changeset
|
454 f->name = build_string (name); |
10768
938451cf1b10
(Fmake_terminal_frame): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10676
diff
changeset
|
455 |
938451cf1b10
(Fmake_terminal_frame): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10676
diff
changeset
|
456 f->visible = 1; /* FRAME_SET_VISIBLE wd set frame_garbaged. */ |
938451cf1b10
(Fmake_terminal_frame): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10676
diff
changeset
|
457 f->async_visible = 1; /* Don't let visible be cleared later. */ |
15391
d4cec5d7566d
(Fset_mouse_position): Remove the DOS-specific
Richard M. Stallman <rms@gnu.org>
parents:
15062
diff
changeset
|
458 #ifdef MSDOS |
d4cec5d7566d
(Fset_mouse_position): Remove the DOS-specific
Richard M. Stallman <rms@gnu.org>
parents:
15062
diff
changeset
|
459 f->output_data.x = &the_only_x_display; |
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26164
diff
changeset
|
460 if (!inhibit_window_system |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26164
diff
changeset
|
461 && (!FRAMEP (selected_frame) || !FRAME_LIVE_P (XFRAME (selected_frame)) |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26164
diff
changeset
|
462 || XFRAME (selected_frame)->output_method == output_msdos_raw)) |
31470
2e399023961d
(make_terminal_frame): Initialize frame foreground and
Eli Zaretskii <eliz@gnu.org>
parents:
31448
diff
changeset
|
463 { |
2e399023961d
(make_terminal_frame): Initialize frame foreground and
Eli Zaretskii <eliz@gnu.org>
parents:
31448
diff
changeset
|
464 f->output_method = output_msdos_raw; |
2e399023961d
(make_terminal_frame): Initialize frame foreground and
Eli Zaretskii <eliz@gnu.org>
parents:
31448
diff
changeset
|
465 /* This initialization of foreground and background pixels is |
2e399023961d
(make_terminal_frame): Initialize frame foreground and
Eli Zaretskii <eliz@gnu.org>
parents:
31448
diff
changeset
|
466 only important for the initial frame created in temacs. If |
2e399023961d
(make_terminal_frame): Initialize frame foreground and
Eli Zaretskii <eliz@gnu.org>
parents:
31448
diff
changeset
|
467 we don't do that, we get black background and foreground in |
2e399023961d
(make_terminal_frame): Initialize frame foreground and
Eli Zaretskii <eliz@gnu.org>
parents:
31448
diff
changeset
|
468 the dumped Emacs because the_only_x_display is a static |
2e399023961d
(make_terminal_frame): Initialize frame foreground and
Eli Zaretskii <eliz@gnu.org>
parents:
31448
diff
changeset
|
469 variable, hence it is born all-zeroes, and zero is the code |
2e399023961d
(make_terminal_frame): Initialize frame foreground and
Eli Zaretskii <eliz@gnu.org>
parents:
31448
diff
changeset
|
470 for the black color. Other frames all inherit their pixels |
2e399023961d
(make_terminal_frame): Initialize frame foreground and
Eli Zaretskii <eliz@gnu.org>
parents:
31448
diff
changeset
|
471 from what's already in the_only_x_display. */ |
2e399023961d
(make_terminal_frame): Initialize frame foreground and
Eli Zaretskii <eliz@gnu.org>
parents:
31448
diff
changeset
|
472 if ((!FRAMEP (selected_frame) || !FRAME_LIVE_P (XFRAME (selected_frame))) |
2e399023961d
(make_terminal_frame): Initialize frame foreground and
Eli Zaretskii <eliz@gnu.org>
parents:
31448
diff
changeset
|
473 && f->output_data.x->background_pixel == 0 |
2e399023961d
(make_terminal_frame): Initialize frame foreground and
Eli Zaretskii <eliz@gnu.org>
parents:
31448
diff
changeset
|
474 && f->output_data.x->foreground_pixel == 0) |
2e399023961d
(make_terminal_frame): Initialize frame foreground and
Eli Zaretskii <eliz@gnu.org>
parents:
31448
diff
changeset
|
475 { |
2e399023961d
(make_terminal_frame): Initialize frame foreground and
Eli Zaretskii <eliz@gnu.org>
parents:
31448
diff
changeset
|
476 f->output_data.x->background_pixel = FACE_TTY_DEFAULT_BG_COLOR; |
2e399023961d
(make_terminal_frame): Initialize frame foreground and
Eli Zaretskii <eliz@gnu.org>
parents:
31448
diff
changeset
|
477 f->output_data.x->foreground_pixel = FACE_TTY_DEFAULT_FG_COLOR; |
2e399023961d
(make_terminal_frame): Initialize frame foreground and
Eli Zaretskii <eliz@gnu.org>
parents:
31448
diff
changeset
|
478 } |
2e399023961d
(make_terminal_frame): Initialize frame foreground and
Eli Zaretskii <eliz@gnu.org>
parents:
31448
diff
changeset
|
479 } |
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26164
diff
changeset
|
480 else |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26164
diff
changeset
|
481 f->output_method = output_termcap; |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26164
diff
changeset
|
482 #else |
35003
c6726a1e70ce
(make_terminal_frame) [WINDOWSNT]: Make terminal frames
Andrew Innes <andrewi@gnu.org>
parents:
33760
diff
changeset
|
483 #ifdef WINDOWSNT |
35447
c6cb860208d8
(Qw32_console): Remove variable.
Andrew Innes <andrewi@gnu.org>
parents:
35003
diff
changeset
|
484 f->output_method = output_termcap; |
35003
c6726a1e70ce
(make_terminal_frame) [WINDOWSNT]: Make terminal frames
Andrew Innes <andrewi@gnu.org>
parents:
33760
diff
changeset
|
485 f->output_data.x = &tty_display; |
c6726a1e70ce
(make_terminal_frame) [WINDOWSNT]: Make terminal frames
Andrew Innes <andrewi@gnu.org>
parents:
33760
diff
changeset
|
486 #else |
25523
9e9eeb68482e
(Fframep) [macintosh]: Handle mac frame type.
Richard M. Stallman <rms@gnu.org>
parents:
25350
diff
changeset
|
487 #ifdef macintosh |
32752
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32545
diff
changeset
|
488 make_mac_terminal_frame (f); |
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32545
diff
changeset
|
489 #else |
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26164
diff
changeset
|
490 f->output_data.x = &tty_display; |
32752
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32545
diff
changeset
|
491 #endif /* macintosh */ |
35003
c6726a1e70ce
(make_terminal_frame) [WINDOWSNT]: Make terminal frames
Andrew Innes <andrewi@gnu.org>
parents:
33760
diff
changeset
|
492 #endif /* WINDOWSNT */ |
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26164
diff
changeset
|
493 #endif /* MSDOS */ |
25523
9e9eeb68482e
(Fframep) [macintosh]: Handle mac frame type.
Richard M. Stallman <rms@gnu.org>
parents:
25350
diff
changeset
|
494 |
25117
f6f34f0bc1af
(make_terminal_frame) [MSDOS]: Don't call
Eli Zaretskii <eliz@gnu.org>
parents:
25030
diff
changeset
|
495 if (!noninteractive) |
f6f34f0bc1af
(make_terminal_frame) [MSDOS]: Don't call
Eli Zaretskii <eliz@gnu.org>
parents:
25030
diff
changeset
|
496 init_frame_faces (f); |
32752
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32545
diff
changeset
|
497 |
765 | 498 return f; |
286 | 499 } |
10768
938451cf1b10
(Fmake_terminal_frame): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10676
diff
changeset
|
500 |
938451cf1b10
(Fmake_terminal_frame): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10676
diff
changeset
|
501 DEFUN ("make-terminal-frame", Fmake_terminal_frame, Smake_terminal_frame, |
40105
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
502 1, 1, 0, |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
503 doc: /* Create an additional terminal frame. |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
504 You can create multiple frames on a text-only terminal in this way. |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
505 Only the selected terminal frame is actually displayed. |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
506 This function takes one argument, an alist specifying frame parameters. |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
507 In practice, generally you don't need to specify any parameters. |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
508 Note that changing the size of one terminal frame automatically affects all. */) |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
509 (parms) |
10768
938451cf1b10
(Fmake_terminal_frame): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10676
diff
changeset
|
510 Lisp_Object parms; |
938451cf1b10
(Fmake_terminal_frame): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10676
diff
changeset
|
511 { |
938451cf1b10
(Fmake_terminal_frame): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10676
diff
changeset
|
512 struct frame *f; |
25523
9e9eeb68482e
(Fframep) [macintosh]: Handle mac frame type.
Richard M. Stallman <rms@gnu.org>
parents:
25350
diff
changeset
|
513 Lisp_Object frame, tem; |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
514 struct frame *sf = SELECTED_FRAME (); |
10768
938451cf1b10
(Fmake_terminal_frame): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10676
diff
changeset
|
515 |
15392
ac7e878c5526
(Fmake_terminal_frame): Test MSDOS, not __MSDOS__.
Richard M. Stallman <rms@gnu.org>
parents:
15391
diff
changeset
|
516 #ifdef MSDOS |
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26164
diff
changeset
|
517 if (sf->output_method != output_msdos_raw |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26164
diff
changeset
|
518 && sf->output_method != output_termcap) |
15391
d4cec5d7566d
(Fset_mouse_position): Remove the DOS-specific
Richard M. Stallman <rms@gnu.org>
parents:
15062
diff
changeset
|
519 abort (); |
25523
9e9eeb68482e
(Fframep) [macintosh]: Handle mac frame type.
Richard M. Stallman <rms@gnu.org>
parents:
25350
diff
changeset
|
520 #else /* not MSDOS */ |
9e9eeb68482e
(Fframep) [macintosh]: Handle mac frame type.
Richard M. Stallman <rms@gnu.org>
parents:
25350
diff
changeset
|
521 |
9e9eeb68482e
(Fframep) [macintosh]: Handle mac frame type.
Richard M. Stallman <rms@gnu.org>
parents:
25350
diff
changeset
|
522 #ifdef macintosh |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
523 if (sf->output_method != output_mac) |
25523
9e9eeb68482e
(Fframep) [macintosh]: Handle mac frame type.
Richard M. Stallman <rms@gnu.org>
parents:
25350
diff
changeset
|
524 error ("Not running on a Macintosh screen; cannot make a new Macintosh frame"); |
15391
d4cec5d7566d
(Fset_mouse_position): Remove the DOS-specific
Richard M. Stallman <rms@gnu.org>
parents:
15062
diff
changeset
|
525 #else |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
526 if (sf->output_method != output_termcap) |
10768
938451cf1b10
(Fmake_terminal_frame): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10676
diff
changeset
|
527 error ("Not using an ASCII terminal now; cannot make a new ASCII frame"); |
15391
d4cec5d7566d
(Fset_mouse_position): Remove the DOS-specific
Richard M. Stallman <rms@gnu.org>
parents:
15062
diff
changeset
|
528 #endif |
25523
9e9eeb68482e
(Fframep) [macintosh]: Handle mac frame type.
Richard M. Stallman <rms@gnu.org>
parents:
25350
diff
changeset
|
529 #endif /* not MSDOS */ |
10768
938451cf1b10
(Fmake_terminal_frame): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10676
diff
changeset
|
530 |
938451cf1b10
(Fmake_terminal_frame): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10676
diff
changeset
|
531 f = make_terminal_frame (); |
25523
9e9eeb68482e
(Fframep) [macintosh]: Handle mac frame type.
Richard M. Stallman <rms@gnu.org>
parents:
25350
diff
changeset
|
532 |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
533 change_frame_size (f, FRAME_HEIGHT (sf), |
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
534 FRAME_WIDTH (sf), 0, 0, 0); |
25030
c69d9e48269b
(make_frame): Set n_current_toolbar_items to 0.
Gerd Moellmann <gerd@gnu.org>
parents:
23746
diff
changeset
|
535 adjust_glyphs (f); |
10768
938451cf1b10
(Fmake_terminal_frame): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10676
diff
changeset
|
536 calculate_costs (f); |
938451cf1b10
(Fmake_terminal_frame): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10676
diff
changeset
|
537 XSETFRAME (frame, f); |
16184
ca018789eb73
(Fmake_terminal_frame): Use Vdefault_frame_alist.
Richard M. Stallman <rms@gnu.org>
parents:
16112
diff
changeset
|
538 Fmodify_frame_parameters (frame, Vdefault_frame_alist); |
10768
938451cf1b10
(Fmake_terminal_frame): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10676
diff
changeset
|
539 Fmodify_frame_parameters (frame, parms); |
25209
eea9647c8246
(Fframe_parameters): Swap foreground and background
Eli Zaretskii <eliz@gnu.org>
parents:
25158
diff
changeset
|
540 |
eea9647c8246
(Fframe_parameters): Swap foreground and background
Eli Zaretskii <eliz@gnu.org>
parents:
25158
diff
changeset
|
541 /* Make the frame face alist be frame-specific, so that each |
eea9647c8246
(Fframe_parameters): Swap foreground and background
Eli Zaretskii <eliz@gnu.org>
parents:
25158
diff
changeset
|
542 frame could change its face definitions independently. */ |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
543 f->face_alist = Fcopy_alist (sf->face_alist); |
25209
eea9647c8246
(Fframe_parameters): Swap foreground and background
Eli Zaretskii <eliz@gnu.org>
parents:
25158
diff
changeset
|
544 /* Simple Fcopy_alist isn't enough, because we need the contents of |
eea9647c8246
(Fframe_parameters): Swap foreground and background
Eli Zaretskii <eliz@gnu.org>
parents:
25158
diff
changeset
|
545 the vectors which are the CDRs of associations in face_alist to |
eea9647c8246
(Fframe_parameters): Swap foreground and background
Eli Zaretskii <eliz@gnu.org>
parents:
25158
diff
changeset
|
546 be copied as well. */ |
eea9647c8246
(Fframe_parameters): Swap foreground and background
Eli Zaretskii <eliz@gnu.org>
parents:
25158
diff
changeset
|
547 for (tem = f->face_alist; CONSP (tem); tem = XCDR (tem)) |
39973
579177964efa
Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents:
39918
diff
changeset
|
548 XSETCDR (XCAR (tem), Fcopy_sequence (XCDR (XCAR (tem)))); |
10768
938451cf1b10
(Fmake_terminal_frame): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10676
diff
changeset
|
549 return frame; |
938451cf1b10
(Fmake_terminal_frame): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10676
diff
changeset
|
550 } |
36810
a9485f8e43d6
(do_switch_frame): Remove unused parameter NO_EVENT, add
Gerd Moellmann <gerd@gnu.org>
parents:
36804
diff
changeset
|
551 |
286 | 552 |
36810
a9485f8e43d6
(do_switch_frame): Remove unused parameter NO_EVENT, add
Gerd Moellmann <gerd@gnu.org>
parents:
36804
diff
changeset
|
553 /* Perform the switch to frame FRAME. |
a9485f8e43d6
(do_switch_frame): Remove unused parameter NO_EVENT, add
Gerd Moellmann <gerd@gnu.org>
parents:
36804
diff
changeset
|
554 |
a9485f8e43d6
(do_switch_frame): Remove unused parameter NO_EVENT, add
Gerd Moellmann <gerd@gnu.org>
parents:
36804
diff
changeset
|
555 If FRAME is a switch-frame event `(switch-frame FRAME1)', use |
a9485f8e43d6
(do_switch_frame): Remove unused parameter NO_EVENT, add
Gerd Moellmann <gerd@gnu.org>
parents:
36804
diff
changeset
|
556 FRAME1 as frame. |
a9485f8e43d6
(do_switch_frame): Remove unused parameter NO_EVENT, add
Gerd Moellmann <gerd@gnu.org>
parents:
36804
diff
changeset
|
557 |
a9485f8e43d6
(do_switch_frame): Remove unused parameter NO_EVENT, add
Gerd Moellmann <gerd@gnu.org>
parents:
36804
diff
changeset
|
558 If TRACK is non-zero and the frame that currently has the focus |
a9485f8e43d6
(do_switch_frame): Remove unused parameter NO_EVENT, add
Gerd Moellmann <gerd@gnu.org>
parents:
36804
diff
changeset
|
559 redirects its focus to the selected frame, redirect that focused |
a9485f8e43d6
(do_switch_frame): Remove unused parameter NO_EVENT, add
Gerd Moellmann <gerd@gnu.org>
parents:
36804
diff
changeset
|
560 frame's focus to FRAME instead. |
a9485f8e43d6
(do_switch_frame): Remove unused parameter NO_EVENT, add
Gerd Moellmann <gerd@gnu.org>
parents:
36804
diff
changeset
|
561 |
a9485f8e43d6
(do_switch_frame): Remove unused parameter NO_EVENT, add
Gerd Moellmann <gerd@gnu.org>
parents:
36804
diff
changeset
|
562 FOR_DELETION non-zero means that the selected frame is being |
a9485f8e43d6
(do_switch_frame): Remove unused parameter NO_EVENT, add
Gerd Moellmann <gerd@gnu.org>
parents:
36804
diff
changeset
|
563 deleted, which includes the possibility that the frame's display |
a9485f8e43d6
(do_switch_frame): Remove unused parameter NO_EVENT, add
Gerd Moellmann <gerd@gnu.org>
parents:
36804
diff
changeset
|
564 is dead. */ |
a9485f8e43d6
(do_switch_frame): Remove unused parameter NO_EVENT, add
Gerd Moellmann <gerd@gnu.org>
parents:
36804
diff
changeset
|
565 |
12286
723569a0028c
(Fdelete_frame): Use do_switch_frame directly.
Richard M. Stallman <rms@gnu.org>
parents:
12283
diff
changeset
|
566 Lisp_Object |
36810
a9485f8e43d6
(do_switch_frame): Remove unused parameter NO_EVENT, add
Gerd Moellmann <gerd@gnu.org>
parents:
36804
diff
changeset
|
567 do_switch_frame (frame, track, for_deletion) |
a9485f8e43d6
(do_switch_frame): Remove unused parameter NO_EVENT, add
Gerd Moellmann <gerd@gnu.org>
parents:
36804
diff
changeset
|
568 Lisp_Object frame; |
a9485f8e43d6
(do_switch_frame): Remove unused parameter NO_EVENT, add
Gerd Moellmann <gerd@gnu.org>
parents:
36804
diff
changeset
|
569 int track, for_deletion; |
286 | 570 { |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
571 struct frame *sf = SELECTED_FRAME (); |
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
572 |
1385
a4a205bdd2c1
* frame.c: #include "commands.h" and "keyboard.h".
Jim Blandy <jimb@redhat.com>
parents:
1346
diff
changeset
|
573 /* If FRAME is a switch-frame event, extract the frame we should |
a4a205bdd2c1
* frame.c: #include "commands.h" and "keyboard.h".
Jim Blandy <jimb@redhat.com>
parents:
1346
diff
changeset
|
574 switch to. */ |
a4a205bdd2c1
* frame.c: #include "commands.h" and "keyboard.h".
Jim Blandy <jimb@redhat.com>
parents:
1346
diff
changeset
|
575 if (CONSP (frame) |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
576 && EQ (XCAR (frame), Qswitch_frame) |
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
577 && CONSP (XCDR (frame))) |
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
578 frame = XCAR (XCDR (frame)); |
1385
a4a205bdd2c1
* frame.c: #include "commands.h" and "keyboard.h".
Jim Blandy <jimb@redhat.com>
parents:
1346
diff
changeset
|
579 |
6352
6f48bd9145f9
(Fhandle_switch_frame): Ignore switch to dead frame.
Karl Heuer <kwzh@gnu.org>
parents:
6346
diff
changeset
|
580 /* This used to say CHECK_LIVE_FRAME, but apparently it's possible for |
6f48bd9145f9
(Fhandle_switch_frame): Ignore switch to dead frame.
Karl Heuer <kwzh@gnu.org>
parents:
6346
diff
changeset
|
581 a switch-frame event to arrive after a frame is no longer live, |
6f48bd9145f9
(Fhandle_switch_frame): Ignore switch to dead frame.
Karl Heuer <kwzh@gnu.org>
parents:
6346
diff
changeset
|
582 especially when deleting the initial frame during startup. */ |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
583 CHECK_FRAME (frame); |
6352
6f48bd9145f9
(Fhandle_switch_frame): Ignore switch to dead frame.
Karl Heuer <kwzh@gnu.org>
parents:
6346
diff
changeset
|
584 if (! FRAME_LIVE_P (XFRAME (frame))) |
6f48bd9145f9
(Fhandle_switch_frame): Ignore switch to dead frame.
Karl Heuer <kwzh@gnu.org>
parents:
6346
diff
changeset
|
585 return Qnil; |
286 | 586 |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
587 if (sf == XFRAME (frame)) |
765 | 588 return frame; |
286 | 589 |
6486
5012ae9c6075
(do_switch_frame): Common code for Fselect_frame and handle_switch_frame.
Karl Heuer <kwzh@gnu.org>
parents:
6355
diff
changeset
|
590 /* This is too greedy; it causes inappropriate focus redirection |
5012ae9c6075
(do_switch_frame): Common code for Fselect_frame and handle_switch_frame.
Karl Heuer <kwzh@gnu.org>
parents:
6355
diff
changeset
|
591 that's hard to get rid of. */ |
5012ae9c6075
(do_switch_frame): Common code for Fselect_frame and handle_switch_frame.
Karl Heuer <kwzh@gnu.org>
parents:
6355
diff
changeset
|
592 #if 0 |
1709
b86b3237e017
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1691
diff
changeset
|
593 /* If a frame's focus has been redirected toward the currently |
b86b3237e017
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1691
diff
changeset
|
594 selected frame, we should change the redirection to point to the |
b86b3237e017
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1691
diff
changeset
|
595 newly selected frame. This means that if the focus is redirected |
b86b3237e017
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1691
diff
changeset
|
596 from a minibufferless frame to a surrogate minibuffer frame, we |
b86b3237e017
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1691
diff
changeset
|
597 can use `other-window' to switch between all the frames using |
b86b3237e017
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1691
diff
changeset
|
598 that minibuffer frame, and the focus redirection will follow us |
b86b3237e017
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1691
diff
changeset
|
599 around. */ |
6486
5012ae9c6075
(do_switch_frame): Common code for Fselect_frame and handle_switch_frame.
Karl Heuer <kwzh@gnu.org>
parents:
6355
diff
changeset
|
600 if (track) |
5012ae9c6075
(do_switch_frame): Common code for Fselect_frame and handle_switch_frame.
Karl Heuer <kwzh@gnu.org>
parents:
6355
diff
changeset
|
601 { |
5012ae9c6075
(do_switch_frame): Common code for Fselect_frame and handle_switch_frame.
Karl Heuer <kwzh@gnu.org>
parents:
6355
diff
changeset
|
602 Lisp_Object tail; |
1709
b86b3237e017
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1691
diff
changeset
|
603 |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
604 for (tail = Vframe_list; CONSP (tail); tail = XCDR (tail)) |
6486
5012ae9c6075
(do_switch_frame): Common code for Fselect_frame and handle_switch_frame.
Karl Heuer <kwzh@gnu.org>
parents:
6355
diff
changeset
|
605 { |
5012ae9c6075
(do_switch_frame): Common code for Fselect_frame and handle_switch_frame.
Karl Heuer <kwzh@gnu.org>
parents:
6355
diff
changeset
|
606 Lisp_Object focus; |
5012ae9c6075
(do_switch_frame): Common code for Fselect_frame and handle_switch_frame.
Karl Heuer <kwzh@gnu.org>
parents:
6355
diff
changeset
|
607 |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
608 if (!FRAMEP (XCAR (tail))) |
6486
5012ae9c6075
(do_switch_frame): Common code for Fselect_frame and handle_switch_frame.
Karl Heuer <kwzh@gnu.org>
parents:
6355
diff
changeset
|
609 abort (); |
5012ae9c6075
(do_switch_frame): Common code for Fselect_frame and handle_switch_frame.
Karl Heuer <kwzh@gnu.org>
parents:
6355
diff
changeset
|
610 |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
611 focus = FRAME_FOCUS_FRAME (XFRAME (XCAR (tail))); |
1709
b86b3237e017
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1691
diff
changeset
|
612 |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
613 if (FRAMEP (focus) && XFRAME (focus) == SELECTED_FRAME ()) |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
614 Fredirect_frame_focus (XCAR (tail), frame); |
6486
5012ae9c6075
(do_switch_frame): Common code for Fselect_frame and handle_switch_frame.
Karl Heuer <kwzh@gnu.org>
parents:
6355
diff
changeset
|
615 } |
5012ae9c6075
(do_switch_frame): Common code for Fselect_frame and handle_switch_frame.
Karl Heuer <kwzh@gnu.org>
parents:
6355
diff
changeset
|
616 } |
5012ae9c6075
(do_switch_frame): Common code for Fselect_frame and handle_switch_frame.
Karl Heuer <kwzh@gnu.org>
parents:
6355
diff
changeset
|
617 #else /* ! 0 */ |
5012ae9c6075
(do_switch_frame): Common code for Fselect_frame and handle_switch_frame.
Karl Heuer <kwzh@gnu.org>
parents:
6355
diff
changeset
|
618 /* Instead, apply it only to the frame we're pointing to. */ |
13412
1ed740e9aa64
[HAVE_NTGUI]: Test for a Win32 frame in procedures that test for an X frame.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13396
diff
changeset
|
619 #ifdef HAVE_WINDOW_SYSTEM |
36810
a9485f8e43d6
(do_switch_frame): Remove unused parameter NO_EVENT, add
Gerd Moellmann <gerd@gnu.org>
parents:
36804
diff
changeset
|
620 if (track && FRAME_WINDOW_P (XFRAME (frame))) |
6486
5012ae9c6075
(do_switch_frame): Common code for Fselect_frame and handle_switch_frame.
Karl Heuer <kwzh@gnu.org>
parents:
6355
diff
changeset
|
621 { |
5012ae9c6075
(do_switch_frame): Common code for Fselect_frame and handle_switch_frame.
Karl Heuer <kwzh@gnu.org>
parents:
6355
diff
changeset
|
622 Lisp_Object focus, xfocus; |
1709
b86b3237e017
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1691
diff
changeset
|
623 |
11529
5beffe62d4ef
(do_switch_frame): x_get_focus_frame needs an arg.
Karl Heuer <kwzh@gnu.org>
parents:
11495
diff
changeset
|
624 xfocus = x_get_focus_frame (XFRAME (frame)); |
6486
5012ae9c6075
(do_switch_frame): Common code for Fselect_frame and handle_switch_frame.
Karl Heuer <kwzh@gnu.org>
parents:
6355
diff
changeset
|
625 if (FRAMEP (xfocus)) |
5012ae9c6075
(do_switch_frame): Common code for Fselect_frame and handle_switch_frame.
Karl Heuer <kwzh@gnu.org>
parents:
6355
diff
changeset
|
626 { |
5012ae9c6075
(do_switch_frame): Common code for Fselect_frame and handle_switch_frame.
Karl Heuer <kwzh@gnu.org>
parents:
6355
diff
changeset
|
627 focus = FRAME_FOCUS_FRAME (XFRAME (xfocus)); |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
628 if (FRAMEP (focus) && XFRAME (focus) == SELECTED_FRAME ()) |
6486
5012ae9c6075
(do_switch_frame): Common code for Fselect_frame and handle_switch_frame.
Karl Heuer <kwzh@gnu.org>
parents:
6355
diff
changeset
|
629 Fredirect_frame_focus (xfocus, frame); |
5012ae9c6075
(do_switch_frame): Common code for Fselect_frame and handle_switch_frame.
Karl Heuer <kwzh@gnu.org>
parents:
6355
diff
changeset
|
630 } |
5012ae9c6075
(do_switch_frame): Common code for Fselect_frame and handle_switch_frame.
Karl Heuer <kwzh@gnu.org>
parents:
6355
diff
changeset
|
631 } |
5012ae9c6075
(do_switch_frame): Common code for Fselect_frame and handle_switch_frame.
Karl Heuer <kwzh@gnu.org>
parents:
6355
diff
changeset
|
632 #endif /* HAVE_X_WINDOWS */ |
5012ae9c6075
(do_switch_frame): Common code for Fselect_frame and handle_switch_frame.
Karl Heuer <kwzh@gnu.org>
parents:
6355
diff
changeset
|
633 #endif /* ! 0 */ |
1709
b86b3237e017
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1691
diff
changeset
|
634 |
36810
a9485f8e43d6
(do_switch_frame): Remove unused parameter NO_EVENT, add
Gerd Moellmann <gerd@gnu.org>
parents:
36804
diff
changeset
|
635 if (!for_deletion && FRAME_HAS_MINIBUF_P (sf)) |
35611
3e7efd5ea1da
(do_switch_frame): If selected frame has a mini-window,
Gerd Moellmann <gerd@gnu.org>
parents:
35447
diff
changeset
|
636 resize_mini_window (XWINDOW (FRAME_MINIBUF_WINDOW (sf)), 1); |
3e7efd5ea1da
(do_switch_frame): If selected frame has a mini-window,
Gerd Moellmann <gerd@gnu.org>
parents:
35447
diff
changeset
|
637 |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
638 selected_frame = frame; |
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
639 if (! FRAME_MINIBUF_ONLY_P (XFRAME (selected_frame))) |
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
640 last_nonminibuf_frame = XFRAME (selected_frame); |
363 | 641 |
765 | 642 Fselect_window (XFRAME (frame)->selected_window); |
286 | 643 |
1920
ac5e559a819a
* frame.c (Fselect_frame): Set Vlast_event_frame to Qnil after
Jim Blandy <jimb@redhat.com>
parents:
1870
diff
changeset
|
644 /* We want to make sure that the next event generates a frame-switch |
3591
507f64624555
Apply typo patches from Paul Eggert.
Jim Blandy <jimb@redhat.com>
parents:
3497
diff
changeset
|
645 event to the appropriate frame. This seems kludgy to me, but |
1920
ac5e559a819a
* frame.c (Fselect_frame): Set Vlast_event_frame to Qnil after
Jim Blandy <jimb@redhat.com>
parents:
1870
diff
changeset
|
646 before you take it out, make sure that evaluating something like |
ac5e559a819a
* frame.c (Fselect_frame): Set Vlast_event_frame to Qnil after
Jim Blandy <jimb@redhat.com>
parents:
1870
diff
changeset
|
647 (select-window (frame-root-window (new-frame))) doesn't end up |
ac5e559a819a
* frame.c (Fselect_frame): Set Vlast_event_frame to Qnil after
Jim Blandy <jimb@redhat.com>
parents:
1870
diff
changeset
|
648 with your typing being interpreted in the new frame instead of |
ac5e559a819a
* frame.c (Fselect_frame): Set Vlast_event_frame to Qnil after
Jim Blandy <jimb@redhat.com>
parents:
1870
diff
changeset
|
649 the one you're actually typing in. */ |
10853
3db086133785
(do_switch_frame): Undo Feb 6 change.
Karl Heuer <kwzh@gnu.org>
parents:
10851
diff
changeset
|
650 internal_last_event_frame = Qnil; |
1920
ac5e559a819a
* frame.c (Fselect_frame): Set Vlast_event_frame to Qnil after
Jim Blandy <jimb@redhat.com>
parents:
1870
diff
changeset
|
651 |
765 | 652 return frame; |
286 | 653 } |
654 | |
6486
5012ae9c6075
(do_switch_frame): Common code for Fselect_frame and handle_switch_frame.
Karl Heuer <kwzh@gnu.org>
parents:
6355
diff
changeset
|
655 DEFUN ("select-frame", Fselect_frame, Sselect_frame, 1, 2, "e", |
40105
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
656 doc: /* Select the frame FRAME. |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
657 Subsequent editing commands apply to its selected window. |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
658 The selection of FRAME lasts until the next time the user does |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
659 something to select a different frame, or until the next time this |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
660 function is called. */) |
6486
5012ae9c6075
(do_switch_frame): Common code for Fselect_frame and handle_switch_frame.
Karl Heuer <kwzh@gnu.org>
parents:
6355
diff
changeset
|
661 (frame, no_enter) |
5012ae9c6075
(do_switch_frame): Common code for Fselect_frame and handle_switch_frame.
Karl Heuer <kwzh@gnu.org>
parents:
6355
diff
changeset
|
662 Lisp_Object frame, no_enter; |
5012ae9c6075
(do_switch_frame): Common code for Fselect_frame and handle_switch_frame.
Karl Heuer <kwzh@gnu.org>
parents:
6355
diff
changeset
|
663 { |
36810
a9485f8e43d6
(do_switch_frame): Remove unused parameter NO_EVENT, add
Gerd Moellmann <gerd@gnu.org>
parents:
36804
diff
changeset
|
664 return do_switch_frame (frame, 1, 0); |
6486
5012ae9c6075
(do_switch_frame): Common code for Fselect_frame and handle_switch_frame.
Karl Heuer <kwzh@gnu.org>
parents:
6355
diff
changeset
|
665 } |
5012ae9c6075
(do_switch_frame): Common code for Fselect_frame and handle_switch_frame.
Karl Heuer <kwzh@gnu.org>
parents:
6355
diff
changeset
|
666 |
5012ae9c6075
(do_switch_frame): Common code for Fselect_frame and handle_switch_frame.
Karl Heuer <kwzh@gnu.org>
parents:
6355
diff
changeset
|
667 |
5012ae9c6075
(do_switch_frame): Common code for Fselect_frame and handle_switch_frame.
Karl Heuer <kwzh@gnu.org>
parents:
6355
diff
changeset
|
668 DEFUN ("handle-switch-frame", Fhandle_switch_frame, Shandle_switch_frame, 1, 2, "e", |
40105
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
669 doc: /* Handle a switch-frame event EVENT. |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
670 Switch-frame events are usually bound to this function. |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
671 A switch-frame event tells Emacs that the window manager has requested |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
672 that the user's events be directed to the frame mentioned in the event. |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
673 This function selects the selected window of the frame of EVENT. |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
674 |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
675 If EVENT is frame object, handle it as if it were a switch-frame event |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
676 to that frame. */) |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
677 (event, no_enter) |
14077
a6d3ce4a2f8e
(Fhandle_switch_frame, Fset_frame_height): Harmonize arguments with
Erik Naggum <erik@naggum.no>
parents:
13748
diff
changeset
|
678 Lisp_Object event, no_enter; |
6486
5012ae9c6075
(do_switch_frame): Common code for Fselect_frame and handle_switch_frame.
Karl Heuer <kwzh@gnu.org>
parents:
6355
diff
changeset
|
679 { |
12255
41083bd094ac
(Fhandle_switch_frame): Preserve prefix arg.
Karl Heuer <kwzh@gnu.org>
parents:
12222
diff
changeset
|
680 /* Preserve prefix arg that the command loop just cleared. */ |
41083bd094ac
(Fhandle_switch_frame): Preserve prefix arg.
Karl Heuer <kwzh@gnu.org>
parents:
12222
diff
changeset
|
681 current_kboard->Vprefix_arg = Vcurrent_prefix_arg; |
13106
22011e724596
(Qmouse_leave_buffer_hook): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
12987
diff
changeset
|
682 call1 (Vrun_hooks, Qmouse_leave_buffer_hook); |
36810
a9485f8e43d6
(do_switch_frame): Remove unused parameter NO_EVENT, add
Gerd Moellmann <gerd@gnu.org>
parents:
36804
diff
changeset
|
683 return do_switch_frame (event, 0, 0); |
6486
5012ae9c6075
(do_switch_frame): Common code for Fselect_frame and handle_switch_frame.
Karl Heuer <kwzh@gnu.org>
parents:
6355
diff
changeset
|
684 } |
5012ae9c6075
(do_switch_frame): Common code for Fselect_frame and handle_switch_frame.
Karl Heuer <kwzh@gnu.org>
parents:
6355
diff
changeset
|
685 |
12283
fd9043d15414
[MULTI_FRAME] (Fignore_event): New function.
Karl Heuer <kwzh@gnu.org>
parents:
12255
diff
changeset
|
686 DEFUN ("ignore-event", Fignore_event, Signore_event, 0, 0, "", |
40105
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
687 doc: /* Do nothing, but preserve any prefix argument already specified. |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
688 This is a suitable binding for iconify-frame and make-frame-visible. */) |
12283
fd9043d15414
[MULTI_FRAME] (Fignore_event): New function.
Karl Heuer <kwzh@gnu.org>
parents:
12255
diff
changeset
|
689 () |
fd9043d15414
[MULTI_FRAME] (Fignore_event): New function.
Karl Heuer <kwzh@gnu.org>
parents:
12255
diff
changeset
|
690 { |
fd9043d15414
[MULTI_FRAME] (Fignore_event): New function.
Karl Heuer <kwzh@gnu.org>
parents:
12255
diff
changeset
|
691 current_kboard->Vprefix_arg = Vcurrent_prefix_arg; |
fd9043d15414
[MULTI_FRAME] (Fignore_event): New function.
Karl Heuer <kwzh@gnu.org>
parents:
12255
diff
changeset
|
692 return Qnil; |
fd9043d15414
[MULTI_FRAME] (Fignore_event): New function.
Karl Heuer <kwzh@gnu.org>
parents:
12255
diff
changeset
|
693 } |
6486
5012ae9c6075
(do_switch_frame): Common code for Fselect_frame and handle_switch_frame.
Karl Heuer <kwzh@gnu.org>
parents:
6355
diff
changeset
|
694 |
765 | 695 DEFUN ("selected-frame", Fselected_frame, Sselected_frame, 0, 0, 0, |
40105
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
696 doc: /* Return the frame that is now selected. */) |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
697 () |
286 | 698 { |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
699 return selected_frame; |
286 | 700 } |
7055
5e4906d964b8
(Fset_frame_selected_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7025
diff
changeset
|
701 |
765 | 702 DEFUN ("window-frame", Fwindow_frame, Swindow_frame, 1, 1, 0, |
40105
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
703 doc: /* Return the frame object that window WINDOW is on. */) |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
704 (window) |
286 | 705 Lisp_Object window; |
706 { | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
707 CHECK_LIVE_WINDOW (window); |
765 | 708 return XWINDOW (window)->frame; |
286 | 709 } |
710 | |
6527
ab9f20a3f502
(Fframe_first_window): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6500
diff
changeset
|
711 DEFUN ("frame-first-window", Fframe_first_window, Sframe_first_window, 0, 1, 0, |
40105
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
712 doc: /* Returns the topmost, leftmost window of FRAME. |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
713 If omitted, FRAME defaults to the currently selected frame. */) |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
714 (frame) |
6527
ab9f20a3f502
(Fframe_first_window): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6500
diff
changeset
|
715 Lisp_Object frame; |
ab9f20a3f502
(Fframe_first_window): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6500
diff
changeset
|
716 { |
ab9f20a3f502
(Fframe_first_window): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6500
diff
changeset
|
717 Lisp_Object w; |
ab9f20a3f502
(Fframe_first_window): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6500
diff
changeset
|
718 |
ab9f20a3f502
(Fframe_first_window): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6500
diff
changeset
|
719 if (NILP (frame)) |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
720 w = SELECTED_FRAME ()->root_window; |
6527
ab9f20a3f502
(Fframe_first_window): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6500
diff
changeset
|
721 else |
ab9f20a3f502
(Fframe_first_window): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6500
diff
changeset
|
722 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
723 CHECK_LIVE_FRAME (frame); |
6527
ab9f20a3f502
(Fframe_first_window): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6500
diff
changeset
|
724 w = XFRAME (frame)->root_window; |
ab9f20a3f502
(Fframe_first_window): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6500
diff
changeset
|
725 } |
ab9f20a3f502
(Fframe_first_window): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6500
diff
changeset
|
726 while (NILP (XWINDOW (w)->buffer)) |
ab9f20a3f502
(Fframe_first_window): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6500
diff
changeset
|
727 { |
ab9f20a3f502
(Fframe_first_window): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6500
diff
changeset
|
728 if (! NILP (XWINDOW (w)->hchild)) |
ab9f20a3f502
(Fframe_first_window): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6500
diff
changeset
|
729 w = XWINDOW (w)->hchild; |
ab9f20a3f502
(Fframe_first_window): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6500
diff
changeset
|
730 else if (! NILP (XWINDOW (w)->vchild)) |
ab9f20a3f502
(Fframe_first_window): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6500
diff
changeset
|
731 w = XWINDOW (w)->vchild; |
ab9f20a3f502
(Fframe_first_window): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6500
diff
changeset
|
732 else |
ab9f20a3f502
(Fframe_first_window): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6500
diff
changeset
|
733 abort (); |
ab9f20a3f502
(Fframe_first_window): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6500
diff
changeset
|
734 } |
ab9f20a3f502
(Fframe_first_window): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6500
diff
changeset
|
735 return w; |
ab9f20a3f502
(Fframe_first_window): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6500
diff
changeset
|
736 } |
ab9f20a3f502
(Fframe_first_window): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6500
diff
changeset
|
737 |
11169
d0550c056e5b
[MULTI_FRAME] (Factive_minibuffer_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11126
diff
changeset
|
738 DEFUN ("active-minibuffer-window", Factive_minibuffer_window, |
d0550c056e5b
[MULTI_FRAME] (Factive_minibuffer_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11126
diff
changeset
|
739 Sactive_minibuffer_window, 0, 0, 0, |
40105
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
740 doc: /* Return the currently active minibuffer window, or nil if none. */) |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
741 () |
11169
d0550c056e5b
[MULTI_FRAME] (Factive_minibuffer_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11126
diff
changeset
|
742 { |
d0550c056e5b
[MULTI_FRAME] (Factive_minibuffer_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11126
diff
changeset
|
743 return minibuf_level ? minibuf_window : Qnil; |
d0550c056e5b
[MULTI_FRAME] (Factive_minibuffer_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11126
diff
changeset
|
744 } |
d0550c056e5b
[MULTI_FRAME] (Factive_minibuffer_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11126
diff
changeset
|
745 |
765 | 746 DEFUN ("frame-root-window", Fframe_root_window, Sframe_root_window, 0, 1, 0, |
40105
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
747 doc: /* Returns the root-window of FRAME. |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
748 If omitted, FRAME defaults to the currently selected frame. */) |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
749 (frame) |
765 | 750 Lisp_Object frame; |
286 | 751 { |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
752 Lisp_Object window; |
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
753 |
765 | 754 if (NILP (frame)) |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
755 window = SELECTED_FRAME ()->root_window; |
454 | 756 else |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
757 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
758 CHECK_LIVE_FRAME (frame); |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
759 window = XFRAME (frame)->root_window; |
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
760 } |
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
761 |
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
762 return window; |
286 | 763 } |
764 | |
765 | 765 DEFUN ("frame-selected-window", Fframe_selected_window, |
766 Sframe_selected_window, 0, 1, 0, | |
40105
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
767 doc: /* Return the selected window of frame object FRAME. |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
768 If omitted, FRAME defaults to the currently selected frame. */) |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
769 (frame) |
765 | 770 Lisp_Object frame; |
286 | 771 { |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
772 Lisp_Object window; |
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
773 |
765 | 774 if (NILP (frame)) |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
775 window = SELECTED_FRAME ()->selected_window; |
454 | 776 else |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
777 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
778 CHECK_LIVE_FRAME (frame); |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
779 window = XFRAME (frame)->selected_window; |
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
780 } |
286 | 781 |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
782 return window; |
286 | 783 } |
784 | |
7055
5e4906d964b8
(Fset_frame_selected_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7025
diff
changeset
|
785 DEFUN ("set-frame-selected-window", Fset_frame_selected_window, |
5e4906d964b8
(Fset_frame_selected_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7025
diff
changeset
|
786 Sset_frame_selected_window, 2, 2, 0, |
40105
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
787 doc: /* Set the selected window of frame object FRAME to WINDOW. |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
788 If FRAME is nil, the selected frame is used. |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
789 If FRAME is the selected frame, this makes WINDOW the selected window. */) |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
790 (frame, window) |
7055
5e4906d964b8
(Fset_frame_selected_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7025
diff
changeset
|
791 Lisp_Object frame, window; |
5e4906d964b8
(Fset_frame_selected_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7025
diff
changeset
|
792 { |
5e4906d964b8
(Fset_frame_selected_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7025
diff
changeset
|
793 if (NILP (frame)) |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
794 frame = selected_frame; |
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
795 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
796 CHECK_LIVE_FRAME (frame); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
797 CHECK_LIVE_WINDOW (window); |
7055
5e4906d964b8
(Fset_frame_selected_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7025
diff
changeset
|
798 |
5e4906d964b8
(Fset_frame_selected_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7025
diff
changeset
|
799 if (! EQ (frame, WINDOW_FRAME (XWINDOW (window)))) |
5e4906d964b8
(Fset_frame_selected_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7025
diff
changeset
|
800 error ("In `set-frame-selected-window', WINDOW is not on FRAME"); |
5e4906d964b8
(Fset_frame_selected_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7025
diff
changeset
|
801 |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
802 if (EQ (frame, selected_frame)) |
7055
5e4906d964b8
(Fset_frame_selected_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7025
diff
changeset
|
803 return Fselect_window (window); |
5e4906d964b8
(Fset_frame_selected_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7025
diff
changeset
|
804 |
5e4906d964b8
(Fset_frame_selected_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7025
diff
changeset
|
805 return XFRAME (frame)->selected_window = window; |
5e4906d964b8
(Fset_frame_selected_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7025
diff
changeset
|
806 } |
5e4906d964b8
(Fset_frame_selected_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7025
diff
changeset
|
807 |
765 | 808 DEFUN ("frame-list", Fframe_list, Sframe_list, |
286 | 809 0, 0, 0, |
40105
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
810 doc: /* Return a list of all frames. */) |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
811 () |
286 | 812 { |
36971
3819e613c7c2
(Fframe_list): Don't return a tooltip frame.
Gerd Moellmann <gerd@gnu.org>
parents:
36810
diff
changeset
|
813 Lisp_Object frames; |
3819e613c7c2
(Fframe_list): Don't return a tooltip frame.
Gerd Moellmann <gerd@gnu.org>
parents:
36810
diff
changeset
|
814 frames = Fcopy_sequence (Vframe_list); |
36984
1b91be709189
(Fframe_list): Don't reference tip_frame if HAVE_WINDOW_SYSTEM is not defined.
Eli Zaretskii <eliz@gnu.org>
parents:
36971
diff
changeset
|
815 #ifdef HAVE_WINDOW_SYSTEM |
36971
3819e613c7c2
(Fframe_list): Don't return a tooltip frame.
Gerd Moellmann <gerd@gnu.org>
parents:
36810
diff
changeset
|
816 if (FRAMEP (tip_frame)) |
3819e613c7c2
(Fframe_list): Don't return a tooltip frame.
Gerd Moellmann <gerd@gnu.org>
parents:
36810
diff
changeset
|
817 frames = Fdelq (tip_frame, frames); |
36984
1b91be709189
(Fframe_list): Don't reference tip_frame if HAVE_WINDOW_SYSTEM is not defined.
Eli Zaretskii <eliz@gnu.org>
parents:
36971
diff
changeset
|
818 #endif |
36971
3819e613c7c2
(Fframe_list): Don't return a tooltip frame.
Gerd Moellmann <gerd@gnu.org>
parents:
36810
diff
changeset
|
819 return frames; |
286 | 820 } |
821 | |
765 | 822 /* Return the next frame in the frame list after FRAME. |
823 If MINIBUF is nil, exclude minibuffer-only frames. | |
8168
32fbb27091d4
(next_frame, prev_frame):
Richard M. Stallman <rms@gnu.org>
parents:
8099
diff
changeset
|
824 If MINIBUF is a window, include only its own frame |
32fbb27091d4
(next_frame, prev_frame):
Richard M. Stallman <rms@gnu.org>
parents:
8099
diff
changeset
|
825 and any frame now using that window as the minibuffer. |
6246
128dc040e121
(next_frame, prev_frame): If MINIBUF is `visible',
Richard M. Stallman <rms@gnu.org>
parents:
6157
diff
changeset
|
826 If MINIBUF is `visible', include all visible frames. |
8168
32fbb27091d4
(next_frame, prev_frame):
Richard M. Stallman <rms@gnu.org>
parents:
8099
diff
changeset
|
827 If MINIBUF is 0, include all visible and iconified frames. |
6246
128dc040e121
(next_frame, prev_frame): If MINIBUF is `visible',
Richard M. Stallman <rms@gnu.org>
parents:
6157
diff
changeset
|
828 Otherwise, include all frames. */ |
128dc040e121
(next_frame, prev_frame): If MINIBUF is `visible',
Richard M. Stallman <rms@gnu.org>
parents:
6157
diff
changeset
|
829 |
286 | 830 Lisp_Object |
765 | 831 next_frame (frame, minibuf) |
832 Lisp_Object frame; | |
454 | 833 Lisp_Object minibuf; |
286 | 834 { |
835 Lisp_Object tail; | |
836 int passed = 0; | |
837 | |
765 | 838 /* There must always be at least one frame in Vframe_list. */ |
839 if (! CONSP (Vframe_list)) | |
454 | 840 abort (); |
841 | |
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1809
diff
changeset
|
842 /* If this frame is dead, it won't be in Vframe_list, and we'll loop |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1809
diff
changeset
|
843 forever. Forestall that. */ |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
844 CHECK_LIVE_FRAME (frame); |
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1809
diff
changeset
|
845 |
286 | 846 while (1) |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
847 for (tail = Vframe_list; CONSP (tail); tail = XCDR (tail)) |
286 | 848 { |
6500
551bff5cffde
(next_frame, prev_frame, other_visible_frames, Fdelete_frame): Use assignment,
Karl Heuer <kwzh@gnu.org>
parents:
6486
diff
changeset
|
849 Lisp_Object f; |
1118
a43d53261506
* frame.c (choose_minibuf_frame): abort if the selected frame has
Jim Blandy <jimb@redhat.com>
parents:
1006
diff
changeset
|
850 |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
851 f = XCAR (tail); |
12379
7149fc03ea56
(next_frame, prev_frame): Consider only frames on same kbd.
Richard M. Stallman <rms@gnu.org>
parents:
12286
diff
changeset
|
852 |
7149fc03ea56
(next_frame, prev_frame): Consider only frames on same kbd.
Richard M. Stallman <rms@gnu.org>
parents:
12286
diff
changeset
|
853 if (passed |
7149fc03ea56
(next_frame, prev_frame): Consider only frames on same kbd.
Richard M. Stallman <rms@gnu.org>
parents:
12286
diff
changeset
|
854 && FRAME_KBOARD (XFRAME (f)) == FRAME_KBOARD (XFRAME (frame))) |
363 | 855 { |
1118
a43d53261506
* frame.c (choose_minibuf_frame): abort if the selected frame has
Jim Blandy <jimb@redhat.com>
parents:
1006
diff
changeset
|
856 /* Decide whether this frame is eligible to be returned. */ |
a43d53261506
* frame.c (choose_minibuf_frame): abort if the selected frame has
Jim Blandy <jimb@redhat.com>
parents:
1006
diff
changeset
|
857 |
a43d53261506
* frame.c (choose_minibuf_frame): abort if the selected frame has
Jim Blandy <jimb@redhat.com>
parents:
1006
diff
changeset
|
858 /* If we've looped all the way around without finding any |
a43d53261506
* frame.c (choose_minibuf_frame): abort if the selected frame has
Jim Blandy <jimb@redhat.com>
parents:
1006
diff
changeset
|
859 eligible frames, return the original frame. */ |
a43d53261506
* frame.c (choose_minibuf_frame): abort if the selected frame has
Jim Blandy <jimb@redhat.com>
parents:
1006
diff
changeset
|
860 if (EQ (f, frame)) |
a43d53261506
* frame.c (choose_minibuf_frame): abort if the selected frame has
Jim Blandy <jimb@redhat.com>
parents:
1006
diff
changeset
|
861 return f; |
335 | 862 |
1118
a43d53261506
* frame.c (choose_minibuf_frame): abort if the selected frame has
Jim Blandy <jimb@redhat.com>
parents:
1006
diff
changeset
|
863 /* Let minibuf decide if this frame is acceptable. */ |
a43d53261506
* frame.c (choose_minibuf_frame): abort if the selected frame has
Jim Blandy <jimb@redhat.com>
parents:
1006
diff
changeset
|
864 if (NILP (minibuf)) |
a43d53261506
* frame.c (choose_minibuf_frame): abort if the selected frame has
Jim Blandy <jimb@redhat.com>
parents:
1006
diff
changeset
|
865 { |
a43d53261506
* frame.c (choose_minibuf_frame): abort if the selected frame has
Jim Blandy <jimb@redhat.com>
parents:
1006
diff
changeset
|
866 if (! FRAME_MINIBUF_ONLY_P (XFRAME (f))) |
a43d53261506
* frame.c (choose_minibuf_frame): abort if the selected frame has
Jim Blandy <jimb@redhat.com>
parents:
1006
diff
changeset
|
867 return f; |
a43d53261506
* frame.c (choose_minibuf_frame): abort if the selected frame has
Jim Blandy <jimb@redhat.com>
parents:
1006
diff
changeset
|
868 } |
6246
128dc040e121
(next_frame, prev_frame): If MINIBUF is `visible',
Richard M. Stallman <rms@gnu.org>
parents:
6157
diff
changeset
|
869 else if (EQ (minibuf, Qvisible)) |
128dc040e121
(next_frame, prev_frame): If MINIBUF is `visible',
Richard M. Stallman <rms@gnu.org>
parents:
6157
diff
changeset
|
870 { |
128dc040e121
(next_frame, prev_frame): If MINIBUF is `visible',
Richard M. Stallman <rms@gnu.org>
parents:
6157
diff
changeset
|
871 FRAME_SAMPLE_VISIBILITY (XFRAME (f)); |
128dc040e121
(next_frame, prev_frame): If MINIBUF is `visible',
Richard M. Stallman <rms@gnu.org>
parents:
6157
diff
changeset
|
872 if (FRAME_VISIBLE_P (XFRAME (f))) |
128dc040e121
(next_frame, prev_frame): If MINIBUF is `visible',
Richard M. Stallman <rms@gnu.org>
parents:
6157
diff
changeset
|
873 return f; |
128dc040e121
(next_frame, prev_frame): If MINIBUF is `visible',
Richard M. Stallman <rms@gnu.org>
parents:
6157
diff
changeset
|
874 } |
29987
c38afaed3dd0
(next_frame): Don't check frame-focus redirection in
Gerd Moellmann <gerd@gnu.org>
parents:
29616
diff
changeset
|
875 else if (INTEGERP (minibuf) && XINT (minibuf) == 0) |
8168
32fbb27091d4
(next_frame, prev_frame):
Richard M. Stallman <rms@gnu.org>
parents:
8099
diff
changeset
|
876 { |
32fbb27091d4
(next_frame, prev_frame):
Richard M. Stallman <rms@gnu.org>
parents:
8099
diff
changeset
|
877 FRAME_SAMPLE_VISIBILITY (XFRAME (f)); |
32fbb27091d4
(next_frame, prev_frame):
Richard M. Stallman <rms@gnu.org>
parents:
8099
diff
changeset
|
878 if (FRAME_VISIBLE_P (XFRAME (f)) |
32fbb27091d4
(next_frame, prev_frame):
Richard M. Stallman <rms@gnu.org>
parents:
8099
diff
changeset
|
879 || FRAME_ICONIFIED_P (XFRAME (f))) |
32fbb27091d4
(next_frame, prev_frame):
Richard M. Stallman <rms@gnu.org>
parents:
8099
diff
changeset
|
880 return f; |
32fbb27091d4
(next_frame, prev_frame):
Richard M. Stallman <rms@gnu.org>
parents:
8099
diff
changeset
|
881 } |
6246
128dc040e121
(next_frame, prev_frame): If MINIBUF is `visible',
Richard M. Stallman <rms@gnu.org>
parents:
6157
diff
changeset
|
882 else if (WINDOWP (minibuf)) |
1118
a43d53261506
* frame.c (choose_minibuf_frame): abort if the selected frame has
Jim Blandy <jimb@redhat.com>
parents:
1006
diff
changeset
|
883 { |
8168
32fbb27091d4
(next_frame, prev_frame):
Richard M. Stallman <rms@gnu.org>
parents:
8099
diff
changeset
|
884 if (EQ (FRAME_MINIBUF_WINDOW (XFRAME (f)), minibuf) |
29995
ec33931795c4
(next_frame, prev_frame): If MINIBUF is a window,
Gerd Moellmann <gerd@gnu.org>
parents:
29987
diff
changeset
|
885 || EQ (WINDOW_FRAME (XWINDOW (minibuf)), f) |
ec33931795c4
(next_frame, prev_frame): If MINIBUF is a window,
Gerd Moellmann <gerd@gnu.org>
parents:
29987
diff
changeset
|
886 || EQ (WINDOW_FRAME (XWINDOW (minibuf)), |
ec33931795c4
(next_frame, prev_frame): If MINIBUF is a window,
Gerd Moellmann <gerd@gnu.org>
parents:
29987
diff
changeset
|
887 FRAME_FOCUS_FRAME (XFRAME (f)))) |
1118
a43d53261506
* frame.c (choose_minibuf_frame): abort if the selected frame has
Jim Blandy <jimb@redhat.com>
parents:
1006
diff
changeset
|
888 return f; |
a43d53261506
* frame.c (choose_minibuf_frame): abort if the selected frame has
Jim Blandy <jimb@redhat.com>
parents:
1006
diff
changeset
|
889 } |
a43d53261506
* frame.c (choose_minibuf_frame): abort if the selected frame has
Jim Blandy <jimb@redhat.com>
parents:
1006
diff
changeset
|
890 else |
765 | 891 return f; |
363 | 892 } |
286 | 893 |
1118
a43d53261506
* frame.c (choose_minibuf_frame): abort if the selected frame has
Jim Blandy <jimb@redhat.com>
parents:
1006
diff
changeset
|
894 if (EQ (frame, f)) |
286 | 895 passed++; |
896 } | |
897 } | |
898 | |
765 | 899 /* Return the previous frame in the frame list before FRAME. |
900 If MINIBUF is nil, exclude minibuffer-only frames. | |
8168
32fbb27091d4
(next_frame, prev_frame):
Richard M. Stallman <rms@gnu.org>
parents:
8099
diff
changeset
|
901 If MINIBUF is a window, include only its own frame |
32fbb27091d4
(next_frame, prev_frame):
Richard M. Stallman <rms@gnu.org>
parents:
8099
diff
changeset
|
902 and any frame now using that window as the minibuffer. |
6246
128dc040e121
(next_frame, prev_frame): If MINIBUF is `visible',
Richard M. Stallman <rms@gnu.org>
parents:
6157
diff
changeset
|
903 If MINIBUF is `visible', include all visible frames. |
8168
32fbb27091d4
(next_frame, prev_frame):
Richard M. Stallman <rms@gnu.org>
parents:
8099
diff
changeset
|
904 If MINIBUF is 0, include all visible and iconified frames. |
6246
128dc040e121
(next_frame, prev_frame): If MINIBUF is `visible',
Richard M. Stallman <rms@gnu.org>
parents:
6157
diff
changeset
|
905 Otherwise, include all frames. */ |
128dc040e121
(next_frame, prev_frame): If MINIBUF is `visible',
Richard M. Stallman <rms@gnu.org>
parents:
6157
diff
changeset
|
906 |
286 | 907 Lisp_Object |
765 | 908 prev_frame (frame, minibuf) |
909 Lisp_Object frame; | |
454 | 910 Lisp_Object minibuf; |
286 | 911 { |
912 Lisp_Object tail; | |
913 Lisp_Object prev; | |
914 | |
765 | 915 /* There must always be at least one frame in Vframe_list. */ |
916 if (! CONSP (Vframe_list)) | |
454 | 917 abort (); |
918 | |
286 | 919 prev = Qnil; |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
920 for (tail = Vframe_list; CONSP (tail); tail = XCDR (tail)) |
454 | 921 { |
6500
551bff5cffde
(next_frame, prev_frame, other_visible_frames, Fdelete_frame): Use assignment,
Karl Heuer <kwzh@gnu.org>
parents:
6486
diff
changeset
|
922 Lisp_Object f; |
454 | 923 |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
924 f = XCAR (tail); |
9127
0b4836daa8e1
(Fframep, make_frame_without_minibuffer, do_switch_frame, prev_frame,
Karl Heuer <kwzh@gnu.org>
parents:
9032
diff
changeset
|
925 if (!FRAMEP (f)) |
1118
a43d53261506
* frame.c (choose_minibuf_frame): abort if the selected frame has
Jim Blandy <jimb@redhat.com>
parents:
1006
diff
changeset
|
926 abort (); |
454 | 927 |
1118
a43d53261506
* frame.c (choose_minibuf_frame): abort if the selected frame has
Jim Blandy <jimb@redhat.com>
parents:
1006
diff
changeset
|
928 if (EQ (frame, f) && !NILP (prev)) |
a43d53261506
* frame.c (choose_minibuf_frame): abort if the selected frame has
Jim Blandy <jimb@redhat.com>
parents:
1006
diff
changeset
|
929 return prev; |
454 | 930 |
12379
7149fc03ea56
(next_frame, prev_frame): Consider only frames on same kbd.
Richard M. Stallman <rms@gnu.org>
parents:
12286
diff
changeset
|
931 if (FRAME_KBOARD (XFRAME (f)) == FRAME_KBOARD (XFRAME (frame))) |
1118
a43d53261506
* frame.c (choose_minibuf_frame): abort if the selected frame has
Jim Blandy <jimb@redhat.com>
parents:
1006
diff
changeset
|
932 { |
12379
7149fc03ea56
(next_frame, prev_frame): Consider only frames on same kbd.
Richard M. Stallman <rms@gnu.org>
parents:
12286
diff
changeset
|
933 /* Decide whether this frame is eligible to be returned, |
7149fc03ea56
(next_frame, prev_frame): Consider only frames on same kbd.
Richard M. Stallman <rms@gnu.org>
parents:
12286
diff
changeset
|
934 according to minibuf. */ |
7149fc03ea56
(next_frame, prev_frame): Consider only frames on same kbd.
Richard M. Stallman <rms@gnu.org>
parents:
12286
diff
changeset
|
935 if (NILP (minibuf)) |
7149fc03ea56
(next_frame, prev_frame): Consider only frames on same kbd.
Richard M. Stallman <rms@gnu.org>
parents:
12286
diff
changeset
|
936 { |
7149fc03ea56
(next_frame, prev_frame): Consider only frames on same kbd.
Richard M. Stallman <rms@gnu.org>
parents:
12286
diff
changeset
|
937 if (! FRAME_MINIBUF_ONLY_P (XFRAME (f))) |
7149fc03ea56
(next_frame, prev_frame): Consider only frames on same kbd.
Richard M. Stallman <rms@gnu.org>
parents:
12286
diff
changeset
|
938 prev = f; |
7149fc03ea56
(next_frame, prev_frame): Consider only frames on same kbd.
Richard M. Stallman <rms@gnu.org>
parents:
12286
diff
changeset
|
939 } |
7149fc03ea56
(next_frame, prev_frame): Consider only frames on same kbd.
Richard M. Stallman <rms@gnu.org>
parents:
12286
diff
changeset
|
940 else if (WINDOWP (minibuf)) |
7149fc03ea56
(next_frame, prev_frame): Consider only frames on same kbd.
Richard M. Stallman <rms@gnu.org>
parents:
12286
diff
changeset
|
941 { |
7149fc03ea56
(next_frame, prev_frame): Consider only frames on same kbd.
Richard M. Stallman <rms@gnu.org>
parents:
12286
diff
changeset
|
942 if (EQ (FRAME_MINIBUF_WINDOW (XFRAME (f)), minibuf) |
29995
ec33931795c4
(next_frame, prev_frame): If MINIBUF is a window,
Gerd Moellmann <gerd@gnu.org>
parents:
29987
diff
changeset
|
943 || EQ (WINDOW_FRAME (XWINDOW (minibuf)), f) |
ec33931795c4
(next_frame, prev_frame): If MINIBUF is a window,
Gerd Moellmann <gerd@gnu.org>
parents:
29987
diff
changeset
|
944 || EQ (WINDOW_FRAME (XWINDOW (minibuf)), |
ec33931795c4
(next_frame, prev_frame): If MINIBUF is a window,
Gerd Moellmann <gerd@gnu.org>
parents:
29987
diff
changeset
|
945 FRAME_FOCUS_FRAME (XFRAME (f)))) |
12379
7149fc03ea56
(next_frame, prev_frame): Consider only frames on same kbd.
Richard M. Stallman <rms@gnu.org>
parents:
12286
diff
changeset
|
946 prev = f; |
7149fc03ea56
(next_frame, prev_frame): Consider only frames on same kbd.
Richard M. Stallman <rms@gnu.org>
parents:
12286
diff
changeset
|
947 } |
7149fc03ea56
(next_frame, prev_frame): Consider only frames on same kbd.
Richard M. Stallman <rms@gnu.org>
parents:
12286
diff
changeset
|
948 else if (EQ (minibuf, Qvisible)) |
7149fc03ea56
(next_frame, prev_frame): Consider only frames on same kbd.
Richard M. Stallman <rms@gnu.org>
parents:
12286
diff
changeset
|
949 { |
7149fc03ea56
(next_frame, prev_frame): Consider only frames on same kbd.
Richard M. Stallman <rms@gnu.org>
parents:
12286
diff
changeset
|
950 FRAME_SAMPLE_VISIBILITY (XFRAME (f)); |
7149fc03ea56
(next_frame, prev_frame): Consider only frames on same kbd.
Richard M. Stallman <rms@gnu.org>
parents:
12286
diff
changeset
|
951 if (FRAME_VISIBLE_P (XFRAME (f))) |
7149fc03ea56
(next_frame, prev_frame): Consider only frames on same kbd.
Richard M. Stallman <rms@gnu.org>
parents:
12286
diff
changeset
|
952 prev = f; |
7149fc03ea56
(next_frame, prev_frame): Consider only frames on same kbd.
Richard M. Stallman <rms@gnu.org>
parents:
12286
diff
changeset
|
953 } |
7149fc03ea56
(next_frame, prev_frame): Consider only frames on same kbd.
Richard M. Stallman <rms@gnu.org>
parents:
12286
diff
changeset
|
954 else if (XFASTINT (minibuf) == 0) |
7149fc03ea56
(next_frame, prev_frame): Consider only frames on same kbd.
Richard M. Stallman <rms@gnu.org>
parents:
12286
diff
changeset
|
955 { |
7149fc03ea56
(next_frame, prev_frame): Consider only frames on same kbd.
Richard M. Stallman <rms@gnu.org>
parents:
12286
diff
changeset
|
956 FRAME_SAMPLE_VISIBILITY (XFRAME (f)); |
7149fc03ea56
(next_frame, prev_frame): Consider only frames on same kbd.
Richard M. Stallman <rms@gnu.org>
parents:
12286
diff
changeset
|
957 if (FRAME_VISIBLE_P (XFRAME (f)) |
7149fc03ea56
(next_frame, prev_frame): Consider only frames on same kbd.
Richard M. Stallman <rms@gnu.org>
parents:
12286
diff
changeset
|
958 || FRAME_ICONIFIED_P (XFRAME (f))) |
7149fc03ea56
(next_frame, prev_frame): Consider only frames on same kbd.
Richard M. Stallman <rms@gnu.org>
parents:
12286
diff
changeset
|
959 prev = f; |
7149fc03ea56
(next_frame, prev_frame): Consider only frames on same kbd.
Richard M. Stallman <rms@gnu.org>
parents:
12286
diff
changeset
|
960 } |
7149fc03ea56
(next_frame, prev_frame): Consider only frames on same kbd.
Richard M. Stallman <rms@gnu.org>
parents:
12286
diff
changeset
|
961 else |
1118
a43d53261506
* frame.c (choose_minibuf_frame): abort if the selected frame has
Jim Blandy <jimb@redhat.com>
parents:
1006
diff
changeset
|
962 prev = f; |
454 | 963 } |
1118
a43d53261506
* frame.c (choose_minibuf_frame): abort if the selected frame has
Jim Blandy <jimb@redhat.com>
parents:
1006
diff
changeset
|
964 } |
454 | 965 |
1118
a43d53261506
* frame.c (choose_minibuf_frame): abort if the selected frame has
Jim Blandy <jimb@redhat.com>
parents:
1006
diff
changeset
|
966 /* We've scanned the entire list. */ |
a43d53261506
* frame.c (choose_minibuf_frame): abort if the selected frame has
Jim Blandy <jimb@redhat.com>
parents:
1006
diff
changeset
|
967 if (NILP (prev)) |
a43d53261506
* frame.c (choose_minibuf_frame): abort if the selected frame has
Jim Blandy <jimb@redhat.com>
parents:
1006
diff
changeset
|
968 /* We went through the whole frame list without finding a single |
a43d53261506
* frame.c (choose_minibuf_frame): abort if the selected frame has
Jim Blandy <jimb@redhat.com>
parents:
1006
diff
changeset
|
969 acceptable frame. Return the original frame. */ |
a43d53261506
* frame.c (choose_minibuf_frame): abort if the selected frame has
Jim Blandy <jimb@redhat.com>
parents:
1006
diff
changeset
|
970 return frame; |
a43d53261506
* frame.c (choose_minibuf_frame): abort if the selected frame has
Jim Blandy <jimb@redhat.com>
parents:
1006
diff
changeset
|
971 else |
a43d53261506
* frame.c (choose_minibuf_frame): abort if the selected frame has
Jim Blandy <jimb@redhat.com>
parents:
1006
diff
changeset
|
972 /* There were no acceptable frames in the list before FRAME; otherwise, |
a43d53261506
* frame.c (choose_minibuf_frame): abort if the selected frame has
Jim Blandy <jimb@redhat.com>
parents:
1006
diff
changeset
|
973 we would have returned directly from the loop. Since PREV is the last |
a43d53261506
* frame.c (choose_minibuf_frame): abort if the selected frame has
Jim Blandy <jimb@redhat.com>
parents:
1006
diff
changeset
|
974 acceptable frame in the list, return it. */ |
a43d53261506
* frame.c (choose_minibuf_frame): abort if the selected frame has
Jim Blandy <jimb@redhat.com>
parents:
1006
diff
changeset
|
975 return prev; |
286 | 976 } |
977 | |
4424
027d3affb2f8
(Fprevious_frame): New function, for parity with Fnext_frame.
Roland McGrath <roland@gnu.org>
parents:
4412
diff
changeset
|
978 |
765 | 979 DEFUN ("next-frame", Fnext_frame, Snext_frame, 0, 2, 0, |
40105
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
980 doc: /* Return the next frame in the frame list after FRAME. |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
981 It considers only frames on the same terminal as FRAME. |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
982 By default, skip minibuffer-only frames. |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
983 If omitted, FRAME defaults to the selected frame. |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
984 If optional argument MINIFRAME is nil, exclude minibuffer-only frames. |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
985 If MINIFRAME is a window, include only its own frame |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
986 and any frame now using that window as the minibuffer. |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
987 If MINIFRAME is `visible', include all visible frames. |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
988 If MINIFRAME is 0, include all visible and iconified frames. |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
989 Otherwise, include all frames. */) |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
990 (frame, miniframe) |
1251
4e556fda7a4d
* frame.c (Fselect_frame, Fframe_root_window,
Jim Blandy <jimb@redhat.com>
parents:
1118
diff
changeset
|
991 Lisp_Object frame, miniframe; |
286 | 992 { |
765 | 993 if (NILP (frame)) |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
994 frame = selected_frame; |
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
995 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
996 CHECK_LIVE_FRAME (frame); |
765 | 997 return next_frame (frame, miniframe); |
286 | 998 } |
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1809
diff
changeset
|
999 |
4424
027d3affb2f8
(Fprevious_frame): New function, for parity with Fnext_frame.
Roland McGrath <roland@gnu.org>
parents:
4412
diff
changeset
|
1000 DEFUN ("previous-frame", Fprevious_frame, Sprevious_frame, 0, 2, 0, |
40105
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1001 doc: /* Return the previous frame in the frame list before FRAME. |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1002 It considers only frames on the same terminal as FRAME. |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1003 By default, skip minibuffer-only frames. |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1004 If omitted, FRAME defaults to the selected frame. |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1005 If optional argument MINIFRAME is nil, exclude minibuffer-only frames. |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1006 If MINIFRAME is a window, include only its own frame |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1007 and any frame now using that window as the minibuffer. |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1008 If MINIFRAME is `visible', include all visible frames. |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1009 If MINIFRAME is 0, include all visible and iconified frames. |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1010 Otherwise, include all frames. */) |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1011 (frame, miniframe) |
4424
027d3affb2f8
(Fprevious_frame): New function, for parity with Fnext_frame.
Roland McGrath <roland@gnu.org>
parents:
4412
diff
changeset
|
1012 Lisp_Object frame, miniframe; |
027d3affb2f8
(Fprevious_frame): New function, for parity with Fnext_frame.
Roland McGrath <roland@gnu.org>
parents:
4412
diff
changeset
|
1013 { |
027d3affb2f8
(Fprevious_frame): New function, for parity with Fnext_frame.
Roland McGrath <roland@gnu.org>
parents:
4412
diff
changeset
|
1014 if (NILP (frame)) |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
1015 frame = selected_frame; |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
1016 CHECK_LIVE_FRAME (frame); |
4424
027d3affb2f8
(Fprevious_frame): New function, for parity with Fnext_frame.
Roland McGrath <roland@gnu.org>
parents:
4412
diff
changeset
|
1017 return prev_frame (frame, miniframe); |
027d3affb2f8
(Fprevious_frame): New function, for parity with Fnext_frame.
Roland McGrath <roland@gnu.org>
parents:
4412
diff
changeset
|
1018 } |
286 | 1019 |
5925
806e876cacb4
(Fset_frame_height, Fset_frame_width, Fset_frame_size):
Richard M. Stallman <rms@gnu.org>
parents:
5552
diff
changeset
|
1020 /* Return 1 if it is ok to delete frame F; |
806e876cacb4
(Fset_frame_height, Fset_frame_width, Fset_frame_size):
Richard M. Stallman <rms@gnu.org>
parents:
5552
diff
changeset
|
1021 0 if all frames aside from F are invisible. |
806e876cacb4
(Fset_frame_height, Fset_frame_width, Fset_frame_size):
Richard M. Stallman <rms@gnu.org>
parents:
5552
diff
changeset
|
1022 (Exception: if F is the terminal frame, and we are using X, return 1.) */ |
806e876cacb4
(Fset_frame_height, Fset_frame_width, Fset_frame_size):
Richard M. Stallman <rms@gnu.org>
parents:
5552
diff
changeset
|
1023 |
7646
de2c4334fad4
(other_visible_frames): No longer static.
Richard M. Stallman <rms@gnu.org>
parents:
7570
diff
changeset
|
1024 int |
5925
806e876cacb4
(Fset_frame_height, Fset_frame_width, Fset_frame_size):
Richard M. Stallman <rms@gnu.org>
parents:
5552
diff
changeset
|
1025 other_visible_frames (f) |
806e876cacb4
(Fset_frame_height, Fset_frame_width, Fset_frame_size):
Richard M. Stallman <rms@gnu.org>
parents:
5552
diff
changeset
|
1026 FRAME_PTR f; |
806e876cacb4
(Fset_frame_height, Fset_frame_width, Fset_frame_size):
Richard M. Stallman <rms@gnu.org>
parents:
5552
diff
changeset
|
1027 { |
806e876cacb4
(Fset_frame_height, Fset_frame_width, Fset_frame_size):
Richard M. Stallman <rms@gnu.org>
parents:
5552
diff
changeset
|
1028 /* We know the selected frame is visible, |
806e876cacb4
(Fset_frame_height, Fset_frame_width, Fset_frame_size):
Richard M. Stallman <rms@gnu.org>
parents:
5552
diff
changeset
|
1029 so if F is some other frame, it can't be the sole visible one. */ |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
1030 if (f == SELECTED_FRAME ()) |
5925
806e876cacb4
(Fset_frame_height, Fset_frame_width, Fset_frame_size):
Richard M. Stallman <rms@gnu.org>
parents:
5552
diff
changeset
|
1031 { |
806e876cacb4
(Fset_frame_height, Fset_frame_width, Fset_frame_size):
Richard M. Stallman <rms@gnu.org>
parents:
5552
diff
changeset
|
1032 Lisp_Object frames; |
806e876cacb4
(Fset_frame_height, Fset_frame_width, Fset_frame_size):
Richard M. Stallman <rms@gnu.org>
parents:
5552
diff
changeset
|
1033 int count = 0; |
806e876cacb4
(Fset_frame_height, Fset_frame_width, Fset_frame_size):
Richard M. Stallman <rms@gnu.org>
parents:
5552
diff
changeset
|
1034 |
806e876cacb4
(Fset_frame_height, Fset_frame_width, Fset_frame_size):
Richard M. Stallman <rms@gnu.org>
parents:
5552
diff
changeset
|
1035 for (frames = Vframe_list; |
806e876cacb4
(Fset_frame_height, Fset_frame_width, Fset_frame_size):
Richard M. Stallman <rms@gnu.org>
parents:
5552
diff
changeset
|
1036 CONSP (frames); |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
1037 frames = XCDR (frames)) |
5925
806e876cacb4
(Fset_frame_height, Fset_frame_width, Fset_frame_size):
Richard M. Stallman <rms@gnu.org>
parents:
5552
diff
changeset
|
1038 { |
6500
551bff5cffde
(next_frame, prev_frame, other_visible_frames, Fdelete_frame): Use assignment,
Karl Heuer <kwzh@gnu.org>
parents:
6486
diff
changeset
|
1039 Lisp_Object this; |
5925
806e876cacb4
(Fset_frame_height, Fset_frame_width, Fset_frame_size):
Richard M. Stallman <rms@gnu.org>
parents:
5552
diff
changeset
|
1040 |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
1041 this = XCAR (frames); |
5925
806e876cacb4
(Fset_frame_height, Fset_frame_width, Fset_frame_size):
Richard M. Stallman <rms@gnu.org>
parents:
5552
diff
changeset
|
1042 /* Verify that the frame's window still exists |
806e876cacb4
(Fset_frame_height, Fset_frame_width, Fset_frame_size):
Richard M. Stallman <rms@gnu.org>
parents:
5552
diff
changeset
|
1043 and we can still talk to it. And note any recent change |
806e876cacb4
(Fset_frame_height, Fset_frame_width, Fset_frame_size):
Richard M. Stallman <rms@gnu.org>
parents:
5552
diff
changeset
|
1044 in visibility. */ |
13412
1ed740e9aa64
[HAVE_NTGUI]: Test for a Win32 frame in procedures that test for an X frame.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13396
diff
changeset
|
1045 #ifdef HAVE_WINDOW_SYSTEM |
1ed740e9aa64
[HAVE_NTGUI]: Test for a Win32 frame in procedures that test for an X frame.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13396
diff
changeset
|
1046 if (FRAME_WINDOW_P (XFRAME (this))) |
5925
806e876cacb4
(Fset_frame_height, Fset_frame_width, Fset_frame_size):
Richard M. Stallman <rms@gnu.org>
parents:
5552
diff
changeset
|
1047 { |
9648
14b1481b7c6d
(other_visible_frames): Pass a frame ptr to x_sync.
Richard M. Stallman <rms@gnu.org>
parents:
9572
diff
changeset
|
1048 x_sync (XFRAME (this)); |
5925
806e876cacb4
(Fset_frame_height, Fset_frame_width, Fset_frame_size):
Richard M. Stallman <rms@gnu.org>
parents:
5552
diff
changeset
|
1049 FRAME_SAMPLE_VISIBILITY (XFRAME (this)); |
806e876cacb4
(Fset_frame_height, Fset_frame_width, Fset_frame_size):
Richard M. Stallman <rms@gnu.org>
parents:
5552
diff
changeset
|
1050 } |
806e876cacb4
(Fset_frame_height, Fset_frame_width, Fset_frame_size):
Richard M. Stallman <rms@gnu.org>
parents:
5552
diff
changeset
|
1051 #endif |
806e876cacb4
(Fset_frame_height, Fset_frame_width, Fset_frame_size):
Richard M. Stallman <rms@gnu.org>
parents:
5552
diff
changeset
|
1052 |
806e876cacb4
(Fset_frame_height, Fset_frame_width, Fset_frame_size):
Richard M. Stallman <rms@gnu.org>
parents:
5552
diff
changeset
|
1053 if (FRAME_VISIBLE_P (XFRAME (this)) |
806e876cacb4
(Fset_frame_height, Fset_frame_width, Fset_frame_size):
Richard M. Stallman <rms@gnu.org>
parents:
5552
diff
changeset
|
1054 || FRAME_ICONIFIED_P (XFRAME (this)) |
806e876cacb4
(Fset_frame_height, Fset_frame_width, Fset_frame_size):
Richard M. Stallman <rms@gnu.org>
parents:
5552
diff
changeset
|
1055 /* Allow deleting the terminal frame when at least |
806e876cacb4
(Fset_frame_height, Fset_frame_width, Fset_frame_size):
Richard M. Stallman <rms@gnu.org>
parents:
5552
diff
changeset
|
1056 one X frame exists! */ |
13412
1ed740e9aa64
[HAVE_NTGUI]: Test for a Win32 frame in procedures that test for an X frame.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13396
diff
changeset
|
1057 || (FRAME_WINDOW_P (XFRAME (this)) && !FRAME_WINDOW_P (f))) |
5925
806e876cacb4
(Fset_frame_height, Fset_frame_width, Fset_frame_size):
Richard M. Stallman <rms@gnu.org>
parents:
5552
diff
changeset
|
1058 count++; |
806e876cacb4
(Fset_frame_height, Fset_frame_width, Fset_frame_size):
Richard M. Stallman <rms@gnu.org>
parents:
5552
diff
changeset
|
1059 } |
806e876cacb4
(Fset_frame_height, Fset_frame_width, Fset_frame_size):
Richard M. Stallman <rms@gnu.org>
parents:
5552
diff
changeset
|
1060 return count > 1; |
806e876cacb4
(Fset_frame_height, Fset_frame_width, Fset_frame_size):
Richard M. Stallman <rms@gnu.org>
parents:
5552
diff
changeset
|
1061 } |
806e876cacb4
(Fset_frame_height, Fset_frame_width, Fset_frame_size):
Richard M. Stallman <rms@gnu.org>
parents:
5552
diff
changeset
|
1062 return 1; |
806e876cacb4
(Fset_frame_height, Fset_frame_width, Fset_frame_size):
Richard M. Stallman <rms@gnu.org>
parents:
5552
diff
changeset
|
1063 } |
806e876cacb4
(Fset_frame_height, Fset_frame_width, Fset_frame_size):
Richard M. Stallman <rms@gnu.org>
parents:
5552
diff
changeset
|
1064 |
4341
d07ef5ea3b58
(Fdelete_frame): New arg FORCE allows deletion of last non-invisible frame.
Richard M. Stallman <rms@gnu.org>
parents:
4227
diff
changeset
|
1065 DEFUN ("delete-frame", Fdelete_frame, Sdelete_frame, 0, 2, "", |
40105
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1066 doc: /* Delete FRAME, permanently eliminating it from use. |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1067 If omitted, FRAME defaults to the selected frame. |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1068 A frame may not be deleted if its minibuffer is used by other frames. |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1069 Normally, you may not delete a frame if all other frames are invisible, |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1070 but if the second optional argument FORCE is non-nil, you may do so. |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1071 |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1072 This function runs `delete-frame-hook' before actually deleting the |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1073 frame. The hook is called with one argument FRAME. */) |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1074 (frame, force) |
4341
d07ef5ea3b58
(Fdelete_frame): New arg FORCE allows deletion of last non-invisible frame.
Richard M. Stallman <rms@gnu.org>
parents:
4227
diff
changeset
|
1075 Lisp_Object frame, force; |
286 | 1076 { |
765 | 1077 struct frame *f; |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
1078 struct frame *sf = SELECTED_FRAME (); |
12222
7286ed64badd
(Fdelete_frame): If the minibuf window was selected, make that remain so.
Richard M. Stallman <rms@gnu.org>
parents:
12010
diff
changeset
|
1079 int minibuffer_selected; |
286 | 1080 |
765 | 1081 if (EQ (frame, Qnil)) |
286 | 1082 { |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
1083 f = sf; |
9268
cb55d0155265
(make_minibuffer_frame, make_terminal_frame, Fselected_frame,
Karl Heuer <kwzh@gnu.org>
parents:
9214
diff
changeset
|
1084 XSETFRAME (frame, f); |
286 | 1085 } |
1086 else | |
1087 { | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
1088 CHECK_FRAME (frame); |
765 | 1089 f = XFRAME (frame); |
286 | 1090 } |
1091 | |
765 | 1092 if (! FRAME_LIVE_P (f)) |
1920
ac5e559a819a
* frame.c (Fselect_frame): Set Vlast_event_frame to Qnil after
Jim Blandy <jimb@redhat.com>
parents:
1870
diff
changeset
|
1093 return Qnil; |
454 | 1094 |
35660
b9366f467430
* alloc.c (allocate_string) [macintosh]: Call check_string_bytes
Andrew Choi <akochoi@shaw.ca>
parents:
35611
diff
changeset
|
1095 if (NILP (force) && !other_visible_frames (f) |
b9366f467430
* alloc.c (allocate_string) [macintosh]: Call check_string_bytes
Andrew Choi <akochoi@shaw.ca>
parents:
35611
diff
changeset
|
1096 #ifdef macintosh |
b9366f467430
* alloc.c (allocate_string) [macintosh]: Call check_string_bytes
Andrew Choi <akochoi@shaw.ca>
parents:
35611
diff
changeset
|
1097 /* Terminal frame deleted before any other visible frames are |
b9366f467430
* alloc.c (allocate_string) [macintosh]: Call check_string_bytes
Andrew Choi <akochoi@shaw.ca>
parents:
35611
diff
changeset
|
1098 created. */ |
b9366f467430
* alloc.c (allocate_string) [macintosh]: Call check_string_bytes
Andrew Choi <akochoi@shaw.ca>
parents:
35611
diff
changeset
|
1099 && strcmp (XSTRING (f->name)->data, "F1") != 0 |
b9366f467430
* alloc.c (allocate_string) [macintosh]: Call check_string_bytes
Andrew Choi <akochoi@shaw.ca>
parents:
35611
diff
changeset
|
1100 #endif |
b9366f467430
* alloc.c (allocate_string) [macintosh]: Call check_string_bytes
Andrew Choi <akochoi@shaw.ca>
parents:
35611
diff
changeset
|
1101 ) |
5925
806e876cacb4
(Fset_frame_height, Fset_frame_width, Fset_frame_size):
Richard M. Stallman <rms@gnu.org>
parents:
5552
diff
changeset
|
1102 error ("Attempt to delete the sole visible or iconified frame"); |
286 | 1103 |
18945
7f491075707a
(Fdelete_frame): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
18698
diff
changeset
|
1104 #if 0 |
7f491075707a
(Fdelete_frame): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
18698
diff
changeset
|
1105 /* This is a nice idea, but x_connection_closed needs to be able |
7f491075707a
(Fdelete_frame): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
18698
diff
changeset
|
1106 to delete the last frame, if it is gone. */ |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
1107 if (NILP (XCDR (Vframe_list))) |
18698
52271ad26a1d
(Fdelete_frame): Always err for deleting the only frame.
Richard M. Stallman <rms@gnu.org>
parents:
18380
diff
changeset
|
1108 error ("Attempt to delete the only frame"); |
18945
7f491075707a
(Fdelete_frame): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
18698
diff
changeset
|
1109 #endif |
18698
52271ad26a1d
(Fdelete_frame): Always err for deleting the only frame.
Richard M. Stallman <rms@gnu.org>
parents:
18380
diff
changeset
|
1110 |
765 | 1111 /* Does this frame have a minibuffer, and is it the surrogate |
1112 minibuffer for any other frame? */ | |
965
0eb68c6c452a
* frame.c (Qheight, Qicon, Qmodeline, Qname, Qnone, Qonly,
Jim Blandy <jimb@redhat.com>
parents:
886
diff
changeset
|
1113 if (FRAME_HAS_MINIBUF_P (XFRAME (frame))) |
363 | 1114 { |
765 | 1115 Lisp_Object frames; |
708 | 1116 |
765 | 1117 for (frames = Vframe_list; |
1118 CONSP (frames); | |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
1119 frames = XCDR (frames)) |
708 | 1120 { |
6157
9422e430f067
(Fdelete_frame): Don't initialize a Lisp_Object.
Richard M. Stallman <rms@gnu.org>
parents:
6130
diff
changeset
|
1121 Lisp_Object this; |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
1122 this = XCAR (frames); |
363 | 1123 |
765 | 1124 if (! EQ (this, frame) |
1125 && EQ (frame, | |
6157
9422e430f067
(Fdelete_frame): Don't initialize a Lisp_Object.
Richard M. Stallman <rms@gnu.org>
parents:
6130
diff
changeset
|
1126 WINDOW_FRAME (XWINDOW |
9422e430f067
(Fdelete_frame): Don't initialize a Lisp_Object.
Richard M. Stallman <rms@gnu.org>
parents:
6130
diff
changeset
|
1127 (FRAME_MINIBUF_WINDOW (XFRAME (this)))))) |
765 | 1128 error ("Attempt to delete a surrogate minibuffer frame"); |
708 | 1129 } |
286 | 1130 } |
1131 | |
32909
44cb0900a858
(Fdelete_frame): Doc fix. Move running the hook
Gerd Moellmann <gerd@gnu.org>
parents:
32907
diff
changeset
|
1132 /* Run `delete-frame-hook'. */ |
44cb0900a858
(Fdelete_frame): Doc fix. Move running the hook
Gerd Moellmann <gerd@gnu.org>
parents:
32907
diff
changeset
|
1133 if (!NILP (Vrun_hooks)) |
44cb0900a858
(Fdelete_frame): Doc fix. Move running the hook
Gerd Moellmann <gerd@gnu.org>
parents:
32907
diff
changeset
|
1134 { |
44cb0900a858
(Fdelete_frame): Doc fix. Move running the hook
Gerd Moellmann <gerd@gnu.org>
parents:
32907
diff
changeset
|
1135 Lisp_Object args[2]; |
44cb0900a858
(Fdelete_frame): Doc fix. Move running the hook
Gerd Moellmann <gerd@gnu.org>
parents:
32907
diff
changeset
|
1136 args[0] = intern ("delete-frame-hook"); |
44cb0900a858
(Fdelete_frame): Doc fix. Move running the hook
Gerd Moellmann <gerd@gnu.org>
parents:
32907
diff
changeset
|
1137 args[1] = frame; |
44cb0900a858
(Fdelete_frame): Doc fix. Move running the hook
Gerd Moellmann <gerd@gnu.org>
parents:
32907
diff
changeset
|
1138 Frun_hook_with_args (2, args); |
44cb0900a858
(Fdelete_frame): Doc fix. Move running the hook
Gerd Moellmann <gerd@gnu.org>
parents:
32907
diff
changeset
|
1139 } |
44cb0900a858
(Fdelete_frame): Doc fix. Move running the hook
Gerd Moellmann <gerd@gnu.org>
parents:
32907
diff
changeset
|
1140 |
12222
7286ed64badd
(Fdelete_frame): If the minibuf window was selected, make that remain so.
Richard M. Stallman <rms@gnu.org>
parents:
12010
diff
changeset
|
1141 minibuffer_selected = EQ (minibuf_window, selected_window); |
7286ed64badd
(Fdelete_frame): If the minibuf window was selected, make that remain so.
Richard M. Stallman <rms@gnu.org>
parents:
12010
diff
changeset
|
1142 |
765 | 1143 /* Don't let the frame remain selected. */ |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
1144 if (f == sf) |
12379
7149fc03ea56
(next_frame, prev_frame): Consider only frames on same kbd.
Richard M. Stallman <rms@gnu.org>
parents:
12286
diff
changeset
|
1145 { |
7149fc03ea56
(next_frame, prev_frame): Consider only frames on same kbd.
Richard M. Stallman <rms@gnu.org>
parents:
12286
diff
changeset
|
1146 Lisp_Object tail, frame1; |
7149fc03ea56
(next_frame, prev_frame): Consider only frames on same kbd.
Richard M. Stallman <rms@gnu.org>
parents:
12286
diff
changeset
|
1147 |
7149fc03ea56
(next_frame, prev_frame): Consider only frames on same kbd.
Richard M. Stallman <rms@gnu.org>
parents:
12286
diff
changeset
|
1148 /* Look for another visible frame on the same terminal. */ |
7149fc03ea56
(next_frame, prev_frame): Consider only frames on same kbd.
Richard M. Stallman <rms@gnu.org>
parents:
12286
diff
changeset
|
1149 frame1 = next_frame (frame, Qvisible); |
7149fc03ea56
(next_frame, prev_frame): Consider only frames on same kbd.
Richard M. Stallman <rms@gnu.org>
parents:
12286
diff
changeset
|
1150 |
7149fc03ea56
(next_frame, prev_frame): Consider only frames on same kbd.
Richard M. Stallman <rms@gnu.org>
parents:
12286
diff
changeset
|
1151 /* If there is none, find *some* other frame. */ |
7149fc03ea56
(next_frame, prev_frame): Consider only frames on same kbd.
Richard M. Stallman <rms@gnu.org>
parents:
12286
diff
changeset
|
1152 if (NILP (frame1) || EQ (frame1, frame)) |
7149fc03ea56
(next_frame, prev_frame): Consider only frames on same kbd.
Richard M. Stallman <rms@gnu.org>
parents:
12286
diff
changeset
|
1153 { |
7149fc03ea56
(next_frame, prev_frame): Consider only frames on same kbd.
Richard M. Stallman <rms@gnu.org>
parents:
12286
diff
changeset
|
1154 FOR_EACH_FRAME (tail, frame1) |
7149fc03ea56
(next_frame, prev_frame): Consider only frames on same kbd.
Richard M. Stallman <rms@gnu.org>
parents:
12286
diff
changeset
|
1155 { |
7149fc03ea56
(next_frame, prev_frame): Consider only frames on same kbd.
Richard M. Stallman <rms@gnu.org>
parents:
12286
diff
changeset
|
1156 if (! EQ (frame, frame1)) |
7149fc03ea56
(next_frame, prev_frame): Consider only frames on same kbd.
Richard M. Stallman <rms@gnu.org>
parents:
12286
diff
changeset
|
1157 break; |
7149fc03ea56
(next_frame, prev_frame): Consider only frames on same kbd.
Richard M. Stallman <rms@gnu.org>
parents:
12286
diff
changeset
|
1158 } |
7149fc03ea56
(next_frame, prev_frame): Consider only frames on same kbd.
Richard M. Stallman <rms@gnu.org>
parents:
12286
diff
changeset
|
1159 } |
7149fc03ea56
(next_frame, prev_frame): Consider only frames on same kbd.
Richard M. Stallman <rms@gnu.org>
parents:
12286
diff
changeset
|
1160 |
36810
a9485f8e43d6
(do_switch_frame): Remove unused parameter NO_EVENT, add
Gerd Moellmann <gerd@gnu.org>
parents:
36804
diff
changeset
|
1161 do_switch_frame (frame1, 0, 1); |
25736
84179b4e7743
(Fdelete_frame): Correct local variable pointing to
Gerd Moellmann <gerd@gnu.org>
parents:
25710
diff
changeset
|
1162 sf = SELECTED_FRAME (); |
12379
7149fc03ea56
(next_frame, prev_frame): Consider only frames on same kbd.
Richard M. Stallman <rms@gnu.org>
parents:
12286
diff
changeset
|
1163 } |
286 | 1164 |
765 | 1165 /* Don't allow minibuf_window to remain on a deleted frame. */ |
1166 if (EQ (f->minibuffer_window, minibuf_window)) | |
286 | 1167 { |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
1168 Fset_window_buffer (sf->minibuffer_window, |
286 | 1169 XWINDOW (minibuf_window)->buffer); |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
1170 minibuf_window = sf->minibuffer_window; |
12222
7286ed64badd
(Fdelete_frame): If the minibuf window was selected, make that remain so.
Richard M. Stallman <rms@gnu.org>
parents:
12010
diff
changeset
|
1171 |
7286ed64badd
(Fdelete_frame): If the minibuf window was selected, make that remain so.
Richard M. Stallman <rms@gnu.org>
parents:
12010
diff
changeset
|
1172 /* If the dying minibuffer window was selected, |
7286ed64badd
(Fdelete_frame): If the minibuf window was selected, make that remain so.
Richard M. Stallman <rms@gnu.org>
parents:
12010
diff
changeset
|
1173 select the new one. */ |
7286ed64badd
(Fdelete_frame): If the minibuf window was selected, make that remain so.
Richard M. Stallman <rms@gnu.org>
parents:
12010
diff
changeset
|
1174 if (minibuffer_selected) |
7286ed64badd
(Fdelete_frame): If the minibuf window was selected, make that remain so.
Richard M. Stallman <rms@gnu.org>
parents:
12010
diff
changeset
|
1175 Fselect_window (minibuf_window); |
286 | 1176 } |
1177 | |
27800
403b2b833ce2
(Fdelete_frame): Don't let echo_area_window to remain on a deleted frame.
Eli Zaretskii <eliz@gnu.org>
parents:
27797
diff
changeset
|
1178 /* Don't let echo_area_window to remain on a deleted frame. */ |
403b2b833ce2
(Fdelete_frame): Don't let echo_area_window to remain on a deleted frame.
Eli Zaretskii <eliz@gnu.org>
parents:
27797
diff
changeset
|
1179 if (EQ (f->minibuffer_window, echo_area_window)) |
403b2b833ce2
(Fdelete_frame): Don't let echo_area_window to remain on a deleted frame.
Eli Zaretskii <eliz@gnu.org>
parents:
27797
diff
changeset
|
1180 echo_area_window = sf->minibuffer_window; |
403b2b833ce2
(Fdelete_frame): Don't let echo_area_window to remain on a deleted frame.
Eli Zaretskii <eliz@gnu.org>
parents:
27797
diff
changeset
|
1181 |
8099
a06382fd175d
(Fdelete_frame): Call x_clear_frame_selections.
Richard M. Stallman <rms@gnu.org>
parents:
8054
diff
changeset
|
1182 /* Clear any X selections for this frame. */ |
a06382fd175d
(Fdelete_frame): Call x_clear_frame_selections.
Richard M. Stallman <rms@gnu.org>
parents:
8054
diff
changeset
|
1183 #ifdef HAVE_X_WINDOWS |
a06382fd175d
(Fdelete_frame): Call x_clear_frame_selections.
Richard M. Stallman <rms@gnu.org>
parents:
8054
diff
changeset
|
1184 if (FRAME_X_P (f)) |
a06382fd175d
(Fdelete_frame): Call x_clear_frame_selections.
Richard M. Stallman <rms@gnu.org>
parents:
8054
diff
changeset
|
1185 x_clear_frame_selections (f); |
a06382fd175d
(Fdelete_frame): Call x_clear_frame_selections.
Richard M. Stallman <rms@gnu.org>
parents:
8054
diff
changeset
|
1186 #endif |
a06382fd175d
(Fdelete_frame): Call x_clear_frame_selections.
Richard M. Stallman <rms@gnu.org>
parents:
8054
diff
changeset
|
1187 |
25030
c69d9e48269b
(make_frame): Set n_current_toolbar_items to 0.
Gerd Moellmann <gerd@gnu.org>
parents:
23746
diff
changeset
|
1188 /* Free glyphs. |
c69d9e48269b
(make_frame): Set n_current_toolbar_items to 0.
Gerd Moellmann <gerd@gnu.org>
parents:
23746
diff
changeset
|
1189 This function must be called before the window tree of the |
c69d9e48269b
(make_frame): Set n_current_toolbar_items to 0.
Gerd Moellmann <gerd@gnu.org>
parents:
23746
diff
changeset
|
1190 frame is deleted because windows contain dynamically allocated |
c69d9e48269b
(make_frame): Set n_current_toolbar_items to 0.
Gerd Moellmann <gerd@gnu.org>
parents:
23746
diff
changeset
|
1191 memory. */ |
c69d9e48269b
(make_frame): Set n_current_toolbar_items to 0.
Gerd Moellmann <gerd@gnu.org>
parents:
23746
diff
changeset
|
1192 free_glyphs (f); |
c69d9e48269b
(make_frame): Set n_current_toolbar_items to 0.
Gerd Moellmann <gerd@gnu.org>
parents:
23746
diff
changeset
|
1193 |
1680
ea9f3949f153
* frame.c (Fdelete_frame): Delete all the windows in the frame's
Jim Blandy <jimb@redhat.com>
parents:
1652
diff
changeset
|
1194 /* Mark all the windows that used to be on FRAME as deleted, and then |
ea9f3949f153
* frame.c (Fdelete_frame): Delete all the windows in the frame's
Jim Blandy <jimb@redhat.com>
parents:
1652
diff
changeset
|
1195 remove the reference to them. */ |
ea9f3949f153
* frame.c (Fdelete_frame): Delete all the windows in the frame's
Jim Blandy <jimb@redhat.com>
parents:
1652
diff
changeset
|
1196 delete_all_subwindows (XWINDOW (f->root_window)); |
ea9f3949f153
* frame.c (Fdelete_frame): Delete all the windows in the frame's
Jim Blandy <jimb@redhat.com>
parents:
1652
diff
changeset
|
1197 f->root_window = Qnil; |
ea9f3949f153
* frame.c (Fdelete_frame): Delete all the windows in the frame's
Jim Blandy <jimb@redhat.com>
parents:
1652
diff
changeset
|
1198 |
765 | 1199 Vframe_list = Fdelq (frame, Vframe_list); |
1709
b86b3237e017
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1691
diff
changeset
|
1200 FRAME_SET_VISIBLE (f, 0); |
286 | 1201 |
11495
da1a40d86231
(Fdelete_frame): Free f->namebuf.
Karl Heuer <kwzh@gnu.org>
parents:
11494
diff
changeset
|
1202 if (f->namebuf) |
25030
c69d9e48269b
(make_frame): Set n_current_toolbar_items to 0.
Gerd Moellmann <gerd@gnu.org>
parents:
23746
diff
changeset
|
1203 xfree (f->namebuf); |
8666
844edbc22875
(Fdelete_frame): Free the frame's glyphs arrays.
Richard M. Stallman <rms@gnu.org>
parents:
8586
diff
changeset
|
1204 if (FRAME_INSERT_COST (f)) |
25030
c69d9e48269b
(make_frame): Set n_current_toolbar_items to 0.
Gerd Moellmann <gerd@gnu.org>
parents:
23746
diff
changeset
|
1205 xfree (FRAME_INSERT_COST (f)); |
8666
844edbc22875
(Fdelete_frame): Free the frame's glyphs arrays.
Richard M. Stallman <rms@gnu.org>
parents:
8586
diff
changeset
|
1206 if (FRAME_DELETEN_COST (f)) |
25030
c69d9e48269b
(make_frame): Set n_current_toolbar_items to 0.
Gerd Moellmann <gerd@gnu.org>
parents:
23746
diff
changeset
|
1207 xfree (FRAME_DELETEN_COST (f)); |
8666
844edbc22875
(Fdelete_frame): Free the frame's glyphs arrays.
Richard M. Stallman <rms@gnu.org>
parents:
8586
diff
changeset
|
1208 if (FRAME_INSERTN_COST (f)) |
25030
c69d9e48269b
(make_frame): Set n_current_toolbar_items to 0.
Gerd Moellmann <gerd@gnu.org>
parents:
23746
diff
changeset
|
1209 xfree (FRAME_INSERTN_COST (f)); |
8666
844edbc22875
(Fdelete_frame): Free the frame's glyphs arrays.
Richard M. Stallman <rms@gnu.org>
parents:
8586
diff
changeset
|
1210 if (FRAME_DELETE_COST (f)) |
25030
c69d9e48269b
(make_frame): Set n_current_toolbar_items to 0.
Gerd Moellmann <gerd@gnu.org>
parents:
23746
diff
changeset
|
1211 xfree (FRAME_DELETE_COST (f)); |
17573
bfd86808adcc
(Fdelete_frame): Free FRAME_MESSAGE_BUF.
Richard M. Stallman <rms@gnu.org>
parents:
17235
diff
changeset
|
1212 if (FRAME_MESSAGE_BUF (f)) |
25030
c69d9e48269b
(make_frame): Set n_current_toolbar_items to 0.
Gerd Moellmann <gerd@gnu.org>
parents:
23746
diff
changeset
|
1213 xfree (FRAME_MESSAGE_BUF (f)); |
8666
844edbc22875
(Fdelete_frame): Free the frame's glyphs arrays.
Richard M. Stallman <rms@gnu.org>
parents:
8586
diff
changeset
|
1214 |
1809
69b3ee873a9b
* frame.c (Fdelete_frame): Clear the frame's display after calling
Jim Blandy <jimb@redhat.com>
parents:
1784
diff
changeset
|
1215 /* Since some events are handled at the interrupt level, we may get |
69b3ee873a9b
* frame.c (Fdelete_frame): Clear the frame's display after calling
Jim Blandy <jimb@redhat.com>
parents:
1784
diff
changeset
|
1216 an event for f at any time; if we zero out the frame's display |
69b3ee873a9b
* frame.c (Fdelete_frame): Clear the frame's display after calling
Jim Blandy <jimb@redhat.com>
parents:
1784
diff
changeset
|
1217 now, then we may trip up the event-handling code. Instead, we'll |
69b3ee873a9b
* frame.c (Fdelete_frame): Clear the frame's display after calling
Jim Blandy <jimb@redhat.com>
parents:
1784
diff
changeset
|
1218 promise that the display of the frame must be valid until we have |
69b3ee873a9b
* frame.c (Fdelete_frame): Clear the frame's display after calling
Jim Blandy <jimb@redhat.com>
parents:
1784
diff
changeset
|
1219 called the window-system-dependent frame destruction routine. */ |
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1809
diff
changeset
|
1220 |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1809
diff
changeset
|
1221 /* I think this should be done with a hook. */ |
13412
1ed740e9aa64
[HAVE_NTGUI]: Test for a Win32 frame in procedures that test for an X frame.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13396
diff
changeset
|
1222 #ifdef HAVE_WINDOW_SYSTEM |
1ed740e9aa64
[HAVE_NTGUI]: Test for a Win32 frame in procedures that test for an X frame.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13396
diff
changeset
|
1223 if (FRAME_WINDOW_P (f)) |
1809
69b3ee873a9b
* frame.c (Fdelete_frame): Clear the frame's display after calling
Jim Blandy <jimb@redhat.com>
parents:
1784
diff
changeset
|
1224 x_destroy_window (f); |
363 | 1225 #endif |
1226 | |
12667
a3466dad7d6d
Renamings: frame->display => frame->output, struct x_display -> sruct x_output.
Richard M. Stallman <rms@gnu.org>
parents:
12630
diff
changeset
|
1227 f->output_data.nothing = 0; |
1809
69b3ee873a9b
* frame.c (Fdelete_frame): Clear the frame's display after calling
Jim Blandy <jimb@redhat.com>
parents:
1784
diff
changeset
|
1228 |
765 | 1229 /* If we've deleted the last_nonminibuf_frame, then try to find |
363 | 1230 another one. */ |
765 | 1231 if (f == last_nonminibuf_frame) |
363 | 1232 { |
765 | 1233 Lisp_Object frames; |
708 | 1234 |
765 | 1235 last_nonminibuf_frame = 0; |
363 | 1236 |
765 | 1237 for (frames = Vframe_list; |
1238 CONSP (frames); | |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
1239 frames = XCDR (frames)) |
363 | 1240 { |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
1241 f = XFRAME (XCAR (frames)); |
765 | 1242 if (!FRAME_MINIBUF_ONLY_P (f)) |
363 | 1243 { |
765 | 1244 last_nonminibuf_frame = f; |
363 | 1245 break; |
1246 } | |
1247 } | |
1248 } | |
286 | 1249 |
11906
3ca56969ba07
(Fdelete_frame): When updating Vdefault_minibuffer_frame,
Karl Heuer <kwzh@gnu.org>
parents:
11794
diff
changeset
|
1250 /* If we've deleted this keyboard's default_minibuffer_frame, try to |
3ca56969ba07
(Fdelete_frame): When updating Vdefault_minibuffer_frame,
Karl Heuer <kwzh@gnu.org>
parents:
11794
diff
changeset
|
1251 find another one. Prefer minibuffer-only frames, but also notice |
3ca56969ba07
(Fdelete_frame): When updating Vdefault_minibuffer_frame,
Karl Heuer <kwzh@gnu.org>
parents:
11794
diff
changeset
|
1252 frames with other windows. */ |
11779
6234b3610a6f
Vdefault_minibuffer_frame is now part of KBOARD instead
Karl Heuer <kwzh@gnu.org>
parents:
11775
diff
changeset
|
1253 if (EQ (frame, FRAME_KBOARD (f)->Vdefault_minibuffer_frame)) |
708 | 1254 { |
765 | 1255 Lisp_Object frames; |
708 | 1256 |
765 | 1257 /* The last frame we saw with a minibuffer, minibuffer-only or not. */ |
6500
551bff5cffde
(next_frame, prev_frame, other_visible_frames, Fdelete_frame): Use assignment,
Karl Heuer <kwzh@gnu.org>
parents:
6486
diff
changeset
|
1258 Lisp_Object frame_with_minibuf; |
12380
2c09b3adbb90
(Fdelete_frame): It's ok to have no minibuffer left on
Richard M. Stallman <rms@gnu.org>
parents:
12379
diff
changeset
|
1259 /* Some frame we found on the same kboard, or nil if there are none. */ |
2c09b3adbb90
(Fdelete_frame): It's ok to have no minibuffer left on
Richard M. Stallman <rms@gnu.org>
parents:
12379
diff
changeset
|
1260 Lisp_Object frame_on_same_kboard; |
708 | 1261 |
12380
2c09b3adbb90
(Fdelete_frame): It's ok to have no minibuffer left on
Richard M. Stallman <rms@gnu.org>
parents:
12379
diff
changeset
|
1262 frame_on_same_kboard = Qnil; |
6500
551bff5cffde
(next_frame, prev_frame, other_visible_frames, Fdelete_frame): Use assignment,
Karl Heuer <kwzh@gnu.org>
parents:
6486
diff
changeset
|
1263 frame_with_minibuf = Qnil; |
12380
2c09b3adbb90
(Fdelete_frame): It's ok to have no minibuffer left on
Richard M. Stallman <rms@gnu.org>
parents:
12379
diff
changeset
|
1264 |
765 | 1265 for (frames = Vframe_list; |
1266 CONSP (frames); | |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
1267 frames = XCDR (frames)) |
708 | 1268 { |
6500
551bff5cffde
(next_frame, prev_frame, other_visible_frames, Fdelete_frame): Use assignment,
Karl Heuer <kwzh@gnu.org>
parents:
6486
diff
changeset
|
1269 Lisp_Object this; |
11906
3ca56969ba07
(Fdelete_frame): When updating Vdefault_minibuffer_frame,
Karl Heuer <kwzh@gnu.org>
parents:
11794
diff
changeset
|
1270 struct frame *f1; |
708 | 1271 |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
1272 this = XCAR (frames); |
9127
0b4836daa8e1
(Fframep, make_frame_without_minibuffer, do_switch_frame, prev_frame,
Karl Heuer <kwzh@gnu.org>
parents:
9032
diff
changeset
|
1273 if (!FRAMEP (this)) |
708 | 1274 abort (); |
11906
3ca56969ba07
(Fdelete_frame): When updating Vdefault_minibuffer_frame,
Karl Heuer <kwzh@gnu.org>
parents:
11794
diff
changeset
|
1275 f1 = XFRAME (this); |
708 | 1276 |
11906
3ca56969ba07
(Fdelete_frame): When updating Vdefault_minibuffer_frame,
Karl Heuer <kwzh@gnu.org>
parents:
11794
diff
changeset
|
1277 /* Consider only frames on the same kboard |
3ca56969ba07
(Fdelete_frame): When updating Vdefault_minibuffer_frame,
Karl Heuer <kwzh@gnu.org>
parents:
11794
diff
changeset
|
1278 and only those with minibuffers. */ |
3ca56969ba07
(Fdelete_frame): When updating Vdefault_minibuffer_frame,
Karl Heuer <kwzh@gnu.org>
parents:
11794
diff
changeset
|
1279 if (FRAME_KBOARD (f) == FRAME_KBOARD (f1) |
3ca56969ba07
(Fdelete_frame): When updating Vdefault_minibuffer_frame,
Karl Heuer <kwzh@gnu.org>
parents:
11794
diff
changeset
|
1280 && FRAME_HAS_MINIBUF_P (f1)) |
708 | 1281 { |
765 | 1282 frame_with_minibuf = this; |
11906
3ca56969ba07
(Fdelete_frame): When updating Vdefault_minibuffer_frame,
Karl Heuer <kwzh@gnu.org>
parents:
11794
diff
changeset
|
1283 if (FRAME_MINIBUF_ONLY_P (f1)) |
708 | 1284 break; |
1285 } | |
12380
2c09b3adbb90
(Fdelete_frame): It's ok to have no minibuffer left on
Richard M. Stallman <rms@gnu.org>
parents:
12379
diff
changeset
|
1286 |
2c09b3adbb90
(Fdelete_frame): It's ok to have no minibuffer left on
Richard M. Stallman <rms@gnu.org>
parents:
12379
diff
changeset
|
1287 if (FRAME_KBOARD (f) == FRAME_KBOARD (f1)) |
2c09b3adbb90
(Fdelete_frame): It's ok to have no minibuffer left on
Richard M. Stallman <rms@gnu.org>
parents:
12379
diff
changeset
|
1288 frame_on_same_kboard = this; |
708 | 1289 } |
1290 | |
12380
2c09b3adbb90
(Fdelete_frame): It's ok to have no minibuffer left on
Richard M. Stallman <rms@gnu.org>
parents:
12379
diff
changeset
|
1291 if (!NILP (frame_on_same_kboard)) |
2c09b3adbb90
(Fdelete_frame): It's ok to have no minibuffer left on
Richard M. Stallman <rms@gnu.org>
parents:
12379
diff
changeset
|
1292 { |
2c09b3adbb90
(Fdelete_frame): It's ok to have no minibuffer left on
Richard M. Stallman <rms@gnu.org>
parents:
12379
diff
changeset
|
1293 /* We know that there must be some frame with a minibuffer out |
2c09b3adbb90
(Fdelete_frame): It's ok to have no minibuffer left on
Richard M. Stallman <rms@gnu.org>
parents:
12379
diff
changeset
|
1294 there. If this were not true, all of the frames present |
2c09b3adbb90
(Fdelete_frame): It's ok to have no minibuffer left on
Richard M. Stallman <rms@gnu.org>
parents:
12379
diff
changeset
|
1295 would have to be minibufferless, which implies that at some |
2c09b3adbb90
(Fdelete_frame): It's ok to have no minibuffer left on
Richard M. Stallman <rms@gnu.org>
parents:
12379
diff
changeset
|
1296 point their minibuffer frames must have been deleted, but |
2c09b3adbb90
(Fdelete_frame): It's ok to have no minibuffer left on
Richard M. Stallman <rms@gnu.org>
parents:
12379
diff
changeset
|
1297 that is prohibited at the top; you can't delete surrogate |
2c09b3adbb90
(Fdelete_frame): It's ok to have no minibuffer left on
Richard M. Stallman <rms@gnu.org>
parents:
12379
diff
changeset
|
1298 minibuffer frames. */ |
2c09b3adbb90
(Fdelete_frame): It's ok to have no minibuffer left on
Richard M. Stallman <rms@gnu.org>
parents:
12379
diff
changeset
|
1299 if (NILP (frame_with_minibuf)) |
2c09b3adbb90
(Fdelete_frame): It's ok to have no minibuffer left on
Richard M. Stallman <rms@gnu.org>
parents:
12379
diff
changeset
|
1300 abort (); |
708 | 1301 |
12380
2c09b3adbb90
(Fdelete_frame): It's ok to have no minibuffer left on
Richard M. Stallman <rms@gnu.org>
parents:
12379
diff
changeset
|
1302 FRAME_KBOARD (f)->Vdefault_minibuffer_frame = frame_with_minibuf; |
2c09b3adbb90
(Fdelete_frame): It's ok to have no minibuffer left on
Richard M. Stallman <rms@gnu.org>
parents:
12379
diff
changeset
|
1303 } |
2c09b3adbb90
(Fdelete_frame): It's ok to have no minibuffer left on
Richard M. Stallman <rms@gnu.org>
parents:
12379
diff
changeset
|
1304 else |
2c09b3adbb90
(Fdelete_frame): It's ok to have no minibuffer left on
Richard M. Stallman <rms@gnu.org>
parents:
12379
diff
changeset
|
1305 /* No frames left on this kboard--say no minibuffer either. */ |
2c09b3adbb90
(Fdelete_frame): It's ok to have no minibuffer left on
Richard M. Stallman <rms@gnu.org>
parents:
12379
diff
changeset
|
1306 FRAME_KBOARD (f)->Vdefault_minibuffer_frame = Qnil; |
708 | 1307 } |
1308 | |
16280
f4833d0bfaaa
(Fdelete_frame): Set update_mode_lines.
Richard M. Stallman <rms@gnu.org>
parents:
16263
diff
changeset
|
1309 /* Cause frame titles to update--necessary if we now have just one frame. */ |
f4833d0bfaaa
(Fdelete_frame): Set update_mode_lines.
Richard M. Stallman <rms@gnu.org>
parents:
16263
diff
changeset
|
1310 update_mode_lines = 1; |
f4833d0bfaaa
(Fdelete_frame): Set update_mode_lines.
Richard M. Stallman <rms@gnu.org>
parents:
16263
diff
changeset
|
1311 |
286 | 1312 return Qnil; |
1313 } | |
1314 | |
1315 /* Return mouse position in character cell units. */ | |
1316 | |
454 | 1317 DEFUN ("mouse-position", Fmouse_position, Smouse_position, 0, 0, 0, |
40105
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1318 doc: /* Return a list (FRAME X . Y) giving the current mouse frame and position. |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1319 The position is given in character cells, where (0, 0) is the |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1320 upper-left corner. |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1321 If Emacs is running on a mouseless terminal or hasn't been programmed |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1322 to read the mouse position, it returns the selected frame for FRAME |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1323 and nil for X and Y. |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1324 If `mouse-position-function' is non-nil, `mouse-position' calls it, |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1325 passing the normal return value to that function as an argument, |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1326 and returns whatever that function returns. */) |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1327 () |
286 | 1328 { |
765 | 1329 FRAME_PTR f; |
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1809
diff
changeset
|
1330 Lisp_Object lispy_dummy; |
1989
b1c1ab20f810
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1920
diff
changeset
|
1331 enum scroll_bar_part party_dummy; |
27795
83292274bbd4
(Vmouse_position_function): New variable.
Dave Love <fx@gnu.org>
parents:
27725
diff
changeset
|
1332 Lisp_Object x, y, retval; |
6054
24ffc4bc4067
(Fmouse_position): Convert to glyph units.
Richard M. Stallman <rms@gnu.org>
parents:
6012
diff
changeset
|
1333 int col, row; |
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1809
diff
changeset
|
1334 unsigned long long_dummy; |
27797
da774b48eb7f
(Fmouse_position): GCPRO retval instead of x and y.
Gerd Moellmann <gerd@gnu.org>
parents:
27795
diff
changeset
|
1335 struct gcpro gcpro1; |
286 | 1336 |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
1337 f = SELECTED_FRAME (); |
3658
c2831d419bec
(Fmouse_position): Set up defaults before calling the hook.
Richard M. Stallman <rms@gnu.org>
parents:
3591
diff
changeset
|
1338 x = y = Qnil; |
c2831d419bec
(Fmouse_position): Set up defaults before calling the hook.
Richard M. Stallman <rms@gnu.org>
parents:
3591
diff
changeset
|
1339 |
11025
6c5aef697fbe
(Fmouse_position): Do work only if HAVE_MOUSE.
Karl Heuer <kwzh@gnu.org>
parents:
11017
diff
changeset
|
1340 #ifdef HAVE_MOUSE |
3658
c2831d419bec
(Fmouse_position): Set up defaults before calling the hook.
Richard M. Stallman <rms@gnu.org>
parents:
3591
diff
changeset
|
1341 /* It's okay for the hook to refrain from storing anything. */ |
454 | 1342 if (mouse_position_hook) |
20178
fb9facb8fda0
(Fmouse_pixel_position, Fmouse_position):
Karl Heuer <kwzh@gnu.org>
parents:
20038
diff
changeset
|
1343 (*mouse_position_hook) (&f, -1, |
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1809
diff
changeset
|
1344 &lispy_dummy, &party_dummy, |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1809
diff
changeset
|
1345 &x, &y, |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1809
diff
changeset
|
1346 &long_dummy); |
6854
c976ac5d85ec
(Fmouse_position) [MULTI_FRAME]: Use pixel_to_glyph, not glyph_to_pixel. Skip
Karl Heuer <kwzh@gnu.org>
parents:
6806
diff
changeset
|
1347 if (! NILP (x)) |
c976ac5d85ec
(Fmouse_position) [MULTI_FRAME]: Use pixel_to_glyph, not glyph_to_pixel. Skip
Karl Heuer <kwzh@gnu.org>
parents:
6806
diff
changeset
|
1348 { |
c976ac5d85ec
(Fmouse_position) [MULTI_FRAME]: Use pixel_to_glyph, not glyph_to_pixel. Skip
Karl Heuer <kwzh@gnu.org>
parents:
6806
diff
changeset
|
1349 col = XINT (x); |
c976ac5d85ec
(Fmouse_position) [MULTI_FRAME]: Use pixel_to_glyph, not glyph_to_pixel. Skip
Karl Heuer <kwzh@gnu.org>
parents:
6806
diff
changeset
|
1350 row = XINT (y); |
12006
3e9db7cb1d05
(Fmouse_position): Use NULL, not 0, as arg of pixel_to_glyph_coords.
Karl Heuer <kwzh@gnu.org>
parents:
12005
diff
changeset
|
1351 pixel_to_glyph_coords (f, col, row, &col, &row, NULL, 1); |
6854
c976ac5d85ec
(Fmouse_position) [MULTI_FRAME]: Use pixel_to_glyph, not glyph_to_pixel. Skip
Karl Heuer <kwzh@gnu.org>
parents:
6806
diff
changeset
|
1352 XSETINT (x, col); |
c976ac5d85ec
(Fmouse_position) [MULTI_FRAME]: Use pixel_to_glyph, not glyph_to_pixel. Skip
Karl Heuer <kwzh@gnu.org>
parents:
6806
diff
changeset
|
1353 XSETINT (y, row); |
c976ac5d85ec
(Fmouse_position) [MULTI_FRAME]: Use pixel_to_glyph, not glyph_to_pixel. Skip
Karl Heuer <kwzh@gnu.org>
parents:
6806
diff
changeset
|
1354 } |
11025
6c5aef697fbe
(Fmouse_position): Do work only if HAVE_MOUSE.
Karl Heuer <kwzh@gnu.org>
parents:
11017
diff
changeset
|
1355 #endif |
9268
cb55d0155265
(make_minibuffer_frame, make_terminal_frame, Fselected_frame,
Karl Heuer <kwzh@gnu.org>
parents:
9214
diff
changeset
|
1356 XSETFRAME (lispy_dummy, f); |
27795
83292274bbd4
(Vmouse_position_function): New variable.
Dave Love <fx@gnu.org>
parents:
27725
diff
changeset
|
1357 retval = Fcons (lispy_dummy, Fcons (x, y)); |
27797
da774b48eb7f
(Fmouse_position): GCPRO retval instead of x and y.
Gerd Moellmann <gerd@gnu.org>
parents:
27795
diff
changeset
|
1358 GCPRO1 (retval); |
27795
83292274bbd4
(Vmouse_position_function): New variable.
Dave Love <fx@gnu.org>
parents:
27725
diff
changeset
|
1359 if (!NILP (Vmouse_position_function)) |
27797
da774b48eb7f
(Fmouse_position): GCPRO retval instead of x and y.
Gerd Moellmann <gerd@gnu.org>
parents:
27795
diff
changeset
|
1360 retval = call1 (Vmouse_position_function, retval); |
da774b48eb7f
(Fmouse_position): GCPRO retval instead of x and y.
Gerd Moellmann <gerd@gnu.org>
parents:
27795
diff
changeset
|
1361 RETURN_UNGCPRO (retval); |
286 | 1362 } |
1363 | |
7025
24e759919770
(Fmouse_pixel_position, Fset_mouse_pixel_position): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
6986
diff
changeset
|
1364 DEFUN ("mouse-pixel-position", Fmouse_pixel_position, |
24e759919770
(Fmouse_pixel_position, Fset_mouse_pixel_position): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
6986
diff
changeset
|
1365 Smouse_pixel_position, 0, 0, 0, |
40105
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1366 doc: /* Return a list (FRAME X . Y) giving the current mouse frame and position. |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1367 The position is given in pixel units, where (0, 0) is the |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1368 upper-left corner. |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1369 If Emacs is running on a mouseless terminal or hasn't been programmed |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1370 to read the mouse position, it returns the selected frame for FRAME |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1371 and nil for X and Y. */) |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1372 () |
7025
24e759919770
(Fmouse_pixel_position, Fset_mouse_pixel_position): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
6986
diff
changeset
|
1373 { |
24e759919770
(Fmouse_pixel_position, Fset_mouse_pixel_position): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
6986
diff
changeset
|
1374 FRAME_PTR f; |
24e759919770
(Fmouse_pixel_position, Fset_mouse_pixel_position): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
6986
diff
changeset
|
1375 Lisp_Object lispy_dummy; |
24e759919770
(Fmouse_pixel_position, Fset_mouse_pixel_position): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
6986
diff
changeset
|
1376 enum scroll_bar_part party_dummy; |
24e759919770
(Fmouse_pixel_position, Fset_mouse_pixel_position): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
6986
diff
changeset
|
1377 Lisp_Object x, y; |
24e759919770
(Fmouse_pixel_position, Fset_mouse_pixel_position): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
6986
diff
changeset
|
1378 unsigned long long_dummy; |
24e759919770
(Fmouse_pixel_position, Fset_mouse_pixel_position): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
6986
diff
changeset
|
1379 |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
1380 f = SELECTED_FRAME (); |
7025
24e759919770
(Fmouse_pixel_position, Fset_mouse_pixel_position): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
6986
diff
changeset
|
1381 x = y = Qnil; |
24e759919770
(Fmouse_pixel_position, Fset_mouse_pixel_position): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
6986
diff
changeset
|
1382 |
11126
786f1c82a38e
(Fmouse_position--both definitions): Pass 0 for `insist'.
Richard M. Stallman <rms@gnu.org>
parents:
11025
diff
changeset
|
1383 #ifdef HAVE_MOUSE |
7025
24e759919770
(Fmouse_pixel_position, Fset_mouse_pixel_position): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
6986
diff
changeset
|
1384 /* It's okay for the hook to refrain from storing anything. */ |
24e759919770
(Fmouse_pixel_position, Fset_mouse_pixel_position): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
6986
diff
changeset
|
1385 if (mouse_position_hook) |
20178
fb9facb8fda0
(Fmouse_pixel_position, Fmouse_position):
Karl Heuer <kwzh@gnu.org>
parents:
20038
diff
changeset
|
1386 (*mouse_position_hook) (&f, -1, |
7025
24e759919770
(Fmouse_pixel_position, Fset_mouse_pixel_position): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
6986
diff
changeset
|
1387 &lispy_dummy, &party_dummy, |
24e759919770
(Fmouse_pixel_position, Fset_mouse_pixel_position): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
6986
diff
changeset
|
1388 &x, &y, |
24e759919770
(Fmouse_pixel_position, Fset_mouse_pixel_position): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
6986
diff
changeset
|
1389 &long_dummy); |
11126
786f1c82a38e
(Fmouse_position--both definitions): Pass 0 for `insist'.
Richard M. Stallman <rms@gnu.org>
parents:
11025
diff
changeset
|
1390 #endif |
9268
cb55d0155265
(make_minibuffer_frame, make_terminal_frame, Fselected_frame,
Karl Heuer <kwzh@gnu.org>
parents:
9214
diff
changeset
|
1391 XSETFRAME (lispy_dummy, f); |
7025
24e759919770
(Fmouse_pixel_position, Fset_mouse_pixel_position): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
6986
diff
changeset
|
1392 return Fcons (lispy_dummy, Fcons (x, y)); |
24e759919770
(Fmouse_pixel_position, Fset_mouse_pixel_position): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
6986
diff
changeset
|
1393 } |
24e759919770
(Fmouse_pixel_position, Fset_mouse_pixel_position): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
6986
diff
changeset
|
1394 |
286 | 1395 DEFUN ("set-mouse-position", Fset_mouse_position, Sset_mouse_position, 3, 3, 0, |
40105
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1396 doc: /* Move the mouse pointer to the center of character cell (X,Y) in FRAME. |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1397 Coordinates are relative to the frame, not a window, |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1398 so the coordinates of the top left character in the frame |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1399 may be nonzero due to left-hand scroll bars or the menu bar. |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1400 |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1401 This function is a no-op for an X frame that is not visible. |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1402 If you have just created a frame, you must wait for it to become visible |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1403 before calling this function on it, like this. |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1404 (while (not (frame-visible-p frame)) (sleep-for .5)) */) |
765 | 1405 (frame, x, y) |
1406 Lisp_Object frame, x, y; | |
286 | 1407 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
1408 CHECK_LIVE_FRAME (frame); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
1409 CHECK_NUMBER (x); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
1410 CHECK_NUMBER (y); |
286 | 1411 |
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1809
diff
changeset
|
1412 /* I think this should be done with a hook. */ |
13412
1ed740e9aa64
[HAVE_NTGUI]: Test for a Win32 frame in procedures that test for an X frame.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13396
diff
changeset
|
1413 #ifdef HAVE_WINDOW_SYSTEM |
1ed740e9aa64
[HAVE_NTGUI]: Test for a Win32 frame in procedures that test for an X frame.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13396
diff
changeset
|
1414 if (FRAME_WINDOW_P (XFRAME (frame))) |
39918
fa0407ac162f
(Fset_mouse_position): Improve style of comment to follow other comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39748
diff
changeset
|
1415 /* Warping the mouse will cause enternotify and focus events. */ |
21524
e4ab93e19658
(Fset_mouse_position, Fset_mouse_pixel_position): Fix
Andreas Schwab <schwab@suse.de>
parents:
21514
diff
changeset
|
1416 x_set_mouse_position (XFRAME (frame), XINT (x), XINT (y)); |
15391
d4cec5d7566d
(Fset_mouse_position): Remove the DOS-specific
Richard M. Stallman <rms@gnu.org>
parents:
15062
diff
changeset
|
1417 #else |
15396 | 1418 #if defined (MSDOS) && defined (HAVE_MOUSE) |
15391
d4cec5d7566d
(Fset_mouse_position): Remove the DOS-specific
Richard M. Stallman <rms@gnu.org>
parents:
15062
diff
changeset
|
1419 if (FRAME_MSDOS_P (XFRAME (frame))) |
d4cec5d7566d
(Fset_mouse_position): Remove the DOS-specific
Richard M. Stallman <rms@gnu.org>
parents:
15062
diff
changeset
|
1420 { |
d4cec5d7566d
(Fset_mouse_position): Remove the DOS-specific
Richard M. Stallman <rms@gnu.org>
parents:
15062
diff
changeset
|
1421 Fselect_frame (frame, Qnil); |
d4cec5d7566d
(Fset_mouse_position): Remove the DOS-specific
Richard M. Stallman <rms@gnu.org>
parents:
15062
diff
changeset
|
1422 mouse_moveto (XINT (x), XINT (y)); |
d4cec5d7566d
(Fset_mouse_position): Remove the DOS-specific
Richard M. Stallman <rms@gnu.org>
parents:
15062
diff
changeset
|
1423 } |
d4cec5d7566d
(Fset_mouse_position): Remove the DOS-specific
Richard M. Stallman <rms@gnu.org>
parents:
15062
diff
changeset
|
1424 #endif |
286 | 1425 #endif |
1426 | |
1427 return Qnil; | |
1428 } | |
7025
24e759919770
(Fmouse_pixel_position, Fset_mouse_pixel_position): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
6986
diff
changeset
|
1429 |
24e759919770
(Fmouse_pixel_position, Fset_mouse_pixel_position): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
6986
diff
changeset
|
1430 DEFUN ("set-mouse-pixel-position", Fset_mouse_pixel_position, |
24e759919770
(Fmouse_pixel_position, Fset_mouse_pixel_position): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
6986
diff
changeset
|
1431 Sset_mouse_pixel_position, 3, 3, 0, |
40105
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1432 doc: /* Move the mouse pointer to pixel position (X,Y) in FRAME. |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1433 Note, this is a no-op for an X frame that is not visible. |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1434 If you have just created a frame, you must wait for it to become visible |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1435 before calling this function on it, like this. |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1436 (while (not (frame-visible-p frame)) (sleep-for .5)) */) |
7025
24e759919770
(Fmouse_pixel_position, Fset_mouse_pixel_position): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
6986
diff
changeset
|
1437 (frame, x, y) |
24e759919770
(Fmouse_pixel_position, Fset_mouse_pixel_position): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
6986
diff
changeset
|
1438 Lisp_Object frame, x, y; |
24e759919770
(Fmouse_pixel_position, Fset_mouse_pixel_position): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
6986
diff
changeset
|
1439 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
1440 CHECK_LIVE_FRAME (frame); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
1441 CHECK_NUMBER (x); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
1442 CHECK_NUMBER (y); |
7025
24e759919770
(Fmouse_pixel_position, Fset_mouse_pixel_position): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
6986
diff
changeset
|
1443 |
24e759919770
(Fmouse_pixel_position, Fset_mouse_pixel_position): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
6986
diff
changeset
|
1444 /* I think this should be done with a hook. */ |
13412
1ed740e9aa64
[HAVE_NTGUI]: Test for a Win32 frame in procedures that test for an X frame.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13396
diff
changeset
|
1445 #ifdef HAVE_WINDOW_SYSTEM |
1ed740e9aa64
[HAVE_NTGUI]: Test for a Win32 frame in procedures that test for an X frame.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13396
diff
changeset
|
1446 if (FRAME_WINDOW_P (XFRAME (frame))) |
39918
fa0407ac162f
(Fset_mouse_position): Improve style of comment to follow other comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39748
diff
changeset
|
1447 /* Warping the mouse will cause enternotify and focus events. */ |
21524
e4ab93e19658
(Fset_mouse_position, Fset_mouse_pixel_position): Fix
Andreas Schwab <schwab@suse.de>
parents:
21514
diff
changeset
|
1448 x_set_mouse_pixel_position (XFRAME (frame), XINT (x), XINT (y)); |
15391
d4cec5d7566d
(Fset_mouse_position): Remove the DOS-specific
Richard M. Stallman <rms@gnu.org>
parents:
15062
diff
changeset
|
1449 #else |
15396 | 1450 #if defined (MSDOS) && defined (HAVE_MOUSE) |
15391
d4cec5d7566d
(Fset_mouse_position): Remove the DOS-specific
Richard M. Stallman <rms@gnu.org>
parents:
15062
diff
changeset
|
1451 if (FRAME_MSDOS_P (XFRAME (frame))) |
d4cec5d7566d
(Fset_mouse_position): Remove the DOS-specific
Richard M. Stallman <rms@gnu.org>
parents:
15062
diff
changeset
|
1452 { |
d4cec5d7566d
(Fset_mouse_position): Remove the DOS-specific
Richard M. Stallman <rms@gnu.org>
parents:
15062
diff
changeset
|
1453 Fselect_frame (frame, Qnil); |
d4cec5d7566d
(Fset_mouse_position): Remove the DOS-specific
Richard M. Stallman <rms@gnu.org>
parents:
15062
diff
changeset
|
1454 mouse_moveto (XINT (x), XINT (y)); |
d4cec5d7566d
(Fset_mouse_position): Remove the DOS-specific
Richard M. Stallman <rms@gnu.org>
parents:
15062
diff
changeset
|
1455 } |
d4cec5d7566d
(Fset_mouse_position): Remove the DOS-specific
Richard M. Stallman <rms@gnu.org>
parents:
15062
diff
changeset
|
1456 #endif |
7025
24e759919770
(Fmouse_pixel_position, Fset_mouse_pixel_position): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
6986
diff
changeset
|
1457 #endif |
24e759919770
(Fmouse_pixel_position, Fset_mouse_pixel_position): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
6986
diff
changeset
|
1458 |
24e759919770
(Fmouse_pixel_position, Fset_mouse_pixel_position): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
6986
diff
changeset
|
1459 return Qnil; |
24e759919770
(Fmouse_pixel_position, Fset_mouse_pixel_position): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
6986
diff
changeset
|
1460 } |
286 | 1461 |
22188
9fba463768ec
(frame_buffer_predicate): New arg FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
21825
diff
changeset
|
1462 static void make_frame_visible_1 P_ ((Lisp_Object)); |
9fba463768ec
(frame_buffer_predicate): New arg FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
21825
diff
changeset
|
1463 |
765 | 1464 DEFUN ("make-frame-visible", Fmake_frame_visible, Smake_frame_visible, |
3834
1b2144b795aa
* frame.c (Fmake_frame_visible): Make this interactively callable;
Jim Blandy <jimb@redhat.com>
parents:
3763
diff
changeset
|
1465 0, 1, "", |
40105
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1466 doc: /* Make the frame FRAME visible (assuming it is an X window). |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1467 If omitted, FRAME defaults to the currently selected frame. */) |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1468 (frame) |
765 | 1469 Lisp_Object frame; |
286 | 1470 { |
872 | 1471 if (NILP (frame)) |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
1472 frame = selected_frame; |
872 | 1473 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
1474 CHECK_LIVE_FRAME (frame); |
286 | 1475 |
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1809
diff
changeset
|
1476 /* I think this should be done with a hook. */ |
13412
1ed740e9aa64
[HAVE_NTGUI]: Test for a Win32 frame in procedures that test for an X frame.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13396
diff
changeset
|
1477 #ifdef HAVE_WINDOW_SYSTEM |
1ed740e9aa64
[HAVE_NTGUI]: Test for a Win32 frame in procedures that test for an X frame.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13396
diff
changeset
|
1478 if (FRAME_WINDOW_P (XFRAME (frame))) |
5105
9b41ddf1b5f7
(Fmake_frame_visible): Use FRAME_SAMPLE_VISIBILITY. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
4961
diff
changeset
|
1479 { |
9b41ddf1b5f7
(Fmake_frame_visible): Use FRAME_SAMPLE_VISIBILITY. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
4961
diff
changeset
|
1480 FRAME_SAMPLE_VISIBILITY (XFRAME (frame)); |
9b41ddf1b5f7
(Fmake_frame_visible): Use FRAME_SAMPLE_VISIBILITY. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
4961
diff
changeset
|
1481 x_make_frame_visible (XFRAME (frame)); |
9b41ddf1b5f7
(Fmake_frame_visible): Use FRAME_SAMPLE_VISIBILITY. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
4961
diff
changeset
|
1482 } |
965
0eb68c6c452a
* frame.c (Qheight, Qicon, Qmodeline, Qname, Qnone, Qonly,
Jim Blandy <jimb@redhat.com>
parents:
886
diff
changeset
|
1483 #endif |
286 | 1484 |
22188
9fba463768ec
(frame_buffer_predicate): New arg FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
21825
diff
changeset
|
1485 make_frame_visible_1 (XFRAME (frame)->root_window); |
9fba463768ec
(frame_buffer_predicate): New arg FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
21825
diff
changeset
|
1486 |
39918
fa0407ac162f
(Fset_mouse_position): Improve style of comment to follow other comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39748
diff
changeset
|
1487 /* Make menu bar update for the Buffers and Frames menus. */ |
7900
60795e826dad
Put stdio.h after config.h.
Richard M. Stallman <rms@gnu.org>
parents:
7646
diff
changeset
|
1488 windows_or_buffers_changed++; |
60795e826dad
Put stdio.h after config.h.
Richard M. Stallman <rms@gnu.org>
parents:
7646
diff
changeset
|
1489 |
765 | 1490 return frame; |
286 | 1491 } |
1492 | |
22188
9fba463768ec
(frame_buffer_predicate): New arg FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
21825
diff
changeset
|
1493 /* Update the display_time slot of the buffers shown in WINDOW |
9fba463768ec
(frame_buffer_predicate): New arg FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
21825
diff
changeset
|
1494 and all its descendents. */ |
9fba463768ec
(frame_buffer_predicate): New arg FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
21825
diff
changeset
|
1495 |
9fba463768ec
(frame_buffer_predicate): New arg FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
21825
diff
changeset
|
1496 static void |
9fba463768ec
(frame_buffer_predicate): New arg FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
21825
diff
changeset
|
1497 make_frame_visible_1 (window) |
9fba463768ec
(frame_buffer_predicate): New arg FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
21825
diff
changeset
|
1498 Lisp_Object window; |
9fba463768ec
(frame_buffer_predicate): New arg FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
21825
diff
changeset
|
1499 { |
9fba463768ec
(frame_buffer_predicate): New arg FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
21825
diff
changeset
|
1500 struct window *w; |
9fba463768ec
(frame_buffer_predicate): New arg FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
21825
diff
changeset
|
1501 |
9fba463768ec
(frame_buffer_predicate): New arg FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
21825
diff
changeset
|
1502 for (;!NILP (window); window = w->next) |
9fba463768ec
(frame_buffer_predicate): New arg FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
21825
diff
changeset
|
1503 { |
9fba463768ec
(frame_buffer_predicate): New arg FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
21825
diff
changeset
|
1504 w = XWINDOW (window); |
9fba463768ec
(frame_buffer_predicate): New arg FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
21825
diff
changeset
|
1505 |
9fba463768ec
(frame_buffer_predicate): New arg FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
21825
diff
changeset
|
1506 if (!NILP (w->buffer)) |
9fba463768ec
(frame_buffer_predicate): New arg FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
21825
diff
changeset
|
1507 XBUFFER (w->buffer)->display_time = Fcurrent_time (); |
9fba463768ec
(frame_buffer_predicate): New arg FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
21825
diff
changeset
|
1508 |
9fba463768ec
(frame_buffer_predicate): New arg FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
21825
diff
changeset
|
1509 if (!NILP (w->vchild)) |
9fba463768ec
(frame_buffer_predicate): New arg FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
21825
diff
changeset
|
1510 make_frame_visible_1 (w->vchild); |
9fba463768ec
(frame_buffer_predicate): New arg FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
21825
diff
changeset
|
1511 if (!NILP (w->hchild)) |
9fba463768ec
(frame_buffer_predicate): New arg FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
21825
diff
changeset
|
1512 make_frame_visible_1 (w->hchild); |
9fba463768ec
(frame_buffer_predicate): New arg FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
21825
diff
changeset
|
1513 } |
9fba463768ec
(frame_buffer_predicate): New arg FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
21825
diff
changeset
|
1514 } |
9fba463768ec
(frame_buffer_predicate): New arg FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
21825
diff
changeset
|
1515 |
765 | 1516 DEFUN ("make-frame-invisible", Fmake_frame_invisible, Smake_frame_invisible, |
5925
806e876cacb4
(Fset_frame_height, Fset_frame_width, Fset_frame_size):
Richard M. Stallman <rms@gnu.org>
parents:
5552
diff
changeset
|
1517 0, 2, "", |
40105
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1518 doc: /* Make the frame FRAME invisible (assuming it is an X window). |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1519 If omitted, FRAME defaults to the currently selected frame. |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1520 Normally you may not make FRAME invisible if all other frames are invisible, |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1521 but if the second optional argument FORCE is non-nil, you may do so. */) |
5925
806e876cacb4
(Fset_frame_height, Fset_frame_width, Fset_frame_size):
Richard M. Stallman <rms@gnu.org>
parents:
5552
diff
changeset
|
1522 (frame, force) |
806e876cacb4
(Fset_frame_height, Fset_frame_width, Fset_frame_size):
Richard M. Stallman <rms@gnu.org>
parents:
5552
diff
changeset
|
1523 Lisp_Object frame, force; |
286 | 1524 { |
872 | 1525 if (NILP (frame)) |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
1526 frame = selected_frame; |
872 | 1527 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
1528 CHECK_LIVE_FRAME (frame); |
286 | 1529 |
5925
806e876cacb4
(Fset_frame_height, Fset_frame_width, Fset_frame_size):
Richard M. Stallman <rms@gnu.org>
parents:
5552
diff
changeset
|
1530 if (NILP (force) && !other_visible_frames (XFRAME (frame))) |
806e876cacb4
(Fset_frame_height, Fset_frame_width, Fset_frame_size):
Richard M. Stallman <rms@gnu.org>
parents:
5552
diff
changeset
|
1531 error ("Attempt to make invisible the sole visible or iconified frame"); |
806e876cacb4
(Fset_frame_height, Fset_frame_width, Fset_frame_size):
Richard M. Stallman <rms@gnu.org>
parents:
5552
diff
changeset
|
1532 |
8586
c78654909acf
(Fmake_frame_invisible, Ficonify_frame): Don't switch frames.
Karl Heuer <kwzh@gnu.org>
parents:
8264
diff
changeset
|
1533 #if 0 /* This isn't logically necessary, and it can do GC. */ |
3283
e2a40a3baa4b
(Ficonify_frame, Fmake_frame_invisible):
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
1534 /* Don't let the frame remain selected. */ |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
1535 if (EQ (frame, selected_frame)) |
36810
a9485f8e43d6
(do_switch_frame): Remove unused parameter NO_EVENT, add
Gerd Moellmann <gerd@gnu.org>
parents:
36804
diff
changeset
|
1536 do_switch_frame (next_frame (frame, Qt), 0, 0) |
8586
c78654909acf
(Fmake_frame_invisible, Ficonify_frame): Don't switch frames.
Karl Heuer <kwzh@gnu.org>
parents:
8264
diff
changeset
|
1537 #endif |
3283
e2a40a3baa4b
(Ficonify_frame, Fmake_frame_invisible):
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
1538 |
e2a40a3baa4b
(Ficonify_frame, Fmake_frame_invisible):
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
1539 /* Don't allow minibuf_window to remain on a deleted frame. */ |
e2a40a3baa4b
(Ficonify_frame, Fmake_frame_invisible):
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
1540 if (EQ (XFRAME (frame)->minibuffer_window, minibuf_window)) |
e2a40a3baa4b
(Ficonify_frame, Fmake_frame_invisible):
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
1541 { |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
1542 struct frame *sf = XFRAME (selected_frame); |
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
1543 Fset_window_buffer (sf->minibuffer_window, |
3283
e2a40a3baa4b
(Ficonify_frame, Fmake_frame_invisible):
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
1544 XWINDOW (minibuf_window)->buffer); |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
1545 minibuf_window = sf->minibuffer_window; |
3283
e2a40a3baa4b
(Ficonify_frame, Fmake_frame_invisible):
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
1546 } |
e2a40a3baa4b
(Ficonify_frame, Fmake_frame_invisible):
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
1547 |
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1809
diff
changeset
|
1548 /* I think this should be done with a hook. */ |
13412
1ed740e9aa64
[HAVE_NTGUI]: Test for a Win32 frame in procedures that test for an X frame.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13396
diff
changeset
|
1549 #ifdef HAVE_WINDOW_SYSTEM |
1ed740e9aa64
[HAVE_NTGUI]: Test for a Win32 frame in procedures that test for an X frame.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13396
diff
changeset
|
1550 if (FRAME_WINDOW_P (XFRAME (frame))) |
765 | 1551 x_make_frame_invisible (XFRAME (frame)); |
965
0eb68c6c452a
* frame.c (Qheight, Qicon, Qmodeline, Qname, Qnone, Qonly,
Jim Blandy <jimb@redhat.com>
parents:
886
diff
changeset
|
1552 #endif |
286 | 1553 |
39918
fa0407ac162f
(Fset_mouse_position): Improve style of comment to follow other comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39748
diff
changeset
|
1554 /* Make menu bar update for the Buffers and Frames menus. */ |
7900
60795e826dad
Put stdio.h after config.h.
Richard M. Stallman <rms@gnu.org>
parents:
7646
diff
changeset
|
1555 windows_or_buffers_changed++; |
60795e826dad
Put stdio.h after config.h.
Richard M. Stallman <rms@gnu.org>
parents:
7646
diff
changeset
|
1556 |
286 | 1557 return Qnil; |
1558 } | |
1559 | |
765 | 1560 DEFUN ("iconify-frame", Ficonify_frame, Siconify_frame, |
872 | 1561 0, 1, "", |
40105
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1562 doc: /* Make the frame FRAME into an icon. |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1563 If omitted, FRAME defaults to the currently selected frame. */) |
765 | 1564 (frame) |
1565 Lisp_Object frame; | |
286 | 1566 { |
872 | 1567 if (NILP (frame)) |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
1568 frame = selected_frame; |
872 | 1569 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
1570 CHECK_LIVE_FRAME (frame); |
286 | 1571 |
8586
c78654909acf
(Fmake_frame_invisible, Ficonify_frame): Don't switch frames.
Karl Heuer <kwzh@gnu.org>
parents:
8264
diff
changeset
|
1572 #if 0 /* This isn't logically necessary, and it can do GC. */ |
3283
e2a40a3baa4b
(Ficonify_frame, Fmake_frame_invisible):
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
1573 /* Don't let the frame remain selected. */ |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
1574 if (EQ (frame, selected_frame)) |
3283
e2a40a3baa4b
(Ficonify_frame, Fmake_frame_invisible):
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
1575 Fhandle_switch_frame (next_frame (frame, Qt), Qnil); |
8586
c78654909acf
(Fmake_frame_invisible, Ficonify_frame): Don't switch frames.
Karl Heuer <kwzh@gnu.org>
parents:
8264
diff
changeset
|
1576 #endif |
3283
e2a40a3baa4b
(Ficonify_frame, Fmake_frame_invisible):
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
1577 |
e2a40a3baa4b
(Ficonify_frame, Fmake_frame_invisible):
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
1578 /* Don't allow minibuf_window to remain on a deleted frame. */ |
e2a40a3baa4b
(Ficonify_frame, Fmake_frame_invisible):
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
1579 if (EQ (XFRAME (frame)->minibuffer_window, minibuf_window)) |
e2a40a3baa4b
(Ficonify_frame, Fmake_frame_invisible):
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
1580 { |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
1581 struct frame *sf = XFRAME (selected_frame); |
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
1582 Fset_window_buffer (sf->minibuffer_window, |
3283
e2a40a3baa4b
(Ficonify_frame, Fmake_frame_invisible):
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
1583 XWINDOW (minibuf_window)->buffer); |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
1584 minibuf_window = sf->minibuffer_window; |
3283
e2a40a3baa4b
(Ficonify_frame, Fmake_frame_invisible):
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
1585 } |
e2a40a3baa4b
(Ficonify_frame, Fmake_frame_invisible):
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
1586 |
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1809
diff
changeset
|
1587 /* I think this should be done with a hook. */ |
13412
1ed740e9aa64
[HAVE_NTGUI]: Test for a Win32 frame in procedures that test for an X frame.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13396
diff
changeset
|
1588 #ifdef HAVE_WINDOW_SYSTEM |
1ed740e9aa64
[HAVE_NTGUI]: Test for a Win32 frame in procedures that test for an X frame.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13396
diff
changeset
|
1589 if (FRAME_WINDOW_P (XFRAME (frame))) |
765 | 1590 x_iconify_frame (XFRAME (frame)); |
965
0eb68c6c452a
* frame.c (Qheight, Qicon, Qmodeline, Qname, Qnone, Qonly,
Jim Blandy <jimb@redhat.com>
parents:
886
diff
changeset
|
1591 #endif |
286 | 1592 |
39918
fa0407ac162f
(Fset_mouse_position): Improve style of comment to follow other comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39748
diff
changeset
|
1593 /* Make menu bar update for the Buffers and Frames menus. */ |
7900
60795e826dad
Put stdio.h after config.h.
Richard M. Stallman <rms@gnu.org>
parents:
7646
diff
changeset
|
1594 windows_or_buffers_changed++; |
60795e826dad
Put stdio.h after config.h.
Richard M. Stallman <rms@gnu.org>
parents:
7646
diff
changeset
|
1595 |
286 | 1596 return Qnil; |
1597 } | |
1598 | |
765 | 1599 DEFUN ("frame-visible-p", Fframe_visible_p, Sframe_visible_p, |
286 | 1600 1, 1, 0, |
40105
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1601 doc: /* Return t if FRAME is now \"visible\" (actually in use for display). |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1602 A frame that is not \"visible\" is not updated and, if it works through |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1603 a window system, it may not show at all. |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1604 Return the symbol `icon' if frame is visible only as an icon. */) |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1605 (frame) |
765 | 1606 Lisp_Object frame; |
286 | 1607 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
1608 CHECK_LIVE_FRAME (frame); |
286 | 1609 |
6012
650c0f231d17
(Fframe_visible_p): Do FRAME_SAMPLE_VISIBILITY first.
Richard M. Stallman <rms@gnu.org>
parents:
5925
diff
changeset
|
1610 FRAME_SAMPLE_VISIBILITY (XFRAME (frame)); |
650c0f231d17
(Fframe_visible_p): Do FRAME_SAMPLE_VISIBILITY first.
Richard M. Stallman <rms@gnu.org>
parents:
5925
diff
changeset
|
1611 |
1709
b86b3237e017
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1691
diff
changeset
|
1612 if (FRAME_VISIBLE_P (XFRAME (frame))) |
286 | 1613 return Qt; |
1709
b86b3237e017
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1691
diff
changeset
|
1614 if (FRAME_ICONIFIED_P (XFRAME (frame))) |
965
0eb68c6c452a
* frame.c (Qheight, Qicon, Qmodeline, Qname, Qnone, Qonly,
Jim Blandy <jimb@redhat.com>
parents:
886
diff
changeset
|
1615 return Qicon; |
286 | 1616 return Qnil; |
1617 } | |
1618 | |
765 | 1619 DEFUN ("visible-frame-list", Fvisible_frame_list, Svisible_frame_list, |
286 | 1620 0, 0, 0, |
40105
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1621 doc: /* Return a list of all frames now \"visible\" (being updated). */) |
286 | 1622 () |
1623 { | |
765 | 1624 Lisp_Object tail, frame; |
1625 struct frame *f; | |
286 | 1626 Lisp_Object value; |
1627 | |
1628 value = Qnil; | |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
1629 for (tail = Vframe_list; CONSP (tail); tail = XCDR (tail)) |
286 | 1630 { |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
1631 frame = XCAR (tail); |
9127
0b4836daa8e1
(Fframep, make_frame_without_minibuffer, do_switch_frame, prev_frame,
Karl Heuer <kwzh@gnu.org>
parents:
9032
diff
changeset
|
1632 if (!FRAMEP (frame)) |
286 | 1633 continue; |
765 | 1634 f = XFRAME (frame); |
1709
b86b3237e017
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1691
diff
changeset
|
1635 if (FRAME_VISIBLE_P (f)) |
765 | 1636 value = Fcons (frame, value); |
286 | 1637 } |
1638 return value; | |
1639 } | |
363 | 1640 |
1641 | |
11754
7691dbfc7571
(Fraise_frame, Flower_frame): Make arg FRAME optional.
Richard M. Stallman <rms@gnu.org>
parents:
11535
diff
changeset
|
1642 DEFUN ("raise-frame", Fraise_frame, Sraise_frame, 0, 1, "", |
40105
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1643 doc: /* Bring FRAME to the front, so it occludes any frames it overlaps. |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1644 If FRAME is invisible, make it visible. |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1645 If you don't specify a frame, the selected frame is used. |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1646 If Emacs is displaying on an ordinary terminal or some other device which |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1647 doesn't support multiple overlapping frames, this function does nothing. */) |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1648 (frame) |
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1809
diff
changeset
|
1649 Lisp_Object frame; |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1809
diff
changeset
|
1650 { |
11211
2f9a24a4c9eb
(Fraise_frame, Flower_frame): Now interactive.
Richard M. Stallman <rms@gnu.org>
parents:
11169
diff
changeset
|
1651 if (NILP (frame)) |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
1652 frame = selected_frame; |
11211
2f9a24a4c9eb
(Fraise_frame, Flower_frame): Now interactive.
Richard M. Stallman <rms@gnu.org>
parents:
11169
diff
changeset
|
1653 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
1654 CHECK_LIVE_FRAME (frame); |
4961
dd67510308ae
(Fraise_frame): Do like the documentation says, and make
Richard M. Stallman <rms@gnu.org>
parents:
4798
diff
changeset
|
1655 |
dd67510308ae
(Fraise_frame): Do like the documentation says, and make
Richard M. Stallman <rms@gnu.org>
parents:
4798
diff
changeset
|
1656 /* Do like the documentation says. */ |
dd67510308ae
(Fraise_frame): Do like the documentation says, and make
Richard M. Stallman <rms@gnu.org>
parents:
4798
diff
changeset
|
1657 Fmake_frame_visible (frame); |
dd67510308ae
(Fraise_frame): Do like the documentation says, and make
Richard M. Stallman <rms@gnu.org>
parents:
4798
diff
changeset
|
1658 |
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1809
diff
changeset
|
1659 if (frame_raise_lower_hook) |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1809
diff
changeset
|
1660 (*frame_raise_lower_hook) (XFRAME (frame), 1); |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1809
diff
changeset
|
1661 |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1809
diff
changeset
|
1662 return Qnil; |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1809
diff
changeset
|
1663 } |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1809
diff
changeset
|
1664 |
2282
f727944c11aa
* frame.c (Fraise_frame, Flower_frame): Renamed from
Jim Blandy <jimb@redhat.com>
parents:
2207
diff
changeset
|
1665 /* Should we have a corresponding function called Flower_Power? */ |
11754
7691dbfc7571
(Fraise_frame, Flower_frame): Make arg FRAME optional.
Richard M. Stallman <rms@gnu.org>
parents:
11535
diff
changeset
|
1666 DEFUN ("lower-frame", Flower_frame, Slower_frame, 0, 1, "", |
40105
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1667 doc: /* Send FRAME to the back, so it is occluded by any frames that overlap it. |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1668 If you don't specify a frame, the selected frame is used. |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1669 If Emacs is displaying on an ordinary terminal or some other device which |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1670 doesn't support multiple overlapping frames, this function does nothing. */) |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1671 (frame) |
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1809
diff
changeset
|
1672 Lisp_Object frame; |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1809
diff
changeset
|
1673 { |
11211
2f9a24a4c9eb
(Fraise_frame, Flower_frame): Now interactive.
Richard M. Stallman <rms@gnu.org>
parents:
11169
diff
changeset
|
1674 if (NILP (frame)) |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
1675 frame = selected_frame; |
11211
2f9a24a4c9eb
(Fraise_frame, Flower_frame): Now interactive.
Richard M. Stallman <rms@gnu.org>
parents:
11169
diff
changeset
|
1676 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
1677 CHECK_LIVE_FRAME (frame); |
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1809
diff
changeset
|
1678 |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1809
diff
changeset
|
1679 if (frame_raise_lower_hook) |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1809
diff
changeset
|
1680 (*frame_raise_lower_hook) (XFRAME (frame), 0); |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1809
diff
changeset
|
1681 |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1809
diff
changeset
|
1682 return Qnil; |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1809
diff
changeset
|
1683 } |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1809
diff
changeset
|
1684 |
363 | 1685 |
765 | 1686 DEFUN ("redirect-frame-focus", Fredirect_frame_focus, Sredirect_frame_focus, |
363 | 1687 1, 2, 0, |
40105
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1688 doc: /* Arrange for keystrokes typed at FRAME to be sent to FOCUS-FRAME. |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1689 In other words, switch-frame events caused by events in FRAME will |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1690 request a switch to FOCUS-FRAME, and `last-event-frame' will be |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1691 FOCUS-FRAME after reading an event typed at FRAME. |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1692 |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1693 If FOCUS-FRAME is omitted or nil, any existing redirection is |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1694 cancelled, and the frame again receives its own keystrokes. |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1695 |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1696 Focus redirection is useful for temporarily redirecting keystrokes to |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1697 a surrogate minibuffer frame when a frame doesn't have its own |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1698 minibuffer window. |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1699 |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1700 A frame's focus redirection can be changed by select-frame. If frame |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1701 FOO is selected, and then a different frame BAR is selected, any |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1702 frames redirecting their focus to FOO are shifted to redirect their |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1703 focus to BAR. This allows focus redirection to work properly when the |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1704 user switches from one frame to another using `select-window'. |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1705 |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1706 This means that a frame whose focus is redirected to itself is treated |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1707 differently from a frame whose focus is redirected to nil; the former |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1708 is affected by select-frame, while the latter is not. |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1709 |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1710 The redirection lasts until `redirect-frame-focus' is called to change it. */) |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1711 (frame, focus_frame) |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1712 Lisp_Object frame, focus_frame; |
363 | 1713 { |
3970
020fe391d5c1
* frame.c (Fredirect_frame_focus): Allow redirection of focus of
Jim Blandy <jimb@redhat.com>
parents:
3834
diff
changeset
|
1714 /* Note that we don't check for a live frame here. It's reasonable |
020fe391d5c1
* frame.c (Fredirect_frame_focus): Allow redirection of focus of
Jim Blandy <jimb@redhat.com>
parents:
3834
diff
changeset
|
1715 to redirect the focus of a frame you're about to delete, if you |
020fe391d5c1
* frame.c (Fredirect_frame_focus): Allow redirection of focus of
Jim Blandy <jimb@redhat.com>
parents:
3834
diff
changeset
|
1716 know what other frame should receive those keystrokes. */ |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
1717 CHECK_FRAME (frame); |
454 | 1718 |
1709
b86b3237e017
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1691
diff
changeset
|
1719 if (! NILP (focus_frame)) |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
1720 CHECK_LIVE_FRAME (focus_frame); |
363 | 1721 |
765 | 1722 XFRAME (frame)->focus_frame = focus_frame; |
363 | 1723 |
765 | 1724 if (frame_rehighlight_hook) |
11535
ae282c46aec2
(Fredirect_frame_focus): Fix earlier change; use a frame known to be non-nil.
Karl Heuer <kwzh@gnu.org>
parents:
11532
diff
changeset
|
1725 (*frame_rehighlight_hook) (XFRAME (frame)); |
363 | 1726 |
1727 return Qnil; | |
1728 } | |
1729 | |
1730 | |
765 | 1731 DEFUN ("frame-focus", Fframe_focus, Sframe_focus, 1, 1, 0, |
40105
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1732 doc: /* Return the frame to which FRAME's keystrokes are currently being sent. |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1733 This returns nil if FRAME's focus is not redirected. |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1734 See `redirect-frame-focus'. */) |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1735 (frame) |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1736 Lisp_Object frame; |
363 | 1737 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
1738 CHECK_LIVE_FRAME (frame); |
1709
b86b3237e017
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1691
diff
changeset
|
1739 |
765 | 1740 return FRAME_FOCUS_FRAME (XFRAME (frame)); |
363 | 1741 } |
1742 | |
1743 | |
286 | 1744 |
10207
e6618f52efe9
(Fmodify_frame_parameters): For non-X frames,
Richard M. Stallman <rms@gnu.org>
parents:
9972
diff
changeset
|
1745 /* Return the value of frame parameter PROP in frame FRAME. */ |
e6618f52efe9
(Fmodify_frame_parameters): For non-X frames,
Richard M. Stallman <rms@gnu.org>
parents:
9972
diff
changeset
|
1746 |
286 | 1747 Lisp_Object |
765 | 1748 get_frame_param (frame, prop) |
1749 register struct frame *frame; | |
286 | 1750 Lisp_Object prop; |
1751 { | |
1752 register Lisp_Object tem; | |
1753 | |
765 | 1754 tem = Fassq (prop, frame->param_alist); |
286 | 1755 if (EQ (tem, Qnil)) |
1756 return tem; | |
1757 return Fcdr (tem); | |
1758 } | |
1759 | |
10207
e6618f52efe9
(Fmodify_frame_parameters): For non-X frames,
Richard M. Stallman <rms@gnu.org>
parents:
9972
diff
changeset
|
1760 /* Return the buffer-predicate of the selected frame. */ |
e6618f52efe9
(Fmodify_frame_parameters): For non-X frames,
Richard M. Stallman <rms@gnu.org>
parents:
9972
diff
changeset
|
1761 |
e6618f52efe9
(Fmodify_frame_parameters): For non-X frames,
Richard M. Stallman <rms@gnu.org>
parents:
9972
diff
changeset
|
1762 Lisp_Object |
22188
9fba463768ec
(frame_buffer_predicate): New arg FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
21825
diff
changeset
|
1763 frame_buffer_predicate (frame) |
9fba463768ec
(frame_buffer_predicate): New arg FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
21825
diff
changeset
|
1764 Lisp_Object frame; |
10207
e6618f52efe9
(Fmodify_frame_parameters): For non-X frames,
Richard M. Stallman <rms@gnu.org>
parents:
9972
diff
changeset
|
1765 { |
22188
9fba463768ec
(frame_buffer_predicate): New arg FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
21825
diff
changeset
|
1766 return XFRAME (frame)->buffer_predicate; |
10207
e6618f52efe9
(Fmodify_frame_parameters): For non-X frames,
Richard M. Stallman <rms@gnu.org>
parents:
9972
diff
changeset
|
1767 } |
e6618f52efe9
(Fmodify_frame_parameters): For non-X frames,
Richard M. Stallman <rms@gnu.org>
parents:
9972
diff
changeset
|
1768 |
17221
0530a375eb21
(frame_buffer_list, set_frame_buffer_list): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
17032
diff
changeset
|
1769 /* Return the buffer-list of the selected frame. */ |
0530a375eb21
(frame_buffer_list, set_frame_buffer_list): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
17032
diff
changeset
|
1770 |
0530a375eb21
(frame_buffer_list, set_frame_buffer_list): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
17032
diff
changeset
|
1771 Lisp_Object |
22188
9fba463768ec
(frame_buffer_predicate): New arg FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
21825
diff
changeset
|
1772 frame_buffer_list (frame) |
9fba463768ec
(frame_buffer_predicate): New arg FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
21825
diff
changeset
|
1773 Lisp_Object frame; |
17221
0530a375eb21
(frame_buffer_list, set_frame_buffer_list): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
17032
diff
changeset
|
1774 { |
22188
9fba463768ec
(frame_buffer_predicate): New arg FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
21825
diff
changeset
|
1775 return XFRAME (frame)->buffer_list; |
17221
0530a375eb21
(frame_buffer_list, set_frame_buffer_list): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
17032
diff
changeset
|
1776 } |
0530a375eb21
(frame_buffer_list, set_frame_buffer_list): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
17032
diff
changeset
|
1777 |
0530a375eb21
(frame_buffer_list, set_frame_buffer_list): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
17032
diff
changeset
|
1778 /* Set the buffer-list of the selected frame. */ |
0530a375eb21
(frame_buffer_list, set_frame_buffer_list): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
17032
diff
changeset
|
1779 |
0530a375eb21
(frame_buffer_list, set_frame_buffer_list): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
17032
diff
changeset
|
1780 void |
22188
9fba463768ec
(frame_buffer_predicate): New arg FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
21825
diff
changeset
|
1781 set_frame_buffer_list (frame, list) |
9fba463768ec
(frame_buffer_predicate): New arg FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
21825
diff
changeset
|
1782 Lisp_Object frame, list; |
17221
0530a375eb21
(frame_buffer_list, set_frame_buffer_list): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
17032
diff
changeset
|
1783 { |
22188
9fba463768ec
(frame_buffer_predicate): New arg FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
21825
diff
changeset
|
1784 XFRAME (frame)->buffer_list = list; |
17221
0530a375eb21
(frame_buffer_list, set_frame_buffer_list): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
17032
diff
changeset
|
1785 } |
0530a375eb21
(frame_buffer_list, set_frame_buffer_list): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
17032
diff
changeset
|
1786 |
0530a375eb21
(frame_buffer_list, set_frame_buffer_list): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
17032
diff
changeset
|
1787 /* Discard BUFFER from the buffer-list of each frame. */ |
0530a375eb21
(frame_buffer_list, set_frame_buffer_list): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
17032
diff
changeset
|
1788 |
0530a375eb21
(frame_buffer_list, set_frame_buffer_list): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
17032
diff
changeset
|
1789 void |
0530a375eb21
(frame_buffer_list, set_frame_buffer_list): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
17032
diff
changeset
|
1790 frames_discard_buffer (buffer) |
0530a375eb21
(frame_buffer_list, set_frame_buffer_list): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
17032
diff
changeset
|
1791 Lisp_Object buffer; |
0530a375eb21
(frame_buffer_list, set_frame_buffer_list): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
17032
diff
changeset
|
1792 { |
0530a375eb21
(frame_buffer_list, set_frame_buffer_list): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
17032
diff
changeset
|
1793 Lisp_Object frame, tail; |
0530a375eb21
(frame_buffer_list, set_frame_buffer_list): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
17032
diff
changeset
|
1794 |
0530a375eb21
(frame_buffer_list, set_frame_buffer_list): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
17032
diff
changeset
|
1795 FOR_EACH_FRAME (tail, frame) |
0530a375eb21
(frame_buffer_list, set_frame_buffer_list): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
17032
diff
changeset
|
1796 { |
0530a375eb21
(frame_buffer_list, set_frame_buffer_list): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
17032
diff
changeset
|
1797 XFRAME (frame)->buffer_list |
0530a375eb21
(frame_buffer_list, set_frame_buffer_list): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
17032
diff
changeset
|
1798 = Fdelq (buffer, XFRAME (frame)->buffer_list); |
0530a375eb21
(frame_buffer_list, set_frame_buffer_list): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
17032
diff
changeset
|
1799 } |
0530a375eb21
(frame_buffer_list, set_frame_buffer_list): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
17032
diff
changeset
|
1800 } |
0530a375eb21
(frame_buffer_list, set_frame_buffer_list): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
17032
diff
changeset
|
1801 |
17235
5905b103d7ea
(frames_bury_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17221
diff
changeset
|
1802 /* Move BUFFER to the end of the buffer-list of each frame. */ |
5905b103d7ea
(frames_bury_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17221
diff
changeset
|
1803 |
5905b103d7ea
(frames_bury_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17221
diff
changeset
|
1804 void |
5905b103d7ea
(frames_bury_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17221
diff
changeset
|
1805 frames_bury_buffer (buffer) |
5905b103d7ea
(frames_bury_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17221
diff
changeset
|
1806 Lisp_Object buffer; |
5905b103d7ea
(frames_bury_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17221
diff
changeset
|
1807 { |
5905b103d7ea
(frames_bury_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17221
diff
changeset
|
1808 Lisp_Object frame, tail; |
5905b103d7ea
(frames_bury_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17221
diff
changeset
|
1809 |
5905b103d7ea
(frames_bury_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17221
diff
changeset
|
1810 FOR_EACH_FRAME (tail, frame) |
5905b103d7ea
(frames_bury_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17221
diff
changeset
|
1811 { |
28930
963baceb2414
(frames_bury_buffer): Don't add a buffer to the frame's
Gerd Moellmann <gerd@gnu.org>
parents:
28225
diff
changeset
|
1812 struct frame *f = XFRAME (frame); |
963baceb2414
(frames_bury_buffer): Don't add a buffer to the frame's
Gerd Moellmann <gerd@gnu.org>
parents:
28225
diff
changeset
|
1813 Lisp_Object found; |
963baceb2414
(frames_bury_buffer): Don't add a buffer to the frame's
Gerd Moellmann <gerd@gnu.org>
parents:
28225
diff
changeset
|
1814 |
963baceb2414
(frames_bury_buffer): Don't add a buffer to the frame's
Gerd Moellmann <gerd@gnu.org>
parents:
28225
diff
changeset
|
1815 found = Fmemq (buffer, f->buffer_list); |
963baceb2414
(frames_bury_buffer): Don't add a buffer to the frame's
Gerd Moellmann <gerd@gnu.org>
parents:
28225
diff
changeset
|
1816 if (!NILP (found)) |
963baceb2414
(frames_bury_buffer): Don't add a buffer to the frame's
Gerd Moellmann <gerd@gnu.org>
parents:
28225
diff
changeset
|
1817 f->buffer_list = nconc2 (Fdelq (buffer, f->buffer_list), |
963baceb2414
(frames_bury_buffer): Don't add a buffer to the frame's
Gerd Moellmann <gerd@gnu.org>
parents:
28225
diff
changeset
|
1818 Fcons (buffer, Qnil)); |
17235
5905b103d7ea
(frames_bury_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17221
diff
changeset
|
1819 } |
5905b103d7ea
(frames_bury_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17221
diff
changeset
|
1820 } |
5905b103d7ea
(frames_bury_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17221
diff
changeset
|
1821 |
10207
e6618f52efe9
(Fmodify_frame_parameters): For non-X frames,
Richard M. Stallman <rms@gnu.org>
parents:
9972
diff
changeset
|
1822 /* Modify the alist in *ALISTPTR to associate PROP with VAL. |
e6618f52efe9
(Fmodify_frame_parameters): For non-X frames,
Richard M. Stallman <rms@gnu.org>
parents:
9972
diff
changeset
|
1823 If the alist already has an element for PROP, we change it. */ |
e6618f52efe9
(Fmodify_frame_parameters): For non-X frames,
Richard M. Stallman <rms@gnu.org>
parents:
9972
diff
changeset
|
1824 |
286 | 1825 void |
965
0eb68c6c452a
* frame.c (Qheight, Qicon, Qmodeline, Qname, Qnone, Qonly,
Jim Blandy <jimb@redhat.com>
parents:
886
diff
changeset
|
1826 store_in_alist (alistptr, prop, val) |
286 | 1827 Lisp_Object *alistptr, val; |
965
0eb68c6c452a
* frame.c (Qheight, Qicon, Qmodeline, Qname, Qnone, Qonly,
Jim Blandy <jimb@redhat.com>
parents:
886
diff
changeset
|
1828 Lisp_Object prop; |
286 | 1829 { |
1830 register Lisp_Object tem; | |
1831 | |
1832 tem = Fassq (prop, *alistptr); | |
1833 if (EQ (tem, Qnil)) | |
1834 *alistptr = Fcons (Fcons (prop, val), *alistptr); | |
1835 else | |
1836 Fsetcdr (tem, val); | |
1837 } | |
1838 | |
20280
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
1839 static int |
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
1840 frame_name_fnn_p (str, len) |
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
1841 char *str; |
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
1842 int len; |
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
1843 { |
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
1844 if (len > 1 && str[0] == 'F') |
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
1845 { |
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
1846 char *end_ptr; |
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
1847 |
25789
d68642dd5bbf
(frame_name_fnn_p): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
25736
diff
changeset
|
1848 strtol (str + 1, &end_ptr, 10); |
d68642dd5bbf
(frame_name_fnn_p): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
25736
diff
changeset
|
1849 |
20280
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
1850 if (end_ptr == str + len) |
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
1851 return 1; |
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
1852 } |
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
1853 return 0; |
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
1854 } |
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
1855 |
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
1856 /* Set the name of the terminal frame. Also used by MSDOS frames. |
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
1857 Modeled after x_set_name which is used for WINDOW frames. */ |
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
1858 |
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
1859 void |
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
1860 set_term_frame_name (f, name) |
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
1861 struct frame *f; |
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
1862 Lisp_Object name; |
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
1863 { |
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
1864 f->explicit_name = ! NILP (name); |
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
1865 |
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
1866 /* If NAME is nil, set the name to F<num>. */ |
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
1867 if (NILP (name)) |
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
1868 { |
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
1869 char namebuf[20]; |
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
1870 |
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
1871 /* Check for no change needed in this very common case |
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
1872 before we do any consing. */ |
20622
619c69f1ab83
(set_term_frame_name): Use size_byte.
Richard M. Stallman <rms@gnu.org>
parents:
20280
diff
changeset
|
1873 if (frame_name_fnn_p (XSTRING (f->name)->data, |
21244
50929073a0ba
Use STRING_BYTES and SET_STRING_BYTES.
Richard M. Stallman <rms@gnu.org>
parents:
20622
diff
changeset
|
1874 STRING_BYTES (XSTRING (f->name)))) |
20280
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
1875 return; |
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
1876 |
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
1877 terminal_frame_count++; |
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
1878 sprintf (namebuf, "F%d", terminal_frame_count); |
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
1879 name = build_string (namebuf); |
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
1880 } |
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
1881 else |
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
1882 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
1883 CHECK_STRING (name); |
20280
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
1884 |
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
1885 /* Don't change the name if it's already NAME. */ |
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
1886 if (! NILP (Fstring_equal (name, f->name))) |
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
1887 return; |
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
1888 |
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
1889 /* Don't allow the user to set the frame name to F<num>, so it |
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
1890 doesn't clash with the names we generate for terminal frames. */ |
21244
50929073a0ba
Use STRING_BYTES and SET_STRING_BYTES.
Richard M. Stallman <rms@gnu.org>
parents:
20622
diff
changeset
|
1891 if (frame_name_fnn_p (XSTRING (name)->data, STRING_BYTES (XSTRING (name)))) |
20280
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
1892 error ("Frame names of the form F<num> are usurped by Emacs"); |
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
1893 } |
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
1894 |
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
1895 f->name = name; |
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
1896 update_mode_lines = 1; |
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
1897 } |
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
1898 |
286 | 1899 void |
765 | 1900 store_frame_param (f, prop, val) |
1901 struct frame *f; | |
286 | 1902 Lisp_Object prop, val; |
1903 { | |
29616
8d7a0f575a0e
(Fmodify_frame_parameters): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents:
28930
diff
changeset
|
1904 register Lisp_Object old_alist_elt; |
286 | 1905 |
29616
8d7a0f575a0e
(Fmodify_frame_parameters): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents:
28930
diff
changeset
|
1906 /* The buffer-alist parameter is stored in a special place and is |
8d7a0f575a0e
(Fmodify_frame_parameters): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents:
28930
diff
changeset
|
1907 not in the alist. */ |
17221
0530a375eb21
(frame_buffer_list, set_frame_buffer_list): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
17032
diff
changeset
|
1908 if (EQ (prop, Qbuffer_list)) |
0530a375eb21
(frame_buffer_list, set_frame_buffer_list): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
17032
diff
changeset
|
1909 { |
0530a375eb21
(frame_buffer_list, set_frame_buffer_list): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
17032
diff
changeset
|
1910 f->buffer_list = val; |
0530a375eb21
(frame_buffer_list, set_frame_buffer_list): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
17032
diff
changeset
|
1911 return; |
0530a375eb21
(frame_buffer_list, set_frame_buffer_list): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
17032
diff
changeset
|
1912 } |
0530a375eb21
(frame_buffer_list, set_frame_buffer_list): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
17032
diff
changeset
|
1913 |
29616
8d7a0f575a0e
(Fmodify_frame_parameters): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents:
28930
diff
changeset
|
1914 /* If PROP is a symbol which is supposed to have frame-local values, |
8d7a0f575a0e
(Fmodify_frame_parameters): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents:
28930
diff
changeset
|
1915 and it is set up based on this frame, switch to the global |
8d7a0f575a0e
(Fmodify_frame_parameters): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents:
28930
diff
changeset
|
1916 binding. That way, we can create or alter the frame-local binding |
8d7a0f575a0e
(Fmodify_frame_parameters): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents:
28930
diff
changeset
|
1917 without messing up the symbol's status. */ |
8d7a0f575a0e
(Fmodify_frame_parameters): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents:
28930
diff
changeset
|
1918 if (SYMBOLP (prop)) |
8d7a0f575a0e
(Fmodify_frame_parameters): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents:
28930
diff
changeset
|
1919 { |
8d7a0f575a0e
(Fmodify_frame_parameters): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents:
28930
diff
changeset
|
1920 Lisp_Object valcontents; |
39581
6d9fa06012a6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE macros instead of accessing
Gerd Moellmann <gerd@gnu.org>
parents:
39503
diff
changeset
|
1921 valcontents = SYMBOL_VALUE (prop); |
29616
8d7a0f575a0e
(Fmodify_frame_parameters): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents:
28930
diff
changeset
|
1922 if ((BUFFER_LOCAL_VALUEP (valcontents) |
8d7a0f575a0e
(Fmodify_frame_parameters): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents:
28930
diff
changeset
|
1923 || SOME_BUFFER_LOCAL_VALUEP (valcontents)) |
8d7a0f575a0e
(Fmodify_frame_parameters): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents:
28930
diff
changeset
|
1924 && XBUFFER_LOCAL_VALUE (valcontents)->check_frame |
8d7a0f575a0e
(Fmodify_frame_parameters): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents:
28930
diff
changeset
|
1925 && XFRAME (XBUFFER_LOCAL_VALUE (valcontents)->frame) == f) |
8d7a0f575a0e
(Fmodify_frame_parameters): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents:
28930
diff
changeset
|
1926 swap_in_global_binding (prop); |
8d7a0f575a0e
(Fmodify_frame_parameters): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents:
28930
diff
changeset
|
1927 } |
8d7a0f575a0e
(Fmodify_frame_parameters): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents:
28930
diff
changeset
|
1928 |
8d7a0f575a0e
(Fmodify_frame_parameters): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents:
28930
diff
changeset
|
1929 /* Update the frame parameter alist. */ |
8d7a0f575a0e
(Fmodify_frame_parameters): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents:
28930
diff
changeset
|
1930 old_alist_elt = Fassq (prop, f->param_alist); |
8d7a0f575a0e
(Fmodify_frame_parameters): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents:
28930
diff
changeset
|
1931 if (EQ (old_alist_elt, Qnil)) |
765 | 1932 f->param_alist = Fcons (Fcons (prop, val), f->param_alist); |
286 | 1933 else |
29616
8d7a0f575a0e
(Fmodify_frame_parameters): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents:
28930
diff
changeset
|
1934 Fsetcdr (old_alist_elt, val); |
539 | 1935 |
29616
8d7a0f575a0e
(Fmodify_frame_parameters): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents:
28930
diff
changeset
|
1936 /* Update some other special parameters in their special places |
8d7a0f575a0e
(Fmodify_frame_parameters): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents:
28930
diff
changeset
|
1937 in addition to the alist. */ |
8d7a0f575a0e
(Fmodify_frame_parameters): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents:
28930
diff
changeset
|
1938 |
10207
e6618f52efe9
(Fmodify_frame_parameters): For non-X frames,
Richard M. Stallman <rms@gnu.org>
parents:
9972
diff
changeset
|
1939 if (EQ (prop, Qbuffer_predicate)) |
e6618f52efe9
(Fmodify_frame_parameters): For non-X frames,
Richard M. Stallman <rms@gnu.org>
parents:
9972
diff
changeset
|
1940 f->buffer_predicate = val; |
e6618f52efe9
(Fmodify_frame_parameters): For non-X frames,
Richard M. Stallman <rms@gnu.org>
parents:
9972
diff
changeset
|
1941 |
13412
1ed740e9aa64
[HAVE_NTGUI]: Test for a Win32 frame in procedures that test for an X frame.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13396
diff
changeset
|
1942 if (! FRAME_WINDOW_P (f)) |
20280
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
1943 { |
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
1944 if (EQ (prop, Qmenu_bar_lines)) |
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
1945 set_menu_bar_lines (f, val, make_number (FRAME_MENU_BAR_LINES (f))); |
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
1946 else if (EQ (prop, Qname)) |
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
1947 set_term_frame_name (f, val); |
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
1948 } |
12761
bffb5ea6fb43
Move various Q... vars to top of file, unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
12742
diff
changeset
|
1949 |
9127
0b4836daa8e1
(Fframep, make_frame_without_minibuffer, do_switch_frame, prev_frame,
Karl Heuer <kwzh@gnu.org>
parents:
9032
diff
changeset
|
1950 if (EQ (prop, Qminibuffer) && WINDOWP (val)) |
539 | 1951 { |
1952 if (! MINI_WINDOW_P (XWINDOW (val))) | |
1953 error ("Surrogate minibuffer windows must be minibuffer windows."); | |
1954 | |
25710
ee1da070c50f
(Fnext_frame): Remove unused variable(s).
Gerd Moellmann <gerd@gnu.org>
parents:
25669
diff
changeset
|
1955 if ((FRAME_HAS_MINIBUF_P (f) || FRAME_MINIBUF_ONLY_P (f)) |
16371
906cef1d36bd
(store_frame_param): Allow setting a frame's minibuffer
Karl Heuer <kwzh@gnu.org>
parents:
16280
diff
changeset
|
1956 && !EQ (val, f->minibuffer_window)) |
906cef1d36bd
(store_frame_param): Allow setting a frame's minibuffer
Karl Heuer <kwzh@gnu.org>
parents:
16280
diff
changeset
|
1957 error ("Can't change the surrogate minibuffer of a frame with its own minibuffer"); |
539 | 1958 |
1959 /* Install the chosen minibuffer window, with proper buffer. */ | |
765 | 1960 f->minibuffer_window = val; |
539 | 1961 } |
286 | 1962 } |
1963 | |
765 | 1964 DEFUN ("frame-parameters", Fframe_parameters, Sframe_parameters, 0, 1, 0, |
40105
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1965 doc: /* Return the parameters-alist of frame FRAME. |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1966 It is a list of elements of the form (PARM . VALUE), where PARM is a symbol. |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1967 The meaningful PARMs depend on the kind of frame. |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1968 If FRAME is omitted, return information on the currently selected frame. */) |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1969 (frame) |
765 | 1970 Lisp_Object frame; |
286 | 1971 { |
1972 Lisp_Object alist; | |
7162
06a13bf36a8c
(Fframe_parameters) [!MULTI_FRAME]: Unstub it again.
Karl Heuer <kwzh@gnu.org>
parents:
7134
diff
changeset
|
1973 FRAME_PTR f; |
15062
de7528327c39
(Fframe_parameters, both definitions):
Richard M. Stallman <rms@gnu.org>
parents:
15001
diff
changeset
|
1974 int height, width; |
27575
2344fab04513
(Fframe_parameters): Add GCPRO because tty_color_name can GC.
Gerd Moellmann <gerd@gnu.org>
parents:
26729
diff
changeset
|
1975 struct gcpro gcpro1; |
286 | 1976 |
36804
e4331ae9636d
(Fframe_parameters): In the `buffer-list' frame
Gerd Moellmann <gerd@gnu.org>
parents:
36433
diff
changeset
|
1977 if (NILP (frame)) |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
1978 frame = selected_frame; |
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
1979 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
1980 CHECK_FRAME (frame); |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
1981 f = XFRAME (frame); |
286 | 1982 |
7162
06a13bf36a8c
(Fframe_parameters) [!MULTI_FRAME]: Unstub it again.
Karl Heuer <kwzh@gnu.org>
parents:
7134
diff
changeset
|
1983 if (!FRAME_LIVE_P (f)) |
286 | 1984 return Qnil; |
1985 | |
765 | 1986 alist = Fcopy_alist (f->param_alist); |
27575
2344fab04513
(Fframe_parameters): Add GCPRO because tty_color_name can GC.
Gerd Moellmann <gerd@gnu.org>
parents:
26729
diff
changeset
|
1987 GCPRO1 (alist); |
2344fab04513
(Fframe_parameters): Add GCPRO because tty_color_name can GC.
Gerd Moellmann <gerd@gnu.org>
parents:
26729
diff
changeset
|
1988 |
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26164
diff
changeset
|
1989 if (!FRAME_WINDOW_P (f)) |
15391
d4cec5d7566d
(Fset_mouse_position): Remove the DOS-specific
Richard M. Stallman <rms@gnu.org>
parents:
15062
diff
changeset
|
1990 { |
25117
f6f34f0bc1af
(make_terminal_frame) [MSDOS]: Don't call
Eli Zaretskii <eliz@gnu.org>
parents:
25030
diff
changeset
|
1991 int fg = FRAME_FOREGROUND_PIXEL (f); |
f6f34f0bc1af
(make_terminal_frame) [MSDOS]: Don't call
Eli Zaretskii <eliz@gnu.org>
parents:
25030
diff
changeset
|
1992 int bg = FRAME_BACKGROUND_PIXEL (f); |
32545
288723d38c06
(Fframe_parameters): If a tty's frame's param_alist says
Eli Zaretskii <eliz@gnu.org>
parents:
32254
diff
changeset
|
1993 Lisp_Object elt; |
25117
f6f34f0bc1af
(make_terminal_frame) [MSDOS]: Don't call
Eli Zaretskii <eliz@gnu.org>
parents:
25030
diff
changeset
|
1994 |
32545
288723d38c06
(Fframe_parameters): If a tty's frame's param_alist says
Eli Zaretskii <eliz@gnu.org>
parents:
32254
diff
changeset
|
1995 /* If the frame's parameter alist says the colors are |
288723d38c06
(Fframe_parameters): If a tty's frame's param_alist says
Eli Zaretskii <eliz@gnu.org>
parents:
32254
diff
changeset
|
1996 unspecified and reversed, take the frame's background pixel |
288723d38c06
(Fframe_parameters): If a tty's frame's param_alist says
Eli Zaretskii <eliz@gnu.org>
parents:
32254
diff
changeset
|
1997 for foreground and vice versa. */ |
288723d38c06
(Fframe_parameters): If a tty's frame's param_alist says
Eli Zaretskii <eliz@gnu.org>
parents:
32254
diff
changeset
|
1998 elt = Fassq (Qforeground_color, alist); |
33005
87893013088c
(Fframe_parameters): Fix the change from 2000-10-16:
Eli Zaretskii <eliz@gnu.org>
parents:
32909
diff
changeset
|
1999 if (!NILP (elt) && CONSP (elt) && STRINGP (XCDR (elt))) |
87893013088c
(Fframe_parameters): Fix the change from 2000-10-16:
Eli Zaretskii <eliz@gnu.org>
parents:
32909
diff
changeset
|
2000 { |
87893013088c
(Fframe_parameters): Fix the change from 2000-10-16:
Eli Zaretskii <eliz@gnu.org>
parents:
32909
diff
changeset
|
2001 if (strncmp (XSTRING (XCDR (elt))->data, |
87893013088c
(Fframe_parameters): Fix the change from 2000-10-16:
Eli Zaretskii <eliz@gnu.org>
parents:
32909
diff
changeset
|
2002 unspecified_bg, |
87893013088c
(Fframe_parameters): Fix the change from 2000-10-16:
Eli Zaretskii <eliz@gnu.org>
parents:
32909
diff
changeset
|
2003 XSTRING (XCDR (elt))->size) == 0) |
87893013088c
(Fframe_parameters): Fix the change from 2000-10-16:
Eli Zaretskii <eliz@gnu.org>
parents:
32909
diff
changeset
|
2004 store_in_alist (&alist, Qforeground_color, tty_color_name (f, bg)); |
87893013088c
(Fframe_parameters): Fix the change from 2000-10-16:
Eli Zaretskii <eliz@gnu.org>
parents:
32909
diff
changeset
|
2005 else if (strncmp (XSTRING (XCDR (elt))->data, |
87893013088c
(Fframe_parameters): Fix the change from 2000-10-16:
Eli Zaretskii <eliz@gnu.org>
parents:
32909
diff
changeset
|
2006 unspecified_fg, |
87893013088c
(Fframe_parameters): Fix the change from 2000-10-16:
Eli Zaretskii <eliz@gnu.org>
parents:
32909
diff
changeset
|
2007 XSTRING (XCDR (elt))->size) == 0) |
87893013088c
(Fframe_parameters): Fix the change from 2000-10-16:
Eli Zaretskii <eliz@gnu.org>
parents:
32909
diff
changeset
|
2008 store_in_alist (&alist, Qforeground_color, tty_color_name (f, fg)); |
87893013088c
(Fframe_parameters): Fix the change from 2000-10-16:
Eli Zaretskii <eliz@gnu.org>
parents:
32909
diff
changeset
|
2009 } |
32545
288723d38c06
(Fframe_parameters): If a tty's frame's param_alist says
Eli Zaretskii <eliz@gnu.org>
parents:
32254
diff
changeset
|
2010 else |
288723d38c06
(Fframe_parameters): If a tty's frame's param_alist says
Eli Zaretskii <eliz@gnu.org>
parents:
32254
diff
changeset
|
2011 store_in_alist (&alist, Qforeground_color, tty_color_name (f, fg)); |
288723d38c06
(Fframe_parameters): If a tty's frame's param_alist says
Eli Zaretskii <eliz@gnu.org>
parents:
32254
diff
changeset
|
2012 elt = Fassq (Qbackground_color, alist); |
33005
87893013088c
(Fframe_parameters): Fix the change from 2000-10-16:
Eli Zaretskii <eliz@gnu.org>
parents:
32909
diff
changeset
|
2013 if (!NILP (elt) && CONSP (elt) && STRINGP (XCDR (elt))) |
87893013088c
(Fframe_parameters): Fix the change from 2000-10-16:
Eli Zaretskii <eliz@gnu.org>
parents:
32909
diff
changeset
|
2014 { |
87893013088c
(Fframe_parameters): Fix the change from 2000-10-16:
Eli Zaretskii <eliz@gnu.org>
parents:
32909
diff
changeset
|
2015 if (strncmp (XSTRING (XCDR (elt))->data, |
87893013088c
(Fframe_parameters): Fix the change from 2000-10-16:
Eli Zaretskii <eliz@gnu.org>
parents:
32909
diff
changeset
|
2016 unspecified_fg, |
87893013088c
(Fframe_parameters): Fix the change from 2000-10-16:
Eli Zaretskii <eliz@gnu.org>
parents:
32909
diff
changeset
|
2017 XSTRING (XCDR (elt))->size) == 0) |
87893013088c
(Fframe_parameters): Fix the change from 2000-10-16:
Eli Zaretskii <eliz@gnu.org>
parents:
32909
diff
changeset
|
2018 store_in_alist (&alist, Qbackground_color, tty_color_name (f, fg)); |
87893013088c
(Fframe_parameters): Fix the change from 2000-10-16:
Eli Zaretskii <eliz@gnu.org>
parents:
32909
diff
changeset
|
2019 else if (strncmp (XSTRING (XCDR (elt))->data, |
87893013088c
(Fframe_parameters): Fix the change from 2000-10-16:
Eli Zaretskii <eliz@gnu.org>
parents:
32909
diff
changeset
|
2020 unspecified_bg, |
87893013088c
(Fframe_parameters): Fix the change from 2000-10-16:
Eli Zaretskii <eliz@gnu.org>
parents:
32909
diff
changeset
|
2021 XSTRING (XCDR (elt))->size) == 0) |
87893013088c
(Fframe_parameters): Fix the change from 2000-10-16:
Eli Zaretskii <eliz@gnu.org>
parents:
32909
diff
changeset
|
2022 store_in_alist (&alist, Qbackground_color, tty_color_name (f, bg)); |
87893013088c
(Fframe_parameters): Fix the change from 2000-10-16:
Eli Zaretskii <eliz@gnu.org>
parents:
32909
diff
changeset
|
2023 } |
32545
288723d38c06
(Fframe_parameters): If a tty's frame's param_alist says
Eli Zaretskii <eliz@gnu.org>
parents:
32254
diff
changeset
|
2024 else |
288723d38c06
(Fframe_parameters): If a tty's frame's param_alist says
Eli Zaretskii <eliz@gnu.org>
parents:
32254
diff
changeset
|
2025 store_in_alist (&alist, Qbackground_color, tty_color_name (f, bg)); |
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26164
diff
changeset
|
2026 store_in_alist (&alist, intern ("font"), |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26164
diff
changeset
|
2027 build_string (FRAME_MSDOS_P (f) |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26164
diff
changeset
|
2028 ? "ms-dos" |
35003
c6726a1e70ce
(make_terminal_frame) [WINDOWSNT]: Make terminal frames
Andrew Innes <andrewi@gnu.org>
parents:
33760
diff
changeset
|
2029 : FRAME_W32_P (f) ? "w32term" |
c6726a1e70ce
(make_terminal_frame) [WINDOWSNT]: Make terminal frames
Andrew Innes <andrewi@gnu.org>
parents:
33760
diff
changeset
|
2030 :"tty")); |
15391
d4cec5d7566d
(Fset_mouse_position): Remove the DOS-specific
Richard M. Stallman <rms@gnu.org>
parents:
15062
diff
changeset
|
2031 } |
965
0eb68c6c452a
* frame.c (Qheight, Qicon, Qmodeline, Qname, Qnone, Qonly,
Jim Blandy <jimb@redhat.com>
parents:
886
diff
changeset
|
2032 store_in_alist (&alist, Qname, f->name); |
15062
de7528327c39
(Fframe_parameters, both definitions):
Richard M. Stallman <rms@gnu.org>
parents:
15001
diff
changeset
|
2033 height = (FRAME_NEW_HEIGHT (f) ? FRAME_NEW_HEIGHT (f) : FRAME_HEIGHT (f)); |
de7528327c39
(Fframe_parameters, both definitions):
Richard M. Stallman <rms@gnu.org>
parents:
15001
diff
changeset
|
2034 store_in_alist (&alist, Qheight, make_number (height)); |
de7528327c39
(Fframe_parameters, both definitions):
Richard M. Stallman <rms@gnu.org>
parents:
15001
diff
changeset
|
2035 width = (FRAME_NEW_WIDTH (f) ? FRAME_NEW_WIDTH (f) : FRAME_WIDTH (f)); |
de7528327c39
(Fframe_parameters, both definitions):
Richard M. Stallman <rms@gnu.org>
parents:
15001
diff
changeset
|
2036 store_in_alist (&alist, Qwidth, make_number (width)); |
7162
06a13bf36a8c
(Fframe_parameters) [!MULTI_FRAME]: Unstub it again.
Karl Heuer <kwzh@gnu.org>
parents:
7134
diff
changeset
|
2037 store_in_alist (&alist, Qmodeline, (FRAME_WANTS_MODELINE_P (f) ? Qt : Qnil)); |
965
0eb68c6c452a
* frame.c (Qheight, Qicon, Qmodeline, Qname, Qnone, Qonly,
Jim Blandy <jimb@redhat.com>
parents:
886
diff
changeset
|
2038 store_in_alist (&alist, Qminibuffer, |
1870
d90e9fecad48
* frame.c (Fframe_parameters): Report the `minibuffer' parameter of
Jim Blandy <jimb@redhat.com>
parents:
1821
diff
changeset
|
2039 (! FRAME_HAS_MINIBUF_P (f) ? Qnil |
7162
06a13bf36a8c
(Fframe_parameters) [!MULTI_FRAME]: Unstub it again.
Karl Heuer <kwzh@gnu.org>
parents:
7134
diff
changeset
|
2040 : FRAME_MINIBUF_ONLY_P (f) ? Qonly |
06a13bf36a8c
(Fframe_parameters) [!MULTI_FRAME]: Unstub it again.
Karl Heuer <kwzh@gnu.org>
parents:
7134
diff
changeset
|
2041 : FRAME_MINIBUF_WINDOW (f))); |
06a13bf36a8c
(Fframe_parameters) [!MULTI_FRAME]: Unstub it again.
Karl Heuer <kwzh@gnu.org>
parents:
7134
diff
changeset
|
2042 store_in_alist (&alist, Qunsplittable, (FRAME_NO_SPLIT_P (f) ? Qt : Qnil)); |
36804
e4331ae9636d
(Fframe_parameters): In the `buffer-list' frame
Gerd Moellmann <gerd@gnu.org>
parents:
36433
diff
changeset
|
2043 store_in_alist (&alist, Qbuffer_list, frame_buffer_list (frame)); |
286 | 2044 |
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1809
diff
changeset
|
2045 /* I think this should be done with a hook. */ |
13412
1ed740e9aa64
[HAVE_NTGUI]: Test for a Win32 frame in procedures that test for an X frame.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13396
diff
changeset
|
2046 #ifdef HAVE_WINDOW_SYSTEM |
1ed740e9aa64
[HAVE_NTGUI]: Test for a Win32 frame in procedures that test for an X frame.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13396
diff
changeset
|
2047 if (FRAME_WINDOW_P (f)) |
765 | 2048 x_report_frame_params (f, &alist); |
8244
15d4c2bd29e6
[MULTI_FRAME] (Fframe_parameters): For non-X frames,
Richard M. Stallman <rms@gnu.org>
parents:
8168
diff
changeset
|
2049 else |
965
0eb68c6c452a
* frame.c (Qheight, Qicon, Qmodeline, Qname, Qnone, Qonly,
Jim Blandy <jimb@redhat.com>
parents:
886
diff
changeset
|
2050 #endif |
8904
af3ff2dbaddd
(Fframe_parameters): Fix Lisp_Object vs. int problems.
Karl Heuer <kwzh@gnu.org>
parents:
8685
diff
changeset
|
2051 { |
af3ff2dbaddd
(Fframe_parameters): Fix Lisp_Object vs. int problems.
Karl Heuer <kwzh@gnu.org>
parents:
8685
diff
changeset
|
2052 /* This ought to be correct in f->param_alist for an X frame. */ |
af3ff2dbaddd
(Fframe_parameters): Fix Lisp_Object vs. int problems.
Karl Heuer <kwzh@gnu.org>
parents:
8685
diff
changeset
|
2053 Lisp_Object lines; |
9309
27370f65dfa1
(make_frame, Fframe_parameters, Fselected_frame, syms_of_frame): Don't use
Karl Heuer <kwzh@gnu.org>
parents:
9268
diff
changeset
|
2054 XSETFASTINT (lines, FRAME_MENU_BAR_LINES (f)); |
8904
af3ff2dbaddd
(Fframe_parameters): Fix Lisp_Object vs. int problems.
Karl Heuer <kwzh@gnu.org>
parents:
8685
diff
changeset
|
2055 store_in_alist (&alist, Qmenu_bar_lines, lines); |
af3ff2dbaddd
(Fframe_parameters): Fix Lisp_Object vs. int problems.
Karl Heuer <kwzh@gnu.org>
parents:
8685
diff
changeset
|
2056 } |
27575
2344fab04513
(Fframe_parameters): Add GCPRO because tty_color_name can GC.
Gerd Moellmann <gerd@gnu.org>
parents:
26729
diff
changeset
|
2057 |
2344fab04513
(Fframe_parameters): Add GCPRO because tty_color_name can GC.
Gerd Moellmann <gerd@gnu.org>
parents:
26729
diff
changeset
|
2058 UNGCPRO; |
286 | 2059 return alist; |
2060 } | |
2061 | |
31399
db831ffcd565
(Qdisplay_type): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31102
diff
changeset
|
2062 |
db831ffcd565
(Qdisplay_type): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31102
diff
changeset
|
2063 DEFUN ("frame-parameter", Fframe_parameter, Sframe_parameter, 2, 2, 0, |
40105
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
2064 doc: /* Return FRAME's value for parameter PARAMETER. |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
2065 If FRAME is nil, describe the currently selected frame. */) |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
2066 (frame, parameter) |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
2067 Lisp_Object frame, parameter; |
31399
db831ffcd565
(Qdisplay_type): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31102
diff
changeset
|
2068 { |
db831ffcd565
(Qdisplay_type): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31102
diff
changeset
|
2069 struct frame *f; |
db831ffcd565
(Qdisplay_type): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31102
diff
changeset
|
2070 Lisp_Object value; |
db831ffcd565
(Qdisplay_type): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31102
diff
changeset
|
2071 |
db831ffcd565
(Qdisplay_type): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31102
diff
changeset
|
2072 if (NILP (frame)) |
db831ffcd565
(Qdisplay_type): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31102
diff
changeset
|
2073 frame = selected_frame; |
db831ffcd565
(Qdisplay_type): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31102
diff
changeset
|
2074 else |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
2075 CHECK_FRAME (frame); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
2076 CHECK_SYMBOL (parameter); |
31399
db831ffcd565
(Qdisplay_type): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31102
diff
changeset
|
2077 |
db831ffcd565
(Qdisplay_type): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31102
diff
changeset
|
2078 f = XFRAME (frame); |
db831ffcd565
(Qdisplay_type): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31102
diff
changeset
|
2079 value = Qnil; |
db831ffcd565
(Qdisplay_type): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31102
diff
changeset
|
2080 |
db831ffcd565
(Qdisplay_type): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31102
diff
changeset
|
2081 if (FRAME_LIVE_P (f)) |
db831ffcd565
(Qdisplay_type): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31102
diff
changeset
|
2082 { |
40319
52af99ad587f
Resurrect a comment lost in the previous commit.
Eli Zaretskii <eliz@gnu.org>
parents:
40317
diff
changeset
|
2083 /* Avoid consing in frequent cases. */ |
31442
cb166d3ac8e7
(Fframe_parameter): Handle `name' specially.
Gerd Moellmann <gerd@gnu.org>
parents:
31399
diff
changeset
|
2084 if (EQ (parameter, Qname)) |
cb166d3ac8e7
(Fframe_parameter): Handle `name' specially.
Gerd Moellmann <gerd@gnu.org>
parents:
31399
diff
changeset
|
2085 value = f->name; |
31448
70b366918608
(Fframe_parameter): Handle `name' and `background-mode'
Gerd Moellmann <gerd@gnu.org>
parents:
31442
diff
changeset
|
2086 #ifdef HAVE_X_WINDOWS |
70b366918608
(Fframe_parameter): Handle `name' and `background-mode'
Gerd Moellmann <gerd@gnu.org>
parents:
31442
diff
changeset
|
2087 else if (EQ (parameter, Qdisplay) && FRAME_X_P (f)) |
70b366918608
(Fframe_parameter): Handle `name' and `background-mode'
Gerd Moellmann <gerd@gnu.org>
parents:
31442
diff
changeset
|
2088 value = XCAR (FRAME_X_DISPLAY_INFO (f)->name_list_element); |
70b366918608
(Fframe_parameter): Handle `name' and `background-mode'
Gerd Moellmann <gerd@gnu.org>
parents:
31442
diff
changeset
|
2089 #endif /* HAVE_X_WINDOWS */ |
40313
b2ff79e90309
(Fframe_parameter): Fix a bug whereby some
Gerd Moellmann <gerd@gnu.org>
parents:
40105
diff
changeset
|
2090 else if (EQ (parameter, Qbackground_color) |
b2ff79e90309
(Fframe_parameter): Fix a bug whereby some
Gerd Moellmann <gerd@gnu.org>
parents:
40105
diff
changeset
|
2091 || EQ (parameter, Qforeground_color)) |
31442
cb166d3ac8e7
(Fframe_parameter): Handle `name' specially.
Gerd Moellmann <gerd@gnu.org>
parents:
31399
diff
changeset
|
2092 { |
cb166d3ac8e7
(Fframe_parameter): Handle `name' specially.
Gerd Moellmann <gerd@gnu.org>
parents:
31399
diff
changeset
|
2093 value = Fassq (parameter, f->param_alist); |
cb166d3ac8e7
(Fframe_parameter): Handle `name' specially.
Gerd Moellmann <gerd@gnu.org>
parents:
31399
diff
changeset
|
2094 if (CONSP (value)) |
32254
f93728883f64
(Fframe_parameter): For non-windowed frames, if
Eli Zaretskii <eliz@gnu.org>
parents:
31470
diff
changeset
|
2095 { |
f93728883f64
(Fframe_parameter): For non-windowed frames, if
Eli Zaretskii <eliz@gnu.org>
parents:
31470
diff
changeset
|
2096 value = XCDR (value); |
f93728883f64
(Fframe_parameter): For non-windowed frames, if
Eli Zaretskii <eliz@gnu.org>
parents:
31470
diff
changeset
|
2097 /* Fframe_parameters puts the actual fg/bg color names, |
f93728883f64
(Fframe_parameter): For non-windowed frames, if
Eli Zaretskii <eliz@gnu.org>
parents:
31470
diff
changeset
|
2098 even if f->param_alist says otherwise. This is |
f93728883f64
(Fframe_parameter): For non-windowed frames, if
Eli Zaretskii <eliz@gnu.org>
parents:
31470
diff
changeset
|
2099 important when param_alist's notion of colors is |
f93728883f64
(Fframe_parameter): For non-windowed frames, if
Eli Zaretskii <eliz@gnu.org>
parents:
31470
diff
changeset
|
2100 "unspecified". We need to do the same here. */ |
f93728883f64
(Fframe_parameter): For non-windowed frames, if
Eli Zaretskii <eliz@gnu.org>
parents:
31470
diff
changeset
|
2101 if (STRINGP (value) && !FRAME_WINDOW_P (f)) |
f93728883f64
(Fframe_parameter): For non-windowed frames, if
Eli Zaretskii <eliz@gnu.org>
parents:
31470
diff
changeset
|
2102 { |
32545
288723d38c06
(Fframe_parameters): If a tty's frame's param_alist says
Eli Zaretskii <eliz@gnu.org>
parents:
32254
diff
changeset
|
2103 char *color_name; |
288723d38c06
(Fframe_parameters): If a tty's frame's param_alist says
Eli Zaretskii <eliz@gnu.org>
parents:
32254
diff
changeset
|
2104 EMACS_INT csz; |
288723d38c06
(Fframe_parameters): If a tty's frame's param_alist says
Eli Zaretskii <eliz@gnu.org>
parents:
32254
diff
changeset
|
2105 |
288723d38c06
(Fframe_parameters): If a tty's frame's param_alist says
Eli Zaretskii <eliz@gnu.org>
parents:
32254
diff
changeset
|
2106 if (EQ (parameter, Qbackground_color)) |
288723d38c06
(Fframe_parameters): If a tty's frame's param_alist says
Eli Zaretskii <eliz@gnu.org>
parents:
32254
diff
changeset
|
2107 { |
288723d38c06
(Fframe_parameters): If a tty's frame's param_alist says
Eli Zaretskii <eliz@gnu.org>
parents:
32254
diff
changeset
|
2108 color_name = XSTRING (value)->data; |
288723d38c06
(Fframe_parameters): If a tty's frame's param_alist says
Eli Zaretskii <eliz@gnu.org>
parents:
32254
diff
changeset
|
2109 csz = XSTRING (value)->size; |
288723d38c06
(Fframe_parameters): If a tty's frame's param_alist says
Eli Zaretskii <eliz@gnu.org>
parents:
32254
diff
changeset
|
2110 if (strncmp (color_name, unspecified_bg, csz) == 0) |
288723d38c06
(Fframe_parameters): If a tty's frame's param_alist says
Eli Zaretskii <eliz@gnu.org>
parents:
32254
diff
changeset
|
2111 value = tty_color_name (f, FRAME_BACKGROUND_PIXEL (f)); |
288723d38c06
(Fframe_parameters): If a tty's frame's param_alist says
Eli Zaretskii <eliz@gnu.org>
parents:
32254
diff
changeset
|
2112 else if (strncmp (color_name, unspecified_fg, csz) == 0) |
288723d38c06
(Fframe_parameters): If a tty's frame's param_alist says
Eli Zaretskii <eliz@gnu.org>
parents:
32254
diff
changeset
|
2113 value = tty_color_name (f, FRAME_FOREGROUND_PIXEL (f)); |
288723d38c06
(Fframe_parameters): If a tty's frame's param_alist says
Eli Zaretskii <eliz@gnu.org>
parents:
32254
diff
changeset
|
2114 } |
288723d38c06
(Fframe_parameters): If a tty's frame's param_alist says
Eli Zaretskii <eliz@gnu.org>
parents:
32254
diff
changeset
|
2115 else if (EQ (parameter, Qforeground_color)) |
288723d38c06
(Fframe_parameters): If a tty's frame's param_alist says
Eli Zaretskii <eliz@gnu.org>
parents:
32254
diff
changeset
|
2116 { |
288723d38c06
(Fframe_parameters): If a tty's frame's param_alist says
Eli Zaretskii <eliz@gnu.org>
parents:
32254
diff
changeset
|
2117 color_name = XSTRING (value)->data; |
288723d38c06
(Fframe_parameters): If a tty's frame's param_alist says
Eli Zaretskii <eliz@gnu.org>
parents:
32254
diff
changeset
|
2118 csz = XSTRING (value)->size; |
288723d38c06
(Fframe_parameters): If a tty's frame's param_alist says
Eli Zaretskii <eliz@gnu.org>
parents:
32254
diff
changeset
|
2119 if (strncmp (color_name, unspecified_fg, csz) == 0) |
288723d38c06
(Fframe_parameters): If a tty's frame's param_alist says
Eli Zaretskii <eliz@gnu.org>
parents:
32254
diff
changeset
|
2120 value = tty_color_name (f, FRAME_FOREGROUND_PIXEL (f)); |
288723d38c06
(Fframe_parameters): If a tty's frame's param_alist says
Eli Zaretskii <eliz@gnu.org>
parents:
32254
diff
changeset
|
2121 else if (strncmp (color_name, unspecified_bg, csz) == 0) |
288723d38c06
(Fframe_parameters): If a tty's frame's param_alist says
Eli Zaretskii <eliz@gnu.org>
parents:
32254
diff
changeset
|
2122 value = tty_color_name (f, FRAME_BACKGROUND_PIXEL (f)); |
288723d38c06
(Fframe_parameters): If a tty's frame's param_alist says
Eli Zaretskii <eliz@gnu.org>
parents:
32254
diff
changeset
|
2123 } |
32254
f93728883f64
(Fframe_parameter): For non-windowed frames, if
Eli Zaretskii <eliz@gnu.org>
parents:
31470
diff
changeset
|
2124 } |
f93728883f64
(Fframe_parameter): For non-windowed frames, if
Eli Zaretskii <eliz@gnu.org>
parents:
31470
diff
changeset
|
2125 } |
40317
dfb2afb0aa8a
(Fframe_parameter): Fix last change.
Eli Zaretskii <eliz@gnu.org>
parents:
40313
diff
changeset
|
2126 else |
dfb2afb0aa8a
(Fframe_parameter): Fix last change.
Eli Zaretskii <eliz@gnu.org>
parents:
40313
diff
changeset
|
2127 value = Fcdr (Fassq (parameter, Fframe_parameters (frame))); |
31442
cb166d3ac8e7
(Fframe_parameter): Handle `name' specially.
Gerd Moellmann <gerd@gnu.org>
parents:
31399
diff
changeset
|
2128 } |
40313
b2ff79e90309
(Fframe_parameter): Fix a bug whereby some
Gerd Moellmann <gerd@gnu.org>
parents:
40105
diff
changeset
|
2129 else if (EQ (parameter, Qdisplay_type) |
b2ff79e90309
(Fframe_parameter): Fix a bug whereby some
Gerd Moellmann <gerd@gnu.org>
parents:
40105
diff
changeset
|
2130 || EQ (parameter, Qbackground_mode)) |
b2ff79e90309
(Fframe_parameter): Fix a bug whereby some
Gerd Moellmann <gerd@gnu.org>
parents:
40105
diff
changeset
|
2131 value = Fcdr (Fassq (parameter, f->param_alist)); |
b2ff79e90309
(Fframe_parameter): Fix a bug whereby some
Gerd Moellmann <gerd@gnu.org>
parents:
40105
diff
changeset
|
2132 else |
b2ff79e90309
(Fframe_parameter): Fix a bug whereby some
Gerd Moellmann <gerd@gnu.org>
parents:
40105
diff
changeset
|
2133 value = Fcdr (Fassq (parameter, Fframe_parameters (frame))); |
31399
db831ffcd565
(Qdisplay_type): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31102
diff
changeset
|
2134 } |
db831ffcd565
(Qdisplay_type): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31102
diff
changeset
|
2135 |
db831ffcd565
(Qdisplay_type): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31102
diff
changeset
|
2136 return value; |
db831ffcd565
(Qdisplay_type): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31102
diff
changeset
|
2137 } |
db831ffcd565
(Qdisplay_type): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31102
diff
changeset
|
2138 |
db831ffcd565
(Qdisplay_type): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31102
diff
changeset
|
2139 |
765 | 2140 DEFUN ("modify-frame-parameters", Fmodify_frame_parameters, |
2141 Smodify_frame_parameters, 2, 2, 0, | |
40105
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
2142 doc: /* Modify the parameters of frame FRAME according to ALIST. |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
2143 If FRAME is nil, it defaults to the selected frame. |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
2144 ALIST is an alist of parameters to change and their new values. |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
2145 Each element of ALIST has the form (PARM . VALUE), where PARM is a symbol. |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
2146 The meaningful PARMs depend on the kind of frame. |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
2147 Undefined PARMs are ignored, but stored in the frame's parameter list |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
2148 so that `frame-parameters' will return them. |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
2149 |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
2150 The value of frame parameter FOO can also be accessed |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
2151 as a frame-local binding for the variable FOO, if you have |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
2152 enabled such bindings for that variable with `make-variable-frame-local'. */) |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
2153 (frame, alist) |
765 | 2154 Lisp_Object frame, alist; |
286 | 2155 { |
965
0eb68c6c452a
* frame.c (Qheight, Qicon, Qmodeline, Qname, Qnone, Qonly,
Jim Blandy <jimb@redhat.com>
parents:
886
diff
changeset
|
2156 FRAME_PTR f; |
25710
ee1da070c50f
(Fnext_frame): Remove unused variable(s).
Gerd Moellmann <gerd@gnu.org>
parents:
25669
diff
changeset
|
2157 register Lisp_Object tail, prop, val; |
33509
a7d245e080d1
(syms_of_frame_1): Removed; code moved to syms_of_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
33005
diff
changeset
|
2158 int count = BINDING_STACK_SIZE (); |
a7d245e080d1
(syms_of_frame_1): Removed; code moved to syms_of_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
33005
diff
changeset
|
2159 |
a7d245e080d1
(syms_of_frame_1): Removed; code moved to syms_of_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
33005
diff
changeset
|
2160 /* Bind this to t to inhibit initialization of the default face from |
a7d245e080d1
(syms_of_frame_1): Removed; code moved to syms_of_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
33005
diff
changeset
|
2161 X resources in face-set-after-frame-default. If we don't inhibit |
a7d245e080d1
(syms_of_frame_1): Removed; code moved to syms_of_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
33005
diff
changeset
|
2162 this, modifying the `font' frame parameter, for example, while |
a7d245e080d1
(syms_of_frame_1): Removed; code moved to syms_of_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
33005
diff
changeset
|
2163 there is a `default.attributeFont' X resource, won't work, |
a7d245e080d1
(syms_of_frame_1): Removed; code moved to syms_of_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
33005
diff
changeset
|
2164 because `default's font is reset to the value of the X resource |
a7d245e080d1
(syms_of_frame_1): Removed; code moved to syms_of_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
33005
diff
changeset
|
2165 and that resets the `font' frame parameter. */ |
a7d245e080d1
(syms_of_frame_1): Removed; code moved to syms_of_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
33005
diff
changeset
|
2166 specbind (Qinhibit_default_face_x_resources, Qt); |
286 | 2167 |
765 | 2168 if (EQ (frame, Qnil)) |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
2169 frame = selected_frame; |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
2170 CHECK_LIVE_FRAME (frame); |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
2171 f = XFRAME (frame); |
286 | 2172 |
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1809
diff
changeset
|
2173 /* I think this should be done with a hook. */ |
13412
1ed740e9aa64
[HAVE_NTGUI]: Test for a Win32 frame in procedures that test for an X frame.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13396
diff
changeset
|
2174 #ifdef HAVE_WINDOW_SYSTEM |
1ed740e9aa64
[HAVE_NTGUI]: Test for a Win32 frame in procedures that test for an X frame.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13396
diff
changeset
|
2175 if (FRAME_WINDOW_P (f)) |
965
0eb68c6c452a
* frame.c (Qheight, Qicon, Qmodeline, Qname, Qnone, Qonly,
Jim Blandy <jimb@redhat.com>
parents:
886
diff
changeset
|
2176 x_set_frame_parameters (f, alist); |
10207
e6618f52efe9
(Fmodify_frame_parameters): For non-X frames,
Richard M. Stallman <rms@gnu.org>
parents:
9972
diff
changeset
|
2177 else |
e6618f52efe9
(Fmodify_frame_parameters): For non-X frames,
Richard M. Stallman <rms@gnu.org>
parents:
9972
diff
changeset
|
2178 #endif |
15391
d4cec5d7566d
(Fset_mouse_position): Remove the DOS-specific
Richard M. Stallman <rms@gnu.org>
parents:
15062
diff
changeset
|
2179 #ifdef MSDOS |
d4cec5d7566d
(Fset_mouse_position): Remove the DOS-specific
Richard M. Stallman <rms@gnu.org>
parents:
15062
diff
changeset
|
2180 if (FRAME_MSDOS_P (f)) |
d4cec5d7566d
(Fset_mouse_position): Remove the DOS-specific
Richard M. Stallman <rms@gnu.org>
parents:
15062
diff
changeset
|
2181 IT_set_frame_parameters (f, alist); |
d4cec5d7566d
(Fset_mouse_position): Remove the DOS-specific
Richard M. Stallman <rms@gnu.org>
parents:
15062
diff
changeset
|
2182 else |
d4cec5d7566d
(Fset_mouse_position): Remove the DOS-specific
Richard M. Stallman <rms@gnu.org>
parents:
15062
diff
changeset
|
2183 #endif |
25523
9e9eeb68482e
(Fframep) [macintosh]: Handle mac frame type.
Richard M. Stallman <rms@gnu.org>
parents:
25350
diff
changeset
|
2184 |
16568
cc6d85f9df0f
(Fmodify_frame_parameters): Use alist in reverse order.
Richard M. Stallman <rms@gnu.org>
parents:
16536
diff
changeset
|
2185 { |
cc6d85f9df0f
(Fmodify_frame_parameters): Use alist in reverse order.
Richard M. Stallman <rms@gnu.org>
parents:
16536
diff
changeset
|
2186 int length = XINT (Flength (alist)); |
cc6d85f9df0f
(Fmodify_frame_parameters): Use alist in reverse order.
Richard M. Stallman <rms@gnu.org>
parents:
16536
diff
changeset
|
2187 int i; |
cc6d85f9df0f
(Fmodify_frame_parameters): Use alist in reverse order.
Richard M. Stallman <rms@gnu.org>
parents:
16536
diff
changeset
|
2188 Lisp_Object *parms |
cc6d85f9df0f
(Fmodify_frame_parameters): Use alist in reverse order.
Richard M. Stallman <rms@gnu.org>
parents:
16536
diff
changeset
|
2189 = (Lisp_Object *) alloca (length * sizeof (Lisp_Object)); |
cc6d85f9df0f
(Fmodify_frame_parameters): Use alist in reverse order.
Richard M. Stallman <rms@gnu.org>
parents:
16536
diff
changeset
|
2190 Lisp_Object *values |
cc6d85f9df0f
(Fmodify_frame_parameters): Use alist in reverse order.
Richard M. Stallman <rms@gnu.org>
parents:
16536
diff
changeset
|
2191 = (Lisp_Object *) alloca (length * sizeof (Lisp_Object)); |
cc6d85f9df0f
(Fmodify_frame_parameters): Use alist in reverse order.
Richard M. Stallman <rms@gnu.org>
parents:
16536
diff
changeset
|
2192 |
cc6d85f9df0f
(Fmodify_frame_parameters): Use alist in reverse order.
Richard M. Stallman <rms@gnu.org>
parents:
16536
diff
changeset
|
2193 /* Extract parm names and values into those vectors. */ |
cc6d85f9df0f
(Fmodify_frame_parameters): Use alist in reverse order.
Richard M. Stallman <rms@gnu.org>
parents:
16536
diff
changeset
|
2194 |
cc6d85f9df0f
(Fmodify_frame_parameters): Use alist in reverse order.
Richard M. Stallman <rms@gnu.org>
parents:
16536
diff
changeset
|
2195 i = 0; |
cc6d85f9df0f
(Fmodify_frame_parameters): Use alist in reverse order.
Richard M. Stallman <rms@gnu.org>
parents:
16536
diff
changeset
|
2196 for (tail = alist; CONSP (tail); tail = Fcdr (tail)) |
cc6d85f9df0f
(Fmodify_frame_parameters): Use alist in reverse order.
Richard M. Stallman <rms@gnu.org>
parents:
16536
diff
changeset
|
2197 { |
25710
ee1da070c50f
(Fnext_frame): Remove unused variable(s).
Gerd Moellmann <gerd@gnu.org>
parents:
25669
diff
changeset
|
2198 Lisp_Object elt; |
16568
cc6d85f9df0f
(Fmodify_frame_parameters): Use alist in reverse order.
Richard M. Stallman <rms@gnu.org>
parents:
16536
diff
changeset
|
2199 |
cc6d85f9df0f
(Fmodify_frame_parameters): Use alist in reverse order.
Richard M. Stallman <rms@gnu.org>
parents:
16536
diff
changeset
|
2200 elt = Fcar (tail); |
cc6d85f9df0f
(Fmodify_frame_parameters): Use alist in reverse order.
Richard M. Stallman <rms@gnu.org>
parents:
16536
diff
changeset
|
2201 parms[i] = Fcar (elt); |
cc6d85f9df0f
(Fmodify_frame_parameters): Use alist in reverse order.
Richard M. Stallman <rms@gnu.org>
parents:
16536
diff
changeset
|
2202 values[i] = Fcdr (elt); |
cc6d85f9df0f
(Fmodify_frame_parameters): Use alist in reverse order.
Richard M. Stallman <rms@gnu.org>
parents:
16536
diff
changeset
|
2203 i++; |
cc6d85f9df0f
(Fmodify_frame_parameters): Use alist in reverse order.
Richard M. Stallman <rms@gnu.org>
parents:
16536
diff
changeset
|
2204 } |
cc6d85f9df0f
(Fmodify_frame_parameters): Use alist in reverse order.
Richard M. Stallman <rms@gnu.org>
parents:
16536
diff
changeset
|
2205 |
cc6d85f9df0f
(Fmodify_frame_parameters): Use alist in reverse order.
Richard M. Stallman <rms@gnu.org>
parents:
16536
diff
changeset
|
2206 /* Now process them in reverse of specified order. */ |
cc6d85f9df0f
(Fmodify_frame_parameters): Use alist in reverse order.
Richard M. Stallman <rms@gnu.org>
parents:
16536
diff
changeset
|
2207 for (i--; i >= 0; i--) |
cc6d85f9df0f
(Fmodify_frame_parameters): Use alist in reverse order.
Richard M. Stallman <rms@gnu.org>
parents:
16536
diff
changeset
|
2208 { |
cc6d85f9df0f
(Fmodify_frame_parameters): Use alist in reverse order.
Richard M. Stallman <rms@gnu.org>
parents:
16536
diff
changeset
|
2209 prop = parms[i]; |
cc6d85f9df0f
(Fmodify_frame_parameters): Use alist in reverse order.
Richard M. Stallman <rms@gnu.org>
parents:
16536
diff
changeset
|
2210 val = values[i]; |
cc6d85f9df0f
(Fmodify_frame_parameters): Use alist in reverse order.
Richard M. Stallman <rms@gnu.org>
parents:
16536
diff
changeset
|
2211 store_frame_param (f, prop, val); |
cc6d85f9df0f
(Fmodify_frame_parameters): Use alist in reverse order.
Richard M. Stallman <rms@gnu.org>
parents:
16536
diff
changeset
|
2212 } |
cc6d85f9df0f
(Fmodify_frame_parameters): Use alist in reverse order.
Richard M. Stallman <rms@gnu.org>
parents:
16536
diff
changeset
|
2213 } |
286 | 2214 |
33509
a7d245e080d1
(syms_of_frame_1): Removed; code moved to syms_of_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
33005
diff
changeset
|
2215 return unbind_to (count, Qnil); |
286 | 2216 } |
2217 | |
2068
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
2218 DEFUN ("frame-char-height", Fframe_char_height, Sframe_char_height, |
40105
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
2219 0, 1, 0, |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
2220 doc: /* Height in pixels of a line in the font in frame FRAME. |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
2221 If FRAME is omitted, the selected frame is used. |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
2222 For a terminal frame, the value is always 1. */) |
2068
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
2223 (frame) |
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
2224 Lisp_Object frame; |
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
2225 { |
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
2226 struct frame *f; |
286 | 2227 |
2068
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
2228 if (NILP (frame)) |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
2229 frame = selected_frame; |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
2230 CHECK_FRAME (frame); |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
2231 f = XFRAME (frame); |
777 | 2232 |
13412
1ed740e9aa64
[HAVE_NTGUI]: Test for a Win32 frame in procedures that test for an X frame.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13396
diff
changeset
|
2233 #ifdef HAVE_WINDOW_SYSTEM |
1ed740e9aa64
[HAVE_NTGUI]: Test for a Win32 frame in procedures that test for an X frame.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13396
diff
changeset
|
2234 if (FRAME_WINDOW_P (f)) |
2068
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
2235 return make_number (x_char_height (f)); |
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
2236 else |
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
2237 #endif |
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
2238 return make_number (1); |
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
2239 } |
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
2240 |
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
2241 |
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
2242 DEFUN ("frame-char-width", Fframe_char_width, Sframe_char_width, |
40105
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
2243 0, 1, 0, |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
2244 doc: /* Width in pixels of characters in the font in frame FRAME. |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
2245 If FRAME is omitted, the selected frame is used. |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
2246 The width is the same for all characters, because |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
2247 currently Emacs supports only fixed-width fonts. |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
2248 For a terminal screen, the value is always 1. */) |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
2249 (frame) |
765 | 2250 Lisp_Object frame; |
286 | 2251 { |
2068
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
2252 struct frame *f; |
286 | 2253 |
2068
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
2254 if (NILP (frame)) |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
2255 frame = selected_frame; |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
2256 CHECK_FRAME (frame); |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
2257 f = XFRAME (frame); |
2068
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
2258 |
13412
1ed740e9aa64
[HAVE_NTGUI]: Test for a Win32 frame in procedures that test for an X frame.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13396
diff
changeset
|
2259 #ifdef HAVE_WINDOW_SYSTEM |
1ed740e9aa64
[HAVE_NTGUI]: Test for a Win32 frame in procedures that test for an X frame.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13396
diff
changeset
|
2260 if (FRAME_WINDOW_P (f)) |
2068
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
2261 return make_number (x_char_width (f)); |
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
2262 else |
777 | 2263 #endif |
2068
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
2264 return make_number (1); |
286 | 2265 } |
2266 | |
2068
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
2267 DEFUN ("frame-pixel-height", Fframe_pixel_height, |
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
2268 Sframe_pixel_height, 0, 1, 0, |
40105
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
2269 doc: /* Return a FRAME's height in pixels. |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
2270 This counts only the height available for text lines, |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
2271 not menu bars on window-system Emacs frames. |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
2272 For a terminal frame, the result really gives the height in characters. |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
2273 If FRAME is omitted, the selected frame is used. */) |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
2274 (frame) |
2068
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
2275 Lisp_Object frame; |
286 | 2276 { |
2068
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
2277 struct frame *f; |
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
2278 |
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
2279 if (NILP (frame)) |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
2280 frame = selected_frame; |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
2281 CHECK_FRAME (frame); |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
2282 f = XFRAME (frame); |
2068
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
2283 |
13412
1ed740e9aa64
[HAVE_NTGUI]: Test for a Win32 frame in procedures that test for an X frame.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13396
diff
changeset
|
2284 #ifdef HAVE_WINDOW_SYSTEM |
1ed740e9aa64
[HAVE_NTGUI]: Test for a Win32 frame in procedures that test for an X frame.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13396
diff
changeset
|
2285 if (FRAME_WINDOW_P (f)) |
2068
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
2286 return make_number (x_pixel_height (f)); |
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
2287 else |
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
2288 #endif |
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
2289 return make_number (FRAME_HEIGHT (f)); |
286 | 2290 } |
2068
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
2291 |
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
2292 DEFUN ("frame-pixel-width", Fframe_pixel_width, |
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
2293 Sframe_pixel_width, 0, 1, 0, |
40105
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
2294 doc: /* Return FRAME's width in pixels. |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
2295 For a terminal frame, the result really gives the width in characters. |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
2296 If FRAME is omitted, the selected frame is used. */) |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
2297 (frame) |
2068
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
2298 Lisp_Object frame; |
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
2299 { |
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
2300 struct frame *f; |
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
2301 |
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
2302 if (NILP (frame)) |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
2303 frame = selected_frame; |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
2304 CHECK_FRAME (frame); |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
2305 f = XFRAME (frame); |
2068
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
2306 |
13412
1ed740e9aa64
[HAVE_NTGUI]: Test for a Win32 frame in procedures that test for an X frame.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13396
diff
changeset
|
2307 #ifdef HAVE_WINDOW_SYSTEM |
1ed740e9aa64
[HAVE_NTGUI]: Test for a Win32 frame in procedures that test for an X frame.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13396
diff
changeset
|
2308 if (FRAME_WINDOW_P (f)) |
2068
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
2309 return make_number (x_pixel_width (f)); |
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
2310 else |
777 | 2311 #endif |
2068
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
2312 return make_number (FRAME_WIDTH (f)); |
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
2313 } |
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
2314 |
765 | 2315 DEFUN ("set-frame-height", Fset_frame_height, Sset_frame_height, 2, 3, 0, |
40105
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
2316 doc: /* Specify that the frame FRAME has LINES lines. |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
2317 Optional third arg non-nil means that redisplay should use LINES lines |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
2318 but that the idea of the actual height of the frame should not be changed. */) |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
2319 (frame, lines, pretend) |
14077
a6d3ce4a2f8e
(Fhandle_switch_frame, Fset_frame_height): Harmonize arguments with
Erik Naggum <erik@naggum.no>
parents:
13748
diff
changeset
|
2320 Lisp_Object frame, lines, pretend; |
286 | 2321 { |
765 | 2322 register struct frame *f; |
286 | 2323 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
2324 CHECK_NUMBER (lines); |
765 | 2325 if (NILP (frame)) |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
2326 frame = selected_frame; |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
2327 CHECK_LIVE_FRAME (frame); |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
2328 f = XFRAME (frame); |
286 | 2329 |
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1809
diff
changeset
|
2330 /* I think this should be done with a hook. */ |
13412
1ed740e9aa64
[HAVE_NTGUI]: Test for a Win32 frame in procedures that test for an X frame.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13396
diff
changeset
|
2331 #ifdef HAVE_WINDOW_SYSTEM |
1ed740e9aa64
[HAVE_NTGUI]: Test for a Win32 frame in procedures that test for an X frame.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13396
diff
changeset
|
2332 if (FRAME_WINDOW_P (f)) |
286 | 2333 { |
14077
a6d3ce4a2f8e
(Fhandle_switch_frame, Fset_frame_height): Harmonize arguments with
Erik Naggum <erik@naggum.no>
parents:
13748
diff
changeset
|
2334 if (XINT (lines) != f->height) |
a6d3ce4a2f8e
(Fhandle_switch_frame, Fset_frame_height): Harmonize arguments with
Erik Naggum <erik@naggum.no>
parents:
13748
diff
changeset
|
2335 x_set_window_size (f, 1, f->width, XINT (lines)); |
25350
f964a1e5b29c
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25209
diff
changeset
|
2336 do_pending_window_change (0); |
286 | 2337 } |
2338 else | |
965
0eb68c6c452a
* frame.c (Qheight, Qicon, Qmodeline, Qname, Qnone, Qonly,
Jim Blandy <jimb@redhat.com>
parents:
886
diff
changeset
|
2339 #endif |
25350
f964a1e5b29c
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25209
diff
changeset
|
2340 change_frame_size (f, XINT (lines), 0, !NILP (pretend), 0, 0); |
286 | 2341 return Qnil; |
2342 } | |
2343 | |
765 | 2344 DEFUN ("set-frame-width", Fset_frame_width, Sset_frame_width, 2, 3, 0, |
40105
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
2345 doc: /* Specify that the frame FRAME has COLS columns. |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
2346 Optional third arg non-nil means that redisplay should use COLS columns |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
2347 but that the idea of the actual width of the frame should not be changed. */) |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
2348 (frame, cols, pretend) |
965
0eb68c6c452a
* frame.c (Qheight, Qicon, Qmodeline, Qname, Qnone, Qonly,
Jim Blandy <jimb@redhat.com>
parents:
886
diff
changeset
|
2349 Lisp_Object frame, cols, pretend; |
286 | 2350 { |
765 | 2351 register struct frame *f; |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
2352 CHECK_NUMBER (cols); |
765 | 2353 if (NILP (frame)) |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
2354 frame = selected_frame; |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
2355 CHECK_LIVE_FRAME (frame); |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
2356 f = XFRAME (frame); |
286 | 2357 |
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1809
diff
changeset
|
2358 /* I think this should be done with a hook. */ |
13412
1ed740e9aa64
[HAVE_NTGUI]: Test for a Win32 frame in procedures that test for an X frame.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13396
diff
changeset
|
2359 #ifdef HAVE_WINDOW_SYSTEM |
1ed740e9aa64
[HAVE_NTGUI]: Test for a Win32 frame in procedures that test for an X frame.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13396
diff
changeset
|
2360 if (FRAME_WINDOW_P (f)) |
286 | 2361 { |
765 | 2362 if (XINT (cols) != f->width) |
5925
806e876cacb4
(Fset_frame_height, Fset_frame_width, Fset_frame_size):
Richard M. Stallman <rms@gnu.org>
parents:
5552
diff
changeset
|
2363 x_set_window_size (f, 1, XINT (cols), f->height); |
25350
f964a1e5b29c
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25209
diff
changeset
|
2364 do_pending_window_change (0); |
286 | 2365 } |
2366 else | |
965
0eb68c6c452a
* frame.c (Qheight, Qicon, Qmodeline, Qname, Qnone, Qonly,
Jim Blandy <jimb@redhat.com>
parents:
886
diff
changeset
|
2367 #endif |
25350
f964a1e5b29c
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25209
diff
changeset
|
2368 change_frame_size (f, 0, XINT (cols), !NILP (pretend), 0, 0); |
286 | 2369 return Qnil; |
2370 } | |
2371 | |
765 | 2372 DEFUN ("set-frame-size", Fset_frame_size, Sset_frame_size, 3, 3, 0, |
40105
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
2373 doc: /* Sets size of FRAME to COLS by ROWS, measured in characters. */) |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
2374 (frame, cols, rows) |
765 | 2375 Lisp_Object frame, cols, rows; |
286 | 2376 { |
765 | 2377 register struct frame *f; |
286 | 2378 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
2379 CHECK_LIVE_FRAME (frame); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
2380 CHECK_NUMBER (cols); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
2381 CHECK_NUMBER (rows); |
765 | 2382 f = XFRAME (frame); |
286 | 2383 |
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1809
diff
changeset
|
2384 /* I think this should be done with a hook. */ |
13412
1ed740e9aa64
[HAVE_NTGUI]: Test for a Win32 frame in procedures that test for an X frame.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13396
diff
changeset
|
2385 #ifdef HAVE_WINDOW_SYSTEM |
1ed740e9aa64
[HAVE_NTGUI]: Test for a Win32 frame in procedures that test for an X frame.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13396
diff
changeset
|
2386 if (FRAME_WINDOW_P (f)) |
286 | 2387 { |
14966
a8d71d222bb7
(Fset_frame_size): Do call Fset_frame_size
Richard M. Stallman <rms@gnu.org>
parents:
14303
diff
changeset
|
2388 if (XINT (rows) != f->height || XINT (cols) != f->width |
a8d71d222bb7
(Fset_frame_size): Do call Fset_frame_size
Richard M. Stallman <rms@gnu.org>
parents:
14303
diff
changeset
|
2389 || FRAME_NEW_HEIGHT (f) || FRAME_NEW_WIDTH (f)) |
5925
806e876cacb4
(Fset_frame_height, Fset_frame_width, Fset_frame_size):
Richard M. Stallman <rms@gnu.org>
parents:
5552
diff
changeset
|
2390 x_set_window_size (f, 1, XINT (cols), XINT (rows)); |
25350
f964a1e5b29c
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25209
diff
changeset
|
2391 do_pending_window_change (0); |
286 | 2392 } |
2393 else | |
965
0eb68c6c452a
* frame.c (Qheight, Qicon, Qmodeline, Qname, Qnone, Qonly,
Jim Blandy <jimb@redhat.com>
parents:
886
diff
changeset
|
2394 #endif |
25350
f964a1e5b29c
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25209
diff
changeset
|
2395 change_frame_size (f, XINT (rows), XINT (cols), 0, 0, 0); |
286 | 2396 |
2397 return Qnil; | |
2398 } | |
2399 | |
765 | 2400 DEFUN ("set-frame-position", Fset_frame_position, |
2401 Sset_frame_position, 3, 3, 0, | |
40105
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
2402 doc: /* Sets position of FRAME in pixels to XOFFSET by YOFFSET. |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
2403 This is actually the position of the upper left corner of the frame. |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
2404 Negative values for XOFFSET or YOFFSET are interpreted relative to |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
2405 the rightmost or bottommost possible position (that stays within the screen). */) |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
2406 (frame, xoffset, yoffset) |
765 | 2407 Lisp_Object frame, xoffset, yoffset; |
286 | 2408 { |
765 | 2409 register struct frame *f; |
286 | 2410 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
2411 CHECK_LIVE_FRAME (frame); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
2412 CHECK_NUMBER (xoffset); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
2413 CHECK_NUMBER (yoffset); |
765 | 2414 f = XFRAME (frame); |
286 | 2415 |
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1809
diff
changeset
|
2416 /* I think this should be done with a hook. */ |
13412
1ed740e9aa64
[HAVE_NTGUI]: Test for a Win32 frame in procedures that test for an X frame.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13396
diff
changeset
|
2417 #ifdef HAVE_WINDOW_SYSTEM |
1ed740e9aa64
[HAVE_NTGUI]: Test for a Win32 frame in procedures that test for an X frame.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13396
diff
changeset
|
2418 if (FRAME_WINDOW_P (f)) |
6921
50060d486c47
(Fset_frame_position): Pass new arg to x_set_offset.
Richard M. Stallman <rms@gnu.org>
parents:
6854
diff
changeset
|
2419 x_set_offset (f, XINT (xoffset), XINT (yoffset), 1); |
965
0eb68c6c452a
* frame.c (Qheight, Qicon, Qmodeline, Qname, Qnone, Qonly,
Jim Blandy <jimb@redhat.com>
parents:
886
diff
changeset
|
2420 #endif |
286 | 2421 |
2422 return Qt; | |
2423 } | |
777 | 2424 |
286 | 2425 |
21514 | 2426 void |
765 | 2427 syms_of_frame () |
286 | 2428 { |
33509
a7d245e080d1
(syms_of_frame_1): Removed; code moved to syms_of_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
33005
diff
changeset
|
2429 Qframep = intern ("framep"); |
a7d245e080d1
(syms_of_frame_1): Removed; code moved to syms_of_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
33005
diff
changeset
|
2430 staticpro (&Qframep); |
a7d245e080d1
(syms_of_frame_1): Removed; code moved to syms_of_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
33005
diff
changeset
|
2431 Qframe_live_p = intern ("frame-live-p"); |
a7d245e080d1
(syms_of_frame_1): Removed; code moved to syms_of_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
33005
diff
changeset
|
2432 staticpro (&Qframe_live_p); |
a7d245e080d1
(syms_of_frame_1): Removed; code moved to syms_of_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
33005
diff
changeset
|
2433 Qheight = intern ("height"); |
a7d245e080d1
(syms_of_frame_1): Removed; code moved to syms_of_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
33005
diff
changeset
|
2434 staticpro (&Qheight); |
a7d245e080d1
(syms_of_frame_1): Removed; code moved to syms_of_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
33005
diff
changeset
|
2435 Qicon = intern ("icon"); |
a7d245e080d1
(syms_of_frame_1): Removed; code moved to syms_of_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
33005
diff
changeset
|
2436 staticpro (&Qicon); |
a7d245e080d1
(syms_of_frame_1): Removed; code moved to syms_of_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
33005
diff
changeset
|
2437 Qminibuffer = intern ("minibuffer"); |
a7d245e080d1
(syms_of_frame_1): Removed; code moved to syms_of_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
33005
diff
changeset
|
2438 staticpro (&Qminibuffer); |
a7d245e080d1
(syms_of_frame_1): Removed; code moved to syms_of_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
33005
diff
changeset
|
2439 Qmodeline = intern ("modeline"); |
a7d245e080d1
(syms_of_frame_1): Removed; code moved to syms_of_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
33005
diff
changeset
|
2440 staticpro (&Qmodeline); |
a7d245e080d1
(syms_of_frame_1): Removed; code moved to syms_of_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
33005
diff
changeset
|
2441 Qname = intern ("name"); |
a7d245e080d1
(syms_of_frame_1): Removed; code moved to syms_of_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
33005
diff
changeset
|
2442 staticpro (&Qname); |
a7d245e080d1
(syms_of_frame_1): Removed; code moved to syms_of_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
33005
diff
changeset
|
2443 Qonly = intern ("only"); |
a7d245e080d1
(syms_of_frame_1): Removed; code moved to syms_of_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
33005
diff
changeset
|
2444 staticpro (&Qonly); |
a7d245e080d1
(syms_of_frame_1): Removed; code moved to syms_of_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
33005
diff
changeset
|
2445 Qunsplittable = intern ("unsplittable"); |
a7d245e080d1
(syms_of_frame_1): Removed; code moved to syms_of_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
33005
diff
changeset
|
2446 staticpro (&Qunsplittable); |
a7d245e080d1
(syms_of_frame_1): Removed; code moved to syms_of_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
33005
diff
changeset
|
2447 Qmenu_bar_lines = intern ("menu-bar-lines"); |
a7d245e080d1
(syms_of_frame_1): Removed; code moved to syms_of_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
33005
diff
changeset
|
2448 staticpro (&Qmenu_bar_lines); |
a7d245e080d1
(syms_of_frame_1): Removed; code moved to syms_of_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
33005
diff
changeset
|
2449 Qtool_bar_lines = intern ("tool-bar-lines"); |
a7d245e080d1
(syms_of_frame_1): Removed; code moved to syms_of_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
33005
diff
changeset
|
2450 staticpro (&Qtool_bar_lines); |
a7d245e080d1
(syms_of_frame_1): Removed; code moved to syms_of_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
33005
diff
changeset
|
2451 Qwidth = intern ("width"); |
a7d245e080d1
(syms_of_frame_1): Removed; code moved to syms_of_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
33005
diff
changeset
|
2452 staticpro (&Qwidth); |
a7d245e080d1
(syms_of_frame_1): Removed; code moved to syms_of_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
33005
diff
changeset
|
2453 Qx = intern ("x"); |
a7d245e080d1
(syms_of_frame_1): Removed; code moved to syms_of_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
33005
diff
changeset
|
2454 staticpro (&Qx); |
a7d245e080d1
(syms_of_frame_1): Removed; code moved to syms_of_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
33005
diff
changeset
|
2455 Qw32 = intern ("w32"); |
a7d245e080d1
(syms_of_frame_1): Removed; code moved to syms_of_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
33005
diff
changeset
|
2456 staticpro (&Qw32); |
a7d245e080d1
(syms_of_frame_1): Removed; code moved to syms_of_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
33005
diff
changeset
|
2457 Qpc = intern ("pc"); |
a7d245e080d1
(syms_of_frame_1): Removed; code moved to syms_of_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
33005
diff
changeset
|
2458 staticpro (&Qpc); |
a7d245e080d1
(syms_of_frame_1): Removed; code moved to syms_of_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
33005
diff
changeset
|
2459 Qmac = intern ("mac"); |
a7d245e080d1
(syms_of_frame_1): Removed; code moved to syms_of_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
33005
diff
changeset
|
2460 staticpro (&Qmac); |
a7d245e080d1
(syms_of_frame_1): Removed; code moved to syms_of_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
33005
diff
changeset
|
2461 Qvisible = intern ("visible"); |
a7d245e080d1
(syms_of_frame_1): Removed; code moved to syms_of_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
33005
diff
changeset
|
2462 staticpro (&Qvisible); |
a7d245e080d1
(syms_of_frame_1): Removed; code moved to syms_of_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
33005
diff
changeset
|
2463 Qbuffer_predicate = intern ("buffer-predicate"); |
a7d245e080d1
(syms_of_frame_1): Removed; code moved to syms_of_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
33005
diff
changeset
|
2464 staticpro (&Qbuffer_predicate); |
a7d245e080d1
(syms_of_frame_1): Removed; code moved to syms_of_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
33005
diff
changeset
|
2465 Qbuffer_list = intern ("buffer-list"); |
a7d245e080d1
(syms_of_frame_1): Removed; code moved to syms_of_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
33005
diff
changeset
|
2466 staticpro (&Qbuffer_list); |
a7d245e080d1
(syms_of_frame_1): Removed; code moved to syms_of_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
33005
diff
changeset
|
2467 Qtitle = intern ("title"); |
a7d245e080d1
(syms_of_frame_1): Removed; code moved to syms_of_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
33005
diff
changeset
|
2468 staticpro (&Qtitle); |
a7d245e080d1
(syms_of_frame_1): Removed; code moved to syms_of_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
33005
diff
changeset
|
2469 Qdisplay_type = intern ("display-type"); |
a7d245e080d1
(syms_of_frame_1): Removed; code moved to syms_of_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
33005
diff
changeset
|
2470 staticpro (&Qdisplay_type); |
a7d245e080d1
(syms_of_frame_1): Removed; code moved to syms_of_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
33005
diff
changeset
|
2471 Qbackground_mode = intern ("background-mode"); |
a7d245e080d1
(syms_of_frame_1): Removed; code moved to syms_of_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
33005
diff
changeset
|
2472 staticpro (&Qbackground_mode); |
41718
0ef9924a634f
(Qleft_fringe, Qright_fringe): New vars.
Kim F. Storm <storm@cua.dk>
parents:
41263
diff
changeset
|
2473 Qleft_fringe = intern ("left-fringe"); |
0ef9924a634f
(Qleft_fringe, Qright_fringe): New vars.
Kim F. Storm <storm@cua.dk>
parents:
41263
diff
changeset
|
2474 staticpro (&Qleft_fringe); |
0ef9924a634f
(Qleft_fringe, Qright_fringe): New vars.
Kim F. Storm <storm@cua.dk>
parents:
41263
diff
changeset
|
2475 Qright_fringe = intern ("right-fringe"); |
0ef9924a634f
(Qleft_fringe, Qright_fringe): New vars.
Kim F. Storm <storm@cua.dk>
parents:
41263
diff
changeset
|
2476 staticpro (&Qright_fringe); |
286 | 2477 |
33509
a7d245e080d1
(syms_of_frame_1): Removed; code moved to syms_of_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
33005
diff
changeset
|
2478 DEFVAR_LISP ("default-frame-alist", &Vdefault_frame_alist, |
40105
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
2479 doc: /* Alist of default values for frame creation. |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
2480 These may be set in your init file, like this: |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
2481 (setq default-frame-alist '((width . 80) (height . 55) (menu-bar-lines . 1)) |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
2482 These override values given in window system configuration data, |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
2483 including X Windows' defaults database. |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
2484 For values specific to the first Emacs frame, see `initial-frame-alist'. |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
2485 For values specific to the separate minibuffer frame, see |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
2486 `minibuffer-frame-alist'. |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
2487 The `menu-bar-lines' element of the list controls whether new frames |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
2488 have menu bars; `menu-bar-mode' works by altering this element. */); |
33509
a7d245e080d1
(syms_of_frame_1): Removed; code moved to syms_of_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
33005
diff
changeset
|
2489 Vdefault_frame_alist = Qnil; |
a7d245e080d1
(syms_of_frame_1): Removed; code moved to syms_of_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
33005
diff
changeset
|
2490 |
a7d245e080d1
(syms_of_frame_1): Removed; code moved to syms_of_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
33005
diff
changeset
|
2491 Qinhibit_default_face_x_resources |
a7d245e080d1
(syms_of_frame_1): Removed; code moved to syms_of_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
33005
diff
changeset
|
2492 = intern ("inhibit-default-face-x-resources"); |
a7d245e080d1
(syms_of_frame_1): Removed; code moved to syms_of_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
33005
diff
changeset
|
2493 staticpro (&Qinhibit_default_face_x_resources); |
286 | 2494 |
765 | 2495 DEFVAR_LISP ("terminal-frame", &Vterminal_frame, |
40105
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
2496 doc: /* The initial frame-object, which represents Emacs's stdout. */); |
286 | 2497 |
2498 DEFVAR_LISP ("emacs-iconified", &Vemacs_iconified, | |
40105
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
2499 doc: /* Non-nil if all of emacs is iconified and frame updates are not needed. */); |
286 | 2500 Vemacs_iconified = Qnil; |
2501 | |
27795
83292274bbd4
(Vmouse_position_function): New variable.
Dave Love <fx@gnu.org>
parents:
27725
diff
changeset
|
2502 DEFVAR_LISP ("mouse-position-function", &Vmouse_position_function, |
40105
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
2503 doc: /* If non-nil, function to transform normal value of `mouse-position'. |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
2504 `mouse-position' calls this function, passing its usual return value as |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
2505 argument, and returns whatever this function returns. |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
2506 This abnormal hook exists for the benefit of packages like `xt-mouse.el' |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
2507 which need to do mouse handling at the Lisp level. */); |
27795
83292274bbd4
(Vmouse_position_function): New variable.
Dave Love <fx@gnu.org>
parents:
27725
diff
changeset
|
2508 Vmouse_position_function = Qnil; |
83292274bbd4
(Vmouse_position_function): New variable.
Dave Love <fx@gnu.org>
parents:
27725
diff
changeset
|
2509 |
11779
6234b3610a6f
Vdefault_minibuffer_frame is now part of KBOARD instead
Karl Heuer <kwzh@gnu.org>
parents:
11775
diff
changeset
|
2510 DEFVAR_KBOARD ("default-minibuffer-frame", Vdefault_minibuffer_frame, |
40105
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
2511 doc: /* Minibufferless frames use this frame's minibuffer. |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
2512 |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
2513 Emacs cannot create minibufferless frames unless this is set to an |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
2514 appropriate surrogate. |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
2515 |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
2516 Emacs consults this variable only when creating minibufferless |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
2517 frames; once the frame is created, it sticks with its assigned |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
2518 minibuffer, no matter what this variable is set to. This means that |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
2519 this variable doesn't necessarily say anything meaningful about the |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
2520 current set of frames, or where the minibuffer is currently being |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
2521 displayed. |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
2522 |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
2523 This variable is local to the current terminal and cannot be buffer-local. */); |
286 | 2524 |
33509
a7d245e080d1
(syms_of_frame_1): Removed; code moved to syms_of_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
33005
diff
changeset
|
2525 staticpro (&Vframe_list); |
a7d245e080d1
(syms_of_frame_1): Removed; code moved to syms_of_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
33005
diff
changeset
|
2526 |
11169
d0550c056e5b
[MULTI_FRAME] (Factive_minibuffer_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11126
diff
changeset
|
2527 defsubr (&Sactive_minibuffer_window); |
765 | 2528 defsubr (&Sframep); |
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1809
diff
changeset
|
2529 defsubr (&Sframe_live_p); |
10768
938451cf1b10
(Fmake_terminal_frame): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10676
diff
changeset
|
2530 defsubr (&Smake_terminal_frame); |
2298
872a3a2c3fed
* frame.c (Fhandle_switch_frame): Renamed from Fselect_frame.
Jim Blandy <jimb@redhat.com>
parents:
2282
diff
changeset
|
2531 defsubr (&Shandle_switch_frame); |
12283
fd9043d15414
[MULTI_FRAME] (Fignore_event): New function.
Karl Heuer <kwzh@gnu.org>
parents:
12255
diff
changeset
|
2532 defsubr (&Signore_event); |
765 | 2533 defsubr (&Sselect_frame); |
2534 defsubr (&Sselected_frame); | |
2535 defsubr (&Swindow_frame); | |
2536 defsubr (&Sframe_root_window); | |
7570
20cbb114367b
(syms_of_frame): Set up frame-first-window as Lisp fn.
Richard M. Stallman <rms@gnu.org>
parents:
7307
diff
changeset
|
2537 defsubr (&Sframe_first_window); |
765 | 2538 defsubr (&Sframe_selected_window); |
7055
5e4906d964b8
(Fset_frame_selected_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7025
diff
changeset
|
2539 defsubr (&Sset_frame_selected_window); |
765 | 2540 defsubr (&Sframe_list); |
2541 defsubr (&Snext_frame); | |
4424
027d3affb2f8
(Fprevious_frame): New function, for parity with Fnext_frame.
Roland McGrath <roland@gnu.org>
parents:
4412
diff
changeset
|
2542 defsubr (&Sprevious_frame); |
765 | 2543 defsubr (&Sdelete_frame); |
454 | 2544 defsubr (&Smouse_position); |
7025
24e759919770
(Fmouse_pixel_position, Fset_mouse_pixel_position): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
6986
diff
changeset
|
2545 defsubr (&Smouse_pixel_position); |
286 | 2546 defsubr (&Sset_mouse_position); |
7025
24e759919770
(Fmouse_pixel_position, Fset_mouse_pixel_position): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
6986
diff
changeset
|
2547 defsubr (&Sset_mouse_pixel_position); |
286 | 2548 #if 0 |
765 | 2549 defsubr (&Sframe_configuration); |
2550 defsubr (&Srestore_frame_configuration); | |
286 | 2551 #endif |
765 | 2552 defsubr (&Smake_frame_visible); |
2553 defsubr (&Smake_frame_invisible); | |
2554 defsubr (&Siconify_frame); | |
2555 defsubr (&Sframe_visible_p); | |
2556 defsubr (&Svisible_frame_list); | |
2282
f727944c11aa
* frame.c (Fraise_frame, Flower_frame): Renamed from
Jim Blandy <jimb@redhat.com>
parents:
2207
diff
changeset
|
2557 defsubr (&Sraise_frame); |
f727944c11aa
* frame.c (Fraise_frame, Flower_frame): Renamed from
Jim Blandy <jimb@redhat.com>
parents:
2207
diff
changeset
|
2558 defsubr (&Slower_frame); |
765 | 2559 defsubr (&Sredirect_frame_focus); |
2560 defsubr (&Sframe_focus); | |
2561 defsubr (&Sframe_parameters); | |
31399
db831ffcd565
(Qdisplay_type): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31102
diff
changeset
|
2562 defsubr (&Sframe_parameter); |
765 | 2563 defsubr (&Smodify_frame_parameters); |
2068
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
2564 defsubr (&Sframe_char_height); |
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
2565 defsubr (&Sframe_char_width); |
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
2566 defsubr (&Sframe_pixel_height); |
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
2567 defsubr (&Sframe_pixel_width); |
765 | 2568 defsubr (&Sset_frame_height); |
2569 defsubr (&Sset_frame_width); | |
2570 defsubr (&Sset_frame_size); | |
2571 defsubr (&Sset_frame_position); | |
286 | 2572 } |