X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fsession.c;h=2894c435f92251cab9a11938b32432cb961e010f;hb=8fe0cb8989c1fe12b30b9030b446345f25340d35;hp=2ad31ee613b09027809ea00f3f614fb6acc19426;hpb=860020c1e1b62a0aa9297745f24870b822edba42;p=chaz%2Fopenbox diff --git a/openbox/session.c b/openbox/session.c index 2ad31ee6..2894c435 100644 --- a/openbox/session.c +++ b/openbox/session.c @@ -2,10 +2,15 @@ #ifndef USE_SM -void session_load(char *path) {} -void session_startup(int argc, char **argv) {} +#include "session.h" +#include "client.h" + +GList *session_saved_state; + +void session_startup(int *argc, char ***argv) {} void session_shutdown() {} -ObSessionState* session_state_find(struct _ObClient *c) { return NULL; } +GList* session_state_find(ObClient *c) { return NULL; } +gboolean session_state_cmp(ObSessionState *s, ObClient *c) { return FALSE; } void session_state_free(ObSessionState *state) {} #else @@ -15,6 +20,7 @@ void session_state_free(ObSessionState *state) {} #include "session.h" #include "client.h" #include "prop.h" +#include "gettext.h" #include "parser/parse.h" #include @@ -28,12 +34,16 @@ void session_state_free(ObSessionState *state) {} #include +GList *session_saved_state; + +static gboolean sm_disable; static SmcConn sm_conn; static gchar *save_file; +static gchar *sm_id; static gint sm_argc; static gchar **sm_argv; -static GSList *sm_saved_state; +static void session_load(char *path); static gboolean session_save(); static void sm_save_yourself(SmcConn conn, SmPointer data, int save_type, @@ -47,54 +57,32 @@ static void save_commands() SmProp *props[2]; SmProp prop_cmd = { SmCloneCommand, SmLISTofARRAY8, 1, }; SmProp prop_res = { SmRestartCommand, SmLISTofARRAY8, }; - gint i, j, n; - gboolean has_id = FALSE, has_file = FALSE; - - for (i = 1; !has_id && !has_file && i < sm_argc - 1; ++i) { - if (!has_id && strcmp(sm_argv[i], "--sm-client-id") == 0) - has_id = TRUE; - if (!has_file && strcmp(sm_argv[i], "--sm-save-file") == 0) - has_file = TRUE; - } + gint i; - n = (has_file ? sm_argc-2 : sm_argc); - n = (has_id ? n-2 : n); - prop_cmd.vals = g_new(SmPropValue, n); - prop_cmd.num_vals = n; - for (i = 0, j = 0; i < sm_argc; ++i, ++j) { - if (strcmp (sm_argv[i], "--sm-client-id") == 0 || - strcmp (sm_argv[i], "--sm-save-file") == 0) { - ++i, --j; /* skip the next as well, keep j where it is */ - } else { - prop_cmd.vals[j].value = sm_argv[i]; - prop_cmd.vals[j].length = strlen(sm_argv[i]); - } + prop_cmd.vals = g_new(SmPropValue, sm_argc); + prop_cmd.num_vals = sm_argc; + for (i = 0; i < sm_argc; ++i) { + prop_cmd.vals[i].value = sm_argv[i]; + prop_cmd.vals[i].length = strlen(sm_argv[i]); } - n = (has_file ? sm_argc : sm_argc+2); - n = (has_id ? n-2 : n); - prop_res.vals = g_new(SmPropValue, n); - prop_res.num_vals = n; - for (i = 0, j = 0; i < sm_argc; ++i, ++j) { - if (strcmp (sm_argv[i], "--sm-client-id") == 0 || - strcmp (sm_argv[i], "--sm-save-file") == 0) { - ++i, --j; /* skip the next as well, keep j where it is */ - } else { - prop_res.vals[j].value = sm_argv[i]; - prop_res.vals[j].length = strlen(sm_argv[i]); - } + prop_res.vals = g_new(SmPropValue, sm_argc + 2); + prop_res.num_vals = sm_argc + 2; + for (i = 0; i < sm_argc; ++i) { + prop_res.vals[i].value = sm_argv[i]; + prop_res.vals[i].length = strlen(sm_argv[i]); } if (save_file) { - prop_res.vals[j].value = "--sm-save-file"; - prop_res.vals[j++].length = strlen("--sm-save-file"); - prop_res.vals[j].value = save_file; - prop_res.vals[j++].length = strlen(save_file); + prop_res.vals[i].value = "--sm-save-file"; + prop_res.vals[i++].length = strlen("--sm-save-file"); + prop_res.vals[i].value = save_file; + prop_res.vals[i++].length = strlen(save_file); } else { - prop_res.vals[j].value = "--sm-client-id"; - prop_res.vals[j++].length = strlen("--sm-client-id"); - prop_res.vals[j].value = ob_sm_id; - prop_res.vals[j++].length = strlen(ob_sm_id); + prop_res.vals[i].value = "--sm-client-id"; + prop_res.vals[i++].length = strlen("--sm-client-id"); + prop_res.vals[i].value = sm_id; + prop_res.vals[i++].length = strlen(sm_id); } props[0] = &prop_res; @@ -105,15 +93,59 @@ static void save_commands() g_free(prop_cmd.vals); } -void session_startup(int argc, char **argv) +static void remove_two_args(int *argc, char ***argv, int index) +{ + int i; + + for (i = index; i < index + 2; ++i) + (*argv)[i] = (*argv)[i+2]; + *argc -= 2; +} + +static void parse_args(int *argc, char ***argv) +{ + int i; + + for (i = 1; i < *argc; ++i) { + if (!strcmp((*argv)[i], "--sm-client-id")) { + if (i == *argc - 1) /* no args left */ + g_printerr(_("--sm-client-id requires an argument\n")); + else { + sm_id = g_strdup((*argv)[i+1]); + remove_two_args(argc, argv, i); + ++i; + } + } else if (!strcmp((*argv)[i], "--sm-save-file")) { + if (i == *argc - 1) /* no args left */ + g_printerr(_("--sm-save-file requires an argument\n")); + else { + save_file = g_strdup((*argv)[i+1]); + remove_two_args(argc, argv, i); + ++i; + } + } else if (!strcmp((*argv)[i], "--sm-disable")) { + sm_disable = TRUE; + } + } +} + +void session_startup(int *argc, char ***argv) { #define SM_ERR_LEN 1024 SmcCallbacks cb; char sm_err[SM_ERR_LEN]; - sm_argc = argc; - sm_argv = argv; + parse_args(argc, argv); + + if (sm_disable) + return; + + if (save_file) + session_load(save_file); + + sm_argc = *argc; + sm_argv = *argv; cb.save_yourself.callback = sm_save_yourself; cb.save_yourself.client_data = NULL; @@ -132,7 +164,7 @@ void session_startup(int argc, char **argv) SmcDieProcMask | SmcSaveCompleteProcMask | SmcShutdownCancelledProcMask, - &cb, ob_sm_id, &ob_sm_id, + &cb, sm_id, &sm_id, SM_ERR_LEN, sm_err); if (sm_conn == NULL) g_warning("Failed to connect to session manager: %s", sm_err); @@ -151,8 +183,8 @@ void session_startup(int argc, char **argv) gchar hint, pri; gchar pid[32]; - val_prog.value = argv[0]; - val_prog.length = strlen(argv[0]); + val_prog.value = sm_argv[0]; + val_prog.length = strlen(sm_argv[0]); val_uid.value = g_strdup(g_get_user_name()); val_uid.length = strlen(val_uid.value); @@ -187,14 +219,13 @@ void session_startup(int argc, char **argv) g_free(val_uid.value); save_commands(); - - ob_debug("Connected to session manager with id %s\n", ob_sm_id); } } void session_shutdown() { g_free(save_file); + g_free(sm_id); if (sm_conn) { SmPropValue val_hint; @@ -214,6 +245,12 @@ void session_shutdown() SmcSetProperties(sm_conn, 1, props); SmcCloseConnection(sm_conn, 0, NULL); + + while (session_saved_state) { + session_state_free(session_saved_state->data); + session_saved_state = g_list_delete_link(session_saved_state, + session_saved_state); + } } } @@ -221,8 +258,6 @@ static void sm_save_yourself_phase2(SmcConn conn, SmPointer data) { gboolean success; - ob_debug("got SAVE YOURSELF PHASE 2 from session manager\n"); - success = session_save(); save_commands(); @@ -232,8 +267,6 @@ static void sm_save_yourself_phase2(SmcConn conn, SmPointer data) static void sm_save_yourself(SmcConn conn, SmPointer data, int save_type, Bool shutdown, int interact_style, Bool fast) { - ob_debug("got SAVE YOURSELF from session manager\n"); - if (!SmcRequestSaveYourselfPhase2(conn, sm_save_yourself_phase2, data)) { ob_debug("SAVE YOURSELF PHASE 2 failed\n"); SmcSaveYourselfDone(conn, FALSE); @@ -243,17 +276,14 @@ static void sm_save_yourself(SmcConn conn, SmPointer data, int save_type, static void sm_die(SmcConn conn, SmPointer data) { ob_exit(); - ob_debug("got DIE from session manager\n"); } static void sm_save_complete(SmcConn conn, SmPointer data) { - ob_debug("got SAVE COMPLETE from session manager\n"); } static void sm_shutdown_cancelled(SmcConn conn, SmPointer data) { - ob_debug("got SHUTDOWN CANCELLED from session manager\n"); } static gboolean session_save() @@ -278,16 +308,23 @@ static gboolean session_save() g_warning("unable to save the session to %s: %s", save_file, strerror(errno)); } else { + guint stack_pos = 0; + fprintf(f, "\n\n"); - fprintf(f, "\n\n", ob_sm_id); + fprintf(f, "\n\n", sm_id); - for (it = client_list; it; it = g_list_next(it)) { + for (it = stacking_list; it; it = g_list_next(it)) { guint num; gint32 *dimensions; gint prex, prey, prew, preh; - ObClient *c = it->data; + ObClient *c; gchar *client_id, *t; + if (WINDOW_IS_CLIENT(it->data)) + c = WINDOW_AS_CLIENT(it->data); + else + continue; + if (!client_normal(c)) continue; @@ -324,6 +361,7 @@ static gboolean session_save() g_free(t); fprintf(f, "\t%d\n", c->desktop); + fprintf(f, "\t%d\n", stack_pos); fprintf(f, "\t%d\n", prex); fprintf(f, "\t%d\n", prey); fprintf(f, "\t%d\n", prew); @@ -348,6 +386,8 @@ static gboolean session_save() fprintf(f, "\t\n"); fprintf(f, "\n\n"); + ++stack_pos; + g_free(client_id); } @@ -376,57 +416,60 @@ void session_state_free(ObSessionState *state) } } -static gboolean session_state_cmp(ObSessionState *s, ObClient *c) +gboolean session_state_cmp(ObSessionState *s, ObClient *c) { gchar *client_id; if (!(client_id = client_get_sm_client_id(c))) return FALSE; - g_print("\nsaved %s\nnow %s\n", s->id, client_id); if (strcmp(s->id, client_id)) { g_free(client_id); return FALSE; } g_free(client_id); - g_print("saved %s\nnow %s\n", s->name, c->name); if (strcmp(s->name, c->name)) return FALSE; - g_print("saved %s\nnow %s\n", s->class, c->class); if (strcmp(s->class, c->class)) return FALSE; - g_print("saved %s\nnow %s\n\n", s->role, c->role); if (strcmp(s->role, c->role)) return FALSE; return TRUE; } -ObSessionState* session_state_find(ObClient *c) +GList* session_state_find(ObClient *c) { - GSList *it; + GList *it; - for (it = sm_saved_state; it; it = g_slist_next(it)) - if (session_state_cmp(it->data, c)) { - ObSessionState *s = it->data; - sm_saved_state = g_slist_remove(sm_saved_state, s); - return s; + for (it = session_saved_state; it; it = g_list_next(it)) { + ObSessionState *s = it->data; + if (!s->matched && session_state_cmp(s, c)) { + s->matched = TRUE; + break; } - return NULL; + } + return it; } -void session_load(char *path) +static gint stack_sort(const ObSessionState *s1, const ObSessionState *s2) +{ + return s1->stacking - s2->stacking; +} + +static void session_load(char *path) { xmlDocPtr doc; xmlNodePtr node, n; - gchar *sm_id; + gchar *id; if (!parse_load(path, "openbox_session", &doc, &node)) return; - if (!parse_attr_string("id", node, &sm_id)) + if (!parse_attr_string("id", node, &id)) return; - ob_sm_id = g_strdup(sm_id); + g_free(sm_id); + sm_id = id; - node = parse_find_node("window", node->xmlChildrenNode); + node = parse_find_node("window", node->children); while (node) { ObSessionState *state; @@ -434,52 +477,55 @@ void session_load(char *path) if (!parse_attr_string("id", node, &state->id)) goto session_load_bail; - if (!(n = parse_find_node("name", node->xmlChildrenNode))) + if (!(n = parse_find_node("name", node->children))) goto session_load_bail; state->name = parse_string(doc, n); - if (!(n = parse_find_node("class", node->xmlChildrenNode))) + if (!(n = parse_find_node("class", node->children))) goto session_load_bail; state->class = parse_string(doc, n); - if (!(n = parse_find_node("role", node->xmlChildrenNode))) + if (!(n = parse_find_node("role", node->children))) goto session_load_bail; state->role = parse_string(doc, n); - if (!(n = parse_find_node("desktop", node->xmlChildrenNode))) + if (!(n = parse_find_node("stacking", node->children))) + goto session_load_bail; + state->stacking = parse_int(doc, n); + if (!(n = parse_find_node("desktop", node->children))) goto session_load_bail; state->desktop = parse_int(doc, n); - if (!(n = parse_find_node("x", node->xmlChildrenNode))) + if (!(n = parse_find_node("x", node->children))) goto session_load_bail; state->x = parse_int(doc, n); - if (!(n = parse_find_node("y", node->xmlChildrenNode))) + if (!(n = parse_find_node("y", node->children))) goto session_load_bail; state->y = parse_int(doc, n); - if (!(n = parse_find_node("width", node->xmlChildrenNode))) + if (!(n = parse_find_node("width", node->children))) goto session_load_bail; state->w = parse_int(doc, n); - if (!(n = parse_find_node("height", node->xmlChildrenNode))) + if (!(n = parse_find_node("height", node->children))) goto session_load_bail; state->h = parse_int(doc, n); state->shaded = - parse_find_node("shaded", node->xmlChildrenNode) != NULL; + parse_find_node("shaded", node->children) != NULL; state->iconic = - parse_find_node("iconic", node->xmlChildrenNode) != NULL; + parse_find_node("iconic", node->children) != NULL; state->skip_pager = - parse_find_node("skip_pager", node->xmlChildrenNode) != NULL; + parse_find_node("skip_pager", node->children) != NULL; state->skip_taskbar = - parse_find_node("skip_taskbar", node->xmlChildrenNode) != NULL; + parse_find_node("skip_taskbar", node->children) != NULL; state->fullscreen = - parse_find_node("fullscreen", node->xmlChildrenNode) != NULL; + parse_find_node("fullscreen", node->children) != NULL; state->above = - parse_find_node("above", node->xmlChildrenNode) != NULL; + parse_find_node("above", node->children) != NULL; state->below = - parse_find_node("below", node->xmlChildrenNode) != NULL; + parse_find_node("below", node->children) != NULL; state->max_horz = - parse_find_node("max_horz", node->xmlChildrenNode) != NULL; + parse_find_node("max_horz", node->children) != NULL; state->max_vert = - parse_find_node("max_vert", node->xmlChildrenNode) != NULL; + parse_find_node("max_vert", node->children) != NULL; /* save this */ - sm_saved_state = g_slist_prepend(sm_saved_state, state); + session_saved_state = g_list_prepend(session_saved_state, state); goto session_load_ok; session_load_bail: @@ -490,6 +536,10 @@ void session_load(char *path) node = parse_find_node("window", node->next); } + /* sort them by their stacking order */ + session_saved_state = g_list_sort(session_saved_state, + (GCompareFunc)stack_sort); + xmlFreeDoc(doc); }