mcabber: mcabber/mcabber/commands.c comparison

comparison mcabber/mcabber/commands.c @ 2164:038c4d601011

Simplify handling of command '/quit'

author	franky
date	Fri, 17 Oct 2014 22:31:03 +0200
parents	798baf5db4eb
children	f14537ee3476

comparison

equal deleted inserted replaced

-:0ac8eea728d1
+:038c4d601011
 #define IMSTATUS_DONOTDISTURB   "dnd"
 #ifdef WITH_DEPRECATED_STATUS_INVISIBLE
 # define IMSTATUS_INVISIBLE      "invisible"
 #endif
-// Return value container for the following functions
-static int retval_for_cmds;
 // Commands callbacks
 static void do_roster(char *arg);
 static void do_status(char *arg);
 static void do_status_to(char *arg);
 static void do_add(char *arg);
 static void do_set(char *arg);
 static void do_alias(char *arg);
 static void do_bind(char *arg);
 static void do_connect(char *arg);
 static void do_disconnect(char *arg);
+static void do_quit(char *arg);
 static void do_rawxml(char *arg);
 static void do_room(char *arg);
 static void do_authorization(char *arg);
 static void do_version(char *arg);
 static void do_request(char *arg);
 COMPL_MULTILINE, 0, &do_msay, NULL);
 cmd_add("otr", "Manage OTR settings", COMPL_OTR, COMPL_JID, &do_otr, NULL);
 cmd_add("otrpolicy", "Manage OTR policies", COMPL_JID, COMPL_OTRPOLICY,
 &do_otrpolicy, NULL);
 cmd_add("pgp", "Manage PGP settings", COMPL_PGP, COMPL_JID, &do_pgp, NULL);
-cmd_add("quit", "Exit the software", 0, 0, NULL, NULL);
+cmd_add("quit", "Exit the software", 0, 0, &do_quit, NULL);
 cmd_add("rawxml", "Send a raw XML string", 0, 0, &do_rawxml, NULL);
 cmd_add("rename", "Rename the current buddy", 0, 0, &do_rename, NULL);
 cmd_add("request", "Send a Jabber IQ request", COMPL_REQUEST, COMPL_JID,
 &do_request, NULL);
 cmd_add("room", "MUC actions command", COMPL_ROOM, 0, &do_room, NULL);
 //  process_command(line, iscmd)
 // Process a command line.
 // If iscmd is TRUE, process the command even if verbatim mmode is set;
 // it is intended to be used for key bindings.
-// Return 255 if this is the /quit command, and 0 for the other commands.
+void process_command(const char *line, guint iscmd)
-int process_command(const char *line, guint iscmd)
 {
 char *p;
 char *xpline;
 cmd *curcmd;
 if (!line)
-return 0;
+return;
 // We do alias expansion here
 if (iscmd || scr_get_multimode() != 2)
 xpline = expandalias(line);
 else
 // Remove trailing spaces:
 for (p=xpline ; *p ; p++)
 ;
 for (p-- ; p>xpline && (*p == ' ') ; p--)
 *p = 0;
-// Command "quit"?
-if ((iscmd || scr_get_multimode() != 2)
-&& (!strncasecmp(xpline, mkcmdstr("quit"), strlen(mkcmdstr("quit"))))) {
-if (!xpline[5] || xpline[5] == ' ') {
-g_free(xpline);
-return 255;
-}
-} else if (iscmd && !strncasecmp(xpline, "quit", 4) &&
-(!xpline[4] || xpline[4] == ' ')) {
-// If iscmd is true we can have the command without the command prefix
-// character (usually '/').
-g_free(xpline);
-return 255;
-}
 // If verbatim multi-line mode, we check if another /msay command is typed
 if (!iscmd && scr_get_multimode() == 2
 && (strncasecmp(xpline, mkcmdstr("msay "), strlen(mkcmdstr("msay "))))) {
 // It isn't an /msay command
 scr_append_multiline(xpline);
 g_free(xpline);
-return 0;
+return;
 }
 // Commands handling
 curcmd = cmd_get(xpline);
 if (!curcmd) {
 scr_LogPrint(LPRINT_NORMAL, "Unrecognized command.  "
 "Please see the manual for a list of known commands.");
 g_free(xpline);
-return 0;
+return;
 }
 if (!curcmd->func) {
 scr_LogPrint(LPRINT_NORMAL,
 "This functionality is not yet implemented, sorry.");
 g_free(xpline);
-return 0;
+return;
 }
 // Lets go to the command parameters
 for (p = xpline+1; *p && (*p != ' ') ; p++)
 ;
 // Skip spaces
 while (*p && (*p == ' '))
 p++;
 // Call command-specific function
-retval_for_cmds = 0;
 #ifdef MODULES_ENABLE
 if (curcmd->userdata)
 (*(void (*)(char *p, gpointer u))curcmd->func)(p, curcmd->userdata);
 else
 (*curcmd->func)(p);
 #else
 (*curcmd->func)(p);
 #endif
 g_free(xpline);
-return retval_for_cmds;
 }
 //  process_line(line)
 // Process a command/message line.
 // If this isn't a command, this is a message and it is sent to the
 // currently selected buddy.
-// Return 255 if the line is the /quit command, or 0.
+void process_line(const char *line)
-int process_line(const char *line)
 {
 if (!*line) { // User only pressed enter
 if (scr_get_multimode()) {
 scr_append_multiline("");
-return 0;
+return;
 }
 if (current_buddy) {
 if (buddy_gettype(BUDDATA(current_buddy)) & ROSTER_TYPE_GROUP)
 do_group("toggle");
 else {
 // Enter chat mode
 scr_set_chatmode(TRUE);
 scr_show_buddy_window();
 }
 }
-return 0;
+return;
 }
 if (*line != COMMAND_CHAR) {
 // This isn't a command
 if (scr_get_multimode())
 scr_append_multiline(line);
 else
 say_cmd((char*)line, 0);
-return 0;
+return;
 }
 /* It is _probably_ a command -- except for verbatim multi-line mode */
-return process_command(line, FALSE);
+process_command(line, FALSE);
 }
 // Helper routine for buffer item_{lock,unlock,toggle_lock}
 // "lock" values: 1=lock 0=unlock -1=invert
 static void roster_buddylock(char *bjid, int lock)
 settings_set(SETTINGS_TYPE_BINDING, k_code, value_utf8);
 g_free(value_utf8);
 g_free(value);
 }
 g_free(k_code);
+}
+static void do_quit(char *arg)
+{
+mcabber_set_terminate_ui();
 }
 static void do_rawxml(char *arg)
 {
 char **paramlst;
 } else if (!strcasecmp(arg, "iline_bdel")) {
 readline_backward_kill_iline();
 } else if (!strcasecmp(arg, "send_multiline")) {
 readline_send_multiline();
 } else if (!strcasecmp(arg, "iline_accept")) {
-retval_for_cmds = readline_accept_line(FALSE);
+readline_accept_line(FALSE);
 } else if (!strcasecmp(arg, "iline_accept_down_hist")) {
-retval_for_cmds = readline_accept_line(TRUE);
+readline_accept_line(TRUE);
 } else if (!strcasecmp(arg, "compl_cancel")) {
 readline_cancel_completion();
 } else if (!strcasecmp(arg, "compl_do_fwd")) {
 readline_do_completion(TRUE);
 } else if (!strcasecmp(arg, "compl_do_bwd")) {

Mercurial > ~mikael > mcabber > hg

comparison mcabber/mcabber/commands.c @ 2164:038c4d601011