+/* -*- 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
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();
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);
&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;
void session_shutdown()
{
+ g_free(sm_sessions_path);
g_free(save_file);
g_free(sm_id);
static void sm_die(SmcConn conn, SmPointer data)
{
- ob_exit();
+ ob_exit(0);
}
static void sm_save_complete(SmcConn conn, SmPointer data)
(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");
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);
if (!client_normal(c))
continue;
- if (!(client_id = client_get_sm_client_id(c)))
+ if (!c->sm_client_id)
continue;
prex = c->area.x;
g_free(dimensions);
}
- fprintf(f, "<window id=\"%s\">\n", client_id);
+ fprintf(f, "<window id=\"%s\">\n", c->sm_client_id);
t = g_markup_escape_text(c->name, -1);
fprintf(f, "\t<name>%s</name>\n", t);
fprintf(f, "</window>\n\n");
++stack_pos;
-
- g_free(client_id);
}
fprintf(f, "</openbox_session>\n");
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)
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;
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);