1 files changed, 12 insertions, 5 deletions

diff --git a/src/Ewmh.cc b/src/Ewmh.cc
index b4e831d..ef2fc09 100644
--- a/src/Ewmh.cc
+++ b/src/Ewmh.cc
@@ -629,7 +629,7 @@ void Ewmh::updateState(FluxboxWindow &win) {
         state.push_back(m_net_wm_state_skip_taskbar);
     if (win.isFullscreen())
         state.push_back(m_net_wm_state_fullscreen);
-    if (win.winClient().isModal())
+    if (win.winClient().isStateModal())
         state.push_back(m_net_wm_state_modal);
 
     FluxboxWindow::ClientList::iterator it = win.clientList().begin();
@@ -1031,12 +1031,16 @@ void Ewmh::createAtoms() {
     utf8_string = XInternAtom(disp, "UTF8_STRING", False);
 }
 
-// wrapper for avoiding changing every AtomHandler to include an unnecessary
-// parameter, although we need it for _NET_WM_STATE_DEMANDS_ATTENTION
+// wrapper for real setState, since most operations don't need the client
 void Ewmh::setState(FluxboxWindow &win, Atom state, bool value) {
     setState(win, state, value, win.winClient());
 }
 
+// wrapper for real toggleState, since most operations don't need the client
+void Ewmh::toggleState(FluxboxWindow &win, Atom state) {
+    toggleState(win, state, win.winClient());
+}
+
 // set window state
 void Ewmh::setState(FluxboxWindow &win, Atom state, bool value,
                     WinClient &client) {
@@ -1084,13 +1088,14 @@ void Ewmh::setState(FluxboxWindow &win, Atom state, bool value,
             Fluxbox::instance()->attentionHandler().
                 update(&client.focusSig());
         }
+    } else if (state == m_net_wm_state_modal) {
+        client.setStateModal(value);
     }
 
-    // Note: state == net_wm_state_modal, We should not change it
 }
 
 // toggle window state
-void Ewmh::toggleState(FluxboxWindow &win, Atom state) {
+void Ewmh::toggleState(FluxboxWindow &win, Atom state, WinClient &client) {
     if (state == m_net_wm_state_sticky) { // sticky
         win.stick();
     } else if (state == m_net_wm_state_shaded){ // shaded
@@ -1119,6 +1124,8 @@ void Ewmh::toggleState(FluxboxWindow &win, Atom state) {
             win.moveToLayer(Layer::NORMAL);
         else
             win.moveToLayer(Layer::ABOVE_DOCK);
+    } else if (state == m_net_wm_state_modal) { // modal
+        client.setStateModal(!client.isStateModal());
     }
 
 }