#include "screen.h"
#include "prop.h"
#include "extensions.h"
+#include "config.h"
#include "frame.h"
#include "engine.h"
#include "event.h"
GSList *client_list = NULL;
GHashTable *client_map = NULL;
+static Window *client_startup_stack_order = NULL;
+static gulong client_startup_stack_size = 0;
+
static void client_get_all(Client *self);
static void client_toggle_border(Client *self, gboolean show);
static void client_get_area(Client *self);
{
client_map = g_hash_table_new((GHashFunc)map_hash,
(GEqualFunc)map_key_comp);
+
+ /* save the stacking order on startup! */
+ PROP_GET32U(ob_root, net_client_list_stacking, window,
+ client_startup_stack_order, client_startup_stack_size);
+
client_set_list();
}
void client_manage_all()
{
+ ConfigValue focus_new;
unsigned int i, j, nchild;
Window w, *children;
XWMHints *wmhints;
}
}
XFree(children);
+
+ /* stack them as they were on startup!
+ why with stacking_lower? Why, because then windows who aren't in the
+ stacking list are on the top where you can see them instead of buried
+ at the bottom! */
+ for (i = client_startup_stack_size; i > 0; --i) {
+ Client *c;
+
+ w = client_startup_stack_order[i-1];
+ c = g_hash_table_lookup(client_map, &w);
+ if (c) stacking_lower(c);
+ }
+ g_free(client_startup_stack_order);
+ client_startup_stack_order = NULL;
+ client_startup_stack_size = 0;
+
+ if (!config_get("focusNew", Config_Bool, &focus_new))
+ g_assert_not_reached();
+ if (focus_new.bool)
+ focus_fallback(FALSE);
}
void client_manage(Window window)
XSetWindowAttributes attrib_set;
/* XWMHints *wmhint; */
guint i;
+ ConfigValue focus_new;
grab_server(TRUE);
dispatch_client(Event_Client_Mapped, client, 0, 0);
+ if (!config_get("focusNew", Config_Bool, &focus_new))
+ g_assert_not_reached();
+ if (ob_state != State_Starting && focus_new.bool)
+ client_focus(client);
+
/* update the list hints */
client_set_list();
- g_message("Managed window 0x%lx", window);
+/* g_message("Managed window 0x%lx", window);*/
}
void client_unmanage_all()
int j;
GSList *it;
- g_message("Unmanaging window: %lx", client->window);
+/* g_message("Unmanaging window: %lx", client->window);*/
dispatch_client(Event_Client_Destroy, client, 0, 0);
g_assert(client != NULL);
dispatch_client(Event_Client_Unmapped, client, 0, 0);
g_assert(client != NULL);
- /* unfocus the client (dispatchs the focus event) (we're out of the
- transient lists already, so being modal doesn't matter) */
- if (client_focused(client))
- client_unfocus(client);
-
/* give the client its border back */
client_toggle_border(client, TRUE);
/* get the hints from the window */
if (XGetWMNormalHints(ob_display, self->window, &size, &ret)) {
- self->positioned = (size.flags & (PPosition|USPosition));
+ self->positioned = !!(size.flags & (PPosition|USPosition));
if (size.flags & PWinGravity) {
self->gravity = size.win_gravity;
{
/* start with everything (cept fullscreen) */
self->decorations = Decor_Titlebar | Decor_Handle | Decor_Border |
- Decor_Icon | Decor_AllDesktops | Decor_Iconify | Decor_Maximize;
+ Decor_Icon | Decor_AllDesktops | Decor_Iconify | Decor_Maximize |
+ Decor_Shade;
self->functions = Func_Resize | Func_Move | Func_Iconify | Func_Maximize |
Func_Shade;
if (self->delete_window) {
self->decorations &= ~Decor_Maximize;
if (self->disabled_decorations & Decor_AllDesktops)
self->decorations &= ~Decor_AllDesktops;
+ if (self->disabled_decorations & Decor_Shade)
+ self->decorations &= ~Decor_Shade;
if (self->disabled_decorations & Decor_Close)
self->decorations &= ~Decor_Close;
else self->shaded = FALSE;
}
if (!(self->functions & Func_Iconify) && self->iconic) {
+ g_message("UNSETTING ICONIC");
if (self->frame) client_iconify(self, FALSE, TRUE);
else self->iconic = FALSE;
}
if (hints->flags & InputHint)
self->can_focus = hints->input;
- /* only do this when starting! */
- if (ob_state == State_Starting && (hints->flags & StateHint))
- self->iconic = hints->initial_state == IconicState;
+ /* only do this when first managing the window *AND* when we aren't
+ starting up! */
+ if (ob_state != State_Starting && self->frame == NULL)
+ if (hints->flags & StateHint)
+ self->iconic = hints->initial_state == IconicState;
if (hints->flags & XUrgencyHint)
ur = TRUE;
gulong *data;
if (PROP_GET32A(self->window, net_wm_strut, cardinal, data, 4)) {
- STRUT_SET(self->strut, data[0], data[1], data[2], data[3]);
+ STRUT_SET(self->strut, data[0], data[2], data[1], data[3]);
g_free(data);
} else
STRUT_SET(self->strut, 0, 0, 0, 0);
/* store the icons */
i = 0;
for (j = 0; j < self->nicons; ++j) {
- w = self->icons[j].w = data[i++];
- h = self->icons[j].h = data[i++];
+ w = self->icons[j].width = data[i++];
+ h = self->icons[j].height = data[i++];
self->icons[j].data =
g_memdup(&data[i], w * h * sizeof(gulong));
i += w * h;
g_free(data);
}
- if (self->nicons <= 0) {
- self->nicons = 1;
- self->icons = g_new0(Icon, 1);
- }
-
if (self->frame)
engine_frame_adjust_icon(self->frame);
}
{
gboolean moved = FALSE, resized = FALSE;
+ /* gets the frame's position */
+ frame_client_gravity(self->frame, &x, &y);
+
+ /* these positions are frame positions, not client positions */
+
/* set the size and position if fullscreen */
if (self->fullscreen) {
x = 0;
/* set the size and position if maximized */
if (self->max_horz) {
x = screen_area(self->desktop)->x - self->frame->size.left;
- w = screen_area(self->desktop)->x +
- screen_area(self->desktop)->width;
+ w = screen_area(self->desktop)->width;
}
if (self->max_vert) {
y = screen_area(self->desktop)->y;
- h = screen_area(self->desktop)->y +
- screen_area(self->desktop)->height -
+ h = screen_area(self->desktop)->height -
self->frame->size.top - self->frame->size.bottom;
}
}
+ /* gets the client's position */
+ frame_frame_gravity(self->frame, &x, &y);
+
/* these override the above states! if you cant move you can't move! */
if (user) {
if (!(self->functions & Func_Move)) {
XUnmapWindow(ob_display, self->window);
} else {
if (curdesk)
- client_set_desktop(self, screen_desktop);
+ client_set_desktop(self, screen_desktop, FALSE);
self->wmstate = self->shaded ? IconicState : NormalState;
XMapWindow(ob_display, self->window);
}
PROP_SET32A(self->window, openbox_premax, cardinal,
dimensions, 4);
}
-
- /* pass the client's current position info. the client_configure
- will move/size stuff as appropriate for a maximized window */
- x = self->area.x;
- y = self->area.y;
- w = self->area.width;
- h = self->area.height;
} else {
long *dimensions;
void client_shade(Client *self, gboolean shade)
{
- if (!(self->functions & Func_Shade) || /* can't */
+ if ((!(self->functions & Func_Shade) && shade) || /* can't shade */
self->shaded == shade) return; /* already done */
/* when we're iconic, don't change the wmstate */
XKillClient(ob_display, self->window);
}
-void client_set_desktop(Client *self, guint target)
+void client_set_desktop(Client *self, guint target, gboolean donthide)
{
guint old, i;
+ ConfigValue focus_new;
if (target == self->desktop) return;
- g_message("Setting desktop %u\n", target);
+ g_message("Setting desktop %u", target);
g_assert(target < screen_num_desktops || target == DESKTOP_ALL);
/* the frame can display the current desktop state */
engine_frame_adjust_state(self->frame);
/* 'move' the window to the new desktop */
- client_showhide(self);
+ if (!donthide)
+ client_showhide(self);
+ /* raise if it was not already on the desktop */
+ if (old != DESKTOP_ALL)
+ stacking_raise(self);
screen_update_struts();
/* update the focus lists */
+ if (!config_get("focusNew", Config_Bool, &focus_new))
+ g_assert_not_reached();
if (old == DESKTOP_ALL) {
for (i = 0; i < screen_num_desktops; ++i)
focus_order[i] = g_list_remove(focus_order[i], self);
- focus_order[target] = g_list_prepend(focus_order[target], self);
- } else {
+ } else
focus_order[old] = g_list_remove(focus_order[old], self);
- if (target == DESKTOP_ALL)
- for (i = 0; i < screen_num_desktops; ++i)
+ if (target == DESKTOP_ALL) {
+ for (i = 0; i < screen_num_desktops; ++i) {
+ if (focus_new.bool)
focus_order[i] = g_list_prepend(focus_order[i], self);
+ else
+ focus_order[i] = g_list_append(focus_order[i], self);
+ }
+ } else {
+ if (focus_new.bool)
+ focus_order[target] = g_list_prepend(focus_order[target], self);
+ else
+ focus_order[target] = g_list_append(focus_order[target], self);
}
dispatch_client(Event_Client_Desktop, self, target, old);
}
if (self->can_focus)
- XSetInputFocus(ob_display, self->window, RevertToNone,
- CurrentTime);
+ /* RevertToPointerRoot causes much more headache than TevertToNone, so
+ I choose to use it always, hopefully to find errors quicker, if any
+ are left. (I hate X. I hate focus events.) */
+ XSetInputFocus(ob_display, self->window, RevertToPointerRoot,
+ event_lasttime);
if (self->focus_notify) {
XEvent ce;
ce.xclient.window = self->window;
ce.xclient.format = 32;
ce.xclient.data.l[0] = prop_atoms.wm_take_focus;
- ce.xclient.data.l[1] = CurrentTime;
+ ce.xclient.data.l[1] = event_lasttime;
ce.xclient.data.l[2] = 0l;
ce.xclient.data.l[3] = 0l;
ce.xclient.data.l[4] = 0l;
XSendEvent(ob_display, self->window, FALSE, NoEventMask, &ce);
}
- /* XSync(ob_display, FALSE); XXX Why sync? */
+ g_message("focusing %lx", self->window);
+
+ /* Cause the FocusIn to come back to us. Important for desktop switches,
+ since otherwise we'll have no FocusIn on the queue and send it off to
+ the focus_backup. */
+ XSync(ob_display, FALSE);
return TRUE;
}
void client_unfocus(Client *self)
{
g_assert(focus_client == self);
- client_set_focused(self, FALSE);
+ focus_fallback(FALSE);
}
gboolean client_focused(Client *self)
return self == focus_client;
}
-void client_set_focused(Client *self, gboolean focused)
+Icon *client_icon(Client *self, int w, int h)
{
- if (focused) {
- if (focus_client != self)
- focus_set_client(self);
- } else {
- if (focus_client == self)
- focus_set_client(NULL);
- }
+ int i;
+ /* si is the smallest image >= req */
+ /* li is the largest image < req */
+ unsigned long size, smallest = 0xffffffff, largest = 0, si = 0, li = 0;
- /* focus state can affect the stacking layer */
- client_calc_layer(self);
+ if (!self->nicons) return NULL;
- engine_frame_adjust_focus(self->frame);
+ for (i = 0; i < self->nicons; ++i) {
+ size = self->icons[i].width * self->icons[i].height;
+ if (size < smallest && size >= (unsigned)(w * h)) {
+ smallest = size;
+ si = i;
+ }
+ if (size > largest && size <= (unsigned)(w * h)) {
+ largest = size;
+ li = i;
+ }
+ }
+ if (largest == 0) /* didnt find one smaller than the requested size */
+ return &self->icons[si];
+ return &self->icons[li];
}
projects / chaz / openbox / blobdiff