all repos — fluxbox @ f0e60d08652d7ae71f682714d772e3211e8e4133

custom fork of the fluxbox windowmanager 

fix some issues with window menus
Mark Tiefenbruck mark@fluxbox.org
commit

f0e60d08652d7ae71f682714d772e3211e8e4133

parent

38a01a71b401800c8aa3b242f672cc58143f6c28

1 files changed, 13 insertions(+), 1 deletions(-)

jump to
M src/Toolbar.cc → src/Toolbar.cc 
@@ -521,10 +521,15 @@ 
 
 
 void Toolbar::buttonPressEvent(XButtonEvent &be) {
+    WinClient *old = WindowCmd<void>::client();
     WindowCmd<void>::setWindow(0);
     if (Fluxbox::instance()->keys()->doAction(be.type, be.state, be.button,
-                                              Keys::ON_TOOLBAR, be.time))
+                                              Keys::ON_TOOLBAR, be.time)) {
+        WindowCmd<void>::setClient(old);
         return;
+    }
+    WindowCmd<void>::setClient(old);
+
     if (be.button == 1)
         raise();
     if (be.button != 3)

@@ -549,9 +554,12 @@ 
 }
 
 void Toolbar::enterNotifyEvent(XCrossingEvent &ce) {
+    WinClient *old = WindowCmd<void>::client();
     WindowCmd<void>::setWindow(0);
     Fluxbox::instance()->keys()->doAction(ce.type, ce.state, 0,
                                           Keys::ON_TOOLBAR);
+    WindowCmd<void>::setClient(old);
+
     if (! doAutoHide()) {
         if (isHidden())
             toggleHidden();

@@ -573,8 +581,12 @@ if (event.x_root > x() && event.x_root <= (int)(x() + width()) &&
         event.y_root > y() && event.y_root <= (int)(y() + height()))
         return;
 
+    WinClient *old = WindowCmd<void>::client();
+    WindowCmd<void>::setWindow(0);
     Fluxbox::instance()->keys()->doAction(event.type, event.state, 0,
                                           Keys::ON_TOOLBAR);
+    WindowCmd<void>::setClient(old);
+
     if (! doAutoHide())
         return;