X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fsession.c;h=9ce04674eae453afdcbd65c08780aa91f2681339;hb=3ce8f836749c9f74f6888251f0a7f2ff601830c0;hp=f17822ce20e6882b12ee090f14550dfdaed48e6d;hpb=06fb4c7382a9c2a25e74adefbbc267417af5aadd;p=chaz%2Fopenbox diff --git a/openbox/session.c b/openbox/session.c index f17822ce..9ce04674 100644 --- a/openbox/session.c +++ b/openbox/session.c @@ -7,8 +7,7 @@ GList *session_saved_state; -void session_load(char *path) {} -void session_startup(int argc, char **argv) {} +void session_startup(int *argc, char ***argv) {} void session_shutdown() {} GList* session_state_find(ObClient *c) { return NULL; } gboolean session_state_cmp(ObSessionState *s, ObClient *c) { return FALSE; } @@ -21,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 @@ -36,11 +36,15 @@ void session_state_free(ObSessionState *state) {} 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 gchar *sm_sessions_path; +static void session_load(char *path); static gboolean session_save(); static void sm_save_yourself(SmcConn conn, SmPointer data, int save_type, @@ -54,54 +58,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; @@ -112,15 +94,63 @@ 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; + + sm_sessions_path = g_build_filename(parse_xdg_data_home_path(), + "openbox", "sessions", NULL); + parse_mkdir_path(sm_sessions_path, 0700); + + 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; @@ -139,7 +169,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); @@ -158,8 +188,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); @@ -199,7 +229,9 @@ void session_startup(int argc, char **argv) void session_shutdown() { + g_free(sm_sessions_path); g_free(save_file); + g_free(sm_id); if (sm_conn) { SmPropValue val_hint; @@ -272,8 +304,7 @@ static gboolean session_save() (int) time(NULL), (int) getpid(), g_random_int()); - save_file = g_build_filename(g_get_home_dir(), ".openbox", "sessions", - filename, NULL); + save_file = g_build_filename(sm_sessions_path, filename, NULL); g_free(filename); f = fopen(save_file, "w"); @@ -285,14 +316,14 @@ static gboolean session_save() guint stack_pos = 0; fprintf(f, "\n\n"); - fprintf(f, "\n\n", ob_sm_id); + fprintf(f, "\n\n", sm_id); for (it = stacking_list; it; it = g_list_next(it)) { guint num; gint32 *dimensions; gint prex, prey, prew, preh; ObClient *c; - gchar *client_id, *t; + gchar *t; if (WINDOW_IS_CLIENT(it->data)) c = WINDOW_AS_CLIENT(it->data); @@ -302,7 +333,7 @@ static gboolean session_save() if (!client_normal(c)) continue; - if (!(client_id = client_get_sm_client_id(c))) + if (!c->sm_client_id) continue; prex = c->area.x; @@ -320,7 +351,7 @@ static gboolean session_save() g_free(dimensions); } - fprintf(f, "\n", client_id); + fprintf(f, "\n", c->sm_client_id); t = g_markup_escape_text(c->name, -1); fprintf(f, "\t%s\n", t); @@ -361,8 +392,6 @@ static gboolean session_save() fprintf(f, "\n\n"); ++stack_pos; - - g_free(client_id); } fprintf(f, "\n"); @@ -392,22 +421,11 @@ void session_state_free(ObSessionState *state) gboolean session_state_cmp(ObSessionState *s, ObClient *c) { - gchar *client_id; - - if (!(client_id = client_get_sm_client_id(c))) - return FALSE; - if (strcmp(s->id, client_id)) { - g_free(client_id); - return FALSE; - } - g_free(client_id); - if (strcmp(s->name, c->name)) - return FALSE; - if (strcmp(s->class, c->class)) - return FALSE; - if (strcmp(s->role, c->role)) - return FALSE; - return TRUE; + 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)); } GList* session_state_find(ObClient *c) @@ -429,20 +447,21 @@ static gint stack_sort(const ObSessionState *s1, const ObSessionState *s2) return s1->stacking - s2->stacking; } -void session_load(char *path) +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; @@ -450,52 +469,52 @@ 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("stacking", 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->xmlChildrenNode))) + 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 */ session_saved_state = g_list_prepend(session_saved_state, state);