Index: openacs-4/packages/xowiki/tcl/chat-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/chat-procs.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/xowiki/tcl/chat-procs.tcl	8 Apr 2006 15:00:44 -0000	1.6
+++ openacs-4/packages/xowiki/tcl/chat-procs.tcl	9 Apr 2006 00:07:10 -0000	1.7
@@ -6,7 +6,7 @@
     @cvs-id $Id$
 }
 namespace eval ::xowiki {
-  ::xo::ChatClass Chat -superclass ::xo::Chat 
+  ::xo::ChatClass Chat -superclass ::xo::Chat
 
   Chat instproc render {} {
     my orderby time
@@ -43,22 +43,35 @@
     
     if {![info exists mode]} {
       set mode polling
-      set user_agent [string tolower [ns_set get [ns_conn headers] User-Agent]]
-      if {[regexp (firefox) $user_agent] && [info command ::thread::mutex] ne ""} {
-	set mode streaming
+      if {[info command ::thread::mutex] ne ""} {
+	# we seem to have libthread installed, we can use the background delivery thread
+	# scripted streaming should work everywhere
+	set mode scripted-streaming
+	if {[regexp (firefox) [string tolower [ns_set get [ns_conn headers] User-Agent]]]} {
+	  # for firefox, we could use the nice mode without the spinning load indicator
+	  set mode streaming
+	}
       }
-      my log "--mode $mode, user_agent=$user_agent"
+      my log "--mode $mode"
     }
-    
-    if {$mode eq "polling"} {
-      ::xowiki::Page requireJS  "/resources/xowiki/get-http-object.js"
-      set jspath packages/xowiki/www/ajax/chat.js
-      set login_url ${path}ajax/chat?m=login&$context
-      set get_update  "chatSendCmd(\"$path/ajax/chat?m=get_new&$context\",chatReceiver)"
-      set get_all     "chatSendCmd(\"$path/ajax/chat?m=get_all&$context\",chatReceiver)"
-    } else {
-      set jspath packages/xowiki/www/ajax/streaming-chat.js
-      set subscribe_url ${path}ajax/chat?m=subscribe&$context
+
+    switch $mode {
+      polling {
+	::xowiki::Page requireJS  "/resources/xowiki/get-http-object.js"
+	set jspath packages/xowiki/www/ajax/chat.js
+	set login_url ${path}ajax/chat?m=login&$context
+	set get_update  "chatSendCmd(\"$path/ajax/chat?m=get_new&$context\",chatReceiver)"
+	set get_all     "chatSendCmd(\"$path/ajax/chat?m=get_all&$context\",chatReceiver)"
+      }
+      streaming {
+	set jspath packages/xowiki/www/ajax/streaming-chat.js
+	set subscribe_url ${path}ajax/chat?m=subscribe&$context
+      }
+      scripted-streaming {
+	append context &mode=scripted
+	set jspath packages/xowiki/www/ajax/scripted-streaming-chat.js
+	set subscribe_url ${path}ajax/chat?m=subscribe&$context
+      }
     }
     set send_url  ${path}ajax/chat?m=add_msg&$context&msg=
 
@@ -67,22 +80,20 @@
     }
     set file [open [acs_root_dir]/$jspath]; set js [read $file]; close $file
 
-    if {$mode eq "polling"} {
-      return "\
+    switch $mode {
+      polling {return "\
       <script type='text/javascript' language='javascript'>
       $js
       setInterval('$get_update',5000)
       </script>
       <form action='#' onsubmit='chatSendMsg(\"$send_url\",chatReceiver); return false;'>
       <iframe name='ichat' id='ichat' frameborder='0' src='$login_url'
           style='width:90%;' height='150'>
-
       </iframe>
       <input type='text' size='40' name='msg' id='chatMsg'>
-      </form> 
-    "
-    } else {
-      return "\
+      </form>"
+      }
+      streaming {return "\
       <script type='text/javascript' language='javascript'>$js
       var send_url = \"$send_url\";
       chatSubscribe(\"$subscribe_url\");
@@ -94,13 +105,36 @@
 height: 70px;
 height:150px;
 font-size:.95em;
-line-height:1em;
+line-height:.7em;
 color:#333;
 overflow:auto;
 '></div>
    <form action='#' onsubmit='chatSendMsg(); return false;'>
-   <input type='text' size='40' name='msg' id='chatMsg'>
-"
+   <input type='text' size='40' name='msg' id='chatMsg'>"
+      }
+      scripted-streaming {return "\
+      <script type='text/javascript' language='javascript'>
+      $js
+      var send_url = \"$send_url\";
+      </script>
+   <div id='messages' style='margin:1.5em 0 1.5em 0;
+padding:1em 0 1em 1em;
+background-color: #f9f9f9;
+border:1px solid #dedede;
+height: 70px;
+height:150px;
+font-size:.95em;
+line-height:.7em;
+color:#333;
+overflow:auto;
+'></div>
+      <iframe name='ichat' id='ichat' frameborder='0' src='$subscribe_url' 
+	      style='width:0px; height:0px; border: 0px'>
+      </iframe>
+      <form action='#' onsubmit='chatSendMsg(); return false;'>
+      <input type='text' size='40' name='msg' id='chatMsg'>
+      </form>"
+      }
     }
   }
 }