X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Fconsole.h;h=cf2ab25e9c999bf5d1bc35408d1312d5f7ffcb8a;hb=c2fa8c29642cee0aace8723bc5475bf5d0ec1bca;hp=8bf8ab5978f0f0ba07f0e40d13fc402da5206190;hpb=59eec5f21669e81977b5b1fe9bf717cab49cf7fb;p=chise%2Fxemacs-chise.git-

diff --git a/src/console.h b/src/console.h
index 8bf8ab5..cf2ab25 100644
--- a/src/console.h
+++ b/src/console.h
@@ -25,6 +25,8 @@ Boston, MA 02111-1307, USA.  */
 #ifndef INCLUDED_console_h_
 #define INCLUDED_console_h_
 
+#include "character.h"
+
 /* Devices and consoles are similar entities.  The idea is that
    a console represents a physical keyboard/mouse/other-input-source
    while a device represents a display where frames appear on.
@@ -97,7 +99,8 @@ struct console_methods
   Lisp_Object (*own_selection_method)(Lisp_Object selection_name,
                                       Lisp_Object selection_value,
                                       Lisp_Object how_to_add,
-                                      Lisp_Object selection_type);
+                                      Lisp_Object selection_type,
+			  int owned_p);
   void (*disown_selection_method)(Lisp_Object selection_name,
                                   Lisp_Object timeval);
   Lisp_Object (*get_foreign_selection_method) (Lisp_Object selection_symbol,
@@ -152,7 +155,7 @@ struct console_methods
   int (*left_margin_width_method) (struct window *);
   int (*right_margin_width_method) (struct window *);
   int (*text_width_method) (struct frame *f, struct face_cachel *cachel,
-			    const Emchar *str, Charcount len);
+			    const Charc *str, Charcount len);
   void (*output_display_block_method) (struct window *, struct display_line *,
 				       int, int, int, int, int, int, int);
   int (*divider_height_method) (void);
@@ -179,7 +182,7 @@ struct console_methods
 				face_index findex, int cursor_start, int cursor_width,
 				int cursor_height, int offset_bitmap);
   void (*output_string_method) (struct window *w, struct display_line *dl,
-				Emchar_dynarr *buf, int xpos, int xoffset,
+				Charc_dynarr *buf, int xpos, int xoffset,
 				int start_pixpos, int width, face_index findex,
 				int cursor, int cursor_start, int cursor_width,
 				int cursor_height);
@@ -387,7 +390,7 @@ struct console_methods * type##_console_methods
     add_entry_to_console_type_list (Q##type, type##_console_methods);	\
     type##_console_methods->image_conversion_list = Qnil;		\
     staticpro_nodump (&type##_console_methods->image_conversion_list);	\
-    dumpstruct (&type##_console_methods, &console_methods_description);	\
+    dump_add_root_struct_ptr (&type##_console_methods, &console_methods_description);	\
 } while (0)
 
 #define REINITIALIZE_CONSOLE_TYPE(type) do {	\