nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

a little check that catches firefox and other buggy apps, which set the same wmcommand across sessions on different window types. type is a pretty obvious check its hard for it to be a false alarm

Browse source
This commit is contained in:
Dana Jansens 2007-05-17 03:31:20 +00:00
parent c6dac85397
commit f9a79e6062
2 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
openbox/session.c
View file

@ -513,6 +513,8 @@ static gboolean session_save_to_file(const ObSMSaveData *savedata)
fprintf(f, "\t<role>%s</role>\n", t); fprintf(f, "\t<role>%s</role>\n", t);
g_free(t); g_free(t);
fprintf(f, "\t<windowtype>%d</windowtype>\n", c->type);
fprintf(f, "\t<desktop>%d</desktop>\n", c->desktop); fprintf(f, "\t<desktop>%d</desktop>\n", c->desktop);
fprintf(f, "\t<x>%d</x>\n", prex); fprintf(f, "\t<x>%d</x>\n", prex);
fprintf(f, "\t<y>%d</y>\n", prey); fprintf(f, "\t<y>%d</y>\n", prey);
@ -576,12 +578,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 name: %s \n", c->name);
ob_debug_type(OB_DEBUG_SM, " client class: %s \n", c->class); 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 role: %s \n", c->role);
ob_debug_type(OB_DEBUG_SM, " client type: %s \n", c->type);
ob_debug_type(OB_DEBUG_SM, " client command: %s \n", ob_debug_type(OB_DEBUG_SM, " client command: %s \n",
c->wm_command ? c->wm_command : "(null)"); 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 id: %s \n", s->id);
ob_debug_type(OB_DEBUG_SM, " state name: %s \n", s->name); 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 class: %s \n", s->class);
ob_debug_type(OB_DEBUG_SM, " state role: %s \n", s->role); ob_debug_type(OB_DEBUG_SM, " state role: %s \n", s->role);
ob_debug_type(OB_DEBUG_SM, " state type: %s \n", s->type);
ob_debug_type(OB_DEBUG_SM, " state command: %s \n", ob_debug_type(OB_DEBUG_SM, " state command: %s \n",
s->command ? s->command : "(null)"); s->command ? s->command : "(null)");
@ -590,7 +594,13 @@ static gboolean session_state_cmp(ObSessionState *s, ObClient *c)
{ {
return (!strcmp(s->name, c->name) && return (!strcmp(s->name, c->name) &&
!strcmp(s->class, c->class) && !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; return FALSE;
} }
@ -639,6 +649,9 @@ static void session_load_file(const gchar *path)
if (!(n = parse_find_node("role", node->children))) if (!(n = parse_find_node("role", node->children)))
goto session_load_bail; goto session_load_bail;
state->role = parse_string(doc, n); state->role = parse_string(doc, n);
if (!(n = parse_find_node("windowtype", node->children)))
goto session_load_bail;
state->type = parse_int(doc, n);
if (!(n = parse_find_node("desktop", node->children))) if (!(n = parse_find_node("desktop", node->children)))
goto session_load_bail; goto session_load_bail;
state->desktop = parse_int(doc, n); state->desktop = parse_int(doc, n);

5
openbox/session.h
View file

@ -19,14 +19,15 @@
#ifndef __ob__session_h #ifndef __ob__session_h
#define __ob__session_h #define __ob__session_h
#include <glib.h> #include "client.h"
struct _ObClient; #include <glib.h>
typedef struct _ObSessionState ObSessionState; typedef struct _ObSessionState ObSessionState;
struct _ObSessionState { struct _ObSessionState {
gchar *id, *command, *name, *class, *role; gchar *id, *command, *name, *class, *role;
ObClientType type;
guint desktop; guint desktop;
gint x, y, w, h; gint x, y, w, h;
gboolean shaded, iconic, skip_pager, skip_taskbar, fullscreen; gboolean shaded, iconic, skip_pager, skip_taskbar, fullscreen;