all repos — fluxbox @ 02e0f9321cce4f331ce2523621830e3102c04493

custom fork of the fluxbox windowmanager 

use current workspace in ClientPattern when client has no FbWindow
Mark Tiefenbruck mark@fluxbox.org
commit

02e0f9321cce4f331ce2523621830e3102c04493

parent

ed28c69b8d7eb68cb12ec4b4456770ce55def69d

1 files changed, 5 insertions(+), 6 deletions(-)

jump to
M src/ClientPattern.cc → src/ClientPattern.cc 
@@ -378,17 +378,16 @@ case ICONHIDDEN:
         return (fbwin && fbwin->isIconHidden()) ? "yes" : "no";
         break;
     case WORKSPACE: {
-        if (!fbwin)
-            return "";
+        unsigned int wsnum = (fbwin ? fbwin->workspaceNumber() : client.screen().currentWorkspaceID());
         char tmpstr[128];
-        sprintf(tmpstr, "%d", fbwin->workspaceNumber());
+        sprintf(tmpstr, "%d", wsnum);
         return std::string(tmpstr);
         break;
     }
     case WORKSPACENAME: {
-        if (!fbwin)
-            return "";
-        const Workspace *w = client.screen().getWorkspace(fbwin->workspaceNumber());
+        const Workspace *w = (fbwin ?
+                client.screen().getWorkspace(fbwin->workspaceNumber()) :
+                client.screen().currentWorkspace());
         return w ? w->name() : "";
         break;
     }