#include "prop.h"
#include "extensions.h"
#include "frame.h"
+#include "session.h"
#include "event.h"
#include "grab.h"
#include "focus.h"
static void client_change_allowed_actions(ObClient *self);
static void client_change_state(ObClient *self);
static void client_apply_startup_state(ObClient *self);
+static void client_restore_session_state(ObClient *self);
void client_startup()
{
self = g_new(ObClient, 1);
self->obwin.type = Window_Client;
self->window = window;
+
client_get_all(self);
+ client_restore_session_state(self);
+
+ client_change_state(self);
/* remove the client's border (and adjust re gravity) */
client_toggle_border(self, FALSE);
if (screen_showing_desktop)
screen_show_desktop(FALSE);
+ /* add to client list/map */
+ client_list = g_list_append(client_list, self);
+ g_hash_table_insert(window_map, &self->window, self);
+
/* update the list hints */
client_set_list();
dispatch_client(Event_Client_Mapped, self, 0, 0);
- /* add to client list/map */
- client_list = g_list_append(client_list, self);
- g_hash_table_insert(window_map, &self->window, self);
-
ob_debug("Managed window 0x%lx (%s)\n", window, self->class);
}
client_set_list();
}
+static void client_restore_session_state(ObClient *self)
+{
+ ObSessionState *s;
+
+ s = session_state_find(self);
+ if (!(s)) return;
+
+ RECT_SET(self->area, s->x, s->y, s->w, s->h);
+ self->positioned = TRUE;
+ XResizeWindow(ob_display, self->window, s->w, s->h);
+
+ self->desktop = s->desktop == DESKTOP_ALL ? s->desktop :
+ MIN(screen_num_desktops - 1, s->desktop);
+ PROP_SET32(self->window, net_wm_desktop, cardinal, self->desktop);
+
+ self->shaded = s->shaded;
+ self->iconic = s->iconic;
+ self->skip_pager = s->skip_pager;
+ self->skip_taskbar = s->skip_taskbar;
+ self->fullscreen = s->fullscreen;
+ self->above = s->above;
+ self->below = s->below;
+ self->max_horz = s->max_horz;
+ self->max_vert = s->max_vert;
+
+ session_state_free(s);
+}
+
void client_move_onscreen(ObClient *self, gboolean rude)
{
int x = self->area.x;
int y = self->area.y;
if (client_find_onscreen(self, &x, &y,
- self->area.width, self->area.height, rude)) {
+ self->frame->area.width,
+ self->frame->area.height, rude)) {
client_configure(self, OB_CORNER_TOPLEFT, x, y,
self->area.width, self->area.height,
TRUE, TRUE);
client_update_class(self);
client_update_strut(self);
client_update_icons(self);
-
- client_change_state(self);
}
static void client_get_area(ObClient *self)
if (!trdesk)
/* defaults to the current desktop */
self->desktop = screen_desktop;
-
}
if (self->desktop != d) {
/* set the desktop hint, to make sure that it always exists */
client_change_allowed_actions(self);
if (self->frame) {
- /* this makes sure that these windows appear on all desktops */
- if (self->type == OB_CLIENT_TYPE_DESKTOP &&
- self->desktop != DESKTOP_ALL)
- client_set_desktop(self, DESKTOP_ALL, FALSE);
-
- /* adjust the client's decorations, etc. */
+ if (self->decorations != self->frame->decorations)
+ /* adjust the client's decorations, etc. */
+ client_reconfigure(self);
+ /* we actually have to do this twice :P
+ the first time it removes the decorations, but now it may need to
+ be reconstrained for being maximized etc, so calling this again
+ will work with the new setup of decorations on the window */
client_reconfigure(self);
} else {
/* this makes sure that these windows appear on all desktops */
}
}
- /* the WM_HINTS can contain an icon */
- client_update_icons(self);
-
/* because the self->transient flag wont change from this call,
we don't need to update the window's type and such, only its
transient_for, and the transients lists of other windows in
client_update_transient_for(self);
}
+ /* the WM_HINTS can contain an icon */
+ client_update_icons(self);
+
XFree(hints);
}
{
guint num;
guint32 *data;
+ gboolean got = FALSE;
+
+ if (PROP_GETA32(self->window, net_wm_strut_partial, cardinal,
+ &data, &num)) {
+ if (num == 12) {
+ got = TRUE;
+ STRUT_PARTIAL_SET(self->strut,
+ data[0], data[2], data[1], data[3],
+ data[4], data[5], data[8], data[9],
+ data[6], data[7], data[10], data[11]);
+ }
+ g_free(data);
+ }
- if (!PROP_GETA32(self->window, net_wm_strut, cardinal, &data, &num)) {
- STRUT_SET(self->strut, 0, 0, 0, 0);
- } else {
- if (num == 4)
- STRUT_SET(self->strut, data[0], data[2], data[1], data[3]);
- else
- STRUT_SET(self->strut, 0, 0, 0, 0);
- g_free(data);
+ if (!got &&
+ PROP_GETA32(self->window, net_wm_strut, cardinal, &data, &num)) {
+ if (num == 4) {
+ got = TRUE;
+ STRUT_PARTIAL_SET(self->strut,
+ data[0], data[2], data[1], data[3],
+ 0, 0, 0, 0, 0, 0, 0, 0);
+ }
+ g_free(data);
}
+ if (!got)
+ STRUT_PARTIAL_SET(self->strut, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0);
+
/* updating here is pointless while we're being mapped cuz we're not in
the client list yet */
if (self->frame)
{
gboolean moved = FALSE, resized = FALSE;
+ /* make the frame recalculate its dimentions n shit without changing
+ anything visible for real, this way the constraints below can work with
+ the updated frame dimensions. */
+ frame_adjust_area(self->frame, TRUE, TRUE, TRUE);
+
/* gets the frame's position */
frame_client_gravity(self->frame, &x, &y);
/* set the size and position if maximized */
if (self->max_horz) {
- x = a->x - self->frame->size.left;
- w = a->width;
+ x = a->x;
+ w = a->width - self->frame->size.left - self->frame->size.right;
}
if (self->max_vert) {
y = a->y;
/* store the logical size */
SIZE_SET(self->logical_size,
- self->size_inc.width == 1 ? w : w + basew,
- self->size_inc.height == 1 ? h : h + baseh);
+ self->size_inc.width > 1 ? w : w + basew,
+ self->size_inc.height > 1 ? h : h + baseh);
w *= self->size_inc.width;
h *= self->size_inc.height;
/* for app-requested resizes, always resize if 'resized' is true.
for user-requested ones, only resize if final is true, or when
- resizing in opaque mode */
+ resizing in redraw mode */
if ((!user && resized) ||
- (user && (final || (resized && config_opaque_resize))))
+ (user && (final || (resized && config_redraw_resize))))
XResizeWindow(ob_display, self->window, w, h);
/* move/resize the frame to match the request */
moved = resized = TRUE;
if (moved || resized)
- frame_adjust_area(self->frame, moved, resized);
+ frame_adjust_area(self->frame, moved, resized, FALSE);
if (!resized && (force_reply || ((!user && moved) || (user && final))))
{
self->border_width;
event.xconfigure.y = self->frame->area.y + self->frame->size.top -
self->border_width;
- g_message("x %d cx %d y %d cy %d",
- self->area.x,
- event.xconfigure.x,
- self->area.y,
- event.xconfigure.y);
event.xconfigure.width = w;
event.xconfigure.height = h;
event.xconfigure.border_width = 0;
self->shaded = shade;
client_change_state(self);
/* resize the frame to just the titlebar */
- frame_adjust_area(self->frame, FALSE, FALSE);
+ frame_adjust_area(self->frame, FALSE, FALSE, FALSE);
}
void client_close(ObClient *self)
}
return NULL;
}
+
+gchar* client_get_sm_client_id(ObClient *self)
+{
+ gchar *id = NULL;
+
+ if (!PROP_GETS(self->window, sm_client_id, locale, &id) && self->group)
+ PROP_GETS(self->group->leader, sm_client_id, locale, &id);
+ return id;
+}
projects / chaz / openbox / blobdiff