diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/command/command.c | 190 | ||||
| -rw-r--r-- | src/command/command.h | 9 | ||||
| -rw-r--r-- | src/command/commands.c | 332 | ||||
| -rw-r--r-- | src/command/commands.h | 168 | ||||
| -rw-r--r-- | src/muc.c | 5 | ||||
| -rw-r--r-- | src/muc.h | 3 | ||||
| -rw-r--r-- | src/profanity.c | 12 | ||||
| -rw-r--r-- | src/ui/console.c | 3 | ||||
| -rw-r--r-- | src/ui/core.c | 10 | ||||
| -rw-r--r-- | src/ui/inputwin.c | 11 | ||||
| -rw-r--r-- | src/ui/ui.h | 111 | ||||
| -rw-r--r-- | src/ui/win_types.h | 145 |
12 files changed, 496 insertions, 503 deletions
diff --git a/src/command/command.c b/src/command/command.c index 840a23e5..14b7aa48 100644 --- a/src/command/command.c +++ b/src/command/command.c @@ -68,40 +68,38 @@ #include "ui/ui.h" #include "window_list.h" -typedef char*(*autocompleter)(char*, int*); - -static gboolean _cmd_execute(const char * const command, const char * const inp); - -static char * _cmd_complete_parameters(const char * const input); - -static char * _sub_autocomplete(const char * const input); -static char * _notify_autocomplete(const char * const input); -static char * _theme_autocomplete(const char * const input); -static char * _autoaway_autocomplete(const char * const input); -static char * _autoconnect_autocomplete(const char * const input); -static char * _account_autocomplete(const char * const input); -static char * _who_autocomplete(const char * const input); -static char * _roster_autocomplete(const char * const input); -static char * _group_autocomplete(const char * const input); -static char * _bookmark_autocomplete(const char * const input); -static char * _otr_autocomplete(const char * const input); -static char * _connect_autocomplete(const char * const input); -static char * _statuses_autocomplete(const char * const input); -static char * _alias_autocomplete(const char * const input); -static char * _join_autocomplete(const char * const input); -static char * _log_autocomplete(const char * const input); -static char * _form_autocomplete(const char * const input); -static char * _form_field_autocomplete(const char * const input); -static char * _occupants_autocomplete(const char * const input); -static char * _kick_autocomplete(const char * const input); -static char * _ban_autocomplete(const char * const input); -static char * _affiliation_autocomplete(const char * const input); -static char * _role_autocomplete(const char * const input); -static char * _resource_autocomplete(const char * const input); -static char * _titlebar_autocomplete(const char * const input); -static char * _inpblock_autocomplete(const char * const input); -static char * _time_autocomplete(const char * const input); -static char * _receipts_autocomplete(const char * const input); +static gboolean _cmd_execute(ProfWin *window, const char * const command, const char * const inp); + +static char * _cmd_complete_parameters(ProfWin *window, const char * const input); + +static char * _sub_autocomplete(ProfWin *window, const char * const input); +static char * _notify_autocomplete(ProfWin *window, const char * const input); +static char * _theme_autocomplete(ProfWin *window, const char * const input); +static char * _autoaway_autocomplete(ProfWin *window, const char * const input); +static char * _autoconnect_autocomplete(ProfWin *window, const char * const input); +static char * _account_autocomplete(ProfWin *window, const char * const input); +static char * _who_autocomplete(ProfWin *window, const char * const input); +static char * _roster_autocomplete(ProfWin *window, const char * const input); +static char * _group_autocomplete(ProfWin *window, const char * const input); +static char * _bookmark_autocomplete(ProfWin *window, const char * const input); +static char * _otr_autocomplete(ProfWin *window, const char * const input); +static char * _connect_autocomplete(ProfWin *window, const char * const input); +static char * _statuses_autocomplete(ProfWin *window, const char * const input); +static char * _alias_autocomplete(ProfWin *window, const char * const input); +static char * _join_autocomplete(ProfWin *window, const char * const input); +static char * _log_autocomplete(ProfWin *window, const char * const input); +static char * _form_autocomplete(ProfWin *window, const char * const input); +static char * _form_field_autocomplete(ProfWin *window, const char * const input); +static char * _occupants_autocomplete(ProfWin *window, const char * const input); +static char * _kick_autocomplete(ProfWin *window, const char * const input); +static char * _ban_autocomplete(ProfWin *window, const char * const input); +static char * _affiliation_autocomplete(ProfWin *window, const char * const input); +static char * _role_autocomplete(ProfWin *window, const char * const input); +static char * _resource_autocomplete(ProfWin *window, const char * const input); +static char * _titlebar_autocomplete(ProfWin *window, const char * const input); +static char * _inpblock_autocomplete(ProfWin *window, const char * const input); +static char * _time_autocomplete(ProfWin *window, const char * const input); +static char * _receipts_autocomplete(ProfWin *window, const char * const input); GHashTable *commands = NULL; @@ -1741,7 +1739,7 @@ cmd_alias_remove(char *value) // Command autocompletion functions char* -cmd_autocomplete(const char * const input) +cmd_autocomplete(ProfWin *window, const char * const input) { // autocomplete command if ((strncmp(input, "/", 1) == 0) && (!str_contains(input, strlen(input), ' '))) { @@ -1753,7 +1751,7 @@ cmd_autocomplete(const char * const input) // autocomplete parameters } else { - char *found = _cmd_complete_parameters(input); + char *found = _cmd_complete_parameters(window, input); if (found) { return found; } @@ -1763,7 +1761,7 @@ cmd_autocomplete(const char * const input) } void -cmd_reset_autocomplete() +cmd_reset_autocomplete(ProfWin *window) { roster_reset_search_attempts(); muc_invites_reset_ac(); @@ -1831,7 +1829,7 @@ cmd_reset_autocomplete() autocomplete_reset(receipts_ac); autocomplete_reset(pgp_ac); - if (ui_current_win_type() == WIN_CHAT) { + if (window->type == WIN_CHAT) { ProfChatWin *chatwin = wins_get_current_chat(); PContact contact = roster_get_contact(chatwin->barejid); if (contact) { @@ -1839,13 +1837,13 @@ cmd_reset_autocomplete() } } - if (ui_current_win_type() == WIN_MUC) { + if (window->type == WIN_MUC) { ProfMucWin *mucwin = wins_get_current_muc(); muc_autocomplete_reset(mucwin->roomjid); muc_jid_autocomplete_reset(mucwin->roomjid); } - if (ui_current_win_type() == WIN_MUC_CONFIG) { + if (window->type == WIN_MUC_CONFIG) { ProfMucConfWin *confwin = wins_get_current_muc_conf(); if (confwin->form) { form_reset_autocompleters(confwin->form); @@ -1860,7 +1858,7 @@ cmd_reset_autocomplete() * continue, FALSE otherwise */ gboolean -cmd_process_input(char *inp) +cmd_process_input(ProfWin *window, char *inp) { log_debug("Input received: %s", inp); gboolean result = FALSE; @@ -1874,12 +1872,12 @@ cmd_process_input(char *inp) } else if (inp[0] == '/') { char *inp_cpy = strdup(inp); char *command = strtok(inp_cpy, " "); - result = _cmd_execute(command, inp); + result = _cmd_execute(window, command, inp); free(inp_cpy); // call a default handler if input didn't start with '/' } else { - result = cmd_execute_default(inp); + result = cmd_execute_default(window, inp); } return result; @@ -1888,18 +1886,18 @@ cmd_process_input(char *inp) // Command execution void -cmd_execute_connect(const char * const account) +cmd_execute_connect(ProfWin *window, const char * const account) { GString *command = g_string_new("/connect "); g_string_append(command, account); - cmd_process_input(command->str); + cmd_process_input(window, command->str); g_string_free(command, TRUE); } static gboolean -_cmd_execute(const char * const command, const char * const inp) +_cmd_execute(ProfWin *window, const char * const command, const char * const inp) { - if (g_str_has_prefix(command, "/field") && ui_current_win_type() == WIN_MUC_CONFIG) { + if (g_str_has_prefix(command, "/field") && window->type == WIN_MUC_CONFIG) { gboolean result = FALSE; gchar **args = parse_args_with_freetext(inp, 1, 2, &result); if (!result) { @@ -1908,7 +1906,7 @@ _cmd_execute(const char * const command, const char * const inp) } else { gchar **tokens = g_strsplit(inp, " ", 2); char *field = tokens[0] + 1; - result = cmd_form_field(field, args); + result = cmd_form_field(window, field, args); g_strfreev(tokens); } @@ -1925,15 +1923,15 @@ _cmd_execute(const char * const command, const char * const inp) ui_invalid_command_usage(cmd->help.usage, cmd->setting_func); return TRUE; } else { - gboolean result = cmd->func(args, cmd->help); + gboolean result = cmd->func(window, args, cmd->help); g_strfreev(args); return result; } } else { gboolean ran_alias = FALSE; - gboolean alias_result = cmd_execute_alias(inp, &ran_alias); + gboolean alias_result = cmd_execute_alias(window, inp, &ran_alias); if (!ran_alias) { - return cmd_execute_default(inp); + return cmd_execute_default(window, inp); } else { return alias_result; } @@ -1941,7 +1939,7 @@ _cmd_execute(const char * const command, const char * const inp) } static char * -_cmd_complete_parameters(const char * const input) +_cmd_complete_parameters(ProfWin *window, const char * const input) { int i; char *result = NULL; @@ -1959,7 +1957,7 @@ _cmd_complete_parameters(const char * const input) } // autocomplete nickname in chat rooms - if (ui_current_win_type() == WIN_MUC) { + if (window->type == WIN_MUC) { ProfMucWin *mucwin = wins_get_current_muc(); Autocomplete nick_ac = muc_roster_ac(mucwin->roomjid); if (nick_ac) { @@ -2065,9 +2063,9 @@ _cmd_complete_parameters(const char * const input) } parsed[i] = '\0'; - char * (*ac_func)(const char * const) = g_hash_table_lookup(ac_funcs, parsed); + char * (*ac_func)(ProfWin*, const char * const) = g_hash_table_lookup(ac_funcs, parsed); if (ac_func) { - result = ac_func(input); + result = ac_func(window, input); if (result) { g_hash_table_destroy(ac_funcs); return result; @@ -2076,7 +2074,7 @@ _cmd_complete_parameters(const char * const input) g_hash_table_destroy(ac_funcs); if (g_str_has_prefix(input, "/field")) { - result = _form_field_autocomplete(input); + result = _form_field_autocomplete(window, input); if (result) { return result; } @@ -2086,7 +2084,7 @@ _cmd_complete_parameters(const char * const input) } static char * -_sub_autocomplete(const char * const input) +_sub_autocomplete(ProfWin *window, const char * const input) { char *result = NULL; result = autocomplete_param_with_func(input, "/sub allow", presence_sub_request_find); @@ -2106,12 +2104,11 @@ _sub_autocomplete(const char * const input) } static char * -_who_autocomplete(const char * const input) +_who_autocomplete(ProfWin *window, const char * const input) { char *result = NULL; - win_type_t win_type = ui_current_win_type(); - if (win_type == WIN_MUC) { + if (window->type == WIN_MUC) { result = autocomplete_param_with_ac(input, "/who", who_room_ac, TRUE); if (result) { return result; @@ -2139,7 +2136,7 @@ _who_autocomplete(const char * const input) } static char * -_roster_autocomplete(const char * const input) +_roster_autocomplete(ProfWin *window, const char * const input) { char *result = NULL; result = autocomplete_param_with_func(input, "/roster nick", roster_barejid_autocomplete); @@ -2175,7 +2172,7 @@ _roster_autocomplete(const char * const input) } static char * -_group_autocomplete(const char * const input) +_group_autocomplete(ProfWin *window, const char * const input) { char *result = NULL; result = autocomplete_param_with_func(input, "/group show", roster_group_autocomplete); @@ -2208,7 +2205,7 @@ _group_autocomplete(const char * const input) } static char * -_bookmark_autocomplete(const char * const input) +_bookmark_autocomplete(ProfWin *window, const char * const input) { char *found = NULL; @@ -2287,7 +2284,7 @@ _bookmark_autocomplete(const char * const input) } static char * -_notify_autocomplete(const char * const input) +_notify_autocomplete(ProfWin *window, const char * const input) { int i = 0; char *result = NULL; @@ -2350,7 +2347,7 @@ _notify_autocomplete(const char * const input) } static char * -_autoaway_autocomplete(const char * const input) +_autoaway_autocomplete(ProfWin *window, const char * const input) { char *result = NULL; @@ -2372,7 +2369,7 @@ _autoaway_autocomplete(const char * const input) } static char * -_log_autocomplete(const char * const input) +_log_autocomplete(ProfWin *window, const char * const input) { char *result = NULL; @@ -2395,7 +2392,7 @@ _log_autocomplete(const char * const input) } static char * -_autoconnect_autocomplete(const char * const input) +_autoconnect_autocomplete(ProfWin *window, const char * const input) { char *result = NULL; @@ -2413,7 +2410,7 @@ _autoconnect_autocomplete(const char * const input) } static char * -_otr_autocomplete(const char * const input) +_otr_autocomplete(ProfWin *window, const char * const input) { char *found = NULL; @@ -2466,7 +2463,7 @@ _otr_autocomplete(const char * const input) } static char * -_theme_autocomplete(const char * const input) +_theme_autocomplete(ProfWin *window, const char * const input) { char *result = NULL; if ((strncmp(input, "/theme load ", 12) == 0) && (strlen(input) > 12)) { @@ -2495,12 +2492,11 @@ _theme_autocomplete(const char * const input) } static char * -_resource_autocomplete(const char * const input) +_resource_autocomplete(ProfWin *window, const char * const input) { char *found = NULL; - ProfWin *current = wins_get_current(); - if (current && current->type == WIN_CHAT) { + if (window->type == WIN_CHAT) { ProfChatWin *chatwin = wins_get_current_chat(); PContact contact = roster_get_contact(chatwin->barejid); if (contact) { @@ -2531,7 +2527,7 @@ _resource_autocomplete(const char * const input) } static char * -_titlebar_autocomplete(const char * const input) +_titlebar_autocomplete(ProfWin *window, const char * const input) { char *found = NULL; @@ -2554,7 +2550,7 @@ _titlebar_autocomplete(const char * const input) } static char * -_inpblock_autocomplete(const char * const input) +_inpblock_autocomplete(ProfWin *window, const char * const input) { char *found = NULL; @@ -2572,16 +2568,15 @@ _inpblock_autocomplete(const char * const input) } static char * -_form_autocomplete(const char * const input) +_form_autocomplete(ProfWin *window, const char * const input) { - ProfWin *current = wins_get_current(); - if (current->type != WIN_MUC_CONFIG) { + if (window->type != WIN_MUC_CONFIG) { return NULL; } char *found = NULL; - ProfMucConfWin *confwin = (ProfMucConfWin*)current; + ProfMucConfWin *confwin = (ProfMucConfWin*)window; DataForm *form = confwin->form; if (form) { found = autocomplete_param_with_ac(input, "/form help", form->tag_ac, TRUE); @@ -2599,16 +2594,15 @@ _form_autocomplete(const char * const input) } static char * -_form_field_autocomplete(const char * const input) +_form_field_autocomplete(ProfWin *window, const char * const input) { - ProfWin *current = wins_get_current(); - if (current->type != WIN_MUC_CONFIG) { + if (window->type != WIN_MUC_CONFIG) { return NULL; } char *found = NULL; - ProfMucConfWin *confwin = (ProfMucConfWin*)current; + ProfMucConfWin *confwin = (ProfMucConfWin*)window; DataForm *form = confwin->form; if (form == NULL) { return NULL; @@ -2670,7 +2664,7 @@ _form_field_autocomplete(const char * const input) } static char * -_occupants_autocomplete(const char * const input) +_occupants_autocomplete(ProfWin *window, const char * const input) { char *found = NULL; @@ -2708,7 +2702,7 @@ _occupants_autocomplete(const char * const input) } static char * -_time_autocomplete(const char * const input) +_time_autocomplete(ProfWin *window, const char * const input) { char *found = NULL; @@ -2726,11 +2720,11 @@ _time_autocomplete(const char * const input) } static char * -_kick_autocomplete(const char * const input) +_kick_autocomplete(ProfWin *window, const char * const input) { char *result = NULL; - if (ui_current_win_type() == WIN_MUC) { + if (window->type == WIN_MUC) { ProfMucWin *mucwin = wins_get_current_muc(); Autocomplete nick_ac = muc_roster_ac(mucwin->roomjid); @@ -2746,11 +2740,11 @@ _kick_autocomplete(const char * const input) } static char * -_ban_autocomplete(const char * const input) +_ban_autocomplete(ProfWin *window, const char * const input) { char *result = NULL; - if (ui_current_win_type() == WIN_MUC) { + if (window->type == WIN_MUC) { ProfMucWin *mucwin = wins_get_current_muc(); Autocomplete jid_ac = muc_roster_jid_ac(mucwin->roomjid); @@ -2766,11 +2760,11 @@ _ban_autocomplete(const char * const input) } static char * -_affiliation_autocomplete(const char * const input) +_affiliation_autocomplete(ProfWin *window, const char * const input) { char *result = NULL; - if (ui_current_win_type() == WIN_MUC) { + if (window->type == WIN_MUC) { ProfMucWin *mucwin = wins_get_current_muc(); gboolean parse_result; Autocomplete jid_ac = muc_roster_jid_ac(mucwin->roomjid); @@ -2813,11 +2807,11 @@ _affiliation_autocomplete(const char * const input) } static char * -_role_autocomplete(const char * const input) +_role_autocomplete(ProfWin *window, const char * const input) { char *result = NULL; - if (ui_current_win_type() == WIN_MUC) { + if (window->type == WIN_MUC) { ProfMucWin *mucwin = wins_get_current_muc(); gboolean parse_result; Autocomplete nick_ac = muc_roster_ac(mucwin->roomjid); @@ -2860,7 +2854,7 @@ _role_autocomplete(const char * const input) } static char * -_statuses_autocomplete(const char * const input) +_statuses_autocomplete(ProfWin *window, const char * const input) { char *result = NULL; @@ -2888,7 +2882,7 @@ _statuses_autocomplete(const char * const input) } static char * -_receipts_autocomplete(const char * const input) +_receipts_autocomplete(ProfWin *window, const char * const input) { char *result = NULL; @@ -2911,7 +2905,7 @@ _receipts_autocomplete(const char * const input) } static char * -_alias_autocomplete(const char * const input) +_alias_autocomplete(ProfWin *window, const char * const input) { char *result = NULL; @@ -2929,7 +2923,7 @@ _alias_autocomplete(const char * const input) } static char * -_connect_autocomplete(const char * const input) +_connect_autocomplete(ProfWin *window, const char * const input) { char *found = NULL; gboolean result = FALSE; @@ -2964,7 +2958,7 @@ _connect_autocomplete(const char * const input) } static char * -_join_autocomplete(const char * const input) +_join_autocomplete(ProfWin *window, const char * const input) { char *found = NULL; gboolean result = FALSE; @@ -2999,7 +2993,7 @@ _join_autocomplete(const char * const input) } static char * -_account_autocomplete(const char * const input) +_account_autocomplete(ProfWin *window, const char * const input) { char *found = NULL; gboolean result = FALSE; diff --git a/src/command/command.h b/src/command/command.h index b500404b..e6fc7ead 100644 --- a/src/command/command.h +++ b/src/command/command.h @@ -38,14 +38,15 @@ #include <glib.h> #include "xmpp/form.h" +#include "ui/ui.h" GHashTable *commands; void cmd_init(void); void cmd_uninit(void); -char* cmd_autocomplete(const char * const input); -void cmd_reset_autocomplete(void); +char* cmd_autocomplete(ProfWin *window, const char * const input); +void cmd_reset_autocomplete(ProfWin *window); void cmd_autocomplete_add(char *value); void cmd_autocomplete_remove(char *value); void cmd_autocomplete_add_form_fields(DataForm *form); @@ -53,8 +54,8 @@ void cmd_autocomplete_remove_form_fields(DataForm *form); void cmd_alias_add(char *value); void cmd_alias_remove(char *value); -gboolean cmd_process_input(char *inp); -void cmd_execute_connect(const char * const account); +gboolean cmd_process_input(ProfWin *window, char *inp); +void cmd_execute_connect(ProfWin *window, const char * const account); gboolean cmd_exists(char *cmd); diff --git a/src/command/commands.c b/src/command/commands.c index 854d2061..e3a6acd4 100644 --- a/src/command/commands.c +++ b/src/command/commands.c @@ -77,13 +77,13 @@ static gboolean _cmd_set_boolean_preference(gchar *arg, struct cmd_help_t help, const char * const display, preference_t pref); static void _cmd_show_filtered_help(char *heading, gchar *cmd_filter[], int filter_size); static gint _compare_commands(Command *a, Command *b); -static void _who_room(gchar **args, struct cmd_help_t help); -static void _who_roster(gchar **args, struct cmd_help_t help); +static void _who_room(ProfWin *window, gchar **args, struct cmd_help_t help); +static void _who_roster(ProfWin *window, gchar **args, struct cmd_help_t help); extern GHashTable *commands; gboolean -cmd_execute_default(const char * inp) +cmd_execute_default(ProfWin *window, const char * inp) { // handle escaped commands - treat as normal message if (g_str_has_prefix(inp, "//")) { @@ -97,8 +97,7 @@ cmd_execute_default(const char * inp) } // handle non commands in non chat windows - ProfWin *current = wins_get_current(); - if (current->type != WIN_CHAT && current->type != WIN_MUC && current->type != WIN_PRIVATE) { + if (window->type != WIN_CHAT && window->type != WIN_MUC && window->type != WIN_PRIVATE) { cons_show("Unknown command: %s", inp); return TRUE; } @@ -109,7 +108,7 @@ cmd_execute_default(const char * inp) return TRUE; } - switch (current->type) { + switch (window->type) { case WIN_CHAT: { ProfChatWin *chatwin = wins_get_current_chat(); @@ -136,7 +135,7 @@ cmd_execute_default(const char * inp) } gboolean -cmd_execute_alias(const char * const inp, gboolean *ran) +cmd_execute_alias(ProfWin *window, const char * const inp, gboolean *ran) { if (inp[0] != '/') { ran = FALSE; @@ -148,7 +147,7 @@ cmd_execute_alias(const char * const inp, gboolean *ran) free(alias); if (value) { *ran = TRUE; - return cmd_process_input(value); + return cmd_process_input(window, value); } *ran = FALSE; @@ -156,7 +155,7 @@ cmd_execute_alias(const char * const inp, gboolean *ran) } gboolean -cmd_connect(gchar **args, struct cmd_help_t help) +cmd_connect(ProfWin *window, gchar **args, struct cmd_help_t help) { jabber_conn_status_t conn_status = jabber_get_connection_status(); if ((conn_status != JABBER_DISCONNECTED) && (conn_status != JABBER_STARTED)) { @@ -258,7 +257,7 @@ cmd_connect(gchar **args, struct cmd_help_t help) } gboolean -cmd_account(gchar **args, struct cmd_help_t help) +cmd_account(ProfWin *window, gchar **args, struct cmd_help_t help) { char *command = args[0]; @@ -578,7 +577,7 @@ cmd_account(gchar **args, struct cmd_help_t help) } gboolean -cmd_sub(gchar **args, struct cmd_help_t help) +cmd_sub(ProfWin *window, gchar **args, struct cmd_help_t help) { jabber_conn_status_t conn_status = jabber_get_connection_status(); @@ -606,8 +605,7 @@ cmd_sub(gchar **args, struct cmd_help_t help) return TRUE; } - win_type_t win_type = ui_current_win_type(); - if ((win_type != WIN_CHAT) && (jid == NULL)) { + if ((window->type != WIN_CHAT) && (jid == NULL)) { cons_show("You must specify a contact."); return TRUE; } @@ -634,13 +632,13 @@ cmd_sub(gchar **args, struct cmd_help_t help) } else if (strcmp(subcmd, "show") == 0) { PContact contact = roster_get_contact(jidp->barejid); if ((contact == NULL) || (p_contact_subscription(contact) == NULL)) { - if (win_type == WIN_CHAT) { + if (window->type == WIN_CHAT) { ui_current_print_line("No subscription information for %s.", jidp->barejid); } else { cons_show("No subscription information for %s.", jidp->barejid); } } else { - if (win_type == WIN_CHAT) { + if (window->type == WIN_CHAT) { if (p_contact_pending_out(contact)) { ui_current_print_line("%s subscription status: %s, request pending.", jidp->barejid, p_contact_subscription(contact)); @@ -668,7 +666,7 @@ cmd_sub(gchar **args, struct cmd_help_t help) } gboolean -cmd_disconnect(gchar **args, struct cmd_help_t help) +cmd_disconnect(ProfWin *window, gchar **args, struct cmd_help_t help) { if (jabber_get_connection_status() == JABBER_CONNECTED) { char *jid = strdup(jabber_get_fulljid()); @@ -687,7 +685,7 @@ cmd_disconnect(gchar **args, struct cmd_help_t help) } gboolean -cmd_quit(gchar **args, struct cmd_help_t help) +cmd_quit(ProfWin *window, gchar **args, struct cmd_help_t help) { log_info("Profanity is shutting down..."); exit(0); @@ -695,7 +693,7 @@ cmd_quit(gchar **args, struct cmd_help_t help) } gboolean -cmd_wins(gchar **args, struct cmd_help_t help) +cmd_wins(ProfWin *window, gchar **args, struct cmd_help_t help) { if (args[0] == NULL) { cons_show_wins(); @@ -734,7 +732,7 @@ cmd_wins(gchar **args, struct cmd_help_t help) } gboolean -cmd_winstidy(gchar **args, struct cmd_help_t help) +cmd_winstidy(ProfWin *window, gchar **args, struct cmd_help_t help) { gboolean result = _cmd_set_boolean_preference(args[0], help, "Wins Auto Tidy", PREF_WINS_AUTO_TIDY); @@ -746,22 +744,22 @@ cmd_winstidy(gchar **args, struct cmd_help_t help) } gboolean -cmd_win(gchar **args, struct cmd_help_t help) +cmd_win(ProfWin *window, gchar **args, struct cmd_help_t help) { int num = atoi(args[0]); - ProfWin *window = wins_get_by_num(num); - if (!window) { + ProfWin *focuswin = wins_get_by_num(num); + if (!focuswin) { cons_show("Window %d does not exist.", num); } else { - ui_ev_focus_win(window); + ui_ev_focus_win(focuswin); } return TRUE; } gboolean -cmd_help(gchar **args, struct cmd_help_t help) +cmd_help(ProfWin *window, gchar **args, struct cmd_help_t help) { int num_args = g_strv_length(args); if (num_args == 0) { @@ -863,14 +861,14 @@ cmd_help(gchar **args, struct cmd_help_t help) } gboolean -cmd_about(gchar **args, struct cmd_help_t help) +cmd_about(ProfWin *window, gchar **args, struct cmd_help_t help) { ui_about(); return TRUE; } gboolean -cmd_prefs(gchar **args, struct cmd_help_t help) +cmd_prefs(ProfWin *window, gchar **args, struct cmd_help_t help) { if (args[0] == NULL) { cons_prefs(); @@ -911,7 +909,7 @@ cmd_prefs(gchar **args, struct cmd_help_t help) } gboolean -cmd_theme(gchar **args, struct cmd_help_t help) +cmd_theme(ProfWin *window, gchar **args, struct cmd_help_t help) { // list themes if (g_strcmp0(args[0], "list") == 0) { @@ -953,7 +951,7 @@ cmd_theme(gchar **args, struct cmd_help_t help) } static void -_who_room(gchar **args, struct cmd_help_t help) +_who_room(ProfWin *window, gchar **args, struct cmd_help_t help) { if ((g_strv_length(args) == 2) && args[1]) { cons_show("Argument group is not applicable to chat rooms."); @@ -1082,7 +1080,7 @@ _who_room(gchar **args, struct cmd_help_t help) } static void -_who_roster(gchar **args, struct cmd_help_t help) +_who_roster(ProfWin *window, gchar **args, struct cmd_help_t help) { char *presence = args[0]; @@ -1295,20 +1293,19 @@ _who_roster(gchar **args, struct cmd_help_t help) } gboolean -cmd_who(gchar **args, struct cmd_help_t help) +cmd_who(ProfWin *window, gchar **args, struct cmd_help_t help) { jabber_conn_status_t conn_status = jabber_get_connection_status(); - win_type_t win_type = ui_current_win_type(); if (conn_status != JABBER_CONNECTED) { cons_show("You are not currently connected."); - } else if (win_type == WIN_MUC) { - _who_room(args, help); + } else if (window->type == WIN_MUC) { + _who_room(window, args, help); } else { - _who_roster(args, help); + _who_roster(window, args, help); } - if (win_type != WIN_CONSOLE && win_type != WIN_MUC) { + if (window->type != WIN_CONSOLE && window->type != WIN_MUC) { ui_statusbar_new(1); } @@ -1316,13 +1313,12 @@ cmd_who(gchar **args, struct cmd_help_t help) } gboolean -cmd_msg(gchar **args, struct cmd_help_t help) +cmd_msg(ProfWin *window, gchar **args, struct cmd_help_t help) { char *usr = args[0]; char *msg = args[1]; jabber_conn_status_t conn_status = jabber_get_connection_status(); - win_type_t win_type = ui_current_win_type(); if (conn_status != JABBER_CONNECTED) { cons_show("You are not currently connected."); @@ -1330,7 +1326,7 @@ cmd_msg(gchar **args, struct cmd_help_t help) } // send private message when in MUC room - if (win_type == WIN_MUC) { + if (window->type == WIN_MUC) { ProfMucWin *mucwin = wins_get_current_muc(); if (muc_roster_contains_nick(mucwin->roomjid, usr)) { GString *full_jid = g_string_new(mucwin->roomjid); @@ -1383,7 +1379,7 @@ cmd_msg(gchar **args, struct cmd_help_t help) } gboolean -cmd_group(gchar **args, struct cmd_help_t help) +cmd_group(ProfWin *window, gchar **args, struct cmd_help_t help) { jabber_conn_status_t conn_status = jabber_get_connection_status(); @@ -1490,7 +1486,7 @@ cmd_group(gchar **args, struct cmd_help_t help) } gboolean -cmd_roster(gchar **args, struct cmd_help_t help) +cmd_roster(ProfWin *window, gchar **args, struct cmd_help_t help) { jabber_conn_status_t conn_status = jabber_get_connection_status(); @@ -1717,7 +1713,7 @@ cmd_roster(gchar **args, struct cmd_help_t help) } gboolean -cmd_resource(gchar **args, struct cmd_help_t help) +cmd_resource(ProfWin *window, gchar **args, struct cmd_help_t help) { char *cmd = args[0]; char *setting = NULL; @@ -1739,12 +1735,11 @@ cmd_resource(gchar **args, struct cmd_help_t help) } } - ProfWin *current = wins_get_current(); - if (current->type != WIN_CHAT) { + if (window->type != WIN_CHAT) { cons_show("Resource can only be changed in chat windows."); return TRUE; } - ProfChatWin *chatwin = (ProfChatWin*)current; + ProfChatWin *chatwin = (ProfChatWin*)window; if (g_strcmp0(cmd, "set") == 0) { char *resource = args[1]; @@ -1790,24 +1785,22 @@ cmd_resource(gchar **args, struct cmd_help_t help) } gboolean -cmd_status(gchar **args, struct cmd_help_t help) +cmd_status(ProfWin *window, gchar **args, struct cmd_help_t help) { char *usr = args[0]; jabber_conn_status_t conn_status = jabber_get_connection_status(); - win_type_t win_type = ui_current_win_type(); if (conn_status != JABBER_CONNECTED) { cons_show("You are not currently connected."); return TRUE; } - switch (win_type) + switch (window->type) { case WIN_MUC: if (usr) { ProfMucWin *mucwin = wins_get_current_muc(); - ProfWin *window = (ProfWin*) mucwin; Occupant *occupant = muc_roster_item(mucwin->roomjid, usr); if (occupant) { win_show_occupant(window, occupant); @@ -1823,7 +1816,6 @@ cmd_status(gchar **args, struct cmd_help_t help) ui_current_print_line("No parameter required when in chat."); } else { ProfChatWin *chatwin = wins_get_current_chat(); - ProfWin *window = (ProfWin*) chatwin; PContact pcontact = roster_get_contact(chatwin->barejid); if (pcontact) { win_show_contact(window, pcontact); @@ -1837,7 +1829,6 @@ cmd_status(gchar **args, struct cmd_help_t help) ui_current_print_line("No parameter required when in chat."); } else { ProfPrivateWin *privatewin = wins_get_current_private(); - ProfWin *window = (ProfWin*) privatewin; Jid *jid = jid_create(privatewin->fulljid); Occupant *occupant = muc_roster_item(jid->barejid, jid->resourcepart); if (occupant) { @@ -1867,12 +1858,11 @@ cmd_status(gchar **args, struct cmd_help_t help) } gboolean -cmd_info(gchar **args, struct cmd_help_t help) +cmd_info(ProfWin *window, gchar **args, struct cmd_help_t help) { char *usr = args[0]; jabber_conn_status_t conn_status = jabber_get_connection_status(); - win_type_t win_type = ui_current_win_type(); PContact pcontact = NULL; if (conn_status != JABBER_CONNECTED) { @@ -1880,15 +1870,14 @@ cmd_info(gchar **args, struct cmd_help_t help) return TRUE; } - switch (win_type) + switch (window->type) { case WIN_MUC: if (usr) { ProfMucWin *mucwin = wins_get_current_muc(); Occupant *occupant = muc_roster_item(mucwin->roomjid, usr); if (occupant) { - ProfWin *current = wins_get_current(); - win_show_occupant_info(current, mucwin->roomjid, occupant); + win_show_occupant_info(window, mucwin->roomjid, occupant); } else { ui_current_print_line("No such occupant \"%s\" in room.", usr); } @@ -1904,7 +1893,6 @@ cmd_info(gchar **args, struct cmd_help_t help) ui_current_print_line("No parameter required when in chat."); } else { ProfChatWin *chatwin = wins_get_current_chat(); - ProfWin *window = (ProfWin*) chatwin; PContact pcontact = roster_get_contact(chatwin->barejid); if (pcontact) { win_show_info(window, pcontact); @@ -1918,7 +1906,6 @@ cmd_info(gchar **args, struct cmd_help_t help) ui_current_print_line("No parameter required when in chat."); } else { ProfPrivateWin *privatewin = wins_get_current_private(); - ProfWin *window = (ProfWin*) privatewin; Jid *jid = jid_create(privatewin->fulljid); Occupant *occupant = muc_roster_item(jid->barejid, jid->resourcepart); if (occupant) { @@ -1953,10 +1940,9 @@ cmd_info(gchar **args, struct cmd_help_t help) } gboolean -cmd_caps(gchar **args, struct cmd_help_t help) +cmd_caps(ProfWin *window, gchar **args, struct cmd_help_t help) { jabber_conn_status_t conn_status = jabber_get_connection_status(); - win_type_t win_type = ui_current_win_type(); PContact pcontact = NULL; Occupant *occupant = NULL; @@ -1965,7 +1951,7 @@ cmd_caps(gchar **args, struct cmd_help_t help) return TRUE; } - switch (win_type) + switch (window->type) { case WIN_MUC: if (args[0]) { @@ -2029,10 +2015,9 @@ cmd_caps(gchar **args, struct cmd_help_t help) gboolean -cmd_software(gchar **args, struct cmd_help_t help) +cmd_software(ProfWin *window, gchar **args, struct cmd_help_t help) { jabber_conn_status_t conn_status = jabber_get_connection_status(); - win_type_t win_type = ui_current_win_type(); Occupant *occupant = NULL; if (conn_status != JABBER_CONNECTED) { @@ -2040,7 +2025,7 @@ cmd_software(gchar **args, struct cmd_help_t help) return TRUE; } - switch (win_type) + switch (window->type) { case WIN_MUC: if (args[0]) { @@ -2088,7 +2073,7 @@ cmd_software(gchar **args, struct cmd_help_t help) } gboolean -cmd_join(gchar **args, struct cmd_help_t help) +cmd_join(ProfWin *window, gchar **args, struct cmd_help_t help) { jabber_conn_status_t conn_status = jabber_get_connection_status(); if (conn_status != JABBER_CONNECTED) { @@ -2185,7 +2170,7 @@ cmd_join(gchar **args, struct cmd_help_t help) } gboolean -cmd_invite(gchar **args, struct cmd_help_t help) +cmd_invite(ProfWin *window, gchar **args, struct cmd_help_t help) { char *contact = args[0]; char *reason = args[1]; @@ -2196,7 +2181,7 @@ cmd_invite(gchar **args, struct cmd_help_t help) return TRUE; } - if (ui_current_win_type() != WIN_MUC) { + if (window->type != WIN_MUC) { cons_show("You must be in a chat room to send an invite."); return TRUE; } @@ -2220,7 +2205,7 @@ cmd_invite(gchar **args, struct cmd_help_t help) } gboolean -cmd_invites(gchar **args, struct cmd_help_t help) +cmd_invites(ProfWin *window, gchar **args, struct cmd_help_t help) { GSList *invites = muc_invites(); cons_show_room_invites(invites); @@ -2229,7 +2214,7 @@ cmd_invites(gchar **args, struct cmd_help_t help) } gboolean -cmd_decline(gchar **args, struct cmd_help_t help) +cmd_decline(ProfWin *window, gchar **args, struct cmd_help_t help) { if (!muc_invites_contain(args[0])) { cons_show("No such invite exists."); @@ -2242,14 +2227,13 @@ cmd_decline(gchar **args, struct cmd_help_t help) } gboolean -cmd_form_field(char *tag, gchar **args) +cmd_form_field(ProfWin *window, char *tag, gchar **args) { - ProfWin *current = wins_get_current(); - if (current->type != WIN_MUC_CONFIG) { + if (window->type != WIN_MUC_CONFIG) { return TRUE; } - ProfMucConfWin *confwin = (ProfMucConfWin*)current; + ProfMucConfWin *confwin = (ProfMucConfWin*)window; DataForm *form = confwin->form; if (form) { if (!form_tag_exists(form, tag)) { @@ -2270,11 +2254,11 @@ cmd_form_field(char *tag, gchar **args) if (g_strcmp0(value, "on") == 0) { form_set_value(form, tag, "1"); ui_current_print_line("Field updated..."); - ui_show_form_field(current, form, tag); + ui_show_form_field(window, form, tag); } else if (g_strcmp0(value, "off") == 0) { form_set_value(form, tag, "0"); ui_current_print_line("Field updated..."); - ui_show_form_field(current, form, tag); + ui_show_form_field(window, form, tag); } else { ui_current_print_line("Invalid command, usage:"); ui_show_form_field_help(confwin, tag); @@ -2293,7 +2277,7 @@ cmd_form_field(char *tag, gchar **args) } else { form_set_value(form, tag, value); ui_current_print_line("Field updated..."); - ui_show_form_field(current, form, tag); + ui_show_form_field(window, form, tag); } break; case FIELD_LIST_SINGLE: @@ -2305,7 +2289,7 @@ cmd_form_field(char *tag, gchar **args) } else { form_set_value(form, tag, value); ui_current_print_line("Field updated..."); - ui_show_form_field(current, form, tag); + ui_show_form_field(window, form, tag); } break; @@ -2329,7 +2313,7 @@ cmd_form_field(char *tag, gchar **args) if (g_strcmp0(cmd, "add") == 0) { form_add_value(form, tag, value); ui_current_print_line("Field updated..."); - ui_show_form_field(current, form, tag); + ui_show_form_field(window, form, tag); break; } if (g_strcmp0(args[0], "remove") == 0) { @@ -2357,7 +2341,7 @@ cmd_form_field(char *tag, gchar **args) removed = form_remove_text_multi_value(form, tag, index); if (removed) { ui_current_print_line("Field updated..."); - ui_show_form_field(current, form, tag); + ui_show_form_field(window, form, tag); } else { ui_current_print_line("Could not remove %s from %s", value, tag); } @@ -2386,7 +2370,7 @@ cmd_form_field(char *tag, gchar **args) added = form_add_unique_value(form, tag, value); if (added) { ui_current_print_line("Field updated..."); - ui_show_form_field(current, form, tag); + ui_show_form_field(window, form, tag); } else { ui_current_print_line("Value %s already selected for %s", value, tag); } @@ -2403,7 +2387,7 @@ cmd_form_field(char *tag, gchar **args) removed = form_remove_value(form, tag, value); if (removed) { ui_current_print_line("Field updated..."); - ui_show_form_field(current, form, tag); + ui_show_form_field(window, form, tag); } else { ui_current_print_line("Value %s is not currently set for %s", value, tag); } @@ -2435,7 +2419,7 @@ cmd_form_field(char *tag, gchar **args) added = form_add_unique_value(form, tag, value); if (added) { ui_current_print_line("Field updated..."); - ui_show_form_field(current, form, tag); + ui_show_form_field(window, form, tag); } else { ui_current_print_line("JID %s already exists in %s", value, tag); } @@ -2445,7 +2429,7 @@ cmd_form_field(char *tag, gchar **args) removed = form_remove_value(form, tag, value); if (removed) { ui_current_print_line("Field updated..."); - ui_show_form_field(current, form, tag); + ui_show_form_field(window, form, tag); } else { ui_current_print_line("Field %s does not contain %s", tag, value); } @@ -2461,7 +2445,7 @@ cmd_form_field(char *tag, gchar **args) } gboolean -cmd_form(gchar **args, struct cmd_help_t help) +cmd_form(ProfWin *window, gchar **args, struct cmd_help_t help) { jabber_conn_status_t conn_status = jabber_get_connection_status(); @@ -2470,8 +2454,7 @@ cmd_form(gchar **args, struct cmd_help_t help) return TRUE; } - win_type_t win_type = ui_current_win_type(); - if (win_type != WIN_MUC_CONFIG) { + if (window->type != WIN_MUC_CONFIG) { cons_show("Command '/form' does not apply to this window."); return TRUE; } @@ -2513,7 +2496,6 @@ cmd_form(gchar **args, struct cmd_help_t help) if (g_strcmp0(args[0], "submit") == 0) { iq_submit_room_config(confwin->roomjid, confwin->form); - } if (g_strcmp0(args[0], "cancel") == 0) { @@ -2536,7 +2518,7 @@ cmd_form(gchar **args, struct cmd_help_t help) } gboolean -cmd_kick(gchar **args, struct cmd_help_t help) +cmd_kick(ProfWin *window, gchar **args, struct cmd_help_t help) { jabber_conn_status_t conn_status = jabber_get_connection_status(); @@ -2545,8 +2527,7 @@ cmd_kick(gchar **args, struct cmd_help_t help) return TRUE; } - win_type_t win_type = ui_current_win_type(); - if (win_type != WIN_MUC) { + if (window->type != WIN_MUC) { cons_show("Command '/kick' only applies in chat rooms."); return TRUE; } @@ -2569,7 +2550,7 @@ cmd_kick(gchar **args, struct cmd_help_t help) } gboolean -cmd_ban(gchar **args, struct cmd_help_t help) +cmd_ban(ProfWin *window, gchar **args, struct cmd_help_t help) { jabber_conn_status_t conn_status = jabber_get_connection_status(); @@ -2578,8 +2559,7 @@ cmd_ban(gchar **args, struct cmd_help_t help) return TRUE; } - win_type_t win_type = ui_current_win_type(); - if (win_type != WIN_MUC) { + if (window->type != WIN_MUC) { cons_show("Command '/ban' only applies in chat rooms."); return TRUE; } @@ -2597,7 +2577,7 @@ cmd_ban(gchar **args, struct cmd_help_t help) } gboolean -cmd_subject(gchar **args, struct cmd_help_t help) +cmd_subject(ProfWin *window, gchar **args, struct cmd_help_t help) { jabber_conn_status_t conn_status = jabber_get_connection_status(); @@ -2606,14 +2586,12 @@ cmd_subject(gchar **args, struct cmd_help_t help) return TRUE; } - win_type_t win_type = ui_current_win_type(); - if (win_type != WIN_MUC) { + if (window->type != WIN_MUC) { cons_show("Command '/room' does not apply to this window."); return TRUE; } ProfMucWin *mucwin = wins_get_current_muc(); - ProfWin *window = (ProfWin*) mucwin; if (args[0] == NULL) { char *subject = muc_subject(mucwin->roomjid); @@ -2645,7 +2623,7 @@ cmd_subject(gchar **args, struct cmd_help_t help) } gboolean -cmd_affiliation(gchar **args, struct cmd_help_t help) +cmd_affiliation(ProfWin *window, gchar **args, struct cmd_help_t help) { jabber_conn_status_t conn_status = jabber_get_connection_status(); @@ -2654,8 +2632,7 @@ cmd_affiliation(gchar **args, struct cmd_help_t help) return TRUE; } - win_type_t win_type = ui_current_win_type(); - if (win_type != WIN_MUC) { + if (window->type != WIN_MUC) { cons_show("Command '/affiliation' does not apply to this window."); return TRUE; } @@ -2715,7 +2692,7 @@ cmd_affiliation(gchar **args, struct cmd_help_t help) } gboolean -cmd_role(gchar **args, struct cmd_help_t help) +cmd_role(ProfWin *window, gchar **args, struct cmd_help_t help) { jabber_conn_status_t conn_status = jabber_get_connection_status(); @@ -2724,8 +2701,7 @@ cmd_role(gchar **args, struct cmd_help_t help) return TRUE; } - win_type_t win_type = ui_current_win_type(); - if (win_type != WIN_MUC) { + if (window->type != WIN_MUC) { cons_show("Command '/role' does not apply to this window."); return TRUE; } @@ -2783,7 +2759,7 @@ cmd_role(gchar **args, struct cmd_help_t help) } gboolean -cmd_room(gchar **args, struct cmd_help_t help) +cmd_room(ProfWin *window, gchar **args, struct cmd_help_t help) { jabber_conn_status_t conn_status = jabber_get_connection_status(); @@ -2792,8 +2768,7 @@ cmd_room(gchar **args, struct cmd_help_t help) return TRUE; } - win_type_t win_type = ui_current_win_type(); - if (win_type != WIN_MUC) { + if (window->type != WIN_MUC) { cons_show("Command '/room' does not apply to this window."); return TRUE; } @@ -2806,7 +2781,6 @@ cmd_room(gchar **args, struct cmd_help_t help) } ProfMucWin *mucwin = wins_get_current_muc(); - ProfWin *window = (ProfWin*) mucwin; int num = wins_get_num(window); int ui_index = num; @@ -2847,7 +2821,7 @@ cmd_room(gchar **args, struct cmd_help_t help) } gboolean -cmd_occupants(gchar **args, struct cmd_help_t help) +cmd_occupants(ProfWin *window, gchar **args, struct cmd_help_t help) { jabber_conn_status_t conn_status = jabber_get_connection_status(); @@ -2902,8 +2876,7 @@ cmd_occupants(gchar **args, struct cmd_help_t help) } } - win_type_t win_type = ui_current_win_type(); - if (win_type != WIN_MUC) { + if (window->type != WIN_MUC) { cons_show("Cannot apply setting when not in chat room."); return TRUE; } @@ -2932,7 +2905,7 @@ cmd_occupants(gchar **args, struct cmd_help_t help) } gboolean -cmd_rooms(gchar **args, struct cmd_help_t help) +cmd_rooms(ProfWin *window, gchar **args, struct cmd_help_t help) { jabber_conn_status_t conn_status = jabber_get_connection_status(); @@ -2953,7 +2926,7 @@ cmd_rooms(gchar **args, struct cmd_help_t help) } gboolean -cmd_bookmark(gchar **args, struct cmd_help_t help) +cmd_bookmark(ProfWin *window, gchar **args, struct cmd_help_t help) { jabber_conn_status_t conn_status = jabber_get_connection_status(); @@ -2962,10 +2935,8 @@ cmd_bookmark(gchar **args, struct cmd_help_t help) return TRUE; } - win_type_t win_type = ui_current_win_type(); - gchar *cmd = args[0]; - if (win_type == WIN_MUC && cmd == NULL) { + if (window->type == WIN_MUC && cmd == NULL) { // default to current nickname, password, and autojoin "on" ProfMucWin *mucwin = wins_get_current_muc(); char *nick = muc_nick(mucwin->roomjid); @@ -3065,7 +3036,7 @@ cmd_bookmark(gchar **args, struct cmd_help_t help) } gboolean -cmd_disco(gchar **args, struct cmd_help_t help) +cmd_disco(ProfWin *window, gchar **args, struct cmd_help_t help) { jabber_conn_status_t conn_status = jabber_get_connection_status(); @@ -3095,7 +3066,7 @@ cmd_disco(gchar **args, struct cmd_help_t help) } gboolean -cmd_nick(gchar **args, struct cmd_help_t help) +cmd_nick(ProfWin *window, gchar **args, struct cmd_help_t help) { jabber_conn_status_t conn_status = jabber_get_connection_status(); @@ -3103,7 +3074,7 @@ cmd_nick(gchar **args, struct cmd_help_t help) cons_show("You are not currently connected."); return TRUE; } - if (ui_current_win_type() != WIN_MUC) { + if (window->type != WIN_MUC) { cons_show("You can only change your nickname in a chat room window."); return TRUE; } @@ -3116,7 +3087,7 @@ cmd_nick(gchar **args, struct cmd_help_t help) } gboolean -cmd_alias(gchar **args, struct cmd_help_t help) +cmd_alias(ProfWin *window, gchar **args, struct cmd_help_t help) { char *subcmd = args[0]; @@ -3188,28 +3159,27 @@ cmd_alias(gchar **args, struct cmd_help_t help) } gboolean -cmd_tiny(gchar **args, struct cmd_help_t help) +cmd_tiny(ProfWin *window, gchar **args, struct cmd_help_t help) { char *url = args[0]; - ProfWin *current = wins_get_current(); - if (current->type != WIN_CHAT && current->type != WIN_MUC && current->type != WIN_PRIVATE) { + if (window->type != WIN_CHAT && window->type != WIN_MUC && window->type != WIN_PRIVATE) { cons_show("/tiny can only be used in chat windows"); return TRUE; } if (!tinyurl_valid(url)) { - win_vprint(current, '-', NULL, 0, THEME_ERROR, "", "/tiny, badly formed URL: %s", url); + win_vprint(window, '-', NULL, 0, THEME_ERROR, "", "/tiny, badly formed URL: %s", url); return TRUE; } char *tiny = tinyurl_get(url); if (!tiny) { - win_print(current, '-', NULL, 0, THEME_ERROR, "", "Couldn't create tinyurl."); + win_print(window, '-', NULL, 0, THEME_ERROR, "", "Couldn't create tinyurl."); return TRUE; } - switch (current->type){ + switch (window->type){ case WIN_CHAT: { ProfChatWin *chatwin = wins_get_current_chat(); @@ -3238,15 +3208,14 @@ cmd_tiny(gchar **args, struct cmd_help_t help) } gboolean -cmd_clear(gchar **args, struct cmd_help_t help) +cmd_clear(ProfWin *window, gchar **args, struct cmd_help_t help) { - ProfWin *win = wins_get_current(); - ui_clear_win(win); + ui_clear_win(window); return TRUE; } gboolean -cmd_close(gchar **args, struct cmd_help_t help) +cmd_close(ProfWin *window, gchar **args, struct cmd_help_t help) { jabber_conn_status_t conn_status = jabber_get_connection_status(); int index = 0; @@ -3288,8 +3257,8 @@ cmd_close(gchar **args, struct cmd_help_t help) return TRUE; } - ProfWin *window = wins_get_by_num(index); - if (!window) { + ProfWin *toclose = wins_get_by_num(index); + if (!toclose) { cons_show("Window is not open."); return TRUE; } @@ -3318,13 +3287,12 @@ cmd_close(gchar **args, struct cmd_help_t help) } gboolean -cmd_leave(gchar **args, struct cmd_help_t help) +cmd_leave(ProfWin *window, gchar **args, struct cmd_help_t help) { jabber_conn_status_t conn_status = jabber_get_connection_status(); - win_type_t win_type = ui_current_win_type(); int index = wins_get_current_num(); - if (win_type != WIN_MUC) { + if (window->type != WIN_MUC) { cons_show("You can only use the /leave command in a chat room."); cons_alert(); return TRUE; @@ -3342,7 +3310,7 @@ cmd_leave(gchar **args, struct cmd_help_t help) } gboolean -cmd_privileges(gchar **args, struct cmd_help_t help) +cmd_privileges(ProfWin *window, gchar **args, struct cmd_help_t help) { gboolean result = _cmd_set_boolean_preference(args[0], help, "MUC privileges", PREF_MUC_PRIVILEGES); @@ -3352,19 +3320,19 @@ cmd_privileges(gchar **args, struct cmd_help_t help) } gboolean -cmd_beep(gchar **args, struct cmd_help_t help) +cmd_beep(ProfWin *window, gchar **args, struct cmd_help_t help) { return _cmd_set_boolean_preference(args[0], help, "Sound", PREF_BEEP); } gboolean -cmd_presence(gchar **args, struct cmd_help_t help) +cmd_presence(ProfWin *window, gchar **args, struct cmd_help_t help) { return _cmd_set_boolean_preference(args[0], help, "Contact presence", PREF_PRESENCE); } gboolean -cmd_wrap(gchar **args, struct cmd_help_t help) +cmd_wrap(ProfWin *window, gchar **args, struct cmd_help_t help) { gboolean result = _cmd_set_boolean_preference(args[0], help, "Word wrap", PREF_WRAP); @@ -3374,7 +3342,7 @@ cmd_wrap(gchar **args, struct cmd_help_t help) } gboolean -cmd_time(gchar **args, struct cmd_help_t help) +cmd_time(ProfWin *window, gchar **args, struct cmd_help_t help) { if (g_strcmp0(args[0], "statusbar") == 0) { if (g_strcmp0(args[1], "minutes") == 0) { @@ -3420,7 +3388,7 @@ cmd_time(gchar **args, struct cmd_help_t help) } gboolean -cmd_states(gchar **args, struct cmd_help_t help) +cmd_states(ProfWin *window, gchar **args, struct cmd_help_t help) { gboolean result = _cmd_set_boolean_preference(args[0], help, "Sending chat states", PREF_STATES); @@ -3435,7 +3403,7 @@ cmd_states(gchar **args, struct cmd_help_t help) } gboolean -cmd_titlebar(gchar **args, struct cmd_help_t help) +cmd_titlebar(ProfWin *window, gchar **args, struct cmd_help_t help) { if (g_strcmp0(args[0], "show") != 0 && g_strcmp0(args[0], "goodbye") != 0) { cons_show("Usage: %s", help.usage); @@ -3452,7 +3420,7 @@ cmd_titlebar(gchar **args, struct cmd_help_t help) } gboolean -cmd_outtype(gchar **args, struct cmd_help_t help) +cmd_outtype(ProfWin *window, gchar **args, struct cmd_help_t help) { gboolean result = _cmd_set_boolean_preference(args[0], help, "Sending typing notifications", PREF_OUTTYPE); @@ -3466,7 +3434,7 @@ cmd_outtype(gchar **args, struct cmd_help_t help) } gboolean -cmd_gone(gchar **args, struct cmd_help_t help) +cmd_gone(ProfWin *window, gchar **args, struct cmd_help_t help) { char *value = args[0]; @@ -3490,7 +3458,7 @@ cmd_gone(gchar **args, struct cmd_help_t help) gboolean -cmd_notify(gchar **args, struct cmd_help_t help) +cmd_notify(ProfWin *window, gchar **args, struct cmd_help_t help) { char *kind = args[0]; @@ -3633,7 +3601,7 @@ cmd_notify(gchar **args, struct cmd_help_t help) } gboolean -cmd_inpblock(gchar **args, struct cmd_help_t help) +cmd_inpblock(ProfWin *window, gchar **args, struct cmd_help_t help) { char *subcmd = args[0]; char *value = args[1]; @@ -3679,7 +3647,7 @@ cmd_inpblock(gchar **args, struct cmd_help_t help) } gboolean -cmd_log(gchar **args, struct cmd_help_t help) +cmd_log(ProfWin *window, gchar **args, struct cmd_help_t help) { char *subcmd = args[0]; char *value = args[1]; @@ -3735,7 +3703,7 @@ cmd_log(gchar **args, struct cmd_help_t help) } gboolean -cmd_reconnect(gchar **args, struct cmd_help_t help) +cmd_reconnect(ProfWin *window, gchar **args, struct cmd_help_t help) { char *value = args[0]; @@ -3759,7 +3727,7 @@ cmd_reconnect(gchar **args, struct cmd_help_t help) } gboolean -cmd_autoping(gchar **args, struct cmd_help_t help) +cmd_autoping(ProfWin *window, gchar **args, struct cmd_help_t help) { char *value = args[0]; @@ -3784,7 +3752,7 @@ cmd_autoping(gchar **args, struct cmd_help_t help) } gboolean -cmd_ping(gchar **args, struct cmd_help_t help) +cmd_ping(ProfWin *window, gchar **args, struct cmd_help_t help) { jabber_conn_status_t conn_status = jabber_get_connection_status(); @@ -3804,7 +3772,7 @@ cmd_ping(gchar **args, struct cmd_help_t help) } gboolean -cmd_autoaway(gchar **args, struct cmd_help_t help) +cmd_autoaway(ProfWin *window, gchar **args, struct cmd_help_t help) { char *setting = args[0]; char *value = args[1]; @@ -3863,7 +3831,7 @@ cmd_autoaway(gchar **args, struct cmd_help_t help) } gboolean -cmd_priority(gchar **args, struct cmd_help_t help) +cmd_priority(ProfWin *window, gchar **args, struct cmd_help_t help) { jabber_conn_status_t conn_status = jabber_get_connection_status(); @@ -3891,7 +3859,7 @@ cmd_priority(gchar **args, struct cmd_help_t help) } gboolean -cmd_statuses(gchar **args, struct cmd_help_t help) +cmd_statuses(ProfWin *window, gchar **args, struct cmd_help_t help) { if (strcmp(args[0], "console") != 0 && strcmp(args[0], "chat") != 0 && @@ -3944,7 +3912,7 @@ cmd_statuses(gchar **args, struct cmd_help_t help) } gboolean -cmd_vercheck(gchar **args, struct cmd_help_t help) +cmd_vercheck(ProfWin *window, gchar **args, struct cmd_help_t help) { int num_args = g_strv_length(args); @@ -3958,7 +3926,7 @@ cmd_vercheck(gchar **args, struct cmd_help_t help) } gboolean -cmd_xmlconsole(gchar **args, struct cmd_help_t help) +cmd_xmlconsole(ProfWin *window, gchar **args, struct cmd_help_t help) { if (!ui_xmlconsole_exists()) { ui_create_xmlconsole_win(); @@ -3970,28 +3938,28 @@ cmd_xmlconsole(gchar **args, struct cmd_help_t help) } gboolean -cmd_flash(gchar **args, struct cmd_help_t help) +cmd_flash(ProfWin *window, gchar **args, struct cmd_help_t help) { return _cmd_set_boolean_preference(args[0], help, "Screen flash", PREF_FLASH); } gboolean -cmd_intype(gchar **args, struct cmd_help_t help) +cmd_intype(ProfWin *window, gchar **args, struct cmd_help_t help) { return _cmd_set_boolean_preference(args[0], help, "Show contact typing", PREF_INTYPE); } gboolean -cmd_splash(gchar **args, struct cmd_help_t help) +cmd_splash(ProfWin *window, gchar **args, struct cmd_help_t help) { return _cmd_set_boolean_preference(args[0], help, "Splash screen", PREF_SPLASH); } gboolean -cmd_autoconnect(gchar **args, struct cmd_help_t help) +cmd_autoconnect(ProfWin *window, gchar **args, struct cmd_help_t help) { if (strcmp(args[0], "off") == 0) { prefs_set_string(PREF_CONNECT_ACCOUNT, NULL); @@ -4006,7 +3974,7 @@ cmd_autoconnect(gchar **args, struct cmd_help_t help) } gboolean -cmd_chlog(gchar **args, struct cmd_help_t help) +cmd_chlog(ProfWin *window, gchar **args, struct cmd_help_t help) { gboolean result = _cmd_set_boolean_preference(args[0], help, "Chat logging", PREF_CHLOG); @@ -4020,7 +3988,7 @@ cmd_chlog(gchar **args, struct cmd_help_t help) } gboolean -cmd_grlog(gchar **args, struct cmd_help_t help) +cmd_grlog(ProfWin *window, gchar **args, struct cmd_help_t help) { gboolean result = _cmd_set_boolean_preference(args[0], help, "Groupchat logging", PREF_GRLOG); @@ -4029,14 +3997,14 @@ cmd_grlog(gchar **args, struct cmd_help_t help) } gboolean -cmd_mouse(gchar **args, struct cmd_help_t help) +cmd_mouse(ProfWin *window, gchar **args, struct cmd_help_t help) { return _cmd_set_boolean_preference(args[0], help, "Mouse handling", PREF_MOUSE); } gboolean -cmd_history(gchar **args, struct cmd_help_t help) +cmd_history(ProfWin *window, gchar **args, struct cmd_help_t help) { gboolean result = _cmd_set_boolean_preference(args[0], help, "Chat history", PREF_HISTORY); @@ -4050,7 +4018,7 @@ cmd_history(gchar **args, struct cmd_help_t help) } gboolean -cmd_carbons(gchar **args, struct cmd_help_t help) +cmd_carbons(ProfWin *window, gchar **args, struct cmd_help_t help) { gboolean result = _cmd_set_boolean_preference(args[0], help, "Message carbons preference", PREF_CARBONS); @@ -4071,7 +4039,7 @@ cmd_carbons(gchar **args, struct cmd_help_t help) } gboolean -cmd_receipts(gchar **args, struct cmd_help_t help) +cmd_receipts(ProfWin *window, gchar **args, struct cmd_help_t help) { if (g_strcmp0(args[0], "send") == 0) { return _cmd_set_boolean_preference(args[1], help, @@ -4086,42 +4054,42 @@ cmd_receipts(gchar **args, struct cmd_help_t help) } gboolean -cmd_away(gchar **args, struct cmd_help_t help) +cmd_away(ProfWin *window, gchar **args, struct cmd_help_t help) { _update_presence(RESOURCE_AWAY, "away", args); return TRUE; } gboolean -cmd_online(gchar **args, struct cmd_help_t help) +cmd_online(ProfWin *window, gchar **args, struct cmd_help_t help) { _update_presence(RESOURCE_ONLINE, "online", args); return TRUE; } gboolean -cmd_dnd(gchar **args, struct cmd_help_t help) +cmd_dnd(ProfWin *window, gchar **args, struct cmd_help_t help) { _update_presence(RESOURCE_DND, "dnd", args); return TRUE; } gboolean -cmd_chat(gchar **args, struct cmd_help_t help) +cmd_chat(ProfWin *window, gchar **args, struct cmd_help_t help) { _update_presence(RESOURCE_CHAT, "chat", args); return TRUE; } gboolean -cmd_xa(gchar **args, struct cmd_help_t help) +cmd_xa(ProfWin *window, gchar **args, struct cmd_help_t help) { _update_presence(RESOURCE_XA, "xa", args); return TRUE; } gboolean -cmd_pgp(gchar **args, struct cmd_help_t help) +cmd_pgp(ProfWin *window, gchar **args, struct cmd_help_t help) { #ifdef HAVE_LIBGPGME if (g_strcmp0(args[0], "keys") == 0) { @@ -4181,7 +4149,7 @@ cmd_pgp(gchar **args, struct cmd_help_t help) } gboolean -cmd_otr(gchar **args, struct cmd_help_t help) +cmd_otr(ProfWin *window, gchar **args, struct cmd_help_t help) { #ifdef HAVE_LIBOTR if (args[0] == NULL) { @@ -4280,8 +4248,7 @@ cmd_otr(gchar **args, struct cmd_help_t help) return TRUE; } else if (strcmp(args[0], "theirfp") == 0) { - win_type_t win_type = ui_current_win_type(); - if (win_type != WIN_CHAT) { + if (window->type != WIN_CHAT) { ui_current_print_line("You must be in a regular chat window to view a recipient's fingerprint."); return TRUE; } @@ -4333,8 +4300,7 @@ cmd_otr(gchar **args, struct cmd_help_t help) // no recipient, use current chat } else { - win_type_t win_type = ui_current_win_type(); - if (win_type != WIN_CHAT) { + if (window->type != WIN_CHAT) { ui_current_print_line("You must be in a regular chat window to start an OTR session."); return TRUE; } @@ -4356,8 +4322,7 @@ cmd_otr(gchar **args, struct cmd_help_t help) } } else if (strcmp(args[0], "end") == 0) { - win_type_t win_type = ui_current_win_type(); - if (win_type != WIN_CHAT) { + if (window->type != WIN_CHAT) { ui_current_print_line("You must be in a regular chat window to use OTR."); return TRUE; } @@ -4373,8 +4338,7 @@ cmd_otr(gchar **args, struct cmd_help_t help) return TRUE; } else if (strcmp(args[0], "trust") == 0) { - win_type_t win_type = ui_current_win_type(); - if (win_type != WIN_CHAT) { + if (window->type != WIN_CHAT) { ui_current_print_line("You must be in an OTR session to trust a recipient."); return TRUE; } @@ -4390,8 +4354,7 @@ cmd_otr(gchar **args, struct cmd_help_t help) return TRUE; } else if (strcmp(args[0], "untrust") == 0) { - win_type_t win_type = ui_current_win_type(); - if (win_type != WIN_CHAT) { + if (window->type != WIN_CHAT) { ui_current_print_line("You must be in an OTR session to untrust a recipient."); return TRUE; } @@ -4407,8 +4370,7 @@ cmd_otr(gchar **args, struct cmd_help_t help) return TRUE; } else if (strcmp(args[0], "secret") == 0) { - win_type_t win_type = ui_current_win_type(); - if (win_type != WIN_CHAT) { + if (window->type != WIN_CHAT) { ui_current_print_line("You must be in an OTR session to trust a recipient."); return TRUE; } @@ -4436,8 +4398,7 @@ cmd_otr(gchar **args, struct cmd_help_t help) return TRUE; } - win_type_t win_type = ui_current_win_type(); - if (win_type != WIN_CHAT) { + if (window->type != WIN_CHAT) { ui_current_print_line("You must be in an OTR session to trust a recipient."); return TRUE; } @@ -4452,8 +4413,7 @@ cmd_otr(gchar **args, struct cmd_help_t help) return TRUE; } else if (strcmp(args[0], "answer") == 0) { - win_type_t win_type = ui_current_win_type(); - if (win_type != WIN_CHAT) { + if (window->type != WIN_CHAT) { ui_current_print_line("You must be in an OTR session to trust a recipient."); return TRUE; } diff --git a/src/command/commands.h b/src/command/commands.h index 8a75c03d..d7044ea1 100644 --- a/src/command/commands.h +++ b/src/command/commands.h @@ -35,6 +35,8 @@ #ifndef COMMANDS_H #define COMMANDS_H +#include "ui/ui.h" + // Command help strings typedef struct cmd_help_t { const gchar *usage; @@ -54,7 +56,7 @@ typedef struct cmd_help_t { */ typedef struct cmd_t { gchar *cmd; - gboolean (*func)(gchar **args, struct cmd_help_t help); + gboolean (*func)(ProfWin *window, gchar **args, struct cmd_help_t help); gchar** (*parser)(const char * const inp, int min, int max, gboolean *result); int min_args; int max_args; @@ -62,89 +64,89 @@ typedef struct cmd_t { CommandHelp help; } Command; -gboolean cmd_execute_alias(const char * const inp, gboolean *ran); -gboolean cmd_execute_default(const char * inp); +gboolean cmd_execute_alias(ProfWin *window, const char * const inp, gboolean *ran); +gboolean cmd_execute_default(ProfWin *window, const char * inp); -gboolean cmd_about(gchar **args, struct cmd_help_t help); -gboolean cmd_account(gchar **args, struct cmd_help_t help); -gboolean cmd_autoaway(gchar **args, struct cmd_help_t help); -gboolean cmd_autoconnect(gchar **args, struct cmd_help_t help); -gboolean cmd_autoping(gchar **args, struct cmd_help_t help); -gboolean cmd_away(gchar **args, struct cmd_help_t help); -gboolean cmd_beep(gchar **args, struct cmd_help_t help); -gboolean cmd_caps(gchar **args, struct cmd_help_t help); -gboolean cmd_chat(gchar **args, struct cmd_help_t help); -gboolean cmd_chlog(gchar **args, struct cmd_help_t help); -gboolean cmd_clear(gchar **args, struct cmd_help_t help); -gboolean cmd_close(gchar **args, struct cmd_help_t help); -gboolean cmd_connect(gchar **args, struct cmd_help_t help); -gboolean cmd_decline(gchar **args, struct cmd_help_t help); -gboolean cmd_disco(gchar **args, struct cmd_help_t help); -gboolean cmd_disconnect(gchar **args, struct cmd_help_t help); -gboolean cmd_dnd(gchar **args, struct cmd_help_t help); -gboolean cmd_flash(gchar **args, struct cmd_help_t help); -gboolean cmd_gone(gchar **args, struct cmd_help_t help); -gboolean cmd_grlog(gchar **args, struct cmd_help_t help); -gboolean cmd_group(gchar **args, struct cmd_help_t help); -gboolean cmd_help(gchar **args, struct cmd_help_t help); -gboolean cmd_history(gchar **args, struct cmd_help_t help); -gboolean cmd_carbons(gchar **args, struct cmd_help_t help); -gboolean cmd_receipts(gchar **args, struct cmd_help_t help); -gboolean cmd_info(gchar **args, struct cmd_help_t help); -gboolean cmd_intype(gchar **args, struct cmd_help_t help); -gboolean cmd_invite(gchar **args, struct cmd_help_t help); -gboolean cmd_invites(gchar **args, struct cmd_help_t help); -gboolean cmd_join(gchar **args, struct cmd_help_t help); -gboolean cmd_leave(gchar **args, struct cmd_help_t help); -gboolean cmd_log(gchar **args, struct cmd_help_t help); -gboolean cmd_mouse(gchar **args, struct cmd_help_t help); -gboolean cmd_msg(gchar **args, struct cmd_help_t help); -gboolean cmd_nick(gchar **args, struct cmd_help_t help); -gboolean cmd_notify(gchar **args, struct cmd_help_t help); -gboolean cmd_online(gchar **args, struct cmd_help_t help); -gboolean cmd_otr(gchar **args, struct cmd_help_t help); -gboolean cmd_pgp(gchar **args, struct cmd_help_t help); -gboolean cmd_outtype(gchar **args, struct cmd_help_t help); -gboolean cmd_prefs(gchar **args, struct cmd_help_t help); -gboolean cmd_priority(gchar **args, struct cmd_help_t help); -gboolean cmd_quit(gchar **args, struct cmd_help_t help); -gboolean cmd_reconnect(gchar **args, struct cmd_help_t help); -gboolean cmd_room(gchar **args, struct cmd_help_t help); -gboolean cmd_rooms(gchar **args, struct cmd_help_t help); -gboolean cmd_bookmark(gchar **args, struct cmd_help_t help); -gboolean cmd_roster(gchar **args, struct cmd_help_t help); -gboolean cmd_software(gchar **args, struct cmd_help_t help); -gboolean cmd_splash(gchar **args, struct cmd_help_t help); -gboolean cmd_states(gchar **args, struct cmd_help_t help); -gboolean cmd_status(gchar **args, struct cmd_help_t help); -gboolean cmd_statuses(gchar **args, struct cmd_help_t help); -gboolean cmd_sub(gchar **args, struct cmd_help_t help); -gboolean cmd_theme(gchar **args, struct cmd_help_t help); -gboolean cmd_tiny(gchar **args, struct cmd_help_t help); -gboolean cmd_titlebar(gchar **args, struct cmd_help_t help); -gboolean cmd_vercheck(gchar **args, struct cmd_help_t help); -gboolean cmd_who(gchar **args, struct cmd_help_t help); -gboolean cmd_win(gchar **args, struct cmd_help_t help); -gboolean cmd_wins(gchar **args, struct cmd_help_t help); -gboolean cmd_winstidy(gchar **args, struct cmd_help_t help); -gboolean cmd_xa(gchar **args, struct cmd_help_t help); -gboolean cmd_alias(gchar **args, struct cmd_help_t help); -gboolean cmd_xmlconsole(gchar **args, struct cmd_help_t help); -gboolean cmd_ping(gchar **args, struct cmd_help_t help); -gboolean cmd_form(gchar **args, struct cmd_help_t help); -gboolean cmd_occupants(gchar **args, struct cmd_help_t help); -gboolean cmd_kick(gchar **args, struct cmd_help_t help); -gboolean cmd_ban(gchar **args, struct cmd_help_t help); -gboolean cmd_subject(gchar **args, struct cmd_help_t help); -gboolean cmd_affiliation(gchar **args, struct cmd_help_t help); -gboolean cmd_role(gchar **args, struct cmd_help_t help); -gboolean cmd_privileges(gchar **args, struct cmd_help_t help); -gboolean cmd_presence(gchar **args, struct cmd_help_t help); -gboolean cmd_wrap(gchar **args, struct cmd_help_t help); -gboolean cmd_time(gchar **args, struct cmd_help_t help); -gboolean cmd_resource(gchar **args, struct cmd_help_t help); -gboolean cmd_inpblock(gchar **args, struct cmd_help_t help); +gboolean cmd_about(ProfWin *window, gchar **args, struct cmd_help_t help); +gboolean cmd_account(ProfWin *window, gchar **args, struct cmd_help_t help); +gboolean cmd_autoaway(ProfWin *window, gchar **args, struct cmd_help_t help); +gboolean cmd_autoconnect(ProfWin *window, gchar **args, struct cmd_help_t help); +gboolean cmd_autoping(ProfWin *window, gchar **args, struct cmd_help_t help); +gboolean cmd_away(ProfWin *window, gchar **args, struct cmd_help_t help); +gboolean cmd_beep(ProfWin *window, gchar **args, struct cmd_help_t help); +gboolean cmd_caps(ProfWin *window, gchar **args, struct cmd_help_t help); +gboolean cmd_chat(ProfWin *window, gchar **args, struct cmd_help_t help); +gboolean cmd_chlog(ProfWin *window, gchar **args, struct cmd_help_t help); +gboolean cmd_clear(ProfWin *window, gchar **args, struct cmd_help_t help); +gboolean cmd_close(ProfWin *window, gchar **args, struct cmd_help_t help); +gboolean cmd_connect(ProfWin *window, gchar **args, struct cmd_help_t help); +gboolean cmd_decline(ProfWin *window, gchar **args, struct cmd_help_t help); +gboolean cmd_disco(ProfWin *window, gchar **args, struct cmd_help_t help); +gboolean cmd_disconnect(ProfWin *window, gchar **args, struct cmd_help_t help); +gboolean cmd_dnd(ProfWin *window, gchar **args, struct cmd_help_t help); +gboolean cmd_flash(ProfWin *window, gchar **args, struct cmd_help_t help); +gboolean cmd_gone(ProfWin *window, gchar **args, struct cmd_help_t help); +gboolean cmd_grlog(ProfWin *window, gchar **args, struct cmd_help_t help); +gboolean cmd_group(ProfWin *window, gchar **args, struct cmd_help_t help); +gboolean cmd_help(ProfWin *window, gchar **args, struct cmd_help_t help); +gboolean cmd_history(ProfWin *window, gchar **args, struct cmd_help_t help); +gboolean cmd_carbons(ProfWin *window, gchar **args, struct cmd_help_t help); +gboolean cmd_receipts(ProfWin *window, gchar **args, struct cmd_help_t help); +gboolean cmd_info(ProfWin *window, gchar **args, struct cmd_help_t help); +gboolean cmd_intype(ProfWin *window, gchar **args, struct cmd_help_t help); +gboolean cmd_invite(ProfWin *window, gchar **args, struct cmd_help_t help); +gboolean cmd_invites(ProfWin *window, gchar **args, struct cmd_help_t help); +gboolean cmd_join(ProfWin *window, gchar **args, struct cmd_help_t help); +gboolean cmd_leave(ProfWin *window, gchar **args, struct cmd_help_t help); +gboolean cmd_log(ProfWin *window, gchar **args, struct cmd_help_t help); +gboolean cmd_mouse(ProfWin *window, gchar **args, struct cmd_help_t help); +gboolean cmd_msg(ProfWin *window, gchar **args, struct cmd_help_t help); +gboolean cmd_nick(ProfWin *window, gchar **args, struct cmd_help_t help); +gboolean cmd_notify(ProfWin *window, gchar **args, struct cmd_help_t help); +gboolean cmd_online(ProfWin *window, gchar **args, struct cmd_help_t help); +gboolean cmd_otr(ProfWin *window, gchar **args, struct cmd_help_t help); +gboolean cmd_pgp(ProfWin *window, gchar **args, struct cmd_help_t help); +gboolean cmd_outtype(ProfWin *window, gchar **args, struct cmd_help_t help); +gboolean cmd_prefs(ProfWin *window, gchar **args, struct cmd_help_t help); +gboolean cmd_priority(ProfWin *window, gchar **args, struct cmd_help_t help); +gboolean cmd_quit(ProfWin *window, gchar **args, struct cmd_help_t help); +gboolean cmd_reconnect(ProfWin *window, gchar **args, struct cmd_help_t help); +gboolean cmd_room(ProfWin *window, gchar **args, struct cmd_help_t help); +gboolean cmd_rooms(ProfWin *window, gchar **args, struct cmd_help_t help); +gboolean cmd_bookmark(ProfWin *window, gchar **args, struct cmd_help_t help); +gboolean cmd_roster(ProfWin *window, gchar **args, struct cmd_help_t help); +gboolean cmd_software(ProfWin *window, gchar **args, struct cmd_help_t help); +gboolean cmd_splash(ProfWin *window, gchar **args, struct cmd_help_t help); +gboolean cmd_states(ProfWin *window, gchar **args, struct cmd_help_t help); +gboolean cmd_status(ProfWin *window, gchar **args, struct cmd_help_t help); +gboolean cmd_statuses(ProfWin *window, gchar **args, struct cmd_help_t help); +gboolean cmd_sub(ProfWin *window, gchar **args, struct cmd_help_t help); +gboolean cmd_theme(ProfWin *window, gchar **args, struct cmd_help_t help); +gboolean cmd_tiny(ProfWin *window, gchar **args, struct cmd_help_t help); +gboolean cmd_titlebar(ProfWin *window, gchar **args, struct cmd_help_t help); +gboolean cmd_vercheck(ProfWin *window, gchar **args, struct cmd_help_t help); +gboolean cmd_who(ProfWin *window, gchar **args, struct cmd_help_t help); +gboolean cmd_win(ProfWin *window, gchar **args, struct cmd_help_t help); +gboolean cmd_wins(ProfWin *window, gchar **args, struct cmd_help_t help); +gboolean cmd_winstidy(ProfWin *window, gchar **args, struct cmd_help_t help); +gboolean cmd_xa(ProfWin *window, gchar **args, struct cmd_help_t help); +gboolean cmd_alias(ProfWin *window, gchar **args, struct cmd_help_t help); +gboolean cmd_xmlconsole(ProfWin *window, gchar **args, struct cmd_help_t help); +gboolean cmd_ping(ProfWin *window, gchar **args, struct cmd_help_t help); +gboolean cmd_form(ProfWin *window, gchar **args, struct cmd_help_t help); +gboolean cmd_occupants(ProfWin *window, gchar **args, struct cmd_help_t help); +gboolean cmd_kick(ProfWin *window, gchar **args, struct cmd_help_t help); +gboolean cmd_ban(ProfWin *window, gchar **args, struct cmd_help_t help); +gboolean cmd_subject(ProfWin *window, gchar **args, struct cmd_help_t help); +gboolean cmd_affiliation(ProfWin *window, gchar **args, struct cmd_help_t help); +gboolean cmd_role(ProfWin *window, gchar **args, struct cmd_help_t help); +gboolean cmd_privileges(ProfWin *window, gchar **args, struct cmd_help_t help); +gboolean cmd_presence(ProfWin *window, gchar **args, struct cmd_help_t help); +gboolean cmd_wrap(ProfWin *window, gchar **args, struct cmd_help_t help); +gboolean cmd_time(ProfWin *window, gchar **args, struct cmd_help_t help); +gboolean cmd_resource(ProfWin *window, gchar **args, struct cmd_help_t help); +gboolean cmd_inpblock(ProfWin *window, gchar **args, struct cmd_help_t help); -gboolean cmd_form_field(char *tag, gchar **args); +gboolean cmd_form_field(ProfWin *window, char *tag, gchar **args); #endif diff --git a/src/muc.c b/src/muc.c index 8110f9a5..6fa548bc 100644 --- a/src/muc.c +++ b/src/muc.c @@ -663,10 +663,9 @@ muc_roster_nick_change_complete(const char * const room, } char * -muc_autocomplete(const char * const input) +muc_autocomplete(ProfWin *window, const char * const input) { - win_type_t wintype = ui_current_win_type(); - if (wintype == WIN_MUC) { + if (window->type == WIN_MUC) { ProfMucWin *mucwin = wins_get_current_muc(); ChatRoom *chat_room = g_hash_table_lookup(rooms, mucwin->roomjid); diff --git a/src/muc.h b/src/muc.h index ad96f3d9..eb636aff 100644 --- a/src/muc.h +++ b/src/muc.h @@ -40,6 +40,7 @@ #include "contact.h" #include "jid.h" #include "tools/autocomplete.h" +#include "ui/win_types.h" typedef enum { MUC_ROLE_NONE, @@ -133,7 +134,7 @@ char* muc_subject(const char * const room); void muc_pending_broadcasts_add(const char * const room, const char * const message); GList * muc_pending_broadcasts(const char * const room); -char* muc_autocomplete(const char * const input); +char* muc_autocomplete(ProfWin *window, const char * const input); void muc_autocomplete_reset(const char * const room); gboolean muc_requires_config(const char * const room); diff --git a/src/profanity.c b/src/profanity.c index 6ce31cc3..bbf07f0b 100644 --- a/src/profanity.c +++ b/src/profanity.c @@ -92,7 +92,8 @@ prof_run(const int disable_tls, char *log_level, char *account_name) line = ui_readline(); if (line) { - cont = cmd_process_input(line); + ProfWin *window = wins_get_current(); + cont = cmd_process_input(window, line); free(line); line = NULL; } else { @@ -132,10 +133,10 @@ prof_handle_idle(void) void prof_handle_activity(void) { - win_type_t win_type = ui_current_win_type(); jabber_conn_status_t status = jabber_get_connection_status(); + ProfWin *current = wins_get_current(); - if ((status == JABBER_CONNECTED) && (win_type == WIN_CHAT)) { + if ((status == JABBER_CONNECTED) && (current->type == WIN_CHAT)) { ProfChatWin *chatwin = wins_get_current_chat(); chat_state_handle_typing(chatwin->barejid, chatwin->state); } @@ -144,12 +145,13 @@ prof_handle_activity(void) static void _connect_default(const char * const account) { + ProfWin *window = wins_get_current(); if (account) { - cmd_execute_connect(account); + cmd_execute_connect(window, account); } else { char *pref_connect_account = prefs_get_string(PREF_CONNECT_ACCOUNT); if (pref_connect_account) { - cmd_execute_connect(pref_connect_account); + cmd_execute_connect(window, pref_connect_account); prefs_free_string(pref_connect_account); } } diff --git a/src/ui/console.c b/src/ui/console.c index 118656dd..1e20c964 100644 --- a/src/ui/console.c +++ b/src/ui/console.c @@ -1564,7 +1564,8 @@ cons_show_contacts(GSList *list) void cons_alert(void) { - if (ui_current_win_type() != WIN_CONSOLE) { + ProfWin *current = wins_get_current(); + if (current->type != WIN_CONSOLE) { status_bar_new(1); } } diff --git a/src/ui/core.c b/src/ui/core.c index f517d51d..10c5d347 100644 --- a/src/ui/core.c +++ b/src/ui/core.c @@ -689,7 +689,8 @@ ui_invalid_command_usage(const char * const usage, void (*setting_func)(void)) } else { cons_show(""); cons_show("Usage: %s", usage); - if (ui_current_win_type() == WIN_CHAT) { + ProfWin *current = wins_get_current(); + if (current->type == WIN_CHAT) { char usage_cpy[strlen(usage) + 8]; sprintf(usage_cpy, "Usage: %s", usage); ui_current_print_line(usage_cpy); @@ -1145,13 +1146,6 @@ ui_swap_wins(int source_win, int target_win) } win_type_t -ui_current_win_type(void) -{ - ProfWin *current = wins_get_current(); - return current->type; -} - -win_type_t ui_win_type(int index) { ProfWin *window = wins_get_by_num(index); diff --git a/src/ui/inputwin.c b/src/ui/inputwin.c index 57814414..e29cec6c 100644 --- a/src/ui/inputwin.c +++ b/src/ui/inputwin.c @@ -415,7 +415,8 @@ _inp_rl_getc(FILE *stream) { int ch = rl_getc(stream); if (_inp_printable(ch)) { - cmd_reset_autocomplete(); + ProfWin *window = wins_get_current(); + cmd_reset_autocomplete(window); } return ch; } @@ -435,14 +436,16 @@ _inp_rl_tab_handler(int count, int key) return 0; } - if ((strncmp(rl_line_buffer, "/", 1) != 0) && (ui_current_win_type() == WIN_MUC)) { - char *result = muc_autocomplete(rl_line_buffer); + ProfWin *current = wins_get_current(); + if ((strncmp(rl_line_buffer, "/", 1) != 0) && (current->type == WIN_MUC)) { + char *result = muc_autocomplete(current, rl_line_buffer); if (result) { rl_replace_line(result, 0); rl_point = rl_end; } } else if (strncmp(rl_line_buffer, "/", 1) == 0) { - char *result = cmd_autocomplete(rl_line_buffer); + ProfWin *window = wins_get_current(); + char *result = cmd_autocomplete(window, rl_line_buffer); if (result) { rl_replace_line(result, 0); rl_point = rl_end; diff --git a/src/ui/ui.h b/src/ui/ui.h index abe50435..396bae1c 100644 --- a/src/ui/ui.h +++ b/src/ui/ui.h @@ -35,122 +35,15 @@ #ifndef UI_UI_H #define UI_UI_H -#include "config.h" - -#include <wchar.h> -#include <glib.h> -#ifdef HAVE_NCURSESW_NCURSES_H -#include <ncursesw/ncurses.h> -#elif HAVE_NCURSES_H -#include <ncurses.h> -#endif - -#include "contact.h" -#include "jid.h" -#include "xmpp/xmpp.h" -#include "ui/buffer.h" -#include "chat_state.h" +#include "ui/win_types.h" #include "muc.h" -#define LAYOUT_SPLIT_MEMCHECK 12345671 -#define PROFCHATWIN_MEMCHECK 22374522 -#define PROFMUCWIN_MEMCHECK 52345276 -#define PROFPRIVATEWIN_MEMCHECK 77437483 -#define PROFCONFWIN_MEMCHECK 64334685 -#define PROFXMLWIN_MEMCHECK 87333463 - #define NO_ME 1 #define NO_DATE 2 #define NO_EOL 4 #define NO_COLOUR_FROM 8 #define NO_COLOUR_DATE 16 -typedef enum { - LAYOUT_SIMPLE, - LAYOUT_SPLIT -} layout_type_t; - -typedef struct prof_layout_t { - layout_type_t type; - WINDOW *win; - ProfBuff buffer; - int y_pos; - int paged; -} ProfLayout; - -typedef struct prof_layout_simple_t { - ProfLayout base; -} ProfLayoutSimple; - -typedef struct prof_layout_split_t { - ProfLayout base; - WINDOW *subwin; - int sub_y_pos; - unsigned long memcheck; -} ProfLayoutSplit; - -typedef enum { - WIN_CONSOLE, - WIN_CHAT, - WIN_MUC, - WIN_MUC_CONFIG, - WIN_PRIVATE, - WIN_XML -} win_type_t; - -typedef enum { - PROF_ENC_NONE, - PROF_ENC_OTR -} prof_enc_t; - -typedef struct prof_win_t { - win_type_t type; - ProfLayout *layout; -} ProfWin; - -typedef struct prof_console_win_t { - ProfWin window; -} ProfConsoleWin; - -typedef struct prof_chat_win_t { - ProfWin window; - char *barejid; - int unread; - ChatState *state; - prof_enc_t enc_mode; - gboolean otr_is_trusted; - char *resource_override; - gboolean history_shown; - unsigned long memcheck; -} ProfChatWin; - -typedef struct prof_muc_win_t { - ProfWin window; - char *roomjid; - int unread; - gboolean showjid; - unsigned long memcheck; -} ProfMucWin; - -typedef struct prof_mucconf_win_t { - ProfWin window; - char *roomjid; - DataForm *form; - unsigned long memcheck; -} ProfMucConfWin; - -typedef struct prof_private_win_t { - ProfWin window; - char *fulljid; - int unread; - unsigned long memcheck; -} ProfPrivateWin; - -typedef struct prof_xml_win_t { - ProfWin window; - unsigned long memcheck; -} ProfXMLWin; - // ui startup and control void ui_init(void); void ui_load_colours(void); @@ -193,8 +86,6 @@ int ui_close_all_wins(void); int ui_close_read_wins(void); // current window actions -win_type_t ui_current_win_type(void); - void ui_current_print_line(const char * const msg, ...); void ui_current_print_formatted_line(const char show_char, int attrs, const char * const msg, ...); void ui_current_error_line(const char * const msg); diff --git a/src/ui/win_types.h b/src/ui/win_types.h new file mode 100644 index 00000000..7e757b88 --- /dev/null +++ b/src/ui/win_types.h @@ -0,0 +1,145 @@ +/* + * win_types.h + * + * Copyright (C) 2012 - 2015 James Booth <boothj5@gmail.com> + * + * This file is part of Profanity. + * + * Profanity is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Profanity is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Profanity. If not, see <http://www.gnu.org/licenses/>. + * + * In addition, as a special exception, the copyright holders give permission to + * link the code of portions of this program with the OpenSSL library under + * certain conditions as described in each individual source file, and + * distribute linked combinations including the two. + * + * You must obey the GNU General Public License in all respects for all of the + * code used other than OpenSSL. If you modify file(s) with this exception, you + * may extend this exception to your version of the file(s), but you are not + * obligated to do so. If you do not wish to do so, delete this exception + * statement from your version. If you delete this exception statement from all + * source files in the program, then also delete it here. + * + */ + +#ifndef UI_WIN_TYPES_H +#define UI_WIN_TYPES_H + +#include "config.h" + +#include <wchar.h> +#include <glib.h> +#ifdef HAVE_NCURSESW_NCURSES_H +#include <ncursesw/ncurses.h> +#elif HAVE_NCURSES_H +#include <ncurses.h> +#endif + +#include "xmpp/xmpp.h" +#include "ui/buffer.h" +#include "chat_state.h" + +#define LAYOUT_SPLIT_MEMCHECK 12345671 +#define PROFCHATWIN_MEMCHECK 22374522 +#define PROFMUCWIN_MEMCHECK 52345276 +#define PROFPRIVATEWIN_MEMCHECK 77437483 +#define PROFCONFWIN_MEMCHECK 64334685 +#define PROFXMLWIN_MEMCHECK 87333463 + +typedef enum { + LAYOUT_SIMPLE, + LAYOUT_SPLIT +} layout_type_t; + +typedef struct prof_layout_t { + layout_type_t type; + WINDOW *win; + ProfBuff buffer; + int y_pos; + int paged; +} ProfLayout; + +typedef struct prof_layout_simple_t { + ProfLayout base; +} ProfLayoutSimple; + +typedef struct prof_layout_split_t { + ProfLayout base; + WINDOW *subwin; + int sub_y_pos; + unsigned long memcheck; +} ProfLayoutSplit; + +typedef enum { + WIN_CONSOLE, + WIN_CHAT, + WIN_MUC, + WIN_MUC_CONFIG, + WIN_PRIVATE, + WIN_XML +} win_type_t; + +typedef enum { + PROF_ENC_NONE, + PROF_ENC_OTR +} prof_enc_t; + +typedef struct prof_win_t { + win_type_t type; + ProfLayout *layout; +} ProfWin; + +typedef struct prof_console_win_t { + ProfWin window; +} ProfConsoleWin; + +typedef struct prof_chat_win_t { + ProfWin window; + char *barejid; + int unread; + ChatState *state; + prof_enc_t enc_mode; + gboolean otr_is_trusted; + char *resource_override; + gboolean history_shown; + unsigned long memcheck; +} ProfChatWin; + +typedef struct prof_muc_win_t { + ProfWin window; + char *roomjid; + int unread; + gboolean showjid; + unsigned long memcheck; +} ProfMucWin; + +typedef struct prof_mucconf_win_t { + ProfWin window; + char *roomjid; + DataForm *form; + unsigned long memcheck; +} ProfMucConfWin; + +typedef struct prof_private_win_t { + ProfWin window; + char *fulljid; + int unread; + unsigned long memcheck; +} ProfPrivateWin; + +typedef struct prof_xml_win_t { + ProfWin window; + unsigned long memcheck; +} ProfXMLWin; + +#endif |