From b982bd9abfa37a8de05e337f7ad81f14be593942 Mon Sep 17 00:00:00 2001 From: Witold Filipczyk Date: Mon, 31 Jan 2022 16:18:43 +0100 Subject: [PATCH] [draw] const char * in draw_text --- src/bfu/checkbox.c | 2 +- src/terminal/draw.c | 7 ++++--- src/terminal/draw.h | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/bfu/checkbox.c b/src/bfu/checkbox.c index faa8f54bf..78438daff 100644 --- a/src/bfu/checkbox.c +++ b/src/bfu/checkbox.c @@ -63,7 +63,7 @@ display_checkbox(struct dialog_data *dlg_data, struct widget_data *widget_data) { struct terminal *term = dlg_data->win->term; struct color_pair *color; - char *text; + const char *text; struct el_box *pos = &widget_data->box; int selected = is_selected_widget(dlg_data, widget_data); diff --git a/src/terminal/draw.c b/src/terminal/draw.c index 84c770f7a..406d650cf 100644 --- a/src/terminal/draw.c +++ b/src/terminal/draw.c @@ -422,10 +422,11 @@ draw_shadow(struct terminal *term, struct el_box *box, #ifdef CONFIG_UTF8 static void draw_text_utf8(struct terminal *term, int x, int y, - char *text, int length, + const char *text2, int length, int attr, struct color_pair *color) { struct screen_char *start, *pos; + char *text = (char *)text2; char *end = text + length; unicode_val_T data; @@ -495,7 +496,7 @@ draw_text_utf8(struct terminal *term, int x, int y, void draw_text(struct terminal *term, int x, int y, - char *text, int length, + const char *text, int length, int attr, struct color_pair *color) { int end_pos; @@ -561,7 +562,7 @@ draw_text(struct terminal *term, int x, int y, void draw_dlg_text(struct dialog_data *dlg_data, int x, int y, - char *text, int length, + const char *text, int length, int attr, struct color_pair *color) { struct terminal *term = dlg_data->win->term; diff --git a/src/terminal/draw.h b/src/terminal/draw.h index b8d048850..abb3d06b8 100644 --- a/src/terminal/draw.h +++ b/src/terminal/draw.h @@ -290,13 +290,13 @@ void fix_dwchar_around_box(struct terminal *term, struct el_box *box, int border /** Draws @a length chars from @a text. */ void draw_text(struct terminal *term, int x, int y, - char *text, int length, + const char *text, int length, int attr, struct color_pair *color); /** Draws text for dialogs. */ void draw_dlg_text(struct dialog_data *dlg_data, int x, int y, - char *text, int length, + const char *text, int length, int attr, struct color_pair *color);