nilix/fluxbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed remove of handle in propertyNotify

Browse source
This commit is contained in:
fluxgen 2002-04-14 11:54:59 +00:00
parent a5bf916fac
commit 0d708fa2be
1 changed files with 17 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/Window.cc
View file

@ -22,7 +22,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
// $Id: Window.cc,v 1.43 2002/04/12 14:54:57 fluxgen Exp $ // $Id: Window.cc,v 1.44 2002/04/14 11:54:59 fluxgen Exp $
#include "Window.hh" #include "Window.hh"
@ -80,6 +80,7 @@ tab(0)
,gnome_hints(0) ,gnome_hints(0)
#endif #endif
{ {
lastFocusTime.tv_sec = lastFocusTime.tv_usec = 0; lastFocusTime.tv_sec = lastFocusTime.tv_usec = 0;
fprintf(stderr, fprintf(stderr,
@ -1744,7 +1745,7 @@ void FluxboxWindow::configure(int dx, int dy,
frame.y = dy; frame.y = dy;
frame.width = dw; frame.width = dw;
frame.height = dh; frame.height = dh;
downsize(); downsize();
#ifdef SHAPE #ifdef SHAPE
@ -1772,7 +1773,6 @@ void FluxboxWindow::configure(int dx, int dy,
xrect, num, ShapeUnion, Unsorted); xrect, num, ShapeUnion, Unsorted);
} }
#endif // SHAPE #endif // SHAPE
XMoveResizeWindow(display, frame.window, frame.x, frame.y, XMoveResizeWindow(display, frame.window, frame.x, frame.y,
frame.width, frame.height); frame.width, frame.height);
positionWindows(); positionWindows();
@ -2042,9 +2042,9 @@ void FluxboxWindow::maximize(unsigned int button) {
#ifdef SLIT #ifdef SLIT
#ifdef XINERAMA #ifdef XINERAMA
// take the slit in account if it's on the same head // take the slit in account if it's on the same head
// (always true if we don't have xinerama // (always true if we don't have xinerama
if (!screen->hasXinerama() || screen->getSlitOnHead() == head) { if (!screen->hasXinerama() || screen->getSlitOnHead() == head) {
#endif // XINERAMA #endif // XINERAMA
Slit* mSlt = screen->getSlit(); Slit* mSlt = screen->getSlit();
@ -2102,7 +2102,7 @@ if (!screen->hasXinerama() || screen->getSlitOnHead() == head) {
} }
} }
#ifdef XINERAMA #ifdef XINERAMA
} }
#endif // XINERAMA #endif // XINERAMA
#endif // SLIT #endif // SLIT
@ -3002,10 +3002,11 @@ void FluxboxWindow::propertyNotifyEvent(Atom atom) {
if (client.max_width <= client.min_width && if (client.max_width <= client.min_width &&
client.max_height <= client.min_height) client.max_height <= client.min_height)
decorations.maximize = decorations.handle = decorations.maximize = decorations.handle =
functions.resize = functions.maximize = false; functions.resize = functions.maximize = false;
else else {
decorations.maximize = decorations.handle = decorations.handle = false;
functions.resize = functions.maximize = true; decorations.maximize = functions.resize = functions.maximize = true;
}
} }
int x = frame.x, y = frame.y; int x = frame.x, y = frame.y;
@ -3083,10 +3084,11 @@ void FluxboxWindow::configureRequestEvent(XConfigureRequestEvent *cr) {
if (cr->value_mask & CWWidth) if (cr->value_mask & CWWidth)
cw = cr->width + (frame.mwm_border_w * 2); cw = cr->width + (frame.mwm_border_w * 2);
if (cr->value_mask & CWHeight) if (cr->value_mask & CWHeight) {
ch = cr->height + frame.y_border + (frame.mwm_border_w * 2) + ch = cr->height + (frame.y_border + (frame.mwm_border_w * 2) +
(screen->getBorderWidth() * decorations.handle) + frame.handle_h; screen->getBorderWidth()) * decorations.border +
frame.handle_h*decorations.handle;
}
if (frame.x != cx || frame.y != cy || if (frame.x != cx || frame.y != cy ||
frame.width != cw || frame.height != ch) { frame.width != cw || frame.height != ch) {
configure(cx, cy, cw, ch); configure(cx, cy, cw, ch);
@ -3448,7 +3450,6 @@ void FluxboxWindow::shapeEvent(XShapeEvent *) {
void FluxboxWindow::setDecoration(Decoration decoration) { void FluxboxWindow::setDecoration(Decoration decoration) {
switch (decoration) { switch (decoration) {
case DECOR_NONE: case DECOR_NONE:
decorations.titlebar = decorations.border = decorations.handle = decorations.titlebar = decorations.border = decorations.handle =