static void set_theme_statics(ObFrame *self);
static void free_theme_statics(ObFrame *self);
static gboolean frame_animate_iconify(gpointer self);
+static void frame_adjust_cursors(ObFrame *self);
static Window createWindow(Window parent, Visual *visual,
gulong mask, XSetWindowAttributes *attrib)
oldsize = self->size;
if (resized) {
+ /* do this before changing the frame's status like max_horz max_vert */
+ frame_adjust_cursors(self);
+
+ self->functions = self->client->functions;
self->decorations = self->client->decorations;
self->max_horz = self->client->max_horz;
+ self->max_vert = self->client->max_vert;
if (self->decorations & OB_FRAME_DECOR_BORDER) {
self->bwidth = ob_rr_theme->fbwidth;
self->bwidth = self->cbwidth_x = self->cbwidth_y = 0;
}
self->rbwidth = self->bwidth;
- self->leftb = self->rightb = TRUE;
if (self->max_horz) {
- self->leftb = self->rightb = FALSE;
self->cbwidth_x = 0;
- }
+ self->width = self->client->area.width - self->bwidth * 2;
+ } else
+ self->width = self->client->area.width + self->cbwidth_x * 2;
- self->width = self->client->area.width + self->cbwidth_x * 2;
- self->width = MAX(self->width, 1); /* no lower than 1 */
+ /* some elements are sized based of the width, so don't let them have
+ negative values */
+ self->width = MAX(self->width,
+ (ob_rr_theme->grip_width + self->bwidth) * 2 + 1);
STRUT_SET(self->size,
- self->cbwidth_x + (self->leftb ? self->bwidth : 0),
+ self->cbwidth_x + (!self->max_horz ? self->bwidth : 0),
self->cbwidth_y + self->bwidth,
- self->cbwidth_x + (self->rightb ? self->bwidth : 0),
+ self->cbwidth_x + (!self->max_horz ? self->bwidth : 0),
self->cbwidth_y + self->bwidth);
if (self->decorations & OB_FRAME_DECOR_TITLEBAR)
if (!fake) {
if (self->bwidth) {
+ gint titlesides;
+
+ /* height of titleleft and titleright */
+ titlesides = (!self->max_horz ?
+ ob_rr_theme->grip_width :
+ self->size.top - self->bwidth);
+
XMoveResizeWindow(ob_display, self->titletop,
ob_rr_theme->grip_width + self->bwidth, 0,
- self->client->area.width +
- self->cbwidth_x * 2 + self->bwidth * 2 -
- (ob_rr_theme->grip_width + self->bwidth) * 2,
+ /* width + bwidth*2 - bwidth*2 - grips*2 */
+ self->width - ob_rr_theme->grip_width * 2,
self->bwidth);
XMoveResizeWindow(ob_display, self->titletopleft,
0, 0,
self->bwidth);
XMoveResizeWindow(ob_display, self->titletopright,
self->client->area.width +
- self->cbwidth_x * 2 + self->bwidth * 2 -
+ self->size.left + self->size.right -
ob_rr_theme->grip_width - self->bwidth,
0,
ob_rr_theme->grip_width + self->bwidth,
self->bwidth);
- XMoveResizeWindow(ob_display, self->titleleft,
- 0, self->bwidth,
- self->bwidth,
- (self->leftb ?
- ob_rr_theme->grip_width :
- self->size.top - self->bwidth));
- XMoveResizeWindow(ob_display, self->titleright,
- self->client->area.width +
- self->cbwidth_x * 2 + self->bwidth,
- self->bwidth,
- self->bwidth,
- (self->rightb ?
- ob_rr_theme->grip_width :
- self->size.top - self->bwidth));
+ if (titlesides > 0) {
+ XMoveResizeWindow(ob_display, self->titleleft,
+ 0, self->bwidth,
+ self->bwidth,
+ titlesides);
+ XMoveResizeWindow(ob_display, self->titleright,
+ self->client->area.width +
+ self->size.left + self->size.right -
+ self->bwidth,
+ self->bwidth,
+ self->bwidth,
+ titlesides);
+
+ XMapWindow(ob_display, self->titleleft);
+ XMapWindow(ob_display, self->titleright);
+ } else {
+ XUnmapWindow(ob_display, self->titleleft);
+ XUnmapWindow(ob_display, self->titleright);
+ }
XMapWindow(ob_display, self->titletop);
XMapWindow(ob_display, self->titletopleft);
XMapWindow(ob_display, self->titletopright);
- XMapWindow(ob_display, self->titleleft);
- XMapWindow(ob_display, self->titleright);
if (self->decorations & OB_FRAME_DECOR_TITLEBAR &&
self->rbwidth)
XMoveResizeWindow(ob_display, self->titlebottom,
self->bwidth,
ob_rr_theme->title_height + self->bwidth,
- self->client->area.width +
- self->cbwidth_x * 2,
+ self->width,
self->rbwidth);
XMapWindow(ob_display, self->titlebottom);
if (self->decorations & OB_FRAME_DECOR_GRIPS) {
XMoveResizeWindow(ob_display, self->topresize,
- ob_rr_theme->grip_width + self->bwidth,
+ ob_rr_theme->grip_width,
0,
- self->width - (ob_rr_theme->grip_width +
- self->bwidth) * 2,
+ self->width - ob_rr_theme->grip_width *2,
ob_rr_theme->paddingy + 1);
XMoveWindow(ob_display, self->tltresize, 0, 0);
0,
self->size.top + self->client->area.height +
self->size.bottom -
- (self->leftb ?
+ (!self->max_horz ?
ob_rr_theme->grip_width :
self->size.bottom),
self->bwidth,
- (self->leftb ?
+ (!self->max_horz ?
ob_rr_theme->grip_width :
self->size.bottom));
XMoveResizeWindow(ob_display, self->rgripright,
self->size.right - self->bwidth,
self->size.top + self->client->area.height +
self->size.bottom -
- (self->leftb ?
+ (!self->max_horz ?
ob_rr_theme->grip_width :
self->size.bottom),
self->bwidth,
- (self->rightb ?
+ (!self->max_horz ?
ob_rr_theme->grip_width :
self->size.bottom));
XUnmapWindow(ob_display, self->handle);
}
- if (self->bwidth && self->leftb) {
+ if (self->bwidth && !self->max_horz) {
XMoveResizeWindow(ob_display, self->left,
0,
self->bwidth + ob_rr_theme->grip_width,
} else
XUnmapWindow(ob_display, self->left);
- if (self->bwidth && self->rightb) {
+ if (self->bwidth && !self->max_horz) {
XMoveResizeWindow(ob_display, self->right,
self->client->area.width +
self->cbwidth_x * 2 + self->bwidth,
self->size.top - self->cbwidth_y,
self->client->area.width +
self->cbwidth_x * 2 +
- (self->leftb ? self->bwidth : 0) +
- (self->rightb ? self->bwidth : 0),
+ (!self->max_horz ? self->bwidth * 2 : 0),
self->client->area.height +
self->cbwidth_y * 2);
/* move the plate */
XMoveWindow(ob_display, self->plate,
- (self->leftb ? self->bwidth : 0) + self->cbwidth_x,
+ (!self->max_horz ? self->bwidth : 0) + self->cbwidth_x,
self->cbwidth_y);
/* when the client has StaticGravity, it likes to move around. */
- XMoveWindow(ob_display, self->client->window, 0, 0);
+ XMoveWindow(ob_display, self->client->window,
+ -self->client->border_width,
+ -self->client->border_width);
}
}
self->client->area.height +
self->size.top + self->size.bottom));
- if (moved || resized) {
+ if ((moved || resized) && !fake) {
/* find the new coordinates, done after setting the frame.size, for
frame_client_gravity. */
self->area.x = self->client->area.x;
XResizeWindow(ob_display, self->label, self->label_width,
ob_rr_theme->label_height);
- /* set up cursors */
- if (!fake &&
- (self->functions & OB_CLIENT_FUNC_RESIZE) !=
- (self->client->functions & OB_CLIENT_FUNC_RESIZE))
+}
+
+static void frame_adjust_cursors(ObFrame *self)
+{
+ if ((self->functions & OB_CLIENT_FUNC_RESIZE) !=
+ (self->client->functions & OB_CLIENT_FUNC_RESIZE) ||
+ self->max_horz != self->client->max_horz ||
+ self->max_vert != self->client->max_vert)
{
- gboolean r = self->client->functions & OB_CLIENT_FUNC_RESIZE;
+ gboolean r = (self->client->functions & OB_CLIENT_FUNC_RESIZE) &&
+ !(self->client->max_horz && self->client->max_vert);
+ gboolean topbot = !self->client->max_vert;
XSetWindowAttributes a;
- a.cursor = ob_cursor(r ? OB_CURSOR_NORTH : OB_CURSOR_NONE);
+ /* these ones turn off when max vert */
+ a.cursor = ob_cursor(r && topbot ? OB_CURSOR_NORTH : OB_CURSOR_NONE);
XChangeWindowAttributes(ob_display, self->topresize, CWCursor, &a);
XChangeWindowAttributes(ob_display, self->titletop, CWCursor, &a);
+ a.cursor = ob_cursor(r && topbot ? OB_CURSOR_SOUTH : OB_CURSOR_NONE);
+ XChangeWindowAttributes(ob_display, self->handle, CWCursor, &a);
+ XChangeWindowAttributes(ob_display, self->handletop, CWCursor, &a);
+ XChangeWindowAttributes(ob_display, self->handlebottom, CWCursor, &a);
+
+ /* these ones don't */
a.cursor = ob_cursor(r ? OB_CURSOR_NORTHWEST : OB_CURSOR_NONE);
XChangeWindowAttributes(ob_display, self->tltresize, CWCursor, &a);
XChangeWindowAttributes(ob_display, self->tllresize, CWCursor, &a);
XChangeWindowAttributes(ob_display, self->left, CWCursor, &a);
a.cursor = ob_cursor(r ? OB_CURSOR_EAST : OB_CURSOR_NONE);
XChangeWindowAttributes(ob_display, self->right, CWCursor, &a);
- a.cursor = ob_cursor(r ? OB_CURSOR_SOUTH : OB_CURSOR_NONE);
- XChangeWindowAttributes(ob_display, self->handle, CWCursor, &a);
- XChangeWindowAttributes(ob_display, self->handletop, CWCursor, &a);
- XChangeWindowAttributes(ob_display, self->handlebottom, CWCursor, &a);
a.cursor = ob_cursor(r ? OB_CURSOR_SOUTHWEST : OB_CURSOR_NONE);
XChangeWindowAttributes(ob_display, self->lgrip, CWCursor, &a);
XChangeWindowAttributes(ob_display, self->handleleft, CWCursor, &a);
XChangeWindowAttributes(ob_display, self->rgripright, CWCursor, &a);
XChangeWindowAttributes(ob_display, self->rgriptop, CWCursor, &a);
XChangeWindowAttributes(ob_display, self->rgripbottom, CWCursor, &a);
-
- self->functions = self->client->functions;
}
}
void frame_grab_client(ObFrame *self)
{
+ /* DO NOT map the client window here. we used to do that, but it is bogus.
+ we need to set up the client's dimensions and everything before we
+ send a mapnotify or we create race conditions.
+ */
+
/* reparent the client to the frame */
- XReparentWindow(ob_display, self->client->window, self->plate, 0, 0);
+ XReparentWindow(ob_display, self->client->window, self->plate,
+ -self->client->border_width, -self->client->border_width);
/*
When reparenting the client window, it is usually not mapped yet, since
req's) the ButtonPress is to catch clicks on the client border */
XSelectInput(ob_display, self->plate, PLATE_EVENTMASK);
- /* map the client so it maps when the frame does */
- XMapWindow(ob_display, self->client->window);
-
/* set all the windows for the frame in the window_map */
g_hash_table_insert(window_map, &self->window, self->client);
g_hash_table_insert(window_map, &self->plate, self->client);
return OB_FRAME_CONTEXT_CLIENT;
}
- if (win == self->title) {
- /* when the user clicks in the corners of the titlebar and the client
- is fully maximized, then treat it like they clicked in the
- button that is there */
- if (self->client->max_horz && self->client->max_vert &&
- y < ob_rr_theme->paddingy + 1 + ob_rr_theme->button_size)
+ /* when the user clicks in the corners of the titlebar and the client
+ is fully maximized, then treat it like they clicked in the
+ button that is there */
+ if (self->max_horz && self->max_vert &&
+ (win == self->title || win == self->titletop ||
+ win == self->titleleft || win == self->titletopleft ||
+ win == self->titleright || win == self->titletopright))
+ {
+ /* get the mouse coords in reference to the whole frame */
+ gint fx = x;
+ gint fy = y;
+
+ /* these windows are down a border width from the top of the frame */
+ if (win == self->title ||
+ win == self->titleleft || win == self->titleright)
+ fy += self->bwidth;
+
+ /* title is a border width in from the edge */
+ if (win == self->title)
+ fx += self->bwidth;
+ /* titletop is a bit to the right */
+ else if (win == self->titletop)
+ fx += ob_rr_theme->grip_width + self->bwidth;
+ /* titletopright is way to the right edge */
+ else if (win == self->titletopright)
+ fx += self->area.width - (ob_rr_theme->grip_width + self->bwidth);
+ /* titleright is even more way to the right edge */
+ else if (win == self->titleright)
+ fx += self->area.width - self->bwidth;
+
+ /* figure out if we're over the area that should be considered a
+ button */
+ if (fy < self->bwidth + ob_rr_theme->paddingy + 1 +
+ ob_rr_theme->button_size)
{
- if (x < ((ob_rr_theme->paddingx + 1) * 2 +
- ob_rr_theme->button_size)) {
+ if (fx < (self->bwidth + ob_rr_theme->paddingx + 1 +
+ ob_rr_theme->button_size))
+ {
if (self->leftmost != OB_FRAME_CONTEXT_NONE)
return self->leftmost;
}
- else if (x > (self->width -
- (ob_rr_theme->paddingx + 1 +
- ob_rr_theme->button_size)))
+ else if (fx >= (self->area.width -
+ (self->bwidth + ob_rr_theme->paddingx + 1 +
+ ob_rr_theme->button_size)))
{
if (self->rightmost != OB_FRAME_CONTEXT_NONE)
return self->rightmost;
}
}
+
+ /* there is no resizing maximized windows so make them the titlebar
+ context */
return OB_FRAME_CONTEXT_TITLEBAR;
}
+ else if (self->max_vert &&
+ (win == self->titletop || win == self->topresize))
+ /* can't resize vertically when max vert */
+ return OB_FRAME_CONTEXT_TITLEBAR;
if (win == self->window) return OB_FRAME_CONTEXT_FRAME;
if (win == self->label) return OB_FRAME_CONTEXT_TITLEBAR;
if (win == self->rgripright) return OB_FRAME_CONTEXT_BLCORNER;
if (win == self->rgriptop) return OB_FRAME_CONTEXT_BLCORNER;
if (win == self->rgripbottom) return OB_FRAME_CONTEXT_BLCORNER;
+ if (win == self->title) return OB_FRAME_CONTEXT_TITLEBAR;
+ if (win == self->titleleft) return OB_FRAME_CONTEXT_TLCORNER;
+ if (win == self->titletopleft) return OB_FRAME_CONTEXT_TLCORNER;
+ if (win == self->titleright) return OB_FRAME_CONTEXT_TRCORNER;
+ if (win == self->titletopright) return OB_FRAME_CONTEXT_TRCORNER;
if (win == self->titletop) return OB_FRAME_CONTEXT_TOP;
if (win == self->topresize) return OB_FRAME_CONTEXT_TOP;
if (win == self->tltresize) return OB_FRAME_CONTEXT_TLCORNER;
if (win == self->tllresize) return OB_FRAME_CONTEXT_TLCORNER;
- if (win == self->titleleft) return OB_FRAME_CONTEXT_TLCORNER;
- if (win == self->titletopleft) return OB_FRAME_CONTEXT_TLCORNER;
if (win == self->trtresize) return OB_FRAME_CONTEXT_TRCORNER;
if (win == self->trrresize) return OB_FRAME_CONTEXT_TRCORNER;
- if (win == self->titleright) return OB_FRAME_CONTEXT_TRCORNER;
- if (win == self->titletopright) return OB_FRAME_CONTEXT_TRCORNER;
if (win == self->left) return OB_FRAME_CONTEXT_LEFT;
if (win == self->right) return OB_FRAME_CONTEXT_RIGHT;
if (win == self->max) return OB_FRAME_CONTEXT_MAXIMIZE;
case NorthGravity:
case SouthGravity:
case CenterGravity:
- *x -= (self->size.left + w) / 2;
+ /* the middle of the client will be the middle of the frame */
+ *x -= (self->size.right - self->size.left) / 2;
break;
case NorthEastGravity:
case SouthEastGravity:
case EastGravity:
- *x -= (self->size.left + self->size.right + w) - 1;
+ /* the right side of the client will be the right side of the frame */
+ *x -= self->size.right + self->size.left - self->client->border_width*2;
break;
case ForgetGravity:
case StaticGravity:
- *x -= self->size.left;
+ /* the client's position won't move */
+ *x -= self->size.left - self->client->border_width;
break;
}
case CenterGravity:
case EastGravity:
case WestGravity:
- *y -= (self->size.top + h) / 2;
+ /* the middle of the client will be the middle of the frame */
+ *y -= (self->size.bottom - self->size.top) / 2;
break;
case SouthWestGravity:
case SouthEastGravity:
case SouthGravity:
- *y -= (self->size.top + self->size.bottom + h) - 1;
+ /* the bottom of the client will be the bottom of the frame */
+ *y -= self->size.bottom + self->size.top - self->client->border_width*2;
break;
case ForgetGravity:
case StaticGravity:
- *y -= self->size.top;
+ /* the client's position won't move */
+ *y -= self->size.top - self->client->border_width;
break;
}
}
case NorthGravity:
case CenterGravity:
case SouthGravity:
- *x += (self->size.left + w) / 2;
+ /* the middle of the client will be the middle of the frame */
+ *x += (self->size.right - self->size.left) / 2;
break;
case NorthEastGravity:
case EastGravity:
case SouthEastGravity:
- *x += (self->size.left + self->size.right + w) - 1;
+ /* the right side of the client will be the right side of the frame */
+ *x += self->size.right + self->size.left - self->client->border_width*2;
break;
case StaticGravity:
case ForgetGravity:
- *x += self->size.left;
+ /* the client's position won't move */
+ *x += self->size.left - self->client->border_width;
break;
}
case WestGravity:
case CenterGravity:
case EastGravity:
- *y += (self->size.top + h) / 2;
+ /* the middle of the client will be the middle of the frame */
+ *y += (self->size.bottom - self->size.top) / 2;
break;
case SouthWestGravity:
case SouthGravity:
case SouthEastGravity:
- *y += (self->size.top + self->size.bottom + h) - 1;
+ /* the bottom of the client will be the bottom of the frame */
+ *y += self->size.bottom + self->size.top - self->client->border_width*2;
break;
case StaticGravity:
case ForgetGravity:
- *y += self->size.top;
+ /* the client's position won't move */
+ *y += self->size.top - self->client->border_width;
break;
}
}
projects / chaz / openbox / blobdiff