New command line switch "--no-terminal-data-request"
This commit is contained in:
parent
ff6ff14793
commit
e5902a6ee6
|
@ -1,3 +1,7 @@
|
||||||
|
2020-02-25 Markus Gans <guru.mail@muenster.de>
|
||||||
|
* New command line switch "--no-terminal-data-request" to disable
|
||||||
|
font and title determination
|
||||||
|
|
||||||
2020-02-19 Markus Gans <guru.mail@muenster.de>
|
2020-02-19 Markus Gans <guru.mail@muenster.de>
|
||||||
* Some small code improvements
|
* Some small code improvements
|
||||||
* SGRoptimizer improved
|
* SGRoptimizer improved
|
||||||
|
|
|
@ -320,6 +320,8 @@ void FApplication::showParameterUsage()
|
||||||
<< " Disable cursor optimization\n"
|
<< " Disable cursor optimization\n"
|
||||||
<< " --no-terminal-detection "
|
<< " --no-terminal-detection "
|
||||||
<< " Disable terminal detection\n"
|
<< " Disable terminal detection\n"
|
||||||
|
<< " --no-terminal-data-request"
|
||||||
|
<< " Do not determine terminal font and title\n"
|
||||||
<< " --no-color-change "
|
<< " --no-color-change "
|
||||||
<< " Do not redefine the color palette\n"
|
<< " Do not redefine the color palette\n"
|
||||||
<< " --no-sgr-optimizer "
|
<< " --no-sgr-optimizer "
|
||||||
|
@ -418,6 +420,7 @@ void FApplication::cmd_options (const int& argc, char* argv[])
|
||||||
{C_STR("no-mouse"), no_argument, nullptr, 0 },
|
{C_STR("no-mouse"), no_argument, nullptr, 0 },
|
||||||
{C_STR("no-optimized-cursor"), no_argument, nullptr, 0 },
|
{C_STR("no-optimized-cursor"), no_argument, nullptr, 0 },
|
||||||
{C_STR("no-terminal-detection"), no_argument, nullptr, 0 },
|
{C_STR("no-terminal-detection"), no_argument, nullptr, 0 },
|
||||||
|
{C_STR("no-terminal-data-request"), no_argument, nullptr, 0 },
|
||||||
{C_STR("no-color-change"), no_argument, nullptr, 0 },
|
{C_STR("no-color-change"), no_argument, nullptr, 0 },
|
||||||
{C_STR("no-sgr-optimizer"), no_argument, nullptr, 0 },
|
{C_STR("no-sgr-optimizer"), no_argument, nullptr, 0 },
|
||||||
{C_STR("vgafont"), no_argument, nullptr, 0 },
|
{C_STR("vgafont"), no_argument, nullptr, 0 },
|
||||||
|
@ -471,6 +474,9 @@ void FApplication::cmd_options (const int& argc, char* argv[])
|
||||||
if ( std::strcmp(long_options[idx].name, "no-terminal-detection") == 0 )
|
if ( std::strcmp(long_options[idx].name, "no-terminal-detection") == 0 )
|
||||||
getStartOptions().terminal_detection = false;
|
getStartOptions().terminal_detection = false;
|
||||||
|
|
||||||
|
if ( std::strcmp(long_options[idx].name, "no-terminal-data-request") == 0 )
|
||||||
|
getStartOptions().terminal_data_request = false;
|
||||||
|
|
||||||
if ( std::strcmp(long_options[idx].name, "no-color-change") == 0 )
|
if ( std::strcmp(long_options[idx].name, "no-color-change") == 0 )
|
||||||
getStartOptions().color_change = false;
|
getStartOptions().color_change = false;
|
||||||
|
|
||||||
|
|
|
@ -38,6 +38,7 @@ FStartOptions::FStartOptions()
|
||||||
: cursor_optimisation{true}
|
: cursor_optimisation{true}
|
||||||
, mouse_support{true}
|
, mouse_support{true}
|
||||||
, terminal_detection{true}
|
, terminal_detection{true}
|
||||||
|
, terminal_data_request{true}
|
||||||
, color_change{true}
|
, color_change{true}
|
||||||
, sgr_optimizer{true}
|
, sgr_optimizer{true}
|
||||||
, vgafont{false}
|
, vgafont{false}
|
||||||
|
|
|
@ -1846,6 +1846,9 @@ void FTerm::init_captureFontAndTitle()
|
||||||
{
|
{
|
||||||
// Save the used xterm font and window title
|
// Save the used xterm font and window title
|
||||||
|
|
||||||
|
if ( ! FStartOptions::getFStartOptions().terminal_data_request )
|
||||||
|
return;
|
||||||
|
|
||||||
xterm->captureFontAndTitle();
|
xterm->captureFontAndTitle();
|
||||||
const auto& font = xterm->getFont();
|
const auto& font = xterm->getFont();
|
||||||
const auto& title = xterm->getTitle();
|
const auto& title = xterm->getTitle();
|
||||||
|
|
|
@ -77,11 +77,11 @@ class FStartOptions final
|
||||||
uInt8 cursor_optimisation : 1;
|
uInt8 cursor_optimisation : 1;
|
||||||
uInt8 mouse_support : 1;
|
uInt8 mouse_support : 1;
|
||||||
uInt8 terminal_detection : 1;
|
uInt8 terminal_detection : 1;
|
||||||
|
uInt8 terminal_data_request : 1;
|
||||||
uInt8 color_change : 1;
|
uInt8 color_change : 1;
|
||||||
uInt8 sgr_optimizer : 1;
|
uInt8 sgr_optimizer : 1;
|
||||||
uInt8 vgafont : 1;
|
uInt8 vgafont : 1;
|
||||||
uInt8 newfont : 1;
|
uInt8 newfont : 1;
|
||||||
uInt8 : 1; // padding bits
|
|
||||||
fc::encoding encoding;
|
fc::encoding encoding;
|
||||||
|
|
||||||
#if defined(__FreeBSD__) || defined(__DragonFly__) || defined(UNIT_TEST)
|
#if defined(__FreeBSD__) || defined(__DragonFly__) || defined(UNIT_TEST)
|
||||||
|
|
Loading…
Reference in New Issue