X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fsession.c;h=54ce34ed4b64544c723f1bae50e0bf215a6b3f35;hb=b338e27b3217375d07bfbddd57f3372430919085;hp=324e2848ee2066763aa68a6e6af90312562eeaaa;hpb=04a44af3c4d6365cbf7b551b9cc15eaaada28410;p=chaz%2Fopenbox diff --git a/openbox/session.c b/openbox/session.c index 324e2848..54ce34ed 100644 --- a/openbox/session.c +++ b/openbox/session.c @@ -1,10 +1,35 @@ +/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- + + session.c for the Openbox window manager + Copyright (c) 2003 Ben Jansens + + This program 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 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + See the COPYING file for a copy of the GNU General Public License. +*/ + /* This session code is largely inspired by metacity code. */ #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(gint *argc, gchar ***argv) {} void session_shutdown() {} +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 @@ -13,6 +38,7 @@ void session_shutdown() {} #include "session.h" #include "client.h" #include "prop.h" +#include "gettext.h" #include "parser/parse.h" #include @@ -26,12 +52,21 @@ void session_shutdown() {} #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 void sm_save_yourself(SmcConn conn, SmPointer data, int save_type, - Bool shutdown, int interact_style, Bool fast); +static gchar *sm_sessions_path; + +static void session_load(gchar *path); +static gboolean session_save(); + +static void sm_save_yourself(SmcConn conn, SmPointer data, gint save_type, + Bool shutdown, gint interact_style, Bool fast); static void sm_die(SmcConn conn, SmPointer data); static void sm_save_complete(SmcConn conn, SmPointer data); static void sm_shutdown_cancelled(SmcConn conn, SmPointer data); @@ -41,71 +76,106 @@ static void save_commands() SmProp *props[2]; SmProp prop_cmd = { SmCloneCommand, SmLISTofARRAY8, 1, }; SmProp prop_res = { SmRestartCommand, SmLISTofARRAY8, }; - gchar *file_path; - 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]); } - file_path = g_build_filename(g_get_home_dir(), ".openbox", "sessions", - ob_sm_id, NULL); - - prop_res.vals[j].value = "--sm-save-file"; - prop_res.vals[j++].length = strlen("--sm-save-file"); - prop_res.vals[j].value = file_path; - prop_res.vals[j++].length = strlen(file_path); + 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); props[0] = &prop_res; props[1] = &prop_cmd; - SmcSetProperties(sm_conn, 1, props); + SmcSetProperties(sm_conn, 2, props); - g_free(file_path); g_free(prop_res.vals); g_free(prop_cmd.vals); } -void session_startup(int argc, char **argv) +static void remove_args(gint *argc, gchar ***argv, gint index, gint num) +{ + gint i; + + for (i = index; i < index + num; ++i) + (*argv)[i] = (*argv)[i+num]; + *argc -= num; +} + +static void parse_args(gint *argc, gchar ***argv) +{ + gint 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_args(argc, argv, i, 2); + ++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_args(argc, argv, i, 2); + ++i; + } + } else if (!strcmp((*argv)[i], "--sm-disable")) { + sm_disable = TRUE; + remove_args(argc, argv, i, 1); + } + } +} + +void session_startup(gint *argc, gchar ***argv) { #define SM_ERR_LEN 1024 SmcCallbacks cb; - char sm_err[SM_ERR_LEN]; + gchar sm_err[SM_ERR_LEN]; + + parse_args(argc, argv); + + if (sm_disable) + return; + + sm_sessions_path = g_build_filename(parse_xdg_data_home_path(), + "openbox", "sessions", NULL); + if (!parse_mkdir_path(sm_sessions_path, 0700)) + g_warning(_("Unable to make directory '%s': %s"), + sm_sessions_path, g_strerror(errno)); + + if (save_file) + session_load(save_file); + else { + gchar *filename; + + /* this algo is from metacity */ + filename = g_strdup_printf("%d-%d-%u.obs", + (gint) time(NULL), + (gint) getpid(), + g_random_int()); + save_file = g_build_filename(sm_sessions_path, filename, NULL); + g_free(filename); + } - sm_argc = argc; - sm_argv = argv; + sm_argc = *argc; + sm_argv = *argv; cb.save_yourself.callback = sm_save_yourself; cb.save_yourself.client_data = NULL; @@ -124,10 +194,10 @@ 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); + ob_debug("Failed to connect to session manager: %s\n", sm_err); else { SmPropValue val_prog; SmPropValue val_uid; @@ -140,11 +210,11 @@ void session_startup(int argc, char **argv) SmProp prop_pid = { SmProcessID, SmARRAY8, 1, }; SmProp prop_pri = { "_GSM_Priority", SmCARD8, 1, }; SmProp *props[6]; - gulong hint, pri; + 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); @@ -153,7 +223,7 @@ void session_startup(int argc, char **argv) val_hint.value = &hint; val_hint.length = 1; - sprintf(pid, "%ld", (long)getpid()); + g_snprintf(pid, sizeof(pid), "%ld", (glong) getpid()); val_pid.value = pid; val_pid.length = strlen(pid); @@ -178,13 +248,15 @@ void session_startup(int argc, char **argv) g_free(val_uid.value); - ob_debug("Connected to session manager with id %s\n", ob_sm_id); + save_commands(); } } void session_shutdown() { + g_free(sm_sessions_path); g_free(save_file); + g_free(sm_id); if (sm_conn) { SmPropValue val_hint; @@ -204,93 +276,140 @@ 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); + } + } +} + +static void sm_save_yourself_phase2(SmcConn conn, SmPointer data) +{ + gboolean success; + + success = session_save(); + save_commands(); + + SmcSaveYourselfDone(conn, success); +} + +static void sm_save_yourself(SmcConn conn, SmPointer data, gint save_type, + Bool shutdown, gint interact_style, Bool fast) +{ + if (!SmcRequestSaveYourselfPhase2(conn, sm_save_yourself_phase2, data)) { + ob_debug("SAVE YOURSELF PHASE 2 failed\n"); + SmcSaveYourselfDone(conn, FALSE); } } -static void sm_save_yourself(SmcConn conn, SmPointer data, int save_type, - Bool shutdown, int interact_style, Bool fast) +static void sm_die(SmcConn conn, SmPointer data) +{ + ob_exit(0); +} + +static void sm_save_complete(SmcConn conn, SmPointer data) +{ +} + +static void sm_shutdown_cancelled(SmcConn conn, SmPointer data) +{ +} + +static gboolean session_save() { - gchar *filename; FILE *f; GList *it; gboolean success = TRUE; - ob_debug("got SAVE YOURSELF from session manager\n"); - - /* this algo is from metacity */ - filename = g_strdup_printf("%d-%d-%u.obs", - (int) time(NULL), - (int) getpid(), - g_random_int()); - save_file = g_build_filename(g_get_home_dir(), ".openbox", "sessions", - filename, NULL); - g_free(filename); - f = fopen(save_file, "w"); if (!f) { success = FALSE; g_warning("unable to save the session to %s: %s", - save_file, strerror(errno)); + save_file, g_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)) { - guint num; - gint32 *dimensions; + for (it = stacking_list; it; it = g_list_next(it)) { gint prex, prey, prew, preh; - ObClient *c = it->data; + ObClient *c; + gchar *t; + + if (WINDOW_IS_CLIENT(it->data)) + c = WINDOW_AS_CLIENT(it->data); + else + continue; if (!client_normal(c)) continue; + if (!c->sm_client_id) + continue; + prex = c->area.x; prey = c->area.y; prew = c->area.width; preh = c->area.height; - if (PROP_GETA32(c->window, openbox_premax, cardinal, - (guint32**)&dimensions, &num)) { - if (num == 4) { - prex = dimensions[0]; - prey = dimensions[1]; - prew = dimensions[2]; - preh = dimensions[3]; - } - g_free(dimensions); + if (c->fullscreen) { + prex = c->pre_fullscreen_area.x; + prey = c->pre_fullscreen_area.x; + prew = c->pre_fullscreen_area.width; + preh = c->pre_fullscreen_area.height; + } + if (c->max_horz) { + prex = c->pre_max_area.x; + prew = c->pre_max_area.width; } + if (c->max_vert) { + prey = c->pre_max_area.y; + preh = c->pre_max_area.height; + } + + fprintf(f, "\n", c->sm_client_id); - fprintf(f, "\t\n", - g_markup_escape_text("XXX", -1)); - fprintf(f, "\t\t%s\n", - g_markup_escape_text(c->name, -1)); - fprintf(f, "\t\t%s\n", - g_markup_escape_text(c->class, -1)); - fprintf(f, "\t\t%s\n", - g_markup_escape_text(c->role, -1)); - fprintf(f, "\t\t%d\n", c->desktop); - fprintf(f, "\t\t%d\n", prex); - fprintf(f, "\t\t%d\n", prey); - fprintf(f, "\t\t%d\n", prew); - fprintf(f, "\t\t%d\n", preh); + t = g_markup_escape_text(c->name, -1); + fprintf(f, "\t%s\n", t); + g_free(t); + + t = g_markup_escape_text(c->class, -1); + fprintf(f, "\t%s\n", t); + g_free(t); + + t = g_markup_escape_text(c->role, -1); + fprintf(f, "\t%s\n", t); + 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); + fprintf(f, "\t%d\n", preh); if (c->shaded) - fprintf(f, "\t\t\n"); + fprintf(f, "\t\n"); if (c->iconic) - fprintf(f, "\t\t\n"); + fprintf(f, "\t\n"); if (c->skip_pager) - fprintf(f, "\t\t\n"); + fprintf(f, "\t\n"); if (c->skip_taskbar) - fprintf(f, "\t\t\n"); + fprintf(f, "\t\n"); if (c->fullscreen) - fprintf(f, "\t\t\n"); + fprintf(f, "\t\n"); if (c->above) - fprintf(f, "\t\t\n"); + fprintf(f, "\t\n"); if (c->below) - fprintf(f, "\t\t\n"); + fprintf(f, "\t\n"); if (c->max_horz) - fprintf(f, "\t\t\n"); + fprintf(f, "\t\n"); if (c->max_vert) - fprintf(f, "\t\t\n"); - fprintf(f, "\t\n\n"); + fprintf(f, "\t\n"); + fprintf(f, "\n\n"); + + ++stack_pos; } fprintf(f, "\n"); @@ -298,105 +417,140 @@ static void sm_save_yourself(SmcConn conn, SmPointer data, int save_type, if (fflush(f)) { success = FALSE; g_warning("error while saving the session to %s: %s", - save_file, strerror(errno)); + save_file, g_strerror(errno)); } fclose(f); } - save_commands(); + return success; +} - SmcSaveYourselfDone(conn, success); +void session_state_free(ObSessionState *state) +{ + if (state) { + g_free(state->id); + g_free(state->name); + g_free(state->class); + g_free(state->role); + + g_free(state); + } } -static void sm_die(SmcConn conn, SmPointer data) +gboolean session_state_cmp(ObSessionState *s, ObClient *c) { - ob_exit(); - ob_debug("got DIE from session manager\n"); + 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)); } -static void sm_save_complete(SmcConn conn, SmPointer data) +GList* session_state_find(ObClient *c) { - ob_debug("got SAVE COMPLETE from session manager\n"); + GList *it; + + 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 it; } -static void sm_shutdown_cancelled(SmcConn conn, SmPointer data) +static gint stack_sort(const ObSessionState *s1, const ObSessionState *s2) { - ob_debug("got SHUTDOWN CANCELLED from session manager\n"); + return s1->stacking - s2->stacking; } -void session_load(char *path) +static void session_load(gchar *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) { - gchar *id, *name, *class, *role; - guint desktop; - gint x, y, w, h; - gboolean shaded, iconic, skip_pager, skip_taskbar, fullscreen; - gboolean above, below, max_horz, max_vert; + ObSessionState *state; + + state = g_new0(ObSessionState, 1); - if (!parse_attr_string("id", node, &id)) + 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; - name = parse_string(doc, n); - if (!(n = parse_find_node("class", node->xmlChildrenNode))) + state->name = parse_string(doc, n); + if (!(n = parse_find_node("class", node->children))) goto session_load_bail; - class = parse_string(doc, n); - if (!(n = parse_find_node("role", node->xmlChildrenNode))) + state->class = parse_string(doc, n); + if (!(n = parse_find_node("role", node->children))) goto session_load_bail; - role = parse_string(doc, n); - if (!(n = parse_find_node("desktop", node->xmlChildrenNode))) + state->role = parse_string(doc, n); + if (!(n = parse_find_node("stacking", node->children))) goto session_load_bail; - desktop = parse_int(doc, n); - if (!(n = parse_find_node("x", node->xmlChildrenNode))) + state->stacking = parse_int(doc, n); + if (!(n = parse_find_node("desktop", node->children))) goto session_load_bail; - x = parse_int(doc, n); - if (!(n = parse_find_node("y", node->xmlChildrenNode))) + state->desktop = parse_int(doc, n); + if (!(n = parse_find_node("x", node->children))) goto session_load_bail; - y = parse_int(doc, n); - if (!(n = parse_find_node("width", node->xmlChildrenNode))) + state->x = parse_int(doc, n); + if (!(n = parse_find_node("y", node->children))) goto session_load_bail; - w = parse_int(doc, n); - if (!(n = parse_find_node("height", node->xmlChildrenNode))) + state->y = parse_int(doc, n); + if (!(n = parse_find_node("width", node->children))) goto session_load_bail; - h = parse_int(doc, n); - - shaded = parse_find_node("shaded", node->xmlChildrenNode) != NULL; - iconic = parse_find_node("iconic", node->xmlChildrenNode) != NULL; - skip_pager = parse_find_node("skip_pager", node->xmlChildrenNode) - != NULL; - skip_taskbar = parse_find_node("skip_taskbar", node->xmlChildrenNode) - != NULL; - fullscreen = parse_find_node("fullscreen", node->xmlChildrenNode) - != NULL; - above = parse_find_node("above", node->xmlChildrenNode) != NULL; - below = parse_find_node("below", node->xmlChildrenNode) != NULL; - max_horz = parse_find_node("max_horz", node->xmlChildrenNode) != NULL; - max_vert = parse_find_node("max_vert", node->xmlChildrenNode) != NULL; + state->w = parse_int(doc, n); + 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->children) != NULL; + state->iconic = + parse_find_node("iconic", node->children) != NULL; + state->skip_pager = + parse_find_node("skip_pager", node->children) != NULL; + state->skip_taskbar = + parse_find_node("skip_taskbar", node->children) != NULL; + state->fullscreen = + parse_find_node("fullscreen", node->children) != NULL; + state->above = + parse_find_node("above", node->children) != NULL; + state->below = + parse_find_node("below", node->children) != NULL; + state->max_horz = + parse_find_node("max_horz", node->children) != NULL; + state->max_vert = + parse_find_node("max_vert", node->children) != NULL; - g_message("read session window %s", name); - - /* XXX save this */ + /* save this */ + session_saved_state = g_list_prepend(session_saved_state, state); + goto session_load_ok; session_load_bail: + session_state_free(state); + + session_load_ok: node = parse_find_node("window", node->next); } - xmlFreeDoc(doc); + /* sort them by their stacking order */ + session_saved_state = g_list_sort(session_saved_state, + (GCompareFunc)stack_sort); - unlink(path); + xmlFreeDoc(doc); } #endif