X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fclient.c;h=95d1e97e1539613eb1c7b4c19a33017fac88fa2d;hb=5c472be0b312243b7ef705c84ef42f6560537e04;hp=0dd1696730c6a26c53842c0625d6f569728eb907;hpb=e0170fe18192bf9e383b71578b57ff3fecfe0d70;p=chaz%2Fopenbox diff --git a/openbox/client.c b/openbox/client.c index 0dd16967..95d1e97e 100644 --- a/openbox/client.c +++ b/openbox/client.c @@ -2,6 +2,7 @@ #include "screen.h" #include "prop.h" #include "extensions.h" +#include "config.h" #include "frame.h" #include "engine.h" #include "event.h" @@ -86,6 +87,7 @@ void client_set_list() void client_manage_all() { + ConfigValue focus_new; unsigned int i, j, nchild; Window w, *children; XWMHints *wmhints; @@ -130,12 +132,17 @@ void client_manage_all() w = client_startup_stack_order[i-1]; c = g_hash_table_lookup(client_map, &w); - g_message("0x%lx %d", c->window, c->iconic); + g_message("0x%lx %d %d", c->window, c->iconic, c->shaded); 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) @@ -146,6 +153,7 @@ void client_manage(Window window) XSetWindowAttributes attrib_set; /* XWMHints *wmhint; */ guint i; + ConfigValue focus_new; grab_server(TRUE); @@ -232,6 +240,11 @@ void client_manage(Window window) 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(); @@ -295,11 +308,6 @@ void client_unmanage(Client *client) 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); @@ -698,7 +706,7 @@ void client_update_normal_hints(Client *self) /* 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; @@ -885,6 +893,7 @@ static void client_change_allowed_actions(Client *self) 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; } @@ -926,9 +935,11 @@ void client_update_wmhints(Client *self) 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; @@ -1074,7 +1085,7 @@ void client_update_strut(Client *self) 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); @@ -1315,13 +1326,11 @@ void client_configure(Client *self, Corner anchor, int x, int y, int w, int h, /* 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; } } @@ -1532,7 +1541,7 @@ void client_iconify(Client *self, gboolean iconic, gboolean curdesk) 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); } @@ -1693,13 +1702,14 @@ void client_kill(Client *self) 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); @@ -1709,19 +1719,33 @@ void client_set_desktop(Client *self, guint target) /* 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); @@ -1934,7 +1958,10 @@ gboolean client_focus(Client *self) } if (self->can_focus) - XSetInputFocus(ob_display, self->window, RevertToNone, + /* 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) { @@ -1952,14 +1979,19 @@ gboolean client_focus(Client *self) 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) @@ -1967,23 +1999,6 @@ gboolean client_focused(Client *self) return self == focus_client; } -void client_set_focused(Client *self, gboolean focused) -{ - if (focused) { - if (focus_client != self) - focus_set_client(self); - } else { - event_unfocustime = event_lasttime; - if (focus_client == self) - focus_set_client(NULL); - } - - /* focus state can affect the stacking layer */ - client_calc_layer(self); - - engine_frame_adjust_focus(self->frame); -} - Icon *client_icon(Client *self, int w, int h) { int i;