summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--configure.in4
-rw-r--r--src/main.c29
-rw-r--r--src/session.c55
-rw-r--r--src/session.h3
5 files changed, 68 insertions, 28 deletions
diff --git a/ChangeLog b/ChangeLog
index facbdc8..9483306 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2002-03-13 Havoc Pennington <hp@pobox.com>
+ * src/main.c (main): put back --sm-client-id argument, needed
+ for including us in a default session
+
+2002-03-13 Havoc Pennington <hp@pobox.com>
+
* src/session.c (meta_session_init): don't save a file here, only
in response to SaveYourself. Change the code to properly use a
unique state file for each SaveYourself. Totally, totally
diff --git a/configure.in b/configure.in
index 4eb2596..f9f2255 100644
--- a/configure.in
+++ b/configure.in
@@ -88,10 +88,10 @@ PKG_CHECK_MODULES(METACITY, gtk+-2.0 >= 1.3.13 gconf-2.0 >= 1.1.7)
PKG_CHECK_MODULES(METACITY_MESSAGE, gtk+-2.0 >= 1.3.13)
PKG_CHECK_MODULES(METACITY_WINDOW_DEMO, gtk+-2.0 >= 1.3.13)
-CFLAGS="$METACITY_CFLAGS $CFLAGS"
-
AC_PATH_XTRA
+CFLAGS="$METACITY_CFLAGS $CFLAGS $X_CFLAGS"
+
METACITY_LIBS="$X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $METACITY_LIBS"
found_sm=false
diff --git a/src/main.c b/src/main.c
index 9806a27..2634bf6 100644
--- a/src/main.c
+++ b/src/main.c
@@ -138,6 +138,28 @@ main (int argc, char **argv)
}
else if (strcmp (arg, "--display") == 0)
; /* wait for next arg */
+ else if (strstr (arg, "--sm-client-id=") == arg)
+ {
+ const char *id;
+
+ if (client_id)
+ meta_fatal ("Can't specify client ID twice\n");
+
+ id = strchr (arg, '=');
+ ++id;
+
+ client_id = g_strdup (id);
+ }
+ else if (prev_arg &&
+ strcmp (prev_arg, "--sm-client-id") == 0)
+ {
+ if (client_id)
+ meta_fatal ("Can't specify client ID twice\n");
+
+ client_id = g_strdup (arg);
+ }
+ else if (strcmp (arg, "--sm-client-id") == 0)
+ ; /* wait for next arg */
else if (strstr (arg, "--sm-save-file=") == arg)
{
const char *file;
@@ -167,7 +189,10 @@ main (int argc, char **argv)
++i;
}
-
+
+ if (save_file && client_id)
+ meta_fatal ("Can't specify both SM save file and SM client id\n");
+
meta_main_loop = g_main_loop_new (NULL, FALSE);
if (display_name == NULL &&
@@ -243,7 +268,7 @@ main (int argc, char **argv)
* info
*/
if (!disable_sm)
- meta_session_init (save_file);
+ meta_session_init (client_id, save_file);
if (!meta_display_open (NULL))
meta_exit (META_EXIT_ERROR);
diff --git a/src/session.c b/src/session.c
index 2b12c88..e41c9a6 100644
--- a/src/session.c
+++ b/src/session.c
@@ -28,7 +28,8 @@
#ifndef HAVE_SM
void
-meta_session_init (const char *save_file)
+meta_session_init (const char *client_id,
+ const char *save_file)
{
meta_topic (META_DEBUG_SM, "Compiled without session management support\n");
}
@@ -68,8 +69,7 @@ static void new_ice_connection (IceConn connection, IcePointer client_data,
Bool opening, IcePointer *watch_data);
static void save_state (void);
-static void load_state (const char *previous_save_file);
-static const char* get_previous_id (void);
+static char* load_state (const char *previous_save_file);
static void regenerate_save_file (void);
static const char* full_save_file (void);
static const char* base_save_file (void);
@@ -208,21 +208,27 @@ static gpointer session_connection = NULL;
static ClientState current_state = STATE_DISCONNECTED;
void
-meta_session_init (const char *previous_save_file)
+meta_session_init (const char *previous_client_id,
+ const char *previous_save_file)
{
/* Some code here from twm */
char buf[256];
unsigned long mask;
SmcCallbacks callbacks;
- const char *previous_id;
+ char *saved_client_id;
meta_topic (META_DEBUG_SM, "Initializing session with save file '%s'\n",
previous_save_file ? previous_save_file : "(none)");
if (previous_save_file)
- load_state (previous_save_file);
-
- previous_id = get_previous_id (); /* from the file if any, null otherwise */
+ {
+ saved_client_id = load_state (previous_save_file);
+ previous_client_id = saved_client_id;
+ }
+ else
+ {
+ saved_client_id = NULL;
+ }
ice_init ();
@@ -254,14 +260,15 @@ meta_session_init (const char *previous_save_file)
SmProtoMinor,
mask,
&callbacks,
- (char*) previous_id,
+ (char*) previous_client_id,
&client_id,
255, buf);
if (session_connection == NULL)
{
meta_warning ("Failed to open connection to session manager: %s\n", buf);
- return;
+
+ goto out;
}
else
{
@@ -270,7 +277,7 @@ meta_session_init (const char *previous_save_file)
meta_topic (META_DEBUG_SM, "Obtained session ID '%s'\n", client_id);
}
- if (previous_id && strcmp (previous_id, client_id) == 0)
+ if (previous_client_id && strcmp (previous_client_id, client_id) == 0)
current_state = STATE_IDLE;
else
current_state = STATE_REGISTERING;
@@ -338,6 +345,9 @@ meta_session_init (const char *previous_save_file)
SmcSetProperties (session_connection, 6, props);
}
+
+ out:
+ g_free (saved_client_id);
}
static void
@@ -925,7 +935,7 @@ typedef enum
typedef struct
{
MetaWindowSessionInfo *info;
-
+ char *previous_id;
} ParseData;
static void session_info_free (MetaWindowSessionInfo *info);
@@ -956,9 +966,8 @@ static GMarkupParser metacity_session_parser = {
};
static GSList *window_info_list = NULL;
-static char* previous_id = NULL;
-static void
+static char*
load_state (const char *previous_save_file)
{
GMarkupParseContext *context;
@@ -983,7 +992,7 @@ load_state (const char *previous_save_file)
session_file, error->message);
g_error_free (error);
g_free (session_file);
- return;
+ return NULL;
}
meta_topic (META_DEBUG_SM, "Parsing saved session file %s\n", session_file);
@@ -991,6 +1000,7 @@ load_state (const char *previous_save_file)
session_file = NULL;
parse_data.info = NULL;
+ parse_data.previous_id = NULL;
context = g_markup_parse_context_new (&metacity_session_parser,
0, &parse_data, NULL);
@@ -1019,10 +1029,15 @@ load_state (const char *previous_save_file)
if (parse_data.info)
session_info_free (parse_data.info);
+
+ g_free (parse_data.previous_id);
+ parse_data.previous_id = NULL;
out:
g_free (text);
+
+ return parse_data.previous_id;
}
/* FIXME this isn't very robust against bogus session files */
@@ -1052,7 +1067,7 @@ start_element_handler (GMarkupParseContext *context,
name = attribute_names[i];
val = attribute_values[i];
- if (previous_id)
+ if (pd->previous_id)
{
g_set_error (error,
G_MARKUP_ERROR,
@@ -1063,7 +1078,7 @@ start_element_handler (GMarkupParseContext *context,
if (strcmp (name, "id") == 0)
{
- previous_id = decode_text_from_utf8 (val);
+ pd->previous_id = decode_text_from_utf8 (val);
}
else
{
@@ -1297,12 +1312,6 @@ text_handler (GMarkupParseContext *context,
*/
}
-static const char*
-get_previous_id (void)
-{
- return previous_id;
-}
-
static gboolean
both_null_or_matching (const char *a,
const char *b)
diff --git a/src/session.h b/src/session.h
index cea75d2..cf02915 100644
--- a/src/session.h
+++ b/src/session.h
@@ -60,7 +60,8 @@ struct _MetaWindowSessionInfo
const MetaWindowSessionInfo* meta_window_lookup_saved_state (MetaWindow *window);
void meta_window_release_saved_state (const MetaWindowSessionInfo *info);
-void meta_session_init (const char *save_file);
+void meta_session_init (const char *client_id,
+ const char *save_file);
#endif