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

	* Makefile (DIST_FILES): New target.
	(MIGSTUBS): Likewise.
	(OBJS): Add $(MIGSTUBS).
	* ourfs_notify.defs: New file.
	* console.c: Diddle order of typedefs.
	(netfs_attempt_read): Clip AMT to bytes left to read before
	calling display_read.
	(netfs_S_file_notice_changes): New function.
	* console.h: Include <stdint.h>, not <sys/types.h>.
	Change all types from u_int32_t to uint32_t.
	* display.c: Include <stddef.h> and "outfs_notify_U.h".  Change
	all u_int_32 types to uint32_t.
	(struct modreq): New structure.
	(struct display): New member filemod_reqs.
	(free_modreqs): New function.
	(display_notice_changes): Likewise.
	(display_notice_filechange): Likewise.
	(display_destroy): Free filemod_reqs member of DISPLAY.
	(MATRIX_POS): Macro removed.
	(screen_fill): Rewritten.
	(screen_shift_left): New function.
	(screen_shift_right): Likewise.
	(screen_scroll_up): Function removed.
	(screen_scroll_down): Likewise.
	(screen_scroll_left): Likewise.
	(screen_scroll_right): Likewise.
	(handle_esc_bracket): Use new screen_* functions.
	(display_output_one): Store old cursor and screen attributes, and
	if they have been changed, send file change notifications.
	* display.h: New prototype for display_notice_changes.

1 files changed, 14 insertions, 12 deletions

diff --git a/console/console.h b/console/console.h
index 27996955..08f35955 100644
--- a/console/console.h
+++ b/console/console.h
@@ -19,41 +19,43 @@
 #ifndef _HURD_CONSOLE_H
 #define _HURD_CONSOLE_H
 
-#include <sys/types.h>
+#include <stdint.h>
 
 struct cons_display
 {
 #define CONS_MAGIC 0x48555244	/* Hex for "HURD".  */
-  u_int32_t magic;		/* CONS_MAGIC, use to detect
+  uint32_t magic;		/* CONS_MAGIC, use to detect
 				   endianess.  */
 #define CONS_VERSION_MAJ 0x0
 #define CONS_VERSION_MAJ_SHIFT 16
 #define CONS_VERSION_AGE 0x0
-  u_int32_t version;		/* Version of interface.  Lower 16
+  uint32_t version;		/* Version of interface.  Lower 16
 				   bits define the age, upper 16 bits
 				   the major version.  */
   struct
   {
-    u_int32_t width;	/* Width of screen matrix.  */
-    u_int32_t lines;	/* Length of whole matrix.  */
-    u_int32_t cur_line;	/* Beginning of visible area.  */
-    u_int32_t scr_lines;/* Number of lines in scrollback buffer
+    uint32_t width;	/* Width of screen matrix.  */
+    uint32_t lines;	/* Length of whole matrix.  */
+    uint32_t cur_line;	/* Beginning of visible area.  This is only
+			   ever increased by the server, so clients
+			   can optimize scrolling.  */
+    uint32_t scr_lines;/* Number of lines in scrollback buffer
 			   preceeding CUR_LINE.  */
-    u_int32_t height;	/* Number of lines in visible area following
+    uint32_t height;	/* Number of lines in visible area following
 			   (and including) CUR_LINE.  */
-    u_int32_t matrix;	/* Index (in wchar_t) of the beginning of
+    uint32_t matrix;	/* Index (in wchar_t) of the beginning of
 			   screen matrix in this structure.  */
   } screen;
 
   struct
   {
-    u_int32_t col;	/* Current column (x-position) of cursor.  */
-    u_int32_t row;	/* Current row (y-position) of cursor.  */
+    uint32_t col;	/* Current column (x-position) of cursor.  */
+    uint32_t row;	/* Current row (y-position) of cursor.  */
 
 #define CONS_CURSOR_INVISIBLE 0
 #define CONS_CURSOR_NORMAL 1
 #define CONS_CURSOR_VERY_VISIBLE 2
-    u_int32_t status;	/* Visibility status of cursor.  */
+    uint32_t status;	/* Visibility status of cursor.  */
   } cursor;
 
   /* Don't use this, use ((wchar_t *) cons_display +