From dad3090d3201bd8272cb762beea8ef3aa8ce9673 Mon Sep 17 00:00:00 2001 From: nicm Date: Thu, 12 Jan 2017 10:15:55 +0000 Subject: Put all palette functions together in the file. --- window.c | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) (limited to 'window.c') diff --git a/window.c b/window.c index 454b5a45..3bf05bd6 100644 --- a/window.c +++ b/window.c @@ -1133,6 +1133,26 @@ window_pane_reset_palette(struct window_pane *wp) wp->flags |= PANE_REDRAW; } +int +window_pane_get_palette(const struct window_pane *wp, int c) +{ + int new; + + if (wp == NULL || wp->palette == NULL) + return (-1); + + new = -1; + if (c < 8) + new = wp->palette[c]; + else if (c >= 90 && c <= 97) + new = wp->palette[8 + c - 90]; + else if (c & COLOUR_FLAG_256) + new = wp->palette[c & ~COLOUR_FLAG_256]; + if (new == 0) + return (-1); + return (new); +} + static void window_pane_mode_timer(__unused int fd, __unused short events, void *arg) { @@ -1517,23 +1537,3 @@ winlink_shuffle_up(struct session *s, struct winlink *wl) return (idx); } - -int -window_pane_get_palette(const struct window_pane *wp, int c) -{ - int new; - - if (wp == NULL || wp->palette == NULL) - return (-1); - - new = -1; - if (c < 8) - new = wp->palette[c]; - else if (c >= 90 && c <= 97) - new = wp->palette[8 + c - 90]; - else if (c & COLOUR_FLAG_256) - new = wp->palette[c & ~COLOUR_FLAG_256]; - if (new == 0) - return (-1); - return (new); -} -- cgit