From 20331ffd74964cf23a8d76a9aa544647b77a288c Mon Sep 17 00:00:00 2001 From: Pavol Babincak Date: Sun, 9 Apr 2006 16:52:23 +0200 Subject: [PATCH] Use unicode_val_T instead of uint16_t for unicode data. --- src/terminal/draw.c | 4 ++-- src/terminal/draw.h | 8 +++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/terminal/draw.c b/src/terminal/draw.c index c11836f7b..e50d9d291 100644 --- a/src/terminal/draw.c +++ b/src/terminal/draw.c @@ -104,7 +104,7 @@ draw_char_color(struct terminal *term, int x, int y, struct color_pair *color) void #ifdef CONFIG_UTF_8 -draw_char_data(struct terminal *term, int x, int y, uint16_t data) +draw_char_data(struct terminal *term, int x, int y, unicode_val_T data) #else draw_char_data(struct terminal *term, int x, int y, unsigned char data) #endif /* CONFIG_UTF_8 */ @@ -226,7 +226,7 @@ draw_border(struct terminal *term, struct box *box, #ifdef CONFIG_UTF_8 void draw_char(struct terminal *term, int x, int y, - uint16_t data, enum screen_char_attr attr, + unicode_val_T data, enum screen_char_attr attr, struct color_pair *color) #else void diff --git a/src/terminal/draw.h b/src/terminal/draw.h index 4d7307e71..77e34679d 100644 --- a/src/terminal/draw.h +++ b/src/terminal/draw.h @@ -1,6 +1,8 @@ #ifndef EL__TERMINAL_DRAW_H #define EL__TERMINAL_DRAW_H +#include "intl/charsets.h" /* unicode_val_T */ + struct color_pair; struct box; struct terminal; @@ -20,7 +22,7 @@ enum screen_char_attr { struct screen_char { /* Contains either character value or frame data. */ #ifdef CONFIG_UTF_8 - uint16_t data; + unicode_val_T data; #else unsigned char data; #endif /* CONFIG_UTF_8 */ @@ -207,7 +209,7 @@ void draw_char_color(struct terminal *term, int x, int y, /* Sets the data of a screen position. */ #ifdef CONFIG_UTF_8 -void draw_char_data(struct terminal *term, int x, int y, uint16_t data); +void draw_char_data(struct terminal *term, int x, int y, unicode_val_T data); #else void draw_char_data(struct terminal *term, int x, int y, unsigned char data); #endif /* CONFIG_UTF_8 */ @@ -223,7 +225,7 @@ void draw_border_cross(struct terminal *, int x, int y, /* Draws a char. */ #ifdef CONFIG_UTF_8 void draw_char(struct terminal *term, int x, int y, - uint16_t data, enum screen_char_attr attr, + unicode_val_T data, enum screen_char_attr attr, struct color_pair *color); #else void draw_char(struct terminal *term, int x, int y,