philippelh/bitchx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove globals 'li' and 'co' in term.c

Browse Source 
These globals were used to store the original terminal dimesions from the terminal database (or
in the case of reattaching, supplied by scr-bx) to be applied if the current terminal dimensions
could not be determined.

Instead, we leave the original terminal dimensions in current_term->TI_lines and current_term->TI_cols,
and create current_term->li and current_term->co to store the current terminal dimensions (as eg.
supplied by scr-bx).
This commit is contained in:
Kevin Easton
2017-09-15 17:15:24 +10:00
parent c9b0e654b5
commit 70ac43ce77
8 changed files with 67 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/window.c
View File

@@ -940,8 +940,8 @@ void BX_recalculate_windows (Screen *screen)
if (dumb_mode)
return;
#ifdef GUI
current_term->TI_lines = screen->li;
current_term->TI_cols = screen->co;
current_term->li = screen->li;
current_term->co = screen->co;
#endif
if (!screen) /* it's a hidden window. ignore this */
@@ -951,10 +951,10 @@ void BX_recalculate_windows (Screen *screen)
*/
if (screen && !screen->current_window)
{
int display_size = current_term->li - 2 - screen->window_list->double_status;
screen->window_list->top = 0;
screen->window_list->display_size = current_term->TI_lines - 2 - screen->window_list->double_status;
screen->window_list->bottom = current_term->TI_lines - 2 - screen->window_list->double_status;
old_li = current_term->TI_lines;
screen->window_list->display_size = display_size;
screen->window_list->bottom = display_size;
return;
}
@@ -974,7 +974,7 @@ void BX_recalculate_windows (Screen *screen)
split += tmp->status_lines;
}
excess_li = current_term->TI_lines - old_li - split;
excess_li = current_term->li - old_li - split;
for (tmp = screen->window_list; tmp; tmp = tmp->next)
{