+/* -*- 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
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; }
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);
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")) {
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")) {
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);
&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;
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);
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");
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(sm_sessions_path, filename, NULL);
g_free(filename);
fprintf(f, "<openbox_session id=\"%s\">\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 *t;
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, "<window id=\"%s\">\n", c->sm_client_id);
return s1->stacking - s2->stacking;
}
-static void session_load(char *path)
+static void session_load(gchar *path)
{
xmlDocPtr doc;
xmlNodePtr node, n;