From 3c4d73c48403198a7d2db8d36a6174082840b58d Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Sun, 6 May 2007 11:14:20 +0000 Subject: [PATCH] save session state for old clients that dont use XSMP. more session improvements. with ksmserver we can save a few things before the clients go messing with stuff during the interactive phase. --- openbox/client.c | 46 +++++++++++++++++-------- openbox/client.h | 4 +++ openbox/event.c | 2 ++ openbox/prop.c | 1 + openbox/prop.h | 1 + openbox/session.c | 85 +++++++++++++++++++++++++++++++++++++---------- openbox/session.h | 2 +- 7 files changed, 109 insertions(+), 32 deletions(-) diff --git a/openbox/client.c b/openbox/client.c index 210307c3..cbd42ef4 100644 --- a/openbox/client.c +++ b/openbox/client.c @@ -612,6 +612,7 @@ void client_unmanage(ObClient *self) g_free(self->icons[j].data); if (self->nicons > 0) g_free(self->icons); + g_free(self->wm_command); g_free(self->title); g_free(self->icon_title); g_free(self->name); @@ -994,6 +995,7 @@ static void client_get_all(ObClient *self) client_update_title(self); client_update_class(self); client_update_sm_client_id(self); + client_update_command(self); client_update_strut(self); client_update_icons(self); client_update_user_time(self); @@ -3579,20 +3581,36 @@ void client_update_sm_client_id(ObClient *self) g_free(self->sm_client_id); self->sm_client_id = NULL; - if (!PROP_GETS(self->window, sm_client_id, locale, &self->sm_client_id) && - self->group) { - ob_debug_type(OB_DEBUG_SM, "Client %s does not have session id\n", - self->title); - if (!PROP_GETS(self->group->leader, sm_client_id, locale, - &self->sm_client_id)) { - ob_debug_type(OB_DEBUG_SM, "Client %s does not have session id on " - "group window\n", self->title); - } else - ob_debug_type(OB_DEBUG_SM, "Client %s has session id on " - "group window\n", self->title); - } else - ob_debug_type(OB_DEBUG_SM, "Client %s has session id\n", - self->title); + if (!PROP_GETS(self->window, sm_client_id, locale, &self->sm_client_id)) + if (self->group) + PROP_GETS(self->group->leader, sm_client_id, locale, + &self->sm_client_id); +} + +void client_update_command(ObClient *self) +{ + gchar **data; + + g_free(self->wm_command); + self->wm_command = NULL; + + if (PROP_GETSS(self->window, wm_command, locale, &data)) { + /* merge/mash them all together */ + gchar *merge = NULL; + gint i; + + for (i = 0; data[i]; ++i) { + gchar *tmp = merge; + if (merge) + merge = g_strconcat(merge, data[i], NULL); + else + merge = g_strconcat(data[i], NULL); + g_free(tmp); + } + g_strfreev(data); + + self->wm_command = merge; + } } #define WANT_EDGE(cur, c) \ diff --git a/openbox/client.h b/openbox/client.h index 3fab451e..6b28d457 100644 --- a/openbox/client.h +++ b/openbox/client.h @@ -118,6 +118,8 @@ struct _ObClient gchar *icon_title; /*! Hostname of machine running the client */ gchar *client_machine; + /*! The command used to run the program. Pre-XSMP window identification. */ + gchar *wm_command; /*! The application that created the window */ gchar *name; @@ -582,6 +584,8 @@ void client_update_normal_hints(ObClient *self); void client_update_wmhints(ObClient *self); /*! Updates the window's title and icon title */ void client_update_title(ObClient *self); +/*! Updates the command used to run the program */ +void client_update_command(ObClient *self); /*! Updates the window's application name and class */ void client_update_class(ObClient *self); /*! Updates the strut for the client */ diff --git a/openbox/event.c b/openbox/event.c index 2dcb6af2..cc875d56 100644 --- a/openbox/event.c +++ b/openbox/event.c @@ -1128,6 +1128,8 @@ static void event_handle_client(ObClient *client, XEvent *e) msgtype == prop_atoms.net_wm_icon_name || msgtype == prop_atoms.wm_icon_name) { client_update_title(client); + } else if (msgtype == prop_atoms.wm_command) { + client_update_command(client); } else if (msgtype == prop_atoms.wm_class) { client_update_class(client); } else if (msgtype == prop_atoms.wm_protocols) { diff --git a/openbox/prop.c b/openbox/prop.c index 4d366a59..15be0292 100644 --- a/openbox/prop.c +++ b/openbox/prop.c @@ -49,6 +49,7 @@ void prop_startup() CREATE(wm_class, "WM_CLASS"); CREATE(wm_window_role, "WM_WINDOW_ROLE"); CREATE(wm_client_machine, "WM_CLIENT_MACHINE"); + CREATE(wm_command, "WM_COMMAND"); CREATE(motif_wm_hints, "_MOTIF_WM_HINTS"); CREATE(sm_client_id, "SM_CLIENT_ID"); diff --git a/openbox/prop.h b/openbox/prop.h index 75431b95..e256d480 100644 --- a/openbox/prop.h +++ b/openbox/prop.h @@ -51,6 +51,7 @@ typedef struct Atoms { Atom wm_class; Atom wm_window_role; Atom wm_client_machine; + Atom wm_command; Atom motif_wm_hints; /* SM atoms */ diff --git a/openbox/session.c b/openbox/session.c index 64ed1787..2b53784e 100644 --- a/openbox/session.c +++ b/openbox/session.c @@ -35,6 +35,7 @@ GList* session_state_find(struct _ObClient *c) { return NULL; } #include "openbox.h" #include "client.h" #include "prop.h" +#include "focus.h" #include "screen.h" #include "gettext.h" #include "parser/parse.h" @@ -56,10 +57,16 @@ static SmcConn sm_conn; static gint sm_argc; static gchar **sm_argv; +/* Data saved from the first level save yourself */ +typedef struct { + ObClient *focus_client; + gint desktop; +} ObSMSaveData; + static gboolean session_connect(); -static void session_load_file(gchar *path); -static gboolean session_save_to_file(); +static void session_load_file(const gchar *path); +static gboolean session_save_to_file(const ObSMSaveData *savedata); static void session_setup_program(); static void session_setup_user(); @@ -336,15 +343,27 @@ static void session_setup_restart_command() g_free(vals); } +static ObSMSaveData *sm_save_get_data() +{ + ObSMSaveData *savedata = g_new0(ObSMSaveData, 1); + savedata->focus_client = focus_client; + savedata->desktop = screen_desktop; + return savedata; +} + static void sm_save_yourself_2(SmcConn conn, SmPointer data) { gboolean success; + ObSMSaveData *savedata = data; /* save the current state */ ob_debug_type(OB_DEBUG_SM, "Session save phase 2 requested\n"); ob_debug_type(OB_DEBUG_SM, " Saving session to file '%s'\n", ob_sm_save_file); - success = session_save_to_file(); + if (savedata == NULL) + savedata = sm_save_get_data(); + success = session_save_to_file(savedata); + g_free(savedata); /* tell the session manager how to restore this state */ if (success) session_setup_restart_command(); @@ -357,9 +376,22 @@ static void sm_save_yourself_2(SmcConn conn, SmPointer data) static void sm_save_yourself(SmcConn conn, SmPointer data, gint save_type, Bool shutdown, gint interact_style, Bool fast) { + ObSMSaveData *savedata = NULL; + gchar *vendor; + ob_debug_type(OB_DEBUG_SM, "Session save requested\n"); - if (!SmcRequestSaveYourselfPhase2(conn, sm_save_yourself_2, data)) { + vendor = SmcVendor(sm_conn); + ob_debug_type(OB_DEBUG_SM, "Session manager's vendor: %s\n", vendor); + + if (!strcmp(vendor, "KDE")) { + /* ksmserver guarantees that phase 1 will complete before allowing any + clients interaction, so we can save this sanely here before they + get messed up from interaction */ + savedata = sm_save_get_data(); + } + + if (!SmcRequestSaveYourselfPhase2(conn, sm_save_yourself_2, savedata)) { ob_debug_type(OB_DEBUG_SM, "Requst for phase 2 failed\n"); SmcSaveYourselfDone(conn, FALSE); } @@ -381,7 +413,7 @@ static void sm_shutdown_cancelled(SmcConn conn, SmPointer data) ob_debug_type(OB_DEBUG_SM, "Shutdown cancelled\n"); } -static gboolean session_save_to_file() +static gboolean session_save_to_file(const ObSMSaveData *savedata) { FILE *f; GList *it; @@ -396,7 +428,7 @@ static gboolean session_save_to_file() fprintf(f, "\n\n"); fprintf(f, "\n\n"); - fprintf(f, "%d\n", screen_desktop); + fprintf(f, "%d\n", savedata->desktop); /* they are ordered top to bottom in stacking order */ for (it = stacking_list; it; it = g_list_next(it)) { @@ -413,10 +445,16 @@ static gboolean session_save_to_file() continue; if (!c->sm_client_id) { - ob_debug_type(OB_DEBUG_SM, "Client %s does not have a client " - "id set, so we can't save its state\n", + ob_debug_type(OB_DEBUG_SM, "Client %s does not have a " + "session id set\n", c->title); - continue; + if (!c->wm_command) { + ob_debug_type(OB_DEBUG_SM, "Client %s does not have an " + "oldskool wm_command set either. We won't " + "be saving its data\n", + c->title); + continue; + } } ob_debug_type(OB_DEBUG_SM, "Saving state for client %s\n", @@ -441,7 +479,10 @@ static gboolean session_save_to_file() preh = c->pre_max_area.height; } - fprintf(f, "\n", c->sm_client_id); + if (c->sm_client_id) + fprintf(f, "\n", c->sm_client_id); + else + fprintf(f, "\n", c->wm_command); t = g_markup_escape_text(c->name, -1); fprintf(f, "\t%s\n", t); @@ -480,7 +521,7 @@ static gboolean session_save_to_file() fprintf(f, "\t\n"); if (c->undecorated) fprintf(f, "\t\n"); - if (client_focused(c)) + if (savedata->focus_client == c) fprintf(f, "\t\n"); fprintf(f, "\n\n"); } @@ -502,6 +543,7 @@ static void session_state_free(ObSessionState *state) { if (state) { g_free(state->id); + g_free(state->command); g_free(state->name); g_free(state->class); g_free(state->role); @@ -517,15 +559,23 @@ static gboolean session_state_cmp(ObSessionState *s, ObClient *c) ob_debug_type(OB_DEBUG_SM, " client name: %s \n", c->name); ob_debug_type(OB_DEBUG_SM, " client class: %s \n", c->class); ob_debug_type(OB_DEBUG_SM, " client role: %s \n", c->role); + ob_debug_type(OB_DEBUG_SM, " client command: %s \n", + c->wm_command ? c->wm_command : "(null)"); ob_debug_type(OB_DEBUG_SM, " state id: %s \n", s->id); ob_debug_type(OB_DEBUG_SM, " state name: %s \n", s->name); ob_debug_type(OB_DEBUG_SM, " state class: %s \n", s->class); ob_debug_type(OB_DEBUG_SM, " state role: %s \n", s->role); - return (c->sm_client_id && - !strcmp(s->id, c->sm_client_id) && - !strcmp(s->name, c->name) && - !strcmp(s->class, c->class) && - !strcmp(s->role, c->role)); + ob_debug_type(OB_DEBUG_SM, " state command: %s \n", + s->command ? s->command : "(null)"); + + if ((c->sm_client_id && s->id && !strcmp(c->sm_client_id, s->id)) || + (c->wm_command && s->command && !strcmp(c->wm_command, s->command))) + { + return (!strcmp(s->name, c->name) && + !strcmp(s->class, c->class) && + !strcmp(s->role, c->role)); + } + return FALSE; } GList* session_state_find(ObClient *c) @@ -542,7 +592,7 @@ GList* session_state_find(ObClient *c) return it; } -static void session_load_file(gchar *path) +static void session_load_file(const gchar *path) { xmlDocPtr doc; xmlNodePtr node, n; @@ -561,6 +611,7 @@ static void session_load_file(gchar *path) state = g_new0(ObSessionState, 1); if (!parse_attr_string("id", node, &state->id)) + if (!parse_attr_string("command", node, &state->command)) goto session_load_bail; if (!(n = parse_find_node("name", node->children))) goto session_load_bail; diff --git a/openbox/session.h b/openbox/session.h index cbfd5177..8663fce2 100644 --- a/openbox/session.h +++ b/openbox/session.h @@ -26,7 +26,7 @@ struct _ObClient; typedef struct _ObSessionState ObSessionState; struct _ObSessionState { - gchar *id, *name, *class, *role; + gchar *id, *command, *name, *class, *role; guint desktop; gint x, y, w, h; gboolean shaded, iconic, skip_pager, skip_taskbar, fullscreen; -- 2.39.2