aboutsummaryrefslogtreecommitdiff
path: root/src/Ewmh.cc
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2006-02-20 21:04:35 (GMT)
committerfluxgen <fluxgen>2006-02-20 21:04:35 (GMT)
commit369b4e1b92491aa57b0bf430b89bf732b80fa6a4 (patch)
tree2bf00a93ad1c195ef7d446e8989069f218a2cd47 /src/Ewmh.cc
parent2566d84561ce9f5ecaf1adcce97eb578747034e3 (diff)
downloadfluxbox_pavel-369b4e1b92491aa57b0bf430b89bf732b80fa6a4.zip
fluxbox_pavel-369b4e1b92491aa57b0bf430b89bf732b80fa6a4.tar.bz2
moved class Layer from class Fluxbox and thus reduces some dependecies
Diffstat (limited to 'src/Ewmh.cc')
-rw-r--r--src/Ewmh.cc32
1 files changed, 16 insertions, 16 deletions
diff --git a/src/Ewmh.cc b/src/Ewmh.cc
index dc772e3..911c919 100644
--- a/src/Ewmh.cc
+++ b/src/Ewmh.cc
@@ -27,8 +27,8 @@
27#include "Window.hh" 27#include "Window.hh"
28#include "WinClient.hh" 28#include "WinClient.hh"
29#include "Workspace.hh" 29#include "Workspace.hh"
30#include "fluxbox.hh" 30#include "Layer.hh"
31 31#include "FbTk/App.hh"
32#include "FbTk/FbWindow.hh" 32#include "FbTk/FbWindow.hh"
33#include "FbTk/I18n.hh" 33#include "FbTk/I18n.hh"
34 34
@@ -194,7 +194,7 @@ void Ewmh::setupFrame(FluxboxWindow &win) {
194 &data); 194 &data);
195 if (data) { 195 if (data) {
196 Atom *atoms = (unsigned long *)data; 196 Atom *atoms = (unsigned long *)data;
197 for (unsigned long l=0; l<nitems; ++l) { 197 for (unsigned long l = 0; l < nitems; ++l) {
198 /* From Extended Window Manager Hints, draft 1.3: 198 /* From Extended Window Manager Hints, draft 1.3:
199 * 199 *
200 * _NET_WM_WINDOW_TYPE_DOCK indicates a dock or panel feature. 200 * _NET_WM_WINDOW_TYPE_DOCK indicates a dock or panel feature.
@@ -217,7 +217,7 @@ void Ewmh::setupFrame(FluxboxWindow &win) {
217 217
218 win.setFocusHidden(true); 218 win.setFocusHidden(true);
219 win.setIconHidden(true); 219 win.setIconHidden(true);
220 win.moveToLayer(Fluxbox::instance()->getDesktopLayer()); 220 win.moveToLayer(Layer::DESKTOP);
221 win.setDecorationMask(0); 221 win.setDecorationMask(0);
222 win.setTabable(false); 222 win.setTabable(false);
223 win.setMovable(false); 223 win.setMovable(false);
@@ -534,9 +534,9 @@ void Ewmh::updateState(FluxboxWindow &win) {
534 state.push_back(m_net_wm_state_sticky); 534 state.push_back(m_net_wm_state_sticky);
535 if (win.isShaded()) 535 if (win.isShaded())
536 state.push_back(m_net_wm_state_shaded); 536 state.push_back(m_net_wm_state_shaded);
537 if (win.layerNum() == Fluxbox::instance()->getBottomLayer()) 537 if (win.layerNum() == Layer::BOTTOM)
538 state.push_back(m_net_wm_state_below); 538 state.push_back(m_net_wm_state_below);
539 if (win.layerNum() == Fluxbox::instance()->getAboveDockLayer()) 539 if (win.layerNum() == Layer::ABOVE_DOCK)
540 state.push_back(m_net_wm_state_above); 540 state.push_back(m_net_wm_state_above);
541 if (win.isIconic()) 541 if (win.isIconic())
542 state.push_back(m_net_wm_state_hidden); 542 state.push_back(m_net_wm_state_hidden);
@@ -889,15 +889,15 @@ void Ewmh::setState(FluxboxWindow &win, Atom state, bool value) {
889 win.setIconHidden(value); 889 win.setIconHidden(value);
890 } else if (state == m_net_wm_state_below) { // bottom layer 890 } else if (state == m_net_wm_state_below) { // bottom layer
891 if (value) 891 if (value)
892 win.moveToLayer(Fluxbox::instance()->getBottomLayer()); 892 win.moveToLayer(Layer::BOTTOM);
893 else 893 else
894 win.moveToLayer(Fluxbox::instance()->getNormalLayer()); 894 win.moveToLayer(Layer::NORMAL);
895 895
896 } else if (state == m_net_wm_state_above) { // above layer 896 } else if (state == m_net_wm_state_above) { // above layer
897 if (value) 897 if (value)
898 win.moveToLayer(Fluxbox::instance()->getAboveDockLayer()); 898 win.moveToLayer(Layer::ABOVE_DOCK);
899 else 899 else
900 win.moveToLayer(Fluxbox::instance()->getNormalLayer()); 900 win.moveToLayer(Layer::NORMAL);
901 } 901 }
902} 902}
903 903
@@ -916,16 +916,16 @@ void Ewmh::toggleState(FluxboxWindow &win, Atom state) {
916 } else if (state == m_net_wm_state_skip_taskbar) { 916 } else if (state == m_net_wm_state_skip_taskbar) {
917 win.setIconHidden(!win.isIconHidden()); 917 win.setIconHidden(!win.isIconHidden());
918 } else if (state == m_net_wm_state_below) { // bottom layer 918 } else if (state == m_net_wm_state_below) { // bottom layer
919 if (win.layerNum() == Fluxbox::instance()->getBottomLayer()) 919 if (win.layerNum() == Layer::BOTTOM)
920 win.moveToLayer(Fluxbox::instance()->getNormalLayer()); 920 win.moveToLayer(Layer::NORMAL);
921 else 921 else
922 win.moveToLayer(Fluxbox::instance()->getBottomLayer()); 922 win.moveToLayer(Layer::BOTTOM);
923 923
924 } else if (state == m_net_wm_state_above) { // top layer 924 } else if (state == m_net_wm_state_above) { // top layer
925 if (win.layerNum() == Fluxbox::instance()->getAboveDockLayer()) 925 if (win.layerNum() == Layer::ABOVE_DOCK)
926 win.moveToLayer(Fluxbox::instance()->getNormalLayer()); 926 win.moveToLayer(Layer::NORMAL);
927 else 927 else
928 win.moveToLayer(Fluxbox::instance()->getAboveDockLayer()); 928 win.moveToLayer(Layer::ABOVE_DOCK);
929 } 929 }
930 930
931} 931}