ariadne
/
smol
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

really fix titlebar() 

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2845 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
master
David Lawrence Ramsey 2005-07-10 23:45:23 +00:00
parent b386a905e6
commit d4dab46ebc
1 changed files with 32 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/winio.c
View File

@ -2741,14 +2741,15 @@ void statusq_abort(void)
void titlebar(const char *path) void titlebar(const char *path)
{ {
int space; int space = COLS;
/* The space we have available for display. */ /* The space we have available for display. */
size_t verlen = strlenpt(VERMSG); size_t verlen = strlenpt(VERMSG) + 1;
/* The length of the version message in columns. */ /* The length of the version message in columns, plus one for
* padding. */
const char *prefix; const char *prefix;
/* "DIR:", "File:", or "New Buffer". Goes before filename. */ /* "DIR:", "File:", or "New Buffer". Goes before filename. */
size_t prefixlen; size_t prefixlen;
/* The length of the prefix in columns. */ /* The length of the prefix in columns, plus one for padding. */
const char *state; const char *state;
/* "Modified", "View", or "". Shows the state of this /* "Modified", "View", or "". Shows the state of this
* buffer. */ * buffer. */
@ -2768,22 +2769,27 @@ void titlebar(const char *path)
wattron(topwin, A_REVERSE); wattron(topwin, A_REVERSE);
blank_titlebar(); blank_titlebar();
if (COLS <= 4 || COLS - 4 < verlen) /* space has to be at least 4: two spaces before the version message,
* at least one character of the version message, and one space
* after the version message. */
if (space < 4)
space = 0; space = 0;
else { else {
space = COLS - 4 - verlen; /* Limit verlen to 1/3 the length of the screen in columns,
/* Reserve 2/3 of the screen plus two columns for after the * minus three columns for spaces. */
* version message. */ if (verlen > (COLS / 3) - 3)
if (space < COLS - (COLS / 3) + 2) verlen = (COLS / 3) - 3;
space = COLS - (COLS / 3) + 2;
} }
if (COLS > 3) { if (space >= 4) {
/* The version message, counting the two spaces before it, /* Add one space after the version message, and account for both it
* should only take up 1/3 of the screen minus two columns. */ * and the two spaces before it. */
mvwaddnstr(topwin, 0, 2, VERMSG, actual_x(VERMSG, mvwaddnstr(topwin, 0, 2, VERMSG, actual_x(VERMSG, verlen));
(COLS / 3) - 4));
waddch(topwin, ' '); waddch(topwin, ' ');
verlen += 3;
/* Account for the full length of the version message. */
space -= verlen;
} }
#ifndef DISABLE_BROWSER #ifndef DISABLE_BROWSER
@ -2797,13 +2803,10 @@ void titlebar(const char *path)
statelen = strlenpt((state[0] != '\0') ? state : _("Modified")); statelen = strlenpt((state[0] != '\0') ? state : _("Modified"));
/* We need a space before state. */ /* If possible, add a space before state. */
if ((openfile->modified || ISSET(VIEW_MODE)) && statelen < COLS) if (space > 0 && statelen < space)
statelen++; statelen++;
else
assert(space >= 0);
if (space == 0 || statelen >= space)
goto the_end; goto the_end;
#ifndef DISABLE_BROWSER #ifndef DISABLE_BROWSER
@ -2818,11 +2821,9 @@ void titlebar(const char *path)
} else } else
prefix = _("File:"); prefix = _("File:");
assert(statelen < space); prefixlen = strnlenpt(prefix, space - statelen) + 1;
prefixlen = strnlenpt(prefix, space - statelen); /* If newfie is FALSE, add a space after prefix. */
/* If newfie is FALSE, we need a space after prefix. */
if (!newfie && prefixlen + statelen < space) if (!newfie && prefixlen + statelen < space)
prefixlen++; prefixlen++;
@ -2831,6 +2832,7 @@ void titlebar(const char *path)
if (path == NULL) if (path == NULL)
path = openfile->filename; path = openfile->filename;
/* Account for the full lengths of the prefix and the state. */
if (space >= prefixlen + statelen) if (space >= prefixlen + statelen)
space -= prefixlen + statelen; space -= prefixlen + statelen;
else else
@ -2838,9 +2840,9 @@ void titlebar(const char *path)
/* space is now the room we have for the filename. */ /* space is now the room we have for the filename. */
if (!newfie) { if (!newfie) {
size_t lenpt = strlenpt(path) + 1, start_col; size_t lenpt = strlenpt(path), start_col;
dots = (lenpt >= space); dots = (lenpt > space);
if (dots) { if (dots) {
start_col = lenpt - space + 3; start_col = lenpt - space + 3;
@ -2856,8 +2858,8 @@ void titlebar(const char *path)
/* The length of the expanded filename. */ /* The length of the expanded filename. */
/* There is room for the whole filename, so we center it. */ /* There is room for the whole filename, so we center it. */
mvwaddnstr(topwin, 0, ((COLS / 3) - 4) + ((space - exppathlen) / mvwaddnstr(topwin, 0, verlen + ((space - exppathlen) / 3),
3), prefix, actual_x(prefix, prefixlen)); prefix, actual_x(prefix, prefixlen));
if (!newfie) { if (!newfie) {
assert(strlenpt(prefix) + 1 == prefixlen); assert(strlenpt(prefix) + 1 == prefixlen);