annotate src/xsmfns.c @ 83350:e7d5238afe52

Work around crashes in X session management after normal shutdown of X server. * src/xsmfns.c (x_session_close): New function. * src/xterm.h: Declare it. * src/xterm.c (XTread_socket): Don't call x_session_check_input for secondary displays. (x_term_init): Do not initialize X session management when the initial display was a tty frame. (x_delete_display): Close X session management when we close its display. git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-390
author Karoly Lorentey <lorentey@elte.hu>
date Thu, 04 Aug 2005 00:46:55 +0000
parents 6c13700d1c13
children 532e0a9335a9
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.
56135
5407da499273 Update copyright.
Kim F. Storm <storm@cua.dk>
parents: 54172
diff changeset
3 Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
4
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
5 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
6
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
7 GNU Emacs is free software; you can redistribute it and/or modify
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
8 it under the terms of the GNU General Public License as published by
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
9 the Free Software Foundation; either version 2, or (at your option)
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
10 any later version.
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
11
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
12 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
13 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
14 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
15 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
16
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
17 You should have received a copy of the GNU General Public License
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
18 along with GNU Emacs; see the file COPYING. If not, write to
64084
a8fa7c632ee4 Update FSF's address.
Lute Kamstra <lute@gnu.org>
parents: 57704
diff changeset
19 the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
a8fa7c632ee4 Update FSF's address.
Lute Kamstra <lute@gnu.org>
parents: 57704
diff changeset
20 Boston, MA 02110-1301, USA. */
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
21
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
22 #include <config.h>
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
23
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
24 #ifdef HAVE_X_SM
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
25
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
26 #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
27 #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
28 #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
29
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
30 #ifdef HAVE_STRING_H
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
31 #include <string.h>
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
32 #else
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
33 #ifdef HAVE_STRINGS_H
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
34 #include <strings.h>
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
35 #endif
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
36 #endif
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
37
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
38 #ifdef HAVE_UNISTD_H
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
39 #include <unistd.h>
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
40 #endif
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
41 #ifdef HAVE_STDLIB_H
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
42 #include <stdlib.h>
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
43 #endif
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
44
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
45 #include <sys/param.h>
43848
1690ab476469 Include stdio.h because termhooks.h needs it.
Gerd Moellmann <gerd@gnu.org>
parents: 43810
diff changeset
46 #include <stdio.h>
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
47
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
48 #include "systime.h"
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
49 #include "sysselect.h"
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
50 #include "lisp.h"
83004
7900111db01c Converted display hooks to be display-local. Plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents: 52401
diff changeset
51 #include "frame.h"
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
52 #include "termhooks.h"
43848
1690ab476469 Include stdio.h because termhooks.h needs it.
Gerd Moellmann <gerd@gnu.org>
parents: 43810
diff changeset
53 #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
54 #include "xterm.h"
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
55
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
56 #ifndef MAXPATHLEN
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
57 #define MAXPATHLEN 1024
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
58 #endif /* not MAXPATHLEN */
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
59
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
60
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
61 /* The user login name. */
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
62
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
63 extern Lisp_Object Vuser_login_name;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
64
45803
9484de301252 Rename enum event_kind items.
Pavel Janík <Pavel@Janik.cz>
parents: 43919
diff changeset
65 /* 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
66
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
67 static struct input_event emacs_event;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
68
45803
9484de301252 Rename enum event_kind items.
Pavel Janík <Pavel@Janik.cz>
parents: 43919
diff changeset
69 /* 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
70
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
71 static int ice_fd = -1;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
72
45803
9484de301252 Rename enum event_kind items.
Pavel Janík <Pavel@Janik.cz>
parents: 43919
diff changeset
73 /* 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
74
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
75 static int doing_interact = False;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
76
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 /* 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
78
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
79 static SmcConn smc_conn;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
80
57704
4ff1d695430a * xsmfns.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents: 56135
diff changeset
81 /* 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
82
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
83 static char *client_id;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
84
57704
4ff1d695430a * xsmfns.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents: 56135
diff changeset
85 /* 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
86
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
87 static char *emacs_program;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
88
57704
4ff1d695430a * xsmfns.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents: 56135
diff changeset
89 /* 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
90
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
91 Lisp_Object Vx_session_id;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
92
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
93 /* 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
94 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
95
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
96 Lisp_Object Vx_session_previous_id;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
97
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
98 /* 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
99 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
100
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
101 #define SMID_OPT "--smid="
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
102
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
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 /* 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
105 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
106
03e0aadb68a0 xsmfns.c (smc_save_yourself_CB): Add --no-splash to options
Jan Djärv <jan.h.d@swipnet.se>
parents: 49421
diff changeset
107 #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
108
03e0aadb68a0 xsmfns.c (smc_save_yourself_CB): Add --no-splash to options
Jan Djärv <jan.h.d@swipnet.se>
parents: 49421
diff changeset
109
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
110 /* 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
111 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
112 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
113
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
114 int
54172
6851117e8d89 (x_session_check_input): Remove numchars arg.
Kim F. Storm <storm@cua.dk>
parents: 52401
diff changeset
115 x_session_check_input (bufp)
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
116 struct input_event *bufp;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
117 {
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
118 SELECT_TYPE read_fds;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
119 EMACS_TIME tmout;
47942
080b4586492b Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents: 46370
diff changeset
120
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
121 if (ice_fd == -1) return 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 FD_ZERO (&read_fds);
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
124 FD_SET (ice_fd, &read_fds);
47942
080b4586492b Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents: 46370
diff changeset
125
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
126 tmout.tv_sec = 0;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
127 tmout.tv_usec = 0;
47942
080b4586492b Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents: 46370
diff changeset
128
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
129 /* 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
130 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
131 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
132 will be called. */
45803
9484de301252 Rename enum event_kind items.
Pavel Janík <Pavel@Janik.cz>
parents: 43919
diff changeset
133 emacs_event.kind = NO_EVENT;
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
134
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
135 if (select (ice_fd+1, &read_fds,
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
136 (SELECT_TYPE *)0, (SELECT_TYPE *)0, &tmout) < 0)
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
137 {
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
138 ice_fd = -1;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
139 return 0;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
140 }
47942
080b4586492b Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents: 46370
diff changeset
141
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
142
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
143 if (FD_ISSET (ice_fd, &read_fds))
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
144 IceProcessMessages (SmcGetIceConnection (smc_conn),
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
145 (IceReplyWaitInfo *)0, (Bool *)0);
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
146
47942
080b4586492b Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents: 46370
diff changeset
147
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
148 /* 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
149 SAVE_SESSION_EVENT. */
54172
6851117e8d89 (x_session_check_input): Remove numchars arg.
Kim F. Storm <storm@cua.dk>
parents: 52401
diff changeset
150 if (emacs_event.kind == NO_EVENT)
6851117e8d89 (x_session_check_input): Remove numchars arg.
Kim F. Storm <storm@cua.dk>
parents: 52401
diff changeset
151 return 0;
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
152
54172
6851117e8d89 (x_session_check_input): Remove numchars arg.
Kim F. Storm <storm@cua.dk>
parents: 52401
diff changeset
153 bcopy (&emacs_event, bufp, sizeof (struct input_event));
6851117e8d89 (x_session_check_input): Remove numchars arg.
Kim F. Storm <storm@cua.dk>
parents: 52401
diff changeset
154 return 1;
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
155 }
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
156
57704
4ff1d695430a * xsmfns.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents: 56135
diff changeset
157 /* 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
158
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
159 int
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
160 x_session_have_connection ()
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
161 {
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
162 return ice_fd != -1;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
163 }
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 /* 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
166 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
167 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
168
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
169 static void
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
170 smc_interact_CB (smcConn, clientData)
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
171 SmcConn smcConn;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
172 SmPointer clientData;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
173 {
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
174 doing_interact = True;
45803
9484de301252 Rename enum event_kind items.
Pavel Janík <Pavel@Janik.cz>
parents: 43919
diff changeset
175 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
176 }
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
177
49421
381ccbf15cd9 *** empty log message ***
Juanma Barranquero <lekktu@gmail.com>
parents: 47942
diff changeset
178 /* 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
179 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
180 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
181 are started in the correct directory.
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
182
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
183 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
184 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
185
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
186 static void
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
187 smc_save_yourself_CB (smcConn,
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
188 clientData,
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
189 saveType,
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
190 shutdown,
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
191 interactStyle,
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
192 fast)
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
193 SmcConn smcConn;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
194 SmPointer clientData;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
195 int saveType;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
196 Bool shutdown;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
197 int interactStyle;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
198 Bool fast;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
199 {
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
200 #define NR_PROPS 5
47942
080b4586492b Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents: 46370
diff changeset
201
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
202 SmProp *props[NR_PROPS];
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
203 SmProp prop_ptr[NR_PROPS];
47942
080b4586492b Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents: 46370
diff changeset
204
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
205 SmPropValue values[20];
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
206 int val_idx = 0;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
207 int props_idx = 0;
47942
080b4586492b Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents: 46370
diff changeset
208
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
209 char cwd[MAXPATHLEN+1];
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
210 char *smid_opt;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
211
57704
4ff1d695430a * xsmfns.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents: 56135
diff changeset
212 /* 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
213 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
214 props[props_idx]->name = SmCloneCommand;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
215 props[props_idx]->type = SmLISTofARRAY8;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
216 props[props_idx]->num_vals = 1;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
217 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
218 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
219 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
220 ++props_idx;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
221
57704
4ff1d695430a * xsmfns.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents: 56135
diff changeset
222 /* The name of the program. */
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
223 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
224 props[props_idx]->name = SmProgram;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
225 props[props_idx]->type = SmARRAY8;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
226 props[props_idx]->num_vals = 1;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
227 props[props_idx]->vals = &values[val_idx++];
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 45803
diff changeset
228 props[props_idx]->vals[0].length = strlen (SDATA (Vinvocation_name));
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 45803
diff changeset
229 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
230 ++props_idx;
47942
080b4586492b Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents: 46370
diff changeset
231
57704
4ff1d695430a * xsmfns.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents: 56135
diff changeset
232 /* How to restart Emacs (i.e.: /path/to/emacs --smid=xxxx --no-splash). */
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
233 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
234 props[props_idx]->name = SmRestartCommand;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
235 props[props_idx]->type = SmLISTofARRAY8;
57704
4ff1d695430a * xsmfns.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents: 56135
diff changeset
236 props[props_idx]->num_vals = 3; /* /path/to/emacs, --smid=xxx --no-splash */
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
237 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
238 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
239 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
240
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
241 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
242 strcpy (smid_opt, SMID_OPT);
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
243 strcat (smid_opt, client_id);
47942
080b4586492b Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents: 46370
diff changeset
244
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
245 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
246 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
247
03e0aadb68a0 xsmfns.c (smc_save_yourself_CB): Add --no-splash to options
Jan Djärv <jan.h.d@swipnet.se>
parents: 49421
diff changeset
248 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
249 props[props_idx]->vals[2].value = 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
250 val_idx += 3;
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
251 ++props_idx;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
252
57704
4ff1d695430a * xsmfns.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents: 56135
diff changeset
253 /* User id. */
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
254 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
255 props[props_idx]->name = SmUserID;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
256 props[props_idx]->type = SmARRAY8;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
257 props[props_idx]->num_vals = 1;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
258 props[props_idx]->vals = &values[val_idx++];
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 45803
diff changeset
259 props[props_idx]->vals[0].length = strlen (SDATA (Vuser_login_name));
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 45803
diff changeset
260 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
261 ++props_idx;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
262
57704
4ff1d695430a * xsmfns.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents: 56135
diff changeset
263 /* The current directory property, not mandatory. */
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
264 #ifdef HAVE_GETCWD
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
265 if (getcwd (cwd, MAXPATHLEN+1) != 0)
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
266 #else
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
267 if (getwd (cwd) != 0)
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
268 #endif
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
269 {
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
270 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
271 props[props_idx]->name = SmCurrentDirectory;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
272 props[props_idx]->type = SmARRAY8;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
273 props[props_idx]->num_vals = 1;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
274 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
275 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
276 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
277 ++props_idx;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
278 }
47942
080b4586492b Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents: 46370
diff changeset
279
080b4586492b Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents: 46370
diff changeset
280
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
281 SmcSetProperties (smcConn, props_idx, props);
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
282
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
283 xfree (smid_opt);
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
284
57704
4ff1d695430a * xsmfns.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents: 56135
diff changeset
285 /* 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
286 if (interactStyle != SmInteractStyleAny
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
287 || ! shutdown
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
288 || saveType == SmSaveLocal
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
289 || ! 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
290 {
57704
4ff1d695430a * xsmfns.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents: 56135
diff changeset
291 /* 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
292 SmcSaveYourselfDone (smcConn, True);
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
293 }
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
294 }
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 /* 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
297
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
298 static void
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
299 smc_die_CB (smcConn, clientData)
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
300 SmcConn smcConn;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
301 SmPointer clientData;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
302 {
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
303 SmcCloseConnection (smcConn, 0, 0);
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
304 ice_fd = -1;
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
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
307 /* 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
308 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
309 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
310 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
311 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
312
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
313 static void
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
314 smc_save_complete_CB (smcConn, clientData)
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
315 SmcConn smcConn;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
316 SmPointer clientData;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
317 {
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
318 /* Empty */
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
319 }
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 static void
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
322 smc_shutdown_cancelled_CB (smcConn, clientData)
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
323 SmcConn smcConn;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
324 SmPointer clientData;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
325 {
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
326 /* Empty */
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
327 }
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
328
49421
381ccbf15cd9 *** empty log message ***
Juanma Barranquero <lekktu@gmail.com>
parents: 47942
diff changeset
329 /* 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
330 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
331
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
332 static void
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
333 smc_error_handler (smcConn,
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
334 swap,
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
335 offendingMinorOpcode,
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
336 offendingSequence,
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
337 errorClass,
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
338 severity,
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
339 values)
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
340 SmcConn smcConn;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
341 Bool swap;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
342 int offendingMinorOpcode;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
343 unsigned long offendingSequence;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
344 int errorClass;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
345 int severity;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
346 SmPointer values;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
347 {
57704
4ff1d695430a * xsmfns.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents: 56135
diff changeset
348 /* Empty */
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
349 }
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
350
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
351 static void
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
352 ice_error_handler (iceConn,
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
353 swap,
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
354 offendingMinorOpcode,
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
355 offendingSequence,
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
356 errorClass,
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
357 severity,
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
358 values)
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
359 IceConn iceConn;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
360 Bool swap;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
361 int offendingMinorOpcode;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
362 unsigned long offendingSequence;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
363 int errorClass;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
364 int severity;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
365 IcePointer values;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
366 {
57704
4ff1d695430a * xsmfns.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents: 56135
diff changeset
367 /* Empty */
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
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
370
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
371 static void
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
372 ice_io_error_handler (iceConn)
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
373 IceConn iceConn;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
374 {
57704
4ff1d695430a * xsmfns.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents: 56135
diff changeset
375 /* Connection probably gone. */
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
376 ice_fd = -1;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
377 }
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
378
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
379 /* 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
380 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
381
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
382 static void
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
383 ice_conn_watch_CB (iceConn, clientData, opening, watchData)
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
384 IceConn iceConn;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
385 IcePointer clientData;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
386 Bool opening;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
387 IcePointer *watchData;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
388 {
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
389 if (! opening)
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
390 {
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
391 ice_fd = -1;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
392 return;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
393 }
47942
080b4586492b Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents: 46370
diff changeset
394
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
395 ice_fd = IceConnectionNumber (iceConn);
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
396 #ifndef F_SETOWN_BUG
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
397 #ifdef F_SETOWN
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
398 #ifdef F_SETOWN_SOCK_NEG
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
399 /* stdin is a socket here */
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
400 fcntl (ice_fd, F_SETOWN, -getpid ());
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
401 #else /* ! defined (F_SETOWN_SOCK_NEG) */
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
402 fcntl (ice_fd, F_SETOWN, getpid ());
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
403 #endif /* ! defined (F_SETOWN_SOCK_NEG) */
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
404 #endif /* ! defined (F_SETOWN) */
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
405 #endif /* F_SETOWN_BUG */
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
406
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
407 #ifdef SIGIO
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
408 if (interrupt_input)
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
409 init_sigio (ice_fd);
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
410 #endif /* ! defined (SIGIO) */
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
411 }
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
412
52298
1a4bd2bec861 Create and initialize a client leader window so session management
Jan Djärv <jan.h.d@swipnet.se>
parents: 50016
diff changeset
413 /* 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
414
52298
1a4bd2bec861 Create and initialize a client leader window so session management
Jan Djärv <jan.h.d@swipnet.se>
parents: 50016
diff changeset
415 static void
1a4bd2bec861 Create and initialize a client leader window so session management
Jan Djärv <jan.h.d@swipnet.se>
parents: 50016
diff changeset
416 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
417 struct x_display_info *dpyinfo;
1a4bd2bec861 Create and initialize a client leader window so session management
Jan Djärv <jan.h.d@swipnet.se>
parents: 50016
diff changeset
418 char *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
419 {
1a4bd2bec861 Create and initialize a client leader window so session management
Jan Djärv <jan.h.d@swipnet.se>
parents: 50016
diff changeset
420 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
421 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
422 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
423
1a4bd2bec861 Create and initialize a client leader window so session management
Jan Djärv <jan.h.d@swipnet.se>
parents: 50016
diff changeset
424 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
425 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
426 -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
427 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
428
1a4bd2bec861 Create and initialize a client leader window so session management
Jan Djärv <jan.h.d@swipnet.se>
parents: 50016
diff changeset
429 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
430 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
431 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
432 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
433
1a4bd2bec861 Create and initialize a client leader window so session management
Jan Djärv <jan.h.d@swipnet.se>
parents: 50016
diff changeset
434 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
435 XChangeProperty (dpyinfo->display, w, sm_id, XA_STRING, 8, PropModeReplace,
1a4bd2bec861 Create and initialize a client leader window so session management
Jan Djärv <jan.h.d@swipnet.se>
parents: 50016
diff changeset
436 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
437
1a4bd2bec861 Create and initialize a client leader window so session management
Jan Djärv <jan.h.d@swipnet.se>
parents: 50016
diff changeset
438 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
439 }
1a4bd2bec861 Create and initialize a client leader window so session management
Jan Djärv <jan.h.d@swipnet.se>
parents: 50016
diff changeset
440
57704
4ff1d695430a * xsmfns.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents: 56135
diff changeset
441 /* 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
442
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
443 void
52298
1a4bd2bec861 Create and initialize a client leader window so session management
Jan Djärv <jan.h.d@swipnet.se>
parents: 50016
diff changeset
444 x_session_initialize (dpyinfo)
1a4bd2bec861 Create and initialize a client leader window so session management
Jan Djärv <jan.h.d@swipnet.se>
parents: 50016
diff changeset
445 struct x_display_info *dpyinfo;
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
446 {
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
447 #define SM_ERRORSTRING_LEN 512
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
448 char errorstring[SM_ERRORSTRING_LEN];
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
449 char* previous_id = NULL;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
450 SmcCallbacks callbacks;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
451 int name_len = 0;
47942
080b4586492b Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents: 46370
diff changeset
452
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
453 /* 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
454 have a previous id. */
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
455 if (! EQ (Vx_session_previous_id, Qnil) && STRINGP (Vx_session_previous_id))
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 45803
diff changeset
456 previous_id = SDATA (Vx_session_previous_id);
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
457
57704
4ff1d695430a * xsmfns.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents: 56135
diff changeset
458 /* 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
459 if (! EQ (Vinvocation_directory, Qnil))
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 45803
diff changeset
460 name_len += strlen (SDATA (Vinvocation_directory));
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 45803
diff changeset
461 name_len += strlen (SDATA (Vinvocation_name));
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
462
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
463 /* 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
464 not very large */
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
465 emacs_program = xmalloc (name_len + 1);
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
466 emacs_program[0] = '\0';
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
467
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
468 if (! EQ (Vinvocation_directory, Qnil))
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 45803
diff changeset
469 strcpy (emacs_program, SDATA (Vinvocation_directory));
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 45803
diff changeset
470 strcat (emacs_program, SDATA (Vinvocation_name));
47942
080b4586492b Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents: 46370
diff changeset
471
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
472 /* 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
473 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
474 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
475 callbacks.save_yourself.client_data = 0;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
476 callbacks.die.callback = smc_die_CB;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
477 callbacks.die.client_data = 0;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
478 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
479 callbacks.save_complete.client_data = 0;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
480 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
481 callbacks.shutdown_cancelled.client_data = 0;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
482
57704
4ff1d695430a * xsmfns.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents: 56135
diff changeset
483 /* Set error handlers. */
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
484 SmcSetErrorHandler (smc_error_handler);
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
485 IceSetErrorHandler (ice_error_handler);
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
486 IceSetIOErrorHandler (ice_io_error_handler);
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
487
57704
4ff1d695430a * xsmfns.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents: 56135
diff changeset
488 /* 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
489 IceAddConnectionWatch (ice_conn_watch_CB, 0);
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
490
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
491 /* 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
492 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
493 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
494 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
495 (SmcSaveYourselfProcMask|
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
496 SmcDieProcMask|
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
497 SmcSaveCompleteProcMask|
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
498 SmcShutdownCancelledProcMask),
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
499 &callbacks,
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
500 previous_id,
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
501 &client_id,
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
502 SM_ERRORSTRING_LEN,
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
503 errorstring);
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
504
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
505 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
506 {
1a4bd2bec861 Create and initialize a client leader window so session management
Jan Djärv <jan.h.d@swipnet.se>
parents: 50016
diff changeset
507 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
508
1a4bd2bec861 Create and initialize a client leader window so session management
Jan Djärv <jan.h.d@swipnet.se>
parents: 50016
diff changeset
509 #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
510 /* 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
511 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
512 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
513 #else
1a4bd2bec861 Create and initialize a client leader window so session management
Jan Djärv <jan.h.d@swipnet.se>
parents: 50016
diff changeset
514 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
515 #endif
1a4bd2bec861 Create and initialize a client leader window so session management
Jan Djärv <jan.h.d@swipnet.se>
parents: 50016
diff changeset
516 }
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
517 }
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
518
83350
e7d5238afe52 Work around crashes in X session management after normal shutdown of X server.
Karoly Lorentey <lorentey@elte.hu>
parents: 83332
diff changeset
519 /* 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
520
e7d5238afe52 Work around crashes in X session management after normal shutdown of X server.
Karoly Lorentey <lorentey@elte.hu>
parents: 83332
diff changeset
521 void
e7d5238afe52 Work around crashes in X session management after normal shutdown of X server.
Karoly Lorentey <lorentey@elte.hu>
parents: 83332
diff changeset
522 x_session_close ()
e7d5238afe52 Work around crashes in X session management after normal shutdown of X server.
Karoly Lorentey <lorentey@elte.hu>
parents: 83332
diff changeset
523 {
e7d5238afe52 Work around crashes in X session management after normal shutdown of X server.
Karoly Lorentey <lorentey@elte.hu>
parents: 83332
diff changeset
524 ice_fd = -1;
e7d5238afe52 Work around crashes in X session management after normal shutdown of X server.
Karoly Lorentey <lorentey@elte.hu>
parents: 83332
diff changeset
525 }
e7d5238afe52 Work around crashes in X session management after normal shutdown of X server.
Karoly Lorentey <lorentey@elte.hu>
parents: 83332
diff changeset
526
43810
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 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
529 Shandle_save_session, 1, 1, "e",
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
530 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
531 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
532 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
533 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
534 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
535 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
536 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
537 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
538
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
539 Do not call this function yourself. */)
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
540 (event)
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
541 Lisp_Object event;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
542 {
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
543 /* 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
544 this at the wrong time. */
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
545 if (doing_interact)
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
546 {
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
547 Bool cancel_shutdown = False;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
548
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
549 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
550
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
551 SmcInteractDone (smc_conn, cancel_shutdown);
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
552 SmcSaveYourselfDone (smc_conn, True);
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
553
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
554 doing_interact = False;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
555 }
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
556
833c0585a612 Added return value to Fhandle_save_session to avoid compiler warning.
Jan Djärv <jan.h.d@swipnet.se>
parents: 43848
diff changeset
557 return Qnil;
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
558 }
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
559
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
560
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
561 /***********************************************************************
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
562 Initialization
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
563 ***********************************************************************/
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
564 void
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
565 syms_of_xsmfns ()
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
566 {
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
567 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
568 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
569 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
570 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
571 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
572 `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
573 Vx_session_id = Qnil;
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
574
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
575 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
576 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
577 If Emacs is running on a window system that has a session manager, the
080b4586492b Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents: 46370
diff changeset
578 session manager gives Emacs a session id. It is feasible for Emacs lisp
080b4586492b Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents: 46370
diff changeset
579 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
580 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
581 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
582 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
583
47942
080b4586492b Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents: 46370
diff changeset
584 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
585 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
586 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
587 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
588 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
589
47942
080b4586492b Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents: 46370
diff changeset
590 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
591 `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
592 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
593
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
594 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
595 `emacs-session-restore'." */);
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
596 Vx_session_previous_id = Qnil;
47942
080b4586492b Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents: 46370
diff changeset
597
43810
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
598 defsubr (&Shandle_save_session);
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
599 }
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
600
3d8039f847f5 New file for X session management.
Jan Djärv <jan.h.d@swipnet.se>
parents:
diff changeset
601 #endif /* HAVE_X_SM */
52401
695cf19ef79e Add arch taglines
Miles Bader <miles@gnu.org>
parents: 52298
diff changeset
602
695cf19ef79e Add arch taglines
Miles Bader <miles@gnu.org>
parents: 52298
diff changeset
603 /* arch-tag: 56a2c58c-adfa-430a-b772-130abd29fd2e
695cf19ef79e Add arch taglines
Miles Bader <miles@gnu.org>
parents: 52298
diff changeset
604 (do not change this comment) */