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