LinHES-system: couple things here, but mostly fix the osd message system

- add lh_message.sh
- Move OSD stuff out of linHES-session and instead have it call lh_message.sh
- add switch_web.sh

1 files changed, 26 insertions, 26 deletions

diff --git a/abs/core/LinHES-system/LinHES-session b/abs/core/LinHES-system/LinHES-session
index 1a460b5..f01e569 100755
--- a/abs/core/LinHES-system/LinHES-session
+++ b/abs/core/LinHES-system/LinHES-session
@@ -36,16 +36,16 @@ export MALLOC_CHECK_=0
 # }
 
 
-
-. /etc/osd_cat.cfg || {
-        color=yellow
-        outline=2
-        outlinecolour=black
-        shadow=0
-        shadowcolour=black
-        font="-adobe-helvetica-bold-*-*-*-34-*-*-*-*-*-*-*"
-}
-
+#
+# . /etc/osd_cat.cfg || {
+#         color=yellow
+#         outline=2
+#         outlinecolour=black
+#         shadow=0
+#         shadowcolour=black
+#         font="-adobe-helvetica-bold-*-*-*-34-*-*-*-*-*-*-*"
+# }
+#
 function delay_osd(){
     if [ x$STARTUP_STYLE = xmythvantage ]
     then
@@ -65,23 +65,23 @@ function delay_osd(){
 
 
     }
-
-function msg_osd(){
-    echo -e "$1"  | osd_cat --pos=middle --align=center --offset=200 --delay=5 --color=$color --outline=$outline --outlinecolour=$outlinecolour --shadow=$shadow --shadowcolour=$shadowcolour --font=$font
-}
-
-function msg_pyosd(){
-    /usr/LH/bin/xmsg.py -m "$1"
-}
+#
+# function msg_osd(){
+#     echo -e "$1"  | osd_cat --pos=middle --align=center --offset=200 --delay=5 --color=$color --outline=$outline --outlinecolour=$outlinecolour --shadow=$shadow --shadowcolour=$shadowcolour --font=$font
+# }
+#
+# function msg_pyosd(){
+#     /usr/LH/bin/xmsg.py -m "$1"
+# }
 
 function msg(){
-    if [ x$STARTUP_STYLE = xmythvantage ]
-    then
-        msg_pyosd "$1"
-    else
-        msg_osd "$1"
-    fi
-
+#     if [ x$STARTUP_STYLE = xmythvantage ]
+#     then
+#         msg_pyosd "$1"
+#     else
+#         msg_osd "$1"
+#     fi
+    /usr/LH/bin/lh_message.sh "$1"
 }
 
 
@@ -132,7 +132,7 @@ function run_tilda(){
 
         width=`/usr/bin/xwininfo -root|grep Width | awk '{ print $2}'`
         height=`/usr/bin/xwininfo -root|grep Height | awk '{ print $2}'`
-	center=$[width/2]
+        center=$[width/2]
         sixtypercent=`echo "scale=0; ( $width*.6) / 1" |bc`
         quarter_height=`echo "scale=0; ($height*.35) /1" |bc`