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