tui: resize: use an extended terminal capability

... rather than hardwiring the string and testing the terminal
type every time the screen is re-sized.
This commit is contained in:
Jonathan de Boyne Pollard
2017-05-05 15:17:32 +01:00
committed by Justin M. Keyes
parent 36d1fd0602
commit 593af64943

View File

@@ -95,6 +95,7 @@ typedef struct {
int set_rgb_foreground, set_rgb_background; int set_rgb_foreground, set_rgb_background;
int set_cursor_color; int set_cursor_color;
int enable_focus_reporting, disable_focus_reporting; int enable_focus_reporting, disable_focus_reporting;
int resize_screen;
} unibi_ext; } unibi_ext;
} TUIData; } TUIData;
@@ -157,6 +158,7 @@ static void terminfo_start(UI *ui)
data->unibi_ext.disable_bracketed_paste = -1; data->unibi_ext.disable_bracketed_paste = -1;
data->unibi_ext.enable_focus_reporting = -1; data->unibi_ext.enable_focus_reporting = -1;
data->unibi_ext.disable_focus_reporting = -1; data->unibi_ext.disable_focus_reporting = -1;
data->unibi_ext.resize_screen = -1;
data->out_fd = 1; data->out_fd = 1;
data->out_isatty = os_isatty(data->out_fd); data->out_isatty = os_isatty(data->out_fd);
// setup unibilium // setup unibilium
@@ -428,16 +430,9 @@ static void tui_resize(UI *ui, Integer width, Integer height)
ugrid_resize(&data->grid, (int)width, (int)height); ugrid_resize(&data->grid, (int)width, (int)height);
if (!got_winch) { // Try to resize the terminal window. if (!got_winch) { // Try to resize the terminal window.
// Only send this extension to terminal types that we know understand it. data->params[0].i = (int)height;
if (data->term == kTermDTTerm // originated this extension data->params[1].i = (int)width;
|| data->term == kTermXTerm // per xterm ctlseqs doco unibi_out(ui, data->unibi_ext.resize_screen);
|| data->term == kTermKonsole // per commentary in VT102Emulation.cpp
|| data->term == kTermTeraTerm // per TeraTerm "Supported Control Functions" doco
|| data->term == kTermRxvt) { // per command.C
char r[16]; // enough for 9999x9999
snprintf(r, sizeof(r), "\x1b[8;%d;%dt", height, width);
out(ui, r, strlen(r));
}
} else { // Already handled the SIGWINCH signal; avoid double-resize. } else { // Already handled the SIGWINCH signal; avoid double-resize.
got_winch = false; got_winch = false;
} }
@@ -1048,6 +1043,16 @@ static void fix_terminfo(TUIData *data)
unibi_set_str(ut, unibi_set_a_background, XTERM_SETAB); unibi_set_str(ut, unibi_set_a_background, XTERM_SETAB);
} }
// Only define this capability for terminal types that we know understand it.
if (data->term == kTermDTTerm // originated this extension
|| data->term == kTermXTerm // per xterm ctlseqs doco
|| data->term == kTermKonsole // per commentary in VT102Emulation.cpp
|| data->term == kTermTeraTerm // per TeraTerm "Supported Control Functions" doco
|| data->term == kTermRxvt) { // per command.C
data->unibi_ext.resize_screen = (int)unibi_add_ext_str(ut, NULL,
"\x1b[8;%p1%d;%p2%dt");
}
end: end:
// Fill some empty slots with common terminal strings // Fill some empty slots with common terminal strings
if (data->term == kTermiTerm) { if (data->term == kTermiTerm) {