summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/Window.cc23
1 files changed, 12 insertions, 11 deletions
diff --git a/src/Window.cc b/src/Window.cc
index 85f8d23..b32a86b 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -22,7 +22,7 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: Window.cc,v 1.64 2002/08/02 12:58:37 fluxgen Exp $ 25// $Id: Window.cc,v 1.65 2002/08/04 15:15:22 fluxgen Exp $
26 26
27#include "Window.hh" 27#include "Window.hh"
28 28
@@ -285,7 +285,7 @@ tab(0)
285 285
286 createTitlebar(); 286 createTitlebar();
287 createHandle(); 287 createHandle();
288 288
289 associateClientWindow(); 289 associateClientWindow();
290 290
291 grabButtons(); 291 grabButtons();
@@ -296,6 +296,7 @@ tab(0)
296 // maximizable as default (such as dialogs) 296 // maximizable as default (such as dialogs)
297 if (decorations.tab && fluxbox->useTabs() && decorations.maximize) 297 if (decorations.tab && fluxbox->useTabs() && decorations.maximize)
298 tab = new Tab(this, 0, 0); 298 tab = new Tab(this, 0, 0);
299
299 decorate(); 300 decorate();
300 301
301 XRaiseWindow(display, frame.plate); 302 XRaiseWindow(display, frame.plate);
@@ -1986,7 +1987,7 @@ void FluxboxWindow::maximize(unsigned int button) {
1986 1987
1987 Slit* mSlt = screen->getSlit(); 1988 Slit* mSlt = screen->getSlit();
1988 1989
1989 if(!screen->doMaxOverSlit() && !screen->doFullMax() && (mSlt->getWidth() > 1)) 1990 if(!screen->doMaxOverSlit() && !screen->doFullMax() && (mSlt->width() > 1))
1990 { 1991 {
1991 switch(screen->getSlitDirection()) 1992 switch(screen->getSlitDirection())
1992 { 1993 {
@@ -1996,10 +1997,10 @@ void FluxboxWindow::maximize(unsigned int button) {
1996 case Slit::TOPRIGHT: 1997 case Slit::TOPRIGHT:
1997 case Slit::CENTERRIGHT: 1998 case Slit::CENTERRIGHT:
1998 case Slit::BOTTOMRIGHT: 1999 case Slit::BOTTOMRIGHT:
1999 slitModR = mSlt->getWidth() + screen->getBevelWidth(); 2000 slitModR = mSlt->width() + screen->getBevelWidth();
2000 break; 2001 break;
2001 default: 2002 default:
2002 slitModL = mSlt->getWidth() + screen->getBevelWidth(); 2003 slitModL = mSlt->width() + screen->getBevelWidth();
2003 break; 2004 break;
2004 } 2005 }
2005 break; 2006 break;
@@ -2009,7 +2010,7 @@ void FluxboxWindow::maximize(unsigned int button) {
2009 case Slit::TOPLEFT: 2010 case Slit::TOPLEFT:
2010 case Slit::TOPCENTER: 2011 case Slit::TOPCENTER:
2011 case Slit::TOPRIGHT: 2012 case Slit::TOPRIGHT:
2012 slitModT = mSlt->getHeight() + screen->getBevelWidth(); 2013 slitModT = mSlt->height() + screen->getBevelWidth();
2013 switch (screen->getToolbarPlacement()) { 2014 switch (screen->getToolbarPlacement()) {
2014 case Toolbar::TOPLEFT: 2015 case Toolbar::TOPLEFT:
2015 case Toolbar::TOPCENTER: 2016 case Toolbar::TOPCENTER:
@@ -2022,7 +2023,7 @@ void FluxboxWindow::maximize(unsigned int button) {
2022 } 2023 }
2023 break; 2024 break;
2024 default: 2025 default:
2025 slitModB = mSlt->getHeight() + screen->getBevelWidth(); 2026 slitModB = mSlt->height() + screen->getBevelWidth();
2026 switch (screen->getToolbarPlacement()) { 2027 switch (screen->getToolbarPlacement()) {
2027 case Toolbar::BOTTOMLEFT: 2028 case Toolbar::BOTTOMLEFT:
2028 case Toolbar::BOTTOMCENTER: 2029 case Toolbar::BOTTOMCENTER:
@@ -2878,8 +2879,8 @@ bool FluxboxWindow::destroyNotifyEvent(XDestroyWindowEvent *de) {
2878 2879
2879void FluxboxWindow::propertyNotifyEvent(Atom atom) { 2880void FluxboxWindow::propertyNotifyEvent(Atom atom) {
2880 Fluxbox *fluxbox = Fluxbox::instance(); 2881 Fluxbox *fluxbox = Fluxbox::instance();
2881 BaseDisplay::GrabGuard gg(*fluxbox); 2882// BaseDisplay::GrabGuard gg(*fluxbox);
2882 fluxbox->grab(); 2883// fluxbox->grab();
2883 if (! validateClient()) return; 2884 if (! validateClient()) return;
2884 2885
2885 switch(atom) { 2886 switch(atom) {
@@ -2975,7 +2976,7 @@ void FluxboxWindow::propertyNotifyEvent(Atom atom) {
2975 break; 2976 break;
2976 } 2977 }
2977 2978
2978 fluxbox->ungrab(); 2979// fluxbox->ungrab();
2979} 2980}
2980 2981
2981 2982
@@ -3580,7 +3581,7 @@ void FluxboxWindow::updateIcon() {
3580 IconBarObj *icon = 0; 3581 IconBarObj *icon = 0;
3581 if ((iconbar = screen->getToolbar()->getIconBar()) != 0) { 3582 if ((iconbar = screen->getToolbar()->getIconBar()) != 0) {
3582 if ((icon = iconbar->findIcon(this)) != 0) 3583 if ((icon = iconbar->findIcon(this)) != 0)
3583 iconbar->draw(icon, icon->getWidth()); 3584 iconbar->draw(icon, icon->width());
3584 } 3585 }
3585 } 3586 }
3586} 3587}