diff options
author | James Booth <boothj5@gmail.com> | 2015-06-17 00:15:28 +0100 |
---|---|---|
committer | James Booth <boothj5@gmail.com> | 2015-06-17 00:15:28 +0100 |
commit | 2215a3791f4394394c3ddcde7dd4aa98c704809b (patch) | |
tree | 9d654ffdd90a49d22efa603cc926238b1d34eafa /src | |
parent | cfef64c7677cdf66e2b37aa0aa5728262c3bb2f6 (diff) | |
download | profani-tty-2215a3791f4394394c3ddcde7dd4aa98c704809b.tar.gz |
Added current window reference to command functions
Diffstat (limited to 'src')
-rw-r--r-- | src/command/command.c | 8 | ||||
-rw-r--r-- | src/command/commands.c | 326 | ||||
-rw-r--r-- | src/command/commands.h | 162 | ||||
-rw-r--r-- | src/muc.c | 5 | ||||
-rw-r--r-- | src/muc.h | 3 | ||||
-rw-r--r-- | src/profanity.c | 4 | ||||
-rw-r--r-- | src/ui/console.c | 3 | ||||
-rw-r--r-- | src/ui/core.c | 10 | ||||
-rw-r--r-- | src/ui/inputwin.c | 5 | ||||
-rw-r--r-- | src/ui/ui.h | 111 | ||||
-rw-r--r-- | src/ui/win_types.h | 145 |
11 files changed, 387 insertions, 395 deletions
diff --git a/src/command/command.c b/src/command/command.c index 5dc0a582..a3bc24aa 100644 --- a/src/command/command.c +++ b/src/command/command.c @@ -1859,7 +1859,7 @@ cmd_process_input(ProfWin *window, char *inp) // 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,7 +1888,7 @@ _cmd_execute(ProfWin *window, 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); } @@ -1905,7 +1905,7 @@ _cmd_execute(ProfWin *window, 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; } @@ -1913,7 +1913,7 @@ _cmd_execute(ProfWin *window, const char * const command, const char * const inp gboolean ran_alias = FALSE; 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; } diff --git a/src/command/commands.c b/src/command/commands.c index 6d9a8732..0360bb9f 100644 --- a/src/command/commands.c +++ b/src/command/commands.c @@ -74,13 +74,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, "//")) { @@ -94,8 +94,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; } @@ -106,7 +105,7 @@ cmd_execute_default(const char * inp) return TRUE; } - switch (current->type) { + switch (window->type) { case WIN_CHAT: { ProfChatWin *chatwin = wins_get_current_chat(); @@ -153,7 +152,7 @@ cmd_execute_alias(ProfWin *window, 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)) { @@ -255,7 +254,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]; @@ -567,7 +566,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(); @@ -595,8 +594,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; } @@ -623,13 +621,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)); @@ -657,7 +655,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()); @@ -676,7 +674,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); @@ -684,7 +682,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(); @@ -723,7 +721,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); @@ -735,22 +733,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) { @@ -852,14 +850,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(); @@ -900,7 +898,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) { @@ -942,7 +940,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."); @@ -1071,7 +1069,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]; @@ -1284,20 +1282,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); } @@ -1305,13 +1302,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."); @@ -1319,7 +1315,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); @@ -1372,7 +1368,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(); @@ -1479,7 +1475,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(); @@ -1706,7 +1702,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; @@ -1728,12 +1724,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]; @@ -1779,24 +1774,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); @@ -1812,7 +1805,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); @@ -1826,7 +1818,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) { @@ -1856,12 +1847,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) { @@ -1869,15 +1859,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); } @@ -1893,7 +1882,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); @@ -1907,7 +1895,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) { @@ -1942,10 +1929,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; @@ -1954,7 +1940,7 @@ cmd_caps(gchar **args, struct cmd_help_t help) return TRUE; } - switch (win_type) + switch (window->type) { case WIN_MUC: if (args[0]) { @@ -2018,10 +2004,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) { @@ -2029,7 +2014,7 @@ cmd_software(gchar **args, struct cmd_help_t help) return TRUE; } - switch (win_type) + switch (window->type) { case WIN_MUC: if (args[0]) { @@ -2077,7 +2062,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) { @@ -2174,7 +2159,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]; @@ -2185,7 +2170,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; } @@ -2209,7 +2194,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); @@ -2218,7 +2203,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."); @@ -2231,14 +2216,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)) { @@ -2259,11 +2243,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); @@ -2282,7 +2266,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: @@ -2294,7 +2278,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; @@ -2318,7 +2302,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) { @@ -2346,7 +2330,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); } @@ -2375,7 +2359,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); } @@ -2392,7 +2376,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); } @@ -2424,7 +2408,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); } @@ -2434,7 +2418,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); } @@ -2450,7 +2434,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(); @@ -2459,8 +2443,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; } @@ -2502,7 +2485,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) { @@ -2525,7 +2507,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(); @@ -2534,8 +2516,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; } @@ -2558,7 +2539,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(); @@ -2567,8 +2548,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; } @@ -2586,7 +2566,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(); @@ -2595,14 +2575,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); @@ -2634,7 +2612,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(); @@ -2643,8 +2621,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; } @@ -2704,7 +2681,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(); @@ -2713,8 +2690,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; } @@ -2772,7 +2748,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(); @@ -2781,8 +2757,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; } @@ -2795,7 +2770,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; @@ -2836,7 +2810,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(); @@ -2891,8 +2865,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; } @@ -2921,7 +2894,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(); @@ -2942,7 +2915,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(); @@ -2951,10 +2924,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); @@ -3054,7 +3025,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(); @@ -3084,7 +3055,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(); @@ -3092,7 +3063,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; } @@ -3105,7 +3076,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]; @@ -3177,28 +3148,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(); @@ -3227,15 +3197,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; @@ -3277,8 +3246,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; } @@ -3307,13 +3276,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; @@ -3331,7 +3299,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); @@ -3341,19 +3309,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); @@ -3363,7 +3331,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) { @@ -3409,7 +3377,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); @@ -3424,7 +3392,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); @@ -3441,7 +3409,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); @@ -3455,7 +3423,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]; @@ -3479,7 +3447,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]; @@ -3622,7 +3590,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]; @@ -3668,7 +3636,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]; @@ -3724,7 +3692,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]; @@ -3748,7 +3716,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]; @@ -3773,7 +3741,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(); @@ -3793,7 +3761,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]; @@ -3852,7 +3820,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(); @@ -3880,7 +3848,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 && @@ -3933,7 +3901,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); @@ -3947,7 +3915,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(); @@ -3959,28 +3927,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); @@ -3995,7 +3963,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); @@ -4009,7 +3977,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); @@ -4018,14 +3986,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); @@ -4039,7 +4007,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); @@ -4060,7 +4028,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, @@ -4075,42 +4043,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_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) { @@ -4209,8 +4177,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; } @@ -4262,8 +4229,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; } @@ -4285,8 +4251,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; } @@ -4302,8 +4267,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; } @@ -4319,8 +4283,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; } @@ -4336,8 +4299,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; } @@ -4365,8 +4327,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; } @@ -4381,8 +4342,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 2ede3996..2af24180 100644 --- a/src/command/commands.h +++ b/src/command/commands.h @@ -56,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; @@ -65,87 +65,87 @@ typedef struct cmd_t { } Command; gboolean cmd_execute_alias(ProfWin *window, const char * const inp, gboolean *ran); -gboolean cmd_execute_default(const char * inp); +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_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_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 9b2ba143..af9bbe74 100644 --- a/src/profanity.c +++ b/src/profanity.c @@ -130,10 +130,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); } diff --git a/src/ui/console.c b/src/ui/console.c index 5f6b1ef0..7e071bd9 100644 --- a/src/ui/console.c +++ b/src/ui/console.c @@ -1560,7 +1560,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 20c9900f..e29cec6c 100644 --- a/src/ui/inputwin.c +++ b/src/ui/inputwin.c @@ -436,8 +436,9 @@ _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; 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 |