Changeset 4695

Timestamp:

02/23/07 14:04:22 (1 year ago)

Author:

morris

Message:

Match server's p7 support

Files:

• wire/branches/p7/Makefile.in (modified) (1 diff)
• wire/branches/p7/wire/client.c (modified) (7 diffs)
• wire/branches/p7/wire/commands.c (modified) (2 diffs)
• wire/branches/p7/wire/server.c (modified) (3 diffs)
• wire/branches/p7/wire/server.h (modified) (2 diffs)
• wire/branches/p7/wire/users.c (modified) (1 diff)
• wire/branches/p7/wire/users.h (modified) (1 diff)
• wire/branches/p7/wire/windows.c (modified) (1 diff)

wire/branches/p7/Makefile.in

@@ -111 +111 @@
-clean: clean-recursive
-        rm -f $(objdir)/wire/*.o
-
+wire/
-        rm -f $(rundir)/wire
-

wire/branches/p7/wire/client.c

@@ -50 +50 @@
-static void                                                     wr_message_ping_reply(wi_p7_message_t *);
-static void                                                     wr_message_server_info(wi_p7_message_t *);
+static void                                                     wr_message_user_info(wi_p7_message_t *);
+static void                                                     wr_message_user_list(wi_p7_message_t *);
+static void                                                     wr_message_user_list_done(wi_p7_message_t *);
-
-
@@ -160 +163 @@
-        wi_hash_set_data_for_key(wr_message_handlers, wr_message_ping_reply, WI_STR("wired.ping.reply"));
-        wi_hash_set_data_for_key(wr_message_handlers, wr_message_server_info, WI_STR("wired.server_info"));
+        wi_hash_set_data_for_key(wr_message_handlers, wr_message_user_info, WI_STR("wired.user_info"));
+        wi_hash_set_data_for_key(wr_message_handlers, wr_message_user_list, WI_STR("wired.user_list"));
+        wi_hash_set_data_for_key(wr_message_handlers, wr_message_user_list_done, WI_STR("wired.user_list.done"));
-
-        wr_icon = wi_data_init_with_base64(wi_data_alloc(), wi_string_with_cstring(wr_default_icon));
@@ -512 +518 @@
-                return NULL;
-        
-
-
-
+
-}
-
@@ -558 +562 @@
-                wr_send_message(message);
-        }
+
+        message = wi_p7_message_with_name(WI_STR("wired.join_chat"), wr_p7_socket);
+        wi_p7_message_set_uint32_for_name(message, wr_chat_id(wr_public_chat), WI_STR("wired.chat.id"));
+        wr_send_message(message);
-}
-
@@ -570 +578 @@
-        wi_p7_message_t         *reply;
-
-
-
-
-
-
-
+
+
+
+
-
-        wr_draw_divider();
@@ -589 +595 @@
-
-
-
+
+
+
-/*
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-static void wr_msg_308(wi_array_t *arguments) {
-        wi_enumerator_t         *enumerator;
@@ -901 +665 @@
-                }
-        }
+}*/
+
+}
+
+
+
+static void wr_message_user_list(wi_p7_message_t *reply) {
+        wr_user_t                       *user;
+        wr_chat_t                       *chat;
+        wi_p7_uint32_t          cid;
+        
+        if(!wi_p7_message_get_uint32_for_name(reply, &cid, WI_STR("wired.chat.id")))
+                return;
+        
+        chat = wr_chats_chat_with_cid(cid);
+        
+        if(chat) {
+                user = wr_user_init_with_message(wr_user_alloc(), reply);
+                wr_chat_add_user(chat, user);
+                wi_release(user);
+        }
+}
+
+
+
+static void wr_message_user_list_done(wi_p7_message_t *reply) {
+        wr_chat_t                       *chat;
+        wi_p7_uint32_t          cid;
+        
+        if(!wi_p7_message_get_uint32_for_name(reply, &cid, WI_STR("wired.chat.id")))
+                return;
+        
+        chat = wr_chats_chat_with_cid(cid);
+        
+        if(chat) {
+                wr_draw_divider();
+                wr_print_users(wr_windows_window_with_chat(chat));
+        }
+}
+
+
+
+#pragma mark -
+/*
+static void wr_msg_200(wi_array_t *arguments) {
+        double          protocol;
+        
+        protocol = wi_string_double(wr_protocol_version_string);
+        
+        wr_server = wr_server_init(wr_server_alloc());
+        wr_server->version = wi_retain(WI_ARRAY(arguments, 0));
+        wr_server->protocol = wi_string_double(WI_ARRAY(arguments, 1));
+        wr_server->name = wi_retain(WI_ARRAY(arguments, 2));
+        wr_server->description = wi_retain(WI_ARRAY(arguments, 3));
+        wr_server->startdate = wi_date_init_with_iso8601_string(wi_date_alloc(), WI_ARRAY(arguments, 4));
+        wr_server->files = wi_string_uint32(WI_ARRAY(arguments, 4));
+        wr_server->size = wi_string_uint64(WI_ARRAY(arguments, 5));
+
+        wr_draw_divider();
+        
+        if(!wr_logged_in) {
+                if(wr_server->protocol > protocol) {
+                        wr_wprintf_prefix(wr_console_window, WI_STR("Server protocol version %.1f may not be fully compatible with client protocol version %.1f"),
+                                wr_server->protocol, protocol);
+                }
+
+                wr_send_command(WI_STR("CLIENT %#@"), wr_client_version_string);
+                wr_send_command(WI_STR("NICK %#@"), wr_nick);
+                wr_send_command(WI_STR("STATUS %#@"), wr_status);
+                wr_send_command(WI_STR("ICON %u%c%#@"), 0, WR_FIELD_SEPARATOR, wr_icon);
+                wr_send_command(WI_STR("USER %#@"), wr_login);
+                wr_send_command(WI_STR("PASS %#@"), (wi_string_length(wr_password) == 0) ? NULL : wi_string_sha1(wr_password));
+                
+                wr_send_command(WI_STR("WHO %u"), 1);
+
+                wr_logged_in = true;
+        }
+}
+
+
+
+static void wr_msg_201(wi_array_t *arguments) {
+        wr_wprintf_prefix(wr_console_window, WI_STR("Logged in, welcome to %@"), wr_server->name);
+}
+
+
+
+static void wr_msg_202(wi_array_t *arguments) {
+        wi_time_interval_t      interval;
+
+        if(wr_ping_time > 0.0) {
+                interval = wi_time_interval() - wr_ping_time;
+                
+                wr_wprintf_prefix(wr_console_window, WI_STR("Ping reply after %.2fms"), interval * 1000.0);
+                
+                wr_ping_time = 0.0;
+        }
+}
+
+
+
+static void wr_msg_300(wi_array_t *arguments) {
+        wr_chat_t       *chat;
+        wr_user_t       *user;
+        wr_cid_t        cid;
+        wr_uid_t        uid;
+
+        cid = wi_string_uint32(WI_ARRAY(arguments, 0));
+        uid = wi_string_uint32(WI_ARRAY(arguments, 1));
+
+        chat = wr_chats_chat_with_cid(cid);
+        user = wr_chat_user_with_uid(chat, uid);
+        
+        if(user && !wr_is_ignored(wr_user_nick(user)))
+                wr_wprint_say(wr_windows_window_with_chat(chat), wr_user_nick(user), WI_ARRAY(arguments, 2));
+}
+
+
+
+static void wr_msg_301(wi_array_t *arguments) {
+        wr_chat_t       *chat;
+        wr_user_t       *user;
+        wr_cid_t        cid;
+        wr_uid_t        uid;
+
+        cid = wi_string_uint32(WI_ARRAY(arguments, 0));
+        uid = wi_string_uint32(WI_ARRAY(arguments, 1));
+
+        chat = wr_chats_chat_with_cid(cid);
+        user = wr_chat_user_with_uid(chat, uid);
+        
+        if(user && !wr_is_ignored(wr_user_nick(user)))
+                wr_wprint_me(wr_windows_window_with_chat(chat), wr_user_nick(user), WI_ARRAY(arguments, 2));
+}
+
+
+
+static void wr_msg_302(wi_array_t *arguments) {
+        wr_chat_t       *chat;
+        wr_user_t       *user;
+        wr_cid_t        cid;
+        
+        cid = wi_string_uint32(WI_ARRAY(arguments, 0));
+        chat = wr_chats_chat_with_cid(cid);
+
+        user = wr_user_init_with_arguments(wr_user_alloc(), arguments);
+        wr_chat_add_user(chat, user);
+        wi_release(user);
+
+        wr_draw_divider();
+        wr_wprintf_prefix(wr_windows_window_with_chat(chat), WI_STR("%@ has joined"),
+                wr_user_nick(user));
+}
+
+
+
+static void wr_msg_303(wi_array_t *arguments) {
+        wr_chat_t       *chat;
+        wr_user_t       *user;
+        wr_cid_t        cid;
+        wr_uid_t        uid;
+
+        cid = wi_string_uint32(WI_ARRAY(arguments, 0));
+        uid = wi_string_uint32(WI_ARRAY(arguments, 1));
+
+        chat = wr_chats_chat_with_cid(cid);
+        user = wr_chat_user_with_uid(chat, uid);
+
+        if(user) {
+                wr_wprintf_prefix(wr_windows_window_with_chat(chat), WI_STR("%@ has left"),
+                        wr_user_nick(user));
+                
+                wr_chat_remove_user(chat, user);
+                wr_draw_divider();
+        }
+}
+
+
+
+static void wr_msg_304(wi_array_t *arguments) {
+        wi_string_t             *nick;
+        wr_user_t               *user;
+        wr_uid_t                uid;
+
+        uid = wi_string_uint32(WI_ARRAY(arguments, 0));
+        user = wr_chat_user_with_uid(wr_public_chat, uid);
+
+        if(user) {
+                nick = WI_ARRAY(arguments, 4);
+                
+                if(!wi_is_equal(wr_user_nick(user), nick)) {
+                        wr_wprintf_prefix(wr_console_window, WI_STR("%@ is now known as %@"),
+                                wr_user_nick(user), nick);
+
+                        wr_user_set_nick(user, nick);
+                }
+
+                wr_user_set_idle(user, wi_string_bool(WI_ARRAY(arguments, 1)));
+                wr_user_set_admin(user, wi_string_bool(WI_ARRAY(arguments, 2)));
+                wr_user_set_status(user, WI_ARRAY(arguments, 5));
+        }
+}
+
+
+
+static void wr_msg_305(wi_array_t *arguments) {
+        wr_user_t               *user;
+        wr_window_t             *window;
+        wr_uid_t                uid;
+
+        uid = wi_string_uint32(WI_ARRAY(arguments, 0));
+        user = wr_chat_user_with_uid(wr_public_chat, uid);
+
+        if(user && !wr_is_ignored(wr_user_nick(user))) {
+                window = wr_windows_window_with_user(user);
+                
+                if(!window) {
+                        window = wr_window_init_with_user(wr_window_alloc(), user);
+                        wr_windows_add_window(window);
+                        wi_release(window);
+                }
+                
+                wr_wprint_msg(window, wr_user_nick(user), WI_ARRAY(arguments, 1));
+                wr_reply_uid = wr_user_id(user);
+        }
+}
+
+
+
+static void wr_msg_306(wi_array_t *arguments) {
+        wi_string_t             *message;
+        wr_user_t               *killer, *victim;
+        wr_uid_t                killer_uid, victim_uid;
+
+        victim_uid = wi_string_uint32(WI_ARRAY(arguments, 0));
+        killer_uid = wi_string_uint32(WI_ARRAY(arguments, 1));
+        message = WI_ARRAY(arguments, 2);
+
+        victim = wr_chat_user_with_uid(wr_public_chat, victim_uid);
+        killer = wr_chat_user_with_uid(wr_public_chat, killer_uid);
+
+        if(killer && victim) {
+                if(wi_string_length(message) > 0) {
+                        wr_wprintf_prefix(wr_console_window, WI_STR("%@ was kicked by %@: %@"),
+                                wr_user_nick(victim), wr_user_nick(killer), message);
+                } else {
+                        wr_wprintf_prefix(wr_console_window, WI_STR("%@ was kicked by %@"),
+                                wr_user_nick(victim), wr_user_nick(killer));
+                }
+        }
+
+        if(victim) {
+                wr_chat_remove_user(wr_public_chat, victim);
+                wr_draw_divider();
+        }
+}
+
+
+
+static void wr_msg_307(wi_array_t *arguments) {
+        wi_string_t             *message;
+        wr_user_t               *killer, *victim;
+        wr_uid_t                killer_uid, victim_uid;
+
+        victim_uid = wi_string_uint32(WI_ARRAY(arguments, 0));
+        killer_uid = wi_string_uint32(WI_ARRAY(arguments, 1));
+        message = WI_ARRAY(arguments, 2);
+
+        victim = wr_chat_user_with_uid(wr_public_chat, victim_uid);
+        killer = wr_chat_user_with_uid(wr_public_chat, killer_uid);
+
+        if(killer && victim) {
+                if(wi_string_length(message) > 0) {
+                        wr_wprintf_prefix(wr_console_window, WI_STR("%@ was banned by %@: %@"),
+                                wr_user_nick(victim), wr_user_nick(killer), message);
+                } else {
+                        wr_wprintf_prefix(wr_console_window, WI_STR("%@ was banned by %@"),
+                                wr_user_nick(victim), wr_user_nick(killer));
+                }
+        }
+
+        if(victim) {
+                wr_chat_remove_user(wr_public_chat, victim);
+                wr_draw_divider();
+        }
+}
+
+
+
+static void wr_msg_308(wi_array_t *arguments) {
+        wi_enumerator_t         *enumerator;
+        wi_date_t                       *date;
+        wi_array_t                      *array, *transfers;
+        wi_string_t                     *string, *interval, *name, *transferred, *size, *speed;
+        wi_uinteger_t           n;
+        wi_boolean_t            first;
+        
+        wr_printf_prefix(WI_STR("User info:"),
+                WI_ARRAY(arguments, 4));
+
+        wr_printf_block(WI_STR("Nick:        %@"), WI_ARRAY(arguments, 4));
+
+        if(wr_server->protocol >= 1.1)
+                wr_printf_block(WI_STR("Status:      %@"), WI_ARRAY(arguments, 15));
+
+        wr_printf_block(WI_STR("Login:       %@"), WI_ARRAY(arguments, 5));
+        wr_printf_block(WI_STR("ID:          %@"), WI_ARRAY(arguments, 0));
+        wr_printf_block(WI_STR("Address:     %@"), WI_ARRAY(arguments, 6));
+        wr_printf_block(WI_STR("Host:        %@"), WI_ARRAY(arguments, 7));
+        wr_printf_block(WI_STR("Client:      %@"), WI_ARRAY(arguments, 8));
+        wr_printf_block(WI_STR("Cipher:      %@/%@ bits"), WI_ARRAY(arguments, 9), WI_ARRAY(arguments, 10));
+
+        date = wi_date_with_iso8601_string(WI_ARRAY(arguments, 11));
+        interval = wi_time_interval_string(wi_date_time_interval_since_now(date));
+    string = wi_date_string_with_format(date, WI_STR("%a %b %e %T %Y"));
+        wr_printf_block(WI_STR("Login Time:  %@, since %@"), interval, string);
+
+        date = wi_date_with_iso8601_string(WI_ARRAY(arguments, 12));
+        interval = wi_time_interval_string(wi_date_time_interval_since_now(date));
+    string = wi_date_string_with_format(date, WI_STR("%a %b %e %T %Y"));
+        wr_printf_block(WI_STR("Idle Time:   %@, since %@"), interval, string);
+        
+        for(n = WR_TRANSFER_DOWNLOAD; n <= WR_TRANSFER_UPLOAD; n++) {
+                string          = WI_ARRAY(arguments, (n == WR_TRANSFER_DOWNLOAD) ? 13 : 14);
+                transfers       = wi_string_components_separated_by_string(string, WI_STR(WR_GROUP_SEPARATOR_STR));
+                enumerator      = wi_array_data_enumerator(transfers);
+                first           = true;
+                
+                while((string = wi_enumerator_next_data(enumerator))) {
+                        array   = wi_string_components_separated_by_string(string, WI_STR(WR_RECORD_SEPARATOR_STR));
+                        
+                        if(wi_array_count(array) == 4) {
+                                name            = wi_string_last_path_component(WI_ARRAY(array, 0));
+                                transferred     = wr_files_string_for_size(wi_string_uint64(WI_ARRAY(array, 1)));
+                                size            = wr_files_string_for_size(wi_string_uint64(WI_ARRAY(array, 2)));
+                                speed           = wr_files_string_for_size(wi_string_uint32(WI_ARRAY(array, 3)));
+                                
+                                if(first) {
+                                        if(n == WR_TRANSFER_DOWNLOAD) {
+                                                wr_printf_block(WI_STR("Downloads:   %@, %@ of %@, %@/s"),
+                                                        name, transferred, size, speed);
+                                        } else {
+                                                wr_printf_block(WI_STR("Uploads:     %@, %@ of %@, %@/s"),
+                                                        name, transferred, size, speed);
+                                        }
+                                } else {
+                                        wr_printf_block(WI_STR("             %@, %@ of %@, %@/s"),
+                                                name, transferred, size, speed);
+                                }
+                        }
+                        
+                        first = false;
+                }
+        }
-}
-

wire/branches/p7/wire/commands.c

@@ -849 +849 @@
-
-static void wr_cmd_info(wi_array_t *arguments) {
+        wi_p7_message_t *message;
-        wi_enumerator_t *enumerator;
-        wi_string_t             *nick;
@@ -865 +866 @@
-                }
-
-
+
+
+
-        }
-}

wire/branches/p7/wire/server.c

@@ -31 +31 @@
-#include <wired/wired.h>
-
+#include "client.h"
-#include "server.h"
-
@@ -61 +62 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-        return server;
-}
@@ -70 +82 @@
-        wr_server_t             *server = instance;
-        
-        wi_release(server->version);
-        wi_release(server->name);
-        wi_release(server->description);
-
+
+
+
+
+
+
-}

wire/branches/p7/wire/server.h

@@ -33 +33 @@
-        wi_runtime_base_t                               base;
-
-        wi_string_t                                             *version;
-        double                                                  protocol;
-        wi_string_t                                             *name;
-        wi_string_t                                             *description;
-
-
-
+
+
+
+
+
+
+
+
-};
-typedef struct _wr_server                       wr_server_t;
@@ -47 +50 @@
-
-wr_server_t *                                           wr_server_alloc(void);
-(wr_server
+_with_message(wr_server_t *, wi_p7_message
-
-#endif /* WR_SERVER_H */

wire/branches/p7/wire/users.c

@@ -127 +127 @@
-
-
+wr_user_t * wr_user_init_with_message(wr_user_t *user, wi_p7_message_t *message) {
+        wi_p7_message_get_uint32_for_name(message, &user->uid, WI_STR("wired.user.id"));
+        wi_p7_message_get_bool_for_name(message, &user->admin, WI_STR("wired.user.admin"));
+        wi_p7_message_get_bool_for_name(message, &user->idle, WI_STR("wired.user.idle"));
+
+        user->nick = wi_retain(wi_p7_message_string_for_name(message, WI_STR("wired.user.nick")));
+        user->status = wi_retain(wi_p7_message_string_for_name(message, WI_STR("wired.user.status")));
+        
+        return user;
+}
+
+
+
-wr_user_t * wr_user_init_with_arguments(wr_user_t *user, wi_array_t *arguments) {
-        user->uid               = wi_string_uint32(WI_ARRAY(arguments, 1));

wire/branches/p7/wire/users.h

@@ -42 +42 @@
-
-wr_user_t *                                                     wr_user_alloc(void);
+wr_user_t *                                                     wr_user_init_with_message(wr_user_t *, wi_p7_message_t *);
-wr_user_t *                                                     wr_user_init_with_arguments(wr_user_t *, wi_array_t *);
-

wire/branches/p7/wire/windows.c

@@ -543 +543 @@
-        wr_printf_block(WI_STR("Description:  %@"), wr_server->description);
-
-dat
-dat
+_tim
+_tim
-        wr_printf_block(WI_STR("Uptime:       %@, since %@"), interval, string);
-
-        wr_printf_block(WI_STR("Files:        %@"), wr_files_string_for_count(wr_server->files));
-        wr_printf_block(WI_STR("Size:         %@"), wr_files_string_for_size(wr_server->size));
-
-
-
-
-
-
-
-
-
-
+
+
+
-}
-