diff options
author | Pavel Labath <pavelo@centrum.sk> | 2011-08-15 21:03:57 (GMT) |
---|---|---|
committer | Paul Tagliamonte <paultag@fluxbox.org> | 2012-04-07 02:13:13 (GMT) |
commit | bc803c3211f3caa3554c9e96f687701de007b436 (patch) | |
tree | d23fbbeb9affe7a4c3d67cde7c4732dd47625682 /src/Ewmh.cc | |
parent | 3012793a8f9151ded4c83da6075919a36dde412f (diff) | |
download | fluxbox_paul-bc803c3211f3caa3554c9e96f687701de007b436.zip fluxbox_paul-bc803c3211f3caa3554c9e96f687701de007b436.tar.bz2 |
Move declarations of Resource enums to a separate file
The reason for this is that I need to access those enums from fluxbox-update_configs and I don't
want to #include and link everything in src.
I also merged Slit::Placement, Toolbar::Placement and FbWinFrame::TabPlacement into one enum.
Diffstat (limited to 'src/Ewmh.cc')
-rw-r--r-- | src/Ewmh.cc | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/Ewmh.cc b/src/Ewmh.cc index 291c39b..be3b1bb 100644 --- a/src/Ewmh.cc +++ b/src/Ewmh.cc | |||
@@ -993,9 +993,9 @@ void Ewmh::updateState(FluxboxWindow &win) { | |||
993 | state.push_back(m_net->wm_state_sticky); | 993 | state.push_back(m_net->wm_state_sticky); |
994 | if (win.isShaded()) | 994 | if (win.isShaded()) |
995 | state.push_back(m_net->wm_state_shaded); | 995 | state.push_back(m_net->wm_state_shaded); |
996 | if (win.layerNum() == ResourceLayer::BOTTOM) | 996 | if (win.layerNum() == LAYERBOTTOM) |
997 | state.push_back(m_net->wm_state_below); | 997 | state.push_back(m_net->wm_state_below); |
998 | if (win.layerNum() == ResourceLayer::ABOVE_DOCK) | 998 | if (win.layerNum() == LAYERABOVE_DOCK) |
999 | state.push_back(m_net->wm_state_above); | 999 | state.push_back(m_net->wm_state_above); |
1000 | if (win.isIconic()) | 1000 | if (win.isIconic()) |
1001 | state.push_back(m_net->wm_state_hidden); | 1001 | state.push_back(m_net->wm_state_hidden); |
@@ -1347,14 +1347,14 @@ void Ewmh::setState(FluxboxWindow &win, Atom state, bool value, | |||
1347 | win.setIconHidden(value); | 1347 | win.setIconHidden(value); |
1348 | } else if (state == m_net->wm_state_below) { // bottom layer | 1348 | } else if (state == m_net->wm_state_below) { // bottom layer |
1349 | if (value) | 1349 | if (value) |
1350 | win.moveToLayer(ResourceLayer::BOTTOM); | 1350 | win.moveToLayer(LAYERBOTTOM); |
1351 | else if (win.layerNum() > ResourceLayer::NORMAL) | 1351 | else if (win.layerNum() > LAYERNORMAL) |
1352 | win.moveToLayer(ResourceLayer::NORMAL); | 1352 | win.moveToLayer(LAYERNORMAL); |
1353 | } else if (state == m_net->wm_state_above) { // above layer | 1353 | } else if (state == m_net->wm_state_above) { // above layer |
1354 | if (value) | 1354 | if (value) |
1355 | win.moveToLayer(ResourceLayer::ABOVE_DOCK); | 1355 | win.moveToLayer(LAYERABOVE_DOCK); |
1356 | else if (win.layerNum() < ResourceLayer::NORMAL) | 1356 | else if (win.layerNum() < LAYERNORMAL) |
1357 | win.moveToLayer(ResourceLayer::NORMAL); | 1357 | win.moveToLayer(LAYERNORMAL); |
1358 | } else if (state == m_net->wm_state_demands_attention) { | 1358 | } else if (state == m_net->wm_state_demands_attention) { |
1359 | if (value) { // if add attention | 1359 | if (value) { // if add attention |
1360 | Fluxbox::instance()->attentionHandler().addAttention(client); | 1360 | Fluxbox::instance()->attentionHandler().addAttention(client); |
@@ -1387,16 +1387,16 @@ void Ewmh::toggleState(FluxboxWindow &win, Atom state, WinClient &client) { | |||
1387 | } else if (state == m_net->wm_state_skip_taskbar) { // taskbar | 1387 | } else if (state == m_net->wm_state_skip_taskbar) { // taskbar |
1388 | win.setIconHidden(!win.isIconHidden()); | 1388 | win.setIconHidden(!win.isIconHidden()); |
1389 | } else if (state == m_net->wm_state_below) { // bottom layer | 1389 | } else if (state == m_net->wm_state_below) { // bottom layer |
1390 | if (win.layerNum() == ResourceLayer::BOTTOM) | 1390 | if (win.layerNum() == LAYERBOTTOM) |
1391 | win.moveToLayer(ResourceLayer::NORMAL); | 1391 | win.moveToLayer(LAYERNORMAL); |
1392 | else | 1392 | else |
1393 | win.moveToLayer(ResourceLayer::BOTTOM); | 1393 | win.moveToLayer(LAYERBOTTOM); |
1394 | 1394 | ||
1395 | } else if (state == m_net->wm_state_above) { // top layer | 1395 | } else if (state == m_net->wm_state_above) { // top layer |
1396 | if (win.layerNum() == ResourceLayer::ABOVE_DOCK) | 1396 | if (win.layerNum() == LAYERABOVE_DOCK) |
1397 | win.moveToLayer(ResourceLayer::NORMAL); | 1397 | win.moveToLayer(LAYERNORMAL); |
1398 | else | 1398 | else |
1399 | win.moveToLayer(ResourceLayer::ABOVE_DOCK); | 1399 | win.moveToLayer(LAYERABOVE_DOCK); |
1400 | } else if (state == m_net->wm_state_modal) { // modal | 1400 | } else if (state == m_net->wm_state_modal) { // modal |
1401 | client.setStateModal(!client.isStateModal()); | 1401 | client.setStateModal(!client.isStateModal()); |
1402 | } | 1402 | } |