aboutsummaryrefslogtreecommitdiff
path: root/src/Window.cc
diff options
context:
space:
mode:
authorMathias Gumz <akira at fluxbox dot org>2011-03-23 11:02:15 (GMT)
committerMathias Gumz <akira at fluxbox dot org>2011-03-23 11:02:15 (GMT)
commite850b0191977da47eb7233e248dbab7ebd1d21f0 (patch)
treed3a3e33f1d4524147ddaa2b6b21e05bd142fc367 /src/Window.cc
parent7ece90ad4f360b3cf11e46a00d4c1ec5b60213e9 (diff)
downloadfluxbox_pavel-e850b0191977da47eb7233e248dbab7ebd1d21f0.zip
fluxbox_pavel-e850b0191977da47eb7233e248dbab7ebd1d21f0.tar.bz2
compile fix: sunCC 5.11 (sunstudio 12) compiles and links again
biggest change: renaming of 'class Layer' to 'class ResourceLayer' in Layer.hh to handle complaints about 'ambiguous Layer: Layer or FbTk::Layer'. 'ResourceLayer' sounds crappy, but that was the best I could come up with right now.
Diffstat (limited to 'src/Window.cc')
-rw-r--r--src/Window.cc22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/Window.cc b/src/Window.cc
index 51a66df..1a5bd91 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -479,7 +479,7 @@ void FluxboxWindow::init() {
479 m_workspace_number = 479 m_workspace_number =
480 m_client->transientFor()->fbwindow()->workspaceNumber(); 480 m_client->transientFor()->fbwindow()->workspaceNumber();
481 } else // if no parent then set default layer 481 } else // if no parent then set default layer
482 moveToLayer(m_state.layernum, m_state.layernum != ::Layer::NORMAL); 482 moveToLayer(m_state.layernum, m_state.layernum != ::ResourceLayer::NORMAL);
483 483
484 fbdbg<<"FluxboxWindow::init("<<title().logical()<<") transientFor: "<< 484 fbdbg<<"FluxboxWindow::init("<<title().logical()<<") transientFor: "<<
485 m_client->transientFor()<<endl; 485 m_client->transientFor()<<endl;
@@ -1445,9 +1445,9 @@ void FluxboxWindow::setFullscreenLayer() {
1445 getOnHead() != foc->getOnHead() || 1445 getOnHead() != foc->getOnHead() ||
1446 (foc->winClient().isTransient() && 1446 (foc->winClient().isTransient() &&
1447 foc->winClient().transientFor()->fbwindow() == this)) { 1447 foc->winClient().transientFor()->fbwindow() == this)) {
1448 moveToLayer(::Layer::ABOVE_DOCK); 1448 moveToLayer(::ResourceLayer::ABOVE_DOCK);
1449 } else { 1449 } else {
1450 moveToLayer(::Layer::DESKTOP); 1450 moveToLayer(::ResourceLayer::DESKTOP);
1451 } 1451 }
1452 stateSig().notify(); 1452 stateSig().notify();
1453 1453
@@ -1683,10 +1683,10 @@ void FluxboxWindow::moveToLayer(int layernum, bool force) {
1683 fbdbg<<"FluxboxWindow("<<title().logical()<<")::moveToLayer("<<layernum<<")"<<endl; 1683 fbdbg<<"FluxboxWindow("<<title().logical()<<")::moveToLayer("<<layernum<<")"<<endl;
1684 1684
1685 // don't let it set its layer into menu area 1685 // don't let it set its layer into menu area
1686 if (layernum <= ::Layer::MENU) 1686 if (layernum <= ::ResourceLayer::MENU)
1687 layernum = ::Layer::MENU + 1; 1687 layernum = ::ResourceLayer::MENU + 1;
1688 else if (layernum >= ::Layer::NUM_LAYERS) 1688 else if (layernum >= ::ResourceLayer::NUM_LAYERS)
1689 layernum = ::Layer::NUM_LAYERS - 1; 1689 layernum = ::ResourceLayer::NUM_LAYERS - 1;
1690 1690
1691 if (!m_initialized) 1691 if (!m_initialized)
1692 m_state.layernum = layernum; 1692 m_state.layernum = layernum;
@@ -1758,7 +1758,7 @@ void FluxboxWindow::setFocusFlag(bool focus) {
1758 } 1758 }
1759 1759
1760 if (m_state.fullscreen && focus) { 1760 if (m_state.fullscreen && focus) {
1761 moveToLayer(::Layer::ABOVE_DOCK); 1761 moveToLayer(::ResourceLayer::ABOVE_DOCK);
1762 leave(screen().focusedWindowSig()); 1762 leave(screen().focusedWindowSig());
1763 } 1763 }
1764 1764
@@ -3774,7 +3774,7 @@ void FluxboxWindow::setWindowType(WindowState::WindowType type) {
3774 setMouseFocus(false); 3774 setMouseFocus(false);
3775 setClickFocus(false); 3775 setClickFocus(false);
3776 setDecorationMask(WindowState::DECOR_NONE); 3776 setDecorationMask(WindowState::DECOR_NONE);
3777 moveToLayer(::Layer::DOCK); 3777 moveToLayer(::ResourceLayer::DOCK);
3778 break; 3778 break;
3779 case WindowState::TYPE_DESKTOP: 3779 case WindowState::TYPE_DESKTOP:
3780 /* 3780 /*
@@ -3787,7 +3787,7 @@ void FluxboxWindow::setWindowType(WindowState::WindowType type) {
3787 setIconHidden(true); 3787 setIconHidden(true);
3788 setFocusNew(false); 3788 setFocusNew(false);
3789 setMouseFocus(false); 3789 setMouseFocus(false);
3790 moveToLayer(::Layer::DESKTOP); 3790 moveToLayer(::ResourceLayer::DESKTOP);
3791 setDecorationMask(WindowState::DECOR_NONE); 3791 setDecorationMask(WindowState::DECOR_NONE);
3792 setTabable(false); 3792 setTabable(false);
3793 setMovable(false); 3793 setMovable(false);
@@ -3822,7 +3822,7 @@ void FluxboxWindow::setWindowType(WindowState::WindowType type) {
3822 */ 3822 */
3823 setDecorationMask(WindowState::DECOR_TOOL); 3823 setDecorationMask(WindowState::DECOR_TOOL);
3824 setIconHidden(true); 3824 setIconHidden(true);
3825 moveToLayer(::Layer::ABOVE_DOCK); 3825 moveToLayer(::ResourceLayer::ABOVE_DOCK);
3826 break; 3826 break;
3827 case WindowState::TYPE_NORMAL: 3827 case WindowState::TYPE_NORMAL:
3828 default: 3828 default: