* Made the chat screen totally kick-ass sweet. The flickering reload

  i-frame is now tiny and hidden, and it *appends* new chat data to
  the viewable window using JavaScript.  No flickering + scrollback!
* Added a help button to the chat screen.

diff --git a/webcit/ChangeLog b/webcit/ChangeLog
index 138c9163ab62e7252a8ef7d839d1bf586bce04a7..0ef62ca06bbb2d7718eda6e08b53e22b9eb86d8c 100644 (file)
--- a/webcit/ChangeLog
+++ b/webcit/ChangeLog
@@ -1,4 +1,10 @@
 $Log$
+Revision 505.11  2004/03/03 05:21:36  ajc
+* Made the chat screen totally kick-ass sweet.  The flickering reload
+  i-frame is now tiny and hidden, and it *appends* new chat data to
+  the viewable window using JavaScript.  No flickering + scrollback!
+* Added a help button to the chat screen.
+
 Revision 505.10  2004/02/29 22:52:15  ajc
 * Close and clear (set to -1) server socket handle when socket errors are
   detected.  Fixes a chat problem reported by Winzlo.
@@ -1700,3 +1706,4 @@ Sun Dec  6 19:50:55 EST 1998 Art Cancro <ajc@uncnsrd.mt-kisco.ny.us>
 
 1998-12-03 Nathan Bryant <bryant@cs.usm.maine.edu>
        * webserver.c: warning fix
+

diff --git a/webcit/paging.c b/webcit/paging.c
index 0c13acedb44f25639f9a46a7d49299c7b12fdb54..3d879eaaced5e1d5c430524aca9a4921bc0cd5da 100644 (file)
--- a/webcit/paging.c
+++ b/webcit/paging.c
@@ -118,23 +118,32 @@ void page_user(void)
 void do_chat(void)
 {
 
-       output_headers(1);
+       output_headers(3);
 
        wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#000077\"><TR><TD>"
                "<SPAN CLASS=\"titlebar\">"
                "<IMG SRC=\"/static/chat-icon.gif\" WIDTH=16 HEIGHT=16 ALIGN=MIDDLE>"
-               "Real-time chat</SPAN>\n"
+       );
+       escputs(WC->wc_roomname);
+       wprintf(": real-time chat</SPAN>\n"
                "</TD></TR></TABLE>\n"
-               "<IFRAME WIDTH=100%% HEIGHT=200 SRC=\"/chat_recv\" "
-               "NAME=\"chat_recv\">\n"
+
+               "<IFRAME WIDTH=100%% HEIGHT=200 SRC=\"about:blank\" "
+               "NAME=\"chat_transcript\">\n"
                "<!-- Alternate content for non-supporting browsers -->\n"
                "If you are seeing this message, your browser does not contain\n"
                "the IFRAME support required for the chat window.  Please upgrade\n"
                "to a supported browser, such as\n"
                "<A HREF=\"http://www.mozilla.org\">Mozilla</A>.\n"
                "</IFRAME>\n"
-               "<HR width=100%%>\n"
-               "<IFRAME WIDTH=100%% HEIGHT=50 SRC=\"/chat_send\" "
+
+               "<IFRAME WIDTH=100%% HEIGHT=1 SRC=\"/chat_recv\" "
+               "NAME=\"chat_recv\">\n"
+               "</IFRAME>"
+
+               "<BR>\n"
+
+               "<IFRAME WIDTH=100%% HEIGHT=60 SRC=\"/chat_send\" "
                "NAME=\"chat_send\">\n"
                "</IFRAME>\n"
        );
@@ -191,10 +200,6 @@ int setup_chat_socket(void) {
 
        if (WC->chat_sock < 0) {
 
-               for (i=0; i<CHATLINES; ++i) {
-                       strcpy(WC->chatlines[i], "");
-               }
-
                if (!strcasecmp(ctdlhost, "uds")) {
                        /* unix domain socket */
                        sprintf(buf, "%s/citadel.socket", ctdlport);
@@ -229,7 +234,6 @@ int setup_chat_socket(void) {
                                                serv_gets(buf);
                                                if (buf[0] == '8') {
                                                        good_chatmode = 1;
-                                                       serv_puts("/help");
                                                }
                                        }
                                }
@@ -250,15 +254,19 @@ int setup_chat_socket(void) {
 
 
 /*
- * receiving side of the chat window
+ * Receiving side of the chat window.  This is implemented in a
+ * tiny hidden IFRAME that just does JavaScript writes to
+ * other frames whenever it refreshes and finds new data.
  */
 void chat_recv(void) {
        int i;
-       char name[SIZ];
-       char text[SIZ];
        struct pollfd pf;
        int got_data = 0;
        int end_chat_now = 0;
+       char buf[SIZ];
+       char cl_user[SIZ];
+       char cl_text[SIZ];
+       char *output_data = NULL;
 
        output_headers(0);
 
@@ -268,7 +276,8 @@ void chat_recv(void) {
                "<HEAD>\n"
                "<META HTTP-EQUIV=\"refresh\" CONTENT=\"3\">\n"
                "</HEAD>\n"
-               "<BODY BGCOLOR=\"#FFFFFF\">"
+
+               "<BODY BGCOLOR=\"#FFFFFF\">\n"
        );
 
        if (setup_chat_socket() != 0) {
@@ -280,6 +289,7 @@ void chat_recv(void) {
        /*
         * See if there is any chat data waiting.
         */
+       output_data = strdup("");
        do {
                got_data = 0;
                pf.fd = WC->chat_sock;
@@ -288,57 +298,67 @@ void chat_recv(void) {
                if (poll(&pf, 1, 1) > 0) if (pf.revents & POLLIN) {
                        ++got_data;
 
-                       for (i=0; i<CHATLINES-1; ++i) {
-                               strcpy(WC->chatlines[i], WC->chatlines[i+1]);
-                       }
-       
                        /* Temporarily swap the serv and chat sockets during chat talk */
                        i = WC->serv_sock;
                        WC->serv_sock = WC->chat_sock;
                        WC->chat_sock = i;
        
-                       serv_gets(WC->chatlines[CHATLINES-1]);
-                       if (!strcmp(WC->chatlines[CHATLINES-1], "000")) {
+                       serv_gets(buf);
+
+                       if (!strcmp(buf, "000")) {
+                               strcpy(buf, ":|exiting chat mode");
                                end_chat_now = 1;
-                               strcpy(WC->chatlines[CHATLINES-1], ":|exiting chat mode");
                        }
                        
                        /* Unswap the sockets. */
                        i = WC->serv_sock;
                        WC->serv_sock = WC->chat_sock;
                        WC->chat_sock = i;
-               }
-       } while ( (got_data) && (!end_chat_now) );
 
-       /*
-        * Display appropriately.
-        */
-       for (i=0; i<CHATLINES; ++i) {
-               if (strlen(WC->chatlines[i]) > 0) {
-                       extract(name, WC->chatlines[i], 0);
-                       extract(text, WC->chatlines[i], 1);
-                       if (!strcasecmp(name, WC->wc_username)) {
-                               wprintf("<FONT COLOR=\"#004400\">");
-                       }
-                       else if (!strcmp(name, ":")) {
-                               wprintf("<FONT COLOR=\"#440000\">");
-                       }
-                       else {
-                               wprintf("<FONT COLOR=\"#000044\">");
-                       }
-                       escputs(name);
-                       wprintf(": </FONT>");
-                       escputs(text);
-                       wprintf("<BR>\n");
+                       /* Append our output data */
+                       output_data = realloc(output_data, strlen(output_data) + strlen(buf) + 4);
+                       strcat(output_data, buf);
+                       strcat(output_data, "\n");
                }
-       }
+
+       } while ( (got_data) && (!end_chat_now) );
 
        if (end_chat_now) {
                close(WC->chat_sock);
                WC->chat_sock = (-1);
-               wprintf("<IMG SRC=\"/static/blank.gif\" onLoad=\"top.location.replace('/do_welcome');\">\n");
+               wprintf("<IMG SRC=\"/static/blank.gif\" onLoad=\"parent.location.replace('/display_main_menu');\">\n");
+       }
+
+       if (strlen(output_data) > 0) {
+
+               if (output_data[strlen(output_data)-1] == '\n') {
+                       output_data[strlen(output_data)-1] = 0;
+               }
+
+               /* Output our fun to the other frame. */
+               wprintf("<IMG SRC=\"/static/blank.gif\" WIDTH=1 HEIGHT=1\n"
+                       "onLoad=\" \n"
+               );
+
+               for (i=0; i<num_tokens(output_data, '\n'); ++i) {
+                       extract_token(buf, output_data, i, '\n');
+                       extract_token(cl_user, buf, 0, '|');
+                       extract_token(cl_text, buf, 1, '|');
+
+                       wprintf("parent.chat_transcript.document.write('");
+                       wprintf("<FONT SIZE=-1><B>");
+                       jsescputs(cl_user);
+                       wprintf(":</B> ");
+                       jsescputs(cl_text);
+                       wprintf("</FONT><BR>");
+                       wprintf("'); \n");
+               }
+
+               wprintf("parent.chat_transcript.scrollTo(999999,999999);\">\n");
        }
 
+       free(output_data);
+
        wprintf("</BODY></HTML>\n");
        wDumpContent(0);
 }
@@ -367,6 +387,10 @@ void chat_send(void) {
 
        if (bstr("sendbutton") != NULL) {
 
+               if (!strcasecmp(bstr("sendbutton"), "Help")) {
+                       strcpy(send_this, "/help");
+               }
+
                if (!strcasecmp(bstr("sendbutton"), "Exit")) {
                        strcpy(send_this, "/quit");
                }
@@ -391,10 +415,10 @@ void chat_send(void) {
 
        }
 
-       wprintf("Send: ");
        wprintf("<FORM METHOD=\"POST\" ACTION=\"/chat_send\" NAME=\"chatsendform\">\n");
        wprintf("<INPUT TYPE=\"text\" SIZE=\"80\" MAXLENGTH=\"80\" NAME=\"send_this\">\n");
        wprintf("<INPUT TYPE=\"submit\" NAME=\"sendbutton\" VALUE=\"Send\">\n");
+       wprintf("<INPUT TYPE=\"submit\" NAME=\"sendbutton\" VALUE=\"Help\">\n");
        wprintf("<INPUT TYPE=\"submit\" NAME=\"sendbutton\" VALUE=\"Exit\">\n");
        wprintf("</FORM>\n");
 

diff --git a/webcit/webcit.c b/webcit/webcit.c
index d86c7a763db4f53677949257efb43314ef35608e..914484cef50c3b6dccdf88916f48ae68e5dc558d 100644 (file)
--- a/webcit/webcit.c
+++ b/webcit/webcit.c
@@ -262,6 +262,40 @@ void urlescputs(char *strbuf)
 }
 
 
+/*
+ * Copy a string, escaping characters for JavaScript strings.
+ */
+void jsesc(char *target, char *strbuf)
+{
+       int a;
+       strcpy(target, "");
+
+       for (a = 0; a < strlen(strbuf); ++a) {
+               if (strbuf[a] == '<')
+                       strcat(target, "[");
+               else if (strbuf[a] == '>')
+                       strcat(target, "]");
+               else if (strbuf[a] == '\"')
+                       strcat(target, "&quot;");
+               else if (strbuf[a] == '&')
+                       strcat(target, "&amp;;");
+               else if (strbuf[a] == '\'') 
+                       strcat(target, "\\'");
+               else {
+                       strncat(target, &strbuf[a], 1);
+               }
+       }
+}
+
+void jsescputs(char *strbuf)
+{
+       char outbuf[SIZ];
+       
+       jsesc(outbuf, strbuf);
+       wprintf("%s", outbuf);
+}
+
+
 
 
 /*

diff --git a/webcit/webcit.h b/webcit/webcit.h
index 0cb600824ae28e2229e305e1c2a2617a0f2f1acf..a147a2536eb1f534101dd4ef7030ca768e27ecce 100644 (file)
--- a/webcit/webcit.h
+++ b/webcit/webcit.h
@@ -163,8 +163,6 @@ struct wc_attachment {
        char *data;
 };
 
-#define CHATLINES 8
-
 /*
  * One of these is kept for each active Citadel session.
  * HTTP transactions are bound to one at a time.
@@ -220,7 +218,6 @@ struct wcsession {
        char ImportantMessage[SIZ];
        int outside_frameset_allowed;   /* nonzero if current req is allowed
                                         * outside of the main frameset */
-       char chatlines[CHATLINES][SIZ];
 };
 
 #define extract(dest,source,parmnum)   extract_token(dest,source,parmnum,'|')
@@ -265,6 +262,8 @@ void serv_printf(const char *format,...);
 char *bstr(char *key);
 void urlesc(char *, char *);
 void urlescputs(char *);
+void jsesc(char *, char *);
+void jsescputs(char *);
 void output_headers(int);
 void wprintf(const char *format,...);
 void output_static(char *what);