X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fclient.c;h=d7a99def5c6d125fe9b1109cbd0c180ffa96fee6;hb=a4a0cb78294bb1809b836ea1e86e9d7294bb2929;hp=3d9239e481dd95ed1acfb748b25996f7af002734;hpb=5b3d5bda2439c20b33e7c8e32f58bf92b9bbed5c;p=chaz%2Fopenbox diff --git a/openbox/client.c b/openbox/client.c index 3d9239e4..d7a99def 100644 --- a/openbox/client.c +++ b/openbox/client.c @@ -1355,10 +1355,11 @@ void client_update_icons(Client *self) 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, - &self->icons[self->nicons-1].data)) { + if (!RrPixmapToRGBA(ob_rr_inst, + data[0], data[1], + &self->icons[self->nicons-1].width, + &self->icons[self->nicons-1].height, + &self->icons[self->nicons-1].data)) { g_free(&self->icons[self->nicons-1]); self->nicons--; } @@ -1373,12 +1374,13 @@ void client_update_icons(Client *self) 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), - &self->icons[self->nicons-1].width, - &self->icons[self->nicons-1].height, - &self->icons[self->nicons-1].data)){ + if (!RrPixmapToRGBA(ob_rr_inst, + hints->icon_pixmap, + (hints->flags & IconMaskHint ? + hints->icon_mask : None), + &self->icons[self->nicons-1].width, + &self->icons[self->nicons-1].height, + &self->icons[self->nicons-1].data)){ g_free(&self->icons[self->nicons-1]); self->nicons--; } @@ -1658,16 +1660,32 @@ 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; + } 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; + int mw = (w - basew) % self->size_inc.width; + int mh = (h - baseh) % self->size_inc.height; /* amount to add */ int aw = self->size_inc.width / 2; int ah = self->size_inc.height / 2; @@ -1680,21 +1698,18 @@ 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; } + w -= basew; + h -= baseh; + /* keep to the increments */ w /= self->size_inc.width; h /= self->size_inc.height; @@ -1709,8 +1724,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) { @@ -1733,7 +1763,11 @@ void client_configure(Client *self, Corner anchor, int x, int y, int w, int h, RECT_SET(self->area, x, y, w, h); - if (final || (resized && !config_opaque_resize)) + /* for app-requested resizes, always resize if 'resized' is true. + for user-requested ones, only resize if final is true, or when + resizing in opaque mode */ + if ((!user && resized) || + (user && (final || (resized && config_opaque_resize)))) XResizeWindow(ob_display, self->window, w, h); /* move/resize the frame to match the request */ @@ -1741,7 +1775,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 changed 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 || resized) && (!user || final)) { XEvent event; event.type = ConfigureNotify; event.xconfigure.display = ob_display;