From 72c26fc09af79ce217575a9b0f0d5058c336d5d7 Mon Sep 17 00:00:00 2001 From: Randy Palamar Date: Wed, 8 Jan 2025 20:13:53 -0700 Subject: ui: pass window id when setting style There are a couple times when we want to set a style without an active window. In those cases we just want to use base UI_STYLE_*s and (Win *) is not needed. This fixes a crash when trying to do a vis:info() from lua during an initial file open event. Note that this code is due for a serious refactor, ui styles should be stored in Ui and window specific styles should be stored in Win. Then we won't need any of this difficult to follow indexing into the styles array based on window id and we will never have to realloc when a new window opens. Just another thing to add to my list. --- view.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'view.c') diff --git a/view.c b/view.c index 7b1d231..49f7fc6 100644 --- a/view.c +++ b/view.c @@ -205,7 +205,7 @@ static void view_clear(View *view) { /* FIXME: awful garbage that only exists because every * struct in this program is an interdependent hellscape */ Win *win = (Win *)((char *)view - offsetof(Win, view)); - ui_window_style_set(win, &cell_blank, UI_STYLE_DEFAULT); + ui_window_style_set(&win->vis->ui, win->id, &cell_blank, UI_STYLE_DEFAULT); } static int view_max_text_width(const View *view) { @@ -1365,7 +1365,7 @@ void win_style(Win *win, enum UiStyle style, size_t start, size_t end) { do { while (pos <= end && col < width) { pos += line->cells[col].len; - ui_window_style_set(win, &line->cells[col++], style); + ui_window_style_set(&win->vis->ui, win->id, &line->cells[col++], style); } col = 0; } while (pos <= end && (line = line->next)); -- cgit v1.2.3