Mercurial > ~mikael > mcabber > hg
annotate mcabber/mcabber/commands.c @ 2122:b41719d57dac
reimplement 'unescape_topic' option as '/room topic -u' switch
| author | sh!zeeg <shizeeque@gmail.com> |
|---|---|
| date | Wed, 14 May 2014 10:47:56 +0400 |
| parents | 9c791e2a437a |
| children | 300e7bf4416a |
| rev | line source |
|---|---|
| 47 | 1 /* |
| 699 | 2 * commands.c -- user commands handling |
| 393 | 3 * |
|
1729
e6e89b1d7831
Minor style and header updates
Mikael Berthe <mikael@lilotux.net>
parents:
1726
diff
changeset
|
4 * Copyright (C) 2005-2010 Mikael Berthe <mikael@lilotux.net> |
| 47 | 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> |
| 1598 | 23 #include <stdlib.h> |
|
1432
46e5eb9917bc
Add an option "-f" (file) to /say_to
Mikael Berthe <mikael@lilotux.net>
parents:
1430
diff
changeset
|
24 #include <sys/types.h> |
|
46e5eb9917bc
Add an option "-f" (file) to /say_to
Mikael Berthe <mikael@lilotux.net>
parents:
1430
diff
changeset
|
25 #include <sys/stat.h> |
|
46e5eb9917bc
Add an option "-f" (file) to /say_to
Mikael Berthe <mikael@lilotux.net>
parents:
1430
diff
changeset
|
26 #include <unistd.h> |
|
1675
c73b31124fa6
Use glob() in source command
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
27 #include <errno.h> |
|
c73b31124fa6
Use glob() in source command
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
28 #include <glob.h> |
| 95 | 29 |
|
1676
96b5484423af
Use $prefix/lib/mcabber as default modules_dir
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1675
diff
changeset
|
30 #include "config.h" |
| 47 | 31 #include "commands.h" |
|
868
cefdaeb42e67
Add online /help command
Mikael Berthe <mikael@lilotux.net>
parents:
867
diff
changeset
|
32 #include "help.h" |
| 81 | 33 #include "roster.h" |
| 47 | 34 #include "screen.h" |
| 95 | 35 #include "compl.h" |
| 113 | 36 #include "hooks.h" |
| 191 | 37 #include "hbuf.h" |
| 47 | 38 #include "utils.h" |
|
283
00b2377539ac
Add /set command (to get/set/unset options values)
Mikael Berthe <mikael@lilotux.net>
parents:
277
diff
changeset
|
39 #include "settings.h" |
| 748 | 40 #include "events.h" |
|
1299
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
41 #include "otr.h" |
|
2107
1bd9978ed5d0
Added carbon command
Roeland Jago Douma <roeland@famdouma.nl>
parents:
2074
diff
changeset
|
42 #include "carbons.h" |
|
1442
b49a1edba983
Check file content when using /say_to -f
Mikael Berthe <mikael@lilotux.net>
parents:
1435
diff
changeset
|
43 #include "utf8.h" |
| 1598 | 44 #include "xmpp.h" |
|
1653
fca9a4c17432
Improve UI latency and CPU usage
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1649
diff
changeset
|
45 #include "main.h" |
| 47 | 46 |
| 967 | 47 #define IMSTATUS_AWAY "away" |
| 48 #define IMSTATUS_ONLINE "online" | |
| 49 #define IMSTATUS_OFFLINE "offline" | |
| 50 #define IMSTATUS_FREE4CHAT "free" | |
| 51 #define IMSTATUS_AVAILABLE "avail" | |
| 52 #define IMSTATUS_NOTAVAILABLE "notavail" | |
| 53 #define IMSTATUS_DONOTDISTURB "dnd" | |
|
1972
45f0f0f60656
Remove deprecated status invisible
Mikael Berthe <mikael@lilotux.net>
parents:
1959
diff
changeset
|
54 #ifdef WITH_DEPRECATED_STATUS_INVISIBLE |
|
45f0f0f60656
Remove deprecated status invisible
Mikael Berthe <mikael@lilotux.net>
parents:
1959
diff
changeset
|
55 # define IMSTATUS_INVISIBLE "invisible" |
|
45f0f0f60656
Remove deprecated status invisible
Mikael Berthe <mikael@lilotux.net>
parents:
1959
diff
changeset
|
56 #endif |
| 967 | 57 |
|
1173
960f34ec22a2
Add init_bindings() for default key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents:
1172
diff
changeset
|
58 // Return value container for the following functions |
|
960f34ec22a2
Add init_bindings() for default key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents:
1172
diff
changeset
|
59 static int retval_for_cmds; |
|
960f34ec22a2
Add init_bindings() for default key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents:
1172
diff
changeset
|
60 |
| 104 | 61 // Commands callbacks |
|
336
eb994ee40029
Make some functions static
Mikael Berthe <mikael@lilotux.net>
parents:
330
diff
changeset
|
62 static void do_roster(char *arg); |
|
eb994ee40029
Make some functions static
Mikael Berthe <mikael@lilotux.net>
parents:
330
diff
changeset
|
63 static void do_status(char *arg); |
| 444 | 64 static void do_status_to(char *arg); |
|
336
eb994ee40029
Make some functions static
Mikael Berthe <mikael@lilotux.net>
parents:
330
diff
changeset
|
65 static void do_add(char *arg); |
|
eb994ee40029
Make some functions static
Mikael Berthe <mikael@lilotux.net>
parents:
330
diff
changeset
|
66 static void do_del(char *arg); |
|
eb994ee40029
Make some functions static
Mikael Berthe <mikael@lilotux.net>
parents:
330
diff
changeset
|
67 static void do_group(char *arg); |
|
eb994ee40029
Make some functions static
Mikael Berthe <mikael@lilotux.net>
parents:
330
diff
changeset
|
68 static void do_say(char *arg); |
|
eb994ee40029
Make some functions static
Mikael Berthe <mikael@lilotux.net>
parents:
330
diff
changeset
|
69 static void do_msay(char *arg); |
| 480 | 70 static void do_say_to(char *arg); |
|
336
eb994ee40029
Make some functions static
Mikael Berthe <mikael@lilotux.net>
parents:
330
diff
changeset
|
71 static void do_buffer(char *arg); |
|
eb994ee40029
Make some functions static
Mikael Berthe <mikael@lilotux.net>
parents:
330
diff
changeset
|
72 static void do_clear(char *arg); |
|
eb994ee40029
Make some functions static
Mikael Berthe <mikael@lilotux.net>
parents:
330
diff
changeset
|
73 static void do_info(char *arg); |
|
eb994ee40029
Make some functions static
Mikael Berthe <mikael@lilotux.net>
parents:
330
diff
changeset
|
74 static void do_rename(char *arg); |
|
eb994ee40029
Make some functions static
Mikael Berthe <mikael@lilotux.net>
parents:
330
diff
changeset
|
75 static void do_move(char *arg); |
|
eb994ee40029
Make some functions static
Mikael Berthe <mikael@lilotux.net>
parents:
330
diff
changeset
|
76 static void do_set(char *arg); |
|
eb994ee40029
Make some functions static
Mikael Berthe <mikael@lilotux.net>
parents:
330
diff
changeset
|
77 static void do_alias(char *arg); |
|
eb994ee40029
Make some functions static
Mikael Berthe <mikael@lilotux.net>
parents:
330
diff
changeset
|
78 static void do_bind(char *arg); |
|
eb994ee40029
Make some functions static
Mikael Berthe <mikael@lilotux.net>
parents:
330
diff
changeset
|
79 static void do_connect(char *arg); |
|
eb994ee40029
Make some functions static
Mikael Berthe <mikael@lilotux.net>
parents:
330
diff
changeset
|
80 static void do_disconnect(char *arg); |
| 436 | 81 static void do_rawxml(char *arg); |
|
447
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
446
diff
changeset
|
82 static void do_room(char *arg); |
|
617
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
608
diff
changeset
|
83 static void do_authorization(char *arg); |
| 622 | 84 static void do_version(char *arg); |
| 693 | 85 static void do_request(char *arg); |
| 748 | 86 static void do_event(char *arg); |
|
868
cefdaeb42e67
Add online /help command
Mikael Berthe <mikael@lilotux.net>
parents:
867
diff
changeset
|
87 static void do_help(char *arg); |
| 1066 | 88 static void do_pgp(char *arg); |
|
1171
03a38b7ad2e0
Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents:
1165
diff
changeset
|
89 static void do_iline(char *arg); |
|
1172
334ae9f498f1
Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents:
1171
diff
changeset
|
90 static void do_screen_refresh(char *arg); |
|
334ae9f498f1
Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents:
1171
diff
changeset
|
91 static void do_chat_disable(char *arg); |
| 1192 | 92 static void do_source(char *arg); |
|
1272
033576acac4c
Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents:
1268
diff
changeset
|
93 static void do_color(char *arg); |
|
1299
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
94 static void do_otr(char *arg); |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
95 static void do_otrpolicy(char *arg); |
|
1518
63dc211a4c1a
New command: /echo (display a message in the log window)
Mikael Berthe <mikael@lilotux.net>
parents:
1508
diff
changeset
|
96 static void do_echo(char *arg); |
|
1939
932d1b250a55
Simplify cmd_add() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1938
diff
changeset
|
97 static void do_module(char *arg); |
|
2107
1bd9978ed5d0
Added carbon command
Roeland Jago Douma <roeland@famdouma.nl>
parents:
2074
diff
changeset
|
98 static void do_carbons(char *arg); |
| 47 | 99 |
|
1980
3bcc57751283
Add 'muc_bookmark_autoupdate' (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents:
1979
diff
changeset
|
100 static void room_bookmark(gpointer bud, char *arg); |
|
3bcc57751283
Add 'muc_bookmark_autoupdate' (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents:
1979
diff
changeset
|
101 |
| 104 | 102 // Global variable for the commands list |
| 95 | 103 static GSList *Commands; |
|
1988
dd65a18dc480
Add cmd_set_safe() / cmd_is_safe() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1986
diff
changeset
|
104 static GSList *safe_commands; |
| 95 | 105 |
| 1607 | 106 #ifdef MODULES_ENABLE |
|
1735
5093b5ca1572
New modules loading scheme
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1732
diff
changeset
|
107 #include "modules.h" |
|
5093b5ca1572
New modules loading scheme
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1732
diff
changeset
|
108 |
|
1986
ad77110343d6
Use a command ID with cmd_add/cmd_del (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1985
diff
changeset
|
109 gpointer cmd_del(gpointer id) |
| 1607 | 110 { |
|
1649
44bbdc961234
Allow commands shading
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1648
diff
changeset
|
111 GSList *sl_cmd; |
| 1992 | 112 if (!id) return NULL; |
|
1986
ad77110343d6
Use a command ID with cmd_add/cmd_del (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1985
diff
changeset
|
113 for (sl_cmd = Commands; sl_cmd; sl_cmd = sl_cmd->next) |
|
ad77110343d6
Use a command ID with cmd_add/cmd_del (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1985
diff
changeset
|
114 if (sl_cmd -> data == id) { |
|
ad77110343d6
Use a command ID with cmd_add/cmd_del (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1985
diff
changeset
|
115 cmd *command = (cmd *) sl_cmd->data; |
|
1649
44bbdc961234
Allow commands shading
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1648
diff
changeset
|
116 gpointer userdata = command->userdata; |
|
44bbdc961234
Allow commands shading
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1648
diff
changeset
|
117 Commands = g_slist_delete_link(Commands, sl_cmd); |
|
44bbdc961234
Allow commands shading
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1648
diff
changeset
|
118 compl_del_category_word(COMPL_CMD, command->name); |
|
44bbdc961234
Allow commands shading
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1648
diff
changeset
|
119 g_free(command); |
|
44bbdc961234
Allow commands shading
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1648
diff
changeset
|
120 return userdata; |
|
44bbdc961234
Allow commands shading
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1648
diff
changeset
|
121 } |
| 1607 | 122 return NULL; |
| 123 } | |
|
1939
932d1b250a55
Simplify cmd_add() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1938
diff
changeset
|
124 #endif |
| 104 | 125 |
| 95 | 126 // cmd_add() |
| 127 // Adds a command to the commands list and to the CMD completion list | |
|
1986
ad77110343d6
Use a command ID with cmd_add/cmd_del (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1985
diff
changeset
|
128 gpointer cmd_add(const char *name, const char *help, guint flags_row1, |
|
ad77110343d6
Use a command ID with cmd_add/cmd_del (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1985
diff
changeset
|
129 guint flags_row2, void (*f)(char*), gpointer userdata) |
| 95 | 130 { |
| 131 cmd *n_cmd = g_new0(cmd, 1); | |
| 132 strncpy(n_cmd->name, name, 32-1); | |
| 133 n_cmd->help = help; | |
| 134 n_cmd->completion_flags[0] = flags_row1; | |
| 135 n_cmd->completion_flags[1] = flags_row2; | |
| 136 n_cmd->func = f; | |
| 1607 | 137 n_cmd->userdata = userdata; |
|
1649
44bbdc961234
Allow commands shading
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1648
diff
changeset
|
138 Commands = g_slist_prepend(Commands, n_cmd); |
| 95 | 139 // Add to completion CMD category |
| 140 compl_add_category_word(COMPL_CMD, name); | |
|
1986
ad77110343d6
Use a command ID with cmd_add/cmd_del (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1985
diff
changeset
|
141 return n_cmd; |
| 95 | 142 } |
| 143 | |
|
1988
dd65a18dc480
Add cmd_set_safe() / cmd_is_safe() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1986
diff
changeset
|
144 // cmd_set_safe(name, safe) |
|
dd65a18dc480
Add cmd_set_safe() / cmd_is_safe() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1986
diff
changeset
|
145 // Sets if command can be used in startup configuration file. |
|
dd65a18dc480
Add cmd_set_safe() / cmd_is_safe() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1986
diff
changeset
|
146 gboolean cmd_set_safe(const gchar *name, gboolean safe) |
|
dd65a18dc480
Add cmd_set_safe() / cmd_is_safe() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1986
diff
changeset
|
147 { |
|
dd65a18dc480
Add cmd_set_safe() / cmd_is_safe() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1986
diff
changeset
|
148 GSList *sel; |
|
dd65a18dc480
Add cmd_set_safe() / cmd_is_safe() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1986
diff
changeset
|
149 if (!name) |
|
dd65a18dc480
Add cmd_set_safe() / cmd_is_safe() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1986
diff
changeset
|
150 return FALSE; |
|
dd65a18dc480
Add cmd_set_safe() / cmd_is_safe() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1986
diff
changeset
|
151 for (sel = safe_commands; sel; sel = sel->next) |
|
dd65a18dc480
Add cmd_set_safe() / cmd_is_safe() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1986
diff
changeset
|
152 if (!strcmp((const char *)sel->data, name)) { |
|
dd65a18dc480
Add cmd_set_safe() / cmd_is_safe() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1986
diff
changeset
|
153 if (safe) |
|
dd65a18dc480
Add cmd_set_safe() / cmd_is_safe() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1986
diff
changeset
|
154 return FALSE; |
|
dd65a18dc480
Add cmd_set_safe() / cmd_is_safe() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1986
diff
changeset
|
155 else { |
|
dd65a18dc480
Add cmd_set_safe() / cmd_is_safe() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1986
diff
changeset
|
156 g_free(sel->data); |
|
dd65a18dc480
Add cmd_set_safe() / cmd_is_safe() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1986
diff
changeset
|
157 safe_commands = g_slist_delete_link(safe_commands, sel); |
|
dd65a18dc480
Add cmd_set_safe() / cmd_is_safe() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1986
diff
changeset
|
158 } |
|
dd65a18dc480
Add cmd_set_safe() / cmd_is_safe() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1986
diff
changeset
|
159 } |
|
dd65a18dc480
Add cmd_set_safe() / cmd_is_safe() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1986
diff
changeset
|
160 if (safe) |
|
dd65a18dc480
Add cmd_set_safe() / cmd_is_safe() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1986
diff
changeset
|
161 safe_commands = g_slist_append(safe_commands, g_strdup(name)); |
|
dd65a18dc480
Add cmd_set_safe() / cmd_is_safe() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1986
diff
changeset
|
162 else |
|
dd65a18dc480
Add cmd_set_safe() / cmd_is_safe() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1986
diff
changeset
|
163 return FALSE; |
|
dd65a18dc480
Add cmd_set_safe() / cmd_is_safe() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1986
diff
changeset
|
164 return TRUE; |
|
dd65a18dc480
Add cmd_set_safe() / cmd_is_safe() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1986
diff
changeset
|
165 } |
|
dd65a18dc480
Add cmd_set_safe() / cmd_is_safe() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1986
diff
changeset
|
166 |
|
dd65a18dc480
Add cmd_set_safe() / cmd_is_safe() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1986
diff
changeset
|
167 // cmd_is_safe(name) |
|
dd65a18dc480
Add cmd_set_safe() / cmd_is_safe() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1986
diff
changeset
|
168 // Returns if command is safe or not |
|
dd65a18dc480
Add cmd_set_safe() / cmd_is_safe() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1986
diff
changeset
|
169 gboolean cmd_is_safe(const gchar *name) |
|
dd65a18dc480
Add cmd_set_safe() / cmd_is_safe() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1986
diff
changeset
|
170 { |
|
dd65a18dc480
Add cmd_set_safe() / cmd_is_safe() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1986
diff
changeset
|
171 GSList *sel; |
|
dd65a18dc480
Add cmd_set_safe() / cmd_is_safe() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1986
diff
changeset
|
172 if (!name) |
|
dd65a18dc480
Add cmd_set_safe() / cmd_is_safe() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1986
diff
changeset
|
173 return FALSE; |
|
dd65a18dc480
Add cmd_set_safe() / cmd_is_safe() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1986
diff
changeset
|
174 for (sel = safe_commands; sel; sel = sel->next) |
|
dd65a18dc480
Add cmd_set_safe() / cmd_is_safe() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1986
diff
changeset
|
175 if (!strcmp((const char *)sel->data, name)) |
|
dd65a18dc480
Add cmd_set_safe() / cmd_is_safe() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1986
diff
changeset
|
176 return TRUE; |
|
dd65a18dc480
Add cmd_set_safe() / cmd_is_safe() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1986
diff
changeset
|
177 return FALSE; |
|
dd65a18dc480
Add cmd_set_safe() / cmd_is_safe() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1986
diff
changeset
|
178 } |
|
dd65a18dc480
Add cmd_set_safe() / cmd_is_safe() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1986
diff
changeset
|
179 |
| 95 | 180 // cmd_init() |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
181 // Commands table initialization |
|
1173
960f34ec22a2
Add init_bindings() for default key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents:
1172
diff
changeset
|
182 // !!! |
|
960f34ec22a2
Add init_bindings() for default key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents:
1172
diff
changeset
|
183 // After changing commands names and it arguments names here, you must change |
|
960f34ec22a2
Add init_bindings() for default key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents:
1172
diff
changeset
|
184 // ones in init_bindings()! |
|
960f34ec22a2
Add init_bindings() for default key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents:
1172
diff
changeset
|
185 // |
| 95 | 186 void cmd_init(void) |
| 187 { | |
|
1939
932d1b250a55
Simplify cmd_add() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1938
diff
changeset
|
188 cmd_add("add", "Add a jabber user", COMPL_JID, 0, &do_add, NULL); |
|
932d1b250a55
Simplify cmd_add() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1938
diff
changeset
|
189 cmd_add("alias", "Add an alias", 0, 0, &do_alias, NULL); |
|
617
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
608
diff
changeset
|
190 cmd_add("authorization", "Manage subscription authorizations", |
|
1939
932d1b250a55
Simplify cmd_add() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1938
diff
changeset
|
191 COMPL_AUTH, COMPL_JID, &do_authorization, NULL); |
|
932d1b250a55
Simplify cmd_add() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1938
diff
changeset
|
192 cmd_add("bind", "Add an key binding", 0, 0, &do_bind, NULL); |
| 187 | 193 cmd_add("buffer", "Manipulate current buddy's buffer (chat window)", |
|
1939
932d1b250a55
Simplify cmd_add() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1938
diff
changeset
|
194 COMPL_BUFFER, 0, &do_buffer, NULL); |
| 2111 | 195 cmd_add("carbons", "Manage carbons settings", COMPL_CARBONS, 0, |
| 196 &do_carbons, NULL); | |
|
1939
932d1b250a55
Simplify cmd_add() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1938
diff
changeset
|
197 cmd_add("chat_disable", "Disable chat mode", 0, 0, &do_chat_disable, NULL); |
|
932d1b250a55
Simplify cmd_add() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1938
diff
changeset
|
198 cmd_add("clear", "Clear the dialog window", 0, 0, &do_clear, NULL); |
|
932d1b250a55
Simplify cmd_add() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1938
diff
changeset
|
199 cmd_add("color", "Set coloring options", COMPL_COLOR, 0, &do_color, NULL); |
|
932d1b250a55
Simplify cmd_add() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1938
diff
changeset
|
200 cmd_add("connect", "Connect to the server", 0, 0, &do_connect, NULL); |
|
932d1b250a55
Simplify cmd_add() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1938
diff
changeset
|
201 cmd_add("del", "Delete the current buddy", 0, 0, &do_del, NULL); |
|
932d1b250a55
Simplify cmd_add() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1938
diff
changeset
|
202 cmd_add("disconnect", "Disconnect from server", 0, 0, &do_disconnect, NULL); |
|
932d1b250a55
Simplify cmd_add() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1938
diff
changeset
|
203 cmd_add("echo", "Display a string in the log window", 0, 0, &do_echo, NULL); |
|
932d1b250a55
Simplify cmd_add() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1938
diff
changeset
|
204 cmd_add("event", "Process an event", COMPL_EVENTSID, COMPL_EVENTS, &do_event, |
|
932d1b250a55
Simplify cmd_add() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1938
diff
changeset
|
205 NULL); |
|
1507
3de24d857ef7
Complete group names in /group command
Mikael Berthe <mikael@lilotux.net>
parents:
1506
diff
changeset
|
206 cmd_add("group", "Change group display settings", |
|
1939
932d1b250a55
Simplify cmd_add() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1938
diff
changeset
|
207 COMPL_GROUP, COMPL_GROUPNAME, &do_group, NULL); |
|
932d1b250a55
Simplify cmd_add() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1938
diff
changeset
|
208 cmd_add("help", "Display some help", COMPL_CMD, 0, &do_help, NULL); |
|
932d1b250a55
Simplify cmd_add() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1938
diff
changeset
|
209 cmd_add("iline", "Manipulate input buffer", 0, 0, &do_iline, NULL); |
|
932d1b250a55
Simplify cmd_add() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1938
diff
changeset
|
210 cmd_add("info", "Show basic info on current buddy", 0, 0, &do_info, NULL); |
|
932d1b250a55
Simplify cmd_add() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1938
diff
changeset
|
211 cmd_add("module", "Manipulations with modules", COMPL_MODULE, 0, &do_module, |
|
932d1b250a55
Simplify cmd_add() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1938
diff
changeset
|
212 NULL); |
| 225 | 213 cmd_add("move", "Move the current buddy to another group", COMPL_GROUPNAME, |
|
1939
932d1b250a55
Simplify cmd_add() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1938
diff
changeset
|
214 0, &do_move, NULL); |
| 238 | 215 cmd_add("msay", "Send a multi-lines message to the selected buddy", |
|
1939
932d1b250a55
Simplify cmd_add() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1938
diff
changeset
|
216 COMPL_MULTILINE, 0, &do_msay, NULL); |
|
932d1b250a55
Simplify cmd_add() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1938
diff
changeset
|
217 cmd_add("otr", "Manage OTR settings", COMPL_OTR, COMPL_JID, &do_otr, NULL); |
|
1333
e30a9d907105
Minor coding style adjustments
Mikael Berthe <mikael@lilotux.net>
parents:
1329
diff
changeset
|
218 cmd_add("otrpolicy", "Manage OTR policies", COMPL_JID, COMPL_OTRPOLICY, |
|
1939
932d1b250a55
Simplify cmd_add() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1938
diff
changeset
|
219 &do_otrpolicy, NULL); |
|
932d1b250a55
Simplify cmd_add() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1938
diff
changeset
|
220 cmd_add("pgp", "Manage PGP settings", COMPL_PGP, COMPL_JID, &do_pgp, NULL); |
|
932d1b250a55
Simplify cmd_add() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1938
diff
changeset
|
221 cmd_add("quit", "Exit the software", 0, 0, NULL, NULL); |
|
932d1b250a55
Simplify cmd_add() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1938
diff
changeset
|
222 cmd_add("rawxml", "Send a raw XML string", 0, 0, &do_rawxml, NULL); |
|
932d1b250a55
Simplify cmd_add() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1938
diff
changeset
|
223 cmd_add("rename", "Rename the current buddy", 0, 0, &do_rename, NULL); |
|
902
2016f52a167f
Sort commands (for the completion system)
Mikael Berthe <mikael@lilotux.net>
parents:
900
diff
changeset
|
224 cmd_add("request", "Send a Jabber IQ request", COMPL_REQUEST, COMPL_JID, |
|
1939
932d1b250a55
Simplify cmd_add() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1938
diff
changeset
|
225 &do_request, NULL); |
|
932d1b250a55
Simplify cmd_add() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1938
diff
changeset
|
226 cmd_add("room", "MUC actions command", COMPL_ROOM, 0, &do_room, NULL); |
| 128 | 227 cmd_add("roster", "Manipulate the roster/buddylist", COMPL_ROSTER, 0, |
|
1939
932d1b250a55
Simplify cmd_add() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1938
diff
changeset
|
228 &do_roster, NULL); |
|
932d1b250a55
Simplify cmd_add() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1938
diff
changeset
|
229 cmd_add("say", "Say something to the selected buddy", 0, 0, &do_say, NULL); |
|
488
9e8519078e00
Enable jid completion for /say_to
Mikael Berthe <mikael@lilotux.net>
parents:
486
diff
changeset
|
230 cmd_add("say_to", "Say something to a specific buddy", COMPL_JID, 0, |
|
1939
932d1b250a55
Simplify cmd_add() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1938
diff
changeset
|
231 &do_say_to, NULL); |
|
932d1b250a55
Simplify cmd_add() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1938
diff
changeset
|
232 cmd_add("screen_refresh", "Redraw mcabber screen", 0, 0, &do_screen_refresh, |
|
932d1b250a55
Simplify cmd_add() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1938
diff
changeset
|
233 NULL); |
|
932d1b250a55
Simplify cmd_add() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1938
diff
changeset
|
234 cmd_add("set", "Set/query an option value", 0, 0, &do_set, NULL); |
|
932d1b250a55
Simplify cmd_add() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1938
diff
changeset
|
235 cmd_add("source", "Read a configuration file", 0, 0, &do_source, NULL); |
|
932d1b250a55
Simplify cmd_add() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1938
diff
changeset
|
236 cmd_add("status", "Show or set your status", COMPL_STATUS, 0, &do_status, |
|
932d1b250a55
Simplify cmd_add() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1938
diff
changeset
|
237 NULL); |
| 444 | 238 cmd_add("status_to", "Show or set your status for one recipient", |
|
1939
932d1b250a55
Simplify cmd_add() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1938
diff
changeset
|
239 COMPL_JID, COMPL_STATUS, &do_status_to, NULL); |
|
932d1b250a55
Simplify cmd_add() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1938
diff
changeset
|
240 cmd_add("version", "Show mcabber version", 0, 0, &do_version, NULL); |
| 95 | 241 |
|
1988
dd65a18dc480
Add cmd_set_safe() / cmd_is_safe() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1986
diff
changeset
|
242 cmd_set_safe("set", TRUE); |
|
dd65a18dc480
Add cmd_set_safe() / cmd_is_safe() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1986
diff
changeset
|
243 cmd_set_safe("bind", TRUE); |
|
dd65a18dc480
Add cmd_set_safe() / cmd_is_safe() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1986
diff
changeset
|
244 cmd_set_safe("alias", TRUE); |
|
dd65a18dc480
Add cmd_set_safe() / cmd_is_safe() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1986
diff
changeset
|
245 cmd_set_safe("pgp", TRUE); |
|
dd65a18dc480
Add cmd_set_safe() / cmd_is_safe() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1986
diff
changeset
|
246 cmd_set_safe("source", TRUE); |
|
dd65a18dc480
Add cmd_set_safe() / cmd_is_safe() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1986
diff
changeset
|
247 cmd_set_safe("status", TRUE); |
|
dd65a18dc480
Add cmd_set_safe() / cmd_is_safe() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1986
diff
changeset
|
248 cmd_set_safe("color", TRUE); |
|
dd65a18dc480
Add cmd_set_safe() / cmd_is_safe() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1986
diff
changeset
|
249 cmd_set_safe("otrpolicy", TRUE); |
|
dd65a18dc480
Add cmd_set_safe() / cmd_is_safe() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1986
diff
changeset
|
250 cmd_set_safe("module", TRUE); |
|
dd65a18dc480
Add cmd_set_safe() / cmd_is_safe() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1986
diff
changeset
|
251 |
| 95 | 252 // Status category |
| 253 compl_add_category_word(COMPL_STATUS, "online"); | |
| 254 compl_add_category_word(COMPL_STATUS, "avail"); | |
|
1972
45f0f0f60656
Remove deprecated status invisible
Mikael Berthe <mikael@lilotux.net>
parents:
1959
diff
changeset
|
255 #ifdef WITH_DEPRECATED_STATUS_INVISIBLE |
| 95 | 256 compl_add_category_word(COMPL_STATUS, "invisible"); |
|
1972
45f0f0f60656
Remove deprecated status invisible
Mikael Berthe <mikael@lilotux.net>
parents:
1959
diff
changeset
|
257 #endif |
| 95 | 258 compl_add_category_word(COMPL_STATUS, "free"); |
| 259 compl_add_category_word(COMPL_STATUS, "dnd"); | |
| 260 compl_add_category_word(COMPL_STATUS, "notavail"); | |
| 261 compl_add_category_word(COMPL_STATUS, "away"); | |
|
1235
58d6e7713164
Complete /status offline
Mikael Berthe <mikael@lilotux.net>
parents:
1226
diff
changeset
|
262 compl_add_category_word(COMPL_STATUS, "offline"); |
|
1422
3cd104b41f26
Add "/status message" (to only change the status description string)
Mikael Berthe <mikael@lilotux.net>
parents:
1418
diff
changeset
|
263 compl_add_category_word(COMPL_STATUS, "message"); |
| 103 | 264 |
| 265 // Roster category | |
| 266 compl_add_category_word(COMPL_ROSTER, "bottom"); | |
| 265 | 267 compl_add_category_word(COMPL_ROSTER, "top"); |
|
377
00809e3e327e
Add "/roster up" and "/roster down"
Mikael Berthe <mikael@lilotux.net>
parents:
374
diff
changeset
|
268 compl_add_category_word(COMPL_ROSTER, "up"); |
|
00809e3e327e
Add "/roster up" and "/roster down"
Mikael Berthe <mikael@lilotux.net>
parents:
374
diff
changeset
|
269 compl_add_category_word(COMPL_ROSTER, "down"); |
|
1086
5e2e647e781b
Add command /roster group_prev|group_next and update documentation
Mikael Berthe <mikael@lilotux.net>
parents:
1074
diff
changeset
|
270 compl_add_category_word(COMPL_ROSTER, "group_prev"); |
|
5e2e647e781b
Add command /roster group_prev|group_next and update documentation
Mikael Berthe <mikael@lilotux.net>
parents:
1074
diff
changeset
|
271 compl_add_category_word(COMPL_ROSTER, "group_next"); |
|
707
b26a0bde4cdb
Add /roster hide|show|toggle
Mikael Berthe <mikael@lilotux.net>
parents:
699
diff
changeset
|
272 compl_add_category_word(COMPL_ROSTER, "hide"); |
|
b26a0bde4cdb
Add /roster hide|show|toggle
Mikael Berthe <mikael@lilotux.net>
parents:
699
diff
changeset
|
273 compl_add_category_word(COMPL_ROSTER, "show"); |
|
b26a0bde4cdb
Add /roster hide|show|toggle
Mikael Berthe <mikael@lilotux.net>
parents:
699
diff
changeset
|
274 compl_add_category_word(COMPL_ROSTER, "toggle"); |
|
1311
0dda8238af21
Implement "/roster display"
Mikael Berthe <mikael@lilotux.net>
parents:
1305
diff
changeset
|
275 compl_add_category_word(COMPL_ROSTER, "display"); |
| 103 | 276 compl_add_category_word(COMPL_ROSTER, "hide_offline"); |
| 277 compl_add_category_word(COMPL_ROSTER, "show_offline"); | |
|
290
f63839a4cb35
Add /roster toggle_offline
Mikael Berthe <mikael@lilotux.net>
parents:
288
diff
changeset
|
278 compl_add_category_word(COMPL_ROSTER, "toggle_offline"); |
|
974
36f7753dfb59
Add /roster item_{lock,unlock}
Mikael Berthe <mikael@lilotux.net>
parents:
968
diff
changeset
|
279 compl_add_category_word(COMPL_ROSTER, "item_lock"); |
|
36f7753dfb59
Add /roster item_{lock,unlock}
Mikael Berthe <mikael@lilotux.net>
parents:
968
diff
changeset
|
280 compl_add_category_word(COMPL_ROSTER, "item_unlock"); |
|
1350
096411233fce
Add /roster item_toggle_lock (suggested by Wolfram S.)
Mikael Berthe <mikael@lilotux.net>
parents:
1347
diff
changeset
|
281 compl_add_category_word(COMPL_ROSTER, "item_toggle_lock"); |
| 330 | 282 compl_add_category_word(COMPL_ROSTER, "alternate"); |
| 265 | 283 compl_add_category_word(COMPL_ROSTER, "search"); |
| 236 | 284 compl_add_category_word(COMPL_ROSTER, "unread_first"); |
| 285 compl_add_category_word(COMPL_ROSTER, "unread_next"); | |
| 1016 | 286 compl_add_category_word(COMPL_ROSTER, "note"); |
|
2013
8dc418af3e72
Allow to select to which buddy resource messages go. Closes issue #55
Hermitifier
parents:
2010
diff
changeset
|
287 compl_add_category_word(COMPL_ROSTER, "resource_lock"); |
|
8dc418af3e72
Allow to select to which buddy resource messages go. Closes issue #55
Hermitifier
parents:
2010
diff
changeset
|
288 compl_add_category_word(COMPL_ROSTER, "resource_unlock"); |
| 127 | 289 |
| 1626 | 290 // Buffer category |
|
508
5a2132ba2220
Add "/buffer up" and "/buffer down"
Mikael Berthe <mikael@lilotux.net>
parents:
506
diff
changeset
|
291 compl_add_category_word(COMPL_BUFFER, "clear"); |
| 187 | 292 compl_add_category_word(COMPL_BUFFER, "bottom"); |
| 293 compl_add_category_word(COMPL_BUFFER, "top"); | |
|
508
5a2132ba2220
Add "/buffer up" and "/buffer down"
Mikael Berthe <mikael@lilotux.net>
parents:
506
diff
changeset
|
294 compl_add_category_word(COMPL_BUFFER, "up"); |
|
5a2132ba2220
Add "/buffer up" and "/buffer down"
Mikael Berthe <mikael@lilotux.net>
parents:
506
diff
changeset
|
295 compl_add_category_word(COMPL_BUFFER, "down"); |
|
370
dd9e2eb52916
Add /buffer search_{backward,forward}
Mikael Berthe <mikael@lilotux.net>
parents:
369
diff
changeset
|
296 compl_add_category_word(COMPL_BUFFER, "search_backward"); |
|
dd9e2eb52916
Add /buffer search_{backward,forward}
Mikael Berthe <mikael@lilotux.net>
parents:
369
diff
changeset
|
297 compl_add_category_word(COMPL_BUFFER, "search_forward"); |
|
1959
ed97057f0881
Add completion item for /buffer readmark subcommand
Mikael Berthe <mikael@lilotux.net>
parents:
1956
diff
changeset
|
298 compl_add_category_word(COMPL_BUFFER, "readmark"); |
| 464 | 299 compl_add_category_word(COMPL_BUFFER, "date"); |
| 462 | 300 compl_add_category_word(COMPL_BUFFER, "%"); |
| 866 | 301 compl_add_category_word(COMPL_BUFFER, "purge"); |
|
1135
5d7c05932b13
Add command /buffer close
Mikael Berthe <mikael@lilotux.net>
parents:
1130
diff
changeset
|
302 compl_add_category_word(COMPL_BUFFER, "close"); |
|
1138
8ba4b1e8b42d
Add command /buffer close_all
Mikael Berthe <mikael@lilotux.net>
parents:
1135
diff
changeset
|
303 compl_add_category_word(COMPL_BUFFER, "close_all"); |
|
873
ee39f6d94d43
Add /buffer {scroll_lock|scroll_unlock|toggle_scroll}
Mikael Berthe <mikael@lilotux.net>
parents:
868
diff
changeset
|
304 compl_add_category_word(COMPL_BUFFER, "scroll_lock"); |
|
ee39f6d94d43
Add /buffer {scroll_lock|scroll_unlock|toggle_scroll}
Mikael Berthe <mikael@lilotux.net>
parents:
868
diff
changeset
|
305 compl_add_category_word(COMPL_BUFFER, "scroll_unlock"); |
|
ee39f6d94d43
Add /buffer {scroll_lock|scroll_unlock|toggle_scroll}
Mikael Berthe <mikael@lilotux.net>
parents:
868
diff
changeset
|
306 compl_add_category_word(COMPL_BUFFER, "scroll_toggle"); |
|
1424
bb1cc8902d0e
Allow "/buffer list" when debugging mode is disabled
Mikael Berthe <mikael@lilotux.net>
parents:
1423
diff
changeset
|
307 compl_add_category_word(COMPL_BUFFER, "list"); |
|
1485
0121b6f3047c
New command: /buffer save
Mikael Berthe <mikael@lilotux.net>
parents:
1484
diff
changeset
|
308 compl_add_category_word(COMPL_BUFFER, "save"); |
| 187 | 309 |
| 127 | 310 // Group category |
| 240 | 311 compl_add_category_word(COMPL_GROUP, "fold"); |
| 312 compl_add_category_word(COMPL_GROUP, "unfold"); | |
| 130 | 313 compl_add_category_word(COMPL_GROUP, "toggle"); |
| 238 | 314 |
| 315 // Multi-line (msay) category | |
| 316 compl_add_category_word(COMPL_MULTILINE, "abort"); | |
| 317 compl_add_category_word(COMPL_MULTILINE, "begin"); | |
| 318 compl_add_category_word(COMPL_MULTILINE, "send"); | |
| 636 | 319 compl_add_category_word(COMPL_MULTILINE, "send_to"); |
|
796
79c8823da808
Add "/msay toggle" command
Mikael Berthe <mikael@lilotux.net>
parents:
791
diff
changeset
|
320 compl_add_category_word(COMPL_MULTILINE, "toggle"); |
|
838
ea1204c8a30b
Add "/msay toggle_verbatim"
Mikael Berthe <mikael@lilotux.net>
parents:
837
diff
changeset
|
321 compl_add_category_word(COMPL_MULTILINE, "toggle_verbatim"); |
|
260
33e1a05864a6
Add "verbatim multi-line" mode, with commands disabled
mikael@frmp8452
parents:
244
diff
changeset
|
322 compl_add_category_word(COMPL_MULTILINE, "verbatim"); |
|
447
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
446
diff
changeset
|
323 |
|
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
446
diff
changeset
|
324 // Room category |
|
585
7eff2c1481fa
Add "/room affil" and "/room role"
Mikael Berthe <mikael@lilotux.net>
parents:
584
diff
changeset
|
325 compl_add_category_word(COMPL_ROOM, "affil"); |
| 571 | 326 compl_add_category_word(COMPL_ROOM, "ban"); |
| 1009 | 327 compl_add_category_word(COMPL_ROOM, "bookmark"); |
| 599 | 328 compl_add_category_word(COMPL_ROOM, "destroy"); |
| 486 | 329 compl_add_category_word(COMPL_ROOM, "invite"); |
|
447
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
446
diff
changeset
|
330 compl_add_category_word(COMPL_ROOM, "join"); |
| 568 | 331 compl_add_category_word(COMPL_ROOM, "kick"); |
|
447
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
446
diff
changeset
|
332 compl_add_category_word(COMPL_ROOM, "leave"); |
|
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
446
diff
changeset
|
333 compl_add_category_word(COMPL_ROOM, "names"); |
| 470 | 334 compl_add_category_word(COMPL_ROOM, "nick"); |
| 490 | 335 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
|
336 compl_add_category_word(COMPL_ROOM, "remove"); |
|
585
7eff2c1481fa
Add "/room affil" and "/room role"
Mikael Berthe <mikael@lilotux.net>
parents:
584
diff
changeset
|
337 compl_add_category_word(COMPL_ROOM, "role"); |
|
1377
cd9182f0b5c7
Add /room setopt {print_status,auto_whois}
Mikael Berthe <mikael@lilotux.net>
parents:
1368
diff
changeset
|
338 compl_add_category_word(COMPL_ROOM, "setopt"); |
|
475
fa49ac0bb8f3
Add "/room topic", and display topic changes
Mikael Berthe <mikael@lilotux.net>
parents:
472
diff
changeset
|
339 compl_add_category_word(COMPL_ROOM, "topic"); |
|
1260
b4ccc5b2a6de
Add command /room unban
Mikael Berthe <mikael@lilotux.net>
parents:
1235
diff
changeset
|
340 compl_add_category_word(COMPL_ROOM, "unban"); |
| 449 | 341 compl_add_category_word(COMPL_ROOM, "unlock"); |
|
572
afc2bd38b15c
Implement affiliations handling, add "/room whois"
Mikael Berthe <mikael@lilotux.net>
parents:
571
diff
changeset
|
342 compl_add_category_word(COMPL_ROOM, "whois"); |
|
617
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
608
diff
changeset
|
343 |
|
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
608
diff
changeset
|
344 // Authorization category |
|
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
608
diff
changeset
|
345 compl_add_category_word(COMPL_AUTH, "allow"); |
|
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
608
diff
changeset
|
346 compl_add_category_word(COMPL_AUTH, "cancel"); |
|
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
608
diff
changeset
|
347 compl_add_category_word(COMPL_AUTH, "request"); |
|
835
6a732d2ad4b4
Add "/authorization request_unsubscribe"
Mikael Berthe <mikael@lilotux.net>
parents:
831
diff
changeset
|
348 compl_add_category_word(COMPL_AUTH, "request_unsubscribe"); |
| 693 | 349 |
| 350 // Request (query) category | |
| 1015 | 351 compl_add_category_word(COMPL_REQUEST, "last"); |
|
1705
ac881b5f9248
Add /request ping (XEP-0199), by merging isbear's module
Mikael Berthe <mikael@lilotux.net>
parents:
1686
diff
changeset
|
352 compl_add_category_word(COMPL_REQUEST, "ping"); |
| 693 | 353 compl_add_category_word(COMPL_REQUEST, "time"); |
|
1003
c8b1a52b2fd6
Initial VCard retrieval support
Mikael Berthe <mikael@lilotux.net>
parents:
988
diff
changeset
|
354 compl_add_category_word(COMPL_REQUEST, "vcard"); |
| 693 | 355 compl_add_category_word(COMPL_REQUEST, "version"); |
|
750
938a8791658c
Add partial completion for the "/event" command
Mikael Berthe <mikael@lilotux.net>
parents:
748
diff
changeset
|
356 |
|
938a8791658c
Add partial completion for the "/event" command
Mikael Berthe <mikael@lilotux.net>
parents:
748
diff
changeset
|
357 // Events category |
|
938a8791658c
Add partial completion for the "/event" command
Mikael Berthe <mikael@lilotux.net>
parents:
748
diff
changeset
|
358 compl_add_category_word(COMPL_EVENTS, "accept"); |
| 755 | 359 compl_add_category_word(COMPL_EVENTS, "ignore"); |
|
750
938a8791658c
Add partial completion for the "/event" command
Mikael Berthe <mikael@lilotux.net>
parents:
748
diff
changeset
|
360 compl_add_category_word(COMPL_EVENTS, "reject"); |
| 1066 | 361 |
| 362 // PGP category | |
| 363 compl_add_category_word(COMPL_PGP, "disable"); | |
| 364 compl_add_category_word(COMPL_PGP, "enable"); | |
| 1197 | 365 compl_add_category_word(COMPL_PGP, "force"); |
| 1066 | 366 compl_add_category_word(COMPL_PGP, "info"); |
| 367 compl_add_category_word(COMPL_PGP, "setkey"); | |
|
1272
033576acac4c
Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents:
1268
diff
changeset
|
368 |
|
1299
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
369 // OTR category |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
370 compl_add_category_word(COMPL_OTR, "start"); |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
371 compl_add_category_word(COMPL_OTR, "stop"); |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
372 compl_add_category_word(COMPL_OTR, "fingerprint"); |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
373 compl_add_category_word(COMPL_OTR, "smpq"); |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
374 compl_add_category_word(COMPL_OTR, "smpr"); |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
375 compl_add_category_word(COMPL_OTR, "smpa"); |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
376 compl_add_category_word(COMPL_OTR, "info"); |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
377 compl_add_category_word(COMPL_OTR, "key"); |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
378 |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
379 // OTR Policy category |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
380 compl_add_category_word(COMPL_OTRPOLICY, "plain"); |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
381 compl_add_category_word(COMPL_OTRPOLICY, "manual"); |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
382 compl_add_category_word(COMPL_OTRPOLICY, "opportunistic"); |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
383 compl_add_category_word(COMPL_OTRPOLICY, "always"); |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
384 |
|
1272
033576acac4c
Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents:
1268
diff
changeset
|
385 // Color category |
|
033576acac4c
Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents:
1268
diff
changeset
|
386 compl_add_category_word(COMPL_COLOR, "roster"); |
|
1292
382ec54b584e
Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1290
diff
changeset
|
387 compl_add_category_word(COMPL_COLOR, "muc"); |
|
382ec54b584e
Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1290
diff
changeset
|
388 compl_add_category_word(COMPL_COLOR, "mucnick"); |
|
1923
924f4552996c
Add a category module to complete the /module subcommands
Mikael Berthe <mikael@lilotux.net>
parents:
1921
diff
changeset
|
389 |
|
924f4552996c
Add a category module to complete the /module subcommands
Mikael Berthe <mikael@lilotux.net>
parents:
1921
diff
changeset
|
390 #ifdef MODULES_ENABLE |
|
924f4552996c
Add a category module to complete the /module subcommands
Mikael Berthe <mikael@lilotux.net>
parents:
1921
diff
changeset
|
391 // Module category |
|
924f4552996c
Add a category module to complete the /module subcommands
Mikael Berthe <mikael@lilotux.net>
parents:
1921
diff
changeset
|
392 compl_add_category_word(COMPL_MODULE, "info"); |
|
924f4552996c
Add a category module to complete the /module subcommands
Mikael Berthe <mikael@lilotux.net>
parents:
1921
diff
changeset
|
393 compl_add_category_word(COMPL_MODULE, "list"); |
|
924f4552996c
Add a category module to complete the /module subcommands
Mikael Berthe <mikael@lilotux.net>
parents:
1921
diff
changeset
|
394 compl_add_category_word(COMPL_MODULE, "load"); |
|
924f4552996c
Add a category module to complete the /module subcommands
Mikael Berthe <mikael@lilotux.net>
parents:
1921
diff
changeset
|
395 compl_add_category_word(COMPL_MODULE, "unload"); |
|
924f4552996c
Add a category module to complete the /module subcommands
Mikael Berthe <mikael@lilotux.net>
parents:
1921
diff
changeset
|
396 #endif |
|
2107
1bd9978ed5d0
Added carbon command
Roeland Jago Douma <roeland@famdouma.nl>
parents:
2074
diff
changeset
|
397 |
|
1bd9978ed5d0
Added carbon command
Roeland Jago Douma <roeland@famdouma.nl>
parents:
2074
diff
changeset
|
398 // Carbons category |
|
1bd9978ed5d0
Added carbon command
Roeland Jago Douma <roeland@famdouma.nl>
parents:
2074
diff
changeset
|
399 compl_add_category_word(COMPL_CARBONS, "info"); |
|
1bd9978ed5d0
Added carbon command
Roeland Jago Douma <roeland@famdouma.nl>
parents:
2074
diff
changeset
|
400 compl_add_category_word(COMPL_CARBONS, "enable"); |
|
1bd9978ed5d0
Added carbon command
Roeland Jago Douma <roeland@famdouma.nl>
parents:
2074
diff
changeset
|
401 compl_add_category_word(COMPL_CARBONS, "disable"); |
| 95 | 402 } |
| 94 | 403 |
| 285 | 404 // expandalias(line) |
| 405 // If there is one, expand the alias in line and returns a new allocated line | |
| 406 // If no alias is found, returns line | |
|
1356
7794d76ca90e
Warn if the user renames a local item
Mikael Berthe <mikael@lilotux.net>
parents:
1355
diff
changeset
|
407 // Note: if the returned pointer is different from line, the caller should |
|
7794d76ca90e
Warn if the user renames a local item
Mikael Berthe <mikael@lilotux.net>
parents:
1355
diff
changeset
|
408 // g_free() the pointer after use |
|
1352
61a54e172010
Add internal hooks support
Mikael Berthe <mikael@lilotux.net>
parents:
1351
diff
changeset
|
409 char *expandalias(const char *line) |
| 285 | 410 { |
| 411 const char *p1, *p2; | |
| 412 char *word; | |
| 413 const gchar *value; | |
|
1352
61a54e172010
Add internal hooks support
Mikael Berthe <mikael@lilotux.net>
parents:
1351
diff
changeset
|
414 char *newline = (char*)line; |
| 285 | 415 |
| 967 | 416 // Ignore leading COMMAND_CHAR |
| 417 for (p1 = line ; *p1 == COMMAND_CHAR ; p1++) | |
| 285 | 418 ; |
| 419 // Locate the end of the word | |
| 420 for (p2 = p1 ; *p2 && (*p2 != ' ') ; p2++) | |
| 421 ; | |
| 1387 | 422 // Extract the word and look for an alias in the list |
| 285 | 423 word = g_strndup(p1, p2-p1); |
| 424 value = settings_get(SETTINGS_TYPE_ALIAS, (const char*)word); | |
| 425 g_free(word); | |
| 426 | |
| 1387 | 427 if (value) |
| 428 newline = g_strdup_printf("%c%s%s", COMMAND_CHAR, value, p2); | |
| 429 | |
| 285 | 430 return newline; |
| 431 } | |
| 432 | |
| 102 | 433 // cmd_get |
| 434 // Finds command in the command list structure. | |
| 435 // Returns a pointer to the cmd entry, or NULL if command not found. | |
| 238 | 436 cmd *cmd_get(const char *command) |
| 102 | 437 { |
| 238 | 438 const char *p1, *p2; |
| 102 | 439 char *com; |
| 440 GSList *sl_com; | |
| 285 | 441 |
| 967 | 442 // Ignore leading COMMAND_CHAR |
| 443 for (p1 = command ; *p1 == COMMAND_CHAR ; p1++) | |
| 102 | 444 ; |
| 445 // Locate the end of the command | |
| 446 for (p2 = p1 ; *p2 && (*p2 != ' ') ; p2++) | |
| 447 ; | |
| 448 // Copy the clean command | |
| 449 com = g_strndup(p1, p2-p1); | |
| 450 | |
| 451 // Look for command in the list | |
| 452 for (sl_com=Commands; sl_com; sl_com = g_slist_next(sl_com)) { | |
| 453 if (!strcasecmp(com, ((cmd*)sl_com->data)->name)) | |
| 454 break; | |
| 455 } | |
| 456 g_free(com); | |
| 457 | |
| 458 if (sl_com) // Command has been found. | |
| 459 return (cmd*)sl_com->data; | |
| 460 return NULL; | |
| 461 } | |
| 462 | |
|
1187
16abe7ec3056
Fix a conflict between verbatim multiline mode and the key binding system
Mikael Berthe <mikael@lilotux.net>
parents:
1181
diff
changeset
|
463 // process_command(line, iscmd) |
| 288 | 464 // Process a command line. |
|
1187
16abe7ec3056
Fix a conflict between verbatim multiline mode and the key binding system
Mikael Berthe <mikael@lilotux.net>
parents:
1181
diff
changeset
|
465 // If iscmd is TRUE, process the command even if verbatim mmode is set; |
|
16abe7ec3056
Fix a conflict between verbatim multiline mode and the key binding system
Mikael Berthe <mikael@lilotux.net>
parents:
1181
diff
changeset
|
466 // it is intended to be used for key bindings. |
| 288 | 467 // Return 255 if this is the /quit command, and 0 for the other commands. |
|
1352
61a54e172010
Add internal hooks support
Mikael Berthe <mikael@lilotux.net>
parents:
1351
diff
changeset
|
468 int process_command(const char *line, guint iscmd) |
| 47 | 469 { |
| 101 | 470 char *p; |
| 285 | 471 char *xpline; |
| 104 | 472 cmd *curcmd; |
| 473 | |
| 1365 | 474 if (!line) |
| 475 return 0; | |
| 476 | |
| 285 | 477 // We do alias expansion here |
|
1187
16abe7ec3056
Fix a conflict between verbatim multiline mode and the key binding system
Mikael Berthe <mikael@lilotux.net>
parents:
1181
diff
changeset
|
478 if (iscmd || scr_get_multimode() != 2) |
| 288 | 479 xpline = expandalias(line); |
| 480 else | |
|
1352
61a54e172010
Add internal hooks support
Mikael Berthe <mikael@lilotux.net>
parents:
1351
diff
changeset
|
481 xpline = (char*)line; // No expansion in verbatim multi-line mode |
|
61a54e172010
Add internal hooks support
Mikael Berthe <mikael@lilotux.net>
parents:
1351
diff
changeset
|
482 |
|
61a54e172010
Add internal hooks support
Mikael Berthe <mikael@lilotux.net>
parents:
1351
diff
changeset
|
483 // We want to use a copy |
|
954
27a7b2f986f5
Fix a freeze with UTF-8 locales
Mikael Berthe <mikael@lilotux.net>
parents:
902
diff
changeset
|
484 if (xpline == line) |
|
27a7b2f986f5
Fix a freeze with UTF-8 locales
Mikael Berthe <mikael@lilotux.net>
parents:
902
diff
changeset
|
485 xpline = g_strdup(line); |
|
27a7b2f986f5
Fix a freeze with UTF-8 locales
Mikael Berthe <mikael@lilotux.net>
parents:
902
diff
changeset
|
486 |
|
27a7b2f986f5
Fix a freeze with UTF-8 locales
Mikael Berthe <mikael@lilotux.net>
parents:
902
diff
changeset
|
487 // Remove trailing spaces: |
|
27a7b2f986f5
Fix a freeze with UTF-8 locales
Mikael Berthe <mikael@lilotux.net>
parents:
902
diff
changeset
|
488 for (p=xpline ; *p ; p++) |
|
27a7b2f986f5
Fix a freeze with UTF-8 locales
Mikael Berthe <mikael@lilotux.net>
parents:
902
diff
changeset
|
489 ; |
|
27a7b2f986f5
Fix a freeze with UTF-8 locales
Mikael Berthe <mikael@lilotux.net>
parents:
902
diff
changeset
|
490 for (p-- ; p>xpline && (*p == ' ') ; p--) |
|
27a7b2f986f5
Fix a freeze with UTF-8 locales
Mikael Berthe <mikael@lilotux.net>
parents:
902
diff
changeset
|
491 *p = 0; |
|
27a7b2f986f5
Fix a freeze with UTF-8 locales
Mikael Berthe <mikael@lilotux.net>
parents:
902
diff
changeset
|
492 |
| 101 | 493 // Command "quit"? |
|
1187
16abe7ec3056
Fix a conflict between verbatim multiline mode and the key binding system
Mikael Berthe <mikael@lilotux.net>
parents:
1181
diff
changeset
|
494 if ((iscmd || scr_get_multimode() != 2) |
|
1126
771eb6aa2d41
Fix another memory leak, spotted by valgrind
misc@mandriva.org
parents:
1100
diff
changeset
|
495 && (!strncasecmp(xpline, mkcmdstr("quit"), strlen(mkcmdstr("quit"))))) { |
|
771eb6aa2d41
Fix another memory leak, spotted by valgrind
misc@mandriva.org
parents:
1100
diff
changeset
|
496 if (!xpline[5] || xpline[5] == ' ') { |
|
771eb6aa2d41
Fix another memory leak, spotted by valgrind
misc@mandriva.org
parents:
1100
diff
changeset
|
497 g_free(xpline); |
| 116 | 498 return 255; |
|
1126
771eb6aa2d41
Fix another memory leak, spotted by valgrind
misc@mandriva.org
parents:
1100
diff
changeset
|
499 } |
|
1359
7daf906fbcdc
The command /quit can be used in bindings, hooks and sourced files
Mikael Berthe <mikael@lilotux.net>
parents:
1356
diff
changeset
|
500 } else if (iscmd && !strncasecmp(xpline, "quit", 4) && |
|
7daf906fbcdc
The command /quit can be used in bindings, hooks and sourced files
Mikael Berthe <mikael@lilotux.net>
parents:
1356
diff
changeset
|
501 (!xpline[4] || xpline[4] == ' ')) { |
|
7daf906fbcdc
The command /quit can be used in bindings, hooks and sourced files
Mikael Berthe <mikael@lilotux.net>
parents:
1356
diff
changeset
|
502 // If iscmd is true we can have the command without the command prefix |
|
7daf906fbcdc
The command /quit can be used in bindings, hooks and sourced files
Mikael Berthe <mikael@lilotux.net>
parents:
1356
diff
changeset
|
503 // character (usually '/'). |
|
7daf906fbcdc
The command /quit can be used in bindings, hooks and sourced files
Mikael Berthe <mikael@lilotux.net>
parents:
1356
diff
changeset
|
504 g_free(xpline); |
|
7daf906fbcdc
The command /quit can be used in bindings, hooks and sourced files
Mikael Berthe <mikael@lilotux.net>
parents:
1356
diff
changeset
|
505 return 255; |
|
1126
771eb6aa2d41
Fix another memory leak, spotted by valgrind
misc@mandriva.org
parents:
1100
diff
changeset
|
506 } |
| 104 | 507 |
|
260
33e1a05864a6
Add "verbatim multi-line" mode, with commands disabled
mikael@frmp8452
parents:
244
diff
changeset
|
508 // If verbatim multi-line mode, we check if another /msay command is typed |
|
1187
16abe7ec3056
Fix a conflict between verbatim multiline mode and the key binding system
Mikael Berthe <mikael@lilotux.net>
parents:
1181
diff
changeset
|
509 if (!iscmd && scr_get_multimode() == 2 |
| 967 | 510 && (strncasecmp(xpline, mkcmdstr("msay "), strlen(mkcmdstr("msay "))))) { |
|
260
33e1a05864a6
Add "verbatim multi-line" mode, with commands disabled
mikael@frmp8452
parents:
244
diff
changeset
|
511 // It isn't an /msay command |
| 285 | 512 scr_append_multiline(xpline); |
|
954
27a7b2f986f5
Fix a freeze with UTF-8 locales
Mikael Berthe <mikael@lilotux.net>
parents:
902
diff
changeset
|
513 g_free(xpline); |
|
260
33e1a05864a6
Add "verbatim multi-line" mode, with commands disabled
mikael@frmp8452
parents:
244
diff
changeset
|
514 return 0; |
|
33e1a05864a6
Add "verbatim multi-line" mode, with commands disabled
mikael@frmp8452
parents:
244
diff
changeset
|
515 } |
|
33e1a05864a6
Add "verbatim multi-line" mode, with commands disabled
mikael@frmp8452
parents:
244
diff
changeset
|
516 |
| 47 | 517 // Commands handling |
| 285 | 518 curcmd = cmd_get(xpline); |
| 47 | 519 |
| 104 | 520 if (!curcmd) { |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
521 scr_LogPrint(LPRINT_NORMAL, "Unrecognized command. " |
|
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
522 "Please see the manual for a list of known commands."); |
|
954
27a7b2f986f5
Fix a freeze with UTF-8 locales
Mikael Berthe <mikael@lilotux.net>
parents:
902
diff
changeset
|
523 g_free(xpline); |
| 104 | 524 return 0; |
| 525 } | |
| 526 if (!curcmd->func) { | |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
527 scr_LogPrint(LPRINT_NORMAL, |
|
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
528 "This functionality is not yet implemented, sorry."); |
|
954
27a7b2f986f5
Fix a freeze with UTF-8 locales
Mikael Berthe <mikael@lilotux.net>
parents:
902
diff
changeset
|
529 g_free(xpline); |
| 104 | 530 return 0; |
| 531 } | |
| 532 // Lets go to the command parameters | |
| 285 | 533 for (p = xpline+1; *p && (*p != ' ') ; p++) |
| 104 | 534 ; |
| 535 // Skip spaces | |
| 285 | 536 while (*p && (*p == ' ')) |
| 537 p++; | |
| 104 | 538 // Call command-specific function |
|
1173
960f34ec22a2
Add init_bindings() for default key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents:
1172
diff
changeset
|
539 retval_for_cmds = 0; |
| 1607 | 540 #ifdef MODULES_ENABLE |
| 541 if (curcmd->userdata) | |
| 542 (*(void (*)(char *p, gpointer u))curcmd->func)(p, curcmd->userdata); | |
| 543 else | |
| 544 (*curcmd->func)(p); | |
| 545 #else | |
| 285 | 546 (*curcmd->func)(p); |
| 1607 | 547 #endif |
|
954
27a7b2f986f5
Fix a freeze with UTF-8 locales
Mikael Berthe <mikael@lilotux.net>
parents:
902
diff
changeset
|
548 g_free(xpline); |
|
1173
960f34ec22a2
Add init_bindings() for default key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents:
1172
diff
changeset
|
549 return retval_for_cmds; |
| 47 | 550 } |
| 551 | |
| 288 | 552 // process_line(line) |
| 553 // Process a command/message line. | |
| 554 // If this isn't a command, this is a message and it is sent to the | |
| 555 // currently selected buddy. | |
| 556 // Return 255 if the line is the /quit command, or 0. | |
|
1352
61a54e172010
Add internal hooks support
Mikael Berthe <mikael@lilotux.net>
parents:
1351
diff
changeset
|
557 int process_line(const char *line) |
| 288 | 558 { |
| 559 if (!*line) { // User only pressed enter | |
| 560 if (scr_get_multimode()) { | |
| 561 scr_append_multiline(""); | |
| 562 return 0; | |
| 563 } | |
| 564 if (current_buddy) { | |
|
1410
0cb4361c85a7
Pressing enter when a group is selected will toggle the fold status (franky)
Mikael Berthe <mikael@lilotux.net>
parents:
1395
diff
changeset
|
565 if (buddy_gettype(BUDDATA(current_buddy)) & ROSTER_TYPE_GROUP) |
|
1749
7ee390513463
Use api version for module checks
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1745
diff
changeset
|
566 do_group("toggle"); |
|
1410
0cb4361c85a7
Pressing enter when a group is selected will toggle the fold status (franky)
Mikael Berthe <mikael@lilotux.net>
parents:
1395
diff
changeset
|
567 else { |
|
0cb4361c85a7
Pressing enter when a group is selected will toggle the fold status (franky)
Mikael Berthe <mikael@lilotux.net>
parents:
1395
diff
changeset
|
568 // Enter chat mode |
|
0cb4361c85a7
Pressing enter when a group is selected will toggle the fold status (franky)
Mikael Berthe <mikael@lilotux.net>
parents:
1395
diff
changeset
|
569 scr_set_chatmode(TRUE); |
|
1780
e4378fbab5d7
Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents:
1774
diff
changeset
|
570 scr_show_buddy_window(); |
|
1410
0cb4361c85a7
Pressing enter when a group is selected will toggle the fold status (franky)
Mikael Berthe <mikael@lilotux.net>
parents:
1395
diff
changeset
|
571 } |
| 288 | 572 } |
| 573 return 0; | |
| 574 } | |
| 575 | |
| 967 | 576 if (*line != COMMAND_CHAR) { |
| 288 | 577 // This isn't a command |
| 578 if (scr_get_multimode()) | |
| 579 scr_append_multiline(line); | |
| 580 else | |
|
1740
391863b7952c
Rename do_say_internal() and export it as say_cmd()
Mikael Berthe <mikael@lilotux.net>
parents:
1737
diff
changeset
|
581 say_cmd((char*)line, 0); |
| 288 | 582 return 0; |
| 583 } | |
| 584 | |
|
1187
16abe7ec3056
Fix a conflict between verbatim multiline mode and the key binding system
Mikael Berthe <mikael@lilotux.net>
parents:
1181
diff
changeset
|
585 /* It is _probably_ a command -- except for verbatim multi-line mode */ |
|
16abe7ec3056
Fix a conflict between verbatim multiline mode and the key binding system
Mikael Berthe <mikael@lilotux.net>
parents:
1181
diff
changeset
|
586 return process_command(line, FALSE); |
| 288 | 587 } |
| 588 | |
|
1350
096411233fce
Add /roster item_toggle_lock (suggested by Wolfram S.)
Mikael Berthe <mikael@lilotux.net>
parents:
1347
diff
changeset
|
589 // Helper routine for buffer item_{lock,unlock,toggle_lock} |
|
096411233fce
Add /roster item_toggle_lock (suggested by Wolfram S.)
Mikael Berthe <mikael@lilotux.net>
parents:
1347
diff
changeset
|
590 // "lock" values: 1=lock 0=unlock -1=invert |
|
096411233fce
Add /roster item_toggle_lock (suggested by Wolfram S.)
Mikael Berthe <mikael@lilotux.net>
parents:
1347
diff
changeset
|
591 static void roster_buddylock(char *bjid, int lock) |
|
974
36f7753dfb59
Add /roster item_{lock,unlock}
Mikael Berthe <mikael@lilotux.net>
parents:
968
diff
changeset
|
592 { |
|
36f7753dfb59
Add /roster item_{lock,unlock}
Mikael Berthe <mikael@lilotux.net>
parents:
968
diff
changeset
|
593 gpointer bud = NULL; |
|
36f7753dfb59
Add /roster item_{lock,unlock}
Mikael Berthe <mikael@lilotux.net>
parents:
968
diff
changeset
|
594 bool may_need_refresh = FALSE; |
|
36f7753dfb59
Add /roster item_{lock,unlock}
Mikael Berthe <mikael@lilotux.net>
parents:
968
diff
changeset
|
595 |
|
36f7753dfb59
Add /roster item_{lock,unlock}
Mikael Berthe <mikael@lilotux.net>
parents:
968
diff
changeset
|
596 // Allow special jid "" or "." (current buddy) |
| 1058 | 597 if (bjid && (!*bjid || !strcmp(bjid, "."))) |
| 598 bjid = NULL; | |
|
974
36f7753dfb59
Add /roster item_{lock,unlock}
Mikael Berthe <mikael@lilotux.net>
parents:
968
diff
changeset
|
599 |
| 1058 | 600 if (bjid) { |
|
974
36f7753dfb59
Add /roster item_{lock,unlock}
Mikael Berthe <mikael@lilotux.net>
parents:
968
diff
changeset
|
601 // The JID has been specified. Quick check... |
| 1058 | 602 if (check_jid_syntax(bjid)) { |
|
1064
516b5f7d1023
Fix some UTF-8 related problems
Mikael Berthe <mikael@lilotux.net>
parents:
1059
diff
changeset
|
603 scr_LogPrint(LPRINT_NORMAL|LPRINT_NOTUTF8, |
|
516b5f7d1023
Fix some UTF-8 related problems
Mikael Berthe <mikael@lilotux.net>
parents:
1059
diff
changeset
|
604 "<%s> is not a valid Jabber ID.", bjid); |
|
974
36f7753dfb59
Add /roster item_{lock,unlock}
Mikael Berthe <mikael@lilotux.net>
parents:
968
diff
changeset
|
605 } else { |
|
36f7753dfb59
Add /roster item_{lock,unlock}
Mikael Berthe <mikael@lilotux.net>
parents:
968
diff
changeset
|
606 // Find the buddy |
|
36f7753dfb59
Add /roster item_{lock,unlock}
Mikael Berthe <mikael@lilotux.net>
parents:
968
diff
changeset
|
607 GSList *roster_elt; |
| 1058 | 608 roster_elt = roster_find(bjid, jidsearch, |
|
974
36f7753dfb59
Add /roster item_{lock,unlock}
Mikael Berthe <mikael@lilotux.net>
parents:
968
diff
changeset
|
609 ROSTER_TYPE_USER|ROSTER_TYPE_ROOM); |
|
36f7753dfb59
Add /roster item_{lock,unlock}
Mikael Berthe <mikael@lilotux.net>
parents:
968
diff
changeset
|
610 if (roster_elt) |
|
36f7753dfb59
Add /roster item_{lock,unlock}
Mikael Berthe <mikael@lilotux.net>
parents:
968
diff
changeset
|
611 bud = roster_elt->data; |
|
36f7753dfb59
Add /roster item_{lock,unlock}
Mikael Berthe <mikael@lilotux.net>
parents:
968
diff
changeset
|
612 else |
|
36f7753dfb59
Add /roster item_{lock,unlock}
Mikael Berthe <mikael@lilotux.net>
parents:
968
diff
changeset
|
613 scr_LogPrint(LPRINT_NORMAL, "This jid isn't in the roster."); |
|
36f7753dfb59
Add /roster item_{lock,unlock}
Mikael Berthe <mikael@lilotux.net>
parents:
968
diff
changeset
|
614 may_need_refresh = TRUE; |
|
36f7753dfb59
Add /roster item_{lock,unlock}
Mikael Berthe <mikael@lilotux.net>
parents:
968
diff
changeset
|
615 } |
|
36f7753dfb59
Add /roster item_{lock,unlock}
Mikael Berthe <mikael@lilotux.net>
parents:
968
diff
changeset
|
616 } else { |
|
36f7753dfb59
Add /roster item_{lock,unlock}
Mikael Berthe <mikael@lilotux.net>
parents:
968
diff
changeset
|
617 // Use the current buddy |
|
36f7753dfb59
Add /roster item_{lock,unlock}
Mikael Berthe <mikael@lilotux.net>
parents:
968
diff
changeset
|
618 if (current_buddy) |
|
36f7753dfb59
Add /roster item_{lock,unlock}
Mikael Berthe <mikael@lilotux.net>
parents:
968
diff
changeset
|
619 bud = BUDDATA(current_buddy); |
|
36f7753dfb59
Add /roster item_{lock,unlock}
Mikael Berthe <mikael@lilotux.net>
parents:
968
diff
changeset
|
620 } |
|
36f7753dfb59
Add /roster item_{lock,unlock}
Mikael Berthe <mikael@lilotux.net>
parents:
968
diff
changeset
|
621 |
|
36f7753dfb59
Add /roster item_{lock,unlock}
Mikael Berthe <mikael@lilotux.net>
parents:
968
diff
changeset
|
622 // Update the ROSTER_FLAG_USRLOCK flag |
|
36f7753dfb59
Add /roster item_{lock,unlock}
Mikael Berthe <mikael@lilotux.net>
parents:
968
diff
changeset
|
623 if (bud) { |
|
1350
096411233fce
Add /roster item_toggle_lock (suggested by Wolfram S.)
Mikael Berthe <mikael@lilotux.net>
parents:
1347
diff
changeset
|
624 if (lock == -1) |
|
096411233fce
Add /roster item_toggle_lock (suggested by Wolfram S.)
Mikael Berthe <mikael@lilotux.net>
parents:
1347
diff
changeset
|
625 lock = !(buddy_getflags(bud) & ROSTER_FLAG_USRLOCK); |
|
974
36f7753dfb59
Add /roster item_{lock,unlock}
Mikael Berthe <mikael@lilotux.net>
parents:
968
diff
changeset
|
626 buddy_setflags(bud, ROSTER_FLAG_USRLOCK, lock); |
|
1350
096411233fce
Add /roster item_toggle_lock (suggested by Wolfram S.)
Mikael Berthe <mikael@lilotux.net>
parents:
1347
diff
changeset
|
627 if (may_need_refresh) { |
|
974
36f7753dfb59
Add /roster item_{lock,unlock}
Mikael Berthe <mikael@lilotux.net>
parents:
968
diff
changeset
|
628 buddylist_build(); |
|
36f7753dfb59
Add /roster item_{lock,unlock}
Mikael Berthe <mikael@lilotux.net>
parents:
968
diff
changeset
|
629 update_roster = TRUE; |
|
1350
096411233fce
Add /roster item_toggle_lock (suggested by Wolfram S.)
Mikael Berthe <mikael@lilotux.net>
parents:
1347
diff
changeset
|
630 } |
|
974
36f7753dfb59
Add /roster item_{lock,unlock}
Mikael Berthe <mikael@lilotux.net>
parents:
968
diff
changeset
|
631 } |
|
36f7753dfb59
Add /roster item_{lock,unlock}
Mikael Berthe <mikael@lilotux.net>
parents:
968
diff
changeset
|
632 } |
|
36f7753dfb59
Add /roster item_{lock,unlock}
Mikael Berthe <mikael@lilotux.net>
parents:
968
diff
changeset
|
633 |
|
2013
8dc418af3e72
Allow to select to which buddy resource messages go. Closes issue #55
Hermitifier
parents:
2010
diff
changeset
|
634 static void roster_resourcelock(char *jidres, gboolean lock) { |
|
8dc418af3e72
Allow to select to which buddy resource messages go. Closes issue #55
Hermitifier
parents:
2010
diff
changeset
|
635 gpointer bud = NULL; |
|
8dc418af3e72
Allow to select to which buddy resource messages go. Closes issue #55
Hermitifier
parents:
2010
diff
changeset
|
636 char *resource = NULL; |
|
8dc418af3e72
Allow to select to which buddy resource messages go. Closes issue #55
Hermitifier
parents:
2010
diff
changeset
|
637 |
|
8dc418af3e72
Allow to select to which buddy resource messages go. Closes issue #55
Hermitifier
parents:
2010
diff
changeset
|
638 if (!jidres) { |
|
8dc418af3e72
Allow to select to which buddy resource messages go. Closes issue #55
Hermitifier
parents:
2010
diff
changeset
|
639 if (lock) return; |
|
8dc418af3e72
Allow to select to which buddy resource messages go. Closes issue #55
Hermitifier
parents:
2010
diff
changeset
|
640 jidres = "."; |
|
8dc418af3e72
Allow to select to which buddy resource messages go. Closes issue #55
Hermitifier
parents:
2010
diff
changeset
|
641 } |
|
8dc418af3e72
Allow to select to which buddy resource messages go. Closes issue #55
Hermitifier
parents:
2010
diff
changeset
|
642 |
|
8dc418af3e72
Allow to select to which buddy resource messages go. Closes issue #55
Hermitifier
parents:
2010
diff
changeset
|
643 if (jidres[0] == '.' && |
|
8dc418af3e72
Allow to select to which buddy resource messages go. Closes issue #55
Hermitifier
parents:
2010
diff
changeset
|
644 (jidres[1] == '\0' || jidres[1] == JID_RESOURCE_SEPARATOR)) { |
|
8dc418af3e72
Allow to select to which buddy resource messages go. Closes issue #55
Hermitifier
parents:
2010
diff
changeset
|
645 //Special jid: . or ./resource |
|
8dc418af3e72
Allow to select to which buddy resource messages go. Closes issue #55
Hermitifier
parents:
2010
diff
changeset
|
646 switch (jidres[1]) { |
|
8dc418af3e72
Allow to select to which buddy resource messages go. Closes issue #55
Hermitifier
parents:
2010
diff
changeset
|
647 case JID_RESOURCE_SEPARATOR: |
|
8dc418af3e72
Allow to select to which buddy resource messages go. Closes issue #55
Hermitifier
parents:
2010
diff
changeset
|
648 resource = jidres+2; |
|
8dc418af3e72
Allow to select to which buddy resource messages go. Closes issue #55
Hermitifier
parents:
2010
diff
changeset
|
649 case '\0': |
|
8dc418af3e72
Allow to select to which buddy resource messages go. Closes issue #55
Hermitifier
parents:
2010
diff
changeset
|
650 if (current_buddy) |
|
8dc418af3e72
Allow to select to which buddy resource messages go. Closes issue #55
Hermitifier
parents:
2010
diff
changeset
|
651 bud = BUDDATA(current_buddy); |
|
8dc418af3e72
Allow to select to which buddy resource messages go. Closes issue #55
Hermitifier
parents:
2010
diff
changeset
|
652 } |
|
8dc418af3e72
Allow to select to which buddy resource messages go. Closes issue #55
Hermitifier
parents:
2010
diff
changeset
|
653 } else { |
|
8dc418af3e72
Allow to select to which buddy resource messages go. Closes issue #55
Hermitifier
parents:
2010
diff
changeset
|
654 char *tmp; |
|
8dc418af3e72
Allow to select to which buddy resource messages go. Closes issue #55
Hermitifier
parents:
2010
diff
changeset
|
655 if (!check_jid_syntax(jidres) && |
|
8dc418af3e72
Allow to select to which buddy resource messages go. Closes issue #55
Hermitifier
parents:
2010
diff
changeset
|
656 (tmp = strchr(jidres, JID_RESOURCE_SEPARATOR))) { |
|
8dc418af3e72
Allow to select to which buddy resource messages go. Closes issue #55
Hermitifier
parents:
2010
diff
changeset
|
657 //Any other valid full jid |
|
8dc418af3e72
Allow to select to which buddy resource messages go. Closes issue #55
Hermitifier
parents:
2010
diff
changeset
|
658 *tmp = '\0'; // for roster search by bare jid; |
|
8dc418af3e72
Allow to select to which buddy resource messages go. Closes issue #55
Hermitifier
parents:
2010
diff
changeset
|
659 resource = tmp+1; |
|
8dc418af3e72
Allow to select to which buddy resource messages go. Closes issue #55
Hermitifier
parents:
2010
diff
changeset
|
660 GSList *roster_elt; |
|
8dc418af3e72
Allow to select to which buddy resource messages go. Closes issue #55
Hermitifier
parents:
2010
diff
changeset
|
661 roster_elt = roster_find(jidres, jidsearch, |
|
8dc418af3e72
Allow to select to which buddy resource messages go. Closes issue #55
Hermitifier
parents:
2010
diff
changeset
|
662 ROSTER_TYPE_USER|ROSTER_TYPE_AGENT); |
|
8dc418af3e72
Allow to select to which buddy resource messages go. Closes issue #55
Hermitifier
parents:
2010
diff
changeset
|
663 if (roster_elt) |
|
8dc418af3e72
Allow to select to which buddy resource messages go. Closes issue #55
Hermitifier
parents:
2010
diff
changeset
|
664 bud = roster_elt->data; |
|
8dc418af3e72
Allow to select to which buddy resource messages go. Closes issue #55
Hermitifier
parents:
2010
diff
changeset
|
665 *tmp = JID_RESOURCE_SEPARATOR; |
|
8dc418af3e72
Allow to select to which buddy resource messages go. Closes issue #55
Hermitifier
parents:
2010
diff
changeset
|
666 } |
|
8dc418af3e72
Allow to select to which buddy resource messages go. Closes issue #55
Hermitifier
parents:
2010
diff
changeset
|
667 if (!bud) { |
|
8dc418af3e72
Allow to select to which buddy resource messages go. Closes issue #55
Hermitifier
parents:
2010
diff
changeset
|
668 //Resource for current buddy |
|
8dc418af3e72
Allow to select to which buddy resource messages go. Closes issue #55
Hermitifier
parents:
2010
diff
changeset
|
669 if (current_buddy) |
|
8dc418af3e72
Allow to select to which buddy resource messages go. Closes issue #55
Hermitifier
parents:
2010
diff
changeset
|
670 bud = BUDDATA(current_buddy); |
|
8dc418af3e72
Allow to select to which buddy resource messages go. Closes issue #55
Hermitifier
parents:
2010
diff
changeset
|
671 resource = jidres; |
|
8dc418af3e72
Allow to select to which buddy resource messages go. Closes issue #55
Hermitifier
parents:
2010
diff
changeset
|
672 } |
|
8dc418af3e72
Allow to select to which buddy resource messages go. Closes issue #55
Hermitifier
parents:
2010
diff
changeset
|
673 } |
|
2074
e04b6dfbb054
Some whitespace cleanup
Mikael Berthe <mikael@lilotux.net>
parents:
2051
diff
changeset
|
674 |
|
2013
8dc418af3e72
Allow to select to which buddy resource messages go. Closes issue #55
Hermitifier
parents:
2010
diff
changeset
|
675 if (bud && buddy_gettype(bud) & (ROSTER_TYPE_USER|ROSTER_TYPE_AGENT)) { |
|
8dc418af3e72
Allow to select to which buddy resource messages go. Closes issue #55
Hermitifier
parents:
2010
diff
changeset
|
676 if (lock) { |
|
8dc418af3e72
Allow to select to which buddy resource messages go. Closes issue #55
Hermitifier
parents:
2010
diff
changeset
|
677 GSList *resources, *p_res; |
|
8dc418af3e72
Allow to select to which buddy resource messages go. Closes issue #55
Hermitifier
parents:
2010
diff
changeset
|
678 gboolean found = FALSE; |
|
8dc418af3e72
Allow to select to which buddy resource messages go. Closes issue #55
Hermitifier
parents:
2010
diff
changeset
|
679 resources = buddy_getresources(bud); |
|
8dc418af3e72
Allow to select to which buddy resource messages go. Closes issue #55
Hermitifier
parents:
2010
diff
changeset
|
680 for (p_res = resources ; p_res ; p_res = g_slist_next(p_res)) { |
|
8dc418af3e72
Allow to select to which buddy resource messages go. Closes issue #55
Hermitifier
parents:
2010
diff
changeset
|
681 if (!g_strcmp0((char*)p_res->data, resource)) |
|
8dc418af3e72
Allow to select to which buddy resource messages go. Closes issue #55
Hermitifier
parents:
2010
diff
changeset
|
682 found = TRUE; |
|
8dc418af3e72
Allow to select to which buddy resource messages go. Closes issue #55
Hermitifier
parents:
2010
diff
changeset
|
683 g_free(p_res->data); |
|
8dc418af3e72
Allow to select to which buddy resource messages go. Closes issue #55
Hermitifier
parents:
2010
diff
changeset
|
684 } |
|
8dc418af3e72
Allow to select to which buddy resource messages go. Closes issue #55
Hermitifier
parents:
2010
diff
changeset
|
685 g_slist_free(resources); |
|
8dc418af3e72
Allow to select to which buddy resource messages go. Closes issue #55
Hermitifier
parents:
2010
diff
changeset
|
686 if (!found) { |
|
8dc418af3e72
Allow to select to which buddy resource messages go. Closes issue #55
Hermitifier
parents:
2010
diff
changeset
|
687 scr_LogPrint(LPRINT_NORMAL, "No such resource <%s>...", jidres); |
|
8dc418af3e72
Allow to select to which buddy resource messages go. Closes issue #55
Hermitifier
parents:
2010
diff
changeset
|
688 return; |
|
8dc418af3e72
Allow to select to which buddy resource messages go. Closes issue #55
Hermitifier
parents:
2010
diff
changeset
|
689 } |
|
8dc418af3e72
Allow to select to which buddy resource messages go. Closes issue #55
Hermitifier
parents:
2010
diff
changeset
|
690 } else { |
|
8dc418af3e72
Allow to select to which buddy resource messages go. Closes issue #55
Hermitifier
parents:
2010
diff
changeset
|
691 resource = NULL; |
|
8dc418af3e72
Allow to select to which buddy resource messages go. Closes issue #55
Hermitifier
parents:
2010
diff
changeset
|
692 } |
|
8dc418af3e72
Allow to select to which buddy resource messages go. Closes issue #55
Hermitifier
parents:
2010
diff
changeset
|
693 buddy_setactiveresource(bud, resource); |
|
8dc418af3e72
Allow to select to which buddy resource messages go. Closes issue #55
Hermitifier
parents:
2010
diff
changeset
|
694 scr_update_chat_status(TRUE); |
|
8dc418af3e72
Allow to select to which buddy resource messages go. Closes issue #55
Hermitifier
parents:
2010
diff
changeset
|
695 } |
|
8dc418af3e72
Allow to select to which buddy resource messages go. Closes issue #55
Hermitifier
parents:
2010
diff
changeset
|
696 } |
|
1022
4c8d7b558e83
Annotations listing (/roster note in the status buffer)
Mikael Berthe <mikael@lilotux.net>
parents:
1021
diff
changeset
|
697 // display_and_free_note(note, winId) |
|
4c8d7b558e83
Annotations listing (/roster note in the status buffer)
Mikael Berthe <mikael@lilotux.net>
parents:
1021
diff
changeset
|
698 // Display the note information in the winId buffer, and free note |
|
4c8d7b558e83
Annotations listing (/roster note in the status buffer)
Mikael Berthe <mikael@lilotux.net>
parents:
1021
diff
changeset
|
699 // (winId is a bare jid or NULL for the status window, in which case we |
|
4c8d7b558e83
Annotations listing (/roster note in the status buffer)
Mikael Berthe <mikael@lilotux.net>
parents:
1021
diff
changeset
|
700 // display the note jid too) |
|
4c8d7b558e83
Annotations listing (/roster note in the status buffer)
Mikael Berthe <mikael@lilotux.net>
parents:
1021
diff
changeset
|
701 static void display_and_free_note(struct annotation *note, const char *winId) |
|
4c8d7b558e83
Annotations listing (/roster note in the status buffer)
Mikael Berthe <mikael@lilotux.net>
parents:
1021
diff
changeset
|
702 { |
|
4c8d7b558e83
Annotations listing (/roster note in the status buffer)
Mikael Berthe <mikael@lilotux.net>
parents:
1021
diff
changeset
|
703 gchar tbuf[128]; |
|
4c8d7b558e83
Annotations listing (/roster note in the status buffer)
Mikael Berthe <mikael@lilotux.net>
parents:
1021
diff
changeset
|
704 GString *sbuf; |
|
4c8d7b558e83
Annotations listing (/roster note in the status buffer)
Mikael Berthe <mikael@lilotux.net>
parents:
1021
diff
changeset
|
705 guint msg_flag = HBB_PREFIX_INFO; |
|
1268
dbc907b2d92f
Add configurable colors for info and incoming messages (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents:
1260
diff
changeset
|
706 /* We use the flag prefix_info for the first line, and prefix_cont |
|
1022
4c8d7b558e83
Annotations listing (/roster note in the status buffer)
Mikael Berthe <mikael@lilotux.net>
parents:
1021
diff
changeset
|
707 for the other lines, for better readability */ |
|
4c8d7b558e83
Annotations listing (/roster note in the status buffer)
Mikael Berthe <mikael@lilotux.net>
parents:
1021
diff
changeset
|
708 |
|
4c8d7b558e83
Annotations listing (/roster note in the status buffer)
Mikael Berthe <mikael@lilotux.net>
parents:
1021
diff
changeset
|
709 if (!note) |
|
4c8d7b558e83
Annotations listing (/roster note in the status buffer)
Mikael Berthe <mikael@lilotux.net>
parents:
1021
diff
changeset
|
710 return; |
|
4c8d7b558e83
Annotations listing (/roster note in the status buffer)
Mikael Berthe <mikael@lilotux.net>
parents:
1021
diff
changeset
|
711 |
|
4c8d7b558e83
Annotations listing (/roster note in the status buffer)
Mikael Berthe <mikael@lilotux.net>
parents:
1021
diff
changeset
|
712 sbuf = g_string_new(""); |
|
4c8d7b558e83
Annotations listing (/roster note in the status buffer)
Mikael Berthe <mikael@lilotux.net>
parents:
1021
diff
changeset
|
713 |
|
4c8d7b558e83
Annotations listing (/roster note in the status buffer)
Mikael Berthe <mikael@lilotux.net>
parents:
1021
diff
changeset
|
714 if (!winId) { |
|
4c8d7b558e83
Annotations listing (/roster note in the status buffer)
Mikael Berthe <mikael@lilotux.net>
parents:
1021
diff
changeset
|
715 // We're writing to the status window, so let's show the jid too. |
|
4c8d7b558e83
Annotations listing (/roster note in the status buffer)
Mikael Berthe <mikael@lilotux.net>
parents:
1021
diff
changeset
|
716 g_string_printf(sbuf, "Annotation on <%s>", note->jid); |
|
1290
e42f48103609
Drawing the MUC nicks by a different color
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1279
diff
changeset
|
717 scr_WriteIncomingMessage(winId, sbuf->str, 0, msg_flag, 0); |
|
1268
dbc907b2d92f
Add configurable colors for info and incoming messages (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents:
1260
diff
changeset
|
718 msg_flag = HBB_PREFIX_INFO | HBB_PREFIX_CONT; |
|
1022
4c8d7b558e83
Annotations listing (/roster note in the status buffer)
Mikael Berthe <mikael@lilotux.net>
parents:
1021
diff
changeset
|
719 } |
|
4c8d7b558e83
Annotations listing (/roster note in the status buffer)
Mikael Berthe <mikael@lilotux.net>
parents:
1021
diff
changeset
|
720 |
|
4c8d7b558e83
Annotations listing (/roster note in the status buffer)
Mikael Berthe <mikael@lilotux.net>
parents:
1021
diff
changeset
|
721 // If we have the creation date, display it |
|
4c8d7b558e83
Annotations listing (/roster note in the status buffer)
Mikael Berthe <mikael@lilotux.net>
parents:
1021
diff
changeset
|
722 if (note->cdate) { |
|
4c8d7b558e83
Annotations listing (/roster note in the status buffer)
Mikael Berthe <mikael@lilotux.net>
parents:
1021
diff
changeset
|
723 strftime(tbuf, sizeof(tbuf), "%Y-%m-%d %H:%M:%S", |
|
4c8d7b558e83
Annotations listing (/roster note in the status buffer)
Mikael Berthe <mikael@lilotux.net>
parents:
1021
diff
changeset
|
724 localtime(¬e->cdate)); |
|
4c8d7b558e83
Annotations listing (/roster note in the status buffer)
Mikael Berthe <mikael@lilotux.net>
parents:
1021
diff
changeset
|
725 g_string_printf(sbuf, "Note created %s", tbuf); |
|
1290
e42f48103609
Drawing the MUC nicks by a different color
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1279
diff
changeset
|
726 scr_WriteIncomingMessage(winId, sbuf->str, 0, msg_flag, 0); |
|
1268
dbc907b2d92f
Add configurable colors for info and incoming messages (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents:
1260
diff
changeset
|
727 msg_flag = HBB_PREFIX_INFO | HBB_PREFIX_CONT; |
|
1022
4c8d7b558e83
Annotations listing (/roster note in the status buffer)
Mikael Berthe <mikael@lilotux.net>
parents:
1021
diff
changeset
|
728 } |
|
4c8d7b558e83
Annotations listing (/roster note in the status buffer)
Mikael Berthe <mikael@lilotux.net>
parents:
1021
diff
changeset
|
729 // If we have the modification date, display it |
|
4c8d7b558e83
Annotations listing (/roster note in the status buffer)
Mikael Berthe <mikael@lilotux.net>
parents:
1021
diff
changeset
|
730 // unless it's the same as the creation date |
|
4c8d7b558e83
Annotations listing (/roster note in the status buffer)
Mikael Berthe <mikael@lilotux.net>
parents:
1021
diff
changeset
|
731 if (note->mdate && note->mdate != note->cdate) { |
|
4c8d7b558e83
Annotations listing (/roster note in the status buffer)
Mikael Berthe <mikael@lilotux.net>
parents:
1021
diff
changeset
|
732 strftime(tbuf, sizeof(tbuf), "%Y-%m-%d %H:%M:%S", |
|
4c8d7b558e83
Annotations listing (/roster note in the status buffer)
Mikael Berthe <mikael@lilotux.net>
parents:
1021
diff
changeset
|
733 localtime(¬e->mdate)); |
|
4c8d7b558e83
Annotations listing (/roster note in the status buffer)
Mikael Berthe <mikael@lilotux.net>
parents:
1021
diff
changeset
|
734 g_string_printf(sbuf, "Note modified %s", tbuf); |
|
1290
e42f48103609
Drawing the MUC nicks by a different color
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1279
diff
changeset
|
735 scr_WriteIncomingMessage(winId, sbuf->str, 0, msg_flag, 0); |
|
1268
dbc907b2d92f
Add configurable colors for info and incoming messages (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents:
1260
diff
changeset
|
736 msg_flag = HBB_PREFIX_INFO | HBB_PREFIX_CONT; |
|
1022
4c8d7b558e83
Annotations listing (/roster note in the status buffer)
Mikael Berthe <mikael@lilotux.net>
parents:
1021
diff
changeset
|
737 } |
|
4c8d7b558e83
Annotations listing (/roster note in the status buffer)
Mikael Berthe <mikael@lilotux.net>
parents:
1021
diff
changeset
|
738 // Note text |
|
4c8d7b558e83
Annotations listing (/roster note in the status buffer)
Mikael Berthe <mikael@lilotux.net>
parents:
1021
diff
changeset
|
739 g_string_printf(sbuf, "Note: %s", note->text); |
|
1290
e42f48103609
Drawing the MUC nicks by a different color
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1279
diff
changeset
|
740 scr_WriteIncomingMessage(winId, sbuf->str, 0, msg_flag, 0); |
|
1022
4c8d7b558e83
Annotations listing (/roster note in the status buffer)
Mikael Berthe <mikael@lilotux.net>
parents:
1021
diff
changeset
|
741 |
|
4c8d7b558e83
Annotations listing (/roster note in the status buffer)
Mikael Berthe <mikael@lilotux.net>
parents:
1021
diff
changeset
|
742 g_string_free(sbuf, TRUE); |
|
4c8d7b558e83
Annotations listing (/roster note in the status buffer)
Mikael Berthe <mikael@lilotux.net>
parents:
1021
diff
changeset
|
743 g_free(note->text); |
|
4c8d7b558e83
Annotations listing (/roster note in the status buffer)
Mikael Berthe <mikael@lilotux.net>
parents:
1021
diff
changeset
|
744 g_free(note->jid); |
|
4c8d7b558e83
Annotations listing (/roster note in the status buffer)
Mikael Berthe <mikael@lilotux.net>
parents:
1021
diff
changeset
|
745 g_free(note); |
|
4c8d7b558e83
Annotations listing (/roster note in the status buffer)
Mikael Berthe <mikael@lilotux.net>
parents:
1021
diff
changeset
|
746 } |
|
4c8d7b558e83
Annotations listing (/roster note in the status buffer)
Mikael Berthe <mikael@lilotux.net>
parents:
1021
diff
changeset
|
747 |
| 1059 | 748 static void display_all_annotations(void) |
|
1022
4c8d7b558e83
Annotations listing (/roster note in the status buffer)
Mikael Berthe <mikael@lilotux.net>
parents:
1021
diff
changeset
|
749 { |
|
4c8d7b558e83
Annotations listing (/roster note in the status buffer)
Mikael Berthe <mikael@lilotux.net>
parents:
1021
diff
changeset
|
750 GSList *notes; |
| 1598 | 751 notes = xmpp_get_all_storage_rosternotes(); |
|
1163
2913310a7be6
Make /roster bookmark in the status buffer show all bookmarks
Mikael Berthe <mikael@lilotux.net>
parents:
1162
diff
changeset
|
752 |
|
2913310a7be6
Make /roster bookmark in the status buffer show all bookmarks
Mikael Berthe <mikael@lilotux.net>
parents:
1162
diff
changeset
|
753 if (!notes) |
|
2913310a7be6
Make /roster bookmark in the status buffer show all bookmarks
Mikael Berthe <mikael@lilotux.net>
parents:
1162
diff
changeset
|
754 return; |
|
2913310a7be6
Make /roster bookmark in the status buffer show all bookmarks
Mikael Berthe <mikael@lilotux.net>
parents:
1162
diff
changeset
|
755 |
|
1022
4c8d7b558e83
Annotations listing (/roster note in the status buffer)
Mikael Berthe <mikael@lilotux.net>
parents:
1021
diff
changeset
|
756 // Call display_and_free_note() for each note, |
|
4c8d7b558e83
Annotations listing (/roster note in the status buffer)
Mikael Berthe <mikael@lilotux.net>
parents:
1021
diff
changeset
|
757 // with winId = NULL (special window) |
|
4c8d7b558e83
Annotations listing (/roster note in the status buffer)
Mikael Berthe <mikael@lilotux.net>
parents:
1021
diff
changeset
|
758 g_slist_foreach(notes, (GFunc)&display_and_free_note, NULL); |
|
1163
2913310a7be6
Make /roster bookmark in the status buffer show all bookmarks
Mikael Berthe <mikael@lilotux.net>
parents:
1162
diff
changeset
|
759 scr_setmsgflag_if_needed(SPECIAL_BUFFER_STATUS_ID, TRUE); |
|
1815
6abca6000762
Make use of ROSTER_UI_PRIO_STATUS_WIN_MESSAGE
Mikael Berthe <mikael@lilotux.net>
parents:
1811
diff
changeset
|
760 scr_setattentionflag_if_needed(SPECIAL_BUFFER_STATUS_ID, TRUE, |
|
6abca6000762
Make use of ROSTER_UI_PRIO_STATUS_WIN_MESSAGE
Mikael Berthe <mikael@lilotux.net>
parents:
1811
diff
changeset
|
761 ROSTER_UI_PRIO_STATUS_WIN_MESSAGE, prio_max); |
|
1022
4c8d7b558e83
Annotations listing (/roster note in the status buffer)
Mikael Berthe <mikael@lilotux.net>
parents:
1021
diff
changeset
|
762 g_slist_free(notes); |
|
4c8d7b558e83
Annotations listing (/roster note in the status buffer)
Mikael Berthe <mikael@lilotux.net>
parents:
1021
diff
changeset
|
763 } |
|
4c8d7b558e83
Annotations listing (/roster note in the status buffer)
Mikael Berthe <mikael@lilotux.net>
parents:
1021
diff
changeset
|
764 |
| 1016 | 765 static void roster_note(char *arg) |
| 766 { | |
| 1058 | 767 const char *bjid; |
| 1016 | 768 guint type; |
| 769 | |
| 770 if (!current_buddy) | |
| 771 return; | |
| 772 | |
| 1058 | 773 bjid = buddy_getjid(BUDDATA(current_buddy)); |
| 1016 | 774 type = buddy_gettype(BUDDATA(current_buddy)); |
| 775 | |
| 1058 | 776 if (!bjid && type == ROSTER_TYPE_SPECIAL && !arg) { |
|
1022
4c8d7b558e83
Annotations listing (/roster note in the status buffer)
Mikael Berthe <mikael@lilotux.net>
parents:
1021
diff
changeset
|
777 // We're in the status window (the only special buffer currently) |
|
4c8d7b558e83
Annotations listing (/roster note in the status buffer)
Mikael Berthe <mikael@lilotux.net>
parents:
1021
diff
changeset
|
778 // Let's display all server notes |
|
4c8d7b558e83
Annotations listing (/roster note in the status buffer)
Mikael Berthe <mikael@lilotux.net>
parents:
1021
diff
changeset
|
779 display_all_annotations(); |
|
4c8d7b558e83
Annotations listing (/roster note in the status buffer)
Mikael Berthe <mikael@lilotux.net>
parents:
1021
diff
changeset
|
780 return; |
|
4c8d7b558e83
Annotations listing (/roster note in the status buffer)
Mikael Berthe <mikael@lilotux.net>
parents:
1021
diff
changeset
|
781 } |
|
4c8d7b558e83
Annotations listing (/roster note in the status buffer)
Mikael Berthe <mikael@lilotux.net>
parents:
1021
diff
changeset
|
782 |
| 1058 | 783 if (!bjid || (type != ROSTER_TYPE_USER && |
| 1016 | 784 type != ROSTER_TYPE_ROOM && |
| 785 type != ROSTER_TYPE_AGENT)) { | |
| 786 scr_LogPrint(LPRINT_NORMAL, "This item can't have a note."); | |
| 787 return; | |
| 788 } | |
| 789 | |
|
1022
4c8d7b558e83
Annotations listing (/roster note in the status buffer)
Mikael Berthe <mikael@lilotux.net>
parents:
1021
diff
changeset
|
790 if (arg && *arg) { // Set a note |
|
4c8d7b558e83
Annotations listing (/roster note in the status buffer)
Mikael Berthe <mikael@lilotux.net>
parents:
1021
diff
changeset
|
791 gchar *msg, *notetxt; |
| 1016 | 792 msg = to_utf8(arg); |
| 793 if (!strcmp(msg, "-")) | |
|
1019
9d5f6e0ea7b3
XEP-0145: display note dates
Mikael Berthe <mikael@lilotux.net>
parents:
1016
diff
changeset
|
794 notetxt = NULL; // delete note |
| 1016 | 795 else |
|
1019
9d5f6e0ea7b3
XEP-0145: display note dates
Mikael Berthe <mikael@lilotux.net>
parents:
1016
diff
changeset
|
796 notetxt = msg; |
| 1598 | 797 xmpp_set_storage_rosternotes(bjid, notetxt); |
|
1019
9d5f6e0ea7b3
XEP-0145: display note dates
Mikael Berthe <mikael@lilotux.net>
parents:
1016
diff
changeset
|
798 g_free(msg); |
| 1016 | 799 } else { // Display a note |
| 1598 | 800 struct annotation *note = xmpp_get_storage_rosternotes(bjid, FALSE); |
|
1019
9d5f6e0ea7b3
XEP-0145: display note dates
Mikael Berthe <mikael@lilotux.net>
parents:
1016
diff
changeset
|
801 if (note) { |
| 1058 | 802 display_and_free_note(note, bjid); |
|
1019
9d5f6e0ea7b3
XEP-0145: display note dates
Mikael Berthe <mikael@lilotux.net>
parents:
1016
diff
changeset
|
803 } else { |
| 1058 | 804 scr_WriteIncomingMessage(bjid, "This item doesn't have a note.", 0, |
|
1290
e42f48103609
Drawing the MUC nicks by a different color
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1279
diff
changeset
|
805 HBB_PREFIX_INFO, 0); |
|
1019
9d5f6e0ea7b3
XEP-0145: display note dates
Mikael Berthe <mikael@lilotux.net>
parents:
1016
diff
changeset
|
806 } |
| 1016 | 807 } |
| 808 } | |
| 809 | |
|
1573
ece4f26bf9ff
Add count parameter to roster up/down command
Mikael Berthe <mikael@lilotux.net>
parents:
1562
diff
changeset
|
810 // roster_updown(updown, nitems) |
|
ece4f26bf9ff
Add count parameter to roster up/down command
Mikael Berthe <mikael@lilotux.net>
parents:
1562
diff
changeset
|
811 // updown: -1=up, +1=down |
|
ece4f26bf9ff
Add count parameter to roster up/down command
Mikael Berthe <mikael@lilotux.net>
parents:
1562
diff
changeset
|
812 inline static void roster_updown(int updown, char *nitems) |
|
ece4f26bf9ff
Add count parameter to roster up/down command
Mikael Berthe <mikael@lilotux.net>
parents:
1562
diff
changeset
|
813 { |
|
ece4f26bf9ff
Add count parameter to roster up/down command
Mikael Berthe <mikael@lilotux.net>
parents:
1562
diff
changeset
|
814 int nbitems; |
|
ece4f26bf9ff
Add count parameter to roster up/down command
Mikael Berthe <mikael@lilotux.net>
parents:
1562
diff
changeset
|
815 |
|
ece4f26bf9ff
Add count parameter to roster up/down command
Mikael Berthe <mikael@lilotux.net>
parents:
1562
diff
changeset
|
816 if (!nitems || !*nitems) |
|
ece4f26bf9ff
Add count parameter to roster up/down command
Mikael Berthe <mikael@lilotux.net>
parents:
1562
diff
changeset
|
817 nbitems = 1; |
|
ece4f26bf9ff
Add count parameter to roster up/down command
Mikael Berthe <mikael@lilotux.net>
parents:
1562
diff
changeset
|
818 else |
|
ece4f26bf9ff
Add count parameter to roster up/down command
Mikael Berthe <mikael@lilotux.net>
parents:
1562
diff
changeset
|
819 nbitems = strtol(nitems, NULL, 10); |
|
ece4f26bf9ff
Add count parameter to roster up/down command
Mikael Berthe <mikael@lilotux.net>
parents:
1562
diff
changeset
|
820 |
|
ece4f26bf9ff
Add count parameter to roster up/down command
Mikael Berthe <mikael@lilotux.net>
parents:
1562
diff
changeset
|
821 if (nbitems > 0) |
|
1780
e4378fbab5d7
Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents:
1774
diff
changeset
|
822 scr_roster_up_down(updown, nbitems); |
|
1573
ece4f26bf9ff
Add count parameter to roster up/down command
Mikael Berthe <mikael@lilotux.net>
parents:
1562
diff
changeset
|
823 } |
|
ece4f26bf9ff
Add count parameter to roster up/down command
Mikael Berthe <mikael@lilotux.net>
parents:
1562
diff
changeset
|
824 |
| 104 | 825 /* Commands callback functions */ |
|
557
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
826 /* All these do_*() functions will be called with a "arg" parameter */ |
|
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
827 /* (with arg not null) */ |
| 104 | 828 |
|
336
eb994ee40029
Make some functions static
Mikael Berthe <mikael@lilotux.net>
parents:
330
diff
changeset
|
829 static void do_roster(char *arg) |
| 104 | 830 { |
|
968
d3bfa9e9d88c
Use split_arg() in do_roster()
Mikael Berthe <mikael@lilotux.net>
parents:
967
diff
changeset
|
831 char **paramlst; |
|
d3bfa9e9d88c
Use split_arg() in do_roster()
Mikael Berthe <mikael@lilotux.net>
parents:
967
diff
changeset
|
832 char *subcmd; |
|
d3bfa9e9d88c
Use split_arg() in do_roster()
Mikael Berthe <mikael@lilotux.net>
parents:
967
diff
changeset
|
833 |
|
d3bfa9e9d88c
Use split_arg() in do_roster()
Mikael Berthe <mikael@lilotux.net>
parents:
967
diff
changeset
|
834 paramlst = split_arg(arg, 2, 1); // subcmd, arg |
|
d3bfa9e9d88c
Use split_arg() in do_roster()
Mikael Berthe <mikael@lilotux.net>
parents:
967
diff
changeset
|
835 subcmd = *paramlst; |
|
d3bfa9e9d88c
Use split_arg() in do_roster()
Mikael Berthe <mikael@lilotux.net>
parents:
967
diff
changeset
|
836 arg = *(paramlst+1); |
|
d3bfa9e9d88c
Use split_arg() in do_roster()
Mikael Berthe <mikael@lilotux.net>
parents:
967
diff
changeset
|
837 |
|
d3bfa9e9d88c
Use split_arg() in do_roster()
Mikael Berthe <mikael@lilotux.net>
parents:
967
diff
changeset
|
838 if (!subcmd || !*subcmd) { |
|
d3bfa9e9d88c
Use split_arg() in do_roster()
Mikael Berthe <mikael@lilotux.net>
parents:
967
diff
changeset
|
839 scr_LogPrint(LPRINT_NORMAL, "Missing parameter."); |
|
d3bfa9e9d88c
Use split_arg() in do_roster()
Mikael Berthe <mikael@lilotux.net>
parents:
967
diff
changeset
|
840 free_arg_lst(paramlst); |
|
d3bfa9e9d88c
Use split_arg() in do_roster()
Mikael Berthe <mikael@lilotux.net>
parents:
967
diff
changeset
|
841 return; |
|
d3bfa9e9d88c
Use split_arg() in do_roster()
Mikael Berthe <mikael@lilotux.net>
parents:
967
diff
changeset
|
842 } |
|
d3bfa9e9d88c
Use split_arg() in do_roster()
Mikael Berthe <mikael@lilotux.net>
parents:
967
diff
changeset
|
843 |
|
d3bfa9e9d88c
Use split_arg() in do_roster()
Mikael Berthe <mikael@lilotux.net>
parents:
967
diff
changeset
|
844 if (!strcasecmp(subcmd, "top")) { |
|
1780
e4378fbab5d7
Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents:
1774
diff
changeset
|
845 scr_roster_top(); |
| 128 | 846 update_roster = TRUE; |
|
968
d3bfa9e9d88c
Use split_arg() in do_roster()
Mikael Berthe <mikael@lilotux.net>
parents:
967
diff
changeset
|
847 } else if (!strcasecmp(subcmd, "bottom")) { |
|
1780
e4378fbab5d7
Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents:
1774
diff
changeset
|
848 scr_roster_bottom(); |
| 128 | 849 update_roster = TRUE; |
|
968
d3bfa9e9d88c
Use split_arg() in do_roster()
Mikael Berthe <mikael@lilotux.net>
parents:
967
diff
changeset
|
850 } else if (!strcasecmp(subcmd, "hide")) { |
|
1780
e4378fbab5d7
Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents:
1774
diff
changeset
|
851 scr_roster_visibility(0); |
|
968
d3bfa9e9d88c
Use split_arg() in do_roster()
Mikael Berthe <mikael@lilotux.net>
parents:
967
diff
changeset
|
852 } else if (!strcasecmp(subcmd, "show")) { |
|
1780
e4378fbab5d7
Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents:
1774
diff
changeset
|
853 scr_roster_visibility(1); |
|
968
d3bfa9e9d88c
Use split_arg() in do_roster()
Mikael Berthe <mikael@lilotux.net>
parents:
967
diff
changeset
|
854 } else if (!strcasecmp(subcmd, "toggle")) { |
|
1780
e4378fbab5d7
Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents:
1774
diff
changeset
|
855 scr_roster_visibility(-1); |
|
968
d3bfa9e9d88c
Use split_arg() in do_roster()
Mikael Berthe <mikael@lilotux.net>
parents:
967
diff
changeset
|
856 } else if (!strcasecmp(subcmd, "hide_offline")) { |
| 120 | 857 buddylist_set_hide_offline_buddies(TRUE); |
| 104 | 858 if (current_buddy) |
| 859 buddylist_build(); | |
| 128 | 860 update_roster = TRUE; |
|
968
d3bfa9e9d88c
Use split_arg() in do_roster()
Mikael Berthe <mikael@lilotux.net>
parents:
967
diff
changeset
|
861 } else if (!strcasecmp(subcmd, "show_offline")) { |
| 120 | 862 buddylist_set_hide_offline_buddies(FALSE); |
| 124 | 863 buddylist_build(); |
| 128 | 864 update_roster = TRUE; |
|
968
d3bfa9e9d88c
Use split_arg() in do_roster()
Mikael Berthe <mikael@lilotux.net>
parents:
967
diff
changeset
|
865 } else if (!strcasecmp(subcmd, "toggle_offline")) { |
|
290
f63839a4cb35
Add /roster toggle_offline
Mikael Berthe <mikael@lilotux.net>
parents:
288
diff
changeset
|
866 buddylist_set_hide_offline_buddies(-1); |
|
f63839a4cb35
Add /roster toggle_offline
Mikael Berthe <mikael@lilotux.net>
parents:
288
diff
changeset
|
867 buddylist_build(); |
|
f63839a4cb35
Add /roster toggle_offline
Mikael Berthe <mikael@lilotux.net>
parents:
288
diff
changeset
|
868 update_roster = TRUE; |
|
1311
0dda8238af21
Implement "/roster display"
Mikael Berthe <mikael@lilotux.net>
parents:
1305
diff
changeset
|
869 } else if (!strcasecmp(subcmd, "display")) { |
|
1780
e4378fbab5d7
Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents:
1774
diff
changeset
|
870 scr_roster_display(arg); |
|
974
36f7753dfb59
Add /roster item_{lock,unlock}
Mikael Berthe <mikael@lilotux.net>
parents:
968
diff
changeset
|
871 } else if (!strcasecmp(subcmd, "item_lock")) { |
|
1350
096411233fce
Add /roster item_toggle_lock (suggested by Wolfram S.)
Mikael Berthe <mikael@lilotux.net>
parents:
1347
diff
changeset
|
872 roster_buddylock(arg, 1); |
|
974
36f7753dfb59
Add /roster item_{lock,unlock}
Mikael Berthe <mikael@lilotux.net>
parents:
968
diff
changeset
|
873 } else if (!strcasecmp(subcmd, "item_unlock")) { |
|
1350
096411233fce
Add /roster item_toggle_lock (suggested by Wolfram S.)
Mikael Berthe <mikael@lilotux.net>
parents:
1347
diff
changeset
|
874 roster_buddylock(arg, 0); |
|
096411233fce
Add /roster item_toggle_lock (suggested by Wolfram S.)
Mikael Berthe <mikael@lilotux.net>
parents:
1347
diff
changeset
|
875 } else if (!strcasecmp(subcmd, "item_toggle_lock")) { |
|
096411233fce
Add /roster item_toggle_lock (suggested by Wolfram S.)
Mikael Berthe <mikael@lilotux.net>
parents:
1347
diff
changeset
|
876 roster_buddylock(arg, -1); |
|
968
d3bfa9e9d88c
Use split_arg() in do_roster()
Mikael Berthe <mikael@lilotux.net>
parents:
967
diff
changeset
|
877 } else if (!strcasecmp(subcmd, "unread_first")) { |
|
1780
e4378fbab5d7
Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents:
1774
diff
changeset
|
878 scr_roster_unread_message(0); |
|
968
d3bfa9e9d88c
Use split_arg() in do_roster()
Mikael Berthe <mikael@lilotux.net>
parents:
967
diff
changeset
|
879 } else if (!strcasecmp(subcmd, "unread_next")) { |
|
1780
e4378fbab5d7
Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents:
1774
diff
changeset
|
880 scr_roster_unread_message(1); |
|
968
d3bfa9e9d88c
Use split_arg() in do_roster()
Mikael Berthe <mikael@lilotux.net>
parents:
967
diff
changeset
|
881 } else if (!strcasecmp(subcmd, "alternate")) { |
|
1780
e4378fbab5d7
Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents:
1774
diff
changeset
|
882 scr_roster_jump_alternate(); |
|
968
d3bfa9e9d88c
Use split_arg() in do_roster()
Mikael Berthe <mikael@lilotux.net>
parents:
967
diff
changeset
|
883 } else if (!strncasecmp(subcmd, "search", 6)) { |
|
979
ea939ff047d8
Improve /buffer search_*
Mikael Berthe <mikael@lilotux.net>
parents:
978
diff
changeset
|
884 strip_arg_special_chars(arg); |
|
ea939ff047d8
Improve /buffer search_*
Mikael Berthe <mikael@lilotux.net>
parents:
978
diff
changeset
|
885 if (!arg || !*arg) { |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
886 scr_LogPrint(LPRINT_NORMAL, "What name or JID are you looking for?"); |
|
968
d3bfa9e9d88c
Use split_arg() in do_roster()
Mikael Berthe <mikael@lilotux.net>
parents:
967
diff
changeset
|
887 free_arg_lst(paramlst); |
| 265 | 888 return; |
| 889 } | |
|
1780
e4378fbab5d7
Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents:
1774
diff
changeset
|
890 scr_roster_search(arg); |
| 265 | 891 update_roster = TRUE; |
|
968
d3bfa9e9d88c
Use split_arg() in do_roster()
Mikael Berthe <mikael@lilotux.net>
parents:
967
diff
changeset
|
892 } else if (!strcasecmp(subcmd, "up")) { |
|
1573
ece4f26bf9ff
Add count parameter to roster up/down command
Mikael Berthe <mikael@lilotux.net>
parents:
1562
diff
changeset
|
893 roster_updown(-1, arg); |
|
968
d3bfa9e9d88c
Use split_arg() in do_roster()
Mikael Berthe <mikael@lilotux.net>
parents:
967
diff
changeset
|
894 } else if (!strcasecmp(subcmd, "down")) { |
|
1573
ece4f26bf9ff
Add count parameter to roster up/down command
Mikael Berthe <mikael@lilotux.net>
parents:
1562
diff
changeset
|
895 roster_updown(1, arg); |
|
1086
5e2e647e781b
Add command /roster group_prev|group_next and update documentation
Mikael Berthe <mikael@lilotux.net>
parents:
1074
diff
changeset
|
896 } else if (!strcasecmp(subcmd, "group_prev")) { |
|
1780
e4378fbab5d7
Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents:
1774
diff
changeset
|
897 scr_roster_prev_group(); |
|
1086
5e2e647e781b
Add command /roster group_prev|group_next and update documentation
Mikael Berthe <mikael@lilotux.net>
parents:
1074
diff
changeset
|
898 } else if (!strcasecmp(subcmd, "group_next")) { |
|
1780
e4378fbab5d7
Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents:
1774
diff
changeset
|
899 scr_roster_next_group(); |
| 1016 | 900 } else if (!strcasecmp(subcmd, "note")) { |
| 901 roster_note(arg); | |
|
2013
8dc418af3e72
Allow to select to which buddy resource messages go. Closes issue #55
Hermitifier
parents:
2010
diff
changeset
|
902 } else if (!strcasecmp(subcmd, "resource_lock")) { |
|
8dc418af3e72
Allow to select to which buddy resource messages go. Closes issue #55
Hermitifier
parents:
2010
diff
changeset
|
903 roster_resourcelock(arg, TRUE); |
|
8dc418af3e72
Allow to select to which buddy resource messages go. Closes issue #55
Hermitifier
parents:
2010
diff
changeset
|
904 } else if (!strcasecmp(subcmd, "resource_unlock")) { |
|
8dc418af3e72
Allow to select to which buddy resource messages go. Closes issue #55
Hermitifier
parents:
2010
diff
changeset
|
905 roster_resourcelock(arg, FALSE); |
| 104 | 906 } else |
|
374
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
371
diff
changeset
|
907 scr_LogPrint(LPRINT_NORMAL, "Unrecognized parameter!"); |
|
968
d3bfa9e9d88c
Use split_arg() in do_roster()
Mikael Berthe <mikael@lilotux.net>
parents:
967
diff
changeset
|
908 free_arg_lst(paramlst); |
| 104 | 909 } |
| 108 | 910 |
|
1272
033576acac4c
Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents:
1268
diff
changeset
|
911 void do_color(char *arg) |
|
033576acac4c
Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents:
1268
diff
changeset
|
912 { |
|
033576acac4c
Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents:
1268
diff
changeset
|
913 char **paramlst; |
|
033576acac4c
Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents:
1268
diff
changeset
|
914 char *subcmd; |
|
033576acac4c
Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents:
1268
diff
changeset
|
915 |
|
033576acac4c
Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents:
1268
diff
changeset
|
916 paramlst = split_arg(arg, 2, 1); // subcmd, arg |
|
033576acac4c
Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents:
1268
diff
changeset
|
917 subcmd = *paramlst; |
|
033576acac4c
Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents:
1268
diff
changeset
|
918 arg = *(paramlst+1); |
|
033576acac4c
Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents:
1268
diff
changeset
|
919 |
|
033576acac4c
Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents:
1268
diff
changeset
|
920 if (!subcmd || !*subcmd) { |
|
033576acac4c
Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents:
1268
diff
changeset
|
921 scr_LogPrint(LPRINT_NORMAL, "Missing parameter."); |
|
033576acac4c
Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents:
1268
diff
changeset
|
922 free_arg_lst(paramlst); |
|
033576acac4c
Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents:
1268
diff
changeset
|
923 return; |
|
033576acac4c
Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents:
1268
diff
changeset
|
924 } |
|
033576acac4c
Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents:
1268
diff
changeset
|
925 |
|
033576acac4c
Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents:
1268
diff
changeset
|
926 if (!strcasecmp(subcmd, "roster")) { |
|
1333
e30a9d907105
Minor coding style adjustments
Mikael Berthe <mikael@lilotux.net>
parents:
1329
diff
changeset
|
927 char *status, *wildcard, *color; |
|
1272
033576acac4c
Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents:
1268
diff
changeset
|
928 char **arglist = split_arg(arg, 3, 0); |
|
1333
e30a9d907105
Minor coding style adjustments
Mikael Berthe <mikael@lilotux.net>
parents:
1329
diff
changeset
|
929 |
|
e30a9d907105
Minor coding style adjustments
Mikael Berthe <mikael@lilotux.net>
parents:
1329
diff
changeset
|
930 status = *arglist; |
|
e30a9d907105
Minor coding style adjustments
Mikael Berthe <mikael@lilotux.net>
parents:
1329
diff
changeset
|
931 wildcard = to_utf8(arglist[1]); |
|
e30a9d907105
Minor coding style adjustments
Mikael Berthe <mikael@lilotux.net>
parents:
1329
diff
changeset
|
932 color = arglist[2]; |
|
e30a9d907105
Minor coding style adjustments
Mikael Berthe <mikael@lilotux.net>
parents:
1329
diff
changeset
|
933 |
|
1272
033576acac4c
Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents:
1268
diff
changeset
|
934 if (status && !strcmp(status, "clear")) { // Not a color command, clear all |
|
1780
e4378fbab5d7
Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents:
1774
diff
changeset
|
935 scr_roster_clear_color(); |
|
1272
033576acac4c
Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents:
1268
diff
changeset
|
936 update_roster = TRUE; |
|
033576acac4c
Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents:
1268
diff
changeset
|
937 } else { |
|
033576acac4c
Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents:
1268
diff
changeset
|
938 if (!status || !*status || !wildcard || !*wildcard || !color || !*color) { |
|
033576acac4c
Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents:
1268
diff
changeset
|
939 scr_LogPrint(LPRINT_NORMAL, "Missing argument"); |
|
033576acac4c
Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents:
1268
diff
changeset
|
940 } else { |
|
1780
e4378fbab5d7
Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents:
1774
diff
changeset
|
941 update_roster = scr_roster_color(status, wildcard, color) || |
|
e4378fbab5d7
Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents:
1774
diff
changeset
|
942 update_roster; |
|
1272
033576acac4c
Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents:
1268
diff
changeset
|
943 } |
|
033576acac4c
Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents:
1268
diff
changeset
|
944 } |
|
033576acac4c
Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents:
1268
diff
changeset
|
945 free_arg_lst(arglist); |
|
1292
382ec54b584e
Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1290
diff
changeset
|
946 g_free(wildcard); |
|
382ec54b584e
Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1290
diff
changeset
|
947 } else if (!strcasecmp(subcmd, "muc")) { |
|
382ec54b584e
Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1290
diff
changeset
|
948 char **arglist = split_arg(arg, 2, 0); |
|
382ec54b584e
Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1290
diff
changeset
|
949 char *free_muc = to_utf8(*arglist); |
|
382ec54b584e
Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1290
diff
changeset
|
950 const char *muc = free_muc, *mode = arglist[1]; |
|
382ec54b584e
Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1290
diff
changeset
|
951 if (!muc || !*muc) |
|
382ec54b584e
Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1290
diff
changeset
|
952 scr_LogPrint(LPRINT_NORMAL, "What MUC?"); |
|
382ec54b584e
Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1290
diff
changeset
|
953 else { |
|
382ec54b584e
Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1290
diff
changeset
|
954 if (!strcmp(muc, ".")) |
|
382ec54b584e
Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1290
diff
changeset
|
955 if (!(muc = CURRENT_JID)) |
|
382ec54b584e
Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1290
diff
changeset
|
956 scr_LogPrint(LPRINT_NORMAL, "No JID selected"); |
|
382ec54b584e
Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1290
diff
changeset
|
957 if (muc) { |
|
382ec54b584e
Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1290
diff
changeset
|
958 if (check_jid_syntax(muc) && strcmp(muc, "*")) |
|
382ec54b584e
Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1290
diff
changeset
|
959 scr_LogPrint(LPRINT_NORMAL, "Not a JID"); |
|
382ec54b584e
Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1290
diff
changeset
|
960 else { |
|
382ec54b584e
Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1290
diff
changeset
|
961 if (!mode || !*mode || !strcasecmp(mode, "on")) |
|
1780
e4378fbab5d7
Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents:
1774
diff
changeset
|
962 scr_muc_color(muc, MC_ALL); |
|
1292
382ec54b584e
Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1290
diff
changeset
|
963 else if (!strcasecmp(mode, "preset")) |
|
1780
e4378fbab5d7
Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents:
1774
diff
changeset
|
964 scr_muc_color(muc, MC_PRESET); |
|
1292
382ec54b584e
Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1290
diff
changeset
|
965 else if (!strcasecmp(mode, "off")) |
|
1780
e4378fbab5d7
Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents:
1774
diff
changeset
|
966 scr_muc_color(muc, MC_OFF); |
|
1292
382ec54b584e
Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1290
diff
changeset
|
967 else if (!strcmp(mode, "-")) |
|
1780
e4378fbab5d7
Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents:
1774
diff
changeset
|
968 scr_muc_color(muc, MC_REMOVE); |
|
1292
382ec54b584e
Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1290
diff
changeset
|
969 else |
|
382ec54b584e
Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1290
diff
changeset
|
970 scr_LogPrint(LPRINT_NORMAL, "Unknown coloring mode"); |
|
382ec54b584e
Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1290
diff
changeset
|
971 } |
|
382ec54b584e
Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1290
diff
changeset
|
972 } |
|
382ec54b584e
Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1290
diff
changeset
|
973 } |
|
382ec54b584e
Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1290
diff
changeset
|
974 free_arg_lst(arglist); |
|
382ec54b584e
Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1290
diff
changeset
|
975 g_free(free_muc); |
|
382ec54b584e
Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1290
diff
changeset
|
976 } else if (!strcasecmp(subcmd, "mucnick")) { |
|
382ec54b584e
Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1290
diff
changeset
|
977 char **arglist = split_arg(arg, 2, 0); |
|
382ec54b584e
Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1290
diff
changeset
|
978 const char *nick = *arglist, *color = arglist[1]; |
|
382ec54b584e
Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1290
diff
changeset
|
979 if (!nick || !*nick || !color || !*color) |
|
382ec54b584e
Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1290
diff
changeset
|
980 scr_LogPrint(LPRINT_NORMAL, "Missing argument"); |
|
382ec54b584e
Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1290
diff
changeset
|
981 else |
|
1780
e4378fbab5d7
Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents:
1774
diff
changeset
|
982 scr_muc_nick_color(nick, color); |
|
1292
382ec54b584e
Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1290
diff
changeset
|
983 free_arg_lst(arglist); |
|
1272
033576acac4c
Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents:
1268
diff
changeset
|
984 } else |
|
033576acac4c
Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents:
1268
diff
changeset
|
985 scr_LogPrint(LPRINT_NORMAL, "Unrecognized parameter!"); |
|
033576acac4c
Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents:
1268
diff
changeset
|
986 free_arg_lst(paramlst); |
|
033576acac4c
Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents:
1268
diff
changeset
|
987 } |
|
033576acac4c
Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents:
1268
diff
changeset
|
988 |
|
1415
317f8d181626
Rename command public functions
Mikael Berthe <mikael@lilotux.net>
parents:
1414
diff
changeset
|
989 // cmd_setstatus(recipient, arg) |
| 444 | 990 // Set your Jabber status. |
| 991 // - if recipient is not NULL, the status is sent to this contact only | |
| 992 // - arg must be "status message" (message is optional) | |
|
1415
317f8d181626
Rename command public functions
Mikael Berthe <mikael@lilotux.net>
parents:
1414
diff
changeset
|
993 void cmd_setstatus(const char *recipient, const char *arg) |
| 116 | 994 { |
|
557
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
995 char **paramlst; |
|
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
996 char *status; |
|
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
997 char *msg; |
| 116 | 998 enum imstatus st; |
| 999 | |
|
1732
4e57d6275a86
Allow status command in the configuration file
Mikael Berthe <mikael@lilotux.net>
parents:
1729
diff
changeset
|
1000 if (!xmpp_is_online()) |
|
4e57d6275a86
Allow status command in the configuration file
Mikael Berthe <mikael@lilotux.net>
parents:
1729
diff
changeset
|
1001 scr_LogPrint(LPRINT_NORMAL, "You are currently not connected..."); |
|
4e57d6275a86
Allow status command in the configuration file
Mikael Berthe <mikael@lilotux.net>
parents:
1729
diff
changeset
|
1002 // We do not return now, so that the status is memorized and used later... |
|
472
75442262c082
Disable some commands when not connected
Mikael Berthe <mikael@lilotux.net>
parents:
471
diff
changeset
|
1003 |
|
1428
5667048423db
Reset auto-away before changing the status
Mikael Berthe <mikael@lilotux.net>
parents:
1424
diff
changeset
|
1004 // It makes sense to reset autoaway before changing the status |
|
5667048423db
Reset auto-away before changing the status
Mikael Berthe <mikael@lilotux.net>
parents:
1424
diff
changeset
|
1005 // (esp. for FIFO or remote commands) or the behaviour could be |
|
5667048423db
Reset auto-away before changing the status
Mikael Berthe <mikael@lilotux.net>
parents:
1424
diff
changeset
|
1006 // unexpected... |
|
1429
99d95d4ea806
No need to explicitly reset auto-away for directed presence messages
Mikael Berthe <mikael@lilotux.net>
parents:
1428
diff
changeset
|
1007 if (!recipient) |
|
1780
e4378fbab5d7
Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents:
1774
diff
changeset
|
1008 scr_check_auto_away(TRUE); |
|
1428
5667048423db
Reset auto-away before changing the status
Mikael Berthe <mikael@lilotux.net>
parents:
1424
diff
changeset
|
1009 |
|
1368
23afeb5c555b
Don't strip quotes from a status message (Suggested by bb)
Mikael Berthe <mikael@lilotux.net>
parents:
1365
diff
changeset
|
1010 paramlst = split_arg(arg, 2, 1); // status, message |
|
557
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
1011 status = *paramlst; |
|
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
1012 msg = *(paramlst+1); |
|
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
1013 |
|
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
1014 if (!status) { |
|
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
1015 free_arg_lst(paramlst); |
|
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
1016 return; |
|
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
1017 } |
|
318
45076d02eeef
The /status command can specify a status message
Mikael Berthe <mikael@lilotux.net>
parents:
310
diff
changeset
|
1018 |
| 967 | 1019 if (!strcasecmp(status, IMSTATUS_OFFLINE)) st = offline; |
| 1020 else if (!strcasecmp(status, IMSTATUS_ONLINE)) st = available; | |
| 1021 else if (!strcasecmp(status, IMSTATUS_AVAILABLE)) st = available; | |
| 1022 else if (!strcasecmp(status, IMSTATUS_AWAY)) st = away; | |
|
1972
45f0f0f60656
Remove deprecated status invisible
Mikael Berthe <mikael@lilotux.net>
parents:
1959
diff
changeset
|
1023 #ifdef WITH_DEPRECATED_STATUS_INVISIBLE |
| 967 | 1024 else if (!strcasecmp(status, IMSTATUS_INVISIBLE)) st = invisible; |
|
1972
45f0f0f60656
Remove deprecated status invisible
Mikael Berthe <mikael@lilotux.net>
parents:
1959
diff
changeset
|
1025 #endif |
| 967 | 1026 else if (!strcasecmp(status, IMSTATUS_DONOTDISTURB)) st = dontdisturb; |
| 1027 else if (!strcasecmp(status, IMSTATUS_NOTAVAILABLE)) st = notavail; | |
| 1028 else if (!strcasecmp(status, IMSTATUS_FREE4CHAT)) st = freeforchat; | |
|
1463
477581e3b95e
"status message" expects a message
Mikael Berthe <mikael@lilotux.net>
parents:
1462
diff
changeset
|
1029 else if (!strcasecmp(status, "message")) { |
|
477581e3b95e
"status message" expects a message
Mikael Berthe <mikael@lilotux.net>
parents:
1462
diff
changeset
|
1030 if (!msg || !*msg) { |
|
477581e3b95e
"status message" expects a message
Mikael Berthe <mikael@lilotux.net>
parents:
1462
diff
changeset
|
1031 // We want a message. If there's none, we give up. |
|
477581e3b95e
"status message" expects a message
Mikael Berthe <mikael@lilotux.net>
parents:
1462
diff
changeset
|
1032 scr_LogPrint(LPRINT_NORMAL, "Missing parameter."); |
|
477581e3b95e
"status message" expects a message
Mikael Berthe <mikael@lilotux.net>
parents:
1462
diff
changeset
|
1033 free_arg_lst(paramlst); |
|
477581e3b95e
"status message" expects a message
Mikael Berthe <mikael@lilotux.net>
parents:
1462
diff
changeset
|
1034 return; |
|
477581e3b95e
"status message" expects a message
Mikael Berthe <mikael@lilotux.net>
parents:
1462
diff
changeset
|
1035 } |
| 1598 | 1036 st = xmpp_getstatus(); // Preserve current status |
|
1463
477581e3b95e
"status message" expects a message
Mikael Berthe <mikael@lilotux.net>
parents:
1462
diff
changeset
|
1037 } else { |
| 444 | 1038 scr_LogPrint(LPRINT_NORMAL, "Unrecognized status!"); |
|
557
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
1039 free_arg_lst(paramlst); |
| 116 | 1040 return; |
| 1041 } | |
| 1042 | |
|
677
633a0522bd37
Using "/status invisible -" did not clear the status message
Mikael Berthe <mikael@lilotux.net>
parents:
659
diff
changeset
|
1043 // Use provided message |
|
633a0522bd37
Using "/status invisible -" did not clear the status message
Mikael Berthe <mikael@lilotux.net>
parents:
659
diff
changeset
|
1044 if (msg && !*msg) { |
|
318
45076d02eeef
The /status command can specify a status message
Mikael Berthe <mikael@lilotux.net>
parents:
310
diff
changeset
|
1045 msg = NULL; |
|
677
633a0522bd37
Using "/status invisible -" did not clear the status message
Mikael Berthe <mikael@lilotux.net>
parents:
659
diff
changeset
|
1046 } |
|
318
45076d02eeef
The /status command can specify a status message
Mikael Berthe <mikael@lilotux.net>
parents:
310
diff
changeset
|
1047 |
|
528
2f714bd701a1
Do not use default status messages with /status_to
Mikael Berthe <mikael@lilotux.net>
parents:
519
diff
changeset
|
1048 // If a recipient is specified, let's don't use default status messages |
|
2f714bd701a1
Do not use default status messages with /status_to
Mikael Berthe <mikael@lilotux.net>
parents:
519
diff
changeset
|
1049 if (recipient && !msg) |
|
2f714bd701a1
Do not use default status messages with /status_to
Mikael Berthe <mikael@lilotux.net>
parents:
519
diff
changeset
|
1050 msg = ""; |
|
2f714bd701a1
Do not use default status messages with /status_to
Mikael Berthe <mikael@lilotux.net>
parents:
519
diff
changeset
|
1051 |
| 1598 | 1052 xmpp_setstatus(st, recipient, msg, FALSE); |
|
557
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
1053 |
|
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
1054 free_arg_lst(paramlst); |
| 444 | 1055 } |
| 1056 | |
| 1057 static void do_status(char *arg) | |
| 1058 { | |
|
557
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
1059 if (!*arg) { |
| 1598 | 1060 const char *sm = xmpp_getstatusmsg(); |
|
519
5c338d31de56
Show current global status message in "/status"
Mikael Berthe <mikael@lilotux.net>
parents:
508
diff
changeset
|
1061 scr_LogPrint(LPRINT_NORMAL, "Your status is: [%c] %s", |
| 1598 | 1062 imstatus2char[xmpp_getstatus()], |
|
519
5c338d31de56
Show current global status message in "/status"
Mikael Berthe <mikael@lilotux.net>
parents:
508
diff
changeset
|
1063 (sm ? sm : "")); |
| 444 | 1064 return; |
| 1065 } | |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
1066 arg = to_utf8(arg); |
|
1415
317f8d181626
Rename command public functions
Mikael Berthe <mikael@lilotux.net>
parents:
1414
diff
changeset
|
1067 cmd_setstatus(NULL, arg); |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
1068 g_free(arg); |
| 444 | 1069 } |
| 1070 | |
| 1071 static void do_status_to(char *arg) | |
| 1072 { | |
|
557
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
1073 char **paramlst; |
| 1058 | 1074 char *fjid, *st, *msg; |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
1075 char *jid_utf8 = NULL; |
|
557
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
1076 |
|
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
1077 paramlst = split_arg(arg, 3, 1); // jid, status, [message] |
| 1058 | 1078 fjid = *paramlst; |
|
557
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
1079 st = *(paramlst+1); |
|
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
1080 msg = *(paramlst+2); |
| 444 | 1081 |
| 1058 | 1082 if (!fjid || !st) { |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
1083 scr_LogPrint(LPRINT_NORMAL, |
|
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
1084 "Please specify both a Jabber ID and a status."); |
|
640
1cd7f8e3895b
"/status_to" can be used with no jid (it will use the current buddy's jid)
Mikael Berthe <mikael@lilotux.net>
parents:
638
diff
changeset
|
1085 free_arg_lst(paramlst); |
|
1cd7f8e3895b
"/status_to" can be used with no jid (it will use the current buddy's jid)
Mikael Berthe <mikael@lilotux.net>
parents:
638
diff
changeset
|
1086 return; |
|
1cd7f8e3895b
"/status_to" can be used with no jid (it will use the current buddy's jid)
Mikael Berthe <mikael@lilotux.net>
parents:
638
diff
changeset
|
1087 } |
|
1cd7f8e3895b
"/status_to" can be used with no jid (it will use the current buddy's jid)
Mikael Berthe <mikael@lilotux.net>
parents:
638
diff
changeset
|
1088 |
|
1cd7f8e3895b
"/status_to" can be used with no jid (it will use the current buddy's jid)
Mikael Berthe <mikael@lilotux.net>
parents:
638
diff
changeset
|
1089 // Allow things like /status_to "" away |
| 1058 | 1090 if (!*fjid || !strcmp(fjid, ".")) |
| 1091 fjid = NULL; | |
|
640
1cd7f8e3895b
"/status_to" can be used with no jid (it will use the current buddy's jid)
Mikael Berthe <mikael@lilotux.net>
parents:
638
diff
changeset
|
1092 |
| 1058 | 1093 if (fjid) { |
|
640
1cd7f8e3895b
"/status_to" can be used with no jid (it will use the current buddy's jid)
Mikael Berthe <mikael@lilotux.net>
parents:
638
diff
changeset
|
1094 // The JID has been specified. Quick check... |
| 1058 | 1095 if (check_jid_syntax(fjid)) { |
|
1064
516b5f7d1023
Fix some UTF-8 related problems
Mikael Berthe <mikael@lilotux.net>
parents:
1059
diff
changeset
|
1096 scr_LogPrint(LPRINT_NORMAL|LPRINT_NOTUTF8, |
|
516b5f7d1023
Fix some UTF-8 related problems
Mikael Berthe <mikael@lilotux.net>
parents:
1059
diff
changeset
|
1097 "<%s> is not a valid Jabber ID.", fjid); |
| 1058 | 1098 fjid = NULL; |
|
640
1cd7f8e3895b
"/status_to" can be used with no jid (it will use the current buddy's jid)
Mikael Berthe <mikael@lilotux.net>
parents:
638
diff
changeset
|
1099 } else { |
|
696
ee06382dfb22
/status_to: Do not convert resource name to lower case
Mikael Berthe <mikael@lilotux.net>
parents:
694
diff
changeset
|
1100 // Convert jid to lowercase |
| 1058 | 1101 char *p = fjid; |
|
977
5b01de4ac5e1
Cosmetic changes
Alexis Hildebrandt <afh [at] 2drop [dot] net>
parents:
974
diff
changeset
|
1102 for ( ; *p && *p != JID_RESOURCE_SEPARATOR; p++) |
|
696
ee06382dfb22
/status_to: Do not convert resource name to lower case
Mikael Berthe <mikael@lilotux.net>
parents:
694
diff
changeset
|
1103 *p = tolower(*p); |
| 1058 | 1104 fjid = jid_utf8 = to_utf8(fjid); |
|
640
1cd7f8e3895b
"/status_to" can be used with no jid (it will use the current buddy's jid)
Mikael Berthe <mikael@lilotux.net>
parents:
638
diff
changeset
|
1105 } |
|
557
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
1106 } else { |
|
640
1cd7f8e3895b
"/status_to" can be used with no jid (it will use the current buddy's jid)
Mikael Berthe <mikael@lilotux.net>
parents:
638
diff
changeset
|
1107 // Add the current buddy |
|
1cd7f8e3895b
"/status_to" can be used with no jid (it will use the current buddy's jid)
Mikael Berthe <mikael@lilotux.net>
parents:
638
diff
changeset
|
1108 if (current_buddy) |
| 1058 | 1109 fjid = (char*)buddy_getjid(BUDDATA(current_buddy)); |
| 1110 if (!fjid) | |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
1111 scr_LogPrint(LPRINT_NORMAL, "Please specify a Jabber ID."); |
|
640
1cd7f8e3895b
"/status_to" can be used with no jid (it will use the current buddy's jid)
Mikael Berthe <mikael@lilotux.net>
parents:
638
diff
changeset
|
1112 } |
|
1cd7f8e3895b
"/status_to" can be used with no jid (it will use the current buddy's jid)
Mikael Berthe <mikael@lilotux.net>
parents:
638
diff
changeset
|
1113 |
| 1058 | 1114 if (fjid) { |
| 1115 char *cmdline; | |
|
557
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
1116 if (!msg) |
|
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
1117 msg = ""; |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
1118 msg = to_utf8(msg); |
| 1058 | 1119 cmdline = g_strdup_printf("%s %s", st, msg); |
| 1120 scr_LogPrint(LPRINT_LOGNORM, "Sending to <%s> /status %s", fjid, cmdline); | |
|
1415
317f8d181626
Rename command public functions
Mikael Berthe <mikael@lilotux.net>
parents:
1414
diff
changeset
|
1121 cmd_setstatus(fjid, cmdline); |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
1122 g_free(msg); |
| 1058 | 1123 g_free(cmdline); |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
1124 g_free(jid_utf8); |
| 444 | 1125 } |
|
557
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
1126 free_arg_lst(paramlst); |
| 116 | 1127 } |
| 1128 | |
|
336
eb994ee40029
Make some functions static
Mikael Berthe <mikael@lilotux.net>
parents:
330
diff
changeset
|
1129 static void do_add(char *arg) |
| 124 | 1130 { |
|
557
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
1131 char **paramlst; |
| 244 | 1132 char *id, *nick; |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
1133 char *jid_utf8 = NULL; |
|
472
75442262c082
Disable some commands when not connected
Mikael Berthe <mikael@lilotux.net>
parents:
471
diff
changeset
|
1134 |
|
1684
95df4ea512c8
Provide xmpp_is_online()
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1682
diff
changeset
|
1135 if (!xmpp_is_online()) { |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
1136 scr_LogPrint(LPRINT_NORMAL, "You are not connected."); |
|
472
75442262c082
Disable some commands when not connected
Mikael Berthe <mikael@lilotux.net>
parents:
471
diff
changeset
|
1137 return; |
|
75442262c082
Disable some commands when not connected
Mikael Berthe <mikael@lilotux.net>
parents:
471
diff
changeset
|
1138 } |
|
75442262c082
Disable some commands when not connected
Mikael Berthe <mikael@lilotux.net>
parents:
471
diff
changeset
|
1139 |
|
557
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
1140 paramlst = split_arg(arg, 2, 0); // jid, [nickname] |
|
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
1141 id = *paramlst; |
|
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
1142 nick = *(paramlst+1); |
| 244 | 1143 |
|
638
f6946251acdf
"/add" can be used with no jid (it will use the current buddy's jid)
Mikael Berthe <mikael@lilotux.net>
parents:
636
diff
changeset
|
1144 if (!id) |
|
f6946251acdf
"/add" can be used with no jid (it will use the current buddy's jid)
Mikael Berthe <mikael@lilotux.net>
parents:
636
diff
changeset
|
1145 nick = NULL; // Allow things like: /add "" nick |
|
641
62679532ea55
Allow special jid "." in commands /add and /status_to
Mikael Berthe <mikael@lilotux.net>
parents:
640
diff
changeset
|
1146 else if (!*id || !strcmp(id, ".")) |
|
638
f6946251acdf
"/add" can be used with no jid (it will use the current buddy's jid)
Mikael Berthe <mikael@lilotux.net>
parents:
636
diff
changeset
|
1147 id = NULL; |
|
f6946251acdf
"/add" can be used with no jid (it will use the current buddy's jid)
Mikael Berthe <mikael@lilotux.net>
parents:
636
diff
changeset
|
1148 |
|
f6946251acdf
"/add" can be used with no jid (it will use the current buddy's jid)
Mikael Berthe <mikael@lilotux.net>
parents:
636
diff
changeset
|
1149 if (id) { |
|
f6946251acdf
"/add" can be used with no jid (it will use the current buddy's jid)
Mikael Berthe <mikael@lilotux.net>
parents:
636
diff
changeset
|
1150 // The JID has been specified. Quick check... |
|
f6946251acdf
"/add" can be used with no jid (it will use the current buddy's jid)
Mikael Berthe <mikael@lilotux.net>
parents:
636
diff
changeset
|
1151 if (check_jid_syntax(id)) { |
|
1064
516b5f7d1023
Fix some UTF-8 related problems
Mikael Berthe <mikael@lilotux.net>
parents:
1059
diff
changeset
|
1152 scr_LogPrint(LPRINT_NORMAL|LPRINT_NOTUTF8, |
|
516b5f7d1023
Fix some UTF-8 related problems
Mikael Berthe <mikael@lilotux.net>
parents:
1059
diff
changeset
|
1153 "<%s> is not a valid Jabber ID.", id); |
|
638
f6946251acdf
"/add" can be used with no jid (it will use the current buddy's jid)
Mikael Berthe <mikael@lilotux.net>
parents:
636
diff
changeset
|
1154 id = NULL; |
|
f6946251acdf
"/add" can be used with no jid (it will use the current buddy's jid)
Mikael Berthe <mikael@lilotux.net>
parents:
636
diff
changeset
|
1155 } else { |
|
f6946251acdf
"/add" can be used with no jid (it will use the current buddy's jid)
Mikael Berthe <mikael@lilotux.net>
parents:
636
diff
changeset
|
1156 mc_strtolower(id); |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
1157 id = jid_utf8 = to_utf8(id); |
|
638
f6946251acdf
"/add" can be used with no jid (it will use the current buddy's jid)
Mikael Berthe <mikael@lilotux.net>
parents:
636
diff
changeset
|
1158 } |
|
f6946251acdf
"/add" can be used with no jid (it will use the current buddy's jid)
Mikael Berthe <mikael@lilotux.net>
parents:
636
diff
changeset
|
1159 } else { |
|
f6946251acdf
"/add" can be used with no jid (it will use the current buddy's jid)
Mikael Berthe <mikael@lilotux.net>
parents:
636
diff
changeset
|
1160 // Add the current buddy |
|
f6946251acdf
"/add" can be used with no jid (it will use the current buddy's jid)
Mikael Berthe <mikael@lilotux.net>
parents:
636
diff
changeset
|
1161 if (current_buddy) |
|
f6946251acdf
"/add" can be used with no jid (it will use the current buddy's jid)
Mikael Berthe <mikael@lilotux.net>
parents:
636
diff
changeset
|
1162 id = (char*)buddy_getjid(BUDDATA(current_buddy)); |
|
557
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
1163 if (!id) |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
1164 scr_LogPrint(LPRINT_NORMAL, "Please specify a Jabber ID."); |
|
638
f6946251acdf
"/add" can be used with no jid (it will use the current buddy's jid)
Mikael Berthe <mikael@lilotux.net>
parents:
636
diff
changeset
|
1165 } |
|
f6946251acdf
"/add" can be used with no jid (it will use the current buddy's jid)
Mikael Berthe <mikael@lilotux.net>
parents:
636
diff
changeset
|
1166 |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
1167 if (nick) |
|
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
1168 nick = to_utf8(nick); |
|
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
1169 |
|
638
f6946251acdf
"/add" can be used with no jid (it will use the current buddy's jid)
Mikael Berthe <mikael@lilotux.net>
parents:
636
diff
changeset
|
1170 if (id) { |
| 452 | 1171 // 2nd parameter = optional nickname |
| 1598 | 1172 xmpp_addbuddy(id, nick, NULL); |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
1173 scr_LogPrint(LPRINT_LOGNORM, "Sent presence notification request to <%s>.", |
| 452 | 1174 id); |
| 1175 } | |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
1176 |
|
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
1177 g_free(jid_utf8); |
|
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
1178 g_free(nick); |
|
557
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
1179 free_arg_lst(paramlst); |
| 124 | 1180 } |
| 128 | 1181 |
|
336
eb994ee40029
Make some functions static
Mikael Berthe <mikael@lilotux.net>
parents:
330
diff
changeset
|
1182 static void do_del(char *arg) |
| 206 | 1183 { |
| 1058 | 1184 const char *bjid; |
| 206 | 1185 |
|
557
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
1186 if (*arg) { |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
1187 scr_LogPrint(LPRINT_NORMAL, "This action does not require a parameter; " |
|
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
1188 "the currently-selected buddy will be deleted."); |
| 206 | 1189 return; |
| 1190 } | |
| 1191 | |
| 1058 | 1192 if (!current_buddy) |
| 1193 return; | |
| 1194 bjid = buddy_getjid(BUDDATA(current_buddy)); | |
| 1195 if (!bjid) | |
| 1196 return; | |
| 206 | 1197 |
|
540
887c1bd37617
Prevent deletion from rooms we haven't left
Mikael Berthe <mikael@lilotux.net>
parents:
539
diff
changeset
|
1198 if (buddy_gettype(BUDDATA(current_buddy)) & ROSTER_TYPE_ROOM) { |
|
887c1bd37617
Prevent deletion from rooms we haven't left
Mikael Berthe <mikael@lilotux.net>
parents:
539
diff
changeset
|
1199 // This is a chatroom |
|
652
b243d3b3ff1b
We do not need buddy_isresource() anymore
Mikael Berthe <mikael@lilotux.net>
parents:
650
diff
changeset
|
1200 if (buddy_getinsideroom(BUDDATA(current_buddy))) { |
|
540
887c1bd37617
Prevent deletion from rooms we haven't left
Mikael Berthe <mikael@lilotux.net>
parents:
539
diff
changeset
|
1201 scr_LogPrint(LPRINT_NORMAL, "You haven't left this room!"); |
|
887c1bd37617
Prevent deletion from rooms we haven't left
Mikael Berthe <mikael@lilotux.net>
parents:
539
diff
changeset
|
1202 return; |
|
887c1bd37617
Prevent deletion from rooms we haven't left
Mikael Berthe <mikael@lilotux.net>
parents:
539
diff
changeset
|
1203 } |
|
887c1bd37617
Prevent deletion from rooms we haven't left
Mikael Berthe <mikael@lilotux.net>
parents:
539
diff
changeset
|
1204 } |
|
887c1bd37617
Prevent deletion from rooms we haven't left
Mikael Berthe <mikael@lilotux.net>
parents:
539
diff
changeset
|
1205 |
|
1165
d5b26a0a9771
Close a buffer when using /del
Mikael Berthe <mikael@lilotux.net>
parents:
1163
diff
changeset
|
1206 // Close the buffer |
|
1780
e4378fbab5d7
Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents:
1774
diff
changeset
|
1207 scr_buffer_purge(1, NULL); |
|
1165
d5b26a0a9771
Close a buffer when using /del
Mikael Berthe <mikael@lilotux.net>
parents:
1163
diff
changeset
|
1208 |
| 1058 | 1209 scr_LogPrint(LPRINT_LOGNORM, "Removing <%s>...", bjid); |
| 1598 | 1210 xmpp_delbuddy(bjid); |
|
1780
e4378fbab5d7
Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents:
1774
diff
changeset
|
1211 scr_update_buddy_window(); |
| 206 | 1212 } |
| 1213 | |
|
336
eb994ee40029
Make some functions static
Mikael Berthe <mikael@lilotux.net>
parents:
330
diff
changeset
|
1214 static void do_group(char *arg) |
| 128 | 1215 { |
|
1351
43e777a5ff06
The group name can be specified in the /group command
Mikael Berthe <mikael@lilotux.net>
parents:
1350
diff
changeset
|
1216 gpointer group = NULL; |
|
958
30b799632653
Cosmetics (change a variable name)
Mikael Berthe <mikael@lilotux.net>
parents:
957
diff
changeset
|
1217 guint leave_buddywindow; |
|
1351
43e777a5ff06
The group name can be specified in the /group command
Mikael Berthe <mikael@lilotux.net>
parents:
1350
diff
changeset
|
1218 char **paramlst; |
|
43e777a5ff06
The group name can be specified in the /group command
Mikael Berthe <mikael@lilotux.net>
parents:
1350
diff
changeset
|
1219 char *subcmd; |
|
1410
0cb4361c85a7
Pressing enter when a group is selected will toggle the fold status (franky)
Mikael Berthe <mikael@lilotux.net>
parents:
1395
diff
changeset
|
1220 enum { group_toggle = -1, group_unfold = 0, group_fold = 1 } group_state = 0; |
| 128 | 1221 |
|
557
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
1222 if (!*arg) { |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
1223 scr_LogPrint(LPRINT_NORMAL, "Missing parameter."); |
| 128 | 1224 return; |
| 1225 } | |
| 1226 | |
| 1058 | 1227 if (!current_buddy) |
| 1228 return; | |
| 128 | 1229 |
|
1508
86620c83123b
Handle quotes in group commands
Mikael Berthe <mikael@lilotux.net>
parents:
1507
diff
changeset
|
1230 paramlst = split_arg(arg, 2, 0); // subcmd, [arg] |
|
1351
43e777a5ff06
The group name can be specified in the /group command
Mikael Berthe <mikael@lilotux.net>
parents:
1350
diff
changeset
|
1231 subcmd = *paramlst; |
|
43e777a5ff06
The group name can be specified in the /group command
Mikael Berthe <mikael@lilotux.net>
parents:
1350
diff
changeset
|
1232 arg = *(paramlst+1); |
|
43e777a5ff06
The group name can be specified in the /group command
Mikael Berthe <mikael@lilotux.net>
parents:
1350
diff
changeset
|
1233 |
|
43e777a5ff06
The group name can be specified in the /group command
Mikael Berthe <mikael@lilotux.net>
parents:
1350
diff
changeset
|
1234 if (!subcmd || !*subcmd) |
|
2016
e9b6e168a45e
Improve checks for /group command parameters
Mikael Berthe <mikael@lilotux.net>
parents:
2013
diff
changeset
|
1235 goto do_group_return; // Should not happen |
|
e9b6e168a45e
Improve checks for /group command parameters
Mikael Berthe <mikael@lilotux.net>
parents:
2013
diff
changeset
|
1236 |
|
e9b6e168a45e
Improve checks for /group command parameters
Mikael Berthe <mikael@lilotux.net>
parents:
2013
diff
changeset
|
1237 if (!strcasecmp(subcmd, "expand") || !strcasecmp(subcmd, "unfold")) |
|
e9b6e168a45e
Improve checks for /group command parameters
Mikael Berthe <mikael@lilotux.net>
parents:
2013
diff
changeset
|
1238 group_state = group_unfold; |
|
e9b6e168a45e
Improve checks for /group command parameters
Mikael Berthe <mikael@lilotux.net>
parents:
2013
diff
changeset
|
1239 else if (!strcasecmp(subcmd, "shrink") || !strcasecmp(subcmd, "fold")) |
|
e9b6e168a45e
Improve checks for /group command parameters
Mikael Berthe <mikael@lilotux.net>
parents:
2013
diff
changeset
|
1240 group_state = group_fold; |
|
e9b6e168a45e
Improve checks for /group command parameters
Mikael Berthe <mikael@lilotux.net>
parents:
2013
diff
changeset
|
1241 else if (!strcasecmp(subcmd, "toggle")) |
|
e9b6e168a45e
Improve checks for /group command parameters
Mikael Berthe <mikael@lilotux.net>
parents:
2013
diff
changeset
|
1242 group_state = group_toggle; |
|
e9b6e168a45e
Improve checks for /group command parameters
Mikael Berthe <mikael@lilotux.net>
parents:
2013
diff
changeset
|
1243 else { |
|
e9b6e168a45e
Improve checks for /group command parameters
Mikael Berthe <mikael@lilotux.net>
parents:
2013
diff
changeset
|
1244 scr_LogPrint(LPRINT_NORMAL, "Unrecognized parameter!"); |
|
e9b6e168a45e
Improve checks for /group command parameters
Mikael Berthe <mikael@lilotux.net>
parents:
2013
diff
changeset
|
1245 goto do_group_return; |
|
e9b6e168a45e
Improve checks for /group command parameters
Mikael Berthe <mikael@lilotux.net>
parents:
2013
diff
changeset
|
1246 } |
|
1351
43e777a5ff06
The group name can be specified in the /group command
Mikael Berthe <mikael@lilotux.net>
parents:
1350
diff
changeset
|
1247 |
|
43e777a5ff06
The group name can be specified in the /group command
Mikael Berthe <mikael@lilotux.net>
parents:
1350
diff
changeset
|
1248 if (arg && *arg) { |
|
43e777a5ff06
The group name can be specified in the /group command
Mikael Berthe <mikael@lilotux.net>
parents:
1350
diff
changeset
|
1249 GSList *roster_elt; |
|
1506
8a63d4514503
Fix encoding issue in /group command
Mikael Berthe <mikael@lilotux.net>
parents:
1503
diff
changeset
|
1250 char *group_utf8 = to_utf8(arg); |
|
8a63d4514503
Fix encoding issue in /group command
Mikael Berthe <mikael@lilotux.net>
parents:
1503
diff
changeset
|
1251 roster_elt = roster_find(group_utf8, namesearch, ROSTER_TYPE_GROUP); |
|
8a63d4514503
Fix encoding issue in /group command
Mikael Berthe <mikael@lilotux.net>
parents:
1503
diff
changeset
|
1252 g_free(group_utf8); |
|
1351
43e777a5ff06
The group name can be specified in the /group command
Mikael Berthe <mikael@lilotux.net>
parents:
1350
diff
changeset
|
1253 if (roster_elt) |
|
43e777a5ff06
The group name can be specified in the /group command
Mikael Berthe <mikael@lilotux.net>
parents:
1350
diff
changeset
|
1254 group = buddy_getgroup(roster_elt->data); |
|
43e777a5ff06
The group name can be specified in the /group command
Mikael Berthe <mikael@lilotux.net>
parents:
1350
diff
changeset
|
1255 } else { |
|
43e777a5ff06
The group name can be specified in the /group command
Mikael Berthe <mikael@lilotux.net>
parents:
1350
diff
changeset
|
1256 group = buddy_getgroup(BUDDATA(current_buddy)); |
|
43e777a5ff06
The group name can be specified in the /group command
Mikael Berthe <mikael@lilotux.net>
parents:
1350
diff
changeset
|
1257 } |
|
2016
e9b6e168a45e
Improve checks for /group command parameters
Mikael Berthe <mikael@lilotux.net>
parents:
2013
diff
changeset
|
1258 if (!group) { |
|
e9b6e168a45e
Improve checks for /group command parameters
Mikael Berthe <mikael@lilotux.net>
parents:
2013
diff
changeset
|
1259 scr_LogPrint(LPRINT_NORMAL, "Group not found."); |
|
1351
43e777a5ff06
The group name can be specified in the /group command
Mikael Berthe <mikael@lilotux.net>
parents:
1350
diff
changeset
|
1260 goto do_group_return; |
|
2016
e9b6e168a45e
Improve checks for /group command parameters
Mikael Berthe <mikael@lilotux.net>
parents:
2013
diff
changeset
|
1261 } |
|
853
bdd526ec62bc
Fix segfault when using /group with the [status] entry
Mikael Berthe <mikael@lilotux.net>
parents:
848
diff
changeset
|
1262 |
| 212 | 1263 // We'll have to redraw the chat window if we're not currently on the group |
| 1264 // entry itself, because it means we'll have to leave the current buddy | |
| 1265 // chat window. | |
| 1360 | 1266 leave_buddywindow = (group != BUDDATA(current_buddy) && |
| 1267 group == buddy_getgroup(BUDDATA(current_buddy))); | |
| 1268 | |
| 128 | 1269 if (!(buddy_gettype(group) & ROSTER_TYPE_GROUP)) { |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
1270 scr_LogPrint(LPRINT_NORMAL, "You need to select a group."); |
|
1351
43e777a5ff06
The group name can be specified in the /group command
Mikael Berthe <mikael@lilotux.net>
parents:
1350
diff
changeset
|
1271 goto do_group_return; |
| 128 | 1272 } |
| 166 | 1273 |
| 1360 | 1274 if (group_state != group_unfold && leave_buddywindow) |
|
1780
e4378fbab5d7
Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents:
1774
diff
changeset
|
1275 scr_roster_prev_group(); |
| 1360 | 1276 |
|
1410
0cb4361c85a7
Pressing enter when a group is selected will toggle the fold status (franky)
Mikael Berthe <mikael@lilotux.net>
parents:
1395
diff
changeset
|
1277 buddy_hide_group(group, group_state); |
| 1360 | 1278 |
| 128 | 1279 buddylist_build(); |
| 1280 update_roster = TRUE; | |
|
1351
43e777a5ff06
The group name can be specified in the /group command
Mikael Berthe <mikael@lilotux.net>
parents:
1350
diff
changeset
|
1281 |
|
43e777a5ff06
The group name can be specified in the /group command
Mikael Berthe <mikael@lilotux.net>
parents:
1350
diff
changeset
|
1282 do_group_return: |
|
43e777a5ff06
The group name can be specified in the /group command
Mikael Berthe <mikael@lilotux.net>
parents:
1350
diff
changeset
|
1283 free_arg_lst(paramlst); |
| 128 | 1284 } |
| 1285 | |
|
1305
9bc68473f8a3
-n and -f flags to message-sending commands
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1301
diff
changeset
|
1286 static int send_message_to(const char *fjid, const char *msg, const char *subj, |
| 1598 | 1287 LmMessageSubType type_overwrite, bool quiet) |
| 636 | 1288 { |
| 1289 char *bare_jid, *rp; | |
|
807
f6cda389db48
Allow messages with a subject (/msay)
Mikael Berthe <mikael@lilotux.net>
parents:
797
diff
changeset
|
1290 char *hmsg; |
| 1197 | 1291 gint crypted; |
| 1292 gint retval = 0; | |
|
1305
9bc68473f8a3
-n and -f flags to message-sending commands
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1301
diff
changeset
|
1293 int isroom; |
| 1602 | 1294 gpointer xep184 = NULL; |
|
1305
9bc68473f8a3
-n and -f flags to message-sending commands
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1301
diff
changeset
|
1295 |
|
1684
95df4ea512c8
Provide xmpp_is_online()
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1682
diff
changeset
|
1296 if (!xmpp_is_online()) { |
|
1305
9bc68473f8a3
-n and -f flags to message-sending commands
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1301
diff
changeset
|
1297 scr_LogPrint(LPRINT_NORMAL, "You are not connected."); |
|
9bc68473f8a3
-n and -f flags to message-sending commands
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1301
diff
changeset
|
1298 return 1; |
|
9bc68473f8a3
-n and -f flags to message-sending commands
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1301
diff
changeset
|
1299 } |
| 1058 | 1300 if (!fjid || !*fjid) { |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
1301 scr_LogPrint(LPRINT_NORMAL, "You must specify a Jabber ID."); |
| 636 | 1302 return 1; |
| 1303 } | |
| 1304 if (!msg || !*msg) { | |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
1305 scr_LogPrint(LPRINT_NORMAL, "You must specify a message."); |
| 636 | 1306 return 1; |
| 1307 } | |
| 1058 | 1308 if (check_jid_syntax((char*)fjid)) { |
|
1064
516b5f7d1023
Fix some UTF-8 related problems
Mikael Berthe <mikael@lilotux.net>
parents:
1059
diff
changeset
|
1309 scr_LogPrint(LPRINT_NORMAL|LPRINT_NOTUTF8, |
|
516b5f7d1023
Fix some UTF-8 related problems
Mikael Berthe <mikael@lilotux.net>
parents:
1059
diff
changeset
|
1310 "<%s> is not a valid Jabber ID.", fjid); |
| 636 | 1311 return 1; |
| 1312 } | |
| 1313 | |
| 1314 // We must use the bare jid in hk_message_out() | |
| 1058 | 1315 rp = strchr(fjid, JID_RESOURCE_SEPARATOR); |
|
1430
12847b0ea8c9
Add an option "-q" (quiet) to /say_to
Mikael Berthe <mikael@lilotux.net>
parents:
1429
diff
changeset
|
1316 if (rp) |
|
12847b0ea8c9
Add an option "-q" (quiet) to /say_to
Mikael Berthe <mikael@lilotux.net>
parents:
1429
diff
changeset
|
1317 bare_jid = g_strndup(fjid, rp - fjid); |
|
12847b0ea8c9
Add an option "-q" (quiet) to /say_to
Mikael Berthe <mikael@lilotux.net>
parents:
1429
diff
changeset
|
1318 else |
|
12847b0ea8c9
Add an option "-q" (quiet) to /say_to
Mikael Berthe <mikael@lilotux.net>
parents:
1429
diff
changeset
|
1319 bare_jid = (char*)fjid; |
|
12847b0ea8c9
Add an option "-q" (quiet) to /say_to
Mikael Berthe <mikael@lilotux.net>
parents:
1429
diff
changeset
|
1320 |
|
12847b0ea8c9
Add an option "-q" (quiet) to /say_to
Mikael Berthe <mikael@lilotux.net>
parents:
1429
diff
changeset
|
1321 if (!quiet) { |
|
12847b0ea8c9
Add an option "-q" (quiet) to /say_to
Mikael Berthe <mikael@lilotux.net>
parents:
1429
diff
changeset
|
1322 // Jump to window, create one if needed |
|
1780
e4378fbab5d7
Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents:
1774
diff
changeset
|
1323 scr_roster_jump_jid(bare_jid); |
|
1430
12847b0ea8c9
Add an option "-q" (quiet) to /say_to
Mikael Berthe <mikael@lilotux.net>
parents:
1429
diff
changeset
|
1324 } |
| 636 | 1325 |
| 1326 // Check if we're sending a message to a conference room | |
| 1327 // If not, we must make sure rp is NULL, for hk_message_out() | |
|
1305
9bc68473f8a3
-n and -f flags to message-sending commands
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1301
diff
changeset
|
1328 isroom = !!roster_find(bare_jid, jidsearch, ROSTER_TYPE_ROOM); |
| 636 | 1329 if (rp) { |
|
1305
9bc68473f8a3
-n and -f flags to message-sending commands
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1301
diff
changeset
|
1330 if (isroom) rp++; |
| 636 | 1331 else rp = NULL; |
| 1332 } | |
|
1305
9bc68473f8a3
-n and -f flags to message-sending commands
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1301
diff
changeset
|
1333 isroom = isroom && (!rp || !*rp); |
| 636 | 1334 |
| 1335 // local part (UI, logging, etc.) | |
|
807
f6cda389db48
Allow messages with a subject (/msay)
Mikael Berthe <mikael@lilotux.net>
parents:
797
diff
changeset
|
1336 if (subj) |
|
f6cda389db48
Allow messages with a subject (/msay)
Mikael Berthe <mikael@lilotux.net>
parents:
797
diff
changeset
|
1337 hmsg = g_strdup_printf("[%s]\n%s", subj, msg); |
|
f6cda389db48
Allow messages with a subject (/msay)
Mikael Berthe <mikael@lilotux.net>
parents:
797
diff
changeset
|
1338 else |
|
f6cda389db48
Allow messages with a subject (/msay)
Mikael Berthe <mikael@lilotux.net>
parents:
797
diff
changeset
|
1339 hmsg = (char*)msg; |
|
f6cda389db48
Allow messages with a subject (/msay)
Mikael Berthe <mikael@lilotux.net>
parents:
797
diff
changeset
|
1340 |
|
1055
6eb1efea75d0
PGP: Visual encryption flag
Mikael Berthe <mikael@lilotux.net>
parents:
1050
diff
changeset
|
1341 // Network part |
| 1598 | 1342 xmpp_send_msg(fjid, msg, (isroom ? ROSTER_TYPE_ROOM : ROSTER_TYPE_USER), |
| 1602 | 1343 subj, FALSE, &crypted, type_overwrite, &xep184); |
| 636 | 1344 |
| 1197 | 1345 if (crypted == -1) { |
| 1346 scr_LogPrint(LPRINT_LOGNORM, "Encryption error. Message was not sent."); | |
| 1347 retval = 1; | |
| 1348 goto send_message_to_return; | |
| 1349 } | |
| 1350 | |
|
1055
6eb1efea75d0
PGP: Visual encryption flag
Mikael Berthe <mikael@lilotux.net>
parents:
1050
diff
changeset
|
1351 // Hook |
|
1333
e30a9d907105
Minor coding style adjustments
Mikael Berthe <mikael@lilotux.net>
parents:
1329
diff
changeset
|
1352 if (!isroom) |
| 1602 | 1353 hk_message_out(bare_jid, rp, 0, hmsg, crypted, xep184); |
| 1197 | 1354 |
| 1355 send_message_to_return: | |
|
1055
6eb1efea75d0
PGP: Visual encryption flag
Mikael Berthe <mikael@lilotux.net>
parents:
1050
diff
changeset
|
1356 if (hmsg != msg) g_free(hmsg); |
| 636 | 1357 if (rp) g_free(bare_jid); |
| 1197 | 1358 return retval; |
| 636 | 1359 } |
| 1360 | |
|
1305
9bc68473f8a3
-n and -f flags to message-sending commands
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1301
diff
changeset
|
1361 // send_message(msg, subj, type_overwrite) |
|
9bc68473f8a3
-n and -f flags to message-sending commands
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1301
diff
changeset
|
1362 // Write the message in the buddy's window and send the message on |
|
9bc68473f8a3
-n and -f flags to message-sending commands
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1301
diff
changeset
|
1363 // the network. |
|
9bc68473f8a3
-n and -f flags to message-sending commands
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1301
diff
changeset
|
1364 static void send_message(const char *msg, const char *subj, |
| 1598 | 1365 LmMessageSubType type_overwrite) |
|
1305
9bc68473f8a3
-n and -f flags to message-sending commands
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1301
diff
changeset
|
1366 { |
|
9bc68473f8a3
-n and -f flags to message-sending commands
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1301
diff
changeset
|
1367 const char *bjid; |
|
2013
8dc418af3e72
Allow to select to which buddy resource messages go. Closes issue #55
Hermitifier
parents:
2010
diff
changeset
|
1368 char *jid; |
|
8dc418af3e72
Allow to select to which buddy resource messages go. Closes issue #55
Hermitifier
parents:
2010
diff
changeset
|
1369 const char *activeres; |
|
1305
9bc68473f8a3
-n and -f flags to message-sending commands
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1301
diff
changeset
|
1370 |
|
9bc68473f8a3
-n and -f flags to message-sending commands
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1301
diff
changeset
|
1371 if (!current_buddy) { |
|
9bc68473f8a3
-n and -f flags to message-sending commands
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1301
diff
changeset
|
1372 scr_LogPrint(LPRINT_NORMAL, "No buddy is currently selected."); |
|
9bc68473f8a3
-n and -f flags to message-sending commands
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1301
diff
changeset
|
1373 return; |
|
9bc68473f8a3
-n and -f flags to message-sending commands
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1301
diff
changeset
|
1374 } |
|
9bc68473f8a3
-n and -f flags to message-sending commands
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1301
diff
changeset
|
1375 |
|
9bc68473f8a3
-n and -f flags to message-sending commands
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1301
diff
changeset
|
1376 bjid = CURRENT_JID; |
|
9bc68473f8a3
-n and -f flags to message-sending commands
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1301
diff
changeset
|
1377 if (!bjid) { |
|
9bc68473f8a3
-n and -f flags to message-sending commands
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1301
diff
changeset
|
1378 scr_LogPrint(LPRINT_NORMAL, "No buddy is currently selected."); |
|
9bc68473f8a3
-n and -f flags to message-sending commands
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1301
diff
changeset
|
1379 return; |
|
9bc68473f8a3
-n and -f flags to message-sending commands
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1301
diff
changeset
|
1380 } |
|
9bc68473f8a3
-n and -f flags to message-sending commands
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1301
diff
changeset
|
1381 |
|
2013
8dc418af3e72
Allow to select to which buddy resource messages go. Closes issue #55
Hermitifier
parents:
2010
diff
changeset
|
1382 activeres = buddy_getactiveresource(BUDDATA(current_buddy)); |
|
8dc418af3e72
Allow to select to which buddy resource messages go. Closes issue #55
Hermitifier
parents:
2010
diff
changeset
|
1383 if (activeres) |
|
8dc418af3e72
Allow to select to which buddy resource messages go. Closes issue #55
Hermitifier
parents:
2010
diff
changeset
|
1384 jid = g_strdup_printf("%s/%s", bjid, activeres); |
|
8dc418af3e72
Allow to select to which buddy resource messages go. Closes issue #55
Hermitifier
parents:
2010
diff
changeset
|
1385 else |
|
8dc418af3e72
Allow to select to which buddy resource messages go. Closes issue #55
Hermitifier
parents:
2010
diff
changeset
|
1386 jid = g_strdup(bjid); |
|
8dc418af3e72
Allow to select to which buddy resource messages go. Closes issue #55
Hermitifier
parents:
2010
diff
changeset
|
1387 |
|
8dc418af3e72
Allow to select to which buddy resource messages go. Closes issue #55
Hermitifier
parents:
2010
diff
changeset
|
1388 send_message_to(jid, msg, subj, type_overwrite, FALSE); |
|
8dc418af3e72
Allow to select to which buddy resource messages go. Closes issue #55
Hermitifier
parents:
2010
diff
changeset
|
1389 g_free(jid); |
|
1305
9bc68473f8a3
-n and -f flags to message-sending commands
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1301
diff
changeset
|
1390 } |
|
9bc68473f8a3
-n and -f flags to message-sending commands
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1301
diff
changeset
|
1391 |
| 1598 | 1392 static LmMessageSubType scan_mtype(char **arg) |
|
1305
9bc68473f8a3
-n and -f flags to message-sending commands
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1301
diff
changeset
|
1393 { |
|
1729
e6e89b1d7831
Minor style and header updates
Mikael Berthe <mikael@lilotux.net>
parents:
1726
diff
changeset
|
1394 // Try splitting it |
|
1305
9bc68473f8a3
-n and -f flags to message-sending commands
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1301
diff
changeset
|
1395 char **parlist = split_arg(*arg, 2, 1); |
| 1598 | 1396 LmMessageSubType result = LM_MESSAGE_SUB_TYPE_NOT_SET; |
|
1729
e6e89b1d7831
Minor style and header updates
Mikael Berthe <mikael@lilotux.net>
parents:
1726
diff
changeset
|
1397 // Is it a good parameter? |
|
1333
e30a9d907105
Minor coding style adjustments
Mikael Berthe <mikael@lilotux.net>
parents:
1329
diff
changeset
|
1398 if (parlist && *parlist) { |
|
e30a9d907105
Minor coding style adjustments
Mikael Berthe <mikael@lilotux.net>
parents:
1329
diff
changeset
|
1399 if (!strcmp("-n", *parlist)) { |
| 1598 | 1400 result = LM_MESSAGE_SUB_TYPE_NORMAL; |
|
1333
e30a9d907105
Minor coding style adjustments
Mikael Berthe <mikael@lilotux.net>
parents:
1329
diff
changeset
|
1401 } else if (!strcmp("-h", *parlist)) { |
| 1598 | 1402 result = LM_MESSAGE_SUB_TYPE_HEADLINE; |
|
1305
9bc68473f8a3
-n and -f flags to message-sending commands
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1301
diff
changeset
|
1403 } |
| 1598 | 1404 if (result != LM_MESSAGE_SUB_TYPE_NOT_SET || (!strcmp("--", *parlist))) |
|
1305
9bc68473f8a3
-n and -f flags to message-sending commands
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1301
diff
changeset
|
1405 *arg += strlen(*arg) - (parlist[1] ? strlen(parlist[1]) : 0); |
|
9bc68473f8a3
-n and -f flags to message-sending commands
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1301
diff
changeset
|
1406 } |
|
1729
e6e89b1d7831
Minor style and header updates
Mikael Berthe <mikael@lilotux.net>
parents:
1726
diff
changeset
|
1407 // Anything found? -> skip it |
|
1305
9bc68473f8a3
-n and -f flags to message-sending commands
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1301
diff
changeset
|
1408 free_arg_lst(parlist); |
|
9bc68473f8a3
-n and -f flags to message-sending commands
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1301
diff
changeset
|
1409 return result; |
|
9bc68473f8a3
-n and -f flags to message-sending commands
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1301
diff
changeset
|
1410 } |
|
9bc68473f8a3
-n and -f flags to message-sending commands
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1301
diff
changeset
|
1411 |
|
1740
391863b7952c
Rename do_say_internal() and export it as say_cmd()
Mikael Berthe <mikael@lilotux.net>
parents:
1737
diff
changeset
|
1412 void say_cmd(char *arg, int parse_flags) |
| 132 | 1413 { |
| 164 | 1414 gpointer bud; |
| 1598 | 1415 LmMessageSubType msgtype = LM_MESSAGE_SUB_TYPE_NOT_SET; |
| 132 | 1416 |
| 1417 scr_set_chatmode(TRUE); | |
|
1780
e4378fbab5d7
Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents:
1774
diff
changeset
|
1418 scr_show_buddy_window(); |
| 164 | 1419 |
| 1420 if (!current_buddy) { | |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
1421 scr_LogPrint(LPRINT_NORMAL, |
|
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
1422 "Whom are you talking to? Please select a buddy."); |
| 164 | 1423 return; |
| 132 | 1424 } |
| 164 | 1425 |
| 1426 bud = BUDDATA(current_buddy); | |
|
631
423c24e5875a
Allow sending a message to an agent
Mikael Berthe <mikael@lilotux.net>
parents:
626
diff
changeset
|
1427 if (!(buddy_gettype(bud) & |
|
423c24e5875a
Allow sending a message to an agent
Mikael Berthe <mikael@lilotux.net>
parents:
626
diff
changeset
|
1428 (ROSTER_TYPE_USER|ROSTER_TYPE_AGENT|ROSTER_TYPE_ROOM))) { |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
1429 scr_LogPrint(LPRINT_NORMAL, "This is not a user."); |
| 164 | 1430 return; |
| 1431 } | |
| 1432 | |
| 1433 buddy_setflags(bud, ROSTER_FLAG_LOCK, TRUE); | |
|
1333
e30a9d907105
Minor coding style adjustments
Mikael Berthe <mikael@lilotux.net>
parents:
1329
diff
changeset
|
1434 if (parse_flags) |
|
1305
9bc68473f8a3
-n and -f flags to message-sending commands
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1301
diff
changeset
|
1435 msgtype = scan_mtype(&arg); |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
1436 arg = to_utf8(arg); |
|
1305
9bc68473f8a3
-n and -f flags to message-sending commands
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1301
diff
changeset
|
1437 send_message(arg, NULL, msgtype); |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
1438 g_free(arg); |
| 132 | 1439 } |
| 1440 | |
|
1305
9bc68473f8a3
-n and -f flags to message-sending commands
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1301
diff
changeset
|
1441 static void do_say(char *arg) { |
|
1740
391863b7952c
Rename do_say_internal() and export it as say_cmd()
Mikael Berthe <mikael@lilotux.net>
parents:
1737
diff
changeset
|
1442 say_cmd(arg, 1); |
|
1305
9bc68473f8a3
-n and -f flags to message-sending commands
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1301
diff
changeset
|
1443 } |
|
9bc68473f8a3
-n and -f flags to message-sending commands
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1301
diff
changeset
|
1444 |
|
336
eb994ee40029
Make some functions static
Mikael Berthe <mikael@lilotux.net>
parents:
330
diff
changeset
|
1445 static void do_msay(char *arg) |
| 238 | 1446 { |
| 636 | 1447 /* Parameters: begin verbatim abort send send_to */ |
| 1448 char **paramlst; | |
| 1449 char *subcmd; | |
| 1450 | |
| 1451 paramlst = split_arg(arg, 2, 1); // subcmd, arg | |
| 1452 subcmd = *paramlst; | |
| 1453 arg = *(paramlst+1); | |
| 238 | 1454 |
| 636 | 1455 if (!subcmd || !*subcmd) { |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
1456 scr_LogPrint(LPRINT_NORMAL, "Missing parameter."); |
| 636 | 1457 scr_LogPrint(LPRINT_NORMAL, "Please read the manual before using " |
| 1458 "the /msay command."); | |
| 967 | 1459 scr_LogPrint(LPRINT_NORMAL, "(Use \"%s begin\" to enter " |
| 1460 "multi-line mode...)", mkcmdstr("msay")); | |
|
1073
253e8988eb5c
Fix a few memory leaks after calls to split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
1072
diff
changeset
|
1461 goto do_msay_return; |
| 636 | 1462 } |
| 1463 | |
|
796
79c8823da808
Add "/msay toggle" command
Mikael Berthe <mikael@lilotux.net>
parents:
791
diff
changeset
|
1464 if (!strcasecmp(subcmd, "toggle")) { |
|
79c8823da808
Add "/msay toggle" command
Mikael Berthe <mikael@lilotux.net>
parents:
791
diff
changeset
|
1465 if (scr_get_multimode()) |
|
79c8823da808
Add "/msay toggle" command
Mikael Berthe <mikael@lilotux.net>
parents:
791
diff
changeset
|
1466 subcmd = "send"; |
|
79c8823da808
Add "/msay toggle" command
Mikael Berthe <mikael@lilotux.net>
parents:
791
diff
changeset
|
1467 else |
|
79c8823da808
Add "/msay toggle" command
Mikael Berthe <mikael@lilotux.net>
parents:
791
diff
changeset
|
1468 subcmd = "begin"; |
|
838
ea1204c8a30b
Add "/msay toggle_verbatim"
Mikael Berthe <mikael@lilotux.net>
parents:
837
diff
changeset
|
1469 } else if (!strcasecmp(subcmd, "toggle_verbatim")) { |
|
ea1204c8a30b
Add "/msay toggle_verbatim"
Mikael Berthe <mikael@lilotux.net>
parents:
837
diff
changeset
|
1470 if (scr_get_multimode()) |
|
ea1204c8a30b
Add "/msay toggle_verbatim"
Mikael Berthe <mikael@lilotux.net>
parents:
837
diff
changeset
|
1471 subcmd = "send"; |
|
ea1204c8a30b
Add "/msay toggle_verbatim"
Mikael Berthe <mikael@lilotux.net>
parents:
837
diff
changeset
|
1472 else |
|
ea1204c8a30b
Add "/msay toggle_verbatim"
Mikael Berthe <mikael@lilotux.net>
parents:
837
diff
changeset
|
1473 subcmd = "verbatim"; |
|
796
79c8823da808
Add "/msay toggle" command
Mikael Berthe <mikael@lilotux.net>
parents:
791
diff
changeset
|
1474 } |
|
79c8823da808
Add "/msay toggle" command
Mikael Berthe <mikael@lilotux.net>
parents:
791
diff
changeset
|
1475 |
| 636 | 1476 if (!strcasecmp(subcmd, "abort")) { |
|
315
65aa05520556
First Ctrl-C now also leaves multi-line message mode
Mikael Berthe <mikael@lilotux.net>
parents:
310
diff
changeset
|
1477 if (scr_get_multimode()) |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
1478 scr_LogPrint(LPRINT_NORMAL, "Leaving multi-line message mode."); |
|
807
f6cda389db48
Allow messages with a subject (/msay)
Mikael Berthe <mikael@lilotux.net>
parents:
797
diff
changeset
|
1479 scr_set_multimode(FALSE, NULL); |
|
1073
253e8988eb5c
Fix a few memory leaks after calls to split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
1072
diff
changeset
|
1480 goto do_msay_return; |
| 636 | 1481 } else if ((!strcasecmp(subcmd, "begin")) || |
| 1482 (!strcasecmp(subcmd, "verbatim"))) { | |
|
840
2903fd66c3ad
Be more verbose about verbatim mode
Mikael Berthe <mikael@lilotux.net>
parents:
838
diff
changeset
|
1483 bool verbat; |
|
807
f6cda389db48
Allow messages with a subject (/msay)
Mikael Berthe <mikael@lilotux.net>
parents:
797
diff
changeset
|
1484 gchar *subj_utf8 = to_utf8(arg); |
|
840
2903fd66c3ad
Be more verbose about verbatim mode
Mikael Berthe <mikael@lilotux.net>
parents:
838
diff
changeset
|
1485 if (!strcasecmp(subcmd, "verbatim")) { |
|
807
f6cda389db48
Allow messages with a subject (/msay)
Mikael Berthe <mikael@lilotux.net>
parents:
797
diff
changeset
|
1486 scr_set_multimode(2, subj_utf8); |
|
840
2903fd66c3ad
Be more verbose about verbatim mode
Mikael Berthe <mikael@lilotux.net>
parents:
838
diff
changeset
|
1487 verbat = TRUE; |
|
2903fd66c3ad
Be more verbose about verbatim mode
Mikael Berthe <mikael@lilotux.net>
parents:
838
diff
changeset
|
1488 } else { |
|
807
f6cda389db48
Allow messages with a subject (/msay)
Mikael Berthe <mikael@lilotux.net>
parents:
797
diff
changeset
|
1489 scr_set_multimode(1, subj_utf8); |
|
840
2903fd66c3ad
Be more verbose about verbatim mode
Mikael Berthe <mikael@lilotux.net>
parents:
838
diff
changeset
|
1490 verbat = FALSE; |
|
2903fd66c3ad
Be more verbose about verbatim mode
Mikael Berthe <mikael@lilotux.net>
parents:
838
diff
changeset
|
1491 } |
|
260
33e1a05864a6
Add "verbatim multi-line" mode, with commands disabled
mikael@frmp8452
parents:
244
diff
changeset
|
1492 |
|
840
2903fd66c3ad
Be more verbose about verbatim mode
Mikael Berthe <mikael@lilotux.net>
parents:
838
diff
changeset
|
1493 scr_LogPrint(LPRINT_NORMAL, "Entered %smulti-line message mode.", |
|
2903fd66c3ad
Be more verbose about verbatim mode
Mikael Berthe <mikael@lilotux.net>
parents:
838
diff
changeset
|
1494 verbat ? "VERBATIM " : ""); |
| 967 | 1495 scr_LogPrint(LPRINT_NORMAL, "Select a buddy and use \"%s send\" " |
| 1496 "when your message is ready.", mkcmdstr("msay")); | |
|
840
2903fd66c3ad
Be more verbose about verbatim mode
Mikael Berthe <mikael@lilotux.net>
parents:
838
diff
changeset
|
1497 if (verbat) |
| 967 | 1498 scr_LogPrint(LPRINT_NORMAL, "Use \"%s abort\" to abort this mode.", |
| 1499 mkcmdstr("msay")); | |
|
807
f6cda389db48
Allow messages with a subject (/msay)
Mikael Berthe <mikael@lilotux.net>
parents:
797
diff
changeset
|
1500 g_free(subj_utf8); |
|
1073
253e8988eb5c
Fix a few memory leaks after calls to split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
1072
diff
changeset
|
1501 goto do_msay_return; |
| 636 | 1502 } else if (strcasecmp(subcmd, "send") && strcasecmp(subcmd, "send_to")) { |
|
374
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
371
diff
changeset
|
1503 scr_LogPrint(LPRINT_NORMAL, "Unrecognized parameter!"); |
|
1073
253e8988eb5c
Fix a few memory leaks after calls to split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
1072
diff
changeset
|
1504 goto do_msay_return; |
| 238 | 1505 } |
| 1506 | |
| 636 | 1507 /* send/send_to command */ |
| 238 | 1508 |
| 1509 if (!scr_get_multimode()) { | |
|
374
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
371
diff
changeset
|
1510 scr_LogPrint(LPRINT_NORMAL, "No message to send. " |
| 967 | 1511 "Use \"%s begin\" first.", mkcmdstr("msay")); |
|
1073
253e8988eb5c
Fix a few memory leaks after calls to split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
1072
diff
changeset
|
1512 goto do_msay_return; |
| 238 | 1513 } |
| 1514 | |
| 1515 scr_set_chatmode(TRUE); | |
|
1780
e4378fbab5d7
Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents:
1774
diff
changeset
|
1516 scr_show_buddy_window(); |
| 238 | 1517 |
| 636 | 1518 if (!strcasecmp(subcmd, "send_to")) { |
|
797
5eb701c1bc1f
Multi-line mode: Do not send empty messages
Mikael Berthe <mikael@lilotux.net>
parents:
796
diff
changeset
|
1519 int err = FALSE; |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
1520 gchar *msg_utf8; |
| 1598 | 1521 LmMessageSubType msg_type = scan_mtype(&arg); |
| 636 | 1522 // Let's send to the specified JID. We leave now if there |
| 1523 // has been an error (so we don't leave multi-line mode). | |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
1524 arg = to_utf8(arg); |
|
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
1525 msg_utf8 = to_utf8(scr_get_multiline()); |
|
797
5eb701c1bc1f
Multi-line mode: Do not send empty messages
Mikael Berthe <mikael@lilotux.net>
parents:
796
diff
changeset
|
1526 if (msg_utf8) { |
|
1430
12847b0ea8c9
Add an option "-q" (quiet) to /say_to
Mikael Berthe <mikael@lilotux.net>
parents:
1429
diff
changeset
|
1527 err = send_message_to(arg, msg_utf8, scr_get_multimode_subj(), msg_type, |
|
12847b0ea8c9
Add an option "-q" (quiet) to /say_to
Mikael Berthe <mikael@lilotux.net>
parents:
1429
diff
changeset
|
1528 FALSE); |
|
797
5eb701c1bc1f
Multi-line mode: Do not send empty messages
Mikael Berthe <mikael@lilotux.net>
parents:
796
diff
changeset
|
1529 g_free(msg_utf8); |
|
5eb701c1bc1f
Multi-line mode: Do not send empty messages
Mikael Berthe <mikael@lilotux.net>
parents:
796
diff
changeset
|
1530 } |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
1531 g_free(arg); |
|
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
1532 if (err) |
|
1073
253e8988eb5c
Fix a few memory leaks after calls to split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
1072
diff
changeset
|
1533 goto do_msay_return; |
| 636 | 1534 } else { // Send to currently selected buddy |
| 1535 gpointer bud; | |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
1536 gchar *msg_utf8; |
| 238 | 1537 |
| 636 | 1538 if (!current_buddy) { |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
1539 scr_LogPrint(LPRINT_NORMAL, "Whom are you talking to?"); |
|
1073
253e8988eb5c
Fix a few memory leaks after calls to split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
1072
diff
changeset
|
1540 goto do_msay_return; |
| 636 | 1541 } |
| 1542 | |
| 1543 bud = BUDDATA(current_buddy); | |
|
1181
807815928754
Allow sending a multi-line message to an agent
Mikael Berthe <mikael@lilotux.net>
parents:
1177
diff
changeset
|
1544 if (!(buddy_gettype(bud) & |
|
807815928754
Allow sending a multi-line message to an agent
Mikael Berthe <mikael@lilotux.net>
parents:
1177
diff
changeset
|
1545 (ROSTER_TYPE_USER|ROSTER_TYPE_AGENT|ROSTER_TYPE_ROOM))) { |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
1546 scr_LogPrint(LPRINT_NORMAL, "This is not a user."); |
|
1073
253e8988eb5c
Fix a few memory leaks after calls to split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
1072
diff
changeset
|
1547 goto do_msay_return; |
| 636 | 1548 } |
| 1549 | |
| 1550 buddy_setflags(bud, ROSTER_FLAG_LOCK, TRUE); | |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
1551 msg_utf8 = to_utf8(scr_get_multiline()); |
|
797
5eb701c1bc1f
Multi-line mode: Do not send empty messages
Mikael Berthe <mikael@lilotux.net>
parents:
796
diff
changeset
|
1552 if (msg_utf8) { |
|
1305
9bc68473f8a3
-n and -f flags to message-sending commands
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1301
diff
changeset
|
1553 send_message(msg_utf8, scr_get_multimode_subj(), scan_mtype(&arg)); |
|
797
5eb701c1bc1f
Multi-line mode: Do not send empty messages
Mikael Berthe <mikael@lilotux.net>
parents:
796
diff
changeset
|
1554 g_free(msg_utf8); |
|
5eb701c1bc1f
Multi-line mode: Do not send empty messages
Mikael Berthe <mikael@lilotux.net>
parents:
796
diff
changeset
|
1555 } |
| 238 | 1556 } |
|
807
f6cda389db48
Allow messages with a subject (/msay)
Mikael Berthe <mikael@lilotux.net>
parents:
797
diff
changeset
|
1557 scr_set_multimode(FALSE, NULL); |
|
797
5eb701c1bc1f
Multi-line mode: Do not send empty messages
Mikael Berthe <mikael@lilotux.net>
parents:
796
diff
changeset
|
1558 scr_LogPrint(LPRINT_NORMAL, "You have left multi-line message mode."); |
|
1073
253e8988eb5c
Fix a few memory leaks after calls to split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
1072
diff
changeset
|
1559 do_msay_return: |
|
253e8988eb5c
Fix a few memory leaks after calls to split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
1072
diff
changeset
|
1560 free_arg_lst(paramlst); |
| 238 | 1561 } |
| 1562 | |
|
1432
46e5eb9917bc
Add an option "-f" (file) to /say_to
Mikael Berthe <mikael@lilotux.net>
parents:
1430
diff
changeset
|
1563 // load_message_from_file(filename) |
|
46e5eb9917bc
Add an option "-f" (file) to /say_to
Mikael Berthe <mikael@lilotux.net>
parents:
1430
diff
changeset
|
1564 // Read the whole content of a file. |
|
46e5eb9917bc
Add an option "-f" (file) to /say_to
Mikael Berthe <mikael@lilotux.net>
parents:
1430
diff
changeset
|
1565 // The data are converted to UTF8, they should be freed by the caller after |
|
46e5eb9917bc
Add an option "-f" (file) to /say_to
Mikael Berthe <mikael@lilotux.net>
parents:
1430
diff
changeset
|
1566 // use. |
|
46e5eb9917bc
Add an option "-f" (file) to /say_to
Mikael Berthe <mikael@lilotux.net>
parents:
1430
diff
changeset
|
1567 char *load_message_from_file(const char *filename) |
|
46e5eb9917bc
Add an option "-f" (file) to /say_to
Mikael Berthe <mikael@lilotux.net>
parents:
1430
diff
changeset
|
1568 { |
|
1434
bed2f0caa952
Expand filename in /say_to -f
Mikael Berthe <mikael@lilotux.net>
parents:
1433
diff
changeset
|
1569 FILE *fd; |
|
1432
46e5eb9917bc
Add an option "-f" (file) to /say_to
Mikael Berthe <mikael@lilotux.net>
parents:
1430
diff
changeset
|
1570 struct stat buf; |
|
46e5eb9917bc
Add an option "-f" (file) to /say_to
Mikael Berthe <mikael@lilotux.net>
parents:
1430
diff
changeset
|
1571 char *msgbuf, *msgbuf_utf8; |
|
1442
b49a1edba983
Check file content when using /say_to -f
Mikael Berthe <mikael@lilotux.net>
parents:
1435
diff
changeset
|
1572 char *p; |
|
b49a1edba983
Check file content when using /say_to -f
Mikael Berthe <mikael@lilotux.net>
parents:
1435
diff
changeset
|
1573 char *next_utf8_char; |
|
1443
0623d694a77f
Forbid NUL characters when using /say_to -f
Mikael Berthe <mikael@lilotux.net>
parents:
1442
diff
changeset
|
1574 size_t len; |
|
1432
46e5eb9917bc
Add an option "-f" (file) to /say_to
Mikael Berthe <mikael@lilotux.net>
parents:
1430
diff
changeset
|
1575 |
|
46e5eb9917bc
Add an option "-f" (file) to /say_to
Mikael Berthe <mikael@lilotux.net>
parents:
1430
diff
changeset
|
1576 fd = fopen(filename, "r"); |
|
46e5eb9917bc
Add an option "-f" (file) to /say_to
Mikael Berthe <mikael@lilotux.net>
parents:
1430
diff
changeset
|
1577 |
|
46e5eb9917bc
Add an option "-f" (file) to /say_to
Mikael Berthe <mikael@lilotux.net>
parents:
1430
diff
changeset
|
1578 if (!fd || fstat(fileno(fd), &buf)) { |
|
46e5eb9917bc
Add an option "-f" (file) to /say_to
Mikael Berthe <mikael@lilotux.net>
parents:
1430
diff
changeset
|
1579 scr_LogPrint(LPRINT_LOGNORM, "Cannot open message file (%s)", filename); |
|
46e5eb9917bc
Add an option "-f" (file) to /say_to
Mikael Berthe <mikael@lilotux.net>
parents:
1430
diff
changeset
|
1580 return NULL; |
|
46e5eb9917bc
Add an option "-f" (file) to /say_to
Mikael Berthe <mikael@lilotux.net>
parents:
1430
diff
changeset
|
1581 } |
|
46e5eb9917bc
Add an option "-f" (file) to /say_to
Mikael Berthe <mikael@lilotux.net>
parents:
1430
diff
changeset
|
1582 if (!buf.st_size || buf.st_size >= HBB_BLOCKSIZE) { |
|
46e5eb9917bc
Add an option "-f" (file) to /say_to
Mikael Berthe <mikael@lilotux.net>
parents:
1430
diff
changeset
|
1583 if (!buf.st_size) |
|
46e5eb9917bc
Add an option "-f" (file) to /say_to
Mikael Berthe <mikael@lilotux.net>
parents:
1430
diff
changeset
|
1584 scr_LogPrint(LPRINT_LOGNORM, "Message file is empty (%s)", filename); |
|
46e5eb9917bc
Add an option "-f" (file) to /say_to
Mikael Berthe <mikael@lilotux.net>
parents:
1430
diff
changeset
|
1585 else |
|
46e5eb9917bc
Add an option "-f" (file) to /say_to
Mikael Berthe <mikael@lilotux.net>
parents:
1430
diff
changeset
|
1586 scr_LogPrint(LPRINT_LOGNORM, "Message file is too big (%s)", filename); |
|
46e5eb9917bc
Add an option "-f" (file) to /say_to
Mikael Berthe <mikael@lilotux.net>
parents:
1430
diff
changeset
|
1587 fclose(fd); |
|
46e5eb9917bc
Add an option "-f" (file) to /say_to
Mikael Berthe <mikael@lilotux.net>
parents:
1430
diff
changeset
|
1588 return NULL; |
|
46e5eb9917bc
Add an option "-f" (file) to /say_to
Mikael Berthe <mikael@lilotux.net>
parents:
1430
diff
changeset
|
1589 } |
|
46e5eb9917bc
Add an option "-f" (file) to /say_to
Mikael Berthe <mikael@lilotux.net>
parents:
1430
diff
changeset
|
1590 |
|
46e5eb9917bc
Add an option "-f" (file) to /say_to
Mikael Berthe <mikael@lilotux.net>
parents:
1430
diff
changeset
|
1591 msgbuf = g_new0(char, HBB_BLOCKSIZE); |
|
1443
0623d694a77f
Forbid NUL characters when using /say_to -f
Mikael Berthe <mikael@lilotux.net>
parents:
1442
diff
changeset
|
1592 len = fread(msgbuf, 1, HBB_BLOCKSIZE-1, fd); |
|
1432
46e5eb9917bc
Add an option "-f" (file) to /say_to
Mikael Berthe <mikael@lilotux.net>
parents:
1430
diff
changeset
|
1593 fclose(fd); |
|
46e5eb9917bc
Add an option "-f" (file) to /say_to
Mikael Berthe <mikael@lilotux.net>
parents:
1430
diff
changeset
|
1594 |
|
1442
b49a1edba983
Check file content when using /say_to -f
Mikael Berthe <mikael@lilotux.net>
parents:
1435
diff
changeset
|
1595 next_utf8_char = msgbuf; |
|
b49a1edba983
Check file content when using /say_to -f
Mikael Berthe <mikael@lilotux.net>
parents:
1435
diff
changeset
|
1596 |
|
1443
0623d694a77f
Forbid NUL characters when using /say_to -f
Mikael Berthe <mikael@lilotux.net>
parents:
1442
diff
changeset
|
1597 // Check there is no binary data. It must be a *message* file! |
|
1442
b49a1edba983
Check file content when using /say_to -f
Mikael Berthe <mikael@lilotux.net>
parents:
1435
diff
changeset
|
1598 for (p = msgbuf ; *p ; p++) { |
|
b49a1edba983
Check file content when using /say_to -f
Mikael Berthe <mikael@lilotux.net>
parents:
1435
diff
changeset
|
1599 if (utf8_mode) { |
|
b49a1edba983
Check file content when using /say_to -f
Mikael Berthe <mikael@lilotux.net>
parents:
1435
diff
changeset
|
1600 if (p == next_utf8_char) { |
|
1462
2b43d89a10bb
Allow tab characters with /say_to -f
Mikael Berthe <mikael@lilotux.net>
parents:
1443
diff
changeset
|
1601 if (!iswprint(get_char(p)) && *p != '\n' && *p != '\t') |
|
1442
b49a1edba983
Check file content when using /say_to -f
Mikael Berthe <mikael@lilotux.net>
parents:
1435
diff
changeset
|
1602 break; |
|
b49a1edba983
Check file content when using /say_to -f
Mikael Berthe <mikael@lilotux.net>
parents:
1435
diff
changeset
|
1603 next_utf8_char = next_char(p); |
|
b49a1edba983
Check file content when using /say_to -f
Mikael Berthe <mikael@lilotux.net>
parents:
1435
diff
changeset
|
1604 } |
|
b49a1edba983
Check file content when using /say_to -f
Mikael Berthe <mikael@lilotux.net>
parents:
1435
diff
changeset
|
1605 } else { |
|
b49a1edba983
Check file content when using /say_to -f
Mikael Berthe <mikael@lilotux.net>
parents:
1435
diff
changeset
|
1606 unsigned char sc = *p; |
|
1462
2b43d89a10bb
Allow tab characters with /say_to -f
Mikael Berthe <mikael@lilotux.net>
parents:
1443
diff
changeset
|
1607 if (!iswprint(sc) && sc != '\n' && sc != '\t') |
|
1442
b49a1edba983
Check file content when using /say_to -f
Mikael Berthe <mikael@lilotux.net>
parents:
1435
diff
changeset
|
1608 break; |
|
b49a1edba983
Check file content when using /say_to -f
Mikael Berthe <mikael@lilotux.net>
parents:
1435
diff
changeset
|
1609 } |
|
b49a1edba983
Check file content when using /say_to -f
Mikael Berthe <mikael@lilotux.net>
parents:
1435
diff
changeset
|
1610 } |
|
b49a1edba983
Check file content when using /say_to -f
Mikael Berthe <mikael@lilotux.net>
parents:
1435
diff
changeset
|
1611 |
|
1443
0623d694a77f
Forbid NUL characters when using /say_to -f
Mikael Berthe <mikael@lilotux.net>
parents:
1442
diff
changeset
|
1612 if (*p || (size_t)(p-msgbuf) != len) { // We're not at the End Of Line... |
|
1442
b49a1edba983
Check file content when using /say_to -f
Mikael Berthe <mikael@lilotux.net>
parents:
1435
diff
changeset
|
1613 scr_LogPrint(LPRINT_LOGNORM, "Message file contains " |
|
b49a1edba983
Check file content when using /say_to -f
Mikael Berthe <mikael@lilotux.net>
parents:
1435
diff
changeset
|
1614 "invalid characters (%s)", filename); |
|
b49a1edba983
Check file content when using /say_to -f
Mikael Berthe <mikael@lilotux.net>
parents:
1435
diff
changeset
|
1615 g_free(msgbuf); |
|
b49a1edba983
Check file content when using /say_to -f
Mikael Berthe <mikael@lilotux.net>
parents:
1435
diff
changeset
|
1616 return NULL; |
|
b49a1edba983
Check file content when using /say_to -f
Mikael Berthe <mikael@lilotux.net>
parents:
1435
diff
changeset
|
1617 } |
|
b49a1edba983
Check file content when using /say_to -f
Mikael Berthe <mikael@lilotux.net>
parents:
1435
diff
changeset
|
1618 |
|
b49a1edba983
Check file content when using /say_to -f
Mikael Berthe <mikael@lilotux.net>
parents:
1435
diff
changeset
|
1619 // p is now at the EOL |
|
1443
0623d694a77f
Forbid NUL characters when using /say_to -f
Mikael Berthe <mikael@lilotux.net>
parents:
1442
diff
changeset
|
1620 // Let's strip trailing newlines |
|
1442
b49a1edba983
Check file content when using /say_to -f
Mikael Berthe <mikael@lilotux.net>
parents:
1435
diff
changeset
|
1621 if (p > msgbuf) |
|
b49a1edba983
Check file content when using /say_to -f
Mikael Berthe <mikael@lilotux.net>
parents:
1435
diff
changeset
|
1622 p--; |
|
b49a1edba983
Check file content when using /say_to -f
Mikael Berthe <mikael@lilotux.net>
parents:
1435
diff
changeset
|
1623 while (p > msgbuf && *p == '\n') |
|
b49a1edba983
Check file content when using /say_to -f
Mikael Berthe <mikael@lilotux.net>
parents:
1435
diff
changeset
|
1624 *p-- = 0; |
|
1432
46e5eb9917bc
Add an option "-f" (file) to /say_to
Mikael Berthe <mikael@lilotux.net>
parents:
1430
diff
changeset
|
1625 |
|
46e5eb9917bc
Add an option "-f" (file) to /say_to
Mikael Berthe <mikael@lilotux.net>
parents:
1430
diff
changeset
|
1626 // It could be empty, once the trailing newlines are gone |
|
1442
b49a1edba983
Check file content when using /say_to -f
Mikael Berthe <mikael@lilotux.net>
parents:
1435
diff
changeset
|
1627 if (p == msgbuf && *p == '\n') { |
|
1432
46e5eb9917bc
Add an option "-f" (file) to /say_to
Mikael Berthe <mikael@lilotux.net>
parents:
1430
diff
changeset
|
1628 scr_LogPrint(LPRINT_LOGNORM, "Message file is empty (%s)", filename); |
|
46e5eb9917bc
Add an option "-f" (file) to /say_to
Mikael Berthe <mikael@lilotux.net>
parents:
1430
diff
changeset
|
1629 g_free(msgbuf); |
|
46e5eb9917bc
Add an option "-f" (file) to /say_to
Mikael Berthe <mikael@lilotux.net>
parents:
1430
diff
changeset
|
1630 return NULL; |
|
46e5eb9917bc
Add an option "-f" (file) to /say_to
Mikael Berthe <mikael@lilotux.net>
parents:
1430
diff
changeset
|
1631 } |
|
46e5eb9917bc
Add an option "-f" (file) to /say_to
Mikael Berthe <mikael@lilotux.net>
parents:
1430
diff
changeset
|
1632 |
|
46e5eb9917bc
Add an option "-f" (file) to /say_to
Mikael Berthe <mikael@lilotux.net>
parents:
1430
diff
changeset
|
1633 msgbuf_utf8 = to_utf8(msgbuf); |
|
46e5eb9917bc
Add an option "-f" (file) to /say_to
Mikael Berthe <mikael@lilotux.net>
parents:
1430
diff
changeset
|
1634 |
|
46e5eb9917bc
Add an option "-f" (file) to /say_to
Mikael Berthe <mikael@lilotux.net>
parents:
1430
diff
changeset
|
1635 if (!msgbuf_utf8 && msgbuf) |
|
46e5eb9917bc
Add an option "-f" (file) to /say_to
Mikael Berthe <mikael@lilotux.net>
parents:
1430
diff
changeset
|
1636 scr_LogPrint(LPRINT_LOGNORM, "Message file charset conversion error (%s)", |
|
46e5eb9917bc
Add an option "-f" (file) to /say_to
Mikael Berthe <mikael@lilotux.net>
parents:
1430
diff
changeset
|
1637 filename); |
|
46e5eb9917bc
Add an option "-f" (file) to /say_to
Mikael Berthe <mikael@lilotux.net>
parents:
1430
diff
changeset
|
1638 g_free(msgbuf); |
|
46e5eb9917bc
Add an option "-f" (file) to /say_to
Mikael Berthe <mikael@lilotux.net>
parents:
1430
diff
changeset
|
1639 return msgbuf_utf8; |
|
46e5eb9917bc
Add an option "-f" (file) to /say_to
Mikael Berthe <mikael@lilotux.net>
parents:
1430
diff
changeset
|
1640 } |
|
46e5eb9917bc
Add an option "-f" (file) to /say_to
Mikael Berthe <mikael@lilotux.net>
parents:
1430
diff
changeset
|
1641 |
| 480 | 1642 static void do_say_to(char *arg) |
| 1643 { | |
|
557
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
1644 char **paramlst; |
|
2051
71d84213f850
Add option -e (eval) to say_to
Mikael Berthe <mikael@lilotux.net>
parents:
2030
diff
changeset
|
1645 char *fjid, *msg_utf8; |
|
71d84213f850
Add option -e (eval) to say_to
Mikael Berthe <mikael@lilotux.net>
parents:
2030
diff
changeset
|
1646 char *msg; |
|
71d84213f850
Add option -e (eval) to say_to
Mikael Berthe <mikael@lilotux.net>
parents:
2030
diff
changeset
|
1647 char *unescaped_msg = NULL; |
|
1943
11bda6d8daab
Add default server for private messages
Mikael Berthe <mikael@lilotux.net>
parents:
1939
diff
changeset
|
1648 char *uncompletedfjid = NULL; |
|
1432
46e5eb9917bc
Add an option "-f" (file) to /say_to
Mikael Berthe <mikael@lilotux.net>
parents:
1430
diff
changeset
|
1649 char *file = NULL; |
| 1598 | 1650 LmMessageSubType msg_type = LM_MESSAGE_SUB_TYPE_NOT_SET; |
|
1430
12847b0ea8c9
Add an option "-q" (quiet) to /say_to
Mikael Berthe <mikael@lilotux.net>
parents:
1429
diff
changeset
|
1651 bool quiet = FALSE; |
|
2051
71d84213f850
Add option -e (eval) to say_to
Mikael Berthe <mikael@lilotux.net>
parents:
2030
diff
changeset
|
1652 bool eval = FALSE; |
| 480 | 1653 |
|
1684
95df4ea512c8
Provide xmpp_is_online()
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1682
diff
changeset
|
1654 if (!xmpp_is_online()) { |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
1655 scr_LogPrint(LPRINT_NORMAL, "You are not connected."); |
| 480 | 1656 return; |
| 1657 } | |
| 1658 | |
|
1305
9bc68473f8a3
-n and -f flags to message-sending commands
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1301
diff
changeset
|
1659 msg_type = scan_mtype(&arg); |
|
1430
12847b0ea8c9
Add an option "-q" (quiet) to /say_to
Mikael Berthe <mikael@lilotux.net>
parents:
1429
diff
changeset
|
1660 paramlst = split_arg(arg, 2, 1); // jid, message (or option, jid, message) |
|
12847b0ea8c9
Add an option "-q" (quiet) to /say_to
Mikael Berthe <mikael@lilotux.net>
parents:
1429
diff
changeset
|
1661 |
|
1432
46e5eb9917bc
Add an option "-f" (file) to /say_to
Mikael Berthe <mikael@lilotux.net>
parents:
1430
diff
changeset
|
1662 if (!*paramlst) { // No parameter? |
|
46e5eb9917bc
Add an option "-f" (file) to /say_to
Mikael Berthe <mikael@lilotux.net>
parents:
1430
diff
changeset
|
1663 scr_LogPrint(LPRINT_NORMAL, "Please specify a Jabber ID."); |
|
46e5eb9917bc
Add an option "-f" (file) to /say_to
Mikael Berthe <mikael@lilotux.net>
parents:
1430
diff
changeset
|
1664 free_arg_lst(paramlst); |
|
46e5eb9917bc
Add an option "-f" (file) to /say_to
Mikael Berthe <mikael@lilotux.net>
parents:
1430
diff
changeset
|
1665 return; |
|
46e5eb9917bc
Add an option "-f" (file) to /say_to
Mikael Berthe <mikael@lilotux.net>
parents:
1430
diff
changeset
|
1666 } |
|
46e5eb9917bc
Add an option "-f" (file) to /say_to
Mikael Berthe <mikael@lilotux.net>
parents:
1430
diff
changeset
|
1667 |
|
1430
12847b0ea8c9
Add an option "-q" (quiet) to /say_to
Mikael Berthe <mikael@lilotux.net>
parents:
1429
diff
changeset
|
1668 // Check for an option parameter |
|
1562
248da27faff3
Fix segfault when using /say_to with a bad syntax (reported by ISBear)
Mikael Berthe <mikael@lilotux.net>
parents:
1528
diff
changeset
|
1669 while (*paramlst) { |
|
1432
46e5eb9917bc
Add an option "-f" (file) to /say_to
Mikael Berthe <mikael@lilotux.net>
parents:
1430
diff
changeset
|
1670 if (!strcmp(*paramlst, "-q")) { |
|
46e5eb9917bc
Add an option "-f" (file) to /say_to
Mikael Berthe <mikael@lilotux.net>
parents:
1430
diff
changeset
|
1671 char **oldparamlst = paramlst; |
|
46e5eb9917bc
Add an option "-f" (file) to /say_to
Mikael Berthe <mikael@lilotux.net>
parents:
1430
diff
changeset
|
1672 paramlst = split_arg(*(oldparamlst+1), 2, 1); // jid, message |
|
46e5eb9917bc
Add an option "-f" (file) to /say_to
Mikael Berthe <mikael@lilotux.net>
parents:
1430
diff
changeset
|
1673 free_arg_lst(oldparamlst); |
|
46e5eb9917bc
Add an option "-f" (file) to /say_to
Mikael Berthe <mikael@lilotux.net>
parents:
1430
diff
changeset
|
1674 quiet = TRUE; |
|
2051
71d84213f850
Add option -e (eval) to say_to
Mikael Berthe <mikael@lilotux.net>
parents:
2030
diff
changeset
|
1675 } else if (!strcmp(*paramlst, "-e")) { |
|
71d84213f850
Add option -e (eval) to say_to
Mikael Berthe <mikael@lilotux.net>
parents:
2030
diff
changeset
|
1676 char **oldparamlst = paramlst; |
|
71d84213f850
Add option -e (eval) to say_to
Mikael Berthe <mikael@lilotux.net>
parents:
2030
diff
changeset
|
1677 paramlst = split_arg(*(oldparamlst+1), 2, 1); // jid, message |
|
71d84213f850
Add option -e (eval) to say_to
Mikael Berthe <mikael@lilotux.net>
parents:
2030
diff
changeset
|
1678 free_arg_lst(oldparamlst); |
|
71d84213f850
Add option -e (eval) to say_to
Mikael Berthe <mikael@lilotux.net>
parents:
2030
diff
changeset
|
1679 eval = TRUE; |
|
1432
46e5eb9917bc
Add an option "-f" (file) to /say_to
Mikael Berthe <mikael@lilotux.net>
parents:
1430
diff
changeset
|
1680 } else if (!strcmp(*paramlst, "-f")) { |
|
46e5eb9917bc
Add an option "-f" (file) to /say_to
Mikael Berthe <mikael@lilotux.net>
parents:
1430
diff
changeset
|
1681 char **oldparamlst = paramlst; |
|
46e5eb9917bc
Add an option "-f" (file) to /say_to
Mikael Berthe <mikael@lilotux.net>
parents:
1430
diff
changeset
|
1682 paramlst = split_arg(*(oldparamlst+1), 2, 1); // filename, jid |
|
46e5eb9917bc
Add an option "-f" (file) to /say_to
Mikael Berthe <mikael@lilotux.net>
parents:
1430
diff
changeset
|
1683 free_arg_lst(oldparamlst); |
|
1562
248da27faff3
Fix segfault when using /say_to with a bad syntax (reported by ISBear)
Mikael Berthe <mikael@lilotux.net>
parents:
1528
diff
changeset
|
1684 if (!*paramlst) { |
|
248da27faff3
Fix segfault when using /say_to with a bad syntax (reported by ISBear)
Mikael Berthe <mikael@lilotux.net>
parents:
1528
diff
changeset
|
1685 scr_LogPrint(LPRINT_NORMAL, "Wrong usage."); |
|
1875
ad1f7e7c2745
Fix bug in /say_to introduced in changeset 5492b87ba9d0
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1861
diff
changeset
|
1686 free_arg_lst(paramlst); |
|
1562
248da27faff3
Fix segfault when using /say_to with a bad syntax (reported by ISBear)
Mikael Berthe <mikael@lilotux.net>
parents:
1528
diff
changeset
|
1687 return; |
|
248da27faff3
Fix segfault when using /say_to with a bad syntax (reported by ISBear)
Mikael Berthe <mikael@lilotux.net>
parents:
1528
diff
changeset
|
1688 } |
|
1432
46e5eb9917bc
Add an option "-f" (file) to /say_to
Mikael Berthe <mikael@lilotux.net>
parents:
1430
diff
changeset
|
1689 file = g_strdup(*paramlst); |
|
46e5eb9917bc
Add an option "-f" (file) to /say_to
Mikael Berthe <mikael@lilotux.net>
parents:
1430
diff
changeset
|
1690 // One more parameter shift... |
|
46e5eb9917bc
Add an option "-f" (file) to /say_to
Mikael Berthe <mikael@lilotux.net>
parents:
1430
diff
changeset
|
1691 oldparamlst = paramlst; |
|
46e5eb9917bc
Add an option "-f" (file) to /say_to
Mikael Berthe <mikael@lilotux.net>
parents:
1430
diff
changeset
|
1692 paramlst = split_arg(*(oldparamlst+1), 2, 1); // jid, nothing |
|
46e5eb9917bc
Add an option "-f" (file) to /say_to
Mikael Berthe <mikael@lilotux.net>
parents:
1430
diff
changeset
|
1693 free_arg_lst(oldparamlst); |
|
46e5eb9917bc
Add an option "-f" (file) to /say_to
Mikael Berthe <mikael@lilotux.net>
parents:
1430
diff
changeset
|
1694 } else |
|
46e5eb9917bc
Add an option "-f" (file) to /say_to
Mikael Berthe <mikael@lilotux.net>
parents:
1430
diff
changeset
|
1695 break; |
|
1430
12847b0ea8c9
Add an option "-q" (quiet) to /say_to
Mikael Berthe <mikael@lilotux.net>
parents:
1429
diff
changeset
|
1696 } |
|
12847b0ea8c9
Add an option "-q" (quiet) to /say_to
Mikael Berthe <mikael@lilotux.net>
parents:
1429
diff
changeset
|
1697 |
|
1562
248da27faff3
Fix segfault when using /say_to with a bad syntax (reported by ISBear)
Mikael Berthe <mikael@lilotux.net>
parents:
1528
diff
changeset
|
1698 if (!*paramlst) { |
|
248da27faff3
Fix segfault when using /say_to with a bad syntax (reported by ISBear)
Mikael Berthe <mikael@lilotux.net>
parents:
1528
diff
changeset
|
1699 scr_LogPrint(LPRINT_NORMAL, "Wrong usage."); |
|
1875
ad1f7e7c2745
Fix bug in /say_to introduced in changeset 5492b87ba9d0
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1861
diff
changeset
|
1700 free_arg_lst(paramlst); |
|
1562
248da27faff3
Fix segfault when using /say_to with a bad syntax (reported by ISBear)
Mikael Berthe <mikael@lilotux.net>
parents:
1528
diff
changeset
|
1701 return; |
|
248da27faff3
Fix segfault when using /say_to with a bad syntax (reported by ISBear)
Mikael Berthe <mikael@lilotux.net>
parents:
1528
diff
changeset
|
1702 } |
|
248da27faff3
Fix segfault when using /say_to with a bad syntax (reported by ISBear)
Mikael Berthe <mikael@lilotux.net>
parents:
1528
diff
changeset
|
1703 |
| 1058 | 1704 fjid = *paramlst; |
|
557
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
1705 msg = *(paramlst+1); |
|
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
1706 |
|
1875
ad1f7e7c2745
Fix bug in /say_to introduced in changeset 5492b87ba9d0
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1861
diff
changeset
|
1707 if (fjid[0] == '.') { |
|
ad1f7e7c2745
Fix bug in /say_to introduced in changeset 5492b87ba9d0
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1861
diff
changeset
|
1708 const gchar *cjid = (current_buddy ? CURRENT_JID : NULL); |
|
ad1f7e7c2745
Fix bug in /say_to introduced in changeset 5492b87ba9d0
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1861
diff
changeset
|
1709 if (fjid[1] == '\0') { |
|
ad1f7e7c2745
Fix bug in /say_to introduced in changeset 5492b87ba9d0
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1861
diff
changeset
|
1710 fjid = g_strdup(cjid); |
|
ad1f7e7c2745
Fix bug in /say_to introduced in changeset 5492b87ba9d0
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1861
diff
changeset
|
1711 } else if (fjid[1] == JID_RESOURCE_SEPARATOR) { |
|
ad1f7e7c2745
Fix bug in /say_to introduced in changeset 5492b87ba9d0
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1861
diff
changeset
|
1712 char *res_utf8 = to_utf8(fjid+2); |
|
ad1f7e7c2745
Fix bug in /say_to introduced in changeset 5492b87ba9d0
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1861
diff
changeset
|
1713 fjid = g_strdup_printf("%s%c%s", cjid, JID_RESOURCE_SEPARATOR, res_utf8); |
|
1861
81822de0edf6
Fix a potential encoding issue on non-UTF8 systems
Mikael Berthe <mikael@lilotux.net>
parents:
1860
diff
changeset
|
1714 g_free(res_utf8); |
|
1875
ad1f7e7c2745
Fix bug in /say_to introduced in changeset 5492b87ba9d0
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1861
diff
changeset
|
1715 } else |
|
ad1f7e7c2745
Fix bug in /say_to introduced in changeset 5492b87ba9d0
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1861
diff
changeset
|
1716 fjid = to_utf8(fjid); |
|
1861
81822de0edf6
Fix a potential encoding issue on non-UTF8 systems
Mikael Berthe <mikael@lilotux.net>
parents:
1860
diff
changeset
|
1717 } else |
|
81822de0edf6
Fix a potential encoding issue on non-UTF8 systems
Mikael Berthe <mikael@lilotux.net>
parents:
1860
diff
changeset
|
1718 fjid = to_utf8(fjid); |
|
81822de0edf6
Fix a potential encoding issue on non-UTF8 systems
Mikael Berthe <mikael@lilotux.net>
parents:
1860
diff
changeset
|
1719 |
|
1943
11bda6d8daab
Add default server for private messages
Mikael Berthe <mikael@lilotux.net>
parents:
1939
diff
changeset
|
1720 if (!strchr(fjid, JID_DOMAIN_SEPARATOR)) { |
|
11bda6d8daab
Add default server for private messages
Mikael Berthe <mikael@lilotux.net>
parents:
1939
diff
changeset
|
1721 const gchar *append_server = settings_opt_get("default_server"); |
|
11bda6d8daab
Add default server for private messages
Mikael Berthe <mikael@lilotux.net>
parents:
1939
diff
changeset
|
1722 if (append_server) { |
|
11bda6d8daab
Add default server for private messages
Mikael Berthe <mikael@lilotux.net>
parents:
1939
diff
changeset
|
1723 gchar *res = strchr(fjid, JID_RESOURCE_SEPARATOR); |
|
11bda6d8daab
Add default server for private messages
Mikael Berthe <mikael@lilotux.net>
parents:
1939
diff
changeset
|
1724 uncompletedfjid = fjid; |
|
11bda6d8daab
Add default server for private messages
Mikael Berthe <mikael@lilotux.net>
parents:
1939
diff
changeset
|
1725 if (res) { |
|
11bda6d8daab
Add default server for private messages
Mikael Berthe <mikael@lilotux.net>
parents:
1939
diff
changeset
|
1726 *res++ = '\0'; |
|
11bda6d8daab
Add default server for private messages
Mikael Berthe <mikael@lilotux.net>
parents:
1939
diff
changeset
|
1727 fjid = g_strdup_printf("%s%c%s%c%s", fjid, JID_DOMAIN_SEPARATOR, append_server, |
|
11bda6d8daab
Add default server for private messages
Mikael Berthe <mikael@lilotux.net>
parents:
1939
diff
changeset
|
1728 JID_RESOURCE_SEPARATOR, res); |
|
11bda6d8daab
Add default server for private messages
Mikael Berthe <mikael@lilotux.net>
parents:
1939
diff
changeset
|
1729 } else |
|
11bda6d8daab
Add default server for private messages
Mikael Berthe <mikael@lilotux.net>
parents:
1939
diff
changeset
|
1730 fjid = g_strdup_printf("%s%c%s", fjid, JID_DOMAIN_SEPARATOR, append_server); |
|
11bda6d8daab
Add default server for private messages
Mikael Berthe <mikael@lilotux.net>
parents:
1939
diff
changeset
|
1731 } |
|
11bda6d8daab
Add default server for private messages
Mikael Berthe <mikael@lilotux.net>
parents:
1939
diff
changeset
|
1732 } |
|
11bda6d8daab
Add default server for private messages
Mikael Berthe <mikael@lilotux.net>
parents:
1939
diff
changeset
|
1733 |
|
1861
81822de0edf6
Fix a potential encoding issue on non-UTF8 systems
Mikael Berthe <mikael@lilotux.net>
parents:
1860
diff
changeset
|
1734 if (check_jid_syntax(fjid)) { |
|
1432
46e5eb9917bc
Add an option "-f" (file) to /say_to
Mikael Berthe <mikael@lilotux.net>
parents:
1430
diff
changeset
|
1735 scr_LogPrint(LPRINT_NORMAL, "Please specify a valid Jabber ID."); |
|
557
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
1736 free_arg_lst(paramlst); |
|
1943
11bda6d8daab
Add default server for private messages
Mikael Berthe <mikael@lilotux.net>
parents:
1939
diff
changeset
|
1737 g_free(uncompletedfjid); |
|
1861
81822de0edf6
Fix a potential encoding issue on non-UTF8 systems
Mikael Berthe <mikael@lilotux.net>
parents:
1860
diff
changeset
|
1738 g_free(fjid); |
| 480 | 1739 return; |
| 1740 } | |
| 1741 | |
|
1432
46e5eb9917bc
Add an option "-f" (file) to /say_to
Mikael Berthe <mikael@lilotux.net>
parents:
1430
diff
changeset
|
1742 if (!file) { |
|
2051
71d84213f850
Add option -e (eval) to say_to
Mikael Berthe <mikael@lilotux.net>
parents:
2030
diff
changeset
|
1743 msg_utf8 = to_utf8(msg); |
|
71d84213f850
Add option -e (eval) to say_to
Mikael Berthe <mikael@lilotux.net>
parents:
2030
diff
changeset
|
1744 if (eval) { |
|
71d84213f850
Add option -e (eval) to say_to
Mikael Berthe <mikael@lilotux.net>
parents:
2030
diff
changeset
|
1745 unescaped_msg = ut_unescape_tabs_cr(msg_utf8); |
|
71d84213f850
Add option -e (eval) to say_to
Mikael Berthe <mikael@lilotux.net>
parents:
2030
diff
changeset
|
1746 // We must not free() if the original string was returned |
|
71d84213f850
Add option -e (eval) to say_to
Mikael Berthe <mikael@lilotux.net>
parents:
2030
diff
changeset
|
1747 if (unescaped_msg == msg_utf8) |
|
71d84213f850
Add option -e (eval) to say_to
Mikael Berthe <mikael@lilotux.net>
parents:
2030
diff
changeset
|
1748 unescaped_msg = NULL; |
|
71d84213f850
Add option -e (eval) to say_to
Mikael Berthe <mikael@lilotux.net>
parents:
2030
diff
changeset
|
1749 } |
|
71d84213f850
Add option -e (eval) to say_to
Mikael Berthe <mikael@lilotux.net>
parents:
2030
diff
changeset
|
1750 msg = (unescaped_msg ? unescaped_msg : msg_utf8); |
|
1432
46e5eb9917bc
Add an option "-f" (file) to /say_to
Mikael Berthe <mikael@lilotux.net>
parents:
1430
diff
changeset
|
1751 } else { |
|
1434
bed2f0caa952
Expand filename in /say_to -f
Mikael Berthe <mikael@lilotux.net>
parents:
1433
diff
changeset
|
1752 char *filename_xp; |
|
1432
46e5eb9917bc
Add an option "-f" (file) to /say_to
Mikael Berthe <mikael@lilotux.net>
parents:
1430
diff
changeset
|
1753 if (msg) |
|
46e5eb9917bc
Add an option "-f" (file) to /say_to
Mikael Berthe <mikael@lilotux.net>
parents:
1430
diff
changeset
|
1754 scr_LogPrint(LPRINT_NORMAL, "say_to: extra parameter ignored."); |
|
1434
bed2f0caa952
Expand filename in /say_to -f
Mikael Berthe <mikael@lilotux.net>
parents:
1433
diff
changeset
|
1755 filename_xp = expand_filename(file); |
|
2051
71d84213f850
Add option -e (eval) to say_to
Mikael Berthe <mikael@lilotux.net>
parents:
2030
diff
changeset
|
1756 msg = msg_utf8 = load_message_from_file(filename_xp); |
|
1434
bed2f0caa952
Expand filename in /say_to -f
Mikael Berthe <mikael@lilotux.net>
parents:
1433
diff
changeset
|
1757 g_free(filename_xp); |
|
1432
46e5eb9917bc
Add an option "-f" (file) to /say_to
Mikael Berthe <mikael@lilotux.net>
parents:
1430
diff
changeset
|
1758 g_free(file); |
|
46e5eb9917bc
Add an option "-f" (file) to /say_to
Mikael Berthe <mikael@lilotux.net>
parents:
1430
diff
changeset
|
1759 } |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
1760 |
|
1430
12847b0ea8c9
Add an option "-q" (quiet) to /say_to
Mikael Berthe <mikael@lilotux.net>
parents:
1429
diff
changeset
|
1761 send_message_to(fjid, msg, NULL, msg_type, quiet); |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
1762 |
|
1943
11bda6d8daab
Add default server for private messages
Mikael Berthe <mikael@lilotux.net>
parents:
1939
diff
changeset
|
1763 g_free(uncompletedfjid); |
| 1058 | 1764 g_free(fjid); |
|
2051
71d84213f850
Add option -e (eval) to say_to
Mikael Berthe <mikael@lilotux.net>
parents:
2030
diff
changeset
|
1765 g_free(msg_utf8); |
|
71d84213f850
Add option -e (eval) to say_to
Mikael Berthe <mikael@lilotux.net>
parents:
2030
diff
changeset
|
1766 g_free(unescaped_msg); |
|
557
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
1767 free_arg_lst(paramlst); |
| 480 | 1768 } |
| 1769 | |
|
558
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1770 // buffer_updown(updown, nblines) |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1771 // updown: -1=up, +1=down |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1772 inline static void buffer_updown(int updown, char *nlines) |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1773 { |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1774 int nblines; |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1775 |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1776 if (!nlines || !*nlines) |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1777 nblines = 0; |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1778 else |
|
1573
ece4f26bf9ff
Add count parameter to roster up/down command
Mikael Berthe <mikael@lilotux.net>
parents:
1562
diff
changeset
|
1779 nblines = strtol(nlines, NULL, 10); |
|
558
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1780 |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1781 if (nblines >= 0) |
|
1780
e4378fbab5d7
Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents:
1774
diff
changeset
|
1782 scr_buffer_scroll_up_down(updown, nblines); |
|
558
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1783 } |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1784 |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1785 static void buffer_search(int direction, char *arg) |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1786 { |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1787 if (!arg || !*arg) { |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
1788 scr_LogPrint(LPRINT_NORMAL, "Missing parameter."); |
|
558
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1789 return; |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1790 } |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1791 |
|
1780
e4378fbab5d7
Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents:
1774
diff
changeset
|
1792 scr_buffer_search(direction, arg); |
|
558
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1793 } |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1794 |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1795 static void buffer_date(char *date) |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1796 { |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1797 time_t t; |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1798 |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1799 if (!date || !*date) { |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
1800 scr_LogPrint(LPRINT_NORMAL, "Missing parameter."); |
|
558
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1801 return; |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1802 } |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1803 |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1804 strip_arg_special_chars(date); |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1805 |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1806 t = from_iso8601(date, 0); |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1807 if (t) |
|
1780
e4378fbab5d7
Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents:
1774
diff
changeset
|
1808 scr_buffer_date(t); |
|
558
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1809 else |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
1810 scr_LogPrint(LPRINT_NORMAL, "The date you specified is " |
|
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
1811 "not correctly formatted or invalid."); |
|
558
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1812 } |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1813 |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1814 static void buffer_percent(char *arg1, char *arg2) |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1815 { |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1816 // Basically, user has typed "%arg1 arg2" |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1817 // "%50" -> arg1 = 50, arg2 null pointer |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1818 // "% 50" -> arg1 = \0, arg2 = 50 |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1819 |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1820 if (!*arg1 && (!arg2 || !*arg2)) { // No value |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
1821 scr_LogPrint(LPRINT_NORMAL, "Missing parameter."); |
|
558
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1822 return; |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1823 } |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1824 |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1825 if (*arg1 && arg2 && *arg2) { // Two values |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
1826 scr_LogPrint(LPRINT_NORMAL, "Wrong parameters."); |
|
558
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1827 return; |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1828 } |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1829 |
|
1780
e4378fbab5d7
Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents:
1774
diff
changeset
|
1830 scr_buffer_percent(atoi((*arg1 ? arg1 : arg2))); |
|
558
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1831 } |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1832 |
|
336
eb994ee40029
Make some functions static
Mikael Berthe <mikael@lilotux.net>
parents:
330
diff
changeset
|
1833 static void do_buffer(char *arg) |
| 187 | 1834 { |
|
558
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1835 char **paramlst; |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1836 char *subcmd; |
|
370
dd9e2eb52916
Add /buffer search_{backward,forward}
Mikael Berthe <mikael@lilotux.net>
parents:
369
diff
changeset
|
1837 |
| 1058 | 1838 if (!current_buddy) |
| 1839 return; | |
|
558
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1840 |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1841 paramlst = split_arg(arg, 2, 1); // subcmd, arg |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1842 subcmd = *paramlst; |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1843 arg = *(paramlst+1); |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1844 |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1845 if (!subcmd || !*subcmd) { |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
1846 scr_LogPrint(LPRINT_NORMAL, "Missing parameter."); |
|
558
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1847 free_arg_lst(paramlst); |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1848 return; |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1849 } |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1850 |
|
1138
8ba4b1e8b42d
Add command /buffer close_all
Mikael Berthe <mikael@lilotux.net>
parents:
1135
diff
changeset
|
1851 if (buddy_gettype(BUDDATA(current_buddy)) & ROSTER_TYPE_GROUP && |
|
8ba4b1e8b42d
Add command /buffer close_all
Mikael Berthe <mikael@lilotux.net>
parents:
1135
diff
changeset
|
1852 strcasecmp(subcmd, "close_all")) { |
|
8ba4b1e8b42d
Add command /buffer close_all
Mikael Berthe <mikael@lilotux.net>
parents:
1135
diff
changeset
|
1853 scr_LogPrint(LPRINT_NORMAL, "Groups have no buffer."); |
|
8ba4b1e8b42d
Add command /buffer close_all
Mikael Berthe <mikael@lilotux.net>
parents:
1135
diff
changeset
|
1854 free_arg_lst(paramlst); |
|
8ba4b1e8b42d
Add command /buffer close_all
Mikael Berthe <mikael@lilotux.net>
parents:
1135
diff
changeset
|
1855 return; |
|
8ba4b1e8b42d
Add command /buffer close_all
Mikael Berthe <mikael@lilotux.net>
parents:
1135
diff
changeset
|
1856 } |
|
8ba4b1e8b42d
Add command /buffer close_all
Mikael Berthe <mikael@lilotux.net>
parents:
1135
diff
changeset
|
1857 |
|
558
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1858 if (!strcasecmp(subcmd, "top")) { |
|
1780
e4378fbab5d7
Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents:
1774
diff
changeset
|
1859 scr_buffer_top_bottom(-1); |
|
558
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1860 } else if (!strcasecmp(subcmd, "bottom")) { |
|
1780
e4378fbab5d7
Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents:
1774
diff
changeset
|
1861 scr_buffer_top_bottom(1); |
|
558
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1862 } else if (!strcasecmp(subcmd, "clear")) { |
|
1780
e4378fbab5d7
Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents:
1774
diff
changeset
|
1863 scr_buffer_clear(); |
|
1135
5d7c05932b13
Add command /buffer close
Mikael Berthe <mikael@lilotux.net>
parents:
1130
diff
changeset
|
1864 } else if (!strcasecmp(subcmd, "close")) { |
|
1780
e4378fbab5d7
Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents:
1774
diff
changeset
|
1865 scr_buffer_purge(1, arg); |
|
1138
8ba4b1e8b42d
Add command /buffer close_all
Mikael Berthe <mikael@lilotux.net>
parents:
1135
diff
changeset
|
1866 } else if (!strcasecmp(subcmd, "close_all")) { |
|
1780
e4378fbab5d7
Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents:
1774
diff
changeset
|
1867 scr_buffer_purge_all(1); |
| 866 | 1868 } else if (!strcasecmp(subcmd, "purge")) { |
|
1780
e4378fbab5d7
Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents:
1774
diff
changeset
|
1869 scr_buffer_purge(0, arg); |
|
873
ee39f6d94d43
Add /buffer {scroll_lock|scroll_unlock|toggle_scroll}
Mikael Berthe <mikael@lilotux.net>
parents:
868
diff
changeset
|
1870 } else if (!strcasecmp(subcmd, "scroll_lock")) { |
|
1780
e4378fbab5d7
Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents:
1774
diff
changeset
|
1871 scr_buffer_scroll_lock(1); |
|
873
ee39f6d94d43
Add /buffer {scroll_lock|scroll_unlock|toggle_scroll}
Mikael Berthe <mikael@lilotux.net>
parents:
868
diff
changeset
|
1872 } else if (!strcasecmp(subcmd, "scroll_unlock")) { |
|
1780
e4378fbab5d7
Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents:
1774
diff
changeset
|
1873 scr_buffer_scroll_lock(0); |
|
873
ee39f6d94d43
Add /buffer {scroll_lock|scroll_unlock|toggle_scroll}
Mikael Berthe <mikael@lilotux.net>
parents:
868
diff
changeset
|
1874 } else if (!strcasecmp(subcmd, "scroll_toggle")) { |
|
1780
e4378fbab5d7
Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents:
1774
diff
changeset
|
1875 scr_buffer_scroll_lock(-1); |
|
558
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1876 } else if (!strcasecmp(subcmd, "up")) { |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1877 buffer_updown(-1, arg); |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1878 } else if (!strcasecmp(subcmd, "down")) { |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1879 buffer_updown(1, arg); |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1880 } else if (!strcasecmp(subcmd, "search_backward")) { |
|
979
ea939ff047d8
Improve /buffer search_*
Mikael Berthe <mikael@lilotux.net>
parents:
978
diff
changeset
|
1881 strip_arg_special_chars(arg); |
|
558
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1882 buffer_search(-1, arg); |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1883 } else if (!strcasecmp(subcmd, "search_forward")) { |
|
979
ea939ff047d8
Improve /buffer search_*
Mikael Berthe <mikael@lilotux.net>
parents:
978
diff
changeset
|
1884 strip_arg_special_chars(arg); |
|
558
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1885 buffer_search(1, arg); |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1886 } else if (!strcasecmp(subcmd, "date")) { |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1887 buffer_date(arg); |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1888 } else if (*subcmd == '%') { |
|
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1889 buffer_percent(subcmd+1, arg); |
|
1485
0121b6f3047c
New command: /buffer save
Mikael Berthe <mikael@lilotux.net>
parents:
1484
diff
changeset
|
1890 } else if (!strcasecmp(subcmd, "save")) { |
|
1780
e4378fbab5d7
Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents:
1774
diff
changeset
|
1891 scr_buffer_dump(arg); |
|
1226
2521efbf3b72
New (debug) subcommand, buffer list
Mikael Berthe <mikael@lilotux.net>
parents:
1221
diff
changeset
|
1892 } else if (!strcasecmp(subcmd, "list")) { |
|
1780
e4378fbab5d7
Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents:
1774
diff
changeset
|
1893 scr_buffer_list(); |
|
1956
f309f343070c
Add command /buffer readmark
Mikael Berthe <mikael@lilotux.net>
parents:
1946
diff
changeset
|
1894 } else if (!strcasecmp(subcmd, "readmark")) { |
|
f309f343070c
Add command /buffer readmark
Mikael Berthe <mikael@lilotux.net>
parents:
1946
diff
changeset
|
1895 scr_buffer_jump_readmark(); |
|
558
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1896 } else { |
|
374
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
371
diff
changeset
|
1897 scr_LogPrint(LPRINT_NORMAL, "Unrecognized parameter!"); |
|
558
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1898 } |
|
370
dd9e2eb52916
Add /buffer search_{backward,forward}
Mikael Berthe <mikael@lilotux.net>
parents:
369
diff
changeset
|
1899 |
|
558
db019a5f874f
Split do_buffer() and use split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
557
diff
changeset
|
1900 free_arg_lst(paramlst); |
| 187 | 1901 } |
| 1902 | |
| 967 | 1903 static void do_clear(char *arg) // Alias for "buffer clear" |
| 187 | 1904 { |
| 1905 do_buffer("clear"); | |
| 1906 } | |
| 1907 | |
|
336
eb994ee40029
Make some functions static
Mikael Berthe <mikael@lilotux.net>
parents:
330
diff
changeset
|
1908 static void do_info(char *arg) |
| 191 | 1909 { |
| 1910 gpointer bud; | |
| 1058 | 1911 const char *bjid, *name; |
| 1355 | 1912 guint type, on_srv; |
| 191 | 1913 char *buffer; |
|
604
2e8342168ebc
"/info" shows buddy subscription
Mikael Berthe <mikael@lilotux.net>
parents:
600
diff
changeset
|
1914 enum subscr esub; |
| 191 | 1915 |
| 1058 | 1916 if (!current_buddy) |
| 1917 return; | |
| 191 | 1918 bud = BUDDATA(current_buddy); |
| 1919 | |
| 1058 | 1920 bjid = buddy_getjid(bud); |
| 191 | 1921 name = buddy_getname(bud); |
| 1922 type = buddy_gettype(bud); | |
|
604
2e8342168ebc
"/info" shows buddy subscription
Mikael Berthe <mikael@lilotux.net>
parents:
600
diff
changeset
|
1923 esub = buddy_getsubscription(bud); |
| 1355 | 1924 on_srv = buddy_getonserverflag(bud); |
| 191 | 1925 |
|
626
b75f4105ce32
Use a larger buffer for commands like /info
Mikael Berthe <mikael@lilotux.net>
parents:
625
diff
changeset
|
1926 buffer = g_new(char, 4096); |
| 191 | 1927 |
| 1058 | 1928 if (bjid) { |
|
1072
2a3cfb98bd5e
Fix memory leaks after calls to buddy_getresources()
Mikael Berthe <mikael@lilotux.net>
parents:
1070
diff
changeset
|
1929 GSList *resources, *p_res; |
|
604
2e8342168ebc
"/info" shows buddy subscription
Mikael Berthe <mikael@lilotux.net>
parents:
600
diff
changeset
|
1930 char *bstr = "unknown"; |
| 191 | 1931 |
|
647
c6c41dd2464a
Enter chat mode automatically when using some commands
Mikael Berthe <mikael@lilotux.net>
parents:
644
diff
changeset
|
1932 // Enter chat mode |
|
c6c41dd2464a
Enter chat mode automatically when using some commands
Mikael Berthe <mikael@lilotux.net>
parents:
644
diff
changeset
|
1933 scr_set_chatmode(TRUE); |
|
1780
e4378fbab5d7
Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents:
1774
diff
changeset
|
1934 scr_show_buddy_window(); |
|
647
c6c41dd2464a
Enter chat mode automatically when using some commands
Mikael Berthe <mikael@lilotux.net>
parents:
644
diff
changeset
|
1935 |
| 1058 | 1936 snprintf(buffer, 4095, "jid: <%s>", bjid); |
|
1290
e42f48103609
Drawing the MUC nicks by a different color
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1279
diff
changeset
|
1937 scr_WriteIncomingMessage(bjid, buffer, 0, HBB_PREFIX_INFO, 0); |
| 191 | 1938 if (name) { |
|
626
b75f4105ce32
Use a larger buffer for commands like /info
Mikael Berthe <mikael@lilotux.net>
parents:
625
diff
changeset
|
1939 snprintf(buffer, 4095, "Name: %s", name); |
|
1290
e42f48103609
Drawing the MUC nicks by a different color
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1279
diff
changeset
|
1940 scr_WriteIncomingMessage(bjid, buffer, 0, HBB_PREFIX_INFO, 0); |
| 191 | 1941 } |
| 1942 | |
|
604
2e8342168ebc
"/info" shows buddy subscription
Mikael Berthe <mikael@lilotux.net>
parents:
600
diff
changeset
|
1943 if (type == ROSTER_TYPE_USER) bstr = "user"; |
|
2e8342168ebc
"/info" shows buddy subscription
Mikael Berthe <mikael@lilotux.net>
parents:
600
diff
changeset
|
1944 else if (type == ROSTER_TYPE_ROOM) bstr = "chatroom"; |
|
2e8342168ebc
"/info" shows buddy subscription
Mikael Berthe <mikael@lilotux.net>
parents:
600
diff
changeset
|
1945 else if (type == ROSTER_TYPE_AGENT) bstr = "agent"; |
|
2e8342168ebc
"/info" shows buddy subscription
Mikael Berthe <mikael@lilotux.net>
parents:
600
diff
changeset
|
1946 snprintf(buffer, 127, "Type: %s", bstr); |
|
1290
e42f48103609
Drawing the MUC nicks by a different color
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1279
diff
changeset
|
1947 scr_WriteIncomingMessage(bjid, buffer, 0, HBB_PREFIX_INFO, 0); |
|
604
2e8342168ebc
"/info" shows buddy subscription
Mikael Berthe <mikael@lilotux.net>
parents:
600
diff
changeset
|
1948 |
| 1355 | 1949 if (!on_srv) { |
| 1950 scr_WriteIncomingMessage(bjid, "(Local item, not on the server)", | |
| 1951 0, HBB_PREFIX_INFO, 0); | |
| 1952 } | |
| 1953 | |
|
604
2e8342168ebc
"/info" shows buddy subscription
Mikael Berthe <mikael@lilotux.net>
parents:
600
diff
changeset
|
1954 if (esub == sub_both) bstr = "both"; |
|
2e8342168ebc
"/info" shows buddy subscription
Mikael Berthe <mikael@lilotux.net>
parents:
600
diff
changeset
|
1955 else if (esub & sub_from) bstr = "from"; |
|
2e8342168ebc
"/info" shows buddy subscription
Mikael Berthe <mikael@lilotux.net>
parents:
600
diff
changeset
|
1956 else if (esub & sub_to) bstr = "to"; |
|
2e8342168ebc
"/info" shows buddy subscription
Mikael Berthe <mikael@lilotux.net>
parents:
600
diff
changeset
|
1957 else bstr = "none"; |
|
2e8342168ebc
"/info" shows buddy subscription
Mikael Berthe <mikael@lilotux.net>
parents:
600
diff
changeset
|
1958 snprintf(buffer, 64, "Subscription: %s", bstr); |
|
2e8342168ebc
"/info" shows buddy subscription
Mikael Berthe <mikael@lilotux.net>
parents:
600
diff
changeset
|
1959 if (esub & sub_pending) |
|
2e8342168ebc
"/info" shows buddy subscription
Mikael Berthe <mikael@lilotux.net>
parents:
600
diff
changeset
|
1960 strcat(buffer, " (pending)"); |
|
1290
e42f48103609
Drawing the MUC nicks by a different color
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1279
diff
changeset
|
1961 scr_WriteIncomingMessage(bjid, buffer, 0, HBB_PREFIX_INFO, 0); |
|
439
63562fd409a1
/info can show multiple resources
Mikael Berthe <mikael@lilotux.net>
parents:
438
diff
changeset
|
1962 |
|
63562fd409a1
/info can show multiple resources
Mikael Berthe <mikael@lilotux.net>
parents:
438
diff
changeset
|
1963 resources = buddy_getresources(bud); |
|
843
915a7f17474a
Remember the status message when a buddy goes offline
Mikael Berthe <mikael@lilotux.net>
parents:
841
diff
changeset
|
1964 if (!resources && type == ROSTER_TYPE_USER) { |
|
915a7f17474a
Remember the status message when a buddy goes offline
Mikael Berthe <mikael@lilotux.net>
parents:
841
diff
changeset
|
1965 // No resource; display last status message, if any. |
|
915a7f17474a
Remember the status message when a buddy goes offline
Mikael Berthe <mikael@lilotux.net>
parents:
841
diff
changeset
|
1966 const char *rst_msg = buddy_getstatusmsg(bud, ""); |
|
915a7f17474a
Remember the status message when a buddy goes offline
Mikael Berthe <mikael@lilotux.net>
parents:
841
diff
changeset
|
1967 if (rst_msg) { |
|
915a7f17474a
Remember the status message when a buddy goes offline
Mikael Berthe <mikael@lilotux.net>
parents:
841
diff
changeset
|
1968 snprintf(buffer, 4095, "Last status message: %s", rst_msg); |
|
1290
e42f48103609
Drawing the MUC nicks by a different color
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1279
diff
changeset
|
1969 scr_WriteIncomingMessage(bjid, buffer, 0, HBB_PREFIX_INFO, 0); |
|
843
915a7f17474a
Remember the status message when a buddy goes offline
Mikael Berthe <mikael@lilotux.net>
parents:
841
diff
changeset
|
1970 } |
|
915a7f17474a
Remember the status message when a buddy goes offline
Mikael Berthe <mikael@lilotux.net>
parents:
841
diff
changeset
|
1971 } |
|
1072
2a3cfb98bd5e
Fix memory leaks after calls to buddy_getresources()
Mikael Berthe <mikael@lilotux.net>
parents:
1070
diff
changeset
|
1972 for (p_res = resources ; p_res ; p_res = g_slist_next(p_res)) { |
|
439
63562fd409a1
/info can show multiple resources
Mikael Berthe <mikael@lilotux.net>
parents:
438
diff
changeset
|
1973 gchar rprio; |
|
63562fd409a1
/info can show multiple resources
Mikael Berthe <mikael@lilotux.net>
parents:
438
diff
changeset
|
1974 enum imstatus rstatus; |
|
63562fd409a1
/info can show multiple resources
Mikael Berthe <mikael@lilotux.net>
parents:
438
diff
changeset
|
1975 const char *rst_msg; |
|
625
028c01940490
Show presence timestamps in "/info" and "/room whois"
Mikael Berthe <mikael@lilotux.net>
parents:
622
diff
changeset
|
1976 time_t rst_time; |
|
439
63562fd409a1
/info can show multiple resources
Mikael Berthe <mikael@lilotux.net>
parents:
438
diff
changeset
|
1977 |
|
1072
2a3cfb98bd5e
Fix memory leaks after calls to buddy_getresources()
Mikael Berthe <mikael@lilotux.net>
parents:
1070
diff
changeset
|
1978 rprio = buddy_getresourceprio(bud, p_res->data); |
|
2a3cfb98bd5e
Fix memory leaks after calls to buddy_getresources()
Mikael Berthe <mikael@lilotux.net>
parents:
1070
diff
changeset
|
1979 rstatus = buddy_getstatus(bud, p_res->data); |
|
2a3cfb98bd5e
Fix memory leaks after calls to buddy_getresources()
Mikael Berthe <mikael@lilotux.net>
parents:
1070
diff
changeset
|
1980 rst_msg = buddy_getstatusmsg(bud, p_res->data); |
|
2a3cfb98bd5e
Fix memory leaks after calls to buddy_getresources()
Mikael Berthe <mikael@lilotux.net>
parents:
1070
diff
changeset
|
1981 rst_time = buddy_getstatustime(bud, p_res->data); |
|
439
63562fd409a1
/info can show multiple resources
Mikael Berthe <mikael@lilotux.net>
parents:
438
diff
changeset
|
1982 |
|
626
b75f4105ce32
Use a larger buffer for commands like /info
Mikael Berthe <mikael@lilotux.net>
parents:
625
diff
changeset
|
1983 snprintf(buffer, 4095, "Resource: [%c] (%d) %s", imstatus2char[rstatus], |
|
1072
2a3cfb98bd5e
Fix memory leaks after calls to buddy_getresources()
Mikael Berthe <mikael@lilotux.net>
parents:
1070
diff
changeset
|
1984 rprio, (char*)p_res->data); |
|
1290
e42f48103609
Drawing the MUC nicks by a different color
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1279
diff
changeset
|
1985 scr_WriteIncomingMessage(bjid, buffer, 0, HBB_PREFIX_INFO, 0); |
|
439
63562fd409a1
/info can show multiple resources
Mikael Berthe <mikael@lilotux.net>
parents:
438
diff
changeset
|
1986 if (rst_msg) { |
|
626
b75f4105ce32
Use a larger buffer for commands like /info
Mikael Berthe <mikael@lilotux.net>
parents:
625
diff
changeset
|
1987 snprintf(buffer, 4095, "Status message: %s", rst_msg); |
|
1268
dbc907b2d92f
Add configurable colors for info and incoming messages (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents:
1260
diff
changeset
|
1988 scr_WriteIncomingMessage(bjid, buffer, |
|
1290
e42f48103609
Drawing the MUC nicks by a different color
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1279
diff
changeset
|
1989 0, HBB_PREFIX_INFO | HBB_PREFIX_CONT, 0); |
|
439
63562fd409a1
/info can show multiple resources
Mikael Berthe <mikael@lilotux.net>
parents:
438
diff
changeset
|
1990 } |
|
625
028c01940490
Show presence timestamps in "/info" and "/room whois"
Mikael Berthe <mikael@lilotux.net>
parents:
622
diff
changeset
|
1991 if (rst_time) { |
|
626
b75f4105ce32
Use a larger buffer for commands like /info
Mikael Berthe <mikael@lilotux.net>
parents:
625
diff
changeset
|
1992 char tbuf[128]; |
|
625
028c01940490
Show presence timestamps in "/info" and "/room whois"
Mikael Berthe <mikael@lilotux.net>
parents:
622
diff
changeset
|
1993 |
|
028c01940490
Show presence timestamps in "/info" and "/room whois"
Mikael Berthe <mikael@lilotux.net>
parents:
622
diff
changeset
|
1994 strftime(tbuf, sizeof(tbuf), "%Y-%m-%d %H:%M:%S", localtime(&rst_time)); |
|
028c01940490
Show presence timestamps in "/info" and "/room whois"
Mikael Berthe <mikael@lilotux.net>
parents:
622
diff
changeset
|
1995 snprintf(buffer, 127, "Status timestamp: %s", tbuf); |
|
1268
dbc907b2d92f
Add configurable colors for info and incoming messages (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents:
1260
diff
changeset
|
1996 scr_WriteIncomingMessage(bjid, buffer, |
|
1290
e42f48103609
Drawing the MUC nicks by a different color
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1279
diff
changeset
|
1997 0, HBB_PREFIX_INFO | HBB_PREFIX_CONT, 0); |
|
625
028c01940490
Show presence timestamps in "/info" and "/room whois"
Mikael Berthe <mikael@lilotux.net>
parents:
622
diff
changeset
|
1998 } |
|
1043
ebbde723614b
Store contacts PGP keys
Mikael Berthe <mikael@lilotux.net>
parents:
1038
diff
changeset
|
1999 #ifdef HAVE_GPGME |
|
2020
46a21258ad91
Fix some compiler warnings
Myhailo Danylenko <isbear@ukrpost.net>
parents:
2016
diff
changeset
|
2000 struct pgp_data *rpgp = buddy_resource_pgp(bud, p_res->data); |
|
46a21258ad91
Fix some compiler warnings
Myhailo Danylenko <isbear@ukrpost.net>
parents:
2016
diff
changeset
|
2001 |
|
1043
ebbde723614b
Store contacts PGP keys
Mikael Berthe <mikael@lilotux.net>
parents:
1038
diff
changeset
|
2002 if (rpgp && rpgp->sign_keyid) { |
|
ebbde723614b
Store contacts PGP keys
Mikael Berthe <mikael@lilotux.net>
parents:
1038
diff
changeset
|
2003 snprintf(buffer, 4095, "PGP key id: %s", rpgp->sign_keyid); |
|
1268
dbc907b2d92f
Add configurable colors for info and incoming messages (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents:
1260
diff
changeset
|
2004 scr_WriteIncomingMessage(bjid, buffer, |
|
1290
e42f48103609
Drawing the MUC nicks by a different color
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1279
diff
changeset
|
2005 0, HBB_PREFIX_INFO | HBB_PREFIX_CONT, 0); |
|
1043
ebbde723614b
Store contacts PGP keys
Mikael Berthe <mikael@lilotux.net>
parents:
1038
diff
changeset
|
2006 if (rpgp->last_sigsum) { |
|
ebbde723614b
Store contacts PGP keys
Mikael Berthe <mikael@lilotux.net>
parents:
1038
diff
changeset
|
2007 gpgme_sigsum_t ss = rpgp->last_sigsum; |
|
ebbde723614b
Store contacts PGP keys
Mikael Berthe <mikael@lilotux.net>
parents:
1038
diff
changeset
|
2008 snprintf(buffer, 4095, "Last PGP signature: %s", |
|
ebbde723614b
Store contacts PGP keys
Mikael Berthe <mikael@lilotux.net>
parents:
1038
diff
changeset
|
2009 (ss & GPGME_SIGSUM_GREEN ? "good": |
|
ebbde723614b
Store contacts PGP keys
Mikael Berthe <mikael@lilotux.net>
parents:
1038
diff
changeset
|
2010 (ss & GPGME_SIGSUM_RED ? "bad" : "unknown"))); |
|
1268
dbc907b2d92f
Add configurable colors for info and incoming messages (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents:
1260
diff
changeset
|
2011 scr_WriteIncomingMessage(bjid, buffer, |
|
1290
e42f48103609
Drawing the MUC nicks by a different color
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1279
diff
changeset
|
2012 0, HBB_PREFIX_INFO | HBB_PREFIX_CONT, 0); |
|
1043
ebbde723614b
Store contacts PGP keys
Mikael Berthe <mikael@lilotux.net>
parents:
1038
diff
changeset
|
2013 } |
|
ebbde723614b
Store contacts PGP keys
Mikael Berthe <mikael@lilotux.net>
parents:
1038
diff
changeset
|
2014 } |
|
ebbde723614b
Store contacts PGP keys
Mikael Berthe <mikael@lilotux.net>
parents:
1038
diff
changeset
|
2015 #endif |
|
1072
2a3cfb98bd5e
Fix memory leaks after calls to buddy_getresources()
Mikael Berthe <mikael@lilotux.net>
parents:
1070
diff
changeset
|
2016 g_free(p_res->data); |
|
439
63562fd409a1
/info can show multiple resources
Mikael Berthe <mikael@lilotux.net>
parents:
438
diff
changeset
|
2017 } |
|
1072
2a3cfb98bd5e
Fix memory leaks after calls to buddy_getresources()
Mikael Berthe <mikael@lilotux.net>
parents:
1070
diff
changeset
|
2018 g_slist_free(resources); |
| 1355 | 2019 } else { /* Item has no jid */ |
|
374
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
371
diff
changeset
|
2020 if (name) scr_LogPrint(LPRINT_NORMAL, "Name: %s", name); |
|
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
371
diff
changeset
|
2021 scr_LogPrint(LPRINT_NORMAL, "Type: %s", |
|
848
a9161d2dc414
Introduce special buffer stuff
Mikael Berthe <mikael@lilotux.net>
parents:
847
diff
changeset
|
2022 type == ROSTER_TYPE_GROUP ? "group" : |
|
a9161d2dc414
Introduce special buffer stuff
Mikael Berthe <mikael@lilotux.net>
parents:
847
diff
changeset
|
2023 (type == ROSTER_TYPE_SPECIAL ? "special" : "unknown")); |
| 191 | 2024 } |
| 2025 g_free(buffer); | |
| 2026 | |
|
1020
60c94b697f61
Show in /info when the contact has an annotation
Mikael Berthe <mikael@lilotux.net>
parents:
1019
diff
changeset
|
2027 // Tell the user if this item has an annotation. |
|
60c94b697f61
Show in /info when the contact has an annotation
Mikael Berthe <mikael@lilotux.net>
parents:
1019
diff
changeset
|
2028 if (type == ROSTER_TYPE_USER || |
|
60c94b697f61
Show in /info when the contact has an annotation
Mikael Berthe <mikael@lilotux.net>
parents:
1019
diff
changeset
|
2029 type == ROSTER_TYPE_ROOM || |
|
60c94b697f61
Show in /info when the contact has an annotation
Mikael Berthe <mikael@lilotux.net>
parents:
1019
diff
changeset
|
2030 type == ROSTER_TYPE_AGENT) { |
| 1598 | 2031 struct annotation *note = xmpp_get_storage_rosternotes(bjid, TRUE); |
|
1020
60c94b697f61
Show in /info when the contact has an annotation
Mikael Berthe <mikael@lilotux.net>
parents:
1019
diff
changeset
|
2032 if (note) { |
|
60c94b697f61
Show in /info when the contact has an annotation
Mikael Berthe <mikael@lilotux.net>
parents:
1019
diff
changeset
|
2033 // We do not display the note, we just tell the user. |
|
60c94b697f61
Show in /info when the contact has an annotation
Mikael Berthe <mikael@lilotux.net>
parents:
1019
diff
changeset
|
2034 g_free(note->text); |
|
1022
4c8d7b558e83
Annotations listing (/roster note in the status buffer)
Mikael Berthe <mikael@lilotux.net>
parents:
1021
diff
changeset
|
2035 g_free(note->jid); |
|
1020
60c94b697f61
Show in /info when the contact has an annotation
Mikael Berthe <mikael@lilotux.net>
parents:
1019
diff
changeset
|
2036 g_free(note); |
| 1058 | 2037 scr_WriteIncomingMessage(bjid, "(This item has an annotation)", 0, |
|
1290
e42f48103609
Drawing the MUC nicks by a different color
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1279
diff
changeset
|
2038 HBB_PREFIX_INFO, 0); |
|
1020
60c94b697f61
Show in /info when the contact has an annotation
Mikael Berthe <mikael@lilotux.net>
parents:
1019
diff
changeset
|
2039 } |
|
60c94b697f61
Show in /info when the contact has an annotation
Mikael Berthe <mikael@lilotux.net>
parents:
1019
diff
changeset
|
2040 } |
| 191 | 2041 } |
| 2042 | |
|
504
321ae11e7ddb
Prettier display for "/room names"
Mikael Berthe <mikael@lilotux.net>
parents:
490
diff
changeset
|
2043 // room_names() is a variation of do_info(), for chatrooms only |
| 552 | 2044 static void room_names(gpointer bud, char *arg) |
|
504
321ae11e7ddb
Prettier display for "/room names"
Mikael Berthe <mikael@lilotux.net>
parents:
490
diff
changeset
|
2045 { |
| 1058 | 2046 const char *bjid; |
|
504
321ae11e7ddb
Prettier display for "/room names"
Mikael Berthe <mikael@lilotux.net>
parents:
490
diff
changeset
|
2047 char *buffer; |
|
1072
2a3cfb98bd5e
Fix memory leaks after calls to buddy_getresources()
Mikael Berthe <mikael@lilotux.net>
parents:
1070
diff
changeset
|
2048 GSList *resources, *p_res; |
| 1587 | 2049 enum { style_normal = 0, style_detail, style_short, |
| 2050 style_quiet, style_compact } style = 0; | |
|
504
321ae11e7ddb
Prettier display for "/room names"
Mikael Berthe <mikael@lilotux.net>
parents:
490
diff
changeset
|
2051 |
| 552 | 2052 if (*arg) { |
|
1162
39b20ea22ce9
/room names: add options --short, --quiet
Mikael Berthe <mikael@lilotux.net>
parents:
1158
diff
changeset
|
2053 if (!strcasecmp(arg, "--short")) |
|
39b20ea22ce9
/room names: add options --short, --quiet
Mikael Berthe <mikael@lilotux.net>
parents:
1158
diff
changeset
|
2054 style = style_short; |
|
39b20ea22ce9
/room names: add options --short, --quiet
Mikael Berthe <mikael@lilotux.net>
parents:
1158
diff
changeset
|
2055 else if (!strcasecmp(arg, "--quiet")) |
|
39b20ea22ce9
/room names: add options --short, --quiet
Mikael Berthe <mikael@lilotux.net>
parents:
1158
diff
changeset
|
2056 style = style_quiet; |
|
1341
305f7a609545
Add "/room names --detail"
Mikael Berthe <mikael@lilotux.net>
parents:
1333
diff
changeset
|
2057 else if (!strcasecmp(arg, "--detail")) |
|
305f7a609545
Add "/room names --detail"
Mikael Berthe <mikael@lilotux.net>
parents:
1333
diff
changeset
|
2058 style = style_detail; |
| 1587 | 2059 else if (!strcasecmp(arg, "--compact")) |
| 2060 style = style_compact; | |
|
1162
39b20ea22ce9
/room names: add options --short, --quiet
Mikael Berthe <mikael@lilotux.net>
parents:
1158
diff
changeset
|
2061 else { |
|
39b20ea22ce9
/room names: add options --short, --quiet
Mikael Berthe <mikael@lilotux.net>
parents:
1158
diff
changeset
|
2062 scr_LogPrint(LPRINT_NORMAL, "Unrecognized parameter!"); |
|
39b20ea22ce9
/room names: add options --short, --quiet
Mikael Berthe <mikael@lilotux.net>
parents:
1158
diff
changeset
|
2063 return; |
|
39b20ea22ce9
/room names: add options --short, --quiet
Mikael Berthe <mikael@lilotux.net>
parents:
1158
diff
changeset
|
2064 } |
|
504
321ae11e7ddb
Prettier display for "/room names"
Mikael Berthe <mikael@lilotux.net>
parents:
490
diff
changeset
|
2065 } |
|
321ae11e7ddb
Prettier display for "/room names"
Mikael Berthe <mikael@lilotux.net>
parents:
490
diff
changeset
|
2066 |
|
647
c6c41dd2464a
Enter chat mode automatically when using some commands
Mikael Berthe <mikael@lilotux.net>
parents:
644
diff
changeset
|
2067 // Enter chat mode |
|
c6c41dd2464a
Enter chat mode automatically when using some commands
Mikael Berthe <mikael@lilotux.net>
parents:
644
diff
changeset
|
2068 scr_set_chatmode(TRUE); |
|
1780
e4378fbab5d7
Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents:
1774
diff
changeset
|
2069 scr_show_buddy_window(); |
|
647
c6c41dd2464a
Enter chat mode automatically when using some commands
Mikael Berthe <mikael@lilotux.net>
parents:
644
diff
changeset
|
2070 |
| 1058 | 2071 bjid = buddy_getjid(bud); |
|
504
321ae11e7ddb
Prettier display for "/room names"
Mikael Berthe <mikael@lilotux.net>
parents:
490
diff
changeset
|
2072 |
|
626
b75f4105ce32
Use a larger buffer for commands like /info
Mikael Berthe <mikael@lilotux.net>
parents:
625
diff
changeset
|
2073 buffer = g_new(char, 4096); |
|
b75f4105ce32
Use a larger buffer for commands like /info
Mikael Berthe <mikael@lilotux.net>
parents:
625
diff
changeset
|
2074 strncpy(buffer, "Room members:", 127); |
|
1290
e42f48103609
Drawing the MUC nicks by a different color
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1279
diff
changeset
|
2075 scr_WriteIncomingMessage(bjid, buffer, 0, HBB_PREFIX_INFO, 0); |
|
504
321ae11e7ddb
Prettier display for "/room names"
Mikael Berthe <mikael@lilotux.net>
parents:
490
diff
changeset
|
2076 |
|
2120
8aa5e80aebce
add option 'show_room_occupants_count'
sh!zeeg <shizeeque@gmail.com>
parents:
2112
diff
changeset
|
2077 int cnt = 0; |
|
504
321ae11e7ddb
Prettier display for "/room names"
Mikael Berthe <mikael@lilotux.net>
parents:
490
diff
changeset
|
2078 resources = buddy_getresources(bud); |
|
1072
2a3cfb98bd5e
Fix memory leaks after calls to buddy_getresources()
Mikael Berthe <mikael@lilotux.net>
parents:
1070
diff
changeset
|
2079 for (p_res = resources ; p_res ; p_res = g_slist_next(p_res)) { |
|
504
321ae11e7ddb
Prettier display for "/room names"
Mikael Berthe <mikael@lilotux.net>
parents:
490
diff
changeset
|
2080 enum imstatus rstatus; |
|
321ae11e7ddb
Prettier display for "/room names"
Mikael Berthe <mikael@lilotux.net>
parents:
490
diff
changeset
|
2081 const char *rst_msg; |
|
2120
8aa5e80aebce
add option 'show_room_occupants_count'
sh!zeeg <shizeeque@gmail.com>
parents:
2112
diff
changeset
|
2082 cnt++; |
|
504
321ae11e7ddb
Prettier display for "/room names"
Mikael Berthe <mikael@lilotux.net>
parents:
490
diff
changeset
|
2083 |
|
1072
2a3cfb98bd5e
Fix memory leaks after calls to buddy_getresources()
Mikael Berthe <mikael@lilotux.net>
parents:
1070
diff
changeset
|
2084 rstatus = buddy_getstatus(bud, p_res->data); |
|
2a3cfb98bd5e
Fix memory leaks after calls to buddy_getresources()
Mikael Berthe <mikael@lilotux.net>
parents:
1070
diff
changeset
|
2085 rst_msg = buddy_getstatusmsg(bud, p_res->data); |
|
504
321ae11e7ddb
Prettier display for "/room names"
Mikael Berthe <mikael@lilotux.net>
parents:
490
diff
changeset
|
2086 |
|
1162
39b20ea22ce9
/room names: add options --short, --quiet
Mikael Berthe <mikael@lilotux.net>
parents:
1158
diff
changeset
|
2087 if (style == style_short) { |
|
39b20ea22ce9
/room names: add options --short, --quiet
Mikael Berthe <mikael@lilotux.net>
parents:
1158
diff
changeset
|
2088 snprintf(buffer, 4095, "[%c] %s%s%s", imstatus2char[rstatus], |
|
39b20ea22ce9
/room names: add options --short, --quiet
Mikael Berthe <mikael@lilotux.net>
parents:
1158
diff
changeset
|
2089 (char*)p_res->data, |
|
39b20ea22ce9
/room names: add options --short, --quiet
Mikael Berthe <mikael@lilotux.net>
parents:
1158
diff
changeset
|
2090 rst_msg ? " -- " : "", rst_msg ? rst_msg : ""); |
|
1290
e42f48103609
Drawing the MUC nicks by a different color
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1279
diff
changeset
|
2091 scr_WriteIncomingMessage(bjid, buffer, 0, HBB_PREFIX_INFO, 0); |
| 1587 | 2092 } else if (style == style_compact) { |
| 2093 enum imrole role = buddy_getrole(bud, p_res->data); | |
| 2094 enum imaffiliation affil = buddy_getaffil(bud, p_res->data); | |
| 1588 | 2095 bool showaffil = (affil != affil_none); |
| 2096 | |
| 2097 snprintf(buffer, 4095, "[%c] %s (%s%s%s)", | |
| 2098 imstatus2char[rstatus], (char*)p_res->data, | |
| 2099 showaffil ? straffil[affil] : "\0", | |
| 2100 showaffil ? "/" : "\0", | |
| 2101 strrole[role]); | |
| 1587 | 2102 scr_WriteIncomingMessage(bjid, buffer, 0, HBB_PREFIX_INFO, 0); |
| 2103 } else { | |
|
1341
305f7a609545
Add "/room names --detail"
Mikael Berthe <mikael@lilotux.net>
parents:
1333
diff
changeset
|
2104 // (Style "normal", "detail" or "quiet") |
|
1162
39b20ea22ce9
/room names: add options --short, --quiet
Mikael Berthe <mikael@lilotux.net>
parents:
1158
diff
changeset
|
2105 snprintf(buffer, 4095, "[%c] %s", imstatus2char[rstatus], |
|
39b20ea22ce9
/room names: add options --short, --quiet
Mikael Berthe <mikael@lilotux.net>
parents:
1158
diff
changeset
|
2106 (char*)p_res->data); |
|
1290
e42f48103609
Drawing the MUC nicks by a different color
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1279
diff
changeset
|
2107 scr_WriteIncomingMessage(bjid, buffer, 0, HBB_PREFIX_INFO, 0); |
|
1341
305f7a609545
Add "/room names --detail"
Mikael Berthe <mikael@lilotux.net>
parents:
1333
diff
changeset
|
2108 if (rst_msg && style != style_quiet) { |
|
1162
39b20ea22ce9
/room names: add options --short, --quiet
Mikael Berthe <mikael@lilotux.net>
parents:
1158
diff
changeset
|
2109 snprintf(buffer, 4095, "Status message: %s", rst_msg); |
|
1268
dbc907b2d92f
Add configurable colors for info and incoming messages (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents:
1260
diff
changeset
|
2110 scr_WriteIncomingMessage(bjid, buffer, |
|
1290
e42f48103609
Drawing the MUC nicks by a different color
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1279
diff
changeset
|
2111 0, HBB_PREFIX_INFO | HBB_PREFIX_CONT, 0); |
|
1162
39b20ea22ce9
/room names: add options --short, --quiet
Mikael Berthe <mikael@lilotux.net>
parents:
1158
diff
changeset
|
2112 } |
|
1341
305f7a609545
Add "/room names --detail"
Mikael Berthe <mikael@lilotux.net>
parents:
1333
diff
changeset
|
2113 if (style == style_detail) { |
|
305f7a609545
Add "/room names --detail"
Mikael Berthe <mikael@lilotux.net>
parents:
1333
diff
changeset
|
2114 enum imrole role = buddy_getrole(bud, p_res->data); |
|
305f7a609545
Add "/room names --detail"
Mikael Berthe <mikael@lilotux.net>
parents:
1333
diff
changeset
|
2115 enum imaffiliation affil = buddy_getaffil(bud, p_res->data); |
|
305f7a609545
Add "/room names --detail"
Mikael Berthe <mikael@lilotux.net>
parents:
1333
diff
changeset
|
2116 |
|
305f7a609545
Add "/room names --detail"
Mikael Berthe <mikael@lilotux.net>
parents:
1333
diff
changeset
|
2117 snprintf(buffer, 4095, "Role: %s", strrole[role]); |
|
305f7a609545
Add "/room names --detail"
Mikael Berthe <mikael@lilotux.net>
parents:
1333
diff
changeset
|
2118 scr_WriteIncomingMessage(bjid, buffer, |
|
305f7a609545
Add "/room names --detail"
Mikael Berthe <mikael@lilotux.net>
parents:
1333
diff
changeset
|
2119 0, HBB_PREFIX_INFO | HBB_PREFIX_CONT, 0); |
|
305f7a609545
Add "/room names --detail"
Mikael Berthe <mikael@lilotux.net>
parents:
1333
diff
changeset
|
2120 if (affil != affil_none) { |
|
305f7a609545
Add "/room names --detail"
Mikael Berthe <mikael@lilotux.net>
parents:
1333
diff
changeset
|
2121 snprintf(buffer, 4095, "Affiliat.: %s", straffil[affil]); |
|
305f7a609545
Add "/room names --detail"
Mikael Berthe <mikael@lilotux.net>
parents:
1333
diff
changeset
|
2122 scr_WriteIncomingMessage(bjid, buffer, |
|
305f7a609545
Add "/room names --detail"
Mikael Berthe <mikael@lilotux.net>
parents:
1333
diff
changeset
|
2123 0, HBB_PREFIX_INFO | HBB_PREFIX_CONT, 0); |
|
305f7a609545
Add "/room names --detail"
Mikael Berthe <mikael@lilotux.net>
parents:
1333
diff
changeset
|
2124 } |
|
305f7a609545
Add "/room names --detail"
Mikael Berthe <mikael@lilotux.net>
parents:
1333
diff
changeset
|
2125 } |
|
504
321ae11e7ddb
Prettier display for "/room names"
Mikael Berthe <mikael@lilotux.net>
parents:
490
diff
changeset
|
2126 } |
|
1072
2a3cfb98bd5e
Fix memory leaks after calls to buddy_getresources()
Mikael Berthe <mikael@lilotux.net>
parents:
1070
diff
changeset
|
2127 g_free(p_res->data); |
|
504
321ae11e7ddb
Prettier display for "/room names"
Mikael Berthe <mikael@lilotux.net>
parents:
490
diff
changeset
|
2128 } |
|
2120
8aa5e80aebce
add option 'show_room_occupants_count'
sh!zeeg <shizeeque@gmail.com>
parents:
2112
diff
changeset
|
2129 |
|
8aa5e80aebce
add option 'show_room_occupants_count'
sh!zeeg <shizeeque@gmail.com>
parents:
2112
diff
changeset
|
2130 if (settings_opt_get_int("show_room_occupants_count")) { |
|
8aa5e80aebce
add option 'show_room_occupants_count'
sh!zeeg <shizeeque@gmail.com>
parents:
2112
diff
changeset
|
2131 snprintf(buffer, 4095, "Total: %d", cnt); |
|
8aa5e80aebce
add option 'show_room_occupants_count'
sh!zeeg <shizeeque@gmail.com>
parents:
2112
diff
changeset
|
2132 scr_WriteIncomingMessage(bjid, buffer, 0, HBB_PREFIX_INFO, 0); |
|
8aa5e80aebce
add option 'show_room_occupants_count'
sh!zeeg <shizeeque@gmail.com>
parents:
2112
diff
changeset
|
2133 } |
|
8aa5e80aebce
add option 'show_room_occupants_count'
sh!zeeg <shizeeque@gmail.com>
parents:
2112
diff
changeset
|
2134 |
|
1072
2a3cfb98bd5e
Fix memory leaks after calls to buddy_getresources()
Mikael Berthe <mikael@lilotux.net>
parents:
1070
diff
changeset
|
2135 g_slist_free(resources); |
|
504
321ae11e7ddb
Prettier display for "/room names"
Mikael Berthe <mikael@lilotux.net>
parents:
490
diff
changeset
|
2136 g_free(buffer); |
|
321ae11e7ddb
Prettier display for "/room names"
Mikael Berthe <mikael@lilotux.net>
parents:
490
diff
changeset
|
2137 } |
|
321ae11e7ddb
Prettier display for "/room names"
Mikael Berthe <mikael@lilotux.net>
parents:
490
diff
changeset
|
2138 |
|
885
afdd81c2c44d
Allow /rename for groups
Mikael Berthe <mikael@lilotux.net>
parents:
873
diff
changeset
|
2139 static void move_group_member(gpointer bud, void *groupnamedata) |
|
afdd81c2c44d
Allow /rename for groups
Mikael Berthe <mikael@lilotux.net>
parents:
873
diff
changeset
|
2140 { |
| 1058 | 2141 const char *bjid, *name, *groupname; |
|
1980
3bcc57751283
Add 'muc_bookmark_autoupdate' (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents:
1979
diff
changeset
|
2142 guint type, on_srv; |
|
885
afdd81c2c44d
Allow /rename for groups
Mikael Berthe <mikael@lilotux.net>
parents:
873
diff
changeset
|
2143 |
|
afdd81c2c44d
Allow /rename for groups
Mikael Berthe <mikael@lilotux.net>
parents:
873
diff
changeset
|
2144 groupname = (char *)groupnamedata; |
|
afdd81c2c44d
Allow /rename for groups
Mikael Berthe <mikael@lilotux.net>
parents:
873
diff
changeset
|
2145 |
| 1058 | 2146 bjid = buddy_getjid(bud); |
|
885
afdd81c2c44d
Allow /rename for groups
Mikael Berthe <mikael@lilotux.net>
parents:
873
diff
changeset
|
2147 name = buddy_getname(bud); |
|
1980
3bcc57751283
Add 'muc_bookmark_autoupdate' (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents:
1979
diff
changeset
|
2148 type = buddy_gettype(bud); |
|
1976
e6beab22099b
Do not add items to roster with commands /move and /rename (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents:
1972
diff
changeset
|
2149 on_srv = buddy_getonserverflag(bud); |
|
e6beab22099b
Do not add items to roster with commands /move and /rename (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents:
1972
diff
changeset
|
2150 |
|
e6beab22099b
Do not add items to roster with commands /move and /rename (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents:
1972
diff
changeset
|
2151 if (on_srv) |
|
e6beab22099b
Do not add items to roster with commands /move and /rename (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents:
1972
diff
changeset
|
2152 xmpp_updatebuddy(bjid, name, *groupname ? groupname : NULL); |
|
1980
3bcc57751283
Add 'muc_bookmark_autoupdate' (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents:
1979
diff
changeset
|
2153 else { |
|
1978
986e514bec97
Fix changeset e6beab22099b (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents:
1976
diff
changeset
|
2154 buddy_setgroup(bud, (char *)groupname); |
|
1980
3bcc57751283
Add 'muc_bookmark_autoupdate' (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents:
1979
diff
changeset
|
2155 if ((type & ROSTER_TYPE_ROOM) && xmpp_is_bookmarked(bjid) && |
|
3bcc57751283
Add 'muc_bookmark_autoupdate' (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents:
1979
diff
changeset
|
2156 settings_opt_get_int("muc_bookmark_autoupdate")) |
|
3bcc57751283
Add 'muc_bookmark_autoupdate' (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents:
1979
diff
changeset
|
2157 room_bookmark(bud, NULL); |
|
3bcc57751283
Add 'muc_bookmark_autoupdate' (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents:
1979
diff
changeset
|
2158 } |
|
885
afdd81c2c44d
Allow /rename for groups
Mikael Berthe <mikael@lilotux.net>
parents:
873
diff
changeset
|
2159 } |
|
afdd81c2c44d
Allow /rename for groups
Mikael Berthe <mikael@lilotux.net>
parents:
873
diff
changeset
|
2160 |
|
336
eb994ee40029
Make some functions static
Mikael Berthe <mikael@lilotux.net>
parents:
330
diff
changeset
|
2161 static void do_rename(char *arg) |
| 208 | 2162 { |
| 2163 gpointer bud; | |
| 1058 | 2164 const char *bjid, *group; |
|
1356
7794d76ca90e
Warn if the user renames a local item
Mikael Berthe <mikael@lilotux.net>
parents:
1355
diff
changeset
|
2165 guint type, on_srv; |
| 208 | 2166 char *newname, *p; |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
2167 char *name_utf8; |
| 208 | 2168 |
| 1058 | 2169 if (!current_buddy) |
| 2170 return; | |
| 208 | 2171 bud = BUDDATA(current_buddy); |
| 2172 | |
|
1356
7794d76ca90e
Warn if the user renames a local item
Mikael Berthe <mikael@lilotux.net>
parents:
1355
diff
changeset
|
2173 bjid = buddy_getjid(bud); |
|
7794d76ca90e
Warn if the user renames a local item
Mikael Berthe <mikael@lilotux.net>
parents:
1355
diff
changeset
|
2174 group = buddy_getgroupname(bud); |
|
7794d76ca90e
Warn if the user renames a local item
Mikael Berthe <mikael@lilotux.net>
parents:
1355
diff
changeset
|
2175 type = buddy_gettype(bud); |
|
7794d76ca90e
Warn if the user renames a local item
Mikael Berthe <mikael@lilotux.net>
parents:
1355
diff
changeset
|
2176 on_srv = buddy_getonserverflag(bud); |
| 208 | 2177 |
|
885
afdd81c2c44d
Allow /rename for groups
Mikael Berthe <mikael@lilotux.net>
parents:
873
diff
changeset
|
2178 if (type & ROSTER_TYPE_SPECIAL) { |
|
afdd81c2c44d
Allow /rename for groups
Mikael Berthe <mikael@lilotux.net>
parents:
873
diff
changeset
|
2179 scr_LogPrint(LPRINT_NORMAL, "You can't rename this item."); |
| 208 | 2180 return; |
| 2181 } | |
|
885
afdd81c2c44d
Allow /rename for groups
Mikael Berthe <mikael@lilotux.net>
parents:
873
diff
changeset
|
2182 |
|
afdd81c2c44d
Allow /rename for groups
Mikael Berthe <mikael@lilotux.net>
parents:
873
diff
changeset
|
2183 if (!*arg && !(type & ROSTER_TYPE_GROUP)) { |
|
afdd81c2c44d
Allow /rename for groups
Mikael Berthe <mikael@lilotux.net>
parents:
873
diff
changeset
|
2184 scr_LogPrint(LPRINT_NORMAL, "Please specify a new name."); |
|
848
a9161d2dc414
Introduce special buffer stuff
Mikael Berthe <mikael@lilotux.net>
parents:
847
diff
changeset
|
2185 return; |
|
a9161d2dc414
Introduce special buffer stuff
Mikael Berthe <mikael@lilotux.net>
parents:
847
diff
changeset
|
2186 } |
| 208 | 2187 |
|
1976
e6beab22099b
Do not add items to roster with commands /move and /rename (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents:
1972
diff
changeset
|
2188 //if (!(type & ROSTER_TYPE_GROUP) && !on_srv) { |
|
e6beab22099b
Do not add items to roster with commands /move and /rename (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents:
1972
diff
changeset
|
2189 // scr_LogPrint(LPRINT_NORMAL, |
|
e6beab22099b
Do not add items to roster with commands /move and /rename (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents:
1972
diff
changeset
|
2190 // "Note: this item will be added to your server roster."); |
|
e6beab22099b
Do not add items to roster with commands /move and /rename (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents:
1972
diff
changeset
|
2191 // // If this is a MUC room w/o bookmark, let's give a small hint... |
|
e6beab22099b
Do not add items to roster with commands /move and /rename (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents:
1972
diff
changeset
|
2192 // if ((type & ROSTER_TYPE_ROOM) && !xmpp_is_bookmarked(bjid)) { |
|
e6beab22099b
Do not add items to roster with commands /move and /rename (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents:
1972
diff
changeset
|
2193 // scr_LogPrint(LPRINT_NORMAL, |
|
e6beab22099b
Do not add items to roster with commands /move and /rename (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents:
1972
diff
changeset
|
2194 // "You should add a room bookmark or it will not be " |
|
e6beab22099b
Do not add items to roster with commands /move and /rename (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents:
1972
diff
changeset
|
2195 // "recognized as a MUC room next time you run mcabber."); |
|
e6beab22099b
Do not add items to roster with commands /move and /rename (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents:
1972
diff
changeset
|
2196 // } |
|
e6beab22099b
Do not add items to roster with commands /move and /rename (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents:
1972
diff
changeset
|
2197 //} |
|
1356
7794d76ca90e
Warn if the user renames a local item
Mikael Berthe <mikael@lilotux.net>
parents:
1355
diff
changeset
|
2198 |
| 208 | 2199 newname = g_strdup(arg); |
| 2200 // Remove trailing space | |
| 2201 for (p = newname; *p; p++) ; | |
| 2202 while (p > newname && *p == ' ') *p = 0; | |
| 2203 | |
|
557
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
2204 strip_arg_special_chars(newname); |
|
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
2205 |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
2206 name_utf8 = to_utf8(newname); |
|
885
afdd81c2c44d
Allow /rename for groups
Mikael Berthe <mikael@lilotux.net>
parents:
873
diff
changeset
|
2207 |
|
afdd81c2c44d
Allow /rename for groups
Mikael Berthe <mikael@lilotux.net>
parents:
873
diff
changeset
|
2208 if (type & ROSTER_TYPE_GROUP) { |
|
afdd81c2c44d
Allow /rename for groups
Mikael Berthe <mikael@lilotux.net>
parents:
873
diff
changeset
|
2209 // Rename a whole group |
|
afdd81c2c44d
Allow /rename for groups
Mikael Berthe <mikael@lilotux.net>
parents:
873
diff
changeset
|
2210 foreach_group_member(bud, &move_group_member, name_utf8); |
|
afdd81c2c44d
Allow /rename for groups
Mikael Berthe <mikael@lilotux.net>
parents:
873
diff
changeset
|
2211 // Let's jump to the previous buddy, because this group name should |
|
afdd81c2c44d
Allow /rename for groups
Mikael Berthe <mikael@lilotux.net>
parents:
873
diff
changeset
|
2212 // disappear when we receive the server answer. |
|
1780
e4378fbab5d7
Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents:
1774
diff
changeset
|
2213 scr_roster_up_down(-1, 1); |
|
885
afdd81c2c44d
Allow /rename for groups
Mikael Berthe <mikael@lilotux.net>
parents:
873
diff
changeset
|
2214 } else { |
|
afdd81c2c44d
Allow /rename for groups
Mikael Berthe <mikael@lilotux.net>
parents:
873
diff
changeset
|
2215 // Rename a single buddy |
|
1527
ac87eef9050f
"/rename -" can be used to delete the nickname
Mikael Berthe <mikael@lilotux.net>
parents:
1525
diff
changeset
|
2216 guint del_name = 0; |
|
ac87eef9050f
"/rename -" can be used to delete the nickname
Mikael Berthe <mikael@lilotux.net>
parents:
1525
diff
changeset
|
2217 if (!*newname || !strcmp(arg, "-")) |
|
ac87eef9050f
"/rename -" can be used to delete the nickname
Mikael Berthe <mikael@lilotux.net>
parents:
1525
diff
changeset
|
2218 del_name = TRUE; |
|
1976
e6beab22099b
Do not add items to roster with commands /move and /rename (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents:
1972
diff
changeset
|
2219 if (on_srv) { |
|
e6beab22099b
Do not add items to roster with commands /move and /rename (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents:
1972
diff
changeset
|
2220 /* We do not rename the buddy right now because the server could reject |
|
e6beab22099b
Do not add items to roster with commands /move and /rename (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents:
1972
diff
changeset
|
2221 * the request. Let's wait for the server answer. |
|
e6beab22099b
Do not add items to roster with commands /move and /rename (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents:
1972
diff
changeset
|
2222 */ |
|
2030
0771e130f79d
/rename: Do not send empty group attribute when the contact has no group
Mikael Berthe <mikael@lilotux.net>
parents:
2024
diff
changeset
|
2223 xmpp_updatebuddy(bjid, (del_name ? NULL : name_utf8), |
|
0771e130f79d
/rename: Do not send empty group attribute when the contact has no group
Mikael Berthe <mikael@lilotux.net>
parents:
2024
diff
changeset
|
2224 group && *group ? group : NULL); |
|
1976
e6beab22099b
Do not add items to roster with commands /move and /rename (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents:
1972
diff
changeset
|
2225 } else { |
|
e6beab22099b
Do not add items to roster with commands /move and /rename (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents:
1972
diff
changeset
|
2226 // This is a local item, we rename it without adding to roster. |
|
e6beab22099b
Do not add items to roster with commands /move and /rename (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents:
1972
diff
changeset
|
2227 buddy_setname(bud, (del_name ? (char*)bjid : name_utf8)); |
|
1980
3bcc57751283
Add 'muc_bookmark_autoupdate' (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents:
1979
diff
changeset
|
2228 if ((type & ROSTER_TYPE_ROOM) && xmpp_is_bookmarked(bjid) && |
|
3bcc57751283
Add 'muc_bookmark_autoupdate' (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents:
1979
diff
changeset
|
2229 settings_opt_get_int("muc_bookmark_autoupdate")) |
|
3bcc57751283
Add 'muc_bookmark_autoupdate' (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents:
1979
diff
changeset
|
2230 room_bookmark(bud, NULL); |
|
1976
e6beab22099b
Do not add items to roster with commands /move and /rename (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents:
1972
diff
changeset
|
2231 } |
|
885
afdd81c2c44d
Allow /rename for groups
Mikael Berthe <mikael@lilotux.net>
parents:
873
diff
changeset
|
2232 } |
| 208 | 2233 |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
2234 g_free(name_utf8); |
| 208 | 2235 g_free(newname); |
| 2236 update_roster = TRUE; | |
| 2237 } | |
| 2238 | |
|
336
eb994ee40029
Make some functions static
Mikael Berthe <mikael@lilotux.net>
parents:
330
diff
changeset
|
2239 static void do_move(char *arg) |
| 210 | 2240 { |
| 2241 gpointer bud; | |
| 1058 | 2242 const char *bjid, *name, *oldgroupname; |
|
1976
e6beab22099b
Do not add items to roster with commands /move and /rename (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents:
1972
diff
changeset
|
2243 guint type, on_srv; |
| 210 | 2244 char *newgroupname, *p; |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
2245 char *group_utf8; |
| 210 | 2246 |
| 1058 | 2247 if (!current_buddy) |
| 2248 return; | |
| 210 | 2249 bud = BUDDATA(current_buddy); |
| 2250 | |
| 1058 | 2251 bjid = buddy_getjid(bud); |
| 210 | 2252 name = buddy_getname(bud); |
| 2253 type = buddy_gettype(bud); | |
|
1976
e6beab22099b
Do not add items to roster with commands /move and /rename (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents:
1972
diff
changeset
|
2254 on_srv = buddy_getonserverflag(bud); |
| 210 | 2255 |
|
620
97dd14e22b2a
Rewrite buddy_setgroup()
Mikael Berthe <mikael@lilotux.net>
parents:
617
diff
changeset
|
2256 oldgroupname = buddy_getgroupname(bud); |
|
97dd14e22b2a
Rewrite buddy_setgroup()
Mikael Berthe <mikael@lilotux.net>
parents:
617
diff
changeset
|
2257 |
| 210 | 2258 if (type & ROSTER_TYPE_GROUP) { |
|
374
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
371
diff
changeset
|
2259 scr_LogPrint(LPRINT_NORMAL, "You can't move groups!"); |
| 210 | 2260 return; |
| 2261 } | |
|
848
a9161d2dc414
Introduce special buffer stuff
Mikael Berthe <mikael@lilotux.net>
parents:
847
diff
changeset
|
2262 if (type & ROSTER_TYPE_SPECIAL) { |
|
a9161d2dc414
Introduce special buffer stuff
Mikael Berthe <mikael@lilotux.net>
parents:
847
diff
changeset
|
2263 scr_LogPrint(LPRINT_NORMAL, "You can't move this item."); |
|
a9161d2dc414
Introduce special buffer stuff
Mikael Berthe <mikael@lilotux.net>
parents:
847
diff
changeset
|
2264 return; |
|
a9161d2dc414
Introduce special buffer stuff
Mikael Berthe <mikael@lilotux.net>
parents:
847
diff
changeset
|
2265 } |
| 210 | 2266 |
| 2267 newgroupname = g_strdup(arg); | |
| 2268 // Remove trailing space | |
| 2269 for (p = newgroupname; *p; p++) ; | |
|
608
89f5672eb523
/move: really strip trailing space, and assign to no group if no group is specified
Mikael Berthe <mikael@lilotux.net>
parents:
604
diff
changeset
|
2270 while (p > newgroupname && *p == ' ') *p-- = 0; |
| 210 | 2271 |
|
557
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
2272 strip_arg_special_chars(newgroupname); |
|
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
2273 |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
2274 group_utf8 = to_utf8(newgroupname); |
|
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
2275 if (strcmp(oldgroupname, group_utf8)) { |
|
1976
e6beab22099b
Do not add items to roster with commands /move and /rename (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents:
1972
diff
changeset
|
2276 if (on_srv) { |
|
e6beab22099b
Do not add items to roster with commands /move and /rename (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents:
1972
diff
changeset
|
2277 xmpp_updatebuddy(bjid, name, *group_utf8 ? group_utf8 : NULL); |
|
e6beab22099b
Do not add items to roster with commands /move and /rename (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents:
1972
diff
changeset
|
2278 scr_roster_up_down(-1, 1); |
|
e6beab22099b
Do not add items to roster with commands /move and /rename (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents:
1972
diff
changeset
|
2279 |
|
e6beab22099b
Do not add items to roster with commands /move and /rename (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents:
1972
diff
changeset
|
2280 /* We do not move the buddy right now because the server could reject |
|
e6beab22099b
Do not add items to roster with commands /move and /rename (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents:
1972
diff
changeset
|
2281 * the request. Let's wait for the server answer. |
|
e6beab22099b
Do not add items to roster with commands /move and /rename (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents:
1972
diff
changeset
|
2282 */ |
|
e6beab22099b
Do not add items to roster with commands /move and /rename (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents:
1972
diff
changeset
|
2283 } else { |
|
e6beab22099b
Do not add items to roster with commands /move and /rename (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents:
1972
diff
changeset
|
2284 // This is a local item, we move it without adding to roster. |
|
e6beab22099b
Do not add items to roster with commands /move and /rename (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents:
1972
diff
changeset
|
2285 guint msgflag; |
|
e6beab22099b
Do not add items to roster with commands /move and /rename (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents:
1972
diff
changeset
|
2286 |
|
e6beab22099b
Do not add items to roster with commands /move and /rename (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents:
1972
diff
changeset
|
2287 // If the buddy has a pending message flag, |
|
e6beab22099b
Do not add items to roster with commands /move and /rename (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents:
1972
diff
changeset
|
2288 // we remove it temporarily in order to reset the global group |
|
e6beab22099b
Do not add items to roster with commands /move and /rename (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents:
1972
diff
changeset
|
2289 // flag. We set it back once the room is in the new group, |
|
e6beab22099b
Do not add items to roster with commands /move and /rename (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents:
1972
diff
changeset
|
2290 // which will update the new group's flag. |
|
e6beab22099b
Do not add items to roster with commands /move and /rename (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents:
1972
diff
changeset
|
2291 msgflag = buddy_getflags(bud) & ROSTER_FLAG_MSG; |
|
e6beab22099b
Do not add items to roster with commands /move and /rename (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents:
1972
diff
changeset
|
2292 if (msgflag) |
|
e6beab22099b
Do not add items to roster with commands /move and /rename (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents:
1972
diff
changeset
|
2293 roster_msg_setflag(bjid, FALSE, FALSE); |
|
e6beab22099b
Do not add items to roster with commands /move and /rename (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents:
1972
diff
changeset
|
2294 buddy_setgroup(bud, group_utf8); |
|
e6beab22099b
Do not add items to roster with commands /move and /rename (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents:
1972
diff
changeset
|
2295 if (msgflag) |
|
e6beab22099b
Do not add items to roster with commands /move and /rename (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents:
1972
diff
changeset
|
2296 roster_msg_setflag(bjid, FALSE, TRUE); |
|
1980
3bcc57751283
Add 'muc_bookmark_autoupdate' (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents:
1979
diff
changeset
|
2297 if ((type & ROSTER_TYPE_ROOM) && xmpp_is_bookmarked(bjid) && |
|
3bcc57751283
Add 'muc_bookmark_autoupdate' (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents:
1979
diff
changeset
|
2298 settings_opt_get_int("muc_bookmark_autoupdate")) |
|
3bcc57751283
Add 'muc_bookmark_autoupdate' (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents:
1979
diff
changeset
|
2299 room_bookmark(bud, NULL); |
|
1976
e6beab22099b
Do not add items to roster with commands /move and /rename (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents:
1972
diff
changeset
|
2300 } |
|
620
97dd14e22b2a
Rewrite buddy_setgroup()
Mikael Berthe <mikael@lilotux.net>
parents:
617
diff
changeset
|
2301 } |
| 210 | 2302 |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
2303 g_free(group_utf8); |
| 210 | 2304 g_free(newgroupname); |
| 2305 update_roster = TRUE; | |
| 2306 } | |
| 2307 | |
|
1760
106bbf7e97da
Sort and pretty-format options list
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1749
diff
changeset
|
2308 static void list_option_cb(char *k, char *v, void *f) |
|
1661
64a7428afcb3
Print list of options with '/set'
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1653
diff
changeset
|
2309 { |
|
1772
c450d1e66c2e
Don't let "/set" show the password with all other variables
Mikael Berthe <mikael@lilotux.net>
parents:
1761
diff
changeset
|
2310 if (strcmp(k, "password")) { |
|
c450d1e66c2e
Don't let "/set" show the password with all other variables
Mikael Berthe <mikael@lilotux.net>
parents:
1761
diff
changeset
|
2311 GSList **list = f; |
|
c450d1e66c2e
Don't let "/set" show the password with all other variables
Mikael Berthe <mikael@lilotux.net>
parents:
1761
diff
changeset
|
2312 *list = g_slist_insert_sorted(*list, k, (GCompareFunc)strcmp); |
|
c450d1e66c2e
Don't let "/set" show the password with all other variables
Mikael Berthe <mikael@lilotux.net>
parents:
1761
diff
changeset
|
2313 } |
|
1661
64a7428afcb3
Print list of options with '/set'
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1653
diff
changeset
|
2314 } |
|
64a7428afcb3
Print list of options with '/set'
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1653
diff
changeset
|
2315 |
|
336
eb994ee40029
Make some functions static
Mikael Berthe <mikael@lilotux.net>
parents:
330
diff
changeset
|
2316 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
|
2317 { |
|
00b2377539ac
Add /set command (to get/set/unset options values)
Mikael Berthe <mikael@lilotux.net>
parents:
277
diff
changeset
|
2318 guint assign; |
|
1074
b2fc694a8228
Fix a few memory leaks after calls to parse_assigment()
Mikael Berthe <mikael@lilotux.net>
parents:
1073
diff
changeset
|
2319 gchar *option, *value; |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
2320 gchar *option_utf8; |
| 393 | 2321 |
|
1661
64a7428afcb3
Print list of options with '/set'
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1653
diff
changeset
|
2322 if (!*arg) { |
|
64a7428afcb3
Print list of options with '/set'
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1653
diff
changeset
|
2323 // list all set options |
|
1760
106bbf7e97da
Sort and pretty-format options list
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1749
diff
changeset
|
2324 GSList *list = NULL; |
|
106bbf7e97da
Sort and pretty-format options list
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1749
diff
changeset
|
2325 // Get sorted list of keys |
|
106bbf7e97da
Sort and pretty-format options list
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1749
diff
changeset
|
2326 settings_foreach(SETTINGS_TYPE_OPTION, list_option_cb, &list); |
|
106bbf7e97da
Sort and pretty-format options list
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1749
diff
changeset
|
2327 if (list) { |
|
106bbf7e97da
Sort and pretty-format options list
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1749
diff
changeset
|
2328 gsize max = 0; |
|
1761
61f0482d3993
Limit = alignment to 1/3 of screen in option list
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1760
diff
changeset
|
2329 gsize maxmax = scr_gettextwidth() / 3; |
|
1760
106bbf7e97da
Sort and pretty-format options list
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1749
diff
changeset
|
2330 GSList *lel; |
|
106bbf7e97da
Sort and pretty-format options list
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1749
diff
changeset
|
2331 gchar *format; |
|
106bbf7e97da
Sort and pretty-format options list
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1749
diff
changeset
|
2332 // Find out maximum key length |
|
106bbf7e97da
Sort and pretty-format options list
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1749
diff
changeset
|
2333 for (lel = list; lel; lel = lel->next) { |
|
106bbf7e97da
Sort and pretty-format options list
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1749
diff
changeset
|
2334 const gchar *key = lel->data; |
|
106bbf7e97da
Sort and pretty-format options list
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1749
diff
changeset
|
2335 gsize len = strlen(key); |
|
1761
61f0482d3993
Limit = alignment to 1/3 of screen in option list
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1760
diff
changeset
|
2336 if (len > max) { |
|
1760
106bbf7e97da
Sort and pretty-format options list
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1749
diff
changeset
|
2337 max = len; |
|
1761
61f0482d3993
Limit = alignment to 1/3 of screen in option list
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1760
diff
changeset
|
2338 if (max > maxmax) { |
|
61f0482d3993
Limit = alignment to 1/3 of screen in option list
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1760
diff
changeset
|
2339 max = maxmax; |
|
61f0482d3993
Limit = alignment to 1/3 of screen in option list
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1760
diff
changeset
|
2340 break; |
|
61f0482d3993
Limit = alignment to 1/3 of screen in option list
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1760
diff
changeset
|
2341 } |
|
61f0482d3993
Limit = alignment to 1/3 of screen in option list
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1760
diff
changeset
|
2342 } |
|
1760
106bbf7e97da
Sort and pretty-format options list
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1749
diff
changeset
|
2343 } |
|
106bbf7e97da
Sort and pretty-format options list
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1749
diff
changeset
|
2344 // Print out list of options |
| 1774 | 2345 format = g_strdup_printf("%%-%us = [%%s]", (unsigned)max); |
|
1760
106bbf7e97da
Sort and pretty-format options list
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1749
diff
changeset
|
2346 for (lel = list; lel; lel = lel->next) { |
|
106bbf7e97da
Sort and pretty-format options list
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1749
diff
changeset
|
2347 const gchar *key = lel->data; |
|
106bbf7e97da
Sort and pretty-format options list
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1749
diff
changeset
|
2348 scr_LogPrint(LPRINT_NORMAL, format, key, settings_opt_get(key)); |
|
106bbf7e97da
Sort and pretty-format options list
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1749
diff
changeset
|
2349 } |
|
106bbf7e97da
Sort and pretty-format options list
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1749
diff
changeset
|
2350 g_free(format); |
|
106bbf7e97da
Sort and pretty-format options list
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1749
diff
changeset
|
2351 scr_setmsgflag_if_needed(SPECIAL_BUFFER_STATUS_ID, TRUE); |
|
1815
6abca6000762
Make use of ROSTER_UI_PRIO_STATUS_WIN_MESSAGE
Mikael Berthe <mikael@lilotux.net>
parents:
1811
diff
changeset
|
2352 scr_setattentionflag_if_needed(SPECIAL_BUFFER_STATUS_ID, TRUE, |
|
6abca6000762
Make use of ROSTER_UI_PRIO_STATUS_WIN_MESSAGE
Mikael Berthe <mikael@lilotux.net>
parents:
1811
diff
changeset
|
2353 ROSTER_UI_PRIO_STATUS_WIN_MESSAGE, prio_max); |
|
1760
106bbf7e97da
Sort and pretty-format options list
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1749
diff
changeset
|
2354 } else |
|
106bbf7e97da
Sort and pretty-format options list
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1749
diff
changeset
|
2355 scr_LogPrint(LPRINT_NORMAL, "No options found."); |
|
1661
64a7428afcb3
Print list of options with '/set'
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1653
diff
changeset
|
2356 return; |
|
64a7428afcb3
Print list of options with '/set'
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1653
diff
changeset
|
2357 } |
|
64a7428afcb3
Print list of options with '/set'
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1653
diff
changeset
|
2358 |
|
283
00b2377539ac
Add /set command (to get/set/unset options values)
Mikael Berthe <mikael@lilotux.net>
parents:
277
diff
changeset
|
2359 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
|
2360 if (!option) { |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
2361 scr_LogPrint(LPRINT_NORMAL, "Set what option?"); |
|
283
00b2377539ac
Add /set command (to get/set/unset options values)
Mikael Berthe <mikael@lilotux.net>
parents:
277
diff
changeset
|
2362 return; |
|
00b2377539ac
Add /set command (to get/set/unset options values)
Mikael Berthe <mikael@lilotux.net>
parents:
277
diff
changeset
|
2363 } |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
2364 option_utf8 = to_utf8(option); |
|
1074
b2fc694a8228
Fix a few memory leaks after calls to parse_assigment()
Mikael Berthe <mikael@lilotux.net>
parents:
1073
diff
changeset
|
2365 g_free(option); |
|
b2fc694a8228
Fix a few memory leaks after calls to parse_assigment()
Mikael Berthe <mikael@lilotux.net>
parents:
1073
diff
changeset
|
2366 if (!assign) { // This is a query |
|
b2fc694a8228
Fix a few memory leaks after calls to parse_assigment()
Mikael Berthe <mikael@lilotux.net>
parents:
1073
diff
changeset
|
2367 const char *val = settings_opt_get(option_utf8); |
|
b2fc694a8228
Fix a few memory leaks after calls to parse_assigment()
Mikael Berthe <mikael@lilotux.net>
parents:
1073
diff
changeset
|
2368 if (val) |
|
b2fc694a8228
Fix a few memory leaks after calls to parse_assigment()
Mikael Berthe <mikael@lilotux.net>
parents:
1073
diff
changeset
|
2369 scr_LogPrint(LPRINT_NORMAL, "%s = [%s]", option_utf8, val); |
|
b2fc694a8228
Fix a few memory leaks after calls to parse_assigment()
Mikael Berthe <mikael@lilotux.net>
parents:
1073
diff
changeset
|
2370 else |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
2371 scr_LogPrint(LPRINT_NORMAL, "Option %s is not set", option_utf8); |
|
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
2372 g_free(option_utf8); |
|
283
00b2377539ac
Add /set command (to get/set/unset options values)
Mikael Berthe <mikael@lilotux.net>
parents:
277
diff
changeset
|
2373 return; |
|
00b2377539ac
Add /set command (to get/set/unset options values)
Mikael Berthe <mikael@lilotux.net>
parents:
277
diff
changeset
|
2374 } |
|
00b2377539ac
Add /set command (to get/set/unset options values)
Mikael Berthe <mikael@lilotux.net>
parents:
277
diff
changeset
|
2375 // Update the option |
|
1074
b2fc694a8228
Fix a few memory leaks after calls to parse_assigment()
Mikael Berthe <mikael@lilotux.net>
parents:
1073
diff
changeset
|
2376 // Maybe some options should be protected when user is connected (server, |
|
b2fc694a8228
Fix a few memory leaks after calls to parse_assigment()
Mikael Berthe <mikael@lilotux.net>
parents:
1073
diff
changeset
|
2377 // username, etc.). And we should catch some options here, too |
|
283
00b2377539ac
Add /set command (to get/set/unset options values)
Mikael Berthe <mikael@lilotux.net>
parents:
277
diff
changeset
|
2378 // (hide_offline_buddies for ex.) |
|
00b2377539ac
Add /set command (to get/set/unset options values)
Mikael Berthe <mikael@lilotux.net>
parents:
277
diff
changeset
|
2379 if (!value) { |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
2380 settings_del(SETTINGS_TYPE_OPTION, option_utf8); |
|
283
00b2377539ac
Add /set command (to get/set/unset options values)
Mikael Berthe <mikael@lilotux.net>
parents:
277
diff
changeset
|
2381 } else { |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
2382 gchar *value_utf8 = to_utf8(value); |
|
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
2383 settings_set(SETTINGS_TYPE_OPTION, option_utf8, value_utf8); |
|
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
2384 g_free(value_utf8); |
|
1074
b2fc694a8228
Fix a few memory leaks after calls to parse_assigment()
Mikael Berthe <mikael@lilotux.net>
parents:
1073
diff
changeset
|
2385 g_free(value); |
|
283
00b2377539ac
Add /set command (to get/set/unset options values)
Mikael Berthe <mikael@lilotux.net>
parents:
277
diff
changeset
|
2386 } |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
2387 g_free(option_utf8); |
|
283
00b2377539ac
Add /set command (to get/set/unset options values)
Mikael Berthe <mikael@lilotux.net>
parents:
277
diff
changeset
|
2388 } |
|
00b2377539ac
Add /set command (to get/set/unset options values)
Mikael Berthe <mikael@lilotux.net>
parents:
277
diff
changeset
|
2389 |
|
1070
9eaacc0ad3a2
Use a hash for settings
Mikael Berthe <mikael@lilotux.net>
parents:
1066
diff
changeset
|
2390 static void dump_alias(char *k, char *v, void *param) |
|
867
7f056c566569
Commands /alias & /bind list the key bindings and aliases
Mikael Berthe <mikael@lilotux.net>
parents:
866
diff
changeset
|
2391 { |
|
7f056c566569
Commands /alias & /bind list the key bindings and aliases
Mikael Berthe <mikael@lilotux.net>
parents:
866
diff
changeset
|
2392 scr_LogPrint(LPRINT_NORMAL|LPRINT_NOTUTF8, "Alias %s = %s", k, v); |
|
1745
5ef7629a96ff
Set the message flag when using /set, /bind or /alias
Mikael Berthe <mikael@lilotux.net>
parents:
1740
diff
changeset
|
2393 scr_setmsgflag_if_needed(SPECIAL_BUFFER_STATUS_ID, TRUE); |
|
1815
6abca6000762
Make use of ROSTER_UI_PRIO_STATUS_WIN_MESSAGE
Mikael Berthe <mikael@lilotux.net>
parents:
1811
diff
changeset
|
2394 scr_setattentionflag_if_needed(SPECIAL_BUFFER_STATUS_ID, TRUE, |
|
6abca6000762
Make use of ROSTER_UI_PRIO_STATUS_WIN_MESSAGE
Mikael Berthe <mikael@lilotux.net>
parents:
1811
diff
changeset
|
2395 ROSTER_UI_PRIO_STATUS_WIN_MESSAGE, prio_max); |
|
867
7f056c566569
Commands /alias & /bind list the key bindings and aliases
Mikael Berthe <mikael@lilotux.net>
parents:
866
diff
changeset
|
2396 } |
|
7f056c566569
Commands /alias & /bind list the key bindings and aliases
Mikael Berthe <mikael@lilotux.net>
parents:
866
diff
changeset
|
2397 |
|
336
eb994ee40029
Make some functions static
Mikael Berthe <mikael@lilotux.net>
parents:
330
diff
changeset
|
2398 static void do_alias(char *arg) |
| 285 | 2399 { |
| 2400 guint assign; | |
|
1074
b2fc694a8228
Fix a few memory leaks after calls to parse_assigment()
Mikael Berthe <mikael@lilotux.net>
parents:
1073
diff
changeset
|
2401 gchar *alias, *value; |
| 393 | 2402 |
| 285 | 2403 assign = parse_assigment(arg, &alias, &value); |
| 2404 if (!alias) { | |
|
867
7f056c566569
Commands /alias & /bind list the key bindings and aliases
Mikael Berthe <mikael@lilotux.net>
parents:
866
diff
changeset
|
2405 settings_foreach(SETTINGS_TYPE_ALIAS, &dump_alias, NULL); |
|
1745
5ef7629a96ff
Set the message flag when using /set, /bind or /alias
Mikael Berthe <mikael@lilotux.net>
parents:
1740
diff
changeset
|
2406 update_roster = TRUE; |
| 285 | 2407 return; |
| 2408 } | |
|
1074
b2fc694a8228
Fix a few memory leaks after calls to parse_assigment()
Mikael Berthe <mikael@lilotux.net>
parents:
1073
diff
changeset
|
2409 if (!assign) { // This is a query |
|
b2fc694a8228
Fix a few memory leaks after calls to parse_assigment()
Mikael Berthe <mikael@lilotux.net>
parents:
1073
diff
changeset
|
2410 const char *val = settings_get(SETTINGS_TYPE_ALIAS, alias); |
|
b2fc694a8228
Fix a few memory leaks after calls to parse_assigment()
Mikael Berthe <mikael@lilotux.net>
parents:
1073
diff
changeset
|
2411 // NOTE: LPRINT_NOTUTF8 here, see below why it isn't encoded... |
|
b2fc694a8228
Fix a few memory leaks after calls to parse_assigment()
Mikael Berthe <mikael@lilotux.net>
parents:
1073
diff
changeset
|
2412 if (val) |
|
b2fc694a8228
Fix a few memory leaks after calls to parse_assigment()
Mikael Berthe <mikael@lilotux.net>
parents:
1073
diff
changeset
|
2413 scr_LogPrint(LPRINT_NORMAL|LPRINT_NOTUTF8, "%s = %s", alias, val); |
|
b2fc694a8228
Fix a few memory leaks after calls to parse_assigment()
Mikael Berthe <mikael@lilotux.net>
parents:
1073
diff
changeset
|
2414 else |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
2415 scr_LogPrint(LPRINT_NORMAL|LPRINT_NOTUTF8, |
|
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
2416 "Alias '%s' does not exist", alias); |
|
1074
b2fc694a8228
Fix a few memory leaks after calls to parse_assigment()
Mikael Berthe <mikael@lilotux.net>
parents:
1073
diff
changeset
|
2417 goto do_alias_return; |
| 285 | 2418 } |
| 2419 // Check the alias does not conflict with a registered command | |
| 2420 if (cmd_get(alias)) { | |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
2421 scr_LogPrint(LPRINT_NORMAL|LPRINT_NOTUTF8, |
|
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
2422 "'%s' is a reserved word!", alias); |
|
1074
b2fc694a8228
Fix a few memory leaks after calls to parse_assigment()
Mikael Berthe <mikael@lilotux.net>
parents:
1073
diff
changeset
|
2423 goto do_alias_return; |
| 285 | 2424 } |
| 2425 // Update the alias | |
| 2426 if (!value) { | |
| 2427 if (settings_get(SETTINGS_TYPE_ALIAS, alias)) { | |
| 2428 settings_del(SETTINGS_TYPE_ALIAS, alias); | |
| 2429 // Remove alias from the completion list | |
| 2430 compl_del_category_word(COMPL_CMD, alias); | |
| 2431 } | |
| 2432 } else { | |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
2433 /* Add alias to the completion list, if not already in. |
|
1074
b2fc694a8228
Fix a few memory leaks after calls to parse_assigment()
Mikael Berthe <mikael@lilotux.net>
parents:
1073
diff
changeset
|
2434 NOTE: We're not UTF8-encoding "alias" and "value" here because UTF-8 is |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
2435 not yet supported in the UI... (and we use the values in the completion |
|
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
2436 system) |
|
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
2437 */ |
| 285 | 2438 if (!settings_get(SETTINGS_TYPE_ALIAS, alias)) |
| 2439 compl_add_category_word(COMPL_CMD, alias); | |
| 2440 settings_set(SETTINGS_TYPE_ALIAS, alias, value); | |
|
1074
b2fc694a8228
Fix a few memory leaks after calls to parse_assigment()
Mikael Berthe <mikael@lilotux.net>
parents:
1073
diff
changeset
|
2441 g_free(value); |
| 285 | 2442 } |
|
1074
b2fc694a8228
Fix a few memory leaks after calls to parse_assigment()
Mikael Berthe <mikael@lilotux.net>
parents:
1073
diff
changeset
|
2443 do_alias_return: |
|
b2fc694a8228
Fix a few memory leaks after calls to parse_assigment()
Mikael Berthe <mikael@lilotux.net>
parents:
1073
diff
changeset
|
2444 g_free(alias); |
| 285 | 2445 } |
| 2446 | |
|
1070
9eaacc0ad3a2
Use a hash for settings
Mikael Berthe <mikael@lilotux.net>
parents:
1066
diff
changeset
|
2447 static void dump_bind(char *k, char *v, void *param) |
|
867
7f056c566569
Commands /alias & /bind list the key bindings and aliases
Mikael Berthe <mikael@lilotux.net>
parents:
866
diff
changeset
|
2448 { |
|
7f056c566569
Commands /alias & /bind list the key bindings and aliases
Mikael Berthe <mikael@lilotux.net>
parents:
866
diff
changeset
|
2449 scr_LogPrint(LPRINT_NORMAL, "Key %4s is bound to: %s", k, v); |
|
7f056c566569
Commands /alias & /bind list the key bindings and aliases
Mikael Berthe <mikael@lilotux.net>
parents:
866
diff
changeset
|
2450 } |
|
7f056c566569
Commands /alias & /bind list the key bindings and aliases
Mikael Berthe <mikael@lilotux.net>
parents:
866
diff
changeset
|
2451 |
|
336
eb994ee40029
Make some functions static
Mikael Berthe <mikael@lilotux.net>
parents:
330
diff
changeset
|
2452 static void do_bind(char *arg) |
| 288 | 2453 { |
| 2454 guint assign; | |
|
1074
b2fc694a8228
Fix a few memory leaks after calls to parse_assigment()
Mikael Berthe <mikael@lilotux.net>
parents:
1073
diff
changeset
|
2455 gchar *k_code, *value; |
| 393 | 2456 |
| 1058 | 2457 assign = parse_assigment(arg, &k_code, &value); |
| 2458 if (!k_code) { | |
|
867
7f056c566569
Commands /alias & /bind list the key bindings and aliases
Mikael Berthe <mikael@lilotux.net>
parents:
866
diff
changeset
|
2459 settings_foreach(SETTINGS_TYPE_BINDING, &dump_bind, NULL); |
|
1745
5ef7629a96ff
Set the message flag when using /set, /bind or /alias
Mikael Berthe <mikael@lilotux.net>
parents:
1740
diff
changeset
|
2460 scr_setmsgflag_if_needed(SPECIAL_BUFFER_STATUS_ID, TRUE); |
|
1815
6abca6000762
Make use of ROSTER_UI_PRIO_STATUS_WIN_MESSAGE
Mikael Berthe <mikael@lilotux.net>
parents:
1811
diff
changeset
|
2461 scr_setattentionflag_if_needed(SPECIAL_BUFFER_STATUS_ID, TRUE, |
|
6abca6000762
Make use of ROSTER_UI_PRIO_STATUS_WIN_MESSAGE
Mikael Berthe <mikael@lilotux.net>
parents:
1811
diff
changeset
|
2462 ROSTER_UI_PRIO_STATUS_WIN_MESSAGE, prio_max); |
| 288 | 2463 return; |
| 2464 } | |
|
1074
b2fc694a8228
Fix a few memory leaks after calls to parse_assigment()
Mikael Berthe <mikael@lilotux.net>
parents:
1073
diff
changeset
|
2465 if (!assign) { // This is a query |
|
b2fc694a8228
Fix a few memory leaks after calls to parse_assigment()
Mikael Berthe <mikael@lilotux.net>
parents:
1073
diff
changeset
|
2466 const char *val = settings_get(SETTINGS_TYPE_BINDING, k_code); |
|
b2fc694a8228
Fix a few memory leaks after calls to parse_assigment()
Mikael Berthe <mikael@lilotux.net>
parents:
1073
diff
changeset
|
2467 if (val) |
|
b2fc694a8228
Fix a few memory leaks after calls to parse_assigment()
Mikael Berthe <mikael@lilotux.net>
parents:
1073
diff
changeset
|
2468 scr_LogPrint(LPRINT_NORMAL, "Key %s is bound to: %s", k_code, val); |
|
b2fc694a8228
Fix a few memory leaks after calls to parse_assigment()
Mikael Berthe <mikael@lilotux.net>
parents:
1073
diff
changeset
|
2469 else |
| 1058 | 2470 scr_LogPrint(LPRINT_NORMAL, "Key %s is not bound.", k_code); |
|
1074
b2fc694a8228
Fix a few memory leaks after calls to parse_assigment()
Mikael Berthe <mikael@lilotux.net>
parents:
1073
diff
changeset
|
2471 g_free(k_code); |
| 288 | 2472 return; |
| 2473 } | |
| 2474 // Update the key binding | |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
2475 if (!value) { |
| 1058 | 2476 settings_del(SETTINGS_TYPE_BINDING, k_code); |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
2477 } else { |
|
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
2478 gchar *value_utf8 = to_utf8(value); |
| 1058 | 2479 settings_set(SETTINGS_TYPE_BINDING, k_code, value_utf8); |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
2480 g_free(value_utf8); |
|
1074
b2fc694a8228
Fix a few memory leaks after calls to parse_assigment()
Mikael Berthe <mikael@lilotux.net>
parents:
1073
diff
changeset
|
2481 g_free(value); |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
2482 } |
|
1074
b2fc694a8228
Fix a few memory leaks after calls to parse_assigment()
Mikael Berthe <mikael@lilotux.net>
parents:
1073
diff
changeset
|
2483 g_free(k_code); |
| 288 | 2484 } |
| 2485 | |
| 436 | 2486 static void do_rawxml(char *arg) |
| 2487 { | |
|
557
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
2488 char **paramlst; |
|
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
2489 char *subcmd; |
|
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
2490 |
|
1684
95df4ea512c8
Provide xmpp_is_online()
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1682
diff
changeset
|
2491 if (!xmpp_is_online()) { |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
2492 scr_LogPrint(LPRINT_NORMAL, "You are not connected."); |
|
472
75442262c082
Disable some commands when not connected
Mikael Berthe <mikael@lilotux.net>
parents:
471
diff
changeset
|
2493 return; |
|
75442262c082
Disable some commands when not connected
Mikael Berthe <mikael@lilotux.net>
parents:
471
diff
changeset
|
2494 } |
|
75442262c082
Disable some commands when not connected
Mikael Berthe <mikael@lilotux.net>
parents:
471
diff
changeset
|
2495 |
|
557
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
2496 paramlst = split_arg(arg, 2, 1); // subcmd, arg |
|
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
2497 subcmd = *paramlst; |
|
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
2498 arg = *(paramlst+1); |
|
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
2499 |
|
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
2500 if (!subcmd || !*subcmd) { |
|
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
2501 scr_LogPrint(LPRINT_NORMAL, "Please read the manual page" |
|
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
2502 " before using /rawxml :-)"); |
|
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
2503 free_arg_lst(paramlst); |
|
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
2504 return; |
|
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
2505 } |
|
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
2506 |
|
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
2507 if (!strcasecmp(subcmd, "send")) { |
|
461
1d8f5b3a5f2b
Convert /rawxml argument to UTF8
Mikael Berthe <mikael@lilotux.net>
parents:
454
diff
changeset
|
2508 gchar *buffer; |
|
557
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
2509 |
|
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
2510 if (!subcmd || !*subcmd) { |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
2511 scr_LogPrint(LPRINT_NORMAL, "Missing parameter."); |
|
557
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
2512 free_arg_lst(paramlst); |
|
461
1d8f5b3a5f2b
Convert /rawxml argument to UTF8
Mikael Berthe <mikael@lilotux.net>
parents:
454
diff
changeset
|
2513 return; |
|
1d8f5b3a5f2b
Convert /rawxml argument to UTF8
Mikael Berthe <mikael@lilotux.net>
parents:
454
diff
changeset
|
2514 } |
|
557
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
2515 |
|
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
2516 // We don't strip_arg_special_chars() here, because it would be a pain for |
|
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
2517 // the user to escape quotes in a XML stream... |
|
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
2518 |
|
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
2519 buffer = to_utf8(arg); |
|
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
2520 if (buffer) { |
|
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
2521 scr_LogPrint(LPRINT_NORMAL, "Sending XML string"); |
| 1598 | 2522 lm_connection_send_raw(lconnection, buffer, NULL); |
|
557
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
2523 g_free(buffer); |
|
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
2524 } else { |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
2525 scr_LogPrint(LPRINT_NORMAL, "Conversion error in XML string."); |
|
557
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
2526 } |
| 436 | 2527 } else { |
|
557
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
2528 scr_LogPrint(LPRINT_NORMAL, "Unrecognized parameter!"); |
| 436 | 2529 } |
|
557
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
2530 |
|
c72a66dfd2d4
Use split_arg() in most commands
Mikael Berthe <mikael@lilotux.net>
parents:
555
diff
changeset
|
2531 free_arg_lst(paramlst); |
| 436 | 2532 } |
| 2533 | |
|
554
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
552
diff
changeset
|
2534 // check_room_subcommand(arg, param_needed, buddy_must_be_a_room) |
| 552 | 2535 // - Check if this is a room, if buddy_must_be_a_room is not null |
| 2536 // - Check there is at least 1 parameter, if param_needed is true | |
| 2537 // - Return null if one of the checks fails, or a pointer to the first | |
| 2538 // non-space character. | |
|
554
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
552
diff
changeset
|
2539 static char *check_room_subcommand(char *arg, bool param_needed, |
|
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
552
diff
changeset
|
2540 gpointer buddy_must_be_a_room) |
| 552 | 2541 { |
| 2542 if (buddy_must_be_a_room && | |
| 2543 !(buddy_gettype(buddy_must_be_a_room) & ROSTER_TYPE_ROOM)) { | |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
2544 scr_LogPrint(LPRINT_NORMAL, "This isn't a conference room."); |
| 552 | 2545 return NULL; |
| 2546 } | |
| 2547 | |
| 2548 if (param_needed) { | |
|
554
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
552
diff
changeset
|
2549 if (!arg) { |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
2550 scr_LogPrint(LPRINT_NORMAL, "Missing parameter."); |
| 552 | 2551 return NULL; |
| 2552 } | |
| 2553 } | |
| 2554 | |
|
554
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
552
diff
changeset
|
2555 if (arg) |
|
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
552
diff
changeset
|
2556 return arg; |
|
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
552
diff
changeset
|
2557 else |
|
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
552
diff
changeset
|
2558 return ""; |
| 552 | 2559 } |
| 2560 | |
| 2561 static void room_join(gpointer bud, char *arg) | |
| 2562 { | |
|
554
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
552
diff
changeset
|
2563 char **paramlst; |
|
1033
056364952b0d
[BP-7f216b904315] Fix a potential double UTF-8 encoding
Mikael Berthe <mikael@lilotux.net>
parents:
960
diff
changeset
|
2564 char *roomname, *nick, *pass; |
|
056364952b0d
[BP-7f216b904315] Fix a potential double UTF-8 encoding
Mikael Berthe <mikael@lilotux.net>
parents:
960
diff
changeset
|
2565 char *roomname_tmp = NULL; |
|
900
b41684465283
MUC: join password-protected room
Mikael Berthe <mikael@lilotux.net>
parents:
885
diff
changeset
|
2566 char *pass_utf8; |
| 552 | 2567 |
|
900
b41684465283
MUC: join password-protected room
Mikael Berthe <mikael@lilotux.net>
parents:
885
diff
changeset
|
2568 paramlst = split_arg(arg, 3, 0); // roomid, nickname, password |
|
554
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
552
diff
changeset
|
2569 roomname = *paramlst; |
|
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
552
diff
changeset
|
2570 nick = *(paramlst+1); |
|
900
b41684465283
MUC: join password-protected room
Mikael Berthe <mikael@lilotux.net>
parents:
885
diff
changeset
|
2571 pass = *(paramlst+2); |
|
b41684465283
MUC: join password-protected room
Mikael Berthe <mikael@lilotux.net>
parents:
885
diff
changeset
|
2572 |
|
1033
056364952b0d
[BP-7f216b904315] Fix a potential double UTF-8 encoding
Mikael Berthe <mikael@lilotux.net>
parents:
960
diff
changeset
|
2573 if (!roomname) |
|
056364952b0d
[BP-7f216b904315] Fix a potential double UTF-8 encoding
Mikael Berthe <mikael@lilotux.net>
parents:
960
diff
changeset
|
2574 nick = NULL; |
|
900
b41684465283
MUC: join password-protected room
Mikael Berthe <mikael@lilotux.net>
parents:
885
diff
changeset
|
2575 if (!nick) |
|
b41684465283
MUC: join password-protected room
Mikael Berthe <mikael@lilotux.net>
parents:
885
diff
changeset
|
2576 pass = NULL; |
| 552 | 2577 |
|
841
f8c0447beec2
Allow "/room join . [nick]" if the current item is a MUC room
Mikael Berthe <mikael@lilotux.net>
parents:
840
diff
changeset
|
2578 if (!roomname || !strcmp(roomname, ".")) { |
|
f8c0447beec2
Allow "/room join . [nick]" if the current item is a MUC room
Mikael Berthe <mikael@lilotux.net>
parents:
840
diff
changeset
|
2579 // If the current_buddy is recognized as a room, the room name |
|
f8c0447beec2
Allow "/room join . [nick]" if the current item is a MUC room
Mikael Berthe <mikael@lilotux.net>
parents:
840
diff
changeset
|
2580 // can be omitted (or "." can be used). |
|
f8c0447beec2
Allow "/room join . [nick]" if the current item is a MUC room
Mikael Berthe <mikael@lilotux.net>
parents:
840
diff
changeset
|
2581 if (!bud || !(buddy_gettype(bud) & ROSTER_TYPE_ROOM)) { |
|
f8c0447beec2
Allow "/room join . [nick]" if the current item is a MUC room
Mikael Berthe <mikael@lilotux.net>
parents:
840
diff
changeset
|
2582 scr_LogPrint(LPRINT_NORMAL, "Please specify a room name."); |
|
f8c0447beec2
Allow "/room join . [nick]" if the current item is a MUC room
Mikael Berthe <mikael@lilotux.net>
parents:
840
diff
changeset
|
2583 free_arg_lst(paramlst); |
|
f8c0447beec2
Allow "/room join . [nick]" if the current item is a MUC room
Mikael Berthe <mikael@lilotux.net>
parents:
840
diff
changeset
|
2584 return; |
|
f8c0447beec2
Allow "/room join . [nick]" if the current item is a MUC room
Mikael Berthe <mikael@lilotux.net>
parents:
840
diff
changeset
|
2585 } |
|
f8c0447beec2
Allow "/room join . [nick]" if the current item is a MUC room
Mikael Berthe <mikael@lilotux.net>
parents:
840
diff
changeset
|
2586 roomname = (char*)buddy_getjid(bud); |
|
f8c0447beec2
Allow "/room join . [nick]" if the current item is a MUC room
Mikael Berthe <mikael@lilotux.net>
parents:
840
diff
changeset
|
2587 } else if (strchr(roomname, '/')) { |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
2588 scr_LogPrint(LPRINT_NORMAL, "Invalid room name."); |
|
554
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
552
diff
changeset
|
2589 free_arg_lst(paramlst); |
| 552 | 2590 return; |
|
1033
056364952b0d
[BP-7f216b904315] Fix a potential double UTF-8 encoding
Mikael Berthe <mikael@lilotux.net>
parents:
960
diff
changeset
|
2591 } else { |
|
056364952b0d
[BP-7f216b904315] Fix a potential double UTF-8 encoding
Mikael Berthe <mikael@lilotux.net>
parents:
960
diff
changeset
|
2592 // The room id has been specified. Let's convert it and use it. |
|
1648
63d8473df2c3
Fix encoding issues in room command
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1635
diff
changeset
|
2593 mc_strtolower(roomname); |
|
63d8473df2c3
Fix encoding issues in room command
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1635
diff
changeset
|
2594 roomname = roomname_tmp = to_utf8(roomname); |
| 552 | 2595 } |
| 2596 | |
|
659
e61aa455c61b
MUC: Add "nickname" option variable
Mikael Berthe <mikael@lilotux.net>
parents:
653
diff
changeset
|
2597 // If no nickname is provided with the /join command, |
|
1004
b57a01ffeed6
Use existing conference bookmarks
Mikael Berthe <mikael@lilotux.net>
parents:
1003
diff
changeset
|
2598 // we try to get a default nickname. |
|
b57a01ffeed6
Use existing conference bookmarks
Mikael Berthe <mikael@lilotux.net>
parents:
1003
diff
changeset
|
2599 if (!nick || !*nick) |
|
1395
d431cd75eb53
Use bookmarked nickname when manually joining a room
Mikael Berthe <mikael@lilotux.net>
parents:
1392
diff
changeset
|
2600 nick = default_muc_nickname(roomname); |
|
1004
b57a01ffeed6
Use existing conference bookmarks
Mikael Berthe <mikael@lilotux.net>
parents:
1003
diff
changeset
|
2601 else |
|
b57a01ffeed6
Use existing conference bookmarks
Mikael Berthe <mikael@lilotux.net>
parents:
1003
diff
changeset
|
2602 nick = to_utf8(nick); |
|
659
e61aa455c61b
MUC: Add "nickname" option variable
Mikael Berthe <mikael@lilotux.net>
parents:
653
diff
changeset
|
2603 // If we still have no nickname, give up |
|
565
89c347b3e4c1
MUC: Make "/room nick" display the current nickname
Mikael Berthe <mikael@lilotux.net>
parents:
558
diff
changeset
|
2604 if (!nick || !*nick) { |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
2605 scr_LogPrint(LPRINT_NORMAL, "Please specify a nickname."); |
|
1004
b57a01ffeed6
Use existing conference bookmarks
Mikael Berthe <mikael@lilotux.net>
parents:
1003
diff
changeset
|
2606 g_free(nick); |
|
554
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
552
diff
changeset
|
2607 free_arg_lst(paramlst); |
| 552 | 2608 return; |
| 2609 } | |
| 2610 | |
|
900
b41684465283
MUC: join password-protected room
Mikael Berthe <mikael@lilotux.net>
parents:
885
diff
changeset
|
2611 pass_utf8 = to_utf8(pass); |
|
b41684465283
MUC: join password-protected room
Mikael Berthe <mikael@lilotux.net>
parents:
885
diff
changeset
|
2612 |
| 1598 | 2613 xmpp_room_join(roomname, nick, pass_utf8); |
| 552 | 2614 |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
2615 scr_LogPrint(LPRINT_LOGNORM, "Sent a join request to <%s>...", roomname); |
|
653
d5db5be78eb0
MUC: Be more verbose when joining a room
Mikael Berthe <mikael@lilotux.net>
parents:
652
diff
changeset
|
2616 |
|
1033
056364952b0d
[BP-7f216b904315] Fix a potential double UTF-8 encoding
Mikael Berthe <mikael@lilotux.net>
parents:
960
diff
changeset
|
2617 g_free(roomname_tmp); |
|
1004
b57a01ffeed6
Use existing conference bookmarks
Mikael Berthe <mikael@lilotux.net>
parents:
1003
diff
changeset
|
2618 g_free(nick); |
|
900
b41684465283
MUC: join password-protected room
Mikael Berthe <mikael@lilotux.net>
parents:
885
diff
changeset
|
2619 g_free(pass_utf8); |
| 552 | 2620 buddylist_build(); |
| 2621 update_roster = TRUE; | |
|
554
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
552
diff
changeset
|
2622 free_arg_lst(paramlst); |
| 552 | 2623 } |
| 2624 | |
| 2625 static void room_invite(gpointer bud, char *arg) | |
| 2626 { | |
|
554
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
552
diff
changeset
|
2627 char **paramlst; |
| 552 | 2628 const gchar *roomname; |
| 1058 | 2629 char* fjid; |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
2630 gchar *reason_utf8; |
| 552 | 2631 |
|
570
29806b0fe830
Some parsing improvements
Mikael Berthe <mikael@lilotux.net>
parents:
568
diff
changeset
|
2632 paramlst = split_arg(arg, 2, 1); // jid, [reason] |
| 1058 | 2633 fjid = *paramlst; |
|
554
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
552
diff
changeset
|
2634 arg = *(paramlst+1); |
|
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
552
diff
changeset
|
2635 // An empty reason is no reason... |
|
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
552
diff
changeset
|
2636 if (arg && !*arg) |
|
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
552
diff
changeset
|
2637 arg = NULL; |
|
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
552
diff
changeset
|
2638 |
| 1058 | 2639 if (!fjid || !*fjid) { |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
2640 scr_LogPrint(LPRINT_NORMAL, "Missing or incorrect Jabber ID."); |
|
554
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
552
diff
changeset
|
2641 free_arg_lst(paramlst); |
| 552 | 2642 return; |
| 2643 } | |
|
554
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
552
diff
changeset
|
2644 |
| 552 | 2645 roomname = buddy_getjid(bud); |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
2646 reason_utf8 = to_utf8(arg); |
| 1598 | 2647 xmpp_room_invite(roomname, fjid, reason_utf8); |
| 1058 | 2648 scr_LogPrint(LPRINT_LOGNORM, "Invitation sent to <%s>.", fjid); |
|
774
46304b773a44
Remove useless checks before g_free() calls
Mikael Berthe <mikael@lilotux.net>
parents:
772
diff
changeset
|
2649 g_free(reason_utf8); |
|
554
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
552
diff
changeset
|
2650 free_arg_lst(paramlst); |
| 552 | 2651 } |
| 2652 | |
|
585
7eff2c1481fa
Add "/room affil" and "/room role"
Mikael Berthe <mikael@lilotux.net>
parents:
584
diff
changeset
|
2653 static void room_affil(gpointer bud, char *arg) |
|
7eff2c1481fa
Add "/room affil" and "/room role"
Mikael Berthe <mikael@lilotux.net>
parents:
584
diff
changeset
|
2654 { |
|
7eff2c1481fa
Add "/room affil" and "/room role"
Mikael Berthe <mikael@lilotux.net>
parents:
584
diff
changeset
|
2655 char **paramlst; |
| 1058 | 2656 gchar *fjid, *rolename; |
|
585
7eff2c1481fa
Add "/room affil" and "/room role"
Mikael Berthe <mikael@lilotux.net>
parents:
584
diff
changeset
|
2657 struct role_affil ra; |
|
7eff2c1481fa
Add "/room affil" and "/room role"
Mikael Berthe <mikael@lilotux.net>
parents:
584
diff
changeset
|
2658 const char *roomid = buddy_getjid(bud); |
|
7eff2c1481fa
Add "/room affil" and "/room role"
Mikael Berthe <mikael@lilotux.net>
parents:
584
diff
changeset
|
2659 |
|
7eff2c1481fa
Add "/room affil" and "/room role"
Mikael Berthe <mikael@lilotux.net>
parents:
584
diff
changeset
|
2660 paramlst = split_arg(arg, 3, 1); // jid, new_affil, [reason] |
| 1058 | 2661 fjid = *paramlst; |
|
585
7eff2c1481fa
Add "/room affil" and "/room role"
Mikael Berthe <mikael@lilotux.net>
parents:
584
diff
changeset
|
2662 rolename = *(paramlst+1); |
|
7eff2c1481fa
Add "/room affil" and "/room role"
Mikael Berthe <mikael@lilotux.net>
parents:
584
diff
changeset
|
2663 arg = *(paramlst+2); |
|
7eff2c1481fa
Add "/room affil" and "/room role"
Mikael Berthe <mikael@lilotux.net>
parents:
584
diff
changeset
|
2664 |
| 1058 | 2665 if (!fjid || !*fjid || !rolename || !*rolename) { |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
2666 scr_LogPrint(LPRINT_NORMAL, "Please specify both a Jabber ID and a role."); |
|
585
7eff2c1481fa
Add "/room affil" and "/room role"
Mikael Berthe <mikael@lilotux.net>
parents:
584
diff
changeset
|
2667 free_arg_lst(paramlst); |
|
7eff2c1481fa
Add "/room affil" and "/room role"
Mikael Berthe <mikael@lilotux.net>
parents:
584
diff
changeset
|
2668 return; |
|
7eff2c1481fa
Add "/room affil" and "/room role"
Mikael Berthe <mikael@lilotux.net>
parents:
584
diff
changeset
|
2669 } |
|
7eff2c1481fa
Add "/room affil" and "/room role"
Mikael Berthe <mikael@lilotux.net>
parents:
584
diff
changeset
|
2670 |
|
7eff2c1481fa
Add "/room affil" and "/room role"
Mikael Berthe <mikael@lilotux.net>
parents:
584
diff
changeset
|
2671 ra.type = type_affil; |
|
7eff2c1481fa
Add "/room affil" and "/room role"
Mikael Berthe <mikael@lilotux.net>
parents:
584
diff
changeset
|
2672 ra.val.affil = affil_none; |
|
7eff2c1481fa
Add "/room affil" and "/room role"
Mikael Berthe <mikael@lilotux.net>
parents:
584
diff
changeset
|
2673 for (; ra.val.affil < imaffiliation_size; ra.val.affil++) |
|
7eff2c1481fa
Add "/room affil" and "/room role"
Mikael Berthe <mikael@lilotux.net>
parents:
584
diff
changeset
|
2674 if (!strcasecmp(rolename, straffil[ra.val.affil])) |
|
7eff2c1481fa
Add "/room affil" and "/room role"
Mikael Berthe <mikael@lilotux.net>
parents:
584
diff
changeset
|
2675 break; |
|
7eff2c1481fa
Add "/room affil" and "/room role"
Mikael Berthe <mikael@lilotux.net>
parents:
584
diff
changeset
|
2676 |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
2677 if (ra.val.affil < imaffiliation_size) { |
|
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
2678 gchar *jid_utf8, *reason_utf8; |
| 1058 | 2679 jid_utf8 = to_utf8(fjid); |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
2680 reason_utf8 = to_utf8(arg); |
| 1598 | 2681 xmpp_room_setattrib(roomid, jid_utf8, NULL, ra, reason_utf8); |
|
774
46304b773a44
Remove useless checks before g_free() calls
Mikael Berthe <mikael@lilotux.net>
parents:
772
diff
changeset
|
2682 g_free(jid_utf8); |
|
46304b773a44
Remove useless checks before g_free() calls
Mikael Berthe <mikael@lilotux.net>
parents:
772
diff
changeset
|
2683 g_free(reason_utf8); |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
2684 } else |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
2685 scr_LogPrint(LPRINT_NORMAL, "Wrong affiliation parameter."); |
|
585
7eff2c1481fa
Add "/room affil" and "/room role"
Mikael Berthe <mikael@lilotux.net>
parents:
584
diff
changeset
|
2686 |
|
7eff2c1481fa
Add "/room affil" and "/room role"
Mikael Berthe <mikael@lilotux.net>
parents:
584
diff
changeset
|
2687 free_arg_lst(paramlst); |
|
7eff2c1481fa
Add "/room affil" and "/room role"
Mikael Berthe <mikael@lilotux.net>
parents:
584
diff
changeset
|
2688 } |
|
7eff2c1481fa
Add "/room affil" and "/room role"
Mikael Berthe <mikael@lilotux.net>
parents:
584
diff
changeset
|
2689 |
|
7eff2c1481fa
Add "/room affil" and "/room role"
Mikael Berthe <mikael@lilotux.net>
parents:
584
diff
changeset
|
2690 static void room_role(gpointer bud, char *arg) |
|
7eff2c1481fa
Add "/room affil" and "/room role"
Mikael Berthe <mikael@lilotux.net>
parents:
584
diff
changeset
|
2691 { |
|
7eff2c1481fa
Add "/room affil" and "/room role"
Mikael Berthe <mikael@lilotux.net>
parents:
584
diff
changeset
|
2692 char **paramlst; |
| 1058 | 2693 gchar *fjid, *rolename; |
|
585
7eff2c1481fa
Add "/room affil" and "/room role"
Mikael Berthe <mikael@lilotux.net>
parents:
584
diff
changeset
|
2694 struct role_affil ra; |
|
7eff2c1481fa
Add "/room affil" and "/room role"
Mikael Berthe <mikael@lilotux.net>
parents:
584
diff
changeset
|
2695 const char *roomid = buddy_getjid(bud); |
|
7eff2c1481fa
Add "/room affil" and "/room role"
Mikael Berthe <mikael@lilotux.net>
parents:
584
diff
changeset
|
2696 |
|
7eff2c1481fa
Add "/room affil" and "/room role"
Mikael Berthe <mikael@lilotux.net>
parents:
584
diff
changeset
|
2697 paramlst = split_arg(arg, 3, 1); // jid, new_role, [reason] |
| 1058 | 2698 fjid = *paramlst; |
|
585
7eff2c1481fa
Add "/room affil" and "/room role"
Mikael Berthe <mikael@lilotux.net>
parents:
584
diff
changeset
|
2699 rolename = *(paramlst+1); |
|
7eff2c1481fa
Add "/room affil" and "/room role"
Mikael Berthe <mikael@lilotux.net>
parents:
584
diff
changeset
|
2700 arg = *(paramlst+2); |
|
7eff2c1481fa
Add "/room affil" and "/room role"
Mikael Berthe <mikael@lilotux.net>
parents:
584
diff
changeset
|
2701 |
| 1058 | 2702 if (!fjid || !*fjid || !rolename || !*rolename) { |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
2703 scr_LogPrint(LPRINT_NORMAL, "Please specify both a Jabber ID and a role."); |
|
585
7eff2c1481fa
Add "/room affil" and "/room role"
Mikael Berthe <mikael@lilotux.net>
parents:
584
diff
changeset
|
2704 free_arg_lst(paramlst); |
|
7eff2c1481fa
Add "/room affil" and "/room role"
Mikael Berthe <mikael@lilotux.net>
parents:
584
diff
changeset
|
2705 return; |
|
7eff2c1481fa
Add "/room affil" and "/room role"
Mikael Berthe <mikael@lilotux.net>
parents:
584
diff
changeset
|
2706 } |
|
7eff2c1481fa
Add "/room affil" and "/room role"
Mikael Berthe <mikael@lilotux.net>
parents:
584
diff
changeset
|
2707 |
|
7eff2c1481fa
Add "/room affil" and "/room role"
Mikael Berthe <mikael@lilotux.net>
parents:
584
diff
changeset
|
2708 ra.type = type_role; |
|
7eff2c1481fa
Add "/room affil" and "/room role"
Mikael Berthe <mikael@lilotux.net>
parents:
584
diff
changeset
|
2709 ra.val.role = role_none; |
|
7eff2c1481fa
Add "/room affil" and "/room role"
Mikael Berthe <mikael@lilotux.net>
parents:
584
diff
changeset
|
2710 for (; ra.val.role < imrole_size; ra.val.role++) |
|
7eff2c1481fa
Add "/room affil" and "/room role"
Mikael Berthe <mikael@lilotux.net>
parents:
584
diff
changeset
|
2711 if (!strcasecmp(rolename, strrole[ra.val.role])) |
|
7eff2c1481fa
Add "/room affil" and "/room role"
Mikael Berthe <mikael@lilotux.net>
parents:
584
diff
changeset
|
2712 break; |
|
7eff2c1481fa
Add "/room affil" and "/room role"
Mikael Berthe <mikael@lilotux.net>
parents:
584
diff
changeset
|
2713 |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
2714 if (ra.val.role < imrole_size) { |
|
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
2715 gchar *jid_utf8, *reason_utf8; |
| 1058 | 2716 jid_utf8 = to_utf8(fjid); |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
2717 reason_utf8 = to_utf8(arg); |
| 1598 | 2718 xmpp_room_setattrib(roomid, jid_utf8, NULL, ra, reason_utf8); |
|
774
46304b773a44
Remove useless checks before g_free() calls
Mikael Berthe <mikael@lilotux.net>
parents:
772
diff
changeset
|
2719 g_free(jid_utf8); |
|
46304b773a44
Remove useless checks before g_free() calls
Mikael Berthe <mikael@lilotux.net>
parents:
772
diff
changeset
|
2720 g_free(reason_utf8); |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
2721 } else |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
2722 scr_LogPrint(LPRINT_NORMAL, "Wrong role parameter."); |
|
585
7eff2c1481fa
Add "/room affil" and "/room role"
Mikael Berthe <mikael@lilotux.net>
parents:
584
diff
changeset
|
2723 |
|
7eff2c1481fa
Add "/room affil" and "/room role"
Mikael Berthe <mikael@lilotux.net>
parents:
584
diff
changeset
|
2724 free_arg_lst(paramlst); |
|
7eff2c1481fa
Add "/room affil" and "/room role"
Mikael Berthe <mikael@lilotux.net>
parents:
584
diff
changeset
|
2725 } |
|
7eff2c1481fa
Add "/room affil" and "/room role"
Mikael Berthe <mikael@lilotux.net>
parents:
584
diff
changeset
|
2726 |
|
7eff2c1481fa
Add "/room affil" and "/room role"
Mikael Berthe <mikael@lilotux.net>
parents:
584
diff
changeset
|
2727 |
| 571 | 2728 // The expected argument is a Jabber id |
| 2729 static void room_ban(gpointer bud, char *arg) | |
| 2730 { | |
| 2731 char **paramlst; | |
|
1391
e20ab87c4c4c
The command /room ban can be used with a nickname
Mikael Berthe <mikael@lilotux.net>
parents:
1387
diff
changeset
|
2732 gchar *fjid, *bjid; |
|
e20ab87c4c4c
The command /room ban can be used with a nickname
Mikael Berthe <mikael@lilotux.net>
parents:
1387
diff
changeset
|
2733 const gchar *banjid; |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
2734 gchar *jid_utf8, *reason_utf8; |
| 584 | 2735 struct role_affil ra; |
| 571 | 2736 const char *roomid = buddy_getjid(bud); |
| 2737 | |
| 2738 paramlst = split_arg(arg, 2, 1); // jid, [reason] | |
| 1058 | 2739 fjid = *paramlst; |
| 571 | 2740 arg = *(paramlst+1); |
| 2741 | |
| 1058 | 2742 if (!fjid || !*fjid) { |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
2743 scr_LogPrint(LPRINT_NORMAL, "Please specify a Jabber ID."); |
| 571 | 2744 free_arg_lst(paramlst); |
| 2745 return; | |
| 2746 } | |
| 2747 | |
| 584 | 2748 ra.type = type_affil; |
| 2749 ra.val.affil = affil_outcast; | |
| 2750 | |
|
1391
e20ab87c4c4c
The command /room ban can be used with a nickname
Mikael Berthe <mikael@lilotux.net>
parents:
1387
diff
changeset
|
2751 bjid = jidtodisp(fjid); |
|
e20ab87c4c4c
The command /room ban can be used with a nickname
Mikael Berthe <mikael@lilotux.net>
parents:
1387
diff
changeset
|
2752 jid_utf8 = to_utf8(bjid); |
|
e20ab87c4c4c
The command /room ban can be used with a nickname
Mikael Berthe <mikael@lilotux.net>
parents:
1387
diff
changeset
|
2753 |
|
e20ab87c4c4c
The command /room ban can be used with a nickname
Mikael Berthe <mikael@lilotux.net>
parents:
1387
diff
changeset
|
2754 // If the argument doesn't look like a jid, we'll try to find a matching |
|
e20ab87c4c4c
The command /room ban can be used with a nickname
Mikael Berthe <mikael@lilotux.net>
parents:
1387
diff
changeset
|
2755 // nickname. |
|
e20ab87c4c4c
The command /room ban can be used with a nickname
Mikael Berthe <mikael@lilotux.net>
parents:
1387
diff
changeset
|
2756 if (!strchr(bjid, JID_DOMAIN_SEPARATOR) || check_jid_syntax(bjid)) { |
|
e20ab87c4c4c
The command /room ban can be used with a nickname
Mikael Berthe <mikael@lilotux.net>
parents:
1387
diff
changeset
|
2757 const gchar *tmp; |
|
e20ab87c4c4c
The command /room ban can be used with a nickname
Mikael Berthe <mikael@lilotux.net>
parents:
1387
diff
changeset
|
2758 // We want the initial argument, so the fjid variable, because |
|
e20ab87c4c4c
The command /room ban can be used with a nickname
Mikael Berthe <mikael@lilotux.net>
parents:
1387
diff
changeset
|
2759 // we don't want to strip a resource-like string from the nickname! |
|
e20ab87c4c4c
The command /room ban can be used with a nickname
Mikael Berthe <mikael@lilotux.net>
parents:
1387
diff
changeset
|
2760 g_free(jid_utf8); |
|
e20ab87c4c4c
The command /room ban can be used with a nickname
Mikael Berthe <mikael@lilotux.net>
parents:
1387
diff
changeset
|
2761 jid_utf8 = to_utf8(fjid); |
|
e20ab87c4c4c
The command /room ban can be used with a nickname
Mikael Berthe <mikael@lilotux.net>
parents:
1387
diff
changeset
|
2762 tmp = buddy_getrjid(bud, jid_utf8); |
|
e20ab87c4c4c
The command /room ban can be used with a nickname
Mikael Berthe <mikael@lilotux.net>
parents:
1387
diff
changeset
|
2763 if (!tmp) { |
|
e20ab87c4c4c
The command /room ban can be used with a nickname
Mikael Berthe <mikael@lilotux.net>
parents:
1387
diff
changeset
|
2764 scr_LogPrint(LPRINT_NORMAL, "Wrong JID or nickname"); |
|
e20ab87c4c4c
The command /room ban can be used with a nickname
Mikael Berthe <mikael@lilotux.net>
parents:
1387
diff
changeset
|
2765 goto room_ban_return; |
|
e20ab87c4c4c
The command /room ban can be used with a nickname
Mikael Berthe <mikael@lilotux.net>
parents:
1387
diff
changeset
|
2766 } |
|
e20ab87c4c4c
The command /room ban can be used with a nickname
Mikael Berthe <mikael@lilotux.net>
parents:
1387
diff
changeset
|
2767 banjid = jidtodisp(tmp); |
|
e20ab87c4c4c
The command /room ban can be used with a nickname
Mikael Berthe <mikael@lilotux.net>
parents:
1387
diff
changeset
|
2768 } else |
|
e20ab87c4c4c
The command /room ban can be used with a nickname
Mikael Berthe <mikael@lilotux.net>
parents:
1387
diff
changeset
|
2769 banjid = jid_utf8; |
|
e20ab87c4c4c
The command /room ban can be used with a nickname
Mikael Berthe <mikael@lilotux.net>
parents:
1387
diff
changeset
|
2770 |
|
e20ab87c4c4c
The command /room ban can be used with a nickname
Mikael Berthe <mikael@lilotux.net>
parents:
1387
diff
changeset
|
2771 scr_LogPrint(LPRINT_NORMAL, "Requesting a ban for %s", banjid); |
|
e20ab87c4c4c
The command /room ban can be used with a nickname
Mikael Berthe <mikael@lilotux.net>
parents:
1387
diff
changeset
|
2772 |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
2773 reason_utf8 = to_utf8(arg); |
| 1598 | 2774 xmpp_room_setattrib(roomid, banjid, NULL, ra, reason_utf8); |
|
1391
e20ab87c4c4c
The command /room ban can be used with a nickname
Mikael Berthe <mikael@lilotux.net>
parents:
1387
diff
changeset
|
2775 g_free(reason_utf8); |
|
e20ab87c4c4c
The command /room ban can be used with a nickname
Mikael Berthe <mikael@lilotux.net>
parents:
1387
diff
changeset
|
2776 |
|
e20ab87c4c4c
The command /room ban can be used with a nickname
Mikael Berthe <mikael@lilotux.net>
parents:
1387
diff
changeset
|
2777 room_ban_return: |
|
e20ab87c4c4c
The command /room ban can be used with a nickname
Mikael Berthe <mikael@lilotux.net>
parents:
1387
diff
changeset
|
2778 g_free(bjid); |
|
774
46304b773a44
Remove useless checks before g_free() calls
Mikael Berthe <mikael@lilotux.net>
parents:
772
diff
changeset
|
2779 g_free(jid_utf8); |
| 571 | 2780 free_arg_lst(paramlst); |
| 2781 } | |
| 2782 | |
|
1260
b4ccc5b2a6de
Add command /room unban
Mikael Berthe <mikael@lilotux.net>
parents:
1235
diff
changeset
|
2783 // The expected argument is a Jabber id |
|
b4ccc5b2a6de
Add command /room unban
Mikael Berthe <mikael@lilotux.net>
parents:
1235
diff
changeset
|
2784 static void room_unban(gpointer bud, char *arg) |
|
b4ccc5b2a6de
Add command /room unban
Mikael Berthe <mikael@lilotux.net>
parents:
1235
diff
changeset
|
2785 { |
|
b4ccc5b2a6de
Add command /room unban
Mikael Berthe <mikael@lilotux.net>
parents:
1235
diff
changeset
|
2786 gchar *fjid = arg; |
|
b4ccc5b2a6de
Add command /room unban
Mikael Berthe <mikael@lilotux.net>
parents:
1235
diff
changeset
|
2787 gchar *jid_utf8; |
|
b4ccc5b2a6de
Add command /room unban
Mikael Berthe <mikael@lilotux.net>
parents:
1235
diff
changeset
|
2788 struct role_affil ra; |
|
b4ccc5b2a6de
Add command /room unban
Mikael Berthe <mikael@lilotux.net>
parents:
1235
diff
changeset
|
2789 const char *roomid = buddy_getjid(bud); |
|
b4ccc5b2a6de
Add command /room unban
Mikael Berthe <mikael@lilotux.net>
parents:
1235
diff
changeset
|
2790 |
|
b4ccc5b2a6de
Add command /room unban
Mikael Berthe <mikael@lilotux.net>
parents:
1235
diff
changeset
|
2791 if (!fjid || !*fjid) { |
|
b4ccc5b2a6de
Add command /room unban
Mikael Berthe <mikael@lilotux.net>
parents:
1235
diff
changeset
|
2792 scr_LogPrint(LPRINT_NORMAL, "Please specify a Jabber ID."); |
|
b4ccc5b2a6de
Add command /room unban
Mikael Berthe <mikael@lilotux.net>
parents:
1235
diff
changeset
|
2793 return; |
|
b4ccc5b2a6de
Add command /room unban
Mikael Berthe <mikael@lilotux.net>
parents:
1235
diff
changeset
|
2794 } |
|
b4ccc5b2a6de
Add command /room unban
Mikael Berthe <mikael@lilotux.net>
parents:
1235
diff
changeset
|
2795 |
|
b4ccc5b2a6de
Add command /room unban
Mikael Berthe <mikael@lilotux.net>
parents:
1235
diff
changeset
|
2796 ra.type = type_affil; |
|
b4ccc5b2a6de
Add command /room unban
Mikael Berthe <mikael@lilotux.net>
parents:
1235
diff
changeset
|
2797 ra.val.affil = affil_none; |
|
b4ccc5b2a6de
Add command /room unban
Mikael Berthe <mikael@lilotux.net>
parents:
1235
diff
changeset
|
2798 |
|
b4ccc5b2a6de
Add command /room unban
Mikael Berthe <mikael@lilotux.net>
parents:
1235
diff
changeset
|
2799 jid_utf8 = to_utf8(fjid); |
| 1598 | 2800 xmpp_room_setattrib(roomid, jid_utf8, NULL, ra, NULL); |
|
1260
b4ccc5b2a6de
Add command /room unban
Mikael Berthe <mikael@lilotux.net>
parents:
1235
diff
changeset
|
2801 g_free(jid_utf8); |
|
b4ccc5b2a6de
Add command /room unban
Mikael Berthe <mikael@lilotux.net>
parents:
1235
diff
changeset
|
2802 } |
|
b4ccc5b2a6de
Add command /room unban
Mikael Berthe <mikael@lilotux.net>
parents:
1235
diff
changeset
|
2803 |
| 571 | 2804 // The expected argument is a nickname |
| 568 | 2805 static void room_kick(gpointer bud, char *arg) |
| 2806 { | |
| 2807 char **paramlst; | |
| 2808 gchar *nick; | |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
2809 gchar *nick_utf8, *reason_utf8; |
| 584 | 2810 struct role_affil ra; |
| 568 | 2811 const char *roomid = buddy_getjid(bud); |
| 2812 | |
| 571 | 2813 paramlst = split_arg(arg, 2, 1); // nickname, [reason] |
| 568 | 2814 nick = *paramlst; |
| 2815 arg = *(paramlst+1); | |
| 2816 | |
| 2817 if (!nick || !*nick) { | |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
2818 scr_LogPrint(LPRINT_NORMAL, "Please specify a nickname."); |
| 568 | 2819 free_arg_lst(paramlst); |
| 2820 return; | |
| 2821 } | |
| 2822 | |
| 584 | 2823 ra.type = type_role; |
| 2824 ra.val.affil = role_none; | |
| 2825 | |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
2826 nick_utf8 = to_utf8(nick); |
|
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
2827 reason_utf8 = to_utf8(arg); |
| 1598 | 2828 xmpp_room_setattrib(roomid, NULL, nick_utf8, ra, reason_utf8); |
|
774
46304b773a44
Remove useless checks before g_free() calls
Mikael Berthe <mikael@lilotux.net>
parents:
772
diff
changeset
|
2829 g_free(nick_utf8); |
|
46304b773a44
Remove useless checks before g_free() calls
Mikael Berthe <mikael@lilotux.net>
parents:
772
diff
changeset
|
2830 g_free(reason_utf8); |
| 568 | 2831 |
| 2832 free_arg_lst(paramlst); | |
| 2833 } | |
| 2834 | |
|
1415
317f8d181626
Rename command public functions
Mikael Berthe <mikael@lilotux.net>
parents:
1414
diff
changeset
|
2835 void cmd_room_leave(gpointer bud, char *arg) |
| 552 | 2836 { |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
2837 gchar *roomid, *desc; |
|
650
c2d50b97ced4
MUC: /room {leave,nick,topic} can only be used when inside a room
Mikael Berthe <mikael@lilotux.net>
parents:
647
diff
changeset
|
2838 const char *nickname; |
| 552 | 2839 |
|
650
c2d50b97ced4
MUC: /room {leave,nick,topic} can only be used when inside a room
Mikael Berthe <mikael@lilotux.net>
parents:
647
diff
changeset
|
2840 nickname = buddy_getnickname(bud); |
|
c2d50b97ced4
MUC: /room {leave,nick,topic} can only be used when inside a room
Mikael Berthe <mikael@lilotux.net>
parents:
647
diff
changeset
|
2841 if (!nickname) { |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
2842 scr_LogPrint(LPRINT_NORMAL, "You are not in this room."); |
|
650
c2d50b97ced4
MUC: /room {leave,nick,topic} can only be used when inside a room
Mikael Berthe <mikael@lilotux.net>
parents:
647
diff
changeset
|
2843 return; |
|
c2d50b97ced4
MUC: /room {leave,nick,topic} can only be used when inside a room
Mikael Berthe <mikael@lilotux.net>
parents:
647
diff
changeset
|
2844 } |
|
c2d50b97ced4
MUC: /room {leave,nick,topic} can only be used when inside a room
Mikael Berthe <mikael@lilotux.net>
parents:
647
diff
changeset
|
2845 |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
2846 roomid = g_strdup_printf("%s/%s", buddy_getjid(bud), nickname); |
|
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
2847 desc = to_utf8(arg); |
| 1598 | 2848 xmpp_setstatus(offline, roomid, desc, TRUE); |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
2849 g_free(desc); |
| 552 | 2850 g_free(roomid); |
| 2851 } | |
| 2852 | |
| 2853 static void room_nick(gpointer bud, char *arg) | |
| 2854 { | |
|
650
c2d50b97ced4
MUC: /room {leave,nick,topic} can only be used when inside a room
Mikael Berthe <mikael@lilotux.net>
parents:
647
diff
changeset
|
2855 if (!buddy_getinsideroom(bud)) { |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
2856 scr_LogPrint(LPRINT_NORMAL, "You are not in this room."); |
|
650
c2d50b97ced4
MUC: /room {leave,nick,topic} can only be used when inside a room
Mikael Berthe <mikael@lilotux.net>
parents:
647
diff
changeset
|
2857 return; |
|
c2d50b97ced4
MUC: /room {leave,nick,topic} can only be used when inside a room
Mikael Berthe <mikael@lilotux.net>
parents:
647
diff
changeset
|
2858 } |
|
c2d50b97ced4
MUC: /room {leave,nick,topic} can only be used when inside a room
Mikael Berthe <mikael@lilotux.net>
parents:
647
diff
changeset
|
2859 |
|
565
89c347b3e4c1
MUC: Make "/room nick" display the current nickname
Mikael Berthe <mikael@lilotux.net>
parents:
558
diff
changeset
|
2860 if (!arg || !*arg) { |
|
89c347b3e4c1
MUC: Make "/room nick" display the current nickname
Mikael Berthe <mikael@lilotux.net>
parents:
558
diff
changeset
|
2861 const char *nick = buddy_getnickname(bud); |
|
89c347b3e4c1
MUC: Make "/room nick" display the current nickname
Mikael Berthe <mikael@lilotux.net>
parents:
558
diff
changeset
|
2862 if (nick) |
|
89c347b3e4c1
MUC: Make "/room nick" display the current nickname
Mikael Berthe <mikael@lilotux.net>
parents:
558
diff
changeset
|
2863 scr_LogPrint(LPRINT_NORMAL, "Your nickname is: %s", nick); |
|
89c347b3e4c1
MUC: Make "/room nick" display the current nickname
Mikael Berthe <mikael@lilotux.net>
parents:
558
diff
changeset
|
2864 else |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
2865 scr_LogPrint(LPRINT_NORMAL, "You have no nickname in this room."); |
|
565
89c347b3e4c1
MUC: Make "/room nick" display the current nickname
Mikael Berthe <mikael@lilotux.net>
parents:
558
diff
changeset
|
2866 } else { |
|
1648
63d8473df2c3
Fix encoding issues in room command
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1635
diff
changeset
|
2867 gchar *nick = to_utf8(arg); |
|
1392
3d4963c8ce87
Quotes should be escaped in /room nick
Mikael Berthe <mikael@lilotux.net>
parents:
1391
diff
changeset
|
2868 strip_arg_special_chars(nick); |
|
1648
63d8473df2c3
Fix encoding issues in room command
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1635
diff
changeset
|
2869 xmpp_room_join(buddy_getjid(bud), nick, NULL); |
|
900
b41684465283
MUC: join password-protected room
Mikael Berthe <mikael@lilotux.net>
parents:
885
diff
changeset
|
2870 g_free(nick); |
|
565
89c347b3e4c1
MUC: Make "/room nick" display the current nickname
Mikael Berthe <mikael@lilotux.net>
parents:
558
diff
changeset
|
2871 } |
| 552 | 2872 } |
| 2873 | |
| 2874 static void room_privmsg(gpointer bud, char *arg) | |
| 2875 { | |
|
554
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
552
diff
changeset
|
2876 char **paramlst; |
|
1648
63d8473df2c3
Fix encoding issues in room command
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1635
diff
changeset
|
2877 gchar *fjid_utf8, *nick, *nick_utf8, *msg; |
| 552 | 2878 |
|
1100
2bef748356de
Do not strip quotes in /room privmsg
Mikael Berthe <mikael@lilotux.net>
parents:
1086
diff
changeset
|
2879 paramlst = split_arg(arg, 2, 1); // nickname, message |
|
554
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
552
diff
changeset
|
2880 nick = *paramlst; |
|
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
552
diff
changeset
|
2881 arg = *(paramlst+1); |
|
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
552
diff
changeset
|
2882 |
|
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
552
diff
changeset
|
2883 if (!nick || !*nick || !arg || !*arg) { |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
2884 scr_LogPrint(LPRINT_NORMAL, |
|
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
2885 "Please specify both a Jabber ID and a message."); |
|
554
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
552
diff
changeset
|
2886 free_arg_lst(paramlst); |
| 552 | 2887 return; |
| 2888 } | |
|
554
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
552
diff
changeset
|
2889 |
|
1648
63d8473df2c3
Fix encoding issues in room command
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1635
diff
changeset
|
2890 nick_utf8 = to_utf8(nick); |
|
63d8473df2c3
Fix encoding issues in room command
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1635
diff
changeset
|
2891 fjid_utf8 = g_strdup_printf("%s/%s", buddy_getjid(bud), nick_utf8); |
|
63d8473df2c3
Fix encoding issues in room command
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1635
diff
changeset
|
2892 g_free (nick_utf8); |
|
1312
f4830fada2af
Fix /room privmsg when the MUC nickname contains spaces (Reported by sadeness)
Mikael Berthe <mikael@lilotux.net>
parents:
1311
diff
changeset
|
2893 msg = to_utf8(arg); |
| 1598 | 2894 send_message_to(fjid_utf8, msg, NULL, LM_MESSAGE_SUB_TYPE_NOT_SET, FALSE); |
|
1312
f4830fada2af
Fix /room privmsg when the MUC nickname contains spaces (Reported by sadeness)
Mikael Berthe <mikael@lilotux.net>
parents:
1311
diff
changeset
|
2895 g_free(fjid_utf8); |
|
f4830fada2af
Fix /room privmsg when the MUC nickname contains spaces (Reported by sadeness)
Mikael Berthe <mikael@lilotux.net>
parents:
1311
diff
changeset
|
2896 g_free(msg); |
|
554
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
552
diff
changeset
|
2897 free_arg_lst(paramlst); |
| 552 | 2898 } |
| 2899 | |
| 2900 static void room_remove(gpointer bud, char *arg) | |
| 2901 { | |
| 2902 if (*arg) { | |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
2903 scr_LogPrint(LPRINT_NORMAL, "This action does not require a parameter; " |
|
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
2904 "the currently-selected room will be removed."); |
| 552 | 2905 return; |
| 2906 } | |
| 2907 | |
| 2908 // Quick check: if there are resources, we haven't left | |
|
652
b243d3b3ff1b
We do not need buddy_isresource() anymore
Mikael Berthe <mikael@lilotux.net>
parents:
650
diff
changeset
|
2909 if (buddy_getinsideroom(bud)) { |
| 552 | 2910 scr_LogPrint(LPRINT_NORMAL, "You haven't left this room!"); |
| 2911 return; | |
| 2912 } | |
| 2913 // Delete the room | |
| 2914 roster_del_user(buddy_getjid(bud)); | |
|
1780
e4378fbab5d7
Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents:
1774
diff
changeset
|
2915 scr_update_buddy_window(); |
| 552 | 2916 buddylist_build(); |
| 2917 update_roster = TRUE; | |
| 2918 } | |
| 2919 | |
| 2920 static void room_topic(gpointer bud, char *arg) | |
| 2921 { | |
|
650
c2d50b97ced4
MUC: /room {leave,nick,topic} can only be used when inside a room
Mikael Berthe <mikael@lilotux.net>
parents:
647
diff
changeset
|
2922 if (!buddy_getinsideroom(bud)) { |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
2923 scr_LogPrint(LPRINT_NORMAL, "You are not in this room."); |
|
650
c2d50b97ced4
MUC: /room {leave,nick,topic} can only be used when inside a room
Mikael Berthe <mikael@lilotux.net>
parents:
647
diff
changeset
|
2924 return; |
|
c2d50b97ced4
MUC: /room {leave,nick,topic} can only be used when inside a room
Mikael Berthe <mikael@lilotux.net>
parents:
647
diff
changeset
|
2925 } |
|
c2d50b97ced4
MUC: /room {leave,nick,topic} can only be used when inside a room
Mikael Berthe <mikael@lilotux.net>
parents:
647
diff
changeset
|
2926 |
| 552 | 2927 // If no parameter is given, display the current topic |
| 2928 if (!*arg) { | |
| 2929 const char *topic = buddy_gettopic(bud); | |
| 2930 if (topic) | |
| 2931 scr_LogPrint(LPRINT_NORMAL, "Topic: %s", topic); | |
| 2932 else | |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
2933 scr_LogPrint(LPRINT_NORMAL, "No topic has been set."); |
| 552 | 2934 return; |
| 2935 } | |
| 2936 | |
|
1528
4b4b3948420c
MUC fix: the topic couldn't be cleared
Mikael Berthe <mikael@lilotux.net>
parents:
1527
diff
changeset
|
2937 // If arg is "-", let's clear the topic |
|
2122
b41719d57dac
reimplement 'unescape_topic' option as '/room topic -u' switch
sh!zeeg <shizeeque@gmail.com>
parents:
2121
diff
changeset
|
2938 if (!g_strcmp0(arg, "-")) |
|
1528
4b4b3948420c
MUC fix: the topic couldn't be cleared
Mikael Berthe <mikael@lilotux.net>
parents:
1527
diff
changeset
|
2939 arg = NULL; |
|
4b4b3948420c
MUC fix: the topic couldn't be cleared
Mikael Berthe <mikael@lilotux.net>
parents:
1527
diff
changeset
|
2940 |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
2941 arg = to_utf8(arg); |
| 2121 | 2942 // if arg is not NULL & option is set, unescape it |
|
2122
b41719d57dac
reimplement 'unescape_topic' option as '/room topic -u' switch
sh!zeeg <shizeeque@gmail.com>
parents:
2121
diff
changeset
|
2943 if (arg) { |
|
b41719d57dac
reimplement 'unescape_topic' option as '/room topic -u' switch
sh!zeeg <shizeeque@gmail.com>
parents:
2121
diff
changeset
|
2944 char *unescaped_topic = NULL; |
|
b41719d57dac
reimplement 'unescape_topic' option as '/room topic -u' switch
sh!zeeg <shizeeque@gmail.com>
parents:
2121
diff
changeset
|
2945 |
|
b41719d57dac
reimplement 'unescape_topic' option as '/room topic -u' switch
sh!zeeg <shizeeque@gmail.com>
parents:
2121
diff
changeset
|
2946 if (!strncmp(arg, "-u ", 3)) { |
|
b41719d57dac
reimplement 'unescape_topic' option as '/room topic -u' switch
sh!zeeg <shizeeque@gmail.com>
parents:
2121
diff
changeset
|
2947 char *tmp; |
|
b41719d57dac
reimplement 'unescape_topic' option as '/room topic -u' switch
sh!zeeg <shizeeque@gmail.com>
parents:
2121
diff
changeset
|
2948 tmp = g_strdup(arg + 3); |
|
b41719d57dac
reimplement 'unescape_topic' option as '/room topic -u' switch
sh!zeeg <shizeeque@gmail.com>
parents:
2121
diff
changeset
|
2949 g_free(arg); |
|
b41719d57dac
reimplement 'unescape_topic' option as '/room topic -u' switch
sh!zeeg <shizeeque@gmail.com>
parents:
2121
diff
changeset
|
2950 arg = tmp; |
|
b41719d57dac
reimplement 'unescape_topic' option as '/room topic -u' switch
sh!zeeg <shizeeque@gmail.com>
parents:
2121
diff
changeset
|
2951 unescaped_topic = ut_unescape_tabs_cr(arg); |
|
b41719d57dac
reimplement 'unescape_topic' option as '/room topic -u' switch
sh!zeeg <shizeeque@gmail.com>
parents:
2121
diff
changeset
|
2952 } |
|
b41719d57dac
reimplement 'unescape_topic' option as '/room topic -u' switch
sh!zeeg <shizeeque@gmail.com>
parents:
2121
diff
changeset
|
2953 |
|
b41719d57dac
reimplement 'unescape_topic' option as '/room topic -u' switch
sh!zeeg <shizeeque@gmail.com>
parents:
2121
diff
changeset
|
2954 // We must not free() if the original string was returned |
|
b41719d57dac
reimplement 'unescape_topic' option as '/room topic -u' switch
sh!zeeg <shizeeque@gmail.com>
parents:
2121
diff
changeset
|
2955 if (unescaped_topic == arg) |
|
b41719d57dac
reimplement 'unescape_topic' option as '/room topic -u' switch
sh!zeeg <shizeeque@gmail.com>
parents:
2121
diff
changeset
|
2956 unescaped_topic = NULL; |
|
b41719d57dac
reimplement 'unescape_topic' option as '/room topic -u' switch
sh!zeeg <shizeeque@gmail.com>
parents:
2121
diff
changeset
|
2957 |
|
b41719d57dac
reimplement 'unescape_topic' option as '/room topic -u' switch
sh!zeeg <shizeeque@gmail.com>
parents:
2121
diff
changeset
|
2958 if (unescaped_topic != NULL) { |
|
b41719d57dac
reimplement 'unescape_topic' option as '/room topic -u' switch
sh!zeeg <shizeeque@gmail.com>
parents:
2121
diff
changeset
|
2959 free(arg); |
|
b41719d57dac
reimplement 'unescape_topic' option as '/room topic -u' switch
sh!zeeg <shizeeque@gmail.com>
parents:
2121
diff
changeset
|
2960 arg = unescaped_topic; |
|
b41719d57dac
reimplement 'unescape_topic' option as '/room topic -u' switch
sh!zeeg <shizeeque@gmail.com>
parents:
2121
diff
changeset
|
2961 } |
| 2121 | 2962 } |
| 2963 | |
| 552 | 2964 // Set the topic |
| 1598 | 2965 xmpp_send_msg(buddy_getjid(bud), NULL, ROSTER_TYPE_ROOM, arg ? arg : "", |
| 1602 | 2966 FALSE, NULL, LM_MESSAGE_SUB_TYPE_NOT_SET, NULL); |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
2967 g_free(arg); |
| 552 | 2968 } |
| 2969 | |
| 599 | 2970 static void room_destroy(gpointer bud, char *arg) |
| 2971 { | |
| 2972 gchar *msg; | |
| 2973 | |
| 2974 if (arg && *arg) | |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
2975 msg = to_utf8(arg); |
| 599 | 2976 else |
| 2977 msg = NULL; | |
| 2978 | |
| 1598 | 2979 xmpp_room_destroy(buddy_getjid(bud), NULL, msg); |
|
774
46304b773a44
Remove useless checks before g_free() calls
Mikael Berthe <mikael@lilotux.net>
parents:
772
diff
changeset
|
2980 g_free(msg); |
| 599 | 2981 } |
| 2982 | |
| 552 | 2983 static void room_unlock(gpointer bud, char *arg) |
| 2984 { | |
| 2985 if (*arg) { | |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
2986 scr_LogPrint(LPRINT_NORMAL, "Unknown parameter."); |
| 552 | 2987 return; |
| 2988 } | |
| 2989 | |
| 1598 | 2990 xmpp_room_unlock(buddy_getjid(bud)); |
| 552 | 2991 } |
| 2992 | |
|
1377
cd9182f0b5c7
Add /room setopt {print_status,auto_whois}
Mikael Berthe <mikael@lilotux.net>
parents:
1368
diff
changeset
|
2993 static void room_setopt(gpointer bud, char *arg) |
|
cd9182f0b5c7
Add /room setopt {print_status,auto_whois}
Mikael Berthe <mikael@lilotux.net>
parents:
1368
diff
changeset
|
2994 { |
|
cd9182f0b5c7
Add /room setopt {print_status,auto_whois}
Mikael Berthe <mikael@lilotux.net>
parents:
1368
diff
changeset
|
2995 char **paramlst; |
|
cd9182f0b5c7
Add /room setopt {print_status,auto_whois}
Mikael Berthe <mikael@lilotux.net>
parents:
1368
diff
changeset
|
2996 char *param, *value; |
|
1979
6febc7d1f760
Add /room setopt flag_joins (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents:
1978
diff
changeset
|
2997 enum { opt_none = 0, opt_printstatus, |
|
6febc7d1f760
Add /room setopt flag_joins (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents:
1978
diff
changeset
|
2998 opt_autowhois, opt_flagjoins } option = 0; |
|
1980
3bcc57751283
Add 'muc_bookmark_autoupdate' (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents:
1979
diff
changeset
|
2999 guint changed = 0; |
|
1377
cd9182f0b5c7
Add /room setopt {print_status,auto_whois}
Mikael Berthe <mikael@lilotux.net>
parents:
1368
diff
changeset
|
3000 |
|
cd9182f0b5c7
Add /room setopt {print_status,auto_whois}
Mikael Berthe <mikael@lilotux.net>
parents:
1368
diff
changeset
|
3001 paramlst = split_arg(arg, 2, 1); // param, value |
|
cd9182f0b5c7
Add /room setopt {print_status,auto_whois}
Mikael Berthe <mikael@lilotux.net>
parents:
1368
diff
changeset
|
3002 param = *paramlst; |
|
cd9182f0b5c7
Add /room setopt {print_status,auto_whois}
Mikael Berthe <mikael@lilotux.net>
parents:
1368
diff
changeset
|
3003 value = *(paramlst+1); |
|
cd9182f0b5c7
Add /room setopt {print_status,auto_whois}
Mikael Berthe <mikael@lilotux.net>
parents:
1368
diff
changeset
|
3004 if (!param) { |
|
cd9182f0b5c7
Add /room setopt {print_status,auto_whois}
Mikael Berthe <mikael@lilotux.net>
parents:
1368
diff
changeset
|
3005 scr_LogPrint(LPRINT_NORMAL, "Please specify a room option."); |
|
cd9182f0b5c7
Add /room setopt {print_status,auto_whois}
Mikael Berthe <mikael@lilotux.net>
parents:
1368
diff
changeset
|
3006 free_arg_lst(paramlst); |
|
cd9182f0b5c7
Add /room setopt {print_status,auto_whois}
Mikael Berthe <mikael@lilotux.net>
parents:
1368
diff
changeset
|
3007 return; |
|
cd9182f0b5c7
Add /room setopt {print_status,auto_whois}
Mikael Berthe <mikael@lilotux.net>
parents:
1368
diff
changeset
|
3008 } |
|
cd9182f0b5c7
Add /room setopt {print_status,auto_whois}
Mikael Berthe <mikael@lilotux.net>
parents:
1368
diff
changeset
|
3009 |
|
cd9182f0b5c7
Add /room setopt {print_status,auto_whois}
Mikael Berthe <mikael@lilotux.net>
parents:
1368
diff
changeset
|
3010 if (!strcasecmp(param, "print_status")) |
|
cd9182f0b5c7
Add /room setopt {print_status,auto_whois}
Mikael Berthe <mikael@lilotux.net>
parents:
1368
diff
changeset
|
3011 option = opt_printstatus; |
|
cd9182f0b5c7
Add /room setopt {print_status,auto_whois}
Mikael Berthe <mikael@lilotux.net>
parents:
1368
diff
changeset
|
3012 else if (!strcasecmp(param, "auto_whois")) |
|
cd9182f0b5c7
Add /room setopt {print_status,auto_whois}
Mikael Berthe <mikael@lilotux.net>
parents:
1368
diff
changeset
|
3013 option = opt_autowhois; |
|
1979
6febc7d1f760
Add /room setopt flag_joins (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents:
1978
diff
changeset
|
3014 else if (!strcasecmp(param, "flag_joins")) |
|
6febc7d1f760
Add /room setopt flag_joins (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents:
1978
diff
changeset
|
3015 option = opt_flagjoins; |
|
1377
cd9182f0b5c7
Add /room setopt {print_status,auto_whois}
Mikael Berthe <mikael@lilotux.net>
parents:
1368
diff
changeset
|
3016 else { |
|
cd9182f0b5c7
Add /room setopt {print_status,auto_whois}
Mikael Berthe <mikael@lilotux.net>
parents:
1368
diff
changeset
|
3017 scr_LogPrint(LPRINT_NORMAL, "Wrong option!"); |
|
cd9182f0b5c7
Add /room setopt {print_status,auto_whois}
Mikael Berthe <mikael@lilotux.net>
parents:
1368
diff
changeset
|
3018 free_arg_lst(paramlst); |
|
cd9182f0b5c7
Add /room setopt {print_status,auto_whois}
Mikael Berthe <mikael@lilotux.net>
parents:
1368
diff
changeset
|
3019 return; |
|
cd9182f0b5c7
Add /room setopt {print_status,auto_whois}
Mikael Berthe <mikael@lilotux.net>
parents:
1368
diff
changeset
|
3020 } |
|
cd9182f0b5c7
Add /room setopt {print_status,auto_whois}
Mikael Berthe <mikael@lilotux.net>
parents:
1368
diff
changeset
|
3021 |
|
cd9182f0b5c7
Add /room setopt {print_status,auto_whois}
Mikael Berthe <mikael@lilotux.net>
parents:
1368
diff
changeset
|
3022 // If no value is given, display the current value |
|
cd9182f0b5c7
Add /room setopt {print_status,auto_whois}
Mikael Berthe <mikael@lilotux.net>
parents:
1368
diff
changeset
|
3023 if (!value) { |
|
cd9182f0b5c7
Add /room setopt {print_status,auto_whois}
Mikael Berthe <mikael@lilotux.net>
parents:
1368
diff
changeset
|
3024 const char *strval; |
|
cd9182f0b5c7
Add /room setopt {print_status,auto_whois}
Mikael Berthe <mikael@lilotux.net>
parents:
1368
diff
changeset
|
3025 if (option == opt_printstatus) |
|
cd9182f0b5c7
Add /room setopt {print_status,auto_whois}
Mikael Berthe <mikael@lilotux.net>
parents:
1368
diff
changeset
|
3026 strval = strprintstatus[buddy_getprintstatus(bud)]; |
|
1979
6febc7d1f760
Add /room setopt flag_joins (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents:
1978
diff
changeset
|
3027 else if (option == opt_autowhois) |
|
6febc7d1f760
Add /room setopt flag_joins (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents:
1978
diff
changeset
|
3028 strval = strautowhois[buddy_getautowhois(bud)]; |
|
1377
cd9182f0b5c7
Add /room setopt {print_status,auto_whois}
Mikael Berthe <mikael@lilotux.net>
parents:
1368
diff
changeset
|
3029 else |
|
1979
6febc7d1f760
Add /room setopt flag_joins (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents:
1978
diff
changeset
|
3030 strval = strflagjoins[buddy_getflagjoins(bud)]; |
|
1377
cd9182f0b5c7
Add /room setopt {print_status,auto_whois}
Mikael Berthe <mikael@lilotux.net>
parents:
1368
diff
changeset
|
3031 scr_LogPrint(LPRINT_NORMAL, "%s is set to: %s", param, strval); |
|
cd9182f0b5c7
Add /room setopt {print_status,auto_whois}
Mikael Berthe <mikael@lilotux.net>
parents:
1368
diff
changeset
|
3032 free_arg_lst(paramlst); |
|
cd9182f0b5c7
Add /room setopt {print_status,auto_whois}
Mikael Berthe <mikael@lilotux.net>
parents:
1368
diff
changeset
|
3033 return; |
|
cd9182f0b5c7
Add /room setopt {print_status,auto_whois}
Mikael Berthe <mikael@lilotux.net>
parents:
1368
diff
changeset
|
3034 } |
|
cd9182f0b5c7
Add /room setopt {print_status,auto_whois}
Mikael Berthe <mikael@lilotux.net>
parents:
1368
diff
changeset
|
3035 |
|
cd9182f0b5c7
Add /room setopt {print_status,auto_whois}
Mikael Berthe <mikael@lilotux.net>
parents:
1368
diff
changeset
|
3036 if (option == opt_printstatus) { |
|
cd9182f0b5c7
Add /room setopt {print_status,auto_whois}
Mikael Berthe <mikael@lilotux.net>
parents:
1368
diff
changeset
|
3037 enum room_printstatus eval; |
|
cd9182f0b5c7
Add /room setopt {print_status,auto_whois}
Mikael Berthe <mikael@lilotux.net>
parents:
1368
diff
changeset
|
3038 if (!strcasecmp(value, "none")) |
|
cd9182f0b5c7
Add /room setopt {print_status,auto_whois}
Mikael Berthe <mikael@lilotux.net>
parents:
1368
diff
changeset
|
3039 eval = status_none; |
|
cd9182f0b5c7
Add /room setopt {print_status,auto_whois}
Mikael Berthe <mikael@lilotux.net>
parents:
1368
diff
changeset
|
3040 else if (!strcasecmp(value, "in_and_out")) |
|
cd9182f0b5c7
Add /room setopt {print_status,auto_whois}
Mikael Berthe <mikael@lilotux.net>
parents:
1368
diff
changeset
|
3041 eval = status_in_and_out; |
|
cd9182f0b5c7
Add /room setopt {print_status,auto_whois}
Mikael Berthe <mikael@lilotux.net>
parents:
1368
diff
changeset
|
3042 else if (!strcasecmp(value, "all")) |
|
cd9182f0b5c7
Add /room setopt {print_status,auto_whois}
Mikael Berthe <mikael@lilotux.net>
parents:
1368
diff
changeset
|
3043 eval = status_all; |
|
cd9182f0b5c7
Add /room setopt {print_status,auto_whois}
Mikael Berthe <mikael@lilotux.net>
parents:
1368
diff
changeset
|
3044 else { |
|
cd9182f0b5c7
Add /room setopt {print_status,auto_whois}
Mikael Berthe <mikael@lilotux.net>
parents:
1368
diff
changeset
|
3045 eval = status_default; |
|
cd9182f0b5c7
Add /room setopt {print_status,auto_whois}
Mikael Berthe <mikael@lilotux.net>
parents:
1368
diff
changeset
|
3046 if (strcasecmp(value, "default") != 0) |
|
cd9182f0b5c7
Add /room setopt {print_status,auto_whois}
Mikael Berthe <mikael@lilotux.net>
parents:
1368
diff
changeset
|
3047 scr_LogPrint(LPRINT_NORMAL, "Unrecognized value, assuming default..."); |
|
cd9182f0b5c7
Add /room setopt {print_status,auto_whois}
Mikael Berthe <mikael@lilotux.net>
parents:
1368
diff
changeset
|
3048 } |
|
1980
3bcc57751283
Add 'muc_bookmark_autoupdate' (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents:
1979
diff
changeset
|
3049 if (eval != buddy_getprintstatus(bud)) { |
|
3bcc57751283
Add 'muc_bookmark_autoupdate' (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents:
1979
diff
changeset
|
3050 buddy_setprintstatus(bud, eval); |
|
3bcc57751283
Add 'muc_bookmark_autoupdate' (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents:
1979
diff
changeset
|
3051 changed = 1; |
|
3bcc57751283
Add 'muc_bookmark_autoupdate' (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents:
1979
diff
changeset
|
3052 } |
|
1377
cd9182f0b5c7
Add /room setopt {print_status,auto_whois}
Mikael Berthe <mikael@lilotux.net>
parents:
1368
diff
changeset
|
3053 } else if (option == opt_autowhois) { |
|
cd9182f0b5c7
Add /room setopt {print_status,auto_whois}
Mikael Berthe <mikael@lilotux.net>
parents:
1368
diff
changeset
|
3054 enum room_autowhois eval; |
|
cd9182f0b5c7
Add /room setopt {print_status,auto_whois}
Mikael Berthe <mikael@lilotux.net>
parents:
1368
diff
changeset
|
3055 if (!strcasecmp(value, "on")) |
|
cd9182f0b5c7
Add /room setopt {print_status,auto_whois}
Mikael Berthe <mikael@lilotux.net>
parents:
1368
diff
changeset
|
3056 eval = autowhois_on; |
|
cd9182f0b5c7
Add /room setopt {print_status,auto_whois}
Mikael Berthe <mikael@lilotux.net>
parents:
1368
diff
changeset
|
3057 else if (!strcasecmp(value, "off")) |
|
cd9182f0b5c7
Add /room setopt {print_status,auto_whois}
Mikael Berthe <mikael@lilotux.net>
parents:
1368
diff
changeset
|
3058 eval = autowhois_off; |
|
cd9182f0b5c7
Add /room setopt {print_status,auto_whois}
Mikael Berthe <mikael@lilotux.net>
parents:
1368
diff
changeset
|
3059 else { |
|
cd9182f0b5c7
Add /room setopt {print_status,auto_whois}
Mikael Berthe <mikael@lilotux.net>
parents:
1368
diff
changeset
|
3060 eval = autowhois_default; |
|
cd9182f0b5c7
Add /room setopt {print_status,auto_whois}
Mikael Berthe <mikael@lilotux.net>
parents:
1368
diff
changeset
|
3061 if (strcasecmp(value, "default") != 0) |
|
cd9182f0b5c7
Add /room setopt {print_status,auto_whois}
Mikael Berthe <mikael@lilotux.net>
parents:
1368
diff
changeset
|
3062 scr_LogPrint(LPRINT_NORMAL, "Unrecognized value, assuming default..."); |
|
cd9182f0b5c7
Add /room setopt {print_status,auto_whois}
Mikael Berthe <mikael@lilotux.net>
parents:
1368
diff
changeset
|
3063 } |
|
1980
3bcc57751283
Add 'muc_bookmark_autoupdate' (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents:
1979
diff
changeset
|
3064 if (eval != buddy_getautowhois(bud)) { |
|
3bcc57751283
Add 'muc_bookmark_autoupdate' (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents:
1979
diff
changeset
|
3065 buddy_setautowhois(bud, eval); |
|
3bcc57751283
Add 'muc_bookmark_autoupdate' (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents:
1979
diff
changeset
|
3066 changed = 1; |
|
3bcc57751283
Add 'muc_bookmark_autoupdate' (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents:
1979
diff
changeset
|
3067 } |
|
1979
6febc7d1f760
Add /room setopt flag_joins (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents:
1978
diff
changeset
|
3068 } else if (option == opt_flagjoins) { |
|
6febc7d1f760
Add /room setopt flag_joins (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents:
1978
diff
changeset
|
3069 enum room_flagjoins eval; |
|
6febc7d1f760
Add /room setopt flag_joins (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents:
1978
diff
changeset
|
3070 if (!strcasecmp(value, "none")) |
|
6febc7d1f760
Add /room setopt flag_joins (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents:
1978
diff
changeset
|
3071 eval = flagjoins_none; |
|
6febc7d1f760
Add /room setopt flag_joins (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents:
1978
diff
changeset
|
3072 else if (!strcasecmp(value, "joins")) |
|
6febc7d1f760
Add /room setopt flag_joins (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents:
1978
diff
changeset
|
3073 eval = flagjoins_joins; |
|
6febc7d1f760
Add /room setopt flag_joins (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents:
1978
diff
changeset
|
3074 else if (!strcasecmp(value, "all")) |
|
6febc7d1f760
Add /room setopt flag_joins (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents:
1978
diff
changeset
|
3075 eval = flagjoins_all; |
|
6febc7d1f760
Add /room setopt flag_joins (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents:
1978
diff
changeset
|
3076 else { |
|
6febc7d1f760
Add /room setopt flag_joins (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents:
1978
diff
changeset
|
3077 eval = flagjoins_default; |
|
6febc7d1f760
Add /room setopt flag_joins (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents:
1978
diff
changeset
|
3078 if (strcasecmp(value, "default") != 0) |
|
6febc7d1f760
Add /room setopt flag_joins (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents:
1978
diff
changeset
|
3079 scr_LogPrint(LPRINT_NORMAL, "Unrecognized value, assuming default..."); |
|
6febc7d1f760
Add /room setopt flag_joins (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents:
1978
diff
changeset
|
3080 } |
|
1980
3bcc57751283
Add 'muc_bookmark_autoupdate' (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents:
1979
diff
changeset
|
3081 if (eval != buddy_getflagjoins(bud)) { |
|
3bcc57751283
Add 'muc_bookmark_autoupdate' (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents:
1979
diff
changeset
|
3082 buddy_setflagjoins(bud, eval); |
|
3bcc57751283
Add 'muc_bookmark_autoupdate' (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents:
1979
diff
changeset
|
3083 changed = 1; |
|
3bcc57751283
Add 'muc_bookmark_autoupdate' (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents:
1979
diff
changeset
|
3084 } |
|
1377
cd9182f0b5c7
Add /room setopt {print_status,auto_whois}
Mikael Berthe <mikael@lilotux.net>
parents:
1368
diff
changeset
|
3085 } |
|
1980
3bcc57751283
Add 'muc_bookmark_autoupdate' (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents:
1979
diff
changeset
|
3086 if (changed && |
|
3bcc57751283
Add 'muc_bookmark_autoupdate' (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents:
1979
diff
changeset
|
3087 xmpp_is_bookmarked(buddy_getjid(bud)) && |
|
3bcc57751283
Add 'muc_bookmark_autoupdate' (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents:
1979
diff
changeset
|
3088 settings_opt_get_int("muc_bookmark_autoupdate")) |
|
3bcc57751283
Add 'muc_bookmark_autoupdate' (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents:
1979
diff
changeset
|
3089 room_bookmark(bud, NULL); |
|
1377
cd9182f0b5c7
Add /room setopt {print_status,auto_whois}
Mikael Berthe <mikael@lilotux.net>
parents:
1368
diff
changeset
|
3090 |
|
cd9182f0b5c7
Add /room setopt {print_status,auto_whois}
Mikael Berthe <mikael@lilotux.net>
parents:
1368
diff
changeset
|
3091 free_arg_lst(paramlst); |
|
cd9182f0b5c7
Add /room setopt {print_status,auto_whois}
Mikael Berthe <mikael@lilotux.net>
parents:
1368
diff
changeset
|
3092 } |
|
cd9182f0b5c7
Add /room setopt {print_status,auto_whois}
Mikael Berthe <mikael@lilotux.net>
parents:
1368
diff
changeset
|
3093 |
|
1415
317f8d181626
Rename command public functions
Mikael Berthe <mikael@lilotux.net>
parents:
1414
diff
changeset
|
3094 // cmd_room_whois(..) |
|
960
90ff94f0fbbb
Auto-whois shouldn't enable chat mode
Mikael Berthe <mikael@lilotux.net>
parents:
958
diff
changeset
|
3095 // If interactive is TRUE, chatmode can be enabled. |
|
1939
932d1b250a55
Simplify cmd_add() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1938
diff
changeset
|
3096 // Please note that usernick is expected in UTF-8 locale iff interactive is |
|
932d1b250a55
Simplify cmd_add() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1938
diff
changeset
|
3097 // FALSE (in order to work correctly with auto_whois). |
|
1938
26e437e79e60
Fix MUC whois / auto_whois
Mikael Berthe <mikael@lilotux.net>
parents:
1923
diff
changeset
|
3098 void cmd_room_whois(gpointer bud, const char *usernick, guint interactive) |
|
572
afc2bd38b15c
Implement affiliations handling, add "/room whois"
Mikael Berthe <mikael@lilotux.net>
parents:
571
diff
changeset
|
3099 { |
|
1938
26e437e79e60
Fix MUC whois / auto_whois
Mikael Berthe <mikael@lilotux.net>
parents:
1923
diff
changeset
|
3100 char **paramlst = NULL; |
|
572
afc2bd38b15c
Implement affiliations handling, add "/room whois"
Mikael Berthe <mikael@lilotux.net>
parents:
571
diff
changeset
|
3101 gchar *nick, *buffer; |
| 1058 | 3102 const char *bjid, *realjid; |
|
572
afc2bd38b15c
Implement affiliations handling, add "/room whois"
Mikael Berthe <mikael@lilotux.net>
parents:
571
diff
changeset
|
3103 const char *rst_msg; |
| 575 | 3104 gchar rprio; |
|
572
afc2bd38b15c
Implement affiliations handling, add "/room whois"
Mikael Berthe <mikael@lilotux.net>
parents:
571
diff
changeset
|
3105 enum imstatus rstatus; |
|
afc2bd38b15c
Implement affiliations handling, add "/room whois"
Mikael Berthe <mikael@lilotux.net>
parents:
571
diff
changeset
|
3106 enum imrole role; |
|
afc2bd38b15c
Implement affiliations handling, add "/room whois"
Mikael Berthe <mikael@lilotux.net>
parents:
571
diff
changeset
|
3107 enum imaffiliation affil; |
|
625
028c01940490
Show presence timestamps in "/info" and "/room whois"
Mikael Berthe <mikael@lilotux.net>
parents:
622
diff
changeset
|
3108 time_t rst_time; |
|
1416
7f0da8de2a7d
[MUC] Auto-whois doesn't set the new message flag
Mikael Berthe <mikael@lilotux.net>
parents:
1415
diff
changeset
|
3109 guint msg_flag = HBB_PREFIX_INFO; |
|
572
afc2bd38b15c
Implement affiliations handling, add "/room whois"
Mikael Berthe <mikael@lilotux.net>
parents:
571
diff
changeset
|
3110 |
|
1938
26e437e79e60
Fix MUC whois / auto_whois
Mikael Berthe <mikael@lilotux.net>
parents:
1923
diff
changeset
|
3111 if (interactive) { |
|
26e437e79e60
Fix MUC whois / auto_whois
Mikael Berthe <mikael@lilotux.net>
parents:
1923
diff
changeset
|
3112 paramlst = split_arg(usernick, 1, 0); // nickname |
|
26e437e79e60
Fix MUC whois / auto_whois
Mikael Berthe <mikael@lilotux.net>
parents:
1923
diff
changeset
|
3113 nick = to_utf8(*paramlst); |
|
26e437e79e60
Fix MUC whois / auto_whois
Mikael Berthe <mikael@lilotux.net>
parents:
1923
diff
changeset
|
3114 } else { |
|
26e437e79e60
Fix MUC whois / auto_whois
Mikael Berthe <mikael@lilotux.net>
parents:
1923
diff
changeset
|
3115 nick = g_strdup(usernick); |
|
26e437e79e60
Fix MUC whois / auto_whois
Mikael Berthe <mikael@lilotux.net>
parents:
1923
diff
changeset
|
3116 } |
|
572
afc2bd38b15c
Implement affiliations handling, add "/room whois"
Mikael Berthe <mikael@lilotux.net>
parents:
571
diff
changeset
|
3117 |
|
afc2bd38b15c
Implement affiliations handling, add "/room whois"
Mikael Berthe <mikael@lilotux.net>
parents:
571
diff
changeset
|
3118 if (!nick || !*nick) { |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
3119 scr_LogPrint(LPRINT_NORMAL, "Please specify a nickname."); |
|
1938
26e437e79e60
Fix MUC whois / auto_whois
Mikael Berthe <mikael@lilotux.net>
parents:
1923
diff
changeset
|
3120 if (paramlst) |
|
26e437e79e60
Fix MUC whois / auto_whois
Mikael Berthe <mikael@lilotux.net>
parents:
1923
diff
changeset
|
3121 free_arg_lst(paramlst); |
|
572
afc2bd38b15c
Implement affiliations handling, add "/room whois"
Mikael Berthe <mikael@lilotux.net>
parents:
571
diff
changeset
|
3122 return; |
|
afc2bd38b15c
Implement affiliations handling, add "/room whois"
Mikael Berthe <mikael@lilotux.net>
parents:
571
diff
changeset
|
3123 } |
|
afc2bd38b15c
Implement affiliations handling, add "/room whois"
Mikael Berthe <mikael@lilotux.net>
parents:
571
diff
changeset
|
3124 |
|
960
90ff94f0fbbb
Auto-whois shouldn't enable chat mode
Mikael Berthe <mikael@lilotux.net>
parents:
958
diff
changeset
|
3125 if (interactive) { |
|
90ff94f0fbbb
Auto-whois shouldn't enable chat mode
Mikael Berthe <mikael@lilotux.net>
parents:
958
diff
changeset
|
3126 // Enter chat mode |
|
90ff94f0fbbb
Auto-whois shouldn't enable chat mode
Mikael Berthe <mikael@lilotux.net>
parents:
958
diff
changeset
|
3127 scr_set_chatmode(TRUE); |
|
1780
e4378fbab5d7
Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents:
1774
diff
changeset
|
3128 scr_show_buddy_window(); |
|
1416
7f0da8de2a7d
[MUC] Auto-whois doesn't set the new message flag
Mikael Berthe <mikael@lilotux.net>
parents:
1415
diff
changeset
|
3129 } else |
|
7f0da8de2a7d
[MUC] Auto-whois doesn't set the new message flag
Mikael Berthe <mikael@lilotux.net>
parents:
1415
diff
changeset
|
3130 msg_flag |= HBB_PREFIX_NOFLAG; |
|
647
c6c41dd2464a
Enter chat mode automatically when using some commands
Mikael Berthe <mikael@lilotux.net>
parents:
644
diff
changeset
|
3131 |
| 1058 | 3132 bjid = buddy_getjid(bud); |
|
572
afc2bd38b15c
Implement affiliations handling, add "/room whois"
Mikael Berthe <mikael@lilotux.net>
parents:
571
diff
changeset
|
3133 rstatus = buddy_getstatus(bud, nick); |
|
afc2bd38b15c
Implement affiliations handling, add "/room whois"
Mikael Berthe <mikael@lilotux.net>
parents:
571
diff
changeset
|
3134 |
|
afc2bd38b15c
Implement affiliations handling, add "/room whois"
Mikael Berthe <mikael@lilotux.net>
parents:
571
diff
changeset
|
3135 if (rstatus == offline) { |
|
afc2bd38b15c
Implement affiliations handling, add "/room whois"
Mikael Berthe <mikael@lilotux.net>
parents:
571
diff
changeset
|
3136 scr_LogPrint(LPRINT_NORMAL, "No such member: %s", nick); |
|
1938
26e437e79e60
Fix MUC whois / auto_whois
Mikael Berthe <mikael@lilotux.net>
parents:
1923
diff
changeset
|
3137 if (paramlst) |
|
26e437e79e60
Fix MUC whois / auto_whois
Mikael Berthe <mikael@lilotux.net>
parents:
1923
diff
changeset
|
3138 free_arg_lst(paramlst); |
|
791
6c9e8fb69965
Fix "/room whois" with UTF-8 nickname
Mikael Berthe <mikael@lilotux.net>
parents:
777
diff
changeset
|
3139 g_free(nick); |
|
572
afc2bd38b15c
Implement affiliations handling, add "/room whois"
Mikael Berthe <mikael@lilotux.net>
parents:
571
diff
changeset
|
3140 return; |
|
afc2bd38b15c
Implement affiliations handling, add "/room whois"
Mikael Berthe <mikael@lilotux.net>
parents:
571
diff
changeset
|
3141 } |
|
afc2bd38b15c
Implement affiliations handling, add "/room whois"
Mikael Berthe <mikael@lilotux.net>
parents:
571
diff
changeset
|
3142 |
|
625
028c01940490
Show presence timestamps in "/info" and "/room whois"
Mikael Berthe <mikael@lilotux.net>
parents:
622
diff
changeset
|
3143 rst_time = buddy_getstatustime(bud, nick); |
| 575 | 3144 rprio = buddy_getresourceprio(bud, nick); |
|
572
afc2bd38b15c
Implement affiliations handling, add "/room whois"
Mikael Berthe <mikael@lilotux.net>
parents:
571
diff
changeset
|
3145 rst_msg = buddy_getstatusmsg(bud, nick); |
|
afc2bd38b15c
Implement affiliations handling, add "/room whois"
Mikael Berthe <mikael@lilotux.net>
parents:
571
diff
changeset
|
3146 if (!rst_msg) rst_msg = ""; |
|
afc2bd38b15c
Implement affiliations handling, add "/room whois"
Mikael Berthe <mikael@lilotux.net>
parents:
571
diff
changeset
|
3147 |
|
afc2bd38b15c
Implement affiliations handling, add "/room whois"
Mikael Berthe <mikael@lilotux.net>
parents:
571
diff
changeset
|
3148 role = buddy_getrole(bud, nick); |
|
afc2bd38b15c
Implement affiliations handling, add "/room whois"
Mikael Berthe <mikael@lilotux.net>
parents:
571
diff
changeset
|
3149 affil = buddy_getaffil(bud, nick); |
|
afc2bd38b15c
Implement affiliations handling, add "/room whois"
Mikael Berthe <mikael@lilotux.net>
parents:
571
diff
changeset
|
3150 realjid = buddy_getrjid(bud, nick); |
|
afc2bd38b15c
Implement affiliations handling, add "/room whois"
Mikael Berthe <mikael@lilotux.net>
parents:
571
diff
changeset
|
3151 |
|
626
b75f4105ce32
Use a larger buffer for commands like /info
Mikael Berthe <mikael@lilotux.net>
parents:
625
diff
changeset
|
3152 buffer = g_new(char, 4096); |
|
572
afc2bd38b15c
Implement affiliations handling, add "/room whois"
Mikael Berthe <mikael@lilotux.net>
parents:
571
diff
changeset
|
3153 |
|
626
b75f4105ce32
Use a larger buffer for commands like /info
Mikael Berthe <mikael@lilotux.net>
parents:
625
diff
changeset
|
3154 snprintf(buffer, 4095, "Whois [%s]", nick); |
|
1416
7f0da8de2a7d
[MUC] Auto-whois doesn't set the new message flag
Mikael Berthe <mikael@lilotux.net>
parents:
1415
diff
changeset
|
3155 scr_WriteIncomingMessage(bjid, buffer, 0, msg_flag, 0); |
|
626
b75f4105ce32
Use a larger buffer for commands like /info
Mikael Berthe <mikael@lilotux.net>
parents:
625
diff
changeset
|
3156 snprintf(buffer, 4095, "Status : [%c] %s", imstatus2char[rstatus], |
|
572
afc2bd38b15c
Implement affiliations handling, add "/room whois"
Mikael Berthe <mikael@lilotux.net>
parents:
571
diff
changeset
|
3157 rst_msg); |
|
1416
7f0da8de2a7d
[MUC] Auto-whois doesn't set the new message flag
Mikael Berthe <mikael@lilotux.net>
parents:
1415
diff
changeset
|
3158 scr_WriteIncomingMessage(bjid, buffer, 0, msg_flag | HBB_PREFIX_CONT, 0); |
|
572
afc2bd38b15c
Implement affiliations handling, add "/room whois"
Mikael Berthe <mikael@lilotux.net>
parents:
571
diff
changeset
|
3159 |
|
625
028c01940490
Show presence timestamps in "/info" and "/room whois"
Mikael Berthe <mikael@lilotux.net>
parents:
622
diff
changeset
|
3160 if (rst_time) { |
|
626
b75f4105ce32
Use a larger buffer for commands like /info
Mikael Berthe <mikael@lilotux.net>
parents:
625
diff
changeset
|
3161 char tbuf[128]; |
|
625
028c01940490
Show presence timestamps in "/info" and "/room whois"
Mikael Berthe <mikael@lilotux.net>
parents:
622
diff
changeset
|
3162 |
|
028c01940490
Show presence timestamps in "/info" and "/room whois"
Mikael Berthe <mikael@lilotux.net>
parents:
622
diff
changeset
|
3163 strftime(tbuf, sizeof(tbuf), "%Y-%m-%d %H:%M:%S", localtime(&rst_time)); |
|
028c01940490
Show presence timestamps in "/info" and "/room whois"
Mikael Berthe <mikael@lilotux.net>
parents:
622
diff
changeset
|
3164 snprintf(buffer, 127, "Timestamp: %s", tbuf); |
|
1416
7f0da8de2a7d
[MUC] Auto-whois doesn't set the new message flag
Mikael Berthe <mikael@lilotux.net>
parents:
1415
diff
changeset
|
3165 scr_WriteIncomingMessage(bjid, buffer, 0, msg_flag | HBB_PREFIX_CONT, 0); |
|
625
028c01940490
Show presence timestamps in "/info" and "/room whois"
Mikael Berthe <mikael@lilotux.net>
parents:
622
diff
changeset
|
3166 } |
|
028c01940490
Show presence timestamps in "/info" and "/room whois"
Mikael Berthe <mikael@lilotux.net>
parents:
622
diff
changeset
|
3167 |
|
572
afc2bd38b15c
Implement affiliations handling, add "/room whois"
Mikael Berthe <mikael@lilotux.net>
parents:
571
diff
changeset
|
3168 if (realjid) { |
|
626
b75f4105ce32
Use a larger buffer for commands like /info
Mikael Berthe <mikael@lilotux.net>
parents:
625
diff
changeset
|
3169 snprintf(buffer, 4095, "JID : <%s>", realjid); |
|
1416
7f0da8de2a7d
[MUC] Auto-whois doesn't set the new message flag
Mikael Berthe <mikael@lilotux.net>
parents:
1415
diff
changeset
|
3170 scr_WriteIncomingMessage(bjid, buffer, 0, msg_flag | HBB_PREFIX_CONT, 0); |
|
572
afc2bd38b15c
Implement affiliations handling, add "/room whois"
Mikael Berthe <mikael@lilotux.net>
parents:
571
diff
changeset
|
3171 } |
|
afc2bd38b15c
Implement affiliations handling, add "/room whois"
Mikael Berthe <mikael@lilotux.net>
parents:
571
diff
changeset
|
3172 |
| 1058 | 3173 snprintf(buffer, 4095, "Role : %s", strrole[role]); |
|
1416
7f0da8de2a7d
[MUC] Auto-whois doesn't set the new message flag
Mikael Berthe <mikael@lilotux.net>
parents:
1415
diff
changeset
|
3174 scr_WriteIncomingMessage(bjid, buffer, 0, msg_flag | HBB_PREFIX_CONT, 0); |
|
626
b75f4105ce32
Use a larger buffer for commands like /info
Mikael Berthe <mikael@lilotux.net>
parents:
625
diff
changeset
|
3175 snprintf(buffer, 4095, "Affiliat.: %s", straffil[affil]); |
|
1416
7f0da8de2a7d
[MUC] Auto-whois doesn't set the new message flag
Mikael Berthe <mikael@lilotux.net>
parents:
1415
diff
changeset
|
3176 scr_WriteIncomingMessage(bjid, buffer, 0, msg_flag | HBB_PREFIX_CONT, 0); |
|
626
b75f4105ce32
Use a larger buffer for commands like /info
Mikael Berthe <mikael@lilotux.net>
parents:
625
diff
changeset
|
3177 snprintf(buffer, 4095, "Priority : %d", rprio); |
|
1416
7f0da8de2a7d
[MUC] Auto-whois doesn't set the new message flag
Mikael Berthe <mikael@lilotux.net>
parents:
1415
diff
changeset
|
3178 scr_WriteIncomingMessage(bjid, buffer, 0, msg_flag | HBB_PREFIX_CONT, 0); |
|
7f0da8de2a7d
[MUC] Auto-whois doesn't set the new message flag
Mikael Berthe <mikael@lilotux.net>
parents:
1415
diff
changeset
|
3179 |
|
7f0da8de2a7d
[MUC] Auto-whois doesn't set the new message flag
Mikael Berthe <mikael@lilotux.net>
parents:
1415
diff
changeset
|
3180 scr_WriteIncomingMessage(bjid, "End of WHOIS", 0, msg_flag, 0); |
|
572
afc2bd38b15c
Implement affiliations handling, add "/room whois"
Mikael Berthe <mikael@lilotux.net>
parents:
571
diff
changeset
|
3181 |
|
afc2bd38b15c
Implement affiliations handling, add "/room whois"
Mikael Berthe <mikael@lilotux.net>
parents:
571
diff
changeset
|
3182 g_free(buffer); |
|
791
6c9e8fb69965
Fix "/room whois" with UTF-8 nickname
Mikael Berthe <mikael@lilotux.net>
parents:
777
diff
changeset
|
3183 g_free(nick); |
|
1938
26e437e79e60
Fix MUC whois / auto_whois
Mikael Berthe <mikael@lilotux.net>
parents:
1923
diff
changeset
|
3184 if (paramlst) |
|
26e437e79e60
Fix MUC whois / auto_whois
Mikael Berthe <mikael@lilotux.net>
parents:
1923
diff
changeset
|
3185 free_arg_lst(paramlst); |
|
572
afc2bd38b15c
Implement affiliations handling, add "/room whois"
Mikael Berthe <mikael@lilotux.net>
parents:
571
diff
changeset
|
3186 } |
|
afc2bd38b15c
Implement affiliations handling, add "/room whois"
Mikael Berthe <mikael@lilotux.net>
parents:
571
diff
changeset
|
3187 |
| 1009 | 3188 static void room_bookmark(gpointer bud, char *arg) |
| 3189 { | |
| 3190 const char *roomid; | |
|
1976
e6beab22099b
Do not add items to roster with commands /move and /rename (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents:
1972
diff
changeset
|
3191 const char *name = NULL, *nick = NULL, *group = NULL; |
|
1603
54029aba9452
Allow specifying nickname for bookmark
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1602
diff
changeset
|
3192 char *tmpnick = NULL; |
|
1379
74b7621537d7
MUC: Store room settings (print_status, auto_whois) in private storage
Mikael Berthe <mikael@lilotux.net>
parents:
1377
diff
changeset
|
3193 enum room_autowhois autowhois = 0; |
|
1979
6febc7d1f760
Add /room setopt flag_joins (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents:
1978
diff
changeset
|
3194 enum room_flagjoins flagjoins = 0; |
|
1379
74b7621537d7
MUC: Store room settings (print_status, auto_whois) in private storage
Mikael Berthe <mikael@lilotux.net>
parents:
1377
diff
changeset
|
3195 enum room_printstatus printstatus = 0; |
| 1009 | 3196 enum { bm_add = 0, bm_del = 1 } action = 0; |
| 2010 | 3197 int autojoin = 0, autojoin_set = 0; |
|
1603
54029aba9452
Allow specifying nickname for bookmark
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1602
diff
changeset
|
3198 int nick_set = 0; |
| 1009 | 3199 |
| 3200 if (arg && *arg) { | |
|
1603
54029aba9452
Allow specifying nickname for bookmark
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1602
diff
changeset
|
3201 // /room bookmark [add|del] [[+|-]autojoin] [-|nick] |
| 1009 | 3202 char **paramlst; |
| 3203 char **pp; | |
| 3204 | |
|
1603
54029aba9452
Allow specifying nickname for bookmark
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1602
diff
changeset
|
3205 paramlst = split_arg(arg, 3, 0); // At most 3 parameters |
| 1009 | 3206 for (pp = paramlst; *pp; pp++) { |
| 3207 if (!strcasecmp(*pp, "add")) | |
| 3208 action = bm_add; | |
| 3209 else if (!strcasecmp(*pp, "del")) | |
| 3210 action = bm_del; | |
| 2010 | 3211 else if (!strcasecmp(*pp, "-autojoin")) { |
| 1009 | 3212 autojoin = 0; |
| 2010 | 3213 autojoin_set = 1; |
| 3214 } else if (!strcasecmp(*pp, "+autojoin") | |
| 3215 || !strcasecmp(*pp, "autojoin")) { | |
| 1009 | 3216 autojoin = 1; |
| 2010 | 3217 autojoin_set = 1; |
| 3218 } else if (!strcmp(*pp, "-")) | |
|
1603
54029aba9452
Allow specifying nickname for bookmark
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1602
diff
changeset
|
3219 nick_set = 1; |
|
54029aba9452
Allow specifying nickname for bookmark
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1602
diff
changeset
|
3220 else { |
|
54029aba9452
Allow specifying nickname for bookmark
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1602
diff
changeset
|
3221 nick_set = 1; |
|
54029aba9452
Allow specifying nickname for bookmark
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1602
diff
changeset
|
3222 nick = tmpnick = to_utf8 (*pp); |
|
54029aba9452
Allow specifying nickname for bookmark
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1602
diff
changeset
|
3223 } |
| 1009 | 3224 } |
| 3225 free_arg_lst(paramlst); | |
| 3226 } | |
| 3227 | |
| 3228 roomid = buddy_getjid(bud); | |
| 3229 | |
| 3230 if (action == bm_add) { | |
| 3231 name = buddy_getname(bud); | |
|
1993
d4273346d52d
MUC: preserve bookmark when updating a non-joined room
Jan Zachorowski <quantifier666@gmail.com>
parents:
1992
diff
changeset
|
3232 if (!nick_set) { |
|
1603
54029aba9452
Allow specifying nickname for bookmark
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1602
diff
changeset
|
3233 nick = buddy_getnickname(bud); |
|
1993
d4273346d52d
MUC: preserve bookmark when updating a non-joined room
Jan Zachorowski <quantifier666@gmail.com>
parents:
1992
diff
changeset
|
3234 if (!nick) //we are probably bookmarking offline room |
|
d4273346d52d
MUC: preserve bookmark when updating a non-joined room
Jan Zachorowski <quantifier666@gmail.com>
parents:
1992
diff
changeset
|
3235 nick = xmpp_get_bookmark_nick(roomid); |
|
d4273346d52d
MUC: preserve bookmark when updating a non-joined room
Jan Zachorowski <quantifier666@gmail.com>
parents:
1992
diff
changeset
|
3236 } |
| 2010 | 3237 if (!autojoin_set) { |
| 3238 autojoin = xmpp_get_bookmark_autojoin(roomid); | |
| 3239 } | |
|
1379
74b7621537d7
MUC: Store room settings (print_status, auto_whois) in private storage
Mikael Berthe <mikael@lilotux.net>
parents:
1377
diff
changeset
|
3240 printstatus = buddy_getprintstatus(bud); |
|
74b7621537d7
MUC: Store room settings (print_status, auto_whois) in private storage
Mikael Berthe <mikael@lilotux.net>
parents:
1377
diff
changeset
|
3241 autowhois = buddy_getautowhois(bud); |
|
1979
6febc7d1f760
Add /room setopt flag_joins (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents:
1978
diff
changeset
|
3242 flagjoins = buddy_getflagjoins(bud); |
|
1976
e6beab22099b
Do not add items to roster with commands /move and /rename (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents:
1972
diff
changeset
|
3243 group = buddy_getgroupname(bud); |
| 1009 | 3244 } |
| 3245 | |
| 1598 | 3246 xmpp_set_storage_bookmark(roomid, name, nick, NULL, autojoin, |
|
1979
6febc7d1f760
Add /room setopt flag_joins (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents:
1978
diff
changeset
|
3247 printstatus, autowhois, flagjoins, group); |
|
1603
54029aba9452
Allow specifying nickname for bookmark
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1602
diff
changeset
|
3248 g_free (tmpnick); |
| 1009 | 3249 } |
| 3250 | |
|
1163
2913310a7be6
Make /roster bookmark in the status buffer show all bookmarks
Mikael Berthe <mikael@lilotux.net>
parents:
1162
diff
changeset
|
3251 static void display_all_bookmarks(void) |
|
2913310a7be6
Make /roster bookmark in the status buffer show all bookmarks
Mikael Berthe <mikael@lilotux.net>
parents:
1162
diff
changeset
|
3252 { |
|
2913310a7be6
Make /roster bookmark in the status buffer show all bookmarks
Mikael Berthe <mikael@lilotux.net>
parents:
1162
diff
changeset
|
3253 GSList *bm, *bmp; |
|
2913310a7be6
Make /roster bookmark in the status buffer show all bookmarks
Mikael Berthe <mikael@lilotux.net>
parents:
1162
diff
changeset
|
3254 GString *sbuf; |
|
1525
68580b6be895
Display more information in /room bookmark (autojoin, nick...)
Mikael Berthe <mikael@lilotux.net>
parents:
1518
diff
changeset
|
3255 struct bookmark *bm_elt; |
|
1163
2913310a7be6
Make /roster bookmark in the status buffer show all bookmarks
Mikael Berthe <mikael@lilotux.net>
parents:
1162
diff
changeset
|
3256 |
| 1598 | 3257 bm = xmpp_get_all_storage_bookmarks(); |
|
1163
2913310a7be6
Make /roster bookmark in the status buffer show all bookmarks
Mikael Berthe <mikael@lilotux.net>
parents:
1162
diff
changeset
|
3258 |
|
2913310a7be6
Make /roster bookmark in the status buffer show all bookmarks
Mikael Berthe <mikael@lilotux.net>
parents:
1162
diff
changeset
|
3259 if (!bm) |
|
2913310a7be6
Make /roster bookmark in the status buffer show all bookmarks
Mikael Berthe <mikael@lilotux.net>
parents:
1162
diff
changeset
|
3260 return; |
|
2913310a7be6
Make /roster bookmark in the status buffer show all bookmarks
Mikael Berthe <mikael@lilotux.net>
parents:
1162
diff
changeset
|
3261 |
|
2913310a7be6
Make /roster bookmark in the status buffer show all bookmarks
Mikael Berthe <mikael@lilotux.net>
parents:
1162
diff
changeset
|
3262 sbuf = g_string_new(""); |
|
2913310a7be6
Make /roster bookmark in the status buffer show all bookmarks
Mikael Berthe <mikael@lilotux.net>
parents:
1162
diff
changeset
|
3263 |
|
1333
e30a9d907105
Minor coding style adjustments
Mikael Berthe <mikael@lilotux.net>
parents:
1329
diff
changeset
|
3264 scr_WriteIncomingMessage(NULL, "List of MUC bookmarks:", |
|
e30a9d907105
Minor coding style adjustments
Mikael Berthe <mikael@lilotux.net>
parents:
1329
diff
changeset
|
3265 0, HBB_PREFIX_INFO, 0); |
|
1163
2913310a7be6
Make /roster bookmark in the status buffer show all bookmarks
Mikael Berthe <mikael@lilotux.net>
parents:
1162
diff
changeset
|
3266 |
|
2913310a7be6
Make /roster bookmark in the status buffer show all bookmarks
Mikael Berthe <mikael@lilotux.net>
parents:
1162
diff
changeset
|
3267 for (bmp = bm; bmp; bmp = g_slist_next(bmp)) { |
|
1525
68580b6be895
Display more information in /room bookmark (autojoin, nick...)
Mikael Berthe <mikael@lilotux.net>
parents:
1518
diff
changeset
|
3268 bm_elt = bmp->data; |
|
68580b6be895
Display more information in /room bookmark (autojoin, nick...)
Mikael Berthe <mikael@lilotux.net>
parents:
1518
diff
changeset
|
3269 g_string_printf(sbuf, "%c <%s>", |
|
68580b6be895
Display more information in /room bookmark (autojoin, nick...)
Mikael Berthe <mikael@lilotux.net>
parents:
1518
diff
changeset
|
3270 (bm_elt->autojoin ? '*' : ' '), bm_elt->roomjid); |
|
68580b6be895
Display more information in /room bookmark (autojoin, nick...)
Mikael Berthe <mikael@lilotux.net>
parents:
1518
diff
changeset
|
3271 if (bm_elt->nick) |
|
68580b6be895
Display more information in /room bookmark (autojoin, nick...)
Mikael Berthe <mikael@lilotux.net>
parents:
1518
diff
changeset
|
3272 g_string_append_printf(sbuf, " (%s)", bm_elt->nick); |
|
68580b6be895
Display more information in /room bookmark (autojoin, nick...)
Mikael Berthe <mikael@lilotux.net>
parents:
1518
diff
changeset
|
3273 if (bm_elt->name) |
|
68580b6be895
Display more information in /room bookmark (autojoin, nick...)
Mikael Berthe <mikael@lilotux.net>
parents:
1518
diff
changeset
|
3274 g_string_append_printf(sbuf, " %s", bm_elt->name); |
|
68580b6be895
Display more information in /room bookmark (autojoin, nick...)
Mikael Berthe <mikael@lilotux.net>
parents:
1518
diff
changeset
|
3275 g_free(bm_elt->roomjid); |
|
68580b6be895
Display more information in /room bookmark (autojoin, nick...)
Mikael Berthe <mikael@lilotux.net>
parents:
1518
diff
changeset
|
3276 g_free(bm_elt->name); |
|
68580b6be895
Display more information in /room bookmark (autojoin, nick...)
Mikael Berthe <mikael@lilotux.net>
parents:
1518
diff
changeset
|
3277 g_free(bm_elt->nick); |
|
68580b6be895
Display more information in /room bookmark (autojoin, nick...)
Mikael Berthe <mikael@lilotux.net>
parents:
1518
diff
changeset
|
3278 g_free(bm_elt); |
|
1268
dbc907b2d92f
Add configurable colors for info and incoming messages (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents:
1260
diff
changeset
|
3279 scr_WriteIncomingMessage(NULL, sbuf->str, |
|
1290
e42f48103609
Drawing the MUC nicks by a different color
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1279
diff
changeset
|
3280 0, HBB_PREFIX_INFO | HBB_PREFIX_CONT, 0); |
|
1163
2913310a7be6
Make /roster bookmark in the status buffer show all bookmarks
Mikael Berthe <mikael@lilotux.net>
parents:
1162
diff
changeset
|
3281 } |
|
2913310a7be6
Make /roster bookmark in the status buffer show all bookmarks
Mikael Berthe <mikael@lilotux.net>
parents:
1162
diff
changeset
|
3282 |
|
2913310a7be6
Make /roster bookmark in the status buffer show all bookmarks
Mikael Berthe <mikael@lilotux.net>
parents:
1162
diff
changeset
|
3283 scr_setmsgflag_if_needed(SPECIAL_BUFFER_STATUS_ID, TRUE); |
|
1815
6abca6000762
Make use of ROSTER_UI_PRIO_STATUS_WIN_MESSAGE
Mikael Berthe <mikael@lilotux.net>
parents:
1811
diff
changeset
|
3284 scr_setattentionflag_if_needed(SPECIAL_BUFFER_STATUS_ID, TRUE, |
|
6abca6000762
Make use of ROSTER_UI_PRIO_STATUS_WIN_MESSAGE
Mikael Berthe <mikael@lilotux.net>
parents:
1811
diff
changeset
|
3285 ROSTER_UI_PRIO_STATUS_WIN_MESSAGE, prio_max); |
|
1163
2913310a7be6
Make /roster bookmark in the status buffer show all bookmarks
Mikael Berthe <mikael@lilotux.net>
parents:
1162
diff
changeset
|
3286 g_string_free(sbuf, TRUE); |
|
2913310a7be6
Make /roster bookmark in the status buffer show all bookmarks
Mikael Berthe <mikael@lilotux.net>
parents:
1162
diff
changeset
|
3287 g_slist_free(bm); |
|
2913310a7be6
Make /roster bookmark in the status buffer show all bookmarks
Mikael Berthe <mikael@lilotux.net>
parents:
1162
diff
changeset
|
3288 } |
|
2913310a7be6
Make /roster bookmark in the status buffer show all bookmarks
Mikael Berthe <mikael@lilotux.net>
parents:
1162
diff
changeset
|
3289 |
|
1735
5093b5ca1572
New modules loading scheme
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1732
diff
changeset
|
3290 static void do_module(char *arg) |
| 1607 | 3291 { |
|
1939
932d1b250a55
Simplify cmd_add() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1938
diff
changeset
|
3292 #ifdef MODULES_ENABLE |
|
1735
5093b5ca1572
New modules loading scheme
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1732
diff
changeset
|
3293 gboolean force = FALSE; |
|
5093b5ca1572
New modules loading scheme
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1732
diff
changeset
|
3294 char **args; |
|
5093b5ca1572
New modules loading scheme
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1732
diff
changeset
|
3295 |
|
5093b5ca1572
New modules loading scheme
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1732
diff
changeset
|
3296 args = split_arg(arg, 2, 0); |
|
5093b5ca1572
New modules loading scheme
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1732
diff
changeset
|
3297 if (!args[0] || !strcmp(args[0], "list")) { |
|
5093b5ca1572
New modules loading scheme
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1732
diff
changeset
|
3298 module_list_print(); |
|
5093b5ca1572
New modules loading scheme
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1732
diff
changeset
|
3299 } else { |
|
1749
7ee390513463
Use api version for module checks
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1745
diff
changeset
|
3300 const gchar *error = NULL; |
|
1737
764ed5c12589
Move -f flag of /module command after a subcommand
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1735
diff
changeset
|
3301 const gchar *name = args[1]; |
|
764ed5c12589
Move -f flag of /module command after a subcommand
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1735
diff
changeset
|
3302 |
|
764ed5c12589
Move -f flag of /module command after a subcommand
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1735
diff
changeset
|
3303 if (name && name[0] == '-' && name[1] == 'f') { |
|
764ed5c12589
Move -f flag of /module command after a subcommand
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1735
diff
changeset
|
3304 force = TRUE; |
|
764ed5c12589
Move -f flag of /module command after a subcommand
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1735
diff
changeset
|
3305 name +=2; |
|
764ed5c12589
Move -f flag of /module command after a subcommand
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1735
diff
changeset
|
3306 while (*name && *name == ' ') |
|
764ed5c12589
Move -f flag of /module command after a subcommand
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1735
diff
changeset
|
3307 ++name; |
|
764ed5c12589
Move -f flag of /module command after a subcommand
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1735
diff
changeset
|
3308 } |
|
764ed5c12589
Move -f flag of /module command after a subcommand
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1735
diff
changeset
|
3309 |
|
2021
f88de5187d3b
Fix /module error messages to dispaly modulename
Myhailo Danylenko <isbear@ukrpost.net>
parents:
2020
diff
changeset
|
3310 if (!strcmp(args[0], "load")) { |
|
1737
764ed5c12589
Move -f flag of /module command after a subcommand
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1735
diff
changeset
|
3311 error = module_load(name, TRUE, force); |
|
2021
f88de5187d3b
Fix /module error messages to dispaly modulename
Myhailo Danylenko <isbear@ukrpost.net>
parents:
2020
diff
changeset
|
3312 if (error) |
|
f88de5187d3b
Fix /module error messages to dispaly modulename
Myhailo Danylenko <isbear@ukrpost.net>
parents:
2020
diff
changeset
|
3313 scr_log_print(LPRINT_LOGNORM, "Module '%s' loading error: %s", name, error); |
|
f88de5187d3b
Fix /module error messages to dispaly modulename
Myhailo Danylenko <isbear@ukrpost.net>
parents:
2020
diff
changeset
|
3314 } else if (!strcmp(args[0], "unload")) { |
|
1737
764ed5c12589
Move -f flag of /module command after a subcommand
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1735
diff
changeset
|
3315 error = module_unload(name, TRUE, force); |
|
2021
f88de5187d3b
Fix /module error messages to dispaly modulename
Myhailo Danylenko <isbear@ukrpost.net>
parents:
2020
diff
changeset
|
3316 if (error) |
|
f88de5187d3b
Fix /module error messages to dispaly modulename
Myhailo Danylenko <isbear@ukrpost.net>
parents:
2020
diff
changeset
|
3317 scr_log_print(LPRINT_LOGNORM, "Module '%s' unloading error: %s", name, error); |
|
f88de5187d3b
Fix /module error messages to dispaly modulename
Myhailo Danylenko <isbear@ukrpost.net>
parents:
2020
diff
changeset
|
3318 } else if (!strcmp(args[0], "info")) |
|
1749
7ee390513463
Use api version for module checks
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1745
diff
changeset
|
3319 module_info_print(name); |
|
1735
5093b5ca1572
New modules loading scheme
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1732
diff
changeset
|
3320 else |
|
2021
f88de5187d3b
Fix /module error messages to dispaly modulename
Myhailo Danylenko <isbear@ukrpost.net>
parents:
2020
diff
changeset
|
3321 scr_log_print(LPRINT_LOGNORM, "Error: module: Unknown subcommand."); |
| 1607 | 3322 } |
|
1735
5093b5ca1572
New modules loading scheme
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1732
diff
changeset
|
3323 free_arg_lst(args); |
|
1939
932d1b250a55
Simplify cmd_add() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1938
diff
changeset
|
3324 #else |
|
932d1b250a55
Simplify cmd_add() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1938
diff
changeset
|
3325 scr_log_print(LPRINT_NORMAL, |
|
932d1b250a55
Simplify cmd_add() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1938
diff
changeset
|
3326 "Please recompile mcabber with modules enabled."); |
|
932d1b250a55
Simplify cmd_add() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1938
diff
changeset
|
3327 #endif |
| 1607 | 3328 } |
|
1163
2913310a7be6
Make /roster bookmark in the status buffer show all bookmarks
Mikael Berthe <mikael@lilotux.net>
parents:
1162
diff
changeset
|
3329 |
|
447
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
446
diff
changeset
|
3330 static void do_room(char *arg) |
|
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
446
diff
changeset
|
3331 { |
|
554
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
552
diff
changeset
|
3332 char **paramlst; |
|
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
552
diff
changeset
|
3333 char *subcmd; |
|
447
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
446
diff
changeset
|
3334 gpointer bud; |
|
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
446
diff
changeset
|
3335 |
|
1684
95df4ea512c8
Provide xmpp_is_online()
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1682
diff
changeset
|
3336 if (!xmpp_is_online()) { |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
3337 scr_LogPrint(LPRINT_NORMAL, "You are not connected."); |
|
472
75442262c082
Disable some commands when not connected
Mikael Berthe <mikael@lilotux.net>
parents:
471
diff
changeset
|
3338 return; |
|
75442262c082
Disable some commands when not connected
Mikael Berthe <mikael@lilotux.net>
parents:
471
diff
changeset
|
3339 } |
|
75442262c082
Disable some commands when not connected
Mikael Berthe <mikael@lilotux.net>
parents:
471
diff
changeset
|
3340 |
|
554
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
552
diff
changeset
|
3341 paramlst = split_arg(arg, 2, 1); // subcmd, arg |
|
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
552
diff
changeset
|
3342 subcmd = *paramlst; |
|
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
552
diff
changeset
|
3343 arg = *(paramlst+1); |
|
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
552
diff
changeset
|
3344 |
|
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
552
diff
changeset
|
3345 if (!subcmd || !*subcmd) { |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
3346 scr_LogPrint(LPRINT_NORMAL, "Missing parameter."); |
|
554
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
552
diff
changeset
|
3347 free_arg_lst(paramlst); |
|
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
552
diff
changeset
|
3348 return; |
|
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
552
diff
changeset
|
3349 } |
|
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
552
diff
changeset
|
3350 |
|
831
dd865cc57aa2
Fix joining a room when the buddylist is empty
Mikael Berthe <mikael@lilotux.net>
parents:
820
diff
changeset
|
3351 if (current_buddy) { |
|
dd865cc57aa2
Fix joining a room when the buddylist is empty
Mikael Berthe <mikael@lilotux.net>
parents:
820
diff
changeset
|
3352 bud = BUDDATA(current_buddy); |
|
dd865cc57aa2
Fix joining a room when the buddylist is empty
Mikael Berthe <mikael@lilotux.net>
parents:
820
diff
changeset
|
3353 } else { |
|
1073
253e8988eb5c
Fix a few memory leaks after calls to split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
1072
diff
changeset
|
3354 if (strcasecmp(subcmd, "join")) { |
|
253e8988eb5c
Fix a few memory leaks after calls to split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
1072
diff
changeset
|
3355 free_arg_lst(paramlst); |
|
831
dd865cc57aa2
Fix joining a room when the buddylist is empty
Mikael Berthe <mikael@lilotux.net>
parents:
820
diff
changeset
|
3356 return; |
|
1073
253e8988eb5c
Fix a few memory leaks after calls to split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
1072
diff
changeset
|
3357 } |
|
831
dd865cc57aa2
Fix joining a room when the buddylist is empty
Mikael Berthe <mikael@lilotux.net>
parents:
820
diff
changeset
|
3358 // "room join" is a special case, we don't need to have a valid |
|
dd865cc57aa2
Fix joining a room when the buddylist is empty
Mikael Berthe <mikael@lilotux.net>
parents:
820
diff
changeset
|
3359 // current_buddy. |
|
dd865cc57aa2
Fix joining a room when the buddylist is empty
Mikael Berthe <mikael@lilotux.net>
parents:
820
diff
changeset
|
3360 bud = NULL; |
|
dd865cc57aa2
Fix joining a room when the buddylist is empty
Mikael Berthe <mikael@lilotux.net>
parents:
820
diff
changeset
|
3361 } |
|
dd865cc57aa2
Fix joining a room when the buddylist is empty
Mikael Berthe <mikael@lilotux.net>
parents:
820
diff
changeset
|
3362 |
|
554
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
552
diff
changeset
|
3363 if (!strcasecmp(subcmd, "join")) { |
|
841
f8c0447beec2
Allow "/room join . [nick]" if the current item is a MUC room
Mikael Berthe <mikael@lilotux.net>
parents:
840
diff
changeset
|
3364 if ((arg = check_room_subcommand(arg, FALSE, NULL)) != NULL) |
| 552 | 3365 room_join(bud, arg); |
|
554
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
552
diff
changeset
|
3366 } else if (!strcasecmp(subcmd, "invite")) { |
|
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
552
diff
changeset
|
3367 if ((arg = check_room_subcommand(arg, TRUE, bud)) != NULL) |
| 552 | 3368 room_invite(bud, arg); |
|
585
7eff2c1481fa
Add "/room affil" and "/room role"
Mikael Berthe <mikael@lilotux.net>
parents:
584
diff
changeset
|
3369 } else if (!strcasecmp(subcmd, "affil")) { |
|
7eff2c1481fa
Add "/room affil" and "/room role"
Mikael Berthe <mikael@lilotux.net>
parents:
584
diff
changeset
|
3370 if ((arg = check_room_subcommand(arg, TRUE, bud)) != NULL) |
|
7eff2c1481fa
Add "/room affil" and "/room role"
Mikael Berthe <mikael@lilotux.net>
parents:
584
diff
changeset
|
3371 room_affil(bud, arg); |
|
7eff2c1481fa
Add "/room affil" and "/room role"
Mikael Berthe <mikael@lilotux.net>
parents:
584
diff
changeset
|
3372 } else if (!strcasecmp(subcmd, "role")) { |
|
7eff2c1481fa
Add "/room affil" and "/room role"
Mikael Berthe <mikael@lilotux.net>
parents:
584
diff
changeset
|
3373 if ((arg = check_room_subcommand(arg, TRUE, bud)) != NULL) |
|
7eff2c1481fa
Add "/room affil" and "/room role"
Mikael Berthe <mikael@lilotux.net>
parents:
584
diff
changeset
|
3374 room_role(bud, arg); |
| 571 | 3375 } else if (!strcasecmp(subcmd, "ban")) { |
| 3376 if ((arg = check_room_subcommand(arg, TRUE, bud)) != NULL) | |
| 3377 room_ban(bud, arg); | |
|
1260
b4ccc5b2a6de
Add command /room unban
Mikael Berthe <mikael@lilotux.net>
parents:
1235
diff
changeset
|
3378 } else if (!strcasecmp(subcmd, "unban")) { |
|
b4ccc5b2a6de
Add command /room unban
Mikael Berthe <mikael@lilotux.net>
parents:
1235
diff
changeset
|
3379 if ((arg = check_room_subcommand(arg, TRUE, bud)) != NULL) |
|
b4ccc5b2a6de
Add command /room unban
Mikael Berthe <mikael@lilotux.net>
parents:
1235
diff
changeset
|
3380 room_unban(bud, arg); |
| 568 | 3381 } else if (!strcasecmp(subcmd, "kick")) { |
| 3382 if ((arg = check_room_subcommand(arg, TRUE, bud)) != NULL) | |
| 3383 room_kick(bud, arg); | |
|
554
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
552
diff
changeset
|
3384 } else if (!strcasecmp(subcmd, "leave")) { |
|
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
552
diff
changeset
|
3385 if ((arg = check_room_subcommand(arg, FALSE, bud)) != NULL) |
|
1415
317f8d181626
Rename command public functions
Mikael Berthe <mikael@lilotux.net>
parents:
1414
diff
changeset
|
3386 cmd_room_leave(bud, arg); |
|
554
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
552
diff
changeset
|
3387 } else if (!strcasecmp(subcmd, "names")) { |
|
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
552
diff
changeset
|
3388 if ((arg = check_room_subcommand(arg, FALSE, bud)) != NULL) |
| 552 | 3389 room_names(bud, arg); |
|
554
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
552
diff
changeset
|
3390 } else if (!strcasecmp(subcmd, "nick")) { |
|
565
89c347b3e4c1
MUC: Make "/room nick" display the current nickname
Mikael Berthe <mikael@lilotux.net>
parents:
558
diff
changeset
|
3391 if ((arg = check_room_subcommand(arg, FALSE, bud)) != NULL) |
| 552 | 3392 room_nick(bud, arg); |
|
554
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
552
diff
changeset
|
3393 } else if (!strcasecmp(subcmd, "privmsg")) { |
|
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
552
diff
changeset
|
3394 if ((arg = check_room_subcommand(arg, TRUE, bud)) != NULL) |
| 552 | 3395 room_privmsg(bud, arg); |
|
554
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
552
diff
changeset
|
3396 } else if (!strcasecmp(subcmd, "remove")) { |
|
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
552
diff
changeset
|
3397 if ((arg = check_room_subcommand(arg, FALSE, bud)) != NULL) |
| 552 | 3398 room_remove(bud, arg); |
| 599 | 3399 } else if (!strcasecmp(subcmd, "destroy")) { |
| 3400 if ((arg = check_room_subcommand(arg, FALSE, bud)) != NULL) | |
| 3401 room_destroy(bud, arg); | |
|
554
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
552
diff
changeset
|
3402 } else if (!strcasecmp(subcmd, "unlock")) { |
|
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
552
diff
changeset
|
3403 if ((arg = check_room_subcommand(arg, FALSE, bud)) != NULL) |
| 552 | 3404 room_unlock(bud, arg); |
|
1377
cd9182f0b5c7
Add /room setopt {print_status,auto_whois}
Mikael Berthe <mikael@lilotux.net>
parents:
1368
diff
changeset
|
3405 } else if (!strcasecmp(subcmd, "setopt")) { |
|
cd9182f0b5c7
Add /room setopt {print_status,auto_whois}
Mikael Berthe <mikael@lilotux.net>
parents:
1368
diff
changeset
|
3406 if ((arg = check_room_subcommand(arg, FALSE, bud)) != NULL) |
|
cd9182f0b5c7
Add /room setopt {print_status,auto_whois}
Mikael Berthe <mikael@lilotux.net>
parents:
1368
diff
changeset
|
3407 room_setopt(bud, arg); |
|
554
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
552
diff
changeset
|
3408 } else if (!strcasecmp(subcmd, "topic")) { |
|
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
552
diff
changeset
|
3409 if ((arg = check_room_subcommand(arg, FALSE, bud)) != NULL) |
| 552 | 3410 room_topic(bud, arg); |
|
572
afc2bd38b15c
Implement affiliations handling, add "/room whois"
Mikael Berthe <mikael@lilotux.net>
parents:
571
diff
changeset
|
3411 } else if (!strcasecmp(subcmd, "whois")) { |
|
afc2bd38b15c
Implement affiliations handling, add "/room whois"
Mikael Berthe <mikael@lilotux.net>
parents:
571
diff
changeset
|
3412 if ((arg = check_room_subcommand(arg, TRUE, bud)) != NULL) |
|
1415
317f8d181626
Rename command public functions
Mikael Berthe <mikael@lilotux.net>
parents:
1414
diff
changeset
|
3413 cmd_room_whois(bud, arg, TRUE); |
| 1009 | 3414 } else if (!strcasecmp(subcmd, "bookmark")) { |
|
1163
2913310a7be6
Make /roster bookmark in the status buffer show all bookmarks
Mikael Berthe <mikael@lilotux.net>
parents:
1162
diff
changeset
|
3415 if (!arg && !buddy_getjid(BUDDATA(current_buddy)) && |
|
2913310a7be6
Make /roster bookmark in the status buffer show all bookmarks
Mikael Berthe <mikael@lilotux.net>
parents:
1162
diff
changeset
|
3416 buddy_gettype(BUDDATA(current_buddy)) == ROSTER_TYPE_SPECIAL) |
|
2913310a7be6
Make /roster bookmark in the status buffer show all bookmarks
Mikael Berthe <mikael@lilotux.net>
parents:
1162
diff
changeset
|
3417 display_all_bookmarks(); |
|
2913310a7be6
Make /roster bookmark in the status buffer show all bookmarks
Mikael Berthe <mikael@lilotux.net>
parents:
1162
diff
changeset
|
3418 else if ((arg = check_room_subcommand(arg, FALSE, bud)) != NULL) |
| 1009 | 3419 room_bookmark(bud, arg); |
|
447
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
446
diff
changeset
|
3420 } else { |
|
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
446
diff
changeset
|
3421 scr_LogPrint(LPRINT_NORMAL, "Unrecognized parameter!"); |
|
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
446
diff
changeset
|
3422 } |
|
554
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
552
diff
changeset
|
3423 |
|
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
552
diff
changeset
|
3424 free_arg_lst(paramlst); |
|
447
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
446
diff
changeset
|
3425 } |
|
03bb57383cea
Initial Multi-User Chat support
Mikael Berthe <mikael@lilotux.net>
parents:
446
diff
changeset
|
3426 |
|
617
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
608
diff
changeset
|
3427 static void do_authorization(char *arg) |
|
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
608
diff
changeset
|
3428 { |
|
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
608
diff
changeset
|
3429 char **paramlst; |
|
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
608
diff
changeset
|
3430 char *subcmd; |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
3431 char *jid_utf8; |
|
617
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
608
diff
changeset
|
3432 |
|
1684
95df4ea512c8
Provide xmpp_is_online()
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1682
diff
changeset
|
3433 if (!xmpp_is_online()) { |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
3434 scr_LogPrint(LPRINT_NORMAL, "You are not connected."); |
|
617
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
608
diff
changeset
|
3435 return; |
|
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
608
diff
changeset
|
3436 } |
|
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
608
diff
changeset
|
3437 |
|
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
608
diff
changeset
|
3438 paramlst = split_arg(arg, 2, 0); // subcmd, [jid] |
|
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
608
diff
changeset
|
3439 subcmd = *paramlst; |
|
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
608
diff
changeset
|
3440 arg = *(paramlst+1); |
|
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
608
diff
changeset
|
3441 |
|
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
608
diff
changeset
|
3442 if (!subcmd || !*subcmd) { |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
3443 scr_LogPrint(LPRINT_NORMAL, "Missing parameter."); |
|
1073
253e8988eb5c
Fix a few memory leaks after calls to split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
1072
diff
changeset
|
3444 goto do_authorization_return; |
|
617
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
608
diff
changeset
|
3445 } |
|
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
608
diff
changeset
|
3446 |
|
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
608
diff
changeset
|
3447 // Use the provided jid, if it looks valid |
|
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
608
diff
changeset
|
3448 if (arg) { |
|
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
608
diff
changeset
|
3449 if (!*arg) { |
|
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
608
diff
changeset
|
3450 // If no jid is provided, we use the current selected buddy |
|
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
608
diff
changeset
|
3451 arg = NULL; |
|
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
608
diff
changeset
|
3452 } else { |
|
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
608
diff
changeset
|
3453 if (check_jid_syntax(arg)) { |
|
1064
516b5f7d1023
Fix some UTF-8 related problems
Mikael Berthe <mikael@lilotux.net>
parents:
1059
diff
changeset
|
3454 scr_LogPrint(LPRINT_NORMAL|LPRINT_NOTUTF8, |
|
516b5f7d1023
Fix some UTF-8 related problems
Mikael Berthe <mikael@lilotux.net>
parents:
1059
diff
changeset
|
3455 "<%s> is not a valid Jabber ID.", arg); |
|
1073
253e8988eb5c
Fix a few memory leaks after calls to split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
1072
diff
changeset
|
3456 goto do_authorization_return; |
|
617
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
608
diff
changeset
|
3457 } |
|
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
608
diff
changeset
|
3458 } |
|
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
608
diff
changeset
|
3459 } |
|
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
608
diff
changeset
|
3460 |
|
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
608
diff
changeset
|
3461 if (!arg) { // Use the current selected buddy's jid |
|
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
608
diff
changeset
|
3462 gpointer bud; |
|
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
608
diff
changeset
|
3463 guint type; |
|
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
608
diff
changeset
|
3464 |
| 1058 | 3465 if (!current_buddy) |
|
1073
253e8988eb5c
Fix a few memory leaks after calls to split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
1072
diff
changeset
|
3466 goto do_authorization_return; |
|
617
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
608
diff
changeset
|
3467 bud = BUDDATA(current_buddy); |
|
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
608
diff
changeset
|
3468 |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
3469 jid_utf8 = arg = (char*)buddy_getjid(bud); |
|
617
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
608
diff
changeset
|
3470 type = buddy_gettype(bud); |
|
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
608
diff
changeset
|
3471 |
|
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
608
diff
changeset
|
3472 if (!(type & (ROSTER_TYPE_USER|ROSTER_TYPE_AGENT))) { |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
3473 scr_LogPrint(LPRINT_NORMAL, "Invalid buddy."); |
|
1073
253e8988eb5c
Fix a few memory leaks after calls to split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
1072
diff
changeset
|
3474 goto do_authorization_return; |
|
617
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
608
diff
changeset
|
3475 } |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
3476 } else { |
|
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
3477 jid_utf8 = to_utf8(arg); |
|
617
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
608
diff
changeset
|
3478 } |
|
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
608
diff
changeset
|
3479 |
|
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
608
diff
changeset
|
3480 if (!strcasecmp(subcmd, "allow")) { |
| 1598 | 3481 xmpp_send_s10n(jid_utf8, LM_MESSAGE_SUB_TYPE_SUBSCRIBED); |
|
617
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
608
diff
changeset
|
3482 scr_LogPrint(LPRINT_LOGNORM, |
|
1635
a57f2634ee7c
Fix a misleading message
Mikael Berthe <mikael@lilotux.net>
parents:
1631
diff
changeset
|
3483 "Sent presence subscription approval to <%s>.", |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
3484 jid_utf8); |
|
617
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
608
diff
changeset
|
3485 } else if (!strcasecmp(subcmd, "cancel")) { |
| 1598 | 3486 xmpp_send_s10n(jid_utf8, LM_MESSAGE_SUB_TYPE_UNSUBSCRIBED); |
|
617
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
608
diff
changeset
|
3487 scr_LogPrint(LPRINT_LOGNORM, |
|
681
8dc602a246a4
Improve messages in commands.c
Philip M. White <pmw@qnan.org>
parents:
677
diff
changeset
|
3488 "<%s> will no longer receive your presence updates.", |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
3489 jid_utf8); |
|
617
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
608
diff
changeset
|
3490 } else if (!strcasecmp(subcmd, "request")) { |
| 1598 | 3491 xmpp_send_s10n(jid_utf8, LM_MESSAGE_SUB_TYPE_SUBSCRIBE); |
|
617
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
608
diff
changeset
|
3492 scr_LogPrint(LPRINT_LOGNORM, |
| 957 | 3493 "Sent presence notification request to <%s>.", jid_utf8); |
|
835
6a732d2ad4b4
Add "/authorization request_unsubscribe"
Mikael Berthe <mikael@lilotux.net>
parents:
831
diff
changeset
|
3494 } else if (!strcasecmp(subcmd, "request_unsubscribe")) { |
| 1598 | 3495 xmpp_send_s10n(jid_utf8, LM_MESSAGE_SUB_TYPE_UNSUBSCRIBE); |
|
835
6a732d2ad4b4
Add "/authorization request_unsubscribe"
Mikael Berthe <mikael@lilotux.net>
parents:
831
diff
changeset
|
3496 scr_LogPrint(LPRINT_LOGNORM, |
| 957 | 3497 "Sent presence notification unsubscription request to <%s>.", |
|
835
6a732d2ad4b4
Add "/authorization request_unsubscribe"
Mikael Berthe <mikael@lilotux.net>
parents:
831
diff
changeset
|
3498 jid_utf8); |
|
617
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
608
diff
changeset
|
3499 } else { |
|
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
608
diff
changeset
|
3500 scr_LogPrint(LPRINT_NORMAL, "Unrecognized parameter!"); |
|
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
608
diff
changeset
|
3501 } |
|
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
608
diff
changeset
|
3502 |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
3503 // Only free jid_utf8 if it has been allocated, i.e. if != arg. |
|
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
3504 if (jid_utf8 && jid_utf8 != arg) |
|
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
3505 g_free(jid_utf8); |
|
1073
253e8988eb5c
Fix a few memory leaks after calls to split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
1072
diff
changeset
|
3506 do_authorization_return: |
|
617
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
608
diff
changeset
|
3507 free_arg_lst(paramlst); |
|
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
608
diff
changeset
|
3508 } |
|
d3a8b43bf9e7
Add "/authorization" command
Mikael Berthe <mikael@lilotux.net>
parents:
608
diff
changeset
|
3509 |
| 622 | 3510 static void do_version(char *arg) |
| 3511 { | |
|
777
e6d42f239541
"/version" shows Mercurial changeset (if there's one)
Mikael Berthe <mikael@lilotux.net>
parents:
774
diff
changeset
|
3512 gchar *ver = mcabber_version(); |
|
e6d42f239541
"/version" shows Mercurial changeset (if there's one)
Mikael Berthe <mikael@lilotux.net>
parents:
774
diff
changeset
|
3513 scr_LogPrint(LPRINT_NORMAL, "This is mcabber version %s.", ver); |
|
e6d42f239541
"/version" shows Mercurial changeset (if there's one)
Mikael Berthe <mikael@lilotux.net>
parents:
774
diff
changeset
|
3514 g_free(ver); |
|
1921
7d72b7d2d93a
Add module information in the output of /version
Mikael Berthe <mikael@lilotux.net>
parents:
1875
diff
changeset
|
3515 #ifdef MODULES_ENABLE |
|
7d72b7d2d93a
Add module information in the output of /version
Mikael Berthe <mikael@lilotux.net>
parents:
1875
diff
changeset
|
3516 scr_LogPrint(LPRINT_NORMAL, "Compiled with modules support (API %s:%d-%d).", |
|
7d72b7d2d93a
Add module information in the output of /version
Mikael Berthe <mikael@lilotux.net>
parents:
1875
diff
changeset
|
3517 MCABBER_BRANCH, MCABBER_API_MIN, MCABBER_API_VERSION); |
|
7d72b7d2d93a
Add module information in the output of /version
Mikael Berthe <mikael@lilotux.net>
parents:
1875
diff
changeset
|
3518 # ifdef PKGLIB_DIR |
|
7d72b7d2d93a
Add module information in the output of /version
Mikael Berthe <mikael@lilotux.net>
parents:
1875
diff
changeset
|
3519 scr_LogPrint(LPRINT_NORMAL, " Modules directory: " PKGLIB_DIR); |
|
7d72b7d2d93a
Add module information in the output of /version
Mikael Berthe <mikael@lilotux.net>
parents:
1875
diff
changeset
|
3520 # endif |
|
7d72b7d2d93a
Add module information in the output of /version
Mikael Berthe <mikael@lilotux.net>
parents:
1875
diff
changeset
|
3521 #endif |
| 622 | 3522 } |
| 3523 | |
| 693 | 3524 static void do_request(char *arg) |
| 3525 { | |
| 3526 char **paramlst; | |
|
1722
b18142457ca9
Fix vCard requests in MUC rooms
Mikael Berthe <mikael@lilotux.net>
parents:
1720
diff
changeset
|
3527 char *fjid, *type; |
| 740 | 3528 enum iqreq_type numtype = iqreq_none; |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
3529 char *jid_utf8 = NULL; |
| 693 | 3530 |
| 3531 paramlst = split_arg(arg, 2, 0); // type, jid | |
| 3532 type = *paramlst; | |
| 1058 | 3533 fjid = *(paramlst+1); |
| 693 | 3534 |
| 3535 if (type) { | |
| 3536 // Quick check... | |
| 3537 if (!strcasecmp(type, "version")) | |
| 3538 numtype = iqreq_version; | |
| 3539 else if (!strcasecmp(type, "time")) | |
| 3540 numtype = iqreq_time; | |
| 1015 | 3541 else if (!strcasecmp(type, "last")) |
| 3542 numtype = iqreq_last; | |
|
1705
ac881b5f9248
Add /request ping (XEP-0199), by merging isbear's module
Mikael Berthe <mikael@lilotux.net>
parents:
1686
diff
changeset
|
3543 else if (!strcasecmp(type, "ping")) |
|
ac881b5f9248
Add /request ping (XEP-0199), by merging isbear's module
Mikael Berthe <mikael@lilotux.net>
parents:
1686
diff
changeset
|
3544 numtype = iqreq_ping; |
|
1003
c8b1a52b2fd6
Initial VCard retrieval support
Mikael Berthe <mikael@lilotux.net>
parents:
988
diff
changeset
|
3545 else if (!strcasecmp(type, "vcard")) |
|
c8b1a52b2fd6
Initial VCard retrieval support
Mikael Berthe <mikael@lilotux.net>
parents:
988
diff
changeset
|
3546 numtype = iqreq_vcard; |
| 693 | 3547 } |
| 3548 | |
| 3549 if (!type || !numtype) { | |
| 3550 scr_LogPrint(LPRINT_NORMAL, | |
| 1015 | 3551 "Please specify a query type (version, time...)."); |
| 693 | 3552 free_arg_lst(paramlst); |
| 3553 return; | |
| 3554 } | |
| 3555 | |
|
1684
95df4ea512c8
Provide xmpp_is_online()
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1682
diff
changeset
|
3556 if (!xmpp_is_online()) { |
|
1592
1802b926e3fa
Display a warning when using /request while disconnected
Mikael Berthe <mikael@lilotux.net>
parents:
1588
diff
changeset
|
3557 scr_LogPrint(LPRINT_NORMAL, "You are not connected."); |
|
1802b926e3fa
Display a warning when using /request while disconnected
Mikael Berthe <mikael@lilotux.net>
parents:
1588
diff
changeset
|
3558 free_arg_lst(paramlst); |
|
1802b926e3fa
Display a warning when using /request while disconnected
Mikael Berthe <mikael@lilotux.net>
parents:
1588
diff
changeset
|
3559 return; |
|
1802b926e3fa
Display a warning when using /request while disconnected
Mikael Berthe <mikael@lilotux.net>
parents:
1588
diff
changeset
|
3560 } |
|
1802b926e3fa
Display a warning when using /request while disconnected
Mikael Berthe <mikael@lilotux.net>
parents:
1588
diff
changeset
|
3561 |
| 693 | 3562 // Allow special jid "" or "." (current buddy) |
| 1058 | 3563 if (fjid && (!*fjid || !strcmp(fjid, "."))) |
| 3564 fjid = NULL; | |
| 693 | 3565 |
| 1058 | 3566 if (fjid) { |
| 693 | 3567 // The JID has been specified. Quick check... |
| 1058 | 3568 if (check_jid_syntax(fjid)) { |
|
1064
516b5f7d1023
Fix some UTF-8 related problems
Mikael Berthe <mikael@lilotux.net>
parents:
1059
diff
changeset
|
3569 scr_LogPrint(LPRINT_NORMAL|LPRINT_NOTUTF8, |
|
516b5f7d1023
Fix some UTF-8 related problems
Mikael Berthe <mikael@lilotux.net>
parents:
1059
diff
changeset
|
3570 "<%s> is not a valid Jabber ID.", fjid); |
| 1058 | 3571 fjid = NULL; |
| 693 | 3572 } else { |
| 3573 // Convert jid to lowercase | |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
3574 char *p; |
| 1058 | 3575 for (p = fjid; *p && *p != JID_RESOURCE_SEPARATOR; p++) |
| 693 | 3576 *p = tolower(*p); |
| 1058 | 3577 fjid = jid_utf8 = to_utf8(fjid); |
| 693 | 3578 } |
| 3579 } else { | |
| 3580 // Add the current buddy | |
| 3581 if (current_buddy) | |
| 1058 | 3582 fjid = (char*)buddy_getjid(BUDDATA(current_buddy)); |
| 3583 if (!fjid) | |
| 693 | 3584 scr_LogPrint(LPRINT_NORMAL, "Please specify a Jabber ID."); |
| 3585 } | |
| 3586 | |
| 1058 | 3587 if (fjid) { |
| 693 | 3588 switch (numtype) { |
|
1720
98d99485d276
Do not use the full JID for vcard requests (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents:
1705
diff
changeset
|
3589 case iqreq_vcard: |
|
1722
b18142457ca9
Fix vCard requests in MUC rooms
Mikael Berthe <mikael@lilotux.net>
parents:
1720
diff
changeset
|
3590 { // vCards requests are sent to the bare jid, except in MUC rooms |
|
b18142457ca9
Fix vCard requests in MUC rooms
Mikael Berthe <mikael@lilotux.net>
parents:
1720
diff
changeset
|
3591 gchar *tmp = strchr(fjid, JID_RESOURCE_SEPARATOR); |
|
b18142457ca9
Fix vCard requests in MUC rooms
Mikael Berthe <mikael@lilotux.net>
parents:
1720
diff
changeset
|
3592 if (tmp) { |
|
b18142457ca9
Fix vCard requests in MUC rooms
Mikael Berthe <mikael@lilotux.net>
parents:
1720
diff
changeset
|
3593 gchar *bjid = jidtodisp(fjid); |
|
b18142457ca9
Fix vCard requests in MUC rooms
Mikael Berthe <mikael@lilotux.net>
parents:
1720
diff
changeset
|
3594 if (!roster_find(bjid, jidsearch, ROSTER_TYPE_ROOM)) |
|
b18142457ca9
Fix vCard requests in MUC rooms
Mikael Berthe <mikael@lilotux.net>
parents:
1720
diff
changeset
|
3595 *tmp = '\0'; |
|
b18142457ca9
Fix vCard requests in MUC rooms
Mikael Berthe <mikael@lilotux.net>
parents:
1720
diff
changeset
|
3596 g_free(bjid); |
|
b18142457ca9
Fix vCard requests in MUC rooms
Mikael Berthe <mikael@lilotux.net>
parents:
1720
diff
changeset
|
3597 } |
|
b18142457ca9
Fix vCard requests in MUC rooms
Mikael Berthe <mikael@lilotux.net>
parents:
1720
diff
changeset
|
3598 } |
| 693 | 3599 case iqreq_version: |
| 3600 case iqreq_time: | |
| 1015 | 3601 case iqreq_last: |
|
1705
ac881b5f9248
Add /request ping (XEP-0199), by merging isbear's module
Mikael Berthe <mikael@lilotux.net>
parents:
1686
diff
changeset
|
3602 case iqreq_ping: |
| 1598 | 3603 xmpp_request(fjid, numtype); |
| 693 | 3604 break; |
| 3605 default: | |
| 3606 break; | |
| 3607 } | |
| 3608 } | |
|
772
464be13343a9
Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents:
757
diff
changeset
|
3609 g_free(jid_utf8); |
| 693 | 3610 free_arg_lst(paramlst); |
| 3611 } | |
| 3612 | |
| 748 | 3613 static void do_event(char *arg) |
| 3614 { | |
| 3615 char **paramlst; | |
| 3616 char *evid, *subcmd; | |
| 3617 int action = -1; | |
|
1685
1342df44c814
Improved events interface
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1684
diff
changeset
|
3618 |
|
1342df44c814
Improved events interface
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1684
diff
changeset
|
3619 paramlst = split_arg(arg, 3, 1); // id, subcmd, optional arg |
| 748 | 3620 evid = *paramlst; |
| 3621 subcmd = *(paramlst+1); | |
| 3622 | |
| 3623 if (!evid || !subcmd) { | |
| 3624 // Special case: /event list | |
| 3625 if (evid && !strcasecmp(evid, "list")) | |
| 3626 evs_display_list(); | |
| 3627 else | |
| 3628 scr_LogPrint(LPRINT_NORMAL, | |
|
1685
1342df44c814
Improved events interface
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1684
diff
changeset
|
3629 "Missing parameter. Usage: /event num action " |
|
1342df44c814
Improved events interface
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1684
diff
changeset
|
3630 "[event-specific args]"); |
| 748 | 3631 free_arg_lst(paramlst); |
| 3632 return; | |
| 3633 } | |
| 3634 | |
| 3635 if (!strcasecmp(subcmd, "reject")) | |
|
1685
1342df44c814
Improved events interface
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1684
diff
changeset
|
3636 action = EVS_CONTEXT_REJECT; |
| 748 | 3637 else if (!strcasecmp(subcmd, "accept")) |
|
1685
1342df44c814
Improved events interface
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1684
diff
changeset
|
3638 action = EVS_CONTEXT_ACCEPT; |
| 755 | 3639 else if (!strcasecmp(subcmd, "ignore")) |
|
1685
1342df44c814
Improved events interface
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1684
diff
changeset
|
3640 action = EVS_CONTEXT_CANCEL; |
| 748 | 3641 |
| 3642 if (action == -1) { | |
| 3643 scr_LogPrint(LPRINT_NORMAL, "Wrong action parameter."); | |
|
1685
1342df44c814
Improved events interface
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1684
diff
changeset
|
3644 } else { |
|
820
80bd7f49075f
Allow '*' in /event command
Mikael Berthe <mikael@lilotux.net>
parents:
807
diff
changeset
|
3645 GSList *p; |
|
1685
1342df44c814
Improved events interface
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1684
diff
changeset
|
3646 GSList *evidlst; |
|
820
80bd7f49075f
Allow '*' in /event command
Mikael Berthe <mikael@lilotux.net>
parents:
807
diff
changeset
|
3647 |
|
80bd7f49075f
Allow '*' in /event command
Mikael Berthe <mikael@lilotux.net>
parents:
807
diff
changeset
|
3648 if (!strcmp(evid, "*")) { |
|
80bd7f49075f
Allow '*' in /event command
Mikael Berthe <mikael@lilotux.net>
parents:
807
diff
changeset
|
3649 // Use completion list |
|
1685
1342df44c814
Improved events interface
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1684
diff
changeset
|
3650 evidlst = evs_geteventslist(); |
|
820
80bd7f49075f
Allow '*' in /event command
Mikael Berthe <mikael@lilotux.net>
parents:
807
diff
changeset
|
3651 } else { |
|
80bd7f49075f
Allow '*' in /event command
Mikael Berthe <mikael@lilotux.net>
parents:
807
diff
changeset
|
3652 // Let's create a slist with the provided event id |
|
1685
1342df44c814
Improved events interface
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1684
diff
changeset
|
3653 evidlst = g_slist_append(NULL, evid); |
| 748 | 3654 } |
|
820
80bd7f49075f
Allow '*' in /event command
Mikael Berthe <mikael@lilotux.net>
parents:
807
diff
changeset
|
3655 for (p = evidlst; p; p = g_slist_next(p)) { |
|
1685
1342df44c814
Improved events interface
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1684
diff
changeset
|
3656 if (evs_callback(p->data, action, |
|
2024
789779fd728d
Fix /event usage when a reason is provided
Mikael Berthe <mikael@lilotux.net>
parents:
2021
diff
changeset
|
3657 (const char*)*(paramlst+2)) == -1) { |
|
1686
393c05fba337
Use G_GNUC_PRINTF to check scr_LogPrint arguments
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1685
diff
changeset
|
3658 scr_LogPrint(LPRINT_NORMAL, "Event %s not found.", |
|
393c05fba337
Use G_GNUC_PRINTF to check scr_LogPrint arguments
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1685
diff
changeset
|
3659 (const char *)p->data); |
|
820
80bd7f49075f
Allow '*' in /event command
Mikael Berthe <mikael@lilotux.net>
parents:
807
diff
changeset
|
3660 } |
|
80bd7f49075f
Allow '*' in /event command
Mikael Berthe <mikael@lilotux.net>
parents:
807
diff
changeset
|
3661 } |
|
80bd7f49075f
Allow '*' in /event command
Mikael Berthe <mikael@lilotux.net>
parents:
807
diff
changeset
|
3662 g_slist_free(evidlst); |
| 748 | 3663 } |
| 3664 | |
| 3665 free_arg_lst(paramlst); | |
| 3666 } | |
| 3667 | |
| 1066 | 3668 static void do_pgp(char *arg) |
| 3669 { | |
| 3670 char **paramlst; | |
| 3671 char *fjid, *subcmd, *keyid; | |
| 3672 enum { | |
| 3673 pgp_none, | |
| 3674 pgp_enable, | |
| 3675 pgp_disable, | |
| 3676 pgp_setkey, | |
| 1197 | 3677 pgp_force, |
| 1066 | 3678 pgp_info |
| 3679 } op = 0; | |
| 1197 | 3680 int force = FALSE; |
| 1066 | 3681 |
| 3682 paramlst = split_arg(arg, 3, 0); // subcmd, jid, [key] | |
| 3683 subcmd = *paramlst; | |
| 3684 fjid = *(paramlst+1); | |
| 3685 keyid = *(paramlst+2); | |
| 3686 | |
| 3687 if (!subcmd) | |
| 3688 fjid = NULL; | |
| 3689 if (!fjid) | |
| 3690 keyid = NULL; | |
| 3691 | |
| 3692 if (subcmd) { | |
| 3693 if (!strcasecmp(subcmd, "enable")) | |
| 3694 op = pgp_enable; | |
| 3695 else if (!strcasecmp(subcmd, "disable")) | |
| 3696 op = pgp_disable; | |
| 3697 else if (!strcasecmp(subcmd, "setkey")) | |
| 3698 op = pgp_setkey; | |
| 1197 | 3699 else if ((!strcasecmp(subcmd, "force")) || |
| 3700 (!strcasecmp(subcmd, "+force"))) { | |
| 3701 op = pgp_force; | |
| 3702 force = TRUE; | |
| 3703 } else if (!strcasecmp(subcmd, "-force")) | |
| 3704 op = pgp_force; | |
| 1066 | 3705 else if (!strcasecmp(subcmd, "info")) |
| 3706 op = pgp_info; | |
| 3707 } | |
| 3708 | |
| 3709 if (!op) { | |
| 3710 scr_LogPrint(LPRINT_NORMAL, "Unrecognized or missing parameter!"); | |
| 3711 free_arg_lst(paramlst); | |
| 3712 return; | |
| 3713 } | |
| 3714 | |
| 3715 // Allow special jid "" or "." (current buddy) | |
| 3716 if (fjid && (!*fjid || !strcmp(fjid, "."))) | |
| 3717 fjid = NULL; | |
| 3718 | |
| 3719 if (fjid) { | |
| 3720 // The JID has been specified. Quick check... | |
| 3721 if (check_jid_syntax(fjid) || !strchr(fjid, '@')) { | |
| 3722 scr_LogPrint(LPRINT_NORMAL|LPRINT_NOTUTF8, | |
| 3723 "<%s> is not a valid Jabber ID.", fjid); | |
| 3724 fjid = NULL; | |
| 3725 } else { | |
| 3726 // Convert jid to lowercase and strip resource | |
| 3727 char *p; | |
| 3728 for (p = fjid; *p && *p != JID_RESOURCE_SEPARATOR; p++) | |
| 3729 *p = tolower(*p); | |
| 3730 if (*p == JID_RESOURCE_SEPARATOR) | |
| 3731 *p = '\0'; | |
| 3732 } | |
| 3733 } else { | |
| 3734 gpointer bud = NULL; | |
| 3735 if (current_buddy) | |
| 3736 bud = BUDDATA(current_buddy); | |
| 3737 if (bud) { | |
| 3738 guint type = buddy_gettype(bud); | |
| 3739 if (type & ROSTER_TYPE_USER) // Is it a user? | |
| 3740 fjid = (char*)buddy_getjid(bud); | |
| 3741 else | |
| 3742 scr_LogPrint(LPRINT_NORMAL, "The selected item should be a user."); | |
| 3743 } | |
| 3744 } | |
| 3745 | |
| 3746 if (fjid) { // fjid is actually a bare jid... | |
| 1197 | 3747 guint disabled; |
| 1066 | 3748 GString *sbuf; |
| 3749 switch (op) { | |
| 3750 case pgp_enable: | |
| 3751 case pgp_disable: | |
| 3752 settings_pgp_setdisabled(fjid, (op == pgp_disable ? TRUE : FALSE)); | |
| 3753 break; | |
| 1197 | 3754 case pgp_force: |
| 3755 settings_pgp_setforce(fjid, force); | |
| 3756 break; | |
| 1066 | 3757 case pgp_setkey: |
| 3758 settings_pgp_setkeyid(fjid, keyid); | |
| 3759 break; | |
| 3760 case pgp_info: | |
| 3761 sbuf = g_string_new(""); | |
| 3762 if (settings_pgp_getkeyid(fjid)) { | |
| 3763 g_string_printf(sbuf, "PGP Encryption key id: %s", | |
| 3764 settings_pgp_getkeyid(fjid)); | |
|
1290
e42f48103609
Drawing the MUC nicks by a different color
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1279
diff
changeset
|
3765 scr_WriteIncomingMessage(fjid, sbuf->str, 0, HBB_PREFIX_INFO, 0); |
| 1066 | 3766 } |
| 1197 | 3767 disabled = settings_pgp_getdisabled(fjid); |
| 1066 | 3768 g_string_printf(sbuf, "PGP encryption is %s", |
| 1197 | 3769 (disabled ? "disabled" : "enabled")); |
|
1290
e42f48103609
Drawing the MUC nicks by a different color
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1279
diff
changeset
|
3770 scr_WriteIncomingMessage(fjid, sbuf->str, 0, HBB_PREFIX_INFO, 0); |
| 1197 | 3771 if (!disabled && settings_pgp_getforce(fjid)) { |
| 3772 scr_WriteIncomingMessage(fjid, | |
| 3773 "Encryption enforced (no negotiation)", | |
|
1290
e42f48103609
Drawing the MUC nicks by a different color
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1279
diff
changeset
|
3774 0, HBB_PREFIX_INFO, 0); |
| 1197 | 3775 } |
| 1066 | 3776 g_string_free(sbuf, TRUE); |
| 3777 break; | |
| 3778 default: | |
| 3779 break; | |
| 3780 } | |
| 3781 } else { | |
| 3782 scr_LogPrint(LPRINT_NORMAL, "Please specify a valid Jabber ID."); | |
| 3783 } | |
| 3784 | |
| 3785 free_arg_lst(paramlst); | |
| 3786 } | |
| 3787 | |
|
1299
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3788 static void do_otr(char *arg) |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3789 { |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3790 #ifdef HAVE_LIBOTR |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3791 char **paramlst; |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3792 char *fjid, *subcmd, *keyid; |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3793 enum { |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3794 otr_none, |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3795 otr_start, |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3796 otr_stop, |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3797 otr_fpr, |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3798 otr_smpq, |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3799 otr_smpr, |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3800 otr_smpa, |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3801 otr_k, |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3802 otr_info |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3803 } op = 0; |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3804 |
|
1347
07816313073b
Add an option 'otr' to enable OTR support in the configuration file
Mikael Berthe <mikael@lilotux.net>
parents:
1341
diff
changeset
|
3805 if (!otr_enabled()) { |
|
07816313073b
Add an option 'otr' to enable OTR support in the configuration file
Mikael Berthe <mikael@lilotux.net>
parents:
1341
diff
changeset
|
3806 scr_LogPrint(LPRINT_LOGNORM, |
|
07816313073b
Add an option 'otr' to enable OTR support in the configuration file
Mikael Berthe <mikael@lilotux.net>
parents:
1341
diff
changeset
|
3807 "Warning: OTR hasn't been enabled -- command ignored."); |
|
07816313073b
Add an option 'otr' to enable OTR support in the configuration file
Mikael Berthe <mikael@lilotux.net>
parents:
1341
diff
changeset
|
3808 return; |
|
07816313073b
Add an option 'otr' to enable OTR support in the configuration file
Mikael Berthe <mikael@lilotux.net>
parents:
1341
diff
changeset
|
3809 } |
|
07816313073b
Add an option 'otr' to enable OTR support in the configuration file
Mikael Berthe <mikael@lilotux.net>
parents:
1341
diff
changeset
|
3810 |
|
1299
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3811 paramlst = split_arg(arg, 3, 0); // subcmd, jid, [key] |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3812 subcmd = *paramlst; |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3813 fjid = *(paramlst+1); |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3814 keyid = *(paramlst+2); |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3815 |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3816 if (!subcmd) |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3817 fjid = NULL; |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3818 if (!fjid) |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3819 keyid = NULL; |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3820 |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3821 if (subcmd) { |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3822 if (!strcasecmp(subcmd, "start")) |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3823 op = otr_start; |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3824 else if (!strcasecmp(subcmd, "stop")) |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3825 op = otr_stop; |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3826 else if (!strcasecmp(subcmd, "fingerprint")) |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3827 op = otr_fpr; |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3828 else if (!strcasecmp(subcmd, "smpq")) |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3829 op = otr_smpq; |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3830 else if (!strcasecmp(subcmd, "smpr")) |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3831 op = otr_smpr; |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3832 else if (!strcasecmp(subcmd, "smpa")) |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3833 op = otr_smpa; |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3834 else if (!strcasecmp(subcmd, "key")) |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3835 op = otr_k; |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3836 else if (!strcasecmp(subcmd, "info")) |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3837 op = otr_info; |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3838 } |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3839 |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3840 if (!op) { |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3841 scr_LogPrint(LPRINT_NORMAL, "Unrecognized or missing parameter!"); |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3842 free_arg_lst(paramlst); |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3843 return; |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3844 } |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3845 |
|
1333
e30a9d907105
Minor coding style adjustments
Mikael Berthe <mikael@lilotux.net>
parents:
1329
diff
changeset
|
3846 if (op == otr_k) |
|
1299
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3847 otr_key(); |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3848 else { |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3849 // Allow special jid "" or "." (current buddy) |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3850 if (fjid && (!*fjid || !strcmp(fjid, "."))) |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3851 fjid = NULL; |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3852 |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3853 if (fjid) { |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3854 // The JID has been specified. Quick check... |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3855 if (check_jid_syntax(fjid) || !strchr(fjid, '@')) { |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3856 scr_LogPrint(LPRINT_NORMAL|LPRINT_NOTUTF8, |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3857 "<%s> is not a valid Jabber ID.", fjid); |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3858 fjid = NULL; |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3859 } else { |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3860 // Convert jid to lowercase and strip resource |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3861 char *p; |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3862 for (p = fjid; *p && *p != JID_RESOURCE_SEPARATOR; p++) |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3863 *p = tolower(*p); |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3864 if (*p == JID_RESOURCE_SEPARATOR) |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3865 *p = '\0'; |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3866 } |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3867 } else { |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3868 gpointer bud = NULL; |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3869 if (current_buddy) |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3870 bud = BUDDATA(current_buddy); |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3871 if (bud) { |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3872 guint type = buddy_gettype(bud); |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3873 if (type & ROSTER_TYPE_USER) // Is it a user? |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3874 fjid = (char*)buddy_getjid(bud); |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3875 else |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3876 scr_LogPrint(LPRINT_NORMAL, "The selected item should be a user."); |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3877 } |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3878 } |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3879 |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3880 if (fjid) { // fjid is actually a bare jid... |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3881 switch (op) { |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3882 case otr_start: |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3883 otr_establish(fjid); break; |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3884 case otr_stop: |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3885 otr_disconnect(fjid); break; |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3886 case otr_fpr: |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3887 otr_fingerprint(fjid, keyid); break; |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3888 case otr_smpq: |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3889 otr_smp_query(fjid, keyid); break; |
| 1329 | 3890 case otr_smpr: |
|
1299
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3891 otr_smp_respond(fjid, keyid); break; |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3892 case otr_smpa: |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3893 otr_smp_abort(fjid); break; |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3894 case otr_info: |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3895 otr_print_info(fjid); break; |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3896 default: |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3897 break; |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3898 } |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3899 } else |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3900 scr_LogPrint(LPRINT_NORMAL, "Please specify a valid Jabber ID."); |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3901 } |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3902 free_arg_lst(paramlst); |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3903 |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3904 #else |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3905 scr_LogPrint(LPRINT_NORMAL, "Please recompile mcabber with libotr enabled."); |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3906 #endif /* HAVE_LIBOTR */ |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3907 } |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3908 |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3909 #ifdef HAVE_LIBOTR |
| 1598 | 3910 static char *string_for_otrpolicy(enum otr_policy p) |
|
1299
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3911 { |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3912 switch (p) { |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3913 case plain: return "plain"; |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3914 case opportunistic: return "opportunistic"; |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3915 case manual: return "manual"; |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3916 case always: return "always"; |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3917 default: return "unknown"; |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3918 } |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3919 } |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3920 |
| 1598 | 3921 static void dump_otrpolicy(char *k, char *v, void *nothing) |
|
1299
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3922 { |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3923 scr_LogPrint(LPRINT_NORMAL|LPRINT_NOTUTF8, "otrpolicy for %s: %s", k, |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3924 string_for_otrpolicy(*(enum otr_policy*)v)); |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3925 } |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3926 #endif |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3927 |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3928 static void do_otrpolicy(char *arg) |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3929 { |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3930 #ifdef HAVE_LIBOTR |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3931 char **paramlst; |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3932 char *fjid, *policy; |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3933 enum otr_policy p; |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3934 |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3935 paramlst = split_arg(arg, 2, 0); // [jid|default] policy |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3936 fjid = *paramlst; |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3937 policy = *(paramlst+1); |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3938 |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3939 if (!fjid && !policy) { |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3940 scr_LogPrint(LPRINT_NORMAL, "default otrpolicy: %s", |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3941 string_for_otrpolicy(settings_otr_getpolicy(NULL))); |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3942 settings_foreach(SETTINGS_TYPE_OTR, &dump_otrpolicy, NULL); |
|
1301
37b41ed9ed35
Fixed compiler warnings
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1299
diff
changeset
|
3943 free_arg_lst(paramlst); |
|
1299
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3944 return; |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3945 } |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3946 |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3947 if (!policy) { |
|
1301
37b41ed9ed35
Fixed compiler warnings
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1299
diff
changeset
|
3948 scr_LogPrint(LPRINT_NORMAL, |
|
37b41ed9ed35
Fixed compiler warnings
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1299
diff
changeset
|
3949 "Please call otrpolicy correctly: /otrpolicy (default|jid) " |
|
37b41ed9ed35
Fixed compiler warnings
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1299
diff
changeset
|
3950 "(plain|manual|opportunistic|always)"); |
|
1299
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3951 free_arg_lst(paramlst); |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3952 return; |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3953 } |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3954 |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3955 if (!strcasecmp(policy, "plain")) |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3956 p = plain; |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3957 else if (!strcasecmp(policy, "manual")) |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3958 p = manual; |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3959 else if (!strcasecmp(policy, "opportunistic")) |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3960 p = opportunistic; |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3961 else if (!strcasecmp(policy, "always")) |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3962 p = always; |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3963 else { |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3964 /* Fail, we don't know _this_ policy*/ |
|
1301
37b41ed9ed35
Fixed compiler warnings
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1299
diff
changeset
|
3965 scr_LogPrint(LPRINT_NORMAL, "mcabber doesn't support _this_ policy!"); |
|
37b41ed9ed35
Fixed compiler warnings
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1299
diff
changeset
|
3966 free_arg_lst(paramlst); |
|
37b41ed9ed35
Fixed compiler warnings
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1299
diff
changeset
|
3967 return; |
|
1299
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3968 } |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3969 |
|
1333
e30a9d907105
Minor coding style adjustments
Mikael Berthe <mikael@lilotux.net>
parents:
1329
diff
changeset
|
3970 if (!strcasecmp(fjid, "default") || !strcasecmp(fjid, "*")) { |
|
1299
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3971 /*set default policy*/ |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3972 settings_otr_setpolicy(NULL, p); |
|
1301
37b41ed9ed35
Fixed compiler warnings
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1299
diff
changeset
|
3973 free_arg_lst(paramlst); |
|
1299
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3974 return; |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3975 } |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3976 // Allow special jid "" or "." (current buddy) |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3977 if (fjid && (!*fjid || !strcmp(fjid, "."))) |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3978 fjid = NULL; |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3979 |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3980 if (fjid) { |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3981 // The JID has been specified. Quick check... |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3982 if (check_jid_syntax(fjid) || !strchr(fjid, '@')) { |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3983 scr_LogPrint(LPRINT_NORMAL|LPRINT_NOTUTF8, |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3984 "<%s> is not a valid Jabber ID.", fjid); |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3985 fjid = NULL; |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3986 } else { |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3987 // Convert jid to lowercase and strip resource |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3988 char *p; |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3989 for (p = fjid; *p && *p != JID_RESOURCE_SEPARATOR; p++) |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3990 *p = tolower(*p); |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3991 if (*p == JID_RESOURCE_SEPARATOR) |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3992 *p = '\0'; |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3993 } |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3994 } else { |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3995 gpointer bud = NULL; |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3996 if (current_buddy) |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3997 bud = BUDDATA(current_buddy); |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3998 if (bud) { |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
3999 guint type = buddy_gettype(bud); |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
4000 if (type & ROSTER_TYPE_USER) // Is it a user? |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
4001 fjid = (char*)buddy_getjid(bud); |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
4002 else |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
4003 scr_LogPrint(LPRINT_NORMAL, "The selected item should be a user."); |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
4004 } |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
4005 } |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
4006 |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
4007 if (fjid) |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
4008 settings_otr_setpolicy(fjid, p); |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
4009 else |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
4010 scr_LogPrint(LPRINT_NORMAL, "Please specify a valid Jabber ID."); |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
4011 |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
4012 free_arg_lst(paramlst); |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
4013 #else |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
4014 scr_LogPrint(LPRINT_NORMAL, "Please recompile mcabber with libotr enabled."); |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
4015 #endif /* HAVE_LIBOTR */ |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
4016 } |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1292
diff
changeset
|
4017 |
|
1173
960f34ec22a2
Add init_bindings() for default key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents:
1172
diff
changeset
|
4018 /* !!! |
|
960f34ec22a2
Add init_bindings() for default key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents:
1172
diff
changeset
|
4019 After changing the /iline arguments names here, you must change ones |
|
960f34ec22a2
Add init_bindings() for default key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents:
1172
diff
changeset
|
4020 in init_bindings(). |
|
960f34ec22a2
Add init_bindings() for default key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents:
1172
diff
changeset
|
4021 */ |
|
1171
03a38b7ad2e0
Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents:
1165
diff
changeset
|
4022 static void do_iline(char *arg) |
|
03a38b7ad2e0
Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents:
1165
diff
changeset
|
4023 { |
|
03a38b7ad2e0
Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents:
1165
diff
changeset
|
4024 if (!strcasecmp(arg, "fword")) { |
|
03a38b7ad2e0
Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents:
1165
diff
changeset
|
4025 readline_forward_word(); |
|
03a38b7ad2e0
Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents:
1165
diff
changeset
|
4026 } else if (!strcasecmp(arg, "bword")) { |
|
03a38b7ad2e0
Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents:
1165
diff
changeset
|
4027 readline_backward_word(); |
|
03a38b7ad2e0
Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents:
1165
diff
changeset
|
4028 } else if (!strcasecmp(arg, "word_fdel")) { |
|
03a38b7ad2e0
Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents:
1165
diff
changeset
|
4029 readline_forward_kill_word(); |
|
03a38b7ad2e0
Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents:
1165
diff
changeset
|
4030 } else if (!strcasecmp(arg, "word_bdel")) { |
|
03a38b7ad2e0
Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents:
1165
diff
changeset
|
4031 readline_backward_kill_word(); |
|
1172
334ae9f498f1
Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents:
1171
diff
changeset
|
4032 } else if (!strcasecmp(arg, "word_upcase")) { |
|
334ae9f498f1
Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents:
1171
diff
changeset
|
4033 readline_updowncase_word(1); |
|
334ae9f498f1
Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents:
1171
diff
changeset
|
4034 } else if (!strcasecmp(arg, "word_downcase")) { |
|
334ae9f498f1
Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents:
1171
diff
changeset
|
4035 readline_updowncase_word(0); |
|
334ae9f498f1
Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents:
1171
diff
changeset
|
4036 } else if (!strcasecmp(arg, "word_capit")) { |
|
334ae9f498f1
Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents:
1171
diff
changeset
|
4037 readline_capitalize_word(); |
|
1171
03a38b7ad2e0
Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents:
1165
diff
changeset
|
4038 } else if (!strcasecmp(arg, "fchar")) { |
|
03a38b7ad2e0
Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents:
1165
diff
changeset
|
4039 readline_forward_char(); |
|
03a38b7ad2e0
Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents:
1165
diff
changeset
|
4040 } else if (!strcasecmp(arg, "bchar")) { |
|
03a38b7ad2e0
Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents:
1165
diff
changeset
|
4041 readline_backward_char(); |
|
03a38b7ad2e0
Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents:
1165
diff
changeset
|
4042 } else if (!strcasecmp(arg, "char_fdel")) { |
|
03a38b7ad2e0
Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents:
1165
diff
changeset
|
4043 readline_forward_kill_char(); |
|
03a38b7ad2e0
Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents:
1165
diff
changeset
|
4044 } else if (!strcasecmp(arg, "char_bdel")) { |
|
03a38b7ad2e0
Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents:
1165
diff
changeset
|
4045 readline_backward_kill_char(); |
|
1172
334ae9f498f1
Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents:
1171
diff
changeset
|
4046 } else if (!strcasecmp(arg, "char_swap")) { |
|
1171
03a38b7ad2e0
Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents:
1165
diff
changeset
|
4047 readline_transpose_chars(); |
|
1190
be06bbe7e449
Add readline_hist_beginning_search_bwd/fwd functions
Mikael Berthe <mikael@lilotux.net>
parents:
1187
diff
changeset
|
4048 } else if (!strcasecmp(arg, "hist_beginning_search_bwd")) { |
|
be06bbe7e449
Add readline_hist_beginning_search_bwd/fwd functions
Mikael Berthe <mikael@lilotux.net>
parents:
1187
diff
changeset
|
4049 readline_hist_beginning_search_bwd(); |
|
be06bbe7e449
Add readline_hist_beginning_search_bwd/fwd functions
Mikael Berthe <mikael@lilotux.net>
parents:
1187
diff
changeset
|
4050 } else if (!strcasecmp(arg, "hist_beginning_search_fwd")) { |
|
be06bbe7e449
Add readline_hist_beginning_search_bwd/fwd functions
Mikael Berthe <mikael@lilotux.net>
parents:
1187
diff
changeset
|
4051 readline_hist_beginning_search_fwd(); |
|
1171
03a38b7ad2e0
Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents:
1165
diff
changeset
|
4052 } else if (!strcasecmp(arg, "hist_prev")) { |
|
03a38b7ad2e0
Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents:
1165
diff
changeset
|
4053 readline_hist_prev(); |
|
03a38b7ad2e0
Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents:
1165
diff
changeset
|
4054 } else if (!strcasecmp(arg, "hist_next")) { |
|
03a38b7ad2e0
Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents:
1165
diff
changeset
|
4055 readline_hist_next(); |
|
03a38b7ad2e0
Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents:
1165
diff
changeset
|
4056 } else if (!strcasecmp(arg, "iline_start")) { |
|
03a38b7ad2e0
Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents:
1165
diff
changeset
|
4057 readline_iline_start(); |
|
03a38b7ad2e0
Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents:
1165
diff
changeset
|
4058 } else if (!strcasecmp(arg, "iline_end")) { |
|
03a38b7ad2e0
Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents:
1165
diff
changeset
|
4059 readline_iline_end(); |
|
03a38b7ad2e0
Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents:
1165
diff
changeset
|
4060 } else if (!strcasecmp(arg, "iline_fdel")) { |
|
03a38b7ad2e0
Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents:
1165
diff
changeset
|
4061 readline_forward_kill_iline(); |
|
03a38b7ad2e0
Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents:
1165
diff
changeset
|
4062 } else if (!strcasecmp(arg, "iline_bdel")) { |
|
03a38b7ad2e0
Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents:
1165
diff
changeset
|
4063 readline_backward_kill_iline(); |
|
03a38b7ad2e0
Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents:
1165
diff
changeset
|
4064 } else if (!strcasecmp(arg, "send_multiline")) { |
|
03a38b7ad2e0
Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents:
1165
diff
changeset
|
4065 readline_send_multiline(); |
|
1172
334ae9f498f1
Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents:
1171
diff
changeset
|
4066 } else if (!strcasecmp(arg, "iline_accept")) { |
|
1177
10733d7de004
Refactor readline_accept_line() and readline_accept_line_down_hist()
Mikael Berthe <mikael@lilotux.net>
parents:
1173
diff
changeset
|
4067 retval_for_cmds = readline_accept_line(FALSE); |
|
10733d7de004
Refactor readline_accept_line() and readline_accept_line_down_hist()
Mikael Berthe <mikael@lilotux.net>
parents:
1173
diff
changeset
|
4068 } else if (!strcasecmp(arg, "iline_accept_down_hist")) { |
|
10733d7de004
Refactor readline_accept_line() and readline_accept_line_down_hist()
Mikael Berthe <mikael@lilotux.net>
parents:
1173
diff
changeset
|
4069 retval_for_cmds = readline_accept_line(TRUE); |
|
1172
334ae9f498f1
Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents:
1171
diff
changeset
|
4070 } else if (!strcasecmp(arg, "compl_cancel")) { |
|
334ae9f498f1
Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents:
1171
diff
changeset
|
4071 readline_cancel_completion(); |
|
334ae9f498f1
Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents:
1171
diff
changeset
|
4072 } else if (!strcasecmp(arg, "compl_do")) { |
|
334ae9f498f1
Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents:
1171
diff
changeset
|
4073 readline_do_completion(); |
|
1985
0870005f7efc
Add command /iline clear_history
Mikael Berthe <mikael@lilotux.net>
parents:
1980
diff
changeset
|
4074 } else if (!strcasecmp(arg, "clear_history")) { |
|
0870005f7efc
Add command /iline clear_history
Mikael Berthe <mikael@lilotux.net>
parents:
1980
diff
changeset
|
4075 readline_clear_history(); |
|
1945
518740bcd78b
Add /iline iline_insert (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents:
1943
diff
changeset
|
4076 } else { |
|
518740bcd78b
Add /iline iline_insert (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents:
1943
diff
changeset
|
4077 char **paramlst; |
|
518740bcd78b
Add /iline iline_insert (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents:
1943
diff
changeset
|
4078 char *subcmd; |
|
518740bcd78b
Add /iline iline_insert (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents:
1943
diff
changeset
|
4079 |
|
518740bcd78b
Add /iline iline_insert (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents:
1943
diff
changeset
|
4080 paramlst = split_arg(arg, 2, 0); // subcmd, arg |
|
518740bcd78b
Add /iline iline_insert (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents:
1943
diff
changeset
|
4081 subcmd = *paramlst; |
|
518740bcd78b
Add /iline iline_insert (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents:
1943
diff
changeset
|
4082 arg = *(paramlst+1); |
|
518740bcd78b
Add /iline iline_insert (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents:
1943
diff
changeset
|
4083 |
|
1946
69f03eabe514
Complain when the iline subcommand is missing/incorrect
Mikael Berthe <mikael@lilotux.net>
parents:
1945
diff
changeset
|
4084 if (!subcmd || !*subcmd) { |
|
69f03eabe514
Complain when the iline subcommand is missing/incorrect
Mikael Berthe <mikael@lilotux.net>
parents:
1945
diff
changeset
|
4085 scr_LogPrint(LPRINT_NORMAL, "Missing parameter."); |
|
69f03eabe514
Complain when the iline subcommand is missing/incorrect
Mikael Berthe <mikael@lilotux.net>
parents:
1945
diff
changeset
|
4086 free_arg_lst(paramlst); |
|
69f03eabe514
Complain when the iline subcommand is missing/incorrect
Mikael Berthe <mikael@lilotux.net>
parents:
1945
diff
changeset
|
4087 return; |
|
69f03eabe514
Complain when the iline subcommand is missing/incorrect
Mikael Berthe <mikael@lilotux.net>
parents:
1945
diff
changeset
|
4088 } |
|
69f03eabe514
Complain when the iline subcommand is missing/incorrect
Mikael Berthe <mikael@lilotux.net>
parents:
1945
diff
changeset
|
4089 |
|
1945
518740bcd78b
Add /iline iline_insert (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents:
1943
diff
changeset
|
4090 if (!strcasecmp(subcmd, "iline_insert")) { |
|
518740bcd78b
Add /iline iline_insert (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents:
1943
diff
changeset
|
4091 readline_insert(arg); |
|
1946
69f03eabe514
Complain when the iline subcommand is missing/incorrect
Mikael Berthe <mikael@lilotux.net>
parents:
1945
diff
changeset
|
4092 } else { |
|
69f03eabe514
Complain when the iline subcommand is missing/incorrect
Mikael Berthe <mikael@lilotux.net>
parents:
1945
diff
changeset
|
4093 scr_LogPrint(LPRINT_NORMAL, "Invalid subcommand."); |
|
1945
518740bcd78b
Add /iline iline_insert (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents:
1943
diff
changeset
|
4094 } |
|
518740bcd78b
Add /iline iline_insert (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents:
1943
diff
changeset
|
4095 |
|
518740bcd78b
Add /iline iline_insert (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents:
1943
diff
changeset
|
4096 free_arg_lst(paramlst); |
|
1171
03a38b7ad2e0
Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents:
1165
diff
changeset
|
4097 } |
|
03a38b7ad2e0
Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents:
1165
diff
changeset
|
4098 } |
|
03a38b7ad2e0
Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents:
1165
diff
changeset
|
4099 |
|
1172
334ae9f498f1
Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents:
1171
diff
changeset
|
4100 static void do_screen_refresh(char *arg) |
|
334ae9f498f1
Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents:
1171
diff
changeset
|
4101 { |
|
334ae9f498f1
Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents:
1171
diff
changeset
|
4102 readline_refresh_screen(); |
|
334ae9f498f1
Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents:
1171
diff
changeset
|
4103 } |
|
334ae9f498f1
Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents:
1171
diff
changeset
|
4104 |
|
334ae9f498f1
Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents:
1171
diff
changeset
|
4105 static void do_chat_disable(char *arg) |
|
334ae9f498f1
Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents:
1171
diff
changeset
|
4106 { |
|
1503
c74cfe7fd848
Add option --show-roster to command chat_disable.
Mikael Berthe <mikael@lilotux.net>
parents:
1485
diff
changeset
|
4107 guint show_roster; |
|
c74cfe7fd848
Add option --show-roster to command chat_disable.
Mikael Berthe <mikael@lilotux.net>
parents:
1485
diff
changeset
|
4108 |
|
c74cfe7fd848
Add option --show-roster to command chat_disable.
Mikael Berthe <mikael@lilotux.net>
parents:
1485
diff
changeset
|
4109 if (arg && !strcasecmp(arg, "--show-roster")) |
|
c74cfe7fd848
Add option --show-roster to command chat_disable.
Mikael Berthe <mikael@lilotux.net>
parents:
1485
diff
changeset
|
4110 show_roster = 1; |
|
c74cfe7fd848
Add option --show-roster to command chat_disable.
Mikael Berthe <mikael@lilotux.net>
parents:
1485
diff
changeset
|
4111 else |
|
c74cfe7fd848
Add option --show-roster to command chat_disable.
Mikael Berthe <mikael@lilotux.net>
parents:
1485
diff
changeset
|
4112 show_roster = 0; |
|
c74cfe7fd848
Add option --show-roster to command chat_disable.
Mikael Berthe <mikael@lilotux.net>
parents:
1485
diff
changeset
|
4113 |
|
c74cfe7fd848
Add option --show-roster to command chat_disable.
Mikael Berthe <mikael@lilotux.net>
parents:
1485
diff
changeset
|
4114 readline_disable_chat_mode(show_roster); |
|
1172
334ae9f498f1
Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents:
1171
diff
changeset
|
4115 } |
|
334ae9f498f1
Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents:
1171
diff
changeset
|
4116 |
|
1675
c73b31124fa6
Use glob() in source command
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
4117 static int source_print_error(const char *path, int eerrno) |
|
c73b31124fa6
Use glob() in source command
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
4118 { |
|
1939
932d1b250a55
Simplify cmd_add() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1938
diff
changeset
|
4119 scr_LogPrint(LPRINT_DEBUG, "Source: glob (%s) error: %s.", |
|
932d1b250a55
Simplify cmd_add() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1938
diff
changeset
|
4120 path, strerror(eerrno)); |
|
1675
c73b31124fa6
Use glob() in source command
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
4121 return 0; |
|
c73b31124fa6
Use glob() in source command
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
4122 } |
|
c73b31124fa6
Use glob() in source command
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
4123 |
| 1192 | 4124 static void do_source(char *arg) |
| 4125 { | |
| 4126 static int recur_level; | |
|
1202
ede6c7aa59b0
Handle "~" in /source paths
Mikael Berthe <mikael@lilotux.net>
parents:
1197
diff
changeset
|
4127 gchar *filename, *expfname; |
|
1675
c73b31124fa6
Use glob() in source command
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
4128 glob_t flist; |
| 1192 | 4129 if (!*arg) { |
| 4130 scr_LogPrint(LPRINT_NORMAL, "Missing filename."); | |
| 4131 return; | |
| 4132 } | |
| 4133 if (recur_level > 20) { | |
| 4134 scr_LogPrint(LPRINT_LOGNORM, "** Too many source commands!"); | |
| 4135 return; | |
| 4136 } | |
| 4137 filename = g_strdup(arg); | |
| 4138 strip_arg_special_chars(filename); | |
|
1202
ede6c7aa59b0
Handle "~" in /source paths
Mikael Berthe <mikael@lilotux.net>
parents:
1197
diff
changeset
|
4139 expfname = expand_filename(filename); |
| 1192 | 4140 g_free(filename); |
|
1675
c73b31124fa6
Use glob() in source command
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
4141 // match |
|
c73b31124fa6
Use glob() in source command
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
4142 flist.gl_offs = 0; |
|
c73b31124fa6
Use glob() in source command
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
4143 if (glob(expfname, 0, source_print_error, &flist)) { |
|
c73b31124fa6
Use glob() in source command
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
4144 scr_LogPrint(LPRINT_LOGNORM, "Source: error: %s.", strerror (errno)); |
|
c73b31124fa6
Use glob() in source command
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
4145 } else { |
| 1680 | 4146 unsigned int i; |
|
1675
c73b31124fa6
Use glob() in source command
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
4147 // sort list |
|
c73b31124fa6
Use glob() in source command
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
4148 for (i = 1; i < flist.gl_pathc; ++i) { |
|
c73b31124fa6
Use glob() in source command
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
4149 int j; |
|
c73b31124fa6
Use glob() in source command
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
4150 for (j = i-1; j > 0; --j) { |
|
c73b31124fa6
Use glob() in source command
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
4151 char *a = flist.gl_pathv[j+1]; |
|
c73b31124fa6
Use glob() in source command
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
4152 char *b = flist.gl_pathv[j]; |
|
c73b31124fa6
Use glob() in source command
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
4153 if (strcmp(a, b) < 0) { |
|
c73b31124fa6
Use glob() in source command
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
4154 flist.gl_pathv[j] = a; |
|
c73b31124fa6
Use glob() in source command
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
4155 flist.gl_pathv[j+1] = b; |
|
c73b31124fa6
Use glob() in source command
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
4156 } else |
|
c73b31124fa6
Use glob() in source command
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
4157 break; |
|
c73b31124fa6
Use glob() in source command
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
4158 } |
|
c73b31124fa6
Use glob() in source command
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
4159 } |
|
c73b31124fa6
Use glob() in source command
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
4160 // source files in list |
|
c73b31124fa6
Use glob() in source command
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
4161 for (i=0; i < flist.gl_pathc; ++i) { |
|
c73b31124fa6
Use glob() in source command
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
4162 recur_level++; |
|
c73b31124fa6
Use glob() in source command
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
4163 cfg_read_file(flist.gl_pathv[i], FALSE); |
|
c73b31124fa6
Use glob() in source command
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
4164 recur_level--; |
|
c73b31124fa6
Use glob() in source command
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
4165 } |
|
c73b31124fa6
Use glob() in source command
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
4166 // free |
|
c73b31124fa6
Use glob() in source command
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
4167 globfree(&flist); |
|
c73b31124fa6
Use glob() in source command
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
4168 } |
|
1202
ede6c7aa59b0
Handle "~" in /source paths
Mikael Berthe <mikael@lilotux.net>
parents:
1197
diff
changeset
|
4169 g_free(expfname); |
| 1192 | 4170 } |
| 4171 | |
|
336
eb994ee40029
Make some functions static
Mikael Berthe <mikael@lilotux.net>
parents:
330
diff
changeset
|
4172 static void do_connect(char *arg) |
|
298
35cda94e570d
Add /connect and /disconnect commands
Mikael Berthe <mikael@lilotux.net>
parents:
290
diff
changeset
|
4173 { |
| 1598 | 4174 xmpp_connect(); |
|
298
35cda94e570d
Add /connect and /disconnect commands
Mikael Berthe <mikael@lilotux.net>
parents:
290
diff
changeset
|
4175 } |
|
35cda94e570d
Add /connect and /disconnect commands
Mikael Berthe <mikael@lilotux.net>
parents:
290
diff
changeset
|
4176 |
|
336
eb994ee40029
Make some functions static
Mikael Berthe <mikael@lilotux.net>
parents:
330
diff
changeset
|
4177 static void do_disconnect(char *arg) |
|
298
35cda94e570d
Add /connect and /disconnect commands
Mikael Berthe <mikael@lilotux.net>
parents:
290
diff
changeset
|
4178 { |
| 1598 | 4179 xmpp_disconnect(); |
|
298
35cda94e570d
Add /connect and /disconnect commands
Mikael Berthe <mikael@lilotux.net>
parents:
290
diff
changeset
|
4180 } |
| 576 | 4181 |
|
868
cefdaeb42e67
Add online /help command
Mikael Berthe <mikael@lilotux.net>
parents:
867
diff
changeset
|
4182 static void do_help(char *arg) |
|
cefdaeb42e67
Add online /help command
Mikael Berthe <mikael@lilotux.net>
parents:
867
diff
changeset
|
4183 { |
|
cefdaeb42e67
Add online /help command
Mikael Berthe <mikael@lilotux.net>
parents:
867
diff
changeset
|
4184 help_process(arg); |
|
cefdaeb42e67
Add online /help command
Mikael Berthe <mikael@lilotux.net>
parents:
867
diff
changeset
|
4185 } |
|
cefdaeb42e67
Add online /help command
Mikael Berthe <mikael@lilotux.net>
parents:
867
diff
changeset
|
4186 |
|
1518
63dc211a4c1a
New command: /echo (display a message in the log window)
Mikael Berthe <mikael@lilotux.net>
parents:
1508
diff
changeset
|
4187 static void do_echo(char *arg) |
|
63dc211a4c1a
New command: /echo (display a message in the log window)
Mikael Berthe <mikael@lilotux.net>
parents:
1508
diff
changeset
|
4188 { |
|
63dc211a4c1a
New command: /echo (display a message in the log window)
Mikael Berthe <mikael@lilotux.net>
parents:
1508
diff
changeset
|
4189 if (arg) |
|
63dc211a4c1a
New command: /echo (display a message in the log window)
Mikael Berthe <mikael@lilotux.net>
parents:
1508
diff
changeset
|
4190 scr_print_logwindow(arg); |
|
63dc211a4c1a
New command: /echo (display a message in the log window)
Mikael Berthe <mikael@lilotux.net>
parents:
1508
diff
changeset
|
4191 } |
|
63dc211a4c1a
New command: /echo (display a message in the log window)
Mikael Berthe <mikael@lilotux.net>
parents:
1508
diff
changeset
|
4192 |
|
2107
1bd9978ed5d0
Added carbon command
Roeland Jago Douma <roeland@famdouma.nl>
parents:
2074
diff
changeset
|
4193 static void do_carbons(char *arg) |
|
1bd9978ed5d0
Added carbon command
Roeland Jago Douma <roeland@famdouma.nl>
parents:
2074
diff
changeset
|
4194 { |
|
2112
332818e5daa1
Display a warning when the /carbons parameter is wrong
Mikael Berthe <mikael@lilotux.net>
parents:
2111
diff
changeset
|
4195 if (!strcasecmp(arg, "info") || !*arg) { |
|
2107
1bd9978ed5d0
Added carbon command
Roeland Jago Douma <roeland@famdouma.nl>
parents:
2074
diff
changeset
|
4196 carbons_info(); |
|
1bd9978ed5d0
Added carbon command
Roeland Jago Douma <roeland@famdouma.nl>
parents:
2074
diff
changeset
|
4197 } else if (!strcasecmp(arg, "enable")) { |
|
2108
adfd962e1343
Allow the user to enable/disable carbons from the command line
Roeland Jago Douma <roeland@famdouma.nl>
parents:
2107
diff
changeset
|
4198 carbons_enable(); |
|
2107
1bd9978ed5d0
Added carbon command
Roeland Jago Douma <roeland@famdouma.nl>
parents:
2074
diff
changeset
|
4199 } else if (!strcasecmp(arg, "disable")) { |
|
2108
adfd962e1343
Allow the user to enable/disable carbons from the command line
Roeland Jago Douma <roeland@famdouma.nl>
parents:
2107
diff
changeset
|
4200 carbons_disable(); |
|
2112
332818e5daa1
Display a warning when the /carbons parameter is wrong
Mikael Berthe <mikael@lilotux.net>
parents:
2111
diff
changeset
|
4201 } else { |
|
332818e5daa1
Display a warning when the /carbons parameter is wrong
Mikael Berthe <mikael@lilotux.net>
parents:
2111
diff
changeset
|
4202 scr_log_print(LPRINT_NORMAL, "Unrecognized parameter!"); |
|
2107
1bd9978ed5d0
Added carbon command
Roeland Jago Douma <roeland@famdouma.nl>
parents:
2074
diff
changeset
|
4203 } |
|
1bd9978ed5d0
Added carbon command
Roeland Jago Douma <roeland@famdouma.nl>
parents:
2074
diff
changeset
|
4204 } |
|
1bd9978ed5d0
Added carbon command
Roeland Jago Douma <roeland@famdouma.nl>
parents:
2074
diff
changeset
|
4205 |
| 1811 | 4206 /* vim: set expandtab cindent cinoptions=>2\:2(0 sw=2 ts=2: For Vim users... */ |