summaryrefslogtreecommitdiff
path: root/src/common
diff options
context:
space:
mode:
authorSebastien Helleu <flashcode@flashtux.org>2006-05-07 11:40:19 +0000
committerSebastien Helleu <flashcode@flashtux.org>2006-05-07 11:40:19 +0000
commitb7ba64c744b052836a832598ce1348c0b0194244 (patch)
tree42ee6a59a1b44c994b6c9316ec7637531db0d5d1 /src/common
parent7d944ceca40df34e7df383a184912521c4e571d2 (diff)
downloadweechat-b7ba64c744b052836a832598ce1348c0b0194244.zip
Added some panel structures and functions
Diffstat (limited to 'src/common')
-rw-r--r--src/common/command.c12
-rw-r--r--src/common/weechat.c6
2 files changed, 9 insertions, 9 deletions
diff --git a/src/common/command.c b/src/common/command.c
index 5d18619ab..1068b3d17 100644
--- a/src/common/command.c
+++ b/src/common/command.c
@@ -2433,7 +2433,7 @@ weechat_cmd_key_display (t_gui_key *key, int new_key)
{
char *expanded_name;
- expanded_name = gui_key_get_expanded_name (key->key);
+ expanded_name = gui_keyboard_get_expanded_name (key->key);
if (new_key)
{
irc_display_prefix (NULL, NULL, PREFIX_INFO);
@@ -2446,7 +2446,7 @@ weechat_cmd_key_display (t_gui_key *key, int new_key)
GUI_COLOR(COLOR_WIN_CHAT_DARK),
GUI_COLOR(COLOR_WIN_CHAT),
(key->function) ?
- gui_key_function_search_by_ptr (key->function) : key->command);
+ gui_keyboard_function_search_by_ptr (key->function) : key->command);
if (expanded_name)
free (expanded_name);
}
@@ -2487,7 +2487,7 @@ weechat_cmd_key (t_irc_server *server, t_irc_channel *channel,
arguments += 7;
while (arguments[0] == ' ')
arguments++;
- if (gui_key_unbind (arguments))
+ if (gui_keyboard_unbind (arguments))
{
irc_display_prefix (NULL, NULL, PREFIX_INFO);
gui_printf (NULL, _("Key \"%s\" unbinded\n"), arguments);
@@ -2521,8 +2521,8 @@ weechat_cmd_key (t_irc_server *server, t_irc_channel *channel,
arguments++;
if (ascii_strcasecmp (arguments, "-yes") == 0)
{
- gui_key_free_all ();
- gui_key_init ();
+ gui_keyboard_free_all ();
+ gui_keyboard_init ();
irc_display_prefix (NULL, NULL, PREFIX_INFO);
gui_printf (NULL, _("Default key bindings restored\n"));
}
@@ -2552,7 +2552,7 @@ weechat_cmd_key (t_irc_server *server, t_irc_channel *channel,
pos++;
while (pos[0] == ' ')
pos++;
- ptr_key = gui_key_bind (arguments, pos);
+ ptr_key = gui_keyboard_bind (arguments, pos);
if (ptr_key)
weechat_cmd_key_display (ptr_key, 1);
else
diff --git a/src/common/weechat.c b/src/common/weechat.c
index 5963d89bf..6468bc6dc 100644
--- a/src/common/weechat.c
+++ b/src/common/weechat.c
@@ -564,10 +564,10 @@ weechat_display_keys ()
printf ("\n");
for (ptr_key = gui_keys; ptr_key; ptr_key = ptr_key->next_key)
{
- expanded_name = gui_key_get_expanded_name (ptr_key->key);
+ expanded_name = gui_keyboard_get_expanded_name (ptr_key->key);
printf ("* %s => %s\n",
(expanded_name) ? expanded_name : ptr_key->key,
- (ptr_key->function) ? gui_key_function_search_by_ptr (ptr_key->function) : ptr_key->command);
+ (ptr_key->function) ? gui_keyboard_function_search_by_ptr (ptr_key->function) : ptr_key->command);
if (expanded_name)
free (expanded_name);
}
@@ -1095,7 +1095,7 @@ main (int argc, char *argv[])
signal (SIGSEGV, weechat_sigsegv); /* crash dump when SIGSEGV received */
gui_main_pre_init (&argc, &argv); /* pre-initiliaze interface */
weechat_init_vars (); /* initialize some variables */
- gui_key_init (); /* init keyb. (default key bindings)*/
+ gui_keyboard_init (); /* init keyb. (default key bindings)*/
weechat_parse_args (argc, argv); /* parse command line args */
weechat_create_home_dirs (); /* create WeeChat directories */
weechat_init_log (); /* init log file */