From a4577aded9b2e23b9d0852310ca53dd4f74b81b7 Mon Sep 17 00:00:00 2001
From: james <>
Date: Fri, 15 Feb 2008 03:32:07 +0000
Subject: *** empty log message ***

---
 apps/client.c    | 10 +++++++++-
 apps/clients.c   | 12 ++++++++++++
 apps/sympathyd.c | 23 +++++++++++++++++------
 3 files changed, 38 insertions(+), 7 deletions(-)

(limited to 'apps')

diff --git a/apps/client.c b/apps/client.c
index 541603b..93ade70 100644
--- a/apps/client.c
+++ b/apps/client.c
@@ -10,6 +10,9 @@ static char rcsid[] = "$Id$";
 
 /*
  * $Log$
+ * Revision 1.6  2008/02/15 03:32:07  james
+ * *** empty log message ***
+ *
  * Revision 1.5  2008/02/14 10:34:47  james
  * *** empty log message ***
  *
@@ -56,7 +59,7 @@ server_msg (IPC_Msg * m, Context * c)
       vt102_parse (c, m->term.term, m->term.len);
       break;
     case IPC_MSG_TYPE_STATUS:
-      vt102_status_line (c->v, m->status.status);
+      cmd_new_status (c->d, c, m->status.status);
       break;
     default:
       fprintf (stderr, "Unhandeled message type %d\n", m->hdr.type);
@@ -72,6 +75,7 @@ client (void)
   ANSI a = { 0 };
   Context c;
 
+
   s = socket_connect ("socket");
 
   if (!s)
@@ -85,6 +89,7 @@ client (void)
   c.h = history_new (200);
   c.l = NULL;
   c.k = keydis_ipc_new (s);
+  c.d = cmd_new ();
 
   terminal_register_handlers ();
   a.terminal = terminal_open (0, 1);
@@ -95,6 +100,9 @@ client (void)
     {
       struct timeval tv = { 0, 100000 };
 
+      if (c.d->disconnect)
+        break;
+
       FD_ZERO (&rfds);
       FD_ZERO (&wfds);
 
diff --git a/apps/clients.c b/apps/clients.c
index 40713a9..01d5995 100644
--- a/apps/clients.c
+++ b/apps/clients.c
@@ -10,6 +10,9 @@ static char rcsid[] = "$Id$";
 
 /*
  * $Log$
+ * Revision 1.6  2008/02/15 03:32:07  james
+ * *** empty log message ***
+ *
  * Revision 1.5  2008/02/14 10:34:47  james
  * *** empty log message ***
  *
@@ -44,6 +47,15 @@ client_msg (IPC_Msg * m, Context * c)
     case IPC_MSG_TYPE_KEY:
       vt102_send (c, m->key.key);
       break;
+    case IPC_MSG_TYPE_SETBAUD:
+      tty_set_baud (c->t, m->setbaud.baud);
+      break;
+    case IPC_MSG_TYPE_SENDBREAK:
+      tty_send_break (c->t);
+      break;
+    case IPC_MSG_TYPE_SETFLOW:
+      tty_set_flow (c->t, m->setflow.flow);
+      break;
     default:
       fprintf (stderr, "Unhandeled message type %d\n", m->hdr.type);
     }
diff --git a/apps/sympathyd.c b/apps/sympathyd.c
index 81ea2f0..bdf8132 100644
--- a/apps/sympathyd.c
+++ b/apps/sympathyd.c
@@ -11,6 +11,9 @@ static char rcsid[] =
 
 /*
  * $Log$
+ * Revision 1.12  2008/02/15 03:32:07  james
+ * *** empty log message ***
+ *
  * Revision 1.11  2008/02/14 16:21:17  james
  * *** empty log message ***
  *
@@ -81,7 +84,7 @@ get_status (TTY * t, Clients * cs)
   status.lines = tty_status.lines;
   status.baud = tty_status.baud;
   status.crtscts = (tty_status.termios.c_cflag & CRTSCTS) ? 1 : 0;
-  status.blocked=tty_status.blocked;
+  status.blocked = tty_status.blocked;
 
   cd = (tty_status.lines & TIOCM_CD) ? 1 : 0;
 
@@ -218,6 +221,8 @@ check_status (Context * c, Clients * cs)
 
   log_line_changes (c, old_status.lines, status.lines);
 
+  ptr += sprintf (ptr, "CTRL-B ");
+
   t = c->t->name;
   if (!strncmp (t, "/dev/", 5))
     t += 5;
@@ -231,13 +236,14 @@ check_status (Context * c, Clients * cs)
   ptr = do_line (ptr, status.lines, TIOCM_DTR);
   ptr = do_line (ptr, status.lines, TIOCM_DSR);
   ptr = do_line (ptr, status.lines, TIOCM_RI);
+  ptr = do_line (ptr, status.lines, TIOCM_CD);
 
   if (status.blocked)
-  {
+    {
       t = ", Locked";
       while (*t)
         *(ptr++) = *(t++);
-  }
+    }
 
   if (status.crtscts)
     {
@@ -246,6 +252,7 @@ check_status (Context * c, Clients * cs)
         *(ptr++) = *(t++);
     }
 
+#if 0
   if (status.lines & TIOCM_CD)
     {
       ptr +=
@@ -258,6 +265,7 @@ check_status (Context * c, Clients * cs)
         sprintf (ptr, ", Off %d.%d", status.cd_edge_sec / 60,
                  status.cd_edge_sec % 60);
     }
+#endif
 
   ptr +=
     sprintf (ptr, ", %d client%s", status.nclients,
@@ -277,8 +285,10 @@ main (int argc, char *argv[])
   Clients *clients;
 
 
-	construct_possible_lock_files("/dev/modem");
- 	return 0;
+#if 0
+  construct_possible_lock_files ("/dev/modem");
+  return 0;
+#endif
 
   s = socket_listen ("socket");
 
@@ -286,7 +296,8 @@ main (int argc, char *argv[])
   c.v = vt102_new ();
   c.h = history_new (200);
   c.l = file_log_new ("log");
-  c.k = keydis_vt102_new (&c);
+  c.k = keydis_vt102_new ();
+  c.d = NULL;
 
 
   clients = clients_new ();
-- 
cgit v1.2.3