X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=openbox%2Fsession.c;h=8e8f2b7b34005cd967d1a535a81dfc5b625c2c6d;hb=2aa5cd3574b2bbdc103cb7626aa1ff77ea2c0046;hp=10cb26bc6b7ce51962e6043c357d0245104eacee;hpb=755ec08aa36cbd635a841fe8c374b9b751c20213;p=chaz%2Fopenbox diff --git a/openbox/session.c b/openbox/session.c index 10cb26bc..8e8f2b7b 100644 --- a/openbox/session.c +++ b/openbox/session.c @@ -1,3 +1,21 @@ +/* -*- 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 @@ -7,7 +25,7 @@ GList *session_saved_state; -void session_startup(int *argc, char ***argv) {} +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; } @@ -42,12 +60,13 @@ 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 void session_load(gchar *path); static gboolean session_save(); -static void sm_save_yourself(SmcConn conn, SmPointer data, int save_type, - Bool shutdown, int interact_style, Bool fast); +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); @@ -93,18 +112,18 @@ static void save_commands() g_free(prop_cmd.vals); } -static void remove_two_args(int *argc, char ***argv, int index) +static void remove_args(gint *argc, gchar ***argv, gint index, gint num) { - int i; + gint i; - for (i = index; i < index + 2; ++i) - (*argv)[i] = (*argv)[i+2]; - *argc -= 2; + for (i = index; i < index + num; ++i) + (*argv)[i] = (*argv)[i+num]; + *argc -= num; } -static void parse_args(int *argc, char ***argv) +static void parse_args(gint *argc, gchar ***argv) { - int i; + gint i; for (i = 1; i < *argc; ++i) { if (!strcmp((*argv)[i], "--sm-client-id")) { @@ -112,7 +131,7 @@ static void parse_args(int *argc, char ***argv) g_printerr(_("--sm-client-id requires an argument\n")); else { sm_id = g_strdup((*argv)[i+1]); - remove_two_args(argc, argv, i); + remove_args(argc, argv, i, 2); ++i; } } else if (!strcmp((*argv)[i], "--sm-save-file")) { @@ -120,27 +139,32 @@ static void parse_args(int *argc, char ***argv) g_printerr(_("--sm-save-file requires an argument\n")); else { save_file = g_strdup((*argv)[i+1]); - remove_two_args(argc, argv, i); + 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(int *argc, char ***argv) +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); + parse_mkdir_path(sm_sessions_path, 0700); + if (save_file) session_load(save_file); @@ -167,7 +191,7 @@ void session_startup(int *argc, char ***argv) &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; @@ -193,7 +217,7 @@ void session_startup(int *argc, char ***argv) val_hint.value = &hint; val_hint.length = 1; - sprintf(pid, "%ld", (long)getpid()); + sprintf(pid, "%ld", (glong)getpid()); val_pid.value = pid; val_pid.length = strlen(pid); @@ -224,6 +248,7 @@ void session_startup(int *argc, char ***argv) void session_shutdown() { + g_free(sm_sessions_path); g_free(save_file); g_free(sm_id); @@ -264,8 +289,8 @@ static void sm_save_yourself_phase2(SmcConn conn, SmPointer data) SmcSaveYourselfDone(conn, success); } -static void sm_save_yourself(SmcConn conn, SmPointer data, int save_type, - Bool shutdown, int interact_style, Bool fast) +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"); @@ -275,7 +300,7 @@ static void sm_save_yourself(SmcConn conn, SmPointer data, int save_type, static void sm_die(SmcConn conn, SmPointer data) { - ob_exit(); + ob_exit(0); } static void sm_save_complete(SmcConn conn, SmPointer data) @@ -293,13 +318,15 @@ static gboolean session_save() GList *it; gboolean success = TRUE; + if (save_file) + unlink(save_file); + /* this algo is from metacity */ filename = g_strdup_printf("%d-%d-%u.obs", - (int) time(NULL), - (int) getpid(), + (gint) time(NULL), + (gint) 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"); @@ -314,11 +341,9 @@ static gboolean session_save() 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); @@ -328,25 +353,29 @@ 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; 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", client_id); + fprintf(f, "\n", c->sm_client_id); t = g_markup_escape_text(c->name, -1); fprintf(f, "\t%s\n", t); @@ -387,8 +416,6 @@ static gboolean session_save() fprintf(f, "\n\n"); ++stack_pos; - - g_free(client_id); } fprintf(f, "\n"); @@ -418,22 +445,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) @@ -455,7 +471,7 @@ static gint stack_sort(const ObSessionState *s1, const ObSessionState *s2) return s1->stacking - s2->stacking; } -static void session_load(char *path) +static void session_load(gchar *path) { xmlDocPtr doc; xmlNodePtr node, n; @@ -469,7 +485,7 @@ static void session_load(char *path) 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; @@ -477,52 +493,52 @@ static 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);