Mercurial > emacs
annotate src/frame.c @ 90428:a8190f7e546e
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 285-296)
- Update from CVS
- Merge from gnus--rel--5.10
- Update from CVS: admin/FOR-RELEASE: Update refcard section.
* gnus--rel--5.10 (patch 102-104)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-64
author | Miles Bader <miles@gnu.org> |
---|---|
date | Wed, 07 Jun 2006 18:05:10 +0000 |
parents | 6dcadac04bea 756f8d98d484 |
children | 9430e7e49983 |
rev | line source |
---|---|
765 | 1 /* Generic frame functions. |
90386
2ecafc6d5db7
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-58
Miles Bader <miles@gnu.org>
diff
changeset
|
2 Copyright (C) 1993, 1994, 1995, 1997, 1999, 2000, 2001, 2002, 2003, 2006, |
68651
3bd95f4f2941
Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
68395
diff
changeset
|
3 2004, 2005, 2006 Free Software Foundation, Inc. |
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 | |
64084 | 19 the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
20 Boston, MA 02110-1301, 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" |
88351
aac41b50c875
Include "character.h" instead of "charset.h".
Kenichi Handa <handa@m17n.org>
parents:
43442
diff
changeset
|
26 #include "character.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 |
44890
01b93e5e53a7
Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents:
43717
diff
changeset
|
33 #ifdef MAC_OS |
32752
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 |
50357 | 44 #include "blockinput.h" |
5392
d8d5844c3ba6
Always include termhooks.h.
Richard M. Stallman <rms@gnu.org>
parents:
5231
diff
changeset
|
45 #include "termhooks.h" |
21514 | 46 #include "dispextern.h" |
7162
06a13bf36a8c
(Fframe_parameters) [!MULTI_FRAME]: Unstub it again.
Karl Heuer <kwzh@gnu.org>
parents:
7134
diff
changeset
|
47 #include "window.h" |
9572 | 48 #ifdef MSDOS |
49 #include "msdos.h" | |
25117
f6f34f0bc1af
(make_terminal_frame) [MSDOS]: Don't call
Eli Zaretskii <eliz@gnu.org>
parents:
25030
diff
changeset
|
50 #include "dosfns.h" |
9572 | 51 #endif |
732 | 52 |
50357 | 53 |
50373
6defa3317421
Fix compilation for --with-x=no.
Kim F. Storm <storm@cua.dk>
parents:
50357
diff
changeset
|
54 #ifdef HAVE_WINDOW_SYSTEM |
6defa3317421
Fix compilation for --with-x=no.
Kim F. Storm <storm@cua.dk>
parents:
50357
diff
changeset
|
55 |
90412 | 56 #ifdef USE_FONT_BACKEND |
57 #include "font.h" | |
58 #endif /* USE_FONT_BACKEND */ | |
59 | |
50357 | 60 /* The name we're using in resource queries. Most often "emacs". */ |
61 | |
62 Lisp_Object Vx_resource_name; | |
63 | |
64 /* The application class we're using in resource queries. | |
65 Normally "Emacs". */ | |
66 | |
67 Lisp_Object Vx_resource_class; | |
68 | |
50373
6defa3317421
Fix compilation for --with-x=no.
Kim F. Storm <storm@cua.dk>
parents:
50357
diff
changeset
|
69 #endif |
50357 | 70 |
71 Lisp_Object Qframep, Qframe_live_p; | |
72 Lisp_Object Qicon, Qmodeline; | |
965
0eb68c6c452a
* frame.c (Qheight, Qicon, Qmodeline, Qname, Qnone, Qonly,
Jim Blandy <jimb@redhat.com>
parents:
886
diff
changeset
|
73 Lisp_Object Qonly; |
50357 | 74 Lisp_Object Qx, Qw32, Qmac, Qpc; |
6246
128dc040e121
(next_frame, prev_frame): If MINIBUF is `visible',
Richard M. Stallman <rms@gnu.org>
parents:
6157
diff
changeset
|
75 Lisp_Object Qvisible; |
31399
db831ffcd565
(Qdisplay_type): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31102
diff
changeset
|
76 Lisp_Object Qdisplay_type; |
31448
70b366918608
(Fframe_parameter): Handle `name' and `background-mode'
Gerd Moellmann <gerd@gnu.org>
parents:
31442
diff
changeset
|
77 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
|
78 Lisp_Object Qinhibit_default_face_x_resources; |
50357 | 79 |
80 Lisp_Object Qx_frame_parameter; | |
81 Lisp_Object Qx_resource_name; | |
82 | |
83 /* Frame parameters (set or reported). */ | |
84 | |
85 Lisp_Object Qauto_raise, Qauto_lower; | |
86 Lisp_Object Qborder_color, Qborder_width; | |
87 Lisp_Object Qcursor_color, Qcursor_type; | |
88 Lisp_Object Qgeometry; /* Not used */ | |
89 Lisp_Object Qheight, Qwidth; | |
90 Lisp_Object Qleft, Qright; | |
91 Lisp_Object Qicon_left, Qicon_top, Qicon_type, Qicon_name; | |
92 Lisp_Object Qinternal_border_width; | |
93 Lisp_Object Qmouse_color; | |
94 Lisp_Object Qminibuffer; | |
95 Lisp_Object Qscroll_bar_width, Qvertical_scroll_bars; | |
96 Lisp_Object Qvisibility; | |
97 Lisp_Object Qscroll_bar_foreground, Qscroll_bar_background; | |
98 Lisp_Object Qscreen_gamma; | |
99 Lisp_Object Qline_spacing; | |
100 Lisp_Object Quser_position, Quser_size; | |
101 Lisp_Object Qwait_for_wm; | |
102 Lisp_Object Qwindow_id; | |
103 #ifdef HAVE_X_WINDOWS | |
104 Lisp_Object Qouter_window_id; | |
105 #endif | |
106 Lisp_Object Qparent_id; | |
107 Lisp_Object Qtitle, Qname; | |
108 Lisp_Object Qunsplittable; | |
109 Lisp_Object Qmenu_bar_lines, Qtool_bar_lines; | |
110 Lisp_Object Qleft_fringe, Qright_fringe; | |
111 Lisp_Object Qbuffer_predicate, Qbuffer_list; | |
42743
1e6231c9c359
(store_frame_param): Call set_tty_color_mode for termcap
Eli Zaretskii <eliz@gnu.org>
parents:
41718
diff
changeset
|
112 Lisp_Object Qtty_color_mode; |
286 | 113 |
50357 | 114 Lisp_Object Qfullscreen, Qfullwidth, Qfullheight, Qfullboth; |
115 | |
116 Lisp_Object Qface_set_after_frame_default; | |
117 | |
118 | |
12761
bffb5ea6fb43
Move various Q... vars to top of file, unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
12742
diff
changeset
|
119 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
|
120 Lisp_Object Vdefault_frame_alist; |
52557
4a93216e6678
(Vdefault_frame_scroll_bars): New variable.
Kim F. Storm <storm@cua.dk>
parents:
52401
diff
changeset
|
121 Lisp_Object Vdefault_frame_scroll_bars; |
27795
83292274bbd4
(Vmouse_position_function): New variable.
Dave Love <fx@gnu.org>
parents:
27725
diff
changeset
|
122 Lisp_Object Vmouse_position_function; |
43366
512ab477b395
(Vmouse_highlight): New variable.
Kim F. Storm <storm@cua.dk>
parents:
42743
diff
changeset
|
123 Lisp_Object Vmouse_highlight; |
47731
755c4233cfba
* frame.c (Vdelete_frame_functions): New variable.
John Paul Wallington <jpw@pobox.com>
parents:
47036
diff
changeset
|
124 Lisp_Object Vdelete_frame_functions; |
12761
bffb5ea6fb43
Move various Q... vars to top of file, unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
12742
diff
changeset
|
125 |
bffb5ea6fb43
Move various Q... vars to top of file, unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
12742
diff
changeset
|
126 static void |
bffb5ea6fb43
Move various Q... vars to top of file, unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
12742
diff
changeset
|
127 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
|
128 Lisp_Object window; |
bffb5ea6fb43
Move various Q... vars to top of file, unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
12742
diff
changeset
|
129 int n; |
bffb5ea6fb43
Move various Q... vars to top of file, unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
12742
diff
changeset
|
130 { |
bffb5ea6fb43
Move various Q... vars to top of file, unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
12742
diff
changeset
|
131 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
|
132 |
13498
c10046894834
(set_menu_bar_lines): Record the fact that the window configuration changes.
Richard M. Stallman <rms@gnu.org>
parents:
13412
diff
changeset
|
133 XSETFASTINT (w->last_modified, 0); |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
134 XSETFASTINT (w->top_line, XFASTINT (w->top_line) + n); |
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
135 XSETFASTINT (w->total_lines, XFASTINT (w->total_lines) - n); |
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
136 |
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
137 if (INTEGERP (w->orig_top_line)) |
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
138 XSETFASTINT (w->orig_top_line, XFASTINT (w->orig_top_line) + n); |
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
139 if (INTEGERP (w->orig_total_lines)) |
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
140 XSETFASTINT (w->orig_total_lines, XFASTINT (w->orig_total_lines) - n); |
12761
bffb5ea6fb43
Move various Q... vars to top of file, unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
12742
diff
changeset
|
141 |
bffb5ea6fb43
Move various Q... vars to top of file, unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
12742
diff
changeset
|
142 /* 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
|
143 if (!NILP (w->vchild)) |
bffb5ea6fb43
Move various Q... vars to top of file, unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
12742
diff
changeset
|
144 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
|
145 |
bffb5ea6fb43
Move various Q... vars to top of file, unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
12742
diff
changeset
|
146 /* 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
|
147 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
|
148 { |
bffb5ea6fb43
Move various Q... vars to top of file, unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
12742
diff
changeset
|
149 w = XWINDOW (window); |
bffb5ea6fb43
Move various Q... vars to top of file, unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
12742
diff
changeset
|
150 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
|
151 } |
bffb5ea6fb43
Move various Q... vars to top of file, unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
12742
diff
changeset
|
152 } |
bffb5ea6fb43
Move various Q... vars to top of file, unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
12742
diff
changeset
|
153 |
20038
bb460edc7187
(set_menu_bar_lines): Make the function external instead
Eli Zaretskii <eliz@gnu.org>
parents:
19532
diff
changeset
|
154 void |
12761
bffb5ea6fb43
Move various Q... vars to top of file, unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
12742
diff
changeset
|
155 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
|
156 struct frame *f; |
bffb5ea6fb43
Move various Q... vars to top of file, unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
12742
diff
changeset
|
157 Lisp_Object value, oldval; |
bffb5ea6fb43
Move various Q... vars to top of file, unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
12742
diff
changeset
|
158 { |
bffb5ea6fb43
Move various Q... vars to top of file, unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
12742
diff
changeset
|
159 int nlines; |
bffb5ea6fb43
Move various Q... vars to top of file, unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
12742
diff
changeset
|
160 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
|
161 |
bffb5ea6fb43
Move various Q... vars to top of file, unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
12742
diff
changeset
|
162 /* 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
|
163 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
|
164 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
|
165 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
|
166 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
|
167 return; |
bffb5ea6fb43
Move various Q... vars to top of file, unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
12742
diff
changeset
|
168 |
bffb5ea6fb43
Move various Q... vars to top of file, unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
12742
diff
changeset
|
169 if (INTEGERP (value)) |
bffb5ea6fb43
Move various Q... vars to top of file, unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
12742
diff
changeset
|
170 nlines = XINT (value); |
bffb5ea6fb43
Move various Q... vars to top of file, unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
12742
diff
changeset
|
171 else |
bffb5ea6fb43
Move various Q... vars to top of file, unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
12742
diff
changeset
|
172 nlines = 0; |
bffb5ea6fb43
Move various Q... vars to top of file, unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
12742
diff
changeset
|
173 |
13498
c10046894834
(set_menu_bar_lines): Record the fact that the window configuration changes.
Richard M. Stallman <rms@gnu.org>
parents:
13412
diff
changeset
|
174 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
|
175 { |
c10046894834
(set_menu_bar_lines): Record the fact that the window configuration changes.
Richard M. Stallman <rms@gnu.org>
parents:
13412
diff
changeset
|
176 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
|
177 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
|
178 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
|
179 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
|
180 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
|
181 } |
12761
bffb5ea6fb43
Move various Q... vars to top of file, unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
12742
diff
changeset
|
182 } |
bffb5ea6fb43
Move various Q... vars to top of file, unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
12742
diff
changeset
|
183 |
bffb5ea6fb43
Move various Q... vars to top of file, unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
12742
diff
changeset
|
184 Lisp_Object Vemacs_iconified; |
bffb5ea6fb43
Move various Q... vars to top of file, unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
12742
diff
changeset
|
185 Lisp_Object Vframe_list; |
bffb5ea6fb43
Move various Q... vars to top of file, unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
12742
diff
changeset
|
186 |
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26164
diff
changeset
|
187 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
|
188 |
286 | 189 extern Lisp_Object Vminibuffer_list; |
190 extern Lisp_Object get_minibuffer (); | |
5172
9aa201005b16
(Fhandle_switch_frame, Fredirect_frame_focus): Declared.
Richard M. Stallman <rms@gnu.org>
parents:
5105
diff
changeset
|
191 extern Lisp_Object Fhandle_switch_frame (); |
9aa201005b16
(Fhandle_switch_frame, Fredirect_frame_focus): Declared.
Richard M. Stallman <rms@gnu.org>
parents:
5105
diff
changeset
|
192 extern Lisp_Object Fredirect_frame_focus (); |
12005 | 193 extern Lisp_Object x_get_focus_frame (); |
286 | 194 |
765 | 195 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
|
196 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
|
197 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
|
198 `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
|
199 `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
|
200 `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
|
201 `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
|
202 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
|
203 (object) |
454 | 204 Lisp_Object object; |
286 | 205 { |
9127
0b4836daa8e1
(Fframep, make_frame_without_minibuffer, do_switch_frame, prev_frame,
Karl Heuer <kwzh@gnu.org>
parents:
9032
diff
changeset
|
206 if (!FRAMEP (object)) |
286 | 207 return Qnil; |
765 | 208 switch (XFRAME (object)->output_method) |
286 | 209 { |
210 case output_termcap: | |
211 return Qt; | |
212 case output_x_window: | |
965
0eb68c6c452a
* frame.c (Qheight, Qicon, Qmodeline, Qname, Qnone, Qonly,
Jim Blandy <jimb@redhat.com>
parents:
886
diff
changeset
|
213 return Qx; |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16568
diff
changeset
|
214 case output_w32: |
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16568
diff
changeset
|
215 return Qw32; |
15391
d4cec5d7566d
(Fset_mouse_position): Remove the DOS-specific
Richard M. Stallman <rms@gnu.org>
parents:
15062
diff
changeset
|
216 case output_msdos_raw: |
d4cec5d7566d
(Fset_mouse_position): Remove the DOS-specific
Richard M. Stallman <rms@gnu.org>
parents:
15062
diff
changeset
|
217 return Qpc; |
25523
9e9eeb68482e
(Fframep) [macintosh]: Handle mac frame type.
Richard M. Stallman <rms@gnu.org>
parents:
25350
diff
changeset
|
218 case output_mac: |
9e9eeb68482e
(Fframep) [macintosh]: Handle mac frame type.
Richard M. Stallman <rms@gnu.org>
parents:
25350
diff
changeset
|
219 return Qmac; |
286 | 220 default: |
221 abort (); | |
222 } | |
223 } | |
224 | |
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1809
diff
changeset
|
225 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
|
226 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
|
227 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
|
228 frame, the return value indicates what sort of output device it is |
41239 | 229 displayed on. See the documentation of `framep' for possible |
40568 | 230 return values. */) |
40105
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
231 (object) |
454 | 232 Lisp_Object object; |
233 { | |
765 | 234 return ((FRAMEP (object) |
235 && FRAME_LIVE_P (XFRAME (object))) | |
236 ? Fframep (object) | |
454 | 237 : Qnil); |
238 } | |
239 | |
765 | 240 struct frame * |
241 make_frame (mini_p) | |
286 | 242 int mini_p; |
243 { | |
765 | 244 Lisp_Object frame; |
245 register struct frame *f; | |
286 | 246 register Lisp_Object root_window; |
247 register Lisp_Object mini_window; | |
248 | |
36433
20b42ba5a623
(make_frame): Use allocate_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
35817
diff
changeset
|
249 f = allocate_frame (); |
9972
92b33538b36a
(make_frame): Use allocate_vectorlike and VECSIZE.
Karl Heuer <kwzh@gnu.org>
parents:
9901
diff
changeset
|
250 XSETFRAME (frame, f); |
286 | 251 |
25030
c69d9e48269b
(make_frame): Set n_current_toolbar_items to 0.
Gerd Moellmann <gerd@gnu.org>
parents:
23746
diff
changeset
|
252 f->desired_matrix = 0; |
c69d9e48269b
(make_frame): Set n_current_toolbar_items to 0.
Gerd Moellmann <gerd@gnu.org>
parents:
23746
diff
changeset
|
253 f->current_matrix = 0; |
c69d9e48269b
(make_frame): Set n_current_toolbar_items to 0.
Gerd Moellmann <gerd@gnu.org>
parents:
23746
diff
changeset
|
254 f->desired_pool = 0; |
c69d9e48269b
(make_frame): Set n_current_toolbar_items to 0.
Gerd Moellmann <gerd@gnu.org>
parents:
23746
diff
changeset
|
255 f->current_pool = 0; |
c69d9e48269b
(make_frame): Set n_current_toolbar_items to 0.
Gerd Moellmann <gerd@gnu.org>
parents:
23746
diff
changeset
|
256 f->glyphs_initialized_p = 0; |
c69d9e48269b
(make_frame): Set n_current_toolbar_items to 0.
Gerd Moellmann <gerd@gnu.org>
parents:
23746
diff
changeset
|
257 f->decode_mode_spec_buffer = 0; |
765 | 258 f->visible = 0; |
1652
93497cd89204
* frame.c (make_frame): Initialize async_visible and
Jim Blandy <jimb@redhat.com>
parents:
1514
diff
changeset
|
259 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
|
260 f->output_data.nothing = 0; |
765 | 261 f->iconified = 0; |
1652
93497cd89204
* frame.c (make_frame): Initialize async_visible and
Jim Blandy <jimb@redhat.com>
parents:
1514
diff
changeset
|
262 f->async_iconified = 0; |
765 | 263 f->wants_modeline = 1; |
264 f->auto_raise = 0; | |
265 f->auto_lower = 0; | |
266 f->no_split = 0; | |
27725
fb13a4706619
(make_frame): Set frame initiallly to `garbaged'.
Gerd Moellmann <gerd@gnu.org>
parents:
27633
diff
changeset
|
267 f->garbaged = 1; |
765 | 268 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
|
269 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
|
270 f->explicit_name = 0; |
1989
b1c1ab20f810
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1920
diff
changeset
|
271 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
|
272 f->vertical_scroll_bar_type = vertical_scroll_bar_none; |
765 | 273 f->param_alist = Qnil; |
1989
b1c1ab20f810
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1920
diff
changeset
|
274 f->scroll_bars = Qnil; |
b1c1ab20f810
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1920
diff
changeset
|
275 f->condemned_scroll_bars = Qnil; |
2417
8c07933beed9
(make_frame): Init face_alist field.
Richard M. Stallman <rms@gnu.org>
parents:
2298
diff
changeset
|
276 f->face_alist = Qnil; |
25030
c69d9e48269b
(make_frame): Set n_current_toolbar_items to 0.
Gerd Moellmann <gerd@gnu.org>
parents:
23746
diff
changeset
|
277 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
|
278 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
|
279 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
|
280 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
|
281 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
|
282 f->buffer_list = Qnil; |
11017
f7c4ece024d5
(make_frame): Initialize kboard member.
Karl Heuer <kwzh@gnu.org>
parents:
10853
diff
changeset
|
283 #ifdef MULTI_KBOARD |
f7c4ece024d5
(make_frame): Initialize kboard member.
Karl Heuer <kwzh@gnu.org>
parents:
10853
diff
changeset
|
284 f->kboard = initial_kboard; |
f7c4ece024d5
(make_frame): Initialize kboard member.
Karl Heuer <kwzh@gnu.org>
parents:
10853
diff
changeset
|
285 #endif |
14303
48e3ee5005cd
(make_frame): Initialize title parameter to Qnil.
Karl Heuer <kwzh@gnu.org>
parents:
14223
diff
changeset
|
286 f->namebuf = 0; |
14223
596bb10704dd
(make_frame): Initialize frame title field to nil.
Erik Naggum <erik@naggum.no>
parents:
14217
diff
changeset
|
287 f->title = Qnil; |
25030
c69d9e48269b
(make_frame): Set n_current_toolbar_items to 0.
Gerd Moellmann <gerd@gnu.org>
parents:
23746
diff
changeset
|
288 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
|
289 f->tool_bar_window = Qnil; |
33760
22dc6e2e7410
(make_frame): Change initialization of tool bar
Gerd Moellmann <gerd@gnu.org>
parents:
33512
diff
changeset
|
290 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
|
291 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
|
292 f->n_tool_bar_items = 0; |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
293 f->left_fringe_width = f->right_fringe_width = 0; |
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
294 f->fringe_cols = 0; |
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
295 f->scroll_bar_actual_width = 0; |
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
296 f->border_width = 0; |
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
297 f->internal_border_width = 0; |
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
298 f->column_width = 1; /* !FRAME_WINDOW_P value */ |
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
299 f->line_height = 1; /* !FRAME_WINDOW_P value */ |
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
300 f->x_pixels_diff = f->y_pixels_diff = 0; |
51225
695efa86354b
* frame.c (make_frame): Condition want_fullscreen with
Jan Djärv <jan.h.d@swipnet.se>
parents:
51194
diff
changeset
|
301 #ifdef HAVE_WINDOW_SYSTEM |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
302 f->want_fullscreen = FULLSCREEN_NONE; |
51225
695efa86354b
* frame.c (make_frame): Condition want_fullscreen with
Jan Djärv <jan.h.d@swipnet.se>
parents:
51194
diff
changeset
|
303 #endif |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
304 f->size_hint_flags = 0; |
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
305 f->win_gravity = 0; |
90412 | 306 #ifdef USE_FONT_BACKEND |
307 f->font_driver_list = NULL; | |
308 #endif /* USE_FONT_BACKEND */ | |
286 | 309 |
987
afb21e974ed2
* frame.c (make_frame): Stop passing zero to make_window; it's not
Jim Blandy <jimb@redhat.com>
parents:
965
diff
changeset
|
310 root_window = make_window (); |
286 | 311 if (mini_p) |
312 { | |
987
afb21e974ed2
* frame.c (make_frame): Stop passing zero to make_window; it's not
Jim Blandy <jimb@redhat.com>
parents:
965
diff
changeset
|
313 mini_window = make_window (); |
286 | 314 XWINDOW (root_window)->next = mini_window; |
315 XWINDOW (mini_window)->prev = root_window; | |
316 XWINDOW (mini_window)->mini_p = Qt; | |
765 | 317 XWINDOW (mini_window)->frame = frame; |
318 f->minibuffer_window = mini_window; | |
286 | 319 } |
320 else | |
321 { | |
322 mini_window = Qnil; | |
323 XWINDOW (root_window)->next = Qnil; | |
765 | 324 f->minibuffer_window = Qnil; |
286 | 325 } |
326 | |
765 | 327 XWINDOW (root_window)->frame = frame; |
286 | 328 |
329 /* 10 is arbitrary, | |
330 just so that there is "something there." | |
765 | 331 Correct size will be set up later with change_frame_size. */ |
286 | 332 |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
333 SET_FRAME_COLS (f, 10); |
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
334 FRAME_LINES (f) = 10; |
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
335 |
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
336 XSETFASTINT (XWINDOW (root_window)->total_cols, 10); |
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
337 XSETFASTINT (XWINDOW (root_window)->total_lines, (mini_p ? 9 : 10)); |
286 | 338 |
339 if (mini_p) | |
340 { | |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
341 XSETFASTINT (XWINDOW (mini_window)->total_cols, 10); |
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
342 XSETFASTINT (XWINDOW (mini_window)->top_line, 9); |
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
343 XSETFASTINT (XWINDOW (mini_window)->total_lines, 1); |
286 | 344 } |
345 | |
765 | 346 /* Choose a buffer for the frame's root window. */ |
386 | 347 { |
348 Lisp_Object buf; | |
349 | |
350 XWINDOW (root_window)->buffer = Qt; | |
351 buf = Fcurrent_buffer (); | |
352 /* If buf is a 'hidden' buffer (i.e. one whose name starts with | |
353 a space), try to find another one. */ | |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46285
diff
changeset
|
354 if (SREF (Fbuffer_name (buf), 0) == ' ') |
22188
9fba463768ec
(frame_buffer_predicate): New arg FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
21825
diff
changeset
|
355 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
|
356 |
25030
c69d9e48269b
(make_frame): Set n_current_toolbar_items to 0.
Gerd Moellmann <gerd@gnu.org>
parents:
23746
diff
changeset
|
357 /* 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
|
358 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
|
359 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
|
360 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
|
361 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
|
362 SEGV. */ |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
363 set_window_buffer (root_window, buf, 0, 0); |
17221
0530a375eb21
(frame_buffer_list, set_frame_buffer_list): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
17032
diff
changeset
|
364 f->buffer_list = Fcons (buf, Qnil); |
386 | 365 } |
366 | |
286 | 367 if (mini_p) |
368 { | |
369 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
|
370 set_window_buffer (mini_window, |
c69d9e48269b
(make_frame): Set n_current_toolbar_items to 0.
Gerd Moellmann <gerd@gnu.org>
parents:
23746
diff
changeset
|
371 (NILP (Vminibuffer_list) |
c69d9e48269b
(make_frame): Set n_current_toolbar_items to 0.
Gerd Moellmann <gerd@gnu.org>
parents:
23746
diff
changeset
|
372 ? get_minibuffer (0) |
c69d9e48269b
(make_frame): Set n_current_toolbar_items to 0.
Gerd Moellmann <gerd@gnu.org>
parents:
23746
diff
changeset
|
373 : Fcar (Vminibuffer_list)), |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
374 0, 0); |
286 | 375 } |
376 | |
765 | 377 f->root_window = root_window; |
378 f->selected_window = root_window; | |
363 | 379 /* Make sure this window seems more recently used than |
380 a newly-created, never-selected window. */ | |
58265
491080266027
Avoid side-effects inside XSETFASTINT's arguments.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
57971
diff
changeset
|
381 ++window_select_count; |
491080266027
Avoid side-effects inside XSETFASTINT's arguments.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
57971
diff
changeset
|
382 XSETFASTINT (XWINDOW (f->selected_window)->use_time, window_select_count); |
286 | 383 |
51665
c1f65dfc56eb
Fix some of the font/face problems.
Jan Djärv <jan.h.d@swipnet.se>
parents:
51225
diff
changeset
|
384 f->default_face_done_p = 0; |
c1f65dfc56eb
Fix some of the font/face problems.
Jan Djärv <jan.h.d@swipnet.se>
parents:
51225
diff
changeset
|
385 |
765 | 386 return f; |
286 | 387 } |
388 | |
21359
f66e706fc9d6
(make_frame_without_minibuffer): Conditionalize on HAVE_WINDOW_SYSTEM.
Richard M. Stallman <rms@gnu.org>
parents:
21244
diff
changeset
|
389 #ifdef HAVE_WINDOW_SYSTEM |
765 | 390 /* Make a frame using a separate minibuffer window on another frame. |
286 | 391 MINI_WINDOW is the minibuffer window to use. nil means use the |
392 default (the global minibuffer). */ | |
393 | |
765 | 394 struct frame * |
12010
57eb365d32f0
(make_frame_without_minibuffer): New arg DISPLAY.
Karl Heuer <kwzh@gnu.org>
parents:
12006
diff
changeset
|
395 make_frame_without_minibuffer (mini_window, kb, display) |
286 | 396 register Lisp_Object mini_window; |
11775
fe7852953b75
(make_frame_without_minibuffer): New arg KB.
Karl Heuer <kwzh@gnu.org>
parents:
11773
diff
changeset
|
397 KBOARD *kb; |
12010
57eb365d32f0
(make_frame_without_minibuffer): New arg DISPLAY.
Karl Heuer <kwzh@gnu.org>
parents:
12006
diff
changeset
|
398 Lisp_Object display; |
286 | 399 { |
765 | 400 register struct frame *f; |
15555
5ceed3aa6a1c
(make_frame_without_minibuffer): GCPRO the frame f.
Richard M. Stallman <rms@gnu.org>
parents:
15396
diff
changeset
|
401 struct gcpro gcpro1; |
286 | 402 |
12010
57eb365d32f0
(make_frame_without_minibuffer): New arg DISPLAY.
Karl Heuer <kwzh@gnu.org>
parents:
12006
diff
changeset
|
403 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
|
404 CHECK_LIVE_WINDOW (mini_window); |
286 | 405 |
11775
fe7852953b75
(make_frame_without_minibuffer): New arg KB.
Karl Heuer <kwzh@gnu.org>
parents:
11773
diff
changeset
|
406 #ifdef MULTI_KBOARD |
12010
57eb365d32f0
(make_frame_without_minibuffer): New arg DISPLAY.
Karl Heuer <kwzh@gnu.org>
parents:
12006
diff
changeset
|
407 if (!NILP (mini_window) |
57eb365d32f0
(make_frame_without_minibuffer): New arg DISPLAY.
Karl Heuer <kwzh@gnu.org>
parents:
12006
diff
changeset
|
408 && XFRAME (XWINDOW (mini_window)->frame)->kboard != kb) |
63698
e7e58f0947fe
(make_frame_without_minibuffer): Follow error conventions.
Juanma Barranquero <lekktu@gmail.com>
parents:
63643
diff
changeset
|
409 error ("Frame and minibuffer must be on the same display"); |
11775
fe7852953b75
(make_frame_without_minibuffer): New arg KB.
Karl Heuer <kwzh@gnu.org>
parents:
11773
diff
changeset
|
410 #endif |
fe7852953b75
(make_frame_without_minibuffer): New arg KB.
Karl Heuer <kwzh@gnu.org>
parents:
11773
diff
changeset
|
411 |
765 | 412 /* Make a frame containing just a root window. */ |
413 f = make_frame (0); | |
286 | 414 |
12010
57eb365d32f0
(make_frame_without_minibuffer): New arg DISPLAY.
Karl Heuer <kwzh@gnu.org>
parents:
12006
diff
changeset
|
415 if (NILP (mini_window)) |
57eb365d32f0
(make_frame_without_minibuffer): New arg DISPLAY.
Karl Heuer <kwzh@gnu.org>
parents:
12006
diff
changeset
|
416 { |
57eb365d32f0
(make_frame_without_minibuffer): New arg DISPLAY.
Karl Heuer <kwzh@gnu.org>
parents:
12006
diff
changeset
|
417 /* Use default-minibuffer-frame if possible. */ |
57eb365d32f0
(make_frame_without_minibuffer): New arg DISPLAY.
Karl Heuer <kwzh@gnu.org>
parents:
12006
diff
changeset
|
418 if (!FRAMEP (kb->Vdefault_minibuffer_frame) |
57eb365d32f0
(make_frame_without_minibuffer): New arg DISPLAY.
Karl Heuer <kwzh@gnu.org>
parents:
12006
diff
changeset
|
419 || ! 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
|
420 { |
15555
5ceed3aa6a1c
(make_frame_without_minibuffer): GCPRO the frame f.
Richard M. Stallman <rms@gnu.org>
parents:
15396
diff
changeset
|
421 Lisp_Object frame_dummy; |
5ceed3aa6a1c
(make_frame_without_minibuffer): GCPRO the frame f.
Richard M. Stallman <rms@gnu.org>
parents:
15396
diff
changeset
|
422 |
5ceed3aa6a1c
(make_frame_without_minibuffer): GCPRO the frame f.
Richard M. Stallman <rms@gnu.org>
parents:
15396
diff
changeset
|
423 XSETFRAME (frame_dummy, f); |
5ceed3aa6a1c
(make_frame_without_minibuffer): GCPRO the frame f.
Richard M. Stallman <rms@gnu.org>
parents:
15396
diff
changeset
|
424 GCPRO1 (frame_dummy); |
12010
57eb365d32f0
(make_frame_without_minibuffer): New arg DISPLAY.
Karl Heuer <kwzh@gnu.org>
parents:
12006
diff
changeset
|
425 /* 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
|
426 kb->Vdefault_minibuffer_frame = |
5ceed3aa6a1c
(make_frame_without_minibuffer): GCPRO the frame f.
Richard M. Stallman <rms@gnu.org>
parents:
15396
diff
changeset
|
427 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
|
428 UNGCPRO; |
12010
57eb365d32f0
(make_frame_without_minibuffer): New arg DISPLAY.
Karl Heuer <kwzh@gnu.org>
parents:
12006
diff
changeset
|
429 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
430 |
12010
57eb365d32f0
(make_frame_without_minibuffer): New arg DISPLAY.
Karl Heuer <kwzh@gnu.org>
parents:
12006
diff
changeset
|
431 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
|
432 } |
15001
c74ce6421d04
(make_frame_without_minibuffer): Don't change the
Richard M. Stallman <rms@gnu.org>
parents:
14966
diff
changeset
|
433 |
765 | 434 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
|
435 |
c74ce6421d04
(make_frame_without_minibuffer): Don't change the
Richard M. Stallman <rms@gnu.org>
parents:
14966
diff
changeset
|
436 /* 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
|
437 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
|
438 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
|
439 Fset_window_buffer (mini_window, |
c74ce6421d04
(make_frame_without_minibuffer): Don't change the
Richard M. Stallman <rms@gnu.org>
parents:
14966
diff
changeset
|
440 (NILP (Vminibuffer_list) |
c74ce6421d04
(make_frame_without_minibuffer): Don't change the
Richard M. Stallman <rms@gnu.org>
parents:
14966
diff
changeset
|
441 ? get_minibuffer (0) |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
442 : Fcar (Vminibuffer_list)), Qnil); |
765 | 443 return f; |
286 | 444 } |
445 | |
765 | 446 /* Make a frame containing only a minibuffer window. */ |
286 | 447 |
765 | 448 struct frame * |
449 make_minibuffer_frame () | |
286 | 450 { |
765 | 451 /* First make a frame containing just a root window, no minibuffer. */ |
286 | 452 |
765 | 453 register struct frame *f = make_frame (0); |
286 | 454 register Lisp_Object mini_window; |
765 | 455 register Lisp_Object frame; |
286 | 456 |
9268
cb55d0155265
(make_minibuffer_frame, make_terminal_frame, Fselected_frame,
Karl Heuer <kwzh@gnu.org>
parents:
9214
diff
changeset
|
457 XSETFRAME (frame, f); |
286 | 458 |
1006
a13ee72d74a2
* frame.c (make_frame): Clear the explicit_name member of the new
Jim Blandy <jimb@redhat.com>
parents:
987
diff
changeset
|
459 f->auto_raise = 0; |
765 | 460 f->auto_lower = 0; |
461 f->no_split = 1; | |
462 f->wants_modeline = 0; | |
463 f->has_minibuffer = 1; | |
286 | 464 |
465 /* Now label the root window as also being the minibuffer. | |
466 Avoid infinite looping on the window chain by marking next pointer | |
467 as nil. */ | |
468 | |
765 | 469 mini_window = f->minibuffer_window = f->root_window; |
286 | 470 XWINDOW (mini_window)->mini_p = Qt; |
471 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
|
472 XWINDOW (mini_window)->prev = Qnil; |
765 | 473 XWINDOW (mini_window)->frame = frame; |
286 | 474 |
475 /* Put the proper buffer in that window. */ | |
476 | |
477 Fset_window_buffer (mini_window, | |
485 | 478 (NILP (Vminibuffer_list) |
286 | 479 ? get_minibuffer (0) |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
480 : Fcar (Vminibuffer_list)), Qnil); |
765 | 481 return f; |
286 | 482 } |
21359
f66e706fc9d6
(make_frame_without_minibuffer): Conditionalize on HAVE_WINDOW_SYSTEM.
Richard M. Stallman <rms@gnu.org>
parents:
21244
diff
changeset
|
483 #endif /* HAVE_WINDOW_SYSTEM */ |
286 | 484 |
765 | 485 /* Construct a frame that refers to the terminal (stdin and stdout). */ |
286 | 486 |
10768
938451cf1b10
(Fmake_terminal_frame): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10676
diff
changeset
|
487 static int terminal_frame_count; |
938451cf1b10
(Fmake_terminal_frame): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10676
diff
changeset
|
488 |
765 | 489 struct frame * |
490 make_terminal_frame () | |
286 | 491 { |
765 | 492 register struct frame *f; |
5231
6646271e8d32
(make_terminal_frame): Add frame to Vframe_list.
Richard M. Stallman <rms@gnu.org>
parents:
5172
diff
changeset
|
493 Lisp_Object frame; |
10768
938451cf1b10
(Fmake_terminal_frame): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10676
diff
changeset
|
494 char name[20]; |
286 | 495 |
11017
f7c4ece024d5
(make_frame): Initialize kboard member.
Karl Heuer <kwzh@gnu.org>
parents:
10853
diff
changeset
|
496 #ifdef MULTI_KBOARD |
f7c4ece024d5
(make_frame): Initialize kboard member.
Karl Heuer <kwzh@gnu.org>
parents:
10853
diff
changeset
|
497 if (!initial_kboard) |
f7c4ece024d5
(make_frame): Initialize kboard member.
Karl Heuer <kwzh@gnu.org>
parents:
10853
diff
changeset
|
498 { |
f7c4ece024d5
(make_frame): Initialize kboard member.
Karl Heuer <kwzh@gnu.org>
parents:
10853
diff
changeset
|
499 initial_kboard = (KBOARD *) xmalloc (sizeof (KBOARD)); |
f7c4ece024d5
(make_frame): Initialize kboard member.
Karl Heuer <kwzh@gnu.org>
parents:
10853
diff
changeset
|
500 init_kboard (initial_kboard); |
11364
9c609a5bd245
(make_terminal_frame): all_kboards means initial_kboard too.
Karl Heuer <kwzh@gnu.org>
parents:
11355
diff
changeset
|
501 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
|
502 all_kboards = initial_kboard; |
11017
f7c4ece024d5
(make_frame): Initialize kboard member.
Karl Heuer <kwzh@gnu.org>
parents:
10853
diff
changeset
|
503 } |
f7c4ece024d5
(make_frame): Initialize kboard member.
Karl Heuer <kwzh@gnu.org>
parents:
10853
diff
changeset
|
504 #endif |
f7c4ece024d5
(make_frame): Initialize kboard member.
Karl Heuer <kwzh@gnu.org>
parents:
10853
diff
changeset
|
505 |
10768
938451cf1b10
(Fmake_terminal_frame): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10676
diff
changeset
|
506 /* The first call must initialize Vframe_list. */ |
938451cf1b10
(Fmake_terminal_frame): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10676
diff
changeset
|
507 if (! (NILP (Vframe_list) || CONSP (Vframe_list))) |
938451cf1b10
(Fmake_terminal_frame): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10676
diff
changeset
|
508 Vframe_list = Qnil; |
938451cf1b10
(Fmake_terminal_frame): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10676
diff
changeset
|
509 |
765 | 510 f = make_frame (1); |
5231
6646271e8d32
(make_terminal_frame): Add frame to Vframe_list.
Richard M. Stallman <rms@gnu.org>
parents:
5172
diff
changeset
|
511 |
9268
cb55d0155265
(make_minibuffer_frame, make_terminal_frame, Fselected_frame,
Karl Heuer <kwzh@gnu.org>
parents:
9214
diff
changeset
|
512 XSETFRAME (frame, f); |
5231
6646271e8d32
(make_terminal_frame): Add frame to Vframe_list.
Richard M. Stallman <rms@gnu.org>
parents:
5172
diff
changeset
|
513 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
|
514 |
10768
938451cf1b10
(Fmake_terminal_frame): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10676
diff
changeset
|
515 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
|
516 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
|
517 f->name = build_string (name); |
10768
938451cf1b10
(Fmake_terminal_frame): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10676
diff
changeset
|
518 |
938451cf1b10
(Fmake_terminal_frame): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10676
diff
changeset
|
519 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
|
520 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
|
521 #ifdef MSDOS |
d4cec5d7566d
(Fset_mouse_position): Remove the DOS-specific
Richard M. Stallman <rms@gnu.org>
parents:
15062
diff
changeset
|
522 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
|
523 if (!inhibit_window_system |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26164
diff
changeset
|
524 && (!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
|
525 || 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
|
526 { |
2e399023961d
(make_terminal_frame): Initialize frame foreground and
Eli Zaretskii <eliz@gnu.org>
parents:
31448
diff
changeset
|
527 f->output_method = output_msdos_raw; |
2e399023961d
(make_terminal_frame): Initialize frame foreground and
Eli Zaretskii <eliz@gnu.org>
parents:
31448
diff
changeset
|
528 /* 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
|
529 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
|
530 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
|
531 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
|
532 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
|
533 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
|
534 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
|
535 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
|
536 && f->output_data.x->background_pixel == 0 |
2e399023961d
(make_terminal_frame): Initialize frame foreground and
Eli Zaretskii <eliz@gnu.org>
parents:
31448
diff
changeset
|
537 && f->output_data.x->foreground_pixel == 0) |
2e399023961d
(make_terminal_frame): Initialize frame foreground and
Eli Zaretskii <eliz@gnu.org>
parents:
31448
diff
changeset
|
538 { |
2e399023961d
(make_terminal_frame): Initialize frame foreground and
Eli Zaretskii <eliz@gnu.org>
parents:
31448
diff
changeset
|
539 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
|
540 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
|
541 } |
2e399023961d
(make_terminal_frame): Initialize frame foreground and
Eli Zaretskii <eliz@gnu.org>
parents:
31448
diff
changeset
|
542 } |
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26164
diff
changeset
|
543 else |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26164
diff
changeset
|
544 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
|
545 #else |
35003
c6726a1e70ce
(make_terminal_frame) [WINDOWSNT]: Make terminal frames
Andrew Innes <andrewi@gnu.org>
parents:
33760
diff
changeset
|
546 #ifdef WINDOWSNT |
35447
c6cb860208d8
(Qw32_console): Remove variable.
Andrew Innes <andrewi@gnu.org>
parents:
35003
diff
changeset
|
547 f->output_method = output_termcap; |
35003
c6726a1e70ce
(make_terminal_frame) [WINDOWSNT]: Make terminal frames
Andrew Innes <andrewi@gnu.org>
parents:
33760
diff
changeset
|
548 f->output_data.x = &tty_display; |
c6726a1e70ce
(make_terminal_frame) [WINDOWSNT]: Make terminal frames
Andrew Innes <andrewi@gnu.org>
parents:
33760
diff
changeset
|
549 #else |
44890
01b93e5e53a7
Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents:
43717
diff
changeset
|
550 #ifdef MAC_OS8 |
32752
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32545
diff
changeset
|
551 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
|
552 #else |
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26164
diff
changeset
|
553 f->output_data.x = &tty_display; |
47036
9d848dcc4b5d
(make_terminal_frame) [CANNOT_DUMP]: Initialize
Kim F. Storm <storm@cua.dk>
parents:
46467
diff
changeset
|
554 #ifdef CANNOT_DUMP |
9d848dcc4b5d
(make_terminal_frame) [CANNOT_DUMP]: Initialize
Kim F. Storm <storm@cua.dk>
parents:
46467
diff
changeset
|
555 FRAME_FOREGROUND_PIXEL(f) = FACE_TTY_DEFAULT_FG_COLOR; |
9d848dcc4b5d
(make_terminal_frame) [CANNOT_DUMP]: Initialize
Kim F. Storm <storm@cua.dk>
parents:
46467
diff
changeset
|
556 FRAME_BACKGROUND_PIXEL(f) = FACE_TTY_DEFAULT_BG_COLOR; |
9d848dcc4b5d
(make_terminal_frame) [CANNOT_DUMP]: Initialize
Kim F. Storm <storm@cua.dk>
parents:
46467
diff
changeset
|
557 #endif |
44890
01b93e5e53a7
Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents:
43717
diff
changeset
|
558 #endif /* MAC_OS8 */ |
35003
c6726a1e70ce
(make_terminal_frame) [WINDOWSNT]: Make terminal frames
Andrew Innes <andrewi@gnu.org>
parents:
33760
diff
changeset
|
559 #endif /* WINDOWSNT */ |
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26164
diff
changeset
|
560 #endif /* MSDOS */ |
25523
9e9eeb68482e
(Fframep) [macintosh]: Handle mac frame type.
Richard M. Stallman <rms@gnu.org>
parents:
25350
diff
changeset
|
561 |
25117
f6f34f0bc1af
(make_terminal_frame) [MSDOS]: Don't call
Eli Zaretskii <eliz@gnu.org>
parents:
25030
diff
changeset
|
562 if (!noninteractive) |
f6f34f0bc1af
(make_terminal_frame) [MSDOS]: Don't call
Eli Zaretskii <eliz@gnu.org>
parents:
25030
diff
changeset
|
563 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
|
564 |
765 | 565 return f; |
286 | 566 } |
10768
938451cf1b10
(Fmake_terminal_frame): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10676
diff
changeset
|
567 |
938451cf1b10
(Fmake_terminal_frame): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10676
diff
changeset
|
568 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
|
569 1, 1, 0, |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
570 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
|
571 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
|
572 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
|
573 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
|
574 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
|
575 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
|
576 (parms) |
10768
938451cf1b10
(Fmake_terminal_frame): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10676
diff
changeset
|
577 Lisp_Object parms; |
938451cf1b10
(Fmake_terminal_frame): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10676
diff
changeset
|
578 { |
938451cf1b10
(Fmake_terminal_frame): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10676
diff
changeset
|
579 struct frame *f; |
25523
9e9eeb68482e
(Fframep) [macintosh]: Handle mac frame type.
Richard M. Stallman <rms@gnu.org>
parents:
25350
diff
changeset
|
580 Lisp_Object frame, tem; |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
581 struct frame *sf = SELECTED_FRAME (); |
10768
938451cf1b10
(Fmake_terminal_frame): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10676
diff
changeset
|
582 |
15392
ac7e878c5526
(Fmake_terminal_frame): Test MSDOS, not __MSDOS__.
Richard M. Stallman <rms@gnu.org>
parents:
15391
diff
changeset
|
583 #ifdef MSDOS |
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26164
diff
changeset
|
584 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
|
585 && sf->output_method != output_termcap) |
15391
d4cec5d7566d
(Fset_mouse_position): Remove the DOS-specific
Richard M. Stallman <rms@gnu.org>
parents:
15062
diff
changeset
|
586 abort (); |
25523
9e9eeb68482e
(Fframep) [macintosh]: Handle mac frame type.
Richard M. Stallman <rms@gnu.org>
parents:
25350
diff
changeset
|
587 #else /* not MSDOS */ |
9e9eeb68482e
(Fframep) [macintosh]: Handle mac frame type.
Richard M. Stallman <rms@gnu.org>
parents:
25350
diff
changeset
|
588 |
44890
01b93e5e53a7
Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents:
43717
diff
changeset
|
589 #ifdef MAC_OS |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
590 if (sf->output_method != output_mac) |
25523
9e9eeb68482e
(Fframep) [macintosh]: Handle mac frame type.
Richard M. Stallman <rms@gnu.org>
parents:
25350
diff
changeset
|
591 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
|
592 #else |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
593 if (sf->output_method != output_termcap) |
10768
938451cf1b10
(Fmake_terminal_frame): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10676
diff
changeset
|
594 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
|
595 #endif |
25523
9e9eeb68482e
(Fframep) [macintosh]: Handle mac frame type.
Richard M. Stallman <rms@gnu.org>
parents:
25350
diff
changeset
|
596 #endif /* not MSDOS */ |
10768
938451cf1b10
(Fmake_terminal_frame): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10676
diff
changeset
|
597 |
938451cf1b10
(Fmake_terminal_frame): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10676
diff
changeset
|
598 f = make_terminal_frame (); |
25523
9e9eeb68482e
(Fframep) [macintosh]: Handle mac frame type.
Richard M. Stallman <rms@gnu.org>
parents:
25350
diff
changeset
|
599 |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
600 change_frame_size (f, FRAME_LINES (sf), |
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
601 FRAME_COLS (sf), 0, 0, 0); |
25030
c69d9e48269b
(make_frame): Set n_current_toolbar_items to 0.
Gerd Moellmann <gerd@gnu.org>
parents:
23746
diff
changeset
|
602 adjust_glyphs (f); |
10768
938451cf1b10
(Fmake_terminal_frame): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10676
diff
changeset
|
603 calculate_costs (f); |
938451cf1b10
(Fmake_terminal_frame): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10676
diff
changeset
|
604 XSETFRAME (frame, f); |
16184
ca018789eb73
(Fmake_terminal_frame): Use Vdefault_frame_alist.
Richard M. Stallman <rms@gnu.org>
parents:
16112
diff
changeset
|
605 Fmodify_frame_parameters (frame, Vdefault_frame_alist); |
10768
938451cf1b10
(Fmake_terminal_frame): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10676
diff
changeset
|
606 Fmodify_frame_parameters (frame, parms); |
25209
eea9647c8246
(Fframe_parameters): Swap foreground and background
Eli Zaretskii <eliz@gnu.org>
parents:
25158
diff
changeset
|
607 |
eea9647c8246
(Fframe_parameters): Swap foreground and background
Eli Zaretskii <eliz@gnu.org>
parents:
25158
diff
changeset
|
608 /* 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
|
609 frame could change its face definitions independently. */ |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
610 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
|
611 /* 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
|
612 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
|
613 be copied as well. */ |
eea9647c8246
(Fframe_parameters): Swap foreground and background
Eli Zaretskii <eliz@gnu.org>
parents:
25158
diff
changeset
|
614 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
|
615 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
|
616 return frame; |
938451cf1b10
(Fmake_terminal_frame): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10676
diff
changeset
|
617 } |
36810
a9485f8e43d6
(do_switch_frame): Remove unused parameter NO_EVENT, add
Gerd Moellmann <gerd@gnu.org>
parents:
36804
diff
changeset
|
618 |
286 | 619 |
36810
a9485f8e43d6
(do_switch_frame): Remove unused parameter NO_EVENT, add
Gerd Moellmann <gerd@gnu.org>
parents:
36804
diff
changeset
|
620 /* 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
|
621 |
a9485f8e43d6
(do_switch_frame): Remove unused parameter NO_EVENT, add
Gerd Moellmann <gerd@gnu.org>
parents:
36804
diff
changeset
|
622 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
|
623 FRAME1 as frame. |
a9485f8e43d6
(do_switch_frame): Remove unused parameter NO_EVENT, add
Gerd Moellmann <gerd@gnu.org>
parents:
36804
diff
changeset
|
624 |
a9485f8e43d6
(do_switch_frame): Remove unused parameter NO_EVENT, add
Gerd Moellmann <gerd@gnu.org>
parents:
36804
diff
changeset
|
625 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
|
626 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
|
627 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
|
628 |
a9485f8e43d6
(do_switch_frame): Remove unused parameter NO_EVENT, add
Gerd Moellmann <gerd@gnu.org>
parents:
36804
diff
changeset
|
629 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
|
630 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
|
631 is dead. */ |
a9485f8e43d6
(do_switch_frame): Remove unused parameter NO_EVENT, add
Gerd Moellmann <gerd@gnu.org>
parents:
36804
diff
changeset
|
632 |
12286
723569a0028c
(Fdelete_frame): Use do_switch_frame directly.
Richard M. Stallman <rms@gnu.org>
parents:
12283
diff
changeset
|
633 Lisp_Object |
36810
a9485f8e43d6
(do_switch_frame): Remove unused parameter NO_EVENT, add
Gerd Moellmann <gerd@gnu.org>
parents:
36804
diff
changeset
|
634 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
|
635 Lisp_Object frame; |
a9485f8e43d6
(do_switch_frame): Remove unused parameter NO_EVENT, add
Gerd Moellmann <gerd@gnu.org>
parents:
36804
diff
changeset
|
636 int track, for_deletion; |
286 | 637 { |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
638 struct frame *sf = SELECTED_FRAME (); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
639 |
1385
a4a205bdd2c1
* frame.c: #include "commands.h" and "keyboard.h".
Jim Blandy <jimb@redhat.com>
parents:
1346
diff
changeset
|
640 /* 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
|
641 switch to. */ |
a4a205bdd2c1
* frame.c: #include "commands.h" and "keyboard.h".
Jim Blandy <jimb@redhat.com>
parents:
1346
diff
changeset
|
642 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
|
643 && 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
|
644 && CONSP (XCDR (frame))) |
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
645 frame = XCAR (XCDR (frame)); |
1385
a4a205bdd2c1
* frame.c: #include "commands.h" and "keyboard.h".
Jim Blandy <jimb@redhat.com>
parents:
1346
diff
changeset
|
646 |
6352
6f48bd9145f9
(Fhandle_switch_frame): Ignore switch to dead frame.
Karl Heuer <kwzh@gnu.org>
parents:
6346
diff
changeset
|
647 /* 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
|
648 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
|
649 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
|
650 CHECK_FRAME (frame); |
6352
6f48bd9145f9
(Fhandle_switch_frame): Ignore switch to dead frame.
Karl Heuer <kwzh@gnu.org>
parents:
6346
diff
changeset
|
651 if (! FRAME_LIVE_P (XFRAME (frame))) |
6f48bd9145f9
(Fhandle_switch_frame): Ignore switch to dead frame.
Karl Heuer <kwzh@gnu.org>
parents:
6346
diff
changeset
|
652 return Qnil; |
286 | 653 |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
654 if (sf == XFRAME (frame)) |
765 | 655 return frame; |
286 | 656 |
6486
5012ae9c6075
(do_switch_frame): Common code for Fselect_frame and handle_switch_frame.
Karl Heuer <kwzh@gnu.org>
parents:
6355
diff
changeset
|
657 /* 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
|
658 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
|
659 #if 0 |
1709
b86b3237e017
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1691
diff
changeset
|
660 /* 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
|
661 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
|
662 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
|
663 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
|
664 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
|
665 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
|
666 around. */ |
6486
5012ae9c6075
(do_switch_frame): Common code for Fselect_frame and handle_switch_frame.
Karl Heuer <kwzh@gnu.org>
parents:
6355
diff
changeset
|
667 if (track) |
5012ae9c6075
(do_switch_frame): Common code for Fselect_frame and handle_switch_frame.
Karl Heuer <kwzh@gnu.org>
parents:
6355
diff
changeset
|
668 { |
5012ae9c6075
(do_switch_frame): Common code for Fselect_frame and handle_switch_frame.
Karl Heuer <kwzh@gnu.org>
parents:
6355
diff
changeset
|
669 Lisp_Object tail; |
1709
b86b3237e017
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1691
diff
changeset
|
670 |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
671 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
|
672 { |
5012ae9c6075
(do_switch_frame): Common code for Fselect_frame and handle_switch_frame.
Karl Heuer <kwzh@gnu.org>
parents:
6355
diff
changeset
|
673 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
|
674 |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
675 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
|
676 abort (); |
5012ae9c6075
(do_switch_frame): Common code for Fselect_frame and handle_switch_frame.
Karl Heuer <kwzh@gnu.org>
parents:
6355
diff
changeset
|
677 |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
678 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
|
679 |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
680 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
|
681 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
|
682 } |
5012ae9c6075
(do_switch_frame): Common code for Fselect_frame and handle_switch_frame.
Karl Heuer <kwzh@gnu.org>
parents:
6355
diff
changeset
|
683 } |
5012ae9c6075
(do_switch_frame): Common code for Fselect_frame and handle_switch_frame.
Karl Heuer <kwzh@gnu.org>
parents:
6355
diff
changeset
|
684 #else /* ! 0 */ |
5012ae9c6075
(do_switch_frame): Common code for Fselect_frame and handle_switch_frame.
Karl Heuer <kwzh@gnu.org>
parents:
6355
diff
changeset
|
685 /* 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
|
686 #ifdef HAVE_WINDOW_SYSTEM |
36810
a9485f8e43d6
(do_switch_frame): Remove unused parameter NO_EVENT, add
Gerd Moellmann <gerd@gnu.org>
parents:
36804
diff
changeset
|
687 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
|
688 { |
5012ae9c6075
(do_switch_frame): Common code for Fselect_frame and handle_switch_frame.
Karl Heuer <kwzh@gnu.org>
parents:
6355
diff
changeset
|
689 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
|
690 |
11529
5beffe62d4ef
(do_switch_frame): x_get_focus_frame needs an arg.
Karl Heuer <kwzh@gnu.org>
parents:
11495
diff
changeset
|
691 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
|
692 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
|
693 { |
5012ae9c6075
(do_switch_frame): Common code for Fselect_frame and handle_switch_frame.
Karl Heuer <kwzh@gnu.org>
parents:
6355
diff
changeset
|
694 focus = FRAME_FOCUS_FRAME (XFRAME (xfocus)); |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
695 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
|
696 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
|
697 } |
5012ae9c6075
(do_switch_frame): Common code for Fselect_frame and handle_switch_frame.
Karl Heuer <kwzh@gnu.org>
parents:
6355
diff
changeset
|
698 } |
5012ae9c6075
(do_switch_frame): Common code for Fselect_frame and handle_switch_frame.
Karl Heuer <kwzh@gnu.org>
parents:
6355
diff
changeset
|
699 #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
|
700 #endif /* ! 0 */ |
1709
b86b3237e017
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1691
diff
changeset
|
701 |
36810
a9485f8e43d6
(do_switch_frame): Remove unused parameter NO_EVENT, add
Gerd Moellmann <gerd@gnu.org>
parents:
36804
diff
changeset
|
702 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
|
703 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
|
704 |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
705 selected_frame = frame; |
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
706 if (! FRAME_MINIBUF_ONLY_P (XFRAME (selected_frame))) |
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
707 last_nonminibuf_frame = XFRAME (selected_frame); |
363 | 708 |
51048
7ac9c3bea5ea
(Fselect_window): Add optional arg `norecord'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50390
diff
changeset
|
709 Fselect_window (XFRAME (frame)->selected_window, Qnil); |
286 | 710 |
42743
1e6231c9c359
(store_frame_param): Call set_tty_color_mode for termcap
Eli Zaretskii <eliz@gnu.org>
parents:
41718
diff
changeset
|
711 #ifndef WINDOWSNT |
1e6231c9c359
(store_frame_param): Call set_tty_color_mode for termcap
Eli Zaretskii <eliz@gnu.org>
parents:
41718
diff
changeset
|
712 /* Make sure to switch the tty color mode to that of the newly |
1e6231c9c359
(store_frame_param): Call set_tty_color_mode for termcap
Eli Zaretskii <eliz@gnu.org>
parents:
41718
diff
changeset
|
713 selected frame. */ |
1e6231c9c359
(store_frame_param): Call set_tty_color_mode for termcap
Eli Zaretskii <eliz@gnu.org>
parents:
41718
diff
changeset
|
714 sf = SELECTED_FRAME (); |
1e6231c9c359
(store_frame_param): Call set_tty_color_mode for termcap
Eli Zaretskii <eliz@gnu.org>
parents:
41718
diff
changeset
|
715 if (FRAME_TERMCAP_P (sf)) |
1e6231c9c359
(store_frame_param): Call set_tty_color_mode for termcap
Eli Zaretskii <eliz@gnu.org>
parents:
41718
diff
changeset
|
716 { |
1e6231c9c359
(store_frame_param): Call set_tty_color_mode for termcap
Eli Zaretskii <eliz@gnu.org>
parents:
41718
diff
changeset
|
717 Lisp_Object color_mode_spec, color_mode; |
1e6231c9c359
(store_frame_param): Call set_tty_color_mode for termcap
Eli Zaretskii <eliz@gnu.org>
parents:
41718
diff
changeset
|
718 |
1e6231c9c359
(store_frame_param): Call set_tty_color_mode for termcap
Eli Zaretskii <eliz@gnu.org>
parents:
41718
diff
changeset
|
719 color_mode_spec = assq_no_quit (Qtty_color_mode, sf->param_alist); |
1e6231c9c359
(store_frame_param): Call set_tty_color_mode for termcap
Eli Zaretskii <eliz@gnu.org>
parents:
41718
diff
changeset
|
720 if (CONSP (color_mode_spec)) |
1e6231c9c359
(store_frame_param): Call set_tty_color_mode for termcap
Eli Zaretskii <eliz@gnu.org>
parents:
41718
diff
changeset
|
721 color_mode = XCDR (color_mode_spec); |
1e6231c9c359
(store_frame_param): Call set_tty_color_mode for termcap
Eli Zaretskii <eliz@gnu.org>
parents:
41718
diff
changeset
|
722 else |
1e6231c9c359
(store_frame_param): Call set_tty_color_mode for termcap
Eli Zaretskii <eliz@gnu.org>
parents:
41718
diff
changeset
|
723 color_mode = make_number (0); |
1e6231c9c359
(store_frame_param): Call set_tty_color_mode for termcap
Eli Zaretskii <eliz@gnu.org>
parents:
41718
diff
changeset
|
724 set_tty_color_mode (sf, color_mode); |
1e6231c9c359
(store_frame_param): Call set_tty_color_mode for termcap
Eli Zaretskii <eliz@gnu.org>
parents:
41718
diff
changeset
|
725 } |
1e6231c9c359
(store_frame_param): Call set_tty_color_mode for termcap
Eli Zaretskii <eliz@gnu.org>
parents:
41718
diff
changeset
|
726 #endif /* !WINDOWSNT */ |
1e6231c9c359
(store_frame_param): Call set_tty_color_mode for termcap
Eli Zaretskii <eliz@gnu.org>
parents:
41718
diff
changeset
|
727 |
1920
ac5e559a819a
* frame.c (Fselect_frame): Set Vlast_event_frame to Qnil after
Jim Blandy <jimb@redhat.com>
parents:
1870
diff
changeset
|
728 /* 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
|
729 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
|
730 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
|
731 (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
|
732 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
|
733 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
|
734 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
|
735 |
765 | 736 return frame; |
286 | 737 } |
738 | |
63184
1ba4135e8efa
(Fhandle_switch_frame, Fselect_frame): Delete unused arg no_enter.
Luc Teirlinck <teirllm@auburn.edu>
parents:
61784
diff
changeset
|
739 DEFUN ("select-frame", Fselect_frame, Sselect_frame, 1, 1, "e", |
40105
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
740 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
|
741 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
|
742 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
|
743 something to select a different frame, or until the next time this |
56517
c9c9e7be868f
(Fselect_frame, Fset_frame_selected_window)
Luc Teirlinck <teirllm@auburn.edu>
parents:
56453
diff
changeset
|
744 function is called. If you are using a window system, the previously |
c9c9e7be868f
(Fselect_frame, Fset_frame_selected_window)
Luc Teirlinck <teirllm@auburn.edu>
parents:
56453
diff
changeset
|
745 selected frame may be restored as the selected frame after return to |
c9c9e7be868f
(Fselect_frame, Fset_frame_selected_window)
Luc Teirlinck <teirllm@auburn.edu>
parents:
56453
diff
changeset
|
746 the command loop, because it still may have the window system's input |
c9c9e7be868f
(Fselect_frame, Fset_frame_selected_window)
Luc Teirlinck <teirllm@auburn.edu>
parents:
56453
diff
changeset
|
747 focus. On a text-only terminal, the next redisplay will display FRAME. |
c9c9e7be868f
(Fselect_frame, Fset_frame_selected_window)
Luc Teirlinck <teirllm@auburn.edu>
parents:
56453
diff
changeset
|
748 |
c9c9e7be868f
(Fselect_frame, Fset_frame_selected_window)
Luc Teirlinck <teirllm@auburn.edu>
parents:
56453
diff
changeset
|
749 This function returns FRAME, or nil if FRAME has been deleted. */) |
63184
1ba4135e8efa
(Fhandle_switch_frame, Fselect_frame): Delete unused arg no_enter.
Luc Teirlinck <teirllm@auburn.edu>
parents:
61784
diff
changeset
|
750 (frame) |
1ba4135e8efa
(Fhandle_switch_frame, Fselect_frame): Delete unused arg no_enter.
Luc Teirlinck <teirllm@auburn.edu>
parents:
61784
diff
changeset
|
751 Lisp_Object frame; |
6486
5012ae9c6075
(do_switch_frame): Common code for Fselect_frame and handle_switch_frame.
Karl Heuer <kwzh@gnu.org>
parents:
6355
diff
changeset
|
752 { |
36810
a9485f8e43d6
(do_switch_frame): Remove unused parameter NO_EVENT, add
Gerd Moellmann <gerd@gnu.org>
parents:
36804
diff
changeset
|
753 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
|
754 } |
5012ae9c6075
(do_switch_frame): Common code for Fselect_frame and handle_switch_frame.
Karl Heuer <kwzh@gnu.org>
parents:
6355
diff
changeset
|
755 |
5012ae9c6075
(do_switch_frame): Common code for Fselect_frame and handle_switch_frame.
Karl Heuer <kwzh@gnu.org>
parents:
6355
diff
changeset
|
756 |
63184
1ba4135e8efa
(Fhandle_switch_frame, Fselect_frame): Delete unused arg no_enter.
Luc Teirlinck <teirllm@auburn.edu>
parents:
61784
diff
changeset
|
757 DEFUN ("handle-switch-frame", Fhandle_switch_frame, Shandle_switch_frame, 1, 1, "e", |
40105
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
758 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
|
759 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
|
760 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
|
761 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
|
762 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
|
763 |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
764 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
|
765 to that frame. */) |
63184
1ba4135e8efa
(Fhandle_switch_frame, Fselect_frame): Delete unused arg no_enter.
Luc Teirlinck <teirllm@auburn.edu>
parents:
61784
diff
changeset
|
766 (event) |
1ba4135e8efa
(Fhandle_switch_frame, Fselect_frame): Delete unused arg no_enter.
Luc Teirlinck <teirllm@auburn.edu>
parents:
61784
diff
changeset
|
767 Lisp_Object event; |
6486
5012ae9c6075
(do_switch_frame): Common code for Fselect_frame and handle_switch_frame.
Karl Heuer <kwzh@gnu.org>
parents:
6355
diff
changeset
|
768 { |
12255
41083bd094ac
(Fhandle_switch_frame): Preserve prefix arg.
Karl Heuer <kwzh@gnu.org>
parents:
12222
diff
changeset
|
769 /* 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
|
770 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
|
771 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
|
772 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
|
773 } |
5012ae9c6075
(do_switch_frame): Common code for Fselect_frame and handle_switch_frame.
Karl Heuer <kwzh@gnu.org>
parents:
6355
diff
changeset
|
774 |
765 | 775 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
|
776 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
|
777 () |
286 | 778 { |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
779 return selected_frame; |
286 | 780 } |
7055
5e4906d964b8
(Fset_frame_selected_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7025
diff
changeset
|
781 |
765 | 782 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
|
783 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
|
784 (window) |
286 | 785 Lisp_Object window; |
786 { | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
787 CHECK_LIVE_WINDOW (window); |
765 | 788 return XWINDOW (window)->frame; |
286 | 789 } |
790 | |
6527
ab9f20a3f502
(Fframe_first_window): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6500
diff
changeset
|
791 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
|
792 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
|
793 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
|
794 (frame) |
6527
ab9f20a3f502
(Fframe_first_window): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6500
diff
changeset
|
795 Lisp_Object frame; |
ab9f20a3f502
(Fframe_first_window): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6500
diff
changeset
|
796 { |
ab9f20a3f502
(Fframe_first_window): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6500
diff
changeset
|
797 Lisp_Object w; |
ab9f20a3f502
(Fframe_first_window): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6500
diff
changeset
|
798 |
ab9f20a3f502
(Fframe_first_window): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6500
diff
changeset
|
799 if (NILP (frame)) |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
800 w = SELECTED_FRAME ()->root_window; |
6527
ab9f20a3f502
(Fframe_first_window): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6500
diff
changeset
|
801 else |
ab9f20a3f502
(Fframe_first_window): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6500
diff
changeset
|
802 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
803 CHECK_LIVE_FRAME (frame); |
6527
ab9f20a3f502
(Fframe_first_window): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6500
diff
changeset
|
804 w = XFRAME (frame)->root_window; |
ab9f20a3f502
(Fframe_first_window): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6500
diff
changeset
|
805 } |
ab9f20a3f502
(Fframe_first_window): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6500
diff
changeset
|
806 while (NILP (XWINDOW (w)->buffer)) |
ab9f20a3f502
(Fframe_first_window): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6500
diff
changeset
|
807 { |
ab9f20a3f502
(Fframe_first_window): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6500
diff
changeset
|
808 if (! NILP (XWINDOW (w)->hchild)) |
ab9f20a3f502
(Fframe_first_window): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6500
diff
changeset
|
809 w = XWINDOW (w)->hchild; |
ab9f20a3f502
(Fframe_first_window): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6500
diff
changeset
|
810 else if (! NILP (XWINDOW (w)->vchild)) |
ab9f20a3f502
(Fframe_first_window): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6500
diff
changeset
|
811 w = XWINDOW (w)->vchild; |
ab9f20a3f502
(Fframe_first_window): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6500
diff
changeset
|
812 else |
ab9f20a3f502
(Fframe_first_window): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6500
diff
changeset
|
813 abort (); |
ab9f20a3f502
(Fframe_first_window): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6500
diff
changeset
|
814 } |
ab9f20a3f502
(Fframe_first_window): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6500
diff
changeset
|
815 return w; |
ab9f20a3f502
(Fframe_first_window): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6500
diff
changeset
|
816 } |
ab9f20a3f502
(Fframe_first_window): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6500
diff
changeset
|
817 |
11169
d0550c056e5b
[MULTI_FRAME] (Factive_minibuffer_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11126
diff
changeset
|
818 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
|
819 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
|
820 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
|
821 () |
11169
d0550c056e5b
[MULTI_FRAME] (Factive_minibuffer_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11126
diff
changeset
|
822 { |
d0550c056e5b
[MULTI_FRAME] (Factive_minibuffer_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11126
diff
changeset
|
823 return minibuf_level ? minibuf_window : Qnil; |
d0550c056e5b
[MULTI_FRAME] (Factive_minibuffer_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11126
diff
changeset
|
824 } |
d0550c056e5b
[MULTI_FRAME] (Factive_minibuffer_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11126
diff
changeset
|
825 |
765 | 826 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
|
827 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
|
828 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
|
829 (frame) |
765 | 830 Lisp_Object frame; |
286 | 831 { |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
832 Lisp_Object window; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
833 |
765 | 834 if (NILP (frame)) |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
835 window = SELECTED_FRAME ()->root_window; |
454 | 836 else |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
837 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
838 CHECK_LIVE_FRAME (frame); |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
839 window = XFRAME (frame)->root_window; |
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
840 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
841 |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
842 return window; |
286 | 843 } |
844 | |
765 | 845 DEFUN ("frame-selected-window", Fframe_selected_window, |
846 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
|
847 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
|
848 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
|
849 (frame) |
765 | 850 Lisp_Object frame; |
286 | 851 { |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
852 Lisp_Object window; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
853 |
765 | 854 if (NILP (frame)) |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
855 window = SELECTED_FRAME ()->selected_window; |
454 | 856 else |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
857 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
858 CHECK_LIVE_FRAME (frame); |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
859 window = XFRAME (frame)->selected_window; |
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
860 } |
286 | 861 |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
862 return window; |
286 | 863 } |
864 | |
7055
5e4906d964b8
(Fset_frame_selected_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7025
diff
changeset
|
865 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
|
866 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
|
867 doc: /* Set the selected window of frame object FRAME to WINDOW. |
56517
c9c9e7be868f
(Fselect_frame, Fset_frame_selected_window)
Luc Teirlinck <teirllm@auburn.edu>
parents:
56453
diff
changeset
|
868 Return WINDOW. |
40105
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
869 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
|
870 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
|
871 (frame, window) |
7055
5e4906d964b8
(Fset_frame_selected_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7025
diff
changeset
|
872 Lisp_Object frame, window; |
5e4906d964b8
(Fset_frame_selected_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7025
diff
changeset
|
873 { |
5e4906d964b8
(Fset_frame_selected_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7025
diff
changeset
|
874 if (NILP (frame)) |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
875 frame = selected_frame; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
876 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
877 CHECK_LIVE_FRAME (frame); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
878 CHECK_LIVE_WINDOW (window); |
7055
5e4906d964b8
(Fset_frame_selected_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7025
diff
changeset
|
879 |
5e4906d964b8
(Fset_frame_selected_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7025
diff
changeset
|
880 if (! EQ (frame, WINDOW_FRAME (XWINDOW (window)))) |
5e4906d964b8
(Fset_frame_selected_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7025
diff
changeset
|
881 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
|
882 |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
883 if (EQ (frame, selected_frame)) |
51048
7ac9c3bea5ea
(Fselect_window): Add optional arg `norecord'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50390
diff
changeset
|
884 return Fselect_window (window, Qnil); |
7055
5e4906d964b8
(Fset_frame_selected_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7025
diff
changeset
|
885 |
5e4906d964b8
(Fset_frame_selected_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7025
diff
changeset
|
886 return XFRAME (frame)->selected_window = window; |
5e4906d964b8
(Fset_frame_selected_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7025
diff
changeset
|
887 } |
5e4906d964b8
(Fset_frame_selected_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7025
diff
changeset
|
888 |
765 | 889 DEFUN ("frame-list", Fframe_list, Sframe_list, |
286 | 890 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
|
891 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
|
892 () |
286 | 893 { |
36971
3819e613c7c2
(Fframe_list): Don't return a tooltip frame.
Gerd Moellmann <gerd@gnu.org>
parents:
36810
diff
changeset
|
894 Lisp_Object frames; |
3819e613c7c2
(Fframe_list): Don't return a tooltip frame.
Gerd Moellmann <gerd@gnu.org>
parents:
36810
diff
changeset
|
895 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
|
896 #ifdef HAVE_WINDOW_SYSTEM |
36971
3819e613c7c2
(Fframe_list): Don't return a tooltip frame.
Gerd Moellmann <gerd@gnu.org>
parents:
36810
diff
changeset
|
897 if (FRAMEP (tip_frame)) |
3819e613c7c2
(Fframe_list): Don't return a tooltip frame.
Gerd Moellmann <gerd@gnu.org>
parents:
36810
diff
changeset
|
898 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
|
899 #endif |
36971
3819e613c7c2
(Fframe_list): Don't return a tooltip frame.
Gerd Moellmann <gerd@gnu.org>
parents:
36810
diff
changeset
|
900 return frames; |
286 | 901 } |
902 | |
765 | 903 /* Return the next frame in the frame list after FRAME. |
904 If MINIBUF is nil, exclude minibuffer-only frames. | |
8168
32fbb27091d4
(next_frame, prev_frame):
Richard M. Stallman <rms@gnu.org>
parents:
8099
diff
changeset
|
905 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
|
906 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
|
907 If MINIBUF is `visible', include all visible frames. |
8168
32fbb27091d4
(next_frame, prev_frame):
Richard M. Stallman <rms@gnu.org>
parents:
8099
diff
changeset
|
908 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
|
909 Otherwise, include all frames. */ |
128dc040e121
(next_frame, prev_frame): If MINIBUF is `visible',
Richard M. Stallman <rms@gnu.org>
parents:
6157
diff
changeset
|
910 |
65976
c332e9c9e66d
(Fredirect_frame_focus): Fix typos in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
64770
diff
changeset
|
911 static Lisp_Object |
765 | 912 next_frame (frame, minibuf) |
913 Lisp_Object frame; | |
454 | 914 Lisp_Object minibuf; |
286 | 915 { |
916 Lisp_Object tail; | |
917 int passed = 0; | |
918 | |
765 | 919 /* There must always be at least one frame in Vframe_list. */ |
920 if (! CONSP (Vframe_list)) | |
454 | 921 abort (); |
922 | |
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1809
diff
changeset
|
923 /* 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
|
924 forever. Forestall that. */ |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
925 CHECK_LIVE_FRAME (frame); |
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1809
diff
changeset
|
926 |
286 | 927 while (1) |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
928 for (tail = Vframe_list; CONSP (tail); tail = XCDR (tail)) |
286 | 929 { |
6500
551bff5cffde
(next_frame, prev_frame, other_visible_frames, Fdelete_frame): Use assignment,
Karl Heuer <kwzh@gnu.org>
parents:
6486
diff
changeset
|
930 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
|
931 |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
932 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
|
933 |
7149fc03ea56
(next_frame, prev_frame): Consider only frames on same kbd.
Richard M. Stallman <rms@gnu.org>
parents:
12286
diff
changeset
|
934 if (passed |
7149fc03ea56
(next_frame, prev_frame): Consider only frames on same kbd.
Richard M. Stallman <rms@gnu.org>
parents:
12286
diff
changeset
|
935 && FRAME_KBOARD (XFRAME (f)) == FRAME_KBOARD (XFRAME (frame))) |
363 | 936 { |
1118
a43d53261506
* frame.c (choose_minibuf_frame): abort if the selected frame has
Jim Blandy <jimb@redhat.com>
parents:
1006
diff
changeset
|
937 /* 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
|
938 |
a43d53261506
* frame.c (choose_minibuf_frame): abort if the selected frame has
Jim Blandy <jimb@redhat.com>
parents:
1006
diff
changeset
|
939 /* 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
|
940 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
|
941 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
|
942 return f; |
335 | 943 |
1118
a43d53261506
* frame.c (choose_minibuf_frame): abort if the selected frame has
Jim Blandy <jimb@redhat.com>
parents:
1006
diff
changeset
|
944 /* 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
|
945 if (NILP (minibuf)) |
a43d53261506
* frame.c (choose_minibuf_frame): abort if the selected frame has
Jim Blandy <jimb@redhat.com>
parents:
1006
diff
changeset
|
946 { |
a43d53261506
* frame.c (choose_minibuf_frame): abort if the selected frame has
Jim Blandy <jimb@redhat.com>
parents:
1006
diff
changeset
|
947 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
|
948 return f; |
a43d53261506
* frame.c (choose_minibuf_frame): abort if the selected frame has
Jim Blandy <jimb@redhat.com>
parents:
1006
diff
changeset
|
949 } |
6246
128dc040e121
(next_frame, prev_frame): If MINIBUF is `visible',
Richard M. Stallman <rms@gnu.org>
parents:
6157
diff
changeset
|
950 else if (EQ (minibuf, Qvisible)) |
128dc040e121
(next_frame, prev_frame): If MINIBUF is `visible',
Richard M. Stallman <rms@gnu.org>
parents:
6157
diff
changeset
|
951 { |
128dc040e121
(next_frame, prev_frame): If MINIBUF is `visible',
Richard M. Stallman <rms@gnu.org>
parents:
6157
diff
changeset
|
952 FRAME_SAMPLE_VISIBILITY (XFRAME (f)); |
128dc040e121
(next_frame, prev_frame): If MINIBUF is `visible',
Richard M. Stallman <rms@gnu.org>
parents:
6157
diff
changeset
|
953 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
|
954 return f; |
128dc040e121
(next_frame, prev_frame): If MINIBUF is `visible',
Richard M. Stallman <rms@gnu.org>
parents:
6157
diff
changeset
|
955 } |
29987
c38afaed3dd0
(next_frame): Don't check frame-focus redirection in
Gerd Moellmann <gerd@gnu.org>
parents:
29616
diff
changeset
|
956 else if (INTEGERP (minibuf) && XINT (minibuf) == 0) |
8168
32fbb27091d4
(next_frame, prev_frame):
Richard M. Stallman <rms@gnu.org>
parents:
8099
diff
changeset
|
957 { |
32fbb27091d4
(next_frame, prev_frame):
Richard M. Stallman <rms@gnu.org>
parents:
8099
diff
changeset
|
958 FRAME_SAMPLE_VISIBILITY (XFRAME (f)); |
32fbb27091d4
(next_frame, prev_frame):
Richard M. Stallman <rms@gnu.org>
parents:
8099
diff
changeset
|
959 if (FRAME_VISIBLE_P (XFRAME (f)) |
32fbb27091d4
(next_frame, prev_frame):
Richard M. Stallman <rms@gnu.org>
parents:
8099
diff
changeset
|
960 || FRAME_ICONIFIED_P (XFRAME (f))) |
32fbb27091d4
(next_frame, prev_frame):
Richard M. Stallman <rms@gnu.org>
parents:
8099
diff
changeset
|
961 return f; |
32fbb27091d4
(next_frame, prev_frame):
Richard M. Stallman <rms@gnu.org>
parents:
8099
diff
changeset
|
962 } |
6246
128dc040e121
(next_frame, prev_frame): If MINIBUF is `visible',
Richard M. Stallman <rms@gnu.org>
parents:
6157
diff
changeset
|
963 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
|
964 { |
8168
32fbb27091d4
(next_frame, prev_frame):
Richard M. Stallman <rms@gnu.org>
parents:
8099
diff
changeset
|
965 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
|
966 || 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
|
967 || EQ (WINDOW_FRAME (XWINDOW (minibuf)), |
ec33931795c4
(next_frame, prev_frame): If MINIBUF is a window,
Gerd Moellmann <gerd@gnu.org>
parents:
29987
diff
changeset
|
968 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
|
969 return f; |
a43d53261506
* frame.c (choose_minibuf_frame): abort if the selected frame has
Jim Blandy <jimb@redhat.com>
parents:
1006
diff
changeset
|
970 } |
a43d53261506
* frame.c (choose_minibuf_frame): abort if the selected frame has
Jim Blandy <jimb@redhat.com>
parents:
1006
diff
changeset
|
971 else |
765 | 972 return f; |
363 | 973 } |
286 | 974 |
1118
a43d53261506
* frame.c (choose_minibuf_frame): abort if the selected frame has
Jim Blandy <jimb@redhat.com>
parents:
1006
diff
changeset
|
975 if (EQ (frame, f)) |
286 | 976 passed++; |
977 } | |
978 } | |
979 | |
765 | 980 /* Return the previous frame in the frame list before FRAME. |
981 If MINIBUF is nil, exclude minibuffer-only frames. | |
8168
32fbb27091d4
(next_frame, prev_frame):
Richard M. Stallman <rms@gnu.org>
parents:
8099
diff
changeset
|
982 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
|
983 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
|
984 If MINIBUF is `visible', include all visible frames. |
8168
32fbb27091d4
(next_frame, prev_frame):
Richard M. Stallman <rms@gnu.org>
parents:
8099
diff
changeset
|
985 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
|
986 Otherwise, include all frames. */ |
128dc040e121
(next_frame, prev_frame): If MINIBUF is `visible',
Richard M. Stallman <rms@gnu.org>
parents:
6157
diff
changeset
|
987 |
65976
c332e9c9e66d
(Fredirect_frame_focus): Fix typos in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
64770
diff
changeset
|
988 static Lisp_Object |
765 | 989 prev_frame (frame, minibuf) |
990 Lisp_Object frame; | |
454 | 991 Lisp_Object minibuf; |
286 | 992 { |
993 Lisp_Object tail; | |
994 Lisp_Object prev; | |
995 | |
765 | 996 /* There must always be at least one frame in Vframe_list. */ |
997 if (! CONSP (Vframe_list)) | |
454 | 998 abort (); |
999 | |
286 | 1000 prev = Qnil; |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
1001 for (tail = Vframe_list; CONSP (tail); tail = XCDR (tail)) |
454 | 1002 { |
6500
551bff5cffde
(next_frame, prev_frame, other_visible_frames, Fdelete_frame): Use assignment,
Karl Heuer <kwzh@gnu.org>
parents:
6486
diff
changeset
|
1003 Lisp_Object f; |
454 | 1004 |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
1005 f = XCAR (tail); |
9127
0b4836daa8e1
(Fframep, make_frame_without_minibuffer, do_switch_frame, prev_frame,
Karl Heuer <kwzh@gnu.org>
parents:
9032
diff
changeset
|
1006 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
|
1007 abort (); |
454 | 1008 |
1118
a43d53261506
* frame.c (choose_minibuf_frame): abort if the selected frame has
Jim Blandy <jimb@redhat.com>
parents:
1006
diff
changeset
|
1009 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
|
1010 return prev; |
454 | 1011 |
12379
7149fc03ea56
(next_frame, prev_frame): Consider only frames on same kbd.
Richard M. Stallman <rms@gnu.org>
parents:
12286
diff
changeset
|
1012 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
|
1013 { |
12379
7149fc03ea56
(next_frame, prev_frame): Consider only frames on same kbd.
Richard M. Stallman <rms@gnu.org>
parents:
12286
diff
changeset
|
1014 /* 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
|
1015 according to minibuf. */ |
7149fc03ea56
(next_frame, prev_frame): Consider only frames on same kbd.
Richard M. Stallman <rms@gnu.org>
parents:
12286
diff
changeset
|
1016 if (NILP (minibuf)) |
7149fc03ea56
(next_frame, prev_frame): Consider only frames on same kbd.
Richard M. Stallman <rms@gnu.org>
parents:
12286
diff
changeset
|
1017 { |
7149fc03ea56
(next_frame, prev_frame): Consider only frames on same kbd.
Richard M. Stallman <rms@gnu.org>
parents:
12286
diff
changeset
|
1018 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
|
1019 prev = f; |
7149fc03ea56
(next_frame, prev_frame): Consider only frames on same kbd.
Richard M. Stallman <rms@gnu.org>
parents:
12286
diff
changeset
|
1020 } |
7149fc03ea56
(next_frame, prev_frame): Consider only frames on same kbd.
Richard M. Stallman <rms@gnu.org>
parents:
12286
diff
changeset
|
1021 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
|
1022 { |
7149fc03ea56
(next_frame, prev_frame): Consider only frames on same kbd.
Richard M. Stallman <rms@gnu.org>
parents:
12286
diff
changeset
|
1023 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
|
1024 || 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
|
1025 || EQ (WINDOW_FRAME (XWINDOW (minibuf)), |
ec33931795c4
(next_frame, prev_frame): If MINIBUF is a window,
Gerd Moellmann <gerd@gnu.org>
parents:
29987
diff
changeset
|
1026 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
|
1027 prev = f; |
7149fc03ea56
(next_frame, prev_frame): Consider only frames on same kbd.
Richard M. Stallman <rms@gnu.org>
parents:
12286
diff
changeset
|
1028 } |
7149fc03ea56
(next_frame, prev_frame): Consider only frames on same kbd.
Richard M. Stallman <rms@gnu.org>
parents:
12286
diff
changeset
|
1029 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
|
1030 { |
7149fc03ea56
(next_frame, prev_frame): Consider only frames on same kbd.
Richard M. Stallman <rms@gnu.org>
parents:
12286
diff
changeset
|
1031 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
|
1032 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
|
1033 prev = f; |
7149fc03ea56
(next_frame, prev_frame): Consider only frames on same kbd.
Richard M. Stallman <rms@gnu.org>
parents:
12286
diff
changeset
|
1034 } |
7149fc03ea56
(next_frame, prev_frame): Consider only frames on same kbd.
Richard M. Stallman <rms@gnu.org>
parents:
12286
diff
changeset
|
1035 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
|
1036 { |
7149fc03ea56
(next_frame, prev_frame): Consider only frames on same kbd.
Richard M. Stallman <rms@gnu.org>
parents:
12286
diff
changeset
|
1037 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
|
1038 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
|
1039 || 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
|
1040 prev = f; |
7149fc03ea56
(next_frame, prev_frame): Consider only frames on same kbd.
Richard M. Stallman <rms@gnu.org>
parents:
12286
diff
changeset
|
1041 } |
7149fc03ea56
(next_frame, prev_frame): Consider only frames on same kbd.
Richard M. Stallman <rms@gnu.org>
parents:
12286
diff
changeset
|
1042 else |
1118
a43d53261506
* frame.c (choose_minibuf_frame): abort if the selected frame has
Jim Blandy <jimb@redhat.com>
parents:
1006
diff
changeset
|
1043 prev = f; |
454 | 1044 } |
1118
a43d53261506
* frame.c (choose_minibuf_frame): abort if the selected frame has
Jim Blandy <jimb@redhat.com>
parents:
1006
diff
changeset
|
1045 } |
454 | 1046 |
1118
a43d53261506
* frame.c (choose_minibuf_frame): abort if the selected frame has
Jim Blandy <jimb@redhat.com>
parents:
1006
diff
changeset
|
1047 /* 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
|
1048 if (NILP (prev)) |
a43d53261506
* frame.c (choose_minibuf_frame): abort if the selected frame has
Jim Blandy <jimb@redhat.com>
parents:
1006
diff
changeset
|
1049 /* 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
|
1050 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
|
1051 return frame; |
a43d53261506
* frame.c (choose_minibuf_frame): abort if the selected frame has
Jim Blandy <jimb@redhat.com>
parents:
1006
diff
changeset
|
1052 else |
a43d53261506
* frame.c (choose_minibuf_frame): abort if the selected frame has
Jim Blandy <jimb@redhat.com>
parents:
1006
diff
changeset
|
1053 /* 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
|
1054 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
|
1055 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
|
1056 return prev; |
286 | 1057 } |
1058 | |
4424
027d3affb2f8
(Fprevious_frame): New function, for parity with Fnext_frame.
Roland McGrath <roland@gnu.org>
parents:
4412
diff
changeset
|
1059 |
765 | 1060 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
|
1061 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
|
1062 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
|
1063 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
|
1064 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
|
1065 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
|
1066 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
|
1067 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
|
1068 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
|
1069 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
|
1070 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
|
1071 (frame, miniframe) |
1251
4e556fda7a4d
* frame.c (Fselect_frame, Fframe_root_window,
Jim Blandy <jimb@redhat.com>
parents:
1118
diff
changeset
|
1072 Lisp_Object frame, miniframe; |
286 | 1073 { |
765 | 1074 if (NILP (frame)) |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
1075 frame = selected_frame; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
1076 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
1077 CHECK_LIVE_FRAME (frame); |
765 | 1078 return next_frame (frame, miniframe); |
286 | 1079 } |
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1809
diff
changeset
|
1080 |
4424
027d3affb2f8
(Fprevious_frame): New function, for parity with Fnext_frame.
Roland McGrath <roland@gnu.org>
parents:
4412
diff
changeset
|
1081 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
|
1082 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
|
1083 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
|
1084 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
|
1085 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
|
1086 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
|
1087 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
|
1088 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
|
1089 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
|
1090 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
|
1091 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
|
1092 (frame, miniframe) |
4424
027d3affb2f8
(Fprevious_frame): New function, for parity with Fnext_frame.
Roland McGrath <roland@gnu.org>
parents:
4412
diff
changeset
|
1093 Lisp_Object frame, miniframe; |
027d3affb2f8
(Fprevious_frame): New function, for parity with Fnext_frame.
Roland McGrath <roland@gnu.org>
parents:
4412
diff
changeset
|
1094 { |
027d3affb2f8
(Fprevious_frame): New function, for parity with Fnext_frame.
Roland McGrath <roland@gnu.org>
parents:
4412
diff
changeset
|
1095 if (NILP (frame)) |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
1096 frame = selected_frame; |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
1097 CHECK_LIVE_FRAME (frame); |
4424
027d3affb2f8
(Fprevious_frame): New function, for parity with Fnext_frame.
Roland McGrath <roland@gnu.org>
parents:
4412
diff
changeset
|
1098 return prev_frame (frame, miniframe); |
027d3affb2f8
(Fprevious_frame): New function, for parity with Fnext_frame.
Roland McGrath <roland@gnu.org>
parents:
4412
diff
changeset
|
1099 } |
286 | 1100 |
5925
806e876cacb4
(Fset_frame_height, Fset_frame_width, Fset_frame_size):
Richard M. Stallman <rms@gnu.org>
parents:
5552
diff
changeset
|
1101 /* 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
|
1102 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
|
1103 (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
|
1104 |
7646
de2c4334fad4
(other_visible_frames): No longer static.
Richard M. Stallman <rms@gnu.org>
parents:
7570
diff
changeset
|
1105 int |
5925
806e876cacb4
(Fset_frame_height, Fset_frame_width, Fset_frame_size):
Richard M. Stallman <rms@gnu.org>
parents:
5552
diff
changeset
|
1106 other_visible_frames (f) |
806e876cacb4
(Fset_frame_height, Fset_frame_width, Fset_frame_size):
Richard M. Stallman <rms@gnu.org>
parents:
5552
diff
changeset
|
1107 FRAME_PTR f; |
806e876cacb4
(Fset_frame_height, Fset_frame_width, Fset_frame_size):
Richard M. Stallman <rms@gnu.org>
parents:
5552
diff
changeset
|
1108 { |
806e876cacb4
(Fset_frame_height, Fset_frame_width, Fset_frame_size):
Richard M. Stallman <rms@gnu.org>
parents:
5552
diff
changeset
|
1109 /* 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
|
1110 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
|
1111 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
|
1112 { |
806e876cacb4
(Fset_frame_height, Fset_frame_width, Fset_frame_size):
Richard M. Stallman <rms@gnu.org>
parents:
5552
diff
changeset
|
1113 Lisp_Object frames; |
806e876cacb4
(Fset_frame_height, Fset_frame_width, Fset_frame_size):
Richard M. Stallman <rms@gnu.org>
parents:
5552
diff
changeset
|
1114 int count = 0; |
806e876cacb4
(Fset_frame_height, Fset_frame_width, Fset_frame_size):
Richard M. Stallman <rms@gnu.org>
parents:
5552
diff
changeset
|
1115 |
806e876cacb4
(Fset_frame_height, Fset_frame_width, Fset_frame_size):
Richard M. Stallman <rms@gnu.org>
parents:
5552
diff
changeset
|
1116 for (frames = Vframe_list; |
806e876cacb4
(Fset_frame_height, Fset_frame_width, Fset_frame_size):
Richard M. Stallman <rms@gnu.org>
parents:
5552
diff
changeset
|
1117 CONSP (frames); |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
1118 frames = XCDR (frames)) |
5925
806e876cacb4
(Fset_frame_height, Fset_frame_width, Fset_frame_size):
Richard M. Stallman <rms@gnu.org>
parents:
5552
diff
changeset
|
1119 { |
6500
551bff5cffde
(next_frame, prev_frame, other_visible_frames, Fdelete_frame): Use assignment,
Karl Heuer <kwzh@gnu.org>
parents:
6486
diff
changeset
|
1120 Lisp_Object this; |
5925
806e876cacb4
(Fset_frame_height, Fset_frame_width, Fset_frame_size):
Richard M. Stallman <rms@gnu.org>
parents:
5552
diff
changeset
|
1121 |
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); |
5925
806e876cacb4
(Fset_frame_height, Fset_frame_width, Fset_frame_size):
Richard M. Stallman <rms@gnu.org>
parents:
5552
diff
changeset
|
1123 /* 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
|
1124 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
|
1125 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
|
1126 #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
|
1127 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
|
1128 { |
9648
14b1481b7c6d
(other_visible_frames): Pass a frame ptr to x_sync.
Richard M. Stallman <rms@gnu.org>
parents:
9572
diff
changeset
|
1129 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
|
1130 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
|
1131 } |
806e876cacb4
(Fset_frame_height, Fset_frame_width, Fset_frame_size):
Richard M. Stallman <rms@gnu.org>
parents:
5552
diff
changeset
|
1132 #endif |
806e876cacb4
(Fset_frame_height, Fset_frame_width, Fset_frame_size):
Richard M. Stallman <rms@gnu.org>
parents:
5552
diff
changeset
|
1133 |
806e876cacb4
(Fset_frame_height, Fset_frame_width, Fset_frame_size):
Richard M. Stallman <rms@gnu.org>
parents:
5552
diff
changeset
|
1134 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
|
1135 || 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
|
1136 /* 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
|
1137 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
|
1138 || (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
|
1139 count++; |
806e876cacb4
(Fset_frame_height, Fset_frame_width, Fset_frame_size):
Richard M. Stallman <rms@gnu.org>
parents:
5552
diff
changeset
|
1140 } |
806e876cacb4
(Fset_frame_height, Fset_frame_width, Fset_frame_size):
Richard M. Stallman <rms@gnu.org>
parents:
5552
diff
changeset
|
1141 return count > 1; |
806e876cacb4
(Fset_frame_height, Fset_frame_width, Fset_frame_size):
Richard M. Stallman <rms@gnu.org>
parents:
5552
diff
changeset
|
1142 } |
806e876cacb4
(Fset_frame_height, Fset_frame_width, Fset_frame_size):
Richard M. Stallman <rms@gnu.org>
parents:
5552
diff
changeset
|
1143 return 1; |
806e876cacb4
(Fset_frame_height, Fset_frame_width, Fset_frame_size):
Richard M. Stallman <rms@gnu.org>
parents:
5552
diff
changeset
|
1144 } |
806e876cacb4
(Fset_frame_height, Fset_frame_width, Fset_frame_size):
Richard M. Stallman <rms@gnu.org>
parents:
5552
diff
changeset
|
1145 |
4341
d07ef5ea3b58
(Fdelete_frame): New arg FORCE allows deletion of last non-invisible frame.
Richard M. Stallman <rms@gnu.org>
parents:
4227
diff
changeset
|
1146 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
|
1147 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
|
1148 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
|
1149 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
|
1150 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
|
1151 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
|
1152 |
47731
755c4233cfba
* frame.c (Vdelete_frame_functions): New variable.
John Paul Wallington <jpw@pobox.com>
parents:
47036
diff
changeset
|
1153 This function runs `delete-frame-functions' before actually deleting the |
755c4233cfba
* frame.c (Vdelete_frame_functions): New variable.
John Paul Wallington <jpw@pobox.com>
parents:
47036
diff
changeset
|
1154 frame, unless the frame is a tooltip. |
755c4233cfba
* frame.c (Vdelete_frame_functions): New variable.
John Paul Wallington <jpw@pobox.com>
parents:
47036
diff
changeset
|
1155 The functions are run with one arg, the frame to be deleted. */) |
40105
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1156 (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
|
1157 Lisp_Object frame, force; |
286 | 1158 { |
765 | 1159 struct frame *f; |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
1160 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
|
1161 int minibuffer_selected; |
286 | 1162 |
765 | 1163 if (EQ (frame, Qnil)) |
286 | 1164 { |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
1165 f = sf; |
9268
cb55d0155265
(make_minibuffer_frame, make_terminal_frame, Fselected_frame,
Karl Heuer <kwzh@gnu.org>
parents:
9214
diff
changeset
|
1166 XSETFRAME (frame, f); |
286 | 1167 } |
1168 else | |
1169 { | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
1170 CHECK_FRAME (frame); |
765 | 1171 f = XFRAME (frame); |
286 | 1172 } |
1173 | |
765 | 1174 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
|
1175 return Qnil; |
454 | 1176 |
35660
b9366f467430
* alloc.c (allocate_string) [macintosh]: Call check_string_bytes
Andrew Choi <akochoi@shaw.ca>
parents:
35611
diff
changeset
|
1177 if (NILP (force) && !other_visible_frames (f) |
44890
01b93e5e53a7
Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents:
43717
diff
changeset
|
1178 #ifdef MAC_OS8 |
35660
b9366f467430
* alloc.c (allocate_string) [macintosh]: Call check_string_bytes
Andrew Choi <akochoi@shaw.ca>
parents:
35611
diff
changeset
|
1179 /* 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
|
1180 created. */ |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46285
diff
changeset
|
1181 && strcmp (SDATA (f->name), "F1") != 0 |
35660
b9366f467430
* alloc.c (allocate_string) [macintosh]: Call check_string_bytes
Andrew Choi <akochoi@shaw.ca>
parents:
35611
diff
changeset
|
1182 #endif |
b9366f467430
* alloc.c (allocate_string) [macintosh]: Call check_string_bytes
Andrew Choi <akochoi@shaw.ca>
parents:
35611
diff
changeset
|
1183 ) |
5925
806e876cacb4
(Fset_frame_height, Fset_frame_width, Fset_frame_size):
Richard M. Stallman <rms@gnu.org>
parents:
5552
diff
changeset
|
1184 error ("Attempt to delete the sole visible or iconified frame"); |
286 | 1185 |
18945
7f491075707a
(Fdelete_frame): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
18698
diff
changeset
|
1186 #if 0 |
7f491075707a
(Fdelete_frame): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
18698
diff
changeset
|
1187 /* 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
|
1188 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
|
1189 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
|
1190 error ("Attempt to delete the only frame"); |
18945
7f491075707a
(Fdelete_frame): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
18698
diff
changeset
|
1191 #endif |
18698
52271ad26a1d
(Fdelete_frame): Always err for deleting the only frame.
Richard M. Stallman <rms@gnu.org>
parents:
18380
diff
changeset
|
1192 |
765 | 1193 /* Does this frame have a minibuffer, and is it the surrogate |
1194 minibuffer for any other frame? */ | |
965
0eb68c6c452a
* frame.c (Qheight, Qicon, Qmodeline, Qname, Qnone, Qonly,
Jim Blandy <jimb@redhat.com>
parents:
886
diff
changeset
|
1195 if (FRAME_HAS_MINIBUF_P (XFRAME (frame))) |
363 | 1196 { |
765 | 1197 Lisp_Object frames; |
708 | 1198 |
765 | 1199 for (frames = Vframe_list; |
1200 CONSP (frames); | |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
1201 frames = XCDR (frames)) |
708 | 1202 { |
6157
9422e430f067
(Fdelete_frame): Don't initialize a Lisp_Object.
Richard M. Stallman <rms@gnu.org>
parents:
6130
diff
changeset
|
1203 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
|
1204 this = XCAR (frames); |
363 | 1205 |
765 | 1206 if (! EQ (this, frame) |
1207 && EQ (frame, | |
6157
9422e430f067
(Fdelete_frame): Don't initialize a Lisp_Object.
Richard M. Stallman <rms@gnu.org>
parents:
6130
diff
changeset
|
1208 WINDOW_FRAME (XWINDOW |
9422e430f067
(Fdelete_frame): Don't initialize a Lisp_Object.
Richard M. Stallman <rms@gnu.org>
parents:
6130
diff
changeset
|
1209 (FRAME_MINIBUF_WINDOW (XFRAME (this)))))) |
765 | 1210 error ("Attempt to delete a surrogate minibuffer frame"); |
708 | 1211 } |
286 | 1212 } |
1213 | |
47731
755c4233cfba
* frame.c (Vdelete_frame_functions): New variable.
John Paul Wallington <jpw@pobox.com>
parents:
47036
diff
changeset
|
1214 /* Run `delete-frame-functions' unless frame is a tooltip. */ |
755c4233cfba
* frame.c (Vdelete_frame_functions): New variable.
John Paul Wallington <jpw@pobox.com>
parents:
47036
diff
changeset
|
1215 if (!NILP (Vrun_hooks) |
755c4233cfba
* frame.c (Vdelete_frame_functions): New variable.
John Paul Wallington <jpw@pobox.com>
parents:
47036
diff
changeset
|
1216 && NILP (Fframe_parameter (frame, intern ("tooltip")))) |
32909
44cb0900a858
(Fdelete_frame): Doc fix. Move running the hook
Gerd Moellmann <gerd@gnu.org>
parents:
32907
diff
changeset
|
1217 { |
44cb0900a858
(Fdelete_frame): Doc fix. Move running the hook
Gerd Moellmann <gerd@gnu.org>
parents:
32907
diff
changeset
|
1218 Lisp_Object args[2]; |
47731
755c4233cfba
* frame.c (Vdelete_frame_functions): New variable.
John Paul Wallington <jpw@pobox.com>
parents:
47036
diff
changeset
|
1219 args[0] = intern ("delete-frame-functions"); |
32909
44cb0900a858
(Fdelete_frame): Doc fix. Move running the hook
Gerd Moellmann <gerd@gnu.org>
parents:
32907
diff
changeset
|
1220 args[1] = frame; |
44cb0900a858
(Fdelete_frame): Doc fix. Move running the hook
Gerd Moellmann <gerd@gnu.org>
parents:
32907
diff
changeset
|
1221 Frun_hook_with_args (2, args); |
44cb0900a858
(Fdelete_frame): Doc fix. Move running the hook
Gerd Moellmann <gerd@gnu.org>
parents:
32907
diff
changeset
|
1222 } |
44cb0900a858
(Fdelete_frame): Doc fix. Move running the hook
Gerd Moellmann <gerd@gnu.org>
parents:
32907
diff
changeset
|
1223 |
12222
7286ed64badd
(Fdelete_frame): If the minibuf window was selected, make that remain so.
Richard M. Stallman <rms@gnu.org>
parents:
12010
diff
changeset
|
1224 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
|
1225 |
765 | 1226 /* Don't let the frame remain selected. */ |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
1227 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
|
1228 { |
7149fc03ea56
(next_frame, prev_frame): Consider only frames on same kbd.
Richard M. Stallman <rms@gnu.org>
parents:
12286
diff
changeset
|
1229 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
|
1230 |
7149fc03ea56
(next_frame, prev_frame): Consider only frames on same kbd.
Richard M. Stallman <rms@gnu.org>
parents:
12286
diff
changeset
|
1231 /* 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
|
1232 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
|
1233 |
7149fc03ea56
(next_frame, prev_frame): Consider only frames on same kbd.
Richard M. Stallman <rms@gnu.org>
parents:
12286
diff
changeset
|
1234 /* 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
|
1235 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
|
1236 { |
7149fc03ea56
(next_frame, prev_frame): Consider only frames on same kbd.
Richard M. Stallman <rms@gnu.org>
parents:
12286
diff
changeset
|
1237 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
|
1238 { |
7149fc03ea56
(next_frame, prev_frame): Consider only frames on same kbd.
Richard M. Stallman <rms@gnu.org>
parents:
12286
diff
changeset
|
1239 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
|
1240 break; |
7149fc03ea56
(next_frame, prev_frame): Consider only frames on same kbd.
Richard M. Stallman <rms@gnu.org>
parents:
12286
diff
changeset
|
1241 } |
7149fc03ea56
(next_frame, prev_frame): Consider only frames on same kbd.
Richard M. Stallman <rms@gnu.org>
parents:
12286
diff
changeset
|
1242 } |
7149fc03ea56
(next_frame, prev_frame): Consider only frames on same kbd.
Richard M. Stallman <rms@gnu.org>
parents:
12286
diff
changeset
|
1243 |
36810
a9485f8e43d6
(do_switch_frame): Remove unused parameter NO_EVENT, add
Gerd Moellmann <gerd@gnu.org>
parents:
36804
diff
changeset
|
1244 do_switch_frame (frame1, 0, 1); |
25736
84179b4e7743
(Fdelete_frame): Correct local variable pointing to
Gerd Moellmann <gerd@gnu.org>
parents:
25710
diff
changeset
|
1245 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
|
1246 } |
286 | 1247 |
765 | 1248 /* Don't allow minibuf_window to remain on a deleted frame. */ |
1249 if (EQ (f->minibuffer_window, minibuf_window)) | |
286 | 1250 { |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
1251 Fset_window_buffer (sf->minibuffer_window, |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
1252 XWINDOW (minibuf_window)->buffer, Qnil); |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
1253 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
|
1254 |
7286ed64badd
(Fdelete_frame): If the minibuf window was selected, make that remain so.
Richard M. Stallman <rms@gnu.org>
parents:
12010
diff
changeset
|
1255 /* 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
|
1256 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
|
1257 if (minibuffer_selected) |
51048
7ac9c3bea5ea
(Fselect_window): Add optional arg `norecord'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50390
diff
changeset
|
1258 Fselect_window (minibuf_window, Qnil); |
286 | 1259 } |
1260 | |
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
|
1261 /* 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
|
1262 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
|
1263 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
|
1264 |
8099
a06382fd175d
(Fdelete_frame): Call x_clear_frame_selections.
Richard M. Stallman <rms@gnu.org>
parents:
8054
diff
changeset
|
1265 /* 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
|
1266 #ifdef HAVE_X_WINDOWS |
a06382fd175d
(Fdelete_frame): Call x_clear_frame_selections.
Richard M. Stallman <rms@gnu.org>
parents:
8054
diff
changeset
|
1267 if (FRAME_X_P (f)) |
a06382fd175d
(Fdelete_frame): Call x_clear_frame_selections.
Richard M. Stallman <rms@gnu.org>
parents:
8054
diff
changeset
|
1268 x_clear_frame_selections (f); |
a06382fd175d
(Fdelete_frame): Call x_clear_frame_selections.
Richard M. Stallman <rms@gnu.org>
parents:
8054
diff
changeset
|
1269 #endif |
61784
64c5a821e9cd
(Fdelete_frame) [MAC_OS]: Call x_clear_frame_selections.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
60754
diff
changeset
|
1270 #ifdef MAC_OS |
64c5a821e9cd
(Fdelete_frame) [MAC_OS]: Call x_clear_frame_selections.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
60754
diff
changeset
|
1271 if (FRAME_MAC_P (f)) |
64c5a821e9cd
(Fdelete_frame) [MAC_OS]: Call x_clear_frame_selections.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
60754
diff
changeset
|
1272 x_clear_frame_selections (f); |
64c5a821e9cd
(Fdelete_frame) [MAC_OS]: Call x_clear_frame_selections.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
60754
diff
changeset
|
1273 #endif |
8099
a06382fd175d
(Fdelete_frame): Call x_clear_frame_selections.
Richard M. Stallman <rms@gnu.org>
parents:
8054
diff
changeset
|
1274 |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
1275 /* Free glyphs. |
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
1276 This function must be called before the window tree of the |
25030
c69d9e48269b
(make_frame): Set n_current_toolbar_items to 0.
Gerd Moellmann <gerd@gnu.org>
parents:
23746
diff
changeset
|
1277 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
|
1278 memory. */ |
c69d9e48269b
(make_frame): Set n_current_toolbar_items to 0.
Gerd Moellmann <gerd@gnu.org>
parents:
23746
diff
changeset
|
1279 free_glyphs (f); |
c69d9e48269b
(make_frame): Set n_current_toolbar_items to 0.
Gerd Moellmann <gerd@gnu.org>
parents:
23746
diff
changeset
|
1280 |
1680
ea9f3949f153
* frame.c (Fdelete_frame): Delete all the windows in the frame's
Jim Blandy <jimb@redhat.com>
parents:
1652
diff
changeset
|
1281 /* 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
|
1282 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
|
1283 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
|
1284 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
|
1285 |
765 | 1286 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
|
1287 FRAME_SET_VISIBLE (f, 0); |
286 | 1288 |
11495
da1a40d86231
(Fdelete_frame): Free f->namebuf.
Karl Heuer <kwzh@gnu.org>
parents:
11494
diff
changeset
|
1289 if (f->namebuf) |
25030
c69d9e48269b
(make_frame): Set n_current_toolbar_items to 0.
Gerd Moellmann <gerd@gnu.org>
parents:
23746
diff
changeset
|
1290 xfree (f->namebuf); |
52753
551e8ebadb62
Fix memory leaks (from YAMAMOTO Mitsuharu)
Jan Djärv <jan.h.d@swipnet.se>
parents:
52752
diff
changeset
|
1291 if (f->decode_mode_spec_buffer) |
551e8ebadb62
Fix memory leaks (from YAMAMOTO Mitsuharu)
Jan Djärv <jan.h.d@swipnet.se>
parents:
52752
diff
changeset
|
1292 xfree (f->decode_mode_spec_buffer); |
8666
844edbc22875
(Fdelete_frame): Free the frame's glyphs arrays.
Richard M. Stallman <rms@gnu.org>
parents:
8586
diff
changeset
|
1293 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
|
1294 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
|
1295 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
|
1296 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
|
1297 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
|
1298 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
|
1299 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
|
1300 xfree (FRAME_DELETE_COST (f)); |
17573
bfd86808adcc
(Fdelete_frame): Free FRAME_MESSAGE_BUF.
Richard M. Stallman <rms@gnu.org>
parents:
17235
diff
changeset
|
1301 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
|
1302 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
|
1303 |
1809
69b3ee873a9b
* frame.c (Fdelete_frame): Clear the frame's display after calling
Jim Blandy <jimb@redhat.com>
parents:
1784
diff
changeset
|
1304 /* 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
|
1305 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
|
1306 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
|
1307 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
|
1308 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
|
1309 |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1809
diff
changeset
|
1310 /* 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
|
1311 #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
|
1312 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
|
1313 x_destroy_window (f); |
363 | 1314 #endif |
1315 | |
12667
a3466dad7d6d
Renamings: frame->display => frame->output, struct x_display -> sruct x_output.
Richard M. Stallman <rms@gnu.org>
parents:
12630
diff
changeset
|
1316 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
|
1317 |
765 | 1318 /* If we've deleted the last_nonminibuf_frame, then try to find |
363 | 1319 another one. */ |
765 | 1320 if (f == last_nonminibuf_frame) |
363 | 1321 { |
765 | 1322 Lisp_Object frames; |
708 | 1323 |
765 | 1324 last_nonminibuf_frame = 0; |
363 | 1325 |
765 | 1326 for (frames = Vframe_list; |
1327 CONSP (frames); | |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
1328 frames = XCDR (frames)) |
363 | 1329 { |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
1330 f = XFRAME (XCAR (frames)); |
765 | 1331 if (!FRAME_MINIBUF_ONLY_P (f)) |
363 | 1332 { |
765 | 1333 last_nonminibuf_frame = f; |
363 | 1334 break; |
1335 } | |
1336 } | |
1337 } | |
286 | 1338 |
56453
b8b142a8e2c6
(Fdelete_frame): If we're in single_bboard_state on
Richard M. Stallman <rms@gnu.org>
parents:
53072
diff
changeset
|
1339 /* If there's no other frame on the same kboard, get out of |
b8b142a8e2c6
(Fdelete_frame): If we're in single_bboard_state on
Richard M. Stallman <rms@gnu.org>
parents:
53072
diff
changeset
|
1340 single-kboard state if we're in it for this kboard. */ |
b8b142a8e2c6
(Fdelete_frame): If we're in single_bboard_state on
Richard M. Stallman <rms@gnu.org>
parents:
53072
diff
changeset
|
1341 { |
b8b142a8e2c6
(Fdelete_frame): If we're in single_bboard_state on
Richard M. Stallman <rms@gnu.org>
parents:
53072
diff
changeset
|
1342 Lisp_Object frames; |
b8b142a8e2c6
(Fdelete_frame): If we're in single_bboard_state on
Richard M. Stallman <rms@gnu.org>
parents:
53072
diff
changeset
|
1343 /* Some frame we found on the same kboard, or nil if there are none. */ |
b8b142a8e2c6
(Fdelete_frame): If we're in single_bboard_state on
Richard M. Stallman <rms@gnu.org>
parents:
53072
diff
changeset
|
1344 Lisp_Object frame_on_same_kboard; |
b8b142a8e2c6
(Fdelete_frame): If we're in single_bboard_state on
Richard M. Stallman <rms@gnu.org>
parents:
53072
diff
changeset
|
1345 |
b8b142a8e2c6
(Fdelete_frame): If we're in single_bboard_state on
Richard M. Stallman <rms@gnu.org>
parents:
53072
diff
changeset
|
1346 frame_on_same_kboard = Qnil; |
b8b142a8e2c6
(Fdelete_frame): If we're in single_bboard_state on
Richard M. Stallman <rms@gnu.org>
parents:
53072
diff
changeset
|
1347 |
b8b142a8e2c6
(Fdelete_frame): If we're in single_bboard_state on
Richard M. Stallman <rms@gnu.org>
parents:
53072
diff
changeset
|
1348 for (frames = Vframe_list; |
b8b142a8e2c6
(Fdelete_frame): If we're in single_bboard_state on
Richard M. Stallman <rms@gnu.org>
parents:
53072
diff
changeset
|
1349 CONSP (frames); |
b8b142a8e2c6
(Fdelete_frame): If we're in single_bboard_state on
Richard M. Stallman <rms@gnu.org>
parents:
53072
diff
changeset
|
1350 frames = XCDR (frames)) |
b8b142a8e2c6
(Fdelete_frame): If we're in single_bboard_state on
Richard M. Stallman <rms@gnu.org>
parents:
53072
diff
changeset
|
1351 { |
b8b142a8e2c6
(Fdelete_frame): If we're in single_bboard_state on
Richard M. Stallman <rms@gnu.org>
parents:
53072
diff
changeset
|
1352 Lisp_Object this; |
b8b142a8e2c6
(Fdelete_frame): If we're in single_bboard_state on
Richard M. Stallman <rms@gnu.org>
parents:
53072
diff
changeset
|
1353 struct frame *f1; |
b8b142a8e2c6
(Fdelete_frame): If we're in single_bboard_state on
Richard M. Stallman <rms@gnu.org>
parents:
53072
diff
changeset
|
1354 |
b8b142a8e2c6
(Fdelete_frame): If we're in single_bboard_state on
Richard M. Stallman <rms@gnu.org>
parents:
53072
diff
changeset
|
1355 this = XCAR (frames); |
b8b142a8e2c6
(Fdelete_frame): If we're in single_bboard_state on
Richard M. Stallman <rms@gnu.org>
parents:
53072
diff
changeset
|
1356 if (!FRAMEP (this)) |
b8b142a8e2c6
(Fdelete_frame): If we're in single_bboard_state on
Richard M. Stallman <rms@gnu.org>
parents:
53072
diff
changeset
|
1357 abort (); |
b8b142a8e2c6
(Fdelete_frame): If we're in single_bboard_state on
Richard M. Stallman <rms@gnu.org>
parents:
53072
diff
changeset
|
1358 f1 = XFRAME (this); |
b8b142a8e2c6
(Fdelete_frame): If we're in single_bboard_state on
Richard M. Stallman <rms@gnu.org>
parents:
53072
diff
changeset
|
1359 |
b8b142a8e2c6
(Fdelete_frame): If we're in single_bboard_state on
Richard M. Stallman <rms@gnu.org>
parents:
53072
diff
changeset
|
1360 if (FRAME_KBOARD (f) == FRAME_KBOARD (f1)) |
b8b142a8e2c6
(Fdelete_frame): If we're in single_bboard_state on
Richard M. Stallman <rms@gnu.org>
parents:
53072
diff
changeset
|
1361 frame_on_same_kboard = this; |
b8b142a8e2c6
(Fdelete_frame): If we're in single_bboard_state on
Richard M. Stallman <rms@gnu.org>
parents:
53072
diff
changeset
|
1362 } |
b8b142a8e2c6
(Fdelete_frame): If we're in single_bboard_state on
Richard M. Stallman <rms@gnu.org>
parents:
53072
diff
changeset
|
1363 |
b8b142a8e2c6
(Fdelete_frame): If we're in single_bboard_state on
Richard M. Stallman <rms@gnu.org>
parents:
53072
diff
changeset
|
1364 if (NILP (frame_on_same_kboard)) |
b8b142a8e2c6
(Fdelete_frame): If we're in single_bboard_state on
Richard M. Stallman <rms@gnu.org>
parents:
53072
diff
changeset
|
1365 not_single_kboard_state (FRAME_KBOARD (f)); |
b8b142a8e2c6
(Fdelete_frame): If we're in single_bboard_state on
Richard M. Stallman <rms@gnu.org>
parents:
53072
diff
changeset
|
1366 } |
b8b142a8e2c6
(Fdelete_frame): If we're in single_bboard_state on
Richard M. Stallman <rms@gnu.org>
parents:
53072
diff
changeset
|
1367 |
b8b142a8e2c6
(Fdelete_frame): If we're in single_bboard_state on
Richard M. Stallman <rms@gnu.org>
parents:
53072
diff
changeset
|
1368 |
11906
3ca56969ba07
(Fdelete_frame): When updating Vdefault_minibuffer_frame,
Karl Heuer <kwzh@gnu.org>
parents:
11794
diff
changeset
|
1369 /* 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
|
1370 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
|
1371 frames with other windows. */ |
11779
6234b3610a6f
Vdefault_minibuffer_frame is now part of KBOARD instead
Karl Heuer <kwzh@gnu.org>
parents:
11775
diff
changeset
|
1372 if (EQ (frame, FRAME_KBOARD (f)->Vdefault_minibuffer_frame)) |
708 | 1373 { |
765 | 1374 Lisp_Object frames; |
708 | 1375 |
765 | 1376 /* 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
|
1377 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
|
1378 /* 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
|
1379 Lisp_Object frame_on_same_kboard; |
708 | 1380 |
12380
2c09b3adbb90
(Fdelete_frame): It's ok to have no minibuffer left on
Richard M. Stallman <rms@gnu.org>
parents:
12379
diff
changeset
|
1381 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
|
1382 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
|
1383 |
765 | 1384 for (frames = Vframe_list; |
1385 CONSP (frames); | |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
1386 frames = XCDR (frames)) |
708 | 1387 { |
6500
551bff5cffde
(next_frame, prev_frame, other_visible_frames, Fdelete_frame): Use assignment,
Karl Heuer <kwzh@gnu.org>
parents:
6486
diff
changeset
|
1388 Lisp_Object this; |
11906
3ca56969ba07
(Fdelete_frame): When updating Vdefault_minibuffer_frame,
Karl Heuer <kwzh@gnu.org>
parents:
11794
diff
changeset
|
1389 struct frame *f1; |
708 | 1390 |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
1391 this = XCAR (frames); |
9127
0b4836daa8e1
(Fframep, make_frame_without_minibuffer, do_switch_frame, prev_frame,
Karl Heuer <kwzh@gnu.org>
parents:
9032
diff
changeset
|
1392 if (!FRAMEP (this)) |
708 | 1393 abort (); |
11906
3ca56969ba07
(Fdelete_frame): When updating Vdefault_minibuffer_frame,
Karl Heuer <kwzh@gnu.org>
parents:
11794
diff
changeset
|
1394 f1 = XFRAME (this); |
708 | 1395 |
11906
3ca56969ba07
(Fdelete_frame): When updating Vdefault_minibuffer_frame,
Karl Heuer <kwzh@gnu.org>
parents:
11794
diff
changeset
|
1396 /* Consider only frames on the same kboard |
3ca56969ba07
(Fdelete_frame): When updating Vdefault_minibuffer_frame,
Karl Heuer <kwzh@gnu.org>
parents:
11794
diff
changeset
|
1397 and only those with minibuffers. */ |
3ca56969ba07
(Fdelete_frame): When updating Vdefault_minibuffer_frame,
Karl Heuer <kwzh@gnu.org>
parents:
11794
diff
changeset
|
1398 if (FRAME_KBOARD (f) == FRAME_KBOARD (f1) |
3ca56969ba07
(Fdelete_frame): When updating Vdefault_minibuffer_frame,
Karl Heuer <kwzh@gnu.org>
parents:
11794
diff
changeset
|
1399 && FRAME_HAS_MINIBUF_P (f1)) |
708 | 1400 { |
765 | 1401 frame_with_minibuf = this; |
11906
3ca56969ba07
(Fdelete_frame): When updating Vdefault_minibuffer_frame,
Karl Heuer <kwzh@gnu.org>
parents:
11794
diff
changeset
|
1402 if (FRAME_MINIBUF_ONLY_P (f1)) |
708 | 1403 break; |
1404 } | |
12380
2c09b3adbb90
(Fdelete_frame): It's ok to have no minibuffer left on
Richard M. Stallman <rms@gnu.org>
parents:
12379
diff
changeset
|
1405 |
2c09b3adbb90
(Fdelete_frame): It's ok to have no minibuffer left on
Richard M. Stallman <rms@gnu.org>
parents:
12379
diff
changeset
|
1406 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
|
1407 frame_on_same_kboard = this; |
708 | 1408 } |
1409 | |
12380
2c09b3adbb90
(Fdelete_frame): It's ok to have no minibuffer left on
Richard M. Stallman <rms@gnu.org>
parents:
12379
diff
changeset
|
1410 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
|
1411 { |
2c09b3adbb90
(Fdelete_frame): It's ok to have no minibuffer left on
Richard M. Stallman <rms@gnu.org>
parents:
12379
diff
changeset
|
1412 /* 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
|
1413 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
|
1414 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
|
1415 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
|
1416 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
|
1417 minibuffer frames. */ |
2c09b3adbb90
(Fdelete_frame): It's ok to have no minibuffer left on
Richard M. Stallman <rms@gnu.org>
parents:
12379
diff
changeset
|
1418 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
|
1419 abort (); |
708 | 1420 |
12380
2c09b3adbb90
(Fdelete_frame): It's ok to have no minibuffer left on
Richard M. Stallman <rms@gnu.org>
parents:
12379
diff
changeset
|
1421 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
|
1422 } |
2c09b3adbb90
(Fdelete_frame): It's ok to have no minibuffer left on
Richard M. Stallman <rms@gnu.org>
parents:
12379
diff
changeset
|
1423 else |
2c09b3adbb90
(Fdelete_frame): It's ok to have no minibuffer left on
Richard M. Stallman <rms@gnu.org>
parents:
12379
diff
changeset
|
1424 /* 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
|
1425 FRAME_KBOARD (f)->Vdefault_minibuffer_frame = Qnil; |
708 | 1426 } |
1427 | |
16280
f4833d0bfaaa
(Fdelete_frame): Set update_mode_lines.
Richard M. Stallman <rms@gnu.org>
parents:
16263
diff
changeset
|
1428 /* 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
|
1429 update_mode_lines = 1; |
f4833d0bfaaa
(Fdelete_frame): Set update_mode_lines.
Richard M. Stallman <rms@gnu.org>
parents:
16263
diff
changeset
|
1430 |
286 | 1431 return Qnil; |
1432 } | |
1433 | |
1434 /* Return mouse position in character cell units. */ | |
1435 | |
454 | 1436 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
|
1437 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
|
1438 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
|
1439 upper-left corner. |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1440 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
|
1441 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
|
1442 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
|
1443 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
|
1444 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
|
1445 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
|
1446 () |
286 | 1447 { |
765 | 1448 FRAME_PTR f; |
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1809
diff
changeset
|
1449 Lisp_Object lispy_dummy; |
1989
b1c1ab20f810
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1920
diff
changeset
|
1450 enum scroll_bar_part party_dummy; |
27795
83292274bbd4
(Vmouse_position_function): New variable.
Dave Love <fx@gnu.org>
parents:
27725
diff
changeset
|
1451 Lisp_Object x, y, retval; |
6054
24ffc4bc4067
(Fmouse_position): Convert to glyph units.
Richard M. Stallman <rms@gnu.org>
parents:
6012
diff
changeset
|
1452 int col, row; |
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1809
diff
changeset
|
1453 unsigned long long_dummy; |
27797
da774b48eb7f
(Fmouse_position): GCPRO retval instead of x and y.
Gerd Moellmann <gerd@gnu.org>
parents:
27795
diff
changeset
|
1454 struct gcpro gcpro1; |
286 | 1455 |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
1456 f = SELECTED_FRAME (); |
3658
c2831d419bec
(Fmouse_position): Set up defaults before calling the hook.
Richard M. Stallman <rms@gnu.org>
parents:
3591
diff
changeset
|
1457 x = y = Qnil; |
c2831d419bec
(Fmouse_position): Set up defaults before calling the hook.
Richard M. Stallman <rms@gnu.org>
parents:
3591
diff
changeset
|
1458 |
11025
6c5aef697fbe
(Fmouse_position): Do work only if HAVE_MOUSE.
Karl Heuer <kwzh@gnu.org>
parents:
11017
diff
changeset
|
1459 #ifdef HAVE_MOUSE |
3658
c2831d419bec
(Fmouse_position): Set up defaults before calling the hook.
Richard M. Stallman <rms@gnu.org>
parents:
3591
diff
changeset
|
1460 /* It's okay for the hook to refrain from storing anything. */ |
454 | 1461 if (mouse_position_hook) |
20178
fb9facb8fda0
(Fmouse_pixel_position, Fmouse_position):
Karl Heuer <kwzh@gnu.org>
parents:
20038
diff
changeset
|
1462 (*mouse_position_hook) (&f, -1, |
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1809
diff
changeset
|
1463 &lispy_dummy, &party_dummy, |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1809
diff
changeset
|
1464 &x, &y, |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1809
diff
changeset
|
1465 &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
|
1466 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
|
1467 { |
c976ac5d85ec
(Fmouse_position) [MULTI_FRAME]: Use pixel_to_glyph, not glyph_to_pixel. Skip
Karl Heuer <kwzh@gnu.org>
parents:
6806
diff
changeset
|
1468 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
|
1469 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
|
1470 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
|
1471 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
|
1472 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
|
1473 } |
11025
6c5aef697fbe
(Fmouse_position): Do work only if HAVE_MOUSE.
Karl Heuer <kwzh@gnu.org>
parents:
11017
diff
changeset
|
1474 #endif |
9268
cb55d0155265
(make_minibuffer_frame, make_terminal_frame, Fselected_frame,
Karl Heuer <kwzh@gnu.org>
parents:
9214
diff
changeset
|
1475 XSETFRAME (lispy_dummy, f); |
27795
83292274bbd4
(Vmouse_position_function): New variable.
Dave Love <fx@gnu.org>
parents:
27725
diff
changeset
|
1476 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
|
1477 GCPRO1 (retval); |
27795
83292274bbd4
(Vmouse_position_function): New variable.
Dave Love <fx@gnu.org>
parents:
27725
diff
changeset
|
1478 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
|
1479 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
|
1480 RETURN_UNGCPRO (retval); |
286 | 1481 } |
1482 | |
7025
24e759919770
(Fmouse_pixel_position, Fset_mouse_pixel_position): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
6986
diff
changeset
|
1483 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
|
1484 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
|
1485 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
|
1486 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
|
1487 upper-left corner. |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1488 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
|
1489 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
|
1490 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
|
1491 () |
7025
24e759919770
(Fmouse_pixel_position, Fset_mouse_pixel_position): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
6986
diff
changeset
|
1492 { |
24e759919770
(Fmouse_pixel_position, Fset_mouse_pixel_position): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
6986
diff
changeset
|
1493 FRAME_PTR f; |
24e759919770
(Fmouse_pixel_position, Fset_mouse_pixel_position): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
6986
diff
changeset
|
1494 Lisp_Object lispy_dummy; |
24e759919770
(Fmouse_pixel_position, Fset_mouse_pixel_position): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
6986
diff
changeset
|
1495 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
|
1496 Lisp_Object x, y; |
24e759919770
(Fmouse_pixel_position, Fset_mouse_pixel_position): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
6986
diff
changeset
|
1497 unsigned long long_dummy; |
24e759919770
(Fmouse_pixel_position, Fset_mouse_pixel_position): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
6986
diff
changeset
|
1498 |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
1499 f = SELECTED_FRAME (); |
7025
24e759919770
(Fmouse_pixel_position, Fset_mouse_pixel_position): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
6986
diff
changeset
|
1500 x = y = Qnil; |
24e759919770
(Fmouse_pixel_position, Fset_mouse_pixel_position): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
6986
diff
changeset
|
1501 |
11126
786f1c82a38e
(Fmouse_position--both definitions): Pass 0 for `insist'.
Richard M. Stallman <rms@gnu.org>
parents:
11025
diff
changeset
|
1502 #ifdef HAVE_MOUSE |
7025
24e759919770
(Fmouse_pixel_position, Fset_mouse_pixel_position): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
6986
diff
changeset
|
1503 /* 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
|
1504 if (mouse_position_hook) |
20178
fb9facb8fda0
(Fmouse_pixel_position, Fmouse_position):
Karl Heuer <kwzh@gnu.org>
parents:
20038
diff
changeset
|
1505 (*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
|
1506 &lispy_dummy, &party_dummy, |
24e759919770
(Fmouse_pixel_position, Fset_mouse_pixel_position): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
6986
diff
changeset
|
1507 &x, &y, |
24e759919770
(Fmouse_pixel_position, Fset_mouse_pixel_position): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
6986
diff
changeset
|
1508 &long_dummy); |
11126
786f1c82a38e
(Fmouse_position--both definitions): Pass 0 for `insist'.
Richard M. Stallman <rms@gnu.org>
parents:
11025
diff
changeset
|
1509 #endif |
9268
cb55d0155265
(make_minibuffer_frame, make_terminal_frame, Fselected_frame,
Karl Heuer <kwzh@gnu.org>
parents:
9214
diff
changeset
|
1510 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
|
1511 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
|
1512 } |
24e759919770
(Fmouse_pixel_position, Fset_mouse_pixel_position): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
6986
diff
changeset
|
1513 |
286 | 1514 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
|
1515 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
|
1516 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
|
1517 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
|
1518 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
|
1519 |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1520 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
|
1521 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
|
1522 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
|
1523 (while (not (frame-visible-p frame)) (sleep-for .5)) */) |
765 | 1524 (frame, x, y) |
1525 Lisp_Object frame, x, y; | |
286 | 1526 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
1527 CHECK_LIVE_FRAME (frame); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
1528 CHECK_NUMBER (x); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
1529 CHECK_NUMBER (y); |
286 | 1530 |
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1809
diff
changeset
|
1531 /* 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
|
1532 #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
|
1533 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
|
1534 /* 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
|
1535 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
|
1536 #else |
15396 | 1537 #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
|
1538 if (FRAME_MSDOS_P (XFRAME (frame))) |
d4cec5d7566d
(Fset_mouse_position): Remove the DOS-specific
Richard M. Stallman <rms@gnu.org>
parents:
15062
diff
changeset
|
1539 { |
63184
1ba4135e8efa
(Fhandle_switch_frame, Fselect_frame): Delete unused arg no_enter.
Luc Teirlinck <teirllm@auburn.edu>
parents:
61784
diff
changeset
|
1540 Fselect_frame (frame); |
15391
d4cec5d7566d
(Fset_mouse_position): Remove the DOS-specific
Richard M. Stallman <rms@gnu.org>
parents:
15062
diff
changeset
|
1541 mouse_moveto (XINT (x), XINT (y)); |
d4cec5d7566d
(Fset_mouse_position): Remove the DOS-specific
Richard M. Stallman <rms@gnu.org>
parents:
15062
diff
changeset
|
1542 } |
d4cec5d7566d
(Fset_mouse_position): Remove the DOS-specific
Richard M. Stallman <rms@gnu.org>
parents:
15062
diff
changeset
|
1543 #endif |
286 | 1544 #endif |
1545 | |
1546 return Qnil; | |
1547 } | |
7025
24e759919770
(Fmouse_pixel_position, Fset_mouse_pixel_position): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
6986
diff
changeset
|
1548 |
24e759919770
(Fmouse_pixel_position, Fset_mouse_pixel_position): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
6986
diff
changeset
|
1549 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
|
1550 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
|
1551 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
|
1552 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
|
1553 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
|
1554 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
|
1555 (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
|
1556 (frame, x, y) |
24e759919770
(Fmouse_pixel_position, Fset_mouse_pixel_position): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
6986
diff
changeset
|
1557 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
|
1558 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
1559 CHECK_LIVE_FRAME (frame); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
1560 CHECK_NUMBER (x); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
1561 CHECK_NUMBER (y); |
7025
24e759919770
(Fmouse_pixel_position, Fset_mouse_pixel_position): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
6986
diff
changeset
|
1562 |
24e759919770
(Fmouse_pixel_position, Fset_mouse_pixel_position): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
6986
diff
changeset
|
1563 /* 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
|
1564 #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
|
1565 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
|
1566 /* 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
|
1567 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
|
1568 #else |
15396 | 1569 #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
|
1570 if (FRAME_MSDOS_P (XFRAME (frame))) |
d4cec5d7566d
(Fset_mouse_position): Remove the DOS-specific
Richard M. Stallman <rms@gnu.org>
parents:
15062
diff
changeset
|
1571 { |
63184
1ba4135e8efa
(Fhandle_switch_frame, Fselect_frame): Delete unused arg no_enter.
Luc Teirlinck <teirllm@auburn.edu>
parents:
61784
diff
changeset
|
1572 Fselect_frame (frame); |
15391
d4cec5d7566d
(Fset_mouse_position): Remove the DOS-specific
Richard M. Stallman <rms@gnu.org>
parents:
15062
diff
changeset
|
1573 mouse_moveto (XINT (x), XINT (y)); |
d4cec5d7566d
(Fset_mouse_position): Remove the DOS-specific
Richard M. Stallman <rms@gnu.org>
parents:
15062
diff
changeset
|
1574 } |
d4cec5d7566d
(Fset_mouse_position): Remove the DOS-specific
Richard M. Stallman <rms@gnu.org>
parents:
15062
diff
changeset
|
1575 #endif |
7025
24e759919770
(Fmouse_pixel_position, Fset_mouse_pixel_position): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
6986
diff
changeset
|
1576 #endif |
24e759919770
(Fmouse_pixel_position, Fset_mouse_pixel_position): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
6986
diff
changeset
|
1577 |
24e759919770
(Fmouse_pixel_position, Fset_mouse_pixel_position): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
6986
diff
changeset
|
1578 return Qnil; |
24e759919770
(Fmouse_pixel_position, Fset_mouse_pixel_position): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
6986
diff
changeset
|
1579 } |
286 | 1580 |
22188
9fba463768ec
(frame_buffer_predicate): New arg FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
21825
diff
changeset
|
1581 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
|
1582 |
765 | 1583 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
|
1584 0, 1, "", |
40105
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1585 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
|
1586 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
|
1587 (frame) |
765 | 1588 Lisp_Object frame; |
286 | 1589 { |
872 | 1590 if (NILP (frame)) |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
1591 frame = selected_frame; |
872 | 1592 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
1593 CHECK_LIVE_FRAME (frame); |
286 | 1594 |
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1809
diff
changeset
|
1595 /* 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
|
1596 #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
|
1597 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
|
1598 { |
9b41ddf1b5f7
(Fmake_frame_visible): Use FRAME_SAMPLE_VISIBILITY. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
4961
diff
changeset
|
1599 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
|
1600 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
|
1601 } |
965
0eb68c6c452a
* frame.c (Qheight, Qicon, Qmodeline, Qname, Qnone, Qonly,
Jim Blandy <jimb@redhat.com>
parents:
886
diff
changeset
|
1602 #endif |
286 | 1603 |
22188
9fba463768ec
(frame_buffer_predicate): New arg FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
21825
diff
changeset
|
1604 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
|
1605 |
39918
fa0407ac162f
(Fset_mouse_position): Improve style of comment to follow other comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39748
diff
changeset
|
1606 /* 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
|
1607 windows_or_buffers_changed++; |
60795e826dad
Put stdio.h after config.h.
Richard M. Stallman <rms@gnu.org>
parents:
7646
diff
changeset
|
1608 |
765 | 1609 return frame; |
286 | 1610 } |
1611 | |
22188
9fba463768ec
(frame_buffer_predicate): New arg FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
21825
diff
changeset
|
1612 /* 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
|
1613 and all its descendents. */ |
9fba463768ec
(frame_buffer_predicate): New arg FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
21825
diff
changeset
|
1614 |
9fba463768ec
(frame_buffer_predicate): New arg FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
21825
diff
changeset
|
1615 static void |
9fba463768ec
(frame_buffer_predicate): New arg FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
21825
diff
changeset
|
1616 make_frame_visible_1 (window) |
9fba463768ec
(frame_buffer_predicate): New arg FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
21825
diff
changeset
|
1617 Lisp_Object window; |
9fba463768ec
(frame_buffer_predicate): New arg FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
21825
diff
changeset
|
1618 { |
9fba463768ec
(frame_buffer_predicate): New arg FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
21825
diff
changeset
|
1619 struct window *w; |
9fba463768ec
(frame_buffer_predicate): New arg FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
21825
diff
changeset
|
1620 |
9fba463768ec
(frame_buffer_predicate): New arg FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
21825
diff
changeset
|
1621 for (;!NILP (window); window = w->next) |
9fba463768ec
(frame_buffer_predicate): New arg FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
21825
diff
changeset
|
1622 { |
9fba463768ec
(frame_buffer_predicate): New arg FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
21825
diff
changeset
|
1623 w = XWINDOW (window); |
9fba463768ec
(frame_buffer_predicate): New arg FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
21825
diff
changeset
|
1624 |
9fba463768ec
(frame_buffer_predicate): New arg FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
21825
diff
changeset
|
1625 if (!NILP (w->buffer)) |
9fba463768ec
(frame_buffer_predicate): New arg FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
21825
diff
changeset
|
1626 XBUFFER (w->buffer)->display_time = Fcurrent_time (); |
9fba463768ec
(frame_buffer_predicate): New arg FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
21825
diff
changeset
|
1627 |
9fba463768ec
(frame_buffer_predicate): New arg FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
21825
diff
changeset
|
1628 if (!NILP (w->vchild)) |
9fba463768ec
(frame_buffer_predicate): New arg FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
21825
diff
changeset
|
1629 make_frame_visible_1 (w->vchild); |
9fba463768ec
(frame_buffer_predicate): New arg FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
21825
diff
changeset
|
1630 if (!NILP (w->hchild)) |
9fba463768ec
(frame_buffer_predicate): New arg FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
21825
diff
changeset
|
1631 make_frame_visible_1 (w->hchild); |
9fba463768ec
(frame_buffer_predicate): New arg FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
21825
diff
changeset
|
1632 } |
9fba463768ec
(frame_buffer_predicate): New arg FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
21825
diff
changeset
|
1633 } |
9fba463768ec
(frame_buffer_predicate): New arg FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
21825
diff
changeset
|
1634 |
765 | 1635 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
|
1636 0, 2, "", |
40105
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1637 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
|
1638 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
|
1639 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
|
1640 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
|
1641 (frame, force) |
806e876cacb4
(Fset_frame_height, Fset_frame_width, Fset_frame_size):
Richard M. Stallman <rms@gnu.org>
parents:
5552
diff
changeset
|
1642 Lisp_Object frame, force; |
286 | 1643 { |
872 | 1644 if (NILP (frame)) |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
1645 frame = selected_frame; |
872 | 1646 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
1647 CHECK_LIVE_FRAME (frame); |
286 | 1648 |
5925
806e876cacb4
(Fset_frame_height, Fset_frame_width, Fset_frame_size):
Richard M. Stallman <rms@gnu.org>
parents:
5552
diff
changeset
|
1649 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
|
1650 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
|
1651 |
8586
c78654909acf
(Fmake_frame_invisible, Ficonify_frame): Don't switch frames.
Karl Heuer <kwzh@gnu.org>
parents:
8264
diff
changeset
|
1652 #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
|
1653 /* Don't let the frame remain selected. */ |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
1654 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
|
1655 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
|
1656 #endif |
3283
e2a40a3baa4b
(Ficonify_frame, Fmake_frame_invisible):
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
1657 |
e2a40a3baa4b
(Ficonify_frame, Fmake_frame_invisible):
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
1658 /* 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
|
1659 if (EQ (XFRAME (frame)->minibuffer_window, minibuf_window)) |
e2a40a3baa4b
(Ficonify_frame, Fmake_frame_invisible):
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
1660 { |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
1661 struct frame *sf = XFRAME (selected_frame); |
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
1662 Fset_window_buffer (sf->minibuffer_window, |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
1663 XWINDOW (minibuf_window)->buffer, Qnil); |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
1664 minibuf_window = sf->minibuffer_window; |
3283
e2a40a3baa4b
(Ficonify_frame, Fmake_frame_invisible):
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
1665 } |
e2a40a3baa4b
(Ficonify_frame, Fmake_frame_invisible):
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
1666 |
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1809
diff
changeset
|
1667 /* 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
|
1668 #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
|
1669 if (FRAME_WINDOW_P (XFRAME (frame))) |
765 | 1670 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
|
1671 #endif |
286 | 1672 |
39918
fa0407ac162f
(Fset_mouse_position): Improve style of comment to follow other comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39748
diff
changeset
|
1673 /* 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
|
1674 windows_or_buffers_changed++; |
60795e826dad
Put stdio.h after config.h.
Richard M. Stallman <rms@gnu.org>
parents:
7646
diff
changeset
|
1675 |
286 | 1676 return Qnil; |
1677 } | |
1678 | |
765 | 1679 DEFUN ("iconify-frame", Ficonify_frame, Siconify_frame, |
872 | 1680 0, 1, "", |
40105
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1681 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
|
1682 If omitted, FRAME defaults to the currently selected frame. */) |
765 | 1683 (frame) |
1684 Lisp_Object frame; | |
286 | 1685 { |
872 | 1686 if (NILP (frame)) |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
1687 frame = selected_frame; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
1688 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
1689 CHECK_LIVE_FRAME (frame); |
286 | 1690 |
8586
c78654909acf
(Fmake_frame_invisible, Ficonify_frame): Don't switch frames.
Karl Heuer <kwzh@gnu.org>
parents:
8264
diff
changeset
|
1691 #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
|
1692 /* Don't let the frame remain selected. */ |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
1693 if (EQ (frame, selected_frame)) |
63184
1ba4135e8efa
(Fhandle_switch_frame, Fselect_frame): Delete unused arg no_enter.
Luc Teirlinck <teirllm@auburn.edu>
parents:
61784
diff
changeset
|
1694 Fhandle_switch_frame (next_frame (frame, Qt)); |
8586
c78654909acf
(Fmake_frame_invisible, Ficonify_frame): Don't switch frames.
Karl Heuer <kwzh@gnu.org>
parents:
8264
diff
changeset
|
1695 #endif |
3283
e2a40a3baa4b
(Ficonify_frame, Fmake_frame_invisible):
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
1696 |
e2a40a3baa4b
(Ficonify_frame, Fmake_frame_invisible):
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
1697 /* 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
|
1698 if (EQ (XFRAME (frame)->minibuffer_window, minibuf_window)) |
e2a40a3baa4b
(Ficonify_frame, Fmake_frame_invisible):
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
1699 { |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
1700 struct frame *sf = XFRAME (selected_frame); |
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
1701 Fset_window_buffer (sf->minibuffer_window, |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
1702 XWINDOW (minibuf_window)->buffer, Qnil); |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
1703 minibuf_window = sf->minibuffer_window; |
3283
e2a40a3baa4b
(Ficonify_frame, Fmake_frame_invisible):
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
1704 } |
e2a40a3baa4b
(Ficonify_frame, Fmake_frame_invisible):
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
1705 |
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1809
diff
changeset
|
1706 /* 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
|
1707 #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
|
1708 if (FRAME_WINDOW_P (XFRAME (frame))) |
765 | 1709 x_iconify_frame (XFRAME (frame)); |
965
0eb68c6c452a
* frame.c (Qheight, Qicon, Qmodeline, Qname, Qnone, Qonly,
Jim Blandy <jimb@redhat.com>
parents:
886
diff
changeset
|
1710 #endif |
286 | 1711 |
39918
fa0407ac162f
(Fset_mouse_position): Improve style of comment to follow other comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39748
diff
changeset
|
1712 /* 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
|
1713 windows_or_buffers_changed++; |
60795e826dad
Put stdio.h after config.h.
Richard M. Stallman <rms@gnu.org>
parents:
7646
diff
changeset
|
1714 |
286 | 1715 return Qnil; |
1716 } | |
1717 | |
765 | 1718 DEFUN ("frame-visible-p", Fframe_visible_p, Sframe_visible_p, |
286 | 1719 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
|
1720 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
|
1721 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
|
1722 a window system, it may not show at all. |
56517
c9c9e7be868f
(Fselect_frame, Fset_frame_selected_window)
Luc Teirlinck <teirllm@auburn.edu>
parents:
56453
diff
changeset
|
1723 Return the symbol `icon' if frame is visible only as an icon. |
c9c9e7be868f
(Fselect_frame, Fset_frame_selected_window)
Luc Teirlinck <teirllm@auburn.edu>
parents:
56453
diff
changeset
|
1724 |
c9c9e7be868f
(Fselect_frame, Fset_frame_selected_window)
Luc Teirlinck <teirllm@auburn.edu>
parents:
56453
diff
changeset
|
1725 On a text-only terminal, all frames are considered visible, whether |
c9c9e7be868f
(Fselect_frame, Fset_frame_selected_window)
Luc Teirlinck <teirllm@auburn.edu>
parents:
56453
diff
changeset
|
1726 they are currently being displayed or not, and this function returns t |
c9c9e7be868f
(Fselect_frame, Fset_frame_selected_window)
Luc Teirlinck <teirllm@auburn.edu>
parents:
56453
diff
changeset
|
1727 for all frames. */) |
40105
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1728 (frame) |
765 | 1729 Lisp_Object frame; |
286 | 1730 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
1731 CHECK_LIVE_FRAME (frame); |
286 | 1732 |
6012
650c0f231d17
(Fframe_visible_p): Do FRAME_SAMPLE_VISIBILITY first.
Richard M. Stallman <rms@gnu.org>
parents:
5925
diff
changeset
|
1733 FRAME_SAMPLE_VISIBILITY (XFRAME (frame)); |
650c0f231d17
(Fframe_visible_p): Do FRAME_SAMPLE_VISIBILITY first.
Richard M. Stallman <rms@gnu.org>
parents:
5925
diff
changeset
|
1734 |
1709
b86b3237e017
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1691
diff
changeset
|
1735 if (FRAME_VISIBLE_P (XFRAME (frame))) |
286 | 1736 return Qt; |
1709
b86b3237e017
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1691
diff
changeset
|
1737 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
|
1738 return Qicon; |
286 | 1739 return Qnil; |
1740 } | |
1741 | |
765 | 1742 DEFUN ("visible-frame-list", Fvisible_frame_list, Svisible_frame_list, |
286 | 1743 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
|
1744 doc: /* Return a list of all frames now \"visible\" (being updated). */) |
286 | 1745 () |
1746 { | |
765 | 1747 Lisp_Object tail, frame; |
1748 struct frame *f; | |
286 | 1749 Lisp_Object value; |
1750 | |
1751 value = Qnil; | |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
1752 for (tail = Vframe_list; CONSP (tail); tail = XCDR (tail)) |
286 | 1753 { |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
1754 frame = XCAR (tail); |
9127
0b4836daa8e1
(Fframep, make_frame_without_minibuffer, do_switch_frame, prev_frame,
Karl Heuer <kwzh@gnu.org>
parents:
9032
diff
changeset
|
1755 if (!FRAMEP (frame)) |
286 | 1756 continue; |
765 | 1757 f = XFRAME (frame); |
1709
b86b3237e017
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1691
diff
changeset
|
1758 if (FRAME_VISIBLE_P (f)) |
765 | 1759 value = Fcons (frame, value); |
286 | 1760 } |
1761 return value; | |
1762 } | |
363 | 1763 |
1764 | |
11754
7691dbfc7571
(Fraise_frame, Flower_frame): Make arg FRAME optional.
Richard M. Stallman <rms@gnu.org>
parents:
11535
diff
changeset
|
1765 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
|
1766 doc: /* Bring FRAME to the front, so it occludes any frames it overlaps. |
56517
c9c9e7be868f
(Fselect_frame, Fset_frame_selected_window)
Luc Teirlinck <teirllm@auburn.edu>
parents:
56453
diff
changeset
|
1767 If FRAME is invisible or iconified, make it visible. |
40105
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1768 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
|
1769 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
|
1770 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
|
1771 (frame) |
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1809
diff
changeset
|
1772 Lisp_Object frame; |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1809
diff
changeset
|
1773 { |
11211
2f9a24a4c9eb
(Fraise_frame, Flower_frame): Now interactive.
Richard M. Stallman <rms@gnu.org>
parents:
11169
diff
changeset
|
1774 if (NILP (frame)) |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
1775 frame = selected_frame; |
11211
2f9a24a4c9eb
(Fraise_frame, Flower_frame): Now interactive.
Richard M. Stallman <rms@gnu.org>
parents:
11169
diff
changeset
|
1776 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
1777 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
|
1778 |
dd67510308ae
(Fraise_frame): Do like the documentation says, and make
Richard M. Stallman <rms@gnu.org>
parents:
4798
diff
changeset
|
1779 /* 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
|
1780 Fmake_frame_visible (frame); |
dd67510308ae
(Fraise_frame): Do like the documentation says, and make
Richard M. Stallman <rms@gnu.org>
parents:
4798
diff
changeset
|
1781 |
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1809
diff
changeset
|
1782 if (frame_raise_lower_hook) |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1809
diff
changeset
|
1783 (*frame_raise_lower_hook) (XFRAME (frame), 1); |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1809
diff
changeset
|
1784 |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1809
diff
changeset
|
1785 return Qnil; |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1809
diff
changeset
|
1786 } |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1809
diff
changeset
|
1787 |
2282
f727944c11aa
* frame.c (Fraise_frame, Flower_frame): Renamed from
Jim Blandy <jimb@redhat.com>
parents:
2207
diff
changeset
|
1788 /* 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
|
1789 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
|
1790 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
|
1791 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
|
1792 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
|
1793 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
|
1794 (frame) |
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1809
diff
changeset
|
1795 Lisp_Object frame; |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1809
diff
changeset
|
1796 { |
11211
2f9a24a4c9eb
(Fraise_frame, Flower_frame): Now interactive.
Richard M. Stallman <rms@gnu.org>
parents:
11169
diff
changeset
|
1797 if (NILP (frame)) |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
1798 frame = selected_frame; |
11211
2f9a24a4c9eb
(Fraise_frame, Flower_frame): Now interactive.
Richard M. Stallman <rms@gnu.org>
parents:
11169
diff
changeset
|
1799 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
1800 CHECK_LIVE_FRAME (frame); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
1801 |
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1809
diff
changeset
|
1802 if (frame_raise_lower_hook) |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1809
diff
changeset
|
1803 (*frame_raise_lower_hook) (XFRAME (frame), 0); |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1809
diff
changeset
|
1804 |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1809
diff
changeset
|
1805 return Qnil; |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1809
diff
changeset
|
1806 } |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1809
diff
changeset
|
1807 |
363 | 1808 |
765 | 1809 DEFUN ("redirect-frame-focus", Fredirect_frame_focus, Sredirect_frame_focus, |
363 | 1810 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
|
1811 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
|
1812 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
|
1813 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
|
1814 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
|
1815 |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1816 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
|
1817 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
|
1818 |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1819 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
|
1820 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
|
1821 minibuffer window. |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1822 |
65976
c332e9c9e66d
(Fredirect_frame_focus): Fix typos in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
64770
diff
changeset
|
1823 A frame's focus redirection can be changed by `select-frame'. If frame |
40105
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1824 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
|
1825 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
|
1826 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
|
1827 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
|
1828 |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1829 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
|
1830 differently from a frame whose focus is redirected to nil; the former |
65976
c332e9c9e66d
(Fredirect_frame_focus): Fix typos in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
64770
diff
changeset
|
1831 is affected by `select-frame', while the latter is not. |
40105
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1832 |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1833 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
|
1834 (frame, focus_frame) |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1835 Lisp_Object frame, focus_frame; |
363 | 1836 { |
3970
020fe391d5c1
* frame.c (Fredirect_frame_focus): Allow redirection of focus of
Jim Blandy <jimb@redhat.com>
parents:
3834
diff
changeset
|
1837 /* 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
|
1838 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
|
1839 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
|
1840 CHECK_FRAME (frame); |
454 | 1841 |
1709
b86b3237e017
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1691
diff
changeset
|
1842 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
|
1843 CHECK_LIVE_FRAME (focus_frame); |
363 | 1844 |
765 | 1845 XFRAME (frame)->focus_frame = focus_frame; |
363 | 1846 |
765 | 1847 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
|
1848 (*frame_rehighlight_hook) (XFRAME (frame)); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
1849 |
363 | 1850 return Qnil; |
1851 } | |
1852 | |
1853 | |
765 | 1854 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
|
1855 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
|
1856 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
|
1857 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
|
1858 (frame) |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1859 Lisp_Object frame; |
363 | 1860 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
1861 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
|
1862 |
765 | 1863 return FRAME_FOCUS_FRAME (XFRAME (frame)); |
363 | 1864 } |
1865 | |
1866 | |
286 | 1867 |
10207
e6618f52efe9
(Fmodify_frame_parameters): For non-X frames,
Richard M. Stallman <rms@gnu.org>
parents:
9972
diff
changeset
|
1868 /* 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
|
1869 |
286 | 1870 Lisp_Object |
765 | 1871 get_frame_param (frame, prop) |
1872 register struct frame *frame; | |
286 | 1873 Lisp_Object prop; |
1874 { | |
1875 register Lisp_Object tem; | |
1876 | |
765 | 1877 tem = Fassq (prop, frame->param_alist); |
286 | 1878 if (EQ (tem, Qnil)) |
1879 return tem; | |
1880 return Fcdr (tem); | |
1881 } | |
1882 | |
10207
e6618f52efe9
(Fmodify_frame_parameters): For non-X frames,
Richard M. Stallman <rms@gnu.org>
parents:
9972
diff
changeset
|
1883 /* 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
|
1884 |
e6618f52efe9
(Fmodify_frame_parameters): For non-X frames,
Richard M. Stallman <rms@gnu.org>
parents:
9972
diff
changeset
|
1885 Lisp_Object |
22188
9fba463768ec
(frame_buffer_predicate): New arg FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
21825
diff
changeset
|
1886 frame_buffer_predicate (frame) |
9fba463768ec
(frame_buffer_predicate): New arg FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
21825
diff
changeset
|
1887 Lisp_Object frame; |
10207
e6618f52efe9
(Fmodify_frame_parameters): For non-X frames,
Richard M. Stallman <rms@gnu.org>
parents:
9972
diff
changeset
|
1888 { |
22188
9fba463768ec
(frame_buffer_predicate): New arg FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
21825
diff
changeset
|
1889 return XFRAME (frame)->buffer_predicate; |
10207
e6618f52efe9
(Fmodify_frame_parameters): For non-X frames,
Richard M. Stallman <rms@gnu.org>
parents:
9972
diff
changeset
|
1890 } |
e6618f52efe9
(Fmodify_frame_parameters): For non-X frames,
Richard M. Stallman <rms@gnu.org>
parents:
9972
diff
changeset
|
1891 |
17221
0530a375eb21
(frame_buffer_list, set_frame_buffer_list): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
17032
diff
changeset
|
1892 /* 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
|
1893 |
0530a375eb21
(frame_buffer_list, set_frame_buffer_list): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
17032
diff
changeset
|
1894 Lisp_Object |
22188
9fba463768ec
(frame_buffer_predicate): New arg FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
21825
diff
changeset
|
1895 frame_buffer_list (frame) |
9fba463768ec
(frame_buffer_predicate): New arg FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
21825
diff
changeset
|
1896 Lisp_Object frame; |
17221
0530a375eb21
(frame_buffer_list, set_frame_buffer_list): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
17032
diff
changeset
|
1897 { |
22188
9fba463768ec
(frame_buffer_predicate): New arg FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
21825
diff
changeset
|
1898 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
|
1899 } |
0530a375eb21
(frame_buffer_list, set_frame_buffer_list): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
17032
diff
changeset
|
1900 |
0530a375eb21
(frame_buffer_list, set_frame_buffer_list): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
17032
diff
changeset
|
1901 /* 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
|
1902 |
0530a375eb21
(frame_buffer_list, set_frame_buffer_list): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
17032
diff
changeset
|
1903 void |
22188
9fba463768ec
(frame_buffer_predicate): New arg FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
21825
diff
changeset
|
1904 set_frame_buffer_list (frame, list) |
9fba463768ec
(frame_buffer_predicate): New arg FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
21825
diff
changeset
|
1905 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
|
1906 { |
22188
9fba463768ec
(frame_buffer_predicate): New arg FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
21825
diff
changeset
|
1907 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
|
1908 } |
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 /* 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
|
1911 |
0530a375eb21
(frame_buffer_list, set_frame_buffer_list): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
17032
diff
changeset
|
1912 void |
0530a375eb21
(frame_buffer_list, set_frame_buffer_list): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
17032
diff
changeset
|
1913 frames_discard_buffer (buffer) |
0530a375eb21
(frame_buffer_list, set_frame_buffer_list): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
17032
diff
changeset
|
1914 Lisp_Object buffer; |
0530a375eb21
(frame_buffer_list, set_frame_buffer_list): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
17032
diff
changeset
|
1915 { |
0530a375eb21
(frame_buffer_list, set_frame_buffer_list): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
17032
diff
changeset
|
1916 Lisp_Object frame, tail; |
0530a375eb21
(frame_buffer_list, set_frame_buffer_list): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
17032
diff
changeset
|
1917 |
0530a375eb21
(frame_buffer_list, set_frame_buffer_list): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
17032
diff
changeset
|
1918 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
|
1919 { |
0530a375eb21
(frame_buffer_list, set_frame_buffer_list): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
17032
diff
changeset
|
1920 XFRAME (frame)->buffer_list |
0530a375eb21
(frame_buffer_list, set_frame_buffer_list): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
17032
diff
changeset
|
1921 = 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
|
1922 } |
0530a375eb21
(frame_buffer_list, set_frame_buffer_list): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
17032
diff
changeset
|
1923 } |
0530a375eb21
(frame_buffer_list, set_frame_buffer_list): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
17032
diff
changeset
|
1924 |
10207
e6618f52efe9
(Fmodify_frame_parameters): For non-X frames,
Richard M. Stallman <rms@gnu.org>
parents:
9972
diff
changeset
|
1925 /* 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
|
1926 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
|
1927 |
286 | 1928 void |
965
0eb68c6c452a
* frame.c (Qheight, Qicon, Qmodeline, Qname, Qnone, Qonly,
Jim Blandy <jimb@redhat.com>
parents:
886
diff
changeset
|
1929 store_in_alist (alistptr, prop, val) |
286 | 1930 Lisp_Object *alistptr, val; |
965
0eb68c6c452a
* frame.c (Qheight, Qicon, Qmodeline, Qname, Qnone, Qonly,
Jim Blandy <jimb@redhat.com>
parents:
886
diff
changeset
|
1931 Lisp_Object prop; |
286 | 1932 { |
1933 register Lisp_Object tem; | |
1934 | |
1935 tem = Fassq (prop, *alistptr); | |
1936 if (EQ (tem, Qnil)) | |
1937 *alistptr = Fcons (Fcons (prop, val), *alistptr); | |
1938 else | |
1939 Fsetcdr (tem, val); | |
1940 } | |
1941 | |
20280
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
1942 static int |
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
1943 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
|
1944 char *str; |
89549
eaae96c859d2
(frame_name_fnn_p): Make len EMACS_INT.
Dave Love <fx@gnu.org>
parents:
89483
diff
changeset
|
1945 EMACS_INT len; |
20280
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
1946 { |
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
1947 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
|
1948 { |
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
1949 char *end_ptr; |
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
1950 |
25789
d68642dd5bbf
(frame_name_fnn_p): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
25736
diff
changeset
|
1951 strtol (str + 1, &end_ptr, 10); |
d68642dd5bbf
(frame_name_fnn_p): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
25736
diff
changeset
|
1952 |
20280
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
1953 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
|
1954 return 1; |
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
1955 } |
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
1956 return 0; |
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
1957 } |
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
1958 |
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
1959 /* 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
|
1960 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
|
1961 |
65976
c332e9c9e66d
(Fredirect_frame_focus): Fix typos in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
64770
diff
changeset
|
1962 static void |
20280
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
1963 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
|
1964 struct frame *f; |
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
1965 Lisp_Object name; |
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
1966 { |
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
1967 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
|
1968 |
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
1969 /* 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
|
1970 if (NILP (name)) |
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
1971 { |
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
1972 char namebuf[20]; |
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
1973 |
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
1974 /* 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
|
1975 before we do any consing. */ |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46285
diff
changeset
|
1976 if (frame_name_fnn_p (SDATA (f->name), |
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46285
diff
changeset
|
1977 SBYTES (f->name))) |
20280
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
1978 return; |
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
1979 |
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
1980 terminal_frame_count++; |
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
1981 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
|
1982 name = build_string (namebuf); |
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
1983 } |
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
1984 else |
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
1985 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
1986 CHECK_STRING (name); |
20280
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
1987 |
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
1988 /* 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
|
1989 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
|
1990 return; |
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
1991 |
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
1992 /* 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
|
1993 doesn't clash with the names we generate for terminal frames. */ |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46285
diff
changeset
|
1994 if (frame_name_fnn_p (SDATA (name), SBYTES (name))) |
20280
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
1995 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
|
1996 } |
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
1997 |
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
1998 f->name = name; |
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
1999 update_mode_lines = 1; |
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
2000 } |
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
2001 |
286 | 2002 void |
765 | 2003 store_frame_param (f, prop, val) |
2004 struct frame *f; | |
286 | 2005 Lisp_Object prop, val; |
2006 { | |
29616
8d7a0f575a0e
(Fmodify_frame_parameters): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents:
28930
diff
changeset
|
2007 register Lisp_Object old_alist_elt; |
286 | 2008 |
29616
8d7a0f575a0e
(Fmodify_frame_parameters): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents:
28930
diff
changeset
|
2009 /* 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
|
2010 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
|
2011 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
|
2012 { |
0530a375eb21
(frame_buffer_list, set_frame_buffer_list): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
17032
diff
changeset
|
2013 f->buffer_list = val; |
0530a375eb21
(frame_buffer_list, set_frame_buffer_list): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
17032
diff
changeset
|
2014 return; |
0530a375eb21
(frame_buffer_list, set_frame_buffer_list): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
17032
diff
changeset
|
2015 } |
0530a375eb21
(frame_buffer_list, set_frame_buffer_list): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
17032
diff
changeset
|
2016 |
29616
8d7a0f575a0e
(Fmodify_frame_parameters): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents:
28930
diff
changeset
|
2017 /* 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
|
2018 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
|
2019 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
|
2020 without messing up the symbol's status. */ |
8d7a0f575a0e
(Fmodify_frame_parameters): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents:
28930
diff
changeset
|
2021 if (SYMBOLP (prop)) |
8d7a0f575a0e
(Fmodify_frame_parameters): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents:
28930
diff
changeset
|
2022 { |
8d7a0f575a0e
(Fmodify_frame_parameters): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents:
28930
diff
changeset
|
2023 Lisp_Object valcontents; |
39581
6d9fa06012a6
Use SYMBOL_VALUE/SET_SYMBOL_VALUE macros instead of accessing
Gerd Moellmann <gerd@gnu.org>
parents:
39503
diff
changeset
|
2024 valcontents = SYMBOL_VALUE (prop); |
29616
8d7a0f575a0e
(Fmodify_frame_parameters): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents:
28930
diff
changeset
|
2025 if ((BUFFER_LOCAL_VALUEP (valcontents) |
8d7a0f575a0e
(Fmodify_frame_parameters): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents:
28930
diff
changeset
|
2026 || SOME_BUFFER_LOCAL_VALUEP (valcontents)) |
8d7a0f575a0e
(Fmodify_frame_parameters): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents:
28930
diff
changeset
|
2027 && XBUFFER_LOCAL_VALUE (valcontents)->check_frame |
8d7a0f575a0e
(Fmodify_frame_parameters): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents:
28930
diff
changeset
|
2028 && XFRAME (XBUFFER_LOCAL_VALUE (valcontents)->frame) == f) |
8d7a0f575a0e
(Fmodify_frame_parameters): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents:
28930
diff
changeset
|
2029 swap_in_global_binding (prop); |
8d7a0f575a0e
(Fmodify_frame_parameters): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents:
28930
diff
changeset
|
2030 } |
8d7a0f575a0e
(Fmodify_frame_parameters): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents:
28930
diff
changeset
|
2031 |
42743
1e6231c9c359
(store_frame_param): Call set_tty_color_mode for termcap
Eli Zaretskii <eliz@gnu.org>
parents:
41718
diff
changeset
|
2032 #ifndef WINDOWSNT |
1e6231c9c359
(store_frame_param): Call set_tty_color_mode for termcap
Eli Zaretskii <eliz@gnu.org>
parents:
41718
diff
changeset
|
2033 /* The tty color mode needs to be set before the frame's parameter |
1e6231c9c359
(store_frame_param): Call set_tty_color_mode for termcap
Eli Zaretskii <eliz@gnu.org>
parents:
41718
diff
changeset
|
2034 alist is updated with the new value, because set_tty_color_mode |
1e6231c9c359
(store_frame_param): Call set_tty_color_mode for termcap
Eli Zaretskii <eliz@gnu.org>
parents:
41718
diff
changeset
|
2035 wants to look at the old mode. */ |
1e6231c9c359
(store_frame_param): Call set_tty_color_mode for termcap
Eli Zaretskii <eliz@gnu.org>
parents:
41718
diff
changeset
|
2036 if (FRAME_TERMCAP_P (f) && EQ (prop, Qtty_color_mode)) |
1e6231c9c359
(store_frame_param): Call set_tty_color_mode for termcap
Eli Zaretskii <eliz@gnu.org>
parents:
41718
diff
changeset
|
2037 set_tty_color_mode (f, val); |
1e6231c9c359
(store_frame_param): Call set_tty_color_mode for termcap
Eli Zaretskii <eliz@gnu.org>
parents:
41718
diff
changeset
|
2038 #endif |
1e6231c9c359
(store_frame_param): Call set_tty_color_mode for termcap
Eli Zaretskii <eliz@gnu.org>
parents:
41718
diff
changeset
|
2039 |
29616
8d7a0f575a0e
(Fmodify_frame_parameters): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents:
28930
diff
changeset
|
2040 /* Update the frame parameter alist. */ |
8d7a0f575a0e
(Fmodify_frame_parameters): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents:
28930
diff
changeset
|
2041 old_alist_elt = Fassq (prop, f->param_alist); |
8d7a0f575a0e
(Fmodify_frame_parameters): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents:
28930
diff
changeset
|
2042 if (EQ (old_alist_elt, Qnil)) |
765 | 2043 f->param_alist = Fcons (Fcons (prop, val), f->param_alist); |
286 | 2044 else |
29616
8d7a0f575a0e
(Fmodify_frame_parameters): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents:
28930
diff
changeset
|
2045 Fsetcdr (old_alist_elt, val); |
539 | 2046 |
29616
8d7a0f575a0e
(Fmodify_frame_parameters): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents:
28930
diff
changeset
|
2047 /* Update some other special parameters in their special places |
8d7a0f575a0e
(Fmodify_frame_parameters): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents:
28930
diff
changeset
|
2048 in addition to the alist. */ |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
2049 |
10207
e6618f52efe9
(Fmodify_frame_parameters): For non-X frames,
Richard M. Stallman <rms@gnu.org>
parents:
9972
diff
changeset
|
2050 if (EQ (prop, Qbuffer_predicate)) |
e6618f52efe9
(Fmodify_frame_parameters): For non-X frames,
Richard M. Stallman <rms@gnu.org>
parents:
9972
diff
changeset
|
2051 f->buffer_predicate = val; |
e6618f52efe9
(Fmodify_frame_parameters): For non-X frames,
Richard M. Stallman <rms@gnu.org>
parents:
9972
diff
changeset
|
2052 |
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
|
2053 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
|
2054 { |
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
2055 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
|
2056 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
|
2057 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
|
2058 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
|
2059 } |
12761
bffb5ea6fb43
Move various Q... vars to top of file, unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
12742
diff
changeset
|
2060 |
9127
0b4836daa8e1
(Fframep, make_frame_without_minibuffer, do_switch_frame, prev_frame,
Karl Heuer <kwzh@gnu.org>
parents:
9032
diff
changeset
|
2061 if (EQ (prop, Qminibuffer) && WINDOWP (val)) |
539 | 2062 { |
2063 if (! MINI_WINDOW_P (XWINDOW (val))) | |
53072
8787289602d1
Remove period at end of error message.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52754
diff
changeset
|
2064 error ("Surrogate minibuffer windows must be minibuffer windows"); |
539 | 2065 |
25710
ee1da070c50f
(Fnext_frame): Remove unused variable(s).
Gerd Moellmann <gerd@gnu.org>
parents:
25669
diff
changeset
|
2066 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
|
2067 && !EQ (val, f->minibuffer_window)) |
906cef1d36bd
(store_frame_param): Allow setting a frame's minibuffer
Karl Heuer <kwzh@gnu.org>
parents:
16280
diff
changeset
|
2068 error ("Can't change the surrogate minibuffer of a frame with its own minibuffer"); |
539 | 2069 |
2070 /* Install the chosen minibuffer window, with proper buffer. */ | |
765 | 2071 f->minibuffer_window = val; |
539 | 2072 } |
286 | 2073 } |
2074 | |
765 | 2075 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
|
2076 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
|
2077 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
|
2078 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
|
2079 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
|
2080 (frame) |
765 | 2081 Lisp_Object frame; |
286 | 2082 { |
2083 Lisp_Object alist; | |
7162
06a13bf36a8c
(Fframe_parameters) [!MULTI_FRAME]: Unstub it again.
Karl Heuer <kwzh@gnu.org>
parents:
7134
diff
changeset
|
2084 FRAME_PTR f; |
15062
de7528327c39
(Fframe_parameters, both definitions):
Richard M. Stallman <rms@gnu.org>
parents:
15001
diff
changeset
|
2085 int height, width; |
27575
2344fab04513
(Fframe_parameters): Add GCPRO because tty_color_name can GC.
Gerd Moellmann <gerd@gnu.org>
parents:
26729
diff
changeset
|
2086 struct gcpro gcpro1; |
286 | 2087 |
36804
e4331ae9636d
(Fframe_parameters): In the `buffer-list' frame
Gerd Moellmann <gerd@gnu.org>
parents:
36433
diff
changeset
|
2088 if (NILP (frame)) |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
2089 frame = selected_frame; |
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
2090 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
2091 CHECK_FRAME (frame); |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
2092 f = XFRAME (frame); |
286 | 2093 |
7162
06a13bf36a8c
(Fframe_parameters) [!MULTI_FRAME]: Unstub it again.
Karl Heuer <kwzh@gnu.org>
parents:
7134
diff
changeset
|
2094 if (!FRAME_LIVE_P (f)) |
286 | 2095 return Qnil; |
2096 | |
765 | 2097 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
|
2098 GCPRO1 (alist); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
2099 |
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26164
diff
changeset
|
2100 if (!FRAME_WINDOW_P (f)) |
15391
d4cec5d7566d
(Fset_mouse_position): Remove the DOS-specific
Richard M. Stallman <rms@gnu.org>
parents:
15062
diff
changeset
|
2101 { |
25117
f6f34f0bc1af
(make_terminal_frame) [MSDOS]: Don't call
Eli Zaretskii <eliz@gnu.org>
parents:
25030
diff
changeset
|
2102 int fg = FRAME_FOREGROUND_PIXEL (f); |
f6f34f0bc1af
(make_terminal_frame) [MSDOS]: Don't call
Eli Zaretskii <eliz@gnu.org>
parents:
25030
diff
changeset
|
2103 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
|
2104 Lisp_Object elt; |
25117
f6f34f0bc1af
(make_terminal_frame) [MSDOS]: Don't call
Eli Zaretskii <eliz@gnu.org>
parents:
25030
diff
changeset
|
2105 |
32545
288723d38c06
(Fframe_parameters): If a tty's frame's param_alist says
Eli Zaretskii <eliz@gnu.org>
parents:
32254
diff
changeset
|
2106 /* 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
|
2107 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
|
2108 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
|
2109 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
|
2110 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
|
2111 { |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46285
diff
changeset
|
2112 if (strncmp (SDATA (XCDR (elt)), |
33005
87893013088c
(Fframe_parameters): Fix the change from 2000-10-16:
Eli Zaretskii <eliz@gnu.org>
parents:
32909
diff
changeset
|
2113 unspecified_bg, |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46285
diff
changeset
|
2114 SCHARS (XCDR (elt))) == 0) |
33005
87893013088c
(Fframe_parameters): Fix the change from 2000-10-16:
Eli Zaretskii <eliz@gnu.org>
parents:
32909
diff
changeset
|
2115 store_in_alist (&alist, Qforeground_color, tty_color_name (f, bg)); |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46285
diff
changeset
|
2116 else if (strncmp (SDATA (XCDR (elt)), |
33005
87893013088c
(Fframe_parameters): Fix the change from 2000-10-16:
Eli Zaretskii <eliz@gnu.org>
parents:
32909
diff
changeset
|
2117 unspecified_fg, |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46285
diff
changeset
|
2118 SCHARS (XCDR (elt))) == 0) |
33005
87893013088c
(Fframe_parameters): Fix the change from 2000-10-16:
Eli Zaretskii <eliz@gnu.org>
parents:
32909
diff
changeset
|
2119 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
|
2120 } |
32545
288723d38c06
(Fframe_parameters): If a tty's frame's param_alist says
Eli Zaretskii <eliz@gnu.org>
parents:
32254
diff
changeset
|
2121 else |
288723d38c06
(Fframe_parameters): If a tty's frame's param_alist says
Eli Zaretskii <eliz@gnu.org>
parents:
32254
diff
changeset
|
2122 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
|
2123 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
|
2124 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
|
2125 { |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46285
diff
changeset
|
2126 if (strncmp (SDATA (XCDR (elt)), |
33005
87893013088c
(Fframe_parameters): Fix the change from 2000-10-16:
Eli Zaretskii <eliz@gnu.org>
parents:
32909
diff
changeset
|
2127 unspecified_fg, |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46285
diff
changeset
|
2128 SCHARS (XCDR (elt))) == 0) |
33005
87893013088c
(Fframe_parameters): Fix the change from 2000-10-16:
Eli Zaretskii <eliz@gnu.org>
parents:
32909
diff
changeset
|
2129 store_in_alist (&alist, Qbackground_color, tty_color_name (f, fg)); |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46285
diff
changeset
|
2130 else if (strncmp (SDATA (XCDR (elt)), |
33005
87893013088c
(Fframe_parameters): Fix the change from 2000-10-16:
Eli Zaretskii <eliz@gnu.org>
parents:
32909
diff
changeset
|
2131 unspecified_bg, |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46285
diff
changeset
|
2132 SCHARS (XCDR (elt))) == 0) |
33005
87893013088c
(Fframe_parameters): Fix the change from 2000-10-16:
Eli Zaretskii <eliz@gnu.org>
parents:
32909
diff
changeset
|
2133 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
|
2134 } |
32545
288723d38c06
(Fframe_parameters): If a tty's frame's param_alist says
Eli Zaretskii <eliz@gnu.org>
parents:
32254
diff
changeset
|
2135 else |
288723d38c06
(Fframe_parameters): If a tty's frame's param_alist says
Eli Zaretskii <eliz@gnu.org>
parents:
32254
diff
changeset
|
2136 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
|
2137 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
|
2138 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
|
2139 ? "ms-dos" |
35003
c6726a1e70ce
(make_terminal_frame) [WINDOWSNT]: Make terminal frames
Andrew Innes <andrewi@gnu.org>
parents:
33760
diff
changeset
|
2140 : FRAME_W32_P (f) ? "w32term" |
c6726a1e70ce
(make_terminal_frame) [WINDOWSNT]: Make terminal frames
Andrew Innes <andrewi@gnu.org>
parents:
33760
diff
changeset
|
2141 :"tty")); |
15391
d4cec5d7566d
(Fset_mouse_position): Remove the DOS-specific
Richard M. Stallman <rms@gnu.org>
parents:
15062
diff
changeset
|
2142 } |
965
0eb68c6c452a
* frame.c (Qheight, Qicon, Qmodeline, Qname, Qnone, Qonly,
Jim Blandy <jimb@redhat.com>
parents:
886
diff
changeset
|
2143 store_in_alist (&alist, Qname, f->name); |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
2144 height = (f->new_text_lines ? f->new_text_lines : FRAME_LINES (f)); |
15062
de7528327c39
(Fframe_parameters, both definitions):
Richard M. Stallman <rms@gnu.org>
parents:
15001
diff
changeset
|
2145 store_in_alist (&alist, Qheight, make_number (height)); |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
2146 width = (f->new_text_cols ? f->new_text_cols : FRAME_COLS (f)); |
15062
de7528327c39
(Fframe_parameters, both definitions):
Richard M. Stallman <rms@gnu.org>
parents:
15001
diff
changeset
|
2147 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
|
2148 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
|
2149 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
|
2150 (! FRAME_HAS_MINIBUF_P (f) ? Qnil |
7162
06a13bf36a8c
(Fframe_parameters) [!MULTI_FRAME]: Unstub it again.
Karl Heuer <kwzh@gnu.org>
parents:
7134
diff
changeset
|
2151 : FRAME_MINIBUF_ONLY_P (f) ? Qonly |
06a13bf36a8c
(Fframe_parameters) [!MULTI_FRAME]: Unstub it again.
Karl Heuer <kwzh@gnu.org>
parents:
7134
diff
changeset
|
2152 : FRAME_MINIBUF_WINDOW (f))); |
06a13bf36a8c
(Fframe_parameters) [!MULTI_FRAME]: Unstub it again.
Karl Heuer <kwzh@gnu.org>
parents:
7134
diff
changeset
|
2153 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
|
2154 store_in_alist (&alist, Qbuffer_list, frame_buffer_list (frame)); |
286 | 2155 |
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1809
diff
changeset
|
2156 /* 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
|
2157 #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
|
2158 if (FRAME_WINDOW_P (f)) |
765 | 2159 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
|
2160 else |
965
0eb68c6c452a
* frame.c (Qheight, Qicon, Qmodeline, Qname, Qnone, Qonly,
Jim Blandy <jimb@redhat.com>
parents:
886
diff
changeset
|
2161 #endif |
8904
af3ff2dbaddd
(Fframe_parameters): Fix Lisp_Object vs. int problems.
Karl Heuer <kwzh@gnu.org>
parents:
8685
diff
changeset
|
2162 { |
af3ff2dbaddd
(Fframe_parameters): Fix Lisp_Object vs. int problems.
Karl Heuer <kwzh@gnu.org>
parents:
8685
diff
changeset
|
2163 /* 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
|
2164 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
|
2165 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
|
2166 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
|
2167 } |
27575
2344fab04513
(Fframe_parameters): Add GCPRO because tty_color_name can GC.
Gerd Moellmann <gerd@gnu.org>
parents:
26729
diff
changeset
|
2168 |
2344fab04513
(Fframe_parameters): Add GCPRO because tty_color_name can GC.
Gerd Moellmann <gerd@gnu.org>
parents:
26729
diff
changeset
|
2169 UNGCPRO; |
286 | 2170 return alist; |
2171 } | |
2172 | |
31399
db831ffcd565
(Qdisplay_type): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31102
diff
changeset
|
2173 |
db831ffcd565
(Qdisplay_type): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31102
diff
changeset
|
2174 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
|
2175 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
|
2176 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
|
2177 (frame, parameter) |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
2178 Lisp_Object frame, parameter; |
31399
db831ffcd565
(Qdisplay_type): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31102
diff
changeset
|
2179 { |
db831ffcd565
(Qdisplay_type): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31102
diff
changeset
|
2180 struct frame *f; |
db831ffcd565
(Qdisplay_type): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31102
diff
changeset
|
2181 Lisp_Object value; |
db831ffcd565
(Qdisplay_type): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31102
diff
changeset
|
2182 |
db831ffcd565
(Qdisplay_type): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31102
diff
changeset
|
2183 if (NILP (frame)) |
db831ffcd565
(Qdisplay_type): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31102
diff
changeset
|
2184 frame = selected_frame; |
db831ffcd565
(Qdisplay_type): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31102
diff
changeset
|
2185 else |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
2186 CHECK_FRAME (frame); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
2187 CHECK_SYMBOL (parameter); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
2188 |
31399
db831ffcd565
(Qdisplay_type): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31102
diff
changeset
|
2189 f = XFRAME (frame); |
db831ffcd565
(Qdisplay_type): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31102
diff
changeset
|
2190 value = Qnil; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
2191 |
31399
db831ffcd565
(Qdisplay_type): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31102
diff
changeset
|
2192 if (FRAME_LIVE_P (f)) |
db831ffcd565
(Qdisplay_type): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31102
diff
changeset
|
2193 { |
40319
52af99ad587f
Resurrect a comment lost in the previous commit.
Eli Zaretskii <eliz@gnu.org>
parents:
40317
diff
changeset
|
2194 /* Avoid consing in frequent cases. */ |
31442
cb166d3ac8e7
(Fframe_parameter): Handle `name' specially.
Gerd Moellmann <gerd@gnu.org>
parents:
31399
diff
changeset
|
2195 if (EQ (parameter, Qname)) |
cb166d3ac8e7
(Fframe_parameter): Handle `name' specially.
Gerd Moellmann <gerd@gnu.org>
parents:
31399
diff
changeset
|
2196 value = f->name; |
31448
70b366918608
(Fframe_parameter): Handle `name' and `background-mode'
Gerd Moellmann <gerd@gnu.org>
parents:
31442
diff
changeset
|
2197 #ifdef HAVE_X_WINDOWS |
70b366918608
(Fframe_parameter): Handle `name' and `background-mode'
Gerd Moellmann <gerd@gnu.org>
parents:
31442
diff
changeset
|
2198 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
|
2199 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
|
2200 #endif /* HAVE_X_WINDOWS */ |
40313
b2ff79e90309
(Fframe_parameter): Fix a bug whereby some
Gerd Moellmann <gerd@gnu.org>
parents:
40105
diff
changeset
|
2201 else if (EQ (parameter, Qbackground_color) |
b2ff79e90309
(Fframe_parameter): Fix a bug whereby some
Gerd Moellmann <gerd@gnu.org>
parents:
40105
diff
changeset
|
2202 || EQ (parameter, Qforeground_color)) |
31442
cb166d3ac8e7
(Fframe_parameter): Handle `name' specially.
Gerd Moellmann <gerd@gnu.org>
parents:
31399
diff
changeset
|
2203 { |
cb166d3ac8e7
(Fframe_parameter): Handle `name' specially.
Gerd Moellmann <gerd@gnu.org>
parents:
31399
diff
changeset
|
2204 value = Fassq (parameter, f->param_alist); |
cb166d3ac8e7
(Fframe_parameter): Handle `name' specially.
Gerd Moellmann <gerd@gnu.org>
parents:
31399
diff
changeset
|
2205 if (CONSP (value)) |
32254
f93728883f64
(Fframe_parameter): For non-windowed frames, if
Eli Zaretskii <eliz@gnu.org>
parents:
31470
diff
changeset
|
2206 { |
f93728883f64
(Fframe_parameter): For non-windowed frames, if
Eli Zaretskii <eliz@gnu.org>
parents:
31470
diff
changeset
|
2207 value = XCDR (value); |
f93728883f64
(Fframe_parameter): For non-windowed frames, if
Eli Zaretskii <eliz@gnu.org>
parents:
31470
diff
changeset
|
2208 /* 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
|
2209 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
|
2210 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
|
2211 "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
|
2212 if (STRINGP (value) && !FRAME_WINDOW_P (f)) |
f93728883f64
(Fframe_parameter): For non-windowed frames, if
Eli Zaretskii <eliz@gnu.org>
parents:
31470
diff
changeset
|
2213 { |
46467
1a3b3b66171c
(Fframe_parameter): Use const for pointer to lisp
Ken Raeburn <raeburn@raeburn.org>
parents:
46370
diff
changeset
|
2214 const char *color_name; |
32545
288723d38c06
(Fframe_parameters): If a tty's frame's param_alist says
Eli Zaretskii <eliz@gnu.org>
parents:
32254
diff
changeset
|
2215 EMACS_INT csz; |
288723d38c06
(Fframe_parameters): If a tty's frame's param_alist says
Eli Zaretskii <eliz@gnu.org>
parents:
32254
diff
changeset
|
2216 |
288723d38c06
(Fframe_parameters): If a tty's frame's param_alist says
Eli Zaretskii <eliz@gnu.org>
parents:
32254
diff
changeset
|
2217 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
|
2218 { |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46285
diff
changeset
|
2219 color_name = SDATA (value); |
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46285
diff
changeset
|
2220 csz = SCHARS (value); |
32545
288723d38c06
(Fframe_parameters): If a tty's frame's param_alist says
Eli Zaretskii <eliz@gnu.org>
parents:
32254
diff
changeset
|
2221 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
|
2222 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
|
2223 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
|
2224 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
|
2225 } |
288723d38c06
(Fframe_parameters): If a tty's frame's param_alist says
Eli Zaretskii <eliz@gnu.org>
parents:
32254
diff
changeset
|
2226 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
|
2227 { |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46285
diff
changeset
|
2228 color_name = SDATA (value); |
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46285
diff
changeset
|
2229 csz = SCHARS (value); |
32545
288723d38c06
(Fframe_parameters): If a tty's frame's param_alist says
Eli Zaretskii <eliz@gnu.org>
parents:
32254
diff
changeset
|
2230 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
|
2231 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
|
2232 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
|
2233 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
|
2234 } |
32254
f93728883f64
(Fframe_parameter): For non-windowed frames, if
Eli Zaretskii <eliz@gnu.org>
parents:
31470
diff
changeset
|
2235 } |
f93728883f64
(Fframe_parameter): For non-windowed frames, if
Eli Zaretskii <eliz@gnu.org>
parents:
31470
diff
changeset
|
2236 } |
40317
dfb2afb0aa8a
(Fframe_parameter): Fix last change.
Eli Zaretskii <eliz@gnu.org>
parents:
40313
diff
changeset
|
2237 else |
dfb2afb0aa8a
(Fframe_parameter): Fix last change.
Eli Zaretskii <eliz@gnu.org>
parents:
40313
diff
changeset
|
2238 value = Fcdr (Fassq (parameter, Fframe_parameters (frame))); |
31442
cb166d3ac8e7
(Fframe_parameter): Handle `name' specially.
Gerd Moellmann <gerd@gnu.org>
parents:
31399
diff
changeset
|
2239 } |
40313
b2ff79e90309
(Fframe_parameter): Fix a bug whereby some
Gerd Moellmann <gerd@gnu.org>
parents:
40105
diff
changeset
|
2240 else if (EQ (parameter, Qdisplay_type) |
b2ff79e90309
(Fframe_parameter): Fix a bug whereby some
Gerd Moellmann <gerd@gnu.org>
parents:
40105
diff
changeset
|
2241 || EQ (parameter, Qbackground_mode)) |
b2ff79e90309
(Fframe_parameter): Fix a bug whereby some
Gerd Moellmann <gerd@gnu.org>
parents:
40105
diff
changeset
|
2242 value = Fcdr (Fassq (parameter, f->param_alist)); |
b2ff79e90309
(Fframe_parameter): Fix a bug whereby some
Gerd Moellmann <gerd@gnu.org>
parents:
40105
diff
changeset
|
2243 else |
b2ff79e90309
(Fframe_parameter): Fix a bug whereby some
Gerd Moellmann <gerd@gnu.org>
parents:
40105
diff
changeset
|
2244 value = Fcdr (Fassq (parameter, Fframe_parameters (frame))); |
31399
db831ffcd565
(Qdisplay_type): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31102
diff
changeset
|
2245 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
2246 |
31399
db831ffcd565
(Qdisplay_type): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31102
diff
changeset
|
2247 return value; |
db831ffcd565
(Qdisplay_type): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31102
diff
changeset
|
2248 } |
db831ffcd565
(Qdisplay_type): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31102
diff
changeset
|
2249 |
db831ffcd565
(Qdisplay_type): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31102
diff
changeset
|
2250 |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
2251 DEFUN ("modify-frame-parameters", Fmodify_frame_parameters, |
765 | 2252 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
|
2253 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
|
2254 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
|
2255 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
|
2256 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
|
2257 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
|
2258 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
|
2259 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
|
2260 |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
2261 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
|
2262 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
|
2263 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
|
2264 (frame, alist) |
765 | 2265 Lisp_Object frame, alist; |
286 | 2266 { |
965
0eb68c6c452a
* frame.c (Qheight, Qicon, Qmodeline, Qname, Qnone, Qonly,
Jim Blandy <jimb@redhat.com>
parents:
886
diff
changeset
|
2267 FRAME_PTR f; |
25710
ee1da070c50f
(Fnext_frame): Remove unused variable(s).
Gerd Moellmann <gerd@gnu.org>
parents:
25669
diff
changeset
|
2268 register Lisp_Object tail, prop, val; |
46285
3f111801efb4
Rename BINDING_STACK_SIZE to SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents:
46015
diff
changeset
|
2269 int count = SPECPDL_INDEX (); |
33509
a7d245e080d1
(syms_of_frame_1): Removed; code moved to syms_of_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
33005
diff
changeset
|
2270 |
a7d245e080d1
(syms_of_frame_1): Removed; code moved to syms_of_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
33005
diff
changeset
|
2271 /* 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
|
2272 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
|
2273 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
|
2274 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
|
2275 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
|
2276 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
|
2277 specbind (Qinhibit_default_face_x_resources, Qt); |
286 | 2278 |
765 | 2279 if (EQ (frame, Qnil)) |
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_LIVE_FRAME (frame); |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
2282 f = XFRAME (frame); |
286 | 2283 |
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1809
diff
changeset
|
2284 /* 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
|
2285 #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
|
2286 if (FRAME_WINDOW_P (f)) |
965
0eb68c6c452a
* frame.c (Qheight, Qicon, Qmodeline, Qname, Qnone, Qonly,
Jim Blandy <jimb@redhat.com>
parents:
886
diff
changeset
|
2287 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
|
2288 else |
e6618f52efe9
(Fmodify_frame_parameters): For non-X frames,
Richard M. Stallman <rms@gnu.org>
parents:
9972
diff
changeset
|
2289 #endif |
15391
d4cec5d7566d
(Fset_mouse_position): Remove the DOS-specific
Richard M. Stallman <rms@gnu.org>
parents:
15062
diff
changeset
|
2290 #ifdef MSDOS |
d4cec5d7566d
(Fset_mouse_position): Remove the DOS-specific
Richard M. Stallman <rms@gnu.org>
parents:
15062
diff
changeset
|
2291 if (FRAME_MSDOS_P (f)) |
d4cec5d7566d
(Fset_mouse_position): Remove the DOS-specific
Richard M. Stallman <rms@gnu.org>
parents:
15062
diff
changeset
|
2292 IT_set_frame_parameters (f, alist); |
d4cec5d7566d
(Fset_mouse_position): Remove the DOS-specific
Richard M. Stallman <rms@gnu.org>
parents:
15062
diff
changeset
|
2293 else |
d4cec5d7566d
(Fset_mouse_position): Remove the DOS-specific
Richard M. Stallman <rms@gnu.org>
parents:
15062
diff
changeset
|
2294 #endif |
25523
9e9eeb68482e
(Fframep) [macintosh]: Handle mac frame type.
Richard M. Stallman <rms@gnu.org>
parents:
25350
diff
changeset
|
2295 |
16568
cc6d85f9df0f
(Fmodify_frame_parameters): Use alist in reverse order.
Richard M. Stallman <rms@gnu.org>
parents:
16536
diff
changeset
|
2296 { |
cc6d85f9df0f
(Fmodify_frame_parameters): Use alist in reverse order.
Richard M. Stallman <rms@gnu.org>
parents:
16536
diff
changeset
|
2297 int length = XINT (Flength (alist)); |
cc6d85f9df0f
(Fmodify_frame_parameters): Use alist in reverse order.
Richard M. Stallman <rms@gnu.org>
parents:
16536
diff
changeset
|
2298 int i; |
cc6d85f9df0f
(Fmodify_frame_parameters): Use alist in reverse order.
Richard M. Stallman <rms@gnu.org>
parents:
16536
diff
changeset
|
2299 Lisp_Object *parms |
cc6d85f9df0f
(Fmodify_frame_parameters): Use alist in reverse order.
Richard M. Stallman <rms@gnu.org>
parents:
16536
diff
changeset
|
2300 = (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
|
2301 Lisp_Object *values |
cc6d85f9df0f
(Fmodify_frame_parameters): Use alist in reverse order.
Richard M. Stallman <rms@gnu.org>
parents:
16536
diff
changeset
|
2302 = (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
|
2303 |
cc6d85f9df0f
(Fmodify_frame_parameters): Use alist in reverse order.
Richard M. Stallman <rms@gnu.org>
parents:
16536
diff
changeset
|
2304 /* 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
|
2305 |
cc6d85f9df0f
(Fmodify_frame_parameters): Use alist in reverse order.
Richard M. Stallman <rms@gnu.org>
parents:
16536
diff
changeset
|
2306 i = 0; |
cc6d85f9df0f
(Fmodify_frame_parameters): Use alist in reverse order.
Richard M. Stallman <rms@gnu.org>
parents:
16536
diff
changeset
|
2307 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
|
2308 { |
25710
ee1da070c50f
(Fnext_frame): Remove unused variable(s).
Gerd Moellmann <gerd@gnu.org>
parents:
25669
diff
changeset
|
2309 Lisp_Object elt; |
16568
cc6d85f9df0f
(Fmodify_frame_parameters): Use alist in reverse order.
Richard M. Stallman <rms@gnu.org>
parents:
16536
diff
changeset
|
2310 |
cc6d85f9df0f
(Fmodify_frame_parameters): Use alist in reverse order.
Richard M. Stallman <rms@gnu.org>
parents:
16536
diff
changeset
|
2311 elt = Fcar (tail); |
cc6d85f9df0f
(Fmodify_frame_parameters): Use alist in reverse order.
Richard M. Stallman <rms@gnu.org>
parents:
16536
diff
changeset
|
2312 parms[i] = Fcar (elt); |
cc6d85f9df0f
(Fmodify_frame_parameters): Use alist in reverse order.
Richard M. Stallman <rms@gnu.org>
parents:
16536
diff
changeset
|
2313 values[i] = Fcdr (elt); |
cc6d85f9df0f
(Fmodify_frame_parameters): Use alist in reverse order.
Richard M. Stallman <rms@gnu.org>
parents:
16536
diff
changeset
|
2314 i++; |
cc6d85f9df0f
(Fmodify_frame_parameters): Use alist in reverse order.
Richard M. Stallman <rms@gnu.org>
parents:
16536
diff
changeset
|
2315 } |
cc6d85f9df0f
(Fmodify_frame_parameters): Use alist in reverse order.
Richard M. Stallman <rms@gnu.org>
parents:
16536
diff
changeset
|
2316 |
cc6d85f9df0f
(Fmodify_frame_parameters): Use alist in reverse order.
Richard M. Stallman <rms@gnu.org>
parents:
16536
diff
changeset
|
2317 /* 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
|
2318 for (i--; i >= 0; i--) |
cc6d85f9df0f
(Fmodify_frame_parameters): Use alist in reverse order.
Richard M. Stallman <rms@gnu.org>
parents:
16536
diff
changeset
|
2319 { |
cc6d85f9df0f
(Fmodify_frame_parameters): Use alist in reverse order.
Richard M. Stallman <rms@gnu.org>
parents:
16536
diff
changeset
|
2320 prop = parms[i]; |
cc6d85f9df0f
(Fmodify_frame_parameters): Use alist in reverse order.
Richard M. Stallman <rms@gnu.org>
parents:
16536
diff
changeset
|
2321 val = values[i]; |
cc6d85f9df0f
(Fmodify_frame_parameters): Use alist in reverse order.
Richard M. Stallman <rms@gnu.org>
parents:
16536
diff
changeset
|
2322 store_frame_param (f, prop, val); |
63643 | 2323 |
2324 /* Changing the background color might change the background | |
2325 mode, so that we have to load new defface specs. | |
2326 Call frame-set-background-mode to do that. */ | |
2327 if (EQ (prop, Qbackground_color)) | |
2328 call1 (Qframe_set_background_mode, frame); | |
16568
cc6d85f9df0f
(Fmodify_frame_parameters): Use alist in reverse order.
Richard M. Stallman <rms@gnu.org>
parents:
16536
diff
changeset
|
2329 } |
cc6d85f9df0f
(Fmodify_frame_parameters): Use alist in reverse order.
Richard M. Stallman <rms@gnu.org>
parents:
16536
diff
changeset
|
2330 } |
286 | 2331 |
33509
a7d245e080d1
(syms_of_frame_1): Removed; code moved to syms_of_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
33005
diff
changeset
|
2332 return unbind_to (count, Qnil); |
286 | 2333 } |
2334 | |
2068
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
2335 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
|
2336 0, 1, 0, |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
2337 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
|
2338 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
|
2339 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
|
2340 (frame) |
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
2341 Lisp_Object frame; |
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
2342 { |
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
2343 struct frame *f; |
286 | 2344 |
2068
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
2345 if (NILP (frame)) |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
2346 frame = selected_frame; |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
2347 CHECK_FRAME (frame); |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
2348 f = XFRAME (frame); |
777 | 2349 |
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
|
2350 #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
|
2351 if (FRAME_WINDOW_P (f)) |
2068
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
2352 return make_number (x_char_height (f)); |
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
2353 else |
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
2354 #endif |
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
2355 return make_number (1); |
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
2356 } |
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
2357 |
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
2358 |
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
2359 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
|
2360 0, 1, 0, |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
2361 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
|
2362 If FRAME is omitted, the selected frame is used. |
64713
fb0a0e5596b6
(Fframe_char_width): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
64084
diff
changeset
|
2363 On a graphical screen, the width is the standard width of the default font. |
40105
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
2364 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
|
2365 (frame) |
765 | 2366 Lisp_Object frame; |
286 | 2367 { |
2068
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
2368 struct frame *f; |
286 | 2369 |
2068
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
2370 if (NILP (frame)) |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
2371 frame = selected_frame; |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
2372 CHECK_FRAME (frame); |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
2373 f = XFRAME (frame); |
2068
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
2374 |
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
|
2375 #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
|
2376 if (FRAME_WINDOW_P (f)) |
2068
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
2377 return make_number (x_char_width (f)); |
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
2378 else |
777 | 2379 #endif |
2068
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
2380 return make_number (1); |
286 | 2381 } |
2382 | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
2383 DEFUN ("frame-pixel-height", Fframe_pixel_height, |
2068
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
2384 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
|
2385 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
|
2386 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
|
2387 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
|
2388 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
|
2389 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
|
2390 (frame) |
2068
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
2391 Lisp_Object frame; |
286 | 2392 { |
2068
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
2393 struct frame *f; |
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
2394 |
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
2395 if (NILP (frame)) |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
2396 frame = selected_frame; |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
2397 CHECK_FRAME (frame); |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
2398 f = XFRAME (frame); |
2068
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
2399 |
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
|
2400 #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
|
2401 if (FRAME_WINDOW_P (f)) |
2068
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
2402 return make_number (x_pixel_height (f)); |
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
2403 else |
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
2404 #endif |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
2405 return make_number (FRAME_LINES (f)); |
286 | 2406 } |
2068
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
2407 |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
2408 DEFUN ("frame-pixel-width", Fframe_pixel_width, |
2068
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
2409 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
|
2410 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
|
2411 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
|
2412 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
|
2413 (frame) |
2068
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
2414 Lisp_Object frame; |
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
2415 { |
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
2416 struct frame *f; |
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
2417 |
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
2418 if (NILP (frame)) |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
2419 frame = selected_frame; |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
2420 CHECK_FRAME (frame); |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
2421 f = XFRAME (frame); |
2068
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
2422 |
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
|
2423 #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
|
2424 if (FRAME_WINDOW_P (f)) |
2068
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
2425 return make_number (x_pixel_width (f)); |
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
2426 else |
777 | 2427 #endif |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
2428 return make_number (FRAME_COLS (f)); |
2068
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
2429 } |
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
2430 |
765 | 2431 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
|
2432 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
|
2433 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
|
2434 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
|
2435 (frame, lines, pretend) |
14077
a6d3ce4a2f8e
(Fhandle_switch_frame, Fset_frame_height): Harmonize arguments with
Erik Naggum <erik@naggum.no>
parents:
13748
diff
changeset
|
2436 Lisp_Object frame, lines, pretend; |
286 | 2437 { |
765 | 2438 register struct frame *f; |
286 | 2439 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
2440 CHECK_NUMBER (lines); |
765 | 2441 if (NILP (frame)) |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
2442 frame = selected_frame; |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
2443 CHECK_LIVE_FRAME (frame); |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
2444 f = XFRAME (frame); |
286 | 2445 |
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1809
diff
changeset
|
2446 /* 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
|
2447 #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
|
2448 if (FRAME_WINDOW_P (f)) |
286 | 2449 { |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
2450 if (XINT (lines) != FRAME_LINES (f)) |
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
2451 x_set_window_size (f, 1, FRAME_COLS (f), XINT (lines)); |
25350
f964a1e5b29c
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25209
diff
changeset
|
2452 do_pending_window_change (0); |
286 | 2453 } |
2454 else | |
965
0eb68c6c452a
* frame.c (Qheight, Qicon, Qmodeline, Qname, Qnone, Qonly,
Jim Blandy <jimb@redhat.com>
parents:
886
diff
changeset
|
2455 #endif |
25350
f964a1e5b29c
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25209
diff
changeset
|
2456 change_frame_size (f, XINT (lines), 0, !NILP (pretend), 0, 0); |
286 | 2457 return Qnil; |
2458 } | |
2459 | |
765 | 2460 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
|
2461 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
|
2462 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
|
2463 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
|
2464 (frame, cols, pretend) |
965
0eb68c6c452a
* frame.c (Qheight, Qicon, Qmodeline, Qname, Qnone, Qonly,
Jim Blandy <jimb@redhat.com>
parents:
886
diff
changeset
|
2465 Lisp_Object frame, cols, pretend; |
286 | 2466 { |
765 | 2467 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
|
2468 CHECK_NUMBER (cols); |
765 | 2469 if (NILP (frame)) |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
2470 frame = selected_frame; |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
2471 CHECK_LIVE_FRAME (frame); |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
2472 f = XFRAME (frame); |
286 | 2473 |
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1809
diff
changeset
|
2474 /* 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
|
2475 #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
|
2476 if (FRAME_WINDOW_P (f)) |
286 | 2477 { |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
2478 if (XINT (cols) != FRAME_COLS (f)) |
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
2479 x_set_window_size (f, 1, XINT (cols), FRAME_LINES (f)); |
25350
f964a1e5b29c
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25209
diff
changeset
|
2480 do_pending_window_change (0); |
286 | 2481 } |
2482 else | |
965
0eb68c6c452a
* frame.c (Qheight, Qicon, Qmodeline, Qname, Qnone, Qonly,
Jim Blandy <jimb@redhat.com>
parents:
886
diff
changeset
|
2483 #endif |
25350
f964a1e5b29c
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25209
diff
changeset
|
2484 change_frame_size (f, 0, XINT (cols), !NILP (pretend), 0, 0); |
286 | 2485 return Qnil; |
2486 } | |
2487 | |
765 | 2488 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
|
2489 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
|
2490 (frame, cols, rows) |
765 | 2491 Lisp_Object frame, cols, rows; |
286 | 2492 { |
765 | 2493 register struct frame *f; |
286 | 2494 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
2495 CHECK_LIVE_FRAME (frame); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
2496 CHECK_NUMBER (cols); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
2497 CHECK_NUMBER (rows); |
765 | 2498 f = XFRAME (frame); |
286 | 2499 |
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1809
diff
changeset
|
2500 /* 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
|
2501 #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
|
2502 if (FRAME_WINDOW_P (f)) |
286 | 2503 { |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
2504 if (XINT (rows) != FRAME_LINES (f) |
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
2505 || XINT (cols) != FRAME_COLS (f) |
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
2506 || f->new_text_lines || f->new_text_cols) |
5925
806e876cacb4
(Fset_frame_height, Fset_frame_width, Fset_frame_size):
Richard M. Stallman <rms@gnu.org>
parents:
5552
diff
changeset
|
2507 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
|
2508 do_pending_window_change (0); |
286 | 2509 } |
2510 else | |
965
0eb68c6c452a
* frame.c (Qheight, Qicon, Qmodeline, Qname, Qnone, Qonly,
Jim Blandy <jimb@redhat.com>
parents:
886
diff
changeset
|
2511 #endif |
25350
f964a1e5b29c
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25209
diff
changeset
|
2512 change_frame_size (f, XINT (rows), XINT (cols), 0, 0, 0); |
286 | 2513 |
2514 return Qnil; | |
2515 } | |
2516 | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
2517 DEFUN ("set-frame-position", Fset_frame_position, |
765 | 2518 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
|
2519 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
|
2520 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
|
2521 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
|
2522 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
|
2523 (frame, xoffset, yoffset) |
765 | 2524 Lisp_Object frame, xoffset, yoffset; |
286 | 2525 { |
765 | 2526 register struct frame *f; |
286 | 2527 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
2528 CHECK_LIVE_FRAME (frame); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
2529 CHECK_NUMBER (xoffset); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
2530 CHECK_NUMBER (yoffset); |
765 | 2531 f = XFRAME (frame); |
286 | 2532 |
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1809
diff
changeset
|
2533 /* 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
|
2534 #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
|
2535 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
|
2536 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
|
2537 #endif |
286 | 2538 |
2539 return Qt; | |
2540 } | |
777 | 2541 |
286 | 2542 |
50357 | 2543 /*********************************************************************** |
2544 Frame Parameters | |
2545 ***********************************************************************/ | |
2546 | |
2547 /* Connect the frame-parameter names for X frames | |
2548 to the ways of passing the parameter values to the window system. | |
2549 | |
2550 The name of a parameter, as a Lisp symbol, | |
2551 has an `x-frame-parameter' property which is an integer in Lisp | |
2552 that is an index in this table. */ | |
2553 | |
2554 struct frame_parm_table { | |
2555 char *name; | |
2556 Lisp_Object *variable; | |
2557 }; | |
2558 | |
2559 static struct frame_parm_table frame_parms[] = | |
2560 { | |
2561 {"auto-raise", &Qauto_raise}, | |
2562 {"auto-lower", &Qauto_lower}, | |
2563 {"background-color", 0}, | |
2564 {"border-color", &Qborder_color}, | |
2565 {"border-width", &Qborder_width}, | |
2566 {"cursor-color", &Qcursor_color}, | |
2567 {"cursor-type", &Qcursor_type}, | |
2568 {"font", 0}, | |
2569 {"foreground-color", 0}, | |
2570 {"icon-name", &Qicon_name}, | |
2571 {"icon-type", &Qicon_type}, | |
2572 {"internal-border-width", &Qinternal_border_width}, | |
2573 {"menu-bar-lines", &Qmenu_bar_lines}, | |
2574 {"mouse-color", &Qmouse_color}, | |
2575 {"name", &Qname}, | |
2576 {"scroll-bar-width", &Qscroll_bar_width}, | |
2577 {"title", &Qtitle}, | |
2578 {"unsplittable", &Qunsplittable}, | |
2579 {"vertical-scroll-bars", &Qvertical_scroll_bars}, | |
2580 {"visibility", &Qvisibility}, | |
2581 {"tool-bar-lines", &Qtool_bar_lines}, | |
2582 {"scroll-bar-foreground", &Qscroll_bar_foreground}, | |
2583 {"scroll-bar-background", &Qscroll_bar_background}, | |
2584 {"screen-gamma", &Qscreen_gamma}, | |
2585 {"line-spacing", &Qline_spacing}, | |
2586 {"left-fringe", &Qleft_fringe}, | |
2587 {"right-fringe", &Qright_fringe}, | |
2588 {"wait-for-wm", &Qwait_for_wm}, | |
2589 {"fullscreen", &Qfullscreen}, | |
2590 }; | |
2591 | |
2592 #ifdef HAVE_WINDOW_SYSTEM | |
2593 | |
2594 extern Lisp_Object Qbox; | |
2595 extern Lisp_Object Qtop; | |
2596 | |
2597 /* Calculate fullscreen size. Return in *TOP_POS and *LEFT_POS the | |
2598 wanted positions of the WM window (not emacs window). | |
2599 Return in *WIDTH and *HEIGHT the wanted width and height of Emacs | |
2600 window (FRAME_X_WINDOW). | |
2601 */ | |
2602 | |
2603 void | |
2604 x_fullscreen_adjust (f, width, height, top_pos, left_pos) | |
2605 struct frame *f; | |
2606 int *width; | |
2607 int *height; | |
2608 int *top_pos; | |
2609 int *left_pos; | |
2610 { | |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
2611 int newwidth = FRAME_COLS (f); |
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
2612 int newheight = FRAME_LINES (f); |
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
2613 |
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
2614 *top_pos = f->top_pos; |
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
2615 *left_pos = f->left_pos; |
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
2616 |
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
2617 if (f->want_fullscreen & FULLSCREEN_HEIGHT) |
50357 | 2618 { |
2619 int ph; | |
2620 | |
2621 ph = FRAME_X_DISPLAY_INFO (f)->height; | |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
2622 newheight = FRAME_PIXEL_HEIGHT_TO_TEXT_LINES (f, ph); |
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
2623 ph = FRAME_TEXT_LINES_TO_PIXEL_HEIGHT (f, newheight) - f->y_pixels_diff; |
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
2624 newheight = FRAME_PIXEL_HEIGHT_TO_TEXT_LINES (f, ph); |
50357 | 2625 *top_pos = 0; |
2626 } | |
2627 | |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
2628 if (f->want_fullscreen & FULLSCREEN_WIDTH) |
50357 | 2629 { |
2630 int pw; | |
2631 | |
2632 pw = FRAME_X_DISPLAY_INFO (f)->width; | |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
2633 newwidth = FRAME_PIXEL_WIDTH_TO_TEXT_COLS (f, pw); |
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
2634 pw = FRAME_TEXT_COLS_TO_PIXEL_WIDTH (f, newwidth) - f->x_pixels_diff; |
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
2635 newwidth = FRAME_PIXEL_WIDTH_TO_TEXT_COLS (f, pw); |
50357 | 2636 *left_pos = 0; |
2637 } | |
2638 | |
2639 *width = newwidth; | |
2640 *height = newheight; | |
2641 } | |
2642 | |
2643 | |
2644 /* Change the parameters of frame F as specified by ALIST. | |
2645 If a parameter is not specially recognized, do nothing special; | |
2646 otherwise call the `x_set_...' function for that parameter. | |
2647 Except for certain geometry properties, always call store_frame_param | |
2648 to store the new value in the parameter alist. */ | |
2649 | |
2650 void | |
2651 x_set_frame_parameters (f, alist) | |
2652 FRAME_PTR f; | |
2653 Lisp_Object alist; | |
2654 { | |
2655 Lisp_Object tail; | |
2656 | |
2657 /* If both of these parameters are present, it's more efficient to | |
2658 set them both at once. So we wait until we've looked at the | |
2659 entire list before we set them. */ | |
2660 int width, height; | |
2661 | |
2662 /* Same here. */ | |
2663 Lisp_Object left, top; | |
2664 | |
2665 /* Same with these. */ | |
2666 Lisp_Object icon_left, icon_top; | |
2667 | |
2668 /* Record in these vectors all the parms specified. */ | |
2669 Lisp_Object *parms; | |
2670 Lisp_Object *values; | |
2671 int i, p; | |
2672 int left_no_change = 0, top_no_change = 0; | |
2673 int icon_left_no_change = 0, icon_top_no_change = 0; | |
2674 int fullscreen_is_being_set = 0; | |
2675 | |
2676 struct gcpro gcpro1, gcpro2; | |
2677 | |
2678 i = 0; | |
2679 for (tail = alist; CONSP (tail); tail = Fcdr (tail)) | |
2680 i++; | |
2681 | |
2682 parms = (Lisp_Object *) alloca (i * sizeof (Lisp_Object)); | |
2683 values = (Lisp_Object *) alloca (i * sizeof (Lisp_Object)); | |
2684 | |
2685 /* Extract parm names and values into those vectors. */ | |
2686 | |
2687 i = 0; | |
2688 for (tail = alist; CONSP (tail); tail = Fcdr (tail)) | |
2689 { | |
2690 Lisp_Object elt; | |
2691 | |
2692 elt = Fcar (tail); | |
2693 parms[i] = Fcar (elt); | |
2694 values[i] = Fcdr (elt); | |
2695 i++; | |
2696 } | |
2697 /* TAIL and ALIST are not used again below here. */ | |
2698 alist = tail = Qnil; | |
2699 | |
2700 GCPRO2 (*parms, *values); | |
2701 gcpro1.nvars = i; | |
2702 gcpro2.nvars = i; | |
2703 | |
2704 /* There is no need to gcpro LEFT, TOP, ICON_LEFT, or ICON_TOP, | |
2705 because their values appear in VALUES and strings are not valid. */ | |
2706 top = left = Qunbound; | |
2707 icon_left = icon_top = Qunbound; | |
2708 | |
2709 /* Provide default values for HEIGHT and WIDTH. */ | |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
2710 width = (f->new_text_cols ? f->new_text_cols : FRAME_COLS (f)); |
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
2711 height = (f->new_text_lines ? f->new_text_lines : FRAME_LINES (f)); |
50357 | 2712 |
2713 /* Process foreground_color and background_color before anything else. | |
2714 They are independent of other properties, but other properties (e.g., | |
2715 cursor_color) are dependent upon them. */ | |
2716 /* Process default font as well, since fringe widths depends on it. */ | |
2717 /* Also, process fullscreen, width and height depend upon that */ | |
2718 for (p = 0; p < i; p++) | |
2719 { | |
2720 Lisp_Object prop, val; | |
2721 | |
2722 prop = parms[p]; | |
2723 val = values[p]; | |
2724 if (EQ (prop, Qforeground_color) | |
2725 || EQ (prop, Qbackground_color) | |
2726 || EQ (prop, Qfont) | |
2727 || EQ (prop, Qfullscreen)) | |
2728 { | |
2729 register Lisp_Object param_index, old_value; | |
2730 | |
2731 old_value = get_frame_param (f, prop); | |
2732 fullscreen_is_being_set |= EQ (prop, Qfullscreen); | |
2733 | |
2734 if (NILP (Fequal (val, old_value))) | |
2735 { | |
2736 store_frame_param (f, prop, val); | |
2737 | |
2738 param_index = Fget (prop, Qx_frame_parameter); | |
2739 if (NATNUMP (param_index) | |
2740 && (XFASTINT (param_index) | |
2741 < sizeof (frame_parms)/sizeof (frame_parms[0])) | |
2742 && rif->frame_parm_handlers[XINT (param_index)]) | |
2743 (*(rif->frame_parm_handlers[XINT (param_index)])) (f, val, old_value); | |
2744 } | |
2745 } | |
2746 } | |
2747 | |
2748 /* Now process them in reverse of specified order. */ | |
2749 for (i--; i >= 0; i--) | |
2750 { | |
2751 Lisp_Object prop, val; | |
2752 | |
2753 prop = parms[i]; | |
2754 val = values[i]; | |
2755 | |
2756 if (EQ (prop, Qwidth) && NUMBERP (val)) | |
2757 width = XFASTINT (val); | |
2758 else if (EQ (prop, Qheight) && NUMBERP (val)) | |
2759 height = XFASTINT (val); | |
2760 else if (EQ (prop, Qtop)) | |
2761 top = val; | |
2762 else if (EQ (prop, Qleft)) | |
2763 left = val; | |
2764 else if (EQ (prop, Qicon_top)) | |
2765 icon_top = val; | |
2766 else if (EQ (prop, Qicon_left)) | |
2767 icon_left = val; | |
2768 else if (EQ (prop, Qforeground_color) | |
2769 || EQ (prop, Qbackground_color) | |
2770 || EQ (prop, Qfont) | |
2771 || EQ (prop, Qfullscreen)) | |
2772 /* Processed above. */ | |
2773 continue; | |
2774 else | |
2775 { | |
2776 register Lisp_Object param_index, old_value; | |
2777 | |
2778 old_value = get_frame_param (f, prop); | |
2779 | |
2780 store_frame_param (f, prop, val); | |
2781 | |
2782 param_index = Fget (prop, Qx_frame_parameter); | |
2783 if (NATNUMP (param_index) | |
2784 && (XFASTINT (param_index) | |
2785 < sizeof (frame_parms)/sizeof (frame_parms[0])) | |
2786 && rif->frame_parm_handlers[XINT (param_index)]) | |
2787 (*(rif->frame_parm_handlers[XINT (param_index)])) (f, val, old_value); | |
2788 } | |
2789 } | |
2790 | |
2791 /* Don't die if just one of these was set. */ | |
2792 if (EQ (left, Qunbound)) | |
2793 { | |
2794 left_no_change = 1; | |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
2795 if (f->left_pos < 0) |
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
2796 left = Fcons (Qplus, Fcons (make_number (f->left_pos), Qnil)); |
50357 | 2797 else |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
2798 XSETINT (left, f->left_pos); |
50357 | 2799 } |
2800 if (EQ (top, Qunbound)) | |
2801 { | |
2802 top_no_change = 1; | |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
2803 if (f->top_pos < 0) |
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
2804 top = Fcons (Qplus, Fcons (make_number (f->top_pos), Qnil)); |
50357 | 2805 else |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
2806 XSETINT (top, f->top_pos); |
50357 | 2807 } |
2808 | |
2809 /* If one of the icon positions was not set, preserve or default it. */ | |
2810 if (EQ (icon_left, Qunbound) || ! INTEGERP (icon_left)) | |
2811 { | |
2812 icon_left_no_change = 1; | |
2813 icon_left = Fcdr (Fassq (Qicon_left, f->param_alist)); | |
2814 if (NILP (icon_left)) | |
2815 XSETINT (icon_left, 0); | |
2816 } | |
2817 if (EQ (icon_top, Qunbound) || ! INTEGERP (icon_top)) | |
2818 { | |
2819 icon_top_no_change = 1; | |
2820 icon_top = Fcdr (Fassq (Qicon_top, f->param_alist)); | |
2821 if (NILP (icon_top)) | |
2822 XSETINT (icon_top, 0); | |
2823 } | |
2824 | |
2825 if (FRAME_VISIBLE_P (f) && fullscreen_is_being_set) | |
2826 { | |
2827 /* If the frame is visible already and the fullscreen parameter is | |
2828 being set, it is too late to set WM manager hints to specify | |
2829 size and position. | |
2830 Here we first get the width, height and position that applies to | |
2831 fullscreen. We then move the frame to the appropriate | |
2832 position. Resize of the frame is taken care of in the code after | |
2833 this if-statement. */ | |
2834 int new_left, new_top; | |
2835 | |
2836 x_fullscreen_adjust (f, &width, &height, &new_top, &new_left); | |
52754
d08832a11cfd
* w32term.c (w32_read_socket): Remove call to x_check_fullscreen_move,
Jan Djärv <jan.h.d@swipnet.se>
parents:
52753
diff
changeset
|
2837 if (new_top != f->top_pos || new_left != f->left_pos) |
d08832a11cfd
* w32term.c (w32_read_socket): Remove call to x_check_fullscreen_move,
Jan Djärv <jan.h.d@swipnet.se>
parents:
52753
diff
changeset
|
2838 x_set_offset (f, new_left, new_top, 1); |
50357 | 2839 } |
2840 | |
2841 /* Don't set these parameters unless they've been explicitly | |
2842 specified. The window might be mapped or resized while we're in | |
2843 this function, and we don't want to override that unless the lisp | |
2844 code has asked for it. | |
2845 | |
2846 Don't set these parameters unless they actually differ from the | |
2847 window's current parameters; the window may not actually exist | |
2848 yet. */ | |
2849 { | |
2850 Lisp_Object frame; | |
2851 | |
2852 check_frame_size (f, &height, &width); | |
2853 | |
2854 XSETFRAME (frame, f); | |
2855 | |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
2856 if (width != FRAME_COLS (f) |
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
2857 || height != FRAME_LINES (f) |
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
2858 || f->new_text_lines || f->new_text_cols) |
50357 | 2859 Fset_frame_size (frame, make_number (width), make_number (height)); |
2860 | |
2861 if ((!NILP (left) || !NILP (top)) | |
2862 && ! (left_no_change && top_no_change) | |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
2863 && ! (NUMBERP (left) && XINT (left) == f->left_pos |
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
2864 && NUMBERP (top) && XINT (top) == f->top_pos)) |
50357 | 2865 { |
2866 int leftpos = 0; | |
2867 int toppos = 0; | |
2868 | |
2869 /* Record the signs. */ | |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
2870 f->size_hint_flags &= ~ (XNegative | YNegative); |
50357 | 2871 if (EQ (left, Qminus)) |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
2872 f->size_hint_flags |= XNegative; |
50357 | 2873 else if (INTEGERP (left)) |
2874 { | |
2875 leftpos = XINT (left); | |
2876 if (leftpos < 0) | |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
2877 f->size_hint_flags |= XNegative; |
50357 | 2878 } |
2879 else if (CONSP (left) && EQ (XCAR (left), Qminus) | |
2880 && CONSP (XCDR (left)) | |
2881 && INTEGERP (XCAR (XCDR (left)))) | |
2882 { | |
2883 leftpos = - XINT (XCAR (XCDR (left))); | |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
2884 f->size_hint_flags |= XNegative; |
50357 | 2885 } |
2886 else if (CONSP (left) && EQ (XCAR (left), Qplus) | |
2887 && CONSP (XCDR (left)) | |
2888 && INTEGERP (XCAR (XCDR (left)))) | |
2889 { | |
2890 leftpos = XINT (XCAR (XCDR (left))); | |
2891 } | |
2892 | |
2893 if (EQ (top, Qminus)) | |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
2894 f->size_hint_flags |= YNegative; |
50357 | 2895 else if (INTEGERP (top)) |
2896 { | |
2897 toppos = XINT (top); | |
2898 if (toppos < 0) | |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
2899 f->size_hint_flags |= YNegative; |
50357 | 2900 } |
2901 else if (CONSP (top) && EQ (XCAR (top), Qminus) | |
2902 && CONSP (XCDR (top)) | |
2903 && INTEGERP (XCAR (XCDR (top)))) | |
2904 { | |
2905 toppos = - XINT (XCAR (XCDR (top))); | |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
2906 f->size_hint_flags |= YNegative; |
50357 | 2907 } |
2908 else if (CONSP (top) && EQ (XCAR (top), Qplus) | |
2909 && CONSP (XCDR (top)) | |
2910 && INTEGERP (XCAR (XCDR (top)))) | |
2911 { | |
2912 toppos = XINT (XCAR (XCDR (top))); | |
2913 } | |
2914 | |
2915 | |
2916 /* Store the numeric value of the position. */ | |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
2917 f->top_pos = toppos; |
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
2918 f->left_pos = leftpos; |
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
2919 |
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
2920 f->win_gravity = NorthWestGravity; |
50357 | 2921 |
2922 /* Actually set that position, and convert to absolute. */ | |
2923 x_set_offset (f, leftpos, toppos, -1); | |
2924 } | |
2925 | |
2926 if ((!NILP (icon_left) || !NILP (icon_top)) | |
2927 && ! (icon_left_no_change && icon_top_no_change)) | |
2928 x_wm_set_icon_position (f, XINT (icon_left), XINT (icon_top)); | |
2929 } | |
2930 | |
2931 UNGCPRO; | |
2932 } | |
2933 | |
2934 | |
2935 /* Insert a description of internally-recorded parameters of frame X | |
2936 into the parameter alist *ALISTPTR that is to be given to the user. | |
2937 Only parameters that are specific to the X window system | |
2938 and whose values are not correctly recorded in the frame's | |
2939 param_alist need to be considered here. */ | |
2940 | |
2941 void | |
2942 x_report_frame_params (f, alistptr) | |
2943 struct frame *f; | |
2944 Lisp_Object *alistptr; | |
2945 { | |
2946 char buf[16]; | |
2947 Lisp_Object tem; | |
2948 | |
2949 /* Represent negative positions (off the top or left screen edge) | |
2950 in a way that Fmodify_frame_parameters will understand correctly. */ | |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
2951 XSETINT (tem, f->left_pos); |
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
2952 if (f->left_pos >= 0) |
50357 | 2953 store_in_alist (alistptr, Qleft, tem); |
2954 else | |
2955 store_in_alist (alistptr, Qleft, Fcons (Qplus, Fcons (tem, Qnil))); | |
2956 | |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
2957 XSETINT (tem, f->top_pos); |
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
2958 if (f->top_pos >= 0) |
50357 | 2959 store_in_alist (alistptr, Qtop, tem); |
2960 else | |
2961 store_in_alist (alistptr, Qtop, Fcons (Qplus, Fcons (tem, Qnil))); | |
2962 | |
2963 store_in_alist (alistptr, Qborder_width, | |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
2964 make_number (f->border_width)); |
50357 | 2965 store_in_alist (alistptr, Qinternal_border_width, |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
2966 make_number (FRAME_INTERNAL_BORDER_WIDTH (f))); |
50357 | 2967 store_in_alist (alistptr, Qleft_fringe, |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
2968 make_number (FRAME_LEFT_FRINGE_WIDTH (f))); |
50357 | 2969 store_in_alist (alistptr, Qright_fringe, |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
2970 make_number (FRAME_RIGHT_FRINGE_WIDTH (f))); |
50357 | 2971 store_in_alist (alistptr, Qscroll_bar_width, |
2972 (! FRAME_HAS_VERTICAL_SCROLL_BARS (f) | |
2973 ? make_number (0) | |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
2974 : FRAME_CONFIG_SCROLL_BAR_WIDTH (f) > 0 |
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
2975 ? make_number (FRAME_CONFIG_SCROLL_BAR_WIDTH (f)) |
50357 | 2976 /* nil means "use default width" |
2977 for non-toolkit scroll bar. | |
2978 ruler-mode.el depends on this. */ | |
2979 : Qnil)); | |
2980 sprintf (buf, "%ld", (long) FRAME_X_WINDOW (f)); | |
2981 store_in_alist (alistptr, Qwindow_id, | |
2982 build_string (buf)); | |
2983 #ifdef HAVE_X_WINDOWS | |
2984 #ifdef USE_X_TOOLKIT | |
2985 /* Tooltip frame may not have this widget. */ | |
2986 if (FRAME_X_OUTPUT (f)->widget) | |
2987 #endif | |
2988 sprintf (buf, "%ld", (long) FRAME_OUTER_WINDOW (f)); | |
2989 store_in_alist (alistptr, Qouter_window_id, | |
2990 build_string (buf)); | |
2991 #endif | |
2992 store_in_alist (alistptr, Qicon_name, f->icon_name); | |
2993 FRAME_SAMPLE_VISIBILITY (f); | |
2994 store_in_alist (alistptr, Qvisibility, | |
2995 (FRAME_VISIBLE_P (f) ? Qt | |
2996 : FRAME_ICONIFIED_P (f) ? Qicon : Qnil)); | |
2997 store_in_alist (alistptr, Qdisplay, | |
2998 XCAR (FRAME_X_DISPLAY_INFO (f)->name_list_element)); | |
2999 | |
3000 if (FRAME_X_OUTPUT (f)->parent_desc == FRAME_X_DISPLAY_INFO (f)->root_window) | |
3001 tem = Qnil; | |
3002 else | |
3003 XSETFASTINT (tem, FRAME_X_OUTPUT (f)->parent_desc); | |
3004 store_in_alist (alistptr, Qparent_id, tem); | |
3005 } | |
3006 | |
3007 | |
3008 /* Change the `fullscreen' frame parameter of frame F. OLD_VALUE is | |
3009 the previous value of that parameter, NEW_VALUE is the new value. */ | |
3010 | |
3011 void | |
3012 x_set_fullscreen (f, new_value, old_value) | |
3013 struct frame *f; | |
3014 Lisp_Object new_value, old_value; | |
3015 { | |
3016 if (NILP (new_value)) | |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
3017 f->want_fullscreen = FULLSCREEN_NONE; |
50357 | 3018 else if (EQ (new_value, Qfullboth)) |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
3019 f->want_fullscreen = FULLSCREEN_BOTH; |
50357 | 3020 else if (EQ (new_value, Qfullwidth)) |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
3021 f->want_fullscreen = FULLSCREEN_WIDTH; |
50357 | 3022 else if (EQ (new_value, Qfullheight)) |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
3023 f->want_fullscreen = FULLSCREEN_HEIGHT; |
50357 | 3024 } |
3025 | |
3026 | |
3027 /* Change the `line-spacing' frame parameter of frame F. OLD_VALUE is | |
3028 the previous value of that parameter, NEW_VALUE is the new value. */ | |
3029 | |
3030 void | |
3031 x_set_line_spacing (f, new_value, old_value) | |
3032 struct frame *f; | |
3033 Lisp_Object new_value, old_value; | |
3034 { | |
3035 if (NILP (new_value)) | |
3036 f->extra_line_spacing = 0; | |
3037 else if (NATNUMP (new_value)) | |
3038 f->extra_line_spacing = XFASTINT (new_value); | |
3039 else | |
3040 Fsignal (Qerror, Fcons (build_string ("Invalid line-spacing"), | |
3041 Fcons (new_value, Qnil))); | |
3042 if (FRAME_VISIBLE_P (f)) | |
3043 redraw_frame (f); | |
3044 } | |
3045 | |
3046 | |
3047 /* Change the `screen-gamma' frame parameter of frame F. OLD_VALUE is | |
3048 the previous value of that parameter, NEW_VALUE is the new value. */ | |
3049 | |
3050 void | |
3051 x_set_screen_gamma (f, new_value, old_value) | |
3052 struct frame *f; | |
3053 Lisp_Object new_value, old_value; | |
3054 { | |
3055 if (NILP (new_value)) | |
3056 f->gamma = 0; | |
3057 else if (NUMBERP (new_value) && XFLOATINT (new_value) > 0) | |
3058 /* The value 0.4545 is the normal viewing gamma. */ | |
3059 f->gamma = 1.0 / (0.4545 * XFLOATINT (new_value)); | |
3060 else | |
3061 Fsignal (Qerror, Fcons (build_string ("Invalid screen-gamma"), | |
3062 Fcons (new_value, Qnil))); | |
3063 | |
3064 clear_face_cache (0); | |
3065 } | |
3066 | |
3067 | |
3068 void | |
3069 x_set_font (f, arg, oldval) | |
3070 struct frame *f; | |
3071 Lisp_Object arg, oldval; | |
3072 { | |
3073 Lisp_Object result; | |
3074 Lisp_Object fontset_name; | |
3075 Lisp_Object frame; | |
3076 int old_fontset = FRAME_FONTSET(f); | |
3077 | |
90412 | 3078 #ifdef USE_FONT_BACKEND |
3079 if (enable_font_backend) | |
3080 fontset_name = result = x_new_fontset2 (f, arg); | |
3081 else | |
3082 { | |
3083 #endif /* USE_FONT_BACKEND */ | |
50357 | 3084 CHECK_STRING (arg); |
3085 | |
3086 fontset_name = Fquery_fontset (arg, Qnil); | |
3087 | |
3088 BLOCK_INPUT; | |
3089 result = (STRINGP (fontset_name) | |
89483 | 3090 ? x_new_fontset (f, fontset_name) |
3091 : x_new_fontset (f, arg)); | |
50357 | 3092 UNBLOCK_INPUT; |
90412 | 3093 #ifdef USE_FONT_BACKEND |
3094 } | |
3095 #endif | |
50357 | 3096 |
3097 if (EQ (result, Qnil)) | |
3098 error ("Font `%s' is not defined", SDATA (arg)); | |
3099 else if (EQ (result, Qt)) | |
89483 | 3100 error ("The default fontset can't be used for a frame font"); |
50357 | 3101 else if (STRINGP (result)) |
3102 { | |
60512
d82c0ae36f1e
(x_set_font): Call set_default_ascii_font if an
Kenichi Handa <handa@m17n.org>
parents:
59146
diff
changeset
|
3103 set_default_ascii_font (result); |
50357 | 3104 if (STRINGP (fontset_name)) |
3105 { | |
3106 /* Fontset names are built from ASCII font names, so the | |
3107 names may be equal despite there was a change. */ | |
3108 if (old_fontset == FRAME_FONTSET (f)) | |
3109 return; | |
3110 } | |
89483 | 3111 store_frame_param (f, Qfont, result); |
90386
2ecafc6d5db7
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-58
Miles Bader <miles@gnu.org>
diff
changeset
|
3112 |
89483 | 3113 if (!NILP (Fequal (result, oldval))) |
50357 | 3114 return; |
3115 | |
70198
29a0b82dbf7a
(x_set_font): Clear f->n_tool_bar_rows and current frame
Kim F. Storm <storm@cua.dk>
parents:
68918
diff
changeset
|
3116 /* Recalculate toolbar height. */ |
29a0b82dbf7a
(x_set_font): Clear f->n_tool_bar_rows and current frame
Kim F. Storm <storm@cua.dk>
parents:
68918
diff
changeset
|
3117 f->n_tool_bar_rows = 0; |
29a0b82dbf7a
(x_set_font): Clear f->n_tool_bar_rows and current frame
Kim F. Storm <storm@cua.dk>
parents:
68918
diff
changeset
|
3118 /* Ensure we redraw it. */ |
29a0b82dbf7a
(x_set_font): Clear f->n_tool_bar_rows and current frame
Kim F. Storm <storm@cua.dk>
parents:
68918
diff
changeset
|
3119 clear_current_matrices (f); |
29a0b82dbf7a
(x_set_font): Clear f->n_tool_bar_rows and current frame
Kim F. Storm <storm@cua.dk>
parents:
68918
diff
changeset
|
3120 |
50357 | 3121 recompute_basic_faces (f); |
3122 } | |
3123 else | |
3124 abort (); | |
3125 | |
3126 do_pending_window_change (0); | |
3127 | |
3128 /* Don't call `face-set-after-frame-default' when faces haven't been | |
3129 initialized yet. This is the case when called from | |
3130 Fx_create_frame. In that case, the X widget or window doesn't | |
3131 exist either, and we can end up in x_report_frame_params with a | |
3132 null widget which gives a segfault. */ | |
3133 if (FRAME_FACE_CACHE (f)) | |
3134 { | |
3135 XSETFRAME (frame, f); | |
3136 call1 (Qface_set_after_frame_default, frame); | |
3137 } | |
3138 } | |
3139 | |
3140 | |
3141 void | |
3142 x_set_fringe_width (f, new_value, old_value) | |
3143 struct frame *f; | |
3144 Lisp_Object new_value, old_value; | |
3145 { | |
3146 compute_fringe_widths (f, 1); | |
3147 } | |
3148 | |
3149 void | |
3150 x_set_border_width (f, arg, oldval) | |
3151 struct frame *f; | |
3152 Lisp_Object arg, oldval; | |
3153 { | |
3154 CHECK_NUMBER (arg); | |
3155 | |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
3156 if (XINT (arg) == f->border_width) |
50357 | 3157 return; |
3158 | |
3159 if (FRAME_X_WINDOW (f) != 0) | |
70647
1cadc44e0431
(x_set_border_width): Fix error message to say "frame", not "window".
Eli Zaretskii <eliz@gnu.org>
parents:
70198
diff
changeset
|
3160 error ("Cannot change the border width of a frame"); |
50357 | 3161 |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
3162 f->border_width = XINT (arg); |
50357 | 3163 } |
3164 | |
3165 void | |
3166 x_set_internal_border_width (f, arg, oldval) | |
3167 struct frame *f; | |
3168 Lisp_Object arg, oldval; | |
3169 { | |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
3170 int old = FRAME_INTERNAL_BORDER_WIDTH (f); |
50357 | 3171 |
3172 CHECK_NUMBER (arg); | |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
3173 FRAME_INTERNAL_BORDER_WIDTH (f) = XINT (arg); |
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
3174 if (FRAME_INTERNAL_BORDER_WIDTH (f) < 0) |
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
3175 FRAME_INTERNAL_BORDER_WIDTH (f) = 0; |
50357 | 3176 |
3177 #ifdef USE_X_TOOLKIT | |
3178 if (FRAME_X_OUTPUT (f)->edit_widget) | |
3179 widget_store_internal_border (FRAME_X_OUTPUT (f)->edit_widget); | |
3180 #endif | |
3181 | |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
3182 if (FRAME_INTERNAL_BORDER_WIDTH (f) == old) |
50357 | 3183 return; |
3184 | |
3185 if (FRAME_X_WINDOW (f) != 0) | |
3186 { | |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
3187 x_set_window_size (f, 0, FRAME_COLS (f), FRAME_LINES (f)); |
50357 | 3188 SET_FRAME_GARBAGED (f); |
3189 do_pending_window_change (0); | |
3190 } | |
3191 else | |
3192 SET_FRAME_GARBAGED (f); | |
3193 } | |
3194 | |
3195 void | |
3196 x_set_visibility (f, value, oldval) | |
3197 struct frame *f; | |
3198 Lisp_Object value, oldval; | |
3199 { | |
3200 Lisp_Object frame; | |
3201 XSETFRAME (frame, f); | |
3202 | |
3203 if (NILP (value)) | |
3204 Fmake_frame_invisible (frame, Qt); | |
3205 else if (EQ (value, Qicon)) | |
3206 Ficonify_frame (frame); | |
3207 else | |
3208 Fmake_frame_visible (frame); | |
3209 } | |
3210 | |
3211 void | |
3212 x_set_autoraise (f, arg, oldval) | |
3213 struct frame *f; | |
3214 Lisp_Object arg, oldval; | |
3215 { | |
3216 f->auto_raise = !EQ (Qnil, arg); | |
3217 } | |
3218 | |
3219 void | |
3220 x_set_autolower (f, arg, oldval) | |
3221 struct frame *f; | |
3222 Lisp_Object arg, oldval; | |
3223 { | |
3224 f->auto_lower = !EQ (Qnil, arg); | |
3225 } | |
3226 | |
3227 void | |
3228 x_set_unsplittable (f, arg, oldval) | |
3229 struct frame *f; | |
3230 Lisp_Object arg, oldval; | |
3231 { | |
3232 f->no_split = !NILP (arg); | |
3233 } | |
3234 | |
3235 void | |
3236 x_set_vertical_scroll_bars (f, arg, oldval) | |
3237 struct frame *f; | |
3238 Lisp_Object arg, oldval; | |
3239 { | |
3240 if ((EQ (arg, Qleft) && FRAME_HAS_VERTICAL_SCROLL_BARS_ON_RIGHT (f)) | |
3241 || (EQ (arg, Qright) && FRAME_HAS_VERTICAL_SCROLL_BARS_ON_LEFT (f)) | |
3242 || (NILP (arg) && FRAME_HAS_VERTICAL_SCROLL_BARS (f)) | |
3243 || (!NILP (arg) && ! FRAME_HAS_VERTICAL_SCROLL_BARS (f))) | |
3244 { | |
3245 FRAME_VERTICAL_SCROLL_BAR_TYPE (f) | |
3246 = (NILP (arg) | |
3247 ? vertical_scroll_bar_none | |
3248 : EQ (Qleft, arg) | |
3249 ? vertical_scroll_bar_left | |
3250 : EQ (Qright, arg) | |
3251 ? vertical_scroll_bar_right | |
52557
4a93216e6678
(Vdefault_frame_scroll_bars): New variable.
Kim F. Storm <storm@cua.dk>
parents:
52401
diff
changeset
|
3252 : EQ (Qleft, Vdefault_frame_scroll_bars) |
4a93216e6678
(Vdefault_frame_scroll_bars): New variable.
Kim F. Storm <storm@cua.dk>
parents:
52401
diff
changeset
|
3253 ? vertical_scroll_bar_left |
4a93216e6678
(Vdefault_frame_scroll_bars): New variable.
Kim F. Storm <storm@cua.dk>
parents:
52401
diff
changeset
|
3254 : EQ (Qright, Vdefault_frame_scroll_bars) |
4a93216e6678
(Vdefault_frame_scroll_bars): New variable.
Kim F. Storm <storm@cua.dk>
parents:
52401
diff
changeset
|
3255 ? vertical_scroll_bar_right |
4a93216e6678
(Vdefault_frame_scroll_bars): New variable.
Kim F. Storm <storm@cua.dk>
parents:
52401
diff
changeset
|
3256 : vertical_scroll_bar_none); |
50357 | 3257 |
3258 /* We set this parameter before creating the X window for the | |
3259 frame, so we can get the geometry right from the start. | |
3260 However, if the window hasn't been created yet, we shouldn't | |
3261 call x_set_window_size. */ | |
3262 if (FRAME_X_WINDOW (f)) | |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
3263 x_set_window_size (f, 0, FRAME_COLS (f), FRAME_LINES (f)); |
50357 | 3264 do_pending_window_change (0); |
3265 } | |
3266 } | |
3267 | |
3268 void | |
3269 x_set_scroll_bar_width (f, arg, oldval) | |
3270 struct frame *f; | |
3271 Lisp_Object arg, oldval; | |
3272 { | |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
3273 int wid = FRAME_COLUMN_WIDTH (f); |
50357 | 3274 |
3275 if (NILP (arg)) | |
3276 { | |
3277 x_set_scroll_bar_default_width (f); | |
3278 | |
3279 if (FRAME_X_WINDOW (f)) | |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
3280 x_set_window_size (f, 0, FRAME_COLS (f), FRAME_LINES (f)); |
50357 | 3281 do_pending_window_change (0); |
3282 } | |
3283 else if (INTEGERP (arg) && XINT (arg) > 0 | |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
3284 && XFASTINT (arg) != FRAME_CONFIG_SCROLL_BAR_WIDTH (f)) |
50357 | 3285 { |
3286 if (XFASTINT (arg) <= 2 * VERTICAL_SCROLL_BAR_WIDTH_TRIM) | |
3287 XSETINT (arg, 2 * VERTICAL_SCROLL_BAR_WIDTH_TRIM + 1); | |
3288 | |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
3289 FRAME_CONFIG_SCROLL_BAR_WIDTH (f) = XFASTINT (arg); |
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
3290 FRAME_CONFIG_SCROLL_BAR_COLS (f) = (XFASTINT (arg) + wid-1) / wid; |
50357 | 3291 if (FRAME_X_WINDOW (f)) |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
3292 x_set_window_size (f, 0, FRAME_COLS (f), FRAME_LINES (f)); |
50357 | 3293 do_pending_window_change (0); |
3294 } | |
3295 | |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
3296 change_frame_size (f, 0, FRAME_COLS (f), 0, 0, 0); |
50357 | 3297 XWINDOW (FRAME_SELECTED_WINDOW (f))->cursor.hpos = 0; |
3298 XWINDOW (FRAME_SELECTED_WINDOW (f))->cursor.x = 0; | |
3299 } | |
3300 | |
3301 | |
3302 | |
3303 /* Return non-nil if frame F wants a bitmap icon. */ | |
3304 | |
3305 Lisp_Object | |
3306 x_icon_type (f) | |
3307 FRAME_PTR f; | |
3308 { | |
3309 Lisp_Object tem; | |
3310 | |
3311 tem = assq_no_quit (Qicon_type, f->param_alist); | |
3312 if (CONSP (tem)) | |
3313 return XCDR (tem); | |
3314 else | |
3315 return Qnil; | |
3316 } | |
3317 | |
3318 | |
3319 /* Subroutines of creating an X frame. */ | |
3320 | |
3321 /* Make sure that Vx_resource_name is set to a reasonable value. | |
3322 Fix it up, or set it to `emacs' if it is too hopeless. */ | |
3323 | |
3324 void | |
3325 validate_x_resource_name () | |
3326 { | |
3327 int len = 0; | |
3328 /* Number of valid characters in the resource name. */ | |
3329 int good_count = 0; | |
3330 /* Number of invalid characters in the resource name. */ | |
3331 int bad_count = 0; | |
3332 Lisp_Object new; | |
3333 int i; | |
3334 | |
3335 if (!STRINGP (Vx_resource_class)) | |
3336 Vx_resource_class = build_string (EMACS_CLASS); | |
3337 | |
3338 if (STRINGP (Vx_resource_name)) | |
3339 { | |
3340 unsigned char *p = SDATA (Vx_resource_name); | |
3341 int i; | |
3342 | |
3343 len = SBYTES (Vx_resource_name); | |
3344 | |
3345 /* Only letters, digits, - and _ are valid in resource names. | |
3346 Count the valid characters and count the invalid ones. */ | |
3347 for (i = 0; i < len; i++) | |
3348 { | |
3349 int c = p[i]; | |
3350 if (! ((c >= 'a' && c <= 'z') | |
3351 || (c >= 'A' && c <= 'Z') | |
3352 || (c >= '0' && c <= '9') | |
3353 || c == '-' || c == '_')) | |
3354 bad_count++; | |
3355 else | |
3356 good_count++; | |
3357 } | |
3358 } | |
3359 else | |
3360 /* Not a string => completely invalid. */ | |
3361 bad_count = 5, good_count = 0; | |
3362 | |
3363 /* If name is valid already, return. */ | |
3364 if (bad_count == 0) | |
3365 return; | |
3366 | |
3367 /* If name is entirely invalid, or nearly so, use `emacs'. */ | |
3368 if (good_count == 0 | |
3369 || (good_count == 1 && bad_count > 0)) | |
3370 { | |
3371 Vx_resource_name = build_string ("emacs"); | |
3372 return; | |
3373 } | |
3374 | |
3375 /* Name is partly valid. Copy it and replace the invalid characters | |
3376 with underscores. */ | |
3377 | |
3378 Vx_resource_name = new = Fcopy_sequence (Vx_resource_name); | |
3379 | |
3380 for (i = 0; i < len; i++) | |
3381 { | |
3382 int c = SREF (new, i); | |
3383 if (! ((c >= 'a' && c <= 'z') | |
3384 || (c >= 'A' && c <= 'Z') | |
3385 || (c >= '0' && c <= '9') | |
3386 || c == '-' || c == '_')) | |
3387 SSET (new, i, '_'); | |
3388 } | |
3389 } | |
3390 | |
3391 | |
3392 extern char *x_get_string_resource P_ ((XrmDatabase, char *, char *)); | |
3393 extern Display_Info *check_x_display_info P_ ((Lisp_Object)); | |
3394 | |
3395 | |
63698
e7e58f0947fe
(make_frame_without_minibuffer): Follow error conventions.
Juanma Barranquero <lekktu@gmail.com>
parents:
63643
diff
changeset
|
3396 /* Get specified attribute from resource database RDB. |
50357 | 3397 See Fx_get_resource below for other parameters. */ |
3398 | |
3399 static Lisp_Object | |
3400 xrdb_get_resource (rdb, attribute, class, component, subclass) | |
3401 XrmDatabase rdb; | |
3402 Lisp_Object attribute, class, component, subclass; | |
3403 { | |
3404 register char *value; | |
3405 char *name_key; | |
3406 char *class_key; | |
3407 | |
3408 CHECK_STRING (attribute); | |
3409 CHECK_STRING (class); | |
3410 | |
3411 if (!NILP (component)) | |
3412 CHECK_STRING (component); | |
3413 if (!NILP (subclass)) | |
3414 CHECK_STRING (subclass); | |
3415 if (NILP (component) != NILP (subclass)) | |
3416 error ("x-get-resource: must specify both COMPONENT and SUBCLASS or neither"); | |
3417 | |
3418 validate_x_resource_name (); | |
3419 | |
3420 /* Allocate space for the components, the dots which separate them, | |
3421 and the final '\0'. Make them big enough for the worst case. */ | |
3422 name_key = (char *) alloca (SBYTES (Vx_resource_name) | |
3423 + (STRINGP (component) | |
3424 ? SBYTES (component) : 0) | |
3425 + SBYTES (attribute) | |
3426 + 3); | |
3427 | |
3428 class_key = (char *) alloca (SBYTES (Vx_resource_class) | |
3429 + SBYTES (class) | |
3430 + (STRINGP (subclass) | |
3431 ? SBYTES (subclass) : 0) | |
3432 + 3); | |
3433 | |
3434 /* Start with emacs.FRAMENAME for the name (the specific one) | |
3435 and with `Emacs' for the class key (the general one). */ | |
3436 strcpy (name_key, SDATA (Vx_resource_name)); | |
3437 strcpy (class_key, SDATA (Vx_resource_class)); | |
3438 | |
3439 strcat (class_key, "."); | |
3440 strcat (class_key, SDATA (class)); | |
3441 | |
3442 if (!NILP (component)) | |
3443 { | |
3444 strcat (class_key, "."); | |
3445 strcat (class_key, SDATA (subclass)); | |
3446 | |
3447 strcat (name_key, "."); | |
3448 strcat (name_key, SDATA (component)); | |
3449 } | |
3450 | |
3451 strcat (name_key, "."); | |
3452 strcat (name_key, SDATA (attribute)); | |
3453 | |
3454 value = x_get_string_resource (rdb, name_key, class_key); | |
3455 | |
3456 if (value != (char *) 0) | |
3457 return build_string (value); | |
3458 else | |
3459 return Qnil; | |
3460 } | |
3461 | |
3462 | |
3463 DEFUN ("x-get-resource", Fx_get_resource, Sx_get_resource, 2, 4, 0, | |
3464 doc: /* Return the value of ATTRIBUTE, of class CLASS, from the X defaults database. | |
3465 This uses `INSTANCE.ATTRIBUTE' as the key and `Emacs.CLASS' as the | |
3466 class, where INSTANCE is the name under which Emacs was invoked, or | |
3467 the name specified by the `-name' or `-rn' command-line arguments. | |
3468 | |
3469 The optional arguments COMPONENT and SUBCLASS add to the key and the | |
3470 class, respectively. You must specify both of them or neither. | |
3471 If you specify them, the key is `INSTANCE.COMPONENT.ATTRIBUTE' | |
3472 and the class is `Emacs.CLASS.SUBCLASS'. */) | |
3473 (attribute, class, component, subclass) | |
3474 Lisp_Object attribute, class, component, subclass; | |
3475 { | |
3476 #ifdef HAVE_X_WINDOWS | |
3477 check_x (); | |
3478 #endif | |
3479 | |
3480 return xrdb_get_resource (check_x_display_info (Qnil)->xrdb, | |
3481 attribute, class, component, subclass); | |
3482 } | |
3483 | |
3484 /* Get an X resource, like Fx_get_resource, but for display DPYINFO. */ | |
3485 | |
3486 Lisp_Object | |
3487 display_x_get_resource (dpyinfo, attribute, class, component, subclass) | |
50375
8be64cfd36fe
(display_x_get_resource): Use Display_Info argument, not x_display_info.
Juanma Barranquero <lekktu@gmail.com>
parents:
50373
diff
changeset
|
3488 Display_Info *dpyinfo; |
50357 | 3489 Lisp_Object attribute, class, component, subclass; |
3490 { | |
3491 return xrdb_get_resource (dpyinfo->xrdb, | |
3492 attribute, class, component, subclass); | |
3493 } | |
3494 | |
3495 /* Used when C code wants a resource value. */ | |
3496 | |
3497 char * | |
3498 x_get_resource_string (attribute, class) | |
3499 char *attribute, *class; | |
3500 { | |
3501 char *name_key; | |
3502 char *class_key; | |
3503 struct frame *sf = SELECTED_FRAME (); | |
3504 | |
3505 /* Allocate space for the components, the dots which separate them, | |
3506 and the final '\0'. */ | |
3507 name_key = (char *) alloca (SBYTES (Vinvocation_name) | |
3508 + strlen (attribute) + 2); | |
3509 class_key = (char *) alloca ((sizeof (EMACS_CLASS) - 1) | |
3510 + strlen (class) + 2); | |
3511 | |
3512 sprintf (name_key, "%s.%s", SDATA (Vinvocation_name), attribute); | |
3513 sprintf (class_key, "%s.%s", EMACS_CLASS, class); | |
3514 | |
3515 return x_get_string_resource (FRAME_X_DISPLAY_INFO (sf)->xrdb, | |
3516 name_key, class_key); | |
3517 } | |
3518 | |
3519 | |
3520 /* Return the value of parameter PARAM. | |
3521 | |
3522 First search ALIST, then Vdefault_frame_alist, then the X defaults | |
3523 database, using ATTRIBUTE as the attribute name and CLASS as its class. | |
3524 | |
3525 Convert the resource to the type specified by desired_type. | |
3526 | |
3527 If no default is specified, return Qunbound. If you call | |
3528 x_get_arg, make sure you deal with Qunbound in a reasonable way, | |
3529 and don't let it get stored in any Lisp-visible variables! */ | |
3530 | |
3531 Lisp_Object | |
3532 x_get_arg (dpyinfo, alist, param, attribute, class, type) | |
63698
e7e58f0947fe
(make_frame_without_minibuffer): Follow error conventions.
Juanma Barranquero <lekktu@gmail.com>
parents:
63643
diff
changeset
|
3533 Display_Info *dpyinfo; |
50357 | 3534 Lisp_Object alist, param; |
3535 char *attribute; | |
3536 char *class; | |
3537 enum resource_types type; | |
3538 { | |
3539 register Lisp_Object tem; | |
3540 | |
3541 tem = Fassq (param, alist); | |
68395
00f2522b62f3
(x_get_arg): "Clear out" the parm in ALIST if found there.
Richard M. Stallman <rms@gnu.org>
parents:
68242
diff
changeset
|
3542 |
00f2522b62f3
(x_get_arg): "Clear out" the parm in ALIST if found there.
Richard M. Stallman <rms@gnu.org>
parents:
68242
diff
changeset
|
3543 if (!NILP (tem)) |
00f2522b62f3
(x_get_arg): "Clear out" the parm in ALIST if found there.
Richard M. Stallman <rms@gnu.org>
parents:
68242
diff
changeset
|
3544 { |
00f2522b62f3
(x_get_arg): "Clear out" the parm in ALIST if found there.
Richard M. Stallman <rms@gnu.org>
parents:
68242
diff
changeset
|
3545 /* If we find this parm in ALIST, clear it out |
00f2522b62f3
(x_get_arg): "Clear out" the parm in ALIST if found there.
Richard M. Stallman <rms@gnu.org>
parents:
68242
diff
changeset
|
3546 so that it won't be "left over" at the end. */ |
68918
5aa4a7ce059a
(x_get_arg): Clear out PARAM in ALIST also on Mac.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
68905
diff
changeset
|
3547 #ifndef WINDOWSNT /* w32fns.c has not yet been changed to cope with this. */ |
68905
f157b409991c
(x_get_arg): Clear out all occurrences of PARAM in ALIST.
Richard M. Stallman <rms@gnu.org>
parents:
68651
diff
changeset
|
3548 Lisp_Object tail; |
68395
00f2522b62f3
(x_get_arg): "Clear out" the parm in ALIST if found there.
Richard M. Stallman <rms@gnu.org>
parents:
68242
diff
changeset
|
3549 XSETCAR (tem, Qnil); |
68905
f157b409991c
(x_get_arg): Clear out all occurrences of PARAM in ALIST.
Richard M. Stallman <rms@gnu.org>
parents:
68651
diff
changeset
|
3550 /* In case the parameter appears more than once in the alist, |
f157b409991c
(x_get_arg): Clear out all occurrences of PARAM in ALIST.
Richard M. Stallman <rms@gnu.org>
parents:
68651
diff
changeset
|
3551 clear it out. */ |
f157b409991c
(x_get_arg): Clear out all occurrences of PARAM in ALIST.
Richard M. Stallman <rms@gnu.org>
parents:
68651
diff
changeset
|
3552 for (tail = alist; CONSP (tail); tail = XCDR (tail)) |
f157b409991c
(x_get_arg): Clear out all occurrences of PARAM in ALIST.
Richard M. Stallman <rms@gnu.org>
parents:
68651
diff
changeset
|
3553 if (CONSP (XCAR (tail)) |
f157b409991c
(x_get_arg): Clear out all occurrences of PARAM in ALIST.
Richard M. Stallman <rms@gnu.org>
parents:
68651
diff
changeset
|
3554 && EQ (XCAR (XCAR (tail)), param)) |
f157b409991c
(x_get_arg): Clear out all occurrences of PARAM in ALIST.
Richard M. Stallman <rms@gnu.org>
parents:
68651
diff
changeset
|
3555 XSETCAR (XCAR (tail), Qnil); |
68395
00f2522b62f3
(x_get_arg): "Clear out" the parm in ALIST if found there.
Richard M. Stallman <rms@gnu.org>
parents:
68242
diff
changeset
|
3556 #endif |
00f2522b62f3
(x_get_arg): "Clear out" the parm in ALIST if found there.
Richard M. Stallman <rms@gnu.org>
parents:
68242
diff
changeset
|
3557 } |
00f2522b62f3
(x_get_arg): "Clear out" the parm in ALIST if found there.
Richard M. Stallman <rms@gnu.org>
parents:
68242
diff
changeset
|
3558 else |
50357 | 3559 tem = Fassq (param, Vdefault_frame_alist); |
68395
00f2522b62f3
(x_get_arg): "Clear out" the parm in ALIST if found there.
Richard M. Stallman <rms@gnu.org>
parents:
68242
diff
changeset
|
3560 |
00f2522b62f3
(x_get_arg): "Clear out" the parm in ALIST if found there.
Richard M. Stallman <rms@gnu.org>
parents:
68242
diff
changeset
|
3561 /* If it wasn't specified in ALIST or the Lisp-level defaults, |
00f2522b62f3
(x_get_arg): "Clear out" the parm in ALIST if found there.
Richard M. Stallman <rms@gnu.org>
parents:
68242
diff
changeset
|
3562 look in the X resources. */ |
50357 | 3563 if (EQ (tem, Qnil)) |
3564 { | |
3565 if (attribute) | |
3566 { | |
3567 tem = display_x_get_resource (dpyinfo, | |
3568 build_string (attribute), | |
3569 build_string (class), | |
3570 Qnil, Qnil); | |
3571 | |
3572 if (NILP (tem)) | |
3573 return Qunbound; | |
3574 | |
3575 switch (type) | |
3576 { | |
3577 case RES_TYPE_NUMBER: | |
3578 return make_number (atoi (SDATA (tem))); | |
3579 | |
3580 case RES_TYPE_FLOAT: | |
3581 return make_float (atof (SDATA (tem))); | |
3582 | |
3583 case RES_TYPE_BOOLEAN: | |
3584 tem = Fdowncase (tem); | |
3585 if (!strcmp (SDATA (tem), "on") | |
3586 || !strcmp (SDATA (tem), "true")) | |
3587 return Qt; | |
3588 else | |
3589 return Qnil; | |
3590 | |
3591 case RES_TYPE_STRING: | |
3592 return tem; | |
3593 | |
3594 case RES_TYPE_SYMBOL: | |
3595 /* As a special case, we map the values `true' and `on' | |
3596 to Qt, and `false' and `off' to Qnil. */ | |
3597 { | |
3598 Lisp_Object lower; | |
3599 lower = Fdowncase (tem); | |
3600 if (!strcmp (SDATA (lower), "on") | |
3601 || !strcmp (SDATA (lower), "true")) | |
3602 return Qt; | |
3603 else if (!strcmp (SDATA (lower), "off") | |
3604 || !strcmp (SDATA (lower), "false")) | |
3605 return Qnil; | |
3606 else | |
3607 return Fintern (tem, Qnil); | |
3608 } | |
3609 | |
3610 default: | |
3611 abort (); | |
3612 } | |
3613 } | |
3614 else | |
3615 return Qunbound; | |
3616 } | |
3617 return Fcdr (tem); | |
3618 } | |
3619 | |
3620 Lisp_Object | |
3621 x_frame_get_arg (f, alist, param, attribute, class, type) | |
3622 struct frame *f; | |
3623 Lisp_Object alist, param; | |
3624 char *attribute; | |
3625 char *class; | |
3626 enum resource_types type; | |
3627 { | |
3628 return x_get_arg (FRAME_X_DISPLAY_INFO (f), | |
3629 alist, param, attribute, class, type); | |
3630 } | |
3631 | |
3632 /* Like x_frame_get_arg, but also record the value in f->param_alist. */ | |
3633 | |
3634 Lisp_Object | |
3635 x_frame_get_and_record_arg (f, alist, param, attribute, class, type) | |
3636 struct frame *f; | |
3637 Lisp_Object alist, param; | |
3638 char *attribute; | |
3639 char *class; | |
3640 enum resource_types type; | |
3641 { | |
3642 Lisp_Object value; | |
3643 | |
3644 value = x_get_arg (FRAME_X_DISPLAY_INFO (f), alist, param, | |
3645 attribute, class, type); | |
68242
c0002338a5e8
(x_frame_get_and_record_arg): Don't record Qunbound value in f->param_alist.
Richard M. Stallman <rms@gnu.org>
parents:
65976
diff
changeset
|
3646 if (! NILP (value) && ! EQ (value, Qunbound)) |
50357 | 3647 store_frame_param (f, param, value); |
3648 | |
3649 return value; | |
3650 } | |
3651 | |
3652 | |
3653 /* Record in frame F the specified or default value according to ALIST | |
3654 of the parameter named PROP (a Lisp symbol). | |
3655 If no value is specified for PROP, look for an X default for XPROP | |
3656 on the frame named NAME. | |
3657 If that is not found either, use the value DEFLT. */ | |
3658 | |
3659 Lisp_Object | |
3660 x_default_parameter (f, alist, prop, deflt, xprop, xclass, type) | |
3661 struct frame *f; | |
3662 Lisp_Object alist; | |
3663 Lisp_Object prop; | |
3664 Lisp_Object deflt; | |
3665 char *xprop; | |
3666 char *xclass; | |
3667 enum resource_types type; | |
3668 { | |
3669 Lisp_Object tem; | |
3670 | |
3671 tem = x_frame_get_arg (f, alist, prop, xprop, xclass, type); | |
3672 if (EQ (tem, Qunbound)) | |
3673 tem = deflt; | |
3674 x_set_frame_parameters (f, Fcons (Fcons (prop, tem), Qnil)); | |
3675 return tem; | |
3676 } | |
3677 | |
3678 | |
3679 | |
3680 | |
3681 DEFUN ("x-parse-geometry", Fx_parse_geometry, Sx_parse_geometry, 1, 1, 0, | |
3682 doc: /* Parse an X-style geometry string STRING. | |
3683 Returns an alist of the form ((top . TOP), (left . LEFT) ... ). | |
3684 The properties returned may include `top', `left', `height', and `width'. | |
3685 The value of `left' or `top' may be an integer, | |
3686 or a list (+ N) meaning N pixels relative to top/left corner, | |
3687 or a list (- N) meaning -N pixels relative to bottom/right corner. */) | |
3688 (string) | |
3689 Lisp_Object string; | |
3690 { | |
3691 int geometry, x, y; | |
3692 unsigned int width, height; | |
3693 Lisp_Object result; | |
3694 | |
3695 CHECK_STRING (string); | |
3696 | |
3697 geometry = XParseGeometry ((char *) SDATA (string), | |
3698 &x, &y, &width, &height); | |
3699 | |
3700 #if 0 | |
3701 if (!!(geometry & XValue) != !!(geometry & YValue)) | |
3702 error ("Must specify both x and y position, or neither"); | |
3703 #endif | |
3704 | |
3705 result = Qnil; | |
3706 if (geometry & XValue) | |
3707 { | |
3708 Lisp_Object element; | |
3709 | |
3710 if (x >= 0 && (geometry & XNegative)) | |
3711 element = Fcons (Qleft, Fcons (Qminus, Fcons (make_number (-x), Qnil))); | |
3712 else if (x < 0 && ! (geometry & XNegative)) | |
3713 element = Fcons (Qleft, Fcons (Qplus, Fcons (make_number (x), Qnil))); | |
3714 else | |
3715 element = Fcons (Qleft, make_number (x)); | |
3716 result = Fcons (element, result); | |
3717 } | |
3718 | |
3719 if (geometry & YValue) | |
3720 { | |
3721 Lisp_Object element; | |
3722 | |
3723 if (y >= 0 && (geometry & YNegative)) | |
3724 element = Fcons (Qtop, Fcons (Qminus, Fcons (make_number (-y), Qnil))); | |
3725 else if (y < 0 && ! (geometry & YNegative)) | |
3726 element = Fcons (Qtop, Fcons (Qplus, Fcons (make_number (y), Qnil))); | |
3727 else | |
3728 element = Fcons (Qtop, make_number (y)); | |
3729 result = Fcons (element, result); | |
3730 } | |
3731 | |
3732 if (geometry & WidthValue) | |
3733 result = Fcons (Fcons (Qwidth, make_number (width)), result); | |
3734 if (geometry & HeightValue) | |
3735 result = Fcons (Fcons (Qheight, make_number (height)), result); | |
3736 | |
3737 return result; | |
3738 } | |
3739 | |
3740 /* Calculate the desired size and position of frame F. | |
3741 Return the flags saying which aspects were specified. | |
3742 | |
3743 Also set the win_gravity and size_hint_flags of F. | |
3744 | |
3745 Adjust height for toolbar if TOOLBAR_P is 1. | |
3746 | |
3747 This function does not make the coordinates positive. */ | |
3748 | |
3749 #define DEFAULT_ROWS 40 | |
3750 #define DEFAULT_COLS 80 | |
3751 | |
3752 int | |
3753 x_figure_window_size (f, parms, toolbar_p) | |
3754 struct frame *f; | |
3755 Lisp_Object parms; | |
3756 int toolbar_p; | |
3757 { | |
3758 register Lisp_Object tem0, tem1, tem2; | |
3759 long window_prompting = 0; | |
3760 Display_Info *dpyinfo = FRAME_X_DISPLAY_INFO (f); | |
3761 | |
3762 /* Default values if we fall through. | |
3763 Actually, if that happens we should get | |
3764 window manager prompting. */ | |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
3765 SET_FRAME_COLS (f, DEFAULT_COLS); |
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
3766 FRAME_LINES (f) = DEFAULT_ROWS; |
50357 | 3767 /* Window managers expect that if program-specified |
3768 positions are not (0,0), they're intentional, not defaults. */ | |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
3769 f->top_pos = 0; |
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
3770 f->left_pos = 0; |
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
3771 |
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
3772 /* Ensure that old new_text_cols and new_text_lines will not override the |
50357 | 3773 values set here. */ |
3774 /* ++KFS: This was specific to W32, but seems ok for all platforms */ | |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
3775 f->new_text_cols = f->new_text_lines = 0; |
50357 | 3776 |
3777 tem0 = x_get_arg (dpyinfo, parms, Qheight, 0, 0, RES_TYPE_NUMBER); | |
3778 tem1 = x_get_arg (dpyinfo, parms, Qwidth, 0, 0, RES_TYPE_NUMBER); | |
3779 tem2 = x_get_arg (dpyinfo, parms, Quser_size, 0, 0, RES_TYPE_NUMBER); | |
3780 if (! EQ (tem0, Qunbound) || ! EQ (tem1, Qunbound)) | |
3781 { | |
3782 if (!EQ (tem0, Qunbound)) | |
3783 { | |
3784 CHECK_NUMBER (tem0); | |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
3785 FRAME_LINES (f) = XINT (tem0); |
50357 | 3786 } |
3787 if (!EQ (tem1, Qunbound)) | |
3788 { | |
3789 CHECK_NUMBER (tem1); | |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
3790 SET_FRAME_COLS (f, XINT (tem1)); |
50357 | 3791 } |
3792 if (!NILP (tem2) && !EQ (tem2, Qunbound)) | |
3793 window_prompting |= USSize; | |
3794 else | |
3795 window_prompting |= PSize; | |
3796 } | |
3797 | |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
3798 f->scroll_bar_actual_width |
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
3799 = FRAME_SCROLL_BAR_COLS (f) * FRAME_COLUMN_WIDTH (f); |
50357 | 3800 |
3801 /* This used to be done _before_ calling x_figure_window_size, but | |
3802 since the height is reset here, this was really a no-op. I | |
3803 assume that moving it here does what Gerd intended (although he | |
3804 no longer can remember what that was... ++KFS, 2003-03-25. */ | |
3805 | |
3806 /* Add the tool-bar height to the initial frame height so that the | |
3807 user gets a text display area of the size he specified with -g or | |
3808 via .Xdefaults. Later changes of the tool-bar height don't | |
3809 change the frame size. This is done so that users can create | |
3810 tall Emacs frames without having to guess how tall the tool-bar | |
3811 will get. */ | |
3812 if (toolbar_p && FRAME_TOOL_BAR_LINES (f)) | |
3813 { | |
3814 int margin, relief, bar_height; | |
3815 | |
3816 relief = (tool_bar_button_relief >= 0 | |
3817 ? tool_bar_button_relief | |
3818 : DEFAULT_TOOL_BAR_BUTTON_RELIEF); | |
3819 | |
3820 if (INTEGERP (Vtool_bar_button_margin) | |
3821 && XINT (Vtool_bar_button_margin) > 0) | |
3822 margin = XFASTINT (Vtool_bar_button_margin); | |
3823 else if (CONSP (Vtool_bar_button_margin) | |
3824 && INTEGERP (XCDR (Vtool_bar_button_margin)) | |
3825 && XINT (XCDR (Vtool_bar_button_margin)) > 0) | |
3826 margin = XFASTINT (XCDR (Vtool_bar_button_margin)); | |
3827 else | |
3828 margin = 0; | |
3829 | |
3830 bar_height = DEFAULT_TOOL_BAR_IMAGE_HEIGHT + 2 * margin + 2 * relief; | |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
3831 FRAME_LINES (f) += (bar_height + FRAME_LINE_HEIGHT (f) - 1) / FRAME_LINE_HEIGHT (f); |
50357 | 3832 } |
3833 | |
3834 compute_fringe_widths (f, 0); | |
3835 | |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
3836 FRAME_PIXEL_WIDTH (f) = FRAME_TEXT_COLS_TO_PIXEL_WIDTH (f, FRAME_COLS (f)); |
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
3837 FRAME_PIXEL_HEIGHT (f) = FRAME_TEXT_LINES_TO_PIXEL_HEIGHT (f, FRAME_LINES (f)); |
50357 | 3838 |
3839 tem0 = x_get_arg (dpyinfo, parms, Qtop, 0, 0, RES_TYPE_NUMBER); | |
3840 tem1 = x_get_arg (dpyinfo, parms, Qleft, 0, 0, RES_TYPE_NUMBER); | |
3841 tem2 = x_get_arg (dpyinfo, parms, Quser_position, 0, 0, RES_TYPE_NUMBER); | |
3842 if (! EQ (tem0, Qunbound) || ! EQ (tem1, Qunbound)) | |
3843 { | |
3844 if (EQ (tem0, Qminus)) | |
3845 { | |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
3846 f->top_pos = 0; |
50357 | 3847 window_prompting |= YNegative; |
3848 } | |
3849 else if (CONSP (tem0) && EQ (XCAR (tem0), Qminus) | |
3850 && CONSP (XCDR (tem0)) | |
3851 && INTEGERP (XCAR (XCDR (tem0)))) | |
3852 { | |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
3853 f->top_pos = - XINT (XCAR (XCDR (tem0))); |
50357 | 3854 window_prompting |= YNegative; |
3855 } | |
3856 else if (CONSP (tem0) && EQ (XCAR (tem0), Qplus) | |
3857 && CONSP (XCDR (tem0)) | |
3858 && INTEGERP (XCAR (XCDR (tem0)))) | |
3859 { | |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
3860 f->top_pos = XINT (XCAR (XCDR (tem0))); |
50357 | 3861 } |
3862 else if (EQ (tem0, Qunbound)) | |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
3863 f->top_pos = 0; |
50357 | 3864 else |
3865 { | |
3866 CHECK_NUMBER (tem0); | |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
3867 f->top_pos = XINT (tem0); |
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
3868 if (f->top_pos < 0) |
50357 | 3869 window_prompting |= YNegative; |
3870 } | |
3871 | |
3872 if (EQ (tem1, Qminus)) | |
3873 { | |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
3874 f->left_pos = 0; |
50357 | 3875 window_prompting |= XNegative; |
3876 } | |
3877 else if (CONSP (tem1) && EQ (XCAR (tem1), Qminus) | |
3878 && CONSP (XCDR (tem1)) | |
3879 && INTEGERP (XCAR (XCDR (tem1)))) | |
3880 { | |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
3881 f->left_pos = - XINT (XCAR (XCDR (tem1))); |
50357 | 3882 window_prompting |= XNegative; |
3883 } | |
3884 else if (CONSP (tem1) && EQ (XCAR (tem1), Qplus) | |
3885 && CONSP (XCDR (tem1)) | |
3886 && INTEGERP (XCAR (XCDR (tem1)))) | |
3887 { | |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
3888 f->left_pos = XINT (XCAR (XCDR (tem1))); |
50357 | 3889 } |
3890 else if (EQ (tem1, Qunbound)) | |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
3891 f->left_pos = 0; |
50357 | 3892 else |
3893 { | |
3894 CHECK_NUMBER (tem1); | |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
3895 f->left_pos = XINT (tem1); |
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
3896 if (f->left_pos < 0) |
50357 | 3897 window_prompting |= XNegative; |
3898 } | |
3899 | |
3900 if (!NILP (tem2) && ! EQ (tem2, Qunbound)) | |
3901 window_prompting |= USPosition; | |
3902 else | |
3903 window_prompting |= PPosition; | |
3904 } | |
3905 | |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
3906 if (f->want_fullscreen != FULLSCREEN_NONE) |
50357 | 3907 { |
3908 int left, top; | |
3909 int width, height; | |
3910 | |
3911 /* It takes both for some WM:s to place it where we want */ | |
3912 window_prompting = USPosition | PPosition; | |
3913 x_fullscreen_adjust (f, &width, &height, &top, &left); | |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
3914 FRAME_COLS (f) = width; |
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
3915 FRAME_LINES (f) = height; |
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
3916 FRAME_PIXEL_WIDTH (f) = FRAME_TEXT_COLS_TO_PIXEL_WIDTH (f, width); |
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
3917 FRAME_PIXEL_HEIGHT (f) = FRAME_TEXT_LINES_TO_PIXEL_HEIGHT (f, height); |
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
3918 f->left_pos = left; |
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
3919 f->top_pos = top; |
50357 | 3920 } |
3921 | |
3922 if (window_prompting & XNegative) | |
3923 { | |
3924 if (window_prompting & YNegative) | |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
3925 f->win_gravity = SouthEastGravity; |
50357 | 3926 else |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
3927 f->win_gravity = NorthEastGravity; |
50357 | 3928 } |
3929 else | |
3930 { | |
3931 if (window_prompting & YNegative) | |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
3932 f->win_gravity = SouthWestGravity; |
50357 | 3933 else |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
3934 f->win_gravity = NorthWestGravity; |
50357 | 3935 } |
3936 | |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
3937 f->size_hint_flags = window_prompting; |
50357 | 3938 |
3939 return window_prompting; | |
3940 } | |
3941 | |
3942 | |
3943 | |
3944 #endif /* HAVE_WINDOW_SYSTEM */ | |
3945 | |
3946 | |
3947 | |
3948 /*********************************************************************** | |
3949 Initialization | |
3950 ***********************************************************************/ | |
3951 | |
21514 | 3952 void |
765 | 3953 syms_of_frame () |
286 | 3954 { |
33509
a7d245e080d1
(syms_of_frame_1): Removed; code moved to syms_of_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
33005
diff
changeset
|
3955 Qframep = intern ("framep"); |
a7d245e080d1
(syms_of_frame_1): Removed; code moved to syms_of_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
33005
diff
changeset
|
3956 staticpro (&Qframep); |
a7d245e080d1
(syms_of_frame_1): Removed; code moved to syms_of_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
33005
diff
changeset
|
3957 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
|
3958 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
|
3959 Qheight = intern ("height"); |
a7d245e080d1
(syms_of_frame_1): Removed; code moved to syms_of_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
33005
diff
changeset
|
3960 staticpro (&Qheight); |
a7d245e080d1
(syms_of_frame_1): Removed; code moved to syms_of_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
33005
diff
changeset
|
3961 Qicon = intern ("icon"); |
a7d245e080d1
(syms_of_frame_1): Removed; code moved to syms_of_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
33005
diff
changeset
|
3962 staticpro (&Qicon); |
a7d245e080d1
(syms_of_frame_1): Removed; code moved to syms_of_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
33005
diff
changeset
|
3963 Qminibuffer = intern ("minibuffer"); |
a7d245e080d1
(syms_of_frame_1): Removed; code moved to syms_of_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
33005
diff
changeset
|
3964 staticpro (&Qminibuffer); |
a7d245e080d1
(syms_of_frame_1): Removed; code moved to syms_of_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
33005
diff
changeset
|
3965 Qmodeline = intern ("modeline"); |
a7d245e080d1
(syms_of_frame_1): Removed; code moved to syms_of_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
33005
diff
changeset
|
3966 staticpro (&Qmodeline); |
a7d245e080d1
(syms_of_frame_1): Removed; code moved to syms_of_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
33005
diff
changeset
|
3967 Qonly = intern ("only"); |
a7d245e080d1
(syms_of_frame_1): Removed; code moved to syms_of_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
33005
diff
changeset
|
3968 staticpro (&Qonly); |
a7d245e080d1
(syms_of_frame_1): Removed; code moved to syms_of_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
33005
diff
changeset
|
3969 Qwidth = intern ("width"); |
a7d245e080d1
(syms_of_frame_1): Removed; code moved to syms_of_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
33005
diff
changeset
|
3970 staticpro (&Qwidth); |
50357 | 3971 Qgeometry = intern ("geometry"); |
3972 staticpro (&Qgeometry); | |
3973 Qicon_left = intern ("icon-left"); | |
3974 staticpro (&Qicon_left); | |
3975 Qicon_top = intern ("icon-top"); | |
3976 staticpro (&Qicon_top); | |
3977 Qleft = intern ("left"); | |
3978 staticpro (&Qleft); | |
3979 Qright = intern ("right"); | |
3980 staticpro (&Qright); | |
3981 Quser_position = intern ("user-position"); | |
3982 staticpro (&Quser_position); | |
3983 Quser_size = intern ("user-size"); | |
3984 staticpro (&Quser_size); | |
3985 Qwindow_id = intern ("window-id"); | |
3986 staticpro (&Qwindow_id); | |
3987 #ifdef HAVE_X_WINDOWS | |
3988 Qouter_window_id = intern ("outer-window-id"); | |
3989 staticpro (&Qouter_window_id); | |
3990 #endif | |
3991 Qparent_id = intern ("parent-id"); | |
3992 staticpro (&Qparent_id); | |
33509
a7d245e080d1
(syms_of_frame_1): Removed; code moved to syms_of_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
33005
diff
changeset
|
3993 Qx = intern ("x"); |
a7d245e080d1
(syms_of_frame_1): Removed; code moved to syms_of_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
33005
diff
changeset
|
3994 staticpro (&Qx); |
a7d245e080d1
(syms_of_frame_1): Removed; code moved to syms_of_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
33005
diff
changeset
|
3995 Qw32 = intern ("w32"); |
a7d245e080d1
(syms_of_frame_1): Removed; code moved to syms_of_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
33005
diff
changeset
|
3996 staticpro (&Qw32); |
a7d245e080d1
(syms_of_frame_1): Removed; code moved to syms_of_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
33005
diff
changeset
|
3997 Qpc = intern ("pc"); |
a7d245e080d1
(syms_of_frame_1): Removed; code moved to syms_of_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
33005
diff
changeset
|
3998 staticpro (&Qpc); |
a7d245e080d1
(syms_of_frame_1): Removed; code moved to syms_of_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
33005
diff
changeset
|
3999 Qmac = intern ("mac"); |
a7d245e080d1
(syms_of_frame_1): Removed; code moved to syms_of_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
33005
diff
changeset
|
4000 staticpro (&Qmac); |
a7d245e080d1
(syms_of_frame_1): Removed; code moved to syms_of_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
33005
diff
changeset
|
4001 Qvisible = intern ("visible"); |
a7d245e080d1
(syms_of_frame_1): Removed; code moved to syms_of_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
33005
diff
changeset
|
4002 staticpro (&Qvisible); |
a7d245e080d1
(syms_of_frame_1): Removed; code moved to syms_of_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
33005
diff
changeset
|
4003 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
|
4004 staticpro (&Qbuffer_predicate); |
a7d245e080d1
(syms_of_frame_1): Removed; code moved to syms_of_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
33005
diff
changeset
|
4005 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
|
4006 staticpro (&Qbuffer_list); |
a7d245e080d1
(syms_of_frame_1): Removed; code moved to syms_of_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
33005
diff
changeset
|
4007 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
|
4008 staticpro (&Qdisplay_type); |
a7d245e080d1
(syms_of_frame_1): Removed; code moved to syms_of_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
33005
diff
changeset
|
4009 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
|
4010 staticpro (&Qbackground_mode); |
42743
1e6231c9c359
(store_frame_param): Call set_tty_color_mode for termcap
Eli Zaretskii <eliz@gnu.org>
parents:
41718
diff
changeset
|
4011 Qtty_color_mode = intern ("tty-color-mode"); |
1e6231c9c359
(store_frame_param): Call set_tty_color_mode for termcap
Eli Zaretskii <eliz@gnu.org>
parents:
41718
diff
changeset
|
4012 staticpro (&Qtty_color_mode); |
286 | 4013 |
50357 | 4014 Qface_set_after_frame_default = intern ("face-set-after-frame-default"); |
4015 staticpro (&Qface_set_after_frame_default); | |
4016 | |
4017 Qfullwidth = intern ("fullwidth"); | |
4018 staticpro (&Qfullwidth); | |
4019 Qfullheight = intern ("fullheight"); | |
4020 staticpro (&Qfullheight); | |
4021 Qfullboth = intern ("fullboth"); | |
4022 staticpro (&Qfullboth); | |
4023 Qx_resource_name = intern ("x-resource-name"); | |
4024 staticpro (&Qx_resource_name); | |
4025 | |
4026 Qx_frame_parameter = intern ("x-frame-parameter"); | |
4027 staticpro (&Qx_frame_parameter); | |
4028 | |
4029 { | |
4030 int i; | |
4031 | |
4032 for (i = 0; i < sizeof (frame_parms) / sizeof (frame_parms[0]); i++) | |
4033 { | |
4034 Lisp_Object v = intern (frame_parms[i].name); | |
4035 if (frame_parms[i].variable) | |
4036 { | |
4037 *frame_parms[i].variable = v; | |
4038 staticpro (frame_parms[i].variable); | |
4039 } | |
4040 Fput (v, Qx_frame_parameter, make_number (i)); | |
4041 } | |
4042 } | |
4043 | |
50373
6defa3317421
Fix compilation for --with-x=no.
Kim F. Storm <storm@cua.dk>
parents:
50357
diff
changeset
|
4044 #ifdef HAVE_WINDOW_SYSTEM |
50357 | 4045 DEFVAR_LISP ("x-resource-name", &Vx_resource_name, |
4046 doc: /* The name Emacs uses to look up X resources. | |
4047 `x-get-resource' uses this as the first component of the instance name | |
4048 when requesting resource values. | |
4049 Emacs initially sets `x-resource-name' to the name under which Emacs | |
4050 was invoked, or to the value specified with the `-name' or `-rn' | |
4051 switches, if present. | |
4052 | |
4053 It may be useful to bind this variable locally around a call | |
4054 to `x-get-resource'. See also the variable `x-resource-class'. */); | |
4055 Vx_resource_name = Qnil; | |
4056 | |
4057 DEFVAR_LISP ("x-resource-class", &Vx_resource_class, | |
4058 doc: /* The class Emacs uses to look up X resources. | |
4059 `x-get-resource' uses this as the first component of the instance class | |
4060 when requesting resource values. | |
4061 | |
4062 Emacs initially sets `x-resource-class' to "Emacs". | |
4063 | |
4064 Setting this variable permanently is not a reasonable thing to do, | |
4065 but binding this variable locally around a call to `x-get-resource' | |
4066 is a reasonable practice. See also the variable `x-resource-name'. */); | |
4067 Vx_resource_class = build_string (EMACS_CLASS); | |
50373
6defa3317421
Fix compilation for --with-x=no.
Kim F. Storm <storm@cua.dk>
parents:
50357
diff
changeset
|
4068 #endif |
50357 | 4069 |
33509
a7d245e080d1
(syms_of_frame_1): Removed; code moved to syms_of_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
33005
diff
changeset
|
4070 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
|
4071 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
|
4072 These may be set in your init file, like this: |
57971
c6da09b5384b
(syms_of_frame): Fix the example in the doc string.
Eli Zaretskii <eliz@gnu.org>
parents:
56517
diff
changeset
|
4073 (setq default-frame-alist '((width . 80) (height . 55) (menu-bar-lines . 1))) |
40105
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
4074 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
|
4075 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
|
4076 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
|
4077 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
|
4078 `minibuffer-frame-alist'. |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
4079 The `menu-bar-lines' element of the list controls whether new frames |
43716
bb64514bd572
2002-03-05 Per Abrahamsen <abraham@dina.kvl.dk>
Per Abrahamsen <abraham@dina.kvl.dk>
parents:
43442
diff
changeset
|
4080 have menu bars; `menu-bar-mode' works by altering this element. |
43717 | 4081 Setting this variable does not affect existing frames, only new ones. */); |
33509
a7d245e080d1
(syms_of_frame_1): Removed; code moved to syms_of_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
33005
diff
changeset
|
4082 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
|
4083 |
52557
4a93216e6678
(Vdefault_frame_scroll_bars): New variable.
Kim F. Storm <storm@cua.dk>
parents:
52401
diff
changeset
|
4084 DEFVAR_LISP ("default-frame-scroll-bars", &Vdefault_frame_scroll_bars, |
4a93216e6678
(Vdefault_frame_scroll_bars): New variable.
Kim F. Storm <storm@cua.dk>
parents:
52401
diff
changeset
|
4085 doc: /* Default position of scroll bars on this window-system. */); |
4a93216e6678
(Vdefault_frame_scroll_bars): New variable.
Kim F. Storm <storm@cua.dk>
parents:
52401
diff
changeset
|
4086 #ifdef HAVE_WINDOW_SYSTEM |
59146
9bde7721ad0f
* dispextern.h: Change HAVE_CARBON to MAC_OS.
Steven Tamm <steventamm@mac.com>
parents:
58265
diff
changeset
|
4087 #if defined(HAVE_NTGUI) || defined(MAC_OS) |
52557
4a93216e6678
(Vdefault_frame_scroll_bars): New variable.
Kim F. Storm <storm@cua.dk>
parents:
52401
diff
changeset
|
4088 /* MS-Windows has scroll bars on the right by default. */ |
4a93216e6678
(Vdefault_frame_scroll_bars): New variable.
Kim F. Storm <storm@cua.dk>
parents:
52401
diff
changeset
|
4089 Vdefault_frame_scroll_bars = Qright; |
4a93216e6678
(Vdefault_frame_scroll_bars): New variable.
Kim F. Storm <storm@cua.dk>
parents:
52401
diff
changeset
|
4090 #else |
4a93216e6678
(Vdefault_frame_scroll_bars): New variable.
Kim F. Storm <storm@cua.dk>
parents:
52401
diff
changeset
|
4091 Vdefault_frame_scroll_bars = Qleft; |
4a93216e6678
(Vdefault_frame_scroll_bars): New variable.
Kim F. Storm <storm@cua.dk>
parents:
52401
diff
changeset
|
4092 #endif |
4a93216e6678
(Vdefault_frame_scroll_bars): New variable.
Kim F. Storm <storm@cua.dk>
parents:
52401
diff
changeset
|
4093 #else |
4a93216e6678
(Vdefault_frame_scroll_bars): New variable.
Kim F. Storm <storm@cua.dk>
parents:
52401
diff
changeset
|
4094 Vdefault_frame_scroll_bars = Qnil; |
4a93216e6678
(Vdefault_frame_scroll_bars): New variable.
Kim F. Storm <storm@cua.dk>
parents:
52401
diff
changeset
|
4095 #endif |
4a93216e6678
(Vdefault_frame_scroll_bars): New variable.
Kim F. Storm <storm@cua.dk>
parents:
52401
diff
changeset
|
4096 |
33509
a7d245e080d1
(syms_of_frame_1): Removed; code moved to syms_of_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
33005
diff
changeset
|
4097 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
|
4098 = 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
|
4099 staticpro (&Qinhibit_default_face_x_resources); |
286 | 4100 |
765 | 4101 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
|
4102 doc: /* The initial frame-object, which represents Emacs's stdout. */); |
286 | 4103 |
4104 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
|
4105 doc: /* Non-nil if all of emacs is iconified and frame updates are not needed. */); |
286 | 4106 Vemacs_iconified = Qnil; |
4107 | |
27795
83292274bbd4
(Vmouse_position_function): New variable.
Dave Love <fx@gnu.org>
parents:
27725
diff
changeset
|
4108 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
|
4109 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
|
4110 `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
|
4111 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
|
4112 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
|
4113 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
|
4114 Vmouse_position_function = Qnil; |
83292274bbd4
(Vmouse_position_function): New variable.
Dave Love <fx@gnu.org>
parents:
27725
diff
changeset
|
4115 |
43366
512ab477b395
(Vmouse_highlight): New variable.
Kim F. Storm <storm@cua.dk>
parents:
42743
diff
changeset
|
4116 DEFVAR_LISP ("mouse-highlight", &Vmouse_highlight, |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
4117 doc: /* If non-nil, clickable text is highlighted when mouse is over it. |
43366
512ab477b395
(Vmouse_highlight): New variable.
Kim F. Storm <storm@cua.dk>
parents:
42743
diff
changeset
|
4118 If the value is an integer, highlighting is only shown after moving the |
512ab477b395
(Vmouse_highlight): New variable.
Kim F. Storm <storm@cua.dk>
parents:
42743
diff
changeset
|
4119 mouse, while keyboard input turns off the highlight even when the mouse |
512ab477b395
(Vmouse_highlight): New variable.
Kim F. Storm <storm@cua.dk>
parents:
42743
diff
changeset
|
4120 is over the clickable text. However, the mouse shape still indicates |
512ab477b395
(Vmouse_highlight): New variable.
Kim F. Storm <storm@cua.dk>
parents:
42743
diff
changeset
|
4121 when the mouse is over clickable text. */); |
43442
400971c52790
(syms_of_frame): Change mouse-highlight default to t.
Kim F. Storm <storm@cua.dk>
parents:
43366
diff
changeset
|
4122 Vmouse_highlight = Qt; |
43366
512ab477b395
(Vmouse_highlight): New variable.
Kim F. Storm <storm@cua.dk>
parents:
42743
diff
changeset
|
4123 |
47731
755c4233cfba
* frame.c (Vdelete_frame_functions): New variable.
John Paul Wallington <jpw@pobox.com>
parents:
47036
diff
changeset
|
4124 DEFVAR_LISP ("delete-frame-functions", &Vdelete_frame_functions, |
755c4233cfba
* frame.c (Vdelete_frame_functions): New variable.
John Paul Wallington <jpw@pobox.com>
parents:
47036
diff
changeset
|
4125 doc: /* Functions to be run before deleting a frame. |
755c4233cfba
* frame.c (Vdelete_frame_functions): New variable.
John Paul Wallington <jpw@pobox.com>
parents:
47036
diff
changeset
|
4126 The functions are run with one arg, the frame to be deleted. |
755c4233cfba
* frame.c (Vdelete_frame_functions): New variable.
John Paul Wallington <jpw@pobox.com>
parents:
47036
diff
changeset
|
4127 See `delete-frame'. */); |
755c4233cfba
* frame.c (Vdelete_frame_functions): New variable.
John Paul Wallington <jpw@pobox.com>
parents:
47036
diff
changeset
|
4128 Vdelete_frame_functions = Qnil; |
755c4233cfba
* frame.c (Vdelete_frame_functions): New variable.
John Paul Wallington <jpw@pobox.com>
parents:
47036
diff
changeset
|
4129 |
11779
6234b3610a6f
Vdefault_minibuffer_frame is now part of KBOARD instead
Karl Heuer <kwzh@gnu.org>
parents:
11775
diff
changeset
|
4130 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
|
4131 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
|
4132 |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
4133 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
|
4134 appropriate surrogate. |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
4135 |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
4136 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
|
4137 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
|
4138 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
|
4139 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
|
4140 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
|
4141 displayed. |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
4142 |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
4143 This variable is local to the current terminal and cannot be buffer-local. */); |
286 | 4144 |
33509
a7d245e080d1
(syms_of_frame_1): Removed; code moved to syms_of_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
33005
diff
changeset
|
4145 staticpro (&Vframe_list); |
a7d245e080d1
(syms_of_frame_1): Removed; code moved to syms_of_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
33005
diff
changeset
|
4146 |
11169
d0550c056e5b
[MULTI_FRAME] (Factive_minibuffer_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11126
diff
changeset
|
4147 defsubr (&Sactive_minibuffer_window); |
765 | 4148 defsubr (&Sframep); |
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1809
diff
changeset
|
4149 defsubr (&Sframe_live_p); |
10768
938451cf1b10
(Fmake_terminal_frame): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10676
diff
changeset
|
4150 defsubr (&Smake_terminal_frame); |
2298
872a3a2c3fed
* frame.c (Fhandle_switch_frame): Renamed from Fselect_frame.
Jim Blandy <jimb@redhat.com>
parents:
2282
diff
changeset
|
4151 defsubr (&Shandle_switch_frame); |
765 | 4152 defsubr (&Sselect_frame); |
4153 defsubr (&Sselected_frame); | |
4154 defsubr (&Swindow_frame); | |
4155 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
|
4156 defsubr (&Sframe_first_window); |
765 | 4157 defsubr (&Sframe_selected_window); |
7055
5e4906d964b8
(Fset_frame_selected_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7025
diff
changeset
|
4158 defsubr (&Sset_frame_selected_window); |
765 | 4159 defsubr (&Sframe_list); |
4160 defsubr (&Snext_frame); | |
4424
027d3affb2f8
(Fprevious_frame): New function, for parity with Fnext_frame.
Roland McGrath <roland@gnu.org>
parents:
4412
diff
changeset
|
4161 defsubr (&Sprevious_frame); |
765 | 4162 defsubr (&Sdelete_frame); |
454 | 4163 defsubr (&Smouse_position); |
7025
24e759919770
(Fmouse_pixel_position, Fset_mouse_pixel_position): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
6986
diff
changeset
|
4164 defsubr (&Smouse_pixel_position); |
286 | 4165 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
|
4166 defsubr (&Sset_mouse_pixel_position); |
286 | 4167 #if 0 |
765 | 4168 defsubr (&Sframe_configuration); |
4169 defsubr (&Srestore_frame_configuration); | |
286 | 4170 #endif |
765 | 4171 defsubr (&Smake_frame_visible); |
4172 defsubr (&Smake_frame_invisible); | |
4173 defsubr (&Siconify_frame); | |
4174 defsubr (&Sframe_visible_p); | |
4175 defsubr (&Svisible_frame_list); | |
2282
f727944c11aa
* frame.c (Fraise_frame, Flower_frame): Renamed from
Jim Blandy <jimb@redhat.com>
parents:
2207
diff
changeset
|
4176 defsubr (&Sraise_frame); |
f727944c11aa
* frame.c (Fraise_frame, Flower_frame): Renamed from
Jim Blandy <jimb@redhat.com>
parents:
2207
diff
changeset
|
4177 defsubr (&Slower_frame); |
765 | 4178 defsubr (&Sredirect_frame_focus); |
4179 defsubr (&Sframe_focus); | |
4180 defsubr (&Sframe_parameters); | |
31399
db831ffcd565
(Qdisplay_type): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31102
diff
changeset
|
4181 defsubr (&Sframe_parameter); |
765 | 4182 defsubr (&Smodify_frame_parameters); |
2068
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
4183 defsubr (&Sframe_char_height); |
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
4184 defsubr (&Sframe_char_width); |
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
4185 defsubr (&Sframe_pixel_height); |
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
4186 defsubr (&Sframe_pixel_width); |
765 | 4187 defsubr (&Sset_frame_height); |
4188 defsubr (&Sset_frame_width); | |
4189 defsubr (&Sset_frame_size); | |
4190 defsubr (&Sset_frame_position); | |
50357 | 4191 |
4192 #ifdef HAVE_WINDOW_SYSTEM | |
4193 defsubr (&Sx_get_resource); | |
4194 defsubr (&Sx_parse_geometry); | |
4195 #endif | |
4196 | |
286 | 4197 } |
52401 | 4198 |
4199 /* arch-tag: 7dbf2c69-9aad-45f8-8296-db893d6dd039 | |
4200 (do not change this comment) */ |