2005-01-06 Marco Gerards <metgerards@student.han.nl>

	* Makefile (SRCS): Add `vcons-move-mouse.c' and `vcons-event.c'.
	* cons.h (mouse_movement): New enum.
	(mouse_button): Likewise.
	(mouse_event): New struct.
	(mouse_event_t): New type.
	(cons_vcons_set_mousecursor_pos): New prototype.
	(cons_vcons_set_mousecursor_status): Likewise.
	(cons_vcons_move_mouse): Likewise.
	* file-changed.c (cons_S_file_changed): Generate the
	`CONS_EVT_OUTPUT' event, in case there was output.
	* opts-std-startup.c (OPT_MOUSE_SHOW, OPT_MOUSE_HIDE)
	(OPT_MOUSE_SENS, DEFAULT_MOUSE_SENS, DEFAULT_MOUSE_SENS_STRING):
	New macros.
	(_cons_show_mouse, _cons_hide_mouse, _cons_mouse_sens): New
	variables.
	(startup_options): Add the options `--mouse-show-on',
	`--mouse-hide-on' and `--mouse-sensitivity'.
	(parse_startup_opt): Parse the options that were added to
	`startup_options' using the new local function `parse_events'.
	* priv.h (CONS_EVT_MOUSE_MOVE, CONS_EVT_MOUSE_BUTTON)
	(CONS_EVT_KEYPRESS, CONS_EVT_OUTPUT): New macros.
	(_cons_show_mouse, _cons_hide_mouse, _cons_mouse_sens): New
	declarations.
	(_cons_vcons_input): New prototype.
	(_cons_vcons_console_event): Likewise.
	* vcons-event.c: New file.
	* vcons-move-mouse.c: Likewise.
	* vcons-input.c (_cons_vcons_input): New function.
	(cons_vcons_input): Rewritten to use _cons_vcons_input and report
	the `CONS_EVT_KEYPRESS' event.
	* vcons-refresh.c: Include "priv.h".
	(cons_vcons_refresh): Report the `CONS_EVT_OUTPUT' event.
	* vcons-scrollback.c: Include "priv.h".
	(cons_vcons_scrollback): Report the `CONS_EVT_OUTPUT' event.

1 files changed, 74 insertions, 4 deletions

diff --git a/libcons/opts-std-startup.c b/libcons/opts-std-startup.c
index 29278cc2..3cf81ae7 100644
--- a/libcons/opts-std-startup.c
+++ b/libcons/opts-std-startup.c
@@ -1,5 +1,5 @@
 /* opts-std-startup.c - Standard startup-time command line parser.
-   Copyright (C) 1995,96,97,98,99,2001,02,2003 Free Software Foundation, Inc.
+   Copyright (C) 1995,96,97,98,99,2001,02,2003,2004,2005 Free Software Foundation, Inc.
    Written by Miles Bader <miles@gnu.org> and Marcus Brinkmann.
 
    This file is part of the GNU Hurd.
@@ -25,7 +25,7 @@
 #include "priv.h"
 
 
-/* Option keys for long-only options in diskfs_common_options.  */
+/* Option keys for long-only options in argp_option.  */
 #define OPT_SLACK			600	/* --slack */
 #define OPT_JUMP_DOWN_ON_INPUT		601	/* --jump-down-on-input */
 #define OPT_NO_JUMP_DOWN_ON_INPUT	602	/* --no-jump-down-on-input */
@@ -33,13 +33,20 @@
 #define OPT_NO_JUMP_DOWN_ON_OUTPUT	604	/* --no-jump-down-on-output */
 #define OPT_VISUAL_BELL			605	/* --visual-bell */
 #define OPT_AUDIBLE_BELL		606	/* --audible-bell */
+#define OPT_MOUSE_SHOW			607	/* --mouse-show-on */
+#define OPT_MOUSE_HIDE			608	/* --mouse-hide-on */
+#define OPT_MOUSE_SENS			609	/* --mouse-sensitivity */
 
-/* Common value for diskfs_common_options and diskfs_default_sync_interval. */
+/* The number of records the client is allowed to lag behind the server.  */
 #define DEFAULT_SLACK 100
 #define DEFAULT_SLACK_STRING STRINGIFY(DEFAULT_SLACK)
 #define STRINGIFY(x) STRINGIFY_1(x)
 #define STRINGIFY_1(x) #x
 
+/* The mouse sensitivity.  */
+#define DEFAULT_MOUSE_SENS 3.0
+#define DEFAULT_MOUSE_SENS_STRING STRINGIFY(DEFAULT_MOUSE_SENS)
+
 /* Number of records the client is allowed to lag behind the
    server.  */
 int _cons_slack = DEFAULT_SLACK;
@@ -59,6 +66,15 @@ bell_type_t _cons_visual_bell = BELL_VISUAL;
 /* The type of bell used for the audible bell.  */
 bell_type_t _cons_audible_bell = BELL_AUDIBLE;
 
+/* The type of events that will make the mouse cursor visible.  */
+int _cons_show_mouse = CONS_EVT_MOUSE_MOVE;
+
+/* The type of events that will hide the mouse cursor.  */
+int _cons_hide_mouse = CONS_EVT_KEYPRESS;
+
+/* The mouse sensitivity.  */
+float _cons_mouse_sens = DEFAULT_MOUSE_SENS;
+
 static const struct argp_option
 startup_options[] =
 {
@@ -76,6 +92,15 @@ startup_options[] =
     "off, visual, audible" },
   { "audible-bell", OPT_AUDIBLE_BELL, "BELL", 0, "Audible bell: on (default), "
     "off, visual, audible" },
+  { "mouse-show-on", OPT_MOUSE_SHOW, "EVENTS", 0, "One or more of the events" 
+    " mousemove, mousebutton, keypress, output (default is mousemove), if one"
+    " of these events occur the mouse cursor will be made visible" },
+  { "mouse-hide-on", OPT_MOUSE_HIDE, "EVENTS", 0, "One or more of the events" 
+    " mousemove, mousebutton, keypress, output (default is keypress), if one"
+    " of these events occur the mouse cursor will be hidden " },
+  { "mouse-sensitivity", OPT_MOUSE_SENS, "SENSITIVITY", 0, "The mouse"
+    " sensitivity (default " DEFAULT_MOUSE_SENS_STRING ").  A lower value"
+    " means more sensitive" },
   { 0, 0 }
 };
 
@@ -86,6 +111,30 @@ static const char doc[] = "A console client.";
 static error_t
 parse_startup_opt (int opt, char *arg, struct argp_state *state)
 {
+  int parse_events (char *events)
+    {
+      char *evtstr = strdupa (events);
+      char *tok = strtok (evtstr, ",");
+      int evmask = 0;
+
+      while (tok)
+	{
+	  if (!strcasecmp ("mousemove", tok))
+	    evmask |= CONS_EVT_MOUSE_MOVE;
+	  else if (!strcasecmp ("mousebutton", tok))
+	    evmask |= CONS_EVT_MOUSE_BUTTON;
+	  else if (!strcasecmp ("keypress", tok))
+	    evmask |= CONS_EVT_KEYPRESS;
+	  else if (!strcasecmp ("output", tok))
+	    evmask |= CONS_EVT_OUTPUT;
+	  else
+	    argp_error (state, "The event can be one of: MOUSEMOVE,"
+			" MOUSEBUTTON, KEYPRESS or OUTPUT");
+	  tok = strtok (NULL, ",");
+	}
+      return evmask;
+    }
+
   switch (opt)
     {
     case OPT_SLACK:
@@ -131,7 +180,28 @@ parse_startup_opt (int opt, char *arg, struct argp_state *state)
 	argp_error (state, "The visual bell can be one of: on, off, visual, "
 		    "audible");
       break;
-      
+
+    case OPT_MOUSE_SHOW:
+      _cons_show_mouse = parse_events (arg);
+      break;
+
+    case OPT_MOUSE_HIDE:
+      _cons_hide_mouse = parse_events (arg);
+      break;
+
+    case OPT_MOUSE_SENS:
+      {
+	char *tail;
+	
+	errno = 0;
+	_cons_mouse_sens = strtod (arg, &tail);
+	if (tail == NULL || tail == arg || *tail != '\0')
+	  argp_error (state, "SENSITIVITY is not a number: %s", arg);
+	if (errno)
+	  argp_error (state, "Overflow in argument SENSITIVITY %s", arg);
+	break;
+      }
+
     case ARGP_KEY_ARG:
       if (state->arg_num > 0)
 	/* Too many arguments.  */