annotate src/xsmfns.c @ 109731:01af31a38d9e

Use version-list-* functions in package.el. * emacs-lisp/package-x.el (package-upload-buffer-internal): Use version-to-list. (package-upload-buffer-internal): Use version-list-<=. * emacs-lisp/package.el (package-version-split) (package--version-first-nonzero, package-version-compare): Functions removed. (package-directory-list, package-load-all-descriptors) (package--built-in, package-activate, define-package) (package-installed-p, package-compute-transaction) (package-read-all-archive-contents) (package--add-to-archive-contents, package-buffer-info) (package-tar-file-info, package-list-packages-internal): Use version-to-list and version-list-*.
author Chong Yidong <cyd@stupidchicken.com>
date Mon, 09 Aug 2010 14:05:56 -0400
parents 228a5fa4eda0
children e2f8226efb99
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
1 /* Session management module for systems which understand the X Session
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
2 management protocol.
106815
1d1d5d9bd884 Add 2010 to copyright years.
Glenn Morris <rgm@gnu.org>
parents: 105669
diff changeset
3 Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
79759
fc2bcd2a8aad Add 2008 to copyright years.
Glenn Morris <rgm@gnu.org>
parents: 78260
diff changeset
4 Free Software Foundation, Inc.
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
5
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
6 This file is part of GNU Emacs.
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
7
94963
8971ddf55736 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 91702
diff changeset
8 GNU Emacs is free software: you can redistribute it and/or modify
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
9 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: 91702
diff changeset
10 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: 91702
diff changeset
11 (at your option) any later version.
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
12
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
13 GNU Emacs is distributed in the hope that it will be useful,
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
14 but WITHOUT ANY WARRANTY; without even the implied warranty of
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
15 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
16 GNU General Public License for more details.
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
17
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
18 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: 91702
diff changeset
19 along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
20
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
21 #include <config.h>
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
22
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
23 #ifdef HAVE_X_SM
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
24
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
25 #include <X11/SM/SMlib.h>
52298
1a4bd2bec861 Create and initialize a client leader window so session management
Jan Djärv <jan.h.d@swipnet.se>
parents: 50016
diff changeset
26 #include <X11/Xlib.h>
1a4bd2bec861 Create and initialize a client leader window so session management
Jan Djärv <jan.h.d@swipnet.se>
parents: 50016
diff changeset
27 #include <X11/Xutil.h>
1a4bd2bec861 Create and initialize a client leader window so session management
Jan Djärv <jan.h.d@swipnet.se>
parents: 50016
diff changeset
28
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
29 #ifdef HAVE_UNISTD_H
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
30 #include <unistd.h>
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
31 #endif
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
32
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
33 #include <sys/param.h>
43848
1690ab476469 Include stdio.h because termhooks.h needs it.
Gerd Moellmann <gerd@gnu.org>
parents: 43810
diff changeset
34 #include <stdio.h>
105669
68dd71358159 * alloc.c: Do not define struct catchtag.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 100951
diff changeset
35 #include <setjmp.h>
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
36
65764
375ab086d366 * image.c (slurp_file, xbm_read_bitmap_data): Cast to the correct
Dan Nicolaescu <dann@ics.uci.edu>
parents: 65421
diff changeset
37 #include "lisp.h"
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
38 #include "systime.h"
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
39 #include "sysselect.h"
83004
7900111db01c Converted display hooks to be display-local. Plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents: 52401
diff changeset
40 #include "frame.h"
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
41 #include "termhooks.h"
43848
1690ab476469 Include stdio.h because termhooks.h needs it.
Gerd Moellmann <gerd@gnu.org>
parents: 43810
diff changeset
42 #include "termopts.h"
52298
1a4bd2bec861 Create and initialize a client leader window so session management
Jan Djärv <jan.h.d@swipnet.se>
parents: 50016
diff changeset
43 #include "xterm.h"
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
44
109141
fa173b9bd9ce Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents: 109139
diff changeset
45 /* Avoid "differ in sign" warnings */
fa173b9bd9ce Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents: 109139
diff changeset
46 #define SSDATA(x) ((char *) SDATA (x))
fa173b9bd9ce Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents: 109139
diff changeset
47
45803
9484de301252 Rename enum event_kind items.
Pavel Janík <Pavel@Janik.cz>
parents: 43919
diff changeset
48 /* This is the event used when SAVE_SESSION_EVENT occurs. */
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
49
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
50 static struct input_event emacs_event;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
51
45803
9484de301252 Rename enum event_kind items.
Pavel Janík <Pavel@Janik.cz>
parents: 43919
diff changeset
52 /* The descriptor that we use to check for data from the session manager. */
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
53
107121
c7c70f9fa3d7 Fix for bug#5512, don't rely on SIGIO alone.
Jan D. <jan.h.d@swipnet.se>
parents: 106815
diff changeset
54 static int ice_fd;
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
55
45803
9484de301252 Rename enum event_kind items.
Pavel Janík <Pavel@Janik.cz>
parents: 43919
diff changeset
56 /* A flag that says if we are in shutdown interactions or not. */
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
57
107121
c7c70f9fa3d7 Fix for bug#5512, don't rely on SIGIO alone.
Jan D. <jan.h.d@swipnet.se>
parents: 106815
diff changeset
58 static int doing_interact;
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
59
57704
4ff1d695430a * xsmfns.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents: 56135
diff changeset
60 /* The session manager object for the session manager connection. */
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
61
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
62 static SmcConn smc_conn;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
63
57704
4ff1d695430a * xsmfns.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents: 56135
diff changeset
64 /* The client session id for this session. */
4ff1d695430a * xsmfns.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents: 56135
diff changeset
65
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
66 static char *client_id;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
67
57704
4ff1d695430a * xsmfns.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents: 56135
diff changeset
68 /* The full path name to the Emacs program. */
4ff1d695430a * xsmfns.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents: 56135
diff changeset
69
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
70 static char *emacs_program;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
71
57704
4ff1d695430a * xsmfns.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents: 56135
diff changeset
72 /* The client session id for this session as a lisp object. */
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
73
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
74 Lisp_Object Vx_session_id;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
75
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
76 /* The id we had the previous session. This is only available if we
57704
4ff1d695430a * xsmfns.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents: 56135
diff changeset
77 have been started by the session manager with SMID_OPT. */
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
78
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
79 Lisp_Object Vx_session_previous_id;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
80
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
81 /* The option we tell the session manager to start Emacs with when
57704
4ff1d695430a * xsmfns.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents: 56135
diff changeset
82 restarting Emacs. The client_id is appended. */
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
83
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
84 #define SMID_OPT "--smid="
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
85
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
86
50016
03e0aadb68a0 xsmfns.c (smc_save_yourself_CB): Add --no-splash to options
Jan Djärv <jan.h.d@swipnet.se>
parents: 49421
diff changeset
87 /* The option to start Emacs without the splash screen when
57704
4ff1d695430a * xsmfns.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents: 56135
diff changeset
88 restarting Emacs. */
50016
03e0aadb68a0 xsmfns.c (smc_save_yourself_CB): Add --no-splash to options
Jan Djärv <jan.h.d@swipnet.se>
parents: 49421
diff changeset
89
03e0aadb68a0 xsmfns.c (smc_save_yourself_CB): Add --no-splash to options
Jan Djärv <jan.h.d@swipnet.se>
parents: 49421
diff changeset
90 #define NOSPLASH_OPT "--no-splash"
03e0aadb68a0 xsmfns.c (smc_save_yourself_CB): Add --no-splash to options
Jan Djärv <jan.h.d@swipnet.se>
parents: 49421
diff changeset
91
108213
e6266e624471 Run kill-emacs when exiting for display closed or SIGTERM/HUP.
Jan D. <jan.h.d@swipnet.se>
parents: 107121
diff changeset
92 /* The option to make Emacs start in the given directory. */
e6266e624471 Run kill-emacs when exiting for display closed or SIGTERM/HUP.
Jan D. <jan.h.d@swipnet.se>
parents: 107121
diff changeset
93
e6266e624471 Run kill-emacs when exiting for display closed or SIGTERM/HUP.
Jan D. <jan.h.d@swipnet.se>
parents: 107121
diff changeset
94 #define CHDIR_OPT "--chdir="
e6266e624471 Run kill-emacs when exiting for display closed or SIGTERM/HUP.
Jan D. <jan.h.d@swipnet.se>
parents: 107121
diff changeset
95
107121
c7c70f9fa3d7 Fix for bug#5512, don't rely on SIGIO alone.
Jan D. <jan.h.d@swipnet.se>
parents: 106815
diff changeset
96 static void
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 108237
diff changeset
97 ice_connection_closed (void)
107121
c7c70f9fa3d7 Fix for bug#5512, don't rely on SIGIO alone.
Jan D. <jan.h.d@swipnet.se>
parents: 106815
diff changeset
98 {
c7c70f9fa3d7 Fix for bug#5512, don't rely on SIGIO alone.
Jan D. <jan.h.d@swipnet.se>
parents: 106815
diff changeset
99 if (ice_fd >= 0)
c7c70f9fa3d7 Fix for bug#5512, don't rely on SIGIO alone.
Jan D. <jan.h.d@swipnet.se>
parents: 106815
diff changeset
100 delete_keyboard_wait_descriptor (ice_fd);
c7c70f9fa3d7 Fix for bug#5512, don't rely on SIGIO alone.
Jan D. <jan.h.d@swipnet.se>
parents: 106815
diff changeset
101 ice_fd = -1;
c7c70f9fa3d7 Fix for bug#5512, don't rely on SIGIO alone.
Jan D. <jan.h.d@swipnet.se>
parents: 106815
diff changeset
102 }
c7c70f9fa3d7 Fix for bug#5512, don't rely on SIGIO alone.
Jan D. <jan.h.d@swipnet.se>
parents: 106815
diff changeset
103
50016
03e0aadb68a0 xsmfns.c (smc_save_yourself_CB): Add --no-splash to options
Jan Djärv <jan.h.d@swipnet.se>
parents: 49421
diff changeset
104
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
105 /* Handle any messages from the session manager. If no connection is
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
106 open to a session manager, just return 0.
54172
6851117e8d89 (x_session_check_input): Remove numchars arg.
Kim F. Storm <storm@cua.dk>
parents: 52401
diff changeset
107 Otherwise returns 1 if SAVE_SESSION_EVENT is stored in buffer BUFP. */
57704
4ff1d695430a * xsmfns.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents: 56135
diff changeset
108
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
109 int
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 108237
diff changeset
110 x_session_check_input (struct input_event *bufp)
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
111 {
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
112 SELECT_TYPE read_fds;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
113 EMACS_TIME tmout;
107121
c7c70f9fa3d7 Fix for bug#5512, don't rely on SIGIO alone.
Jan D. <jan.h.d@swipnet.se>
parents: 106815
diff changeset
114 int ret;
47942
080b4586492b Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents: 46370
diff changeset
115
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
116 if (ice_fd == -1) return 0;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
117 FD_ZERO (&read_fds);
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
118 FD_SET (ice_fd, &read_fds);
47942
080b4586492b Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents: 46370
diff changeset
119
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
120 tmout.tv_sec = 0;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
121 tmout.tv_usec = 0;
47942
080b4586492b Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents: 46370
diff changeset
122
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
123 /* Reset this so wo can check kind after callbacks have been called by
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
124 IceProcessMessages. The smc_interact_CB sets the kind to
45803
9484de301252 Rename enum event_kind items.
Pavel Janík <Pavel@Janik.cz>
parents: 43919
diff changeset
125 SAVE_SESSION_EVENT, but we don't know beforehand if that callback
57704
4ff1d695430a * xsmfns.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents: 56135
diff changeset
126 will be called. */
45803
9484de301252 Rename enum event_kind items.
Pavel Janík <Pavel@Janik.cz>
parents: 43919
diff changeset
127 emacs_event.kind = NO_EVENT;
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
128
107121
c7c70f9fa3d7 Fix for bug#5512, don't rely on SIGIO alone.
Jan D. <jan.h.d@swipnet.se>
parents: 106815
diff changeset
129 ret = select (ice_fd+1, &read_fds,
c7c70f9fa3d7 Fix for bug#5512, don't rely on SIGIO alone.
Jan D. <jan.h.d@swipnet.se>
parents: 106815
diff changeset
130 (SELECT_TYPE *)0, (SELECT_TYPE *)0, &tmout);
c7c70f9fa3d7 Fix for bug#5512, don't rely on SIGIO alone.
Jan D. <jan.h.d@swipnet.se>
parents: 106815
diff changeset
131
c7c70f9fa3d7 Fix for bug#5512, don't rely on SIGIO alone.
Jan D. <jan.h.d@swipnet.se>
parents: 106815
diff changeset
132 if (ret < 0)
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
133 {
107121
c7c70f9fa3d7 Fix for bug#5512, don't rely on SIGIO alone.
Jan D. <jan.h.d@swipnet.se>
parents: 106815
diff changeset
134 ice_connection_closed ();
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
135 }
107121
c7c70f9fa3d7 Fix for bug#5512, don't rely on SIGIO alone.
Jan D. <jan.h.d@swipnet.se>
parents: 106815
diff changeset
136 else if (ret > 0 && FD_ISSET (ice_fd, &read_fds))
c7c70f9fa3d7 Fix for bug#5512, don't rely on SIGIO alone.
Jan D. <jan.h.d@swipnet.se>
parents: 106815
diff changeset
137 {
c7c70f9fa3d7 Fix for bug#5512, don't rely on SIGIO alone.
Jan D. <jan.h.d@swipnet.se>
parents: 106815
diff changeset
138 ret = IceProcessMessages (SmcGetIceConnection (smc_conn),
c7c70f9fa3d7 Fix for bug#5512, don't rely on SIGIO alone.
Jan D. <jan.h.d@swipnet.se>
parents: 106815
diff changeset
139 (IceReplyWaitInfo *)0, (Bool *)0);
c7c70f9fa3d7 Fix for bug#5512, don't rely on SIGIO alone.
Jan D. <jan.h.d@swipnet.se>
parents: 106815
diff changeset
140 if (ret != IceProcessMessagesSuccess)
c7c70f9fa3d7 Fix for bug#5512, don't rely on SIGIO alone.
Jan D. <jan.h.d@swipnet.se>
parents: 106815
diff changeset
141 {
c7c70f9fa3d7 Fix for bug#5512, don't rely on SIGIO alone.
Jan D. <jan.h.d@swipnet.se>
parents: 106815
diff changeset
142 /* Either IO error or Connection closed. */
c7c70f9fa3d7 Fix for bug#5512, don't rely on SIGIO alone.
Jan D. <jan.h.d@swipnet.se>
parents: 106815
diff changeset
143 if (ret == IceProcessMessagesIOError)
c7c70f9fa3d7 Fix for bug#5512, don't rely on SIGIO alone.
Jan D. <jan.h.d@swipnet.se>
parents: 106815
diff changeset
144 IceCloseConnection (SmcGetIceConnection (smc_conn));
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
145
107121
c7c70f9fa3d7 Fix for bug#5512, don't rely on SIGIO alone.
Jan D. <jan.h.d@swipnet.se>
parents: 106815
diff changeset
146 ice_connection_closed ();
c7c70f9fa3d7 Fix for bug#5512, don't rely on SIGIO alone.
Jan D. <jan.h.d@swipnet.se>
parents: 106815
diff changeset
147 }
c7c70f9fa3d7 Fix for bug#5512, don't rely on SIGIO alone.
Jan D. <jan.h.d@swipnet.se>
parents: 106815
diff changeset
148 }
47942
080b4586492b Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents: 46370
diff changeset
149
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
150 /* Check if smc_interact_CB was called and we shall generate a
57704
4ff1d695430a * xsmfns.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents: 56135
diff changeset
151 SAVE_SESSION_EVENT. */
107121
c7c70f9fa3d7 Fix for bug#5512, don't rely on SIGIO alone.
Jan D. <jan.h.d@swipnet.se>
parents: 106815
diff changeset
152 if (emacs_event.kind != NO_EVENT)
109165
750db9f3e6d8 Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents: 109141
diff changeset
153 memcpy (bufp, &emacs_event, sizeof (struct input_event));
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
154
107121
c7c70f9fa3d7 Fix for bug#5512, don't rely on SIGIO alone.
Jan D. <jan.h.d@swipnet.se>
parents: 106815
diff changeset
155 return emacs_event.kind != NO_EVENT ? 1 : 0;
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
156 }
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
157
57704
4ff1d695430a * xsmfns.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents: 56135
diff changeset
158 /* Return non-zero if we have a connection to a session manager. */
4ff1d695430a * xsmfns.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents: 56135
diff changeset
159
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
160 int
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 108237
diff changeset
161 x_session_have_connection (void)
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
162 {
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
163 return ice_fd != -1;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
164 }
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
165
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
166 /* This is called when the session manager says it is OK to interact with the
45803
9484de301252 Rename enum event_kind items.
Pavel Janík <Pavel@Janik.cz>
parents: 43919
diff changeset
167 user. Here we set the kind to SAVE_SESSION_EVENT so an event is generated.
57704
4ff1d695430a * xsmfns.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents: 56135
diff changeset
168 Then lisp code can interact with the user. */
4ff1d695430a * xsmfns.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents: 56135
diff changeset
169
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
170 static void
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 108237
diff changeset
171 smc_interact_CB (SmcConn smcConn, SmPointer clientData)
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
172 {
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
173 doing_interact = True;
45803
9484de301252 Rename enum event_kind items.
Pavel Janík <Pavel@Janik.cz>
parents: 43919
diff changeset
174 emacs_event.kind = SAVE_SESSION_EVENT;
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
175 }
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
176
49421
381ccbf15cd9 *** empty log message ***
Juanma Barranquero <lekktu@gmail.com>
parents: 47942
diff changeset
177 /* This is called when the session manager tells us to save ourselves.
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
178 We set the required properties so the session manager can restart us,
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
179 plus the current working directory property (not mandatory) so we
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
180 are started in the correct directory.
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
181
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
182 If this is a shutdown and we can request to interact with the user,
57704
4ff1d695430a * xsmfns.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents: 56135
diff changeset
183 we do so, because we don't know what the lisp code might do. */
4ff1d695430a * xsmfns.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents: 56135
diff changeset
184
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
185 static void
109139
c25c24812fb1 Convert declarations or definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109126
diff changeset
186 smc_save_yourself_CB (SmcConn smcConn,
c25c24812fb1 Convert declarations or definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109126
diff changeset
187 SmPointer clientData,
c25c24812fb1 Convert declarations or definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109126
diff changeset
188 int saveType,
c25c24812fb1 Convert declarations or definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109126
diff changeset
189 Bool shutdown,
c25c24812fb1 Convert declarations or definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109126
diff changeset
190 int interactStyle,
c25c24812fb1 Convert declarations or definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109126
diff changeset
191 Bool fast)
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
192 {
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
193 #define NR_PROPS 5
47942
080b4586492b Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents: 46370
diff changeset
194
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
195 SmProp *props[NR_PROPS];
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
196 SmProp prop_ptr[NR_PROPS];
47942
080b4586492b Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents: 46370
diff changeset
197
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
198 SmPropValue values[20];
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
199 int val_idx = 0;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
200 int props_idx = 0;
47942
080b4586492b Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents: 46370
diff changeset
201
65412
3a9693f993b2 (smc_save_yourself_CB): Use get_current_dir_name.
Eli Zaretskii <eliz@gnu.org>
parents: 64770
diff changeset
202 char *cwd = NULL;
108213
e6266e624471 Run kill-emacs when exiting for display closed or SIGTERM/HUP.
Jan D. <jan.h.d@swipnet.se>
parents: 107121
diff changeset
203 char *smid_opt, *chdir_opt = NULL;
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
204
57704
4ff1d695430a * xsmfns.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents: 56135
diff changeset
205 /* How to start a new instance of Emacs. */
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
206 props[props_idx] = &prop_ptr[props_idx];
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
207 props[props_idx]->name = SmCloneCommand;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
208 props[props_idx]->type = SmLISTofARRAY8;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
209 props[props_idx]->num_vals = 1;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
210 props[props_idx]->vals = &values[val_idx++];
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
211 props[props_idx]->vals[0].length = strlen (emacs_program);
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
212 props[props_idx]->vals[0].value = emacs_program;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
213 ++props_idx;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
214
57704
4ff1d695430a * xsmfns.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents: 56135
diff changeset
215 /* The name of the program. */
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
216 props[props_idx] = &prop_ptr[props_idx];
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
217 props[props_idx]->name = SmProgram;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
218 props[props_idx]->type = SmARRAY8;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
219 props[props_idx]->num_vals = 1;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
220 props[props_idx]->vals = &values[val_idx++];
109141
fa173b9bd9ce Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents: 109139
diff changeset
221 props[props_idx]->vals[0].length = strlen (SSDATA (Vinvocation_name));
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 45803
diff changeset
222 props[props_idx]->vals[0].value = SDATA (Vinvocation_name);
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
223 ++props_idx;
47942
080b4586492b Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents: 46370
diff changeset
224
108213
e6266e624471 Run kill-emacs when exiting for display closed or SIGTERM/HUP.
Jan D. <jan.h.d@swipnet.se>
parents: 107121
diff changeset
225 /* How to restart Emacs. */
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
226 props[props_idx] = &prop_ptr[props_idx];
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
227 props[props_idx]->name = SmRestartCommand;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
228 props[props_idx]->type = SmLISTofARRAY8;
108213
e6266e624471 Run kill-emacs when exiting for display closed or SIGTERM/HUP.
Jan D. <jan.h.d@swipnet.se>
parents: 107121
diff changeset
229 /* /path/to/emacs, --smid=xxx --no-splash --chdir=dir */
e6266e624471 Run kill-emacs when exiting for display closed or SIGTERM/HUP.
Jan D. <jan.h.d@swipnet.se>
parents: 107121
diff changeset
230 props[props_idx]->num_vals = 4;
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
231 props[props_idx]->vals = &values[val_idx];
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
232 props[props_idx]->vals[0].length = strlen (emacs_program);
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
233 props[props_idx]->vals[0].value = emacs_program;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
234
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
235 smid_opt = xmalloc (strlen (SMID_OPT) + strlen (client_id) + 1);
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
236 strcpy (smid_opt, SMID_OPT);
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
237 strcat (smid_opt, client_id);
47942
080b4586492b Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents: 46370
diff changeset
238
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
239 props[props_idx]->vals[1].length = strlen (smid_opt);
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
240 props[props_idx]->vals[1].value = smid_opt;
50016
03e0aadb68a0 xsmfns.c (smc_save_yourself_CB): Add --no-splash to options
Jan Djärv <jan.h.d@swipnet.se>
parents: 49421
diff changeset
241
03e0aadb68a0 xsmfns.c (smc_save_yourself_CB): Add --no-splash to options
Jan Djärv <jan.h.d@swipnet.se>
parents: 49421
diff changeset
242 props[props_idx]->vals[2].length = strlen (NOSPLASH_OPT);
03e0aadb68a0 xsmfns.c (smc_save_yourself_CB): Add --no-splash to options
Jan Djärv <jan.h.d@swipnet.se>
parents: 49421
diff changeset
243 props[props_idx]->vals[2].value = NOSPLASH_OPT;
108213
e6266e624471 Run kill-emacs when exiting for display closed or SIGTERM/HUP.
Jan D. <jan.h.d@swipnet.se>
parents: 107121
diff changeset
244
e6266e624471 Run kill-emacs when exiting for display closed or SIGTERM/HUP.
Jan D. <jan.h.d@swipnet.se>
parents: 107121
diff changeset
245 cwd = get_current_dir_name ();
e6266e624471 Run kill-emacs when exiting for display closed or SIGTERM/HUP.
Jan D. <jan.h.d@swipnet.se>
parents: 107121
diff changeset
246 if (cwd)
e6266e624471 Run kill-emacs when exiting for display closed or SIGTERM/HUP.
Jan D. <jan.h.d@swipnet.se>
parents: 107121
diff changeset
247 {
108237
4f8f06b9b90b xsmfns.c (smc_save_yourself_CB): strlen(client_id) => strlen(cwd).
Jan D. <jan.h.d@swipnet.se>
parents: 108213
diff changeset
248 chdir_opt = xmalloc (strlen (CHDIR_OPT) + strlen (cwd) + 1);
108213
e6266e624471 Run kill-emacs when exiting for display closed or SIGTERM/HUP.
Jan D. <jan.h.d@swipnet.se>
parents: 107121
diff changeset
249 strcpy (chdir_opt, CHDIR_OPT);
e6266e624471 Run kill-emacs when exiting for display closed or SIGTERM/HUP.
Jan D. <jan.h.d@swipnet.se>
parents: 107121
diff changeset
250 strcat (chdir_opt, cwd);
e6266e624471 Run kill-emacs when exiting for display closed or SIGTERM/HUP.
Jan D. <jan.h.d@swipnet.se>
parents: 107121
diff changeset
251
e6266e624471 Run kill-emacs when exiting for display closed or SIGTERM/HUP.
Jan D. <jan.h.d@swipnet.se>
parents: 107121
diff changeset
252 props[props_idx]->vals[3].length = strlen (chdir_opt);
e6266e624471 Run kill-emacs when exiting for display closed or SIGTERM/HUP.
Jan D. <jan.h.d@swipnet.se>
parents: 107121
diff changeset
253 props[props_idx]->vals[3].value = chdir_opt;
e6266e624471 Run kill-emacs when exiting for display closed or SIGTERM/HUP.
Jan D. <jan.h.d@swipnet.se>
parents: 107121
diff changeset
254 }
e6266e624471 Run kill-emacs when exiting for display closed or SIGTERM/HUP.
Jan D. <jan.h.d@swipnet.se>
parents: 107121
diff changeset
255
e6266e624471 Run kill-emacs when exiting for display closed or SIGTERM/HUP.
Jan D. <jan.h.d@swipnet.se>
parents: 107121
diff changeset
256 val_idx += cwd ? 4 : 3;
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
257 ++props_idx;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
258
57704
4ff1d695430a * xsmfns.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents: 56135
diff changeset
259 /* User id. */
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
260 props[props_idx] = &prop_ptr[props_idx];
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
261 props[props_idx]->name = SmUserID;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
262 props[props_idx]->type = SmARRAY8;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
263 props[props_idx]->num_vals = 1;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
264 props[props_idx]->vals = &values[val_idx++];
109141
fa173b9bd9ce Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents: 109139
diff changeset
265 props[props_idx]->vals[0].length = strlen (SSDATA (Vuser_login_name));
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 45803
diff changeset
266 props[props_idx]->vals[0].value = SDATA (Vuser_login_name);
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
267 ++props_idx;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
268
65412
3a9693f993b2 (smc_save_yourself_CB): Use get_current_dir_name.
Eli Zaretskii <eliz@gnu.org>
parents: 64770
diff changeset
269
3a9693f993b2 (smc_save_yourself_CB): Use get_current_dir_name.
Eli Zaretskii <eliz@gnu.org>
parents: 64770
diff changeset
270 if (cwd)
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
271 {
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
272 props[props_idx] = &prop_ptr[props_idx];
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
273 props[props_idx]->name = SmCurrentDirectory;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
274 props[props_idx]->type = SmARRAY8;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
275 props[props_idx]->num_vals = 1;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
276 props[props_idx]->vals = &values[val_idx++];
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
277 props[props_idx]->vals[0].length = strlen (cwd);
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
278 props[props_idx]->vals[0].value = cwd;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
279 ++props_idx;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
280 }
47942
080b4586492b Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents: 46370
diff changeset
281
080b4586492b Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents: 46370
diff changeset
282
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
283 SmcSetProperties (smcConn, props_idx, props);
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
284
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
285 xfree (smid_opt);
108213
e6266e624471 Run kill-emacs when exiting for display closed or SIGTERM/HUP.
Jan D. <jan.h.d@swipnet.se>
parents: 107121
diff changeset
286 xfree (chdir_opt);
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
287
95479
9588c3703f38 remove useless if-before-free tests
Jim Meyering <jim@meyering.net>
parents: 95252
diff changeset
288 free (cwd);
65412
3a9693f993b2 (smc_save_yourself_CB): Use get_current_dir_name.
Eli Zaretskii <eliz@gnu.org>
parents: 64770
diff changeset
289
57704
4ff1d695430a * xsmfns.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents: 56135
diff changeset
290 /* See if we maybe shall interact with the user. */
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
291 if (interactStyle != SmInteractStyleAny
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
292 || ! shutdown
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
293 || saveType == SmSaveLocal
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
294 || ! SmcInteractRequest (smcConn, SmDialogNormal, smc_interact_CB, 0))
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
295 {
57704
4ff1d695430a * xsmfns.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents: 56135
diff changeset
296 /* No interaction, we are done saving ourself. */
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
297 SmcSaveYourselfDone (smcConn, True);
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
298 }
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
299 }
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
300
57704
4ff1d695430a * xsmfns.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents: 56135
diff changeset
301 /* According to the SM specification, this shall close the connection. */
4ff1d695430a * xsmfns.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents: 56135
diff changeset
302
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
303 static void
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 108237
diff changeset
304 smc_die_CB (SmcConn smcConn, SmPointer clientData)
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
305 {
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
306 SmcCloseConnection (smcConn, 0, 0);
107121
c7c70f9fa3d7 Fix for bug#5512, don't rely on SIGIO alone.
Jan D. <jan.h.d@swipnet.se>
parents: 106815
diff changeset
307 ice_connection_closed ();
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
308 }
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
309
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
310 /* We don't use the next two but they are mandatory, leave them empty.
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
311 According to the SM specification, we should not interact with the
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
312 user between smc_save_yourself_CB is called and until smc_save_complete_CB
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
313 is called. It seems like a lot of job to implement this and it doesn't
57704
4ff1d695430a * xsmfns.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents: 56135
diff changeset
314 even seem necessary. */
4ff1d695430a * xsmfns.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents: 56135
diff changeset
315
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
316 static void
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 108237
diff changeset
317 smc_save_complete_CB (SmcConn smcConn, SmPointer clientData)
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
318 {
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
319 /* Empty */
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
320 }
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
321
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
322 static void
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 108237
diff changeset
323 smc_shutdown_cancelled_CB (SmcConn smcConn, SmPointer clientData)
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
324 {
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
325 /* Empty */
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
326 }
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
327
49421
381ccbf15cd9 *** empty log message ***
Juanma Barranquero <lekktu@gmail.com>
parents: 47942
diff changeset
328 /* Error handlers for SM and ICE. We don't want to exit Emacs just
57704
4ff1d695430a * xsmfns.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents: 56135
diff changeset
329 because there is some error in the session management. */
4ff1d695430a * xsmfns.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents: 56135
diff changeset
330
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
331 static void
109139
c25c24812fb1 Convert declarations or definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109126
diff changeset
332 smc_error_handler (SmcConn smcConn,
c25c24812fb1 Convert declarations or definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109126
diff changeset
333 Bool swap,
c25c24812fb1 Convert declarations or definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109126
diff changeset
334 int offendingMinorOpcode,
c25c24812fb1 Convert declarations or definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109126
diff changeset
335 unsigned long offendingSequence,
c25c24812fb1 Convert declarations or definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109126
diff changeset
336 int errorClass,
c25c24812fb1 Convert declarations or definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109126
diff changeset
337 int severity,
c25c24812fb1 Convert declarations or definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109126
diff changeset
338 SmPointer values)
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
339 {
57704
4ff1d695430a * xsmfns.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents: 56135
diff changeset
340 /* Empty */
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
341 }
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
342
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
343 static void
109139
c25c24812fb1 Convert declarations or definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109126
diff changeset
344 ice_error_handler (IceConn iceConn,
c25c24812fb1 Convert declarations or definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109126
diff changeset
345 Bool swap,
c25c24812fb1 Convert declarations or definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109126
diff changeset
346 int offendingMinorOpcode,
c25c24812fb1 Convert declarations or definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109126
diff changeset
347 unsigned long offendingSequence,
c25c24812fb1 Convert declarations or definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109126
diff changeset
348 int errorClass,
c25c24812fb1 Convert declarations or definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109126
diff changeset
349 int severity,
c25c24812fb1 Convert declarations or definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109126
diff changeset
350 IcePointer values)
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
351 {
57704
4ff1d695430a * xsmfns.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents: 56135
diff changeset
352 /* Empty */
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
353 }
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
354
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
355
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
356 static void
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 108237
diff changeset
357 ice_io_error_handler (IceConn iceConn)
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
358 {
57704
4ff1d695430a * xsmfns.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents: 56135
diff changeset
359 /* Connection probably gone. */
107121
c7c70f9fa3d7 Fix for bug#5512, don't rely on SIGIO alone.
Jan D. <jan.h.d@swipnet.se>
parents: 106815
diff changeset
360 ice_connection_closed ();
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
361 }
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
362
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
363 /* This is called when the ICE connection is created or closed. The SM library
57704
4ff1d695430a * xsmfns.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents: 56135
diff changeset
364 uses ICE as it transport protocol. */
4ff1d695430a * xsmfns.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents: 56135
diff changeset
365
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
366 static void
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 108237
diff changeset
367 ice_conn_watch_CB (IceConn iceConn, IcePointer clientData, int opening, IcePointer *watchData)
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
368 {
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
369 if (! opening)
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
370 {
107121
c7c70f9fa3d7 Fix for bug#5512, don't rely on SIGIO alone.
Jan D. <jan.h.d@swipnet.se>
parents: 106815
diff changeset
371 ice_connection_closed ();
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
372 return;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
373 }
47942
080b4586492b Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents: 46370
diff changeset
374
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
375 ice_fd = IceConnectionNumber (iceConn);
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
376 #ifdef F_SETOWN
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
377 fcntl (ice_fd, F_SETOWN, getpid ());
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
378 #endif /* ! defined (F_SETOWN) */
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
379
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
380 #ifdef SIGIO
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
381 if (interrupt_input)
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
382 init_sigio (ice_fd);
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
383 #endif /* ! defined (SIGIO) */
107121
c7c70f9fa3d7 Fix for bug#5512, don't rely on SIGIO alone.
Jan D. <jan.h.d@swipnet.se>
parents: 106815
diff changeset
384
c7c70f9fa3d7 Fix for bug#5512, don't rely on SIGIO alone.
Jan D. <jan.h.d@swipnet.se>
parents: 106815
diff changeset
385 add_keyboard_wait_descriptor (ice_fd);
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
386 }
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
387
52298
1a4bd2bec861 Create and initialize a client leader window so session management
Jan Djärv <jan.h.d@swipnet.se>
parents: 50016
diff changeset
388 /* Create the client leader window. */
57704
4ff1d695430a * xsmfns.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents: 56135
diff changeset
389
109141
fa173b9bd9ce Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents: 109139
diff changeset
390 #ifndef USE_GTK
52298
1a4bd2bec861 Create and initialize a client leader window so session management
Jan Djärv <jan.h.d@swipnet.se>
parents: 50016
diff changeset
391 static void
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 108237
diff changeset
392 create_client_leader_window (struct x_display_info *dpyinfo, char *client_id)
52298
1a4bd2bec861 Create and initialize a client leader window so session management
Jan Djärv <jan.h.d@swipnet.se>
parents: 50016
diff changeset
393 {
1a4bd2bec861 Create and initialize a client leader window so session management
Jan Djärv <jan.h.d@swipnet.se>
parents: 50016
diff changeset
394 Window w;
1a4bd2bec861 Create and initialize a client leader window so session management
Jan Djärv <jan.h.d@swipnet.se>
parents: 50016
diff changeset
395 XClassHint class_hints;
1a4bd2bec861 Create and initialize a client leader window so session management
Jan Djärv <jan.h.d@swipnet.se>
parents: 50016
diff changeset
396 Atom sm_id;
1a4bd2bec861 Create and initialize a client leader window so session management
Jan Djärv <jan.h.d@swipnet.se>
parents: 50016
diff changeset
397
1a4bd2bec861 Create and initialize a client leader window so session management
Jan Djärv <jan.h.d@swipnet.se>
parents: 50016
diff changeset
398 w = XCreateSimpleWindow (dpyinfo->display,
1a4bd2bec861 Create and initialize a client leader window so session management
Jan Djärv <jan.h.d@swipnet.se>
parents: 50016
diff changeset
399 dpyinfo->root_window,
1a4bd2bec861 Create and initialize a client leader window so session management
Jan Djärv <jan.h.d@swipnet.se>
parents: 50016
diff changeset
400 -1, -1, 1, 1,
1a4bd2bec861 Create and initialize a client leader window so session management
Jan Djärv <jan.h.d@swipnet.se>
parents: 50016
diff changeset
401 CopyFromParent, CopyFromParent, CopyFromParent);
1a4bd2bec861 Create and initialize a client leader window so session management
Jan Djärv <jan.h.d@swipnet.se>
parents: 50016
diff changeset
402
1a4bd2bec861 Create and initialize a client leader window so session management
Jan Djärv <jan.h.d@swipnet.se>
parents: 50016
diff changeset
403 class_hints.res_name = (char *) SDATA (Vx_resource_name);
1a4bd2bec861 Create and initialize a client leader window so session management
Jan Djärv <jan.h.d@swipnet.se>
parents: 50016
diff changeset
404 class_hints.res_class = (char *) SDATA (Vx_resource_class);
1a4bd2bec861 Create and initialize a client leader window so session management
Jan Djärv <jan.h.d@swipnet.se>
parents: 50016
diff changeset
405 XSetClassHint (dpyinfo->display, w, &class_hints);
1a4bd2bec861 Create and initialize a client leader window so session management
Jan Djärv <jan.h.d@swipnet.se>
parents: 50016
diff changeset
406 XStoreName (dpyinfo->display, w, class_hints.res_name);
1a4bd2bec861 Create and initialize a client leader window so session management
Jan Djärv <jan.h.d@swipnet.se>
parents: 50016
diff changeset
407
1a4bd2bec861 Create and initialize a client leader window so session management
Jan Djärv <jan.h.d@swipnet.se>
parents: 50016
diff changeset
408 sm_id = XInternAtom (dpyinfo->display, "SM_CLIENT_ID", False);
1a4bd2bec861 Create and initialize a client leader window so session management
Jan Djärv <jan.h.d@swipnet.se>
parents: 50016
diff changeset
409 XChangeProperty (dpyinfo->display, w, sm_id, XA_STRING, 8, PropModeReplace,
109141
fa173b9bd9ce Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents: 109139
diff changeset
410 (unsigned char *)client_id, strlen (client_id));
52298
1a4bd2bec861 Create and initialize a client leader window so session management
Jan Djärv <jan.h.d@swipnet.se>
parents: 50016
diff changeset
411
1a4bd2bec861 Create and initialize a client leader window so session management
Jan Djärv <jan.h.d@swipnet.se>
parents: 50016
diff changeset
412 dpyinfo->client_leader_window = w;
1a4bd2bec861 Create and initialize a client leader window so session management
Jan Djärv <jan.h.d@swipnet.se>
parents: 50016
diff changeset
413 }
109141
fa173b9bd9ce Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents: 109139
diff changeset
414 #endif /* ! USE_GTK */
fa173b9bd9ce Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents: 109139
diff changeset
415
52298
1a4bd2bec861 Create and initialize a client leader window so session management
Jan Djärv <jan.h.d@swipnet.se>
parents: 50016
diff changeset
416
57704
4ff1d695430a * xsmfns.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents: 56135
diff changeset
417 /* Try to open a connection to the session manager. */
4ff1d695430a * xsmfns.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents: 56135
diff changeset
418
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
419 void
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 108237
diff changeset
420 x_session_initialize (struct x_display_info *dpyinfo)
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
421 {
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
422 #define SM_ERRORSTRING_LEN 512
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
423 char errorstring[SM_ERRORSTRING_LEN];
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
424 char* previous_id = NULL;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
425 SmcCallbacks callbacks;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
426 int name_len = 0;
47942
080b4586492b Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents: 46370
diff changeset
427
107121
c7c70f9fa3d7 Fix for bug#5512, don't rely on SIGIO alone.
Jan D. <jan.h.d@swipnet.se>
parents: 106815
diff changeset
428 ice_fd = -1;
c7c70f9fa3d7 Fix for bug#5512, don't rely on SIGIO alone.
Jan D. <jan.h.d@swipnet.se>
parents: 106815
diff changeset
429 doing_interact = False;
c7c70f9fa3d7 Fix for bug#5512, don't rely on SIGIO alone.
Jan D. <jan.h.d@swipnet.se>
parents: 106815
diff changeset
430
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
431 /* Check if we where started by the session manager. If so, we will
57704
4ff1d695430a * xsmfns.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents: 56135
diff changeset
432 have a previous id. */
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
433 if (! EQ (Vx_session_previous_id, Qnil) && STRINGP (Vx_session_previous_id))
109141
fa173b9bd9ce Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents: 109139
diff changeset
434 previous_id = SSDATA (Vx_session_previous_id);
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
435
57704
4ff1d695430a * xsmfns.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents: 56135
diff changeset
436 /* Construct the path to the Emacs program. */
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
437 if (! EQ (Vinvocation_directory, Qnil))
109141
fa173b9bd9ce Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents: 109139
diff changeset
438 name_len += strlen (SSDATA (Vinvocation_directory));
fa173b9bd9ce Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents: 109139
diff changeset
439 name_len += strlen (SSDATA (Vinvocation_name));
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
440
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
441 /* This malloc will not be freed, but it is only done once, and hopefully
57704
4ff1d695430a * xsmfns.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents: 56135
diff changeset
442 not very large */
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
443 emacs_program = xmalloc (name_len + 1);
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
444 emacs_program[0] = '\0';
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
445
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
446 if (! EQ (Vinvocation_directory, Qnil))
109141
fa173b9bd9ce Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents: 109139
diff changeset
447 strcpy (emacs_program, SSDATA (Vinvocation_directory));
fa173b9bd9ce Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents: 109139
diff changeset
448 strcat (emacs_program, SSDATA (Vinvocation_name));
47942
080b4586492b Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents: 46370
diff changeset
449
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
450 /* The SM protocol says all callbacks are mandatory, so set up all
57704
4ff1d695430a * xsmfns.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents: 56135
diff changeset
451 here and in the mask passed to SmcOpenConnection. */
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
452 callbacks.save_yourself.callback = smc_save_yourself_CB;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
453 callbacks.save_yourself.client_data = 0;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
454 callbacks.die.callback = smc_die_CB;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
455 callbacks.die.client_data = 0;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
456 callbacks.save_complete.callback = smc_save_complete_CB;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
457 callbacks.save_complete.client_data = 0;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
458 callbacks.shutdown_cancelled.callback = smc_shutdown_cancelled_CB;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
459 callbacks.shutdown_cancelled.client_data = 0;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
460
57704
4ff1d695430a * xsmfns.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents: 56135
diff changeset
461 /* Set error handlers. */
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
462 SmcSetErrorHandler (smc_error_handler);
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
463 IceSetErrorHandler (ice_error_handler);
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
464 IceSetIOErrorHandler (ice_io_error_handler);
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
465
57704
4ff1d695430a * xsmfns.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents: 56135
diff changeset
466 /* Install callback for when connection status changes. */
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
467 IceAddConnectionWatch (ice_conn_watch_CB, 0);
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
468
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
469 /* Open the connection to the session manager. A failure is not
49421
381ccbf15cd9 *** empty log message ***
Juanma Barranquero <lekktu@gmail.com>
parents: 47942
diff changeset
470 critical, it usually means that no session manager is running.
57704
4ff1d695430a * xsmfns.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents: 56135
diff changeset
471 The errorstring is here for debugging. */
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
472 smc_conn = SmcOpenConnection (NULL, NULL, 1, 0,
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
473 (SmcSaveYourselfProcMask|
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
474 SmcDieProcMask|
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
475 SmcSaveCompleteProcMask|
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
476 SmcShutdownCancelledProcMask),
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
477 &callbacks,
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
478 previous_id,
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
479 &client_id,
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
480 SM_ERRORSTRING_LEN,
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
481 errorstring);
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
482
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
483 if (smc_conn != 0)
52298
1a4bd2bec861 Create and initialize a client leader window so session management
Jan Djärv <jan.h.d@swipnet.se>
parents: 50016
diff changeset
484 {
1a4bd2bec861 Create and initialize a client leader window so session management
Jan Djärv <jan.h.d@swipnet.se>
parents: 50016
diff changeset
485 Vx_session_id = make_string (client_id, strlen (client_id));
1a4bd2bec861 Create and initialize a client leader window so session management
Jan Djärv <jan.h.d@swipnet.se>
parents: 50016
diff changeset
486
1a4bd2bec861 Create and initialize a client leader window so session management
Jan Djärv <jan.h.d@swipnet.se>
parents: 50016
diff changeset
487 #ifdef USE_GTK
1a4bd2bec861 Create and initialize a client leader window so session management
Jan Djärv <jan.h.d@swipnet.se>
parents: 50016
diff changeset
488 /* GTK creats a leader window by itself, but we need to tell
1a4bd2bec861 Create and initialize a client leader window so session management
Jan Djärv <jan.h.d@swipnet.se>
parents: 50016
diff changeset
489 it about our client_id. */
1a4bd2bec861 Create and initialize a client leader window so session management
Jan Djärv <jan.h.d@swipnet.se>
parents: 50016
diff changeset
490 gdk_set_sm_client_id (client_id);
1a4bd2bec861 Create and initialize a client leader window so session management
Jan Djärv <jan.h.d@swipnet.se>
parents: 50016
diff changeset
491 #else
1a4bd2bec861 Create and initialize a client leader window so session management
Jan Djärv <jan.h.d@swipnet.se>
parents: 50016
diff changeset
492 create_client_leader_window (dpyinfo, client_id);
1a4bd2bec861 Create and initialize a client leader window so session management
Jan Djärv <jan.h.d@swipnet.se>
parents: 50016
diff changeset
493 #endif
1a4bd2bec861 Create and initialize a client leader window so session management
Jan Djärv <jan.h.d@swipnet.se>
parents: 50016
diff changeset
494 }
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
495 }
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
496
83350
e7d5238afe52 Work around crashes in X session management after normal shutdown of X server.
Karoly Lorentey <lorentey@elte.hu>
parents: 83332
diff changeset
497 /* Ensure that the session manager is not contacted again. */
e7d5238afe52 Work around crashes in X session management after normal shutdown of X server.
Karoly Lorentey <lorentey@elte.hu>
parents: 83332
diff changeset
498
e7d5238afe52 Work around crashes in X session management after normal shutdown of X server.
Karoly Lorentey <lorentey@elte.hu>
parents: 83332
diff changeset
499 void
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 108237
diff changeset
500 x_session_close (void)
83350
e7d5238afe52 Work around crashes in X session management after normal shutdown of X server.
Karoly Lorentey <lorentey@elte.hu>
parents: 83332
diff changeset
501 {
107121
c7c70f9fa3d7 Fix for bug#5512, don't rely on SIGIO alone.
Jan D. <jan.h.d@swipnet.se>
parents: 106815
diff changeset
502 ice_connection_closed ();
83350
e7d5238afe52 Work around crashes in X session management after normal shutdown of X server.
Karoly Lorentey <lorentey@elte.hu>
parents: 83332
diff changeset
503 }
e7d5238afe52 Work around crashes in X session management after normal shutdown of X server.
Karoly Lorentey <lorentey@elte.hu>
parents: 83332
diff changeset
504
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
505
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
506 DEFUN ("handle-save-session", Fhandle_save_session,
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
507 Shandle_save_session, 1, 1, "e",
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
508 doc: /* Handle the save_yourself event from a session manager.
47942
080b4586492b Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents: 46370
diff changeset
509 A session manager can tell Emacs that the window system is shutting down
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
510 by sending Emacs a save_yourself message. Emacs executes this function when
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
511 such an event occurs. This function then executes `emacs-session-save'.
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
512 After that, this function informs the session manager that it can continue
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
513 or abort shutting down the window system depending on the return value
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
514 from `emacs-session-save' If the return value is non-nil the session manager
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
515 is told to abort the window system shutdown.
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
516
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
517 Do not call this function yourself. */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
518 (Lisp_Object event)
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
519 {
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
520 /* Check doing_interact so that we don't do anything if someone called
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
521 this at the wrong time. */
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
522 if (doing_interact)
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
523 {
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
524 Bool cancel_shutdown = False;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
525
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
526 cancel_shutdown = ! EQ (call0 (intern ("emacs-session-save")), Qnil);
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
527
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
528 SmcInteractDone (smc_conn, cancel_shutdown);
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
529 SmcSaveYourselfDone (smc_conn, True);
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
530
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
531 doing_interact = False;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
532 }
43919
833c0585a612 Added return value to Fhandle_save_session to avoid compiler warning.
Jan Djärv <jan.h.d@swipnet.se>
parents: 43848
diff changeset
533
833c0585a612 Added return value to Fhandle_save_session to avoid compiler warning.
Jan Djärv <jan.h.d@swipnet.se>
parents: 43848
diff changeset
534 return Qnil;
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
535 }
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
536
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
537
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
538 /***********************************************************************
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
539 Initialization
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
540 ***********************************************************************/
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
541 void
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 108237
diff changeset
542 syms_of_xsmfns (void)
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
543 {
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
544 DEFVAR_LISP ("x-session-id", &Vx_session_id,
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
545 doc: /* The session id Emacs got from the session manager for this session.
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
546 Changing the value does not change the session id used by Emacs.
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
547 The value is nil if no session manager is running.
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
548 See also `x-session-previous-id', `emacs-save-session-functions',
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
549 `emacs-session-save' and `emacs-session-restore'." */);
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
550 Vx_session_id = Qnil;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
551
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
552 DEFVAR_LISP ("x-session-previous-id", &Vx_session_previous_id,
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
553 doc: /* The previous session id Emacs got from session manager.
47942
080b4586492b Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents: 46370
diff changeset
554 If Emacs is running on a window system that has a session manager, the
73801
14ab09766fec (syms_of_xsmfns): Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents: 68651
diff changeset
555 session manager gives Emacs a session id. It is feasible for Emacs Lisp
47942
080b4586492b Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents: 46370
diff changeset
556 code to use the session id to save configuration in, for example, a file
080b4586492b Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents: 46370
diff changeset
557 with a file name based on the session id. If Emacs is running when the
080b4586492b Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents: 46370
diff changeset
558 window system is shut down, the session manager remembers that Emacs was
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
559 running and saves the session id Emacs had.
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
560
47942
080b4586492b Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents: 46370
diff changeset
561 When the window system is started again, the session manager restarts
080b4586492b Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents: 46370
diff changeset
562 Emacs and hands Emacs the session id it had the last time it was
080b4586492b Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents: 46370
diff changeset
563 running. This is now the previous session id and the value of this
080b4586492b Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents: 46370
diff changeset
564 variable. If configuration was saved in a file as stated above, the
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
565 previous session id shall be used to reconstruct the file name.
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
566
47942
080b4586492b Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents: 46370
diff changeset
567 The session id Emacs has while it is running is in the variable
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
568 `x-session-id'. The value of this variable and `x-session-id' may be the
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
569 same, depending on how the session manager works.
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
570
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
571 See also `emacs-save-session-functions', `emacs-session-save' and
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
572 `emacs-session-restore'." */);
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
573 Vx_session_previous_id = Qnil;
47942
080b4586492b Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents: 46370
diff changeset
574
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
575 defsubr (&Shandle_save_session);
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
576 }
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
577
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
578 #endif /* HAVE_X_SM */
52401
695cf19ef79e Add arch taglines
Miles Bader <miles@gnu.org>
parents: 52298
diff changeset
579
695cf19ef79e Add arch taglines
Miles Bader <miles@gnu.org>
parents: 52298
diff changeset
580 /* arch-tag: 56a2c58c-adfa-430a-b772-130abd29fd2e
695cf19ef79e Add arch taglines
Miles Bader <miles@gnu.org>
parents: 52298
diff changeset
581 (do not change this comment) */