2002-06-25 Marcus Brinkmann <marcus@gnu.org>

	* Makefile (LCLHDRS): Add priv.h and mutations.h.
	(MIGSTUBS): Add tioctlServer.o
	* console.c: Include <hurd/ioctl-types.h>.
	(new_node): Bump up st_size for display node.
	(S_tioctl_tiocflush, S_tioctl_tiocgwinsz, S_tioctl_tiocstart,
	S_tioctl_tiocstop, S_tioctl_tiocoutq, S_tioctl_tiocspgrp,
	S_tioctl_tiocgpgrp): New functions.
	(S_tioctl_tiocmodg, S_tioctl_tiocmods, S_tioctl_tiocexcl,
	S_tioctl_tiocnxcl, S_tioctl_tiocgeta, S_tioctl_tiocseta,
	S_tioctl_tiocsetaw, S_tioctl_tiocsetaf, S_tioctl_tiocgetd,
	S_tioctl_tiocsetd, S_tioctl_tiocdrain, S_tioctl_tiocmget,
	S_tioctl_tiocmset, S_tioctl_tiocsig, S_tioctl_tiocext,
	S_tioctl_tiocswinsz, S_tioctl_tiocremote, S_tioctl_tiocmbic,
	S_tioctl_tiocmbis, S_tioctl_tiocpkt, S_tioctl_tiocsti,
	S_tioctl_tioccdtr, S_tioctl_tiocsdtr, S_tioctl_tioccbrk,
	S_tioctl_tiocsbrk): New stubs.
	(console_demuxer): New function.
	(main): Don't call netfs_server_loop, but call
	ports_manage_port_operations_multithread, so we can use our own
	demuxer.
	* mutations.h: Use intran and outtran for netfs.
	* priv.h: Likewise.

	* console.h (cons_change_t): Add bits for bell_audible and
	bell_visible.
	(struct cons_display): Add member BELL.
	* display.c (struct changes): Add new members bell_audible and
	bell_visible.  Add bit flag macro names for those.
	(display_flush_filechange): Start with first index in buffer.
	Signal bell events.
	(display_record_filechange): Set DISPLAY_CHANGE_MATRIX bit in the
	disjoint case after flushing the update.
	(display_output_one): Recognize '\a' as audible bell and '\Eg' as
	visible bell.
	(display_output_some): Handle bell updates.

1 files changed, 335 insertions, 6 deletions

diff --git a/console/console.c b/console/console.c
index 43f18e6e..d75cf9c7 100644
--- a/console/console.c
+++ b/console/console.c
@@ -36,6 +36,7 @@
 #include <version.h>
 
 #include <hurd/netfs.h>
+#include <hurd/ioctl_types.h>
 
 #include "display.h"
 #include "input.h"
@@ -314,7 +315,7 @@ new_node (struct node **np, vcons_t vcons, vcons_node_type type)
       (*np)->nn_stat.st_mode |= S_IFREG;
       (*np)->nn_stat.st_mode &= ~(S_IXUSR | S_IXGRP | S_IXOTH);
       (*np)->nn_stat.st_size = 80*50 * (sizeof (wchar_t) + 4)
-	+ 14 * 4 + 512 * 8; /* XXX */
+	+ 16 * 4 + 512 * 8; /* XXX */
       break;
     case VCONS_NODE_INPUT:
       (*np)->nn_stat.st_ino = (vcons->id << 2) + 3;
@@ -1336,6 +1337,326 @@ netfs_append_args (char **argz, size_t *argz_len)
 }
 
 
+kern_return_t
+S_tioctl_tiocflush (struct protid *cred, int queue_selector)
+{
+  struct node *np;
+  vcons_t vcons;
+
+  if (!cred)
+    return EOPNOTSUPP;
+  if (!(cred->po->openstat & (O_READ | O_WRITE)))
+    return EBADF;
+
+  np = cred->po->np;
+  vcons = np->nn->vcons;
+  if (!vcons || np != vcons->cons_node)
+    return EOPNOTSUPP;
+
+  if (!queue_selector)
+    queue_selector = O_READ | O_WRITE;
+
+  if (queue_selector & O_READ)
+    input_flush (vcons->input);
+  if (queue_selector & O_WRITE)
+    display_discard_output (vcons->display);
+
+  return 0;
+}
+
+kern_return_t
+S_tioctl_tiocgwinsz (struct protid *cred, struct winsize *size)
+{
+  struct node *np;
+  vcons_t vcons;
+
+  if (!cred)
+    return EOPNOTSUPP;
+
+  np = cred->po->np;
+  vcons = np->nn->vcons;
+  if (!vcons || np != vcons->cons_node)
+    return EOPNOTSUPP;
+
+  display_getsize (vcons->display, size);
+  return 0;
+}
+
+kern_return_t
+S_tioctl_tiocstart (struct protid *cred)
+{
+  struct node *np;
+  vcons_t vcons;
+
+  if (!cred)
+    return EOPNOTSUPP;
+  if (!(cred->po->openstat & (O_READ | O_WRITE)))
+    return EBADF;
+
+  np = cred->po->np;
+  vcons = np->nn->vcons;
+  if (!vcons || np != vcons->cons_node)
+    return EOPNOTSUPP;
+
+  display_start_output (vcons->display);
+  return 0;
+}
+
+kern_return_t
+S_tioctl_tiocstop (struct protid *cred)
+{
+  struct node *np;
+  vcons_t vcons;
+
+  if (!cred)
+    return EOPNOTSUPP;
+  if (!(cred->po->openstat & (O_READ | O_WRITE)))
+    return EBADF;
+
+  np = cred->po->np;
+  vcons = np->nn->vcons;
+  if (!vcons || np != vcons->cons_node)
+    return EOPNOTSUPP;
+
+  display_stop_output (vcons->display);
+  return 0;
+}
+
+
+kern_return_t
+S_tioctl_tiocoutq (struct protid *cred, int *queue_size)
+{
+  struct node *np;
+  vcons_t vcons;
+
+  if (!cred)
+    return EOPNOTSUPP;
+  if (!(cred->po->openstat & (O_READ | O_WRITE)))
+    return EBADF;
+
+  np = cred->po->np;
+  vcons = np->nn->vcons;
+  if (!vcons || np != vcons->cons_node)
+    return EOPNOTSUPP;
+
+  *queue_size = display_pending_output (vcons->display);
+  return 0;
+}
+
+kern_return_t
+S_tioctl_tiocspgrp (struct protid *cred, int pgrp)
+{
+  struct node *np;
+  vcons_t vcons;
+
+  if (!cred)
+    return EOPNOTSUPP;
+  if (!(cred->po->openstat & (O_READ | O_WRITE)))
+    return EBADF;
+
+  np = cred->po->np;
+  vcons = np->nn->vcons;
+  if (!vcons || np != vcons->cons_node)
+    return EOPNOTSUPP;
+
+  display_set_owner (vcons->display, -pgrp);
+  return 0;
+}
+
+kern_return_t
+S_tioctl_tiocgpgrp (struct protid *cred, int *pgrp)
+{
+  error_t err;
+  struct node *np;
+  vcons_t vcons;
+
+  if (!cred)
+    return EOPNOTSUPP;
+  if (!(cred->po->openstat & (O_READ | O_WRITE)))
+    return EBADF;
+
+  np = cred->po->np;
+  vcons = np->nn->vcons;
+  if (!vcons || np != vcons->cons_node)
+    return EOPNOTSUPP;
+
+  err = display_get_owner (vcons->display, pgrp);
+  if (!err)
+    *pgrp = -*pgrp;
+
+  return err;
+}
+
+kern_return_t
+S_tioctl_tiocmodg (io_t port, int *state)
+{
+  return EOPNOTSUPP;
+}
+
+kern_return_t
+S_tioctl_tiocmods (io_t port, int state)
+{
+  return EOPNOTSUPP;
+}
+
+kern_return_t
+S_tioctl_tiocexcl (io_t port)
+{
+  return EOPNOTSUPP;
+}
+
+kern_return_t
+S_tioctl_tiocnxcl (io_t port)
+{
+  return EOPNOTSUPP;
+}
+
+kern_return_t
+S_tioctl_tiocgeta (io_t port, tcflag_t *modes, cc_t *ccs, speed_t *speeds)
+{
+  return EOPNOTSUPP;
+}
+
+kern_return_t
+S_tioctl_tiocseta (io_t port, tcflag_t *modes, cc_t *ccs, speed_t *speeds)
+{
+  return EOPNOTSUPP;
+}
+
+kern_return_t
+S_tioctl_tiocsetaw (io_t port, tcflag_t *modes, cc_t *ccs, speed_t *speeds)
+{
+  return EOPNOTSUPP;
+}
+
+kern_return_t
+S_tioctl_tiocsetaf (io_t port, tcflag_t *modes, cc_t *ccs,
+				  speed_t *speeds)
+{
+  return EOPNOTSUPP;
+}
+
+kern_return_t
+S_tioctl_tiocgetd (io_t port, int *disc)
+{
+  return EOPNOTSUPP;
+}
+
+kern_return_t
+S_tioctl_tiocsetd (io_t port, int disc)
+{
+  return EOPNOTSUPP;
+}
+
+kern_return_t
+S_tioctl_tiocdrain (io_t port)
+{
+  return EOPNOTSUPP;
+}
+
+kern_return_t
+S_tioctl_tiocmget (io_t port, int *bits)
+{
+  return EOPNOTSUPP;
+}
+
+kern_return_t
+S_tioctl_tiocmset (io_t port, int bits)
+{
+  return EOPNOTSUPP;
+}
+
+kern_return_t
+S_tioctl_tiocsig (io_t port, int sig)
+{
+  return EOPNOTSUPP;
+}
+
+kern_return_t
+S_tioctl_tiocext (io_t port, int mode)
+{
+  return EOPNOTSUPP;
+}
+
+kern_return_t
+S_tioctl_tiocucntl (io_t port, int mode)
+
+{
+  return EOPNOTSUPP;
+}
+
+kern_return_t
+S_tioctl_tiocswinsz (struct protid *cred, struct winsize size)
+{
+  return EOPNOTSUPP;
+}
+
+kern_return_t
+S_tioctl_tiocremote (struct protid *cred, int how)
+{
+  return EOPNOTSUPP;
+}
+
+kern_return_t
+S_tioctl_tiocmbic (struct protid *cred, int bits)
+{
+  return EOPNOTSUPP;
+}
+
+kern_return_t
+S_tioctl_tiocmbis (struct protid *cred, int bits)
+{
+  return EOPNOTSUPP;
+}
+
+kern_return_t
+S_tioctl_tiocpkt (struct protid *cred, int mode)
+{
+  return EOPNOTSUPP;
+}
+
+kern_return_t
+S_tioctl_tiocsti (struct protid *cred, char c)
+{
+  return EOPNOTSUPP;
+}
+
+kern_return_t
+S_tioctl_tioccdtr (struct protid *cred)
+{
+  return EOPNOTSUPP;
+}
+
+kern_return_t
+S_tioctl_tiocsdtr (struct protid *cred)
+{
+  return EOPNOTSUPP;
+}
+
+kern_return_t
+S_tioctl_tioccbrk (struct protid *cred)
+{
+  return EOPNOTSUPP;
+}
+
+kern_return_t
+S_tioctl_tiocsbrk (struct protid *cred)
+{
+  return EOPNOTSUPP;
+}
+
+
+int
+console_demuxer (mach_msg_header_t *inp,
+		 mach_msg_header_t *outp)
+{
+  extern int netfs_demuxer (mach_msg_header_t *inp, mach_msg_header_t *outp);
+  extern int tioctl_server (mach_msg_header_t *inp, mach_msg_header_t *outp);
+
+  return (netfs_demuxer (inp, outp)
+	  || tioctl_server (inp, outp));
+}
+  
 int
 main (int argc, char **argv)
 {
@@ -1414,9 +1735,17 @@ main (int argc, char **argv)
       
   fshelp_touch (&netfs_root_node->nn_stat, TOUCH_ATIME|TOUCH_MTIME|TOUCH_CTIME,
 		console_maptime);
-
-  netfs_server_loop ();
-                                
-  /*NOTREACHED*/
-  return 0;
+  
+  do 
+    {
+      ports_manage_port_operations_multithread (netfs_port_bucket,
+						console_demuxer,
+						1000 * 60 * 2,
+						1000 * 60 * 10,
+						0);
+      err = netfs_shutdown (0);
+    }
+  while (err);
+  
+  exit (err);
 }