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