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

some fixes, saving is still broken

Browse Source 
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@1464 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Timo Sirainen 2001-05-08 18:05:53 +00:00 committed by cras
parent 79b908c41c
commit 4c8ad5a4c5
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/fe-common/core/keyboard.c
View File

@ -147,20 +147,15 @@ static void keyconfig_save(const char *id, const char *key, const char *data)
iconfig_node_set_str(node, "data", data); iconfig_node_set_str(node, "data", data);
} }
static void keyconfig_clear(const char *id, const char *key) static void keyconfig_clear(const char *key)
{ {
CONFIG_NODE *node; CONFIG_NODE *node;
g_return_if_fail(id != NULL); g_return_if_fail(key != NULL);
/* remove old keyboard settings */ /* remove old keyboard settings */
node = iconfig_node_traverse("keyboard", TRUE); node = iconfig_node_traverse("keyboard", TRUE);
if (key == NULL) iconfig_node_set_str(node, key, NULL);
iconfig_node_set_str(node, id, NULL);
else {
node = config_node_section(node, id, -1);
if (node != NULL) iconfig_node_set_str(node, key, NULL);
}
} }
KEYINFO_REC *key_info_find(const char *id) KEYINFO_REC *key_info_find(const char *id)
@ -411,7 +406,7 @@ void key_configure_remove(const char *key)
rec = g_hash_table_lookup(keys, key); rec = g_hash_table_lookup(keys, key);
if (rec == NULL) return; if (rec == NULL) return;
keyconfig_clear(rec->info->id, key); keyconfig_clear(key);
key_configure_destroy(rec); key_configure_destroy(rec);
} }
@ -453,7 +448,9 @@ int key_pressed(KEYBOARD_REC *keyboard, const char *key)
rec = g_tree_search(key_states, rec = g_tree_search(key_states,
(GSearchFunc) key_states_search, (GSearchFunc) key_states_search,
(void *) key); (void *) key);
if (rec == NULL || strcmp(rec->info->id, "key") != 0) { if (rec == NULL ||
(g_tree_lookup(key_states, (void *) key) != NULL &&
strcmp(rec->info->id, "key") != 0)) {
/* a single non-combo key was pressed */ /* a single non-combo key was pressed */
rec = g_hash_table_lookup(keys, key); rec = g_hash_table_lookup(keys, key);
if (rec == NULL) if (rec == NULL)