-d 3 excludes special desktop too

for #55
sagb · Mar 28, 2018 · a67ee31 · a67ee31
1 parent f0d1cba
commit a67ee31
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/doc/alttab.1 b/doc/alttab.1
@@ -84,7 +84,7 @@ Doesn\'t work in ratpoison\.
 In various EWMH WM this desktop may be designed hidden or containing sticky windows\. In i3, it\'s "scratchpad"\.
 .
 .IP
-\fI3\fR: All desktops, excluding current one\.
+\fI3\fR: All desktops, excluding current and special\.
 .
 .TP
 \fB\-sc\fR \fINUMBER\fR

diff --git a/doc/alttab.1.ronn b/doc/alttab.1.ronn
@@ -88,7 +88,7 @@ Most command line options have corresponding X resource, see doc/alttab.ad for e
       In various EWMH WM this desktop may be designed hidden
       or containing sticky windows. In i3, it's "scratchpad".
 
-      <3>: All desktops, excluding current one.
+      <3>: All desktops, excluding current and special.
 
   * `-sc` <NUMBER>:
     resource: alttab.screens  

diff --git a/src/ewmh.c b/src/ewmh.c
@@ -260,10 +260,11 @@ int ewmh_initWinlist(quad screen)
             }
             continue;
         }
-        if (g.option_desktop == DESK_NOCURRENT
-                && current_desktop == window_desktop) {
+        if (g.option_desktop == DESK_NOCURRENT && 
+                (window_desktop == current_desktop ||
+                 window_desktop == -1)) {
 	        if (g.debug > 1) {
-                fprintf (stderr, "window on current desktop, skipped\n");
+                fprintf (stderr, "window on current or -1 desktop, skipped\n");
             }
             continue;
         }