blackbeard420/weechat
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

core: fix insert of mouse code in input line after a partial key combo (closes #130)

Browse Source
This commit is contained in:
Sébastien Helleu 2014-07-21 21:29:44 +02:00
parent 29385e39be
commit 3aadfc6765
2 changed files with 33 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog.asciidoc
View File

@ -15,6 +15,8 @@ http://weechat.org/files/releasenotes/ReleaseNotes-devel.html[release notes]
== Version 1.0 (under dev)
* core: fix insert of mouse code in input line after a partial key combo
(closes #130)
* core: check code point value in UTF-8 check function (closes #108)
* core: display a warning on startup if $TERM is not screen(-256color) under
screen/tmux

33
src/gui/gui-key.c
View File

@ -1239,6 +1239,34 @@ end:
return rc;
}
/*
* Checks if the given combo of keys is complete or not.
* It's not complete if the end of string is in the middle of a key
* (for example meta- without the following char/key).
*
* Returns:
* 0: key is incomplete (truncated)
* 1: key is complete
*/
int
gui_key_is_complete (const char *key)
{
int length;
if (!key || !key[0])
return 1;
length = strlen (key);
if (((length >= 1) && (strcmp (key + length - 1, "\x01") == 0))
|| ((length >= 2) && (strcmp (key + length - 2, "\x01[") == 0))
|| ((length >= 3) && (strcmp (key + length - 3, "\x01[[") == 0)))
return 0;
return 1;
}
/*
* Processes a new key pressed.
*
@ -1289,7 +1317,7 @@ gui_key_pressed (const char *key_str)
return 0;
}
if (strcmp (gui_key_combo_buffer, "\x01[[M") == 0)
if (strstr (gui_key_combo_buffer, "\x01[[M"))
{
gui_key_combo_buffer[0] = '\0';
gui_mouse_event_init ();
@ -1389,7 +1417,8 @@ gui_key_pressed (const char *key_str)
}
}
gui_key_combo_buffer[0] = '\0';
if (gui_key_is_complete (gui_key_combo_buffer))
gui_key_combo_buffer[0] = '\0';
/*
* if this is first key and not found (even partial) => return 1