zynk/irssi
2
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2026-08-23 18:42:53 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge d6adfa3965 into 50775e92e6

Browse source
This commit is contained in:
Todd Pratt 2015-11-02 03:00:17 +00:00
commit 753da5db9d
3 changed files with 42 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/fe-text/gui-entry.c
View file

@ -35,21 +35,21 @@ static unichar i_toupper(unichar c)
{
if (term_type == TERM_TYPE_UTF8)
return g_unichar_toupper(c);
return c <= 255 ? toupper(c) : c;
return (c >= 0 && c <= 255) ? toupper(c) : c;
}
static unichar i_tolower(unichar c)
{
if (term_type == TERM_TYPE_UTF8)
return g_unichar_tolower(c);
return c <= 255 ? tolower(c) : c;
return (c >= 0 && c <= 255) ? tolower(c) : c;
}
static int i_isalnum(unichar c)
{
if (term_type == TERM_TYPE_UTF8)
return (g_unichar_isalnum(c) || mk_wcwidth(c) == 0);
return c <= 255 ? isalnum(c) : 0;
return (c >= 0 && c <= 255) ? isalnum(c) : 0;
}
GUI_ENTRY_REC *active_entry;
@ -555,17 +555,32 @@ void gui_entry_erase(GUI_ENTRY_REC *entry, int size, int update_cutbuffer)
return;
if (update_cutbuffer) {
if (entry->cutbuffer_len && update_cutbuffer == CUTBUFFER_PREPEND) {
int cutbuffer_new_size = entry->cutbuffer_len + size;
unichar *tmpcutbuffer = entry->cutbuffer;
entry->cutbuffer = g_new(unichar, cutbuffer_new_size+1);
memcpy(entry->cutbuffer, entry->text + entry->pos - size,
size * sizeof(unichar));
memcpy(entry->cutbuffer + size, tmpcutbuffer,
entry->cutbuffer_len * sizeof(unichar));
entry->cutbuffer_len = cutbuffer_new_size;
entry->cutbuffer[cutbuffer_new_size] = '\0';
g_free(tmpcutbuffer);
} else if (update_cutbuffer) {
/* put erased text to cutbuffer */
if (entry->cutbuffer_len < size) {
g_free(entry->cutbuffer);
entry->cutbuffer = g_new(unichar, size+1);
}
entry->cutbuffer_len = size;
entry->cutbuffer[size] = '\0';
memcpy(entry->cutbuffer, entry->text + entry->pos - size,
size * sizeof(unichar));
}
}
if (entry->utf8)
while (entry->pos-size-w > 0 &&
@ -601,7 +616,7 @@ void gui_entry_erase_cell(GUI_ENTRY_REC *entry)
gui_entry_draw(entry);
}
void gui_entry_erase_word(GUI_ENTRY_REC *entry, int to_space)
void gui_entry_erase_word(GUI_ENTRY_REC *entry, int to_space, int repeat)
{
int to;
@ -624,7 +639,8 @@ void gui_entry_erase_word(GUI_ENTRY_REC *entry, int to_space)
}
if (to > 0) to++;
gui_entry_erase(entry, entry->pos-to, TRUE);
gui_entry_erase(entry, entry->pos-to,
repeat ? CUTBUFFER_PREPEND : TRUE);
}
void gui_entry_erase_next_word(GUI_ENTRY_REC *entry, int to_space)

4
src/fe-text/gui-entry.h
View file

@ -1,6 +1,8 @@
#ifndef __GUI_ENTRY_H
#define __GUI_ENTRY_H
#define CUTBUFFER_PREPEND 42
typedef struct {
int text_len, text_alloc; /* as shorts, not chars */
unichar *text;
@ -43,7 +45,7 @@ char *gui_entry_get_cutbuffer(GUI_ENTRY_REC *entry);
void gui_entry_erase_to(GUI_ENTRY_REC *entry, int pos, int update_cutbuffer);
void gui_entry_erase(GUI_ENTRY_REC *entry, int size, int update_cutbuffer);
void gui_entry_erase_cell(GUI_ENTRY_REC *entry);
void gui_entry_erase_word(GUI_ENTRY_REC *entry, int to_space);
void gui_entry_erase_word(GUI_ENTRY_REC *entry, int to_space, int repeat);
void gui_entry_erase_next_word(GUI_ENTRY_REC *entry, int to_space);
void gui_entry_transpose_chars(GUI_ENTRY_REC *entry);

9
src/fe-text/gui-readline.c
View file

@ -68,6 +68,8 @@ static int paste_timeout_id;
static void sig_input(void);
static int key_repeated = FALSE;
void input_listen_init(int handle)
{
readtag = g_input_add_poll(handle,
@ -361,6 +363,7 @@ static void sig_gui_key_pressed(gpointer keyp)
int ret;
key = GPOINTER_TO_INT(keyp);
key_repeated = key == prev_key;
if (redir != NULL && redir->flags & ENTRY_REDIRECT_FLAG_HOTKEY) {
handle_key_redirect(key);
@ -596,7 +599,7 @@ static void key_backspace(void)
static void key_delete_previous_word(void)
{
gui_entry_erase_word(active_entry, FALSE);
gui_entry_erase_word(active_entry, FALSE, key_repeated);
}
static void key_delete_next_word(void)
@ -606,7 +609,7 @@ static void key_delete_next_word(void)
static void key_delete_to_previous_space(void)
{
gui_entry_erase_word(active_entry, TRUE);
gui_entry_erase_word(active_entry, TRUE, key_repeated);
}
static void key_delete_to_next_space(void)
@ -1020,8 +1023,6 @@ void gui_readline_init(void)
key_bind("key", NULL, "meta2-5F", "cend", (SIGNAL_FUNC) key_combo);
key_bind("key", NULL, "meta2-1;5F", "cend", (SIGNAL_FUNC) key_combo);
key_bind("key", NULL, "meta-O-M", "return", (SIGNAL_FUNC) key_combo);
/* cursor movement */
key_bind("backward_character", "Move the cursor a character backward", "left", NULL, (SIGNAL_FUNC) key_backward_character);
key_bind("forward_character", "Move the cursor a character forward", "right", NULL, (SIGNAL_FUNC) key_forward_character);