Fix autohiding/raising timer logics

Trying to control a timer bound to an unconditional toggle, caused by
opposing events does not work. <- That's a period.
The toolbar implementation would act too seldom, the slit to often.

Instead, fire the timer whenever the state does not match the event and
bind it to a function that queries the pointer position and acts
accordingly.

1 files changed, 33 insertions, 41 deletions

diff --git a/src/Slit.cc b/src/Slit.cc
index b628d18..7eb7dea 100644
--- a/src/Slit.cc
+++ b/src/Slit.cc
@@ -272,8 +272,8 @@ Slit::Slit(BScreen &scr, FbTk::Layer &layer, const char *filename)
     // setup timer
     m_timer.setTimeout(200L * FbTk::FbTime::IN_MILLISECONDS); // default timeout
     m_timer.fireOnce(true);
-    FbTk::RefCount<FbTk::Command<void> > toggle_hidden(new FbTk::SimpleCommand<Slit>(*this, &Slit::toggleHidden));
-    m_timer.setCommand(toggle_hidden);
+    FbTk::RefCount<FbTk::Command<void> > ucs(new FbTk::SimpleCommand<Slit>(*this, &Slit::updateCrossingState));
+    m_timer.setCommand(ucs);
 
 
     FbTk::EventManager::instance()->add(*this, frame.window);
@@ -958,45 +958,47 @@ void Slit::buttonPressEvent(XButtonEvent &be) {
 }
 
 
-void Slit::enterNotifyEvent(XCrossingEvent &) {
-    if (m_rc_auto_raise)
-        m_layeritem->moveToLayer(ResourceLayer::ABOVE_DOCK);
-
-    if (! doAutoHide())
-        return;
-
-    if (isHidden()) {
-        if (! m_timer.isTiming())
-            m_timer.start();
+void Slit::updateCrossingState() {
+    Window wr, wc;
+    int rx, ry, x, y;
+    unsigned int mask;
+    const int bw = -theme()->borderWidth();
+    bool hovered = false;
+    if (XQueryPointer(Fluxbox::instance()->display(), window().window(), &wr, &wc, &rx, &ry, &x, &y, &mask))
+        hovered = x >= bw && y >= bw && x < int(width()) && y < int(height());
+
+    if (hovered) {
+        if (m_rc_auto_raise)
+            m_layeritem->moveToLayer(ResourceLayer::ABOVE_DOCK);
+        if (m_rc_auto_hide && isHidden())
+            toggleHidden();
     } else {
-        if (m_timer.isTiming())
-            m_timer.stop();
+        if (m_rc_auto_hide && !isHidden())
+            toggleHidden();
+        if (m_rc_auto_raise)
+            m_layeritem->moveToLayer(m_rc_layernum->getNum());
     }
 }
 
+void Slit::enterNotifyEvent(XCrossingEvent &ce) {
+    if (!m_rc_auto_hide && isHidden()) {
+        toggleHidden();
+    }
 
-void Slit::leaveNotifyEvent(XCrossingEvent &ev) {
-    if (m_rc_auto_raise)
-        m_layeritem->moveToLayer(m_rc_layernum->getNum());
+    if (!m_timer.isTiming() && (m_rc_auto_hide && isHidden()) ||
+       (m_rc_auto_raise && m_layeritem->getLayerNum() != ResourceLayer::ABOVE_DOCK))
+        m_timer.start();
+}
 
-    if (! doAutoHide())
+void Slit::leaveNotifyEvent(XCrossingEvent &event) {
+    if (m_slitmenu.isVisible())
         return;
 
-    if (isHidden()) {
-        if (m_timer.isTiming())
-            m_timer.stop();
-    } else {
-        if (! m_timer.isTiming()) {
-            // the menu is open, keep it firing until it closes
-            if (m_slitmenu.isVisible())
-                m_timer.fireOnce(false);
-            m_timer.start();
-        }
-    }
-
+    if (!m_timer.isTiming() && (m_rc_auto_hide && !isHidden()) ||
+       (m_rc_auto_raise && m_layeritem->getLayerNum() != m_rc_layernum->getNum()))
+        m_timer.start();
 }
 
-
 void Slit::configureRequestEvent(XConfigureRequestEvent &event) {
     bool reconf = false;
     XWindowChanges xwc;
@@ -1050,16 +1052,6 @@ void Slit::clearWindow() {
 }
 
 void Slit::toggleHidden() {
-    if (doAutoHide()) {
-        if (!m_slitmenu.isVisible()) {
-            m_timer.fireOnce(true);
-        } else {
-            return;
-        }
-    //} else if (!isHidden()) {
-    //    return;
-    }
-
     m_hidden = ! m_hidden; // toggle hidden state
     if (isHidden())
         frame.window.move(frame.x_hidden, frame.y_hidden);