Author: rinrab
Date: Thu Apr 16 19:05:30 2026
New Revision: 1933122
Log:
svnbrowse: Rename 'infobar' to 'header' and 'statusbar' to 'footer' including
all similar symbols.
* subversion/svnbrowse/svnbrowse.c
(COLOR_PAIR_HEADER, COLOR_PAIR_STATUS_BAR): Rename to COLOR_PAIR_HEADER and
COLOR_PAIR_FOOTER.
(svn_browse__view_t->infobar, svn_browse__view_t->statusbar): Rename to
header and footer.
(view_draw_status_bar, view_draw_info_bar): Rename to view_draw_header() and
view_draw_footer().
(everywhere): Adjust references.
Modified:
subversion/trunk/subversion/svnbrowse/svnbrowse.c
Modified: subversion/trunk/subversion/svnbrowse/svnbrowse.c
==============================================================================
--- subversion/trunk/subversion/svnbrowse/svnbrowse.c Thu Apr 16 18:55:36
2026 (r1933121)
+++ subversion/trunk/subversion/svnbrowse/svnbrowse.c Thu Apr 16 19:05:30
2026 (r1933122)
@@ -116,8 +116,8 @@ const apr_getopt_option_t svn_browse__op
#define COLOR_BRANDING 96
enum {
- COLOR_PAIR_INFO_BAR = 1,
- COLOR_PAIR_STATUS_BAR,
+ COLOR_PAIR_HEADER = 1,
+ COLOR_PAIR_FOOTER,
COLOR_PAIR_DIR,
COLOR_PAIR_DIR_SELECTED,
COLOR_PAIR_FILE,
@@ -128,8 +128,8 @@ enum {
typedef struct svn_browse__view_t {
svn_browse__model_t *model;
WINDOW *screen;
- WINDOW *infobar;
- WINDOW *statusbar;
+ WINDOW *header;
+ WINDOW *footer;
WINDOW *list;
} svn_browse__view_t;
@@ -137,7 +137,7 @@ static apr_status_t
view_cleanup(void *ctx)
{
svn_browse__view_t *view = ctx;
- delwin(view->infobar);
+ delwin(view->header);
delwin(view->list);
return APR_SUCCESS;
}
@@ -147,18 +147,18 @@ view_layout(svn_browse__view_t *view)
{
int cols = getmaxx(view->screen);
int rows = getmaxy(view->screen);
- int infobar_height = 1;
- int statusbar_height = 1;
- int list_height = rows - infobar_height - statusbar_height;
+ int header_height = 1;
+ int footer_height = 1;
+ int list_height = rows - header_height - footer_height;
- delwin(view->infobar);
- delwin(view->statusbar);
+ delwin(view->header);
+ delwin(view->footer);
delwin(view->list);
- view->infobar = subwin(view->screen, infobar_height, cols, 0, 0);
- view->list = subwin(view->screen, list_height, cols, infobar_height, 0);
- view->statusbar = subwin(view->screen, statusbar_height, cols,
- infobar_height + list_height, 0);
+ view->header = subwin(view->screen, header_height, cols, 0, 0);
+ view->list = subwin(view->screen, list_height, cols, header_height, 0);
+ view->footer = subwin(view->screen, footer_height, cols,
+ header_height + list_height, 0);
}
static svn_browse__view_t *
@@ -368,8 +368,8 @@ view_draw_item(const svn_browse__item_t
}
static void
-view_draw_info_bar(svn_browse__view_t *view, WINDOW *win,
- apr_pool_t *scratch_pool)
+view_draw_header(svn_browse__view_t *view, WINDOW *win,
+ apr_pool_t *scratch_pool)
{
const char *abspath = svn_path_url_add_component2(
view->model->root, view->model->current->relpath, scratch_pool);
@@ -378,7 +378,7 @@ view_draw_info_bar(svn_browse__view_t *v
const char *suffix = " ";
wmove(win, 0, 0);
- wattrset(win, COLOR_PAIR(COLOR_PAIR_INFO_BAR));
+ wattrset(win, COLOR_PAIR(COLOR_PAIR_HEADER));
waddstr(win, prefix);
waddstr(win, rightpad(apr_psprintf(scratch_pool, "URL: %s", abspath),
getmaxx(win) - strlen(prefix) - strlen(suffix),
@@ -407,14 +407,14 @@ format_percentage_scroll(int scroll, int
}
static void
-view_draw_status_bar(svn_browse__view_t *view, WINDOW *win,
- apr_pool_t *scratch_pool)
+view_draw_footer(svn_browse__view_t *view, WINDOW *win,
+ apr_pool_t *scratch_pool)
{
const char *brand = "Apache Subversion ";
const svn_browse__state_t *state = view->model->current;
wmove(win, 0, 0);
- wattrset(win, COLOR_PAIR(COLOR_PAIR_STATUS_BAR));
+ wattrset(win, COLOR_PAIR(COLOR_PAIR_FOOTER));
waddstr(win, " ");
waddstr(win, rightpad(apr_psprintf(scratch_pool, "Ready"),
getmaxx(win) - 4 - strlen(brand) - 16,
@@ -437,8 +437,8 @@ view_draw(svn_browse__view_t *view, apr_
{
int i;
- view_draw_info_bar(view, view->infobar, pool);
- view_draw_status_bar(view, view->statusbar, pool);
+ view_draw_header(view, view->header, pool);
+ view_draw_footer(view, view->footer, pool);
for (i = 0; i < view->model->current->list->nelts; i++)
{
@@ -681,8 +681,8 @@ sub_main(int *code, int argc, const char
start_color();
use_default_colors();
- init_pair(COLOR_PAIR_INFO_BAR, COLOR_YELLOW, COLOR_BRANDING);
- init_pair(COLOR_PAIR_STATUS_BAR, COLOR_YELLOW, COLOR_SECONDARY);
+ init_pair(COLOR_PAIR_HEADER, COLOR_YELLOW, COLOR_BRANDING);
+ init_pair(COLOR_PAIR_FOOTER, COLOR_YELLOW, COLOR_SECONDARY);
init_pair(COLOR_PAIR_DIR, COLOR_CYAN, -1);
init_pair(COLOR_PAIR_DIR_SELECTED, COLOR_CYAN, COLOR_PRIMARY);
init_pair(COLOR_PAIR_FILE, -1, -1);
