/* Session management module for systems which understand the X Session
management protocol.
- Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008
+ Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
Free Software Foundation, Inc.
This file is part of GNU Emacs.
-GNU Emacs is free software; you can redistribute it and/or modify
+GNU Emacs is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 3, or (at your option)
-any later version.
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
GNU Emacs is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
-along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA. */
+along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#include <config.h>
#include <X11/Xlib.h>
#include <X11/Xutil.h>
-#ifdef HAVE_STRING_H
-#include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
-
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
#include <sys/param.h>
#include <stdio.h>
+#include <setjmp.h>
#include "lisp.h"
#include "systime.h"
/* The descriptor that we use to check for data from the session manager. */
-static int ice_fd = -1;
+static int ice_fd;
/* A flag that says if we are in shutdown interactions or not. */
-static int doing_interact = False;
+static int doing_interact;
/* The session manager object for the session manager connection. */
#define NOSPLASH_OPT "--no-splash"
+static void
+ice_connection_closed ()
+{
+ if (ice_fd >= 0)
+ delete_keyboard_wait_descriptor (ice_fd);
+ ice_fd = -1;
+}
+
/* Handle any messages from the session manager. If no connection is
open to a session manager, just return 0.
{
SELECT_TYPE read_fds;
EMACS_TIME tmout;
+ int ret;
if (ice_fd == -1) return 0;
-
FD_ZERO (&read_fds);
FD_SET (ice_fd, &read_fds);
will be called. */
emacs_event.kind = NO_EVENT;
- if (select (ice_fd+1, &read_fds,
- (SELECT_TYPE *)0, (SELECT_TYPE *)0, &tmout) < 0)
+ ret = select (ice_fd+1, &read_fds,
+ (SELECT_TYPE *)0, (SELECT_TYPE *)0, &tmout);
+
+ if (ret < 0)
{
- ice_fd = -1;
- return 0;
+ ice_connection_closed ();
+ }
+ else if (ret > 0 && FD_ISSET (ice_fd, &read_fds))
+ {
+ ret = IceProcessMessages (SmcGetIceConnection (smc_conn),
+ (IceReplyWaitInfo *)0, (Bool *)0);
+ if (ret != IceProcessMessagesSuccess)
+ {
+ /* Either IO error or Connection closed. */
+ if (ret == IceProcessMessagesIOError)
+ IceCloseConnection (SmcGetIceConnection (smc_conn));
+
+ ice_connection_closed ();
+ }
}
-
-
- if (FD_ISSET (ice_fd, &read_fds))
- IceProcessMessages (SmcGetIceConnection (smc_conn),
- (IceReplyWaitInfo *)0, (Bool *)0);
-
/* Check if smc_interact_CB was called and we shall generate a
SAVE_SESSION_EVENT. */
- if (emacs_event.kind == NO_EVENT)
- return 0;
+ if (emacs_event.kind != NO_EVENT)
+ bcopy (&emacs_event, bufp, sizeof (struct input_event));
- bcopy (&emacs_event, bufp, sizeof (struct input_event));
- return 1;
+ return emacs_event.kind != NO_EVENT ? 1 : 0;
}
/* Return non-zero if we have a connection to a session manager. */
xfree (smid_opt);
- if (cwd)
- free (cwd);
+ free (cwd);
/* See if we maybe shall interact with the user. */
if (interactStyle != SmInteractStyleAny
SmPointer clientData;
{
SmcCloseConnection (smcConn, 0, 0);
- ice_fd = -1;
+ ice_connection_closed ();
}
/* We don't use the next two but they are mandatory, leave them empty.
IceConn iceConn;
{
/* Connection probably gone. */
- ice_fd = -1;
+ ice_connection_closed ();
}
/* This is called when the ICE connection is created or closed. The SM library
{
if (! opening)
{
- ice_fd = -1;
+ ice_connection_closed ();
return;
}
ice_fd = IceConnectionNumber (iceConn);
-#ifndef F_SETOWN_BUG
#ifdef F_SETOWN
-#ifdef F_SETOWN_SOCK_NEG
- /* stdin is a socket here */
- fcntl (ice_fd, F_SETOWN, -getpid ());
-#else /* ! defined (F_SETOWN_SOCK_NEG) */
fcntl (ice_fd, F_SETOWN, getpid ());
-#endif /* ! defined (F_SETOWN_SOCK_NEG) */
#endif /* ! defined (F_SETOWN) */
-#endif /* F_SETOWN_BUG */
#ifdef SIGIO
if (interrupt_input)
init_sigio (ice_fd);
#endif /* ! defined (SIGIO) */
+
+ add_keyboard_wait_descriptor (ice_fd);
}
/* Create the client leader window. */
SmcCallbacks callbacks;
int name_len = 0;
+ ice_fd = -1;
+ doing_interact = False;
+
/* Check if we where started by the session manager. If so, we will
have a previous id. */
if (! EQ (Vx_session_previous_id, Qnil) && STRINGP (Vx_session_previous_id))
void
x_session_close ()
{
- ice_fd = -1;
+ ice_connection_closed ();
}