Mercurial > emacs
annotate src/frame.c @ 110211:6cdcc53703e4
mail-source.el (mail-source-fetch): Don't message if we're fetching mail from a file, and the file doesn't exist.
author | Katsumi Yamaoka <yamaoka@jpl.org> |
---|---|
date | Sun, 05 Sep 2010 23:38:33 +0000 |
parents | 8949aad5e992 |
children | bbc922c0cfa8 |
rev | line source |
---|---|
765 | 1 /* Generic frame functions. |
64770
a0d1312ede66
Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
64713
diff
changeset
|
2 Copyright (C) 1993, 1994, 1995, 1997, 1999, 2000, 2001, 2002, 2003, |
106815 | 3 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. |
286 | 4 |
5 This file is part of GNU Emacs. | |
6 | |
94963
8971ddf55736
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94933
diff
changeset
|
7 GNU Emacs is free software: you can redistribute it and/or modify |
286 | 8 it under the terms of the GNU General Public License as published by |
94963
8971ddf55736
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94933
diff
changeset
|
9 the Free Software Foundation, either version 3 of the License, or |
8971ddf55736
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94933
diff
changeset
|
10 (at your option) any later version. |
286 | 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 | |
94963
8971ddf55736
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94933
diff
changeset
|
18 along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ |
286 | 19 |
7900
60795e826dad
Put stdio.h after config.h.
Richard M. Stallman <rms@gnu.org>
parents:
7646
diff
changeset
|
20 #include <config.h> |
363 | 21 |
7900
60795e826dad
Put stdio.h after config.h.
Richard M. Stallman <rms@gnu.org>
parents:
7646
diff
changeset
|
22 #include <stdio.h> |
96082 | 23 #include <ctype.h> |
105669
68dd71358159
* alloc.c: Do not define struct catchtag.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105545
diff
changeset
|
24 #include <setjmp.h> |
987
afb21e974ed2
* frame.c (make_frame): Stop passing zero to make_window; it's not
Jim Blandy <jimb@redhat.com>
parents:
965
diff
changeset
|
25 #include "lisp.h" |
88351
aac41b50c875
Include "character.h" instead of "charset.h".
Kenichi Handa <handa@m17n.org>
parents:
43442
diff
changeset
|
26 #include "character.h" |
21825
697991d2a2c4
Conditionally include xterm.h using HAVE_X_WINDOWS.
Geoff Voelker <voelker@cs.washington.edu>
parents:
21524
diff
changeset
|
27 #ifdef HAVE_X_WINDOWS |
21514 | 28 #include "xterm.h" |
17032 | 29 #endif |
27633
ab6c81c6edf8
[WINDOWSNT]: Include w32term.h.
Andrew Innes <andrewi@gnu.org>
parents:
27575
diff
changeset
|
30 #ifdef WINDOWSNT |
ab6c81c6edf8
[WINDOWSNT]: Include w32term.h.
Andrew Innes <andrewi@gnu.org>
parents:
27575
diff
changeset
|
31 #include "w32term.h" |
ab6c81c6edf8
[WINDOWSNT]: Include w32term.h.
Andrew Innes <andrewi@gnu.org>
parents:
27575
diff
changeset
|
32 #endif |
96675
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96544
diff
changeset
|
33 #ifdef HAVE_NS |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96544
diff
changeset
|
34 #include "nsterm.h" |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96544
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" |
50357 | 41 #include "blockinput.h" |
53226
dd3018b4785b
Implemented multiple tty support.
Karoly Lorentey <lorentey@elte.hu>
parents:
53072
diff
changeset
|
42 #include "termchar.h" |
5392
d8d5844c3ba6
Always include termhooks.h.
Richard M. Stallman <rms@gnu.org>
parents:
5231
diff
changeset
|
43 #include "termhooks.h" |
21514 | 44 #include "dispextern.h" |
7162
06a13bf36a8c
(Fframe_parameters) [!MULTI_FRAME]: Unstub it again.
Karl Heuer <kwzh@gnu.org>
parents:
7134
diff
changeset
|
45 #include "window.h" |
106511
1905fc4b8a80
* cmds.c: Include "frame.h".
Andreas Schwab <schwab@linux-m68k.org>
parents:
106308
diff
changeset
|
46 #include "font.h" |
94933
75fb6b489ec6
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
93883
diff
changeset
|
47 #ifdef HAVE_WINDOW_SYSTEM |
75fb6b489ec6
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
93883
diff
changeset
|
48 #include "fontset.h" |
75fb6b489ec6
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
93883
diff
changeset
|
49 #endif |
9572 | 50 #ifdef MSDOS |
51 #include "msdos.h" | |
25117
f6f34f0bc1af
(make_terminal_frame) [MSDOS]: Don't call
Eli Zaretskii <eliz@gnu.org>
parents:
25030
diff
changeset
|
52 #include "dosfns.h" |
9572 | 53 #endif |
732 | 54 |
50357 | 55 |
103704
6a4e411bd83b
* xterm.h (struct x_display_info): Add invisible_cursor.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103674
diff
changeset
|
56 /* If we shall make pointer invisible when typing or not. */ |
6a4e411bd83b
* xterm.h (struct x_display_info): Add invisible_cursor.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103674
diff
changeset
|
57 Lisp_Object Vmake_pointer_invisible; |
6a4e411bd83b
* xterm.h (struct x_display_info): Add invisible_cursor.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103674
diff
changeset
|
58 |
50373
6defa3317421
Fix compilation for --with-x=no.
Kim F. Storm <storm@cua.dk>
parents:
50357
diff
changeset
|
59 #ifdef HAVE_WINDOW_SYSTEM |
6defa3317421
Fix compilation for --with-x=no.
Kim F. Storm <storm@cua.dk>
parents:
50357
diff
changeset
|
60 |
50357 | 61 /* The name we're using in resource queries. Most often "emacs". */ |
62 | |
63 Lisp_Object Vx_resource_name; | |
64 | |
65 /* The application class we're using in resource queries. | |
66 Normally "Emacs". */ | |
67 | |
68 Lisp_Object Vx_resource_class; | |
69 | |
95157
b419f60db46c
Seiji Zenitani <zenitani at mac.com>
Glenn Morris <rgm@gnu.org>
parents:
95044
diff
changeset
|
70 /* Lower limit value of the frame opacity (alpha transparency). */ |
b419f60db46c
Seiji Zenitani <zenitani at mac.com>
Glenn Morris <rgm@gnu.org>
parents:
95044
diff
changeset
|
71 |
b419f60db46c
Seiji Zenitani <zenitani at mac.com>
Glenn Morris <rgm@gnu.org>
parents:
95044
diff
changeset
|
72 Lisp_Object Vframe_alpha_lower_limit; |
b419f60db46c
Seiji Zenitani <zenitani at mac.com>
Glenn Morris <rgm@gnu.org>
parents:
95044
diff
changeset
|
73 |
50373
6defa3317421
Fix compilation for --with-x=no.
Kim F. Storm <storm@cua.dk>
parents:
50357
diff
changeset
|
74 #endif |
50357 | 75 |
97449
d3a738f747c6
(Qns_parse_geometry): New var.
Chong Yidong <cyd@stupidchicken.com>
parents:
97141
diff
changeset
|
76 #ifdef HAVE_NS |
d3a738f747c6
(Qns_parse_geometry): New var.
Chong Yidong <cyd@stupidchicken.com>
parents:
97141
diff
changeset
|
77 Lisp_Object Qns_parse_geometry; |
d3a738f747c6
(Qns_parse_geometry): New var.
Chong Yidong <cyd@stupidchicken.com>
parents:
97141
diff
changeset
|
78 #endif |
d3a738f747c6
(Qns_parse_geometry): New var.
Chong Yidong <cyd@stupidchicken.com>
parents:
97141
diff
changeset
|
79 |
50357 | 80 Lisp_Object Qframep, Qframe_live_p; |
81 Lisp_Object Qicon, Qmodeline; | |
965
0eb68c6c452a
* frame.c (Qheight, Qicon, Qmodeline, Qname, Qnone, Qonly,
Jim Blandy <jimb@redhat.com>
parents:
886
diff
changeset
|
82 Lisp_Object Qonly; |
96675
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96544
diff
changeset
|
83 Lisp_Object Qx, Qw32, Qmac, Qpc, Qns; |
6246
128dc040e121
(next_frame, prev_frame): If MINIBUF is `visible',
Richard M. Stallman <rms@gnu.org>
parents:
6157
diff
changeset
|
84 Lisp_Object Qvisible; |
31399
db831ffcd565
(Qdisplay_type): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31102
diff
changeset
|
85 Lisp_Object Qdisplay_type; |
31448
70b366918608
(Fframe_parameter): Handle `name' and `background-mode'
Gerd Moellmann <gerd@gnu.org>
parents:
31442
diff
changeset
|
86 Lisp_Object Qbackground_mode; |
91732
c33ec1f680a9
* frame.c (Qnoelisp): New symbol.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91641
diff
changeset
|
87 Lisp_Object Qnoelisp; |
50357 | 88 |
89 Lisp_Object Qx_frame_parameter; | |
90 Lisp_Object Qx_resource_name; | |
83431
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83427
diff
changeset
|
91 Lisp_Object Qterminal; |
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83427
diff
changeset
|
92 Lisp_Object Qterminal_live_p; |
50357 | 93 |
94 /* Frame parameters (set or reported). */ | |
95 | |
96 Lisp_Object Qauto_raise, Qauto_lower; | |
97 Lisp_Object Qborder_color, Qborder_width; | |
98 Lisp_Object Qcursor_color, Qcursor_type; | |
99 Lisp_Object Qgeometry; /* Not used */ | |
100 Lisp_Object Qheight, Qwidth; | |
101 Lisp_Object Qleft, Qright; | |
102 Lisp_Object Qicon_left, Qicon_top, Qicon_type, Qicon_name; | |
109290
1b5ca039f5f2
Fix faulty `if' statement in delete_frame.
Chong Yidong <cyd@stupidchicken.com>
parents:
107526
diff
changeset
|
103 Lisp_Object Qtooltip; |
50357 | 104 Lisp_Object Qinternal_border_width; |
105 Lisp_Object Qmouse_color; | |
106 Lisp_Object Qminibuffer; | |
107 Lisp_Object Qscroll_bar_width, Qvertical_scroll_bars; | |
108 Lisp_Object Qvisibility; | |
109 Lisp_Object Qscroll_bar_foreground, Qscroll_bar_background; | |
110 Lisp_Object Qscreen_gamma; | |
111 Lisp_Object Qline_spacing; | |
112 Lisp_Object Quser_position, Quser_size; | |
113 Lisp_Object Qwait_for_wm; | |
114 Lisp_Object Qwindow_id; | |
115 #ifdef HAVE_X_WINDOWS | |
116 Lisp_Object Qouter_window_id; | |
117 #endif | |
118 Lisp_Object Qparent_id; | |
119 Lisp_Object Qtitle, Qname; | |
79048
ab853f85e4dc
(Qexplicit_name): New variable.
Martin Rudalics <rudalics@gmx.at>
parents:
78984
diff
changeset
|
120 Lisp_Object Qexplicit_name; |
50357 | 121 Lisp_Object Qunsplittable; |
109581
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109573
diff
changeset
|
122 Lisp_Object Qmenu_bar_lines, Qtool_bar_lines, Qtool_bar_position; |
109058
2f0720afc474
Change default-frame-alist and menu/tool-bar-mode interaction (Bug#2249).
Chong Yidong <cyd@stupidchicken.com>
parents:
109050
diff
changeset
|
123 Lisp_Object Vmenu_bar_mode, Vtool_bar_mode; |
50357 | 124 Lisp_Object Qleft_fringe, Qright_fringe; |
83415
d2c799f58129
Implement full support for frame-local `next-buffer' and `previous-buffer'.
Karoly Lorentey <lorentey@elte.hu>
parents:
83384
diff
changeset
|
125 Lisp_Object Qbuffer_predicate, Qbuffer_list, Qburied_buffer_list; |
42743
1e6231c9c359
(store_frame_param): Call set_tty_color_mode for termcap
Eli Zaretskii <eliz@gnu.org>
parents:
41718
diff
changeset
|
126 Lisp_Object Qtty_color_mode; |
53226
dd3018b4785b
Implemented multiple tty support.
Karoly Lorentey <lorentey@elte.hu>
parents:
53072
diff
changeset
|
127 Lisp_Object Qtty, Qtty_type; |
286 | 128 |
103665
340c701162a6
* emacs.c (USAGE3, standard_args): Add -mm and --maximized.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103603
diff
changeset
|
129 Lisp_Object Qfullscreen, Qfullwidth, Qfullheight, Qfullboth, Qmaximized; |
103674
1867be80e595
* w32fns.c (w32_frame_parm_handlers): Set 0 for sticky.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103665
diff
changeset
|
130 Lisp_Object Qsticky; |
90547
51be6e7b3881
(Qfont_backend): New variable.
Kenichi Handa <handa@m17n.org>
parents:
90533
diff
changeset
|
131 Lisp_Object Qfont_backend; |
95157
b419f60db46c
Seiji Zenitani <zenitani at mac.com>
Glenn Morris <rgm@gnu.org>
parents:
95044
diff
changeset
|
132 Lisp_Object Qalpha; |
50357 | 133 |
134 Lisp_Object Qface_set_after_frame_default; | |
135 | |
12761
bffb5ea6fb43
Move various Q... vars to top of file, unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
12742
diff
changeset
|
136 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
|
137 Lisp_Object Vdefault_frame_alist; |
52557
4a93216e6678
(Vdefault_frame_scroll_bars): New variable.
Kim F. Storm <storm@cua.dk>
parents:
52401
diff
changeset
|
138 Lisp_Object Vdefault_frame_scroll_bars; |
27795
83292274bbd4
(Vmouse_position_function): New variable.
Dave Love <fx@gnu.org>
parents:
27725
diff
changeset
|
139 Lisp_Object Vmouse_position_function; |
43366
512ab477b395
(Vmouse_highlight): New variable.
Kim F. Storm <storm@cua.dk>
parents:
42743
diff
changeset
|
140 Lisp_Object Vmouse_highlight; |
93369
ed10c3092847
* keyboard.c (pending_funcalls): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93203
diff
changeset
|
141 static Lisp_Object Vdelete_frame_functions, Qdelete_frame_functions; |
78984
a26a566a5577
(focus_follows_mouse): Moved here from frame.el to allow
Martin Rudalics <rudalics@gmx.at>
parents:
78260
diff
changeset
|
142 |
a26a566a5577
(focus_follows_mouse): Moved here from frame.el to allow
Martin Rudalics <rudalics@gmx.at>
parents:
78260
diff
changeset
|
143 int focus_follows_mouse; |
12761
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 static void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
146 set_menu_bar_lines_1 (Lisp_Object window, int n) |
12761
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 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
|
149 |
13498
c10046894834
(set_menu_bar_lines): Record the fact that the window configuration changes.
Richard M. Stallman <rms@gnu.org>
parents:
13412
diff
changeset
|
150 XSETFASTINT (w->last_modified, 0); |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
151 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
|
152 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
|
153 |
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
154 if (INTEGERP (w->orig_top_line)) |
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
155 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
|
156 if (INTEGERP (w->orig_total_lines)) |
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
157 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
|
158 |
bffb5ea6fb43
Move various Q... vars to top of file, unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
12742
diff
changeset
|
159 /* 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
|
160 if (!NILP (w->vchild)) |
bffb5ea6fb43
Move various Q... vars to top of file, unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
12742
diff
changeset
|
161 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
|
162 |
bffb5ea6fb43
Move various Q... vars to top of file, unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
12742
diff
changeset
|
163 /* 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
|
164 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
|
165 { |
bffb5ea6fb43
Move various Q... vars to top of file, unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
12742
diff
changeset
|
166 w = XWINDOW (window); |
bffb5ea6fb43
Move various Q... vars to top of file, unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
12742
diff
changeset
|
167 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
|
168 } |
bffb5ea6fb43
Move various Q... vars to top of file, unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
12742
diff
changeset
|
169 } |
bffb5ea6fb43
Move various Q... vars to top of file, unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
12742
diff
changeset
|
170 |
20038
bb460edc7187
(set_menu_bar_lines): Make the function external instead
Eli Zaretskii <eliz@gnu.org>
parents:
19532
diff
changeset
|
171 void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
172 set_menu_bar_lines (struct frame *f, Lisp_Object value, Lisp_Object oldval) |
12761
bffb5ea6fb43
Move various Q... vars to top of file, unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
12742
diff
changeset
|
173 { |
bffb5ea6fb43
Move various Q... vars to top of file, unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
12742
diff
changeset
|
174 int nlines; |
bffb5ea6fb43
Move various Q... vars to top of file, unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
12742
diff
changeset
|
175 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
|
176 |
bffb5ea6fb43
Move various Q... vars to top of file, unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
12742
diff
changeset
|
177 /* 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
|
178 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
|
179 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
|
180 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
|
181 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
|
182 return; |
bffb5ea6fb43
Move various Q... vars to top of file, unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
12742
diff
changeset
|
183 |
bffb5ea6fb43
Move various Q... vars to top of file, unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
12742
diff
changeset
|
184 if (INTEGERP (value)) |
bffb5ea6fb43
Move various Q... vars to top of file, unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
12742
diff
changeset
|
185 nlines = XINT (value); |
bffb5ea6fb43
Move various Q... vars to top of file, unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
12742
diff
changeset
|
186 else |
bffb5ea6fb43
Move various Q... vars to top of file, unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
12742
diff
changeset
|
187 nlines = 0; |
bffb5ea6fb43
Move various Q... vars to top of file, unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
12742
diff
changeset
|
188 |
13498
c10046894834
(set_menu_bar_lines): Record the fact that the window configuration changes.
Richard M. Stallman <rms@gnu.org>
parents:
13412
diff
changeset
|
189 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
|
190 { |
c10046894834
(set_menu_bar_lines): Record the fact that the window configuration changes.
Richard M. Stallman <rms@gnu.org>
parents:
13412
diff
changeset
|
191 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
|
192 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
|
193 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
|
194 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
|
195 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
|
196 } |
12761
bffb5ea6fb43
Move various Q... vars to top of file, unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
12742
diff
changeset
|
197 } |
bffb5ea6fb43
Move various Q... vars to top of file, unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
12742
diff
changeset
|
198 |
bffb5ea6fb43
Move various Q... vars to top of file, unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
12742
diff
changeset
|
199 Lisp_Object Vframe_list; |
bffb5ea6fb43
Move various Q... vars to top of file, unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
12742
diff
changeset
|
200 |
286 | 201 |
765 | 202 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
|
203 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
|
204 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
|
205 `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
|
206 `w32' for an Emacs frame that is a window on MS-Windows display, |
96675
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96544
diff
changeset
|
207 `ns' for an Emacs frame on a GNUstep or Macintosh Cocoa display, |
40105
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
208 `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
|
209 See also `frame-live-p'. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109139
diff
changeset
|
210 (Lisp_Object object) |
286 | 211 { |
9127
0b4836daa8e1
(Fframep, make_frame_without_minibuffer, do_switch_frame, prev_frame,
Karl Heuer <kwzh@gnu.org>
parents:
9032
diff
changeset
|
212 if (!FRAMEP (object)) |
286 | 213 return Qnil; |
765 | 214 switch (XFRAME (object)->output_method) |
286 | 215 { |
83008
040dd41ed7d0
Hookified termcap devices, added bootstrap display device, plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83004
diff
changeset
|
216 case output_initial: /* The initial frame is like a termcap frame. */ |
286 | 217 case output_termcap: |
218 return Qt; | |
219 case output_x_window: | |
965
0eb68c6c452a
* frame.c (Qheight, Qicon, Qmodeline, Qname, Qnone, Qonly,
Jim Blandy <jimb@redhat.com>
parents:
886
diff
changeset
|
220 return Qx; |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16568
diff
changeset
|
221 case output_w32: |
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16568
diff
changeset
|
222 return Qw32; |
15391
d4cec5d7566d
(Fset_mouse_position): Remove the DOS-specific
Richard M. Stallman <rms@gnu.org>
parents:
15062
diff
changeset
|
223 case output_msdos_raw: |
d4cec5d7566d
(Fset_mouse_position): Remove the DOS-specific
Richard M. Stallman <rms@gnu.org>
parents:
15062
diff
changeset
|
224 return Qpc; |
25523
9e9eeb68482e
(Fframep) [macintosh]: Handle mac frame type.
Richard M. Stallman <rms@gnu.org>
parents:
25350
diff
changeset
|
225 case output_mac: |
9e9eeb68482e
(Fframep) [macintosh]: Handle mac frame type.
Richard M. Stallman <rms@gnu.org>
parents:
25350
diff
changeset
|
226 return Qmac; |
96675
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96544
diff
changeset
|
227 case output_ns: |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96544
diff
changeset
|
228 return Qns; |
286 | 229 default: |
230 abort (); | |
231 } | |
232 } | |
233 | |
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1809
diff
changeset
|
234 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
|
235 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
|
236 Value is nil if OBJECT is not a live frame. If object is a live |
83431
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83427
diff
changeset
|
237 frame, the return value indicates what sort of terminal device it is |
41239 | 238 displayed on. See the documentation of `framep' for possible |
40568 | 239 return values. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109139
diff
changeset
|
240 (Lisp_Object object) |
454 | 241 { |
765 | 242 return ((FRAMEP (object) |
243 && FRAME_LIVE_P (XFRAME (object))) | |
244 ? Fframep (object) | |
454 | 245 : Qnil); |
246 } | |
247 | |
83004
7900111db01c
Converted display hooks to be display-local. Plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83003
diff
changeset
|
248 DEFUN ("window-system", Fwindow_system, Swindow_system, 0, 1, 0, |
7900111db01c
Converted display hooks to be display-local. Plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83003
diff
changeset
|
249 doc: /* The name of the window system that FRAME is displaying through. |
7900111db01c
Converted display hooks to be display-local. Plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83003
diff
changeset
|
250 The value is a symbol---for instance, 'x' for X windows. |
7900111db01c
Converted display hooks to be display-local. Plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83003
diff
changeset
|
251 The value is nil if Emacs is using a text-only terminal. |
7900111db01c
Converted display hooks to be display-local. Plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83003
diff
changeset
|
252 |
7900111db01c
Converted display hooks to be display-local. Plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83003
diff
changeset
|
253 FRAME defaults to the currently selected frame. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109139
diff
changeset
|
254 (Lisp_Object frame) |
83004
7900111db01c
Converted display hooks to be display-local. Plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83003
diff
changeset
|
255 { |
7900111db01c
Converted display hooks to be display-local. Plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83003
diff
changeset
|
256 Lisp_Object type; |
7900111db01c
Converted display hooks to be display-local. Plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83003
diff
changeset
|
257 if (NILP (frame)) |
7900111db01c
Converted display hooks to be display-local. Plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83003
diff
changeset
|
258 frame = selected_frame; |
7900111db01c
Converted display hooks to be display-local. Plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83003
diff
changeset
|
259 |
7900111db01c
Converted display hooks to be display-local. Plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83003
diff
changeset
|
260 type = Fframep (frame); |
7900111db01c
Converted display hooks to be display-local. Plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83003
diff
changeset
|
261 |
7900111db01c
Converted display hooks to be display-local. Plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83003
diff
changeset
|
262 if (NILP (type)) |
7900111db01c
Converted display hooks to be display-local. Plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83003
diff
changeset
|
263 wrong_type_argument (Qframep, frame); |
7900111db01c
Converted display hooks to be display-local. Plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83003
diff
changeset
|
264 |
7900111db01c
Converted display hooks to be display-local. Plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83003
diff
changeset
|
265 if (EQ (type, Qt)) |
7900111db01c
Converted display hooks to be display-local. Plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83003
diff
changeset
|
266 return Qnil; |
7900111db01c
Converted display hooks to be display-local. Plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83003
diff
changeset
|
267 else |
7900111db01c
Converted display hooks to be display-local. Plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83003
diff
changeset
|
268 return type; |
85651
a8927de00181
(syms_of_frame) <delete-frame-functions>: Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
85614
diff
changeset
|
269 } |
83004
7900111db01c
Converted display hooks to be display-local. Plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83003
diff
changeset
|
270 |
765 | 271 struct frame * |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
272 make_frame (int mini_p) |
286 | 273 { |
765 | 274 Lisp_Object frame; |
275 register struct frame *f; | |
286 | 276 register Lisp_Object root_window; |
277 register Lisp_Object mini_window; | |
278 | |
36433
20b42ba5a623
(make_frame): Use allocate_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
35817
diff
changeset
|
279 f = allocate_frame (); |
9972
92b33538b36a
(make_frame): Use allocate_vectorlike and VECSIZE.
Karl Heuer <kwzh@gnu.org>
parents:
9901
diff
changeset
|
280 XSETFRAME (frame, f); |
286 | 281 |
25030
c69d9e48269b
(make_frame): Set n_current_toolbar_items to 0.
Gerd Moellmann <gerd@gnu.org>
parents:
23746
diff
changeset
|
282 f->desired_matrix = 0; |
c69d9e48269b
(make_frame): Set n_current_toolbar_items to 0.
Gerd Moellmann <gerd@gnu.org>
parents:
23746
diff
changeset
|
283 f->current_matrix = 0; |
c69d9e48269b
(make_frame): Set n_current_toolbar_items to 0.
Gerd Moellmann <gerd@gnu.org>
parents:
23746
diff
changeset
|
284 f->desired_pool = 0; |
c69d9e48269b
(make_frame): Set n_current_toolbar_items to 0.
Gerd Moellmann <gerd@gnu.org>
parents:
23746
diff
changeset
|
285 f->current_pool = 0; |
c69d9e48269b
(make_frame): Set n_current_toolbar_items to 0.
Gerd Moellmann <gerd@gnu.org>
parents:
23746
diff
changeset
|
286 f->glyphs_initialized_p = 0; |
c69d9e48269b
(make_frame): Set n_current_toolbar_items to 0.
Gerd Moellmann <gerd@gnu.org>
parents:
23746
diff
changeset
|
287 f->decode_mode_spec_buffer = 0; |
765 | 288 f->visible = 0; |
1652
93497cd89204
* frame.c (make_frame): Initialize async_visible and
Jim Blandy <jimb@redhat.com>
parents:
1514
diff
changeset
|
289 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
|
290 f->output_data.nothing = 0; |
765 | 291 f->iconified = 0; |
1652
93497cd89204
* frame.c (make_frame): Initialize async_visible and
Jim Blandy <jimb@redhat.com>
parents:
1514
diff
changeset
|
292 f->async_iconified = 0; |
765 | 293 f->wants_modeline = 1; |
294 f->auto_raise = 0; | |
295 f->auto_lower = 0; | |
296 f->no_split = 0; | |
27725
fb13a4706619
(make_frame): Set frame initiallly to `garbaged'.
Gerd Moellmann <gerd@gnu.org>
parents:
27633
diff
changeset
|
297 f->garbaged = 1; |
765 | 298 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
|
299 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
|
300 f->explicit_name = 0; |
1989
b1c1ab20f810
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1920
diff
changeset
|
301 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
|
302 f->vertical_scroll_bar_type = vertical_scroll_bar_none; |
765 | 303 f->param_alist = Qnil; |
1989
b1c1ab20f810
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1920
diff
changeset
|
304 f->scroll_bars = Qnil; |
b1c1ab20f810
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1920
diff
changeset
|
305 f->condemned_scroll_bars = Qnil; |
2417
8c07933beed9
(make_frame): Init face_alist field.
Richard M. Stallman <rms@gnu.org>
parents:
2298
diff
changeset
|
306 f->face_alist = Qnil; |
25030
c69d9e48269b
(make_frame): Set n_current_toolbar_items to 0.
Gerd Moellmann <gerd@gnu.org>
parents:
23746
diff
changeset
|
307 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
|
308 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
|
309 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
|
310 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
|
311 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
|
312 f->buffer_list = Qnil; |
83415
d2c799f58129
Implement full support for frame-local `next-buffer' and `previous-buffer'.
Karoly Lorentey <lorentey@elte.hu>
parents:
83384
diff
changeset
|
313 f->buried_buffer_list = Qnil; |
14303
48e3ee5005cd
(make_frame): Initialize title parameter to Qnil.
Karl Heuer <kwzh@gnu.org>
parents:
14223
diff
changeset
|
314 f->namebuf = 0; |
14223
596bb10704dd
(make_frame): Initialize frame title field to nil.
Erik Naggum <erik@naggum.no>
parents:
14217
diff
changeset
|
315 f->title = Qnil; |
25030
c69d9e48269b
(make_frame): Set n_current_toolbar_items to 0.
Gerd Moellmann <gerd@gnu.org>
parents:
23746
diff
changeset
|
316 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
|
317 f->tool_bar_window = Qnil; |
33760
22dc6e2e7410
(make_frame): Change initialization of tool bar
Gerd Moellmann <gerd@gnu.org>
parents:
33512
diff
changeset
|
318 f->tool_bar_items = Qnil; |
109581
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109573
diff
changeset
|
319 f->tool_bar_position = Qtop; |
25544
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25523
diff
changeset
|
320 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
|
321 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
|
322 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
|
323 f->fringe_cols = 0; |
109191
379a5ad9f30b
Adapt terminal frames to latest menu-bar changes.
Chong Yidong <cyd@stupidchicken.com>
parents:
109179
diff
changeset
|
324 f->menu_bar_lines = 0; |
379a5ad9f30b
Adapt terminal frames to latest menu-bar changes.
Chong Yidong <cyd@stupidchicken.com>
parents:
109179
diff
changeset
|
325 f->tool_bar_lines = 0; |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
326 f->scroll_bar_actual_width = 0; |
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
327 f->border_width = 0; |
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
328 f->internal_border_width = 0; |
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
329 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
|
330 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
|
331 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
|
332 #ifdef HAVE_WINDOW_SYSTEM |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
333 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
|
334 #endif |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
335 f->size_hint_flags = 0; |
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
336 f->win_gravity = 0; |
90412 | 337 f->font_driver_list = NULL; |
91111
8781d295c455
(make_frame): Initialize f->font_data_list to NULL.
Kenichi Handa <handa@m17n.org>
parents:
91085
diff
changeset
|
338 f->font_data_list = NULL; |
286 | 339 |
987
afb21e974ed2
* frame.c (make_frame): Stop passing zero to make_window; it's not
Jim Blandy <jimb@redhat.com>
parents:
965
diff
changeset
|
340 root_window = make_window (); |
286 | 341 if (mini_p) |
342 { | |
987
afb21e974ed2
* frame.c (make_frame): Stop passing zero to make_window; it's not
Jim Blandy <jimb@redhat.com>
parents:
965
diff
changeset
|
343 mini_window = make_window (); |
286 | 344 XWINDOW (root_window)->next = mini_window; |
345 XWINDOW (mini_window)->prev = root_window; | |
346 XWINDOW (mini_window)->mini_p = Qt; | |
765 | 347 XWINDOW (mini_window)->frame = frame; |
348 f->minibuffer_window = mini_window; | |
286 | 349 } |
350 else | |
351 { | |
352 mini_window = Qnil; | |
353 XWINDOW (root_window)->next = Qnil; | |
765 | 354 f->minibuffer_window = Qnil; |
286 | 355 } |
356 | |
765 | 357 XWINDOW (root_window)->frame = frame; |
286 | 358 |
359 /* 10 is arbitrary, | |
360 just so that there is "something there." | |
765 | 361 Correct size will be set up later with change_frame_size. */ |
286 | 362 |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
363 SET_FRAME_COLS (f, 10); |
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
364 FRAME_LINES (f) = 10; |
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
365 |
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
366 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
|
367 XSETFASTINT (XWINDOW (root_window)->total_lines, (mini_p ? 9 : 10)); |
286 | 368 |
369 if (mini_p) | |
370 { | |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
371 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
|
372 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
|
373 XSETFASTINT (XWINDOW (mini_window)->total_lines, 1); |
286 | 374 } |
375 | |
765 | 376 /* Choose a buffer for the frame's root window. */ |
386 | 377 { |
378 Lisp_Object buf; | |
379 | |
380 XWINDOW (root_window)->buffer = Qt; | |
381 buf = Fcurrent_buffer (); | |
382 /* If buf is a 'hidden' buffer (i.e. one whose name starts with | |
383 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
|
384 if (SREF (Fbuffer_name (buf), 0) == ' ') |
22188
9fba463768ec
(frame_buffer_predicate): New arg FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
21825
diff
changeset
|
385 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
|
386 |
25030
c69d9e48269b
(make_frame): Set n_current_toolbar_items to 0.
Gerd Moellmann <gerd@gnu.org>
parents:
23746
diff
changeset
|
387 /* 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
|
388 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
|
389 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
|
390 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
|
391 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
|
392 SEGV. */ |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
393 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
|
394 f->buffer_list = Fcons (buf, Qnil); |
386 | 395 } |
396 | |
286 | 397 if (mini_p) |
398 { | |
399 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
|
400 set_window_buffer (mini_window, |
c69d9e48269b
(make_frame): Set n_current_toolbar_items to 0.
Gerd Moellmann <gerd@gnu.org>
parents:
23746
diff
changeset
|
401 (NILP (Vminibuffer_list) |
c69d9e48269b
(make_frame): Set n_current_toolbar_items to 0.
Gerd Moellmann <gerd@gnu.org>
parents:
23746
diff
changeset
|
402 ? get_minibuffer (0) |
c69d9e48269b
(make_frame): Set n_current_toolbar_items to 0.
Gerd Moellmann <gerd@gnu.org>
parents:
23746
diff
changeset
|
403 : Fcar (Vminibuffer_list)), |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
404 0, 0); |
286 | 405 } |
406 | |
765 | 407 f->root_window = root_window; |
408 f->selected_window = root_window; | |
363 | 409 /* Make sure this window seems more recently used than |
410 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
|
411 ++window_select_count; |
491080266027
Avoid side-effects inside XSETFASTINT's arguments.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
57971
diff
changeset
|
412 XSETFASTINT (XWINDOW (f->selected_window)->use_time, window_select_count); |
286 | 413 |
51665
c1f65dfc56eb
Fix some of the font/face problems.
Jan Djärv <jan.h.d@swipnet.se>
parents:
51225
diff
changeset
|
414 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
|
415 |
765 | 416 return f; |
286 | 417 } |
418 | |
21359
f66e706fc9d6
(make_frame_without_minibuffer): Conditionalize on HAVE_WINDOW_SYSTEM.
Richard M. Stallman <rms@gnu.org>
parents:
21244
diff
changeset
|
419 #ifdef HAVE_WINDOW_SYSTEM |
765 | 420 /* Make a frame using a separate minibuffer window on another frame. |
286 | 421 MINI_WINDOW is the minibuffer window to use. nil means use the |
422 default (the global minibuffer). */ | |
423 | |
765 | 424 struct frame * |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
425 make_frame_without_minibuffer (register Lisp_Object mini_window, KBOARD *kb, Lisp_Object display) |
286 | 426 { |
765 | 427 register struct frame *f; |
15555
5ceed3aa6a1c
(make_frame_without_minibuffer): GCPRO the frame f.
Richard M. Stallman <rms@gnu.org>
parents:
15396
diff
changeset
|
428 struct gcpro gcpro1; |
286 | 429 |
12010
57eb365d32f0
(make_frame_without_minibuffer): New arg DISPLAY.
Karl Heuer <kwzh@gnu.org>
parents:
12006
diff
changeset
|
430 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
|
431 CHECK_LIVE_WINDOW (mini_window); |
286 | 432 |
12010
57eb365d32f0
(make_frame_without_minibuffer): New arg DISPLAY.
Karl Heuer <kwzh@gnu.org>
parents:
12006
diff
changeset
|
433 if (!NILP (mini_window) |
83431
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83427
diff
changeset
|
434 && FRAME_KBOARD (XFRAME (XWINDOW (mini_window)->frame)) != kb) |
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83427
diff
changeset
|
435 error ("Frame and minibuffer must be on the same terminal"); |
11775
fe7852953b75
(make_frame_without_minibuffer): New arg KB.
Karl Heuer <kwzh@gnu.org>
parents:
11773
diff
changeset
|
436 |
765 | 437 /* Make a frame containing just a root window. */ |
438 f = make_frame (0); | |
286 | 439 |
12010
57eb365d32f0
(make_frame_without_minibuffer): New arg DISPLAY.
Karl Heuer <kwzh@gnu.org>
parents:
12006
diff
changeset
|
440 if (NILP (mini_window)) |
57eb365d32f0
(make_frame_without_minibuffer): New arg DISPLAY.
Karl Heuer <kwzh@gnu.org>
parents:
12006
diff
changeset
|
441 { |
57eb365d32f0
(make_frame_without_minibuffer): New arg DISPLAY.
Karl Heuer <kwzh@gnu.org>
parents:
12006
diff
changeset
|
442 /* Use default-minibuffer-frame if possible. */ |
57eb365d32f0
(make_frame_without_minibuffer): New arg DISPLAY.
Karl Heuer <kwzh@gnu.org>
parents:
12006
diff
changeset
|
443 if (!FRAMEP (kb->Vdefault_minibuffer_frame) |
57eb365d32f0
(make_frame_without_minibuffer): New arg DISPLAY.
Karl Heuer <kwzh@gnu.org>
parents:
12006
diff
changeset
|
444 || ! 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
|
445 { |
15555
5ceed3aa6a1c
(make_frame_without_minibuffer): GCPRO the frame f.
Richard M. Stallman <rms@gnu.org>
parents:
15396
diff
changeset
|
446 Lisp_Object frame_dummy; |
5ceed3aa6a1c
(make_frame_without_minibuffer): GCPRO the frame f.
Richard M. Stallman <rms@gnu.org>
parents:
15396
diff
changeset
|
447 |
5ceed3aa6a1c
(make_frame_without_minibuffer): GCPRO the frame f.
Richard M. Stallman <rms@gnu.org>
parents:
15396
diff
changeset
|
448 XSETFRAME (frame_dummy, f); |
5ceed3aa6a1c
(make_frame_without_minibuffer): GCPRO the frame f.
Richard M. Stallman <rms@gnu.org>
parents:
15396
diff
changeset
|
449 GCPRO1 (frame_dummy); |
12010
57eb365d32f0
(make_frame_without_minibuffer): New arg DISPLAY.
Karl Heuer <kwzh@gnu.org>
parents:
12006
diff
changeset
|
450 /* 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
|
451 kb->Vdefault_minibuffer_frame = |
5ceed3aa6a1c
(make_frame_without_minibuffer): GCPRO the frame f.
Richard M. Stallman <rms@gnu.org>
parents:
15396
diff
changeset
|
452 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
|
453 UNGCPRO; |
12010
57eb365d32f0
(make_frame_without_minibuffer): New arg DISPLAY.
Karl Heuer <kwzh@gnu.org>
parents:
12006
diff
changeset
|
454 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
455 |
12010
57eb365d32f0
(make_frame_without_minibuffer): New arg DISPLAY.
Karl Heuer <kwzh@gnu.org>
parents:
12006
diff
changeset
|
456 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
|
457 } |
15001
c74ce6421d04
(make_frame_without_minibuffer): Don't change the
Richard M. Stallman <rms@gnu.org>
parents:
14966
diff
changeset
|
458 |
765 | 459 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
|
460 |
c74ce6421d04
(make_frame_without_minibuffer): Don't change the
Richard M. Stallman <rms@gnu.org>
parents:
14966
diff
changeset
|
461 /* 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
|
462 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
|
463 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
|
464 Fset_window_buffer (mini_window, |
c74ce6421d04
(make_frame_without_minibuffer): Don't change the
Richard M. Stallman <rms@gnu.org>
parents:
14966
diff
changeset
|
465 (NILP (Vminibuffer_list) |
c74ce6421d04
(make_frame_without_minibuffer): Don't change the
Richard M. Stallman <rms@gnu.org>
parents:
14966
diff
changeset
|
466 ? get_minibuffer (0) |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
467 : Fcar (Vminibuffer_list)), Qnil); |
765 | 468 return f; |
286 | 469 } |
470 | |
765 | 471 /* Make a frame containing only a minibuffer window. */ |
286 | 472 |
765 | 473 struct frame * |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
474 make_minibuffer_frame (void) |
286 | 475 { |
765 | 476 /* First make a frame containing just a root window, no minibuffer. */ |
286 | 477 |
765 | 478 register struct frame *f = make_frame (0); |
286 | 479 register Lisp_Object mini_window; |
765 | 480 register Lisp_Object frame; |
286 | 481 |
9268
cb55d0155265
(make_minibuffer_frame, make_terminal_frame, Fselected_frame,
Karl Heuer <kwzh@gnu.org>
parents:
9214
diff
changeset
|
482 XSETFRAME (frame, f); |
286 | 483 |
1006
a13ee72d74a2
* frame.c (make_frame): Clear the explicit_name member of the new
Jim Blandy <jimb@redhat.com>
parents:
987
diff
changeset
|
484 f->auto_raise = 0; |
765 | 485 f->auto_lower = 0; |
486 f->no_split = 1; | |
487 f->wants_modeline = 0; | |
488 f->has_minibuffer = 1; | |
286 | 489 |
490 /* Now label the root window as also being the minibuffer. | |
491 Avoid infinite looping on the window chain by marking next pointer | |
492 as nil. */ | |
493 | |
765 | 494 mini_window = f->minibuffer_window = f->root_window; |
286 | 495 XWINDOW (mini_window)->mini_p = Qt; |
496 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
|
497 XWINDOW (mini_window)->prev = Qnil; |
765 | 498 XWINDOW (mini_window)->frame = frame; |
286 | 499 |
500 /* Put the proper buffer in that window. */ | |
501 | |
502 Fset_window_buffer (mini_window, | |
485 | 503 (NILP (Vminibuffer_list) |
286 | 504 ? get_minibuffer (0) |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
505 : Fcar (Vminibuffer_list)), Qnil); |
765 | 506 return f; |
286 | 507 } |
21359
f66e706fc9d6
(make_frame_without_minibuffer): Conditionalize on HAVE_WINDOW_SYSTEM.
Richard M. Stallman <rms@gnu.org>
parents:
21244
diff
changeset
|
508 #endif /* HAVE_WINDOW_SYSTEM */ |
286 | 509 |
53226
dd3018b4785b
Implemented multiple tty support.
Karoly Lorentey <lorentey@elte.hu>
parents:
53072
diff
changeset
|
510 /* Construct a frame that refers to a terminal. */ |
286 | 511 |
83431
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83427
diff
changeset
|
512 static int tty_frame_count; |
10768
938451cf1b10
(Fmake_terminal_frame): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10676
diff
changeset
|
513 |
765 | 514 struct frame * |
83008
040dd41ed7d0
Hookified termcap devices, added bootstrap display device, plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83004
diff
changeset
|
515 make_initial_frame (void) |
286 | 516 { |
83008
040dd41ed7d0
Hookified termcap devices, added bootstrap display device, plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83004
diff
changeset
|
517 struct frame *f; |
83431
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83427
diff
changeset
|
518 struct terminal *terminal; |
5231
6646271e8d32
(make_terminal_frame): Add frame to Vframe_list.
Richard M. Stallman <rms@gnu.org>
parents:
5172
diff
changeset
|
519 Lisp_Object frame; |
286 | 520 |
85839
f32c70475c8e
* keyboard.c (syms_of_keyboard): Initialize the initial_kboard.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85688
diff
changeset
|
521 eassert (initial_kboard); |
11017
f7c4ece024d5
(make_frame): Initialize kboard member.
Karl Heuer <kwzh@gnu.org>
parents:
10853
diff
changeset
|
522 |
10768
938451cf1b10
(Fmake_terminal_frame): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10676
diff
changeset
|
523 /* The first call must initialize Vframe_list. */ |
938451cf1b10
(Fmake_terminal_frame): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10676
diff
changeset
|
524 if (! (NILP (Vframe_list) || CONSP (Vframe_list))) |
938451cf1b10
(Fmake_terminal_frame): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10676
diff
changeset
|
525 Vframe_list = Qnil; |
938451cf1b10
(Fmake_terminal_frame): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10676
diff
changeset
|
526 |
83431
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83427
diff
changeset
|
527 terminal = init_initial_terminal (); |
83008
040dd41ed7d0
Hookified termcap devices, added bootstrap display device, plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83004
diff
changeset
|
528 |
040dd41ed7d0
Hookified termcap devices, added bootstrap display device, plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83004
diff
changeset
|
529 f = make_frame (1); |
040dd41ed7d0
Hookified termcap devices, added bootstrap display device, plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83004
diff
changeset
|
530 XSETFRAME (frame, f); |
040dd41ed7d0
Hookified termcap devices, added bootstrap display device, plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83004
diff
changeset
|
531 |
040dd41ed7d0
Hookified termcap devices, added bootstrap display device, plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83004
diff
changeset
|
532 Vframe_list = Fcons (frame, Vframe_list); |
040dd41ed7d0
Hookified termcap devices, added bootstrap display device, plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83004
diff
changeset
|
533 |
83431
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83427
diff
changeset
|
534 tty_frame_count = 1; |
105958
341a779db1d0
* frame.c (make_initial_frame):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105877
diff
changeset
|
535 f->name = make_pure_c_string ("F1"); |
83008
040dd41ed7d0
Hookified termcap devices, added bootstrap display device, plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83004
diff
changeset
|
536 |
040dd41ed7d0
Hookified termcap devices, added bootstrap display device, plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83004
diff
changeset
|
537 f->visible = 1; |
040dd41ed7d0
Hookified termcap devices, added bootstrap display device, plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83004
diff
changeset
|
538 f->async_visible = 1; |
040dd41ed7d0
Hookified termcap devices, added bootstrap display device, plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83004
diff
changeset
|
539 |
83431
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83427
diff
changeset
|
540 f->output_method = terminal->type; |
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83427
diff
changeset
|
541 f->terminal = terminal; |
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83427
diff
changeset
|
542 f->terminal->reference_count++; |
83008
040dd41ed7d0
Hookified termcap devices, added bootstrap display device, plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83004
diff
changeset
|
543 f->output_data.nothing = 0; |
85651
a8927de00181
(syms_of_frame) <delete-frame-functions>: Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
85614
diff
changeset
|
544 |
83008
040dd41ed7d0
Hookified termcap devices, added bootstrap display device, plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83004
diff
changeset
|
545 FRAME_FOREGROUND_PIXEL (f) = FACE_TTY_DEFAULT_FG_COLOR; |
040dd41ed7d0
Hookified termcap devices, added bootstrap display device, plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83004
diff
changeset
|
546 FRAME_BACKGROUND_PIXEL (f) = FACE_TTY_DEFAULT_BG_COLOR; |
85651
a8927de00181
(syms_of_frame) <delete-frame-functions>: Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
85614
diff
changeset
|
547 |
83008
040dd41ed7d0
Hookified termcap devices, added bootstrap display device, plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83004
diff
changeset
|
548 FRAME_CAN_HAVE_SCROLL_BARS (f) = 0; |
040dd41ed7d0
Hookified termcap devices, added bootstrap display device, plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83004
diff
changeset
|
549 FRAME_VERTICAL_SCROLL_BAR_TYPE (f) = vertical_scroll_bar_none; |
109455
56176400910f
* frame.c (make_initial_frame): Use set_menu_bar_lines (Bug#6660).
Chong Yidong <cyd@stupidchicken.com>
parents:
109303
diff
changeset
|
550 |
56176400910f
* frame.c (make_initial_frame): Use set_menu_bar_lines (Bug#6660).
Chong Yidong <cyd@stupidchicken.com>
parents:
109303
diff
changeset
|
551 /* The default value of menu-bar-mode is t. */ |
56176400910f
* frame.c (make_initial_frame): Use set_menu_bar_lines (Bug#6660).
Chong Yidong <cyd@stupidchicken.com>
parents:
109303
diff
changeset
|
552 set_menu_bar_lines (f, make_number (1), Qnil); |
83008
040dd41ed7d0
Hookified termcap devices, added bootstrap display device, plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83004
diff
changeset
|
553 |
96675
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96544
diff
changeset
|
554 #ifdef CANNOT_DUMP |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96544
diff
changeset
|
555 if (!noninteractive) |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96544
diff
changeset
|
556 init_frame_faces (f); |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96544
diff
changeset
|
557 #endif |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96544
diff
changeset
|
558 |
83008
040dd41ed7d0
Hookified termcap devices, added bootstrap display device, plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83004
diff
changeset
|
559 return f; |
040dd41ed7d0
Hookified termcap devices, added bootstrap display device, plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83004
diff
changeset
|
560 } |
040dd41ed7d0
Hookified termcap devices, added bootstrap display device, plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83004
diff
changeset
|
561 |
040dd41ed7d0
Hookified termcap devices, added bootstrap display device, plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83004
diff
changeset
|
562 |
040dd41ed7d0
Hookified termcap devices, added bootstrap display device, plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83004
diff
changeset
|
563 struct frame * |
83431
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83427
diff
changeset
|
564 make_terminal_frame (struct terminal *terminal) |
286 | 565 { |
765 | 566 register struct frame *f; |
5231
6646271e8d32
(make_terminal_frame): Add frame to Vframe_list.
Richard M. Stallman <rms@gnu.org>
parents:
5172
diff
changeset
|
567 Lisp_Object frame; |
10768
938451cf1b10
(Fmake_terminal_frame): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10676
diff
changeset
|
568 char name[20]; |
286 | 569 |
84688
7abdec20dc91
(make_terminal_frame): Use terminal->name as liveness status.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84375
diff
changeset
|
570 if (!terminal->name) |
7abdec20dc91
(make_terminal_frame): Use terminal->name as liveness status.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84375
diff
changeset
|
571 error ("Terminal is not live, can't create new frames on it"); |
10768
938451cf1b10
(Fmake_terminal_frame): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10676
diff
changeset
|
572 |
765 | 573 f = make_frame (1); |
5231
6646271e8d32
(make_terminal_frame): Add frame to Vframe_list.
Richard M. Stallman <rms@gnu.org>
parents:
5172
diff
changeset
|
574 |
9268
cb55d0155265
(make_minibuffer_frame, make_terminal_frame, Fselected_frame,
Karl Heuer <kwzh@gnu.org>
parents:
9214
diff
changeset
|
575 XSETFRAME (frame, f); |
5231
6646271e8d32
(make_terminal_frame): Add frame to Vframe_list.
Richard M. Stallman <rms@gnu.org>
parents:
5172
diff
changeset
|
576 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
|
577 |
83431
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83427
diff
changeset
|
578 tty_frame_count++; |
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83427
diff
changeset
|
579 sprintf (name, "F%d", tty_frame_count); |
17857
c39f34ef5d76
(make_terminal_frame): Don't add `Emacs' to frame name.
Richard M. Stallman <rms@gnu.org>
parents:
17573
diff
changeset
|
580 f->name = build_string (name); |
10768
938451cf1b10
(Fmake_terminal_frame): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10676
diff
changeset
|
581 |
938451cf1b10
(Fmake_terminal_frame): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10676
diff
changeset
|
582 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
|
583 f->async_visible = 1; /* Don't let visible be cleared later. */ |
97690
af1ed0096327
(make_terminal_frame): Initialize f->terminal, f->terminal->reference_count,
Eli Zaretskii <eliz@gnu.org>
parents:
97659
diff
changeset
|
584 f->terminal = terminal; |
af1ed0096327
(make_terminal_frame): Initialize f->terminal, f->terminal->reference_count,
Eli Zaretskii <eliz@gnu.org>
parents:
97659
diff
changeset
|
585 f->terminal->reference_count++; |
15391
d4cec5d7566d
(Fset_mouse_position): Remove the DOS-specific
Richard M. Stallman <rms@gnu.org>
parents:
15062
diff
changeset
|
586 #ifdef MSDOS |
97659
6358f03eb003
(make_terminal_frame) [MSDOS]: Adjust initialization of f->output_data.tty.
Eli Zaretskii <eliz@gnu.org>
parents:
97449
diff
changeset
|
587 f->output_data.tty->display_info = &the_only_display_info; |
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26164
diff
changeset
|
588 if (!inhibit_window_system |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26164
diff
changeset
|
589 && (!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
|
590 || XFRAME (selected_frame)->output_method == output_msdos_raw)) |
98590
2d6205c3076b
(make_terminal_frame) [MSDOS]: Remove unused #ifdef'ed away code.
Eli Zaretskii <eliz@gnu.org>
parents:
98579
diff
changeset
|
591 f->output_method = output_msdos_raw; |
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26164
diff
changeset
|
592 else |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26164
diff
changeset
|
593 f->output_method = output_termcap; |
100825
aa7072ec5fe2
(make_terminal_frame): Remove redundant code and useless
Dan Nicolaescu <dann@ics.uci.edu>
parents:
100780
diff
changeset
|
594 #else /* not MSDOS */ |
aa7072ec5fe2
(make_terminal_frame): Remove redundant code and useless
Dan Nicolaescu <dann@ics.uci.edu>
parents:
100780
diff
changeset
|
595 f->output_method = output_termcap; |
aa7072ec5fe2
(make_terminal_frame): Remove redundant code and useless
Dan Nicolaescu <dann@ics.uci.edu>
parents:
100780
diff
changeset
|
596 create_tty_output (f); |
aa7072ec5fe2
(make_terminal_frame): Remove redundant code and useless
Dan Nicolaescu <dann@ics.uci.edu>
parents:
100780
diff
changeset
|
597 FRAME_FOREGROUND_PIXEL (f) = FACE_TTY_DEFAULT_FG_COLOR; |
aa7072ec5fe2
(make_terminal_frame): Remove redundant code and useless
Dan Nicolaescu <dann@ics.uci.edu>
parents:
100780
diff
changeset
|
598 FRAME_BACKGROUND_PIXEL (f) = FACE_TTY_DEFAULT_BG_COLOR; |
aa7072ec5fe2
(make_terminal_frame): Remove redundant code and useless
Dan Nicolaescu <dann@ics.uci.edu>
parents:
100780
diff
changeset
|
599 #endif /* not MSDOS */ |
25523
9e9eeb68482e
(Fframep) [macintosh]: Handle mac frame type.
Richard M. Stallman <rms@gnu.org>
parents:
25350
diff
changeset
|
600 |
97690
af1ed0096327
(make_terminal_frame): Initialize f->terminal, f->terminal->reference_count,
Eli Zaretskii <eliz@gnu.org>
parents:
97659
diff
changeset
|
601 FRAME_CAN_HAVE_SCROLL_BARS (f) = 0; |
af1ed0096327
(make_terminal_frame): Initialize f->terminal, f->terminal->reference_count,
Eli Zaretskii <eliz@gnu.org>
parents:
97659
diff
changeset
|
602 FRAME_VERTICAL_SCROLL_BAR_TYPE (f) = vertical_scroll_bar_none; |
109191
379a5ad9f30b
Adapt terminal frames to latest menu-bar changes.
Chong Yidong <cyd@stupidchicken.com>
parents:
109179
diff
changeset
|
603 FRAME_MENU_BAR_LINES(f) = NILP (Vmenu_bar_mode) ? 0 : 1; |
97690
af1ed0096327
(make_terminal_frame): Initialize f->terminal, f->terminal->reference_count,
Eli Zaretskii <eliz@gnu.org>
parents:
97659
diff
changeset
|
604 |
af1ed0096327
(make_terminal_frame): Initialize f->terminal, f->terminal->reference_count,
Eli Zaretskii <eliz@gnu.org>
parents:
97659
diff
changeset
|
605 /* Set the top frame to the newly created frame. */ |
af1ed0096327
(make_terminal_frame): Initialize f->terminal, f->terminal->reference_count,
Eli Zaretskii <eliz@gnu.org>
parents:
97659
diff
changeset
|
606 if (FRAMEP (FRAME_TTY (f)->top_frame) |
af1ed0096327
(make_terminal_frame): Initialize f->terminal, f->terminal->reference_count,
Eli Zaretskii <eliz@gnu.org>
parents:
97659
diff
changeset
|
607 && FRAME_LIVE_P (XFRAME (FRAME_TTY (f)->top_frame))) |
af1ed0096327
(make_terminal_frame): Initialize f->terminal, f->terminal->reference_count,
Eli Zaretskii <eliz@gnu.org>
parents:
97659
diff
changeset
|
608 XFRAME (FRAME_TTY (f)->top_frame)->async_visible = 2; /* obscured */ |
af1ed0096327
(make_terminal_frame): Initialize f->terminal, f->terminal->reference_count,
Eli Zaretskii <eliz@gnu.org>
parents:
97659
diff
changeset
|
609 |
af1ed0096327
(make_terminal_frame): Initialize f->terminal, f->terminal->reference_count,
Eli Zaretskii <eliz@gnu.org>
parents:
97659
diff
changeset
|
610 FRAME_TTY (f)->top_frame = frame; |
af1ed0096327
(make_terminal_frame): Initialize f->terminal, f->terminal->reference_count,
Eli Zaretskii <eliz@gnu.org>
parents:
97659
diff
changeset
|
611 |
25117
f6f34f0bc1af
(make_terminal_frame) [MSDOS]: Don't call
Eli Zaretskii <eliz@gnu.org>
parents:
25030
diff
changeset
|
612 if (!noninteractive) |
f6f34f0bc1af
(make_terminal_frame) [MSDOS]: Don't call
Eli Zaretskii <eliz@gnu.org>
parents:
25030
diff
changeset
|
613 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
|
614 |
765 | 615 return f; |
286 | 616 } |
10768
938451cf1b10
(Fmake_terminal_frame): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10676
diff
changeset
|
617 |
83420
521d3f18b3d1
Reimplement terminal parameters in C; clean up term.c, create terminal.c.
Karoly Lorentey <lorentey@elte.hu>
parents:
83415
diff
changeset
|
618 /* Get a suitable value for frame parameter PARAMETER for a newly |
521d3f18b3d1
Reimplement terminal parameters in C; clean up term.c, create terminal.c.
Karoly Lorentey <lorentey@elte.hu>
parents:
83415
diff
changeset
|
619 created frame, based on (1) the user-supplied frame parameter |
109089
bd58a72bb9bb
Fix application of default-frame-alist (Bug#5378).
Chong Yidong <cyd@stupidchicken.com>
parents:
109058
diff
changeset
|
620 alist SUPPLIED_PARMS, and (2) CURRENT_VALUE. */ |
83420
521d3f18b3d1
Reimplement terminal parameters in C; clean up term.c, create terminal.c.
Karoly Lorentey <lorentey@elte.hu>
parents:
83415
diff
changeset
|
621 |
521d3f18b3d1
Reimplement terminal parameters in C; clean up term.c, create terminal.c.
Karoly Lorentey <lorentey@elte.hu>
parents:
83415
diff
changeset
|
622 static Lisp_Object |
521d3f18b3d1
Reimplement terminal parameters in C; clean up term.c, create terminal.c.
Karoly Lorentey <lorentey@elte.hu>
parents:
83415
diff
changeset
|
623 get_future_frame_param (Lisp_Object parameter, |
521d3f18b3d1
Reimplement terminal parameters in C; clean up term.c, create terminal.c.
Karoly Lorentey <lorentey@elte.hu>
parents:
83415
diff
changeset
|
624 Lisp_Object supplied_parms, |
521d3f18b3d1
Reimplement terminal parameters in C; clean up term.c, create terminal.c.
Karoly Lorentey <lorentey@elte.hu>
parents:
83415
diff
changeset
|
625 char *current_value) |
521d3f18b3d1
Reimplement terminal parameters in C; clean up term.c, create terminal.c.
Karoly Lorentey <lorentey@elte.hu>
parents:
83415
diff
changeset
|
626 { |
521d3f18b3d1
Reimplement terminal parameters in C; clean up term.c, create terminal.c.
Karoly Lorentey <lorentey@elte.hu>
parents:
83415
diff
changeset
|
627 Lisp_Object result; |
521d3f18b3d1
Reimplement terminal parameters in C; clean up term.c, create terminal.c.
Karoly Lorentey <lorentey@elte.hu>
parents:
83415
diff
changeset
|
628 |
521d3f18b3d1
Reimplement terminal parameters in C; clean up term.c, create terminal.c.
Karoly Lorentey <lorentey@elte.hu>
parents:
83415
diff
changeset
|
629 result = Fassq (parameter, supplied_parms); |
521d3f18b3d1
Reimplement terminal parameters in C; clean up term.c, create terminal.c.
Karoly Lorentey <lorentey@elte.hu>
parents:
83415
diff
changeset
|
630 if (NILP (result)) |
521d3f18b3d1
Reimplement terminal parameters in C; clean up term.c, create terminal.c.
Karoly Lorentey <lorentey@elte.hu>
parents:
83415
diff
changeset
|
631 result = Fassq (parameter, XFRAME (selected_frame)->param_alist); |
521d3f18b3d1
Reimplement terminal parameters in C; clean up term.c, create terminal.c.
Karoly Lorentey <lorentey@elte.hu>
parents:
83415
diff
changeset
|
632 if (NILP (result) && current_value != NULL) |
521d3f18b3d1
Reimplement terminal parameters in C; clean up term.c, create terminal.c.
Karoly Lorentey <lorentey@elte.hu>
parents:
83415
diff
changeset
|
633 result = build_string (current_value); |
521d3f18b3d1
Reimplement terminal parameters in C; clean up term.c, create terminal.c.
Karoly Lorentey <lorentey@elte.hu>
parents:
83415
diff
changeset
|
634 if (!NILP (result) && !STRINGP (result)) |
521d3f18b3d1
Reimplement terminal parameters in C; clean up term.c, create terminal.c.
Karoly Lorentey <lorentey@elte.hu>
parents:
83415
diff
changeset
|
635 result = XCDR (result); |
521d3f18b3d1
Reimplement terminal parameters in C; clean up term.c, create terminal.c.
Karoly Lorentey <lorentey@elte.hu>
parents:
83415
diff
changeset
|
636 if (NILP (result) || !STRINGP (result)) |
521d3f18b3d1
Reimplement terminal parameters in C; clean up term.c, create terminal.c.
Karoly Lorentey <lorentey@elte.hu>
parents:
83415
diff
changeset
|
637 result = Qnil; |
521d3f18b3d1
Reimplement terminal parameters in C; clean up term.c, create terminal.c.
Karoly Lorentey <lorentey@elte.hu>
parents:
83415
diff
changeset
|
638 |
521d3f18b3d1
Reimplement terminal parameters in C; clean up term.c, create terminal.c.
Karoly Lorentey <lorentey@elte.hu>
parents:
83415
diff
changeset
|
639 return result; |
521d3f18b3d1
Reimplement terminal parameters in C; clean up term.c, create terminal.c.
Karoly Lorentey <lorentey@elte.hu>
parents:
83415
diff
changeset
|
640 } |
521d3f18b3d1
Reimplement terminal parameters in C; clean up term.c, create terminal.c.
Karoly Lorentey <lorentey@elte.hu>
parents:
83415
diff
changeset
|
641 |
10768
938451cf1b10
(Fmake_terminal_frame): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10676
diff
changeset
|
642 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
|
643 1, 1, 0, |
53226
dd3018b4785b
Implemented multiple tty support.
Karoly Lorentey <lorentey@elte.hu>
parents:
53072
diff
changeset
|
644 doc: /* Create an additional terminal frame, possibly on another terminal. |
40105
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
645 This function takes one argument, an alist specifying frame parameters. |
53226
dd3018b4785b
Implemented multiple tty support.
Karoly Lorentey <lorentey@elte.hu>
parents:
53072
diff
changeset
|
646 |
dd3018b4785b
Implemented multiple tty support.
Karoly Lorentey <lorentey@elte.hu>
parents:
53072
diff
changeset
|
647 You can create multiple frames on a single text-only terminal, but |
dd3018b4785b
Implemented multiple tty support.
Karoly Lorentey <lorentey@elte.hu>
parents:
53072
diff
changeset
|
648 only one of them (the selected terminal frame) is actually displayed. |
dd3018b4785b
Implemented multiple tty support.
Karoly Lorentey <lorentey@elte.hu>
parents:
53072
diff
changeset
|
649 |
dd3018b4785b
Implemented multiple tty support.
Karoly Lorentey <lorentey@elte.hu>
parents:
53072
diff
changeset
|
650 In practice, generally you don't need to specify any parameters, |
dd3018b4785b
Implemented multiple tty support.
Karoly Lorentey <lorentey@elte.hu>
parents:
53072
diff
changeset
|
651 except when you want to create a new frame on another terminal. |
dd3018b4785b
Implemented multiple tty support.
Karoly Lorentey <lorentey@elte.hu>
parents:
53072
diff
changeset
|
652 In that case, the `tty' parameter specifies the device file to open, |
dd3018b4785b
Implemented multiple tty support.
Karoly Lorentey <lorentey@elte.hu>
parents:
53072
diff
changeset
|
653 and the `tty-type' parameter specifies the terminal type. Example: |
dd3018b4785b
Implemented multiple tty support.
Karoly Lorentey <lorentey@elte.hu>
parents:
53072
diff
changeset
|
654 |
dd3018b4785b
Implemented multiple tty support.
Karoly Lorentey <lorentey@elte.hu>
parents:
53072
diff
changeset
|
655 (make-terminal-frame '((tty . "/dev/pts/5") (tty-type . "xterm"))) |
dd3018b4785b
Implemented multiple tty support.
Karoly Lorentey <lorentey@elte.hu>
parents:
53072
diff
changeset
|
656 |
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83016
diff
changeset
|
657 Note that changing the size of one terminal frame automatically |
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83016
diff
changeset
|
658 affects all frames on the same terminal device. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109139
diff
changeset
|
659 (Lisp_Object parms) |
10768
938451cf1b10
(Fmake_terminal_frame): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10676
diff
changeset
|
660 { |
938451cf1b10
(Fmake_terminal_frame): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10676
diff
changeset
|
661 struct frame *f; |
83431
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83427
diff
changeset
|
662 struct terminal *t = NULL; |
25523
9e9eeb68482e
(Fframep) [macintosh]: Handle mac frame type.
Richard M. Stallman <rms@gnu.org>
parents:
25350
diff
changeset
|
663 Lisp_Object frame, tem; |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
664 struct frame *sf = SELECTED_FRAME (); |
10768
938451cf1b10
(Fmake_terminal_frame): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10676
diff
changeset
|
665 |
15392
ac7e878c5526
(Fmake_terminal_frame): Test MSDOS, not __MSDOS__.
Richard M. Stallman <rms@gnu.org>
parents:
15391
diff
changeset
|
666 #ifdef MSDOS |
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26164
diff
changeset
|
667 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
|
668 && sf->output_method != output_termcap) |
15391
d4cec5d7566d
(Fset_mouse_position): Remove the DOS-specific
Richard M. Stallman <rms@gnu.org>
parents:
15062
diff
changeset
|
669 abort (); |
25523
9e9eeb68482e
(Fframep) [macintosh]: Handle mac frame type.
Richard M. Stallman <rms@gnu.org>
parents:
25350
diff
changeset
|
670 #else /* not MSDOS */ |
9e9eeb68482e
(Fframep) [macintosh]: Handle mac frame type.
Richard M. Stallman <rms@gnu.org>
parents:
25350
diff
changeset
|
671 |
100614
67eba8ea51bb
(Fmake_terminal_frame): Raise an error when called from
Jason Rumney <jasonr@gnu.org>
parents:
100611
diff
changeset
|
672 #ifdef WINDOWSNT /* This should work now! */ |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
673 if (sf->output_method != output_termcap) |
10768
938451cf1b10
(Fmake_terminal_frame): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10676
diff
changeset
|
674 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
|
675 #endif |
25523
9e9eeb68482e
(Fframep) [macintosh]: Handle mac frame type.
Richard M. Stallman <rms@gnu.org>
parents:
25350
diff
changeset
|
676 #endif /* not MSDOS */ |
10768
938451cf1b10
(Fmake_terminal_frame): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10676
diff
changeset
|
677 |
83167
69ebc75cb461
Implemented display ids for multiple emacsclients on the same tty. Plus assorted bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83074
diff
changeset
|
678 { |
83431
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83427
diff
changeset
|
679 Lisp_Object terminal; |
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83427
diff
changeset
|
680 |
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83427
diff
changeset
|
681 terminal = Fassq (Qterminal, parms); |
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83427
diff
changeset
|
682 if (!NILP (terminal)) |
53226
dd3018b4785b
Implemented multiple tty support.
Karoly Lorentey <lorentey@elte.hu>
parents:
53072
diff
changeset
|
683 { |
83431
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83427
diff
changeset
|
684 terminal = XCDR (terminal); |
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83427
diff
changeset
|
685 t = get_terminal (terminal, 1); |
53226
dd3018b4785b
Implemented multiple tty support.
Karoly Lorentey <lorentey@elte.hu>
parents:
53072
diff
changeset
|
686 } |
97690
af1ed0096327
(make_terminal_frame): Initialize f->terminal, f->terminal->reference_count,
Eli Zaretskii <eliz@gnu.org>
parents:
97659
diff
changeset
|
687 #ifdef MSDOS |
af1ed0096327
(make_terminal_frame): Initialize f->terminal, f->terminal->reference_count,
Eli Zaretskii <eliz@gnu.org>
parents:
97659
diff
changeset
|
688 if (t && t != the_only_display_info.terminal) |
af1ed0096327
(make_terminal_frame): Initialize f->terminal, f->terminal->reference_count,
Eli Zaretskii <eliz@gnu.org>
parents:
97659
diff
changeset
|
689 /* msdos.c assumes a single tty_display_info object. */ |
af1ed0096327
(make_terminal_frame): Initialize f->terminal, f->terminal->reference_count,
Eli Zaretskii <eliz@gnu.org>
parents:
97659
diff
changeset
|
690 error ("Multiple terminals are not supported on this platform"); |
af1ed0096327
(make_terminal_frame): Initialize f->terminal, f->terminal->reference_count,
Eli Zaretskii <eliz@gnu.org>
parents:
97659
diff
changeset
|
691 if (!t) |
af1ed0096327
(make_terminal_frame): Initialize f->terminal, f->terminal->reference_count,
Eli Zaretskii <eliz@gnu.org>
parents:
97659
diff
changeset
|
692 t = the_only_display_info.terminal; |
af1ed0096327
(make_terminal_frame): Initialize f->terminal, f->terminal->reference_count,
Eli Zaretskii <eliz@gnu.org>
parents:
97659
diff
changeset
|
693 #endif |
53226
dd3018b4785b
Implemented multiple tty support.
Karoly Lorentey <lorentey@elte.hu>
parents:
53072
diff
changeset
|
694 } |
85651
a8927de00181
(syms_of_frame) <delete-frame-functions>: Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
85614
diff
changeset
|
695 |
83431
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83427
diff
changeset
|
696 if (!t) |
85651
a8927de00181
(syms_of_frame) <delete-frame-functions>: Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
85614
diff
changeset
|
697 { |
83167
69ebc75cb461
Implemented display ids for multiple emacsclients on the same tty. Plus assorted bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83074
diff
changeset
|
698 char *name = 0, *type = 0; |
83420
521d3f18b3d1
Reimplement terminal parameters in C; clean up term.c, create terminal.c.
Karoly Lorentey <lorentey@elte.hu>
parents:
83415
diff
changeset
|
699 Lisp_Object tty, tty_type; |
521d3f18b3d1
Reimplement terminal parameters in C; clean up term.c, create terminal.c.
Karoly Lorentey <lorentey@elte.hu>
parents:
83415
diff
changeset
|
700 |
521d3f18b3d1
Reimplement terminal parameters in C; clean up term.c, create terminal.c.
Karoly Lorentey <lorentey@elte.hu>
parents:
83415
diff
changeset
|
701 tty = get_future_frame_param |
521d3f18b3d1
Reimplement terminal parameters in C; clean up term.c, create terminal.c.
Karoly Lorentey <lorentey@elte.hu>
parents:
83415
diff
changeset
|
702 (Qtty, parms, (FRAME_TERMCAP_P (XFRAME (selected_frame)) |
521d3f18b3d1
Reimplement terminal parameters in C; clean up term.c, create terminal.c.
Karoly Lorentey <lorentey@elte.hu>
parents:
83415
diff
changeset
|
703 ? FRAME_TTY (XFRAME (selected_frame))->name |
521d3f18b3d1
Reimplement terminal parameters in C; clean up term.c, create terminal.c.
Karoly Lorentey <lorentey@elte.hu>
parents:
83415
diff
changeset
|
704 : NULL)); |
521d3f18b3d1
Reimplement terminal parameters in C; clean up term.c, create terminal.c.
Karoly Lorentey <lorentey@elte.hu>
parents:
83415
diff
changeset
|
705 if (!NILP (tty)) |
83167
69ebc75cb461
Implemented display ids for multiple emacsclients on the same tty. Plus assorted bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83074
diff
changeset
|
706 { |
69ebc75cb461
Implemented display ids for multiple emacsclients on the same tty. Plus assorted bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83074
diff
changeset
|
707 name = (char *) alloca (SBYTES (tty) + 1); |
69ebc75cb461
Implemented display ids for multiple emacsclients on the same tty. Plus assorted bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83074
diff
changeset
|
708 strncpy (name, SDATA (tty), SBYTES (tty)); |
69ebc75cb461
Implemented display ids for multiple emacsclients on the same tty. Plus assorted bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83074
diff
changeset
|
709 name[SBYTES (tty)] = 0; |
69ebc75cb461
Implemented display ids for multiple emacsclients on the same tty. Plus assorted bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83074
diff
changeset
|
710 } |
85651
a8927de00181
(syms_of_frame) <delete-frame-functions>: Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
85614
diff
changeset
|
711 |
83420
521d3f18b3d1
Reimplement terminal parameters in C; clean up term.c, create terminal.c.
Karoly Lorentey <lorentey@elte.hu>
parents:
83415
diff
changeset
|
712 tty_type = get_future_frame_param |
521d3f18b3d1
Reimplement terminal parameters in C; clean up term.c, create terminal.c.
Karoly Lorentey <lorentey@elte.hu>
parents:
83415
diff
changeset
|
713 (Qtty_type, parms, (FRAME_TERMCAP_P (XFRAME (selected_frame)) |
521d3f18b3d1
Reimplement terminal parameters in C; clean up term.c, create terminal.c.
Karoly Lorentey <lorentey@elte.hu>
parents:
83415
diff
changeset
|
714 ? FRAME_TTY (XFRAME (selected_frame))->type |
521d3f18b3d1
Reimplement terminal parameters in C; clean up term.c, create terminal.c.
Karoly Lorentey <lorentey@elte.hu>
parents:
83415
diff
changeset
|
715 : NULL)); |
521d3f18b3d1
Reimplement terminal parameters in C; clean up term.c, create terminal.c.
Karoly Lorentey <lorentey@elte.hu>
parents:
83415
diff
changeset
|
716 if (!NILP (tty_type)) |
83167
69ebc75cb461
Implemented display ids for multiple emacsclients on the same tty. Plus assorted bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83074
diff
changeset
|
717 { |
69ebc75cb461
Implemented display ids for multiple emacsclients on the same tty. Plus assorted bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83074
diff
changeset
|
718 type = (char *) alloca (SBYTES (tty_type) + 1); |
69ebc75cb461
Implemented display ids for multiple emacsclients on the same tty. Plus assorted bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83074
diff
changeset
|
719 strncpy (type, SDATA (tty_type), SBYTES (tty_type)); |
69ebc75cb461
Implemented display ids for multiple emacsclients on the same tty. Plus assorted bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83074
diff
changeset
|
720 type[SBYTES (tty_type)] = 0; |
69ebc75cb461
Implemented display ids for multiple emacsclients on the same tty. Plus assorted bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83074
diff
changeset
|
721 } |
69ebc75cb461
Implemented display ids for multiple emacsclients on the same tty. Plus assorted bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83074
diff
changeset
|
722 |
83431
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83427
diff
changeset
|
723 t = init_tty (name, type, 0); /* Errors are not fatal. */ |
83167
69ebc75cb461
Implemented display ids for multiple emacsclients on the same tty. Plus assorted bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83074
diff
changeset
|
724 } |
69ebc75cb461
Implemented display ids for multiple emacsclients on the same tty. Plus assorted bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83074
diff
changeset
|
725 |
83431
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83427
diff
changeset
|
726 f = make_terminal_frame (t); |
25523
9e9eeb68482e
(Fframep) [macintosh]: Handle mac frame type.
Richard M. Stallman <rms@gnu.org>
parents:
25350
diff
changeset
|
727 |
53229
33c3c7c16e13
lib-src/emacsclient.c: Implemented --here option (open a new Emacs tty). Needs more work.
Karoly Lorentey <lorentey@elte.hu>
parents:
53226
diff
changeset
|
728 { |
33c3c7c16e13
lib-src/emacsclient.c: Implemented --here option (open a new Emacs tty). Needs more work.
Karoly Lorentey <lorentey@elte.hu>
parents:
53226
diff
changeset
|
729 int width, height; |
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83016
diff
changeset
|
730 get_tty_size (fileno (FRAME_TTY (f)->input), &width, &height); |
53229
33c3c7c16e13
lib-src/emacsclient.c: Implemented --here option (open a new Emacs tty). Needs more work.
Karoly Lorentey <lorentey@elte.hu>
parents:
53226
diff
changeset
|
731 change_frame_size (f, height, width, 0, 0, 0); |
33c3c7c16e13
lib-src/emacsclient.c: Implemented --here option (open a new Emacs tty). Needs more work.
Karoly Lorentey <lorentey@elte.hu>
parents:
53226
diff
changeset
|
732 } |
85651
a8927de00181
(syms_of_frame) <delete-frame-functions>: Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
85614
diff
changeset
|
733 |
25030
c69d9e48269b
(make_frame): Set n_current_toolbar_items to 0.
Gerd Moellmann <gerd@gnu.org>
parents:
23746
diff
changeset
|
734 adjust_glyphs (f); |
10768
938451cf1b10
(Fmake_terminal_frame): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10676
diff
changeset
|
735 calculate_costs (f); |
938451cf1b10
(Fmake_terminal_frame): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10676
diff
changeset
|
736 XSETFRAME (frame, f); |
938451cf1b10
(Fmake_terminal_frame): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10676
diff
changeset
|
737 Fmodify_frame_parameters (frame, parms); |
83420
521d3f18b3d1
Reimplement terminal parameters in C; clean up term.c, create terminal.c.
Karoly Lorentey <lorentey@elte.hu>
parents:
83415
diff
changeset
|
738 Fmodify_frame_parameters (frame, Fcons (Fcons (Qtty_type, |
83431
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83427
diff
changeset
|
739 build_string (t->display_info.tty->type)), |
83420
521d3f18b3d1
Reimplement terminal parameters in C; clean up term.c, create terminal.c.
Karoly Lorentey <lorentey@elte.hu>
parents:
83415
diff
changeset
|
740 Qnil)); |
83486
fc6efa09ea7a
Fix segfault by `C-x 5 2' on the controlling tty. (Reported by Suresh Madhu.)
Karoly Lorentey <lorentey@elte.hu>
parents:
83481
diff
changeset
|
741 if (t->display_info.tty->name != NULL) |
fc6efa09ea7a
Fix segfault by `C-x 5 2' on the controlling tty. (Reported by Suresh Madhu.)
Karoly Lorentey <lorentey@elte.hu>
parents:
83481
diff
changeset
|
742 Fmodify_frame_parameters (frame, Fcons (Fcons (Qtty, |
fc6efa09ea7a
Fix segfault by `C-x 5 2' on the controlling tty. (Reported by Suresh Madhu.)
Karoly Lorentey <lorentey@elte.hu>
parents:
83481
diff
changeset
|
743 build_string (t->display_info.tty->name)), |
fc6efa09ea7a
Fix segfault by `C-x 5 2' on the controlling tty. (Reported by Suresh Madhu.)
Karoly Lorentey <lorentey@elte.hu>
parents:
83481
diff
changeset
|
744 Qnil)); |
fc6efa09ea7a
Fix segfault by `C-x 5 2' on the controlling tty. (Reported by Suresh Madhu.)
Karoly Lorentey <lorentey@elte.hu>
parents:
83481
diff
changeset
|
745 else |
fc6efa09ea7a
Fix segfault by `C-x 5 2' on the controlling tty. (Reported by Suresh Madhu.)
Karoly Lorentey <lorentey@elte.hu>
parents:
83481
diff
changeset
|
746 Fmodify_frame_parameters (frame, Fcons (Fcons (Qtty, Qnil), Qnil)); |
25209
eea9647c8246
(Fframe_parameters): Swap foreground and background
Eli Zaretskii <eliz@gnu.org>
parents:
25158
diff
changeset
|
747 |
eea9647c8246
(Fframe_parameters): Swap foreground and background
Eli Zaretskii <eliz@gnu.org>
parents:
25158
diff
changeset
|
748 /* 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
|
749 frame could change its face definitions independently. */ |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
750 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
|
751 /* 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
|
752 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
|
753 be copied as well. */ |
eea9647c8246
(Fframe_parameters): Swap foreground and background
Eli Zaretskii <eliz@gnu.org>
parents:
25158
diff
changeset
|
754 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
|
755 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
|
756 return frame; |
938451cf1b10
(Fmake_terminal_frame): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10676
diff
changeset
|
757 } |
36810
a9485f8e43d6
(do_switch_frame): Remove unused parameter NO_EVENT, add
Gerd Moellmann <gerd@gnu.org>
parents:
36804
diff
changeset
|
758 |
286 | 759 |
36810
a9485f8e43d6
(do_switch_frame): Remove unused parameter NO_EVENT, add
Gerd Moellmann <gerd@gnu.org>
parents:
36804
diff
changeset
|
760 /* 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
|
761 |
a9485f8e43d6
(do_switch_frame): Remove unused parameter NO_EVENT, add
Gerd Moellmann <gerd@gnu.org>
parents:
36804
diff
changeset
|
762 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
|
763 FRAME1 as frame. |
a9485f8e43d6
(do_switch_frame): Remove unused parameter NO_EVENT, add
Gerd Moellmann <gerd@gnu.org>
parents:
36804
diff
changeset
|
764 |
a9485f8e43d6
(do_switch_frame): Remove unused parameter NO_EVENT, add
Gerd Moellmann <gerd@gnu.org>
parents:
36804
diff
changeset
|
765 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
|
766 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
|
767 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
|
768 |
a9485f8e43d6
(do_switch_frame): Remove unused parameter NO_EVENT, add
Gerd Moellmann <gerd@gnu.org>
parents:
36804
diff
changeset
|
769 FOR_DELETION non-zero means that the selected frame is being |
83431
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83427
diff
changeset
|
770 deleted, which includes the possibility that the frame's terminal |
99320
9d9890aa68c5
(do_switch_frame): New argument NORECORD passed to Fselect_window.
Martin Rudalics <rudalics@gmx.at>
parents:
98590
diff
changeset
|
771 is dead. |
9d9890aa68c5
(do_switch_frame): New argument NORECORD passed to Fselect_window.
Martin Rudalics <rudalics@gmx.at>
parents:
98590
diff
changeset
|
772 |
9d9890aa68c5
(do_switch_frame): New argument NORECORD passed to Fselect_window.
Martin Rudalics <rudalics@gmx.at>
parents:
98590
diff
changeset
|
773 The value of NORECORD is passed as argument to Fselect_window. */ |
36810
a9485f8e43d6
(do_switch_frame): Remove unused parameter NO_EVENT, add
Gerd Moellmann <gerd@gnu.org>
parents:
36804
diff
changeset
|
774 |
12286
723569a0028c
(Fdelete_frame): Use do_switch_frame directly.
Richard M. Stallman <rms@gnu.org>
parents:
12283
diff
changeset
|
775 Lisp_Object |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
776 do_switch_frame (Lisp_Object frame, int track, int for_deletion, Lisp_Object norecord) |
286 | 777 { |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
778 struct frame *sf = SELECTED_FRAME (); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
779 |
1385
a4a205bdd2c1
* frame.c: #include "commands.h" and "keyboard.h".
Jim Blandy <jimb@redhat.com>
parents:
1346
diff
changeset
|
780 /* 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
|
781 switch to. */ |
a4a205bdd2c1
* frame.c: #include "commands.h" and "keyboard.h".
Jim Blandy <jimb@redhat.com>
parents:
1346
diff
changeset
|
782 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
|
783 && 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
|
784 && CONSP (XCDR (frame))) |
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
785 frame = XCAR (XCDR (frame)); |
1385
a4a205bdd2c1
* frame.c: #include "commands.h" and "keyboard.h".
Jim Blandy <jimb@redhat.com>
parents:
1346
diff
changeset
|
786 |
6352
6f48bd9145f9
(Fhandle_switch_frame): Ignore switch to dead frame.
Karl Heuer <kwzh@gnu.org>
parents:
6346
diff
changeset
|
787 /* 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
|
788 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
|
789 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
|
790 CHECK_FRAME (frame); |
6352
6f48bd9145f9
(Fhandle_switch_frame): Ignore switch to dead frame.
Karl Heuer <kwzh@gnu.org>
parents:
6346
diff
changeset
|
791 if (! FRAME_LIVE_P (XFRAME (frame))) |
6f48bd9145f9
(Fhandle_switch_frame): Ignore switch to dead frame.
Karl Heuer <kwzh@gnu.org>
parents:
6346
diff
changeset
|
792 return Qnil; |
286 | 793 |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
794 if (sf == XFRAME (frame)) |
765 | 795 return frame; |
286 | 796 |
6486
5012ae9c6075
(do_switch_frame): Common code for Fselect_frame and handle_switch_frame.
Karl Heuer <kwzh@gnu.org>
parents:
6355
diff
changeset
|
797 /* 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
|
798 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
|
799 #if 0 |
1709
b86b3237e017
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1691
diff
changeset
|
800 /* 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
|
801 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
|
802 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
|
803 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
|
804 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
|
805 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
|
806 around. */ |
6486
5012ae9c6075
(do_switch_frame): Common code for Fselect_frame and handle_switch_frame.
Karl Heuer <kwzh@gnu.org>
parents:
6355
diff
changeset
|
807 if (track) |
5012ae9c6075
(do_switch_frame): Common code for Fselect_frame and handle_switch_frame.
Karl Heuer <kwzh@gnu.org>
parents:
6355
diff
changeset
|
808 { |
5012ae9c6075
(do_switch_frame): Common code for Fselect_frame and handle_switch_frame.
Karl Heuer <kwzh@gnu.org>
parents:
6355
diff
changeset
|
809 Lisp_Object tail; |
1709
b86b3237e017
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1691
diff
changeset
|
810 |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
811 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
|
812 { |
5012ae9c6075
(do_switch_frame): Common code for Fselect_frame and handle_switch_frame.
Karl Heuer <kwzh@gnu.org>
parents:
6355
diff
changeset
|
813 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
|
814 |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
815 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
|
816 abort (); |
5012ae9c6075
(do_switch_frame): Common code for Fselect_frame and handle_switch_frame.
Karl Heuer <kwzh@gnu.org>
parents:
6355
diff
changeset
|
817 |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
818 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
|
819 |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
820 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
|
821 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
|
822 } |
5012ae9c6075
(do_switch_frame): Common code for Fselect_frame and handle_switch_frame.
Karl Heuer <kwzh@gnu.org>
parents:
6355
diff
changeset
|
823 } |
5012ae9c6075
(do_switch_frame): Common code for Fselect_frame and handle_switch_frame.
Karl Heuer <kwzh@gnu.org>
parents:
6355
diff
changeset
|
824 #else /* ! 0 */ |
5012ae9c6075
(do_switch_frame): Common code for Fselect_frame and handle_switch_frame.
Karl Heuer <kwzh@gnu.org>
parents:
6355
diff
changeset
|
825 /* 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
|
826 #ifdef HAVE_WINDOW_SYSTEM |
36810
a9485f8e43d6
(do_switch_frame): Remove unused parameter NO_EVENT, add
Gerd Moellmann <gerd@gnu.org>
parents:
36804
diff
changeset
|
827 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
|
828 { |
5012ae9c6075
(do_switch_frame): Common code for Fselect_frame and handle_switch_frame.
Karl Heuer <kwzh@gnu.org>
parents:
6355
diff
changeset
|
829 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
|
830 |
11529
5beffe62d4ef
(do_switch_frame): x_get_focus_frame needs an arg.
Karl Heuer <kwzh@gnu.org>
parents:
11495
diff
changeset
|
831 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
|
832 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
|
833 { |
5012ae9c6075
(do_switch_frame): Common code for Fselect_frame and handle_switch_frame.
Karl Heuer <kwzh@gnu.org>
parents:
6355
diff
changeset
|
834 focus = FRAME_FOCUS_FRAME (XFRAME (xfocus)); |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
835 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
|
836 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
|
837 } |
5012ae9c6075
(do_switch_frame): Common code for Fselect_frame and handle_switch_frame.
Karl Heuer <kwzh@gnu.org>
parents:
6355
diff
changeset
|
838 } |
5012ae9c6075
(do_switch_frame): Common code for Fselect_frame and handle_switch_frame.
Karl Heuer <kwzh@gnu.org>
parents:
6355
diff
changeset
|
839 #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
|
840 #endif /* ! 0 */ |
1709
b86b3237e017
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1691
diff
changeset
|
841 |
36810
a9485f8e43d6
(do_switch_frame): Remove unused parameter NO_EVENT, add
Gerd Moellmann <gerd@gnu.org>
parents:
36804
diff
changeset
|
842 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
|
843 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
|
844 |
97701
5523d496656e
(do_switch_frame): Mark previously displayed frame as obscured for
Eli Zaretskii <eliz@gnu.org>
parents:
97690
diff
changeset
|
845 if (FRAME_TERMCAP_P (XFRAME (frame)) || FRAME_MSDOS_P (XFRAME (frame))) |
53229
33c3c7c16e13
lib-src/emacsclient.c: Implemented --here option (open a new Emacs tty). Needs more work.
Karoly Lorentey <lorentey@elte.hu>
parents:
53226
diff
changeset
|
846 { |
93883
722fdbc7a012
* xdisp.c (redisplay_internal): Reset tty's color_mode when switching
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93369
diff
changeset
|
847 if (FRAMEP (FRAME_TTY (XFRAME (frame))->top_frame)) |
722fdbc7a012
* xdisp.c (redisplay_internal): Reset tty's color_mode when switching
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93369
diff
changeset
|
848 /* Mark previously displayed frame as now obscured. */ |
722fdbc7a012
* xdisp.c (redisplay_internal): Reset tty's color_mode when switching
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93369
diff
changeset
|
849 XFRAME (FRAME_TTY (XFRAME (frame))->top_frame)->async_visible = 2; |
53229
33c3c7c16e13
lib-src/emacsclient.c: Implemented --here option (open a new Emacs tty). Needs more work.
Karoly Lorentey <lorentey@elte.hu>
parents:
53226
diff
changeset
|
850 XFRAME (frame)->async_visible = 1; |
33c3c7c16e13
lib-src/emacsclient.c: Implemented --here option (open a new Emacs tty). Needs more work.
Karoly Lorentey <lorentey@elte.hu>
parents:
53226
diff
changeset
|
851 FRAME_TTY (XFRAME (frame))->top_frame = frame; |
33c3c7c16e13
lib-src/emacsclient.c: Implemented --here option (open a new Emacs tty). Needs more work.
Karoly Lorentey <lorentey@elte.hu>
parents:
53226
diff
changeset
|
852 } |
33c3c7c16e13
lib-src/emacsclient.c: Implemented --here option (open a new Emacs tty). Needs more work.
Karoly Lorentey <lorentey@elte.hu>
parents:
53226
diff
changeset
|
853 |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
854 selected_frame = frame; |
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
855 if (! FRAME_MINIBUF_ONLY_P (XFRAME (selected_frame))) |
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
856 last_nonminibuf_frame = XFRAME (selected_frame); |
363 | 857 |
99320
9d9890aa68c5
(do_switch_frame): New argument NORECORD passed to Fselect_window.
Martin Rudalics <rudalics@gmx.at>
parents:
98590
diff
changeset
|
858 Fselect_window (XFRAME (frame)->selected_window, norecord); |
286 | 859 |
1920
ac5e559a819a
* frame.c (Fselect_frame): Set Vlast_event_frame to Qnil after
Jim Blandy <jimb@redhat.com>
parents:
1870
diff
changeset
|
860 /* 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
|
861 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
|
862 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
|
863 (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
|
864 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
|
865 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
|
866 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
|
867 |
765 | 868 return frame; |
286 | 869 } |
870 | |
99320
9d9890aa68c5
(do_switch_frame): New argument NORECORD passed to Fselect_window.
Martin Rudalics <rudalics@gmx.at>
parents:
98590
diff
changeset
|
871 DEFUN ("select-frame", Fselect_frame, Sselect_frame, 1, 2, "e", |
9d9890aa68c5
(do_switch_frame): New argument NORECORD passed to Fselect_window.
Martin Rudalics <rudalics@gmx.at>
parents:
98590
diff
changeset
|
872 doc: /* Select FRAME. |
40105
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
873 Subsequent editing commands apply to its selected window. |
99320
9d9890aa68c5
(do_switch_frame): New argument NORECORD passed to Fselect_window.
Martin Rudalics <rudalics@gmx.at>
parents:
98590
diff
changeset
|
874 Optional argument NORECORD means to neither change the order of |
9d9890aa68c5
(do_switch_frame): New argument NORECORD passed to Fselect_window.
Martin Rudalics <rudalics@gmx.at>
parents:
98590
diff
changeset
|
875 recently selected windows nor the buffer list. |
9d9890aa68c5
(do_switch_frame): New argument NORECORD passed to Fselect_window.
Martin Rudalics <rudalics@gmx.at>
parents:
98590
diff
changeset
|
876 |
40105
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
877 The selection of FRAME lasts until the next time the user does |
99320
9d9890aa68c5
(do_switch_frame): New argument NORECORD passed to Fselect_window.
Martin Rudalics <rudalics@gmx.at>
parents:
98590
diff
changeset
|
878 something to select a different frame, or until the next time |
9d9890aa68c5
(do_switch_frame): New argument NORECORD passed to Fselect_window.
Martin Rudalics <rudalics@gmx.at>
parents:
98590
diff
changeset
|
879 this function is called. If you are using a window system, the |
9d9890aa68c5
(do_switch_frame): New argument NORECORD passed to Fselect_window.
Martin Rudalics <rudalics@gmx.at>
parents:
98590
diff
changeset
|
880 previously selected frame may be restored as the selected frame |
105772
fd7169a87c28
Fix typos in comments.
Juanma Barranquero <lekktu@gmail.com>
parents:
105669
diff
changeset
|
881 when returning to the command loop, because it still may have |
fd7169a87c28
Fix typos in comments.
Juanma Barranquero <lekktu@gmail.com>
parents:
105669
diff
changeset
|
882 the window system's input focus. On a text-only terminal, the |
104074
8a91154e34a2
Slightly fix the docstring of `select-frame'.
Bastien Guerry <bzg@altern.org>
parents:
103704
diff
changeset
|
883 next redisplay will display FRAME. |
56517
c9c9e7be868f
(Fselect_frame, Fset_frame_selected_window)
Luc Teirlinck <teirllm@auburn.edu>
parents:
56453
diff
changeset
|
884 |
c9c9e7be868f
(Fselect_frame, Fset_frame_selected_window)
Luc Teirlinck <teirllm@auburn.edu>
parents:
56453
diff
changeset
|
885 This function returns FRAME, or nil if FRAME has been deleted. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109139
diff
changeset
|
886 (Lisp_Object frame, Lisp_Object norecord) |
6486
5012ae9c6075
(do_switch_frame): Common code for Fselect_frame and handle_switch_frame.
Karl Heuer <kwzh@gnu.org>
parents:
6355
diff
changeset
|
887 { |
99320
9d9890aa68c5
(do_switch_frame): New argument NORECORD passed to Fselect_window.
Martin Rudalics <rudalics@gmx.at>
parents:
98590
diff
changeset
|
888 return do_switch_frame (frame, 1, 0, norecord); |
6486
5012ae9c6075
(do_switch_frame): Common code for Fselect_frame and handle_switch_frame.
Karl Heuer <kwzh@gnu.org>
parents:
6355
diff
changeset
|
889 } |
5012ae9c6075
(do_switch_frame): Common code for Fselect_frame and handle_switch_frame.
Karl Heuer <kwzh@gnu.org>
parents:
6355
diff
changeset
|
890 |
5012ae9c6075
(do_switch_frame): Common code for Fselect_frame and handle_switch_frame.
Karl Heuer <kwzh@gnu.org>
parents:
6355
diff
changeset
|
891 |
63184
1ba4135e8efa
(Fhandle_switch_frame, Fselect_frame): Delete unused arg no_enter.
Luc Teirlinck <teirllm@auburn.edu>
parents:
61784
diff
changeset
|
892 DEFUN ("handle-switch-frame", Fhandle_switch_frame, Shandle_switch_frame, 1, 1, "e", |
40105
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
893 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
|
894 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
|
895 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
|
896 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
|
897 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
|
898 |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
899 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
|
900 to that frame. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109139
diff
changeset
|
901 (Lisp_Object event) |
6486
5012ae9c6075
(do_switch_frame): Common code for Fselect_frame and handle_switch_frame.
Karl Heuer <kwzh@gnu.org>
parents:
6355
diff
changeset
|
902 { |
12255
41083bd094ac
(Fhandle_switch_frame): Preserve prefix arg.
Karl Heuer <kwzh@gnu.org>
parents:
12222
diff
changeset
|
903 /* 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
|
904 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
|
905 call1 (Vrun_hooks, Qmouse_leave_buffer_hook); |
99320
9d9890aa68c5
(do_switch_frame): New argument NORECORD passed to Fselect_window.
Martin Rudalics <rudalics@gmx.at>
parents:
98590
diff
changeset
|
906 return do_switch_frame (event, 0, 0, Qnil); |
6486
5012ae9c6075
(do_switch_frame): Common code for Fselect_frame and handle_switch_frame.
Karl Heuer <kwzh@gnu.org>
parents:
6355
diff
changeset
|
907 } |
5012ae9c6075
(do_switch_frame): Common code for Fselect_frame and handle_switch_frame.
Karl Heuer <kwzh@gnu.org>
parents:
6355
diff
changeset
|
908 |
765 | 909 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
|
910 doc: /* Return the frame that is now selected. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109139
diff
changeset
|
911 (void) |
286 | 912 { |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
913 return selected_frame; |
286 | 914 } |
7055
5e4906d964b8
(Fset_frame_selected_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7025
diff
changeset
|
915 |
765 | 916 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
|
917 doc: /* Return the frame object that window WINDOW is on. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109139
diff
changeset
|
918 (Lisp_Object window) |
286 | 919 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
920 CHECK_LIVE_WINDOW (window); |
765 | 921 return XWINDOW (window)->frame; |
286 | 922 } |
923 | |
6527
ab9f20a3f502
(Fframe_first_window): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6500
diff
changeset
|
924 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
|
925 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
|
926 If omitted, FRAME defaults to the currently selected frame. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109139
diff
changeset
|
927 (Lisp_Object frame) |
6527
ab9f20a3f502
(Fframe_first_window): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6500
diff
changeset
|
928 { |
ab9f20a3f502
(Fframe_first_window): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6500
diff
changeset
|
929 Lisp_Object w; |
ab9f20a3f502
(Fframe_first_window): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6500
diff
changeset
|
930 |
ab9f20a3f502
(Fframe_first_window): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6500
diff
changeset
|
931 if (NILP (frame)) |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
932 w = SELECTED_FRAME ()->root_window; |
6527
ab9f20a3f502
(Fframe_first_window): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6500
diff
changeset
|
933 else |
ab9f20a3f502
(Fframe_first_window): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6500
diff
changeset
|
934 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
935 CHECK_LIVE_FRAME (frame); |
6527
ab9f20a3f502
(Fframe_first_window): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6500
diff
changeset
|
936 w = XFRAME (frame)->root_window; |
ab9f20a3f502
(Fframe_first_window): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6500
diff
changeset
|
937 } |
ab9f20a3f502
(Fframe_first_window): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6500
diff
changeset
|
938 while (NILP (XWINDOW (w)->buffer)) |
ab9f20a3f502
(Fframe_first_window): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6500
diff
changeset
|
939 { |
ab9f20a3f502
(Fframe_first_window): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6500
diff
changeset
|
940 if (! NILP (XWINDOW (w)->hchild)) |
ab9f20a3f502
(Fframe_first_window): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6500
diff
changeset
|
941 w = XWINDOW (w)->hchild; |
ab9f20a3f502
(Fframe_first_window): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6500
diff
changeset
|
942 else if (! NILP (XWINDOW (w)->vchild)) |
ab9f20a3f502
(Fframe_first_window): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6500
diff
changeset
|
943 w = XWINDOW (w)->vchild; |
ab9f20a3f502
(Fframe_first_window): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6500
diff
changeset
|
944 else |
ab9f20a3f502
(Fframe_first_window): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6500
diff
changeset
|
945 abort (); |
ab9f20a3f502
(Fframe_first_window): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6500
diff
changeset
|
946 } |
ab9f20a3f502
(Fframe_first_window): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6500
diff
changeset
|
947 return w; |
ab9f20a3f502
(Fframe_first_window): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6500
diff
changeset
|
948 } |
ab9f20a3f502
(Fframe_first_window): New function.
Karl Heuer <kwzh@gnu.org>
parents:
6500
diff
changeset
|
949 |
11169
d0550c056e5b
[MULTI_FRAME] (Factive_minibuffer_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11126
diff
changeset
|
950 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
|
951 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
|
952 doc: /* Return the currently active minibuffer window, or nil if none. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109139
diff
changeset
|
953 (void) |
11169
d0550c056e5b
[MULTI_FRAME] (Factive_minibuffer_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11126
diff
changeset
|
954 { |
d0550c056e5b
[MULTI_FRAME] (Factive_minibuffer_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11126
diff
changeset
|
955 return minibuf_level ? minibuf_window : Qnil; |
d0550c056e5b
[MULTI_FRAME] (Factive_minibuffer_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11126
diff
changeset
|
956 } |
d0550c056e5b
[MULTI_FRAME] (Factive_minibuffer_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11126
diff
changeset
|
957 |
765 | 958 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
|
959 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
|
960 If omitted, FRAME defaults to the currently selected frame. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109139
diff
changeset
|
961 (Lisp_Object frame) |
286 | 962 { |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
963 Lisp_Object window; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
964 |
765 | 965 if (NILP (frame)) |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
966 window = SELECTED_FRAME ()->root_window; |
454 | 967 else |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
968 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
969 CHECK_LIVE_FRAME (frame); |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
970 window = XFRAME (frame)->root_window; |
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
971 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
972 |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
973 return window; |
286 | 974 } |
975 | |
765 | 976 DEFUN ("frame-selected-window", Fframe_selected_window, |
977 Sframe_selected_window, 0, 1, 0, | |
99320
9d9890aa68c5
(do_switch_frame): New argument NORECORD passed to Fselect_window.
Martin Rudalics <rudalics@gmx.at>
parents:
98590
diff
changeset
|
978 doc: /* Return the selected window of FRAME. |
9d9890aa68c5
(do_switch_frame): New argument NORECORD passed to Fselect_window.
Martin Rudalics <rudalics@gmx.at>
parents:
98590
diff
changeset
|
979 FRAME defaults to the currently selected frame. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109139
diff
changeset
|
980 (Lisp_Object frame) |
286 | 981 { |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
982 Lisp_Object window; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
983 |
765 | 984 if (NILP (frame)) |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
985 window = SELECTED_FRAME ()->selected_window; |
454 | 986 else |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
987 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
988 CHECK_LIVE_FRAME (frame); |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
989 window = XFRAME (frame)->selected_window; |
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
990 } |
286 | 991 |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
992 return window; |
286 | 993 } |
994 | |
7055
5e4906d964b8
(Fset_frame_selected_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7025
diff
changeset
|
995 DEFUN ("set-frame-selected-window", Fset_frame_selected_window, |
99320
9d9890aa68c5
(do_switch_frame): New argument NORECORD passed to Fselect_window.
Martin Rudalics <rudalics@gmx.at>
parents:
98590
diff
changeset
|
996 Sset_frame_selected_window, 2, 3, 0, |
9d9890aa68c5
(do_switch_frame): New argument NORECORD passed to Fselect_window.
Martin Rudalics <rudalics@gmx.at>
parents:
98590
diff
changeset
|
997 doc: /* Set selected window of FRAME to WINDOW. |
9d9890aa68c5
(do_switch_frame): New argument NORECORD passed to Fselect_window.
Martin Rudalics <rudalics@gmx.at>
parents:
98590
diff
changeset
|
998 If FRAME is nil, use the selected frame. If FRAME is the |
9d9890aa68c5
(do_switch_frame): New argument NORECORD passed to Fselect_window.
Martin Rudalics <rudalics@gmx.at>
parents:
98590
diff
changeset
|
999 selected frame, this makes WINDOW the selected window. |
9d9890aa68c5
(do_switch_frame): New argument NORECORD passed to Fselect_window.
Martin Rudalics <rudalics@gmx.at>
parents:
98590
diff
changeset
|
1000 Optional argument NORECORD non-nil means to neither change the |
9d9890aa68c5
(do_switch_frame): New argument NORECORD passed to Fselect_window.
Martin Rudalics <rudalics@gmx.at>
parents:
98590
diff
changeset
|
1001 order of recently selected windows nor the buffer list. |
9d9890aa68c5
(do_switch_frame): New argument NORECORD passed to Fselect_window.
Martin Rudalics <rudalics@gmx.at>
parents:
98590
diff
changeset
|
1002 Return WINDOW. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109139
diff
changeset
|
1003 (Lisp_Object frame, Lisp_Object window, Lisp_Object norecord) |
7055
5e4906d964b8
(Fset_frame_selected_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7025
diff
changeset
|
1004 { |
5e4906d964b8
(Fset_frame_selected_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7025
diff
changeset
|
1005 if (NILP (frame)) |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
1006 frame = selected_frame; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
1007 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
1008 CHECK_LIVE_FRAME (frame); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
1009 CHECK_LIVE_WINDOW (window); |
7055
5e4906d964b8
(Fset_frame_selected_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7025
diff
changeset
|
1010 |
5e4906d964b8
(Fset_frame_selected_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7025
diff
changeset
|
1011 if (! EQ (frame, WINDOW_FRAME (XWINDOW (window)))) |
5e4906d964b8
(Fset_frame_selected_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7025
diff
changeset
|
1012 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
|
1013 |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
1014 if (EQ (frame, selected_frame)) |
99320
9d9890aa68c5
(do_switch_frame): New argument NORECORD passed to Fselect_window.
Martin Rudalics <rudalics@gmx.at>
parents:
98590
diff
changeset
|
1015 return Fselect_window (window, norecord); |
7055
5e4906d964b8
(Fset_frame_selected_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7025
diff
changeset
|
1016 |
5e4906d964b8
(Fset_frame_selected_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7025
diff
changeset
|
1017 return XFRAME (frame)->selected_window = window; |
5e4906d964b8
(Fset_frame_selected_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7025
diff
changeset
|
1018 } |
83167
69ebc75cb461
Implemented display ids for multiple emacsclients on the same tty. Plus assorted bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83074
diff
changeset
|
1019 |
7055
5e4906d964b8
(Fset_frame_selected_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7025
diff
changeset
|
1020 |
765 | 1021 DEFUN ("frame-list", Fframe_list, Sframe_list, |
286 | 1022 0, 0, 0, |
103148
cfd0f4bd9e6e
(frame-list): Clarify which frames are returned.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
103097
diff
changeset
|
1023 doc: /* Return a list of all live frames. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109139
diff
changeset
|
1024 (void) |
286 | 1025 { |
36971
3819e613c7c2
(Fframe_list): Don't return a tooltip frame.
Gerd Moellmann <gerd@gnu.org>
parents:
36810
diff
changeset
|
1026 Lisp_Object frames; |
3819e613c7c2
(Fframe_list): Don't return a tooltip frame.
Gerd Moellmann <gerd@gnu.org>
parents:
36810
diff
changeset
|
1027 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
|
1028 #ifdef HAVE_WINDOW_SYSTEM |
36971
3819e613c7c2
(Fframe_list): Don't return a tooltip frame.
Gerd Moellmann <gerd@gnu.org>
parents:
36810
diff
changeset
|
1029 if (FRAMEP (tip_frame)) |
3819e613c7c2
(Fframe_list): Don't return a tooltip frame.
Gerd Moellmann <gerd@gnu.org>
parents:
36810
diff
changeset
|
1030 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
|
1031 #endif |
36971
3819e613c7c2
(Fframe_list): Don't return a tooltip frame.
Gerd Moellmann <gerd@gnu.org>
parents:
36810
diff
changeset
|
1032 return frames; |
286 | 1033 } |
1034 | |
765 | 1035 /* Return the next frame in the frame list after FRAME. |
1036 If MINIBUF is nil, exclude minibuffer-only frames. | |
8168
32fbb27091d4
(next_frame, prev_frame):
Richard M. Stallman <rms@gnu.org>
parents:
8099
diff
changeset
|
1037 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
|
1038 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
|
1039 If MINIBUF is `visible', include all visible frames. |
8168
32fbb27091d4
(next_frame, prev_frame):
Richard M. Stallman <rms@gnu.org>
parents:
8099
diff
changeset
|
1040 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
|
1041 Otherwise, include all frames. */ |
128dc040e121
(next_frame, prev_frame): If MINIBUF is `visible',
Richard M. Stallman <rms@gnu.org>
parents:
6157
diff
changeset
|
1042 |
65976
c332e9c9e66d
(Fredirect_frame_focus): Fix typos in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
64770
diff
changeset
|
1043 static Lisp_Object |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1044 next_frame (Lisp_Object frame, Lisp_Object minibuf) |
286 | 1045 { |
1046 Lisp_Object tail; | |
1047 int passed = 0; | |
1048 | |
765 | 1049 /* There must always be at least one frame in Vframe_list. */ |
1050 if (! CONSP (Vframe_list)) | |
454 | 1051 abort (); |
1052 | |
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1809
diff
changeset
|
1053 /* 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
|
1054 forever. Forestall that. */ |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
1055 CHECK_LIVE_FRAME (frame); |
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1809
diff
changeset
|
1056 |
286 | 1057 while (1) |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
1058 for (tail = Vframe_list; CONSP (tail); tail = XCDR (tail)) |
286 | 1059 { |
6500
551bff5cffde
(next_frame, prev_frame, other_visible_frames, Fdelete_frame): Use assignment,
Karl Heuer <kwzh@gnu.org>
parents:
6486
diff
changeset
|
1060 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
|
1061 |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
1062 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
|
1063 |
7149fc03ea56
(next_frame, prev_frame): Consider only frames on same kbd.
Richard M. Stallman <rms@gnu.org>
parents:
12286
diff
changeset
|
1064 if (passed |
53229
33c3c7c16e13
lib-src/emacsclient.c: Implemented --here option (open a new Emacs tty). Needs more work.
Karoly Lorentey <lorentey@elte.hu>
parents:
53226
diff
changeset
|
1065 && ((!FRAME_TERMCAP_P (XFRAME (f)) && !FRAME_TERMCAP_P (XFRAME (frame)) |
33c3c7c16e13
lib-src/emacsclient.c: Implemented --here option (open a new Emacs tty). Needs more work.
Karoly Lorentey <lorentey@elte.hu>
parents:
53226
diff
changeset
|
1066 && FRAME_KBOARD (XFRAME (f)) == FRAME_KBOARD (XFRAME (frame))) |
33c3c7c16e13
lib-src/emacsclient.c: Implemented --here option (open a new Emacs tty). Needs more work.
Karoly Lorentey <lorentey@elte.hu>
parents:
53226
diff
changeset
|
1067 || (FRAME_TERMCAP_P (XFRAME (f)) && FRAME_TERMCAP_P (XFRAME (frame)) |
33c3c7c16e13
lib-src/emacsclient.c: Implemented --here option (open a new Emacs tty). Needs more work.
Karoly Lorentey <lorentey@elte.hu>
parents:
53226
diff
changeset
|
1068 && FRAME_TTY (XFRAME (f)) == FRAME_TTY (XFRAME (frame))))) |
363 | 1069 { |
1118
a43d53261506
* frame.c (choose_minibuf_frame): abort if the selected frame has
Jim Blandy <jimb@redhat.com>
parents:
1006
diff
changeset
|
1070 /* 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
|
1071 |
a43d53261506
* frame.c (choose_minibuf_frame): abort if the selected frame has
Jim Blandy <jimb@redhat.com>
parents:
1006
diff
changeset
|
1072 /* 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
|
1073 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
|
1074 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
|
1075 return f; |
335 | 1076 |
1118
a43d53261506
* frame.c (choose_minibuf_frame): abort if the selected frame has
Jim Blandy <jimb@redhat.com>
parents:
1006
diff
changeset
|
1077 /* 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
|
1078 if (NILP (minibuf)) |
a43d53261506
* frame.c (choose_minibuf_frame): abort if the selected frame has
Jim Blandy <jimb@redhat.com>
parents:
1006
diff
changeset
|
1079 { |
a43d53261506
* frame.c (choose_minibuf_frame): abort if the selected frame has
Jim Blandy <jimb@redhat.com>
parents:
1006
diff
changeset
|
1080 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
|
1081 return f; |
a43d53261506
* frame.c (choose_minibuf_frame): abort if the selected frame has
Jim Blandy <jimb@redhat.com>
parents:
1006
diff
changeset
|
1082 } |
6246
128dc040e121
(next_frame, prev_frame): If MINIBUF is `visible',
Richard M. Stallman <rms@gnu.org>
parents:
6157
diff
changeset
|
1083 else if (EQ (minibuf, Qvisible)) |
128dc040e121
(next_frame, prev_frame): If MINIBUF is `visible',
Richard M. Stallman <rms@gnu.org>
parents:
6157
diff
changeset
|
1084 { |
128dc040e121
(next_frame, prev_frame): If MINIBUF is `visible',
Richard M. Stallman <rms@gnu.org>
parents:
6157
diff
changeset
|
1085 FRAME_SAMPLE_VISIBILITY (XFRAME (f)); |
128dc040e121
(next_frame, prev_frame): If MINIBUF is `visible',
Richard M. Stallman <rms@gnu.org>
parents:
6157
diff
changeset
|
1086 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
|
1087 return f; |
128dc040e121
(next_frame, prev_frame): If MINIBUF is `visible',
Richard M. Stallman <rms@gnu.org>
parents:
6157
diff
changeset
|
1088 } |
29987
c38afaed3dd0
(next_frame): Don't check frame-focus redirection in
Gerd Moellmann <gerd@gnu.org>
parents:
29616
diff
changeset
|
1089 else if (INTEGERP (minibuf) && XINT (minibuf) == 0) |
8168
32fbb27091d4
(next_frame, prev_frame):
Richard M. Stallman <rms@gnu.org>
parents:
8099
diff
changeset
|
1090 { |
32fbb27091d4
(next_frame, prev_frame):
Richard M. Stallman <rms@gnu.org>
parents:
8099
diff
changeset
|
1091 FRAME_SAMPLE_VISIBILITY (XFRAME (f)); |
32fbb27091d4
(next_frame, prev_frame):
Richard M. Stallman <rms@gnu.org>
parents:
8099
diff
changeset
|
1092 if (FRAME_VISIBLE_P (XFRAME (f)) |
32fbb27091d4
(next_frame, prev_frame):
Richard M. Stallman <rms@gnu.org>
parents:
8099
diff
changeset
|
1093 || FRAME_ICONIFIED_P (XFRAME (f))) |
32fbb27091d4
(next_frame, prev_frame):
Richard M. Stallman <rms@gnu.org>
parents:
8099
diff
changeset
|
1094 return f; |
32fbb27091d4
(next_frame, prev_frame):
Richard M. Stallman <rms@gnu.org>
parents:
8099
diff
changeset
|
1095 } |
6246
128dc040e121
(next_frame, prev_frame): If MINIBUF is `visible',
Richard M. Stallman <rms@gnu.org>
parents:
6157
diff
changeset
|
1096 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
|
1097 { |
8168
32fbb27091d4
(next_frame, prev_frame):
Richard M. Stallman <rms@gnu.org>
parents:
8099
diff
changeset
|
1098 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
|
1099 || 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
|
1100 || EQ (WINDOW_FRAME (XWINDOW (minibuf)), |
ec33931795c4
(next_frame, prev_frame): If MINIBUF is a window,
Gerd Moellmann <gerd@gnu.org>
parents:
29987
diff
changeset
|
1101 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
|
1102 return f; |
a43d53261506
* frame.c (choose_minibuf_frame): abort if the selected frame has
Jim Blandy <jimb@redhat.com>
parents:
1006
diff
changeset
|
1103 } |
a43d53261506
* frame.c (choose_minibuf_frame): abort if the selected frame has
Jim Blandy <jimb@redhat.com>
parents:
1006
diff
changeset
|
1104 else |
765 | 1105 return f; |
363 | 1106 } |
286 | 1107 |
1118
a43d53261506
* frame.c (choose_minibuf_frame): abort if the selected frame has
Jim Blandy <jimb@redhat.com>
parents:
1006
diff
changeset
|
1108 if (EQ (frame, f)) |
286 | 1109 passed++; |
1110 } | |
1111 } | |
1112 | |
765 | 1113 /* Return the previous frame in the frame list before FRAME. |
1114 If MINIBUF is nil, exclude minibuffer-only frames. | |
8168
32fbb27091d4
(next_frame, prev_frame):
Richard M. Stallman <rms@gnu.org>
parents:
8099
diff
changeset
|
1115 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
|
1116 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
|
1117 If MINIBUF is `visible', include all visible frames. |
8168
32fbb27091d4
(next_frame, prev_frame):
Richard M. Stallman <rms@gnu.org>
parents:
8099
diff
changeset
|
1118 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
|
1119 Otherwise, include all frames. */ |
128dc040e121
(next_frame, prev_frame): If MINIBUF is `visible',
Richard M. Stallman <rms@gnu.org>
parents:
6157
diff
changeset
|
1120 |
65976
c332e9c9e66d
(Fredirect_frame_focus): Fix typos in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
64770
diff
changeset
|
1121 static Lisp_Object |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1122 prev_frame (Lisp_Object frame, Lisp_Object minibuf) |
286 | 1123 { |
1124 Lisp_Object tail; | |
1125 Lisp_Object prev; | |
1126 | |
765 | 1127 /* There must always be at least one frame in Vframe_list. */ |
1128 if (! CONSP (Vframe_list)) | |
454 | 1129 abort (); |
1130 | |
286 | 1131 prev = Qnil; |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
1132 for (tail = Vframe_list; CONSP (tail); tail = XCDR (tail)) |
454 | 1133 { |
6500
551bff5cffde
(next_frame, prev_frame, other_visible_frames, Fdelete_frame): Use assignment,
Karl Heuer <kwzh@gnu.org>
parents:
6486
diff
changeset
|
1134 Lisp_Object f; |
454 | 1135 |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
1136 f = XCAR (tail); |
9127
0b4836daa8e1
(Fframep, make_frame_without_minibuffer, do_switch_frame, prev_frame,
Karl Heuer <kwzh@gnu.org>
parents:
9032
diff
changeset
|
1137 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
|
1138 abort (); |
454 | 1139 |
1118
a43d53261506
* frame.c (choose_minibuf_frame): abort if the selected frame has
Jim Blandy <jimb@redhat.com>
parents:
1006
diff
changeset
|
1140 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
|
1141 return prev; |
454 | 1142 |
53229
33c3c7c16e13
lib-src/emacsclient.c: Implemented --here option (open a new Emacs tty). Needs more work.
Karoly Lorentey <lorentey@elte.hu>
parents:
53226
diff
changeset
|
1143 if ((!FRAME_TERMCAP_P (XFRAME (f)) && !FRAME_TERMCAP_P (XFRAME (frame)) |
33c3c7c16e13
lib-src/emacsclient.c: Implemented --here option (open a new Emacs tty). Needs more work.
Karoly Lorentey <lorentey@elte.hu>
parents:
53226
diff
changeset
|
1144 && FRAME_KBOARD (XFRAME (f)) == FRAME_KBOARD (XFRAME (frame))) |
33c3c7c16e13
lib-src/emacsclient.c: Implemented --here option (open a new Emacs tty). Needs more work.
Karoly Lorentey <lorentey@elte.hu>
parents:
53226
diff
changeset
|
1145 || (FRAME_TERMCAP_P (XFRAME (f)) && FRAME_TERMCAP_P (XFRAME (frame)) |
33c3c7c16e13
lib-src/emacsclient.c: Implemented --here option (open a new Emacs tty). Needs more work.
Karoly Lorentey <lorentey@elte.hu>
parents:
53226
diff
changeset
|
1146 && FRAME_TTY (XFRAME (f)) == FRAME_TTY (XFRAME (frame)))) |
1118
a43d53261506
* frame.c (choose_minibuf_frame): abort if the selected frame has
Jim Blandy <jimb@redhat.com>
parents:
1006
diff
changeset
|
1147 { |
12379
7149fc03ea56
(next_frame, prev_frame): Consider only frames on same kbd.
Richard M. Stallman <rms@gnu.org>
parents:
12286
diff
changeset
|
1148 /* 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
|
1149 according to minibuf. */ |
7149fc03ea56
(next_frame, prev_frame): Consider only frames on same kbd.
Richard M. Stallman <rms@gnu.org>
parents:
12286
diff
changeset
|
1150 if (NILP (minibuf)) |
7149fc03ea56
(next_frame, prev_frame): Consider only frames on same kbd.
Richard M. Stallman <rms@gnu.org>
parents:
12286
diff
changeset
|
1151 { |
7149fc03ea56
(next_frame, prev_frame): Consider only frames on same kbd.
Richard M. Stallman <rms@gnu.org>
parents:
12286
diff
changeset
|
1152 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
|
1153 prev = f; |
7149fc03ea56
(next_frame, prev_frame): Consider only frames on same kbd.
Richard M. Stallman <rms@gnu.org>
parents:
12286
diff
changeset
|
1154 } |
7149fc03ea56
(next_frame, prev_frame): Consider only frames on same kbd.
Richard M. Stallman <rms@gnu.org>
parents:
12286
diff
changeset
|
1155 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
|
1156 { |
7149fc03ea56
(next_frame, prev_frame): Consider only frames on same kbd.
Richard M. Stallman <rms@gnu.org>
parents:
12286
diff
changeset
|
1157 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
|
1158 || 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
|
1159 || EQ (WINDOW_FRAME (XWINDOW (minibuf)), |
ec33931795c4
(next_frame, prev_frame): If MINIBUF is a window,
Gerd Moellmann <gerd@gnu.org>
parents:
29987
diff
changeset
|
1160 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
|
1161 prev = f; |
7149fc03ea56
(next_frame, prev_frame): Consider only frames on same kbd.
Richard M. Stallman <rms@gnu.org>
parents:
12286
diff
changeset
|
1162 } |
7149fc03ea56
(next_frame, prev_frame): Consider only frames on same kbd.
Richard M. Stallman <rms@gnu.org>
parents:
12286
diff
changeset
|
1163 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
|
1164 { |
7149fc03ea56
(next_frame, prev_frame): Consider only frames on same kbd.
Richard M. Stallman <rms@gnu.org>
parents:
12286
diff
changeset
|
1165 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
|
1166 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
|
1167 prev = f; |
7149fc03ea56
(next_frame, prev_frame): Consider only frames on same kbd.
Richard M. Stallman <rms@gnu.org>
parents:
12286
diff
changeset
|
1168 } |
7149fc03ea56
(next_frame, prev_frame): Consider only frames on same kbd.
Richard M. Stallman <rms@gnu.org>
parents:
12286
diff
changeset
|
1169 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
|
1170 { |
7149fc03ea56
(next_frame, prev_frame): Consider only frames on same kbd.
Richard M. Stallman <rms@gnu.org>
parents:
12286
diff
changeset
|
1171 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
|
1172 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
|
1173 || 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
|
1174 prev = f; |
7149fc03ea56
(next_frame, prev_frame): Consider only frames on same kbd.
Richard M. Stallman <rms@gnu.org>
parents:
12286
diff
changeset
|
1175 } |
7149fc03ea56
(next_frame, prev_frame): Consider only frames on same kbd.
Richard M. Stallman <rms@gnu.org>
parents:
12286
diff
changeset
|
1176 else |
1118
a43d53261506
* frame.c (choose_minibuf_frame): abort if the selected frame has
Jim Blandy <jimb@redhat.com>
parents:
1006
diff
changeset
|
1177 prev = f; |
454 | 1178 } |
1118
a43d53261506
* frame.c (choose_minibuf_frame): abort if the selected frame has
Jim Blandy <jimb@redhat.com>
parents:
1006
diff
changeset
|
1179 } |
454 | 1180 |
1118
a43d53261506
* frame.c (choose_minibuf_frame): abort if the selected frame has
Jim Blandy <jimb@redhat.com>
parents:
1006
diff
changeset
|
1181 /* 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
|
1182 if (NILP (prev)) |
a43d53261506
* frame.c (choose_minibuf_frame): abort if the selected frame has
Jim Blandy <jimb@redhat.com>
parents:
1006
diff
changeset
|
1183 /* 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
|
1184 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
|
1185 return frame; |
a43d53261506
* frame.c (choose_minibuf_frame): abort if the selected frame has
Jim Blandy <jimb@redhat.com>
parents:
1006
diff
changeset
|
1186 else |
a43d53261506
* frame.c (choose_minibuf_frame): abort if the selected frame has
Jim Blandy <jimb@redhat.com>
parents:
1006
diff
changeset
|
1187 /* 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
|
1188 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
|
1189 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
|
1190 return prev; |
286 | 1191 } |
1192 | |
4424
027d3affb2f8
(Fprevious_frame): New function, for parity with Fnext_frame.
Roland McGrath <roland@gnu.org>
parents:
4412
diff
changeset
|
1193 |
765 | 1194 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
|
1195 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
|
1196 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
|
1197 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
|
1198 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
|
1199 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
|
1200 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
|
1201 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
|
1202 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
|
1203 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
|
1204 Otherwise, include all frames. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109139
diff
changeset
|
1205 (Lisp_Object frame, Lisp_Object miniframe) |
286 | 1206 { |
765 | 1207 if (NILP (frame)) |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
1208 frame = selected_frame; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
1209 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
1210 CHECK_LIVE_FRAME (frame); |
765 | 1211 return next_frame (frame, miniframe); |
286 | 1212 } |
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1809
diff
changeset
|
1213 |
4424
027d3affb2f8
(Fprevious_frame): New function, for parity with Fnext_frame.
Roland McGrath <roland@gnu.org>
parents:
4412
diff
changeset
|
1214 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
|
1215 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
|
1216 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
|
1217 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
|
1218 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
|
1219 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
|
1220 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
|
1221 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
|
1222 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
|
1223 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
|
1224 Otherwise, include all frames. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109139
diff
changeset
|
1225 (Lisp_Object frame, Lisp_Object miniframe) |
4424
027d3affb2f8
(Fprevious_frame): New function, for parity with Fnext_frame.
Roland McGrath <roland@gnu.org>
parents:
4412
diff
changeset
|
1226 { |
027d3affb2f8
(Fprevious_frame): New function, for parity with Fnext_frame.
Roland McGrath <roland@gnu.org>
parents:
4412
diff
changeset
|
1227 if (NILP (frame)) |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
1228 frame = selected_frame; |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
1229 CHECK_LIVE_FRAME (frame); |
4424
027d3affb2f8
(Fprevious_frame): New function, for parity with Fnext_frame.
Roland McGrath <roland@gnu.org>
parents:
4412
diff
changeset
|
1230 return prev_frame (frame, miniframe); |
027d3affb2f8
(Fprevious_frame): New function, for parity with Fnext_frame.
Roland McGrath <roland@gnu.org>
parents:
4412
diff
changeset
|
1231 } |
286 | 1232 |
5925
806e876cacb4
(Fset_frame_height, Fset_frame_width, Fset_frame_size):
Richard M. Stallman <rms@gnu.org>
parents:
5552
diff
changeset
|
1233 /* 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
|
1234 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
|
1235 (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
|
1236 |
7646
de2c4334fad4
(other_visible_frames): No longer static.
Richard M. Stallman <rms@gnu.org>
parents:
7570
diff
changeset
|
1237 int |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1238 other_visible_frames (FRAME_PTR f) |
5925
806e876cacb4
(Fset_frame_height, Fset_frame_width, Fset_frame_size):
Richard M. Stallman <rms@gnu.org>
parents:
5552
diff
changeset
|
1239 { |
806e876cacb4
(Fset_frame_height, Fset_frame_width, Fset_frame_size):
Richard M. Stallman <rms@gnu.org>
parents:
5552
diff
changeset
|
1240 /* 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
|
1241 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
|
1242 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
|
1243 { |
806e876cacb4
(Fset_frame_height, Fset_frame_width, Fset_frame_size):
Richard M. Stallman <rms@gnu.org>
parents:
5552
diff
changeset
|
1244 Lisp_Object frames; |
806e876cacb4
(Fset_frame_height, Fset_frame_width, Fset_frame_size):
Richard M. Stallman <rms@gnu.org>
parents:
5552
diff
changeset
|
1245 int count = 0; |
806e876cacb4
(Fset_frame_height, Fset_frame_width, Fset_frame_size):
Richard M. Stallman <rms@gnu.org>
parents:
5552
diff
changeset
|
1246 |
806e876cacb4
(Fset_frame_height, Fset_frame_width, Fset_frame_size):
Richard M. Stallman <rms@gnu.org>
parents:
5552
diff
changeset
|
1247 for (frames = Vframe_list; |
806e876cacb4
(Fset_frame_height, Fset_frame_width, Fset_frame_size):
Richard M. Stallman <rms@gnu.org>
parents:
5552
diff
changeset
|
1248 CONSP (frames); |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
1249 frames = XCDR (frames)) |
5925
806e876cacb4
(Fset_frame_height, Fset_frame_width, Fset_frame_size):
Richard M. Stallman <rms@gnu.org>
parents:
5552
diff
changeset
|
1250 { |
6500
551bff5cffde
(next_frame, prev_frame, other_visible_frames, Fdelete_frame): Use assignment,
Karl Heuer <kwzh@gnu.org>
parents:
6486
diff
changeset
|
1251 Lisp_Object this; |
5925
806e876cacb4
(Fset_frame_height, Fset_frame_width, Fset_frame_size):
Richard M. Stallman <rms@gnu.org>
parents:
5552
diff
changeset
|
1252 |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
1253 this = XCAR (frames); |
5925
806e876cacb4
(Fset_frame_height, Fset_frame_width, Fset_frame_size):
Richard M. Stallman <rms@gnu.org>
parents:
5552
diff
changeset
|
1254 /* 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
|
1255 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
|
1256 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
|
1257 #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
|
1258 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
|
1259 { |
9648
14b1481b7c6d
(other_visible_frames): Pass a frame ptr to x_sync.
Richard M. Stallman <rms@gnu.org>
parents:
9572
diff
changeset
|
1260 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
|
1261 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
|
1262 } |
806e876cacb4
(Fset_frame_height, Fset_frame_width, Fset_frame_size):
Richard M. Stallman <rms@gnu.org>
parents:
5552
diff
changeset
|
1263 #endif |
806e876cacb4
(Fset_frame_height, Fset_frame_width, Fset_frame_size):
Richard M. Stallman <rms@gnu.org>
parents:
5552
diff
changeset
|
1264 |
806e876cacb4
(Fset_frame_height, Fset_frame_width, Fset_frame_size):
Richard M. Stallman <rms@gnu.org>
parents:
5552
diff
changeset
|
1265 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
|
1266 || 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
|
1267 /* 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
|
1268 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
|
1269 || (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
|
1270 count++; |
806e876cacb4
(Fset_frame_height, Fset_frame_width, Fset_frame_size):
Richard M. Stallman <rms@gnu.org>
parents:
5552
diff
changeset
|
1271 } |
806e876cacb4
(Fset_frame_height, Fset_frame_width, Fset_frame_size):
Richard M. Stallman <rms@gnu.org>
parents:
5552
diff
changeset
|
1272 return count > 1; |
806e876cacb4
(Fset_frame_height, Fset_frame_width, Fset_frame_size):
Richard M. Stallman <rms@gnu.org>
parents:
5552
diff
changeset
|
1273 } |
806e876cacb4
(Fset_frame_height, Fset_frame_width, Fset_frame_size):
Richard M. Stallman <rms@gnu.org>
parents:
5552
diff
changeset
|
1274 return 1; |
806e876cacb4
(Fset_frame_height, Fset_frame_width, Fset_frame_size):
Richard M. Stallman <rms@gnu.org>
parents:
5552
diff
changeset
|
1275 } |
806e876cacb4
(Fset_frame_height, Fset_frame_width, Fset_frame_size):
Richard M. Stallman <rms@gnu.org>
parents:
5552
diff
changeset
|
1276 |
100632
389db2f016a4
* frame.c (delete_frame): New function derived from
Martin Rudalics <rudalics@gmx.at>
parents:
100617
diff
changeset
|
1277 /* Delete FRAME. When FORCE equals Qnoelisp, delete FRAME |
389db2f016a4
* frame.c (delete_frame): New function derived from
Martin Rudalics <rudalics@gmx.at>
parents:
100617
diff
changeset
|
1278 unconditionally. x_connection_closed and delete_terminal use |
389db2f016a4
* frame.c (delete_frame): New function derived from
Martin Rudalics <rudalics@gmx.at>
parents:
100617
diff
changeset
|
1279 this. Any other value of FORCE implements the semantics |
389db2f016a4
* frame.c (delete_frame): New function derived from
Martin Rudalics <rudalics@gmx.at>
parents:
100617
diff
changeset
|
1280 described for Fdelete_frame. */ |
389db2f016a4
* frame.c (delete_frame): New function derived from
Martin Rudalics <rudalics@gmx.at>
parents:
100617
diff
changeset
|
1281 Lisp_Object |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1282 delete_frame (Lisp_Object frame, Lisp_Object force) |
102757
8aefacf5b2ca
(delete_frame): Work around compiler bug.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
102746
diff
changeset
|
1283 /* If we use `register' here, gcc-4.0.2 on amd64 using |
8aefacf5b2ca
(delete_frame): Work around compiler bug.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
102746
diff
changeset
|
1284 -DUSE_LISP_UNION_TYPE complains further down that we're getting the |
8aefacf5b2ca
(delete_frame): Work around compiler bug.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
102746
diff
changeset
|
1285 address of `force'. Go figure. */ |
109501
c02e8765755d
Remove unused static functions.
Juanma Barranquero <lekktu@gmail.com>
parents:
109455
diff
changeset
|
1286 |
286 | 1287 { |
765 | 1288 struct frame *f; |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
1289 struct frame *sf = SELECTED_FRAME (); |
83323
61487e73bbc2
Cleanup: Move kboard fields from struct frame and device-specific descriptors to struct display.
Karoly Lorentey <lorentey@elte.hu>
parents:
83314
diff
changeset
|
1290 struct kboard *kb; |
61487e73bbc2
Cleanup: Move kboard fields from struct frame and device-specific descriptors to struct display.
Karoly Lorentey <lorentey@elte.hu>
parents:
83314
diff
changeset
|
1291 |
109290
1b5ca039f5f2
Fix faulty `if' statement in delete_frame.
Chong Yidong <cyd@stupidchicken.com>
parents:
107526
diff
changeset
|
1292 int minibuffer_selected, tooltip_frame; |
286 | 1293 |
765 | 1294 if (EQ (frame, Qnil)) |
286 | 1295 { |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
1296 f = sf; |
9268
cb55d0155265
(make_minibuffer_frame, make_terminal_frame, Fselected_frame,
Karl Heuer <kwzh@gnu.org>
parents:
9214
diff
changeset
|
1297 XSETFRAME (frame, f); |
286 | 1298 } |
1299 else | |
1300 { | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
1301 CHECK_FRAME (frame); |
765 | 1302 f = XFRAME (frame); |
286 | 1303 } |
1304 | |
765 | 1305 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
|
1306 return Qnil; |
454 | 1307 |
87730 | 1308 if (NILP (force) && !other_visible_frames (f)) |
5925
806e876cacb4
(Fset_frame_height, Fset_frame_width, Fset_frame_size):
Richard M. Stallman <rms@gnu.org>
parents:
5552
diff
changeset
|
1309 error ("Attempt to delete the sole visible or iconified frame"); |
286 | 1310 |
100632
389db2f016a4
* frame.c (delete_frame): New function derived from
Martin Rudalics <rudalics@gmx.at>
parents:
100617
diff
changeset
|
1311 /* x_connection_closed must have set FORCE to `noelisp' in order |
18945
7f491075707a
(Fdelete_frame): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
18698
diff
changeset
|
1312 to delete the last frame, if it is gone. */ |
100632
389db2f016a4
* frame.c (delete_frame): New function derived from
Martin Rudalics <rudalics@gmx.at>
parents:
100617
diff
changeset
|
1313 if (NILP (XCDR (Vframe_list)) && !EQ (force, Qnoelisp)) |
18698
52271ad26a1d
(Fdelete_frame): Always err for deleting the only frame.
Richard M. Stallman <rms@gnu.org>
parents:
18380
diff
changeset
|
1314 error ("Attempt to delete the only frame"); |
52271ad26a1d
(Fdelete_frame): Always err for deleting the only frame.
Richard M. Stallman <rms@gnu.org>
parents:
18380
diff
changeset
|
1315 |
765 | 1316 /* Does this frame have a minibuffer, and is it the surrogate |
1317 minibuffer for any other frame? */ | |
965
0eb68c6c452a
* frame.c (Qheight, Qicon, Qmodeline, Qname, Qnone, Qonly,
Jim Blandy <jimb@redhat.com>
parents:
886
diff
changeset
|
1318 if (FRAME_HAS_MINIBUF_P (XFRAME (frame))) |
363 | 1319 { |
765 | 1320 Lisp_Object frames; |
708 | 1321 |
765 | 1322 for (frames = Vframe_list; |
1323 CONSP (frames); | |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
1324 frames = XCDR (frames)) |
708 | 1325 { |
6157
9422e430f067
(Fdelete_frame): Don't initialize a Lisp_Object.
Richard M. Stallman <rms@gnu.org>
parents:
6130
diff
changeset
|
1326 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
|
1327 this = XCAR (frames); |
363 | 1328 |
765 | 1329 if (! EQ (this, frame) |
1330 && EQ (frame, | |
6157
9422e430f067
(Fdelete_frame): Don't initialize a Lisp_Object.
Richard M. Stallman <rms@gnu.org>
parents:
6130
diff
changeset
|
1331 WINDOW_FRAME (XWINDOW |
9422e430f067
(Fdelete_frame): Don't initialize a Lisp_Object.
Richard M. Stallman <rms@gnu.org>
parents:
6130
diff
changeset
|
1332 (FRAME_MINIBUF_WINDOW (XFRAME (this)))))) |
91641
d17766001931
(Fdelete_frame): If FORCE, don't call hooks.
Richard M. Stallman <rms@gnu.org>
parents:
91367
diff
changeset
|
1333 { |
100632
389db2f016a4
* frame.c (delete_frame): New function derived from
Martin Rudalics <rudalics@gmx.at>
parents:
100617
diff
changeset
|
1334 /* If we MUST delete this frame, delete the other first. |
389db2f016a4
* frame.c (delete_frame): New function derived from
Martin Rudalics <rudalics@gmx.at>
parents:
100617
diff
changeset
|
1335 But do this only if FORCE equals `noelisp'. */ |
389db2f016a4
* frame.c (delete_frame): New function derived from
Martin Rudalics <rudalics@gmx.at>
parents:
100617
diff
changeset
|
1336 if (EQ (force, Qnoelisp)) |
389db2f016a4
* frame.c (delete_frame): New function derived from
Martin Rudalics <rudalics@gmx.at>
parents:
100617
diff
changeset
|
1337 delete_frame (this, Qnoelisp); |
91641
d17766001931
(Fdelete_frame): If FORCE, don't call hooks.
Richard M. Stallman <rms@gnu.org>
parents:
91367
diff
changeset
|
1338 else |
d17766001931
(Fdelete_frame): If FORCE, don't call hooks.
Richard M. Stallman <rms@gnu.org>
parents:
91367
diff
changeset
|
1339 error ("Attempt to delete a surrogate minibuffer frame"); |
d17766001931
(Fdelete_frame): If FORCE, don't call hooks.
Richard M. Stallman <rms@gnu.org>
parents:
91367
diff
changeset
|
1340 } |
708 | 1341 } |
286 | 1342 } |
1343 | |
109290
1b5ca039f5f2
Fix faulty `if' statement in delete_frame.
Chong Yidong <cyd@stupidchicken.com>
parents:
107526
diff
changeset
|
1344 tooltip_frame = !NILP (Fframe_parameter (frame, intern ("tooltip"))); |
1b5ca039f5f2
Fix faulty `if' statement in delete_frame.
Chong Yidong <cyd@stupidchicken.com>
parents:
107526
diff
changeset
|
1345 |
100632
389db2f016a4
* frame.c (delete_frame): New function derived from
Martin Rudalics <rudalics@gmx.at>
parents:
100617
diff
changeset
|
1346 /* Run `delete-frame-functions' unless FORCE is `noelisp' or |
389db2f016a4
* frame.c (delete_frame): New function derived from
Martin Rudalics <rudalics@gmx.at>
parents:
100617
diff
changeset
|
1347 frame is a tooltip. FORCE is set to `noelisp' when handling |
389db2f016a4
* frame.c (delete_frame): New function derived from
Martin Rudalics <rudalics@gmx.at>
parents:
100617
diff
changeset
|
1348 a disconnect from the terminal, so we don't dare call Lisp |
389db2f016a4
* frame.c (delete_frame): New function derived from
Martin Rudalics <rudalics@gmx.at>
parents:
100617
diff
changeset
|
1349 code. */ |
109290
1b5ca039f5f2
Fix faulty `if' statement in delete_frame.
Chong Yidong <cyd@stupidchicken.com>
parents:
107526
diff
changeset
|
1350 if (NILP (Vrun_hooks) || tooltip_frame) |
93369
ed10c3092847
* keyboard.c (pending_funcalls): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93203
diff
changeset
|
1351 ; |
109290
1b5ca039f5f2
Fix faulty `if' statement in delete_frame.
Chong Yidong <cyd@stupidchicken.com>
parents:
107526
diff
changeset
|
1352 else if (EQ (force, Qnoelisp)) |
93369
ed10c3092847
* keyboard.c (pending_funcalls): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93203
diff
changeset
|
1353 pending_funcalls |
ed10c3092847
* keyboard.c (pending_funcalls): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93203
diff
changeset
|
1354 = Fcons (list3 (Qrun_hook_with_args, Qdelete_frame_functions, frame), |
ed10c3092847
* keyboard.c (pending_funcalls): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93203
diff
changeset
|
1355 pending_funcalls); |
ed10c3092847
* keyboard.c (pending_funcalls): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93203
diff
changeset
|
1356 else |
ed10c3092847
* keyboard.c (pending_funcalls): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93203
diff
changeset
|
1357 safe_call2 (Qrun_hook_with_args, Qdelete_frame_functions, frame); |
32909
44cb0900a858
(Fdelete_frame): Doc fix. Move running the hook
Gerd Moellmann <gerd@gnu.org>
parents:
32907
diff
changeset
|
1358 |
83167
69ebc75cb461
Implemented display ids for multiple emacsclients on the same tty. Plus assorted bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83074
diff
changeset
|
1359 /* The hook may sometimes (indirectly) cause the frame to be deleted. */ |
69ebc75cb461
Implemented display ids for multiple emacsclients on the same tty. Plus assorted bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83074
diff
changeset
|
1360 if (! FRAME_LIVE_P (f)) |
69ebc75cb461
Implemented display ids for multiple emacsclients on the same tty. Plus assorted bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83074
diff
changeset
|
1361 return Qnil; |
69ebc75cb461
Implemented display ids for multiple emacsclients on the same tty. Plus assorted bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83074
diff
changeset
|
1362 |
91641
d17766001931
(Fdelete_frame): If FORCE, don't call hooks.
Richard M. Stallman <rms@gnu.org>
parents:
91367
diff
changeset
|
1363 /* At this point, we are committed to deleting the frame. |
d17766001931
(Fdelete_frame): If FORCE, don't call hooks.
Richard M. Stallman <rms@gnu.org>
parents:
91367
diff
changeset
|
1364 There is no more chance for errors to prevent it. */ |
d17766001931
(Fdelete_frame): If FORCE, don't call hooks.
Richard M. Stallman <rms@gnu.org>
parents:
91367
diff
changeset
|
1365 |
12222
7286ed64badd
(Fdelete_frame): If the minibuf window was selected, make that remain so.
Richard M. Stallman <rms@gnu.org>
parents:
12010
diff
changeset
|
1366 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
|
1367 |
765 | 1368 /* Don't let the frame remain selected. */ |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
1369 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
|
1370 { |
7149fc03ea56
(next_frame, prev_frame): Consider only frames on same kbd.
Richard M. Stallman <rms@gnu.org>
parents:
12286
diff
changeset
|
1371 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
|
1372 |
7149fc03ea56
(next_frame, prev_frame): Consider only frames on same kbd.
Richard M. Stallman <rms@gnu.org>
parents:
12286
diff
changeset
|
1373 /* 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
|
1374 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
|
1375 |
7149fc03ea56
(next_frame, prev_frame): Consider only frames on same kbd.
Richard M. Stallman <rms@gnu.org>
parents:
12286
diff
changeset
|
1376 /* 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
|
1377 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
|
1378 { |
7149fc03ea56
(next_frame, prev_frame): Consider only frames on same kbd.
Richard M. Stallman <rms@gnu.org>
parents:
12286
diff
changeset
|
1379 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
|
1380 { |
53233
fe9b37bee5f7
Fully eliminated global tty state variables.
Karoly Lorentey <lorentey@elte.hu>
parents:
53232
diff
changeset
|
1381 if (! EQ (frame, frame1) && FRAME_LIVE_P (XFRAME (frame1))) |
12379
7149fc03ea56
(next_frame, prev_frame): Consider only frames on same kbd.
Richard M. Stallman <rms@gnu.org>
parents:
12286
diff
changeset
|
1382 break; |
7149fc03ea56
(next_frame, prev_frame): Consider only frames on same kbd.
Richard M. Stallman <rms@gnu.org>
parents:
12286
diff
changeset
|
1383 } |
7149fc03ea56
(next_frame, prev_frame): Consider only frames on same kbd.
Richard M. Stallman <rms@gnu.org>
parents:
12286
diff
changeset
|
1384 } |
103256
26fe9add7299
(do_switch_frame) [NS_IMPL_COCOA]: Don't raise any window.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
103244
diff
changeset
|
1385 #ifdef NS_IMPL_COCOA |
26fe9add7299
(do_switch_frame) [NS_IMPL_COCOA]: Don't raise any window.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
103244
diff
changeset
|
1386 else |
26fe9add7299
(do_switch_frame) [NS_IMPL_COCOA]: Don't raise any window.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
103244
diff
changeset
|
1387 /* Under NS, there is no system mechanism for choosing a new |
26fe9add7299
(do_switch_frame) [NS_IMPL_COCOA]: Don't raise any window.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
103244
diff
changeset
|
1388 window to get focus -- it is left to application code. |
26fe9add7299
(do_switch_frame) [NS_IMPL_COCOA]: Don't raise any window.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
103244
diff
changeset
|
1389 So the portion of THIS application interfacing with NS |
26fe9add7299
(do_switch_frame) [NS_IMPL_COCOA]: Don't raise any window.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
103244
diff
changeset
|
1390 needs to know about it. We call Fraise_frame, but the |
26fe9add7299
(do_switch_frame) [NS_IMPL_COCOA]: Don't raise any window.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
103244
diff
changeset
|
1391 purpose is really to transfer focus. */ |
26fe9add7299
(do_switch_frame) [NS_IMPL_COCOA]: Don't raise any window.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
103244
diff
changeset
|
1392 Fraise_frame (frame1); |
26fe9add7299
(do_switch_frame) [NS_IMPL_COCOA]: Don't raise any window.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
103244
diff
changeset
|
1393 #endif |
12379
7149fc03ea56
(next_frame, prev_frame): Consider only frames on same kbd.
Richard M. Stallman <rms@gnu.org>
parents:
12286
diff
changeset
|
1394 |
99320
9d9890aa68c5
(do_switch_frame): New argument NORECORD passed to Fselect_window.
Martin Rudalics <rudalics@gmx.at>
parents:
98590
diff
changeset
|
1395 do_switch_frame (frame1, 0, 1, Qnil); |
25736
84179b4e7743
(Fdelete_frame): Correct local variable pointing to
Gerd Moellmann <gerd@gnu.org>
parents:
25710
diff
changeset
|
1396 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
|
1397 } |
286 | 1398 |
765 | 1399 /* Don't allow minibuf_window to remain on a deleted frame. */ |
1400 if (EQ (f->minibuffer_window, minibuf_window)) | |
286 | 1401 { |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
1402 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
|
1403 XWINDOW (minibuf_window)->buffer, Qnil); |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
1404 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
|
1405 |
7286ed64badd
(Fdelete_frame): If the minibuf window was selected, make that remain so.
Richard M. Stallman <rms@gnu.org>
parents:
12010
diff
changeset
|
1406 /* 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
|
1407 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
|
1408 if (minibuffer_selected) |
51048
7ac9c3bea5ea
(Fselect_window): Add optional arg `norecord'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50390
diff
changeset
|
1409 Fselect_window (minibuf_window, Qnil); |
286 | 1410 } |
1411 | |
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
|
1412 /* 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
|
1413 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
|
1414 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
|
1415 |
8099
a06382fd175d
(Fdelete_frame): Call x_clear_frame_selections.
Richard M. Stallman <rms@gnu.org>
parents:
8054
diff
changeset
|
1416 /* 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
|
1417 #ifdef HAVE_X_WINDOWS |
a06382fd175d
(Fdelete_frame): Call x_clear_frame_selections.
Richard M. Stallman <rms@gnu.org>
parents:
8054
diff
changeset
|
1418 if (FRAME_X_P (f)) |
a06382fd175d
(Fdelete_frame): Call x_clear_frame_selections.
Richard M. Stallman <rms@gnu.org>
parents:
8054
diff
changeset
|
1419 x_clear_frame_selections (f); |
a06382fd175d
(Fdelete_frame): Call x_clear_frame_selections.
Richard M. Stallman <rms@gnu.org>
parents:
8054
diff
changeset
|
1420 #endif |
a06382fd175d
(Fdelete_frame): Call x_clear_frame_selections.
Richard M. Stallman <rms@gnu.org>
parents:
8054
diff
changeset
|
1421 |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
1422 /* Free glyphs. |
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
1423 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
|
1424 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
|
1425 memory. */ |
c69d9e48269b
(make_frame): Set n_current_toolbar_items to 0.
Gerd Moellmann <gerd@gnu.org>
parents:
23746
diff
changeset
|
1426 free_glyphs (f); |
c69d9e48269b
(make_frame): Set n_current_toolbar_items to 0.
Gerd Moellmann <gerd@gnu.org>
parents:
23746
diff
changeset
|
1427 |
95044
f4fac6175e87
frame.c (Fdelete_frame): Don't call font_update_drviers if
Eli Zaretskii <eliz@gnu.org>
parents:
94963
diff
changeset
|
1428 #ifdef HAVE_WINDOW_SYSTEM |
91111
8781d295c455
(make_frame): Initialize f->font_data_list to NULL.
Kenichi Handa <handa@m17n.org>
parents:
91085
diff
changeset
|
1429 /* Give chance to each font driver to free a frame specific data. */ |
8781d295c455
(make_frame): Initialize f->font_data_list to NULL.
Kenichi Handa <handa@m17n.org>
parents:
91085
diff
changeset
|
1430 font_update_drivers (f, Qnil); |
95044
f4fac6175e87
frame.c (Fdelete_frame): Don't call font_update_drviers if
Eli Zaretskii <eliz@gnu.org>
parents:
94963
diff
changeset
|
1431 #endif |
91111
8781d295c455
(make_frame): Initialize f->font_data_list to NULL.
Kenichi Handa <handa@m17n.org>
parents:
91085
diff
changeset
|
1432 |
1680
ea9f3949f153
* frame.c (Fdelete_frame): Delete all the windows in the frame's
Jim Blandy <jimb@redhat.com>
parents:
1652
diff
changeset
|
1433 /* 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
|
1434 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
|
1435 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
|
1436 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
|
1437 |
765 | 1438 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
|
1439 FRAME_SET_VISIBLE (f, 0); |
286 | 1440 |
100617
a714dea3017d
Add comment to last change by jhd.
Chong Yidong <cyd@stupidchicken.com>
parents:
100614
diff
changeset
|
1441 /* Allow the vector of menu bar contents to be freed in the next |
a714dea3017d
Add comment to last change by jhd.
Chong Yidong <cyd@stupidchicken.com>
parents:
100614
diff
changeset
|
1442 garbage collection. The frame object itself may not be garbage |
a714dea3017d
Add comment to last change by jhd.
Chong Yidong <cyd@stupidchicken.com>
parents:
100614
diff
changeset
|
1443 collected until much later, because recent_keys and other data |
a714dea3017d
Add comment to last change by jhd.
Chong Yidong <cyd@stupidchicken.com>
parents:
100614
diff
changeset
|
1444 structures can still refer to it. */ |
100611
32c5cd30347a
*** empty log message ***
Jan Djärv <jan.h.d@swipnet.se>
parents:
100408
diff
changeset
|
1445 f->menu_bar_vector = Qnil; |
32c5cd30347a
*** empty log message ***
Jan Djärv <jan.h.d@swipnet.se>
parents:
100408
diff
changeset
|
1446 |
100408
ff982ba457d9
(Fdelete_frame): Call free_font_driver_list.
Chong Yidong <cyd@stupidchicken.com>
parents:
100001
diff
changeset
|
1447 free_font_driver_list (f); |
95481
4390d64d3328
Make "xfree (NULL)" a no-op; remove useless if-before-xfree.
Jim Meyering <jim@meyering.net>
parents:
95157
diff
changeset
|
1448 xfree (f->namebuf); |
4390d64d3328
Make "xfree (NULL)" a no-op; remove useless if-before-xfree.
Jim Meyering <jim@meyering.net>
parents:
95157
diff
changeset
|
1449 xfree (f->decode_mode_spec_buffer); |
4390d64d3328
Make "xfree (NULL)" a no-op; remove useless if-before-xfree.
Jim Meyering <jim@meyering.net>
parents:
95157
diff
changeset
|
1450 xfree (FRAME_INSERT_COST (f)); |
4390d64d3328
Make "xfree (NULL)" a no-op; remove useless if-before-xfree.
Jim Meyering <jim@meyering.net>
parents:
95157
diff
changeset
|
1451 xfree (FRAME_DELETEN_COST (f)); |
4390d64d3328
Make "xfree (NULL)" a no-op; remove useless if-before-xfree.
Jim Meyering <jim@meyering.net>
parents:
95157
diff
changeset
|
1452 xfree (FRAME_INSERTN_COST (f)); |
4390d64d3328
Make "xfree (NULL)" a no-op; remove useless if-before-xfree.
Jim Meyering <jim@meyering.net>
parents:
95157
diff
changeset
|
1453 xfree (FRAME_DELETE_COST (f)); |
4390d64d3328
Make "xfree (NULL)" a no-op; remove useless if-before-xfree.
Jim Meyering <jim@meyering.net>
parents:
95157
diff
changeset
|
1454 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
|
1455 |
1809
69b3ee873a9b
* frame.c (Fdelete_frame): Clear the frame's display after calling
Jim Blandy <jimb@redhat.com>
parents:
1784
diff
changeset
|
1456 /* Since some events are handled at the interrupt level, we may get |
83431
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83427
diff
changeset
|
1457 an event for f at any time; if we zero out the frame's terminal |
1809
69b3ee873a9b
* frame.c (Fdelete_frame): Clear the frame's display after calling
Jim Blandy <jimb@redhat.com>
parents:
1784
diff
changeset
|
1458 now, then we may trip up the event-handling code. Instead, we'll |
83431
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83427
diff
changeset
|
1459 promise that the terminal of the frame must be valid until we |
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83427
diff
changeset
|
1460 have called the window-system-dependent frame destruction |
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83427
diff
changeset
|
1461 routine. */ |
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83427
diff
changeset
|
1462 |
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83427
diff
changeset
|
1463 if (FRAME_TERMINAL (f)->delete_frame_hook) |
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83427
diff
changeset
|
1464 (*FRAME_TERMINAL (f)->delete_frame_hook) (f); |
83323
61487e73bbc2
Cleanup: Move kboard fields from struct frame and device-specific descriptors to struct display.
Karoly Lorentey <lorentey@elte.hu>
parents:
83314
diff
changeset
|
1465 |
83004
7900111db01c
Converted display hooks to be display-local. Plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83003
diff
changeset
|
1466 { |
83431
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83427
diff
changeset
|
1467 struct terminal *terminal = FRAME_TERMINAL (f); |
85651
a8927de00181
(syms_of_frame) <delete-frame-functions>: Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
85614
diff
changeset
|
1468 f->output_data.nothing = 0; |
83431
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83427
diff
changeset
|
1469 f->terminal = 0; /* Now the frame is dead. */ |
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83427
diff
changeset
|
1470 |
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83427
diff
changeset
|
1471 /* If needed, delete the terminal that this frame was on. |
83323
61487e73bbc2
Cleanup: Move kboard fields from struct frame and device-specific descriptors to struct display.
Karoly Lorentey <lorentey@elte.hu>
parents:
83314
diff
changeset
|
1472 (This must be done after the frame is killed.) */ |
83431
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83427
diff
changeset
|
1473 terminal->reference_count--; |
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83427
diff
changeset
|
1474 if (terminal->reference_count == 0) |
83323
61487e73bbc2
Cleanup: Move kboard fields from struct frame and device-specific descriptors to struct display.
Karoly Lorentey <lorentey@elte.hu>
parents:
83314
diff
changeset
|
1475 { |
91791
ad6ac471fdea
(Fdelete_frame): Call Fdelete_terminal.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91761
diff
changeset
|
1476 Lisp_Object tmp; |
ad6ac471fdea
(Fdelete_frame): Call Fdelete_terminal.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91761
diff
changeset
|
1477 XSETTERMINAL (tmp, terminal); |
ad6ac471fdea
(Fdelete_frame): Call Fdelete_terminal.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91761
diff
changeset
|
1478 |
83323
61487e73bbc2
Cleanup: Move kboard fields from struct frame and device-specific descriptors to struct display.
Karoly Lorentey <lorentey@elte.hu>
parents:
83314
diff
changeset
|
1479 kb = NULL; |
91791
ad6ac471fdea
(Fdelete_frame): Call Fdelete_terminal.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91761
diff
changeset
|
1480 Fdelete_terminal (tmp, NILP (force) ? Qt : force); |
83323
61487e73bbc2
Cleanup: Move kboard fields from struct frame and device-specific descriptors to struct display.
Karoly Lorentey <lorentey@elte.hu>
parents:
83314
diff
changeset
|
1481 } |
61487e73bbc2
Cleanup: Move kboard fields from struct frame and device-specific descriptors to struct display.
Karoly Lorentey <lorentey@elte.hu>
parents:
83314
diff
changeset
|
1482 else |
83431
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83427
diff
changeset
|
1483 kb = terminal->kboard; |
83004
7900111db01c
Converted display hooks to be display-local. Plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83003
diff
changeset
|
1484 } |
1809
69b3ee873a9b
* frame.c (Fdelete_frame): Clear the frame's display after calling
Jim Blandy <jimb@redhat.com>
parents:
1784
diff
changeset
|
1485 |
765 | 1486 /* If we've deleted the last_nonminibuf_frame, then try to find |
363 | 1487 another one. */ |
765 | 1488 if (f == last_nonminibuf_frame) |
363 | 1489 { |
765 | 1490 Lisp_Object frames; |
708 | 1491 |
765 | 1492 last_nonminibuf_frame = 0; |
363 | 1493 |
765 | 1494 for (frames = Vframe_list; |
1495 CONSP (frames); | |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
1496 frames = XCDR (frames)) |
363 | 1497 { |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
1498 f = XFRAME (XCAR (frames)); |
765 | 1499 if (!FRAME_MINIBUF_ONLY_P (f)) |
363 | 1500 { |
765 | 1501 last_nonminibuf_frame = f; |
363 | 1502 break; |
1503 } | |
1504 } | |
1505 } | |
286 | 1506 |
56453
b8b142a8e2c6
(Fdelete_frame): If we're in single_bboard_state on
Richard M. Stallman <rms@gnu.org>
parents:
53072
diff
changeset
|
1507 /* 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
|
1508 single-kboard state if we're in it for this kboard. */ |
83323
61487e73bbc2
Cleanup: Move kboard fields from struct frame and device-specific descriptors to struct display.
Karoly Lorentey <lorentey@elte.hu>
parents:
83314
diff
changeset
|
1509 if (kb != NULL) |
61487e73bbc2
Cleanup: Move kboard fields from struct frame and device-specific descriptors to struct display.
Karoly Lorentey <lorentey@elte.hu>
parents:
83314
diff
changeset
|
1510 { |
61487e73bbc2
Cleanup: Move kboard fields from struct frame and device-specific descriptors to struct display.
Karoly Lorentey <lorentey@elte.hu>
parents:
83314
diff
changeset
|
1511 Lisp_Object frames; |
61487e73bbc2
Cleanup: Move kboard fields from struct frame and device-specific descriptors to struct display.
Karoly Lorentey <lorentey@elte.hu>
parents:
83314
diff
changeset
|
1512 /* Some frame we found on the same kboard, or nil if there are none. */ |
61487e73bbc2
Cleanup: Move kboard fields from struct frame and device-specific descriptors to struct display.
Karoly Lorentey <lorentey@elte.hu>
parents:
83314
diff
changeset
|
1513 Lisp_Object frame_on_same_kboard; |
61487e73bbc2
Cleanup: Move kboard fields from struct frame and device-specific descriptors to struct display.
Karoly Lorentey <lorentey@elte.hu>
parents:
83314
diff
changeset
|
1514 |
61487e73bbc2
Cleanup: Move kboard fields from struct frame and device-specific descriptors to struct display.
Karoly Lorentey <lorentey@elte.hu>
parents:
83314
diff
changeset
|
1515 frame_on_same_kboard = Qnil; |
61487e73bbc2
Cleanup: Move kboard fields from struct frame and device-specific descriptors to struct display.
Karoly Lorentey <lorentey@elte.hu>
parents:
83314
diff
changeset
|
1516 |
61487e73bbc2
Cleanup: Move kboard fields from struct frame and device-specific descriptors to struct display.
Karoly Lorentey <lorentey@elte.hu>
parents:
83314
diff
changeset
|
1517 for (frames = Vframe_list; |
61487e73bbc2
Cleanup: Move kboard fields from struct frame and device-specific descriptors to struct display.
Karoly Lorentey <lorentey@elte.hu>
parents:
83314
diff
changeset
|
1518 CONSP (frames); |
61487e73bbc2
Cleanup: Move kboard fields from struct frame and device-specific descriptors to struct display.
Karoly Lorentey <lorentey@elte.hu>
parents:
83314
diff
changeset
|
1519 frames = XCDR (frames)) |
61487e73bbc2
Cleanup: Move kboard fields from struct frame and device-specific descriptors to struct display.
Karoly Lorentey <lorentey@elte.hu>
parents:
83314
diff
changeset
|
1520 { |
61487e73bbc2
Cleanup: Move kboard fields from struct frame and device-specific descriptors to struct display.
Karoly Lorentey <lorentey@elte.hu>
parents:
83314
diff
changeset
|
1521 Lisp_Object this; |
61487e73bbc2
Cleanup: Move kboard fields from struct frame and device-specific descriptors to struct display.
Karoly Lorentey <lorentey@elte.hu>
parents:
83314
diff
changeset
|
1522 struct frame *f1; |
61487e73bbc2
Cleanup: Move kboard fields from struct frame and device-specific descriptors to struct display.
Karoly Lorentey <lorentey@elte.hu>
parents:
83314
diff
changeset
|
1523 |
61487e73bbc2
Cleanup: Move kboard fields from struct frame and device-specific descriptors to struct display.
Karoly Lorentey <lorentey@elte.hu>
parents:
83314
diff
changeset
|
1524 this = XCAR (frames); |
61487e73bbc2
Cleanup: Move kboard fields from struct frame and device-specific descriptors to struct display.
Karoly Lorentey <lorentey@elte.hu>
parents:
83314
diff
changeset
|
1525 if (!FRAMEP (this)) |
61487e73bbc2
Cleanup: Move kboard fields from struct frame and device-specific descriptors to struct display.
Karoly Lorentey <lorentey@elte.hu>
parents:
83314
diff
changeset
|
1526 abort (); |
61487e73bbc2
Cleanup: Move kboard fields from struct frame and device-specific descriptors to struct display.
Karoly Lorentey <lorentey@elte.hu>
parents:
83314
diff
changeset
|
1527 f1 = XFRAME (this); |
61487e73bbc2
Cleanup: Move kboard fields from struct frame and device-specific descriptors to struct display.
Karoly Lorentey <lorentey@elte.hu>
parents:
83314
diff
changeset
|
1528 |
61487e73bbc2
Cleanup: Move kboard fields from struct frame and device-specific descriptors to struct display.
Karoly Lorentey <lorentey@elte.hu>
parents:
83314
diff
changeset
|
1529 if (kb == FRAME_KBOARD (f1)) |
61487e73bbc2
Cleanup: Move kboard fields from struct frame and device-specific descriptors to struct display.
Karoly Lorentey <lorentey@elte.hu>
parents:
83314
diff
changeset
|
1530 frame_on_same_kboard = this; |
61487e73bbc2
Cleanup: Move kboard fields from struct frame and device-specific descriptors to struct display.
Karoly Lorentey <lorentey@elte.hu>
parents:
83314
diff
changeset
|
1531 } |
61487e73bbc2
Cleanup: Move kboard fields from struct frame and device-specific descriptors to struct display.
Karoly Lorentey <lorentey@elte.hu>
parents:
83314
diff
changeset
|
1532 |
61487e73bbc2
Cleanup: Move kboard fields from struct frame and device-specific descriptors to struct display.
Karoly Lorentey <lorentey@elte.hu>
parents:
83314
diff
changeset
|
1533 if (NILP (frame_on_same_kboard)) |
61487e73bbc2
Cleanup: Move kboard fields from struct frame and device-specific descriptors to struct display.
Karoly Lorentey <lorentey@elte.hu>
parents:
83314
diff
changeset
|
1534 not_single_kboard_state (kb); |
61487e73bbc2
Cleanup: Move kboard fields from struct frame and device-specific descriptors to struct display.
Karoly Lorentey <lorentey@elte.hu>
parents:
83314
diff
changeset
|
1535 } |
56453
b8b142a8e2c6
(Fdelete_frame): If we're in single_bboard_state on
Richard M. Stallman <rms@gnu.org>
parents:
53072
diff
changeset
|
1536 |
b8b142a8e2c6
(Fdelete_frame): If we're in single_bboard_state on
Richard M. Stallman <rms@gnu.org>
parents:
53072
diff
changeset
|
1537 |
11906
3ca56969ba07
(Fdelete_frame): When updating Vdefault_minibuffer_frame,
Karl Heuer <kwzh@gnu.org>
parents:
11794
diff
changeset
|
1538 /* 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
|
1539 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
|
1540 frames with other windows. */ |
83323
61487e73bbc2
Cleanup: Move kboard fields from struct frame and device-specific descriptors to struct display.
Karoly Lorentey <lorentey@elte.hu>
parents:
83314
diff
changeset
|
1541 if (kb != NULL && EQ (frame, kb->Vdefault_minibuffer_frame)) |
708 | 1542 { |
765 | 1543 Lisp_Object frames; |
708 | 1544 |
765 | 1545 /* 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
|
1546 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
|
1547 /* 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
|
1548 Lisp_Object frame_on_same_kboard; |
708 | 1549 |
12380
2c09b3adbb90
(Fdelete_frame): It's ok to have no minibuffer left on
Richard M. Stallman <rms@gnu.org>
parents:
12379
diff
changeset
|
1550 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
|
1551 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
|
1552 |
765 | 1553 for (frames = Vframe_list; |
1554 CONSP (frames); | |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
1555 frames = XCDR (frames)) |
708 | 1556 { |
6500
551bff5cffde
(next_frame, prev_frame, other_visible_frames, Fdelete_frame): Use assignment,
Karl Heuer <kwzh@gnu.org>
parents:
6486
diff
changeset
|
1557 Lisp_Object this; |
11906
3ca56969ba07
(Fdelete_frame): When updating Vdefault_minibuffer_frame,
Karl Heuer <kwzh@gnu.org>
parents:
11794
diff
changeset
|
1558 struct frame *f1; |
708 | 1559 |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
1560 this = XCAR (frames); |
9127
0b4836daa8e1
(Fframep, make_frame_without_minibuffer, do_switch_frame, prev_frame,
Karl Heuer <kwzh@gnu.org>
parents:
9032
diff
changeset
|
1561 if (!FRAMEP (this)) |
708 | 1562 abort (); |
11906
3ca56969ba07
(Fdelete_frame): When updating Vdefault_minibuffer_frame,
Karl Heuer <kwzh@gnu.org>
parents:
11794
diff
changeset
|
1563 f1 = XFRAME (this); |
708 | 1564 |
11906
3ca56969ba07
(Fdelete_frame): When updating Vdefault_minibuffer_frame,
Karl Heuer <kwzh@gnu.org>
parents:
11794
diff
changeset
|
1565 /* Consider only frames on the same kboard |
3ca56969ba07
(Fdelete_frame): When updating Vdefault_minibuffer_frame,
Karl Heuer <kwzh@gnu.org>
parents:
11794
diff
changeset
|
1566 and only those with minibuffers. */ |
83323
61487e73bbc2
Cleanup: Move kboard fields from struct frame and device-specific descriptors to struct display.
Karoly Lorentey <lorentey@elte.hu>
parents:
83314
diff
changeset
|
1567 if (kb == FRAME_KBOARD (f1) |
11906
3ca56969ba07
(Fdelete_frame): When updating Vdefault_minibuffer_frame,
Karl Heuer <kwzh@gnu.org>
parents:
11794
diff
changeset
|
1568 && FRAME_HAS_MINIBUF_P (f1)) |
708 | 1569 { |
765 | 1570 frame_with_minibuf = this; |
11906
3ca56969ba07
(Fdelete_frame): When updating Vdefault_minibuffer_frame,
Karl Heuer <kwzh@gnu.org>
parents:
11794
diff
changeset
|
1571 if (FRAME_MINIBUF_ONLY_P (f1)) |
708 | 1572 break; |
1573 } | |
12380
2c09b3adbb90
(Fdelete_frame): It's ok to have no minibuffer left on
Richard M. Stallman <rms@gnu.org>
parents:
12379
diff
changeset
|
1574 |
83323
61487e73bbc2
Cleanup: Move kboard fields from struct frame and device-specific descriptors to struct display.
Karoly Lorentey <lorentey@elte.hu>
parents:
83314
diff
changeset
|
1575 if (kb == FRAME_KBOARD (f1)) |
12380
2c09b3adbb90
(Fdelete_frame): It's ok to have no minibuffer left on
Richard M. Stallman <rms@gnu.org>
parents:
12379
diff
changeset
|
1576 frame_on_same_kboard = this; |
708 | 1577 } |
1578 | |
12380
2c09b3adbb90
(Fdelete_frame): It's ok to have no minibuffer left on
Richard M. Stallman <rms@gnu.org>
parents:
12379
diff
changeset
|
1579 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
|
1580 { |
2c09b3adbb90
(Fdelete_frame): It's ok to have no minibuffer left on
Richard M. Stallman <rms@gnu.org>
parents:
12379
diff
changeset
|
1581 /* 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
|
1582 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
|
1583 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
|
1584 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
|
1585 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
|
1586 minibuffer frames. */ |
2c09b3adbb90
(Fdelete_frame): It's ok to have no minibuffer left on
Richard M. Stallman <rms@gnu.org>
parents:
12379
diff
changeset
|
1587 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
|
1588 abort (); |
708 | 1589 |
83323
61487e73bbc2
Cleanup: Move kboard fields from struct frame and device-specific descriptors to struct display.
Karoly Lorentey <lorentey@elte.hu>
parents:
83314
diff
changeset
|
1590 kb->Vdefault_minibuffer_frame = 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
|
1591 } |
2c09b3adbb90
(Fdelete_frame): It's ok to have no minibuffer left on
Richard M. Stallman <rms@gnu.org>
parents:
12379
diff
changeset
|
1592 else |
2c09b3adbb90
(Fdelete_frame): It's ok to have no minibuffer left on
Richard M. Stallman <rms@gnu.org>
parents:
12379
diff
changeset
|
1593 /* No frames left on this kboard--say no minibuffer either. */ |
83323
61487e73bbc2
Cleanup: Move kboard fields from struct frame and device-specific descriptors to struct display.
Karoly Lorentey <lorentey@elte.hu>
parents:
83314
diff
changeset
|
1594 kb->Vdefault_minibuffer_frame = Qnil; |
708 | 1595 } |
1596 | |
16280
f4833d0bfaaa
(Fdelete_frame): Set update_mode_lines.
Richard M. Stallman <rms@gnu.org>
parents:
16263
diff
changeset
|
1597 /* Cause frame titles to update--necessary if we now have just one frame. */ |
109290
1b5ca039f5f2
Fix faulty `if' statement in delete_frame.
Chong Yidong <cyd@stupidchicken.com>
parents:
107526
diff
changeset
|
1598 if (!tooltip_frame) |
1b5ca039f5f2
Fix faulty `if' statement in delete_frame.
Chong Yidong <cyd@stupidchicken.com>
parents:
107526
diff
changeset
|
1599 update_mode_lines = 1; |
16280
f4833d0bfaaa
(Fdelete_frame): Set update_mode_lines.
Richard M. Stallman <rms@gnu.org>
parents:
16263
diff
changeset
|
1600 |
286 | 1601 return Qnil; |
1602 } | |
100632
389db2f016a4
* frame.c (delete_frame): New function derived from
Martin Rudalics <rudalics@gmx.at>
parents:
100617
diff
changeset
|
1603 |
389db2f016a4
* frame.c (delete_frame): New function derived from
Martin Rudalics <rudalics@gmx.at>
parents:
100617
diff
changeset
|
1604 DEFUN ("delete-frame", Fdelete_frame, Sdelete_frame, 0, 2, "", |
389db2f016a4
* frame.c (delete_frame): New function derived from
Martin Rudalics <rudalics@gmx.at>
parents:
100617
diff
changeset
|
1605 doc: /* Delete FRAME, permanently eliminating it from use. |
389db2f016a4
* frame.c (delete_frame): New function derived from
Martin Rudalics <rudalics@gmx.at>
parents:
100617
diff
changeset
|
1606 FRAME defaults to the selected frame. |
389db2f016a4
* frame.c (delete_frame): New function derived from
Martin Rudalics <rudalics@gmx.at>
parents:
100617
diff
changeset
|
1607 |
389db2f016a4
* frame.c (delete_frame): New function derived from
Martin Rudalics <rudalics@gmx.at>
parents:
100617
diff
changeset
|
1608 A frame may not be deleted if its minibuffer is used by other frames. |
389db2f016a4
* frame.c (delete_frame): New function derived from
Martin Rudalics <rudalics@gmx.at>
parents:
100617
diff
changeset
|
1609 Normally, you may not delete a frame if all other frames are invisible, |
389db2f016a4
* frame.c (delete_frame): New function derived from
Martin Rudalics <rudalics@gmx.at>
parents:
100617
diff
changeset
|
1610 but if the second optional argument FORCE is non-nil, you may do so. |
389db2f016a4
* frame.c (delete_frame): New function derived from
Martin Rudalics <rudalics@gmx.at>
parents:
100617
diff
changeset
|
1611 |
389db2f016a4
* frame.c (delete_frame): New function derived from
Martin Rudalics <rudalics@gmx.at>
parents:
100617
diff
changeset
|
1612 This function runs `delete-frame-functions' before actually |
389db2f016a4
* frame.c (delete_frame): New function derived from
Martin Rudalics <rudalics@gmx.at>
parents:
100617
diff
changeset
|
1613 deleting the frame, unless the frame is a tooltip. |
389db2f016a4
* frame.c (delete_frame): New function derived from
Martin Rudalics <rudalics@gmx.at>
parents:
100617
diff
changeset
|
1614 The functions are run with one argument, the frame to be deleted. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109139
diff
changeset
|
1615 (Lisp_Object frame, Lisp_Object force) |
100632
389db2f016a4
* frame.c (delete_frame): New function derived from
Martin Rudalics <rudalics@gmx.at>
parents:
100617
diff
changeset
|
1616 { |
389db2f016a4
* frame.c (delete_frame): New function derived from
Martin Rudalics <rudalics@gmx.at>
parents:
100617
diff
changeset
|
1617 return delete_frame (frame, !NILP (force) ? Qt : Qnil); |
389db2f016a4
* frame.c (delete_frame): New function derived from
Martin Rudalics <rudalics@gmx.at>
parents:
100617
diff
changeset
|
1618 } |
389db2f016a4
* frame.c (delete_frame): New function derived from
Martin Rudalics <rudalics@gmx.at>
parents:
100617
diff
changeset
|
1619 |
286 | 1620 |
1621 /* Return mouse position in character cell units. */ | |
1622 | |
454 | 1623 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
|
1624 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
|
1625 The position is given in character cells, where (0, 0) is the |
72364
6aeca9f02ce7
(Fmouse_position, Fmouse_pixel_position)
Eli Zaretskii <eliz@gnu.org>
parents:
71980
diff
changeset
|
1626 upper-left corner of the frame, X is the horizontal offset, and Y is |
6aeca9f02ce7
(Fmouse_position, Fmouse_pixel_position)
Eli Zaretskii <eliz@gnu.org>
parents:
71980
diff
changeset
|
1627 the vertical offset. |
40105
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1628 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
|
1629 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
|
1630 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
|
1631 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
|
1632 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
|
1633 and returns whatever that function returns. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109139
diff
changeset
|
1634 (void) |
286 | 1635 { |
765 | 1636 FRAME_PTR f; |
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1809
diff
changeset
|
1637 Lisp_Object lispy_dummy; |
1989
b1c1ab20f810
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1920
diff
changeset
|
1638 enum scroll_bar_part party_dummy; |
27795
83292274bbd4
(Vmouse_position_function): New variable.
Dave Love <fx@gnu.org>
parents:
27725
diff
changeset
|
1639 Lisp_Object x, y, retval; |
6054
24ffc4bc4067
(Fmouse_position): Convert to glyph units.
Richard M. Stallman <rms@gnu.org>
parents:
6012
diff
changeset
|
1640 int col, row; |
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1809
diff
changeset
|
1641 unsigned long long_dummy; |
27797
da774b48eb7f
(Fmouse_position): GCPRO retval instead of x and y.
Gerd Moellmann <gerd@gnu.org>
parents:
27795
diff
changeset
|
1642 struct gcpro gcpro1; |
286 | 1643 |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
1644 f = SELECTED_FRAME (); |
3658
c2831d419bec
(Fmouse_position): Set up defaults before calling the hook.
Richard M. Stallman <rms@gnu.org>
parents:
3591
diff
changeset
|
1645 x = y = Qnil; |
c2831d419bec
(Fmouse_position): Set up defaults before calling the hook.
Richard M. Stallman <rms@gnu.org>
parents:
3591
diff
changeset
|
1646 |
81129
e1b18eee2605
(Fmouse_position, Fmouse_pixel_position):
Nick Roberts <nickrob@snap.net.nz>
parents:
81103
diff
changeset
|
1647 #if defined (HAVE_MOUSE) || defined (HAVE_GPM) |
3658
c2831d419bec
(Fmouse_position): Set up defaults before calling the hook.
Richard M. Stallman <rms@gnu.org>
parents:
3591
diff
changeset
|
1648 /* It's okay for the hook to refrain from storing anything. */ |
83431
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83427
diff
changeset
|
1649 if (FRAME_TERMINAL (f)->mouse_position_hook) |
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83427
diff
changeset
|
1650 (*FRAME_TERMINAL (f)->mouse_position_hook) (&f, -1, |
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83427
diff
changeset
|
1651 &lispy_dummy, &party_dummy, |
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83427
diff
changeset
|
1652 &x, &y, |
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83427
diff
changeset
|
1653 &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
|
1654 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
|
1655 { |
c976ac5d85ec
(Fmouse_position) [MULTI_FRAME]: Use pixel_to_glyph, not glyph_to_pixel. Skip
Karl Heuer <kwzh@gnu.org>
parents:
6806
diff
changeset
|
1656 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
|
1657 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
|
1658 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
|
1659 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
|
1660 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
|
1661 } |
11025
6c5aef697fbe
(Fmouse_position): Do work only if HAVE_MOUSE.
Karl Heuer <kwzh@gnu.org>
parents:
11017
diff
changeset
|
1662 #endif |
9268
cb55d0155265
(make_minibuffer_frame, make_terminal_frame, Fselected_frame,
Karl Heuer <kwzh@gnu.org>
parents:
9214
diff
changeset
|
1663 XSETFRAME (lispy_dummy, f); |
27795
83292274bbd4
(Vmouse_position_function): New variable.
Dave Love <fx@gnu.org>
parents:
27725
diff
changeset
|
1664 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
|
1665 GCPRO1 (retval); |
27795
83292274bbd4
(Vmouse_position_function): New variable.
Dave Love <fx@gnu.org>
parents:
27725
diff
changeset
|
1666 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
|
1667 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
|
1668 RETURN_UNGCPRO (retval); |
286 | 1669 } |
1670 | |
7025
24e759919770
(Fmouse_pixel_position, Fset_mouse_pixel_position): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
6986
diff
changeset
|
1671 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
|
1672 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
|
1673 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
|
1674 The position is given in pixel units, where (0, 0) is the |
72364
6aeca9f02ce7
(Fmouse_position, Fmouse_pixel_position)
Eli Zaretskii <eliz@gnu.org>
parents:
71980
diff
changeset
|
1675 upper-left corner of the frame, X is the horizontal offset, and Y is |
6aeca9f02ce7
(Fmouse_position, Fmouse_pixel_position)
Eli Zaretskii <eliz@gnu.org>
parents:
71980
diff
changeset
|
1676 the vertical offset. |
40105
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1677 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
|
1678 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
|
1679 and nil for X and Y. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109139
diff
changeset
|
1680 (void) |
7025
24e759919770
(Fmouse_pixel_position, Fset_mouse_pixel_position): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
6986
diff
changeset
|
1681 { |
24e759919770
(Fmouse_pixel_position, Fset_mouse_pixel_position): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
6986
diff
changeset
|
1682 FRAME_PTR f; |
24e759919770
(Fmouse_pixel_position, Fset_mouse_pixel_position): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
6986
diff
changeset
|
1683 Lisp_Object lispy_dummy; |
24e759919770
(Fmouse_pixel_position, Fset_mouse_pixel_position): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
6986
diff
changeset
|
1684 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
|
1685 Lisp_Object x, y; |
24e759919770
(Fmouse_pixel_position, Fset_mouse_pixel_position): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
6986
diff
changeset
|
1686 unsigned long long_dummy; |
24e759919770
(Fmouse_pixel_position, Fset_mouse_pixel_position): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
6986
diff
changeset
|
1687 |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
1688 f = SELECTED_FRAME (); |
7025
24e759919770
(Fmouse_pixel_position, Fset_mouse_pixel_position): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
6986
diff
changeset
|
1689 x = y = Qnil; |
24e759919770
(Fmouse_pixel_position, Fset_mouse_pixel_position): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
6986
diff
changeset
|
1690 |
81129
e1b18eee2605
(Fmouse_position, Fmouse_pixel_position):
Nick Roberts <nickrob@snap.net.nz>
parents:
81103
diff
changeset
|
1691 #if defined (HAVE_MOUSE) || defined (HAVE_GPM) |
7025
24e759919770
(Fmouse_pixel_position, Fset_mouse_pixel_position): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
6986
diff
changeset
|
1692 /* It's okay for the hook to refrain from storing anything. */ |
83431
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83427
diff
changeset
|
1693 if (FRAME_TERMINAL (f)->mouse_position_hook) |
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83427
diff
changeset
|
1694 (*FRAME_TERMINAL (f)->mouse_position_hook) (&f, -1, |
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83427
diff
changeset
|
1695 &lispy_dummy, &party_dummy, |
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83427
diff
changeset
|
1696 &x, &y, |
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83427
diff
changeset
|
1697 &long_dummy); |
11126
786f1c82a38e
(Fmouse_position--both definitions): Pass 0 for `insist'.
Richard M. Stallman <rms@gnu.org>
parents:
11025
diff
changeset
|
1698 #endif |
9268
cb55d0155265
(make_minibuffer_frame, make_terminal_frame, Fselected_frame,
Karl Heuer <kwzh@gnu.org>
parents:
9214
diff
changeset
|
1699 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
|
1700 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
|
1701 } |
24e759919770
(Fmouse_pixel_position, Fset_mouse_pixel_position): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
6986
diff
changeset
|
1702 |
286 | 1703 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
|
1704 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
|
1705 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
|
1706 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
|
1707 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
|
1708 |
72364
6aeca9f02ce7
(Fmouse_position, Fmouse_pixel_position)
Eli Zaretskii <eliz@gnu.org>
parents:
71980
diff
changeset
|
1709 The position is given in character cells, where (0, 0) is the |
6aeca9f02ce7
(Fmouse_position, Fmouse_pixel_position)
Eli Zaretskii <eliz@gnu.org>
parents:
71980
diff
changeset
|
1710 upper-left corner of the frame, X is the horizontal offset, and Y is |
6aeca9f02ce7
(Fmouse_position, Fmouse_pixel_position)
Eli Zaretskii <eliz@gnu.org>
parents:
71980
diff
changeset
|
1711 the vertical offset. |
6aeca9f02ce7
(Fmouse_position, Fmouse_pixel_position)
Eli Zaretskii <eliz@gnu.org>
parents:
71980
diff
changeset
|
1712 |
40105
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1713 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
|
1714 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
|
1715 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
|
1716 (while (not (frame-visible-p frame)) (sleep-for .5)) */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109139
diff
changeset
|
1717 (Lisp_Object frame, Lisp_Object x, Lisp_Object y) |
286 | 1718 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
1719 CHECK_LIVE_FRAME (frame); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
1720 CHECK_NUMBER (x); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
1721 CHECK_NUMBER (y); |
286 | 1722 |
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1809
diff
changeset
|
1723 /* 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
|
1724 #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
|
1725 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
|
1726 /* 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
|
1727 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
|
1728 #else |
15396 | 1729 #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
|
1730 if (FRAME_MSDOS_P (XFRAME (frame))) |
d4cec5d7566d
(Fset_mouse_position): Remove the DOS-specific
Richard M. Stallman <rms@gnu.org>
parents:
15062
diff
changeset
|
1731 { |
99320
9d9890aa68c5
(do_switch_frame): New argument NORECORD passed to Fselect_window.
Martin Rudalics <rudalics@gmx.at>
parents:
98590
diff
changeset
|
1732 Fselect_frame (frame, Qnil); |
15391
d4cec5d7566d
(Fset_mouse_position): Remove the DOS-specific
Richard M. Stallman <rms@gnu.org>
parents:
15062
diff
changeset
|
1733 mouse_moveto (XINT (x), XINT (y)); |
d4cec5d7566d
(Fset_mouse_position): Remove the DOS-specific
Richard M. Stallman <rms@gnu.org>
parents:
15062
diff
changeset
|
1734 } |
81103
a0c74ff5828c
(Fset_mouse_pixel_position): Add call to
Nick Roberts <nickrob@snap.net.nz>
parents:
76029
diff
changeset
|
1735 #else |
a0c74ff5828c
(Fset_mouse_pixel_position): Add call to
Nick Roberts <nickrob@snap.net.nz>
parents:
76029
diff
changeset
|
1736 #ifdef HAVE_GPM |
a0c74ff5828c
(Fset_mouse_pixel_position): Add call to
Nick Roberts <nickrob@snap.net.nz>
parents:
76029
diff
changeset
|
1737 { |
99320
9d9890aa68c5
(do_switch_frame): New argument NORECORD passed to Fselect_window.
Martin Rudalics <rudalics@gmx.at>
parents:
98590
diff
changeset
|
1738 Fselect_frame (frame, Qnil); |
81103
a0c74ff5828c
(Fset_mouse_pixel_position): Add call to
Nick Roberts <nickrob@snap.net.nz>
parents:
76029
diff
changeset
|
1739 term_mouse_moveto (XINT (x), XINT (y)); |
a0c74ff5828c
(Fset_mouse_pixel_position): Add call to
Nick Roberts <nickrob@snap.net.nz>
parents:
76029
diff
changeset
|
1740 } |
a0c74ff5828c
(Fset_mouse_pixel_position): Add call to
Nick Roberts <nickrob@snap.net.nz>
parents:
76029
diff
changeset
|
1741 #endif |
15391
d4cec5d7566d
(Fset_mouse_position): Remove the DOS-specific
Richard M. Stallman <rms@gnu.org>
parents:
15062
diff
changeset
|
1742 #endif |
286 | 1743 #endif |
1744 | |
1745 return Qnil; | |
1746 } | |
7025
24e759919770
(Fmouse_pixel_position, Fset_mouse_pixel_position): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
6986
diff
changeset
|
1747 |
24e759919770
(Fmouse_pixel_position, Fset_mouse_pixel_position): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
6986
diff
changeset
|
1748 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
|
1749 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
|
1750 doc: /* Move the mouse pointer to pixel position (X,Y) in FRAME. |
72364
6aeca9f02ce7
(Fmouse_position, Fmouse_pixel_position)
Eli Zaretskii <eliz@gnu.org>
parents:
71980
diff
changeset
|
1751 The position is given in pixels, where (0, 0) is the upper-left corner |
6aeca9f02ce7
(Fmouse_position, Fmouse_pixel_position)
Eli Zaretskii <eliz@gnu.org>
parents:
71980
diff
changeset
|
1752 of the frame, X is the horizontal offset, and Y is the vertical offset. |
6aeca9f02ce7
(Fmouse_position, Fmouse_pixel_position)
Eli Zaretskii <eliz@gnu.org>
parents:
71980
diff
changeset
|
1753 |
40105
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1754 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
|
1755 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
|
1756 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
|
1757 (while (not (frame-visible-p frame)) (sleep-for .5)) */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109139
diff
changeset
|
1758 (Lisp_Object frame, Lisp_Object x, Lisp_Object y) |
7025
24e759919770
(Fmouse_pixel_position, Fset_mouse_pixel_position): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
6986
diff
changeset
|
1759 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
1760 CHECK_LIVE_FRAME (frame); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
1761 CHECK_NUMBER (x); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
1762 CHECK_NUMBER (y); |
7025
24e759919770
(Fmouse_pixel_position, Fset_mouse_pixel_position): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
6986
diff
changeset
|
1763 |
24e759919770
(Fmouse_pixel_position, Fset_mouse_pixel_position): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
6986
diff
changeset
|
1764 /* 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
|
1765 #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
|
1766 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
|
1767 /* 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
|
1768 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
|
1769 #else |
15396 | 1770 #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
|
1771 if (FRAME_MSDOS_P (XFRAME (frame))) |
d4cec5d7566d
(Fset_mouse_position): Remove the DOS-specific
Richard M. Stallman <rms@gnu.org>
parents:
15062
diff
changeset
|
1772 { |
99320
9d9890aa68c5
(do_switch_frame): New argument NORECORD passed to Fselect_window.
Martin Rudalics <rudalics@gmx.at>
parents:
98590
diff
changeset
|
1773 Fselect_frame (frame, Qnil); |
15391
d4cec5d7566d
(Fset_mouse_position): Remove the DOS-specific
Richard M. Stallman <rms@gnu.org>
parents:
15062
diff
changeset
|
1774 mouse_moveto (XINT (x), XINT (y)); |
d4cec5d7566d
(Fset_mouse_position): Remove the DOS-specific
Richard M. Stallman <rms@gnu.org>
parents:
15062
diff
changeset
|
1775 } |
81129
e1b18eee2605
(Fmouse_position, Fmouse_pixel_position):
Nick Roberts <nickrob@snap.net.nz>
parents:
81103
diff
changeset
|
1776 #else |
e1b18eee2605
(Fmouse_position, Fmouse_pixel_position):
Nick Roberts <nickrob@snap.net.nz>
parents:
81103
diff
changeset
|
1777 #ifdef HAVE_GPM |
e1b18eee2605
(Fmouse_position, Fmouse_pixel_position):
Nick Roberts <nickrob@snap.net.nz>
parents:
81103
diff
changeset
|
1778 { |
99320
9d9890aa68c5
(do_switch_frame): New argument NORECORD passed to Fselect_window.
Martin Rudalics <rudalics@gmx.at>
parents:
98590
diff
changeset
|
1779 Fselect_frame (frame, Qnil); |
81129
e1b18eee2605
(Fmouse_position, Fmouse_pixel_position):
Nick Roberts <nickrob@snap.net.nz>
parents:
81103
diff
changeset
|
1780 term_mouse_moveto (XINT (x), XINT (y)); |
e1b18eee2605
(Fmouse_position, Fmouse_pixel_position):
Nick Roberts <nickrob@snap.net.nz>
parents:
81103
diff
changeset
|
1781 } |
e1b18eee2605
(Fmouse_position, Fmouse_pixel_position):
Nick Roberts <nickrob@snap.net.nz>
parents:
81103
diff
changeset
|
1782 #endif |
15391
d4cec5d7566d
(Fset_mouse_position): Remove the DOS-specific
Richard M. Stallman <rms@gnu.org>
parents:
15062
diff
changeset
|
1783 #endif |
7025
24e759919770
(Fmouse_pixel_position, Fset_mouse_pixel_position): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
6986
diff
changeset
|
1784 #endif |
24e759919770
(Fmouse_pixel_position, Fset_mouse_pixel_position): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
6986
diff
changeset
|
1785 |
24e759919770
(Fmouse_pixel_position, Fset_mouse_pixel_position): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
6986
diff
changeset
|
1786 return Qnil; |
24e759919770
(Fmouse_pixel_position, Fset_mouse_pixel_position): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
6986
diff
changeset
|
1787 } |
286 | 1788 |
109100
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
109089
diff
changeset
|
1789 static void make_frame_visible_1 (Lisp_Object); |
22188
9fba463768ec
(frame_buffer_predicate): New arg FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
21825
diff
changeset
|
1790 |
765 | 1791 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
|
1792 0, 1, "", |
40105
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1793 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
|
1794 If omitted, FRAME defaults to the currently selected frame. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109139
diff
changeset
|
1795 (Lisp_Object frame) |
286 | 1796 { |
872 | 1797 if (NILP (frame)) |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
1798 frame = selected_frame; |
872 | 1799 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
1800 CHECK_LIVE_FRAME (frame); |
286 | 1801 |
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1809
diff
changeset
|
1802 /* 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
|
1803 #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
|
1804 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
|
1805 { |
9b41ddf1b5f7
(Fmake_frame_visible): Use FRAME_SAMPLE_VISIBILITY. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
4961
diff
changeset
|
1806 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
|
1807 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
|
1808 } |
965
0eb68c6c452a
* frame.c (Qheight, Qicon, Qmodeline, Qname, Qnone, Qonly,
Jim Blandy <jimb@redhat.com>
parents:
886
diff
changeset
|
1809 #endif |
286 | 1810 |
22188
9fba463768ec
(frame_buffer_predicate): New arg FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
21825
diff
changeset
|
1811 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
|
1812 |
39918
fa0407ac162f
(Fset_mouse_position): Improve style of comment to follow other comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39748
diff
changeset
|
1813 /* 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
|
1814 windows_or_buffers_changed++; |
60795e826dad
Put stdio.h after config.h.
Richard M. Stallman <rms@gnu.org>
parents:
7646
diff
changeset
|
1815 |
765 | 1816 return frame; |
286 | 1817 } |
1818 | |
22188
9fba463768ec
(frame_buffer_predicate): New arg FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
21825
diff
changeset
|
1819 /* 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
|
1820 and all its descendents. */ |
9fba463768ec
(frame_buffer_predicate): New arg FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
21825
diff
changeset
|
1821 |
9fba463768ec
(frame_buffer_predicate): New arg FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
21825
diff
changeset
|
1822 static void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1823 make_frame_visible_1 (Lisp_Object window) |
22188
9fba463768ec
(frame_buffer_predicate): New arg FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
21825
diff
changeset
|
1824 { |
9fba463768ec
(frame_buffer_predicate): New arg FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
21825
diff
changeset
|
1825 struct window *w; |
9fba463768ec
(frame_buffer_predicate): New arg FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
21825
diff
changeset
|
1826 |
9fba463768ec
(frame_buffer_predicate): New arg FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
21825
diff
changeset
|
1827 for (;!NILP (window); window = w->next) |
9fba463768ec
(frame_buffer_predicate): New arg FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
21825
diff
changeset
|
1828 { |
9fba463768ec
(frame_buffer_predicate): New arg FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
21825
diff
changeset
|
1829 w = XWINDOW (window); |
9fba463768ec
(frame_buffer_predicate): New arg FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
21825
diff
changeset
|
1830 |
9fba463768ec
(frame_buffer_predicate): New arg FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
21825
diff
changeset
|
1831 if (!NILP (w->buffer)) |
9fba463768ec
(frame_buffer_predicate): New arg FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
21825
diff
changeset
|
1832 XBUFFER (w->buffer)->display_time = Fcurrent_time (); |
9fba463768ec
(frame_buffer_predicate): New arg FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
21825
diff
changeset
|
1833 |
9fba463768ec
(frame_buffer_predicate): New arg FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
21825
diff
changeset
|
1834 if (!NILP (w->vchild)) |
9fba463768ec
(frame_buffer_predicate): New arg FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
21825
diff
changeset
|
1835 make_frame_visible_1 (w->vchild); |
9fba463768ec
(frame_buffer_predicate): New arg FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
21825
diff
changeset
|
1836 if (!NILP (w->hchild)) |
9fba463768ec
(frame_buffer_predicate): New arg FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
21825
diff
changeset
|
1837 make_frame_visible_1 (w->hchild); |
9fba463768ec
(frame_buffer_predicate): New arg FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
21825
diff
changeset
|
1838 } |
9fba463768ec
(frame_buffer_predicate): New arg FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
21825
diff
changeset
|
1839 } |
9fba463768ec
(frame_buffer_predicate): New arg FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
21825
diff
changeset
|
1840 |
765 | 1841 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
|
1842 0, 2, "", |
105814
d3531eb1d0d5
* frame.c (Fmake_frame_invisible, Fframe_visible_p): Doc fix
Chong Yidong <cyd@stupidchicken.com>
parents:
105772
diff
changeset
|
1843 doc: /* Make the frame FRAME invisible. |
40105
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1844 If omitted, FRAME defaults to the currently selected frame. |
105814
d3531eb1d0d5
* frame.c (Fmake_frame_invisible, Fframe_visible_p): Doc fix
Chong Yidong <cyd@stupidchicken.com>
parents:
105772
diff
changeset
|
1845 On graphical displays, invisible frames are not updated and are |
d3531eb1d0d5
* frame.c (Fmake_frame_invisible, Fframe_visible_p): Doc fix
Chong Yidong <cyd@stupidchicken.com>
parents:
105772
diff
changeset
|
1846 usually not displayed at all, even in a window system's \"taskbar\". |
d3531eb1d0d5
* frame.c (Fmake_frame_invisible, Fframe_visible_p): Doc fix
Chong Yidong <cyd@stupidchicken.com>
parents:
105772
diff
changeset
|
1847 |
40105
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1848 Normally you may not make FRAME invisible if all other frames are invisible, |
105814
d3531eb1d0d5
* frame.c (Fmake_frame_invisible, Fframe_visible_p): Doc fix
Chong Yidong <cyd@stupidchicken.com>
parents:
105772
diff
changeset
|
1849 but if the second optional argument FORCE is non-nil, you may do so. |
d3531eb1d0d5
* frame.c (Fmake_frame_invisible, Fframe_visible_p): Doc fix
Chong Yidong <cyd@stupidchicken.com>
parents:
105772
diff
changeset
|
1850 |
d3531eb1d0d5
* frame.c (Fmake_frame_invisible, Fframe_visible_p): Doc fix
Chong Yidong <cyd@stupidchicken.com>
parents:
105772
diff
changeset
|
1851 This function has no effect on text-only terminal frames. Such frames |
d3531eb1d0d5
* frame.c (Fmake_frame_invisible, Fframe_visible_p): Doc fix
Chong Yidong <cyd@stupidchicken.com>
parents:
105772
diff
changeset
|
1852 are always considered visible, whether or not they are currently being |
d3531eb1d0d5
* frame.c (Fmake_frame_invisible, Fframe_visible_p): Doc fix
Chong Yidong <cyd@stupidchicken.com>
parents:
105772
diff
changeset
|
1853 displayed in the terminal. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109139
diff
changeset
|
1854 (Lisp_Object frame, Lisp_Object force) |
286 | 1855 { |
872 | 1856 if (NILP (frame)) |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
1857 frame = selected_frame; |
872 | 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); |
286 | 1860 |
5925
806e876cacb4
(Fset_frame_height, Fset_frame_width, Fset_frame_size):
Richard M. Stallman <rms@gnu.org>
parents:
5552
diff
changeset
|
1861 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
|
1862 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
|
1863 |
8586
c78654909acf
(Fmake_frame_invisible, Ficonify_frame): Don't switch frames.
Karl Heuer <kwzh@gnu.org>
parents:
8264
diff
changeset
|
1864 #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
|
1865 /* Don't let the frame remain selected. */ |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
1866 if (EQ (frame, selected_frame)) |
99320
9d9890aa68c5
(do_switch_frame): New argument NORECORD passed to Fselect_window.
Martin Rudalics <rudalics@gmx.at>
parents:
98590
diff
changeset
|
1867 do_switch_frame (next_frame (frame, Qt), 0, 0, Qnil) |
8586
c78654909acf
(Fmake_frame_invisible, Ficonify_frame): Don't switch frames.
Karl Heuer <kwzh@gnu.org>
parents:
8264
diff
changeset
|
1868 #endif |
3283
e2a40a3baa4b
(Ficonify_frame, Fmake_frame_invisible):
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
1869 |
e2a40a3baa4b
(Ficonify_frame, Fmake_frame_invisible):
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
1870 /* 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
|
1871 if (EQ (XFRAME (frame)->minibuffer_window, minibuf_window)) |
e2a40a3baa4b
(Ficonify_frame, Fmake_frame_invisible):
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
1872 { |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
1873 struct frame *sf = XFRAME (selected_frame); |
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
1874 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
|
1875 XWINDOW (minibuf_window)->buffer, Qnil); |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
1876 minibuf_window = sf->minibuffer_window; |
3283
e2a40a3baa4b
(Ficonify_frame, Fmake_frame_invisible):
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
1877 } |
e2a40a3baa4b
(Ficonify_frame, Fmake_frame_invisible):
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
1878 |
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1809
diff
changeset
|
1879 /* 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
|
1880 #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
|
1881 if (FRAME_WINDOW_P (XFRAME (frame))) |
765 | 1882 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
|
1883 #endif |
286 | 1884 |
39918
fa0407ac162f
(Fset_mouse_position): Improve style of comment to follow other comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39748
diff
changeset
|
1885 /* 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
|
1886 windows_or_buffers_changed++; |
60795e826dad
Put stdio.h after config.h.
Richard M. Stallman <rms@gnu.org>
parents:
7646
diff
changeset
|
1887 |
286 | 1888 return Qnil; |
1889 } | |
1890 | |
765 | 1891 DEFUN ("iconify-frame", Ficonify_frame, Siconify_frame, |
872 | 1892 0, 1, "", |
40105
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
1893 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
|
1894 If omitted, FRAME defaults to the currently selected frame. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109139
diff
changeset
|
1895 (Lisp_Object frame) |
286 | 1896 { |
872 | 1897 if (NILP (frame)) |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
1898 frame = selected_frame; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
1899 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
1900 CHECK_LIVE_FRAME (frame); |
286 | 1901 |
8586
c78654909acf
(Fmake_frame_invisible, Ficonify_frame): Don't switch frames.
Karl Heuer <kwzh@gnu.org>
parents:
8264
diff
changeset
|
1902 #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
|
1903 /* Don't let the frame remain selected. */ |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
1904 if (EQ (frame, selected_frame)) |
63184
1ba4135e8efa
(Fhandle_switch_frame, Fselect_frame): Delete unused arg no_enter.
Luc Teirlinck <teirllm@auburn.edu>
parents:
61784
diff
changeset
|
1905 Fhandle_switch_frame (next_frame (frame, Qt)); |
8586
c78654909acf
(Fmake_frame_invisible, Ficonify_frame): Don't switch frames.
Karl Heuer <kwzh@gnu.org>
parents:
8264
diff
changeset
|
1906 #endif |
3283
e2a40a3baa4b
(Ficonify_frame, Fmake_frame_invisible):
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
1907 |
e2a40a3baa4b
(Ficonify_frame, Fmake_frame_invisible):
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
1908 /* 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
|
1909 if (EQ (XFRAME (frame)->minibuffer_window, minibuf_window)) |
e2a40a3baa4b
(Ficonify_frame, Fmake_frame_invisible):
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
1910 { |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
1911 struct frame *sf = XFRAME (selected_frame); |
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
1912 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
|
1913 XWINDOW (minibuf_window)->buffer, Qnil); |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
1914 minibuf_window = sf->minibuffer_window; |
3283
e2a40a3baa4b
(Ficonify_frame, Fmake_frame_invisible):
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
1915 } |
e2a40a3baa4b
(Ficonify_frame, Fmake_frame_invisible):
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
1916 |
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1809
diff
changeset
|
1917 /* 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
|
1918 #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
|
1919 if (FRAME_WINDOW_P (XFRAME (frame))) |
765 | 1920 x_iconify_frame (XFRAME (frame)); |
965
0eb68c6c452a
* frame.c (Qheight, Qicon, Qmodeline, Qname, Qnone, Qonly,
Jim Blandy <jimb@redhat.com>
parents:
886
diff
changeset
|
1921 #endif |
286 | 1922 |
39918
fa0407ac162f
(Fset_mouse_position): Improve style of comment to follow other comments.
Pavel Janík <Pavel@Janik.cz>
parents:
39748
diff
changeset
|
1923 /* 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
|
1924 windows_or_buffers_changed++; |
60795e826dad
Put stdio.h after config.h.
Richard M. Stallman <rms@gnu.org>
parents:
7646
diff
changeset
|
1925 |
286 | 1926 return Qnil; |
1927 } | |
1928 | |
765 | 1929 DEFUN ("frame-visible-p", Fframe_visible_p, Sframe_visible_p, |
286 | 1930 1, 1, 0, |
105814
d3531eb1d0d5
* frame.c (Fmake_frame_invisible, Fframe_visible_p): Doc fix
Chong Yidong <cyd@stupidchicken.com>
parents:
105772
diff
changeset
|
1931 doc: /* Return t if FRAME is \"visible\" (actually in use for display). |
d3531eb1d0d5
* frame.c (Fmake_frame_invisible, Fframe_visible_p): Doc fix
Chong Yidong <cyd@stupidchicken.com>
parents:
105772
diff
changeset
|
1932 Return the symbol `icon' if FRAME is iconified or \"minimized\". |
d3531eb1d0d5
* frame.c (Fmake_frame_invisible, Fframe_visible_p): Doc fix
Chong Yidong <cyd@stupidchicken.com>
parents:
105772
diff
changeset
|
1933 Return nil if FRAME was made invisible, via `make-frame-invisible'. |
d3531eb1d0d5
* frame.c (Fmake_frame_invisible, Fframe_visible_p): Doc fix
Chong Yidong <cyd@stupidchicken.com>
parents:
105772
diff
changeset
|
1934 On graphical displays, invisible frames are not updated and are |
d3531eb1d0d5
* frame.c (Fmake_frame_invisible, Fframe_visible_p): Doc fix
Chong Yidong <cyd@stupidchicken.com>
parents:
105772
diff
changeset
|
1935 usually not displayed at all, even in a window system's \"taskbar\". |
d3531eb1d0d5
* frame.c (Fmake_frame_invisible, Fframe_visible_p): Doc fix
Chong Yidong <cyd@stupidchicken.com>
parents:
105772
diff
changeset
|
1936 |
d3531eb1d0d5
* frame.c (Fmake_frame_invisible, Fframe_visible_p): Doc fix
Chong Yidong <cyd@stupidchicken.com>
parents:
105772
diff
changeset
|
1937 If FRAME is a text-only terminal frame, this always returns t. |
d3531eb1d0d5
* frame.c (Fmake_frame_invisible, Fframe_visible_p): Doc fix
Chong Yidong <cyd@stupidchicken.com>
parents:
105772
diff
changeset
|
1938 Such frames are always considered visible, whether or not they are |
d3531eb1d0d5
* frame.c (Fmake_frame_invisible, Fframe_visible_p): Doc fix
Chong Yidong <cyd@stupidchicken.com>
parents:
105772
diff
changeset
|
1939 currently being displayed on the terminal. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109139
diff
changeset
|
1940 (Lisp_Object frame) |
286 | 1941 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
1942 CHECK_LIVE_FRAME (frame); |
286 | 1943 |
6012
650c0f231d17
(Fframe_visible_p): Do FRAME_SAMPLE_VISIBILITY first.
Richard M. Stallman <rms@gnu.org>
parents:
5925
diff
changeset
|
1944 FRAME_SAMPLE_VISIBILITY (XFRAME (frame)); |
650c0f231d17
(Fframe_visible_p): Do FRAME_SAMPLE_VISIBILITY first.
Richard M. Stallman <rms@gnu.org>
parents:
5925
diff
changeset
|
1945 |
1709
b86b3237e017
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1691
diff
changeset
|
1946 if (FRAME_VISIBLE_P (XFRAME (frame))) |
286 | 1947 return Qt; |
1709
b86b3237e017
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1691
diff
changeset
|
1948 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
|
1949 return Qicon; |
286 | 1950 return Qnil; |
1951 } | |
1952 | |
765 | 1953 DEFUN ("visible-frame-list", Fvisible_frame_list, Svisible_frame_list, |
286 | 1954 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
|
1955 doc: /* Return a list of all frames now \"visible\" (being updated). */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109139
diff
changeset
|
1956 (void) |
286 | 1957 { |
765 | 1958 Lisp_Object tail, frame; |
1959 struct frame *f; | |
286 | 1960 Lisp_Object value; |
1961 | |
1962 value = Qnil; | |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
1963 for (tail = Vframe_list; CONSP (tail); tail = XCDR (tail)) |
286 | 1964 { |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
1965 frame = XCAR (tail); |
9127
0b4836daa8e1
(Fframep, make_frame_without_minibuffer, do_switch_frame, prev_frame,
Karl Heuer <kwzh@gnu.org>
parents:
9032
diff
changeset
|
1966 if (!FRAMEP (frame)) |
286 | 1967 continue; |
765 | 1968 f = XFRAME (frame); |
1709
b86b3237e017
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1691
diff
changeset
|
1969 if (FRAME_VISIBLE_P (f)) |
765 | 1970 value = Fcons (frame, value); |
286 | 1971 } |
1972 return value; | |
1973 } | |
363 | 1974 |
1975 | |
11754
7691dbfc7571
(Fraise_frame, Flower_frame): Make arg FRAME optional.
Richard M. Stallman <rms@gnu.org>
parents:
11535
diff
changeset
|
1976 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
|
1977 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
|
1978 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
|
1979 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
|
1980 If Emacs is displaying on an ordinary terminal or some other device which |
98579
6a4d13121cb1
(Fraise_frame): On text-only terminals select frame in
Martin Rudalics <rudalics@gmx.at>
parents:
98240
diff
changeset
|
1981 doesn't support multiple overlapping frames, this function selects FRAME. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109139
diff
changeset
|
1982 (Lisp_Object frame) |
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1809
diff
changeset
|
1983 { |
83004
7900111db01c
Converted display hooks to be display-local. Plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83003
diff
changeset
|
1984 struct frame *f; |
11211
2f9a24a4c9eb
(Fraise_frame, Flower_frame): Now interactive.
Richard M. Stallman <rms@gnu.org>
parents:
11169
diff
changeset
|
1985 if (NILP (frame)) |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
1986 frame = selected_frame; |
11211
2f9a24a4c9eb
(Fraise_frame, Flower_frame): Now interactive.
Richard M. Stallman <rms@gnu.org>
parents:
11169
diff
changeset
|
1987 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
1988 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
|
1989 |
83004
7900111db01c
Converted display hooks to be display-local. Plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83003
diff
changeset
|
1990 f = XFRAME (frame); |
85651
a8927de00181
(syms_of_frame) <delete-frame-functions>: Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
85614
diff
changeset
|
1991 |
98579
6a4d13121cb1
(Fraise_frame): On text-only terminals select frame in
Martin Rudalics <rudalics@gmx.at>
parents:
98240
diff
changeset
|
1992 if (FRAME_TERMCAP_P (f)) |
6a4d13121cb1
(Fraise_frame): On text-only terminals select frame in
Martin Rudalics <rudalics@gmx.at>
parents:
98240
diff
changeset
|
1993 /* On a text-only terminal select FRAME. */ |
99320
9d9890aa68c5
(do_switch_frame): New argument NORECORD passed to Fselect_window.
Martin Rudalics <rudalics@gmx.at>
parents:
98590
diff
changeset
|
1994 Fselect_frame (frame, Qnil); |
98579
6a4d13121cb1
(Fraise_frame): On text-only terminals select frame in
Martin Rudalics <rudalics@gmx.at>
parents:
98240
diff
changeset
|
1995 else |
6a4d13121cb1
(Fraise_frame): On text-only terminals select frame in
Martin Rudalics <rudalics@gmx.at>
parents:
98240
diff
changeset
|
1996 /* Do like the documentation says. */ |
6a4d13121cb1
(Fraise_frame): On text-only terminals select frame in
Martin Rudalics <rudalics@gmx.at>
parents:
98240
diff
changeset
|
1997 Fmake_frame_visible (frame); |
4961
dd67510308ae
(Fraise_frame): Do like the documentation says, and make
Richard M. Stallman <rms@gnu.org>
parents:
4798
diff
changeset
|
1998 |
83431
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83427
diff
changeset
|
1999 if (FRAME_TERMINAL (f)->frame_raise_lower_hook) |
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83427
diff
changeset
|
2000 (*FRAME_TERMINAL (f)->frame_raise_lower_hook) (f, 1); |
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1809
diff
changeset
|
2001 |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1809
diff
changeset
|
2002 return Qnil; |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1809
diff
changeset
|
2003 } |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1809
diff
changeset
|
2004 |
2282
f727944c11aa
* frame.c (Fraise_frame, Flower_frame): Renamed from
Jim Blandy <jimb@redhat.com>
parents:
2207
diff
changeset
|
2005 /* 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
|
2006 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
|
2007 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
|
2008 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
|
2009 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
|
2010 doesn't support multiple overlapping frames, this function does nothing. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109139
diff
changeset
|
2011 (Lisp_Object frame) |
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1809
diff
changeset
|
2012 { |
83004
7900111db01c
Converted display hooks to be display-local. Plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83003
diff
changeset
|
2013 struct frame *f; |
85651
a8927de00181
(syms_of_frame) <delete-frame-functions>: Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
85614
diff
changeset
|
2014 |
11211
2f9a24a4c9eb
(Fraise_frame, Flower_frame): Now interactive.
Richard M. Stallman <rms@gnu.org>
parents:
11169
diff
changeset
|
2015 if (NILP (frame)) |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
2016 frame = selected_frame; |
11211
2f9a24a4c9eb
(Fraise_frame, Flower_frame): Now interactive.
Richard M. Stallman <rms@gnu.org>
parents:
11169
diff
changeset
|
2017 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
2018 CHECK_LIVE_FRAME (frame); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
2019 |
83004
7900111db01c
Converted display hooks to be display-local. Plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83003
diff
changeset
|
2020 f = XFRAME (frame); |
85651
a8927de00181
(syms_of_frame) <delete-frame-functions>: Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
85614
diff
changeset
|
2021 |
83431
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83427
diff
changeset
|
2022 if (FRAME_TERMINAL (f)->frame_raise_lower_hook) |
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83427
diff
changeset
|
2023 (*FRAME_TERMINAL (f)->frame_raise_lower_hook) (f, 0); |
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1809
diff
changeset
|
2024 |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1809
diff
changeset
|
2025 return Qnil; |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1809
diff
changeset
|
2026 } |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1809
diff
changeset
|
2027 |
363 | 2028 |
765 | 2029 DEFUN ("redirect-frame-focus", Fredirect_frame_focus, Sredirect_frame_focus, |
363 | 2030 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
|
2031 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
|
2032 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
|
2033 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
|
2034 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
|
2035 |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
2036 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
|
2037 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
|
2038 |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
2039 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
|
2040 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
|
2041 minibuffer window. |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
2042 |
65976
c332e9c9e66d
(Fredirect_frame_focus): Fix typos in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
64770
diff
changeset
|
2043 A frame's focus redirection can be changed by `select-frame'. If frame |
40105
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
2044 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
|
2045 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
|
2046 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
|
2047 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
|
2048 |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
2049 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
|
2050 differently from a frame whose focus is redirected to nil; the former |
65976
c332e9c9e66d
(Fredirect_frame_focus): Fix typos in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
64770
diff
changeset
|
2051 is affected by `select-frame', while the latter is not. |
40105
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
2052 |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
2053 The redirection lasts until `redirect-frame-focus' is called to change it. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109139
diff
changeset
|
2054 (Lisp_Object frame, Lisp_Object focus_frame) |
363 | 2055 { |
83004
7900111db01c
Converted display hooks to be display-local. Plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83003
diff
changeset
|
2056 struct frame *f; |
85651
a8927de00181
(syms_of_frame) <delete-frame-functions>: Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
85614
diff
changeset
|
2057 |
3970
020fe391d5c1
* frame.c (Fredirect_frame_focus): Allow redirection of focus of
Jim Blandy <jimb@redhat.com>
parents:
3834
diff
changeset
|
2058 /* 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
|
2059 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
|
2060 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
|
2061 CHECK_FRAME (frame); |
454 | 2062 |
1709
b86b3237e017
* frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents:
1691
diff
changeset
|
2063 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
|
2064 CHECK_LIVE_FRAME (focus_frame); |
363 | 2065 |
83004
7900111db01c
Converted display hooks to be display-local. Plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83003
diff
changeset
|
2066 f = XFRAME (frame); |
85651
a8927de00181
(syms_of_frame) <delete-frame-functions>: Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
85614
diff
changeset
|
2067 |
83004
7900111db01c
Converted display hooks to be display-local. Plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83003
diff
changeset
|
2068 f->focus_frame = focus_frame; |
7900111db01c
Converted display hooks to be display-local. Plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83003
diff
changeset
|
2069 |
83431
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83427
diff
changeset
|
2070 if (FRAME_TERMINAL (f)->frame_rehighlight_hook) |
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83427
diff
changeset
|
2071 (*FRAME_TERMINAL (f)->frame_rehighlight_hook) (f); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
2072 |
363 | 2073 return Qnil; |
2074 } | |
2075 | |
2076 | |
765 | 2077 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
|
2078 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
|
2079 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
|
2080 See `redirect-frame-focus'. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109139
diff
changeset
|
2081 (Lisp_Object frame) |
363 | 2082 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
2083 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
|
2084 |
765 | 2085 return FRAME_FOCUS_FRAME (XFRAME (frame)); |
363 | 2086 } |
2087 | |
2088 | |
286 | 2089 |
10207
e6618f52efe9
(Fmodify_frame_parameters): For non-X frames,
Richard M. Stallman <rms@gnu.org>
parents:
9972
diff
changeset
|
2090 /* 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
|
2091 |
286 | 2092 Lisp_Object |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
2093 get_frame_param (register struct frame *frame, Lisp_Object prop) |
286 | 2094 { |
2095 register Lisp_Object tem; | |
2096 | |
765 | 2097 tem = Fassq (prop, frame->param_alist); |
286 | 2098 if (EQ (tem, Qnil)) |
2099 return tem; | |
2100 return Fcdr (tem); | |
2101 } | |
2102 | |
10207
e6618f52efe9
(Fmodify_frame_parameters): For non-X frames,
Richard M. Stallman <rms@gnu.org>
parents:
9972
diff
changeset
|
2103 /* 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
|
2104 |
e6618f52efe9
(Fmodify_frame_parameters): For non-X frames,
Richard M. Stallman <rms@gnu.org>
parents:
9972
diff
changeset
|
2105 Lisp_Object |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
2106 frame_buffer_predicate (Lisp_Object frame) |
10207
e6618f52efe9
(Fmodify_frame_parameters): For non-X frames,
Richard M. Stallman <rms@gnu.org>
parents:
9972
diff
changeset
|
2107 { |
22188
9fba463768ec
(frame_buffer_predicate): New arg FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
21825
diff
changeset
|
2108 return XFRAME (frame)->buffer_predicate; |
10207
e6618f52efe9
(Fmodify_frame_parameters): For non-X frames,
Richard M. Stallman <rms@gnu.org>
parents:
9972
diff
changeset
|
2109 } |
e6618f52efe9
(Fmodify_frame_parameters): For non-X frames,
Richard M. Stallman <rms@gnu.org>
parents:
9972
diff
changeset
|
2110 |
17221
0530a375eb21
(frame_buffer_list, set_frame_buffer_list): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
17032
diff
changeset
|
2111 /* 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
|
2112 |
0530a375eb21
(frame_buffer_list, set_frame_buffer_list): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
17032
diff
changeset
|
2113 Lisp_Object |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
2114 frame_buffer_list (Lisp_Object frame) |
17221
0530a375eb21
(frame_buffer_list, set_frame_buffer_list): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
17032
diff
changeset
|
2115 { |
22188
9fba463768ec
(frame_buffer_predicate): New arg FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
21825
diff
changeset
|
2116 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
|
2117 } |
0530a375eb21
(frame_buffer_list, set_frame_buffer_list): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
17032
diff
changeset
|
2118 |
0530a375eb21
(frame_buffer_list, set_frame_buffer_list): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
17032
diff
changeset
|
2119 /* 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
|
2120 |
0530a375eb21
(frame_buffer_list, set_frame_buffer_list): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
17032
diff
changeset
|
2121 void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
2122 set_frame_buffer_list (Lisp_Object frame, Lisp_Object list) |
17221
0530a375eb21
(frame_buffer_list, set_frame_buffer_list): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
17032
diff
changeset
|
2123 { |
22188
9fba463768ec
(frame_buffer_predicate): New arg FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
21825
diff
changeset
|
2124 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
|
2125 } |
0530a375eb21
(frame_buffer_list, set_frame_buffer_list): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
17032
diff
changeset
|
2126 |
83415
d2c799f58129
Implement full support for frame-local `next-buffer' and `previous-buffer'.
Karoly Lorentey <lorentey@elte.hu>
parents:
83384
diff
changeset
|
2127 /* Discard BUFFER from the buffer-list and buried-buffer-list of each frame. */ |
17221
0530a375eb21
(frame_buffer_list, set_frame_buffer_list): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
17032
diff
changeset
|
2128 |
0530a375eb21
(frame_buffer_list, set_frame_buffer_list): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
17032
diff
changeset
|
2129 void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
2130 frames_discard_buffer (Lisp_Object buffer) |
17221
0530a375eb21
(frame_buffer_list, set_frame_buffer_list): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
17032
diff
changeset
|
2131 { |
0530a375eb21
(frame_buffer_list, set_frame_buffer_list): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
17032
diff
changeset
|
2132 Lisp_Object frame, tail; |
0530a375eb21
(frame_buffer_list, set_frame_buffer_list): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
17032
diff
changeset
|
2133 |
0530a375eb21
(frame_buffer_list, set_frame_buffer_list): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
17032
diff
changeset
|
2134 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
|
2135 { |
0530a375eb21
(frame_buffer_list, set_frame_buffer_list): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
17032
diff
changeset
|
2136 XFRAME (frame)->buffer_list |
0530a375eb21
(frame_buffer_list, set_frame_buffer_list): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
17032
diff
changeset
|
2137 = Fdelq (buffer, XFRAME (frame)->buffer_list); |
83415
d2c799f58129
Implement full support for frame-local `next-buffer' and `previous-buffer'.
Karoly Lorentey <lorentey@elte.hu>
parents:
83384
diff
changeset
|
2138 XFRAME (frame)->buried_buffer_list |
d2c799f58129
Implement full support for frame-local `next-buffer' and `previous-buffer'.
Karoly Lorentey <lorentey@elte.hu>
parents:
83384
diff
changeset
|
2139 = Fdelq (buffer, XFRAME (frame)->buried_buffer_list); |
17221
0530a375eb21
(frame_buffer_list, set_frame_buffer_list): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
17032
diff
changeset
|
2140 } |
0530a375eb21
(frame_buffer_list, set_frame_buffer_list): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
17032
diff
changeset
|
2141 } |
0530a375eb21
(frame_buffer_list, set_frame_buffer_list): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
17032
diff
changeset
|
2142 |
10207
e6618f52efe9
(Fmodify_frame_parameters): For non-X frames,
Richard M. Stallman <rms@gnu.org>
parents:
9972
diff
changeset
|
2143 /* 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
|
2144 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
|
2145 |
286 | 2146 void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
2147 store_in_alist (Lisp_Object *alistptr, Lisp_Object prop, Lisp_Object val) |
286 | 2148 { |
2149 register Lisp_Object tem; | |
2150 | |
2151 tem = Fassq (prop, *alistptr); | |
2152 if (EQ (tem, Qnil)) | |
2153 *alistptr = Fcons (Fcons (prop, val), *alistptr); | |
2154 else | |
2155 Fsetcdr (tem, val); | |
2156 } | |
2157 | |
20280
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
2158 static int |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
2159 frame_name_fnn_p (char *str, EMACS_INT len) |
20280
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
2160 { |
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
2161 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
|
2162 { |
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
2163 char *end_ptr; |
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
2164 |
25789
d68642dd5bbf
(frame_name_fnn_p): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
25736
diff
changeset
|
2165 strtol (str + 1, &end_ptr, 10); |
d68642dd5bbf
(frame_name_fnn_p): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
25736
diff
changeset
|
2166 |
20280
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
2167 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
|
2168 return 1; |
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
2169 } |
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
2170 return 0; |
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
2171 } |
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
2172 |
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
2173 /* 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
|
2174 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
|
2175 |
65976
c332e9c9e66d
(Fredirect_frame_focus): Fix typos in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
64770
diff
changeset
|
2176 static void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
2177 set_term_frame_name (struct frame *f, Lisp_Object name) |
20280
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
2178 { |
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
2179 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
|
2180 |
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
2181 /* 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
|
2182 if (NILP (name)) |
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
2183 { |
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
2184 char namebuf[20]; |
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
2185 |
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
2186 /* 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
|
2187 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
|
2188 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
|
2189 SBYTES (f->name))) |
20280
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
2190 return; |
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
2191 |
83431
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83427
diff
changeset
|
2192 tty_frame_count++; |
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83427
diff
changeset
|
2193 sprintf (namebuf, "F%d", tty_frame_count); |
20280
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
2194 name = build_string (namebuf); |
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
2195 } |
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
2196 else |
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
2197 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
2198 CHECK_STRING (name); |
20280
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
2199 |
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
2200 /* 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
|
2201 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
|
2202 return; |
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
2203 |
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
2204 /* 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
|
2205 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
|
2206 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
|
2207 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
|
2208 } |
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
2209 |
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
2210 f->name = name; |
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
2211 update_mode_lines = 1; |
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
2212 } |
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
2213 |
286 | 2214 void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
2215 store_frame_param (struct frame *f, Lisp_Object prop, Lisp_Object val) |
286 | 2216 { |
29616
8d7a0f575a0e
(Fmodify_frame_parameters): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents:
28930
diff
changeset
|
2217 register Lisp_Object old_alist_elt; |
286 | 2218 |
83415
d2c799f58129
Implement full support for frame-local `next-buffer' and `previous-buffer'.
Karoly Lorentey <lorentey@elte.hu>
parents:
83384
diff
changeset
|
2219 /* The buffer-list parameters are stored in a special place and not |
d2c799f58129
Implement full support for frame-local `next-buffer' and `previous-buffer'.
Karoly Lorentey <lorentey@elte.hu>
parents:
83384
diff
changeset
|
2220 in the alist. */ |
17221
0530a375eb21
(frame_buffer_list, set_frame_buffer_list): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
17032
diff
changeset
|
2221 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
|
2222 { |
0530a375eb21
(frame_buffer_list, set_frame_buffer_list): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
17032
diff
changeset
|
2223 f->buffer_list = val; |
0530a375eb21
(frame_buffer_list, set_frame_buffer_list): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
17032
diff
changeset
|
2224 return; |
0530a375eb21
(frame_buffer_list, set_frame_buffer_list): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
17032
diff
changeset
|
2225 } |
83415
d2c799f58129
Implement full support for frame-local `next-buffer' and `previous-buffer'.
Karoly Lorentey <lorentey@elte.hu>
parents:
83384
diff
changeset
|
2226 if (EQ (prop, Qburied_buffer_list)) |
d2c799f58129
Implement full support for frame-local `next-buffer' and `previous-buffer'.
Karoly Lorentey <lorentey@elte.hu>
parents:
83384
diff
changeset
|
2227 { |
d2c799f58129
Implement full support for frame-local `next-buffer' and `previous-buffer'.
Karoly Lorentey <lorentey@elte.hu>
parents:
83384
diff
changeset
|
2228 f->buried_buffer_list = val; |
d2c799f58129
Implement full support for frame-local `next-buffer' and `previous-buffer'.
Karoly Lorentey <lorentey@elte.hu>
parents:
83384
diff
changeset
|
2229 return; |
d2c799f58129
Implement full support for frame-local `next-buffer' and `previous-buffer'.
Karoly Lorentey <lorentey@elte.hu>
parents:
83384
diff
changeset
|
2230 } |
17221
0530a375eb21
(frame_buffer_list, set_frame_buffer_list): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
17032
diff
changeset
|
2231 |
29616
8d7a0f575a0e
(Fmodify_frame_parameters): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents:
28930
diff
changeset
|
2232 /* 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
|
2233 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
|
2234 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
|
2235 without messing up the symbol's status. */ |
8d7a0f575a0e
(Fmodify_frame_parameters): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents:
28930
diff
changeset
|
2236 if (SYMBOLP (prop)) |
8d7a0f575a0e
(Fmodify_frame_parameters): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents:
28930
diff
changeset
|
2237 { |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107538
diff
changeset
|
2238 struct Lisp_Symbol *sym = XSYMBOL (prop); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107538
diff
changeset
|
2239 start: |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107538
diff
changeset
|
2240 switch (sym->redirect) |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107538
diff
changeset
|
2241 { |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107538
diff
changeset
|
2242 case SYMBOL_VARALIAS: sym = indirect_variable (sym); goto start; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107538
diff
changeset
|
2243 case SYMBOL_PLAINVAL: case SYMBOL_FORWARDED: break; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107538
diff
changeset
|
2244 case SYMBOL_LOCALIZED: |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107538
diff
changeset
|
2245 { struct Lisp_Buffer_Local_Value *blv = sym->val.blv; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107538
diff
changeset
|
2246 if (blv->frame_local && BLV_FOUND (blv) && XFRAME (blv->where) == f) |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107538
diff
changeset
|
2247 swap_in_global_binding (sym); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107538
diff
changeset
|
2248 break; |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107538
diff
changeset
|
2249 } |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107538
diff
changeset
|
2250 default: abort (); |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107538
diff
changeset
|
2251 } |
29616
8d7a0f575a0e
(Fmodify_frame_parameters): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents:
28930
diff
changeset
|
2252 } |
8d7a0f575a0e
(Fmodify_frame_parameters): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents:
28930
diff
changeset
|
2253 |
93883
722fdbc7a012
* xdisp.c (redisplay_internal): Reset tty's color_mode when switching
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93369
diff
changeset
|
2254 /* The tty color needed to be set before the frame's parameter |
722fdbc7a012
* xdisp.c (redisplay_internal): Reset tty's color_mode when switching
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93369
diff
changeset
|
2255 alist was updated with the new value. This is not true any more, |
722fdbc7a012
* xdisp.c (redisplay_internal): Reset tty's color_mode when switching
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93369
diff
changeset
|
2256 but we still do this test early on. */ |
722fdbc7a012
* xdisp.c (redisplay_internal): Reset tty's color_mode when switching
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93369
diff
changeset
|
2257 if (FRAME_TERMCAP_P (f) && EQ (prop, Qtty_color_mode) |
722fdbc7a012
* xdisp.c (redisplay_internal): Reset tty's color_mode when switching
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93369
diff
changeset
|
2258 && f == FRAME_TTY (f)->previous_frame) |
722fdbc7a012
* xdisp.c (redisplay_internal): Reset tty's color_mode when switching
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93369
diff
changeset
|
2259 /* Force redisplay of this tty. */ |
722fdbc7a012
* xdisp.c (redisplay_internal): Reset tty's color_mode when switching
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93369
diff
changeset
|
2260 FRAME_TTY (f)->previous_frame = NULL; |
42743
1e6231c9c359
(store_frame_param): Call set_tty_color_mode for termcap
Eli Zaretskii <eliz@gnu.org>
parents:
41718
diff
changeset
|
2261 |
29616
8d7a0f575a0e
(Fmodify_frame_parameters): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents:
28930
diff
changeset
|
2262 /* Update the frame parameter alist. */ |
8d7a0f575a0e
(Fmodify_frame_parameters): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents:
28930
diff
changeset
|
2263 old_alist_elt = Fassq (prop, f->param_alist); |
8d7a0f575a0e
(Fmodify_frame_parameters): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents:
28930
diff
changeset
|
2264 if (EQ (old_alist_elt, Qnil)) |
765 | 2265 f->param_alist = Fcons (Fcons (prop, val), f->param_alist); |
286 | 2266 else |
29616
8d7a0f575a0e
(Fmodify_frame_parameters): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents:
28930
diff
changeset
|
2267 Fsetcdr (old_alist_elt, val); |
539 | 2268 |
29616
8d7a0f575a0e
(Fmodify_frame_parameters): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents:
28930
diff
changeset
|
2269 /* Update some other special parameters in their special places |
8d7a0f575a0e
(Fmodify_frame_parameters): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents:
28930
diff
changeset
|
2270 in addition to the alist. */ |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
2271 |
10207
e6618f52efe9
(Fmodify_frame_parameters): For non-X frames,
Richard M. Stallman <rms@gnu.org>
parents:
9972
diff
changeset
|
2272 if (EQ (prop, Qbuffer_predicate)) |
e6618f52efe9
(Fmodify_frame_parameters): For non-X frames,
Richard M. Stallman <rms@gnu.org>
parents:
9972
diff
changeset
|
2273 f->buffer_predicate = val; |
e6618f52efe9
(Fmodify_frame_parameters): For non-X frames,
Richard M. Stallman <rms@gnu.org>
parents:
9972
diff
changeset
|
2274 |
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
|
2275 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
|
2276 { |
7916c0d8f2ae
(frame_name_fnn_p, set_term_frame_name): New functions.
Eli Zaretskii <eliz@gnu.org>
parents:
20178
diff
changeset
|
2277 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
|
2278 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
|
2279 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
|
2280 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
|
2281 } |
12761
bffb5ea6fb43
Move various Q... vars to top of file, unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
12742
diff
changeset
|
2282 |
9127
0b4836daa8e1
(Fframep, make_frame_without_minibuffer, do_switch_frame, prev_frame,
Karl Heuer <kwzh@gnu.org>
parents:
9032
diff
changeset
|
2283 if (EQ (prop, Qminibuffer) && WINDOWP (val)) |
539 | 2284 { |
2285 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
|
2286 error ("Surrogate minibuffer windows must be minibuffer windows"); |
539 | 2287 |
25710
ee1da070c50f
(Fnext_frame): Remove unused variable(s).
Gerd Moellmann <gerd@gnu.org>
parents:
25669
diff
changeset
|
2288 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
|
2289 && !EQ (val, f->minibuffer_window)) |
906cef1d36bd
(store_frame_param): Allow setting a frame's minibuffer
Karl Heuer <kwzh@gnu.org>
parents:
16280
diff
changeset
|
2290 error ("Can't change the surrogate minibuffer of a frame with its own minibuffer"); |
539 | 2291 |
2292 /* Install the chosen minibuffer window, with proper buffer. */ | |
765 | 2293 f->minibuffer_window = val; |
539 | 2294 } |
286 | 2295 } |
2296 | |
765 | 2297 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
|
2298 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
|
2299 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
|
2300 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
|
2301 If FRAME is omitted, return information on the currently selected frame. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109139
diff
changeset
|
2302 (Lisp_Object frame) |
286 | 2303 { |
2304 Lisp_Object alist; | |
7162
06a13bf36a8c
(Fframe_parameters) [!MULTI_FRAME]: Unstub it again.
Karl Heuer <kwzh@gnu.org>
parents:
7134
diff
changeset
|
2305 FRAME_PTR f; |
15062
de7528327c39
(Fframe_parameters, both definitions):
Richard M. Stallman <rms@gnu.org>
parents:
15001
diff
changeset
|
2306 int height, width; |
27575
2344fab04513
(Fframe_parameters): Add GCPRO because tty_color_name can GC.
Gerd Moellmann <gerd@gnu.org>
parents:
26729
diff
changeset
|
2307 struct gcpro gcpro1; |
286 | 2308 |
36804
e4331ae9636d
(Fframe_parameters): In the `buffer-list' frame
Gerd Moellmann <gerd@gnu.org>
parents:
36433
diff
changeset
|
2309 if (NILP (frame)) |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
2310 frame = selected_frame; |
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
2311 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
2312 CHECK_FRAME (frame); |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
2313 f = XFRAME (frame); |
286 | 2314 |
7162
06a13bf36a8c
(Fframe_parameters) [!MULTI_FRAME]: Unstub it again.
Karl Heuer <kwzh@gnu.org>
parents:
7134
diff
changeset
|
2315 if (!FRAME_LIVE_P (f)) |
286 | 2316 return Qnil; |
2317 | |
765 | 2318 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
|
2319 GCPRO1 (alist); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
2320 |
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26164
diff
changeset
|
2321 if (!FRAME_WINDOW_P (f)) |
15391
d4cec5d7566d
(Fset_mouse_position): Remove the DOS-specific
Richard M. Stallman <rms@gnu.org>
parents:
15062
diff
changeset
|
2322 { |
25117
f6f34f0bc1af
(make_terminal_frame) [MSDOS]: Don't call
Eli Zaretskii <eliz@gnu.org>
parents:
25030
diff
changeset
|
2323 int fg = FRAME_FOREGROUND_PIXEL (f); |
f6f34f0bc1af
(make_terminal_frame) [MSDOS]: Don't call
Eli Zaretskii <eliz@gnu.org>
parents:
25030
diff
changeset
|
2324 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
|
2325 Lisp_Object elt; |
25117
f6f34f0bc1af
(make_terminal_frame) [MSDOS]: Don't call
Eli Zaretskii <eliz@gnu.org>
parents:
25030
diff
changeset
|
2326 |
32545
288723d38c06
(Fframe_parameters): If a tty's frame's param_alist says
Eli Zaretskii <eliz@gnu.org>
parents:
32254
diff
changeset
|
2327 /* 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
|
2328 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
|
2329 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
|
2330 elt = Fassq (Qforeground_color, alist); |
85017
b0be1b2384d2
(Fframe_parameters): Minor simplification.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84851
diff
changeset
|
2331 if (CONSP (elt) && STRINGP (XCDR (elt))) |
33005
87893013088c
(Fframe_parameters): Fix the change from 2000-10-16:
Eli Zaretskii <eliz@gnu.org>
parents:
32909
diff
changeset
|
2332 { |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46285
diff
changeset
|
2333 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
|
2334 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
|
2335 SCHARS (XCDR (elt))) == 0) |
33005
87893013088c
(Fframe_parameters): Fix the change from 2000-10-16:
Eli Zaretskii <eliz@gnu.org>
parents:
32909
diff
changeset
|
2336 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
|
2337 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
|
2338 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
|
2339 SCHARS (XCDR (elt))) == 0) |
33005
87893013088c
(Fframe_parameters): Fix the change from 2000-10-16:
Eli Zaretskii <eliz@gnu.org>
parents:
32909
diff
changeset
|
2340 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
|
2341 } |
32545
288723d38c06
(Fframe_parameters): If a tty's frame's param_alist says
Eli Zaretskii <eliz@gnu.org>
parents:
32254
diff
changeset
|
2342 else |
288723d38c06
(Fframe_parameters): If a tty's frame's param_alist says
Eli Zaretskii <eliz@gnu.org>
parents:
32254
diff
changeset
|
2343 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
|
2344 elt = Fassq (Qbackground_color, alist); |
85017
b0be1b2384d2
(Fframe_parameters): Minor simplification.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84851
diff
changeset
|
2345 if (CONSP (elt) && STRINGP (XCDR (elt))) |
33005
87893013088c
(Fframe_parameters): Fix the change from 2000-10-16:
Eli Zaretskii <eliz@gnu.org>
parents:
32909
diff
changeset
|
2346 { |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46285
diff
changeset
|
2347 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
|
2348 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
|
2349 SCHARS (XCDR (elt))) == 0) |
33005
87893013088c
(Fframe_parameters): Fix the change from 2000-10-16:
Eli Zaretskii <eliz@gnu.org>
parents:
32909
diff
changeset
|
2350 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
|
2351 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
|
2352 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
|
2353 SCHARS (XCDR (elt))) == 0) |
33005
87893013088c
(Fframe_parameters): Fix the change from 2000-10-16:
Eli Zaretskii <eliz@gnu.org>
parents:
32909
diff
changeset
|
2354 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
|
2355 } |
32545
288723d38c06
(Fframe_parameters): If a tty's frame's param_alist says
Eli Zaretskii <eliz@gnu.org>
parents:
32254
diff
changeset
|
2356 else |
288723d38c06
(Fframe_parameters): If a tty's frame's param_alist says
Eli Zaretskii <eliz@gnu.org>
parents:
32254
diff
changeset
|
2357 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
|
2358 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
|
2359 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
|
2360 ? "ms-dos" |
35003
c6726a1e70ce
(make_terminal_frame) [WINDOWSNT]: Make terminal frames
Andrew Innes <andrewi@gnu.org>
parents:
33760
diff
changeset
|
2361 : FRAME_W32_P (f) ? "w32term" |
c6726a1e70ce
(make_terminal_frame) [WINDOWSNT]: Make terminal frames
Andrew Innes <andrewi@gnu.org>
parents:
33760
diff
changeset
|
2362 :"tty")); |
15391
d4cec5d7566d
(Fset_mouse_position): Remove the DOS-specific
Richard M. Stallman <rms@gnu.org>
parents:
15062
diff
changeset
|
2363 } |
965
0eb68c6c452a
* frame.c (Qheight, Qicon, Qmodeline, Qname, Qnone, Qonly,
Jim Blandy <jimb@redhat.com>
parents:
886
diff
changeset
|
2364 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
|
2365 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
|
2366 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
|
2367 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
|
2368 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
|
2369 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
|
2370 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
|
2371 (! FRAME_HAS_MINIBUF_P (f) ? Qnil |
7162
06a13bf36a8c
(Fframe_parameters) [!MULTI_FRAME]: Unstub it again.
Karl Heuer <kwzh@gnu.org>
parents:
7134
diff
changeset
|
2372 : FRAME_MINIBUF_ONLY_P (f) ? Qonly |
06a13bf36a8c
(Fframe_parameters) [!MULTI_FRAME]: Unstub it again.
Karl Heuer <kwzh@gnu.org>
parents:
7134
diff
changeset
|
2373 : FRAME_MINIBUF_WINDOW (f))); |
06a13bf36a8c
(Fframe_parameters) [!MULTI_FRAME]: Unstub it again.
Karl Heuer <kwzh@gnu.org>
parents:
7134
diff
changeset
|
2374 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
|
2375 store_in_alist (&alist, Qbuffer_list, frame_buffer_list (frame)); |
83415
d2c799f58129
Implement full support for frame-local `next-buffer' and `previous-buffer'.
Karoly Lorentey <lorentey@elte.hu>
parents:
83384
diff
changeset
|
2376 store_in_alist (&alist, Qburied_buffer_list, XFRAME (frame)->buried_buffer_list); |
286 | 2377 |
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1809
diff
changeset
|
2378 /* 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
|
2379 #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
|
2380 if (FRAME_WINDOW_P (f)) |
765 | 2381 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
|
2382 else |
965
0eb68c6c452a
* frame.c (Qheight, Qicon, Qmodeline, Qname, Qnone, Qonly,
Jim Blandy <jimb@redhat.com>
parents:
886
diff
changeset
|
2383 #endif |
8904
af3ff2dbaddd
(Fframe_parameters): Fix Lisp_Object vs. int problems.
Karl Heuer <kwzh@gnu.org>
parents:
8685
diff
changeset
|
2384 { |
af3ff2dbaddd
(Fframe_parameters): Fix Lisp_Object vs. int problems.
Karl Heuer <kwzh@gnu.org>
parents:
8685
diff
changeset
|
2385 /* 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
|
2386 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
|
2387 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
|
2388 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
|
2389 } |
27575
2344fab04513
(Fframe_parameters): Add GCPRO because tty_color_name can GC.
Gerd Moellmann <gerd@gnu.org>
parents:
26729
diff
changeset
|
2390 |
2344fab04513
(Fframe_parameters): Add GCPRO because tty_color_name can GC.
Gerd Moellmann <gerd@gnu.org>
parents:
26729
diff
changeset
|
2391 UNGCPRO; |
286 | 2392 return alist; |
2393 } | |
2394 | |
31399
db831ffcd565
(Qdisplay_type): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31102
diff
changeset
|
2395 |
db831ffcd565
(Qdisplay_type): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31102
diff
changeset
|
2396 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
|
2397 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
|
2398 If FRAME is nil, describe the currently selected frame. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109139
diff
changeset
|
2399 (Lisp_Object frame, Lisp_Object parameter) |
31399
db831ffcd565
(Qdisplay_type): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31102
diff
changeset
|
2400 { |
db831ffcd565
(Qdisplay_type): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31102
diff
changeset
|
2401 struct frame *f; |
db831ffcd565
(Qdisplay_type): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31102
diff
changeset
|
2402 Lisp_Object value; |
db831ffcd565
(Qdisplay_type): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31102
diff
changeset
|
2403 |
db831ffcd565
(Qdisplay_type): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31102
diff
changeset
|
2404 if (NILP (frame)) |
db831ffcd565
(Qdisplay_type): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31102
diff
changeset
|
2405 frame = selected_frame; |
db831ffcd565
(Qdisplay_type): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31102
diff
changeset
|
2406 else |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
2407 CHECK_FRAME (frame); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
2408 CHECK_SYMBOL (parameter); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
2409 |
31399
db831ffcd565
(Qdisplay_type): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31102
diff
changeset
|
2410 f = XFRAME (frame); |
db831ffcd565
(Qdisplay_type): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31102
diff
changeset
|
2411 value = Qnil; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
2412 |
31399
db831ffcd565
(Qdisplay_type): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31102
diff
changeset
|
2413 if (FRAME_LIVE_P (f)) |
db831ffcd565
(Qdisplay_type): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31102
diff
changeset
|
2414 { |
40319
52af99ad587f
Resurrect a comment lost in the previous commit.
Eli Zaretskii <eliz@gnu.org>
parents:
40317
diff
changeset
|
2415 /* Avoid consing in frequent cases. */ |
31442
cb166d3ac8e7
(Fframe_parameter): Handle `name' specially.
Gerd Moellmann <gerd@gnu.org>
parents:
31399
diff
changeset
|
2416 if (EQ (parameter, Qname)) |
cb166d3ac8e7
(Fframe_parameter): Handle `name' specially.
Gerd Moellmann <gerd@gnu.org>
parents:
31399
diff
changeset
|
2417 value = f->name; |
31448
70b366918608
(Fframe_parameter): Handle `name' and `background-mode'
Gerd Moellmann <gerd@gnu.org>
parents:
31442
diff
changeset
|
2418 #ifdef HAVE_X_WINDOWS |
70b366918608
(Fframe_parameter): Handle `name' and `background-mode'
Gerd Moellmann <gerd@gnu.org>
parents:
31442
diff
changeset
|
2419 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
|
2420 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
|
2421 #endif /* HAVE_X_WINDOWS */ |
40313
b2ff79e90309
(Fframe_parameter): Fix a bug whereby some
Gerd Moellmann <gerd@gnu.org>
parents:
40105
diff
changeset
|
2422 else if (EQ (parameter, Qbackground_color) |
b2ff79e90309
(Fframe_parameter): Fix a bug whereby some
Gerd Moellmann <gerd@gnu.org>
parents:
40105
diff
changeset
|
2423 || EQ (parameter, Qforeground_color)) |
31442
cb166d3ac8e7
(Fframe_parameter): Handle `name' specially.
Gerd Moellmann <gerd@gnu.org>
parents:
31399
diff
changeset
|
2424 { |
cb166d3ac8e7
(Fframe_parameter): Handle `name' specially.
Gerd Moellmann <gerd@gnu.org>
parents:
31399
diff
changeset
|
2425 value = Fassq (parameter, f->param_alist); |
cb166d3ac8e7
(Fframe_parameter): Handle `name' specially.
Gerd Moellmann <gerd@gnu.org>
parents:
31399
diff
changeset
|
2426 if (CONSP (value)) |
32254
f93728883f64
(Fframe_parameter): For non-windowed frames, if
Eli Zaretskii <eliz@gnu.org>
parents:
31470
diff
changeset
|
2427 { |
f93728883f64
(Fframe_parameter): For non-windowed frames, if
Eli Zaretskii <eliz@gnu.org>
parents:
31470
diff
changeset
|
2428 value = XCDR (value); |
f93728883f64
(Fframe_parameter): For non-windowed frames, if
Eli Zaretskii <eliz@gnu.org>
parents:
31470
diff
changeset
|
2429 /* 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
|
2430 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
|
2431 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
|
2432 "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
|
2433 if (STRINGP (value) && !FRAME_WINDOW_P (f)) |
f93728883f64
(Fframe_parameter): For non-windowed frames, if
Eli Zaretskii <eliz@gnu.org>
parents:
31470
diff
changeset
|
2434 { |
46467
1a3b3b66171c
(Fframe_parameter): Use const for pointer to lisp
Ken Raeburn <raeburn@raeburn.org>
parents:
46370
diff
changeset
|
2435 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
|
2436 EMACS_INT csz; |
288723d38c06
(Fframe_parameters): If a tty's frame's param_alist says
Eli Zaretskii <eliz@gnu.org>
parents:
32254
diff
changeset
|
2437 |
288723d38c06
(Fframe_parameters): If a tty's frame's param_alist says
Eli Zaretskii <eliz@gnu.org>
parents:
32254
diff
changeset
|
2438 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
|
2439 { |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46285
diff
changeset
|
2440 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
|
2441 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
|
2442 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
|
2443 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
|
2444 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
|
2445 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
|
2446 } |
288723d38c06
(Fframe_parameters): If a tty's frame's param_alist says
Eli Zaretskii <eliz@gnu.org>
parents:
32254
diff
changeset
|
2447 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
|
2448 { |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46285
diff
changeset
|
2449 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
|
2450 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
|
2451 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
|
2452 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
|
2453 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
|
2454 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
|
2455 } |
32254
f93728883f64
(Fframe_parameter): For non-windowed frames, if
Eli Zaretskii <eliz@gnu.org>
parents:
31470
diff
changeset
|
2456 } |
f93728883f64
(Fframe_parameter): For non-windowed frames, if
Eli Zaretskii <eliz@gnu.org>
parents:
31470
diff
changeset
|
2457 } |
40317
dfb2afb0aa8a
(Fframe_parameter): Fix last change.
Eli Zaretskii <eliz@gnu.org>
parents:
40313
diff
changeset
|
2458 else |
dfb2afb0aa8a
(Fframe_parameter): Fix last change.
Eli Zaretskii <eliz@gnu.org>
parents:
40313
diff
changeset
|
2459 value = Fcdr (Fassq (parameter, Fframe_parameters (frame))); |
31442
cb166d3ac8e7
(Fframe_parameter): Handle `name' specially.
Gerd Moellmann <gerd@gnu.org>
parents:
31399
diff
changeset
|
2460 } |
40313
b2ff79e90309
(Fframe_parameter): Fix a bug whereby some
Gerd Moellmann <gerd@gnu.org>
parents:
40105
diff
changeset
|
2461 else if (EQ (parameter, Qdisplay_type) |
b2ff79e90309
(Fframe_parameter): Fix a bug whereby some
Gerd Moellmann <gerd@gnu.org>
parents:
40105
diff
changeset
|
2462 || EQ (parameter, Qbackground_mode)) |
b2ff79e90309
(Fframe_parameter): Fix a bug whereby some
Gerd Moellmann <gerd@gnu.org>
parents:
40105
diff
changeset
|
2463 value = Fcdr (Fassq (parameter, f->param_alist)); |
b2ff79e90309
(Fframe_parameter): Fix a bug whereby some
Gerd Moellmann <gerd@gnu.org>
parents:
40105
diff
changeset
|
2464 else |
107984
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107538
diff
changeset
|
2465 /* FIXME: Avoid this code path at all (as well as code duplication) |
bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107538
diff
changeset
|
2466 by sharing more code with Fframe_parameters. */ |
40313
b2ff79e90309
(Fframe_parameter): Fix a bug whereby some
Gerd Moellmann <gerd@gnu.org>
parents:
40105
diff
changeset
|
2467 value = Fcdr (Fassq (parameter, Fframe_parameters (frame))); |
31399
db831ffcd565
(Qdisplay_type): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31102
diff
changeset
|
2468 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
2469 |
31399
db831ffcd565
(Qdisplay_type): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31102
diff
changeset
|
2470 return value; |
db831ffcd565
(Qdisplay_type): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31102
diff
changeset
|
2471 } |
db831ffcd565
(Qdisplay_type): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31102
diff
changeset
|
2472 |
db831ffcd565
(Qdisplay_type): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31102
diff
changeset
|
2473 |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
2474 DEFUN ("modify-frame-parameters", Fmodify_frame_parameters, |
765 | 2475 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
|
2476 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
|
2477 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
|
2478 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
|
2479 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
|
2480 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
|
2481 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
|
2482 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
|
2483 |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
2484 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
|
2485 as a frame-local binding for the variable FOO, if you have |
97883
8a36a3a1b31e
(Fmodify_frame_parameters): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
97701
diff
changeset
|
2486 enabled such bindings for that variable with `make-variable-frame-local'. |
8a36a3a1b31e
(Fmodify_frame_parameters): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
97701
diff
changeset
|
2487 Note that this functionality is obsolete as of Emacs 22.2, and its |
8a36a3a1b31e
(Fmodify_frame_parameters): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
97701
diff
changeset
|
2488 use is not recommended. Explicitly check for a frame-parameter instead. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109139
diff
changeset
|
2489 (Lisp_Object frame, Lisp_Object alist) |
286 | 2490 { |
965
0eb68c6c452a
* frame.c (Qheight, Qicon, Qmodeline, Qname, Qnone, Qonly,
Jim Blandy <jimb@redhat.com>
parents:
886
diff
changeset
|
2491 FRAME_PTR f; |
25710
ee1da070c50f
(Fnext_frame): Remove unused variable(s).
Gerd Moellmann <gerd@gnu.org>
parents:
25669
diff
changeset
|
2492 register Lisp_Object tail, prop, val; |
286 | 2493 |
765 | 2494 if (EQ (frame, Qnil)) |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
2495 frame = selected_frame; |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
2496 CHECK_LIVE_FRAME (frame); |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
2497 f = XFRAME (frame); |
286 | 2498 |
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1809
diff
changeset
|
2499 /* 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
|
2500 #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
|
2501 if (FRAME_WINDOW_P (f)) |
965
0eb68c6c452a
* frame.c (Qheight, Qicon, Qmodeline, Qname, Qnone, Qonly,
Jim Blandy <jimb@redhat.com>
parents:
886
diff
changeset
|
2502 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
|
2503 else |
e6618f52efe9
(Fmodify_frame_parameters): For non-X frames,
Richard M. Stallman <rms@gnu.org>
parents:
9972
diff
changeset
|
2504 #endif |
15391
d4cec5d7566d
(Fset_mouse_position): Remove the DOS-specific
Richard M. Stallman <rms@gnu.org>
parents:
15062
diff
changeset
|
2505 #ifdef MSDOS |
d4cec5d7566d
(Fset_mouse_position): Remove the DOS-specific
Richard M. Stallman <rms@gnu.org>
parents:
15062
diff
changeset
|
2506 if (FRAME_MSDOS_P (f)) |
d4cec5d7566d
(Fset_mouse_position): Remove the DOS-specific
Richard M. Stallman <rms@gnu.org>
parents:
15062
diff
changeset
|
2507 IT_set_frame_parameters (f, alist); |
d4cec5d7566d
(Fset_mouse_position): Remove the DOS-specific
Richard M. Stallman <rms@gnu.org>
parents:
15062
diff
changeset
|
2508 else |
d4cec5d7566d
(Fset_mouse_position): Remove the DOS-specific
Richard M. Stallman <rms@gnu.org>
parents:
15062
diff
changeset
|
2509 #endif |
25523
9e9eeb68482e
(Fframep) [macintosh]: Handle mac frame type.
Richard M. Stallman <rms@gnu.org>
parents:
25350
diff
changeset
|
2510 |
16568
cc6d85f9df0f
(Fmodify_frame_parameters): Use alist in reverse order.
Richard M. Stallman <rms@gnu.org>
parents:
16536
diff
changeset
|
2511 { |
cc6d85f9df0f
(Fmodify_frame_parameters): Use alist in reverse order.
Richard M. Stallman <rms@gnu.org>
parents:
16536
diff
changeset
|
2512 int length = XINT (Flength (alist)); |
cc6d85f9df0f
(Fmodify_frame_parameters): Use alist in reverse order.
Richard M. Stallman <rms@gnu.org>
parents:
16536
diff
changeset
|
2513 int i; |
cc6d85f9df0f
(Fmodify_frame_parameters): Use alist in reverse order.
Richard M. Stallman <rms@gnu.org>
parents:
16536
diff
changeset
|
2514 Lisp_Object *parms |
cc6d85f9df0f
(Fmodify_frame_parameters): Use alist in reverse order.
Richard M. Stallman <rms@gnu.org>
parents:
16536
diff
changeset
|
2515 = (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
|
2516 Lisp_Object *values |
cc6d85f9df0f
(Fmodify_frame_parameters): Use alist in reverse order.
Richard M. Stallman <rms@gnu.org>
parents:
16536
diff
changeset
|
2517 = (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
|
2518 |
cc6d85f9df0f
(Fmodify_frame_parameters): Use alist in reverse order.
Richard M. Stallman <rms@gnu.org>
parents:
16536
diff
changeset
|
2519 /* 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
|
2520 |
cc6d85f9df0f
(Fmodify_frame_parameters): Use alist in reverse order.
Richard M. Stallman <rms@gnu.org>
parents:
16536
diff
changeset
|
2521 i = 0; |
93203
7327632ad432
(Fmodify_frame_parameters, x_set_frame_parameters): Use XCAR/XCDR.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91791
diff
changeset
|
2522 for (tail = alist; CONSP (tail); tail = XCDR (tail)) |
16568
cc6d85f9df0f
(Fmodify_frame_parameters): Use alist in reverse order.
Richard M. Stallman <rms@gnu.org>
parents:
16536
diff
changeset
|
2523 { |
25710
ee1da070c50f
(Fnext_frame): Remove unused variable(s).
Gerd Moellmann <gerd@gnu.org>
parents:
25669
diff
changeset
|
2524 Lisp_Object elt; |
16568
cc6d85f9df0f
(Fmodify_frame_parameters): Use alist in reverse order.
Richard M. Stallman <rms@gnu.org>
parents:
16536
diff
changeset
|
2525 |
93203
7327632ad432
(Fmodify_frame_parameters, x_set_frame_parameters): Use XCAR/XCDR.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91791
diff
changeset
|
2526 elt = XCAR (tail); |
16568
cc6d85f9df0f
(Fmodify_frame_parameters): Use alist in reverse order.
Richard M. Stallman <rms@gnu.org>
parents:
16536
diff
changeset
|
2527 parms[i] = Fcar (elt); |
cc6d85f9df0f
(Fmodify_frame_parameters): Use alist in reverse order.
Richard M. Stallman <rms@gnu.org>
parents:
16536
diff
changeset
|
2528 values[i] = Fcdr (elt); |
cc6d85f9df0f
(Fmodify_frame_parameters): Use alist in reverse order.
Richard M. Stallman <rms@gnu.org>
parents:
16536
diff
changeset
|
2529 i++; |
cc6d85f9df0f
(Fmodify_frame_parameters): Use alist in reverse order.
Richard M. Stallman <rms@gnu.org>
parents:
16536
diff
changeset
|
2530 } |
cc6d85f9df0f
(Fmodify_frame_parameters): Use alist in reverse order.
Richard M. Stallman <rms@gnu.org>
parents:
16536
diff
changeset
|
2531 |
cc6d85f9df0f
(Fmodify_frame_parameters): Use alist in reverse order.
Richard M. Stallman <rms@gnu.org>
parents:
16536
diff
changeset
|
2532 /* 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
|
2533 for (i--; i >= 0; i--) |
cc6d85f9df0f
(Fmodify_frame_parameters): Use alist in reverse order.
Richard M. Stallman <rms@gnu.org>
parents:
16536
diff
changeset
|
2534 { |
cc6d85f9df0f
(Fmodify_frame_parameters): Use alist in reverse order.
Richard M. Stallman <rms@gnu.org>
parents:
16536
diff
changeset
|
2535 prop = parms[i]; |
cc6d85f9df0f
(Fmodify_frame_parameters): Use alist in reverse order.
Richard M. Stallman <rms@gnu.org>
parents:
16536
diff
changeset
|
2536 val = values[i]; |
cc6d85f9df0f
(Fmodify_frame_parameters): Use alist in reverse order.
Richard M. Stallman <rms@gnu.org>
parents:
16536
diff
changeset
|
2537 store_frame_param (f, prop, val); |
63643 | 2538 |
2539 /* Changing the background color might change the background | |
2540 mode, so that we have to load new defface specs. | |
2541 Call frame-set-background-mode to do that. */ | |
2542 if (EQ (prop, Qbackground_color)) | |
2543 call1 (Qframe_set_background_mode, frame); | |
16568
cc6d85f9df0f
(Fmodify_frame_parameters): Use alist in reverse order.
Richard M. Stallman <rms@gnu.org>
parents:
16536
diff
changeset
|
2544 } |
cc6d85f9df0f
(Fmodify_frame_parameters): Use alist in reverse order.
Richard M. Stallman <rms@gnu.org>
parents:
16536
diff
changeset
|
2545 } |
75954
7988c916074a
(Fmodify_frame_parameters): Return a value.
Andreas Schwab <schwab@suse.de>
parents:
75805
diff
changeset
|
2546 return Qnil; |
286 | 2547 } |
2548 | |
2068
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
2549 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
|
2550 0, 1, 0, |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
2551 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
|
2552 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
|
2553 For a terminal frame, the value is always 1. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109139
diff
changeset
|
2554 (Lisp_Object frame) |
2068
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
2555 { |
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
2556 struct frame *f; |
286 | 2557 |
2068
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
2558 if (NILP (frame)) |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
2559 frame = selected_frame; |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
2560 CHECK_FRAME (frame); |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
2561 f = XFRAME (frame); |
777 | 2562 |
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
|
2563 #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
|
2564 if (FRAME_WINDOW_P (f)) |
2068
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
2565 return make_number (x_char_height (f)); |
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
2566 else |
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
2567 #endif |
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
2568 return make_number (1); |
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
2569 } |
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
2570 |
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
2571 |
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
2572 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
|
2573 0, 1, 0, |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
2574 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
|
2575 If FRAME is omitted, the selected frame is used. |
64713
fb0a0e5596b6
(Fframe_char_width): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
64084
diff
changeset
|
2576 On a graphical screen, the width is the standard width of the default font. |
40105
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
2577 For a terminal screen, the value is always 1. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109139
diff
changeset
|
2578 (Lisp_Object frame) |
286 | 2579 { |
2068
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
2580 struct frame *f; |
286 | 2581 |
2068
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
2582 if (NILP (frame)) |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
2583 frame = selected_frame; |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
2584 CHECK_FRAME (frame); |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
2585 f = XFRAME (frame); |
2068
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
2586 |
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
|
2587 #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
|
2588 if (FRAME_WINDOW_P (f)) |
2068
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
2589 return make_number (x_char_width (f)); |
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
2590 else |
777 | 2591 #endif |
2068
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
2592 return make_number (1); |
286 | 2593 } |
2594 | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
2595 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
|
2596 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
|
2597 doc: /* Return a FRAME's height in pixels. |
105545
c9f6575e6f19
(Fframe_pixel_height): Doc fix. (Bug#4535)
Glenn Morris <rgm@gnu.org>
parents:
105182
diff
changeset
|
2598 If FRAME is omitted, the selected frame is used. The exact value |
c9f6575e6f19
(Fframe_pixel_height): Doc fix. (Bug#4535)
Glenn Morris <rgm@gnu.org>
parents:
105182
diff
changeset
|
2599 of the result depends on the window-system and toolkit in use: |
c9f6575e6f19
(Fframe_pixel_height): Doc fix. (Bug#4535)
Glenn Morris <rgm@gnu.org>
parents:
105182
diff
changeset
|
2600 |
c9f6575e6f19
(Fframe_pixel_height): Doc fix. (Bug#4535)
Glenn Morris <rgm@gnu.org>
parents:
105182
diff
changeset
|
2601 In the Gtk+ version of Emacs, it includes only any window (including |
c9f6575e6f19
(Fframe_pixel_height): Doc fix. (Bug#4535)
Glenn Morris <rgm@gnu.org>
parents:
105182
diff
changeset
|
2602 the minibuffer or eacho area), mode line, and header line. It does not |
c9f6575e6f19
(Fframe_pixel_height): Doc fix. (Bug#4535)
Glenn Morris <rgm@gnu.org>
parents:
105182
diff
changeset
|
2603 include the tool bar or menu bar. |
c9f6575e6f19
(Fframe_pixel_height): Doc fix. (Bug#4535)
Glenn Morris <rgm@gnu.org>
parents:
105182
diff
changeset
|
2604 |
c9f6575e6f19
(Fframe_pixel_height): Doc fix. (Bug#4535)
Glenn Morris <rgm@gnu.org>
parents:
105182
diff
changeset
|
2605 With the Motif or Lucid toolkits, it also includes the tool bar (but |
c9f6575e6f19
(Fframe_pixel_height): Doc fix. (Bug#4535)
Glenn Morris <rgm@gnu.org>
parents:
105182
diff
changeset
|
2606 not the menu bar). |
c9f6575e6f19
(Fframe_pixel_height): Doc fix. (Bug#4535)
Glenn Morris <rgm@gnu.org>
parents:
105182
diff
changeset
|
2607 |
c9f6575e6f19
(Fframe_pixel_height): Doc fix. (Bug#4535)
Glenn Morris <rgm@gnu.org>
parents:
105182
diff
changeset
|
2608 In a graphical version with no toolkit, it includes both the tool bar |
c9f6575e6f19
(Fframe_pixel_height): Doc fix. (Bug#4535)
Glenn Morris <rgm@gnu.org>
parents:
105182
diff
changeset
|
2609 and menu bar. |
c9f6575e6f19
(Fframe_pixel_height): Doc fix. (Bug#4535)
Glenn Morris <rgm@gnu.org>
parents:
105182
diff
changeset
|
2610 |
c9f6575e6f19
(Fframe_pixel_height): Doc fix. (Bug#4535)
Glenn Morris <rgm@gnu.org>
parents:
105182
diff
changeset
|
2611 For a text-only terminal, it includes the menu bar. In this case, the |
c9f6575e6f19
(Fframe_pixel_height): Doc fix. (Bug#4535)
Glenn Morris <rgm@gnu.org>
parents:
105182
diff
changeset
|
2612 result is really in characters rather than pixels (i.e., is identical |
c9f6575e6f19
(Fframe_pixel_height): Doc fix. (Bug#4535)
Glenn Morris <rgm@gnu.org>
parents:
105182
diff
changeset
|
2613 to `frame-height'). */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109139
diff
changeset
|
2614 (Lisp_Object frame) |
286 | 2615 { |
2068
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
2616 struct frame *f; |
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
2617 |
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
2618 if (NILP (frame)) |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
2619 frame = selected_frame; |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
2620 CHECK_FRAME (frame); |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
2621 f = XFRAME (frame); |
2068
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
2622 |
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
|
2623 #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
|
2624 if (FRAME_WINDOW_P (f)) |
2068
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
2625 return make_number (x_pixel_height (f)); |
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
2626 else |
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
2627 #endif |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
2628 return make_number (FRAME_LINES (f)); |
286 | 2629 } |
2068
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
2630 |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
2631 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
|
2632 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
|
2633 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
|
2634 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
|
2635 If FRAME is omitted, the selected frame is used. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109139
diff
changeset
|
2636 (Lisp_Object frame) |
2068
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
2637 { |
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
2638 struct frame *f; |
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
2639 |
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
2640 if (NILP (frame)) |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
2641 frame = selected_frame; |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
2642 CHECK_FRAME (frame); |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
2643 f = XFRAME (frame); |
2068
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
2644 |
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
|
2645 #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
|
2646 if (FRAME_WINDOW_P (f)) |
2068
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
2647 return make_number (x_pixel_width (f)); |
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
2648 else |
777 | 2649 #endif |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
2650 return make_number (FRAME_COLS (f)); |
2068
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
2651 } |
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
2652 |
765 | 2653 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
|
2654 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
|
2655 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
|
2656 but that the idea of the actual height of the frame should not be changed. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109139
diff
changeset
|
2657 (Lisp_Object frame, Lisp_Object lines, Lisp_Object pretend) |
286 | 2658 { |
765 | 2659 register struct frame *f; |
286 | 2660 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
2661 CHECK_NUMBER (lines); |
765 | 2662 if (NILP (frame)) |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
2663 frame = selected_frame; |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
2664 CHECK_LIVE_FRAME (frame); |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
2665 f = XFRAME (frame); |
286 | 2666 |
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1809
diff
changeset
|
2667 /* 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
|
2668 #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
|
2669 if (FRAME_WINDOW_P (f)) |
286 | 2670 { |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
2671 if (XINT (lines) != FRAME_LINES (f)) |
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
2672 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
|
2673 do_pending_window_change (0); |
286 | 2674 } |
2675 else | |
965
0eb68c6c452a
* frame.c (Qheight, Qicon, Qmodeline, Qname, Qnone, Qonly,
Jim Blandy <jimb@redhat.com>
parents:
886
diff
changeset
|
2676 #endif |
25350
f964a1e5b29c
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25209
diff
changeset
|
2677 change_frame_size (f, XINT (lines), 0, !NILP (pretend), 0, 0); |
286 | 2678 return Qnil; |
2679 } | |
2680 | |
765 | 2681 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
|
2682 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
|
2683 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
|
2684 but that the idea of the actual width of the frame should not be changed. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109139
diff
changeset
|
2685 (Lisp_Object frame, Lisp_Object cols, Lisp_Object pretend) |
286 | 2686 { |
765 | 2687 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
|
2688 CHECK_NUMBER (cols); |
765 | 2689 if (NILP (frame)) |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
2690 frame = selected_frame; |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
2691 CHECK_LIVE_FRAME (frame); |
25669
97d5951366cd
(Fmake_terminal_frame): Use SELECTED_FRAME.
Gerd Moellmann <gerd@gnu.org>
parents:
25544
diff
changeset
|
2692 f = XFRAME (frame); |
286 | 2693 |
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1809
diff
changeset
|
2694 /* 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
|
2695 #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
|
2696 if (FRAME_WINDOW_P (f)) |
286 | 2697 { |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
2698 if (XINT (cols) != FRAME_COLS (f)) |
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
2699 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
|
2700 do_pending_window_change (0); |
286 | 2701 } |
2702 else | |
965
0eb68c6c452a
* frame.c (Qheight, Qicon, Qmodeline, Qname, Qnone, Qonly,
Jim Blandy <jimb@redhat.com>
parents:
886
diff
changeset
|
2703 #endif |
25350
f964a1e5b29c
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25209
diff
changeset
|
2704 change_frame_size (f, 0, XINT (cols), !NILP (pretend), 0, 0); |
286 | 2705 return Qnil; |
2706 } | |
2707 | |
765 | 2708 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
|
2709 doc: /* Sets size of FRAME to COLS by ROWS, measured in characters. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109139
diff
changeset
|
2710 (Lisp_Object frame, Lisp_Object cols, Lisp_Object rows) |
286 | 2711 { |
765 | 2712 register struct frame *f; |
286 | 2713 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
2714 CHECK_LIVE_FRAME (frame); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
2715 CHECK_NUMBER (cols); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
2716 CHECK_NUMBER (rows); |
765 | 2717 f = XFRAME (frame); |
286 | 2718 |
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1809
diff
changeset
|
2719 /* 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
|
2720 #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
|
2721 if (FRAME_WINDOW_P (f)) |
286 | 2722 { |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
2723 if (XINT (rows) != FRAME_LINES (f) |
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
2724 || XINT (cols) != FRAME_COLS (f) |
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
2725 || 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
|
2726 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
|
2727 do_pending_window_change (0); |
286 | 2728 } |
2729 else | |
965
0eb68c6c452a
* frame.c (Qheight, Qicon, Qmodeline, Qname, Qnone, Qonly,
Jim Blandy <jimb@redhat.com>
parents:
886
diff
changeset
|
2730 #endif |
25350
f964a1e5b29c
Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents:
25209
diff
changeset
|
2731 change_frame_size (f, XINT (rows), XINT (cols), 0, 0, 0); |
286 | 2732 |
2733 return Qnil; | |
2734 } | |
2735 | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
2736 DEFUN ("set-frame-position", Fset_frame_position, |
765 | 2737 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
|
2738 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
|
2739 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
|
2740 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
|
2741 the rightmost or bottommost possible position (that stays within the screen). */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109139
diff
changeset
|
2742 (Lisp_Object frame, Lisp_Object xoffset, Lisp_Object yoffset) |
286 | 2743 { |
765 | 2744 register struct frame *f; |
286 | 2745 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
2746 CHECK_LIVE_FRAME (frame); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
2747 CHECK_NUMBER (xoffset); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40568
diff
changeset
|
2748 CHECK_NUMBER (yoffset); |
765 | 2749 f = XFRAME (frame); |
286 | 2750 |
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1809
diff
changeset
|
2751 /* 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
|
2752 #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
|
2753 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
|
2754 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
|
2755 #endif |
286 | 2756 |
2757 return Qt; | |
2758 } | |
777 | 2759 |
286 | 2760 |
50357 | 2761 /*********************************************************************** |
2762 Frame Parameters | |
2763 ***********************************************************************/ | |
2764 | |
2765 /* Connect the frame-parameter names for X frames | |
2766 to the ways of passing the parameter values to the window system. | |
2767 | |
2768 The name of a parameter, as a Lisp symbol, | |
2769 has an `x-frame-parameter' property which is an integer in Lisp | |
2770 that is an index in this table. */ | |
2771 | |
2772 struct frame_parm_table { | |
109717
8949aad5e992
Use const char* instead of char*.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109667
diff
changeset
|
2773 const char *name; |
50357 | 2774 Lisp_Object *variable; |
2775 }; | |
2776 | |
109667
fd6fad994956
* src/frame.c (frame_params): Make const.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109637
diff
changeset
|
2777 static const struct frame_parm_table frame_parms[] = |
50357 | 2778 { |
2779 {"auto-raise", &Qauto_raise}, | |
2780 {"auto-lower", &Qauto_lower}, | |
2781 {"background-color", 0}, | |
2782 {"border-color", &Qborder_color}, | |
2783 {"border-width", &Qborder_width}, | |
2784 {"cursor-color", &Qcursor_color}, | |
2785 {"cursor-type", &Qcursor_type}, | |
2786 {"font", 0}, | |
2787 {"foreground-color", 0}, | |
2788 {"icon-name", &Qicon_name}, | |
2789 {"icon-type", &Qicon_type}, | |
2790 {"internal-border-width", &Qinternal_border_width}, | |
2791 {"menu-bar-lines", &Qmenu_bar_lines}, | |
2792 {"mouse-color", &Qmouse_color}, | |
2793 {"name", &Qname}, | |
2794 {"scroll-bar-width", &Qscroll_bar_width}, | |
2795 {"title", &Qtitle}, | |
2796 {"unsplittable", &Qunsplittable}, | |
2797 {"vertical-scroll-bars", &Qvertical_scroll_bars}, | |
2798 {"visibility", &Qvisibility}, | |
2799 {"tool-bar-lines", &Qtool_bar_lines}, | |
2800 {"scroll-bar-foreground", &Qscroll_bar_foreground}, | |
2801 {"scroll-bar-background", &Qscroll_bar_background}, | |
2802 {"screen-gamma", &Qscreen_gamma}, | |
2803 {"line-spacing", &Qline_spacing}, | |
2804 {"left-fringe", &Qleft_fringe}, | |
2805 {"right-fringe", &Qright_fringe}, | |
2806 {"wait-for-wm", &Qwait_for_wm}, | |
2807 {"fullscreen", &Qfullscreen}, | |
95157
b419f60db46c
Seiji Zenitani <zenitani at mac.com>
Glenn Morris <rgm@gnu.org>
parents:
95044
diff
changeset
|
2808 {"font-backend", &Qfont_backend}, |
103674
1867be80e595
* w32fns.c (w32_frame_parm_handlers): Set 0 for sticky.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103665
diff
changeset
|
2809 {"alpha", &Qalpha}, |
1867be80e595
* w32fns.c (w32_frame_parm_handlers): Set 0 for sticky.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103665
diff
changeset
|
2810 {"sticky", &Qsticky}, |
109581
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109573
diff
changeset
|
2811 {"tool-bar-position", &Qtool_bar_position}, |
50357 | 2812 }; |
2813 | |
2814 #ifdef HAVE_WINDOW_SYSTEM | |
2815 | |
2816 /* Calculate fullscreen size. Return in *TOP_POS and *LEFT_POS the | |
73687
420314603844
(syms_of_frame): Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
73253
diff
changeset
|
2817 wanted positions of the WM window (not Emacs window). |
50357 | 2818 Return in *WIDTH and *HEIGHT the wanted width and height of Emacs |
2819 window (FRAME_X_WINDOW). | |
2820 */ | |
2821 | |
2822 void | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
2823 x_fullscreen_adjust (struct frame *f, int *width, int *height, int *top_pos, int *left_pos) |
50357 | 2824 { |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
2825 int newwidth = FRAME_COLS (f); |
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
2826 int newheight = FRAME_LINES (f); |
98240
5f73593cabcd
* frame.c (x_fullscreen_adjust): Declare var as Display_Info.
Juanma Barranquero <lekktu@gmail.com>
parents:
98225
diff
changeset
|
2827 Display_Info *dpyinfo = FRAME_X_DISPLAY_INFO (f); |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
2828 |
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
2829 *top_pos = f->top_pos; |
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
2830 *left_pos = f->left_pos; |
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
2831 |
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
2832 if (f->want_fullscreen & FULLSCREEN_HEIGHT) |
50357 | 2833 { |
2834 int ph; | |
2835 | |
98225
e7da931942f1
(x_fullscreen_adjust): Use x_display_pixel_height and
Chong Yidong <cyd@stupidchicken.com>
parents:
97883
diff
changeset
|
2836 ph = x_display_pixel_height (dpyinfo); |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
2837 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
|
2838 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
|
2839 newheight = FRAME_PIXEL_HEIGHT_TO_TEXT_LINES (f, ph); |
50357 | 2840 *top_pos = 0; |
2841 } | |
2842 | |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
2843 if (f->want_fullscreen & FULLSCREEN_WIDTH) |
50357 | 2844 { |
2845 int pw; | |
2846 | |
98225
e7da931942f1
(x_fullscreen_adjust): Use x_display_pixel_height and
Chong Yidong <cyd@stupidchicken.com>
parents:
97883
diff
changeset
|
2847 pw = x_display_pixel_width (dpyinfo); |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
2848 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
|
2849 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
|
2850 newwidth = FRAME_PIXEL_WIDTH_TO_TEXT_COLS (f, pw); |
50357 | 2851 *left_pos = 0; |
2852 } | |
2853 | |
2854 *width = newwidth; | |
2855 *height = newheight; | |
2856 } | |
2857 | |
2858 | |
2859 /* Change the parameters of frame F as specified by ALIST. | |
2860 If a parameter is not specially recognized, do nothing special; | |
2861 otherwise call the `x_set_...' function for that parameter. | |
2862 Except for certain geometry properties, always call store_frame_param | |
2863 to store the new value in the parameter alist. */ | |
2864 | |
2865 void | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
2866 x_set_frame_parameters (FRAME_PTR f, Lisp_Object alist) |
50357 | 2867 { |
2868 Lisp_Object tail; | |
2869 | |
2870 /* If both of these parameters are present, it's more efficient to | |
2871 set them both at once. So we wait until we've looked at the | |
2872 entire list before we set them. */ | |
2873 int width, height; | |
2874 | |
2875 /* Same here. */ | |
2876 Lisp_Object left, top; | |
2877 | |
2878 /* Same with these. */ | |
2879 Lisp_Object icon_left, icon_top; | |
2880 | |
2881 /* Record in these vectors all the parms specified. */ | |
2882 Lisp_Object *parms; | |
2883 Lisp_Object *values; | |
2884 int i, p; | |
2885 int left_no_change = 0, top_no_change = 0; | |
2886 int icon_left_no_change = 0, icon_top_no_change = 0; | |
103665
340c701162a6
* emacs.c (USAGE3, standard_args): Add -mm and --maximized.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103603
diff
changeset
|
2887 int size_changed = 0; |
50357 | 2888 struct gcpro gcpro1, gcpro2; |
2889 | |
2890 i = 0; | |
2891 for (tail = alist; CONSP (tail); tail = Fcdr (tail)) | |
2892 i++; | |
2893 | |
2894 parms = (Lisp_Object *) alloca (i * sizeof (Lisp_Object)); | |
2895 values = (Lisp_Object *) alloca (i * sizeof (Lisp_Object)); | |
2896 | |
2897 /* Extract parm names and values into those vectors. */ | |
2898 | |
2899 i = 0; | |
93203
7327632ad432
(Fmodify_frame_parameters, x_set_frame_parameters): Use XCAR/XCDR.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91791
diff
changeset
|
2900 for (tail = alist; CONSP (tail); tail = XCDR (tail)) |
50357 | 2901 { |
2902 Lisp_Object elt; | |
2903 | |
93203
7327632ad432
(Fmodify_frame_parameters, x_set_frame_parameters): Use XCAR/XCDR.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91791
diff
changeset
|
2904 elt = XCAR (tail); |
50357 | 2905 parms[i] = Fcar (elt); |
2906 values[i] = Fcdr (elt); | |
2907 i++; | |
2908 } | |
2909 /* TAIL and ALIST are not used again below here. */ | |
2910 alist = tail = Qnil; | |
2911 | |
2912 GCPRO2 (*parms, *values); | |
2913 gcpro1.nvars = i; | |
2914 gcpro2.nvars = i; | |
2915 | |
2916 /* There is no need to gcpro LEFT, TOP, ICON_LEFT, or ICON_TOP, | |
2917 because their values appear in VALUES and strings are not valid. */ | |
2918 top = left = Qunbound; | |
2919 icon_left = icon_top = Qunbound; | |
2920 | |
2921 /* 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
|
2922 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
|
2923 height = (f->new_text_lines ? f->new_text_lines : FRAME_LINES (f)); |
50357 | 2924 |
2925 /* Process foreground_color and background_color before anything else. | |
2926 They are independent of other properties, but other properties (e.g., | |
2927 cursor_color) are dependent upon them. */ | |
2928 /* Process default font as well, since fringe widths depends on it. */ | |
2929 for (p = 0; p < i; p++) | |
2930 { | |
2931 Lisp_Object prop, val; | |
2932 | |
2933 prop = parms[p]; | |
2934 val = values[p]; | |
2935 if (EQ (prop, Qforeground_color) | |
2936 || EQ (prop, Qbackground_color) | |
103665
340c701162a6
* emacs.c (USAGE3, standard_args): Add -mm and --maximized.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103603
diff
changeset
|
2937 || EQ (prop, Qfont)) |
50357 | 2938 { |
2939 register Lisp_Object param_index, old_value; | |
2940 | |
2941 old_value = get_frame_param (f, prop); | |
2942 if (NILP (Fequal (val, old_value))) | |
2943 { | |
2944 store_frame_param (f, prop, val); | |
2945 | |
2946 param_index = Fget (prop, Qx_frame_parameter); | |
2947 if (NATNUMP (param_index) | |
2948 && (XFASTINT (param_index) | |
2949 < sizeof (frame_parms)/sizeof (frame_parms[0])) | |
82992
5de4189e659d
Got rid of the rif (window-based redisplay interface) global variable.
Karoly Lorentey <lorentey@elte.hu>
parents:
82991
diff
changeset
|
2950 && FRAME_RIF (f)->frame_parm_handlers[XINT (param_index)]) |
5de4189e659d
Got rid of the rif (window-based redisplay interface) global variable.
Karoly Lorentey <lorentey@elte.hu>
parents:
82991
diff
changeset
|
2951 (*(FRAME_RIF (f)->frame_parm_handlers[XINT (param_index)])) (f, val, old_value); |
50357 | 2952 } |
2953 } | |
2954 } | |
2955 | |
2956 /* Now process them in reverse of specified order. */ | |
2957 for (i--; i >= 0; i--) | |
2958 { | |
2959 Lisp_Object prop, val; | |
2960 | |
2961 prop = parms[i]; | |
2962 val = values[i]; | |
2963 | |
84375
3dfbf778e937
(x_set_frame_parameters): Check number is positive before using XFASTINT.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83804
diff
changeset
|
2964 if (EQ (prop, Qwidth) && NATNUMP (val)) |
103665
340c701162a6
* emacs.c (USAGE3, standard_args): Add -mm and --maximized.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103603
diff
changeset
|
2965 { |
340c701162a6
* emacs.c (USAGE3, standard_args): Add -mm and --maximized.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103603
diff
changeset
|
2966 size_changed = 1; |
340c701162a6
* emacs.c (USAGE3, standard_args): Add -mm and --maximized.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103603
diff
changeset
|
2967 width = XFASTINT (val); |
340c701162a6
* emacs.c (USAGE3, standard_args): Add -mm and --maximized.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103603
diff
changeset
|
2968 } |
84375
3dfbf778e937
(x_set_frame_parameters): Check number is positive before using XFASTINT.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83804
diff
changeset
|
2969 else if (EQ (prop, Qheight) && NATNUMP (val)) |
103665
340c701162a6
* emacs.c (USAGE3, standard_args): Add -mm and --maximized.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103603
diff
changeset
|
2970 { |
340c701162a6
* emacs.c (USAGE3, standard_args): Add -mm and --maximized.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103603
diff
changeset
|
2971 size_changed = 1; |
340c701162a6
* emacs.c (USAGE3, standard_args): Add -mm and --maximized.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103603
diff
changeset
|
2972 height = XFASTINT (val); |
340c701162a6
* emacs.c (USAGE3, standard_args): Add -mm and --maximized.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103603
diff
changeset
|
2973 } |
50357 | 2974 else if (EQ (prop, Qtop)) |
2975 top = val; | |
2976 else if (EQ (prop, Qleft)) | |
2977 left = val; | |
2978 else if (EQ (prop, Qicon_top)) | |
2979 icon_top = val; | |
2980 else if (EQ (prop, Qicon_left)) | |
2981 icon_left = val; | |
2982 else if (EQ (prop, Qforeground_color) | |
2983 || EQ (prop, Qbackground_color) | |
103665
340c701162a6
* emacs.c (USAGE3, standard_args): Add -mm and --maximized.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103603
diff
changeset
|
2984 || EQ (prop, Qfont)) |
50357 | 2985 /* Processed above. */ |
2986 continue; | |
2987 else | |
2988 { | |
2989 register Lisp_Object param_index, old_value; | |
2990 | |
2991 old_value = get_frame_param (f, prop); | |
2992 | |
2993 store_frame_param (f, prop, val); | |
2994 | |
2995 param_index = Fget (prop, Qx_frame_parameter); | |
2996 if (NATNUMP (param_index) | |
2997 && (XFASTINT (param_index) | |
2998 < sizeof (frame_parms)/sizeof (frame_parms[0])) | |
82992
5de4189e659d
Got rid of the rif (window-based redisplay interface) global variable.
Karoly Lorentey <lorentey@elte.hu>
parents:
82991
diff
changeset
|
2999 && FRAME_RIF (f)->frame_parm_handlers[XINT (param_index)]) |
5de4189e659d
Got rid of the rif (window-based redisplay interface) global variable.
Karoly Lorentey <lorentey@elte.hu>
parents:
82991
diff
changeset
|
3000 (*(FRAME_RIF (f)->frame_parm_handlers[XINT (param_index)])) (f, val, old_value); |
50357 | 3001 } |
3002 } | |
3003 | |
3004 /* Don't die if just one of these was set. */ | |
3005 if (EQ (left, Qunbound)) | |
3006 { | |
3007 left_no_change = 1; | |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
3008 if (f->left_pos < 0) |
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
3009 left = Fcons (Qplus, Fcons (make_number (f->left_pos), Qnil)); |
50357 | 3010 else |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
3011 XSETINT (left, f->left_pos); |
50357 | 3012 } |
3013 if (EQ (top, Qunbound)) | |
3014 { | |
3015 top_no_change = 1; | |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
3016 if (f->top_pos < 0) |
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
3017 top = Fcons (Qplus, Fcons (make_number (f->top_pos), Qnil)); |
50357 | 3018 else |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
3019 XSETINT (top, f->top_pos); |
50357 | 3020 } |
3021 | |
3022 /* If one of the icon positions was not set, preserve or default it. */ | |
3023 if (EQ (icon_left, Qunbound) || ! INTEGERP (icon_left)) | |
3024 { | |
3025 icon_left_no_change = 1; | |
3026 icon_left = Fcdr (Fassq (Qicon_left, f->param_alist)); | |
3027 if (NILP (icon_left)) | |
3028 XSETINT (icon_left, 0); | |
3029 } | |
3030 if (EQ (icon_top, Qunbound) || ! INTEGERP (icon_top)) | |
3031 { | |
3032 icon_top_no_change = 1; | |
3033 icon_top = Fcdr (Fassq (Qicon_top, f->param_alist)); | |
3034 if (NILP (icon_top)) | |
3035 XSETINT (icon_top, 0); | |
3036 } | |
3037 | |
3038 /* Don't set these parameters unless they've been explicitly | |
3039 specified. The window might be mapped or resized while we're in | |
3040 this function, and we don't want to override that unless the lisp | |
3041 code has asked for it. | |
3042 | |
3043 Don't set these parameters unless they actually differ from the | |
3044 window's current parameters; the window may not actually exist | |
3045 yet. */ | |
3046 { | |
3047 Lisp_Object frame; | |
3048 | |
3049 check_frame_size (f, &height, &width); | |
3050 | |
3051 XSETFRAME (frame, f); | |
3052 | |
103665
340c701162a6
* emacs.c (USAGE3, standard_args): Add -mm and --maximized.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103603
diff
changeset
|
3053 if (size_changed |
340c701162a6
* emacs.c (USAGE3, standard_args): Add -mm and --maximized.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103603
diff
changeset
|
3054 && (width != FRAME_COLS (f) |
340c701162a6
* emacs.c (USAGE3, standard_args): Add -mm and --maximized.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103603
diff
changeset
|
3055 || height != FRAME_LINES (f) |
340c701162a6
* emacs.c (USAGE3, standard_args): Add -mm and --maximized.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103603
diff
changeset
|
3056 || f->new_text_lines || f->new_text_cols)) |
340c701162a6
* emacs.c (USAGE3, standard_args): Add -mm and --maximized.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103603
diff
changeset
|
3057 Fset_frame_size (frame, make_number (width), make_number (height)); |
50357 | 3058 |
3059 if ((!NILP (left) || !NILP (top)) | |
3060 && ! (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
|
3061 && ! (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
|
3062 && NUMBERP (top) && XINT (top) == f->top_pos)) |
50357 | 3063 { |
3064 int leftpos = 0; | |
3065 int toppos = 0; | |
3066 | |
3067 /* Record the signs. */ | |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
3068 f->size_hint_flags &= ~ (XNegative | YNegative); |
50357 | 3069 if (EQ (left, Qminus)) |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
3070 f->size_hint_flags |= XNegative; |
50357 | 3071 else if (INTEGERP (left)) |
3072 { | |
3073 leftpos = XINT (left); | |
3074 if (leftpos < 0) | |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
3075 f->size_hint_flags |= XNegative; |
50357 | 3076 } |
3077 else if (CONSP (left) && EQ (XCAR (left), Qminus) | |
3078 && CONSP (XCDR (left)) | |
3079 && INTEGERP (XCAR (XCDR (left)))) | |
3080 { | |
3081 leftpos = - XINT (XCAR (XCDR (left))); | |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
3082 f->size_hint_flags |= XNegative; |
50357 | 3083 } |
3084 else if (CONSP (left) && EQ (XCAR (left), Qplus) | |
3085 && CONSP (XCDR (left)) | |
3086 && INTEGERP (XCAR (XCDR (left)))) | |
3087 { | |
3088 leftpos = XINT (XCAR (XCDR (left))); | |
3089 } | |
3090 | |
3091 if (EQ (top, Qminus)) | |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
3092 f->size_hint_flags |= YNegative; |
50357 | 3093 else if (INTEGERP (top)) |
3094 { | |
3095 toppos = XINT (top); | |
3096 if (toppos < 0) | |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
3097 f->size_hint_flags |= YNegative; |
50357 | 3098 } |
3099 else if (CONSP (top) && EQ (XCAR (top), Qminus) | |
3100 && CONSP (XCDR (top)) | |
3101 && INTEGERP (XCAR (XCDR (top)))) | |
3102 { | |
3103 toppos = - XINT (XCAR (XCDR (top))); | |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
3104 f->size_hint_flags |= YNegative; |
50357 | 3105 } |
3106 else if (CONSP (top) && EQ (XCAR (top), Qplus) | |
3107 && CONSP (XCDR (top)) | |
3108 && INTEGERP (XCAR (XCDR (top)))) | |
3109 { | |
3110 toppos = XINT (XCAR (XCDR (top))); | |
3111 } | |
3112 | |
3113 | |
3114 /* 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
|
3115 f->top_pos = toppos; |
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
3116 f->left_pos = leftpos; |
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
3117 |
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
3118 f->win_gravity = NorthWestGravity; |
50357 | 3119 |
3120 /* Actually set that position, and convert to absolute. */ | |
3121 x_set_offset (f, leftpos, toppos, -1); | |
3122 } | |
3123 | |
3124 if ((!NILP (icon_left) || !NILP (icon_top)) | |
3125 && ! (icon_left_no_change && icon_top_no_change)) | |
3126 x_wm_set_icon_position (f, XINT (icon_left), XINT (icon_top)); | |
3127 } | |
3128 | |
3129 UNGCPRO; | |
3130 } | |
3131 | |
3132 | |
3133 /* Insert a description of internally-recorded parameters of frame X | |
3134 into the parameter alist *ALISTPTR that is to be given to the user. | |
3135 Only parameters that are specific to the X window system | |
3136 and whose values are not correctly recorded in the frame's | |
3137 param_alist need to be considered here. */ | |
3138 | |
3139 void | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
3140 x_report_frame_params (struct frame *f, Lisp_Object *alistptr) |
50357 | 3141 { |
3142 char buf[16]; | |
3143 Lisp_Object tem; | |
3144 | |
3145 /* Represent negative positions (off the top or left screen edge) | |
3146 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
|
3147 XSETINT (tem, f->left_pos); |
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
3148 if (f->left_pos >= 0) |
50357 | 3149 store_in_alist (alistptr, Qleft, tem); |
3150 else | |
3151 store_in_alist (alistptr, Qleft, Fcons (Qplus, Fcons (tem, Qnil))); | |
3152 | |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
3153 XSETINT (tem, f->top_pos); |
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
3154 if (f->top_pos >= 0) |
50357 | 3155 store_in_alist (alistptr, Qtop, tem); |
3156 else | |
3157 store_in_alist (alistptr, Qtop, Fcons (Qplus, Fcons (tem, Qnil))); | |
3158 | |
3159 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
|
3160 make_number (f->border_width)); |
50357 | 3161 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
|
3162 make_number (FRAME_INTERNAL_BORDER_WIDTH (f))); |
50357 | 3163 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
|
3164 make_number (FRAME_LEFT_FRINGE_WIDTH (f))); |
50357 | 3165 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
|
3166 make_number (FRAME_RIGHT_FRINGE_WIDTH (f))); |
50357 | 3167 store_in_alist (alistptr, Qscroll_bar_width, |
3168 (! FRAME_HAS_VERTICAL_SCROLL_BARS (f) | |
3169 ? make_number (0) | |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
3170 : 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
|
3171 ? make_number (FRAME_CONFIG_SCROLL_BAR_WIDTH (f)) |
50357 | 3172 /* nil means "use default width" |
3173 for non-toolkit scroll bar. | |
3174 ruler-mode.el depends on this. */ | |
3175 : Qnil)); | |
3176 sprintf (buf, "%ld", (long) FRAME_X_WINDOW (f)); | |
3177 store_in_alist (alistptr, Qwindow_id, | |
3178 build_string (buf)); | |
3179 #ifdef HAVE_X_WINDOWS | |
3180 #ifdef USE_X_TOOLKIT | |
3181 /* Tooltip frame may not have this widget. */ | |
3182 if (FRAME_X_OUTPUT (f)->widget) | |
3183 #endif | |
3184 sprintf (buf, "%ld", (long) FRAME_OUTER_WINDOW (f)); | |
3185 store_in_alist (alistptr, Qouter_window_id, | |
3186 build_string (buf)); | |
3187 #endif | |
3188 store_in_alist (alistptr, Qicon_name, f->icon_name); | |
3189 FRAME_SAMPLE_VISIBILITY (f); | |
3190 store_in_alist (alistptr, Qvisibility, | |
3191 (FRAME_VISIBLE_P (f) ? Qt | |
3192 : FRAME_ICONIFIED_P (f) ? Qicon : Qnil)); | |
3193 store_in_alist (alistptr, Qdisplay, | |
3194 XCAR (FRAME_X_DISPLAY_INFO (f)->name_list_element)); | |
3195 | |
3196 if (FRAME_X_OUTPUT (f)->parent_desc == FRAME_X_DISPLAY_INFO (f)->root_window) | |
3197 tem = Qnil; | |
3198 else | |
3199 XSETFASTINT (tem, FRAME_X_OUTPUT (f)->parent_desc); | |
79048
ab853f85e4dc
(Qexplicit_name): New variable.
Martin Rudalics <rudalics@gmx.at>
parents:
78984
diff
changeset
|
3200 store_in_alist (alistptr, Qexplicit_name, (f->explicit_name ? Qt : Qnil)); |
50357 | 3201 store_in_alist (alistptr, Qparent_id, tem); |
109581
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109573
diff
changeset
|
3202 store_in_alist (alistptr, Qtool_bar_position, f->tool_bar_position); |
50357 | 3203 } |
3204 | |
3205 | |
3206 /* Change the `fullscreen' frame parameter of frame F. OLD_VALUE is | |
3207 the previous value of that parameter, NEW_VALUE is the new value. */ | |
3208 | |
3209 void | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
3210 x_set_fullscreen (struct frame *f, Lisp_Object new_value, Lisp_Object old_value) |
50357 | 3211 { |
3212 if (NILP (new_value)) | |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
3213 f->want_fullscreen = FULLSCREEN_NONE; |
103665
340c701162a6
* emacs.c (USAGE3, standard_args): Add -mm and --maximized.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103603
diff
changeset
|
3214 else if (EQ (new_value, Qfullboth) || EQ (new_value, Qfullscreen)) |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
3215 f->want_fullscreen = FULLSCREEN_BOTH; |
50357 | 3216 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
|
3217 f->want_fullscreen = FULLSCREEN_WIDTH; |
50357 | 3218 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
|
3219 f->want_fullscreen = FULLSCREEN_HEIGHT; |
103665
340c701162a6
* emacs.c (USAGE3, standard_args): Add -mm and --maximized.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103603
diff
changeset
|
3220 else if (EQ (new_value, Qmaximized)) |
340c701162a6
* emacs.c (USAGE3, standard_args): Add -mm and --maximized.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103603
diff
changeset
|
3221 f->want_fullscreen = FULLSCREEN_MAXIMIZED; |
73865
cec2394c7204
(x_set_fullscreen): Call fullscreen_hook if set.
Jan Djärv <jan.h.d@swipnet.se>
parents:
73687
diff
changeset
|
3222 |
85651
a8927de00181
(syms_of_frame) <delete-frame-functions>: Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
85614
diff
changeset
|
3223 if (FRAME_TERMINAL (f)->fullscreen_hook != NULL) |
83548
c71725faff1a
Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
diff
changeset
|
3224 FRAME_TERMINAL (f)->fullscreen_hook (f); |
50357 | 3225 } |
3226 | |
3227 | |
3228 /* Change the `line-spacing' frame parameter of frame F. OLD_VALUE is | |
3229 the previous value of that parameter, NEW_VALUE is the new value. */ | |
3230 | |
3231 void | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
3232 x_set_line_spacing (struct frame *f, Lisp_Object new_value, Lisp_Object old_value) |
50357 | 3233 { |
3234 if (NILP (new_value)) | |
3235 f->extra_line_spacing = 0; | |
3236 else if (NATNUMP (new_value)) | |
3237 f->extra_line_spacing = XFASTINT (new_value); | |
3238 else | |
71980
423c880b693f
(x_set_line_spacing, x_set_screen_gamma): Use signal_error.
Kim F. Storm <storm@cua.dk>
parents:
70732
diff
changeset
|
3239 signal_error ("Invalid line-spacing", new_value); |
50357 | 3240 if (FRAME_VISIBLE_P (f)) |
3241 redraw_frame (f); | |
3242 } | |
3243 | |
3244 | |
3245 /* Change the `screen-gamma' frame parameter of frame F. OLD_VALUE is | |
3246 the previous value of that parameter, NEW_VALUE is the new value. */ | |
3247 | |
3248 void | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
3249 x_set_screen_gamma (struct frame *f, Lisp_Object new_value, Lisp_Object old_value) |
50357 | 3250 { |
76029
a235d0ff326b
* frame.c (x_set_screen_gamma): Apply gamma value to the frame's bgcolor.
Chong Yidong <cyd@stupidchicken.com>
parents:
75954
diff
changeset
|
3251 Lisp_Object bgcolor; |
a235d0ff326b
* frame.c (x_set_screen_gamma): Apply gamma value to the frame's bgcolor.
Chong Yidong <cyd@stupidchicken.com>
parents:
75954
diff
changeset
|
3252 |
50357 | 3253 if (NILP (new_value)) |
3254 f->gamma = 0; | |
3255 else if (NUMBERP (new_value) && XFLOATINT (new_value) > 0) | |
76029
a235d0ff326b
* frame.c (x_set_screen_gamma): Apply gamma value to the frame's bgcolor.
Chong Yidong <cyd@stupidchicken.com>
parents:
75954
diff
changeset
|
3256 /* The value 0.4545 is the normal viewing gamma. */ |
a235d0ff326b
* frame.c (x_set_screen_gamma): Apply gamma value to the frame's bgcolor.
Chong Yidong <cyd@stupidchicken.com>
parents:
75954
diff
changeset
|
3257 f->gamma = 1.0 / (0.4545 * XFLOATINT (new_value)); |
50357 | 3258 else |
71980
423c880b693f
(x_set_line_spacing, x_set_screen_gamma): Use signal_error.
Kim F. Storm <storm@cua.dk>
parents:
70732
diff
changeset
|
3259 signal_error ("Invalid screen-gamma", new_value); |
50357 | 3260 |
76029
a235d0ff326b
* frame.c (x_set_screen_gamma): Apply gamma value to the frame's bgcolor.
Chong Yidong <cyd@stupidchicken.com>
parents:
75954
diff
changeset
|
3261 /* Apply the new gamma value to the frame background. */ |
a235d0ff326b
* frame.c (x_set_screen_gamma): Apply gamma value to the frame's bgcolor.
Chong Yidong <cyd@stupidchicken.com>
parents:
75954
diff
changeset
|
3262 bgcolor = Fassq (Qbackground_color, f->param_alist); |
a235d0ff326b
* frame.c (x_set_screen_gamma): Apply gamma value to the frame's bgcolor.
Chong Yidong <cyd@stupidchicken.com>
parents:
75954
diff
changeset
|
3263 if (CONSP (bgcolor) && (bgcolor = XCDR (bgcolor), STRINGP (bgcolor))) |
a235d0ff326b
* frame.c (x_set_screen_gamma): Apply gamma value to the frame's bgcolor.
Chong Yidong <cyd@stupidchicken.com>
parents:
75954
diff
changeset
|
3264 { |
a235d0ff326b
* frame.c (x_set_screen_gamma): Apply gamma value to the frame's bgcolor.
Chong Yidong <cyd@stupidchicken.com>
parents:
75954
diff
changeset
|
3265 Lisp_Object index = Fget (Qbackground_color, Qx_frame_parameter); |
a235d0ff326b
* frame.c (x_set_screen_gamma): Apply gamma value to the frame's bgcolor.
Chong Yidong <cyd@stupidchicken.com>
parents:
75954
diff
changeset
|
3266 if (NATNUMP (index) |
a235d0ff326b
* frame.c (x_set_screen_gamma): Apply gamma value to the frame's bgcolor.
Chong Yidong <cyd@stupidchicken.com>
parents:
75954
diff
changeset
|
3267 && (XFASTINT (index) |
a235d0ff326b
* frame.c (x_set_screen_gamma): Apply gamma value to the frame's bgcolor.
Chong Yidong <cyd@stupidchicken.com>
parents:
75954
diff
changeset
|
3268 < sizeof (frame_parms)/sizeof (frame_parms[0])) |
83557
8aaa2a0d400f
Fix compilation errors. Regenerate ldefs-boot.el.
Karoly Lorentey <karoly@lorentey.hu>
parents:
83556
diff
changeset
|
3269 && FRAME_RIF (f)->frame_parm_handlers[XFASTINT (index)]) |
8aaa2a0d400f
Fix compilation errors. Regenerate ldefs-boot.el.
Karoly Lorentey <karoly@lorentey.hu>
parents:
83556
diff
changeset
|
3270 (*FRAME_RIF (f)->frame_parm_handlers[XFASTINT (index)]) |
8aaa2a0d400f
Fix compilation errors. Regenerate ldefs-boot.el.
Karoly Lorentey <karoly@lorentey.hu>
parents:
83556
diff
changeset
|
3271 (f, bgcolor, Qnil); |
76029
a235d0ff326b
* frame.c (x_set_screen_gamma): Apply gamma value to the frame's bgcolor.
Chong Yidong <cyd@stupidchicken.com>
parents:
75954
diff
changeset
|
3272 } |
a235d0ff326b
* frame.c (x_set_screen_gamma): Apply gamma value to the frame's bgcolor.
Chong Yidong <cyd@stupidchicken.com>
parents:
75954
diff
changeset
|
3273 |
a235d0ff326b
* frame.c (x_set_screen_gamma): Apply gamma value to the frame's bgcolor.
Chong Yidong <cyd@stupidchicken.com>
parents:
75954
diff
changeset
|
3274 Fclear_face_cache (Qnil); |
50357 | 3275 } |
3276 | |
3277 | |
3278 void | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
3279 x_set_font (struct frame *f, Lisp_Object arg, Lisp_Object oldval) |
50357 | 3280 { |
106201
01190029e5d3
Set Xft defaults if no XSETTING is found, better default for Gtk+ font dialog.
Jan Djärv <jan.h.d@swipnet.se>
parents:
106085
diff
changeset
|
3281 Lisp_Object frame, font_object, font_param = Qnil; |
94933
75fb6b489ec6
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
93883
diff
changeset
|
3282 int fontset = -1; |
75fb6b489ec6
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
93883
diff
changeset
|
3283 |
96746 | 3284 /* Set the frame parameter back to the old value because we may |
94933
75fb6b489ec6
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
93883
diff
changeset
|
3285 fail to use ARG as the new parameter value. */ |
75fb6b489ec6
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
93883
diff
changeset
|
3286 store_frame_param (f, Qfont, oldval); |
75fb6b489ec6
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
93883
diff
changeset
|
3287 |
102655
3854b305c65b
(x_set_font): Handle the case that ARG is a cons.
Kenichi Handa <handa@m17n.org>
parents:
102481
diff
changeset
|
3288 /* ARG is a fontset name, a font name, a cons of fontset name and a |
3854b305c65b
(x_set_font): Handle the case that ARG is a cons.
Kenichi Handa <handa@m17n.org>
parents:
102481
diff
changeset
|
3289 font object, or a font object. In the last case, this function |
3854b305c65b
(x_set_font): Handle the case that ARG is a cons.
Kenichi Handa <handa@m17n.org>
parents:
102481
diff
changeset
|
3290 never fail. */ |
94933
75fb6b489ec6
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
93883
diff
changeset
|
3291 if (STRINGP (arg)) |
90465
9430e7e49983
(x_set_font) [USE_FONT_BACKEND]: Adusted for the change
Kenichi Handa <handa@m17n.org>
parents:
90428
diff
changeset
|
3292 { |
106201
01190029e5d3
Set Xft defaults if no XSETTING is found, better default for Gtk+ font dialog.
Jan Djärv <jan.h.d@swipnet.se>
parents:
106085
diff
changeset
|
3293 font_param = arg; |
94933
75fb6b489ec6
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
93883
diff
changeset
|
3294 fontset = fs_query_fontset (arg, 0); |
75fb6b489ec6
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
93883
diff
changeset
|
3295 if (fontset < 0) |
90465
9430e7e49983
(x_set_font) [USE_FONT_BACKEND]: Adusted for the change
Kenichi Handa <handa@m17n.org>
parents:
90428
diff
changeset
|
3296 { |
94933
75fb6b489ec6
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
93883
diff
changeset
|
3297 font_object = font_open_by_name (f, SDATA (arg)); |
75fb6b489ec6
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
93883
diff
changeset
|
3298 if (NILP (font_object)) |
75fb6b489ec6
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
93883
diff
changeset
|
3299 error ("Font `%s' is not defined", SDATA (arg)); |
75fb6b489ec6
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
93883
diff
changeset
|
3300 arg = AREF (font_object, FONT_NAME_INDEX); |
75fb6b489ec6
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
93883
diff
changeset
|
3301 } |
75fb6b489ec6
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
93883
diff
changeset
|
3302 else if (fontset > 0) |
75fb6b489ec6
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
93883
diff
changeset
|
3303 { |
75fb6b489ec6
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
93883
diff
changeset
|
3304 Lisp_Object ascii_font = fontset_ascii (fontset); |
75fb6b489ec6
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
93883
diff
changeset
|
3305 |
75fb6b489ec6
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
93883
diff
changeset
|
3306 font_object = font_open_by_name (f, SDATA (ascii_font)); |
75fb6b489ec6
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
93883
diff
changeset
|
3307 if (NILP (font_object)) |
75fb6b489ec6
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
93883
diff
changeset
|
3308 error ("Font `%s' is not defined", SDATA (arg)); |
101171
a94440e70b7c
(x_set_font): Always store a font to the font parameter,
Jason Rumney <jasonr@gnu.org>
parents:
101019
diff
changeset
|
3309 arg = AREF (font_object, FONT_NAME_INDEX); |
90465
9430e7e49983
(x_set_font) [USE_FONT_BACKEND]: Adusted for the change
Kenichi Handa <handa@m17n.org>
parents:
90428
diff
changeset
|
3310 } |
9430e7e49983
(x_set_font) [USE_FONT_BACKEND]: Adusted for the change
Kenichi Handa <handa@m17n.org>
parents:
90428
diff
changeset
|
3311 else |
94933
75fb6b489ec6
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
93883
diff
changeset
|
3312 error ("The default fontset can't be used for a frame font"); |
75fb6b489ec6
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
93883
diff
changeset
|
3313 } |
102655
3854b305c65b
(x_set_font): Handle the case that ARG is a cons.
Kenichi Handa <handa@m17n.org>
parents:
102481
diff
changeset
|
3314 else if (CONSP (arg) && STRINGP (XCAR (arg)) && FONT_OBJECT_P (XCDR (arg))) |
3854b305c65b
(x_set_font): Handle the case that ARG is a cons.
Kenichi Handa <handa@m17n.org>
parents:
102481
diff
changeset
|
3315 { |
3854b305c65b
(x_set_font): Handle the case that ARG is a cons.
Kenichi Handa <handa@m17n.org>
parents:
102481
diff
changeset
|
3316 /* This is the case that the ASCII font of F's fontset XCAR |
3854b305c65b
(x_set_font): Handle the case that ARG is a cons.
Kenichi Handa <handa@m17n.org>
parents:
102481
diff
changeset
|
3317 (arg) is changed to the font XCDR (arg) by |
3854b305c65b
(x_set_font): Handle the case that ARG is a cons.
Kenichi Handa <handa@m17n.org>
parents:
102481
diff
changeset
|
3318 `set-fontset-font'. */ |
3854b305c65b
(x_set_font): Handle the case that ARG is a cons.
Kenichi Handa <handa@m17n.org>
parents:
102481
diff
changeset
|
3319 fontset = fs_query_fontset (XCAR (arg), 0); |
3854b305c65b
(x_set_font): Handle the case that ARG is a cons.
Kenichi Handa <handa@m17n.org>
parents:
102481
diff
changeset
|
3320 if (fontset < 0) |
3854b305c65b
(x_set_font): Handle the case that ARG is a cons.
Kenichi Handa <handa@m17n.org>
parents:
102481
diff
changeset
|
3321 error ("Unknown fontset: %s", SDATA (XCAR (arg))); |
3854b305c65b
(x_set_font): Handle the case that ARG is a cons.
Kenichi Handa <handa@m17n.org>
parents:
102481
diff
changeset
|
3322 font_object = XCDR (arg); |
3854b305c65b
(x_set_font): Handle the case that ARG is a cons.
Kenichi Handa <handa@m17n.org>
parents:
102481
diff
changeset
|
3323 arg = AREF (font_object, FONT_NAME_INDEX); |
106201
01190029e5d3
Set Xft defaults if no XSETTING is found, better default for Gtk+ font dialog.
Jan Djärv <jan.h.d@swipnet.se>
parents:
106085
diff
changeset
|
3324 font_param = Ffont_get (font_object, QCname); |
102655
3854b305c65b
(x_set_font): Handle the case that ARG is a cons.
Kenichi Handa <handa@m17n.org>
parents:
102481
diff
changeset
|
3325 } |
94933
75fb6b489ec6
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
93883
diff
changeset
|
3326 else if (FONT_OBJECT_P (arg)) |
75fb6b489ec6
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
93883
diff
changeset
|
3327 { |
75fb6b489ec6
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
93883
diff
changeset
|
3328 font_object = arg; |
106201
01190029e5d3
Set Xft defaults if no XSETTING is found, better default for Gtk+ font dialog.
Jan Djärv <jan.h.d@swipnet.se>
parents:
106085
diff
changeset
|
3329 font_param = Ffont_get (font_object, QCname); |
102481
66d0ea986f06
(x_set_font): When ARG is a font-object, don't alter the
Kenichi Handa <handa@m17n.org>
parents:
101171
diff
changeset
|
3330 /* This is to store the XLFD font name in the frame parameter for |
105772
fd7169a87c28
Fix typos in comments.
Juanma Barranquero <lekktu@gmail.com>
parents:
105669
diff
changeset
|
3331 backward compatibility. We should store the font-object |
94933
75fb6b489ec6
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
93883
diff
changeset
|
3332 itself in the future. */ |
75fb6b489ec6
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
93883
diff
changeset
|
3333 arg = AREF (font_object, FONT_NAME_INDEX); |
102481
66d0ea986f06
(x_set_font): When ARG is a font-object, don't alter the
Kenichi Handa <handa@m17n.org>
parents:
101171
diff
changeset
|
3334 fontset = FRAME_FONTSET (f); |
103097
129ed78cd442
(x_set_font): When ARG is a font-object, check if the
Kenichi Handa <handa@m17n.org>
parents:
102866
diff
changeset
|
3335 /* Check if we can use the current fontset. If not, set FONTSET |
129ed78cd442
(x_set_font): When ARG is a font-object, check if the
Kenichi Handa <handa@m17n.org>
parents:
102866
diff
changeset
|
3336 to -1 to generate a new fontset from FONT-OBJECT. */ |
129ed78cd442
(x_set_font): When ARG is a font-object, check if the
Kenichi Handa <handa@m17n.org>
parents:
102866
diff
changeset
|
3337 if (fontset >= 0) |
129ed78cd442
(x_set_font): When ARG is a font-object, check if the
Kenichi Handa <handa@m17n.org>
parents:
102866
diff
changeset
|
3338 { |
129ed78cd442
(x_set_font): When ARG is a font-object, check if the
Kenichi Handa <handa@m17n.org>
parents:
102866
diff
changeset
|
3339 Lisp_Object ascii_font = fontset_ascii (fontset); |
129ed78cd442
(x_set_font): When ARG is a font-object, check if the
Kenichi Handa <handa@m17n.org>
parents:
102866
diff
changeset
|
3340 Lisp_Object spec = font_spec_from_name (ascii_font); |
129ed78cd442
(x_set_font): When ARG is a font-object, check if the
Kenichi Handa <handa@m17n.org>
parents:
102866
diff
changeset
|
3341 |
129ed78cd442
(x_set_font): When ARG is a font-object, check if the
Kenichi Handa <handa@m17n.org>
parents:
102866
diff
changeset
|
3342 if (! font_match_p (spec, font_object)) |
129ed78cd442
(x_set_font): When ARG is a font-object, check if the
Kenichi Handa <handa@m17n.org>
parents:
102866
diff
changeset
|
3343 fontset = -1; |
129ed78cd442
(x_set_font): When ARG is a font-object, check if the
Kenichi Handa <handa@m17n.org>
parents:
102866
diff
changeset
|
3344 } |
90465
9430e7e49983
(x_set_font) [USE_FONT_BACKEND]: Adusted for the change
Kenichi Handa <handa@m17n.org>
parents:
90428
diff
changeset
|
3345 } |
90412 | 3346 else |
94933
75fb6b489ec6
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
93883
diff
changeset
|
3347 signal_error ("Invalid font", arg); |
75fb6b489ec6
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
93883
diff
changeset
|
3348 |
75fb6b489ec6
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
93883
diff
changeset
|
3349 if (! NILP (Fequal (font_object, oldval))) |
75fb6b489ec6
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
93883
diff
changeset
|
3350 return; |
102746
9e4328a0286b
(x_set_font): If the fullscreen property is non-nil, adjust
Jan Djärv <jan.h.d@swipnet.se>
parents:
102655
diff
changeset
|
3351 |
94933
75fb6b489ec6
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
93883
diff
changeset
|
3352 x_new_font (f, font_object, fontset); |
75fb6b489ec6
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
93883
diff
changeset
|
3353 store_frame_param (f, Qfont, arg); |
106201
01190029e5d3
Set Xft defaults if no XSETTING is found, better default for Gtk+ font dialog.
Jan Djärv <jan.h.d@swipnet.se>
parents:
106085
diff
changeset
|
3354 #ifdef HAVE_X_WINDOWS |
01190029e5d3
Set Xft defaults if no XSETTING is found, better default for Gtk+ font dialog.
Jan Djärv <jan.h.d@swipnet.se>
parents:
106085
diff
changeset
|
3355 store_frame_param (f, Qfont_param, font_param); |
01190029e5d3
Set Xft defaults if no XSETTING is found, better default for Gtk+ font dialog.
Jan Djärv <jan.h.d@swipnet.se>
parents:
106085
diff
changeset
|
3356 #endif |
94933
75fb6b489ec6
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
93883
diff
changeset
|
3357 /* Recalculate toolbar height. */ |
75fb6b489ec6
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
93883
diff
changeset
|
3358 f->n_tool_bar_rows = 0; |
75fb6b489ec6
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
93883
diff
changeset
|
3359 /* Ensure we redraw it. */ |
75fb6b489ec6
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
93883
diff
changeset
|
3360 clear_current_matrices (f); |
75fb6b489ec6
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
93883
diff
changeset
|
3361 |
75fb6b489ec6
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
93883
diff
changeset
|
3362 recompute_basic_faces (f); |
50357 | 3363 |
3364 do_pending_window_change (0); | |
3365 | |
96544
b90ccb2627a7
(Qinhibit_face_set_after_frame_default): Var deleted.
Chong Yidong <cyd@stupidchicken.com>
parents:
96480
diff
changeset
|
3366 /* We used to call face-set-after-frame-default here, but it leads to |
b90ccb2627a7
(Qinhibit_face_set_after_frame_default): Var deleted.
Chong Yidong <cyd@stupidchicken.com>
parents:
96480
diff
changeset
|
3367 recursive calls (since that function can set the `default' face's |
b90ccb2627a7
(Qinhibit_face_set_after_frame_default): Var deleted.
Chong Yidong <cyd@stupidchicken.com>
parents:
96480
diff
changeset
|
3368 font which in turns changes the frame's `font' parameter). |
b90ccb2627a7
(Qinhibit_face_set_after_frame_default): Var deleted.
Chong Yidong <cyd@stupidchicken.com>
parents:
96480
diff
changeset
|
3369 Also I don't know what this call is meant to do, but it seems the |
b90ccb2627a7
(Qinhibit_face_set_after_frame_default): Var deleted.
Chong Yidong <cyd@stupidchicken.com>
parents:
96480
diff
changeset
|
3370 wrong way to do it anyway (it does a lot more work than what seems |
b90ccb2627a7
(Qinhibit_face_set_after_frame_default): Var deleted.
Chong Yidong <cyd@stupidchicken.com>
parents:
96480
diff
changeset
|
3371 reasonable in response to a change to `font'). */ |
50357 | 3372 } |
3373 | |
3374 | |
90547
51be6e7b3881
(Qfont_backend): New variable.
Kenichi Handa <handa@m17n.org>
parents:
90533
diff
changeset
|
3375 void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
3376 x_set_font_backend (struct frame *f, Lisp_Object new_value, Lisp_Object old_value) |
90547
51be6e7b3881
(Qfont_backend): New variable.
Kenichi Handa <handa@m17n.org>
parents:
90533
diff
changeset
|
3377 { |
51be6e7b3881
(Qfont_backend): New variable.
Kenichi Handa <handa@m17n.org>
parents:
90533
diff
changeset
|
3378 if (! NILP (new_value) |
51be6e7b3881
(Qfont_backend): New variable.
Kenichi Handa <handa@m17n.org>
parents:
90533
diff
changeset
|
3379 && !CONSP (new_value)) |
51be6e7b3881
(Qfont_backend): New variable.
Kenichi Handa <handa@m17n.org>
parents:
90533
diff
changeset
|
3380 { |
51be6e7b3881
(Qfont_backend): New variable.
Kenichi Handa <handa@m17n.org>
parents:
90533
diff
changeset
|
3381 char *p0, *p1; |
98579
6a4d13121cb1
(Fraise_frame): On text-only terminals select frame in
Martin Rudalics <rudalics@gmx.at>
parents:
98240
diff
changeset
|
3382 |
90547
51be6e7b3881
(Qfont_backend): New variable.
Kenichi Handa <handa@m17n.org>
parents:
90533
diff
changeset
|
3383 CHECK_STRING (new_value); |
51be6e7b3881
(Qfont_backend): New variable.
Kenichi Handa <handa@m17n.org>
parents:
90533
diff
changeset
|
3384 p0 = p1 = SDATA (new_value); |
51be6e7b3881
(Qfont_backend): New variable.
Kenichi Handa <handa@m17n.org>
parents:
90533
diff
changeset
|
3385 new_value = Qnil; |
51be6e7b3881
(Qfont_backend): New variable.
Kenichi Handa <handa@m17n.org>
parents:
90533
diff
changeset
|
3386 while (*p0) |
51be6e7b3881
(Qfont_backend): New variable.
Kenichi Handa <handa@m17n.org>
parents:
90533
diff
changeset
|
3387 { |
96082 | 3388 while (*p1 && ! isspace (*p1) && *p1 != ',') p1++; |
90547
51be6e7b3881
(Qfont_backend): New variable.
Kenichi Handa <handa@m17n.org>
parents:
90533
diff
changeset
|
3389 if (p0 < p1) |
51be6e7b3881
(Qfont_backend): New variable.
Kenichi Handa <handa@m17n.org>
parents:
90533
diff
changeset
|
3390 new_value = Fcons (Fintern (make_string (p0, p1 - p0), Qnil), |
51be6e7b3881
(Qfont_backend): New variable.
Kenichi Handa <handa@m17n.org>
parents:
90533
diff
changeset
|
3391 new_value); |
51be6e7b3881
(Qfont_backend): New variable.
Kenichi Handa <handa@m17n.org>
parents:
90533
diff
changeset
|
3392 if (*p1) |
96082 | 3393 { |
3394 int c; | |
3395 | |
3396 while ((c = *++p1) && isspace (c)); | |
3397 } | |
90547
51be6e7b3881
(Qfont_backend): New variable.
Kenichi Handa <handa@m17n.org>
parents:
90533
diff
changeset
|
3398 p0 = p1; |
51be6e7b3881
(Qfont_backend): New variable.
Kenichi Handa <handa@m17n.org>
parents:
90533
diff
changeset
|
3399 } |
90562
9d76594a90f0
(x_set_font_backend): Do more works that were done in
Kenichi Handa <handa@m17n.org>
parents:
90547
diff
changeset
|
3400 new_value = Fnreverse (new_value); |
90547
51be6e7b3881
(Qfont_backend): New variable.
Kenichi Handa <handa@m17n.org>
parents:
90533
diff
changeset
|
3401 } |
51be6e7b3881
(Qfont_backend): New variable.
Kenichi Handa <handa@m17n.org>
parents:
90533
diff
changeset
|
3402 |
90562
9d76594a90f0
(x_set_font_backend): Do more works that were done in
Kenichi Handa <handa@m17n.org>
parents:
90547
diff
changeset
|
3403 if (! NILP (old_value) && ! NILP (Fequal (old_value, new_value))) |
9d76594a90f0
(x_set_font_backend): Do more works that were done in
Kenichi Handa <handa@m17n.org>
parents:
90547
diff
changeset
|
3404 return; |
9d76594a90f0
(x_set_font_backend): Do more works that were done in
Kenichi Handa <handa@m17n.org>
parents:
90547
diff
changeset
|
3405 |
94933
75fb6b489ec6
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
93883
diff
changeset
|
3406 if (FRAME_FONT (f)) |
91248
ed6fa90c5c89
(x_set_font_backend): Don't call Fclear_font_cache. If
Kenichi Handa <handa@m17n.org>
parents:
91119
diff
changeset
|
3407 free_all_realized_faces (Qnil); |
ed6fa90c5c89
(x_set_font_backend): Don't call Fclear_font_cache. If
Kenichi Handa <handa@m17n.org>
parents:
91119
diff
changeset
|
3408 |
ed6fa90c5c89
(x_set_font_backend): Don't call Fclear_font_cache. If
Kenichi Handa <handa@m17n.org>
parents:
91119
diff
changeset
|
3409 new_value = font_update_drivers (f, NILP (new_value) ? Qt : new_value); |
ed6fa90c5c89
(x_set_font_backend): Don't call Fclear_font_cache. If
Kenichi Handa <handa@m17n.org>
parents:
91119
diff
changeset
|
3410 if (NILP (new_value)) |
90562
9d76594a90f0
(x_set_font_backend): Do more works that were done in
Kenichi Handa <handa@m17n.org>
parents:
90547
diff
changeset
|
3411 { |
91248
ed6fa90c5c89
(x_set_font_backend): Don't call Fclear_font_cache. If
Kenichi Handa <handa@m17n.org>
parents:
91119
diff
changeset
|
3412 if (NILP (old_value)) |
ed6fa90c5c89
(x_set_font_backend): Don't call Fclear_font_cache. If
Kenichi Handa <handa@m17n.org>
parents:
91119
diff
changeset
|
3413 error ("No font backend available"); |
ed6fa90c5c89
(x_set_font_backend): Don't call Fclear_font_cache. If
Kenichi Handa <handa@m17n.org>
parents:
91119
diff
changeset
|
3414 font_update_drivers (f, old_value); |
ed6fa90c5c89
(x_set_font_backend): Don't call Fclear_font_cache. If
Kenichi Handa <handa@m17n.org>
parents:
91119
diff
changeset
|
3415 error ("None of specified font backends are available"); |
90562
9d76594a90f0
(x_set_font_backend): Do more works that were done in
Kenichi Handa <handa@m17n.org>
parents:
90547
diff
changeset
|
3416 } |
9d76594a90f0
(x_set_font_backend): Do more works that were done in
Kenichi Handa <handa@m17n.org>
parents:
90547
diff
changeset
|
3417 store_frame_param (f, Qfont_backend, new_value); |
9d76594a90f0
(x_set_font_backend): Do more works that were done in
Kenichi Handa <handa@m17n.org>
parents:
90547
diff
changeset
|
3418 |
94933
75fb6b489ec6
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
93883
diff
changeset
|
3419 if (FRAME_FONT (f)) |
90562
9d76594a90f0
(x_set_font_backend): Do more works that were done in
Kenichi Handa <handa@m17n.org>
parents:
90547
diff
changeset
|
3420 { |
9d76594a90f0
(x_set_font_backend): Do more works that were done in
Kenichi Handa <handa@m17n.org>
parents:
90547
diff
changeset
|
3421 Lisp_Object frame; |
9d76594a90f0
(x_set_font_backend): Do more works that were done in
Kenichi Handa <handa@m17n.org>
parents:
90547
diff
changeset
|
3422 |
9d76594a90f0
(x_set_font_backend): Do more works that were done in
Kenichi Handa <handa@m17n.org>
parents:
90547
diff
changeset
|
3423 XSETFRAME (frame, f); |
9d76594a90f0
(x_set_font_backend): Do more works that were done in
Kenichi Handa <handa@m17n.org>
parents:
90547
diff
changeset
|
3424 x_set_font (f, Fframe_parameter (frame, Qfont), Qnil); |
9d76594a90f0
(x_set_font_backend): Do more works that were done in
Kenichi Handa <handa@m17n.org>
parents:
90547
diff
changeset
|
3425 ++face_change_count; |
9d76594a90f0
(x_set_font_backend): Do more works that were done in
Kenichi Handa <handa@m17n.org>
parents:
90547
diff
changeset
|
3426 ++windows_or_buffers_changed; |
9d76594a90f0
(x_set_font_backend): Do more works that were done in
Kenichi Handa <handa@m17n.org>
parents:
90547
diff
changeset
|
3427 } |
90547
51be6e7b3881
(Qfont_backend): New variable.
Kenichi Handa <handa@m17n.org>
parents:
90533
diff
changeset
|
3428 } |
51be6e7b3881
(Qfont_backend): New variable.
Kenichi Handa <handa@m17n.org>
parents:
90533
diff
changeset
|
3429 |
51be6e7b3881
(Qfont_backend): New variable.
Kenichi Handa <handa@m17n.org>
parents:
90533
diff
changeset
|
3430 |
50357 | 3431 void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
3432 x_set_fringe_width (struct frame *f, Lisp_Object new_value, Lisp_Object old_value) |
50357 | 3433 { |
3434 compute_fringe_widths (f, 1); | |
109581
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109573
diff
changeset
|
3435 #ifdef HAVE_X_WINDOWS |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109573
diff
changeset
|
3436 /* Must adjust this so window managers report correct number of columns. */ |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109573
diff
changeset
|
3437 if (FRAME_X_WINDOW (f) != 0) |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109573
diff
changeset
|
3438 x_wm_set_size_hint (f, 0, 0); |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109573
diff
changeset
|
3439 #endif |
50357 | 3440 } |
3441 | |
3442 void | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
3443 x_set_border_width (struct frame *f, Lisp_Object arg, Lisp_Object oldval) |
50357 | 3444 { |
3445 CHECK_NUMBER (arg); | |
3446 | |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
3447 if (XINT (arg) == f->border_width) |
50357 | 3448 return; |
3449 | |
3450 if (FRAME_X_WINDOW (f) != 0) | |
70647
1cadc44e0431
(x_set_border_width): Fix error message to say "frame", not "window".
Eli Zaretskii <eliz@gnu.org>
parents:
70198
diff
changeset
|
3451 error ("Cannot change the border width of a frame"); |
50357 | 3452 |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
3453 f->border_width = XINT (arg); |
50357 | 3454 } |
3455 | |
3456 void | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
3457 x_set_internal_border_width (struct frame *f, Lisp_Object arg, Lisp_Object oldval) |
50357 | 3458 { |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
3459 int old = FRAME_INTERNAL_BORDER_WIDTH (f); |
50357 | 3460 |
3461 CHECK_NUMBER (arg); | |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
3462 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
|
3463 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
|
3464 FRAME_INTERNAL_BORDER_WIDTH (f) = 0; |
50357 | 3465 |
3466 #ifdef USE_X_TOOLKIT | |
3467 if (FRAME_X_OUTPUT (f)->edit_widget) | |
3468 widget_store_internal_border (FRAME_X_OUTPUT (f)->edit_widget); | |
3469 #endif | |
3470 | |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
3471 if (FRAME_INTERNAL_BORDER_WIDTH (f) == old) |
50357 | 3472 return; |
3473 | |
3474 if (FRAME_X_WINDOW (f) != 0) | |
3475 { | |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
3476 x_set_window_size (f, 0, FRAME_COLS (f), FRAME_LINES (f)); |
50357 | 3477 SET_FRAME_GARBAGED (f); |
3478 do_pending_window_change (0); | |
3479 } | |
3480 else | |
3481 SET_FRAME_GARBAGED (f); | |
3482 } | |
3483 | |
3484 void | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
3485 x_set_visibility (struct frame *f, Lisp_Object value, Lisp_Object oldval) |
50357 | 3486 { |
3487 Lisp_Object frame; | |
3488 XSETFRAME (frame, f); | |
3489 | |
3490 if (NILP (value)) | |
3491 Fmake_frame_invisible (frame, Qt); | |
3492 else if (EQ (value, Qicon)) | |
3493 Ficonify_frame (frame); | |
3494 else | |
3495 Fmake_frame_visible (frame); | |
3496 } | |
3497 | |
3498 void | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
3499 x_set_autoraise (struct frame *f, Lisp_Object arg, Lisp_Object oldval) |
50357 | 3500 { |
3501 f->auto_raise = !EQ (Qnil, arg); | |
3502 } | |
3503 | |
3504 void | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
3505 x_set_autolower (struct frame *f, Lisp_Object arg, Lisp_Object oldval) |
50357 | 3506 { |
3507 f->auto_lower = !EQ (Qnil, arg); | |
3508 } | |
3509 | |
3510 void | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
3511 x_set_unsplittable (struct frame *f, Lisp_Object arg, Lisp_Object oldval) |
50357 | 3512 { |
3513 f->no_split = !NILP (arg); | |
3514 } | |
3515 | |
3516 void | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
3517 x_set_vertical_scroll_bars (struct frame *f, Lisp_Object arg, Lisp_Object oldval) |
50357 | 3518 { |
3519 if ((EQ (arg, Qleft) && FRAME_HAS_VERTICAL_SCROLL_BARS_ON_RIGHT (f)) | |
3520 || (EQ (arg, Qright) && FRAME_HAS_VERTICAL_SCROLL_BARS_ON_LEFT (f)) | |
3521 || (NILP (arg) && FRAME_HAS_VERTICAL_SCROLL_BARS (f)) | |
3522 || (!NILP (arg) && ! FRAME_HAS_VERTICAL_SCROLL_BARS (f))) | |
3523 { | |
3524 FRAME_VERTICAL_SCROLL_BAR_TYPE (f) | |
3525 = (NILP (arg) | |
3526 ? vertical_scroll_bar_none | |
3527 : EQ (Qleft, arg) | |
3528 ? vertical_scroll_bar_left | |
3529 : EQ (Qright, arg) | |
3530 ? vertical_scroll_bar_right | |
52557
4a93216e6678
(Vdefault_frame_scroll_bars): New variable.
Kim F. Storm <storm@cua.dk>
parents:
52401
diff
changeset
|
3531 : EQ (Qleft, Vdefault_frame_scroll_bars) |
4a93216e6678
(Vdefault_frame_scroll_bars): New variable.
Kim F. Storm <storm@cua.dk>
parents:
52401
diff
changeset
|
3532 ? vertical_scroll_bar_left |
4a93216e6678
(Vdefault_frame_scroll_bars): New variable.
Kim F. Storm <storm@cua.dk>
parents:
52401
diff
changeset
|
3533 : EQ (Qright, Vdefault_frame_scroll_bars) |
4a93216e6678
(Vdefault_frame_scroll_bars): New variable.
Kim F. Storm <storm@cua.dk>
parents:
52401
diff
changeset
|
3534 ? vertical_scroll_bar_right |
4a93216e6678
(Vdefault_frame_scroll_bars): New variable.
Kim F. Storm <storm@cua.dk>
parents:
52401
diff
changeset
|
3535 : vertical_scroll_bar_none); |
50357 | 3536 |
3537 /* We set this parameter before creating the X window for the | |
3538 frame, so we can get the geometry right from the start. | |
3539 However, if the window hasn't been created yet, we shouldn't | |
3540 call x_set_window_size. */ | |
3541 if (FRAME_X_WINDOW (f)) | |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
3542 x_set_window_size (f, 0, FRAME_COLS (f), FRAME_LINES (f)); |
50357 | 3543 do_pending_window_change (0); |
3544 } | |
3545 } | |
3546 | |
3547 void | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
3548 x_set_scroll_bar_width (struct frame *f, Lisp_Object arg, Lisp_Object oldval) |
50357 | 3549 { |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
3550 int wid = FRAME_COLUMN_WIDTH (f); |
50357 | 3551 |
3552 if (NILP (arg)) | |
3553 { | |
3554 x_set_scroll_bar_default_width (f); | |
3555 | |
3556 if (FRAME_X_WINDOW (f)) | |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
3557 x_set_window_size (f, 0, FRAME_COLS (f), FRAME_LINES (f)); |
50357 | 3558 do_pending_window_change (0); |
3559 } | |
3560 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
|
3561 && XFASTINT (arg) != FRAME_CONFIG_SCROLL_BAR_WIDTH (f)) |
50357 | 3562 { |
3563 if (XFASTINT (arg) <= 2 * VERTICAL_SCROLL_BAR_WIDTH_TRIM) | |
3564 XSETINT (arg, 2 * VERTICAL_SCROLL_BAR_WIDTH_TRIM + 1); | |
3565 | |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
3566 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
|
3567 FRAME_CONFIG_SCROLL_BAR_COLS (f) = (XFASTINT (arg) + wid-1) / wid; |
50357 | 3568 if (FRAME_X_WINDOW (f)) |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
3569 x_set_window_size (f, 0, FRAME_COLS (f), FRAME_LINES (f)); |
50357 | 3570 do_pending_window_change (0); |
3571 } | |
3572 | |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
3573 change_frame_size (f, 0, FRAME_COLS (f), 0, 0, 0); |
50357 | 3574 XWINDOW (FRAME_SELECTED_WINDOW (f))->cursor.hpos = 0; |
3575 XWINDOW (FRAME_SELECTED_WINDOW (f))->cursor.x = 0; | |
3576 } | |
3577 | |
3578 | |
3579 | |
3580 /* Return non-nil if frame F wants a bitmap icon. */ | |
3581 | |
3582 Lisp_Object | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
3583 x_icon_type (FRAME_PTR f) |
50357 | 3584 { |
3585 Lisp_Object tem; | |
3586 | |
3587 tem = assq_no_quit (Qicon_type, f->param_alist); | |
3588 if (CONSP (tem)) | |
3589 return XCDR (tem); | |
3590 else | |
3591 return Qnil; | |
3592 } | |
3593 | |
95157
b419f60db46c
Seiji Zenitani <zenitani at mac.com>
Glenn Morris <rgm@gnu.org>
parents:
95044
diff
changeset
|
3594 void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
3595 x_set_alpha (struct frame *f, Lisp_Object arg, Lisp_Object oldval) |
95157
b419f60db46c
Seiji Zenitani <zenitani at mac.com>
Glenn Morris <rgm@gnu.org>
parents:
95044
diff
changeset
|
3596 { |
b419f60db46c
Seiji Zenitani <zenitani at mac.com>
Glenn Morris <rgm@gnu.org>
parents:
95044
diff
changeset
|
3597 double alpha = 1.0; |
b419f60db46c
Seiji Zenitani <zenitani at mac.com>
Glenn Morris <rgm@gnu.org>
parents:
95044
diff
changeset
|
3598 double newval[2]; |
b419f60db46c
Seiji Zenitani <zenitani at mac.com>
Glenn Morris <rgm@gnu.org>
parents:
95044
diff
changeset
|
3599 int i, ialpha; |
b419f60db46c
Seiji Zenitani <zenitani at mac.com>
Glenn Morris <rgm@gnu.org>
parents:
95044
diff
changeset
|
3600 Lisp_Object item; |
b419f60db46c
Seiji Zenitani <zenitani at mac.com>
Glenn Morris <rgm@gnu.org>
parents:
95044
diff
changeset
|
3601 |
b419f60db46c
Seiji Zenitani <zenitani at mac.com>
Glenn Morris <rgm@gnu.org>
parents:
95044
diff
changeset
|
3602 for (i = 0; i < 2; i++) |
b419f60db46c
Seiji Zenitani <zenitani at mac.com>
Glenn Morris <rgm@gnu.org>
parents:
95044
diff
changeset
|
3603 { |
b419f60db46c
Seiji Zenitani <zenitani at mac.com>
Glenn Morris <rgm@gnu.org>
parents:
95044
diff
changeset
|
3604 newval[i] = 1.0; |
b419f60db46c
Seiji Zenitani <zenitani at mac.com>
Glenn Morris <rgm@gnu.org>
parents:
95044
diff
changeset
|
3605 if (CONSP (arg)) |
b419f60db46c
Seiji Zenitani <zenitani at mac.com>
Glenn Morris <rgm@gnu.org>
parents:
95044
diff
changeset
|
3606 { |
b419f60db46c
Seiji Zenitani <zenitani at mac.com>
Glenn Morris <rgm@gnu.org>
parents:
95044
diff
changeset
|
3607 item = CAR (arg); |
b419f60db46c
Seiji Zenitani <zenitani at mac.com>
Glenn Morris <rgm@gnu.org>
parents:
95044
diff
changeset
|
3608 arg = CDR (arg); |
b419f60db46c
Seiji Zenitani <zenitani at mac.com>
Glenn Morris <rgm@gnu.org>
parents:
95044
diff
changeset
|
3609 } |
b419f60db46c
Seiji Zenitani <zenitani at mac.com>
Glenn Morris <rgm@gnu.org>
parents:
95044
diff
changeset
|
3610 else |
96480 | 3611 item = arg; |
95157
b419f60db46c
Seiji Zenitani <zenitani at mac.com>
Glenn Morris <rgm@gnu.org>
parents:
95044
diff
changeset
|
3612 |
99511
c4253d0af9b0
(x_set_alpha): Set alpha to -1 if nil given.
Chong Yidong <cyd@stupidchicken.com>
parents:
99320
diff
changeset
|
3613 if (NILP (item)) |
c4253d0af9b0
(x_set_alpha): Set alpha to -1 if nil given.
Chong Yidong <cyd@stupidchicken.com>
parents:
99320
diff
changeset
|
3614 alpha = - 1.0; |
c4253d0af9b0
(x_set_alpha): Set alpha to -1 if nil given.
Chong Yidong <cyd@stupidchicken.com>
parents:
99320
diff
changeset
|
3615 else if (FLOATP (item)) |
c4253d0af9b0
(x_set_alpha): Set alpha to -1 if nil given.
Chong Yidong <cyd@stupidchicken.com>
parents:
99320
diff
changeset
|
3616 { |
c4253d0af9b0
(x_set_alpha): Set alpha to -1 if nil given.
Chong Yidong <cyd@stupidchicken.com>
parents:
99320
diff
changeset
|
3617 alpha = XFLOAT_DATA (item); |
c4253d0af9b0
(x_set_alpha): Set alpha to -1 if nil given.
Chong Yidong <cyd@stupidchicken.com>
parents:
99320
diff
changeset
|
3618 if (alpha < 0.0 || 1.0 < alpha) |
c4253d0af9b0
(x_set_alpha): Set alpha to -1 if nil given.
Chong Yidong <cyd@stupidchicken.com>
parents:
99320
diff
changeset
|
3619 args_out_of_range (make_float (0.0), make_float (1.0)); |
c4253d0af9b0
(x_set_alpha): Set alpha to -1 if nil given.
Chong Yidong <cyd@stupidchicken.com>
parents:
99320
diff
changeset
|
3620 } |
c4253d0af9b0
(x_set_alpha): Set alpha to -1 if nil given.
Chong Yidong <cyd@stupidchicken.com>
parents:
99320
diff
changeset
|
3621 else if (INTEGERP (item)) |
c4253d0af9b0
(x_set_alpha): Set alpha to -1 if nil given.
Chong Yidong <cyd@stupidchicken.com>
parents:
99320
diff
changeset
|
3622 { |
c4253d0af9b0
(x_set_alpha): Set alpha to -1 if nil given.
Chong Yidong <cyd@stupidchicken.com>
parents:
99320
diff
changeset
|
3623 ialpha = XINT (item); |
c4253d0af9b0
(x_set_alpha): Set alpha to -1 if nil given.
Chong Yidong <cyd@stupidchicken.com>
parents:
99320
diff
changeset
|
3624 if (ialpha < 0 || 100 < ialpha) |
c4253d0af9b0
(x_set_alpha): Set alpha to -1 if nil given.
Chong Yidong <cyd@stupidchicken.com>
parents:
99320
diff
changeset
|
3625 args_out_of_range (make_number (0), make_number (100)); |
c4253d0af9b0
(x_set_alpha): Set alpha to -1 if nil given.
Chong Yidong <cyd@stupidchicken.com>
parents:
99320
diff
changeset
|
3626 else |
c4253d0af9b0
(x_set_alpha): Set alpha to -1 if nil given.
Chong Yidong <cyd@stupidchicken.com>
parents:
99320
diff
changeset
|
3627 alpha = ialpha / 100.0; |
c4253d0af9b0
(x_set_alpha): Set alpha to -1 if nil given.
Chong Yidong <cyd@stupidchicken.com>
parents:
99320
diff
changeset
|
3628 } |
c4253d0af9b0
(x_set_alpha): Set alpha to -1 if nil given.
Chong Yidong <cyd@stupidchicken.com>
parents:
99320
diff
changeset
|
3629 else |
c4253d0af9b0
(x_set_alpha): Set alpha to -1 if nil given.
Chong Yidong <cyd@stupidchicken.com>
parents:
99320
diff
changeset
|
3630 wrong_type_argument (Qnumberp, item); |
95157
b419f60db46c
Seiji Zenitani <zenitani at mac.com>
Glenn Morris <rgm@gnu.org>
parents:
95044
diff
changeset
|
3631 newval[i] = alpha; |
b419f60db46c
Seiji Zenitani <zenitani at mac.com>
Glenn Morris <rgm@gnu.org>
parents:
95044
diff
changeset
|
3632 } |
b419f60db46c
Seiji Zenitani <zenitani at mac.com>
Glenn Morris <rgm@gnu.org>
parents:
95044
diff
changeset
|
3633 |
b419f60db46c
Seiji Zenitani <zenitani at mac.com>
Glenn Morris <rgm@gnu.org>
parents:
95044
diff
changeset
|
3634 for (i = 0; i < 2; i++) |
b419f60db46c
Seiji Zenitani <zenitani at mac.com>
Glenn Morris <rgm@gnu.org>
parents:
95044
diff
changeset
|
3635 f->alpha[i] = newval[i]; |
b419f60db46c
Seiji Zenitani <zenitani at mac.com>
Glenn Morris <rgm@gnu.org>
parents:
95044
diff
changeset
|
3636 |
100001
28d216f71b5a
* frame.c (x_set_alpha) [NS_IMPL_COCOA]: Call x_set_frame_alpha.
Seiji Zenitani <zenitani@mac.com>
parents:
99511
diff
changeset
|
3637 #if defined (HAVE_X_WINDOWS) || defined (HAVE_NTGUI) || defined (NS_IMPL_COCOA) |
95157
b419f60db46c
Seiji Zenitani <zenitani at mac.com>
Glenn Morris <rgm@gnu.org>
parents:
95044
diff
changeset
|
3638 BLOCK_INPUT; |
b419f60db46c
Seiji Zenitani <zenitani at mac.com>
Glenn Morris <rgm@gnu.org>
parents:
95044
diff
changeset
|
3639 x_set_frame_alpha (f); |
b419f60db46c
Seiji Zenitani <zenitani at mac.com>
Glenn Morris <rgm@gnu.org>
parents:
95044
diff
changeset
|
3640 UNBLOCK_INPUT; |
b419f60db46c
Seiji Zenitani <zenitani at mac.com>
Glenn Morris <rgm@gnu.org>
parents:
95044
diff
changeset
|
3641 #endif |
b419f60db46c
Seiji Zenitani <zenitani at mac.com>
Glenn Morris <rgm@gnu.org>
parents:
95044
diff
changeset
|
3642 |
b419f60db46c
Seiji Zenitani <zenitani at mac.com>
Glenn Morris <rgm@gnu.org>
parents:
95044
diff
changeset
|
3643 return; |
b419f60db46c
Seiji Zenitani <zenitani at mac.com>
Glenn Morris <rgm@gnu.org>
parents:
95044
diff
changeset
|
3644 } |
b419f60db46c
Seiji Zenitani <zenitani at mac.com>
Glenn Morris <rgm@gnu.org>
parents:
95044
diff
changeset
|
3645 |
50357 | 3646 |
3647 /* Subroutines of creating an X frame. */ | |
3648 | |
3649 /* Make sure that Vx_resource_name is set to a reasonable value. | |
3650 Fix it up, or set it to `emacs' if it is too hopeless. */ | |
3651 | |
3652 void | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
3653 validate_x_resource_name (void) |
50357 | 3654 { |
3655 int len = 0; | |
3656 /* Number of valid characters in the resource name. */ | |
3657 int good_count = 0; | |
3658 /* Number of invalid characters in the resource name. */ | |
3659 int bad_count = 0; | |
3660 Lisp_Object new; | |
3661 int i; | |
3662 | |
3663 if (!STRINGP (Vx_resource_class)) | |
3664 Vx_resource_class = build_string (EMACS_CLASS); | |
3665 | |
3666 if (STRINGP (Vx_resource_name)) | |
3667 { | |
3668 unsigned char *p = SDATA (Vx_resource_name); | |
3669 | |
3670 len = SBYTES (Vx_resource_name); | |
3671 | |
3672 /* Only letters, digits, - and _ are valid in resource names. | |
3673 Count the valid characters and count the invalid ones. */ | |
3674 for (i = 0; i < len; i++) | |
3675 { | |
3676 int c = p[i]; | |
3677 if (! ((c >= 'a' && c <= 'z') | |
3678 || (c >= 'A' && c <= 'Z') | |
3679 || (c >= '0' && c <= '9') | |
3680 || c == '-' || c == '_')) | |
3681 bad_count++; | |
3682 else | |
3683 good_count++; | |
3684 } | |
3685 } | |
3686 else | |
3687 /* Not a string => completely invalid. */ | |
3688 bad_count = 5, good_count = 0; | |
3689 | |
3690 /* If name is valid already, return. */ | |
3691 if (bad_count == 0) | |
3692 return; | |
3693 | |
3694 /* If name is entirely invalid, or nearly so, use `emacs'. */ | |
3695 if (good_count == 0 | |
3696 || (good_count == 1 && bad_count > 0)) | |
3697 { | |
3698 Vx_resource_name = build_string ("emacs"); | |
3699 return; | |
3700 } | |
3701 | |
3702 /* Name is partly valid. Copy it and replace the invalid characters | |
3703 with underscores. */ | |
3704 | |
3705 Vx_resource_name = new = Fcopy_sequence (Vx_resource_name); | |
3706 | |
3707 for (i = 0; i < len; i++) | |
3708 { | |
3709 int c = SREF (new, i); | |
3710 if (! ((c >= 'a' && c <= 'z') | |
3711 || (c >= 'A' && c <= 'Z') | |
3712 || (c >= '0' && c <= '9') | |
3713 || c == '-' || c == '_')) | |
3714 SSET (new, i, '_'); | |
3715 } | |
3716 } | |
3717 | |
3718 | |
109555
05e7e7c46ff0
Use const, move declarations to header files.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109501
diff
changeset
|
3719 extern char *x_get_string_resource (XrmDatabase, const char *, const char *); |
109100
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
109089
diff
changeset
|
3720 extern Display_Info *check_x_display_info (Lisp_Object); |
50357 | 3721 |
3722 | |
63698
e7e58f0947fe
(make_frame_without_minibuffer): Follow error conventions.
Juanma Barranquero <lekktu@gmail.com>
parents:
63643
diff
changeset
|
3723 /* Get specified attribute from resource database RDB. |
50357 | 3724 See Fx_get_resource below for other parameters. */ |
3725 | |
3726 static Lisp_Object | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
3727 xrdb_get_resource (XrmDatabase rdb, Lisp_Object attribute, Lisp_Object class, Lisp_Object component, Lisp_Object subclass) |
50357 | 3728 { |
3729 register char *value; | |
3730 char *name_key; | |
3731 char *class_key; | |
3732 | |
3733 CHECK_STRING (attribute); | |
3734 CHECK_STRING (class); | |
3735 | |
3736 if (!NILP (component)) | |
3737 CHECK_STRING (component); | |
3738 if (!NILP (subclass)) | |
3739 CHECK_STRING (subclass); | |
3740 if (NILP (component) != NILP (subclass)) | |
3741 error ("x-get-resource: must specify both COMPONENT and SUBCLASS or neither"); | |
3742 | |
3743 validate_x_resource_name (); | |
3744 | |
3745 /* Allocate space for the components, the dots which separate them, | |
3746 and the final '\0'. Make them big enough for the worst case. */ | |
3747 name_key = (char *) alloca (SBYTES (Vx_resource_name) | |
3748 + (STRINGP (component) | |
3749 ? SBYTES (component) : 0) | |
3750 + SBYTES (attribute) | |
3751 + 3); | |
3752 | |
3753 class_key = (char *) alloca (SBYTES (Vx_resource_class) | |
3754 + SBYTES (class) | |
3755 + (STRINGP (subclass) | |
3756 ? SBYTES (subclass) : 0) | |
3757 + 3); | |
3758 | |
3759 /* Start with emacs.FRAMENAME for the name (the specific one) | |
3760 and with `Emacs' for the class key (the general one). */ | |
3761 strcpy (name_key, SDATA (Vx_resource_name)); | |
3762 strcpy (class_key, SDATA (Vx_resource_class)); | |
3763 | |
3764 strcat (class_key, "."); | |
3765 strcat (class_key, SDATA (class)); | |
3766 | |
3767 if (!NILP (component)) | |
3768 { | |
3769 strcat (class_key, "."); | |
3770 strcat (class_key, SDATA (subclass)); | |
3771 | |
3772 strcat (name_key, "."); | |
3773 strcat (name_key, SDATA (component)); | |
3774 } | |
3775 | |
3776 strcat (name_key, "."); | |
3777 strcat (name_key, SDATA (attribute)); | |
3778 | |
3779 value = x_get_string_resource (rdb, name_key, class_key); | |
3780 | |
105182
e77a0b956835
* frame.c (xrdb_get_resource): Return nil for empty string resources;
Juanma Barranquero <lekktu@gmail.com>
parents:
105062
diff
changeset
|
3781 if (value != (char *) 0 && *value) |
50357 | 3782 return build_string (value); |
3783 else | |
3784 return Qnil; | |
3785 } | |
3786 | |
3787 | |
3788 DEFUN ("x-get-resource", Fx_get_resource, Sx_get_resource, 2, 4, 0, | |
3789 doc: /* Return the value of ATTRIBUTE, of class CLASS, from the X defaults database. | |
3790 This uses `INSTANCE.ATTRIBUTE' as the key and `Emacs.CLASS' as the | |
3791 class, where INSTANCE is the name under which Emacs was invoked, or | |
3792 the name specified by the `-name' or `-rn' command-line arguments. | |
3793 | |
3794 The optional arguments COMPONENT and SUBCLASS add to the key and the | |
3795 class, respectively. You must specify both of them or neither. | |
3796 If you specify them, the key is `INSTANCE.COMPONENT.ATTRIBUTE' | |
3797 and the class is `Emacs.CLASS.SUBCLASS'. */) | |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109139
diff
changeset
|
3798 (Lisp_Object attribute, Lisp_Object class, Lisp_Object component, Lisp_Object subclass) |
50357 | 3799 { |
3800 #ifdef HAVE_X_WINDOWS | |
3801 check_x (); | |
3802 #endif | |
3803 | |
3804 return xrdb_get_resource (check_x_display_info (Qnil)->xrdb, | |
3805 attribute, class, component, subclass); | |
3806 } | |
3807 | |
3808 /* Get an X resource, like Fx_get_resource, but for display DPYINFO. */ | |
3809 | |
3810 Lisp_Object | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
3811 display_x_get_resource (Display_Info *dpyinfo, Lisp_Object attribute, Lisp_Object class, Lisp_Object component, Lisp_Object subclass) |
50357 | 3812 { |
3813 return xrdb_get_resource (dpyinfo->xrdb, | |
3814 attribute, class, component, subclass); | |
3815 } | |
3816 | |
105062
5f7b67da2bbd
(x_get_resource_string): Re-add for non-toolkit builds (bug#4461).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105047
diff
changeset
|
3817 #if defined HAVE_X_WINDOWS && !defined USE_X_TOOLKIT |
5f7b67da2bbd
(x_get_resource_string): Re-add for non-toolkit builds (bug#4461).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105047
diff
changeset
|
3818 /* Used when C code wants a resource value. */ |
5f7b67da2bbd
(x_get_resource_string): Re-add for non-toolkit builds (bug#4461).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105047
diff
changeset
|
3819 /* Called from oldXMenu/Create.c. */ |
5f7b67da2bbd
(x_get_resource_string): Re-add for non-toolkit builds (bug#4461).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105047
diff
changeset
|
3820 char * |
109555
05e7e7c46ff0
Use const, move declarations to header files.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109501
diff
changeset
|
3821 x_get_resource_string (const char *attribute, const char *class) |
105062
5f7b67da2bbd
(x_get_resource_string): Re-add for non-toolkit builds (bug#4461).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105047
diff
changeset
|
3822 { |
5f7b67da2bbd
(x_get_resource_string): Re-add for non-toolkit builds (bug#4461).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105047
diff
changeset
|
3823 char *name_key; |
5f7b67da2bbd
(x_get_resource_string): Re-add for non-toolkit builds (bug#4461).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105047
diff
changeset
|
3824 char *class_key; |
5f7b67da2bbd
(x_get_resource_string): Re-add for non-toolkit builds (bug#4461).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105047
diff
changeset
|
3825 struct frame *sf = SELECTED_FRAME (); |
5f7b67da2bbd
(x_get_resource_string): Re-add for non-toolkit builds (bug#4461).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105047
diff
changeset
|
3826 |
5f7b67da2bbd
(x_get_resource_string): Re-add for non-toolkit builds (bug#4461).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105047
diff
changeset
|
3827 /* Allocate space for the components, the dots which separate them, |
5f7b67da2bbd
(x_get_resource_string): Re-add for non-toolkit builds (bug#4461).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105047
diff
changeset
|
3828 and the final '\0'. */ |
5f7b67da2bbd
(x_get_resource_string): Re-add for non-toolkit builds (bug#4461).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105047
diff
changeset
|
3829 name_key = (char *) alloca (SBYTES (Vinvocation_name) |
5f7b67da2bbd
(x_get_resource_string): Re-add for non-toolkit builds (bug#4461).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105047
diff
changeset
|
3830 + strlen (attribute) + 2); |
5f7b67da2bbd
(x_get_resource_string): Re-add for non-toolkit builds (bug#4461).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105047
diff
changeset
|
3831 class_key = (char *) alloca ((sizeof (EMACS_CLASS) - 1) |
5f7b67da2bbd
(x_get_resource_string): Re-add for non-toolkit builds (bug#4461).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105047
diff
changeset
|
3832 + strlen (class) + 2); |
5f7b67da2bbd
(x_get_resource_string): Re-add for non-toolkit builds (bug#4461).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105047
diff
changeset
|
3833 |
5f7b67da2bbd
(x_get_resource_string): Re-add for non-toolkit builds (bug#4461).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105047
diff
changeset
|
3834 sprintf (name_key, "%s.%s", SDATA (Vinvocation_name), attribute); |
5f7b67da2bbd
(x_get_resource_string): Re-add for non-toolkit builds (bug#4461).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105047
diff
changeset
|
3835 sprintf (class_key, "%s.%s", EMACS_CLASS, class); |
5f7b67da2bbd
(x_get_resource_string): Re-add for non-toolkit builds (bug#4461).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105047
diff
changeset
|
3836 |
5f7b67da2bbd
(x_get_resource_string): Re-add for non-toolkit builds (bug#4461).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105047
diff
changeset
|
3837 return x_get_string_resource (FRAME_X_DISPLAY_INFO (sf)->xrdb, |
5f7b67da2bbd
(x_get_resource_string): Re-add for non-toolkit builds (bug#4461).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105047
diff
changeset
|
3838 name_key, class_key); |
5f7b67da2bbd
(x_get_resource_string): Re-add for non-toolkit builds (bug#4461).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105047
diff
changeset
|
3839 } |
5f7b67da2bbd
(x_get_resource_string): Re-add for non-toolkit builds (bug#4461).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105047
diff
changeset
|
3840 #endif |
5f7b67da2bbd
(x_get_resource_string): Re-add for non-toolkit builds (bug#4461).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105047
diff
changeset
|
3841 |
50357 | 3842 /* Return the value of parameter PARAM. |
3843 | |
3844 First search ALIST, then Vdefault_frame_alist, then the X defaults | |
3845 database, using ATTRIBUTE as the attribute name and CLASS as its class. | |
3846 | |
3847 Convert the resource to the type specified by desired_type. | |
3848 | |
3849 If no default is specified, return Qunbound. If you call | |
3850 x_get_arg, make sure you deal with Qunbound in a reasonable way, | |
3851 and don't let it get stored in any Lisp-visible variables! */ | |
3852 | |
3853 Lisp_Object | |
109555
05e7e7c46ff0
Use const, move declarations to header files.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109501
diff
changeset
|
3854 x_get_arg (Display_Info *dpyinfo, Lisp_Object alist, Lisp_Object param, |
05e7e7c46ff0
Use const, move declarations to header files.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109501
diff
changeset
|
3855 const char *attribute, const char *class, enum resource_types type) |
50357 | 3856 { |
3857 register Lisp_Object tem; | |
3858 | |
3859 tem = Fassq (param, alist); | |
68395
00f2522b62f3
(x_get_arg): "Clear out" the parm in ALIST if found there.
Richard M. Stallman <rms@gnu.org>
parents:
68242
diff
changeset
|
3860 |
00f2522b62f3
(x_get_arg): "Clear out" the parm in ALIST if found there.
Richard M. Stallman <rms@gnu.org>
parents:
68242
diff
changeset
|
3861 if (!NILP (tem)) |
00f2522b62f3
(x_get_arg): "Clear out" the parm in ALIST if found there.
Richard M. Stallman <rms@gnu.org>
parents:
68242
diff
changeset
|
3862 { |
00f2522b62f3
(x_get_arg): "Clear out" the parm in ALIST if found there.
Richard M. Stallman <rms@gnu.org>
parents:
68242
diff
changeset
|
3863 /* If we find this parm in ALIST, clear it out |
00f2522b62f3
(x_get_arg): "Clear out" the parm in ALIST if found there.
Richard M. Stallman <rms@gnu.org>
parents:
68242
diff
changeset
|
3864 so that it won't be "left over" at the end. */ |
68905
f157b409991c
(x_get_arg): Clear out all occurrences of PARAM in ALIST.
Richard M. Stallman <rms@gnu.org>
parents:
68651
diff
changeset
|
3865 Lisp_Object tail; |
68395
00f2522b62f3
(x_get_arg): "Clear out" the parm in ALIST if found there.
Richard M. Stallman <rms@gnu.org>
parents:
68242
diff
changeset
|
3866 XSETCAR (tem, Qnil); |
68905
f157b409991c
(x_get_arg): Clear out all occurrences of PARAM in ALIST.
Richard M. Stallman <rms@gnu.org>
parents:
68651
diff
changeset
|
3867 /* In case the parameter appears more than once in the alist, |
f157b409991c
(x_get_arg): Clear out all occurrences of PARAM in ALIST.
Richard M. Stallman <rms@gnu.org>
parents:
68651
diff
changeset
|
3868 clear it out. */ |
f157b409991c
(x_get_arg): Clear out all occurrences of PARAM in ALIST.
Richard M. Stallman <rms@gnu.org>
parents:
68651
diff
changeset
|
3869 for (tail = alist; CONSP (tail); tail = XCDR (tail)) |
f157b409991c
(x_get_arg): Clear out all occurrences of PARAM in ALIST.
Richard M. Stallman <rms@gnu.org>
parents:
68651
diff
changeset
|
3870 if (CONSP (XCAR (tail)) |
f157b409991c
(x_get_arg): Clear out all occurrences of PARAM in ALIST.
Richard M. Stallman <rms@gnu.org>
parents:
68651
diff
changeset
|
3871 && EQ (XCAR (XCAR (tail)), param)) |
f157b409991c
(x_get_arg): Clear out all occurrences of PARAM in ALIST.
Richard M. Stallman <rms@gnu.org>
parents:
68651
diff
changeset
|
3872 XSETCAR (XCAR (tail), Qnil); |
68395
00f2522b62f3
(x_get_arg): "Clear out" the parm in ALIST if found there.
Richard M. Stallman <rms@gnu.org>
parents:
68242
diff
changeset
|
3873 } |
00f2522b62f3
(x_get_arg): "Clear out" the parm in ALIST if found there.
Richard M. Stallman <rms@gnu.org>
parents:
68242
diff
changeset
|
3874 else |
50357 | 3875 tem = Fassq (param, Vdefault_frame_alist); |
68395
00f2522b62f3
(x_get_arg): "Clear out" the parm in ALIST if found there.
Richard M. Stallman <rms@gnu.org>
parents:
68242
diff
changeset
|
3876 |
00f2522b62f3
(x_get_arg): "Clear out" the parm in ALIST if found there.
Richard M. Stallman <rms@gnu.org>
parents:
68242
diff
changeset
|
3877 /* If it wasn't specified in ALIST or the Lisp-level defaults, |
00f2522b62f3
(x_get_arg): "Clear out" the parm in ALIST if found there.
Richard M. Stallman <rms@gnu.org>
parents:
68242
diff
changeset
|
3878 look in the X resources. */ |
50357 | 3879 if (EQ (tem, Qnil)) |
3880 { | |
103603
c99edccfe4d8
* frame.c (x_get_arg): Check if dpyinfo is non-NULL.
Chong Yidong <cyd@stupidchicken.com>
parents:
103256
diff
changeset
|
3881 if (attribute && dpyinfo) |
50357 | 3882 { |
3883 tem = display_x_get_resource (dpyinfo, | |
3884 build_string (attribute), | |
3885 build_string (class), | |
3886 Qnil, Qnil); | |
3887 | |
3888 if (NILP (tem)) | |
3889 return Qunbound; | |
3890 | |
3891 switch (type) | |
3892 { | |
3893 case RES_TYPE_NUMBER: | |
3894 return make_number (atoi (SDATA (tem))); | |
3895 | |
107526
af52c11fa4bd
bug #5736: Allow X-resource menuBar to take on/off as documented.
Jan D. <jan.h.d@swipnet.se>
parents:
107045
diff
changeset
|
3896 case RES_TYPE_BOOLEAN_NUMBER: |
af52c11fa4bd
bug #5736: Allow X-resource menuBar to take on/off as documented.
Jan D. <jan.h.d@swipnet.se>
parents:
107045
diff
changeset
|
3897 if (!strcmp (SDATA (tem), "on") |
af52c11fa4bd
bug #5736: Allow X-resource menuBar to take on/off as documented.
Jan D. <jan.h.d@swipnet.se>
parents:
107045
diff
changeset
|
3898 || !strcmp (SDATA (tem), "true")) |
af52c11fa4bd
bug #5736: Allow X-resource menuBar to take on/off as documented.
Jan D. <jan.h.d@swipnet.se>
parents:
107045
diff
changeset
|
3899 return make_number (1); |
af52c11fa4bd
bug #5736: Allow X-resource menuBar to take on/off as documented.
Jan D. <jan.h.d@swipnet.se>
parents:
107045
diff
changeset
|
3900 return make_number (atoi (SDATA (tem))); |
af52c11fa4bd
bug #5736: Allow X-resource menuBar to take on/off as documented.
Jan D. <jan.h.d@swipnet.se>
parents:
107045
diff
changeset
|
3901 break; |
af52c11fa4bd
bug #5736: Allow X-resource menuBar to take on/off as documented.
Jan D. <jan.h.d@swipnet.se>
parents:
107045
diff
changeset
|
3902 |
50357 | 3903 case RES_TYPE_FLOAT: |
3904 return make_float (atof (SDATA (tem))); | |
3905 | |
3906 case RES_TYPE_BOOLEAN: | |
3907 tem = Fdowncase (tem); | |
3908 if (!strcmp (SDATA (tem), "on") | |
96675
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96544
diff
changeset
|
3909 #ifdef HAVE_NS |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96544
diff
changeset
|
3910 || !strcmp(SDATA(tem), "yes") |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96544
diff
changeset
|
3911 #endif |
50357 | 3912 || !strcmp (SDATA (tem), "true")) |
3913 return Qt; | |
3914 else | |
3915 return Qnil; | |
3916 | |
3917 case RES_TYPE_STRING: | |
3918 return tem; | |
3919 | |
3920 case RES_TYPE_SYMBOL: | |
3921 /* As a special case, we map the values `true' and `on' | |
3922 to Qt, and `false' and `off' to Qnil. */ | |
3923 { | |
3924 Lisp_Object lower; | |
3925 lower = Fdowncase (tem); | |
3926 if (!strcmp (SDATA (lower), "on") | |
96675
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96544
diff
changeset
|
3927 #ifdef HAVE_NS |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96544
diff
changeset
|
3928 || !strcmp(SDATA(lower), "yes") |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96544
diff
changeset
|
3929 #endif |
50357 | 3930 || !strcmp (SDATA (lower), "true")) |
3931 return Qt; | |
3932 else if (!strcmp (SDATA (lower), "off") | |
96675
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96544
diff
changeset
|
3933 #ifdef HAVE_NS |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96544
diff
changeset
|
3934 || !strcmp(SDATA(lower), "no") |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96544
diff
changeset
|
3935 #endif |
50357 | 3936 || !strcmp (SDATA (lower), "false")) |
3937 return Qnil; | |
3938 else | |
3939 return Fintern (tem, Qnil); | |
3940 } | |
3941 | |
3942 default: | |
3943 abort (); | |
3944 } | |
3945 } | |
3946 else | |
3947 return Qunbound; | |
3948 } | |
3949 return Fcdr (tem); | |
3950 } | |
3951 | |
3952 Lisp_Object | |
109555
05e7e7c46ff0
Use const, move declarations to header files.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109501
diff
changeset
|
3953 x_frame_get_arg (struct frame *f, Lisp_Object alist, Lisp_Object param, |
05e7e7c46ff0
Use const, move declarations to header files.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109501
diff
changeset
|
3954 const char *attribute, const char *class, |
05e7e7c46ff0
Use const, move declarations to header files.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109501
diff
changeset
|
3955 enum resource_types type) |
50357 | 3956 { |
3957 return x_get_arg (FRAME_X_DISPLAY_INFO (f), | |
3958 alist, param, attribute, class, type); | |
3959 } | |
3960 | |
3961 /* Like x_frame_get_arg, but also record the value in f->param_alist. */ | |
3962 | |
3963 Lisp_Object | |
109555
05e7e7c46ff0
Use const, move declarations to header files.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109501
diff
changeset
|
3964 x_frame_get_and_record_arg (struct frame *f, Lisp_Object alist, |
05e7e7c46ff0
Use const, move declarations to header files.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109501
diff
changeset
|
3965 Lisp_Object param, |
05e7e7c46ff0
Use const, move declarations to header files.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109501
diff
changeset
|
3966 const char *attribute, const char *class, |
05e7e7c46ff0
Use const, move declarations to header files.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109501
diff
changeset
|
3967 enum resource_types type) |
50357 | 3968 { |
3969 Lisp_Object value; | |
3970 | |
3971 value = x_get_arg (FRAME_X_DISPLAY_INFO (f), alist, param, | |
3972 attribute, class, type); | |
68242
c0002338a5e8
(x_frame_get_and_record_arg): Don't record Qunbound value in f->param_alist.
Richard M. Stallman <rms@gnu.org>
parents:
65976
diff
changeset
|
3973 if (! NILP (value) && ! EQ (value, Qunbound)) |
50357 | 3974 store_frame_param (f, param, value); |
3975 | |
3976 return value; | |
3977 } | |
3978 | |
3979 | |
3980 /* Record in frame F the specified or default value according to ALIST | |
3981 of the parameter named PROP (a Lisp symbol). | |
3982 If no value is specified for PROP, look for an X default for XPROP | |
3983 on the frame named NAME. | |
3984 If that is not found either, use the value DEFLT. */ | |
3985 | |
3986 Lisp_Object | |
109555
05e7e7c46ff0
Use const, move declarations to header files.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109501
diff
changeset
|
3987 x_default_parameter (struct frame *f, Lisp_Object alist, Lisp_Object prop, |
05e7e7c46ff0
Use const, move declarations to header files.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109501
diff
changeset
|
3988 Lisp_Object deflt, const char *xprop, const char *xclass, |
05e7e7c46ff0
Use const, move declarations to header files.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109501
diff
changeset
|
3989 enum resource_types type) |
50357 | 3990 { |
3991 Lisp_Object tem; | |
3992 | |
3993 tem = x_frame_get_arg (f, alist, prop, xprop, xclass, type); | |
3994 if (EQ (tem, Qunbound)) | |
3995 tem = deflt; | |
3996 x_set_frame_parameters (f, Fcons (Fcons (prop, tem), Qnil)); | |
3997 return tem; | |
3998 } | |
3999 | |
4000 | |
4001 | |
4002 | |
104927
d76b30182911
(Fx_parse_geometry): Unify the X and NS versions so that they share a
Glenn Morris <rgm@gnu.org>
parents:
104074
diff
changeset
|
4003 /* NS used to define x-parse-geometry in ns-win.el, but that confused |
d76b30182911
(Fx_parse_geometry): Unify the X and NS versions so that they share a
Glenn Morris <rgm@gnu.org>
parents:
104074
diff
changeset
|
4004 make-docfile: the documentation string in ns-win.el was used for |
d76b30182911
(Fx_parse_geometry): Unify the X and NS versions so that they share a
Glenn Morris <rgm@gnu.org>
parents:
104074
diff
changeset
|
4005 x-parse-geometry even in non-NS builds. |
d76b30182911
(Fx_parse_geometry): Unify the X and NS versions so that they share a
Glenn Morris <rgm@gnu.org>
parents:
104074
diff
changeset
|
4006 |
d76b30182911
(Fx_parse_geometry): Unify the X and NS versions so that they share a
Glenn Morris <rgm@gnu.org>
parents:
104074
diff
changeset
|
4007 With two definitions of x-parse-geometry in this file, various |
d76b30182911
(Fx_parse_geometry): Unify the X and NS versions so that they share a
Glenn Morris <rgm@gnu.org>
parents:
104074
diff
changeset
|
4008 things still get confused (eg M-x apropos documentation), so that |
d76b30182911
(Fx_parse_geometry): Unify the X and NS versions so that they share a
Glenn Morris <rgm@gnu.org>
parents:
104074
diff
changeset
|
4009 it is best if the two definitions just share the same doc-string. |
d76b30182911
(Fx_parse_geometry): Unify the X and NS versions so that they share a
Glenn Morris <rgm@gnu.org>
parents:
104074
diff
changeset
|
4010 */ |
97449
d3a738f747c6
(Qns_parse_geometry): New var.
Chong Yidong <cyd@stupidchicken.com>
parents:
97141
diff
changeset
|
4011 DEFUN ("x-parse-geometry", Fx_parse_geometry, Sx_parse_geometry, 1, 1, 0, |
104927
d76b30182911
(Fx_parse_geometry): Unify the X and NS versions so that they share a
Glenn Morris <rgm@gnu.org>
parents:
104074
diff
changeset
|
4012 doc: /* Parse a display geometry string STRING. |
97449
d3a738f747c6
(Qns_parse_geometry): New var.
Chong Yidong <cyd@stupidchicken.com>
parents:
97141
diff
changeset
|
4013 Returns an alist of the form ((top . TOP), (left . LEFT) ... ). |
d3a738f747c6
(Qns_parse_geometry): New var.
Chong Yidong <cyd@stupidchicken.com>
parents:
97141
diff
changeset
|
4014 The properties returned may include `top', `left', `height', and `width'. |
104927
d76b30182911
(Fx_parse_geometry): Unify the X and NS versions so that they share a
Glenn Morris <rgm@gnu.org>
parents:
104074
diff
changeset
|
4015 For X, the value of `left' or `top' may be an integer, |
d76b30182911
(Fx_parse_geometry): Unify the X and NS versions so that they share a
Glenn Morris <rgm@gnu.org>
parents:
104074
diff
changeset
|
4016 or a list (+ N) meaning N pixels relative to top/left corner, |
d76b30182911
(Fx_parse_geometry): Unify the X and NS versions so that they share a
Glenn Morris <rgm@gnu.org>
parents:
104074
diff
changeset
|
4017 or a list (- N) meaning -N pixels relative to bottom/right corner. |
d76b30182911
(Fx_parse_geometry): Unify the X and NS versions so that they share a
Glenn Morris <rgm@gnu.org>
parents:
104074
diff
changeset
|
4018 On Nextstep, this just calls `ns-parse-geometry'. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109139
diff
changeset
|
4019 (Lisp_Object string) |
97449
d3a738f747c6
(Qns_parse_geometry): New var.
Chong Yidong <cyd@stupidchicken.com>
parents:
97141
diff
changeset
|
4020 { |
104927
d76b30182911
(Fx_parse_geometry): Unify the X and NS versions so that they share a
Glenn Morris <rgm@gnu.org>
parents:
104074
diff
changeset
|
4021 #ifdef HAVE_NS |
97449
d3a738f747c6
(Qns_parse_geometry): New var.
Chong Yidong <cyd@stupidchicken.com>
parents:
97141
diff
changeset
|
4022 call1 (Qns_parse_geometry, string); |
104927
d76b30182911
(Fx_parse_geometry): Unify the X and NS versions so that they share a
Glenn Morris <rgm@gnu.org>
parents:
104074
diff
changeset
|
4023 #else |
50357 | 4024 int geometry, x, y; |
4025 unsigned int width, height; | |
4026 Lisp_Object result; | |
4027 | |
4028 CHECK_STRING (string); | |
4029 | |
4030 geometry = XParseGeometry ((char *) SDATA (string), | |
4031 &x, &y, &width, &height); | |
4032 result = Qnil; | |
4033 if (geometry & XValue) | |
4034 { | |
4035 Lisp_Object element; | |
4036 | |
4037 if (x >= 0 && (geometry & XNegative)) | |
4038 element = Fcons (Qleft, Fcons (Qminus, Fcons (make_number (-x), Qnil))); | |
4039 else if (x < 0 && ! (geometry & XNegative)) | |
4040 element = Fcons (Qleft, Fcons (Qplus, Fcons (make_number (x), Qnil))); | |
4041 else | |
4042 element = Fcons (Qleft, make_number (x)); | |
4043 result = Fcons (element, result); | |
4044 } | |
4045 | |
4046 if (geometry & YValue) | |
4047 { | |
4048 Lisp_Object element; | |
4049 | |
4050 if (y >= 0 && (geometry & YNegative)) | |
4051 element = Fcons (Qtop, Fcons (Qminus, Fcons (make_number (-y), Qnil))); | |
4052 else if (y < 0 && ! (geometry & YNegative)) | |
4053 element = Fcons (Qtop, Fcons (Qplus, Fcons (make_number (y), Qnil))); | |
4054 else | |
4055 element = Fcons (Qtop, make_number (y)); | |
4056 result = Fcons (element, result); | |
4057 } | |
4058 | |
4059 if (geometry & WidthValue) | |
4060 result = Fcons (Fcons (Qwidth, make_number (width)), result); | |
4061 if (geometry & HeightValue) | |
4062 result = Fcons (Fcons (Qheight, make_number (height)), result); | |
4063 | |
4064 return result; | |
104927
d76b30182911
(Fx_parse_geometry): Unify the X and NS versions so that they share a
Glenn Morris <rgm@gnu.org>
parents:
104074
diff
changeset
|
4065 #endif /* HAVE_NS */ |
50357 | 4066 } |
97449
d3a738f747c6
(Qns_parse_geometry): New var.
Chong Yidong <cyd@stupidchicken.com>
parents:
97141
diff
changeset
|
4067 |
50357 | 4068 |
4069 /* Calculate the desired size and position of frame F. | |
4070 Return the flags saying which aspects were specified. | |
4071 | |
4072 Also set the win_gravity and size_hint_flags of F. | |
4073 | |
4074 Adjust height for toolbar if TOOLBAR_P is 1. | |
4075 | |
4076 This function does not make the coordinates positive. */ | |
4077 | |
107045
435c323b6002
Change default XFT font to 10pt, and default frame height to 35 rows (Bug#3643).
Chong Yidong <cyd@stupidchicken.com>
parents:
106815
diff
changeset
|
4078 #define DEFAULT_ROWS 35 |
50357 | 4079 #define DEFAULT_COLS 80 |
4080 | |
4081 int | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
4082 x_figure_window_size (struct frame *f, Lisp_Object parms, int toolbar_p) |
50357 | 4083 { |
4084 register Lisp_Object tem0, tem1, tem2; | |
4085 long window_prompting = 0; | |
4086 Display_Info *dpyinfo = FRAME_X_DISPLAY_INFO (f); | |
4087 | |
4088 /* Default values if we fall through. | |
4089 Actually, if that happens we should get | |
4090 window manager prompting. */ | |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
4091 SET_FRAME_COLS (f, DEFAULT_COLS); |
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
4092 FRAME_LINES (f) = DEFAULT_ROWS; |
50357 | 4093 /* Window managers expect that if program-specified |
4094 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
|
4095 f->top_pos = 0; |
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
4096 f->left_pos = 0; |
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
4097 |
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
4098 /* Ensure that old new_text_cols and new_text_lines will not override the |
50357 | 4099 values set here. */ |
4100 /* ++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
|
4101 f->new_text_cols = f->new_text_lines = 0; |
50357 | 4102 |
4103 tem0 = x_get_arg (dpyinfo, parms, Qheight, 0, 0, RES_TYPE_NUMBER); | |
4104 tem1 = x_get_arg (dpyinfo, parms, Qwidth, 0, 0, RES_TYPE_NUMBER); | |
4105 tem2 = x_get_arg (dpyinfo, parms, Quser_size, 0, 0, RES_TYPE_NUMBER); | |
4106 if (! EQ (tem0, Qunbound) || ! EQ (tem1, Qunbound)) | |
4107 { | |
4108 if (!EQ (tem0, Qunbound)) | |
4109 { | |
4110 CHECK_NUMBER (tem0); | |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
4111 FRAME_LINES (f) = XINT (tem0); |
50357 | 4112 } |
4113 if (!EQ (tem1, Qunbound)) | |
4114 { | |
4115 CHECK_NUMBER (tem1); | |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
4116 SET_FRAME_COLS (f, XINT (tem1)); |
50357 | 4117 } |
4118 if (!NILP (tem2) && !EQ (tem2, Qunbound)) | |
4119 window_prompting |= USSize; | |
4120 else | |
4121 window_prompting |= PSize; | |
4122 } | |
4123 | |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
4124 f->scroll_bar_actual_width |
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
4125 = FRAME_SCROLL_BAR_COLS (f) * FRAME_COLUMN_WIDTH (f); |
50357 | 4126 |
4127 /* This used to be done _before_ calling x_figure_window_size, but | |
4128 since the height is reset here, this was really a no-op. I | |
4129 assume that moving it here does what Gerd intended (although he | |
4130 no longer can remember what that was... ++KFS, 2003-03-25. */ | |
4131 | |
4132 /* Add the tool-bar height to the initial frame height so that the | |
4133 user gets a text display area of the size he specified with -g or | |
4134 via .Xdefaults. Later changes of the tool-bar height don't | |
4135 change the frame size. This is done so that users can create | |
4136 tall Emacs frames without having to guess how tall the tool-bar | |
4137 will get. */ | |
4138 if (toolbar_p && FRAME_TOOL_BAR_LINES (f)) | |
4139 { | |
4140 int margin, relief, bar_height; | |
4141 | |
4142 relief = (tool_bar_button_relief >= 0 | |
4143 ? tool_bar_button_relief | |
4144 : DEFAULT_TOOL_BAR_BUTTON_RELIEF); | |
4145 | |
4146 if (INTEGERP (Vtool_bar_button_margin) | |
4147 && XINT (Vtool_bar_button_margin) > 0) | |
4148 margin = XFASTINT (Vtool_bar_button_margin); | |
4149 else if (CONSP (Vtool_bar_button_margin) | |
4150 && INTEGERP (XCDR (Vtool_bar_button_margin)) | |
4151 && XINT (XCDR (Vtool_bar_button_margin)) > 0) | |
4152 margin = XFASTINT (XCDR (Vtool_bar_button_margin)); | |
4153 else | |
4154 margin = 0; | |
4155 | |
4156 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
|
4157 FRAME_LINES (f) += (bar_height + FRAME_LINE_HEIGHT (f) - 1) / FRAME_LINE_HEIGHT (f); |
50357 | 4158 } |
4159 | |
4160 compute_fringe_widths (f, 0); | |
4161 | |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
4162 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
|
4163 FRAME_PIXEL_HEIGHT (f) = FRAME_TEXT_LINES_TO_PIXEL_HEIGHT (f, FRAME_LINES (f)); |
50357 | 4164 |
4165 tem0 = x_get_arg (dpyinfo, parms, Qtop, 0, 0, RES_TYPE_NUMBER); | |
4166 tem1 = x_get_arg (dpyinfo, parms, Qleft, 0, 0, RES_TYPE_NUMBER); | |
4167 tem2 = x_get_arg (dpyinfo, parms, Quser_position, 0, 0, RES_TYPE_NUMBER); | |
4168 if (! EQ (tem0, Qunbound) || ! EQ (tem1, Qunbound)) | |
4169 { | |
4170 if (EQ (tem0, Qminus)) | |
4171 { | |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
4172 f->top_pos = 0; |
50357 | 4173 window_prompting |= YNegative; |
4174 } | |
4175 else if (CONSP (tem0) && EQ (XCAR (tem0), Qminus) | |
4176 && CONSP (XCDR (tem0)) | |
4177 && INTEGERP (XCAR (XCDR (tem0)))) | |
4178 { | |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
4179 f->top_pos = - XINT (XCAR (XCDR (tem0))); |
50357 | 4180 window_prompting |= YNegative; |
4181 } | |
4182 else if (CONSP (tem0) && EQ (XCAR (tem0), Qplus) | |
4183 && CONSP (XCDR (tem0)) | |
4184 && INTEGERP (XCAR (XCDR (tem0)))) | |
4185 { | |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
4186 f->top_pos = XINT (XCAR (XCDR (tem0))); |
50357 | 4187 } |
4188 else if (EQ (tem0, Qunbound)) | |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
4189 f->top_pos = 0; |
50357 | 4190 else |
4191 { | |
4192 CHECK_NUMBER (tem0); | |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
4193 f->top_pos = XINT (tem0); |
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
4194 if (f->top_pos < 0) |
50357 | 4195 window_prompting |= YNegative; |
4196 } | |
4197 | |
4198 if (EQ (tem1, Qminus)) | |
4199 { | |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
4200 f->left_pos = 0; |
50357 | 4201 window_prompting |= XNegative; |
4202 } | |
4203 else if (CONSP (tem1) && EQ (XCAR (tem1), Qminus) | |
4204 && CONSP (XCDR (tem1)) | |
4205 && INTEGERP (XCAR (XCDR (tem1)))) | |
4206 { | |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
4207 f->left_pos = - XINT (XCAR (XCDR (tem1))); |
50357 | 4208 window_prompting |= XNegative; |
4209 } | |
4210 else if (CONSP (tem1) && EQ (XCAR (tem1), Qplus) | |
4211 && CONSP (XCDR (tem1)) | |
4212 && INTEGERP (XCAR (XCDR (tem1)))) | |
4213 { | |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
4214 f->left_pos = XINT (XCAR (XCDR (tem1))); |
50357 | 4215 } |
4216 else if (EQ (tem1, Qunbound)) | |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
4217 f->left_pos = 0; |
50357 | 4218 else |
4219 { | |
4220 CHECK_NUMBER (tem1); | |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
4221 f->left_pos = XINT (tem1); |
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
4222 if (f->left_pos < 0) |
50357 | 4223 window_prompting |= XNegative; |
4224 } | |
4225 | |
4226 if (!NILP (tem2) && ! EQ (tem2, Qunbound)) | |
4227 window_prompting |= USPosition; | |
4228 else | |
4229 window_prompting |= PPosition; | |
4230 } | |
4231 | |
4232 if (window_prompting & XNegative) | |
4233 { | |
4234 if (window_prompting & YNegative) | |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
4235 f->win_gravity = SouthEastGravity; |
50357 | 4236 else |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
4237 f->win_gravity = NorthEastGravity; |
50357 | 4238 } |
4239 else | |
4240 { | |
4241 if (window_prompting & YNegative) | |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
4242 f->win_gravity = SouthWestGravity; |
50357 | 4243 else |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
4244 f->win_gravity = NorthWestGravity; |
50357 | 4245 } |
4246 | |
51194
a873867ba3d2
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
51091
diff
changeset
|
4247 f->size_hint_flags = window_prompting; |
50357 | 4248 |
4249 return window_prompting; | |
4250 } | |
4251 | |
4252 | |
4253 | |
4254 #endif /* HAVE_WINDOW_SYSTEM */ | |
4255 | |
103704
6a4e411bd83b
* xterm.h (struct x_display_info): Add invisible_cursor.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103674
diff
changeset
|
4256 void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
4257 frame_make_pointer_invisible (void) |
103704
6a4e411bd83b
* xterm.h (struct x_display_info): Add invisible_cursor.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103674
diff
changeset
|
4258 { |
6a4e411bd83b
* xterm.h (struct x_display_info): Add invisible_cursor.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103674
diff
changeset
|
4259 if (! NILP (Vmake_pointer_invisible)) |
6a4e411bd83b
* xterm.h (struct x_display_info): Add invisible_cursor.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103674
diff
changeset
|
4260 { |
106308
f276530df5ef
frame.c (frame_make_pointer_invisible)
Jan Djärv <jan.h.d@swipnet.se>
parents:
106290
diff
changeset
|
4261 struct frame *f; |
106290
8671036bedc4
Don't crash if an X terminal is deleted with force == t.
Jan Djärv <jan.h.d@swipnet.se>
parents:
106212
diff
changeset
|
4262 if (!FRAMEP (selected_frame) || !FRAME_LIVE_P (XFRAME (selected_frame))) |
8671036bedc4
Don't crash if an X terminal is deleted with force == t.
Jan Djärv <jan.h.d@swipnet.se>
parents:
106212
diff
changeset
|
4263 return; |
8671036bedc4
Don't crash if an X terminal is deleted with force == t.
Jan Djärv <jan.h.d@swipnet.se>
parents:
106212
diff
changeset
|
4264 |
106308
f276530df5ef
frame.c (frame_make_pointer_invisible)
Jan Djärv <jan.h.d@swipnet.se>
parents:
106290
diff
changeset
|
4265 f = SELECTED_FRAME (); |
103704
6a4e411bd83b
* xterm.h (struct x_display_info): Add invisible_cursor.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103674
diff
changeset
|
4266 if (f && !f->pointer_invisible |
6a4e411bd83b
* xterm.h (struct x_display_info): Add invisible_cursor.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103674
diff
changeset
|
4267 && FRAME_TERMINAL (f)->toggle_invisible_pointer_hook) |
6a4e411bd83b
* xterm.h (struct x_display_info): Add invisible_cursor.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103674
diff
changeset
|
4268 { |
6a4e411bd83b
* xterm.h (struct x_display_info): Add invisible_cursor.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103674
diff
changeset
|
4269 f->mouse_moved = 0; |
6a4e411bd83b
* xterm.h (struct x_display_info): Add invisible_cursor.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103674
diff
changeset
|
4270 FRAME_TERMINAL (f)->toggle_invisible_pointer_hook (f, 1); |
6a4e411bd83b
* xterm.h (struct x_display_info): Add invisible_cursor.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103674
diff
changeset
|
4271 f->pointer_invisible = 1; |
6a4e411bd83b
* xterm.h (struct x_display_info): Add invisible_cursor.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103674
diff
changeset
|
4272 } |
6a4e411bd83b
* xterm.h (struct x_display_info): Add invisible_cursor.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103674
diff
changeset
|
4273 } |
6a4e411bd83b
* xterm.h (struct x_display_info): Add invisible_cursor.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103674
diff
changeset
|
4274 } |
6a4e411bd83b
* xterm.h (struct x_display_info): Add invisible_cursor.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103674
diff
changeset
|
4275 |
6a4e411bd83b
* xterm.h (struct x_display_info): Add invisible_cursor.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103674
diff
changeset
|
4276 void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
4277 frame_make_pointer_visible (void) |
103704
6a4e411bd83b
* xterm.h (struct x_display_info): Add invisible_cursor.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103674
diff
changeset
|
4278 { |
6a4e411bd83b
* xterm.h (struct x_display_info): Add invisible_cursor.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103674
diff
changeset
|
4279 /* We don't check Vmake_pointer_invisible here in case the |
6a4e411bd83b
* xterm.h (struct x_display_info): Add invisible_cursor.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103674
diff
changeset
|
4280 pointer was invisible when Vmake_pointer_invisible was set to nil. */ |
106308
f276530df5ef
frame.c (frame_make_pointer_invisible)
Jan Djärv <jan.h.d@swipnet.se>
parents:
106290
diff
changeset
|
4281 struct frame *f; |
103704
6a4e411bd83b
* xterm.h (struct x_display_info): Add invisible_cursor.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103674
diff
changeset
|
4282 |
106290
8671036bedc4
Don't crash if an X terminal is deleted with force == t.
Jan Djärv <jan.h.d@swipnet.se>
parents:
106212
diff
changeset
|
4283 if (!FRAMEP (selected_frame) || !FRAME_LIVE_P (XFRAME (selected_frame))) |
8671036bedc4
Don't crash if an X terminal is deleted with force == t.
Jan Djärv <jan.h.d@swipnet.se>
parents:
106212
diff
changeset
|
4284 return; |
8671036bedc4
Don't crash if an X terminal is deleted with force == t.
Jan Djärv <jan.h.d@swipnet.se>
parents:
106212
diff
changeset
|
4285 |
106308
f276530df5ef
frame.c (frame_make_pointer_invisible)
Jan Djärv <jan.h.d@swipnet.se>
parents:
106290
diff
changeset
|
4286 f = SELECTED_FRAME (); |
103704
6a4e411bd83b
* xterm.h (struct x_display_info): Add invisible_cursor.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103674
diff
changeset
|
4287 if (f && f->pointer_invisible && f->mouse_moved |
6a4e411bd83b
* xterm.h (struct x_display_info): Add invisible_cursor.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103674
diff
changeset
|
4288 && FRAME_TERMINAL (f)->toggle_invisible_pointer_hook) |
6a4e411bd83b
* xterm.h (struct x_display_info): Add invisible_cursor.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103674
diff
changeset
|
4289 { |
6a4e411bd83b
* xterm.h (struct x_display_info): Add invisible_cursor.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103674
diff
changeset
|
4290 FRAME_TERMINAL (f)->toggle_invisible_pointer_hook (f, 0); |
6a4e411bd83b
* xterm.h (struct x_display_info): Add invisible_cursor.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103674
diff
changeset
|
4291 f->pointer_invisible = 0; |
6a4e411bd83b
* xterm.h (struct x_display_info): Add invisible_cursor.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103674
diff
changeset
|
4292 } |
6a4e411bd83b
* xterm.h (struct x_display_info): Add invisible_cursor.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103674
diff
changeset
|
4293 } |
6a4e411bd83b
* xterm.h (struct x_display_info): Add invisible_cursor.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103674
diff
changeset
|
4294 |
50357 | 4295 |
4296 | |
4297 /*********************************************************************** | |
4298 Initialization | |
4299 ***********************************************************************/ | |
4300 | |
21514 | 4301 void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
4302 syms_of_frame (void) |
286 | 4303 { |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105814
diff
changeset
|
4304 Qframep = intern_c_string ("framep"); |
33509
a7d245e080d1
(syms_of_frame_1): Removed; code moved to syms_of_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
33005
diff
changeset
|
4305 staticpro (&Qframep); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105814
diff
changeset
|
4306 Qframe_live_p = intern_c_string ("frame-live-p"); |
33509
a7d245e080d1
(syms_of_frame_1): Removed; code moved to syms_of_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
33005
diff
changeset
|
4307 staticpro (&Qframe_live_p); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105814
diff
changeset
|
4308 Qexplicit_name = intern_c_string ("explicit-name"); |
79048
ab853f85e4dc
(Qexplicit_name): New variable.
Martin Rudalics <rudalics@gmx.at>
parents:
78984
diff
changeset
|
4309 staticpro (&Qexplicit_name); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105814
diff
changeset
|
4310 Qheight = intern_c_string ("height"); |
33509
a7d245e080d1
(syms_of_frame_1): Removed; code moved to syms_of_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
33005
diff
changeset
|
4311 staticpro (&Qheight); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105814
diff
changeset
|
4312 Qicon = intern_c_string ("icon"); |
33509
a7d245e080d1
(syms_of_frame_1): Removed; code moved to syms_of_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
33005
diff
changeset
|
4313 staticpro (&Qicon); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105814
diff
changeset
|
4314 Qminibuffer = intern_c_string ("minibuffer"); |
33509
a7d245e080d1
(syms_of_frame_1): Removed; code moved to syms_of_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
33005
diff
changeset
|
4315 staticpro (&Qminibuffer); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105814
diff
changeset
|
4316 Qmodeline = intern_c_string ("modeline"); |
33509
a7d245e080d1
(syms_of_frame_1): Removed; code moved to syms_of_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
33005
diff
changeset
|
4317 staticpro (&Qmodeline); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105814
diff
changeset
|
4318 Qonly = intern_c_string ("only"); |
33509
a7d245e080d1
(syms_of_frame_1): Removed; code moved to syms_of_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
33005
diff
changeset
|
4319 staticpro (&Qonly); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105814
diff
changeset
|
4320 Qwidth = intern_c_string ("width"); |
33509
a7d245e080d1
(syms_of_frame_1): Removed; code moved to syms_of_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
33005
diff
changeset
|
4321 staticpro (&Qwidth); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105814
diff
changeset
|
4322 Qgeometry = intern_c_string ("geometry"); |
50357 | 4323 staticpro (&Qgeometry); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105814
diff
changeset
|
4324 Qicon_left = intern_c_string ("icon-left"); |
50357 | 4325 staticpro (&Qicon_left); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105814
diff
changeset
|
4326 Qicon_top = intern_c_string ("icon-top"); |
50357 | 4327 staticpro (&Qicon_top); |
109290
1b5ca039f5f2
Fix faulty `if' statement in delete_frame.
Chong Yidong <cyd@stupidchicken.com>
parents:
107526
diff
changeset
|
4328 Qtooltip = intern_c_string ("tooltip"); |
1b5ca039f5f2
Fix faulty `if' statement in delete_frame.
Chong Yidong <cyd@stupidchicken.com>
parents:
107526
diff
changeset
|
4329 staticpro (&Qtooltip); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105814
diff
changeset
|
4330 Qleft = intern_c_string ("left"); |
50357 | 4331 staticpro (&Qleft); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105814
diff
changeset
|
4332 Qright = intern_c_string ("right"); |
50357 | 4333 staticpro (&Qright); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105814
diff
changeset
|
4334 Quser_position = intern_c_string ("user-position"); |
50357 | 4335 staticpro (&Quser_position); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105814
diff
changeset
|
4336 Quser_size = intern_c_string ("user-size"); |
50357 | 4337 staticpro (&Quser_size); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105814
diff
changeset
|
4338 Qwindow_id = intern_c_string ("window-id"); |
50357 | 4339 staticpro (&Qwindow_id); |
4340 #ifdef HAVE_X_WINDOWS | |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105814
diff
changeset
|
4341 Qouter_window_id = intern_c_string ("outer-window-id"); |
50357 | 4342 staticpro (&Qouter_window_id); |
4343 #endif | |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105814
diff
changeset
|
4344 Qparent_id = intern_c_string ("parent-id"); |
50357 | 4345 staticpro (&Qparent_id); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105814
diff
changeset
|
4346 Qx = intern_c_string ("x"); |
33509
a7d245e080d1
(syms_of_frame_1): Removed; code moved to syms_of_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
33005
diff
changeset
|
4347 staticpro (&Qx); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105814
diff
changeset
|
4348 Qw32 = intern_c_string ("w32"); |
33509
a7d245e080d1
(syms_of_frame_1): Removed; code moved to syms_of_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
33005
diff
changeset
|
4349 staticpro (&Qw32); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105814
diff
changeset
|
4350 Qpc = intern_c_string ("pc"); |
33509
a7d245e080d1
(syms_of_frame_1): Removed; code moved to syms_of_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
33005
diff
changeset
|
4351 staticpro (&Qpc); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105814
diff
changeset
|
4352 Qmac = intern_c_string ("mac"); |
33509
a7d245e080d1
(syms_of_frame_1): Removed; code moved to syms_of_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
33005
diff
changeset
|
4353 staticpro (&Qmac); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105814
diff
changeset
|
4354 Qns = intern_c_string ("ns"); |
96675
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96544
diff
changeset
|
4355 staticpro (&Qns); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105814
diff
changeset
|
4356 Qvisible = intern_c_string ("visible"); |
33509
a7d245e080d1
(syms_of_frame_1): Removed; code moved to syms_of_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
33005
diff
changeset
|
4357 staticpro (&Qvisible); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105814
diff
changeset
|
4358 Qbuffer_predicate = intern_c_string ("buffer-predicate"); |
33509
a7d245e080d1
(syms_of_frame_1): Removed; code moved to syms_of_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
33005
diff
changeset
|
4359 staticpro (&Qbuffer_predicate); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105814
diff
changeset
|
4360 Qbuffer_list = intern_c_string ("buffer-list"); |
33509
a7d245e080d1
(syms_of_frame_1): Removed; code moved to syms_of_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
33005
diff
changeset
|
4361 staticpro (&Qbuffer_list); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105814
diff
changeset
|
4362 Qburied_buffer_list = intern_c_string ("buried-buffer-list"); |
83415
d2c799f58129
Implement full support for frame-local `next-buffer' and `previous-buffer'.
Karoly Lorentey <lorentey@elte.hu>
parents:
83384
diff
changeset
|
4363 staticpro (&Qburied_buffer_list); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105814
diff
changeset
|
4364 Qdisplay_type = intern_c_string ("display-type"); |
33509
a7d245e080d1
(syms_of_frame_1): Removed; code moved to syms_of_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
33005
diff
changeset
|
4365 staticpro (&Qdisplay_type); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105814
diff
changeset
|
4366 Qbackground_mode = intern_c_string ("background-mode"); |
33509
a7d245e080d1
(syms_of_frame_1): Removed; code moved to syms_of_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
33005
diff
changeset
|
4367 staticpro (&Qbackground_mode); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105814
diff
changeset
|
4368 Qnoelisp = intern_c_string ("noelisp"); |
91732
c33ec1f680a9
* frame.c (Qnoelisp): New symbol.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91641
diff
changeset
|
4369 staticpro (&Qnoelisp); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105814
diff
changeset
|
4370 Qtty_color_mode = intern_c_string ("tty-color-mode"); |
42743
1e6231c9c359
(store_frame_param): Call set_tty_color_mode for termcap
Eli Zaretskii <eliz@gnu.org>
parents:
41718
diff
changeset
|
4371 staticpro (&Qtty_color_mode); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105814
diff
changeset
|
4372 Qtty = intern_c_string ("tty"); |
53226
dd3018b4785b
Implemented multiple tty support.
Karoly Lorentey <lorentey@elte.hu>
parents:
53072
diff
changeset
|
4373 staticpro (&Qtty); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105814
diff
changeset
|
4374 Qtty_type = intern_c_string ("tty-type"); |
53226
dd3018b4785b
Implemented multiple tty support.
Karoly Lorentey <lorentey@elte.hu>
parents:
53072
diff
changeset
|
4375 staticpro (&Qtty_type); |
286 | 4376 |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105814
diff
changeset
|
4377 Qface_set_after_frame_default = intern_c_string ("face-set-after-frame-default"); |
50357 | 4378 staticpro (&Qface_set_after_frame_default); |
4379 | |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105814
diff
changeset
|
4380 Qfullwidth = intern_c_string ("fullwidth"); |
50357 | 4381 staticpro (&Qfullwidth); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105814
diff
changeset
|
4382 Qfullheight = intern_c_string ("fullheight"); |
50357 | 4383 staticpro (&Qfullheight); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105814
diff
changeset
|
4384 Qfullboth = intern_c_string ("fullboth"); |
50357 | 4385 staticpro (&Qfullboth); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105814
diff
changeset
|
4386 Qmaximized = intern_c_string ("maximized"); |
103665
340c701162a6
* emacs.c (USAGE3, standard_args): Add -mm and --maximized.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103603
diff
changeset
|
4387 staticpro (&Qmaximized); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105814
diff
changeset
|
4388 Qx_resource_name = intern_c_string ("x-resource-name"); |
50357 | 4389 staticpro (&Qx_resource_name); |
4390 | |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105814
diff
changeset
|
4391 Qx_frame_parameter = intern_c_string ("x-frame-parameter"); |
50357 | 4392 staticpro (&Qx_frame_parameter); |
4393 | |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105814
diff
changeset
|
4394 Qterminal = intern_c_string ("terminal"); |
83431
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83427
diff
changeset
|
4395 staticpro (&Qterminal); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105814
diff
changeset
|
4396 Qterminal_live_p = intern_c_string ("terminal-live-p"); |
83431
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83427
diff
changeset
|
4397 staticpro (&Qterminal_live_p); |
85651
a8927de00181
(syms_of_frame) <delete-frame-functions>: Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
85614
diff
changeset
|
4398 |
97449
d3a738f747c6
(Qns_parse_geometry): New var.
Chong Yidong <cyd@stupidchicken.com>
parents:
97141
diff
changeset
|
4399 #ifdef HAVE_NS |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105814
diff
changeset
|
4400 Qns_parse_geometry = intern_c_string ("ns-parse-geometry"); |
97449
d3a738f747c6
(Qns_parse_geometry): New var.
Chong Yidong <cyd@stupidchicken.com>
parents:
97141
diff
changeset
|
4401 staticpro (&Qns_parse_geometry); |
d3a738f747c6
(Qns_parse_geometry): New var.
Chong Yidong <cyd@stupidchicken.com>
parents:
97141
diff
changeset
|
4402 #endif |
d3a738f747c6
(Qns_parse_geometry): New var.
Chong Yidong <cyd@stupidchicken.com>
parents:
97141
diff
changeset
|
4403 |
50357 | 4404 { |
4405 int i; | |
4406 | |
4407 for (i = 0; i < sizeof (frame_parms) / sizeof (frame_parms[0]); i++) | |
4408 { | |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105814
diff
changeset
|
4409 Lisp_Object v = intern_c_string (frame_parms[i].name); |
50357 | 4410 if (frame_parms[i].variable) |
4411 { | |
4412 *frame_parms[i].variable = v; | |
4413 staticpro (frame_parms[i].variable); | |
4414 } | |
4415 Fput (v, Qx_frame_parameter, make_number (i)); | |
4416 } | |
4417 } | |
4418 | |
50373
6defa3317421
Fix compilation for --with-x=no.
Kim F. Storm <storm@cua.dk>
parents:
50357
diff
changeset
|
4419 #ifdef HAVE_WINDOW_SYSTEM |
50357 | 4420 DEFVAR_LISP ("x-resource-name", &Vx_resource_name, |
4421 doc: /* The name Emacs uses to look up X resources. | |
4422 `x-get-resource' uses this as the first component of the instance name | |
4423 when requesting resource values. | |
4424 Emacs initially sets `x-resource-name' to the name under which Emacs | |
4425 was invoked, or to the value specified with the `-name' or `-rn' | |
4426 switches, if present. | |
4427 | |
4428 It may be useful to bind this variable locally around a call | |
4429 to `x-get-resource'. See also the variable `x-resource-class'. */); | |
4430 Vx_resource_name = Qnil; | |
4431 | |
4432 DEFVAR_LISP ("x-resource-class", &Vx_resource_class, | |
4433 doc: /* The class Emacs uses to look up X resources. | |
4434 `x-get-resource' uses this as the first component of the instance class | |
4435 when requesting resource values. | |
4436 | |
4437 Emacs initially sets `x-resource-class' to "Emacs". | |
4438 | |
4439 Setting this variable permanently is not a reasonable thing to do, | |
4440 but binding this variable locally around a call to `x-get-resource' | |
4441 is a reasonable practice. See also the variable `x-resource-name'. */); | |
4442 Vx_resource_class = build_string (EMACS_CLASS); | |
95157
b419f60db46c
Seiji Zenitani <zenitani at mac.com>
Glenn Morris <rgm@gnu.org>
parents:
95044
diff
changeset
|
4443 |
b419f60db46c
Seiji Zenitani <zenitani at mac.com>
Glenn Morris <rgm@gnu.org>
parents:
95044
diff
changeset
|
4444 DEFVAR_LISP ("frame-alpha-lower-limit", &Vframe_alpha_lower_limit, |
b419f60db46c
Seiji Zenitani <zenitani at mac.com>
Glenn Morris <rgm@gnu.org>
parents:
95044
diff
changeset
|
4445 doc: /* The lower limit of the frame opacity (alpha transparency). |
b419f60db46c
Seiji Zenitani <zenitani at mac.com>
Glenn Morris <rgm@gnu.org>
parents:
95044
diff
changeset
|
4446 The value should range from 0 (invisible) to 100 (completely opaque). |
b419f60db46c
Seiji Zenitani <zenitani at mac.com>
Glenn Morris <rgm@gnu.org>
parents:
95044
diff
changeset
|
4447 You can also use a floating number between 0.0 and 1.0. |
b419f60db46c
Seiji Zenitani <zenitani at mac.com>
Glenn Morris <rgm@gnu.org>
parents:
95044
diff
changeset
|
4448 The default is 20. */); |
b419f60db46c
Seiji Zenitani <zenitani at mac.com>
Glenn Morris <rgm@gnu.org>
parents:
95044
diff
changeset
|
4449 Vframe_alpha_lower_limit = make_number (20); |
50373
6defa3317421
Fix compilation for --with-x=no.
Kim F. Storm <storm@cua.dk>
parents:
50357
diff
changeset
|
4450 #endif |
50357 | 4451 |
33509
a7d245e080d1
(syms_of_frame_1): Removed; code moved to syms_of_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
33005
diff
changeset
|
4452 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
|
4453 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
|
4454 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
|
4455 (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
|
4456 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
|
4457 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
|
4458 For values specific to the first Emacs frame, see `initial-frame-alist'. |
83496
f271076dab2d
Fix toolbars on X frames when Emacs is started on a tty. (Reported by Richard Lewis.)
Karoly Lorentey <lorentey@elte.hu>
parents:
83486
diff
changeset
|
4459 For window-system specific values, see `window-system-default-frame-alist'. |
40105
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
4460 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
|
4461 `minibuffer-frame-alist'. |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
4462 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
|
4463 have menu bars; `menu-bar-mode' works by altering this element. |
43717 | 4464 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
|
4465 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
|
4466 |
52557
4a93216e6678
(Vdefault_frame_scroll_bars): New variable.
Kim F. Storm <storm@cua.dk>
parents:
52401
diff
changeset
|
4467 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
|
4468 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
|
4469 #ifdef HAVE_WINDOW_SYSTEM |
107395
05f285327bae
Put non-GTK X scroll-bars on left.
Chong Yidong <cyd@stupidchicken.com>
parents:
107377
diff
changeset
|
4470 #if defined(HAVE_NTGUI) || defined(NS_IMPL_COCOA) || (defined(USE_GTK) && defined(USE_TOOLKIT_SCROLL_BARS)) |
05f285327bae
Put non-GTK X scroll-bars on left.
Chong Yidong <cyd@stupidchicken.com>
parents:
107377
diff
changeset
|
4471 /* MS-Windows, Mac OS X, and GTK have scroll bars on the right by |
05f285327bae
Put non-GTK X scroll-bars on left.
Chong Yidong <cyd@stupidchicken.com>
parents:
107377
diff
changeset
|
4472 default. */ |
52557
4a93216e6678
(Vdefault_frame_scroll_bars): New variable.
Kim F. Storm <storm@cua.dk>
parents:
52401
diff
changeset
|
4473 Vdefault_frame_scroll_bars = Qright; |
4a93216e6678
(Vdefault_frame_scroll_bars): New variable.
Kim F. Storm <storm@cua.dk>
parents:
52401
diff
changeset
|
4474 #else |
4a93216e6678
(Vdefault_frame_scroll_bars): New variable.
Kim F. Storm <storm@cua.dk>
parents:
52401
diff
changeset
|
4475 Vdefault_frame_scroll_bars = Qleft; |
4a93216e6678
(Vdefault_frame_scroll_bars): New variable.
Kim F. Storm <storm@cua.dk>
parents:
52401
diff
changeset
|
4476 #endif |
4a93216e6678
(Vdefault_frame_scroll_bars): New variable.
Kim F. Storm <storm@cua.dk>
parents:
52401
diff
changeset
|
4477 #else |
4a93216e6678
(Vdefault_frame_scroll_bars): New variable.
Kim F. Storm <storm@cua.dk>
parents:
52401
diff
changeset
|
4478 Vdefault_frame_scroll_bars = Qnil; |
4a93216e6678
(Vdefault_frame_scroll_bars): New variable.
Kim F. Storm <storm@cua.dk>
parents:
52401
diff
changeset
|
4479 #endif |
4a93216e6678
(Vdefault_frame_scroll_bars): New variable.
Kim F. Storm <storm@cua.dk>
parents:
52401
diff
changeset
|
4480 |
765 | 4481 DEFVAR_LISP ("terminal-frame", &Vterminal_frame, |
82990
2ecd1f669db9
Fixed X support, preliminary support for X-tty combo sessions.
Karoly Lorentey <lorentey@elte.hu>
parents:
82989
diff
changeset
|
4482 doc: /* The initial frame-object, which represents Emacs's stdout. */); |
286 | 4483 |
27795
83292274bbd4
(Vmouse_position_function): New variable.
Dave Love <fx@gnu.org>
parents:
27725
diff
changeset
|
4484 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
|
4485 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
|
4486 `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
|
4487 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
|
4488 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
|
4489 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
|
4490 Vmouse_position_function = Qnil; |
83292274bbd4
(Vmouse_position_function): New variable.
Dave Love <fx@gnu.org>
parents:
27725
diff
changeset
|
4491 |
43366
512ab477b395
(Vmouse_highlight): New variable.
Kim F. Storm <storm@cua.dk>
parents:
42743
diff
changeset
|
4492 DEFVAR_LISP ("mouse-highlight", &Vmouse_highlight, |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47731
diff
changeset
|
4493 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
|
4494 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
|
4495 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
|
4496 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
|
4497 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
|
4498 Vmouse_highlight = Qt; |
43366
512ab477b395
(Vmouse_highlight): New variable.
Kim F. Storm <storm@cua.dk>
parents:
42743
diff
changeset
|
4499 |
103704
6a4e411bd83b
* xterm.h (struct x_display_info): Add invisible_cursor.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103674
diff
changeset
|
4500 DEFVAR_LISP ("make-pointer-invisible", &Vmake_pointer_invisible, |
6a4e411bd83b
* xterm.h (struct x_display_info): Add invisible_cursor.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103674
diff
changeset
|
4501 doc: /* If non-nil, make pointer invisible while typing. |
6a4e411bd83b
* xterm.h (struct x_display_info): Add invisible_cursor.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103674
diff
changeset
|
4502 The pointer becomes visible again when the mouse is moved. */); |
6a4e411bd83b
* xterm.h (struct x_display_info): Add invisible_cursor.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103674
diff
changeset
|
4503 Vmake_pointer_invisible = Qt; |
6a4e411bd83b
* xterm.h (struct x_display_info): Add invisible_cursor.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103674
diff
changeset
|
4504 |
47731
755c4233cfba
* frame.c (Vdelete_frame_functions): New variable.
John Paul Wallington <jpw@pobox.com>
parents:
47036
diff
changeset
|
4505 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
|
4506 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
|
4507 The functions are run with one arg, the frame to be deleted. |
83335
60208d3a0bb1
Handle and document that `delete-frame' may call functions in `delete-frame-functions' twice.
Karoly Lorentey <lorentey@elte.hu>
parents:
83332
diff
changeset
|
4508 See `delete-frame'. |
60208d3a0bb1
Handle and document that `delete-frame' may call functions in `delete-frame-functions' twice.
Karoly Lorentey <lorentey@elte.hu>
parents:
83332
diff
changeset
|
4509 |
93369
ed10c3092847
* keyboard.c (pending_funcalls): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93203
diff
changeset
|
4510 Note that functions in this list may be called just before the frame is |
ed10c3092847
* keyboard.c (pending_funcalls): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93203
diff
changeset
|
4511 actually deleted, or some time later (or even both when an earlier function |
ed10c3092847
* keyboard.c (pending_funcalls): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93203
diff
changeset
|
4512 in `delete-frame-functions' (indirectly) calls `delete-frame' |
ed10c3092847
* keyboard.c (pending_funcalls): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93203
diff
changeset
|
4513 recursively). */); |
47731
755c4233cfba
* frame.c (Vdelete_frame_functions): New variable.
John Paul Wallington <jpw@pobox.com>
parents:
47036
diff
changeset
|
4514 Vdelete_frame_functions = Qnil; |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105814
diff
changeset
|
4515 Qdelete_frame_functions = intern_c_string ("delete-frame-functions"); |
93369
ed10c3092847
* keyboard.c (pending_funcalls): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93203
diff
changeset
|
4516 staticpro (&Qdelete_frame_functions); |
47731
755c4233cfba
* frame.c (Vdelete_frame_functions): New variable.
John Paul Wallington <jpw@pobox.com>
parents:
47036
diff
changeset
|
4517 |
109058
2f0720afc474
Change default-frame-alist and menu/tool-bar-mode interaction (Bug#2249).
Chong Yidong <cyd@stupidchicken.com>
parents:
109050
diff
changeset
|
4518 DEFVAR_LISP ("menu-bar-mode", &Vmenu_bar_mode, |
2f0720afc474
Change default-frame-alist and menu/tool-bar-mode interaction (Bug#2249).
Chong Yidong <cyd@stupidchicken.com>
parents:
109050
diff
changeset
|
4519 doc: /* Non-nil if Menu-Bar mode is enabled. */); |
2f0720afc474
Change default-frame-alist and menu/tool-bar-mode interaction (Bug#2249).
Chong Yidong <cyd@stupidchicken.com>
parents:
109050
diff
changeset
|
4520 Vmenu_bar_mode = Qt; |
2f0720afc474
Change default-frame-alist and menu/tool-bar-mode interaction (Bug#2249).
Chong Yidong <cyd@stupidchicken.com>
parents:
109050
diff
changeset
|
4521 |
2f0720afc474
Change default-frame-alist and menu/tool-bar-mode interaction (Bug#2249).
Chong Yidong <cyd@stupidchicken.com>
parents:
109050
diff
changeset
|
4522 DEFVAR_LISP ("tool-bar-mode", &Vtool_bar_mode, |
2f0720afc474
Change default-frame-alist and menu/tool-bar-mode interaction (Bug#2249).
Chong Yidong <cyd@stupidchicken.com>
parents:
109050
diff
changeset
|
4523 doc: /* Non-nil if Tool-Bar mode is enabled. */); |
2f0720afc474
Change default-frame-alist and menu/tool-bar-mode interaction (Bug#2249).
Chong Yidong <cyd@stupidchicken.com>
parents:
109050
diff
changeset
|
4524 Vtool_bar_mode = Qt; |
2f0720afc474
Change default-frame-alist and menu/tool-bar-mode interaction (Bug#2249).
Chong Yidong <cyd@stupidchicken.com>
parents:
109050
diff
changeset
|
4525 |
11779
6234b3610a6f
Vdefault_minibuffer_frame is now part of KBOARD instead
Karl Heuer <kwzh@gnu.org>
parents:
11775
diff
changeset
|
4526 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
|
4527 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
|
4528 |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
4529 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
|
4530 appropriate surrogate. |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
4531 |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
4532 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
|
4533 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
|
4534 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
|
4535 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
|
4536 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
|
4537 displayed. |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
4538 |
bb56bafcdcc7
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39973
diff
changeset
|
4539 This variable is local to the current terminal and cannot be buffer-local. */); |
286 | 4540 |
78984
a26a566a5577
(focus_follows_mouse): Moved here from frame.el to allow
Martin Rudalics <rudalics@gmx.at>
parents:
78260
diff
changeset
|
4541 DEFVAR_BOOL ("focus-follows-mouse", &focus_follows_mouse, |
a26a566a5577
(focus_follows_mouse): Moved here from frame.el to allow
Martin Rudalics <rudalics@gmx.at>
parents:
78260
diff
changeset
|
4542 doc: /* Non-nil if window system changes focus when you move the mouse. |
a26a566a5577
(focus_follows_mouse): Moved here from frame.el to allow
Martin Rudalics <rudalics@gmx.at>
parents:
78260
diff
changeset
|
4543 You should set this variable to tell Emacs how your window manager |
a26a566a5577
(focus_follows_mouse): Moved here from frame.el to allow
Martin Rudalics <rudalics@gmx.at>
parents:
78260
diff
changeset
|
4544 handles focus, since there is no way in general for Emacs to find out |
106212
eada49222b30
(focus-follows-mouse): Mention mouse-autoselect-window.
Glenn Morris <rgm@gnu.org>
parents:
106201
diff
changeset
|
4545 automatically. See also `mouse-autoselect-window'. */); |
78984
a26a566a5577
(focus_follows_mouse): Moved here from frame.el to allow
Martin Rudalics <rudalics@gmx.at>
parents:
78260
diff
changeset
|
4546 #ifdef HAVE_WINDOW_SYSTEM |
97043
9592c50233ab
Remove support for Mac Carbon.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96831
diff
changeset
|
4547 #if defined(HAVE_NTGUI) || defined(HAVE_NS) |
78984
a26a566a5577
(focus_follows_mouse): Moved here from frame.el to allow
Martin Rudalics <rudalics@gmx.at>
parents:
78260
diff
changeset
|
4548 focus_follows_mouse = 0; |
a26a566a5577
(focus_follows_mouse): Moved here from frame.el to allow
Martin Rudalics <rudalics@gmx.at>
parents:
78260
diff
changeset
|
4549 #else |
a26a566a5577
(focus_follows_mouse): Moved here from frame.el to allow
Martin Rudalics <rudalics@gmx.at>
parents:
78260
diff
changeset
|
4550 focus_follows_mouse = 1; |
a26a566a5577
(focus_follows_mouse): Moved here from frame.el to allow
Martin Rudalics <rudalics@gmx.at>
parents:
78260
diff
changeset
|
4551 #endif |
a26a566a5577
(focus_follows_mouse): Moved here from frame.el to allow
Martin Rudalics <rudalics@gmx.at>
parents:
78260
diff
changeset
|
4552 #else |
a26a566a5577
(focus_follows_mouse): Moved here from frame.el to allow
Martin Rudalics <rudalics@gmx.at>
parents:
78260
diff
changeset
|
4553 focus_follows_mouse = 0; |
a26a566a5577
(focus_follows_mouse): Moved here from frame.el to allow
Martin Rudalics <rudalics@gmx.at>
parents:
78260
diff
changeset
|
4554 #endif |
85651
a8927de00181
(syms_of_frame) <delete-frame-functions>: Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
85614
diff
changeset
|
4555 |
33509
a7d245e080d1
(syms_of_frame_1): Removed; code moved to syms_of_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
33005
diff
changeset
|
4556 staticpro (&Vframe_list); |
a7d245e080d1
(syms_of_frame_1): Removed; code moved to syms_of_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
33005
diff
changeset
|
4557 |
11169
d0550c056e5b
[MULTI_FRAME] (Factive_minibuffer_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11126
diff
changeset
|
4558 defsubr (&Sactive_minibuffer_window); |
765 | 4559 defsubr (&Sframep); |
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1809
diff
changeset
|
4560 defsubr (&Sframe_live_p); |
83004
7900111db01c
Converted display hooks to be display-local. Plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83003
diff
changeset
|
4561 defsubr (&Swindow_system); |
10768
938451cf1b10
(Fmake_terminal_frame): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10676
diff
changeset
|
4562 defsubr (&Smake_terminal_frame); |
2298
872a3a2c3fed
* frame.c (Fhandle_switch_frame): Renamed from Fselect_frame.
Jim Blandy <jimb@redhat.com>
parents:
2282
diff
changeset
|
4563 defsubr (&Shandle_switch_frame); |
765 | 4564 defsubr (&Sselect_frame); |
4565 defsubr (&Sselected_frame); | |
4566 defsubr (&Swindow_frame); | |
4567 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
|
4568 defsubr (&Sframe_first_window); |
765 | 4569 defsubr (&Sframe_selected_window); |
7055
5e4906d964b8
(Fset_frame_selected_window): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7025
diff
changeset
|
4570 defsubr (&Sset_frame_selected_window); |
765 | 4571 defsubr (&Sframe_list); |
4572 defsubr (&Snext_frame); | |
4424
027d3affb2f8
(Fprevious_frame): New function, for parity with Fnext_frame.
Roland McGrath <roland@gnu.org>
parents:
4412
diff
changeset
|
4573 defsubr (&Sprevious_frame); |
765 | 4574 defsubr (&Sdelete_frame); |
454 | 4575 defsubr (&Smouse_position); |
7025
24e759919770
(Fmouse_pixel_position, Fset_mouse_pixel_position): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
6986
diff
changeset
|
4576 defsubr (&Smouse_pixel_position); |
286 | 4577 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
|
4578 defsubr (&Sset_mouse_pixel_position); |
286 | 4579 #if 0 |
765 | 4580 defsubr (&Sframe_configuration); |
4581 defsubr (&Srestore_frame_configuration); | |
286 | 4582 #endif |
765 | 4583 defsubr (&Smake_frame_visible); |
4584 defsubr (&Smake_frame_invisible); | |
4585 defsubr (&Siconify_frame); | |
4586 defsubr (&Sframe_visible_p); | |
4587 defsubr (&Svisible_frame_list); | |
2282
f727944c11aa
* frame.c (Fraise_frame, Flower_frame): Renamed from
Jim Blandy <jimb@redhat.com>
parents:
2207
diff
changeset
|
4588 defsubr (&Sraise_frame); |
f727944c11aa
* frame.c (Fraise_frame, Flower_frame): Renamed from
Jim Blandy <jimb@redhat.com>
parents:
2207
diff
changeset
|
4589 defsubr (&Slower_frame); |
765 | 4590 defsubr (&Sredirect_frame_focus); |
4591 defsubr (&Sframe_focus); | |
4592 defsubr (&Sframe_parameters); | |
31399
db831ffcd565
(Qdisplay_type): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
31102
diff
changeset
|
4593 defsubr (&Sframe_parameter); |
765 | 4594 defsubr (&Smodify_frame_parameters); |
2068
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
4595 defsubr (&Sframe_char_height); |
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
4596 defsubr (&Sframe_char_width); |
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
4597 defsubr (&Sframe_pixel_height); |
6357ea40643c
(Fframe_char_height, Fframe_char_width):
Richard M. Stallman <rms@gnu.org>
parents:
1989
diff
changeset
|
4598 defsubr (&Sframe_pixel_width); |
765 | 4599 defsubr (&Sset_frame_height); |
4600 defsubr (&Sset_frame_width); | |
4601 defsubr (&Sset_frame_size); | |
4602 defsubr (&Sset_frame_position); | |
50357 | 4603 |
4604 #ifdef HAVE_WINDOW_SYSTEM | |
4605 defsubr (&Sx_get_resource); | |
4606 defsubr (&Sx_parse_geometry); | |
4607 #endif | |
4608 | |
286 | 4609 } |
52401 | 4610 |
4611 /* arch-tag: 7dbf2c69-9aad-45f8-8296-db893d6dd039 | |
4612 (do not change this comment) */ |