mirror of
https://github.com/irssi/irssi.git
synced 2024-09-08 04:26:01 -04:00
Make use of terminal application keys configurable
adds a new setting term_appkey_mode which can enable or disable the use of keyboard transmit (application keys) mode. Fixes #430
This commit is contained in:
parent
6572005d3d
commit
6c0c0c60ad
@ -1039,6 +1039,7 @@ static void setup_changed(void)
|
|||||||
paste_join_multiline = settings_get_bool("paste_join_multiline");
|
paste_join_multiline = settings_get_bool("paste_join_multiline");
|
||||||
paste_use_bracketed_mode = settings_get_bool("paste_use_bracketed_mode");
|
paste_use_bracketed_mode = settings_get_bool("paste_use_bracketed_mode");
|
||||||
|
|
||||||
|
term_set_appkey_mode(settings_get_bool("term_appkey_mode"));
|
||||||
/* Enable the bracketed paste mode on demand */
|
/* Enable the bracketed paste mode on demand */
|
||||||
term_set_bracketed_paste_mode(paste_use_bracketed_mode);
|
term_set_bracketed_paste_mode(paste_use_bracketed_mode);
|
||||||
}
|
}
|
||||||
@ -1061,6 +1062,7 @@ void gui_readline_init(void)
|
|||||||
g_get_current_time(&last_keypress);
|
g_get_current_time(&last_keypress);
|
||||||
input_listen_init(STDIN_FILENO);
|
input_listen_init(STDIN_FILENO);
|
||||||
|
|
||||||
|
settings_add_bool("lookandfeel", "term_appkey_mode", TRUE);
|
||||||
settings_add_str("history", "scroll_page_count", "/2");
|
settings_add_str("history", "scroll_page_count", "/2");
|
||||||
settings_add_time("misc", "paste_detect_time", "5msecs");
|
settings_add_time("misc", "paste_detect_time", "5msecs");
|
||||||
settings_add_bool("misc", "paste_use_bracketed_mode", FALSE);
|
settings_add_bool("misc", "paste_use_bracketed_mode", FALSE);
|
||||||
|
@ -94,6 +94,7 @@ void term_refresh(TERM_WINDOW *window);
|
|||||||
|
|
||||||
void term_stop(void);
|
void term_stop(void);
|
||||||
|
|
||||||
|
void term_set_appkey_mode(int enable);
|
||||||
void term_set_bracketed_paste_mode(int enable);
|
void term_set_bracketed_paste_mode(int enable);
|
||||||
|
|
||||||
/* keyboard input handling */
|
/* keyboard input handling */
|
||||||
|
@ -395,6 +395,12 @@ static void _ignore_parm(TERM_REC *term, int param)
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void terminfo_set_appkey_mode(TERM_REC *term, int set)
|
||||||
|
{
|
||||||
|
if (term->TI_smkx && term->TI_rmkx)
|
||||||
|
tput(tparm(set ? term->TI_smkx : term->TI_rmkx));
|
||||||
|
}
|
||||||
|
|
||||||
static void term_dec_set_bracketed_paste_mode(int enable)
|
static void term_dec_set_bracketed_paste_mode(int enable)
|
||||||
{
|
{
|
||||||
if (enable)
|
if (enable)
|
||||||
@ -543,8 +549,8 @@ void terminfo_cont(TERM_REC *term)
|
|||||||
if (term->TI_smcup)
|
if (term->TI_smcup)
|
||||||
tput(tparm(term->TI_smcup));
|
tput(tparm(term->TI_smcup));
|
||||||
|
|
||||||
if (term->TI_smkx)
|
if (term->appkey_enabled)
|
||||||
tput(tparm(term->TI_smkx));
|
terminfo_set_appkey_mode(term, TRUE);
|
||||||
|
|
||||||
if (term->bracketed_paste_enabled)
|
if (term->bracketed_paste_enabled)
|
||||||
term_dec_set_bracketed_paste_mode(TRUE);
|
term_dec_set_bracketed_paste_mode(TRUE);
|
||||||
@ -566,8 +572,8 @@ void terminfo_stop(TERM_REC *term)
|
|||||||
if (term->TI_rmcup)
|
if (term->TI_rmcup)
|
||||||
tput(tparm(term->TI_rmcup));
|
tput(tparm(term->TI_rmcup));
|
||||||
|
|
||||||
if (term->TI_rmkx)
|
if (term->appkey_enabled)
|
||||||
tput(tparm(term->TI_rmkx));
|
terminfo_set_appkey_mode(term, FALSE);
|
||||||
|
|
||||||
/* reset input settings */
|
/* reset input settings */
|
||||||
terminfo_input_deinit(term);
|
terminfo_input_deinit(term);
|
||||||
@ -695,6 +701,15 @@ static int term_setup(TERM_REC *term)
|
|||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void term_set_appkey_mode(int enable)
|
||||||
|
{
|
||||||
|
if (current_term->appkey_enabled == enable)
|
||||||
|
return;
|
||||||
|
|
||||||
|
current_term->appkey_enabled = enable;
|
||||||
|
terminfo_set_appkey_mode(current_term, enable);
|
||||||
|
}
|
||||||
|
|
||||||
void term_set_bracketed_paste_mode(int enable)
|
void term_set_bracketed_paste_mode(int enable)
|
||||||
{
|
{
|
||||||
if (current_term->bracketed_paste_enabled == enable)
|
if (current_term->bracketed_paste_enabled == enable)
|
||||||
|
@ -94,6 +94,7 @@ struct _TERM_REC {
|
|||||||
const char *TI_rmkx;
|
const char *TI_rmkx;
|
||||||
|
|
||||||
/* Terminal mode states */
|
/* Terminal mode states */
|
||||||
|
int appkey_enabled;
|
||||||
int bracketed_paste_enabled;
|
int bracketed_paste_enabled;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user