Merged in changes from CVS trunk.

[bpt/emacs.git] / src / termhooks.h

diff --git a/src/termhooks.h b/src/termhooks.h
index 8a0c374..ba677e9 100644 (file)
--- a/src/termhooks.h
+++ b/src/termhooks.h
@@ -329,26 +329,27 @@ struct display
   
   /* Text display hooks.  */
 
-  void (*cursor_to_hook) P_ ((int vpos, int hpos));
-  void (*raw_cursor_to_hook) P_ ((int, int));
+  void (*cursor_to_hook) P_ ((struct frame *f, int vpos, int hpos));
+  void (*raw_cursor_to_hook) P_ ((struct frame *, int, int));
   
-  void (*clear_to_end_hook) P_ ((void));
-  void (*clear_frame_hook) P_ ((void));
-  void (*clear_end_of_line_hook) P_ ((int));
+  void (*clear_to_end_hook) P_ ((struct frame *));
+  void (*clear_frame_hook) P_ ((struct frame *));
+  void (*clear_end_of_line_hook) P_ ((struct frame *, int));
   
-  void (*ins_del_lines_hook) P_ ((int, int));
+  void (*ins_del_lines_hook) P_ ((struct frame *f, int, int));
   
-  void (*insert_glyphs_hook) P_ ((struct glyph *s, int n));
-  void (*write_glyphs_hook) P_ ((struct glyph *s, int n));
-  void (*delete_glyphs_hook) P_ ((int));
+  void (*insert_glyphs_hook) P_ ((struct frame *f, struct glyph *s, int n));
+  void (*write_glyphs_hook) P_ ((struct frame *f, struct glyph *s, int n));
+  void (*delete_glyphs_hook) P_ ((struct frame *, int));
   
-  void (*ring_bell_hook) P_ ((void));
+  void (*ring_bell_hook) P_ ((struct frame *f));
   
   void (*reset_terminal_modes_hook) P_ ((struct display *));
   void (*set_terminal_modes_hook) P_ ((struct display *));
+
   void (*update_begin_hook) P_ ((struct frame *));
   void (*update_end_hook) P_ ((struct frame *));
-  void (*set_terminal_window_hook) P_ ((int));
+  void (*set_terminal_window_hook) P_ ((struct frame *, int));
 
   /* Multi-frame and mouse support hooks.  */
 
@@ -489,10 +490,11 @@ struct display
      there is available input on at least one of the currently opened
      display devices -- but not necessarily on this device.
      Therefore, in most cases EXPECTED should be simply ignored.
-  */
+
+     XXX This documentation needs to be updated.  */
   int (*read_socket_hook) P_ ((struct display *display,
-                               struct input_event *buf,
-                               int size, int expected));
+                               int expected,
+                               struct input_event *hold_quit));
 
   /* Called when a frame's display becomes entirely up to date.  */
   void (*frame_up_to_date_hook) P_ ((struct frame *));
@@ -505,7 +507,7 @@ struct display
   /* Called after the last frame on this display is deleted, or when
      the display device was closed (hangup).
      
-     If this is NULL, then the generic delete_frame() is called
+     If this is NULL, then the generic delete_display() is called
      instead.
 
      The hook must check for and close any live frames that are still
@@ -513,7 +515,6 @@ struct display
      frames on the display when it calls this hook, so infinite
      recursion is prevented.  */
   void (*delete_display_hook) P_ ((struct display *));
-
 };
 
 
@@ -548,7 +549,6 @@ extern struct display *display_list;
 #define FRAME_WINDOW_P(f) (0)
 #endif
 
-
 extern struct display *create_display P_ ((void));
 extern void delete_display P_ ((struct display *));