X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fclient.c;h=59c2274e9104862dbdc19aaf9fc76b5d30fa0935;hb=83508a2ad227464b84e9cd84f7172ac69bf85230;hp=de1b2c9c253bf19c146c881893aa17e1fd3cb3c4;hpb=c2684d312b7bcd0aeb16813c7d1b33d635d99603;p=chaz%2Fopenbox diff --git a/openbox/client.c b/openbox/client.c index de1b2c9c..59c2274e 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" @@ -23,6 +24,9 @@ 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); @@ -38,13 +42,18 @@ static Client *search_focus_tree(Client *node, Client *skip); static void client_apply_startup_state(Client *self); static Client *search_modal_tree(Client *node, Client *skip); -static guint map_hash(Window w) { return w; } -static gboolean map_key_comp(Window w1, Window w2) { return w1 == w2; } +static guint map_hash(Window *w) { return *w; } +static gboolean map_key_comp(Window *w1, Window *w2) { return *w1 == *w2; } void client_startup() { 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(); } @@ -78,6 +87,7 @@ void client_set_list() void client_manage_all() { + ConfigValue focus_new; unsigned int i, j, nchild; Window w, *children; XWMHints *wmhints; @@ -112,6 +122,27 @@ void client_manage_all() } } 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); + 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) @@ -122,6 +153,7 @@ void client_manage(Window window) XSetWindowAttributes attrib_set; /* XWMHints *wmhint; */ guint i; + ConfigValue focus_new; grab_server(TRUE); @@ -186,8 +218,8 @@ void client_manage(Window window) client_list = g_slist_append(client_list, client); stacking_list = g_list_append(stacking_list, client); - g_assert(!g_hash_table_lookup(client_map, (gpointer)client->window)); - g_hash_table_insert(client_map, (gpointer)window, client); + g_assert(!g_hash_table_lookup(client_map, &client->window)); + g_hash_table_insert(client_map, &client->window, client); /* update the focus lists */ if (client->desktop == DESKTOP_ALL) { @@ -208,10 +240,15 @@ 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(); - g_message("Managed window 0x%lx", window); +/* g_message("Managed window 0x%lx", window);*/ } void client_unmanage_all() @@ -226,7 +263,7 @@ void client_unmanage(Client *client) 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); @@ -241,7 +278,7 @@ void client_unmanage(Client *client) client_list = g_slist_remove(client_list, client); stacking_list = g_list_remove(stacking_list, client); - g_hash_table_remove(client_map, (gpointer)client->window); + g_hash_table_remove(client_map, &client->window); /* update the focus lists */ if (client->desktop == DESKTOP_ALL) { @@ -271,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); @@ -528,7 +560,7 @@ void client_update_transient_for(Client *self) if (XGetTransientForHint(ob_display, self->window, &t) && t != self->window) { /* cant be transient to itself! */ self->transient = TRUE; - c = g_hash_table_lookup(client_map, (gpointer)t); + c = g_hash_table_lookup(client_map, &t); g_assert(c != self);/* if this happens then we need to check for it*/ if (!c /*XXX: && _group*/) { @@ -861,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; } @@ -902,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; @@ -1090,8 +1125,8 @@ void client_update_icons(Client *self) /* 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; @@ -1101,11 +1136,6 @@ void client_update_icons(Client *self) 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); } @@ -1915,8 +1945,10 @@ gboolean client_focus(Client *self) } if (self->can_focus) + /* RevertToNone is used so that windows dont get focused inadvertantly + by having the pointer in them, and then FocusIn events go missing */ XSetInputFocus(ob_display, self->window, RevertToNone, - CurrentTime); + event_lasttime); if (self->focus_notify) { XEvent ce; @@ -1926,21 +1958,26 @@ gboolean client_focus(Client *self) 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) @@ -1948,18 +1985,27 @@ 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]; }