IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

options,tui: don't hardcode default terminal size

Browse Source 
also, include some checks.
This commit is contained in:
Felipe Morales 2015-07-20 21:30:42 -03:00 committed by Justin M. Keyes
parent 5732340c20
commit a95a5ba839
3 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/nvim/globals.h
View File

@ -59,7 +59,7 @@
/* Values for "starting" */ /* Values for "starting" */
#define NO_SCREEN 2 /* no screen updating yet */ #define NO_SCREEN 2 /* no screen updating yet */
#define NO_BUFFERS 1 /* not all buffers loaded yet */ #define NO_BUFFERS 1 /* not all buffers loaded yet */
/* 0 not starting anymore */ /* 0 not starting anymore */
/* /*
* Number of Rows and Columns in the screen. * Number of Rows and Columns in the screen.
@ -68,12 +68,16 @@
* They may have different values when the screen wasn't (re)allocated yet * They may have different values when the screen wasn't (re)allocated yet
* after setting Rows or Columns (e.g., when starting up). * after setting Rows or Columns (e.g., when starting up).
*/ */
#define DFLT_COLS 80 /* default value for 'columns' */
#define DFLT_ROWS 24 /* default value for 'lines' */
EXTERN long Rows /* nr of rows in the screen */ EXTERN long Rows /* nr of rows in the screen */
#ifdef DO_INIT #ifdef DO_INIT
= 24L = DFLT_ROWS
#endif #endif
; ;
EXTERN long Columns INIT(= 80); /* nr of columns in the screen */ EXTERN long Columns INIT(= DFLT_COLS); /* nr of columns in the screen */
/* /*
* The characters and attributes cached for the screen. * The characters and attributes cached for the screen.

4
src/nvim/option.c
View File

@ -537,7 +537,7 @@ static vimoption_T
{(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, {(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
{"columns", "co", P_NUM|P_NODEFAULT|P_NO_MKRC|P_VI_DEF|P_RCLR, {"columns", "co", P_NUM|P_NODEFAULT|P_NO_MKRC|P_VI_DEF|P_RCLR,
(char_u *)&Columns, PV_NONE, (char_u *)&Columns, PV_NONE,
{(char_u *)80L, (char_u *)0L} SCRIPTID_INIT}, {(char_u *)DFLT_COLS, (char_u *)0L} SCRIPTID_INIT},
{"comments", "com", P_STRING|P_ALLOCED|P_VI_DEF|P_COMMA|P_NODUP| {"comments", "com", P_STRING|P_ALLOCED|P_VI_DEF|P_COMMA|P_NODUP|
P_CURSWANT, P_CURSWANT,
(char_u *)&p_com, PV_COM, (char_u *)&p_com, PV_COM,
@ -1025,7 +1025,7 @@ static vimoption_T
{"lines", NULL, P_NUM|P_NODEFAULT|P_NO_MKRC|P_VI_DEF|P_RCLR, {"lines", NULL, P_NUM|P_NODEFAULT|P_NO_MKRC|P_VI_DEF|P_RCLR,
(char_u *)&Rows, PV_NONE, (char_u *)&Rows, PV_NONE,
{ {
(char_u *)24L, (char_u *)DFLT_ROWS,
(char_u *)0L (char_u *)0L
} SCRIPTID_INIT}, } SCRIPTID_INIT},
{"linespace", "lsp", P_NUM|P_VI_DEF|P_RCLR, {"linespace", "lsp", P_NUM|P_VI_DEF|P_RCLR,

11
src/nvim/tui/tui.c
View File

@ -1,6 +1,7 @@
#include <assert.h> #include <assert.h>
#include <stdbool.h> #include <stdbool.h>
#include <stdio.h> #include <stdio.h>
#include <limits.h>
#include <uv.h> #include <uv.h>
#include <unibilium.h> #include <unibilium.h>
@ -648,7 +649,9 @@ static void update_size(UI *ui)
int width = 0, height = 0; int width = 0, height = 0;
// 1 - look for non-default 'columns' and 'lines' options during startup // 1 - look for non-default 'columns' and 'lines' options during startup
if (starting && (Columns != 80 || Rows != 24)) { if (starting != 0 && (Columns != DFLT_COLS || Rows != DFLT_ROWS)) {
assert(Columns >= INT_MIN && Columns <= INT_MAX);
assert(Rows >= INT_MIN && Rows <= INT_MAX);
width = (int)Columns; width = (int)Columns;
height = (int)Rows; height = (int)Rows;
goto end; goto end;
@ -675,9 +678,9 @@ static void update_size(UI *ui)
end: end:
if (width <= 0 || height <= 0) { if (width <= 0 || height <= 0) {
// use a default of 80x24 // use the defaults
width = 80; width = DFLT_COLS;
height = 24; height = DFLT_ROWS;
} }
ui->width = width; ui->width = width;