X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fclient.c;h=3396796201c0b2bcb4e45f748a6777823cbffa62;hb=564b727966ef1a38309d45b2ab040c3deeb658a4;hp=d5e7f4ce4816ee266c2bd04b6f8f5ffe1c3a50fc;hpb=c6fe4f8d8f4bd462ff9b1b1344422d0115cd5ff3;p=chaz%2Fopenbox diff --git a/openbox/client.c b/openbox/client.c index d5e7f4ce..33967962 100644 --- a/openbox/client.c +++ b/openbox/client.c @@ -320,6 +320,7 @@ void client_manage(Window window) /* focus the new window? */ if (ob_state() != OB_STATE_STARTING && + !self->iconic && /* this means focus=true for window is same as config_focus_new=true */ ((config_focus_new || (settings && settings->focus == 1)) || client_search_focus_parent(self)) && @@ -332,37 +333,6 @@ void client_manage(Window window) self->type == OB_CLIENT_TYPE_DIALOG)) { activate = TRUE; -#if 0 - if (self->desktop != screen_desktop) { - /* activate the window */ - activate = TRUE; - } else { - gboolean group_foc = FALSE; - - if (self->group) { - GSList *it; - - for (it = self->group->members; it; it = g_slist_next(it)) - { - if (client_focused(it->data)) - { - group_foc = TRUE; - break; - } - } - } - if ((group_foc || - (!self->transient_for && (!self->group || - !self->group->members->next))) || - client_search_focus_tree_full(self) || - !focus_client || - !client_normal(focus_client)) - { - /* activate the window */ - activate = TRUE; - } - } -#endif } /* get the current position */ @@ -404,7 +374,6 @@ void client_manage(Window window) self->window, newx, newy, self->area.width, self->area.height); client_apply_startup_state(self, newx, newy); - keyboard_grab_for_client(self, TRUE); mouse_grab_for_client(self, TRUE); if (activate) { @@ -415,10 +384,18 @@ void client_manage(Window window) ob_debug("Want to focus new window 0x%x with time %u (last time %u)\n", self->window, self->user_time, last_time); - /* If a nothing at all, or a parent was focused, then focus this + /* if it's on another desktop */ + if (!(self->desktop == screen_desktop || self->desktop == DESKTOP_ALL) + && /* the timestamp is from before you changed desktops */ + self->user_time && screen_desktop_user_time && + !event_time_after(self->user_time, screen_desktop_user_time)) + { + activate = FALSE; + } + /* If nothing is focused, or a parent was focused, then focus this always */ - if (!focus_client || client_search_focus_parent(self) != NULL) + else if (!focus_client || client_search_focus_parent(self) != NULL) activate = TRUE; else { @@ -435,13 +412,7 @@ void client_manage(Window window) activate = FALSE; } - if (activate) - { - /* since focus can change the stacking orders, if we focus the - window then the standard raise it gets is not enough, we need - to queue one for after the focus change takes place */ - client_raise(self); - } else { + if (!activate) { ob_debug("Focus stealing prevention activated for %s with time %u " "(last time %u)\n", self->title, self->user_time, last_time); @@ -471,17 +442,8 @@ void client_manage(Window window) a window maps since its not based on an action from the user like clicking a window to activate it. so keep the new window out of the way but do focus it. */ - if (activate) { - /* if using focus_delay, stop the timer now so that focus doesn't - go moving on us */ - event_halt_focus_delay(); - client_focus(self); - } - - /* client_activate does this but we aren't using it so we have to do it - here as well */ - if (screen_showing_desktop) - screen_show_desktop(FALSE); + if (activate) + client_activate(self, FALSE, TRUE); /* add to client list/map */ client_list = g_list_append(client_list, self); @@ -521,13 +483,9 @@ void client_unmanage(ObClient *self) /* flush to send the hide to the server quickly */ XFlush(ob_display); - if (focus_client == self) { - /* ignore enter events from the unmap so it doesnt mess with the focus - */ - event_ignore_queued_enters(); - } + /* ignore enter events from the unmap so it doesnt mess with the focus */ + event_ignore_queued_enters(); - keyboard_grab_for_client(self, FALSE); mouse_grab_for_client(self, FALSE); /* remove the window from our save set */ @@ -535,9 +493,24 @@ void client_unmanage(ObClient *self) /* update the focus lists */ focus_order_remove(self); - /* don't leave an invalid focus_client */ - if (self == focus_client) - focus_client = NULL; + if (client_focused(self)) { + /* we have to fall back here because we might not get a focus out. + 1. we need to xselectinput off the window before we unmap it because + otherwise we end up getting unmapnotifies we don't want and they + can mess up mapping it again quickly + 2. this means that if we unmanage from a synthetic unmapnotify, we + are the ones unmapped it, and causing the focusout. so we won't + get the focusout event. + 3. we can't handle focusin events on the root window because they + come from all screens, so the focus change gets lost + + if this ever gets removed in the future MAKE SURE to replace it + with: + /- don't leave an invalid focus_client -/ + focus_client = NULL; + */ + focus_fallback(FALSE); + } client_list = g_list_remove(client_list, self); stacking_remove(self); @@ -683,7 +656,7 @@ static ObAppSettings *client_get_settings_state(ObClient *self) if (settings->max_vert != -1) self->max_vert = !!settings->max_vert; if (settings->max_horz != -1) - self->max_vert = !!settings->max_horz; + self->max_horz = !!settings->max_horz; if (settings->fullscreen != -1) self->fullscreen = !!settings->fullscreen; @@ -781,8 +754,8 @@ gboolean client_find_onscreen(ObClient *self, gint *x, gint *y, gint w, gint h, Rect *a; gint ox = *x, oy = *y; - frame_client_gravity(self->frame, x, y); /* get where the frame - would be */ + /* get where the frame would be */ + frame_client_gravity(self->frame, x, y, w, h); /* XXX watch for xinerama dead areas */ /* This makes sure windows aren't entirely outside of the screen so you @@ -806,6 +779,15 @@ gboolean client_find_onscreen(ObClient *self, gint *x, gint *y, gint w, gint h, *y = a->y - self->frame->area.width*9/10; } + /* If rudeness wasn't requested, then figure out of the client is currently + entirely on the screen. If it is, then be rude even though it wasn't + requested */ + if (!rude) { + a = screen_area_monitor(self->desktop, client_monitor(self)); + if (RECT_CONTAINS_RECT(*a, self->area)) + rude = TRUE; + } + /* This here doesn't let windows even a pixel outside the screen, * when called from client_manage, programs placing themselves are * forced completely onscreen, while things like @@ -831,8 +813,8 @@ gboolean client_find_onscreen(ObClient *self, gint *x, gint *y, gint w, gint h, } } - frame_frame_gravity(self->frame, x, y); /* get where the client - should be */ + /* get where the client should be */ + frame_frame_gravity(self->frame, x, y, w, h); return ox != *x || oy != *y; } @@ -1019,10 +1001,6 @@ static void client_get_desktop(ObClient *self) self->desktop = screen_desktop; } } - if (self->desktop != d) { - /* set the desktop hint, to make sure that it always exists */ - PROP_SET32(self->window, net_wm_desktop, cardinal, self->desktop); - } } static void client_get_layer(ObClient *self) @@ -1180,7 +1158,8 @@ void client_update_transient_for(ObClient *self) /* remove from old parents */ for (it = self->group->members; it; it = g_slist_next(it)) { ObClient *c = it->data; - if (c != self && !c->transient_for) + if (c != self && (!c->transient_for || + c->transient_for != OB_TRAN_GROUP)) c->transients = g_slist_remove(c->transients, self); } } else if (self->transient_for != NULL) { /* transient of window */ @@ -1195,7 +1174,8 @@ void client_update_transient_for(ObClient *self) /* add to new parents */ for (it = self->group->members; it; it = g_slist_next(it)) { ObClient *c = it->data; - if (c != self && !c->transient_for) + if (c != self && (!c->transient_for || + c->transient_for != OB_TRAN_GROUP)) c->transients = g_slist_append(c->transients, self); } @@ -1306,7 +1286,7 @@ void client_update_protocols(ObClient *self) self->focus_notify = TRUE; #ifdef SYNC else if (proto[i] == prop_atoms.net_wm_sync_request) - /* if this protocol is requested, then the resizing the + /* if this protocol is requested, then resizing the window will be synchronized between the frame and the client */ self->sync_request = TRUE; @@ -1380,9 +1360,9 @@ void client_update_normal_hints(ObClient *self) if (self->frame && self->gravity != oldgravity) { /* move our idea of the client's position based on its new gravity */ - self->area.x = self->frame->area.x; - self->area.y = self->frame->area.y; - frame_frame_gravity(self->frame, &self->area.x, &self->area.y); + client_convert_gravity(self, oldgravity, + &self->area.x, &self->area.y, + self->area.width, self->area.height); } } @@ -1601,7 +1581,7 @@ void client_reconfigure(ObClient *self) /* by making this pass FALSE for user, we avoid the emacs event storm where every configurenotify causes an update in its normal hints, i think this is generally what we want anyways... */ - client_configure(self, OB_CORNER_TOPLEFT, self->area.x, self->area.y, + client_configure(self, self->area.x, self->area.y, self->area.width, self->area.height, FALSE, TRUE); } @@ -1891,7 +1871,26 @@ void client_update_icons(ObClient *self) } } - if (self->frame) + /* set the default icon onto the window + in theory, this could be a race, but if a window doesn't set an icon + or removes it entirely, it's not very likely it is going to set one + right away afterwards */ + if (self->nicons == 0) { + RrPixel32 *icon = ob_rr_theme->def_win_icon; + gulong *data; + + data = g_new(gulong, 48*48+2); + data[0] = data[1] = 48; + for (i = 0; i < 48*48; ++i) + data[i+2] = (((icon[i] >> RrDefaultAlphaOffset) & 0xff) << 24) + + (((icon[i] >> RrDefaultRedOffset) & 0xff) << 16) + + (((icon[i] >> RrDefaultGreenOffset) & 0xff) << 8) + + (((icon[i] >> RrDefaultBlueOffset) & 0xff) << 0); + PROP_SETA32(self->window, net_wm_icon, cardinal, data, 48*48+2); + g_free(data); + } else if (self->frame) + /* don't draw the icon empty if we're just setting one now anyways, + we'll get the property change any second */ frame_adjust_icon(self->frame); } @@ -2173,6 +2172,9 @@ static void client_apply_startup_state(ObClient *self, gint x, gint y) self->area.x = x; self->area.y = y; + /* set the desktop hint, to make sure that it always exists */ + PROP_SET32(self->window, net_wm_desktop, cardinal, self->desktop); + /* these are in a carefully crafted order.. */ if (self->iconic) { @@ -2232,8 +2234,21 @@ static void client_apply_startup_state(ObClient *self, gint x, gint y) */ } -void client_try_configure(ObClient *self, ObCorner anchor, - gint *x, gint *y, gint *w, gint *h, +void client_convert_gravity(ObClient *self, gint gravity, gint *x, gint *y, + gint w, gint h) +{ + gint oldg = self->gravity; + + /* get the frame's position from the requested stuff */ + self->gravity = gravity; + frame_client_gravity(self->frame, x, y, w, h); + self->gravity = oldg; + + /* get the client's position in its true gravity from that */ + frame_frame_gravity(self->frame, x, y, w, h); +} + +void client_try_configure(ObClient *self, gint *x, gint *y, gint *w, gint *h, gint *logicalw, gint *logicalh, gboolean user) { @@ -2328,7 +2343,7 @@ void client_try_configure(ObClient *self, ObCorner anchor, } /* gets the frame's position */ - frame_client_gravity(self->frame, x, y); + frame_client_gravity(self->frame, x, y, *w, *h); /* these positions are frame positions, not client positions */ @@ -2369,7 +2384,7 @@ void client_try_configure(ObClient *self, ObCorner anchor, } /* gets the client's position */ - frame_frame_gravity(self->frame, x, y); + frame_frame_gravity(self->frame, x, y, *w, *h); /* these override the above states! if you cant move you can't move! */ if (user) { @@ -2385,26 +2400,10 @@ void client_try_configure(ObClient *self, ObCorner anchor, g_assert(*w > 0); g_assert(*h > 0); - - switch (anchor) { - case OB_CORNER_TOPLEFT: - break; - case OB_CORNER_TOPRIGHT: - *x -= *w - self->area.width; - break; - case OB_CORNER_BOTTOMLEFT: - *y -= *h - self->area.height; - break; - case OB_CORNER_BOTTOMRIGHT: - *x -= *w - self->area.width; - *y -= *h - self->area.height; - break; - } } -void client_configure_full(ObClient *self, ObCorner anchor, - gint x, gint y, gint w, gint h, +void client_configure_full(ObClient *self, gint x, gint y, gint w, gint h, gboolean user, gboolean final, gboolean force_reply) { @@ -2416,8 +2415,7 @@ void client_configure_full(ObClient *self, ObCorner anchor, gint logicalw, logicalh; /* find the new x, y, width, and height (and logical size) */ - client_try_configure(self, anchor, &x, &y, &w, &h, - &logicalw, &logicalh, user); + client_try_configure(self, &x, &y, &w, &h, &logicalw, &logicalh, user); /* set the logical size if things changed */ if (!(w == self->area.width && h == self->area.height)) @@ -2441,6 +2439,7 @@ void client_configure_full(ObClient *self, ObCorner anchor, /* if the client is enlarging, then resize the client before the frame */ if (send_resize_client && user && (w > oldw || h > oldh)) { XResizeWindow(ob_display, self->window, MAX(w, oldw), MAX(h, oldh)); + /* resize the plate to show the client padding color underneath */ frame_adjust_client_area(self->frame); } @@ -2489,7 +2488,9 @@ void client_configure_full(ObClient *self, ObCorner anchor, /* if the client is shrinking, then resize the frame before the client */ if (send_resize_client && (!user || (w <= oldw || h <= oldh))) { + /* resize the plate to show the client padding color underneath */ frame_adjust_client_area(self->frame); + XResizeWindow(ob_display, self->window, w, h); } @@ -3133,6 +3134,13 @@ void client_activate(ObClient *self, gboolean here, gboolean user) { client_hilite(self, TRUE); } else { + if (event_curtime != CurrentTime) + self->user_time = event_curtime; + + /* if using focus_delay, stop the timer now so that focus doesn't + go moving on us */ + event_halt_focus_delay(); + if (client_normal(self) && screen_showing_desktop) screen_show_desktop(FALSE); if (self->iconic) @@ -3152,11 +3160,11 @@ void client_activate(ObClient *self, gboolean here, gboolean user) client_focus(self); - /* we do this an action here. this is rather important. this is because - we want the results from the focus change to take place BEFORE we go - about raising the window. when a fullscreen window loses focus, we - need this or else the raise wont be able to raise above the - to-lose-focus fullscreen window. */ + /* we do this as an action here. this is rather important. this is + because we want the results from the focus change to take place + BEFORE we go about raising the window. when a fullscreen window + loses focus, we need this or else the raise wont be able to raise + above the to-lose-focus fullscreen window. */ client_raise(self); } } @@ -3258,7 +3266,7 @@ void client_set_undecorated(ObClient *self, gboolean undecorated) * since 125 of these are sent per second when moving the window (with * user = FALSE) i doubt it matters much. */ - client_configure(self, OB_CORNER_TOPLEFT, self->area.x, self->area.y, + client_configure(self, self->area.x, self->area.y, self->area.width, self->area.height, TRUE, TRUE); client_change_state(self); /* reflect this in the state hints */ }