#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->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->cbwidth_l + (!self->max_horz ? self->bwidth : 0),
self->cbwidth_t + self->bwidth,
self->cbwidth_r + (!self->max_horz ? self->bwidth : 0),
- self->cbwidth_b + (!self->max_horz || !self->max_vert ? self->bwidth : 0));
+ self->cbwidth_b +
+ (!self->max_horz || !self->max_vert ? self->bwidth : 0));
if (self->decorations & OB_FRAME_DECOR_TITLEBAR)
self->size.top += ob_rr_theme->title_height + self->bwidth;
{
self->size.bottom += ob_rr_theme->handle_height + self->bwidth;
}
-
+
/* position/size and map/unmap all the windows */
if (!fake) {
sidebwidth) * 2,
self->bwidth);
-
+
if (sidebwidth) {
XMoveResizeWindow(ob_display, self->lgripleft,
0,
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,
+ self->client->area.width + self->cbwidth_l +
+ self->cbwidth_r + self->bwidth,
self->bwidth + ob_rr_theme->grip_width,
self->bwidth,
self->client->area.height +
frame_client_gravity. */
self->area.x = self->client->area.x;
self->area.y = self->client->area.y;
- frame_client_gravity(self, &self->area.x, &self->area.y,
- self->client->area.width,
- self->client->area.height);
+ frame_client_gravity(self, &self->area.x, &self->area.y);
}
if (!fake) {
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.
*/
return OB_FRAME_CONTEXT_NONE;
}
-void frame_client_gravity(ObFrame *self, gint *x, gint *y, gint w, gint h)
+void frame_client_gravity(ObFrame *self, gint *x, gint *y)
{
/* horizontal */
switch (self->client->gravity) {
}
}
-void frame_frame_gravity(ObFrame *self, gint *x, gint *y, gint w, gint h)
+void frame_frame_gravity(ObFrame *self, gint *x, gint *y)
{
/* horizontal */
switch (self->client->gravity) {
{
r->width += self->size.left + self->size.right;
r->height += self->size.top + self->size.bottom;
- frame_client_gravity(self, &r->x, &r->y, r->width, r->height);
+ frame_client_gravity(self, &r->x, &r->y);
}
static void flash_done(gpointer 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;
XUnmapWindow(ob_display, self->window);
else {
/* Send a ConfigureNotify when the animation is done, this fixes
- KDE's pager showing the window in the wrong place. */
- client_reconfigure(self->client);
+ KDE's pager showing the window in the wrong place. since the
+ window is mapped at a different location and is then moved, we
+ need to send the synthetic configurenotify, since apps may have
+ read the position when the client mapped, apparently. */
+ client_reconfigure(self->client, TRUE);
}
/* we're not animating any more ! */