Complete screen on commands (Alioth: #312164, RedHat: #547852).

completions/screen

@@ -22,6 +22,22 @@ _screen()
         esac
     fi
 
+    local i
+    for (( i=1; i <= cword; i++ )); do
+        case ${words[i]} in
+            -r|-R|-d|-D|-x|-s|-c|-T|-e|-h|-p|-S|-t)
+                (( i++ ))
+                continue
+                ;;
+            -*)
+                continue
+                ;;
+        esac
+
+        _command_offset $i
+        return
+    done
+
     case $prev in
         -[rR])
             # list detached
@@ -61,7 +77,7 @@ _screen()
             --version' -- "$cur" ) )
     fi
 } &&
-complete -F _screen -o default screen
+complete -F _screen screen
 
 # Local variables:
 # mode: shell-script

test/lib/completions/screen.exp

@@ -12,15 +12,19 @@ setup
 
 
 assert_complete_any "screen -"
-
-
 sync_after_int
 
 
 assert_complete {bar "bar bar.d/" foo foo.d/} \
     "screen -c $::srcdir/fixtures/shared/default/" "-c should complete files/dirs"
+sync_after_int
 
 
+assert_complete_any "screen cat"
+sync_after_int
+
+
+assert_complete_any "screen -T foo cat"
 sync_after_int