X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=openbox%2Fclient.c;h=1df411e2090fae1c3a5303d2f1f1236b30ff0bac;hb=d447dc0f59619d26073699d9f81d7de77c200be4;hp=b717b914f561323ee9fd2f5ebe12b161a3ec8757;hpb=436c85576e99f4df81273f8b510a94605e676cab;p=chaz%2Fopenbox diff --git a/openbox/client.c b/openbox/client.c index b717b914..1df411e2 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,26 @@ 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); + 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 +152,7 @@ void client_manage(Window window) XSetWindowAttributes attrib_set; /* XWMHints *wmhint; */ guint i; + ConfigValue focus_new; grab_server(TRUE); @@ -186,8 +217,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 +239,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 +262,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 +277,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 +307,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 +559,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*/) { @@ -674,7 +705,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; @@ -715,7 +746,8 @@ void client_setup_decor_and_functions(Client *self) { /* 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) { @@ -794,7 +826,7 @@ void client_setup_decor_and_functions(Client *self) /* can't maximize without moving/resizing */ if (!((self->functions & Func_Move) && (self->functions & Func_Resize))) - self->functions &= ~Func_Maximize; + self->functions &= ~(Func_Maximize | Func_Fullscreen); /* finally, user specified disabled decorations are applied to subtract decorations */ @@ -810,6 +842,8 @@ void client_setup_decor_and_functions(Client *self) 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; @@ -861,6 +895,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 +937,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; @@ -1050,7 +1087,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); @@ -1090,8 +1127,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 +1138,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); } @@ -1286,6 +1318,11 @@ void client_configure(Client *self, Corner anchor, int x, int y, int w, int h, { 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; @@ -1296,74 +1333,85 @@ 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; } } - if (x == self->area.x && y == self->area.y && w == self->area.width && - h == self->area.height) - return; /* no change */ - - w -= self->base_size.width; - h -= self->base_size.height; + /* 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) { - /* for interactive resizing. have to move half an increment in each - direction. */ - - /* how far we are towards the next size inc */ - int mw = w % self->size_inc.width; - int mh = h % self->size_inc.height; - /* amount to add */ - int aw = self->size_inc.width / 2; - int ah = self->size_inc.height / 2; - /* don't let us move into a new size increment */ - if (mw + aw >= self->size_inc.width) - aw = self->size_inc.width - mw - 1; - if (mh + ah >= self->size_inc.height) - ah = self->size_inc.height - mh - 1; - w += aw; - h += ah; - - /* if this is a user-requested resize, then check against min/max - sizes and aspect ratios */ - - /* smaller than min size or bigger than max size? */ - if (w > self->max_size.width) w = self->max_size.width; - if (w < self->min_size.width) w = self->min_size.width; - if (h > self->max_size.height) h = self->max_size.height; - if (h < self->min_size.height) h = self->min_size.height; - - /* adjust the height ot match the width for the aspect ratios */ - if (self->min_ratio) - if (h * self->min_ratio > w) h = (int)(w / self->min_ratio); - if (self->max_ratio) - if (h * self->max_ratio < w) h = (int)(w / self->max_ratio); + if (!(self->functions & Func_Move)) { + x = self->area.x; + y = self->area.y; + } + if (!(self->functions & Func_Resize)) { + w = self->area.width; + h = self->area.height; + } } - /* keep to the increments */ - w /= self->size_inc.width; - h /= self->size_inc.height; + if (!(w == self->area.width && h == self->area.height)) { + w -= self->base_size.width; + h -= self->base_size.height; + + if (user) { + /* for interactive resizing. have to move half an increment in each + direction. */ + + /* how far we are towards the next size inc */ + int mw = w % self->size_inc.width; + int mh = h % self->size_inc.height; + /* amount to add */ + int aw = self->size_inc.width / 2; + int ah = self->size_inc.height / 2; + /* don't let us move into a new size increment */ + if (mw + aw >= self->size_inc.width) + aw = self->size_inc.width - mw - 1; + if (mh + ah >= self->size_inc.height) + ah = self->size_inc.height - mh - 1; + w += aw; + h += ah; + + /* if this is a user-requested resize, then check against min/max + sizes and aspect ratios */ + + /* smaller than min size or bigger than max size? */ + if (w > self->max_size.width) w = self->max_size.width; + if (w < self->min_size.width) w = self->min_size.width; + if (h > self->max_size.height) h = self->max_size.height; + if (h < self->min_size.height) h = self->min_size.height; + + /* adjust the height ot match the width for the aspect ratios */ + if (self->min_ratio) + if (h * self->min_ratio > w) h = (int)(w / self->min_ratio); + if (self->max_ratio) + if (h * self->max_ratio < w) h = (int)(w / self->max_ratio); + } + + /* keep to the increments */ + w /= self->size_inc.width; + h /= self->size_inc.height; - /* you cannot resize to nothing */ - if (w < 1) w = 1; - if (h < 1) h = 1; + /* you cannot resize to nothing */ + if (w < 1) w = 1; + if (h < 1) h = 1; - /* store the logical size */ - SIZE_SET(self->logical_size, w, h); + /* store the logical size */ + SIZE_SET(self->logical_size, w, h); - w *= self->size_inc.width; - h *= self->size_inc.height; + w *= self->size_inc.width; + h *= self->size_inc.height; - w += self->base_size.width; - h += self->base_size.height; + w += self->base_size.width; + h += self->base_size.height; + } switch (anchor) { case Corner_TopLeft: @@ -1390,30 +1438,29 @@ void client_configure(Client *self, Corner anchor, int x, int y, int w, int h, /* move/resize the frame to match the request */ if (self->frame) { - engine_frame_adjust_area(self->frame, moved, resized); - - if (moved) { - if (!user || final) { - XEvent event; - event.type = ConfigureNotify; - event.xconfigure.display = ob_display; - event.xconfigure.event = self->window; - event.xconfigure.window = self->window; + if (moved || resized) + engine_frame_adjust_area(self->frame, moved, resized); + + if (!user || final) { + XEvent event; + event.type = ConfigureNotify; + event.xconfigure.display = ob_display; + event.xconfigure.event = self->window; + event.xconfigure.window = self->window; - /* root window coords with border in mind */ - event.xconfigure.x = x - self->border_width + - self->frame->size.left; - event.xconfigure.y = y - self->border_width + - self->frame->size.top; + /* root window coords with border in mind */ + event.xconfigure.x = x - self->border_width + + self->frame->size.left; + event.xconfigure.y = y - self->border_width + + self->frame->size.top; - event.xconfigure.width = self->area.width; - event.xconfigure.height = self->area.height; - event.xconfigure.border_width = self->border_width; - event.xconfigure.above = self->frame->plate; - event.xconfigure.override_redirect = FALSE; - XSendEvent(event.xconfigure.display, event.xconfigure.window, - FALSE, StructureNotifyMask, &event); - } + event.xconfigure.width = self->area.width; + event.xconfigure.height = self->area.height; + event.xconfigure.border_width = self->border_width; + event.xconfigure.above = self->frame->plate; + event.xconfigure.override_redirect = FALSE; + XSendEvent(event.xconfigure.display, event.xconfigure.window, + FALSE, StructureNotifyMask, &event); } } } @@ -1504,7 +1551,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); } @@ -1568,13 +1615,6 @@ void client_maximize(Client *self, gboolean max, int dir, gboolean savearea) 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; @@ -1621,7 +1661,7 @@ void client_maximize(Client *self, gboolean max, int dir, gboolean savearea) 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 */ @@ -1665,13 +1705,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); @@ -1681,19 +1722,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); @@ -1906,8 +1961,11 @@ gboolean client_focus(Client *self) } 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; @@ -1917,21 +1975,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) @@ -1939,18 +2002,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]; }