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