Mercurial > hg
changeset 315:65aa05520556
First Ctrl-C now also leaves multi-line message mode
* First Ctrl-C does a "/msay abort" command
* Remove debug stuff
* "/msay abort" displays a message when leaving multi-line mode
author | Mikael Berthe <mikael@lilotux.net> |
---|---|
date | Fri, 15 Jul 2005 10:56:15 +0100 |
parents | 1ceb68eb2fc1 |
children | 33b8e801ffa6 |
files | mcabber/src/commands.c mcabber/src/main.c mcabber/src/screen.c |
diffstat | 3 files changed, 5 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/mcabber/src/commands.c Thu Jul 14 23:24:22 2005 +0100 +++ b/mcabber/src/commands.c Fri Jul 15 10:56:15 2005 +0100 @@ -498,6 +498,8 @@ gpointer bud; if (!strcasecmp(arg, "abort")) { + if (scr_get_multimode()) + scr_LogPrint("Leaving multi-line message mode"); scr_set_multimode(FALSE); return; } else if ((!strcasecmp(arg, "begin")) || (!strcasecmp(arg, "verbatim"))) {
--- a/mcabber/src/main.c Thu Jul 14 23:24:22 2005 +0100 +++ b/mcabber/src/main.c Fri Jul 15 10:56:15 2005 +0100 @@ -124,8 +124,8 @@ mcabber_disconnect("Killed by SIGINT"); LastSigtermTime = now; signal(SIGINT, sig_handler); + scr_handle_sigint(); scr_LogPrint("Hit Ctrl-C twice to leave mcabber"); - scr_handle_sigint(); } else { ut_WriteLog("Caught signal: %d\n", signum); }
--- a/mcabber/src/screen.c Thu Jul 14 23:24:22 2005 +0100 +++ b/mcabber/src/screen.c Fri Jul 15 10:56:15 2005 +0100 @@ -1492,7 +1492,8 @@ void scr_handle_sigint(void) { - scr_LogPrint("In screen. completion_started=%d", completion_started); + // Leave multi-line mode + process_command("/msay abort"); // Same as Ctrl-g, now scr_cancel_current_completion(); scr_end_current_completion();