Mercurial > ~mikael > mcabber > hg
annotate mcabber/src/commands.c @ 519:5c338d31de56
Show current global status message in "/status"
| author | Mikael Berthe <mikael@lilotux.net> |
|---|---|
| date | Mon, 14 Nov 2005 18:47:08 +0100 |
| parents | 5a2132ba2220 |
| children | 2f714bd701a1 |
| rev | line source |
|---|---|
| 47 | 1 /* |
| 2 * commands.c -- user commands handling | |
| 393 | 3 * |
| 47 | 4 * Copyright (C) 2005 Mikael Berthe <bmikael@lists.lilotux.net> |
| 5 * | |
| 6 * This program is free software; you can redistribute it and/or modify | |
| 7 * it under the terms of the GNU General Public License as published by | |
| 8 * the Free Software Foundation; either version 2 of the License, or (at | |
| 9 * your option) any later version. | |
| 10 * | |
| 11 * This program is distributed in the hope that it will be useful, but | |
| 12 * WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 14 * General Public License for more details. | |
| 15 * | |
| 16 * You should have received a copy of the GNU General Public License | |
| 17 * along with this program; if not, write to the Free Software | |
| 18 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 | |
| 19 * USA | |
| 20 */ | |
| 21 | |
| 95 | 22 #include <string.h> |
| 23 | |
| 47 | 24 #include "commands.h" |
| 25 #include "jabglue.h" | |
| 81 | 26 #include "roster.h" |
| 47 | 27 #include "screen.h" |
| 95 | 28 #include "compl.h" |
| 113 | 29 #include "hooks.h" |
| 191 | 30 #include "hbuf.h" |
| 47 | 31 #include "utils.h" |
|
283
00b2377539ac
Add /set command (to get/set/unset options values)
Mikael Berthe <mikael@lilotux.net>
parents:
277
diff
changeset
|
32 #include "settings.h" |
| 47 | 33 |
| 104 | 34 // Commands callbacks |
|
336
eb994ee40029
Make some functions static
Mikael Berthe <mikael@lilotux.net>
parents:
330
diff
changeset
|
35 static void do_roster(char *arg); |
|
eb994ee40029
Make some functions static
Mikael Berthe <mikael@lilotux.net>
parents:
330
diff
changeset
|
36 static void do_status(char *arg); |
| 444 | 37 static void do_status_to(char *arg); |
|
336
eb994ee40029
Make some functions static
Mikael Berthe <mikael@lilotux.net>
parents:
330
diff
changeset
|
38 static void do_add(char *arg); |
|
eb994ee40029
Make some functions static
Mikael Berthe <mikael@lilotux.net>
parents:
330
diff
changeset
|
39 static void do_del(char *arg); |
|
eb994ee40029
Make some functions static
Mikael Berthe <mikael@lilotux.net>
parents:
330
diff
changeset
|
40 static void do_group(char *arg); |
|
eb994ee40029
Make some functions static
Mikael Berthe <mikael@lilotux.net>
parents:
330
diff
changeset
|
41 static void do_say(char *arg); |
|
eb994ee40029
Make some functions static
Mikael Berthe <mikael@lilotux.net>
parents:
330
diff
changeset
|
42 static void do_msay(char *arg); |
| 480 | 43 static void do_say_to(char *arg); |
|
336
eb994ee40029
Make some functions static
Mikael Berthe <mikael@lilotux.net>
parents:
330
diff
changeset
|
44 static void do_buffer(char *arg); |
|
eb994ee40029
Make some functions static
Mikael Berthe <mikael@lilotux.net>
parents:
330
diff
changeset
|
45 static void do_clear(char *arg); |
|
eb994ee40029
Make some functions static
Mikael Berthe <mikael@lilotux.net>
parents:
330
diff
changeset
|
46 static void do_info(char *arg); |
|
eb994ee40029
Make some functions static
Mikael Berthe <mikael@lilotux.net>
parents:
330
diff
changeset
|
47 static void do_rename(char *arg); |
|
eb994ee40029
Make some functions static
Mikael Berthe <mikael@lilotux.net>
parents:
330
diff
changeset
|
48 static void do_move(char *arg); |
|
eb994ee40029
Make some functions static
Mikael Berthe <mikael@lilotux.net>
parents:
330
diff
changeset
|
49 static void do_set(char *arg); |
|
eb994ee40029
Make some functions static
Mikael Berthe <mikael@lilotux.net>
parents:
330
diff
changeset
|
50 static void do_alias(char *arg); |
|
eb994ee40029
Make some functions static
Mikael Berthe <mikael@lilotux.net>
parents:
330
diff
changeset
|
51 static void do_bind(char *arg); |
|
eb994ee40029
Make some functions static
Mikael Berthe <mikael@lilotux.net>
parents:
330
diff
changeset
|
52 static void do_connect(char *arg); |
|
eb994ee40029
Make some functions static
Mikael Berthe <mikael@lilotux.net>
parents:
330
diff
changeset
|
53 static void do_disconnect(char *arg); |
| 436 | 54 static void do_rawxml(char *arg); |
|
447
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
446
diff
changeset
|
55 static void do_room(char *arg); |
| 47 | 56 |
| 104 | 57 // Global variable for the commands list |
| 95 | 58 static GSList *Commands; |
| 59 | |
| 104 | 60 |
| 95 | 61 // cmd_add() |
| 62 // Adds a command to the commands list and to the CMD completion list | |
| 63 void cmd_add(const char *name, const char *help, | |
| 104 | 64 guint flags_row1, guint flags_row2, void (*f)()) |
| 95 | 65 { |
| 66 cmd *n_cmd = g_new0(cmd, 1); | |
| 67 strncpy(n_cmd->name, name, 32-1); | |
| 68 n_cmd->help = help; | |
| 69 n_cmd->completion_flags[0] = flags_row1; | |
| 70 n_cmd->completion_flags[1] = flags_row2; | |
| 71 n_cmd->func = f; | |
| 102 | 72 Commands = g_slist_append(Commands, n_cmd); |
| 95 | 73 // Add to completion CMD category |
| 74 compl_add_category_word(COMPL_CMD, name); | |
| 75 } | |
| 76 | |
| 77 // cmd_init() | |
| 78 // ... | |
| 79 void cmd_init(void) | |
| 80 { | |
| 124 | 81 cmd_add("add", "Add a jabber user", COMPL_JID, 0, &do_add); |
| 285 | 82 cmd_add("alias", "Add an alias", 0, 0, &do_alias); |
| 288 | 83 cmd_add("bind", "Add an key binding", 0, 0, &do_bind); |
| 187 | 84 cmd_add("buffer", "Manipulate current buddy's buffer (chat window)", |
| 85 COMPL_BUFFER, 0, &do_buffer); | |
| 108 | 86 cmd_add("clear", "Clear the dialog window", 0, 0, &do_clear); |
|
298
35cda94e570d
Add /connect and /disconnect commands
Mikael Berthe <mikael@lilotux.net>
parents:
290
diff
changeset
|
87 cmd_add("connect", "Connect to the server", 0, 0, &do_connect); |
| 205 | 88 cmd_add("del", "Delete the current buddy", 0, 0, &do_del); |
|
298
35cda94e570d
Add /connect and /disconnect commands
Mikael Berthe <mikael@lilotux.net>
parents:
290
diff
changeset
|
89 cmd_add("disconnect", "Disconnect from server", 0, 0, &do_disconnect); |
| 128 | 90 cmd_add("group", "Change group display settings", COMPL_GROUP, 0, &do_group); |
|
262
ab6f83a82811
Do not add /help to command completion, as it isn't implemented yet.
mikael@frmp8452
parents:
260
diff
changeset
|
91 //cmd_add("help", "Display some help", COMPL_CMD, 0, NULL); |
| 191 | 92 cmd_add("info", "Show basic infos on current buddy", 0, 0, &do_info); |
| 225 | 93 cmd_add("move", "Move the current buddy to another group", COMPL_GROUPNAME, |
| 94 0, &do_move); | |
| 238 | 95 cmd_add("msay", "Send a multi-lines message to the selected buddy", |
| 96 COMPL_MULTILINE, 0, &do_msay); | |
|
447
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
446
diff
changeset
|
97 cmd_add("room", "MUC actions command", COMPL_ROOM, 0, &do_room); |
| 95 | 98 cmd_add("quit", "Exit the software", 0, 0, NULL); |
| 436 | 99 cmd_add("rawxml", "Send a raw XML string", 0, 0, &do_rawxml); |
| 208 | 100 cmd_add("rename", "Rename the current buddy", 0, 0, &do_rename); |
| 95 | 101 //cmd_add("request_auth"); |
| 128 | 102 cmd_add("roster", "Manipulate the roster/buddylist", COMPL_ROSTER, 0, |
| 103 &do_roster); | |
| 132 | 104 cmd_add("say", "Say something to the selected buddy", 0, 0, &do_say); |
|
488
9e8519078e00
Enable jid completion for /say_to
Mikael Berthe <mikael@lilotux.net>
parents:
486
diff
changeset
|
105 cmd_add("say_to", "Say something to a specific buddy", COMPL_JID, 0, |
|
9e8519078e00
Enable jid completion for /say_to
Mikael Berthe <mikael@lilotux.net>
parents:
486
diff
changeset
|
106 &do_say_to); |
| 95 | 107 //cmd_add("search"); |
| 108 //cmd_add("send_auth"); | |
| 310 | 109 cmd_add("set", "Set/query an option value", 0, 0, &do_set); |
| 116 | 110 cmd_add("status", "Show or set your status", COMPL_STATUS, 0, &do_status); |
| 444 | 111 cmd_add("status_to", "Show or set your status for one recipient", |
| 112 COMPL_JID, COMPL_STATUS, &do_status_to); | |
| 95 | 113 |
| 114 // Status category | |
| 115 compl_add_category_word(COMPL_STATUS, "online"); | |
| 116 compl_add_category_word(COMPL_STATUS, "avail"); | |
| 117 compl_add_category_word(COMPL_STATUS, "invisible"); | |
| 118 compl_add_category_word(COMPL_STATUS, "free"); | |
| 119 compl_add_category_word(COMPL_STATUS, "dnd"); | |
| 120 compl_add_category_word(COMPL_STATUS, "notavail"); | |
| 121 compl_add_category_word(COMPL_STATUS, "away"); | |
| 103 | 122 |
| 123 // Roster category | |
| 124 compl_add_category_word(COMPL_ROSTER, "bottom"); | |
| 265 | 125 compl_add_category_word(COMPL_ROSTER, "top"); |
|
377
00809e3e327e
Add "/roster up" and "/roster down"
Mikael Berthe <mikael@lilotux.net>
parents:
374
diff
changeset
|
126 compl_add_category_word(COMPL_ROSTER, "up"); |
|
00809e3e327e
Add "/roster up" and "/roster down"
Mikael Berthe <mikael@lilotux.net>
parents:
374
diff
changeset
|
127 compl_add_category_word(COMPL_ROSTER, "down"); |
| 103 | 128 compl_add_category_word(COMPL_ROSTER, "hide_offline"); |
| 129 compl_add_category_word(COMPL_ROSTER, "show_offline"); | |
|
290
f63839a4cb35
Add /roster toggle_offline
Mikael Berthe <mikael@lilotux.net>
parents:
288
diff
changeset
|
130 compl_add_category_word(COMPL_ROSTER, "toggle_offline"); |
| 330 | 131 compl_add_category_word(COMPL_ROSTER, "alternate"); |
| 265 | 132 compl_add_category_word(COMPL_ROSTER, "search"); |
| 236 | 133 compl_add_category_word(COMPL_ROSTER, "unread_first"); |
| 134 compl_add_category_word(COMPL_ROSTER, "unread_next"); | |
| 127 | 135 |
| 187 | 136 // Roster category |
|
508
5a2132ba2220
Add "/buffer up" and "/buffer down"
Mikael Berthe <mikael@lilotux.net>
parents:
506
diff
changeset
|
137 compl_add_category_word(COMPL_BUFFER, "clear"); |
| 187 | 138 compl_add_category_word(COMPL_BUFFER, "bottom"); |
| 139 compl_add_category_word(COMPL_BUFFER, "top"); | |
|
508
5a2132ba2220
Add "/buffer up" and "/buffer down"
Mikael Berthe <mikael@lilotux.net>
parents:
506
diff
changeset
|
140 compl_add_category_word(COMPL_BUFFER, "up"); |
|
5a2132ba2220
Add "/buffer up" and "/buffer down"
Mikael Berthe <mikael@lilotux.net>
parents:
506
diff
changeset
|
141 compl_add_category_word(COMPL_BUFFER, "down"); |
|
370
dd9e2eb52916
Add /buffer search_{backward,forward}
Mikael Berthe <mikael@lilotux.net>
parents:
369
diff
changeset
|
142 compl_add_category_word(COMPL_BUFFER, "search_backward"); |
|
dd9e2eb52916
Add /buffer search_{backward,forward}
Mikael Berthe <mikael@lilotux.net>
parents:
369
diff
changeset
|
143 compl_add_category_word(COMPL_BUFFER, "search_forward"); |
| 464 | 144 compl_add_category_word(COMPL_BUFFER, "date"); |
| 462 | 145 compl_add_category_word(COMPL_BUFFER, "%"); |
| 187 | 146 |
| 127 | 147 // Group category |
| 240 | 148 compl_add_category_word(COMPL_GROUP, "fold"); |
| 149 compl_add_category_word(COMPL_GROUP, "unfold"); | |
| 130 | 150 compl_add_category_word(COMPL_GROUP, "toggle"); |
| 238 | 151 |
| 152 // Multi-line (msay) category | |
| 153 compl_add_category_word(COMPL_MULTILINE, "abort"); | |
| 154 compl_add_category_word(COMPL_MULTILINE, "begin"); | |
| 155 compl_add_category_word(COMPL_MULTILINE, "send"); | |
|
260
33e1a05864a6
Add "verbatim multi-line" mode, with commands disabled
mikael@frmp8452
parents:
244
diff
changeset
|
156 compl_add_category_word(COMPL_MULTILINE, "verbatim"); |
|
447
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
446
diff
changeset
|
157 |
|
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
446
diff
changeset
|
158 // Room category |
| 486 | 159 compl_add_category_word(COMPL_ROOM, "invite"); |
|
447
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
446
diff
changeset
|
160 compl_add_category_word(COMPL_ROOM, "join"); |
|
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
446
diff
changeset
|
161 compl_add_category_word(COMPL_ROOM, "leave"); |
|
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
446
diff
changeset
|
162 compl_add_category_word(COMPL_ROOM, "names"); |
| 470 | 163 compl_add_category_word(COMPL_ROOM, "nick"); |
| 490 | 164 compl_add_category_word(COMPL_ROOM, "privmsg"); |
|
448
39a28cb59af3
Add "/room remove", to remove an old chatroom from the roster
Mikael Berthe <mikael@lilotux.net>
parents:
447
diff
changeset
|
165 compl_add_category_word(COMPL_ROOM, "remove"); |
|
475
fa49ac0bb8f3
Add "/room topic", and display topic changes
Mikael Berthe <mikael@lilotux.net>
parents:
472
diff
changeset
|
166 compl_add_category_word(COMPL_ROOM, "topic"); |
| 449 | 167 compl_add_category_word(COMPL_ROOM, "unlock"); |
| 95 | 168 } |
| 94 | 169 |
| 285 | 170 // expandalias(line) |
| 171 // If there is one, expand the alias in line and returns a new allocated line | |
| 172 // If no alias is found, returns line | |
| 173 // Note : if the returned pointer is different from line, the caller should | |
| 174 // g_free() the pointer after use | |
| 175 char *expandalias(char *line) | |
| 176 { | |
| 177 const char *p1, *p2; | |
| 178 char *word; | |
| 179 const gchar *value; | |
| 180 char *newline = line; | |
| 181 | |
| 182 // Ignore leading '/' | |
| 183 for (p1 = line ; *p1 == '/' ; p1++) | |
| 184 ; | |
| 185 // Locate the end of the word | |
| 186 for (p2 = p1 ; *p2 && (*p2 != ' ') ; p2++) | |
| 187 ; | |
| 188 // Extract the word | |
| 189 word = g_strndup(p1, p2-p1); | |
| 190 | |
| 191 // Look for an alias in the list | |
| 192 value = settings_get(SETTINGS_TYPE_ALIAS, (const char*)word); | |
| 193 if (value) { | |
| 194 // There is an alias to expand | |
| 195 newline = g_new(char, strlen(value)+strlen(p2)+2); | |
| 196 *newline = '/'; | |
| 197 strcpy(newline+1, value); | |
| 198 strcat(newline, p2); | |
| 199 } | |
| 200 g_free(word); | |
| 201 | |
| 202 return newline; | |
| 203 } | |
| 204 | |
| 102 | 205 // cmd_get |
| 206 // Finds command in the command list structure. | |
| 207 // Returns a pointer to the cmd entry, or NULL if command not found. | |
| 238 | 208 cmd *cmd_get(const char *command) |
| 102 | 209 { |
| 238 | 210 const char *p1, *p2; |
| 102 | 211 char *com; |
| 212 GSList *sl_com; | |
| 285 | 213 |
| 102 | 214 // Ignore leading '/' |
| 215 for (p1 = command ; *p1 == '/' ; p1++) | |
| 216 ; | |
| 217 // Locate the end of the command | |
| 218 for (p2 = p1 ; *p2 && (*p2 != ' ') ; p2++) | |
| 219 ; | |
| 220 // Copy the clean command | |
| 221 com = g_strndup(p1, p2-p1); | |
| 222 | |
| 223 // Look for command in the list | |
| 224 for (sl_com=Commands; sl_com; sl_com = g_slist_next(sl_com)) { | |
| 225 if (!strcasecmp(com, ((cmd*)sl_com->data)->name)) | |
| 226 break; | |
| 227 } | |
| 228 g_free(com); | |
| 229 | |
| 230 if (sl_com) // Command has been found. | |
| 231 return (cmd*)sl_com->data; | |
| 232 return NULL; | |
| 233 } | |
| 234 | |
| 47 | 235 // send_message(msg) |
| 236 // Write the message in the buddy's window and send the message on | |
| 237 // the network. | |
| 238 | 238 void send_message(const char *msg) |
| 47 | 239 { |
| 81 | 240 const char *jid; |
| 393 | 241 |
|
472
75442262c082
Disable some commands when not connected
Mikael Berthe <mikael@lilotux.net>
parents:
471
diff
changeset
|
242 if (!jb_getonline()) { |
|
75442262c082
Disable some commands when not connected
Mikael Berthe <mikael@lilotux.net>
parents:
471
diff
changeset
|
243 scr_LogPrint(LPRINT_NORMAL, "You are not connected"); |
|
75442262c082
Disable some commands when not connected
Mikael Berthe <mikael@lilotux.net>
parents:
471
diff
changeset
|
244 return; |
|
75442262c082
Disable some commands when not connected
Mikael Berthe <mikael@lilotux.net>
parents:
471
diff
changeset
|
245 } |
|
75442262c082
Disable some commands when not connected
Mikael Berthe <mikael@lilotux.net>
parents:
471
diff
changeset
|
246 |
| 81 | 247 if (!current_buddy) { |
|
374
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
371
diff
changeset
|
248 scr_LogPrint(LPRINT_NORMAL, "No buddy currently selected."); |
| 81 | 249 return; |
| 250 } | |
| 251 | |
| 252 jid = CURRENT_JID; | |
| 253 if (!jid) { | |
|
374
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
371
diff
changeset
|
254 scr_LogPrint(LPRINT_NORMAL, "No buddy currently selected."); |
| 81 | 255 return; |
| 256 } | |
| 47 | 257 |
|
447
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
446
diff
changeset
|
258 if (buddy_gettype(BUDDATA(current_buddy)) != ROSTER_TYPE_ROOM) { |
|
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
446
diff
changeset
|
259 // local part (UI, logging, etc.) |
|
484
00e2d3821a5b
Display PRIV for private messages in a room when using /say_to
Mikael Berthe <mikael@lilotux.net>
parents:
480
diff
changeset
|
260 hk_message_out(jid, NULL, 0, msg); |
|
447
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
446
diff
changeset
|
261 } |
| 47 | 262 |
| 263 // Network part | |
|
475
fa49ac0bb8f3
Add "/room topic", and display topic changes
Mikael Berthe <mikael@lilotux.net>
parents:
472
diff
changeset
|
264 jb_send_msg(jid, msg, buddy_gettype(BUDDATA(current_buddy)), NULL); |
| 47 | 265 } |
| 266 | |
| 288 | 267 // process_command(line) |
| 268 // Process a command line. | |
| 269 // Return 255 if this is the /quit command, and 0 for the other commands. | |
| 270 int process_command(char *line) | |
| 47 | 271 { |
| 101 | 272 char *p; |
| 285 | 273 char *xpline; |
| 104 | 274 cmd *curcmd; |
| 275 | |
| 101 | 276 // Remove trailing spaces: |
| 277 for (p=line ; *p ; p++) | |
| 278 ; | |
| 279 for (p-- ; p>line && (*p == ' ') ; p--) | |
| 280 *p = 0; | |
| 281 | |
| 285 | 282 // We do alias expansion here |
| 288 | 283 if (scr_get_multimode() != 2) |
| 284 xpline = expandalias(line); | |
| 285 else | |
| 286 xpline = line; // No expansion in verbatim multi-line mode | |
| 285 | 287 |
| 101 | 288 // Command "quit"? |
| 285 | 289 if ((!strncasecmp(xpline, "/quit", 5)) && (scr_get_multimode() != 2) ) |
| 290 if (!xpline[5] || xpline[5] == ' ') | |
| 116 | 291 return 255; |
| 104 | 292 |
|
260
33e1a05864a6
Add "verbatim multi-line" mode, with commands disabled
mikael@frmp8452
parents:
244
diff
changeset
|
293 // If verbatim multi-line mode, we check if another /msay command is typed |
| 285 | 294 if ((scr_get_multimode() == 2) && (strncasecmp(xpline, "/msay ", 6))) { |
|
260
33e1a05864a6
Add "verbatim multi-line" mode, with commands disabled
mikael@frmp8452
parents:
244
diff
changeset
|
295 // It isn't an /msay command |
| 285 | 296 scr_append_multiline(xpline); |
|
260
33e1a05864a6
Add "verbatim multi-line" mode, with commands disabled
mikael@frmp8452
parents:
244
diff
changeset
|
297 return 0; |
|
33e1a05864a6
Add "verbatim multi-line" mode, with commands disabled
mikael@frmp8452
parents:
244
diff
changeset
|
298 } |
|
33e1a05864a6
Add "verbatim multi-line" mode, with commands disabled
mikael@frmp8452
parents:
244
diff
changeset
|
299 |
| 47 | 300 // Commands handling |
| 285 | 301 curcmd = cmd_get(xpline); |
| 47 | 302 |
| 104 | 303 if (!curcmd) { |
|
374
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
371
diff
changeset
|
304 scr_LogPrint(LPRINT_NORMAL, "Unrecognized command, sorry."); |
| 285 | 305 if (xpline != line) g_free(xpline); |
| 104 | 306 return 0; |
| 307 } | |
| 308 if (!curcmd->func) { | |
|
374
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
371
diff
changeset
|
309 scr_LogPrint(LPRINT_NORMAL, "Not yet implemented, sorry."); |
| 285 | 310 if (xpline != line) g_free(xpline); |
| 104 | 311 return 0; |
| 312 } | |
| 313 // Lets go to the command parameters | |
| 285 | 314 for (p = xpline+1; *p && (*p != ' ') ; p++) |
| 104 | 315 ; |
| 316 // Skip spaces | |
| 285 | 317 while (*p && (*p == ' ')) |
| 318 p++; | |
| 104 | 319 // Call command-specific function |
| 285 | 320 (*curcmd->func)(p); |
| 321 if (xpline != line) g_free(xpline); | |
| 47 | 322 return 0; |
| 323 } | |
| 324 | |
| 288 | 325 // process_line(line) |
| 326 // Process a command/message line. | |
| 327 // If this isn't a command, this is a message and it is sent to the | |
| 328 // currently selected buddy. | |
| 329 // Return 255 if the line is the /quit command, or 0. | |
| 330 int process_line(char *line) | |
| 331 { | |
| 332 if (!*line) { // User only pressed enter | |
| 333 if (scr_get_multimode()) { | |
| 334 scr_append_multiline(""); | |
| 335 return 0; | |
| 336 } | |
| 337 if (current_buddy) { | |
| 338 scr_set_chatmode(TRUE); | |
| 339 buddy_setflags(BUDDATA(current_buddy), ROSTER_FLAG_LOCK, TRUE); | |
| 340 scr_ShowBuddyWindow(); | |
| 341 } | |
| 342 return 0; | |
| 343 } | |
| 344 | |
| 345 if (*line != '/') { | |
| 346 // This isn't a command | |
| 347 if (scr_get_multimode()) | |
| 348 scr_append_multiline(line); | |
| 349 else | |
| 350 do_say(line); | |
| 351 return 0; | |
| 352 } | |
| 353 | |
| 354 /* It is (probably) a command -- except for verbatim multi-line mode */ | |
| 355 return process_command(line); | |
| 356 } | |
| 357 | |
| 104 | 358 /* Commands callback functions */ |
| 359 | |
|
336
eb994ee40029
Make some functions static
Mikael Berthe <mikael@lilotux.net>
parents:
330
diff
changeset
|
360 static void do_roster(char *arg) |
| 104 | 361 { |
| 362 if (!strcasecmp(arg, "top")) { | |
| 363 scr_RosterTop(); | |
| 128 | 364 update_roster = TRUE; |
| 104 | 365 } else if (!strcasecmp(arg, "bottom")) { |
| 366 scr_RosterBottom(); | |
| 128 | 367 update_roster = TRUE; |
| 104 | 368 } else if (!strcasecmp(arg, "hide_offline")) { |
| 120 | 369 buddylist_set_hide_offline_buddies(TRUE); |
| 104 | 370 if (current_buddy) |
| 371 buddylist_build(); | |
| 128 | 372 update_roster = TRUE; |
| 104 | 373 } else if (!strcasecmp(arg, "show_offline")) { |
| 120 | 374 buddylist_set_hide_offline_buddies(FALSE); |
| 124 | 375 buddylist_build(); |
| 128 | 376 update_roster = TRUE; |
|
290
f63839a4cb35
Add /roster toggle_offline
Mikael Berthe <mikael@lilotux.net>
parents:
288
diff
changeset
|
377 } else if (!strcasecmp(arg, "toggle_offline")) { |
|
f63839a4cb35
Add /roster toggle_offline
Mikael Berthe <mikael@lilotux.net>
parents:
288
diff
changeset
|
378 buddylist_set_hide_offline_buddies(-1); |
|
f63839a4cb35
Add /roster toggle_offline
Mikael Berthe <mikael@lilotux.net>
parents:
288
diff
changeset
|
379 buddylist_build(); |
|
f63839a4cb35
Add /roster toggle_offline
Mikael Berthe <mikael@lilotux.net>
parents:
288
diff
changeset
|
380 update_roster = TRUE; |
| 236 | 381 } else if (!strcasecmp(arg, "unread_first")) { |
| 382 scr_RosterUnreadMessage(0); | |
| 383 } else if (!strcasecmp(arg, "unread_next")) { | |
| 384 scr_RosterUnreadMessage(1); | |
| 330 | 385 } else if (!strcasecmp(arg, "alternate")) { |
| 386 scr_RosterJumpAlternate(); | |
| 265 | 387 } else if (!strncasecmp(arg, "search", 6)) { |
| 388 char *string = arg+6; | |
| 389 if (*string && (*string != ' ')) { | |
|
374
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
371
diff
changeset
|
390 scr_LogPrint(LPRINT_NORMAL, "Unrecognized parameter!"); |
| 265 | 391 return; |
| 392 } | |
| 393 while (*string == ' ') | |
| 394 string++; | |
| 395 if (!*string) { | |
|
374
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
371
diff
changeset
|
396 scr_LogPrint(LPRINT_NORMAL, "What name or jid are you looking for?"); |
| 265 | 397 return; |
| 398 } | |
| 399 scr_RosterSearch(string); | |
| 400 update_roster = TRUE; | |
|
377
00809e3e327e
Add "/roster up" and "/roster down"
Mikael Berthe <mikael@lilotux.net>
parents:
374
diff
changeset
|
401 } else if (!strcasecmp(arg, "up")) { |
|
00809e3e327e
Add "/roster up" and "/roster down"
Mikael Berthe <mikael@lilotux.net>
parents:
374
diff
changeset
|
402 scr_RosterUp(); |
|
00809e3e327e
Add "/roster up" and "/roster down"
Mikael Berthe <mikael@lilotux.net>
parents:
374
diff
changeset
|
403 } else if (!strcasecmp(arg, "down")) { |
|
00809e3e327e
Add "/roster up" and "/roster down"
Mikael Berthe <mikael@lilotux.net>
parents:
374
diff
changeset
|
404 scr_RosterDown(); |
| 104 | 405 } else |
|
374
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
371
diff
changeset
|
406 scr_LogPrint(LPRINT_NORMAL, "Unrecognized parameter!"); |
| 104 | 407 } |
| 108 | 408 |
| 444 | 409 // setstatus(recipient, arg) |
| 410 // Set your Jabber status. | |
| 411 // - if recipient is not NULL, the status is sent to this contact only | |
| 412 // - arg must be "status message" (message is optional) | |
| 413 static void setstatus(const char *recipient, const char *arg) | |
| 116 | 414 { |
| 415 enum imstatus st; | |
|
318
45076d02eeef
The /status command can specify a status message
Mikael Berthe <mikael@lilotux.net>
parents:
310
diff
changeset
|
416 int len; |
|
45076d02eeef
The /status command can specify a status message
Mikael Berthe <mikael@lilotux.net>
parents:
310
diff
changeset
|
417 char *msg; |
| 116 | 418 |
|
472
75442262c082
Disable some commands when not connected
Mikael Berthe <mikael@lilotux.net>
parents:
471
diff
changeset
|
419 if (!jb_getonline()) { |
|
75442262c082
Disable some commands when not connected
Mikael Berthe <mikael@lilotux.net>
parents:
471
diff
changeset
|
420 scr_LogPrint(LPRINT_NORMAL, "You are not connected"); |
|
75442262c082
Disable some commands when not connected
Mikael Berthe <mikael@lilotux.net>
parents:
471
diff
changeset
|
421 return; |
|
75442262c082
Disable some commands when not connected
Mikael Berthe <mikael@lilotux.net>
parents:
471
diff
changeset
|
422 } |
|
75442262c082
Disable some commands when not connected
Mikael Berthe <mikael@lilotux.net>
parents:
471
diff
changeset
|
423 |
|
318
45076d02eeef
The /status command can specify a status message
Mikael Berthe <mikael@lilotux.net>
parents:
310
diff
changeset
|
424 msg = strchr(arg, ' '); |
|
45076d02eeef
The /status command can specify a status message
Mikael Berthe <mikael@lilotux.net>
parents:
310
diff
changeset
|
425 if (!msg) |
|
45076d02eeef
The /status command can specify a status message
Mikael Berthe <mikael@lilotux.net>
parents:
310
diff
changeset
|
426 len = strlen(arg); |
|
45076d02eeef
The /status command can specify a status message
Mikael Berthe <mikael@lilotux.net>
parents:
310
diff
changeset
|
427 else |
|
45076d02eeef
The /status command can specify a status message
Mikael Berthe <mikael@lilotux.net>
parents:
310
diff
changeset
|
428 len = msg - arg; |
|
45076d02eeef
The /status command can specify a status message
Mikael Berthe <mikael@lilotux.net>
parents:
310
diff
changeset
|
429 |
|
45076d02eeef
The /status command can specify a status message
Mikael Berthe <mikael@lilotux.net>
parents:
310
diff
changeset
|
430 if (!strncasecmp(arg, "offline", len)) st = offline; |
|
45076d02eeef
The /status command can specify a status message
Mikael Berthe <mikael@lilotux.net>
parents:
310
diff
changeset
|
431 else if (!strncasecmp(arg, "online", len)) st = available; |
|
45076d02eeef
The /status command can specify a status message
Mikael Berthe <mikael@lilotux.net>
parents:
310
diff
changeset
|
432 else if (!strncasecmp(arg, "avail", len)) st = available; |
|
45076d02eeef
The /status command can specify a status message
Mikael Berthe <mikael@lilotux.net>
parents:
310
diff
changeset
|
433 else if (!strncasecmp(arg, "away", len)) st = away; |
|
45076d02eeef
The /status command can specify a status message
Mikael Berthe <mikael@lilotux.net>
parents:
310
diff
changeset
|
434 else if (!strncasecmp(arg, "invisible", len)) st = invisible; |
|
45076d02eeef
The /status command can specify a status message
Mikael Berthe <mikael@lilotux.net>
parents:
310
diff
changeset
|
435 else if (!strncasecmp(arg, "dnd", len)) st = dontdisturb; |
|
45076d02eeef
The /status command can specify a status message
Mikael Berthe <mikael@lilotux.net>
parents:
310
diff
changeset
|
436 else if (!strncasecmp(arg, "notavail", len)) st = notavail; |
|
45076d02eeef
The /status command can specify a status message
Mikael Berthe <mikael@lilotux.net>
parents:
310
diff
changeset
|
437 else if (!strncasecmp(arg, "free", len)) st = freeforchat; |
| 116 | 438 else { |
| 444 | 439 scr_LogPrint(LPRINT_NORMAL, "Unrecognized status!"); |
| 116 | 440 return; |
| 441 } | |
| 442 | |
|
416
48e7808c4191
Allow offline status message
Mikael Berthe <mikael@lilotux.net>
parents:
402
diff
changeset
|
443 if (msg && st != invisible) { |
|
318
45076d02eeef
The /status command can specify a status message
Mikael Berthe <mikael@lilotux.net>
parents:
310
diff
changeset
|
444 for (msg++ ; *msg && *msg == ' ' ; msg++) ; |
|
45076d02eeef
The /status command can specify a status message
Mikael Berthe <mikael@lilotux.net>
parents:
310
diff
changeset
|
445 if (!*msg) msg = NULL; |
|
45076d02eeef
The /status command can specify a status message
Mikael Berthe <mikael@lilotux.net>
parents:
310
diff
changeset
|
446 } else |
|
45076d02eeef
The /status command can specify a status message
Mikael Berthe <mikael@lilotux.net>
parents:
310
diff
changeset
|
447 msg = NULL; |
|
45076d02eeef
The /status command can specify a status message
Mikael Berthe <mikael@lilotux.net>
parents:
310
diff
changeset
|
448 |
| 444 | 449 jb_setstatus(st, recipient, msg); |
| 450 } | |
| 451 | |
| 452 static void do_status(char *arg) | |
| 453 { | |
| 454 if (!arg || (!*arg)) { | |
|
519
5c338d31de56
Show current global status message in "/status"
Mikael Berthe <mikael@lilotux.net>
parents:
508
diff
changeset
|
455 const char *sm = jb_getstatusmsg(); |
|
5c338d31de56
Show current global status message in "/status"
Mikael Berthe <mikael@lilotux.net>
parents:
508
diff
changeset
|
456 scr_LogPrint(LPRINT_NORMAL, "Your status is: [%c] %s", |
|
5c338d31de56
Show current global status message in "/status"
Mikael Berthe <mikael@lilotux.net>
parents:
508
diff
changeset
|
457 imstatus2char[jb_getstatus()], |
|
5c338d31de56
Show current global status message in "/status"
Mikael Berthe <mikael@lilotux.net>
parents:
508
diff
changeset
|
458 (sm ? sm : "")); |
| 444 | 459 return; |
| 460 } | |
| 461 setstatus(NULL, arg); | |
| 462 } | |
| 463 | |
| 464 static void do_status_to(char *arg) | |
| 465 { | |
| 466 char *id, *st; | |
| 467 if (!arg || (*arg == 0)) { | |
| 468 scr_LogPrint(LPRINT_NORMAL, "Missing parameter"); | |
| 469 return; | |
| 470 } | |
| 471 | |
| 472 // Split recipient jid, status | |
| 473 id = g_strdup(arg); | |
| 474 st = strchr(id, ' '); | |
| 475 if (!st) { | |
| 476 scr_LogPrint(LPRINT_NORMAL, "Missing parameter"); | |
| 477 g_free(id); | |
| 478 return; | |
| 479 } | |
| 480 | |
| 481 *st++ = 0; | |
| 482 while (*st && *st == ' ') | |
| 483 st++; | |
| 484 | |
| 452 | 485 if (check_jid_syntax(id)) { |
| 486 scr_LogPrint(LPRINT_NORMAL, "<%s> is not a valid Jabber id", id); | |
| 487 } else { | |
| 488 mc_strtolower(id); | |
| 489 scr_LogPrint(LPRINT_LOGNORM, "Sending to <%s> /status %s", id, st); | |
| 490 setstatus(id, st); | |
| 491 } | |
| 492 g_free(id); | |
| 116 | 493 } |
| 494 | |
|
336
eb994ee40029
Make some functions static
Mikael Berthe <mikael@lilotux.net>
parents:
330
diff
changeset
|
495 static void do_add(char *arg) |
| 124 | 496 { |
| 244 | 497 char *id, *nick; |
|
472
75442262c082
Disable some commands when not connected
Mikael Berthe <mikael@lilotux.net>
parents:
471
diff
changeset
|
498 |
|
75442262c082
Disable some commands when not connected
Mikael Berthe <mikael@lilotux.net>
parents:
471
diff
changeset
|
499 if (!jb_getonline()) { |
|
75442262c082
Disable some commands when not connected
Mikael Berthe <mikael@lilotux.net>
parents:
471
diff
changeset
|
500 scr_LogPrint(LPRINT_NORMAL, "You are not connected"); |
|
75442262c082
Disable some commands when not connected
Mikael Berthe <mikael@lilotux.net>
parents:
471
diff
changeset
|
501 return; |
|
75442262c082
Disable some commands when not connected
Mikael Berthe <mikael@lilotux.net>
parents:
471
diff
changeset
|
502 } |
|
75442262c082
Disable some commands when not connected
Mikael Berthe <mikael@lilotux.net>
parents:
471
diff
changeset
|
503 |
| 446 | 504 if (!arg || (!*arg)) { |
|
374
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
371
diff
changeset
|
505 scr_LogPrint(LPRINT_NORMAL, "Wrong usage"); |
| 124 | 506 return; |
| 507 } | |
| 508 | |
| 244 | 509 id = g_strdup(arg); |
| 510 nick = strchr(id, ' '); | |
| 511 if (nick) { | |
| 512 *nick++ = 0; | |
| 513 while (*nick && *nick == ' ') | |
| 514 nick++; | |
| 515 } | |
| 516 | |
| 452 | 517 if (check_jid_syntax(id)) { |
| 518 scr_LogPrint(LPRINT_NORMAL, "<%s> is not a valid Jabber id", id); | |
| 519 } else { | |
| 520 mc_strtolower(id); | |
| 521 // 2nd parameter = optional nickname | |
| 522 jb_addbuddy(id, nick, NULL); | |
| 523 scr_LogPrint(LPRINT_LOGNORM, "Sent presence notification request to <%s>", | |
| 524 id); | |
| 525 } | |
| 244 | 526 g_free(id); |
| 124 | 527 } |
| 128 | 528 |
|
336
eb994ee40029
Make some functions static
Mikael Berthe <mikael@lilotux.net>
parents:
330
diff
changeset
|
529 static void do_del(char *arg) |
| 206 | 530 { |
| 531 const char *jid; | |
| 532 | |
| 533 if (arg && (*arg)) { | |
|
374
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
371
diff
changeset
|
534 scr_LogPrint(LPRINT_NORMAL, "Wrong usage"); |
| 206 | 535 return; |
| 536 } | |
| 537 | |
| 538 if (!current_buddy) return; | |
| 539 jid = buddy_getjid(BUDDATA(current_buddy)); | |
| 540 if (!jid) return; | |
| 541 | |
|
374
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
371
diff
changeset
|
542 scr_LogPrint(LPRINT_LOGNORM, "Removing <%s>...", jid); |
| 206 | 543 jb_delbuddy(jid); |
| 544 } | |
| 545 | |
|
336
eb994ee40029
Make some functions static
Mikael Berthe <mikael@lilotux.net>
parents:
330
diff
changeset
|
546 static void do_group(char *arg) |
| 128 | 547 { |
| 548 gpointer group; | |
| 166 | 549 guint leave_windowbuddy; |
| 128 | 550 |
| 446 | 551 if (!arg || (!*arg)) { |
|
374
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
371
diff
changeset
|
552 scr_LogPrint(LPRINT_NORMAL, "Missing parameter"); |
| 128 | 553 return; |
| 554 } | |
| 555 | |
| 166 | 556 if (!current_buddy) return; |
| 128 | 557 |
| 166 | 558 group = buddy_getgroup(BUDDATA(current_buddy)); |
| 212 | 559 // We'll have to redraw the chat window if we're not currently on the group |
| 560 // entry itself, because it means we'll have to leave the current buddy | |
| 561 // chat window. | |
| 166 | 562 leave_windowbuddy = (group != BUDDATA(current_buddy)); |
| 563 | |
| 128 | 564 if (!(buddy_gettype(group) & ROSTER_TYPE_GROUP)) { |
|
374
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
371
diff
changeset
|
565 scr_LogPrint(LPRINT_NORMAL, "You need to select a group"); |
| 128 | 566 return; |
| 567 } | |
| 166 | 568 |
| 569 if (!strcasecmp(arg, "expand") || !strcasecmp(arg, "unfold")) { | |
| 128 | 570 buddy_setflags(group, ROSTER_FLAG_HIDE, FALSE); |
| 166 | 571 } else if (!strcasecmp(arg, "shrink") || !strcasecmp(arg, "fold")) { |
| 128 | 572 buddy_setflags(group, ROSTER_FLAG_HIDE, TRUE); |
| 130 | 573 } else if (!strcasecmp(arg, "toggle")) { |
| 574 buddy_setflags(group, ROSTER_FLAG_HIDE, | |
| 575 !(buddy_getflags(group) & ROSTER_FLAG_HIDE)); | |
| 128 | 576 } else { |
|
374
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
371
diff
changeset
|
577 scr_LogPrint(LPRINT_NORMAL, "Unrecognized parameter!"); |
| 128 | 578 return; |
| 579 } | |
| 580 | |
| 581 buddylist_build(); | |
| 582 update_roster = TRUE; | |
| 166 | 583 if (leave_windowbuddy) scr_ShowBuddyWindow(); |
| 128 | 584 } |
| 585 | |
|
336
eb994ee40029
Make some functions static
Mikael Berthe <mikael@lilotux.net>
parents:
330
diff
changeset
|
586 static void do_say(char *arg) |
| 132 | 587 { |
| 164 | 588 gpointer bud; |
| 132 | 589 |
| 590 scr_set_chatmode(TRUE); | |
| 164 | 591 |
| 592 if (!current_buddy) { | |
|
374
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
371
diff
changeset
|
593 scr_LogPrint(LPRINT_NORMAL, "Who are you talking to??"); |
| 164 | 594 return; |
| 132 | 595 } |
| 164 | 596 |
| 597 bud = BUDDATA(current_buddy); | |
|
447
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
446
diff
changeset
|
598 if (!(buddy_gettype(bud) & (ROSTER_TYPE_USER|ROSTER_TYPE_ROOM))) { |
|
374
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
371
diff
changeset
|
599 scr_LogPrint(LPRINT_NORMAL, "This is not a user"); |
| 164 | 600 return; |
| 601 } | |
| 602 | |
| 603 buddy_setflags(bud, ROSTER_FLAG_LOCK, TRUE); | |
| 604 send_message(arg); | |
| 132 | 605 } |
| 606 | |
|
336
eb994ee40029
Make some functions static
Mikael Berthe <mikael@lilotux.net>
parents:
330
diff
changeset
|
607 static void do_msay(char *arg) |
| 238 | 608 { |
|
260
33e1a05864a6
Add "verbatim multi-line" mode, with commands disabled
mikael@frmp8452
parents:
244
diff
changeset
|
609 /* Parameters: begin verbatim abort send */ |
| 238 | 610 gpointer bud; |
| 611 | |
| 612 if (!strcasecmp(arg, "abort")) { | |
|
315
65aa05520556
First Ctrl-C now also leaves multi-line message mode
Mikael Berthe <mikael@lilotux.net>
parents:
310
diff
changeset
|
613 if (scr_get_multimode()) |
|
374
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
371
diff
changeset
|
614 scr_LogPrint(LPRINT_NORMAL, "Leaving multi-line message mode"); |
| 238 | 615 scr_set_multimode(FALSE); |
| 616 return; | |
|
260
33e1a05864a6
Add "verbatim multi-line" mode, with commands disabled
mikael@frmp8452
parents:
244
diff
changeset
|
617 } else if ((!strcasecmp(arg, "begin")) || (!strcasecmp(arg, "verbatim"))) { |
|
33e1a05864a6
Add "verbatim multi-line" mode, with commands disabled
mikael@frmp8452
parents:
244
diff
changeset
|
618 if (!strcasecmp(arg, "verbatim")) |
|
33e1a05864a6
Add "verbatim multi-line" mode, with commands disabled
mikael@frmp8452
parents:
244
diff
changeset
|
619 scr_set_multimode(2); |
|
33e1a05864a6
Add "verbatim multi-line" mode, with commands disabled
mikael@frmp8452
parents:
244
diff
changeset
|
620 else |
|
33e1a05864a6
Add "verbatim multi-line" mode, with commands disabled
mikael@frmp8452
parents:
244
diff
changeset
|
621 scr_set_multimode(1); |
|
33e1a05864a6
Add "verbatim multi-line" mode, with commands disabled
mikael@frmp8452
parents:
244
diff
changeset
|
622 |
|
374
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
371
diff
changeset
|
623 scr_LogPrint(LPRINT_NORMAL, "Entered multi-line message mode."); |
|
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
371
diff
changeset
|
624 scr_LogPrint(LPRINT_NORMAL, "Select a buddy and use \"/msay send\" " |
| 238 | 625 "when your message is ready."); |
| 626 return; | |
| 446 | 627 } else if (!*arg) { |
|
374
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
371
diff
changeset
|
628 scr_LogPrint(LPRINT_NORMAL, "Please read the manual before using " |
|
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
371
diff
changeset
|
629 "the /msay command."); |
|
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
371
diff
changeset
|
630 scr_LogPrint(LPRINT_NORMAL, "(Use \"/msay begin\" to enter " |
|
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
371
diff
changeset
|
631 "multi-line mode...)"); |
| 238 | 632 return; |
| 633 } else if (strcasecmp(arg, "send")) { | |
|
374
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
371
diff
changeset
|
634 scr_LogPrint(LPRINT_NORMAL, "Unrecognized parameter!"); |
| 238 | 635 return; |
| 636 } | |
| 637 | |
| 638 // send command | |
| 639 | |
| 640 if (!scr_get_multimode()) { | |
|
374
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
371
diff
changeset
|
641 scr_LogPrint(LPRINT_NORMAL, "No message to send. " |
|
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
371
diff
changeset
|
642 "Use \"/msay begin\" first."); |
| 238 | 643 return; |
| 644 } | |
| 645 | |
| 646 scr_set_chatmode(TRUE); | |
| 647 | |
| 648 if (!current_buddy) { | |
|
374
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
371
diff
changeset
|
649 scr_LogPrint(LPRINT_NORMAL, "Who are you talking to??"); |
| 238 | 650 return; |
| 651 } | |
| 652 | |
| 653 bud = BUDDATA(current_buddy); | |
|
447
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
446
diff
changeset
|
654 if (!(buddy_gettype(bud) & (ROSTER_TYPE_USER|ROSTER_TYPE_ROOM))) { |
|
374
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
371
diff
changeset
|
655 scr_LogPrint(LPRINT_NORMAL, "This is not a user"); |
| 238 | 656 return; |
| 657 } | |
| 658 | |
| 659 buddy_setflags(bud, ROSTER_FLAG_LOCK, TRUE); | |
| 660 send_message(scr_get_multiline()); | |
| 661 scr_set_multimode(FALSE); | |
| 662 } | |
| 663 | |
| 480 | 664 static void do_say_to(char *arg) |
| 665 { | |
| 666 char *jid, *msg; | |
| 667 char *bare_jid, *p; | |
| 668 | |
| 669 if (!jb_getonline()) { | |
| 670 scr_LogPrint(LPRINT_NORMAL, "You are not connected"); | |
| 671 return; | |
| 672 } | |
| 673 | |
| 674 msg = strchr(arg, ' '); | |
| 675 if (!msg) { | |
| 676 scr_LogPrint(LPRINT_NORMAL, "Missing parameter"); | |
| 677 return; | |
| 678 } | |
| 679 | |
| 680 jid = g_strndup(arg, msg - arg); | |
| 681 | |
| 682 if (check_jid_syntax(jid)) { | |
| 683 scr_LogPrint(LPRINT_NORMAL, "<%s> is not a valid Jabber id", jid); | |
| 684 g_free(jid); | |
| 685 return; | |
| 686 } | |
| 687 | |
| 688 while (*msg == ' ') msg++; | |
| 689 if (!*msg) { | |
| 690 scr_LogPrint(LPRINT_NORMAL, "Wrong or missing parameter"); | |
| 691 g_free(jid); | |
| 692 return; | |
| 693 } | |
| 694 | |
| 695 // We must use the bare jid in hk_message_out() | |
| 696 p = strchr(jid, '/'); | |
| 697 if (p) bare_jid = g_strndup(jid, p - jid); | |
| 698 else bare_jid = jid; | |
| 699 | |
| 700 // Jump to window, create one if needed | |
| 701 scr_RosterJumpJid(bare_jid); | |
| 702 | |
|
484
00e2d3821a5b
Display PRIV for private messages in a room when using /say_to
Mikael Berthe <mikael@lilotux.net>
parents:
480
diff
changeset
|
703 // Check if we're sending a message to a conference room |
|
00e2d3821a5b
Display PRIV for private messages in a room when using /say_to
Mikael Berthe <mikael@lilotux.net>
parents:
480
diff
changeset
|
704 // If not, we must make sure p is NULL, for hk_message_out() |
|
00e2d3821a5b
Display PRIV for private messages in a room when using /say_to
Mikael Berthe <mikael@lilotux.net>
parents:
480
diff
changeset
|
705 if (p) { |
|
00e2d3821a5b
Display PRIV for private messages in a room when using /say_to
Mikael Berthe <mikael@lilotux.net>
parents:
480
diff
changeset
|
706 if (roster_find(bare_jid, jidsearch, ROSTER_TYPE_ROOM)) p++; |
|
00e2d3821a5b
Display PRIV for private messages in a room when using /say_to
Mikael Berthe <mikael@lilotux.net>
parents:
480
diff
changeset
|
707 else p = NULL; |
|
00e2d3821a5b
Display PRIV for private messages in a room when using /say_to
Mikael Berthe <mikael@lilotux.net>
parents:
480
diff
changeset
|
708 } |
|
00e2d3821a5b
Display PRIV for private messages in a room when using /say_to
Mikael Berthe <mikael@lilotux.net>
parents:
480
diff
changeset
|
709 |
| 480 | 710 // local part (UI, logging, etc.) |
|
484
00e2d3821a5b
Display PRIV for private messages in a room when using /say_to
Mikael Berthe <mikael@lilotux.net>
parents:
480
diff
changeset
|
711 hk_message_out(bare_jid, p, 0, msg); |
| 480 | 712 |
| 713 // Network part | |
| 714 jb_send_msg(jid, msg, ROSTER_TYPE_USER, NULL); | |
| 715 g_free(jid); | |
| 716 if (p) g_free(bare_jid); | |
| 717 } | |
| 718 | |
|
336
eb994ee40029
Make some functions static
Mikael Berthe <mikael@lilotux.net>
parents:
330
diff
changeset
|
719 static void do_buffer(char *arg) |
| 187 | 720 { |
|
370
dd9e2eb52916
Add /buffer search_{backward,forward}
Mikael Berthe <mikael@lilotux.net>
parents:
369
diff
changeset
|
721 int search_dir = 0; |
|
dd9e2eb52916
Add /buffer search_{backward,forward}
Mikael Berthe <mikael@lilotux.net>
parents:
369
diff
changeset
|
722 |
|
471
82a27508fb85
Fix segfaults when using /buffer and /room while not connected
Mikael Berthe <mikael@lilotux.net>
parents:
470
diff
changeset
|
723 if (!current_buddy) return; |
| 446 | 724 if (buddy_gettype(BUDDATA(current_buddy)) & ROSTER_TYPE_GROUP) { |
| 725 scr_LogPrint(LPRINT_NORMAL, "Groups have no buffer"); | |
| 726 return; | |
| 727 } | |
| 728 | |
| 187 | 729 if (!strcasecmp(arg, "top")) { |
|
361
51ff319947c3
Code cleanup/optimization
Mikael Berthe <mikael@lilotux.net>
parents:
336
diff
changeset
|
730 scr_BufferTopBottom(-1); |
| 187 | 731 } else if (!strcasecmp(arg, "bottom")) { |
|
361
51ff319947c3
Code cleanup/optimization
Mikael Berthe <mikael@lilotux.net>
parents:
336
diff
changeset
|
732 scr_BufferTopBottom(1); |
| 187 | 733 } else if (!strcasecmp(arg, "clear")) { |
|
369
499170ed71c9
Rename some buffer commands, for homogeneity
Mikael Berthe <mikael@lilotux.net>
parents:
364
diff
changeset
|
734 scr_BufferClear(); |
|
508
5a2132ba2220
Add "/buffer up" and "/buffer down"
Mikael Berthe <mikael@lilotux.net>
parents:
506
diff
changeset
|
735 } else if (!strncasecmp(arg, "up", 2)) { |
|
5a2132ba2220
Add "/buffer up" and "/buffer down"
Mikael Berthe <mikael@lilotux.net>
parents:
506
diff
changeset
|
736 int nblines; |
|
5a2132ba2220
Add "/buffer up" and "/buffer down"
Mikael Berthe <mikael@lilotux.net>
parents:
506
diff
changeset
|
737 arg += 2; |
|
5a2132ba2220
Add "/buffer up" and "/buffer down"
Mikael Berthe <mikael@lilotux.net>
parents:
506
diff
changeset
|
738 if (*arg && *arg++ != ' ') { |
|
5a2132ba2220
Add "/buffer up" and "/buffer down"
Mikael Berthe <mikael@lilotux.net>
parents:
506
diff
changeset
|
739 scr_LogPrint(LPRINT_NORMAL, "Wrong or missing parameter"); |
|
5a2132ba2220
Add "/buffer up" and "/buffer down"
Mikael Berthe <mikael@lilotux.net>
parents:
506
diff
changeset
|
740 return; |
|
5a2132ba2220
Add "/buffer up" and "/buffer down"
Mikael Berthe <mikael@lilotux.net>
parents:
506
diff
changeset
|
741 } |
|
5a2132ba2220
Add "/buffer up" and "/buffer down"
Mikael Berthe <mikael@lilotux.net>
parents:
506
diff
changeset
|
742 nblines = atoi(arg); |
|
5a2132ba2220
Add "/buffer up" and "/buffer down"
Mikael Berthe <mikael@lilotux.net>
parents:
506
diff
changeset
|
743 if (nblines >= 0) |
|
5a2132ba2220
Add "/buffer up" and "/buffer down"
Mikael Berthe <mikael@lilotux.net>
parents:
506
diff
changeset
|
744 scr_BufferScrollUpDown(-1, nblines); |
|
5a2132ba2220
Add "/buffer up" and "/buffer down"
Mikael Berthe <mikael@lilotux.net>
parents:
506
diff
changeset
|
745 } else if (!strncasecmp(arg, "down", 4)) { |
|
5a2132ba2220
Add "/buffer up" and "/buffer down"
Mikael Berthe <mikael@lilotux.net>
parents:
506
diff
changeset
|
746 int nblines; |
|
5a2132ba2220
Add "/buffer up" and "/buffer down"
Mikael Berthe <mikael@lilotux.net>
parents:
506
diff
changeset
|
747 arg += 4; |
|
5a2132ba2220
Add "/buffer up" and "/buffer down"
Mikael Berthe <mikael@lilotux.net>
parents:
506
diff
changeset
|
748 if (*arg && *arg++ != ' ') { |
|
5a2132ba2220
Add "/buffer up" and "/buffer down"
Mikael Berthe <mikael@lilotux.net>
parents:
506
diff
changeset
|
749 scr_LogPrint(LPRINT_NORMAL, "Wrong or missing parameter"); |
|
5a2132ba2220
Add "/buffer up" and "/buffer down"
Mikael Berthe <mikael@lilotux.net>
parents:
506
diff
changeset
|
750 return; |
|
5a2132ba2220
Add "/buffer up" and "/buffer down"
Mikael Berthe <mikael@lilotux.net>
parents:
506
diff
changeset
|
751 } |
|
5a2132ba2220
Add "/buffer up" and "/buffer down"
Mikael Berthe <mikael@lilotux.net>
parents:
506
diff
changeset
|
752 nblines = atoi(arg); |
|
5a2132ba2220
Add "/buffer up" and "/buffer down"
Mikael Berthe <mikael@lilotux.net>
parents:
506
diff
changeset
|
753 if (nblines >= 0) |
|
5a2132ba2220
Add "/buffer up" and "/buffer down"
Mikael Berthe <mikael@lilotux.net>
parents:
506
diff
changeset
|
754 scr_BufferScrollUpDown(1, nblines); |
|
370
dd9e2eb52916
Add /buffer search_{backward,forward}
Mikael Berthe <mikael@lilotux.net>
parents:
369
diff
changeset
|
755 } else if (!strncasecmp(arg, "search_backward", 15)) { |
|
dd9e2eb52916
Add /buffer search_{backward,forward}
Mikael Berthe <mikael@lilotux.net>
parents:
369
diff
changeset
|
756 arg += 15; |
|
dd9e2eb52916
Add /buffer search_{backward,forward}
Mikael Berthe <mikael@lilotux.net>
parents:
369
diff
changeset
|
757 if (*arg++ == ' ') |
|
dd9e2eb52916
Add /buffer search_{backward,forward}
Mikael Berthe <mikael@lilotux.net>
parents:
369
diff
changeset
|
758 search_dir = -1; |
|
dd9e2eb52916
Add /buffer search_{backward,forward}
Mikael Berthe <mikael@lilotux.net>
parents:
369
diff
changeset
|
759 else |
| 446 | 760 scr_LogPrint(LPRINT_NORMAL, "Wrong or missing parameter"); |
|
370
dd9e2eb52916
Add /buffer search_{backward,forward}
Mikael Berthe <mikael@lilotux.net>
parents:
369
diff
changeset
|
761 } else if (!strncasecmp(arg, "search_forward", 14)) { |
|
dd9e2eb52916
Add /buffer search_{backward,forward}
Mikael Berthe <mikael@lilotux.net>
parents:
369
diff
changeset
|
762 arg += 14; |
|
dd9e2eb52916
Add /buffer search_{backward,forward}
Mikael Berthe <mikael@lilotux.net>
parents:
369
diff
changeset
|
763 if (*arg++ == ' ') |
|
dd9e2eb52916
Add /buffer search_{backward,forward}
Mikael Berthe <mikael@lilotux.net>
parents:
369
diff
changeset
|
764 search_dir = 1; |
|
dd9e2eb52916
Add /buffer search_{backward,forward}
Mikael Berthe <mikael@lilotux.net>
parents:
369
diff
changeset
|
765 else |
| 446 | 766 scr_LogPrint(LPRINT_NORMAL, "Wrong or missing parameter"); |
| 464 | 767 } else if (!strncasecmp(arg, "date", 4)) { |
| 768 arg += 4; | |
| 769 if (*arg++ != ' ') { | |
| 770 scr_LogPrint(LPRINT_NORMAL, "Wrong or missing parameter"); | |
| 771 return; | |
| 772 } | |
| 773 while (*arg == ' ') arg++; | |
| 774 if (*arg) { | |
| 775 time_t t = from_iso8601(arg, 0); | |
| 776 if (t) | |
| 777 scr_BufferDate(t); | |
| 778 else | |
| 779 scr_LogPrint(LPRINT_NORMAL, "Wrong or missing parameter"); | |
| 780 } | |
| 781 else | |
| 782 scr_LogPrint(LPRINT_NORMAL, "Wrong or missing parameter"); | |
| 462 | 783 } else if (*arg == '%') { |
| 784 arg++; | |
| 785 while (*arg == ' ') arg++; | |
| 786 if (*arg) | |
| 787 scr_BufferPercent(atoi(arg)); | |
| 788 else | |
| 789 scr_LogPrint(LPRINT_NORMAL, "Wrong or missing parameter"); | |
| 187 | 790 } else |
|
374
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
371
diff
changeset
|
791 scr_LogPrint(LPRINT_NORMAL, "Unrecognized parameter!"); |
|
370
dd9e2eb52916
Add /buffer search_{backward,forward}
Mikael Berthe <mikael@lilotux.net>
parents:
369
diff
changeset
|
792 |
|
371
bc54af8ed048
/buffer search_*: skip leading spaces (if any) in string parameter
Mikael Berthe <mikael@lilotux.net>
parents:
370
diff
changeset
|
793 if (search_dir) { // It is a string search command |
|
bc54af8ed048
/buffer search_*: skip leading spaces (if any) in string parameter
Mikael Berthe <mikael@lilotux.net>
parents:
370
diff
changeset
|
794 for ( ; *arg && *arg == ' ' ; arg++) |
|
bc54af8ed048
/buffer search_*: skip leading spaces (if any) in string parameter
Mikael Berthe <mikael@lilotux.net>
parents:
370
diff
changeset
|
795 ; |
|
370
dd9e2eb52916
Add /buffer search_{backward,forward}
Mikael Berthe <mikael@lilotux.net>
parents:
369
diff
changeset
|
796 scr_BufferSearch(search_dir, arg); |
|
371
bc54af8ed048
/buffer search_*: skip leading spaces (if any) in string parameter
Mikael Berthe <mikael@lilotux.net>
parents:
370
diff
changeset
|
797 } |
| 187 | 798 } |
| 799 | |
|
336
eb994ee40029
Make some functions static
Mikael Berthe <mikael@lilotux.net>
parents:
330
diff
changeset
|
800 static void do_clear(char *arg) // Alias for "/buffer clear" |
| 187 | 801 { |
| 802 do_buffer("clear"); | |
| 803 } | |
| 804 | |
|
336
eb994ee40029
Make some functions static
Mikael Berthe <mikael@lilotux.net>
parents:
330
diff
changeset
|
805 static void do_info(char *arg) |
| 191 | 806 { |
| 807 gpointer bud; | |
|
439
63562fd409a1
/info can show multiple resources
Mikael Berthe <mikael@lilotux.net>
parents:
438
diff
changeset
|
808 const char *jid, *name; |
| 191 | 809 guint type; |
| 810 char *buffer; | |
| 811 | |
| 812 if (!current_buddy) return; | |
| 813 bud = BUDDATA(current_buddy); | |
| 814 | |
| 815 jid = buddy_getjid(bud); | |
| 816 name = buddy_getname(bud); | |
| 817 type = buddy_gettype(bud); | |
| 818 | |
| 819 buffer = g_new(char, 128); | |
| 820 | |
| 821 if (jid) { | |
|
439
63562fd409a1
/info can show multiple resources
Mikael Berthe <mikael@lilotux.net>
parents:
438
diff
changeset
|
822 GSList *resources; |
| 191 | 823 char *typestr = "unknown"; |
| 824 | |
| 825 snprintf(buffer, 127, "jid: <%s>", jid); | |
| 826 scr_WriteIncomingMessage(jid, buffer, 0, HBB_PREFIX_INFO); | |
| 827 if (name) { | |
| 828 snprintf(buffer, 127, "Name: %s", name); | |
| 829 scr_WriteIncomingMessage(jid, buffer, 0, HBB_PREFIX_INFO); | |
| 830 } | |
| 831 | |
|
439
63562fd409a1
/info can show multiple resources
Mikael Berthe <mikael@lilotux.net>
parents:
438
diff
changeset
|
832 if (type == ROSTER_TYPE_USER) typestr = "user"; |
|
447
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
446
diff
changeset
|
833 else if (type == ROSTER_TYPE_ROOM) typestr = "chatroom"; |
| 191 | 834 else if (type == ROSTER_TYPE_AGENT) typestr = "agent"; |
| 835 snprintf(buffer, 127, "Type: %s", typestr); | |
| 836 scr_WriteIncomingMessage(jid, buffer, 0, HBB_PREFIX_INFO); | |
|
439
63562fd409a1
/info can show multiple resources
Mikael Berthe <mikael@lilotux.net>
parents:
438
diff
changeset
|
837 |
|
63562fd409a1
/info can show multiple resources
Mikael Berthe <mikael@lilotux.net>
parents:
438
diff
changeset
|
838 resources = buddy_getresources(bud); |
|
63562fd409a1
/info can show multiple resources
Mikael Berthe <mikael@lilotux.net>
parents:
438
diff
changeset
|
839 for ( ; resources ; resources = g_slist_next(resources) ) { |
|
63562fd409a1
/info can show multiple resources
Mikael Berthe <mikael@lilotux.net>
parents:
438
diff
changeset
|
840 gchar rprio; |
|
63562fd409a1
/info can show multiple resources
Mikael Berthe <mikael@lilotux.net>
parents:
438
diff
changeset
|
841 enum imstatus rstatus; |
|
63562fd409a1
/info can show multiple resources
Mikael Berthe <mikael@lilotux.net>
parents:
438
diff
changeset
|
842 const char *rst_msg; |
|
63562fd409a1
/info can show multiple resources
Mikael Berthe <mikael@lilotux.net>
parents:
438
diff
changeset
|
843 |
|
63562fd409a1
/info can show multiple resources
Mikael Berthe <mikael@lilotux.net>
parents:
438
diff
changeset
|
844 rprio = buddy_getresourceprio(bud, resources->data); |
|
63562fd409a1
/info can show multiple resources
Mikael Berthe <mikael@lilotux.net>
parents:
438
diff
changeset
|
845 rstatus = buddy_getstatus(bud, resources->data); |
|
63562fd409a1
/info can show multiple resources
Mikael Berthe <mikael@lilotux.net>
parents:
438
diff
changeset
|
846 rst_msg = buddy_getstatusmsg(bud, resources->data); |
|
63562fd409a1
/info can show multiple resources
Mikael Berthe <mikael@lilotux.net>
parents:
438
diff
changeset
|
847 |
|
63562fd409a1
/info can show multiple resources
Mikael Berthe <mikael@lilotux.net>
parents:
438
diff
changeset
|
848 snprintf(buffer, 127, "Resource: [%c] (%d) %s", imstatus2char[rstatus], |
|
63562fd409a1
/info can show multiple resources
Mikael Berthe <mikael@lilotux.net>
parents:
438
diff
changeset
|
849 rprio, (char*)resources->data); |
|
63562fd409a1
/info can show multiple resources
Mikael Berthe <mikael@lilotux.net>
parents:
438
diff
changeset
|
850 scr_WriteIncomingMessage(jid, buffer, 0, HBB_PREFIX_INFO); |
|
63562fd409a1
/info can show multiple resources
Mikael Berthe <mikael@lilotux.net>
parents:
438
diff
changeset
|
851 if (rst_msg) { |
|
63562fd409a1
/info can show multiple resources
Mikael Berthe <mikael@lilotux.net>
parents:
438
diff
changeset
|
852 snprintf(buffer, 127, "Status message: %s", rst_msg); |
|
63562fd409a1
/info can show multiple resources
Mikael Berthe <mikael@lilotux.net>
parents:
438
diff
changeset
|
853 scr_WriteIncomingMessage(jid, buffer, 0, HBB_PREFIX_INFO); |
|
63562fd409a1
/info can show multiple resources
Mikael Berthe <mikael@lilotux.net>
parents:
438
diff
changeset
|
854 } |
|
63562fd409a1
/info can show multiple resources
Mikael Berthe <mikael@lilotux.net>
parents:
438
diff
changeset
|
855 } |
| 191 | 856 } else { |
|
374
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
371
diff
changeset
|
857 if (name) scr_LogPrint(LPRINT_NORMAL, "Name: %s", name); |
|
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
371
diff
changeset
|
858 scr_LogPrint(LPRINT_NORMAL, "Type: %s", |
|
439
63562fd409a1
/info can show multiple resources
Mikael Berthe <mikael@lilotux.net>
parents:
438
diff
changeset
|
859 ((type == ROSTER_TYPE_GROUP) ? "group" : "unknown")); |
| 191 | 860 } |
| 861 | |
| 862 g_free(buffer); | |
| 863 } | |
| 864 | |
|
504
321ae11e7ddb
Prettier display for "/room names"
Mikael Berthe <mikael@lilotux.net>
parents:
490
diff
changeset
|
865 // room_names() is a variation of do_info(), for chatrooms only |
|
321ae11e7ddb
Prettier display for "/room names"
Mikael Berthe <mikael@lilotux.net>
parents:
490
diff
changeset
|
866 static void room_names(void) |
|
321ae11e7ddb
Prettier display for "/room names"
Mikael Berthe <mikael@lilotux.net>
parents:
490
diff
changeset
|
867 { |
|
321ae11e7ddb
Prettier display for "/room names"
Mikael Berthe <mikael@lilotux.net>
parents:
490
diff
changeset
|
868 gpointer bud; |
|
321ae11e7ddb
Prettier display for "/room names"
Mikael Berthe <mikael@lilotux.net>
parents:
490
diff
changeset
|
869 const char *jid; |
|
321ae11e7ddb
Prettier display for "/room names"
Mikael Berthe <mikael@lilotux.net>
parents:
490
diff
changeset
|
870 char *buffer; |
|
321ae11e7ddb
Prettier display for "/room names"
Mikael Berthe <mikael@lilotux.net>
parents:
490
diff
changeset
|
871 GSList *resources; |
|
321ae11e7ddb
Prettier display for "/room names"
Mikael Berthe <mikael@lilotux.net>
parents:
490
diff
changeset
|
872 |
|
321ae11e7ddb
Prettier display for "/room names"
Mikael Berthe <mikael@lilotux.net>
parents:
490
diff
changeset
|
873 if (!current_buddy) return; |
|
321ae11e7ddb
Prettier display for "/room names"
Mikael Berthe <mikael@lilotux.net>
parents:
490
diff
changeset
|
874 bud = BUDDATA(current_buddy); |
|
321ae11e7ddb
Prettier display for "/room names"
Mikael Berthe <mikael@lilotux.net>
parents:
490
diff
changeset
|
875 |
|
321ae11e7ddb
Prettier display for "/room names"
Mikael Berthe <mikael@lilotux.net>
parents:
490
diff
changeset
|
876 if (buddy_gettype(bud) != ROSTER_TYPE_ROOM) { |
|
321ae11e7ddb
Prettier display for "/room names"
Mikael Berthe <mikael@lilotux.net>
parents:
490
diff
changeset
|
877 scr_LogPrint(LPRINT_NORMAL, "This isn't a chatroom"); |
|
321ae11e7ddb
Prettier display for "/room names"
Mikael Berthe <mikael@lilotux.net>
parents:
490
diff
changeset
|
878 return; |
|
321ae11e7ddb
Prettier display for "/room names"
Mikael Berthe <mikael@lilotux.net>
parents:
490
diff
changeset
|
879 } |
|
321ae11e7ddb
Prettier display for "/room names"
Mikael Berthe <mikael@lilotux.net>
parents:
490
diff
changeset
|
880 |
|
321ae11e7ddb
Prettier display for "/room names"
Mikael Berthe <mikael@lilotux.net>
parents:
490
diff
changeset
|
881 jid = buddy_getjid(bud); |
|
321ae11e7ddb
Prettier display for "/room names"
Mikael Berthe <mikael@lilotux.net>
parents:
490
diff
changeset
|
882 |
|
321ae11e7ddb
Prettier display for "/room names"
Mikael Berthe <mikael@lilotux.net>
parents:
490
diff
changeset
|
883 buffer = g_new(char, 128); |
|
321ae11e7ddb
Prettier display for "/room names"
Mikael Berthe <mikael@lilotux.net>
parents:
490
diff
changeset
|
884 snprintf(buffer, 127, "Room members:"); |
|
321ae11e7ddb
Prettier display for "/room names"
Mikael Berthe <mikael@lilotux.net>
parents:
490
diff
changeset
|
885 scr_WriteIncomingMessage(jid, buffer, 0, HBB_PREFIX_INFO); |
|
321ae11e7ddb
Prettier display for "/room names"
Mikael Berthe <mikael@lilotux.net>
parents:
490
diff
changeset
|
886 |
|
321ae11e7ddb
Prettier display for "/room names"
Mikael Berthe <mikael@lilotux.net>
parents:
490
diff
changeset
|
887 resources = buddy_getresources(bud); |
|
321ae11e7ddb
Prettier display for "/room names"
Mikael Berthe <mikael@lilotux.net>
parents:
490
diff
changeset
|
888 for ( ; resources ; resources = g_slist_next(resources) ) { |
|
321ae11e7ddb
Prettier display for "/room names"
Mikael Berthe <mikael@lilotux.net>
parents:
490
diff
changeset
|
889 enum imstatus rstatus; |
|
321ae11e7ddb
Prettier display for "/room names"
Mikael Berthe <mikael@lilotux.net>
parents:
490
diff
changeset
|
890 const char *rst_msg; |
|
321ae11e7ddb
Prettier display for "/room names"
Mikael Berthe <mikael@lilotux.net>
parents:
490
diff
changeset
|
891 |
|
321ae11e7ddb
Prettier display for "/room names"
Mikael Berthe <mikael@lilotux.net>
parents:
490
diff
changeset
|
892 rstatus = buddy_getstatus(bud, resources->data); |
|
321ae11e7ddb
Prettier display for "/room names"
Mikael Berthe <mikael@lilotux.net>
parents:
490
diff
changeset
|
893 rst_msg = buddy_getstatusmsg(bud, resources->data); |
|
321ae11e7ddb
Prettier display for "/room names"
Mikael Berthe <mikael@lilotux.net>
parents:
490
diff
changeset
|
894 |
|
321ae11e7ddb
Prettier display for "/room names"
Mikael Berthe <mikael@lilotux.net>
parents:
490
diff
changeset
|
895 snprintf(buffer, 127, "[%c] %s", imstatus2char[rstatus], |
|
321ae11e7ddb
Prettier display for "/room names"
Mikael Berthe <mikael@lilotux.net>
parents:
490
diff
changeset
|
896 (char*)resources->data); |
|
321ae11e7ddb
Prettier display for "/room names"
Mikael Berthe <mikael@lilotux.net>
parents:
490
diff
changeset
|
897 scr_WriteIncomingMessage(jid, buffer, 0, HBB_PREFIX_INFO); |
|
321ae11e7ddb
Prettier display for "/room names"
Mikael Berthe <mikael@lilotux.net>
parents:
490
diff
changeset
|
898 if (rst_msg) { |
|
321ae11e7ddb
Prettier display for "/room names"
Mikael Berthe <mikael@lilotux.net>
parents:
490
diff
changeset
|
899 snprintf(buffer, 127, "Status message: %s", rst_msg); |
|
321ae11e7ddb
Prettier display for "/room names"
Mikael Berthe <mikael@lilotux.net>
parents:
490
diff
changeset
|
900 scr_WriteIncomingMessage(jid, buffer, 0, HBB_PREFIX_INFO); |
|
321ae11e7ddb
Prettier display for "/room names"
Mikael Berthe <mikael@lilotux.net>
parents:
490
diff
changeset
|
901 } |
|
321ae11e7ddb
Prettier display for "/room names"
Mikael Berthe <mikael@lilotux.net>
parents:
490
diff
changeset
|
902 } |
|
321ae11e7ddb
Prettier display for "/room names"
Mikael Berthe <mikael@lilotux.net>
parents:
490
diff
changeset
|
903 |
|
321ae11e7ddb
Prettier display for "/room names"
Mikael Berthe <mikael@lilotux.net>
parents:
490
diff
changeset
|
904 g_free(buffer); |
|
321ae11e7ddb
Prettier display for "/room names"
Mikael Berthe <mikael@lilotux.net>
parents:
490
diff
changeset
|
905 } |
|
321ae11e7ddb
Prettier display for "/room names"
Mikael Berthe <mikael@lilotux.net>
parents:
490
diff
changeset
|
906 |
|
336
eb994ee40029
Make some functions static
Mikael Berthe <mikael@lilotux.net>
parents:
330
diff
changeset
|
907 static void do_rename(char *arg) |
| 208 | 908 { |
| 909 gpointer bud; | |
| 910 const char *jid, *group; | |
| 911 guint type; | |
| 912 char *newname, *p; | |
| 913 | |
| 446 | 914 if (!arg || (!*arg)) { |
|
374
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
371
diff
changeset
|
915 scr_LogPrint(LPRINT_NORMAL, "Missing parameter"); |
| 208 | 916 return; |
| 917 } | |
| 918 | |
| 919 if (!current_buddy) return; | |
| 920 bud = BUDDATA(current_buddy); | |
| 921 | |
| 922 jid = buddy_getjid(bud); | |
| 923 group = buddy_getgroupname(bud); | |
| 924 type = buddy_gettype(bud); | |
| 925 | |
| 926 if (type & ROSTER_TYPE_GROUP) { | |
|
374
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
371
diff
changeset
|
927 scr_LogPrint(LPRINT_NORMAL, "You can't rename groups"); |
| 208 | 928 return; |
| 929 } | |
| 930 | |
| 931 newname = g_strdup(arg); | |
| 932 // Remove trailing space | |
| 933 for (p = newname; *p; p++) ; | |
| 934 while (p > newname && *p == ' ') *p = 0; | |
| 935 | |
| 936 buddy_setname(bud, newname); | |
| 937 jb_updatebuddy(jid, newname, group); | |
| 938 | |
| 939 g_free(newname); | |
| 940 update_roster = TRUE; | |
| 941 } | |
| 942 | |
|
336
eb994ee40029
Make some functions static
Mikael Berthe <mikael@lilotux.net>
parents:
330
diff
changeset
|
943 static void do_move(char *arg) |
| 210 | 944 { |
| 945 gpointer bud; | |
| 946 const char *jid, *name; | |
| 947 guint type; | |
| 948 char *newgroupname, *p; | |
| 949 | |
| 950 if (!current_buddy) return; | |
| 951 bud = BUDDATA(current_buddy); | |
| 952 | |
| 953 jid = buddy_getjid(bud); | |
| 954 name = buddy_getname(bud); | |
| 955 type = buddy_gettype(bud); | |
| 956 | |
| 957 if (type & ROSTER_TYPE_GROUP) { | |
|
374
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
371
diff
changeset
|
958 scr_LogPrint(LPRINT_NORMAL, "You can't move groups!"); |
| 210 | 959 return; |
| 960 } | |
| 961 | |
| 962 newgroupname = g_strdup(arg); | |
| 963 // Remove trailing space | |
| 964 for (p = newgroupname; *p; p++) ; | |
| 965 while (p > newgroupname && *p == ' ') *p = 0; | |
| 966 | |
| 967 // Call to buddy_setgroup() should be at the end, as current implementation | |
| 968 // clones the buddy and deletes the old one (and thus, jid and name are | |
| 969 // freed) | |
| 970 jb_updatebuddy(jid, name, newgroupname); | |
|
506
74dcd0df532e
"/move" does not jump to the buddy in the new group
Mikael Berthe <mikael@lilotux.net>
parents:
504
diff
changeset
|
971 scr_RosterUp(); |
| 210 | 972 buddy_setgroup(bud, newgroupname); |
| 973 | |
| 974 g_free(newgroupname); | |
| 975 update_roster = TRUE; | |
| 976 } | |
| 977 | |
|
336
eb994ee40029
Make some functions static
Mikael Berthe <mikael@lilotux.net>
parents:
330
diff
changeset
|
978 static void do_set(char *arg) |
|
283
00b2377539ac
Add /set command (to get/set/unset options values)
Mikael Berthe <mikael@lilotux.net>
parents:
277
diff
changeset
|
979 { |
|
00b2377539ac
Add /set command (to get/set/unset options values)
Mikael Berthe <mikael@lilotux.net>
parents:
277
diff
changeset
|
980 guint assign; |
|
00b2377539ac
Add /set command (to get/set/unset options values)
Mikael Berthe <mikael@lilotux.net>
parents:
277
diff
changeset
|
981 const gchar *option, *value; |
| 393 | 982 |
|
283
00b2377539ac
Add /set command (to get/set/unset options values)
Mikael Berthe <mikael@lilotux.net>
parents:
277
diff
changeset
|
983 assign = parse_assigment(arg, &option, &value); |
|
00b2377539ac
Add /set command (to get/set/unset options values)
Mikael Berthe <mikael@lilotux.net>
parents:
277
diff
changeset
|
984 if (!option) { |
|
374
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
371
diff
changeset
|
985 scr_LogPrint(LPRINT_NORMAL, "Huh?"); |
|
283
00b2377539ac
Add /set command (to get/set/unset options values)
Mikael Berthe <mikael@lilotux.net>
parents:
277
diff
changeset
|
986 return; |
|
00b2377539ac
Add /set command (to get/set/unset options values)
Mikael Berthe <mikael@lilotux.net>
parents:
277
diff
changeset
|
987 } |
|
00b2377539ac
Add /set command (to get/set/unset options values)
Mikael Berthe <mikael@lilotux.net>
parents:
277
diff
changeset
|
988 if (!assign) { |
|
00b2377539ac
Add /set command (to get/set/unset options values)
Mikael Berthe <mikael@lilotux.net>
parents:
277
diff
changeset
|
989 // This is a query |
|
00b2377539ac
Add /set command (to get/set/unset options values)
Mikael Berthe <mikael@lilotux.net>
parents:
277
diff
changeset
|
990 value = settings_opt_get(option); |
|
00b2377539ac
Add /set command (to get/set/unset options values)
Mikael Berthe <mikael@lilotux.net>
parents:
277
diff
changeset
|
991 if (value) { |
|
374
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
371
diff
changeset
|
992 scr_LogPrint(LPRINT_NORMAL, "%s = [%s]", option, value); |
|
283
00b2377539ac
Add /set command (to get/set/unset options values)
Mikael Berthe <mikael@lilotux.net>
parents:
277
diff
changeset
|
993 } else |
|
374
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
371
diff
changeset
|
994 scr_LogPrint(LPRINT_NORMAL, "Option %s is not set", option); |
|
283
00b2377539ac
Add /set command (to get/set/unset options values)
Mikael Berthe <mikael@lilotux.net>
parents:
277
diff
changeset
|
995 return; |
|
00b2377539ac
Add /set command (to get/set/unset options values)
Mikael Berthe <mikael@lilotux.net>
parents:
277
diff
changeset
|
996 } |
|
00b2377539ac
Add /set command (to get/set/unset options values)
Mikael Berthe <mikael@lilotux.net>
parents:
277
diff
changeset
|
997 // Update the option |
|
00b2377539ac
Add /set command (to get/set/unset options values)
Mikael Berthe <mikael@lilotux.net>
parents:
277
diff
changeset
|
998 // XXX Maybe some options should be protected when user is connected |
|
00b2377539ac
Add /set command (to get/set/unset options values)
Mikael Berthe <mikael@lilotux.net>
parents:
277
diff
changeset
|
999 // (server, username, etc.). And we should catch some options here, too |
|
00b2377539ac
Add /set command (to get/set/unset options values)
Mikael Berthe <mikael@lilotux.net>
parents:
277
diff
changeset
|
1000 // (hide_offline_buddies for ex.) |
|
00b2377539ac
Add /set command (to get/set/unset options values)
Mikael Berthe <mikael@lilotux.net>
parents:
277
diff
changeset
|
1001 if (!value) { |
|
00b2377539ac
Add /set command (to get/set/unset options values)
Mikael Berthe <mikael@lilotux.net>
parents:
277
diff
changeset
|
1002 settings_del(SETTINGS_TYPE_OPTION, option); |
|
00b2377539ac
Add /set command (to get/set/unset options values)
Mikael Berthe <mikael@lilotux.net>
parents:
277
diff
changeset
|
1003 } else { |
|
00b2377539ac
Add /set command (to get/set/unset options values)
Mikael Berthe <mikael@lilotux.net>
parents:
277
diff
changeset
|
1004 settings_set(SETTINGS_TYPE_OPTION, option, value); |
|
00b2377539ac
Add /set command (to get/set/unset options values)
Mikael Berthe <mikael@lilotux.net>
parents:
277
diff
changeset
|
1005 } |
|
00b2377539ac
Add /set command (to get/set/unset options values)
Mikael Berthe <mikael@lilotux.net>
parents:
277
diff
changeset
|
1006 } |
|
00b2377539ac
Add /set command (to get/set/unset options values)
Mikael Berthe <mikael@lilotux.net>
parents:
277
diff
changeset
|
1007 |
|
336
eb994ee40029
Make some functions static
Mikael Berthe <mikael@lilotux.net>
parents:
330
diff
changeset
|
1008 static void do_alias(char *arg) |
| 285 | 1009 { |
| 1010 guint assign; | |
| 1011 const gchar *alias, *value; | |
| 393 | 1012 |
| 285 | 1013 assign = parse_assigment(arg, &alias, &value); |
| 1014 if (!alias) { | |
|
374
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
371
diff
changeset
|
1015 scr_LogPrint(LPRINT_NORMAL, "Huh?"); |
| 285 | 1016 return; |
| 1017 } | |
| 1018 if (!assign) { | |
| 1019 // This is a query | |
| 1020 value = settings_get(SETTINGS_TYPE_ALIAS, alias); | |
| 1021 if (value) { | |
|
374
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
371
diff
changeset
|
1022 scr_LogPrint(LPRINT_NORMAL, "%s = %s", alias, value); |
| 285 | 1023 } else |
|
374
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
371
diff
changeset
|
1024 scr_LogPrint(LPRINT_NORMAL, "Alias '%s' does not exist", alias); |
| 285 | 1025 return; |
| 1026 } | |
| 1027 // Check the alias does not conflict with a registered command | |
| 1028 if (cmd_get(alias)) { | |
|
374
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
371
diff
changeset
|
1029 scr_LogPrint(LPRINT_NORMAL, "'%s' is a reserved word!", alias); |
| 285 | 1030 return; |
| 1031 } | |
| 1032 // Update the alias | |
| 1033 if (!value) { | |
| 1034 if (settings_get(SETTINGS_TYPE_ALIAS, alias)) { | |
| 1035 settings_del(SETTINGS_TYPE_ALIAS, alias); | |
| 1036 // Remove alias from the completion list | |
| 1037 compl_del_category_word(COMPL_CMD, alias); | |
| 1038 } | |
| 1039 } else { | |
| 1040 // Add alias to the completion list, if not already in | |
| 1041 if (!settings_get(SETTINGS_TYPE_ALIAS, alias)) | |
| 1042 compl_add_category_word(COMPL_CMD, alias); | |
| 1043 settings_set(SETTINGS_TYPE_ALIAS, alias, value); | |
| 1044 } | |
| 1045 } | |
| 1046 | |
|
336
eb994ee40029
Make some functions static
Mikael Berthe <mikael@lilotux.net>
parents:
330
diff
changeset
|
1047 static void do_bind(char *arg) |
| 288 | 1048 { |
| 1049 guint assign; | |
| 1050 const gchar *keycode, *value; | |
| 393 | 1051 |
| 288 | 1052 assign = parse_assigment(arg, &keycode, &value); |
| 1053 if (!keycode) { | |
|
374
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
371
diff
changeset
|
1054 scr_LogPrint(LPRINT_NORMAL, "Huh?"); |
| 288 | 1055 return; |
| 1056 } | |
| 1057 if (!assign) { | |
| 1058 // This is a query | |
| 1059 value = settings_get(SETTINGS_TYPE_BINDING, keycode); | |
| 1060 if (value) { | |
|
374
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
371
diff
changeset
|
1061 scr_LogPrint(LPRINT_NORMAL, "Key %s is bound to: %s", keycode, value); |
| 288 | 1062 } else |
|
374
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
371
diff
changeset
|
1063 scr_LogPrint(LPRINT_NORMAL, "Key %s is not bound", keycode); |
| 288 | 1064 return; |
| 1065 } | |
| 1066 // Update the key binding | |
| 1067 if (!value) | |
| 1068 settings_del(SETTINGS_TYPE_BINDING, keycode); | |
| 1069 else | |
| 1070 settings_set(SETTINGS_TYPE_BINDING, keycode, value); | |
| 1071 } | |
| 1072 | |
| 436 | 1073 static void do_rawxml(char *arg) |
| 1074 { | |
|
472
75442262c082
Disable some commands when not connected
Mikael Berthe <mikael@lilotux.net>
parents:
471
diff
changeset
|
1075 if (!jb_getonline()) { |
|
75442262c082
Disable some commands when not connected
Mikael Berthe <mikael@lilotux.net>
parents:
471
diff
changeset
|
1076 scr_LogPrint(LPRINT_NORMAL, "You are not connected"); |
|
75442262c082
Disable some commands when not connected
Mikael Berthe <mikael@lilotux.net>
parents:
471
diff
changeset
|
1077 return; |
|
75442262c082
Disable some commands when not connected
Mikael Berthe <mikael@lilotux.net>
parents:
471
diff
changeset
|
1078 } |
|
75442262c082
Disable some commands when not connected
Mikael Berthe <mikael@lilotux.net>
parents:
471
diff
changeset
|
1079 |
| 436 | 1080 if (!strncasecmp(arg, "send ", 5)) { |
|
461
1d8f5b3a5f2b
Convert /rawxml argument to UTF8
Mikael Berthe <mikael@lilotux.net>
parents:
454
diff
changeset
|
1081 gchar *buffer; |
| 436 | 1082 for (arg += 5; *arg && *arg == ' '; arg++) |
| 1083 ; | |
|
469
a926523d2392
Use UTF8 to handle resources and room nicknames
Mikael Berthe <mikael@lilotux.net>
parents:
464
diff
changeset
|
1084 buffer = to_utf8(arg); |
|
461
1d8f5b3a5f2b
Convert /rawxml argument to UTF8
Mikael Berthe <mikael@lilotux.net>
parents:
454
diff
changeset
|
1085 if (!buffer) { |
|
1d8f5b3a5f2b
Convert /rawxml argument to UTF8
Mikael Berthe <mikael@lilotux.net>
parents:
454
diff
changeset
|
1086 scr_LogPrint(LPRINT_NORMAL, "Conversion error in XML string"); |
|
1d8f5b3a5f2b
Convert /rawxml argument to UTF8
Mikael Berthe <mikael@lilotux.net>
parents:
454
diff
changeset
|
1087 return; |
|
1d8f5b3a5f2b
Convert /rawxml argument to UTF8
Mikael Berthe <mikael@lilotux.net>
parents:
454
diff
changeset
|
1088 } |
| 436 | 1089 scr_LogPrint(LPRINT_NORMAL, "Sending XML string"); |
|
461
1d8f5b3a5f2b
Convert /rawxml argument to UTF8
Mikael Berthe <mikael@lilotux.net>
parents:
454
diff
changeset
|
1090 jb_send_raw(buffer); |
|
1d8f5b3a5f2b
Convert /rawxml argument to UTF8
Mikael Berthe <mikael@lilotux.net>
parents:
454
diff
changeset
|
1091 g_free(buffer); |
| 436 | 1092 } else { |
| 1093 scr_LogPrint(LPRINT_NORMAL, "Please read the manual page" | |
| 1094 " before using /rawxml :-)"); | |
| 1095 } | |
| 1096 } | |
| 1097 | |
|
447
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
446
diff
changeset
|
1098 static void do_room(char *arg) |
|
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
446
diff
changeset
|
1099 { |
|
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
446
diff
changeset
|
1100 gpointer bud; |
|
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
446
diff
changeset
|
1101 |
|
472
75442262c082
Disable some commands when not connected
Mikael Berthe <mikael@lilotux.net>
parents:
471
diff
changeset
|
1102 if (!jb_getonline()) { |
|
75442262c082
Disable some commands when not connected
Mikael Berthe <mikael@lilotux.net>
parents:
471
diff
changeset
|
1103 scr_LogPrint(LPRINT_NORMAL, "You are not connected"); |
|
75442262c082
Disable some commands when not connected
Mikael Berthe <mikael@lilotux.net>
parents:
471
diff
changeset
|
1104 return; |
|
75442262c082
Disable some commands when not connected
Mikael Berthe <mikael@lilotux.net>
parents:
471
diff
changeset
|
1105 } |
|
75442262c082
Disable some commands when not connected
Mikael Berthe <mikael@lilotux.net>
parents:
471
diff
changeset
|
1106 |
|
447
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
446
diff
changeset
|
1107 if (!arg || (!*arg)) { |
|
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
446
diff
changeset
|
1108 scr_LogPrint(LPRINT_NORMAL, "Missing parameter"); |
|
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
446
diff
changeset
|
1109 return; |
|
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
446
diff
changeset
|
1110 } |
|
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
446
diff
changeset
|
1111 |
|
471
82a27508fb85
Fix segfaults when using /buffer and /room while not connected
Mikael Berthe <mikael@lilotux.net>
parents:
470
diff
changeset
|
1112 if (!current_buddy) return; |
|
447
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
446
diff
changeset
|
1113 bud = BUDDATA(current_buddy); |
|
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
446
diff
changeset
|
1114 |
|
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
446
diff
changeset
|
1115 if (!strncasecmp(arg, "join", 4)) { |
|
469
a926523d2392
Use UTF8 to handle resources and room nicknames
Mikael Berthe <mikael@lilotux.net>
parents:
464
diff
changeset
|
1116 char *roomname, *nick; |
|
447
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
446
diff
changeset
|
1117 |
|
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
446
diff
changeset
|
1118 arg += 4; |
|
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
446
diff
changeset
|
1119 if (*arg++ != ' ') { |
|
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
446
diff
changeset
|
1120 scr_LogPrint(LPRINT_NORMAL, "Wrong or missing parameter"); |
|
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
446
diff
changeset
|
1121 return; |
|
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
446
diff
changeset
|
1122 } |
|
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
446
diff
changeset
|
1123 for (; *arg && *arg == ' '; arg++) |
|
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
446
diff
changeset
|
1124 ; |
|
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
446
diff
changeset
|
1125 |
|
454
d647b92e541f
MUC: Disallow room names with a '/'
Mikael Berthe <mikael@lilotux.net>
parents:
452
diff
changeset
|
1126 if (strchr(arg, '/')) { |
|
d647b92e541f
MUC: Disallow room names with a '/'
Mikael Berthe <mikael@lilotux.net>
parents:
452
diff
changeset
|
1127 scr_LogPrint(LPRINT_NORMAL, "Invalid room name"); |
|
d647b92e541f
MUC: Disallow room names with a '/'
Mikael Berthe <mikael@lilotux.net>
parents:
452
diff
changeset
|
1128 return; |
|
d647b92e541f
MUC: Disallow room names with a '/'
Mikael Berthe <mikael@lilotux.net>
parents:
452
diff
changeset
|
1129 } |
|
d647b92e541f
MUC: Disallow room names with a '/'
Mikael Berthe <mikael@lilotux.net>
parents:
452
diff
changeset
|
1130 |
|
447
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
446
diff
changeset
|
1131 roomname = g_strdup(arg); |
|
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
446
diff
changeset
|
1132 nick = strchr(roomname, ' '); |
|
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
446
diff
changeset
|
1133 if (!nick) { |
|
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
446
diff
changeset
|
1134 scr_LogPrint(LPRINT_NORMAL, "Missing parameter (nickname)"); |
|
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
446
diff
changeset
|
1135 g_free(roomname); |
|
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
446
diff
changeset
|
1136 return; |
|
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
446
diff
changeset
|
1137 } |
|
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
446
diff
changeset
|
1138 |
|
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
446
diff
changeset
|
1139 *nick++ = 0; |
|
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
446
diff
changeset
|
1140 while (*nick && *nick == ' ') |
|
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
446
diff
changeset
|
1141 nick++; |
|
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
446
diff
changeset
|
1142 if (!*nick) { |
|
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
446
diff
changeset
|
1143 scr_LogPrint(LPRINT_NORMAL, "Missing parameter (nickname)"); |
|
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
446
diff
changeset
|
1144 g_free(roomname); |
|
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
446
diff
changeset
|
1145 return; |
|
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
446
diff
changeset
|
1146 } |
| 452 | 1147 |
|
469
a926523d2392
Use UTF8 to handle resources and room nicknames
Mikael Berthe <mikael@lilotux.net>
parents:
464
diff
changeset
|
1148 mc_strtolower(roomname); |
|
a926523d2392
Use UTF8 to handle resources and room nicknames
Mikael Berthe <mikael@lilotux.net>
parents:
464
diff
changeset
|
1149 jb_room_join(roomname, nick); |
| 452 | 1150 |
|
447
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
446
diff
changeset
|
1151 g_free(roomname); |
|
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
446
diff
changeset
|
1152 buddylist_build(); |
|
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
446
diff
changeset
|
1153 update_roster = TRUE; |
| 486 | 1154 } else if (!strncasecmp(arg, "invite", 6)) { |
| 1155 const gchar *roomname; | |
| 490 | 1156 gchar* jid; |
| 486 | 1157 arg += 6; |
| 1158 if (*arg++ != ' ') { | |
| 1159 scr_LogPrint(LPRINT_NORMAL, "Wrong or missing parameter"); | |
| 1160 return; | |
| 1161 } | |
| 1162 for (; *arg && *arg == ' '; arg++) | |
| 1163 ; | |
| 1164 if (!(buddy_gettype(bud) & ROSTER_TYPE_ROOM)) { | |
| 1165 scr_LogPrint(LPRINT_NORMAL, "This isn't a chatroom"); | |
| 1166 return; | |
| 1167 } | |
| 1168 if (!*arg) { | |
| 1169 scr_LogPrint(LPRINT_NORMAL, "Missing parameter"); | |
| 1170 return; | |
| 1171 } | |
| 1172 jid = g_strdup(arg); | |
| 1173 arg = strchr(jid, ' '); | |
| 1174 if (arg) { | |
| 1175 *arg++ = 0; | |
| 1176 for (; *arg && *arg == ' '; arg++) | |
| 1177 ; | |
| 1178 if (!*arg) arg = NULL; | |
| 1179 } | |
| 1180 roomname = buddy_getjid(bud); | |
| 1181 jb_room_invite(roomname, jid, arg); | |
| 1182 scr_LogPrint(LPRINT_LOGNORM, "Invitation sent to <%s>", jid); | |
| 1183 g_free(jid); | |
|
447
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
446
diff
changeset
|
1184 } else if (!strncasecmp(arg, "leave", 5)) { |
|
469
a926523d2392
Use UTF8 to handle resources and room nicknames
Mikael Berthe <mikael@lilotux.net>
parents:
464
diff
changeset
|
1185 gchar *roomid, *utf8_nickname; |
|
447
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
446
diff
changeset
|
1186 arg += 5; |
|
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
446
diff
changeset
|
1187 for (; *arg && *arg == ' '; arg++) |
|
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
446
diff
changeset
|
1188 ; |
|
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
446
diff
changeset
|
1189 if (!(buddy_gettype(bud) & ROSTER_TYPE_ROOM)) { |
|
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
446
diff
changeset
|
1190 scr_LogPrint(LPRINT_NORMAL, "This isn't a chatroom"); |
|
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
446
diff
changeset
|
1191 return; |
|
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
446
diff
changeset
|
1192 } |
|
469
a926523d2392
Use UTF8 to handle resources and room nicknames
Mikael Berthe <mikael@lilotux.net>
parents:
464
diff
changeset
|
1193 utf8_nickname = to_utf8(buddy_getnickname(bud)); |
|
a926523d2392
Use UTF8 to handle resources and room nicknames
Mikael Berthe <mikael@lilotux.net>
parents:
464
diff
changeset
|
1194 roomid = g_strdup_printf("%s/%s", buddy_getjid(bud), utf8_nickname); |
|
447
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
446
diff
changeset
|
1195 jb_setstatus(offline, roomid, arg); |
|
469
a926523d2392
Use UTF8 to handle resources and room nicknames
Mikael Berthe <mikael@lilotux.net>
parents:
464
diff
changeset
|
1196 g_free(utf8_nickname); |
|
447
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
446
diff
changeset
|
1197 g_free(roomid); |
|
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
446
diff
changeset
|
1198 buddy_setnickname(bud, NULL); |
|
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
446
diff
changeset
|
1199 buddy_del_all_resources(bud); |
| 486 | 1200 scr_LogPrint(LPRINT_LOGNORM, "You have left %s", buddy_getjid(bud)); |
|
447
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
446
diff
changeset
|
1201 } else if (!strcasecmp(arg, "names")) { |
|
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
446
diff
changeset
|
1202 if (!(buddy_gettype(bud) & ROSTER_TYPE_ROOM)) { |
|
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
446
diff
changeset
|
1203 scr_LogPrint(LPRINT_NORMAL, "This isn't a chatroom"); |
|
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
446
diff
changeset
|
1204 return; |
|
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
446
diff
changeset
|
1205 } |
|
504
321ae11e7ddb
Prettier display for "/room names"
Mikael Berthe <mikael@lilotux.net>
parents:
490
diff
changeset
|
1206 room_names(); |
| 470 | 1207 } else if (!strncasecmp(arg, "nick", 4)) { |
| 1208 gchar *cmd; | |
| 1209 arg += 4; | |
| 1210 if (*arg++ != ' ') { | |
| 1211 scr_LogPrint(LPRINT_NORMAL, "Wrong or missing parameter"); | |
| 1212 return; | |
| 1213 } | |
| 1214 for (; *arg && *arg == ' '; arg++) | |
| 1215 ; | |
| 1216 if (!(buddy_gettype(bud) & ROSTER_TYPE_ROOM)) { | |
| 1217 scr_LogPrint(LPRINT_NORMAL, "This isn't a chatroom"); | |
| 1218 return; | |
| 1219 } | |
| 1220 cmd = g_strdup_printf("join %s %s", buddy_getjid(bud), arg); | |
| 1221 do_room(cmd); | |
| 1222 g_free(cmd); | |
| 490 | 1223 } else if (!strncasecmp(arg, "privmsg", 7)) { |
| 1224 gchar *nick, *cmd; | |
| 1225 arg += 7; | |
| 1226 if (*arg++ != ' ') { | |
| 1227 scr_LogPrint(LPRINT_NORMAL, "Wrong or missing parameter"); | |
| 1228 return; | |
| 1229 } | |
| 1230 for (; *arg && *arg == ' '; arg++) | |
| 1231 ; | |
| 1232 if (!(buddy_gettype(bud) & ROSTER_TYPE_ROOM)) { | |
| 1233 scr_LogPrint(LPRINT_NORMAL, "This isn't a chatroom"); | |
| 1234 return; | |
| 1235 } | |
| 1236 if (!*arg) { | |
| 1237 scr_LogPrint(LPRINT_NORMAL, "Missing parameter"); | |
| 1238 return; | |
| 1239 } | |
| 1240 nick = g_strdup(arg); | |
| 1241 arg = strchr(nick, ' '); | |
| 1242 if (!arg) { | |
| 1243 scr_LogPrint(LPRINT_NORMAL, "Missing parameter"); | |
| 1244 return; | |
| 1245 } | |
| 1246 *arg++ = 0; | |
| 1247 for (; *arg && *arg == ' '; arg++) | |
| 1248 ; | |
| 1249 cmd = g_strdup_printf("%s/%s %s", buddy_getjid(bud), nick, arg); | |
| 1250 do_say_to(cmd); | |
| 1251 g_free(cmd); | |
| 1252 g_free(nick); | |
|
448
39a28cb59af3
Add "/room remove", to remove an old chatroom from the roster
Mikael Berthe <mikael@lilotux.net>
parents:
447
diff
changeset
|
1253 } else if (!strcasecmp(arg, "remove")) { |
|
39a28cb59af3
Add "/room remove", to remove an old chatroom from the roster
Mikael Berthe <mikael@lilotux.net>
parents:
447
diff
changeset
|
1254 if (!(buddy_gettype(bud) & ROSTER_TYPE_ROOM)) { |
|
39a28cb59af3
Add "/room remove", to remove an old chatroom from the roster
Mikael Berthe <mikael@lilotux.net>
parents:
447
diff
changeset
|
1255 scr_LogPrint(LPRINT_NORMAL, "This isn't a chatroom"); |
|
39a28cb59af3
Add "/room remove", to remove an old chatroom from the roster
Mikael Berthe <mikael@lilotux.net>
parents:
447
diff
changeset
|
1256 return; |
|
39a28cb59af3
Add "/room remove", to remove an old chatroom from the roster
Mikael Berthe <mikael@lilotux.net>
parents:
447
diff
changeset
|
1257 } |
|
39a28cb59af3
Add "/room remove", to remove an old chatroom from the roster
Mikael Berthe <mikael@lilotux.net>
parents:
447
diff
changeset
|
1258 // Quick check: if there are resources, we haven't left |
|
39a28cb59af3
Add "/room remove", to remove an old chatroom from the roster
Mikael Berthe <mikael@lilotux.net>
parents:
447
diff
changeset
|
1259 if (buddy_getresources(bud)) { |
|
39a28cb59af3
Add "/room remove", to remove an old chatroom from the roster
Mikael Berthe <mikael@lilotux.net>
parents:
447
diff
changeset
|
1260 scr_LogPrint(LPRINT_NORMAL, "You haven't left this room!"); |
|
39a28cb59af3
Add "/room remove", to remove an old chatroom from the roster
Mikael Berthe <mikael@lilotux.net>
parents:
447
diff
changeset
|
1261 return; |
|
39a28cb59af3
Add "/room remove", to remove an old chatroom from the roster
Mikael Berthe <mikael@lilotux.net>
parents:
447
diff
changeset
|
1262 } |
|
39a28cb59af3
Add "/room remove", to remove an old chatroom from the roster
Mikael Berthe <mikael@lilotux.net>
parents:
447
diff
changeset
|
1263 // Delete the room |
|
39a28cb59af3
Add "/room remove", to remove an old chatroom from the roster
Mikael Berthe <mikael@lilotux.net>
parents:
447
diff
changeset
|
1264 roster_del_user(buddy_getjid(bud)); |
|
39a28cb59af3
Add "/room remove", to remove an old chatroom from the roster
Mikael Berthe <mikael@lilotux.net>
parents:
447
diff
changeset
|
1265 buddylist_build(); |
|
39a28cb59af3
Add "/room remove", to remove an old chatroom from the roster
Mikael Berthe <mikael@lilotux.net>
parents:
447
diff
changeset
|
1266 update_roster = TRUE; |
| 449 | 1267 } else if (!strcasecmp(arg, "unlock")) { |
| 1268 if (!(buddy_gettype(bud) & ROSTER_TYPE_ROOM)) { | |
| 1269 scr_LogPrint(LPRINT_NORMAL, "This isn't a chatroom"); | |
| 1270 return; | |
| 1271 } | |
| 1272 jb_room_unlock(buddy_getjid(bud)); | |
|
475
fa49ac0bb8f3
Add "/room topic", and display topic changes
Mikael Berthe <mikael@lilotux.net>
parents:
472
diff
changeset
|
1273 } else if (!strncasecmp(arg, "topic", 5)) { |
|
fa49ac0bb8f3
Add "/room topic", and display topic changes
Mikael Berthe <mikael@lilotux.net>
parents:
472
diff
changeset
|
1274 gchar *msg; |
|
fa49ac0bb8f3
Add "/room topic", and display topic changes
Mikael Berthe <mikael@lilotux.net>
parents:
472
diff
changeset
|
1275 arg += 5; |
|
fa49ac0bb8f3
Add "/room topic", and display topic changes
Mikael Berthe <mikael@lilotux.net>
parents:
472
diff
changeset
|
1276 if (*arg++ != ' ') { |
|
fa49ac0bb8f3
Add "/room topic", and display topic changes
Mikael Berthe <mikael@lilotux.net>
parents:
472
diff
changeset
|
1277 scr_LogPrint(LPRINT_NORMAL, "Wrong or missing parameter"); |
|
fa49ac0bb8f3
Add "/room topic", and display topic changes
Mikael Berthe <mikael@lilotux.net>
parents:
472
diff
changeset
|
1278 return; |
|
fa49ac0bb8f3
Add "/room topic", and display topic changes
Mikael Berthe <mikael@lilotux.net>
parents:
472
diff
changeset
|
1279 } |
|
fa49ac0bb8f3
Add "/room topic", and display topic changes
Mikael Berthe <mikael@lilotux.net>
parents:
472
diff
changeset
|
1280 for (; *arg && *arg == ' '; arg++) |
|
fa49ac0bb8f3
Add "/room topic", and display topic changes
Mikael Berthe <mikael@lilotux.net>
parents:
472
diff
changeset
|
1281 ; |
|
fa49ac0bb8f3
Add "/room topic", and display topic changes
Mikael Berthe <mikael@lilotux.net>
parents:
472
diff
changeset
|
1282 if (!(buddy_gettype(bud) & ROSTER_TYPE_ROOM)) { |
|
fa49ac0bb8f3
Add "/room topic", and display topic changes
Mikael Berthe <mikael@lilotux.net>
parents:
472
diff
changeset
|
1283 scr_LogPrint(LPRINT_NORMAL, "This isn't a chatroom"); |
|
fa49ac0bb8f3
Add "/room topic", and display topic changes
Mikael Berthe <mikael@lilotux.net>
parents:
472
diff
changeset
|
1284 return; |
|
fa49ac0bb8f3
Add "/room topic", and display topic changes
Mikael Berthe <mikael@lilotux.net>
parents:
472
diff
changeset
|
1285 } |
|
fa49ac0bb8f3
Add "/room topic", and display topic changes
Mikael Berthe <mikael@lilotux.net>
parents:
472
diff
changeset
|
1286 msg = g_strdup_printf("/me has set the topic to: %s", arg); |
|
fa49ac0bb8f3
Add "/room topic", and display topic changes
Mikael Berthe <mikael@lilotux.net>
parents:
472
diff
changeset
|
1287 jb_send_msg(buddy_getjid(bud), msg, ROSTER_TYPE_ROOM, arg); |
|
fa49ac0bb8f3
Add "/room topic", and display topic changes
Mikael Berthe <mikael@lilotux.net>
parents:
472
diff
changeset
|
1288 g_free(msg); |
|
447
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
446
diff
changeset
|
1289 } else { |
|
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
446
diff
changeset
|
1290 scr_LogPrint(LPRINT_NORMAL, "Unrecognized parameter!"); |
|
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
446
diff
changeset
|
1291 } |
|
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
446
diff
changeset
|
1292 } |
|
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
446
diff
changeset
|
1293 |
|
336
eb994ee40029
Make some functions static
Mikael Berthe <mikael@lilotux.net>
parents:
330
diff
changeset
|
1294 static void do_connect(char *arg) |
|
298
35cda94e570d
Add /connect and /disconnect commands
Mikael Berthe <mikael@lilotux.net>
parents:
290
diff
changeset
|
1295 { |
|
35cda94e570d
Add /connect and /disconnect commands
Mikael Berthe <mikael@lilotux.net>
parents:
290
diff
changeset
|
1296 mcabber_connect(); |
|
35cda94e570d
Add /connect and /disconnect commands
Mikael Berthe <mikael@lilotux.net>
parents:
290
diff
changeset
|
1297 } |
|
35cda94e570d
Add /connect and /disconnect commands
Mikael Berthe <mikael@lilotux.net>
parents:
290
diff
changeset
|
1298 |
|
336
eb994ee40029
Make some functions static
Mikael Berthe <mikael@lilotux.net>
parents:
330
diff
changeset
|
1299 static void do_disconnect(char *arg) |
|
298
35cda94e570d
Add /connect and /disconnect commands
Mikael Berthe <mikael@lilotux.net>
parents:
290
diff
changeset
|
1300 { |
|
35cda94e570d
Add /connect and /disconnect commands
Mikael Berthe <mikael@lilotux.net>
parents:
290
diff
changeset
|
1301 jb_disconnect(); |
|
35cda94e570d
Add /connect and /disconnect commands
Mikael Berthe <mikael@lilotux.net>
parents:
290
diff
changeset
|
1302 } |