X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Fconsole.h;h=cf2ab25e9c999bf5d1bc35408d1312d5f7ffcb8a;hb=a699139716d7a947173ebc9a7130cc0eead5da7f;hp=1f32f8cb9f5edcdc09dd0af89230ee47bfdd84f9;hpb=3198ed8319f99e19a14447745f4f93e4b4522961;p=chise%2Fxemacs-chise.git- diff --git a/src/console.h b/src/console.h index 1f32f8c..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. @@ -153,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); @@ -180,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);