aniani/irssi
1
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2024-12-04 14:46:39 -05:00
Code

Merge pull request #458 from ailin-nemui/fix_449

Browse Source 
Properly toggle bracketed paste mode on stop/cont
This commit is contained in:
ailin-nemui 2016-03-22 22:54:43 +01:00
commit 3bc8afa740
4 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common.h
View File

@ -6,7 +6,7 @@
#define IRSSI_GLOBAL_CONFIG "irssi.conf" /* config file name in /etc/ */ #define IRSSI_GLOBAL_CONFIG "irssi.conf" /* config file name in /etc/ */
#define IRSSI_HOME_CONFIG "config" /* config file name in ~/.irssi/ */ #define IRSSI_HOME_CONFIG "config" /* config file name in ~/.irssi/ */
#define IRSSI_ABI_VERSION 2 #define IRSSI_ABI_VERSION 3
#define DEFAULT_SERVER_ADD_PORT 6667 #define DEFAULT_SERVER_ADD_PORT 6667

8
src/fe-text/term-terminfo.c
View File

@ -710,11 +710,3 @@ void term_gets(GArray *buffer, int *line_count)
} }
} }
} }
void term_set_bracketed_paste_mode(int enable)
{
if (enable)
tputs("\e[?2004h", 0, term_putchar);
else
tputs("\e[?2004l", 0, term_putchar);
}

23
src/fe-text/terminfo-core.c
View File

@ -395,6 +395,14 @@ static void _ignore_parm(TERM_REC *term, int param)
{ {
} }
static void term_dec_set_bracketed_paste_mode(int enable)
{
if (enable)
tputs("\e[?2004h", 0, term_putchar);
else
tputs("\e[?2004l", 0, term_putchar);
}
static void term_fill_capabilities(TERM_REC *term) static void term_fill_capabilities(TERM_REC *term)
{ {
int i, ival; int i, ival;
@ -535,6 +543,9 @@ void terminfo_cont(TERM_REC *term)
if (term->TI_smkx) if (term->TI_smkx)
tput(tparm(term->TI_smkx)); tput(tparm(term->TI_smkx));
if (term->bracketed_paste_enabled)
term_dec_set_bracketed_paste_mode(TRUE);
terminfo_input_init(term); terminfo_input_init(term);
} }
@ -545,6 +556,9 @@ void terminfo_stop(TERM_REC *term)
/* move cursor to bottom of the screen */ /* move cursor to bottom of the screen */
terminfo_move(0, term->height-1); terminfo_move(0, term->height-1);
if (term->bracketed_paste_enabled)
term_dec_set_bracketed_paste_mode(FALSE);
/* stop cup-mode */ /* stop cup-mode */
if (term->TI_rmcup) if (term->TI_rmcup)
tput(tparm(term->TI_rmcup)); tput(tparm(term->TI_rmcup));
@ -677,6 +691,15 @@ static int term_setup(TERM_REC *term)
return 1; return 1;
} }
void term_set_bracketed_paste_mode(int enable)
{
if (current_term->bracketed_paste_enabled == enable)
return;
current_term->bracketed_paste_enabled = enable;
term_dec_set_bracketed_paste_mode(enable);
}
TERM_REC *terminfo_core_init(FILE *in, FILE *out) TERM_REC *terminfo_core_init(FILE *in, FILE *out)
{ {
TERM_REC *old_term, *term; TERM_REC *old_term, *term;

3
src/fe-text/terminfo-core.h
View File

@ -92,6 +92,9 @@ struct _TERM_REC {
/* Keyboard-transmit mode */ /* Keyboard-transmit mode */
const char *TI_smkx; const char *TI_smkx;
const char *TI_rmkx; const char *TI_rmkx;
/* Terminal mode states */
int bracketed_paste_enabled;
}; };
extern TERM_REC *current_term; extern TERM_REC *current_term;