Merged 0.7.99 irssi.

[silc.git] / apps / irssi / src / core / commands.h

diff --git a/apps/irssi/src/core/commands.h b/apps/irssi/src/core/commands.h
index 9dee2e8035f8cfee86f01abc0ca9875d8e62edd0..3e55a2adc04f0e7d9ab40504e5251b402786309b 100644 (file)
--- a/apps/irssi/src/core/commands.h
+++ b/apps/irssi/src/core/commands.h
@@ -6,6 +6,7 @@
 typedef struct {
        char *name;
        char *options;
+        int protocol; /* chat protocol required for this command */
         GSList *signals;
 } COMMAND_MODULE_REC;
 
@@ -26,10 +27,11 @@ enum {
 
         CMDERR_ERRNO, /* get the error from errno */
        CMDERR_NOT_ENOUGH_PARAMS, /* not enough parameters given */
-       CMDERR_NOT_CONNECTED, /* not connected to IRC server */
+       CMDERR_NOT_CONNECTED, /* not connected to server */
        CMDERR_NOT_JOINED, /* not joined to any channels in this window */
        CMDERR_CHAN_NOT_FOUND, /* channel not found */
        CMDERR_CHAN_NOT_SYNCED, /* channel not fully synchronized yet */
+       CMDERR_ILLEGAL_PROTO, /* requires different chat protocol than the active server */
        CMDERR_NOT_GOOD_IDEA /* not good idea to do, -yes overrides this */
 };
 
@@ -56,10 +58,14 @@ extern char *current_command; /* the command we're right now. */
 
 /* Bind command to specified function. */
 void command_bind_to(const char *module, int pos, const char *cmd,
-                    const char *category, SIGNAL_FUNC func);
-#define command_bind(a, b, c) command_bind_to(MODULE_NAME, 1, a, b, c)
-#define command_bind_first(a, b, c) command_bind_to(MODULE_NAME, 0, a, b, c)
-#define command_bind_last(a, b, c) command_bind_to(MODULE_NAME, 2, a, b, c)
+                     int protocol, const char *category, SIGNAL_FUNC func);
+#define command_bind(a, b, c) command_bind_to(MODULE_NAME, 1, a, -1, b, c)
+#define command_bind_first(a, b, c) command_bind_to(MODULE_NAME, 0, a, -1, b, c)
+#define command_bind_last(a, b, c) command_bind_to(MODULE_NAME, 2, a, -1, b, c)
+
+#define command_bind_proto(a, b, c, d) command_bind_to(MODULE_NAME, 1, a, b, c, d)
+#define command_bind_proto_first(a, b, c, d) command_bind_to(MODULE_NAME, 0, a, b, c, d)
+#define command_bind_proto_last(a, b, c, d) command_bind_to(MODULE_NAME, 2, a, b, c, d)
 
 void command_unbind(const char *cmd, SIGNAL_FUNC func);
 
@@ -129,6 +135,8 @@ int command_have_option(const char *cmd, const char *option);
 #define PARAM_FLAG_UNKNOWN_OPTIONS 0x00008000
 /* optional channel in first argument */
 #define PARAM_FLAG_OPTCHAN 0x00010000
+/* optional channel in first argument, but don't treat "*" as current channel */
+#define PARAM_FLAG_OPTCHAN_NAME 0x00030000
 
 char *cmd_get_param(char **data);
 /* get parameters from command - you should point free_me somewhere and