X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fsession.c;h=c38a8204ca018a238086d3ab852c23dccfcef501;hb=ea481338b5f16fd81a7b33e036ead39b918a51af;hp=bcf80ad0e8f72c7a60bd04ce30897f3468fa0d8f;hpb=de988813681ed46b480cc4e53dbe449773210ac4;p=chaz%2Fopenbox diff --git a/openbox/session.c b/openbox/session.c index bcf80ad0..c38a8204 100644 --- a/openbox/session.c +++ b/openbox/session.c @@ -24,6 +24,10 @@ struct _ObClient; GList *session_saved_state = NULL; gint session_desktop = -1; +gint session_num_desktops = 0; +gboolean session_desktop_layout_present = FALSE; +ObDesktopLayout session_desktop_layout; +GSList *session_desktop_names = NULL; #ifndef USE_SM void session_startup(gint argc, gchar **argv) {} @@ -34,11 +38,10 @@ GList* session_state_find(struct _ObClient *c) { return NULL; } #include "debug.h" #include "openbox.h" #include "client.h" -#include "prop.h" #include "focus.h" -#include "screen.h" #include "gettext.h" -#include "parser/parse.h" +#include "obt/parse.h" +#include "obt/paths.h" #include #include @@ -88,23 +91,28 @@ static void session_state_free(ObSessionState *state); void session_startup(gint argc, gchar **argv) { gchar *dir; + ObtPaths *p; if (!ob_sm_use) return; sm_argc = argc; sm_argv = argv; - dir = g_build_filename(parse_xdg_data_home_path(), - "openbox", "sessions", NULL); - if (!parse_mkdir_path(dir, 0700)) { + p = obt_paths_new(); + dir = g_build_filename(obt_paths_data_home(p), "openbox", "sessions",NULL); + obt_paths_unref(p), p = NULL; + + if (!obt_paths_mkdir_path(dir, 0700)) { g_message(_("Unable to make directory '%s': %s"), dir, g_strerror(errno)); } if (ob_sm_save_file != NULL) { - ob_debug_type(OB_DEBUG_SM, "Loading from session file %s\n", - ob_sm_save_file); - session_load_file(ob_sm_save_file); + if (ob_sm_restore) { + ob_debug_type(OB_DEBUG_SM, "Loading from session file %s\n", + ob_sm_save_file); + session_load_file(ob_sm_save_file); + } } else { gchar *filename; @@ -136,7 +144,8 @@ void session_shutdown(gboolean permanent) if (sm_conn) { /* if permanent is true then we will change our session state so that the SM won't run us again */ - session_setup_restart_style(!permanent); + if (permanent) + session_setup_restart_style(FALSE); SmcCloseConnection(sm_conn, 0, NULL); @@ -175,8 +184,9 @@ static gboolean session_connect() SmcSaveCompleteProcMask | SmcShutdownCancelledProcMask, &cb, oldid, &ob_sm_id, - SM_ERR_LEN, sm_err); + SM_ERR_LEN-1, sm_err); g_free(oldid); + ob_debug_type(OB_DEBUG_SM, "Connected to SM with id: %s\n", ob_sm_id); if (sm_conn == NULL) ob_debug("Failed to connect to session manager: %s\n", sm_err); return sm_conn != NULL; @@ -195,6 +205,7 @@ static void session_setup_program() .vals = &vals }; SmProp *list = ∝ + ob_debug_type(OB_DEBUG_SM, "Setting program: %s\n", sm_argv[0]); SmcSetProperties(sm_conn, 1, &list); g_free(prop.name); g_free(prop.type); @@ -215,6 +226,7 @@ static void session_setup_user() .vals = &vals }; SmProp *list = ∝ + ob_debug_type(OB_DEBUG_SM, "Setting user: %s\n", user); SmcSetProperties(sm_conn, 1, &list); g_free(prop.name); g_free(prop.type); @@ -223,7 +235,7 @@ static void session_setup_user() static void session_setup_restart_style(gboolean restart) { - char restart_hint = restart ? SmRestartImmediately : SmRestartIfRunning; + gchar restart_hint = restart ? SmRestartImmediately : SmRestartIfRunning; SmPropValue vals = { .value = &restart_hint, @@ -236,6 +248,7 @@ static void session_setup_restart_style(gboolean restart) .vals = &vals }; SmProp *list = ∝ + ob_debug_type(OB_DEBUG_SM, "Setting restart: %d\n", restart); SmcSetProperties(sm_conn, 1, &list); g_free(prop.name); g_free(prop.type); @@ -256,6 +269,7 @@ static void session_setup_pid() .vals = &vals }; SmProp *list = ∝ + ob_debug_type(OB_DEBUG_SM, "Setting pid: %s\n", pid); SmcSetProperties(sm_conn, 1, &list); g_free(prop.name); g_free(prop.type); @@ -278,6 +292,7 @@ static void session_setup_priority() .vals = &vals }; SmProp *list = ∝ + ob_debug_type(OB_DEBUG_SM, "Setting priority: %d\n", priority); SmcSetProperties(sm_conn, 1, &list); g_free(prop.name); g_free(prop.type); @@ -294,13 +309,15 @@ static void session_setup_clone_command() .num_vals = sm_argc, .vals = vals }; + SmProp *list = ∝ + ob_debug_type(OB_DEBUG_SM, "Setting clone command: (%d)\n", sm_argc); for (i = 0; i < sm_argc; ++i) { vals[i].value = sm_argv[i]; vals[i].length = strlen(sm_argv[i]) + 1; + ob_debug_type(OB_DEBUG_SM, " %s\n", vals[i].value); } - SmProp *list = ∝ SmcSetProperties(sm_conn, 1, &list); g_free(prop.name); g_free(prop.type); @@ -318,23 +335,29 @@ static void session_setup_restart_command() .num_vals = sm_argc + 4, .vals = vals }; + SmProp *list = ∝ + ob_debug_type(OB_DEBUG_SM, "Setting restart command: (%d)\n", sm_argc+4); for (i = 0; i < sm_argc; ++i) { vals[i].value = sm_argv[i]; vals[i].length = strlen(sm_argv[i]) + 1; + ob_debug_type(OB_DEBUG_SM, " %s\n", vals[i].value); } - vals[i].value = g_strdup("--sm-save-file"); - vals[i].length = strlen("--sm-save-file") + 1; - vals[i+1].value = ob_sm_save_file; - vals[i+1].length = strlen(ob_sm_save_file) + 1; + vals[i].value = g_strdup("--sm-client-id"); + vals[i].length = strlen("--sm-client-id") + 1; + vals[i+1].value = ob_sm_id; + vals[i+1].length = strlen(ob_sm_id) + 1; + ob_debug_type(OB_DEBUG_SM, " %s\n", vals[i].value); + ob_debug_type(OB_DEBUG_SM, " %s\n", vals[i+1].value); - vals[i+2].value = g_strdup("--sm-client-id"); - vals[i+2].length = strlen("--sm-client-id") + 1; - vals[i+3].value = ob_sm_id; - vals[i+3].length = strlen(ob_sm_id) + 1; + vals[i+2].value = g_strdup("--sm-save-file"); + vals[i+2].length = strlen("--sm-save-file") + 1; + vals[i+3].value = ob_sm_save_file; + vals[i+3].length = strlen(ob_sm_save_file) + 1; + ob_debug_type(OB_DEBUG_SM, " %s\n", vals[i+2].value); + ob_debug_type(OB_DEBUG_SM, " %s\n", vals[i+3].value); - SmProp *list = ∝ SmcSetProperties(sm_conn, 1, &list); g_free(prop.name); g_free(prop.type); @@ -346,6 +369,10 @@ static void session_setup_restart_command() static ObSMSaveData *sm_save_get_data() { ObSMSaveData *savedata = g_new0(ObSMSaveData, 1); + /* save the active desktop and client. + we don't bother to preemptively save the other desktop state like + number and names of desktops, cuz those shouldn't be changing during + the save.. */ savedata->focus_client = focus_client; savedata->desktop = screen_desktop; return savedata; @@ -394,6 +421,7 @@ static void sm_save_yourself(SmcConn conn, SmPointer data, gint save_type, if (!SmcRequestSaveYourselfPhase2(conn, sm_save_yourself_2, savedata)) { ob_debug_type(OB_DEBUG_SM, "Requst for phase 2 failed\n"); + g_free(savedata); SmcSaveYourselfDone(conn, FALSE); } } @@ -411,7 +439,7 @@ static void sm_save_complete(SmcConn conn, SmPointer data) static void sm_shutdown_cancelled(SmcConn conn, SmPointer data) { - ob_debug_type(OB_DEBUG_SM, "Shutdown cancelled\n"); + ob_debug_type(OB_DEBUG_SM, "Shutdown cancelled\n"); } static gboolean session_save_to_file(const ObSMSaveData *savedata) @@ -431,6 +459,28 @@ static gboolean session_save_to_file(const ObSMSaveData *savedata) fprintf(f, "%d\n", savedata->desktop); + fprintf(f, "%d\n", screen_num_desktops); + + fprintf(f, "\n"); + fprintf(f, " %d\n", + screen_desktop_layout.orientation); + fprintf(f, " %d\n", + screen_desktop_layout.start_corner); + fprintf(f, " %d\n", + screen_desktop_layout.columns); + fprintf(f, " %d\n", + screen_desktop_layout.rows); + fprintf(f, "\n"); + + if (screen_desktop_names) { + gint i; + + fprintf(f, "\n"); + for (i = 0; screen_desktop_names[i]; ++i) + fprintf(f, " %s\n", screen_desktop_names[i]); + fprintf(f, "\n"); + } + /* they are ordered top to bottom in stacking order */ for (it = stacking_list; it; it = g_list_next(it)) { gint prex, prey, prew, preh; @@ -497,6 +547,8 @@ static gboolean session_save_to_file(const ObSMSaveData *savedata) fprintf(f, "\t%s\n", t); g_free(t); + fprintf(f, "\t%d\n", c->type); + fprintf(f, "\t%d\n", c->desktop); fprintf(f, "\t%d\n", prex); fprintf(f, "\t%d\n", prey); @@ -560,12 +612,14 @@ 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 type: %d \n", c->type); 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); + ob_debug_type(OB_DEBUG_SM, " state type: %d \n", s->type); ob_debug_type(OB_DEBUG_SM, " state command: %s \n", s->command ? s->command : "(null)"); @@ -574,7 +628,13 @@ static gboolean session_state_cmp(ObSessionState *s, ObClient *c) { return (!strcmp(s->name, c->name) && !strcmp(s->class, c->class) && - !strcmp(s->role, c->role)); + !strcmp(s->role, c->role) && + /* the check for type is to catch broken clients, like + firefox, which open a different window on startup + with the same info as the one we saved. only do this + check for old windows that dont use xsmp, others should + know better ! */ + (!s->command || c->type == s->type)); } return FALSE; } @@ -595,73 +655,107 @@ GList* session_state_find(ObClient *c) static void session_load_file(const gchar *path) { - xmlDocPtr doc; - xmlNodePtr node, n; + ObtParseInst *i; + xmlNodePtr node, n, m; + GList *it, *inext; - if (!parse_load(path, "openbox_session", &doc, &node)) + i = obt_parse_instance_new(); + + if (!obt_parse_load_file(i, path, "openbox_session")) { + obt_parse_instance_unref(i); return; + } + node = obt_parse_root(i); + + if ((n = obt_parse_find_node(node->children, "desktop"))) + session_desktop = obt_parse_node_int(n); + + if ((n = obt_parse_find_node(node->children, "numdesktops"))) + session_num_desktops = obt_parse_node_int(n); + + if ((n = obt_parse_find_node(node->children, "desktoplayout"))) { + /* make sure they are all there for it to be valid */ + if ((m = obt_parse_find_node(n->children, "orientation"))) + session_desktop_layout.orientation = obt_parse_node_int(m); + if (m && (m = obt_parse_find_node(n->children, "startcorner"))) + session_desktop_layout.start_corner = obt_parse_node_int(m); + if (m && (m = obt_parse_find_node(n->children, "columns"))) + session_desktop_layout.columns = obt_parse_node_int(m); + if (m && (m = obt_parse_find_node(n->children, "rows"))) + session_desktop_layout.rows = obt_parse_node_int(m); + session_desktop_layout_present = m != NULL; + } - if ((n = parse_find_node("desktop", node->children))) - session_desktop = parse_int(doc, n); + if ((n = obt_parse_find_node(node->children, "desktopnames"))) { + for (m = obt_parse_find_node(n->children, "name"); m; + m = obt_parse_find_node(m->next, "name")) + { + session_desktop_names = g_slist_append(session_desktop_names, + obt_parse_node_string(m)); + } + } - for (node = parse_find_node("window", node->children); node != NULL; - node = parse_find_node("window", node->next)) + for (node = obt_parse_find_node(node->children, "window"); node != NULL; + node = obt_parse_find_node(node->next, "window")) { ObSessionState *state; state = g_new0(ObSessionState, 1); - if (!parse_attr_string("id", node, &state->id)) - if (!parse_attr_string("command", node, &state->command)) + if (!obt_parse_attr_string(node, "id", &state->id)) + if (!obt_parse_attr_string(node, "command", &state->command)) goto session_load_bail; - if (!(n = parse_find_node("name", node->children))) + if (!(n = obt_parse_find_node(node->children, "name"))) goto session_load_bail; - state->name = parse_string(doc, n); - if (!(n = parse_find_node("class", node->children))) + state->name = obt_parse_node_string(n); + if (!(n = obt_parse_find_node(node->children, "class"))) goto session_load_bail; - state->class = parse_string(doc, n); - if (!(n = parse_find_node("role", node->children))) + state->class = obt_parse_node_string(n); + if (!(n = obt_parse_find_node(node->children, "role"))) goto session_load_bail; - state->role = parse_string(doc, n); - if (!(n = parse_find_node("desktop", node->children))) + state->role = obt_parse_node_string(n); + if (!(n = obt_parse_find_node(node->children, "windowtype"))) goto session_load_bail; - state->desktop = parse_int(doc, n); - if (!(n = parse_find_node("x", node->children))) + state->type = obt_parse_node_int(n); + if (!(n = obt_parse_find_node(node->children, "desktop"))) goto session_load_bail; - state->x = parse_int(doc, n); - if (!(n = parse_find_node("y", node->children))) + state->desktop = obt_parse_node_int(n); + if (!(n = obt_parse_find_node(node->children, "x"))) goto session_load_bail; - state->y = parse_int(doc, n); - if (!(n = parse_find_node("width", node->children))) + state->x = obt_parse_node_int(n); + if (!(n = obt_parse_find_node(node->children, "y"))) goto session_load_bail; - state->w = parse_int(doc, n); - if (!(n = parse_find_node("height", node->children))) + state->y = obt_parse_node_int(n); + if (!(n = obt_parse_find_node(node->children, "width"))) goto session_load_bail; - state->h = parse_int(doc, n); + state->w = obt_parse_node_int(n); + if (!(n = obt_parse_find_node(node->children, "height"))) + goto session_load_bail; + state->h = obt_parse_node_int(n); state->shaded = - parse_find_node("shaded", node->children) != NULL; + obt_parse_find_node(node->children, "shaded") != NULL; state->iconic = - parse_find_node("iconic", node->children) != NULL; + obt_parse_find_node(node->children, "iconic") != NULL; state->skip_pager = - parse_find_node("skip_pager", node->children) != NULL; + obt_parse_find_node(node->children, "skip_pager") != NULL; state->skip_taskbar = - parse_find_node("skip_taskbar", node->children) != NULL; + obt_parse_find_node(node->children, "skip_taskbar") != NULL; state->fullscreen = - parse_find_node("fullscreen", node->children) != NULL; + obt_parse_find_node(node->children, "fullscreen") != NULL; state->above = - parse_find_node("above", node->children) != NULL; + obt_parse_find_node(node->children, "above") != NULL; state->below = - parse_find_node("below", node->children) != NULL; + obt_parse_find_node(node->children, "below") != NULL; state->max_horz = - parse_find_node("max_horz", node->children) != NULL; + obt_parse_find_node(node->children, "max_horz") != NULL; state->max_vert = - parse_find_node("max_vert", node->children) != NULL; + obt_parse_find_node(node->children, "max_vert") != NULL; state->undecorated = - parse_find_node("undecorated", node->children) != NULL; + obt_parse_find_node(node->children, "undecorated") != NULL; state->focused = - parse_find_node("focused", node->children) != NULL; - + obt_parse_find_node(node->children, "focused") != NULL; + /* save this. they are in the file in stacking order, so preserve that order here */ session_saved_state = g_list_append(session_saved_state, state); @@ -671,7 +765,51 @@ static void session_load_file(const gchar *path) session_state_free(state); } - xmlFreeDoc(doc); + /* Remove any duplicates. This means that if two windows (or more) are + saved with the same session state, we won't restore a session for any + of them because we don't know what window to put what on. AHEM FIREFOX. + + This is going to be an O(2^n) kind of operation unfortunately. + */ + for (it = session_saved_state; it; it = inext) { + GList *jt, *jnext; + gboolean founddup = FALSE; + ObSessionState *s1 = it->data; + + inext = g_list_next(it); + + for (jt = g_list_next(it); jt; jt = jnext) { + ObSessionState *s2 = jt->data; + gboolean match; + + jnext = g_list_next(jt); + + if (s1->id && s2->id) + match = strcmp(s1->id, s2->id) == 0; + else if (s1->command && s2->command) + match = strcmp(s1->command, s2->command) == 0; + else + match = FALSE; + + if (match && + !strcmp(s1->name, s2->name) && + !strcmp(s1->class, s2->class) && + !strcmp(s1->role, s2->role)) + { + session_state_free(s2); + session_saved_state = + g_list_delete_link(session_saved_state, jt); + founddup = TRUE; + } + } + + if (founddup) { + session_state_free(s1); + session_saved_state = g_list_delete_link(session_saved_state, it); + } + } + + obt_parse_instance_unref(i); } #endif