aboutsummaryrefslogtreecommitdiff
path: root/src/Ewmh.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/Ewmh.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/Ewmh.cc')
-rw-r--r--src/Ewmh.cc28
1 files changed, 14 insertions, 14 deletions
diff --git a/src/Ewmh.cc b/src/Ewmh.cc
index 241fd0a..bab543b 100644
--- a/src/Ewmh.cc
+++ b/src/Ewmh.cc
@@ -992,9 +992,9 @@ void Ewmh::updateState(FluxboxWindow &win) {
992 state.push_back(m_net->wm_state_sticky); 992 state.push_back(m_net->wm_state_sticky);
993 if (win.isShaded()) 993 if (win.isShaded())
994 state.push_back(m_net->wm_state_shaded); 994 state.push_back(m_net->wm_state_shaded);
995 if (win.layerNum() == Layer::BOTTOM) 995 if (win.layerNum() == ResourceLayer::BOTTOM)
996 state.push_back(m_net->wm_state_below); 996 state.push_back(m_net->wm_state_below);
997 if (win.layerNum() == Layer::ABOVE_DOCK) 997 if (win.layerNum() == ResourceLayer::ABOVE_DOCK)
998 state.push_back(m_net->wm_state_above); 998 state.push_back(m_net->wm_state_above);
999 if (win.isIconic()) 999 if (win.isIconic())
1000 state.push_back(m_net->wm_state_hidden); 1000 state.push_back(m_net->wm_state_hidden);
@@ -1346,14 +1346,14 @@ void Ewmh::setState(FluxboxWindow &win, Atom state, bool value,
1346 win.setIconHidden(value); 1346 win.setIconHidden(value);
1347 } else if (state == m_net->wm_state_below) { // bottom layer 1347 } else if (state == m_net->wm_state_below) { // bottom layer
1348 if (value) 1348 if (value)
1349 win.moveToLayer(Layer::BOTTOM); 1349 win.moveToLayer(ResourceLayer::BOTTOM);
1350 else if (win.layerNum() > Layer::NORMAL) 1350 else if (win.layerNum() > ResourceLayer::NORMAL)
1351 win.moveToLayer(Layer::NORMAL); 1351 win.moveToLayer(ResourceLayer::NORMAL);
1352 } else if (state == m_net->wm_state_above) { // above layer 1352 } else if (state == m_net->wm_state_above) { // above layer
1353 if (value) 1353 if (value)
1354 win.moveToLayer(Layer::ABOVE_DOCK); 1354 win.moveToLayer(ResourceLayer::ABOVE_DOCK);
1355 else if (win.layerNum() < Layer::NORMAL) 1355 else if (win.layerNum() < ResourceLayer::NORMAL)
1356 win.moveToLayer(Layer::NORMAL); 1356 win.moveToLayer(ResourceLayer::NORMAL);
1357 } else if (state == m_net->wm_state_demands_attention) { 1357 } else if (state == m_net->wm_state_demands_attention) {
1358 if (value) { // if add attention 1358 if (value) { // if add attention
1359 Fluxbox::instance()->attentionHandler().addAttention(client); 1359 Fluxbox::instance()->attentionHandler().addAttention(client);
@@ -1386,16 +1386,16 @@ void Ewmh::toggleState(FluxboxWindow &win, Atom state, WinClient &client) {
1386 } else if (state == m_net->wm_state_skip_taskbar) { // taskbar 1386 } else if (state == m_net->wm_state_skip_taskbar) { // taskbar
1387 win.setIconHidden(!win.isIconHidden()); 1387 win.setIconHidden(!win.isIconHidden());
1388 } else if (state == m_net->wm_state_below) { // bottom layer 1388 } else if (state == m_net->wm_state_below) { // bottom layer
1389 if (win.layerNum() == Layer::BOTTOM) 1389 if (win.layerNum() == ResourceLayer::BOTTOM)
1390 win.moveToLayer(Layer::NORMAL); 1390 win.moveToLayer(ResourceLayer::NORMAL);
1391 else 1391 else
1392 win.moveToLayer(Layer::BOTTOM); 1392 win.moveToLayer(ResourceLayer::BOTTOM);
1393 1393
1394 } else if (state == m_net->wm_state_above) { // top layer 1394 } else if (state == m_net->wm_state_above) { // top layer
1395 if (win.layerNum() == Layer::ABOVE_DOCK) 1395 if (win.layerNum() == ResourceLayer::ABOVE_DOCK)
1396 win.moveToLayer(Layer::NORMAL); 1396 win.moveToLayer(ResourceLayer::NORMAL);
1397 else 1397 else
1398 win.moveToLayer(Layer::ABOVE_DOCK); 1398 win.moveToLayer(ResourceLayer::ABOVE_DOCK);
1399 } else if (state == m_net->wm_state_modal) { // modal 1399 } else if (state == m_net->wm_state_modal) { // modal
1400 client.setStateModal(!client.isStateModal()); 1400 client.setStateModal(!client.isStateModal());
1401 } 1401 }