From 1745851759e8fd392fb845abce58008a0a93bc25 Mon Sep 17 00:00:00 2001
From: nojhan <nojhan@gmail.com>
Date: Sun, 29 Jul 2012 22:05:19 +0200
Subject: [PATCH] add detached screen session count

---
 README.md         |  3 ++-
 liquidprompt.bash | 32 +++++++++++++++++++++-----------
 2 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index 9eff56f..37c905a 100644
--- a/README.md
+++ b/README.md
@@ -24,7 +24,7 @@ in a git repository, on branch "myb":
 
 A liquid prompt displaying everything may look like this:
 
-`25% 12.5 1s/1r [user@server:~/liquidprompt] master(3) 125 ± `
+`25% 12.5 1s/1r/1t [user@server:~/liquidprompt] master(3) 125 ± `
 
 It displays:
 
@@ -32,6 +32,7 @@ It displays:
 threshold, with a colormap too;
 * the average of the processors load, if it is over a given limit, with a
 colormap that became more and more noticeable with increasing load;
+* the number of detached `screen` sessions, if there is any;
 * the number of attached sleeping jobs (when you interrupt a command with Ctrl-Z
 and bring it back with `fg`), if there is any;
 * the number of attached running jobs (commands started with a `&`), if there is
diff --git a/liquidprompt.bash b/liquidprompt.bash
index cbe7f8a..cc4752a 100755
--- a/liquidprompt.bash
+++ b/liquidprompt.bash
@@ -23,7 +23,7 @@
 # Below are function for having a flexible dynamic prompt for power user:
 # - display the battery level (if necessary), with colormap (if any battery attached)
 # - if necessary, prints a counter for jobs that are attached to the current
-#   term (e.g. xterm &) or that are sleeping (e.g. Ctrl-z)
+#   term (e.g. xterm &) or that are sleeping (e.g. Ctrl-z) or detached "screen" sessions
 # - display the load average, colored with a colormap
 # - displays the colored login@hostname
 #     - when root displays in red
@@ -265,20 +265,30 @@ __host_color()
 
 # Either attached running jobs (started with $ myjob &)
 # or attached stopped jobs (suspended with Ctrl-Z)
+# or detached screens sessions running on the host
 __jobcount_color()
 {
-    running=`jobs -r | wc -l | tr -d " "`
-    stopped=`jobs -s | wc -l | tr -d " "`
+    local running=$(jobs -r | wc -l | tr -d " ")
+    local stopped=$(jobs -s | wc -l | tr -d " ")
+    local screens=$(screen -ls | grep -c Detach )
 
-    if [ $running != "0" -a $stopped != "0" ]
-    then
-        rep="${NO_COL}${YELLOW}${running}r${NO_COL}/${LIGHT_YELLOW}${stopped}s${NO_COL}"
-    elif [ $running != "0" -a $stopped == "0" ]
-    then
+    if   [ $running != "0" -a $stopped != "0" -a $screens != "0" ] ; then
+        rep="${NO_COL}${YELLOW}${screens}s${NO_COL}/${YELLOW}${running}r${NO_COL}/${LIGHT_YELLOW}${stopped}t${NO_COL}"
+
+    elif [ $running != "0" -a $stopped == "0" -a $screens == "0" ] ; then
         rep="${NO_COL}${YELLOW}${running}r${NO_COL}"
-    elif [ $running == "0" -a $stopped != "0" ]
-    then
-        rep="${NO_COL}${LIGHT_YELLOW}${stopped}s${NO_COL}"
+
+    elif [ $running == "0" -a $stopped != "0" -a $screens == "0" ] ; then
+        rep="${NO_COL}${LIGHT_YELLOW}${stopped}t${NO_COL}"
+
+    elif [ $running == "0" -a $stopped == "0" -a $screens != "0" ] ; then
+        rep="${NO_COL}${YELLOW}${screens}s${NO_COL}"
+
+    elif [ $running != "0" -a $stopped == "0" -a $screens != "0" ] ; then
+        rep="${NO_COL}${YELLOW}${screens}s${NO_COL}/${YELLOW}${running}r${NO_COL}"
+
+    elif [ $running == "0" -a $stopped != "0" -a $screens != "0" ] ; then
+        rep="${NO_COL}${YELLOW}${screens}s${NO_COL}/${LIGHT_YELLOW}${stopped}t${NO_COL}"
     fi
     echo -ne "$rep"
 }