mcabber: mcabber/src/commands.c comparison

comparison mcabber/src/commands.c @ 1305:9bc68473f8a3

-n and -f flags to message-sending commands Allows sending normal and headline messages

author	Michal 'vorner' Vaner <vorner@ucw.cz>
date	Sat, 08 Sep 2007 13:21:07 +0200
parents	37b41ed9ed35
children	0dda8238af21

comparison

equal deleted inserted replaced

-:8ada97e5eb75
+:9bc68473f8a3
 static void do_chat_disable(char *arg);
 static void do_source(char *arg);
 static void do_color(char *arg);
 static void do_otr(char *arg);
 static void do_otrpolicy(char *arg);
+static void do_say_internal(char *arg, int parse_flags);
 // Global variable for the commands list
 static GSList *Commands;
 if (sl_com)       // Command has been found.
 return (cmd*)sl_com->data;
 return NULL;
 }
-//  send_message(msg)
-// Write the message in the buddy's window and send the message on
-// the network.
-static void send_message(const char *msg, const char *subj)
-{
-const char *bjid;
-gint crypted;
-if (!jb_getonline()) {
-scr_LogPrint(LPRINT_NORMAL, "You are not connected.");
-return;
-}
-if (!current_buddy) {
-scr_LogPrint(LPRINT_NORMAL, "No buddy is currently selected.");
-return;
-}
-bjid = CURRENT_JID;
-if (!bjid) {
-scr_LogPrint(LPRINT_NORMAL, "No buddy is currently selected.");
-return;
-}
-// Network part
-jb_send_msg(bjid, msg, buddy_gettype(BUDDATA(current_buddy)), subj, NULL,
-&crypted);
-if (crypted == -1) {
-scr_LogPrint(LPRINT_LOGNORM, "Encryption error.  Message was not sent.");
-return;
-}
-// Hook
-if (buddy_gettype(BUDDATA(current_buddy)) != ROSTER_TYPE_ROOM) {
-// local part (UI, logging, etc.)
-gchar *hmsg;
-if (subj)
-hmsg = g_strdup_printf("[%s]\n%s", subj, msg);
-else
-hmsg = (char*)msg;
-hk_message_out(bjid, NULL, 0, hmsg, crypted);
-if (hmsg != msg) g_free(hmsg);
-}
-}
 //  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.
 if (*line != COMMAND_CHAR) {
 // This isn't a command
 if (scr_get_multimode())
 scr_append_multiline(line);
 else
-do_say(line);
+do_say_internal(line, 0);
 return 0;
 }
 /* It is _probably_ a command -- except for verbatim multi-line mode */
 return process_command(line, FALSE);
 buddylist_build();
 update_roster = TRUE;
 if (leave_buddywindow) scr_ShowBuddyWindow();
 }
-static int send_message_to(const char *fjid, const char *msg, const char *subj)
+static int send_message_to(const char *fjid, const char *msg, const char *subj,
+const char *type_overwrite)
 {
 char *bare_jid, *rp;
 char *hmsg;
 gint crypted;
 gint retval = 0;
+int isroom;
+if (!jb_getonline()) {
+scr_LogPrint(LPRINT_NORMAL, "You are not connected.");
+return 1;
+}
 if (!fjid || !*fjid) {
 scr_LogPrint(LPRINT_NORMAL, "You must specify a Jabber ID.");
 return 1;
 }
 if (!msg || !*msg) {
 // Jump to window, create one if needed
 scr_RosterJumpJid(bare_jid);
 // Check if we're sending a message to a conference room
 // If not, we must make sure rp is NULL, for hk_message_out()
+isroom = !!roster_find(bare_jid, jidsearch, ROSTER_TYPE_ROOM);
 if (rp) {
-if (roster_find(bare_jid, jidsearch, ROSTER_TYPE_ROOM)) rp++;
+if (isroom) rp++;
 else rp = NULL;
 }
+isroom = isroom && (!rp || !*rp);
 // local part (UI, logging, etc.)
 if (subj)
 hmsg = g_strdup_printf("[%s]\n%s", subj, msg);
 else
 hmsg = (char*)msg;
 // Network part
-jb_send_msg(fjid, msg, ROSTER_TYPE_USER, subj, NULL, &crypted);
+jb_send_msg(fjid, msg, (isroom ? ROSTER_TYPE_ROOM : ROSTER_TYPE_USER),
+subj, NULL, &crypted,
+type_overwrite);
 if (crypted == -1) {
 scr_LogPrint(LPRINT_LOGNORM, "Encryption error.  Message was not sent.");
 retval = 1;
 goto send_message_to_return;
 }
 // Hook
-hk_message_out(bare_jid, rp, 0, hmsg, crypted);
+if(!isroom)
+hk_message_out(bare_jid, rp, 0, hmsg, crypted);
 send_message_to_return:
 if (hmsg != msg) g_free(hmsg);
 if (rp) g_free(bare_jid);
 return retval;
 }
-static void do_say(char *arg)
+//  send_message(msg, subj, type_overwrite)
+// Write the message in the buddy's window and send the message on
+// the network.
+static void send_message(const char *msg, const char *subj,
+const char *type_overwrite)
+{
+const char *bjid;
+if (!current_buddy) {
+scr_LogPrint(LPRINT_NORMAL, "No buddy is currently selected.");
+return;
+}
+bjid = CURRENT_JID;
+if (!bjid) {
+scr_LogPrint(LPRINT_NORMAL, "No buddy is currently selected.");
+return;
+}
+send_message_to(bjid, msg, subj, type_overwrite);
+}
+static const char *scan_mtype(char **arg)
+{
+//Try splitting it
+char **parlist = split_arg(*arg, 2, 1);
+const char *result = NULL;
+//Is it any good parameter?
+if(parlist && *parlist) {
+if(!strcmp("-n", *parlist)) {
+result = TMSG_NORMAL;
+} else if(!strcmp("-h", *parlist)) {
+result = TMSG_HEADLINE;
+}
+if(result || (!strcmp("--", *parlist)))
+*arg += strlen(*arg) - (parlist[1] ? strlen(parlist[1]) : 0);
+}
+//Anything found? -> skip it
+free_arg_lst(parlist);
+return result;
+}
+static void do_say_internal(char *arg, int parse_flags)
 {
 gpointer bud;
+const char *msgtype = NULL;
 scr_set_chatmode(TRUE);
 scr_ShowBuddyWindow();
 if (!current_buddy) {
 scr_LogPrint(LPRINT_NORMAL, "This is not a user.");
 return;
 }
 buddy_setflags(bud, ROSTER_FLAG_LOCK, TRUE);
+if(parse_flags)
+msgtype = scan_mtype(&arg);
 arg = to_utf8(arg);
-send_message(arg, NULL);
+send_message(arg, NULL, msgtype);
 g_free(arg);
+}
+static void do_say(char *arg) {
+do_say_internal(arg, 1);
 }
 static void do_msay(char *arg)
 {
 /* Parameters: begin verbatim abort send send_to */
 scr_ShowBuddyWindow();
 if (!strcasecmp(subcmd, "send_to")) {
 int err = FALSE;
 gchar *msg_utf8;
+const char *msg_type = scan_mtype(&arg);
 // Let's send to the specified JID.  We leave now if there
 // has been an error (so we don't leave multi-line mode).
 arg = to_utf8(arg);
 msg_utf8 = to_utf8(scr_get_multiline());
 if (msg_utf8) {
-err = send_message_to(arg, msg_utf8, scr_get_multimode_subj());
+err = send_message_to(arg, msg_utf8, scr_get_multimode_subj(), msg_type);
 g_free(msg_utf8);
 }
 g_free(arg);
 if (err)
 goto do_msay_return;
 }
 buddy_setflags(bud, ROSTER_FLAG_LOCK, TRUE);
 msg_utf8 = to_utf8(scr_get_multiline());
 if (msg_utf8) {
-send_message(msg_utf8, scr_get_multimode_subj());
+send_message(msg_utf8, scr_get_multimode_subj(), scan_mtype(&arg));
 g_free(msg_utf8);
 }
 }
 scr_set_multimode(FALSE, NULL);
 scr_LogPrint(LPRINT_NORMAL, "You have left multi-line message mode.");
 static void do_say_to(char *arg)
 {
 char **paramlst;
 char *fjid, *msg;
+const char *msg_type = NULL;
 if (!jb_getonline()) {
 scr_LogPrint(LPRINT_NORMAL, "You are not connected.");
 return;
 }
+msg_type = scan_mtype(&arg);
 paramlst = split_arg(arg, 2, 1); // jid, message
 fjid = *paramlst;
 msg = *(paramlst+1);
 if (!fjid || !strcmp(fjid, ".")) {
 }
 fjid = to_utf8(fjid);
 msg = to_utf8(msg);
-send_message_to(fjid, msg, NULL);
+send_message_to(fjid, msg, NULL, msg_type);
 g_free(fjid);
 g_free(msg);
 free_arg_lst(paramlst);
 }
 }
 arg = to_utf8(arg);
 // Set the topic
 msg = g_strdup_printf("%s has set the topic to: %s", mkcmdstr("me"), arg);
-jb_send_msg(buddy_getjid(bud), msg, ROSTER_TYPE_ROOM, arg, NULL, NULL);
+jb_send_msg(buddy_getjid(bud), msg, ROSTER_TYPE_ROOM, arg, NULL, NULL, NULL);
 g_free(arg);
 g_free(msg);
 }
 static void room_destroy(gpointer bud, char *arg)

Mercurial > ~mikael > mcabber > hg

comparison mcabber/src/commands.c @ 1305:9bc68473f8a3