M src/CurrentWindowCmd.cc → src/CurrentWindowCmd.cc

@@ -57,6 +57,13 @@ if (tmp) return *tmp;
     return *FocusControl::focusedFbWindow();
 }
 
+WinClient &WindowHelperBoolCmd::winclient() {
+    // will exist from execute above
+    WinClient *tmp = WindowCmd<void>::client();
+    if (tmp) return *tmp;
+    return *FocusControl::focusedWindow();
+}
+
 void CurrentWindowCmd::real_execute() {
     (fbwindow().*m_action)();
 }
@@ -234,5 +241,5 @@ fbwindow().setUnfocusedAlpha(m_unfocus);
 }
 
 bool MatchCmd::real_execute() {
-    return m_pat.match(fbwindow());
+    return m_pat.match(winclient());
 }

M src/CurrentWindowCmd.hh → src/CurrentWindowCmd.hh

@@ -50,6 +50,7 @@ bool bool_execute();
 
 protected:
     FluxboxWindow &fbwindow();
+    WinClient &winclient();
     virtual bool real_execute() = 0;
 };
 

M src/WorkspaceCmd.cc → src/WorkspaceCmd.cc

@@ -64,9 +64,6 @@ }
 }
 
 bool SomeCmd::bool_execute() {
-    if (m_pat.error())
-        return m_cmd->bool_execute();
-
     BScreen *screen = Fluxbox::instance()->keyScreen();
     if (screen != 0) {
         FocusControl::Focusables win_list(screen->focusControl().creationOrderList().clientList());
@@ -85,9 +82,6 @@ return false;
 }
 
 bool EveryCmd::bool_execute() {
-    if (m_pat.error())
-        return m_cmd->bool_execute();
-
     BScreen *screen = Fluxbox::instance()->keyScreen();
     if (screen != 0) {
         FocusControl::Focusables win_list(screen->focusControl().creationOrderList().clientList());

M src/WorkspaceCmd.hh → src/WorkspaceCmd.hh

@@ -52,7 +52,6 @@ bool bool_execute();
 
 private:
     FbTk::RefCount<FbTk::BoolCommand> m_cmd;
-    ClientPattern m_pat;
 };
 
 class EveryCmd: public FbTk::BoolCommand {
@@ -63,7 +62,6 @@ bool bool_execute();
 
 private:
     FbTk::RefCount<FbTk::BoolCommand> m_cmd;
-    ClientPattern m_pat;
 };
 
 class AttachCmd: public FbTk::Command {