#include "openbox.h"
#include "extensions.h"
#include "prop.h"
+#include "grab.h"
#include "config.h"
#include "framerender.h"
#include "mainloop.h"
(visual ? 32 : RrDepth(ob_rr_inst)), InputOutput,
(visual ? visual : RrVisual(ob_rr_inst)),
mask, attrib);
-
+
}
static Visual *check_32bit_client(ObClient *c)
self->innerright = createWindow(self->window, NULL, mask, &attrib);
self->innerbottom = createWindow(self->window, NULL, mask, &attrib);
+ self->innerblb = createWindow(self->innerbottom, NULL, mask, &attrib);
+ self->innerbrb = createWindow(self->innerbottom, NULL, mask, &attrib);
+ self->innerbll = createWindow(self->innerleft, NULL, mask, &attrib);
+ self->innerbrr = createWindow(self->innerright, NULL, mask, &attrib);
+
self->title = createWindow(self->window, NULL, mask, &attrib);
self->titleleft = createWindow(self->window, NULL, mask, &attrib);
self->titletop = createWindow(self->window, NULL, mask, &attrib);
self->handle = createWindow(self->window, NULL, mask, &attrib);
self->lgrip = createWindow(self->handle, NULL, mask, &attrib);
- self->rgrip = createWindow(self->handle, NULL, mask, &attrib);
+ self->rgrip = createWindow(self->handle, NULL, mask, &attrib);
self->handleleft = createWindow(self->handle, NULL, mask, &attrib);
self->handleright = createWindow(self->handle, NULL, mask, &attrib);
XMapWindow(ob_display, self->backback);
XMapWindow(ob_display, self->backfront);
- self->max_press = self->close_press = self->desk_press =
+ self->max_press = self->close_press = self->desk_press =
self->iconify_press = self->shade_press = FALSE;
- self->max_hover = self->close_hover = self->desk_hover =
+ self->max_hover = self->close_hover = self->desk_hover =
self->iconify_hover = self->shade_hover = FALSE;
set_theme_statics(self);
static void free_theme_statics(ObFrame *self)
{
- RrAppearanceFree(self->a_unfocused_title);
+ RrAppearanceFree(self->a_unfocused_title);
RrAppearanceFree(self->a_focused_title);
RrAppearanceFree(self->a_unfocused_label);
RrAppearanceFree(self->a_focused_label);
if (!self->visible) {
self->visible = TRUE;
framerender_frame(self);
+ /* Grab the server to make sure that the frame window is mapped before
+ the client gets its MapNotify, i.e. to make sure the client is
+ _visible_ when it gets MapNotify. */
+ grab_server(TRUE);
XMapWindow(ob_display, self->client->window);
XMapWindow(ob_display, self->window);
+ grab_server(FALSE);
}
}
{
self->size.bottom += ob_rr_theme->handle_height + self->bwidth;
}
-
+
/* position/size and map/unmap all the windows */
if (!fake) {
+ gint innercornerheight =
+ ob_rr_theme->grip_width - self->size.bottom;
+
if (self->cbwidth_l) {
XMoveResizeWindow(ob_display, self->innerleft,
self->size.left - self->cbwidth_l,
} else
XUnmapWindow(ob_display, self->innerleft);
+ if (self->cbwidth_l && innercornerheight > 0) {
+ XMoveResizeWindow(ob_display, self->innerbll,
+ 0,
+ self->client->area.height -
+ (ob_rr_theme->grip_width -
+ self->size.bottom),
+ self->cbwidth_l,
+ ob_rr_theme->grip_width - self->size.bottom);
+
+ XMapWindow(ob_display, self->innerbll);
+ } else
+ XUnmapWindow(ob_display, self->innerbll);
+
if (self->cbwidth_r) {
XMoveResizeWindow(ob_display, self->innerright,
self->size.left + self->client->area.width,
} else
XUnmapWindow(ob_display, self->innerright);
+ if (self->cbwidth_r && innercornerheight > 0) {
+ XMoveResizeWindow(ob_display, self->innerbrr,
+ 0,
+ self->client->area.height -
+ (ob_rr_theme->grip_width -
+ self->size.bottom),
+ self->cbwidth_r,
+ ob_rr_theme->grip_width - self->size.bottom);
+
+ XMapWindow(ob_display, self->innerbrr);
+ } else
+ XUnmapWindow(ob_display, self->innerbrr);
+
if (self->cbwidth_t) {
XMoveResizeWindow(ob_display, self->innertop,
self->size.left - self->cbwidth_l,
self->cbwidth_l + self->cbwidth_r,
self->cbwidth_b);
+ XMoveResizeWindow(ob_display, self->innerblb,
+ 0, 0,
+ ob_rr_theme->grip_width + self->bwidth,
+ self->cbwidth_b);
+ XMoveResizeWindow(ob_display, self->innerbrb,
+ self->client->area.width +
+ self->cbwidth_l + self->cbwidth_r -
+ (ob_rr_theme->grip_width + self->bwidth),
+ 0,
+ ob_rr_theme->grip_width + self->bwidth,
+ self->cbwidth_b);
+
XMapWindow(ob_display, self->innerbottom);
- } else
+ XMapWindow(ob_display, self->innerblb);
+ XMapWindow(ob_display, self->innerbrb);
+ } else {
XUnmapWindow(ob_display, self->innerbottom);
+ XUnmapWindow(ob_display, self->innerblb);
+ XUnmapWindow(ob_display, self->innerbrb);
+ }
if (self->bwidth) {
gint titlesides;
sidebwidth) * 2,
self->bwidth);
-
+
if (sidebwidth) {
XMoveResizeWindow(ob_display, self->lgripleft,
0,
self->bwidth);
XMoveResizeWindow(ob_display, self->rgripbottom,
self->size.left + self->client->area.width +
- self->size.right - self->bwidth - sidebwidth -
+ self->size.right - self->bwidth - sidebwidth-
ob_rr_theme->grip_width,
self->size.top + self->client->area.height +
self->size.bottom - self->bwidth,
XUnmapWindow(ob_display, self->handle);
}
- if (self->bwidth && !self->max_horz) {
+ if (self->bwidth && !self->max_horz &&
+ (self->client->area.height + self->size.top +
+ self->size.bottom) > ob_rr_theme->grip_width * 2)
+ {
XMoveResizeWindow(ob_display, self->left,
0,
self->bwidth + ob_rr_theme->grip_width,
} else
XUnmapWindow(ob_display, self->left);
- if (self->bwidth && !self->max_horz) {
+ if (self->bwidth && !self->max_horz &&
+ (self->client->area.height + self->size.top +
+ self->size.bottom) > ob_rr_theme->grip_width * 2)
+ {
XMoveResizeWindow(ob_display, self->right,
self->client->area.width + self->cbwidth_l +
self->cbwidth_r + self->bwidth,
if (!frame_iconify_animating(self))
/* move and resize the top level frame.
shading can change without being moved or resized.
-
+
but don't do this during an iconify animation. it will be
reflected afterwards.
*/
XChangeWindowAttributes(ob_display, self->lgripleft, CWCursor, &a);
XChangeWindowAttributes(ob_display, self->lgriptop, CWCursor, &a);
XChangeWindowAttributes(ob_display, self->lgripbottom, CWCursor, &a);
+ XChangeWindowAttributes(ob_display, self->innerbll, CWCursor, &a);
+ XChangeWindowAttributes(ob_display, self->innerblb, CWCursor, &a);
a.cursor = ob_cursor(r ? OB_CURSOR_SOUTHEAST : OB_CURSOR_NONE);
XChangeWindowAttributes(ob_display, self->rgrip, CWCursor, &a);
XChangeWindowAttributes(ob_display, self->handleright, CWCursor, &a);
XChangeWindowAttributes(ob_display, self->rgripright, CWCursor, &a);
XChangeWindowAttributes(ob_display, self->rgriptop, CWCursor, &a);
XChangeWindowAttributes(ob_display, self->rgripbottom, CWCursor, &a);
+ XChangeWindowAttributes(ob_display, self->innerbrr, CWCursor, &a);
+ XChangeWindowAttributes(ob_display, self->innerbrb, CWCursor, &a);
}
}
frame_client_gravity(self, &r->x, &r->y);
}
+void frame_rect_to_client(ObFrame *self, Rect *r)
+{
+ r->width -= self->size.left + self->size.right;
+ r->height -= self->size.top + self->size.bottom;
+ frame_frame_gravity(self, &r->x, &r->y);
+}
+
static void flash_done(gpointer data)
{
ObFrame *self = data;
flash_done);
g_get_current_time(&self->flash_end);
g_time_val_add(&self->flash_end, G_USEC_PER_SEC * 5);
-
+
self->flashing = TRUE;
}
/* how far do we have left to go ? */
g_get_current_time(&now);
time = frame_animate_iconify_time_left(self, &now);
-
+
if (time == 0 || iconifying) {
/* start where the frame is supposed to be */
x = self->area.x;