X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=openbox%2Fclient.c;h=4d1ba85a6d01f93f4614878616467aa2924849b3;hb=ddeb066ed4b112d9e8b1b7941addfea06b5c2a99;hp=ade1a1093cb59abf9fea2a7acf79d2c311179086;hpb=a373b1582e4e40a4f126632a7528553e74fd26f2;p=chaz%2Fopenbox diff --git a/openbox/client.c b/openbox/client.c index ade1a109..4d1ba85a 100644 --- a/openbox/client.c +++ b/openbox/client.c @@ -1,5 +1,6 @@ #include "client.h" #include "dock.h" +#include "xerror.h" #include "startup.h" #include "screen.h" #include "moveresize.h" @@ -253,26 +254,26 @@ void client_manage(Window window) focus_order_add_new(self); /* focus the new window? */ - if (ob_state != State_Starting && config_focus_new) { + if (ob_state != State_Starting && config_focus_new && + (self->type == Type_Normal || self->type == Type_Dialog)) { gboolean group_foc = FALSE; if (self->group) { GSList *it; - for (it = self->group->members; it; it = it->next) + for (it = self->group->members; it; it = it->next) { if (client_focused(it->data)) { group_foc = TRUE; break; } + } } /* note the check against Type_Normal/Dialog, not client_normal(self), which would also include other types. in this case we want more strict rules for focus */ - if (((self->type == Type_Normal || - (self->type == Type_Dialog && - (group_foc || - (!self->transient_for && (!self->group || - !self->group->members->next)))))) || + if ((group_foc || + (!self->transient_for && (!self->group || + !self->group->members->next))) || client_search_focus_tree_full(self) || !focus_client || !client_normal(focus_client)) { @@ -1030,7 +1031,7 @@ void client_setup_decor_and_functions(Client *self) we may also need to be repositioned */ frame_adjust_area(self->frame, TRUE, TRUE); /* with new decor, the window's maximized size may change */ - client_remaximize(self); + client_reconfigure(self); } else { /* this makes sure that these windows appear on all desktops */ if (self->type == Type_Desktop && self->desktop != DESKTOP_ALL) @@ -1088,19 +1089,10 @@ static void client_change_allowed_actions(Client *self) } } -void client_remaximize(Client *self) +void client_reconfigure(Client *self) { - int dir; - if (self->max_horz && self->max_vert) - dir = 0; - else if (self->max_horz) - dir = 1; - else if (self->max_vert) - dir = 2; - else - return; /* not maximized */ - self->max_horz = self->max_vert = FALSE; - client_maximize(self, TRUE, dir, FALSE); + client_configure(self, Corner_TopLeft, self->area.x, self->area.y, + self->area.width, self->area.height, TRUE, TRUE); } void client_update_wmhints(Client *self) @@ -1140,18 +1132,20 @@ void client_update_wmhints(Client *self) group_remove(self->group, self); self->group = NULL; } - /* i can only have transients from the group if i am not transient - myself */ - if (hints->window_group != None && !self->transient_for) { + if (hints->window_group != None) { self->group = group_add(hints->window_group, self); - /* add other transients of the group that are already - set up */ - for (it = self->group->members; it; it = it->next) - if (it->data != self && - ((Client*)it->data)->transient_for == TRAN_GROUP) - self->transients = g_slist_append(self->transients, - it->data); + /* i can only have transients from the group if i am not + transient myself */ + if (!self->transient_for) { + /* add other transients of the group that are already + set up */ + for (it = self->group->members; it; it = it->next) + if (it->data != self && + ((Client*)it->data)->transient_for == TRAN_GROUP) + self->transients = g_slist_append(self->transients, + it->data); + } } /* the WM_HINTS can contain an icon */ @@ -1323,7 +1317,7 @@ void client_update_icons(Client *self) w = data[i++]; h = data[i++]; i += w * h; - if (i > num) break; + if (i > num || w*h == 0) break; ++self->nicons; } @@ -1337,6 +1331,8 @@ void client_update_icons(Client *self) w = self->icons[j].width = data[i++]; h = self->icons[j].height = data[i++]; + if (w*h == 0) continue; + self->icons[j].data = g_new(pixel32, w * h); for (x = 0, y = 0, t = 0; t < w * h; ++t, ++x, ++i) { if (x >= w) { @@ -1358,6 +1354,7 @@ void client_update_icons(Client *self) if (num == 2) { self->nicons++; self->icons = g_new(Icon, self->nicons); + xerror_set_ignore(TRUE); if (!render_pixmap_to_rgba(data[0], data[1], &self->icons[self->nicons-1].width, &self->icons[self->nicons-1].height, @@ -1365,6 +1362,7 @@ void client_update_icons(Client *self) g_free(&self->icons[self->nicons-1]); self->nicons--; } + xerror_set_ignore(FALSE); } g_free(data); } else { @@ -1374,6 +1372,7 @@ void client_update_icons(Client *self) if (hints->flags & IconPixmapHint) { self->nicons++; self->icons = g_new(Icon, self->nicons); + xerror_set_ignore(TRUE); if (!render_pixmap_to_rgba(hints->icon_pixmap, (hints->flags & IconMaskHint ? hints->icon_mask : None), @@ -1383,6 +1382,7 @@ void client_update_icons(Client *self) g_free(&self->icons[self->nicons-1]); self->nicons--; } + xerror_set_ignore(FALSE); } XFree(hints); } @@ -1609,10 +1609,25 @@ void client_configure(Client *self, Corner anchor, int x, int y, int w, int h, /* set the size and position if fullscreen */ if (self->fullscreen) { - x = 0; - y = 0; - w = screen_physical_size.width; - h = screen_physical_size.height; +#ifdef VIDMODE + int dot; + XF86VidModeModeLine mode; + + if (XF86VidModeGetModeLine(ob_display, ob_screen, &dot, &mode)) { + w = mode.hdisplay; + h = mode.vdisplay; + if (mode.privsize) XFree(mode.private); + } else { +#else + w = screen_physical_size.width; + h = screen_physical_size.height; +#endif +#ifdef VIDMODE + } + if (!XF86VidModeGetViewPort(ob_display, ob_screen, &x, &y)) { + x = y = 0; +#endif + } user = FALSE; /* ignore that increment etc shit when in fullscreen */ } else { /* set the size and position if maximized */ @@ -1643,8 +1658,27 @@ void client_configure(Client *self, Corner anchor, int x, int y, int w, int h, } if (!(w == self->area.width && h == self->area.height)) { - w -= self->base_size.width; - h -= self->base_size.height; + int basew, baseh, minw, minh; + + /* base size is substituted with min size if not specified */ + if (self->base_size.width || self->base_size.height) { + basew = self->base_size.width; + baseh = self->base_size.height; + } else { + basew = self->min_size.width; + baseh = self->min_size.height; + } + /* min size is substituted with base size if not specified */ + if (self->min_size.width || self->min_size.height) { + minw = self->min_size.width; + minh = self->min_size.height; + } else { + minw = self->base_size.width; + minh = self->base_size.height; + } + + w -= basew; + h -= baseh; if (user) { /* for interactive resizing. have to move half an increment in each @@ -1665,19 +1699,13 @@ void client_configure(Client *self, Corner anchor, int x, int y, int w, int h, h += ah; /* if this is a user-requested resize, then check against min/max - sizes and aspect ratios */ + sizes */ /* 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 (w < minw) w = minw; 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 (h < minh) h = minh; } /* keep to the increments */ @@ -1694,8 +1722,23 @@ void client_configure(Client *self, Corner anchor, int x, int y, int w, int h, w *= self->size_inc.width; h *= self->size_inc.height; - w += self->base_size.width; - h += self->base_size.height; + w += basew; + h += baseh; + + if (user) { + /* adjust the height to match the width for the aspect ratios. + for this, min size is not substituted for base size ever. */ + w -= self->base_size.width; + h -= self->base_size.height; + + 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); + + w += self->base_size.width; + h += self->base_size.height; + } } switch (anchor) { @@ -1718,7 +1761,7 @@ void client_configure(Client *self, Corner anchor, int x, int y, int w, int h, RECT_SET(self->area, x, y, w, h); - if (resized) + if (final || (resized && config_opaque_resize)) XResizeWindow(ob_display, self->window, w, h); /* move/resize the frame to match the request */ @@ -1726,7 +1769,11 @@ void client_configure(Client *self, Corner anchor, int x, int y, int w, int h, if (moved || resized) frame_adjust_area(self->frame, moved, resized); - if (!user || final) { + /* If you send this and the client hasn't moved you end up with buggy + clients (emacs) freaking out, cuz they send back a configure every + time they receive this event, which resends them this event... etc. + */ + if (moved && (!user || final)) { XEvent event; event.type = ConfigureNotify; event.xconfigure.display = ob_display; @@ -1858,6 +1905,11 @@ void client_iconify(Client *self, gboolean iconic, gboolean curdesk) /* this puts it after the current focused window */ focus_order_remove(self); focus_order_add_new(self); + + /* this is here cuz with the VIDMODE extension, the viewport can change + while a fullscreen window is iconic, and when it uniconifies, it + would be nice if it did so to the new position of the viewport */ + client_reconfigure(self); } client_change_state(self); client_showhide(self); @@ -2230,18 +2282,15 @@ Client *client_focus_target(Client *self) return self; } -gboolean client_focus(Client *self) +gboolean client_can_focus(Client *self) { XEvent ev; /* choose the correct target */ self = client_focus_target(self); - if (self->desktop != DESKTOP_ALL && self->desktop != screen_desktop) { - /* update the focus lists */ - focus_order_to_top(self); + if (!self->frame->visible) return FALSE; - } if (!((self->can_focus || self->focus_notify) && (self->desktop == screen_desktop || @@ -2267,6 +2316,22 @@ gboolean client_focus(Client *self) } } + return TRUE; +} + +gboolean client_focus(Client *self) +{ + /* choose the correct target */ + self = client_focus_target(self); + + if (!client_can_focus(self)) { + if (!self->frame->visible) { + /* update the focus lists */ + focus_order_to_top(self); + } + return FALSE; + } + if (self->can_focus) /* RevertToPointerRoot causes much more headache than RevertToNone, so I choose to use it always, hopefully to find errors quicker, if any