commit - 986af34785148736957c8c605dddd2cdfbd54bb2
commit + ab47e7d4a5043a2fa884787041f3f6368675ccec
blob - 481620d82ad8a2bacd8bfd62d12eb88d4b09d369
blob + 00d8392994719e2f9cd1f1c79370cd8bd3cde9e8
--- ui.c
+++ ui.c
if (text == NULL)
text = "";
- wattron(window, body_face.left);
+ wattr_on(window, body_face.left, NULL);
for (i = 0; i < off; i++)
waddch(window, ' ');
- wattroff(window, body_face.left);
-
- wattron(window, prefix_face);
+ wattr_off(window, body_face.left, NULL);
+
+ wattr_on(window, prefix_face, NULL);
wprintw(window, "%s", prfx);
- wattroff(window, prefix_face);
+ wattr_off(window, prefix_face, NULL);
- wattron(window, text_face);
+ wattr_on(window, text_face, NULL);
wprintw(window, "%s", text);
- wattroff(window, text_face);
+ wattr_off(window, text_face, NULL);
getyx(window, y, x);
left = width - x;
- wattron(window, trail_face);
+ wattr_on(window, trail_face, NULL);
for (i = 0; i < left - off - 1; ++i)
waddch(window, ' ');
- wattroff(window, trail_face);
+ wattr_off(window, trail_face, NULL);
- wattron(window, body_face.right);
+ wattr_on(window, body_face.right, NULL);
for (i = 0; i < off; i++)
waddch(window, ' ');
- wattroff(window, body_face.right);
+ wattr_off(window, body_face.right, NULL);
}
}
werase(tabline);
- wattron(tabline, tab_face.background);
+ wattr_on(tabline, tab_face.background, NULL);
wprintw(tabline, toskip == 0 ? " " : "<");
- wattroff(tabline, tab_face.background);
+ wattr_off(tabline, tab_face.background, NULL);
truncated = 0;
TAILQ_FOREACH(tab, &tabshead, tabs) {
}
if (current)
- wattron(tabline, tab_face.current);
+ wattr_on(tabline, tab_face.current, NULL);
else
- wattron(tabline, tab_face.tab);
+ wattr_on(tabline, tab_face.tab, NULL);
wprintw(tabline, "%s", buf);
if (TAILQ_NEXT(tab, tabs) != NULL)
wprintw(tabline, " ");
if (current)
- wattroff(tabline, tab_face.current);
+ wattr_off(tabline, tab_face.current, NULL);
else
- wattroff(tabline, tab_face.tab);
+ wattr_off(tabline, tab_face.tab, NULL);
}
- wattron(tabline, tab_face.background);
+ wattr_on(tabline, tab_face.background, NULL);
for (; x < (size_t)COLS; ++x)
waddch(tabline, ' ');
if (truncated)
mvwprintw(tabline, 0, COLS-1, ">");
- wattroff(tabline, tab_face.background);
+ wattr_off(tabline, tab_face.background, NULL);
}
static void
const char *spin = "-\\|/";
werase(modeline);
- wattron(modeline, modeline_face.background);
+ wattr_on(modeline, modeline_face.background, NULL);
wmove(modeline, 0, 0);
wprintw(modeline, "-%c%c %s ",
for (; x < max_x; ++x)
waddstr(modeline, "-");
- wattroff(modeline, modeline_face.background);
+ wattr_off(modeline, modeline_face.background, NULL);
}
static void
/* unused, but set by getyx */
(void)off_y;
- wattron(minibuf, minibuffer_face.background);
+ wattr_on(minibuf, minibuffer_face.background, NULL);
werase(minibuf);
if (in_minibuffer) {
if (in_minibuffer)
wmove(minibuf, 0, off_x + utf8_swidth_between(start, c));
- wattroff(minibuf, minibuffer_face.background);
+ wattr_off(minibuf, minibuffer_face.background, NULL);
}
static void