diff --git a/src/terminal/terminaldisplay.h b/src/terminal/terminaldisplay.h index 00b3f59..81009b0 100644 --- a/src/terminal/terminaldisplay.h +++ b/src/terminal/terminaldisplay.h @@ -63,10 +63,6 @@ namespace Terminal { class Display { private: - static bool ti_flag( const char *capname ); - static int ti_num( const char *capname ); - static const char *ti_str( const char *capname ); - bool has_ech; /* erase character is part of vt200 but not supported by tmux (or by "screen" terminfo entry, which is what tmux advertises) */ diff --git a/src/terminal/terminaldisplayinit.cc b/src/terminal/terminaldisplayinit.cc index 50a0a35..54dfcc9 100644 --- a/src/terminal/terminaldisplayinit.cc +++ b/src/terminal/terminaldisplayinit.cc @@ -62,7 +62,7 @@ using namespace Terminal; -bool Display::ti_flag( const char *capname ) +static bool ti_flag( const char *capname ) { int val = tigetflag( const_cast( capname ) ); if ( val == -1 ) { @@ -71,16 +71,7 @@ bool Display::ti_flag( const char *capname ) return val; } -int Display::ti_num( const char *capname ) -{ - int val = tigetnum( const_cast( capname ) ); - if ( val == -2 ) { - throw std::invalid_argument( std::string( "Invalid terminfo numeric capability " ) + capname ); - } - return val; -} - -const char *Display::ti_str( const char *capname ) +static const char *ti_str( const char *capname ) { const char *val = tigetstr( const_cast( capname ) ); if ( val == (const char *)-1 ) {