X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fframe.c;h=43b50722e5f4866a77bbed8e36fd8415d7e63a17;hb=62c311ba92fe5c187cc70151eb719a2fdf3efce4;hp=73d5c02632df1e9f1f9ed03e6fd78da6d17da3e3;hpb=1612a16e80abb7994d9498de48fe4c0ded00cdb9;p=chaz%2Fopenbox diff --git a/openbox/frame.c b/openbox/frame.c index 73d5c026..43b50722 100644 --- a/openbox/frame.c +++ b/openbox/frame.c @@ -295,18 +295,20 @@ void frame_adjust_shape(ObFrame *self) num = 0; if (self->decorations & OB_FRAME_DECOR_TITLEBAR) { - xrect[0].x = -ob_rr_theme->fbwidth; - xrect[0].y = -ob_rr_theme->fbwidth; - xrect[0].width = self->width + self->bwidth * 2; + xrect[0].x = 0; + xrect[0].y = 0; + xrect[0].width = self->area.width; xrect[0].height = ob_rr_theme->title_height + - self->bwidth * 2; + self->bwidth + self->rbwidth; ++num; } - if (self->decorations & OB_FRAME_DECOR_HANDLE) { - xrect[1].x = -ob_rr_theme->fbwidth; + if (self->decorations & OB_FRAME_DECOR_HANDLE && + ob_rr_theme->handle_height > 0) + { + xrect[1].x = 0; xrect[1].y = FRAME_HANDLE_Y(self); - xrect[1].width = self->width + self->bwidth * 2; + xrect[1].width = self->area.width; xrect[1].height = ob_rr_theme->handle_height + self->bwidth * 2; ++num; @@ -328,7 +330,6 @@ void frame_adjust_area(ObFrame *self, gboolean moved, if (resized) { self->decorations = self->client->decorations; - self->max_horz = self->client->max_horz; if (self->decorations & OB_FRAME_DECOR_BORDER) { self->bwidth = ob_rr_theme->fbwidth; @@ -339,16 +340,19 @@ void frame_adjust_area(ObFrame *self, gboolean moved, } self->rbwidth = self->bwidth; - if (self->max_horz) - self->cbwidth_x = 0; + self->max_horz = self->client->max_horz; + self->max_vert = self->client->max_vert; - self->width = self->client->area.width + self->cbwidth_x * 2; - self->width = MAX(self->width, 1); /* no lower than 1 */ + if (self->max_horz) { + self->cbwidth_x = 0; + self->width = self->client->area.width - self->bwidth * 2; + } else + self->width = self->client->area.width + self->cbwidth_x * 2; STRUT_SET(self->size, - self->cbwidth_x + self->bwidth, + self->cbwidth_x + (!self->max_horz ? self->bwidth : 0), self->cbwidth_y + self->bwidth, - self->cbwidth_x + self->bwidth, + self->cbwidth_x + (!self->max_horz ? self->bwidth : 0), self->cbwidth_y + self->bwidth); if (self->decorations & OB_FRAME_DECOR_TITLEBAR) @@ -365,9 +369,8 @@ void frame_adjust_area(ObFrame *self, gboolean moved, if (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, @@ -375,21 +378,27 @@ void frame_adjust_area(ObFrame *self, gboolean moved, 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, - ob_rr_theme->grip_width); + (!self->max_horz ? + 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->size.left + self->size.right - + self->bwidth, self->bwidth, self->bwidth, - ob_rr_theme->grip_width); + (!self->max_horz ? + ob_rr_theme->grip_width : + self->size.top - self->bwidth)); XMapWindow(ob_display, self->titletop); XMapWindow(ob_display, self->titletopleft); @@ -403,14 +412,15 @@ void frame_adjust_area(ObFrame *self, gboolean moved, XMoveResizeWindow(ob_display, self->titlebottom, self->bwidth, ob_rr_theme->title_height + self->bwidth, - self->client->area.width + - self->cbwidth_x * 2, - self->bwidth); + self->width, + self->rbwidth); XMapWindow(ob_display, self->titlebottom); } else XUnmapWindow(ob_display, self->titlebottom); } else { + XUnmapWindow(ob_display, self->titlebottom); + XUnmapWindow(ob_display, self->titletop); XUnmapWindow(ob_display, self->titletopleft); XUnmapWindow(ob_display, self->titletopright); @@ -475,17 +485,25 @@ void frame_adjust_area(ObFrame *self, gboolean moved, 0, self->size.top + self->client->area.height + self->size.bottom - - ob_rr_theme->grip_width, + (!self->max_horz ? + ob_rr_theme->grip_width : + self->size.bottom), self->bwidth, - ob_rr_theme->grip_width); + (!self->max_horz ? + ob_rr_theme->grip_width : + self->size.bottom)); XMoveResizeWindow(ob_display, self->rgripright, self->size.left + self->client->area.width + self->size.right - self->bwidth, self->size.top + self->client->area.height + self->size.bottom - - ob_rr_theme->grip_width, + (!self->max_horz ? + ob_rr_theme->grip_width : + self->size.bottom), self->bwidth, - ob_rr_theme->grip_width); + (!self->max_horz ? + ob_rr_theme->grip_width : + self->size.bottom)); XMoveResizeWindow(ob_display, self->lgripbottom, self->bwidth, @@ -560,9 +578,22 @@ void frame_adjust_area(ObFrame *self, gboolean moved, XUnmapWindow(ob_display, self->lgriptop); XUnmapWindow(ob_display, self->rgriptop); } - } else + } else { + XUnmapWindow(ob_display, self->handleleft); + XUnmapWindow(ob_display, self->handleright); + XUnmapWindow(ob_display, self->lgriptop); + XUnmapWindow(ob_display, self->rgriptop); + XUnmapWindow(ob_display, self->handletop); + } } else { + XUnmapWindow(ob_display, self->handleleft); + XUnmapWindow(ob_display, self->handleright); + XUnmapWindow(ob_display, self->lgriptop); + XUnmapWindow(ob_display, self->rgriptop); + + XUnmapWindow(ob_display, self->handletop); + XUnmapWindow(ob_display, self->handlebottom); XUnmapWindow(ob_display, self->lgripleft); XUnmapWindow(ob_display, self->rgripright); @@ -596,8 +627,12 @@ void frame_adjust_area(ObFrame *self, gboolean moved, XUnmapWindow(ob_display, self->lgrip); XUnmapWindow(ob_display, self->rgrip); } - } else + } else { + XUnmapWindow(ob_display, self->lgrip); + XUnmapWindow(ob_display, self->rgrip); + XUnmapWindow(ob_display, self->handle); + } if (self->bwidth && !self->max_horz) { XMoveResizeWindow(ob_display, self->left, @@ -607,6 +642,12 @@ void frame_adjust_area(ObFrame *self, gboolean moved, self->client->area.height + self->size.top + self->size.bottom - ob_rr_theme->grip_width * 2); + + XMapWindow(ob_display, self->left); + } else + XUnmapWindow(ob_display, self->left); + + if (self->bwidth && !self->max_horz) { XMoveResizeWindow(ob_display, self->right, self->client->area.width + self->cbwidth_x * 2 + self->bwidth, @@ -616,12 +657,9 @@ void frame_adjust_area(ObFrame *self, gboolean moved, self->size.top + self->size.bottom - ob_rr_theme->grip_width * 2); - XMapWindow(ob_display, self->left); XMapWindow(ob_display, self->right); - } else { - XUnmapWindow(ob_display, self->left); + } else XUnmapWindow(ob_display, self->right); - } /* move and resize the inner border window which contains the plate */ @@ -629,13 +667,15 @@ void frame_adjust_area(ObFrame *self, gboolean moved, 0, self->size.top - self->cbwidth_y, self->client->area.width + - self->cbwidth_x * 2 + self->bwidth * 2, + self->cbwidth_x * 2 + + (!self->max_horz ? self->bwidth * 2 : 0), self->client->area.height + self->cbwidth_y * 2); /* move the plate */ XMoveWindow(ob_display, self->plate, - self->bwidth + self->cbwidth_x, self->cbwidth_y); + (!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); @@ -706,7 +746,8 @@ void frame_adjust_area(ObFrame *self, gboolean moved, (self->functions & OB_CLIENT_FUNC_RESIZE) != (self->client->functions & OB_CLIENT_FUNC_RESIZE)) { - gboolean r = self->client->functions & OB_CLIENT_FUNC_RESIZE; + gboolean r = self->client->functions & OB_CLIENT_FUNC_RESIZE && + !(self->max_horz && self->max_vert); XSetWindowAttributes a; a.cursor = ob_cursor(r ? OB_CURSOR_NORTH : OB_CURSOR_NONE); @@ -1156,27 +1197,52 @@ ObFrameContext frame_context(ObClient *client, Window win, gint x, gint y) 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->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; + /* 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; } } - return OB_FRAME_CONTEXT_TITLEBAR; } if (win == self->window) return OB_FRAME_CONTEXT_FRAME; @@ -1194,16 +1260,17 @@ ObFrameContext frame_context(ObClient *client, Window win, gint x, gint y) 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; @@ -1418,8 +1485,8 @@ static gboolean frame_animate_iconify(gpointer p) /* start where the frame is supposed to be */ x = self->area.x; y = self->area.y; - w = self->area.width - self->bwidth * 2; - h = self->area.height - self->bwidth * 2; + w = self->area.width; + h = self->area.height; } else { /* start at the icon */ x = iconx; @@ -1472,8 +1539,7 @@ void frame_end_iconify_animation(ObFrame *self) XMoveResizeWindow(ob_display, self->window, self->area.x, self->area.y, - self->area.width - self->bwidth * 2, - self->area.height - self->bwidth * 2); + self->area.width, self->area.height); XFlush(ob_display); }