devs/cproof
1
2
Fork 1
Code Issues 43 Pull Requests 6 Actions Packages Projects 1 Releases Wiki Activity

Added current window reference to command functions

Browse Source
This commit is contained in:
James Booth
2015-06-17 00:15:28 +01:00
parent cfef64c767
commit 2215a3791f
24 changed files with 582 additions and 578 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/command/command.c
View File

@@ -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;
}

326
src/command/commands.c
View File

File diff suppressed because it is too large Load Diff

162
src/command/commands.h
View File

@@ -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