aboutsummaryrefslogtreecommitdiff
path: root/src/Window.cc
diff options
context:
space:
mode:
authorsimonb <simonb>2007-08-08 15:41:10 (GMT)
committersimonb <simonb>2007-08-08 15:41:10 (GMT)
commita04eed16c5287c11e565ecb25f465b96d6f61279 (patch)
treead857bb3a77acb1e846b4a60bb3ca74b334dbd59 /src/Window.cc
parent8c53e8861ed51f284545634b46150f0adeb567e2 (diff)
downloadfluxbox-a04eed16c5287c11e565ecb25f465b96d6f61279.zip
fluxbox-a04eed16c5287c11e565ecb25f465b96d6f61279.tar.bz2
fix elements of shaping, more to come
Diffstat (limited to 'src/Window.cc')
-rw-r--r--src/Window.cc14
1 files changed, 12 insertions, 2 deletions
diff --git a/src/Window.cc b/src/Window.cc
index 653032e..ab917da 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -562,6 +562,11 @@ void FluxboxWindow::shape() {
562#ifdef SHAPE 562#ifdef SHAPE
563 if (m_shaped) { 563 if (m_shaped) {
564 XShapeCombineShape(display, 564 XShapeCombineShape(display,
565 frame().window().window(), ShapeClip,
566 0, frame().clientArea().y(), // xOff, yOff
567 m_client->window(),
568 ShapeClip, ShapeSet);
569 XShapeCombineShape(display,
565 frame().window().window(), ShapeBounding, 570 frame().window().window(), ShapeBounding,
566 0, frame().clientArea().y(), // xOff, yOff 571 0, frame().clientArea().y(), // xOff, yOff
567 m_client->window(), 572 m_client->window(),
@@ -2347,6 +2352,10 @@ void FluxboxWindow::handleEvent(XEvent &event) {
2347 m_shaped = false; 2352 m_shaped = false;
2348 // set no shape 2353 // set no shape
2349 XShapeCombineMask(display, 2354 XShapeCombineMask(display,
2355 frame().window().window(), ShapeClip,
2356 0, 0,
2357 None, ShapeSet);
2358 XShapeCombineMask(display,
2350 frame().window().window(), ShapeBounding, 2359 frame().window().window(), ShapeBounding,
2351 0, 0, 2360 0, 0,
2352 None, ShapeSet); 2361 None, ShapeSet);
@@ -3204,10 +3213,11 @@ void FluxboxWindow::applyDecorations(bool initial) {
3204 } 3213 }
3205 3214
3206 frame().reconfigure(); 3215 frame().reconfigure();
3207 if (!initial && client_move) { 3216 if (client_move)
3208 Fluxbox::instance()->updateFrameExtents(*this); 3217 Fluxbox::instance()->updateFrameExtents(*this);
3218
3219 if (!initial && client_move)
3209 sendConfigureNotify(); 3220 sendConfigureNotify();
3210 }
3211 3221
3212} 3222}
3213 3223