void session_shutdown(gboolean permanent) {}
GList* session_state_find(struct _ObClient *c) { return NULL; }
void session_request_logout(gboolean silent) {}
+gboolean session_connected(void) { return FALSE; }
#else
#include "debug.h"
#include "client.h"
#include "focus.h"
#include "gettext.h"
-#include "obt/parse.h"
+#include "obt/xml.h"
#include "obt/paths.h"
#include <time.h>
}
}
+gboolean session_connected(void)
+{
+ return !!sm_conn;
+}
+
/*! Connect to the session manager and set up our callback functions */
static gboolean session_connect(void)
{
static ObSMSaveData *sm_save_get_data(void)
{
- ObSMSaveData *savedata = g_new0(ObSMSaveData, 1);
+ ObSMSaveData *savedata = g_slice_new0(ObSMSaveData);
/* 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
if (savedata == NULL)
savedata = sm_save_get_data();
success = session_save_to_file(savedata);
- g_free(savedata);
+ g_slice_free(ObSMSaveData, savedata);
/* tell the session manager how to restore this state */
if (success) session_setup_restart_command();
if (!SmcRequestSaveYourselfPhase2(conn, sm_save_yourself_2, savedata)) {
ob_debug_type(OB_DEBUG_SM, "Requst for phase 2 failed");
- g_free(savedata);
+ g_slice_free(ObSMSaveData, savedata);
SmcSaveYourselfDone(conn, FALSE);
}
}
fprintf(f, "\t<y>%d</y>\n", prey);
fprintf(f, "\t<width>%d</width>\n", prew);
fprintf(f, "\t<height>%d</height>\n", preh);
+ fprintf(f, "\t<opacity>%d</opacity>\n", c->opacity);
if (c->shaded)
fprintf(f, "\t<shaded />\n");
if (c->iconic)
g_free(state->class);
g_free(state->role);
- g_free(state);
+ g_slice_free(ObSessionState, state);
}
}
static void session_load_file(const gchar *path)
{
- ObtParseInst *i;
+ ObtXmlInst *i;
xmlNodePtr node, n, m;
GList *it, *inext;
- i = obt_parse_instance_new();
+ i = obt_xml_instance_new();
- if (!obt_parse_load_file(i, path, "openbox_session")) {
+ if (!obt_xml_load_file(i, path, "openbox_session")) {
ob_debug_type(OB_DEBUG_SM, "ERROR: session file is missing root node");
- obt_parse_instance_unref(i);
+ obt_xml_instance_unref(i);
return;
}
- node = obt_parse_root(i);
+ node = obt_xml_root(i);
- if ((n = obt_parse_find_node(node->children, "desktop")))
- session_desktop = obt_parse_node_int(n);
+ if ((n = obt_xml_find_node(node->children, "desktop")))
+ session_desktop = obt_xml_node_int(n);
- if ((n = obt_parse_find_node(node->children, "numdesktops")))
- session_num_desktops = obt_parse_node_int(n);
+ if ((n = obt_xml_find_node(node->children, "numdesktops")))
+ session_num_desktops = obt_xml_node_int(n);
- if ((n = obt_parse_find_node(node->children, "desktoplayout"))) {
+ if ((n = obt_xml_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);
+ if ((m = obt_xml_find_node(n->children, "orientation")))
+ session_desktop_layout.orientation = obt_xml_node_int(m);
+ if (m && (m = obt_xml_find_node(n->children, "startcorner")))
+ session_desktop_layout.start_corner = obt_xml_node_int(m);
+ if (m && (m = obt_xml_find_node(n->children, "columns")))
+ session_desktop_layout.columns = obt_xml_node_int(m);
+ if (m && (m = obt_xml_find_node(n->children, "rows")))
+ session_desktop_layout.rows = obt_xml_node_int(m);
session_desktop_layout_present = m != NULL;
}
- 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"))
+ if ((n = obt_xml_find_node(node->children, "desktopnames"))) {
+ for (m = obt_xml_find_node(n->children, "name"); m;
+ m = obt_xml_find_node(m->next, "name"))
{
session_desktop_names = g_slist_append(session_desktop_names,
- obt_parse_node_string(m));
+ obt_xml_node_string(m));
}
}
ob_debug_type(OB_DEBUG_SM, "loading windows");
- for (node = obt_parse_find_node(node->children, "window"); node != NULL;
- node = obt_parse_find_node(node->next, "window"))
+ for (node = obt_xml_find_node(node->children, "window"); node != NULL;
+ node = obt_xml_find_node(node->next, "window"))
{
ObSessionState *state;
- state = g_new0(ObSessionState, 1);
+ state = g_slice_new0(ObSessionState);
- if (!obt_parse_attr_string(node, "id", &state->id))
- if (!obt_parse_attr_string(node, "command", &state->command))
+ if (!obt_xml_attr_string(node, "id", &state->id))
+ if (!obt_xml_attr_string(node, "command", &state->command))
+ goto session_load_bail;
+ if (!(n = obt_xml_find_node(node->children, "name")))
goto session_load_bail;
- if (!(n = obt_parse_find_node(node->children, "name")))
+ state->name = obt_xml_node_string(n);
+ if (!(n = obt_xml_find_node(node->children, "class")))
goto session_load_bail;
- state->name = obt_parse_node_string(n);
- if (!(n = obt_parse_find_node(node->children, "class")))
+ state->class = obt_xml_node_string(n);
+ if (!(n = obt_xml_find_node(node->children, "role")))
goto session_load_bail;
- state->class = obt_parse_node_string(n);
- if (!(n = obt_parse_find_node(node->children, "role")))
+ state->role = obt_xml_node_string(n);
+ if (!(n = obt_xml_find_node(node->children, "windowtype")))
goto session_load_bail;
- state->role = obt_parse_node_string(n);
- if (!(n = obt_parse_find_node(node->children, "windowtype")))
+ state->type = obt_xml_node_int(n);
+ if (!(n = obt_xml_find_node(node->children, "desktop")))
goto session_load_bail;
- state->type = obt_parse_node_int(n);
- if (!(n = obt_parse_find_node(node->children, "desktop")))
+ state->desktop = obt_xml_node_int(n);
+ if (!(n = obt_xml_find_node(node->children, "x")))
goto session_load_bail;
- state->desktop = obt_parse_node_int(n);
- if (!(n = obt_parse_find_node(node->children, "x")))
+ state->x = obt_xml_node_int(n);
+ if (!(n = obt_xml_find_node(node->children, "y")))
goto session_load_bail;
- state->x = obt_parse_node_int(n);
- if (!(n = obt_parse_find_node(node->children, "y")))
+ state->y = obt_xml_node_int(n);
+ if (!(n = obt_xml_find_node(node->children, "width")))
goto session_load_bail;
- state->y = obt_parse_node_int(n);
- if (!(n = obt_parse_find_node(node->children, "width")))
+ state->w = obt_xml_node_int(n);
+ if (!(n = obt_xml_find_node(node->children, "height")))
goto session_load_bail;
- state->w = obt_parse_node_int(n);
- if (!(n = obt_parse_find_node(node->children, "height")))
+ state->h = obt_xml_node_int(n);
+ if (!(n = obt_xml_find_node(node->children, "opacity")))
goto session_load_bail;
- state->h = obt_parse_node_int(n);
+ state->opacity = obt_xml_node_int(n);
state->shaded =
- obt_parse_find_node(node->children, "shaded") != NULL;
+ obt_xml_find_node(node->children, "shaded") != NULL;
state->iconic =
- obt_parse_find_node(node->children, "iconic") != NULL;
+ obt_xml_find_node(node->children, "iconic") != NULL;
state->skip_pager =
- obt_parse_find_node(node->children, "skip_pager") != NULL;
+ obt_xml_find_node(node->children, "skip_pager") != NULL;
state->skip_taskbar =
- obt_parse_find_node(node->children, "skip_taskbar") != NULL;
+ obt_xml_find_node(node->children, "skip_taskbar") != NULL;
state->fullscreen =
- obt_parse_find_node(node->children, "fullscreen") != NULL;
+ obt_xml_find_node(node->children, "fullscreen") != NULL;
state->above =
- obt_parse_find_node(node->children, "above") != NULL;
+ obt_xml_find_node(node->children, "above") != NULL;
state->below =
- obt_parse_find_node(node->children, "below") != NULL;
+ obt_xml_find_node(node->children, "below") != NULL;
state->max_horz =
- obt_parse_find_node(node->children, "max_horz") != NULL;
+ obt_xml_find_node(node->children, "max_horz") != NULL;
state->max_vert =
- obt_parse_find_node(node->children, "max_vert") != NULL;
+ obt_xml_find_node(node->children, "max_vert") != NULL;
state->undecorated =
- obt_parse_find_node(node->children, "undecorated") != NULL;
+ obt_xml_find_node(node->children, "undecorated") != NULL;
state->focused =
- obt_parse_find_node(node->children, "focused") != NULL;
+ obt_xml_find_node(node->children, "focused") != NULL;
/* save this. they are in the file in stacking order, so preserve
that order here */
}
}
- obt_parse_instance_unref(i);
+ obt_xml_instance_unref(i);
}
void session_request_logout(gboolean silent)
projects / chaz / openbox / blobdiff