projects
/
silc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merged Irssi SVN (upcoming irssi 0.8.11).
[silc.git]
/
apps
/
irssi
/
src
/
fe-common
/
core
/
keyboard.c
diff --git
a/apps/irssi/src/fe-common/core/keyboard.c
b/apps/irssi/src/fe-common/core/keyboard.c
index 9bbb218aa47cb0b589a9b9522d3ed7c92e668147..717bed1f6248ab6602559dc4b0dbc0f9d4c84d9e 100644
(file)
--- a/
apps/irssi/src/fe-common/core/keyboard.c
+++ b/
apps/irssi/src/fe-common/core/keyboard.c
@@
-551,8
+551,6
@@
static int key_states_search(const unsigned char *combo,
return 0;
}
return 0;
}
-/* Returns TRUE if key press was consumed. Control characters should be sent
- as "^@" .. "^_" instead of #0..#31 chars, #127 should be sent as ^? */
int key_pressed(KEYBOARD_REC *keyboard, const char *key)
{
KEY_REC *rec;
int key_pressed(KEYBOARD_REC *keyboard, const char *key)
{
KEY_REC *rec;
@@
-565,7
+563,7
@@
int key_pressed(KEYBOARD_REC *keyboard, const char *key)
if (keyboard->key_state == NULL && key[1] == '\0' &&
!used_keys[(int) (unsigned char) key[0]]) {
/* fast check - key not used */
if (keyboard->key_state == NULL && key[1] == '\0' &&
!used_keys[(int) (unsigned char) key[0]]) {
/* fast check - key not used */
- return
FALSE
;
+ return
-1
;
}
first_key = keyboard->key_state == NULL;
}
first_key = keyboard->key_state == NULL;
@@
-583,13
+581,13
@@
int key_pressed(KEYBOARD_REC *keyboard, const char *key)
/* unknown key combo, eat the invalid key
unless it was the first key pressed */
g_free(combo);
/* unknown key combo, eat the invalid key
unless it was the first key pressed */
g_free(combo);
- return
!first_key
;
+ return
first_key ? -1 : 1
;
}
if (g_tree_lookup(key_states, combo) != rec) {
/* key combo continues.. */
keyboard->key_state = combo;
}
if (g_tree_lookup(key_states, combo) != rec) {
/* key combo continues.. */
keyboard->key_state = combo;
- return
TRUE
;
+ return
0
;
}
/* finished key combo, execute */
}
/* finished key combo, execute */
@@
-597,7
+595,7
@@
int key_pressed(KEYBOARD_REC *keyboard, const char *key)
consumed = key_emit_signal(keyboard, rec);
/* never consume non-control characters */
consumed = key_emit_signal(keyboard, rec);
/* never consume non-control characters */
- return consumed;
+ return consumed
? 1 : -1
;
}
void keyboard_entry_redirect(SIGNAL_FUNC func, const char *entry,
}
void keyboard_entry_redirect(SIGNAL_FUNC func, const char *entry,