improve dirty flag handling when pane is hidden - sfeed_curses - sfeed curses UI (now part of sfeed, development is in sfeed)
(HTM) git clone git://git.codemadness.org/sfeed_curses
(DIR) Log
(DIR) Files
(DIR) Refs
(DIR) README
(DIR) LICENSE
---
(DIR) commit a16ef52f5f57272607cec7dbaa409f1debc1d929
(DIR) parent 3b35fd201979327c13edffcb7f472cadd635bbb5
(HTM) Author: Hiltjo Posthuma <hiltjo@codemadness.org>
Date: Wed, 10 Feb 2021 17:35:53 +0100
improve dirty flag handling when pane is hidden
This always resets the dirty flag even when the pane is currently hidden.
Do not draw when either the width or height is zero anyway. Document the height
should be > 0, otherwise there could be a divide (or modulo) by zero in certain
functions (like drawing, scrolling).
No functional change intended in the current program logic, but this makes
logically more sense.
Diffstat:
M sfeed_curses.c | 23 ++++++++++++++---------
1 file changed, 14 insertions(+), 9 deletions(-)
---
(DIR) diff --git a/sfeed_curses.c b/sfeed_curses.c
@@ -76,7 +76,7 @@ struct pane {
int x; /* absolute x position on the screen */
int y; /* absolute y position on the screen */
int width; /* absolute width of the pane */
- int height; /* absolute height of the pane */
+ int height; /* absolute height of the pane, should be > 0 */
off_t pos; /* focused row position */
struct row *rows;
size_t nrows; /* total amount of rows */
@@ -94,7 +94,7 @@ struct scrollbar {
int ticksize;
int x; /* absolute x position on the screen */
int y; /* absolute y position on the screen */
- int size; /* absolute size of the bar */
+ int size; /* absolute size of the bar, should be > 0 */
int focused; /* has focus or not */
int hidden; /* is visible or not */
int dirty; /* needs draw update */
@@ -798,15 +798,16 @@ pane_draw(struct pane *p)
{
off_t pos, y;
- if (p->hidden || !p->dirty)
+ if (!p->dirty)
+ return;
+ p->dirty = 0;
+ if (p->hidden || !p->width || !p->height)
return;
/* draw visible rows */
pos = p->pos - (p->pos % p->height);
for (y = 0; y < p->height; y++)
pane_row_draw(p, y + pos, (y + pos) == p->pos);
-
- p->dirty = 0;
}
/* Cycle visible pane in a direction, but don't cycle back. */
@@ -934,7 +935,10 @@ scrollbar_draw(struct scrollbar *s)
{
off_t y;
- if (s->hidden || !s->dirty)
+ if (!s->dirty)
+ return;
+ s->dirty = 0;
+ if (s->hidden || !s->size)
return;
cursorsave();
@@ -963,7 +967,6 @@ scrollbar_draw(struct scrollbar *s)
attrmode(ATTR_RESET);
cursorrestore();
- s->dirty = 0;
}
int
@@ -1072,7 +1075,10 @@ uiprompt(int x, int y, char *fmt, ...)
void
statusbar_draw(struct statusbar *s)
{
- if (s->hidden || !s->dirty)
+ if (!s->dirty)
+ return;
+ s->dirty = 0;
+ if (s->hidden || !s->width)
return;
cursorsave();
@@ -1083,7 +1089,6 @@ statusbar_draw(struct statusbar *s)
printpad(s->text, s->width - (!eat_newline_glitch));
attrmode(ATTR_RESET);
cursorrestore();
- s->dirty = 0;
}
void