Changeset aefa533e

Timestamp:

2006-03-21T08:12:22Z (19 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

19a6c75

Parents:

1ad104a

Message:

Added a special +b usermode for easier parseability of some things.
(For now blist and qlist, but more should come)

Files:

• irc.h (modified) (1 diff)
• protocols/oscar/oscar.c (modified) (1 diff)
• query.c (modified) (2 diffs)
• root_commands.c (modified) (2 diffs)

irc.h

@@ -33 +33 @@
 #define IRC_PING_STRING "PinglBee"
 
-#define UMODES "iasw"
+#define UMODES "abisw"
 #define UMODES_PRIV "Ro"
 #define CMODES "nt"

protocols/oscar/oscar.c

@@ -1150 +1150 @@
                 reason = msg + 6;
         
-        dialog_msg = g_strdup_printf("The user %u wants to add you to their buddy list for the following reason:\n\n%s", uin, reason ? reason : "No reason given.");
+        dialog_msg = g_strdup_printf("The user %u wants to add you to their buddy list for the following reason: %s", uin, reason ? reason : "No reason given.");
         data->gc = gc;
         data->uin = uin;

query.c

@@ -39 +39 @@
         q->no = no;
         q->data = data;
+        
+        if( strchr( irc->umode, 'b' ) != NULL )
+        {
+                char *s;
+                
+                /* At least for the machine-parseable version, get rid of
+                   newlines to make "parsing" easier. */
+                for( s = q->question; *s; s ++ )
+                        if( *s == '\r' || *s == '\n' )
+                                *s = ' ';
+        }
         
         if( irc->queries )
@@ -127 +138 @@
                 disp = 1;
         }
-        //Using irc_usermsg instead of serv_got_crap because \x02A is a char too, so a SPACE is needed. 
         if( ans )
         {

root_commands.c

@@ -635 +635 @@
         int online = 0, away = 0, offline = 0;
         user_t *u;
-        char s[64];
+        char s[256];
+        char *format;
         int n_online = 0, n_away = 0, n_offline = 0;
         
@@ -649 +650 @@
                 online =  away = 1;
         
-        irc_usermsg( irc, "%-16.16s  %-40.40s  %s", "Nick", "User/Host/Network", "Status" );
-        
-        if( online == 1 ) for( u = irc->users; u; u = u->next ) if( u->gc && u->online && !u->away )
-        {
-                g_snprintf( s, 63, "%s@%s (%s)", u->user, u->host, u->gc->user->prpl->name );
-                irc_usermsg( irc, "%-16.16s  %-40.40s  %s", u->nick, s, "Online" );
+        if( strchr( irc->umode, 'b' ) != NULL )
+                format = "%s\t%s\t%s";
+        else
+                format = "%-16.16s  %-40.40s  %s";
+        
+        irc_usermsg( irc, format, "Nick", "User/Host/Network", "Status" );
+        
+        for( u = irc->users; u; u = u->next ) if( u->gc && u->online && !u->away )
+        {
+                if( online == 1 )
+                {
+                        g_snprintf( s, sizeof( s ) - 1, "%s@%s (%s)", u->user, u->host, u->gc->user->prpl->name );
+                        irc_usermsg( irc, format, u->nick, s, "Online" );
+                }
+                
                 n_online ++;
         }
 
-        if( away == 1 ) for( u = irc->users; u; u = u->next ) if( u->gc && u->online && u->away )
-        {
-                g_snprintf( s, 63, "%s@%s (%s)", u->user, u->host, u->gc->user->prpl->name );
-                irc_usermsg( irc, "%-16.16s  %-40.40s  %s", u->nick, s, u->away );
+        for( u = irc->users; u; u = u->next ) if( u->gc && u->online && u->away )
+        {
+                if( away == 1 )
+                {
+                        g_snprintf( s, sizeof( s ) - 1, "%s@%s (%s)", u->user, u->host, u->gc->user->prpl->name );
+                        irc_usermsg( irc, format, u->nick, s, u->away );
+                }
                 n_away ++;
         }
         
-        if( offline == 1 ) for( u = irc->users; u; u = u->next ) if( u->gc && !u->online )
-        {
-                g_snprintf( s, 63, "%s@%s (%s)", u->user, u->host, u->gc->user->prpl->name );
-                irc_usermsg( irc, "%-16.16s  %-40.40s  %s", u->nick, s, "Offline" );
+        for( u = irc->users; u; u = u->next ) if( u->gc && !u->online )
+        {
+                if( offline == 1 )
+                {
+                        g_snprintf( s, sizeof( s ) - 1, "%s@%s (%s)", u->user, u->host, u->gc->user->prpl->name );
+                        irc_usermsg( irc, format, u->nick, s, "Offline" );
+                }
                 n_offline ++;
         }
         
-        irc_usermsg( irc, "%d buddies (%d available, %d away, %d offline)", n_online + n_away + n_offline, n_online, n_away, n_offline );
+        if( strchr( irc->umode, 'b' ) == NULL )
+                irc_usermsg( irc, "%d buddies (%d available, %d away, %d offline)", n_online + n_away + n_offline, n_online, n_away, n_offline );
 }