X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=apps%2Fmainloop.c;h=9737bd29439f545c8a3ebc162708715bf74615a0;hb=ef427cbe3bc216800179b66b889b71fec843387c;hp=7fb269adeda9c124b405e065d9c475153e4715eb;hpb=11313f344099e326aaf010fb9781b921df3b1967;p=sympathy.git

diff --git a/apps/mainloop.c b/apps/mainloop.c
index 7fb269a..9737bd2 100644
--- a/apps/mainloop.c
+++ b/apps/mainloop.c
@@ -6,10 +6,47 @@
  *
  */
 
-static char rcsid[] = "$Id$";
+static char rcsid[] =
+  "$Id$";
 
 /*
  * $Log$
+ * Revision 1.20  2008/02/28 16:57:51  james
+ * *** empty log message ***
+ *
+ * Revision 1.19  2008/02/28 16:37:16  james
+ * *** empty log message ***
+ *
+ * Revision 1.18  2008/02/28 11:27:48  james
+ * *** empty log message ***
+ *
+ * Revision 1.17  2008/02/27 09:42:53  james
+ * *** empty log message ***
+ *
+ * Revision 1.16  2008/02/27 09:42:21  james
+ * *** empty log message ***
+ *
+ * Revision 1.15  2008/02/27 01:31:38  james
+ * *** empty log message ***
+ *
+ * Revision 1.14  2008/02/27 01:31:14  james
+ * *** empty log message ***
+ *
+ * Revision 1.13  2008/02/26 23:56:12  james
+ * *** empty log message ***
+ *
+ * Revision 1.12  2008/02/26 23:23:16  james
+ * *** empty log message ***
+ *
+ * Revision 1.11  2008/02/24 00:43:55  james
+ * *** empty log message ***
+ *
+ * Revision 1.10  2008/02/23 13:05:57  staffcvs
+ * *** empty log message ***
+ *
+ * Revision 1.9  2008/02/23 11:48:51  james
+ * *** empty log message ***
+ *
  * Revision 1.8  2008/02/22 23:39:30  james
  * *** empty log message ***
  *
@@ -78,6 +115,8 @@ static char rcsid[] = "$Id$";
 
 #include "clients.h"
 
+Context *context;
+
 typedef struct
 {
   int nclients;
@@ -300,8 +339,29 @@ check_status (Context * c, Clients * cs)
     sprintf (ptr, ", %d client%s", status.nclients,
              (status.nclients == 1) ? "" : "s");
 
+  if (c->tp->biterrs)
+    {
+
+      ptr +=
+        sprintf (ptr, ", %d err%s", c->tp->biterrs,
+                 (c->tp->biterrs == 1) ? "" : "s");
+
+      if (c->tp->guessed_baud == -1)
+        {
+          ptr += sprintf (ptr, " try higher");
+        }
+      else if (c->tp->guessed_baud > 0)
+        {
+          ptr += sprintf (ptr, " try %db", c->tp->guessed_baud);
+        }
+    }
+
   *ptr = 0;
 
+#if 0
+  log_f (c->l, "%s:%d %s", __FILE__, __LINE__, buf);
+#endif
+
   if (cs)
     send_status (cs, buf);
   else
@@ -311,7 +371,7 @@ check_status (Context * c, Clients * cs)
 
 
 static int
-msg_from_server (ANSI *a,IPC_Msg * m, Context * c)
+msg_from_server (ANSI * a, IPC_Msg * m, Context * c)
 {
   switch (m->hdr.type)
     {
@@ -330,11 +390,11 @@ msg_from_server (ANSI *a,IPC_Msg * m, Context * c)
 
       *(c->v) = m->vt102.vt102;
 
-      if (a->one_shot) {
-		a->one_shot(a,&c->v->crt);
-		return 1;
-	}
-      //FIXME HTML hook
+      if (a->one_shot)
+        {
+          a->one_shot (a, &c->v->crt);
+          return 1;
+        }
       break;
     case IPC_MSG_TYPE_TERM:
       tty_parse (c, m->term.term, m->term.len);
@@ -345,20 +405,24 @@ msg_from_server (ANSI *a,IPC_Msg * m, Context * c)
     default:
       fprintf (stderr, "Unhandeled message type %d\n", m->hdr.type);
     }
-return 0;
+  return 0;
 }
 
 
 void
 mainloop (TTY * tty, Socket * server_socket, Socket * client_socket,
-          ANSI * ansi, Log * log, int nhistory)
+          ANSI * ansi, Log * log, int nhistory, CRT_Pos * size)
 {
   fd_set rfds, wfds;
   Context c = { 0 };
   Clients *clients;
 
+  context = &c;
 
-  c.v = vt102_new ();
+  c.tp = tty_parser_new ();
+  c.u = utf8_new ();
+
+  c.v = vt102_new (size);
   c.h = history_new (nhistory);
   c.l = log;
   /* are we being fed by a tty or a socket */
@@ -388,6 +452,9 @@ mainloop (TTY * tty, Socket * server_socket, Socket * client_socket,
     }
 
 
+  vt102_reset (&c);
+
+
   if (server_socket)
     {
       if (client_socket)
@@ -401,7 +468,7 @@ mainloop (TTY * tty, Socket * server_socket, Socket * client_socket,
 
   for (;;)
     {
-      struct timeval tv = { 1, 0 };
+      struct timeval tv = { 0, 250000 };
 
       if ((c.d) && (c.d->disconnect))
         break;
@@ -476,18 +543,19 @@ mainloop (TTY * tty, Socket * server_socket, Socket * client_socket,
       /*any data from the server */
       if (client_socket)
         {
-	  int one_shot;
+          int one_shot;
           if (socket_post_select (client_socket, &rfds, &wfds))
             break;
 
           while (client_socket->msg)
             {
-              if (msg_from_server (ansi,client_socket->msg, &c))
-		one_shot++;
-		
+              if (msg_from_server (ansi, client_socket->msg, &c))
+                one_shot++;
+
               socket_consume_msg (client_socket);
             }
-		if (one_shot) break;
+          if (one_shot)
+            break;
         }
 
 
@@ -495,10 +563,10 @@ mainloop (TTY * tty, Socket * server_socket, Socket * client_socket,
       if (ansi)
         {
           if (ansi->dispatch)
-		ansi->dispatch (ansi, &c);
+            ansi->dispatch (ansi, &c);
 
-	  if (ansi->update)
-          ansi->update (ansi, &c);
+          if (ansi->update)
+            ansi->update (ansi, &c);
         }
     }