Merge branch 'master' of git://factorforge.org/git/william42

extra/irc/messages/messages.factor

@@ -90,11 +90,11 @@ M: end-of-names >>command-parameters ( names-reply params -- names-reply )
     first2 [ >>who ] [ >>channel ] bi* ;
 
 M: mode >>command-parameters ( mode params -- mode )
-    dup length 3 = [
+    dup length {
-        first3 [ >>name ] [ >>mode ] [ >>parameter ] tri*
+        { 3 [ first3 [ >>name ] [ >>mode ] [ >>parameter ] tri* ] }
-    ] [
+        { 2 [ first2 [ >>name ] [ >>mode ] bi* ] }
-        first2 [ >>name ] [ >>mode ] bi*
+        [ drop first >>name dup trailing>> >>mode ]
-    ] if ;
+    } case ;
 
 PRIVATE>
 
@@ -135,12 +135,12 @@ M: irc-message irc-message>server-line ( irc-message -- string )
 
 : copy-message-in ( command irc-message -- command )
     {
-        [ parameters>> [ >>parameters ] [ >>command-parameters ] bi ]
         [ line>>      >>line ]
         [ prefix>>    >>prefix ]
         [ command>>   >>command ]
         [ trailing>>  >>trailing ]
         [ timestamp>> >>timestamp ]
+        [ parameters>> [ >>parameters ] [ >>command-parameters ] bi ]
     } cleave ;
 
 PRIVATE>

extra/irc/ui/ui.factor

@@ -9,7 +9,7 @@ USING: accessors kernel threads combinators concurrency.mailboxes
        ui.gadgets.tabs ui.gadgets.grids ui.gadgets.packs ui.gadgets.labels
        io io.styles namespaces calendar calendar.format models continuations
        irc.client irc.client.private irc.messages
-       irc.ui.commandparser irc.ui.load vocabs.loader ;
+       irc.ui.commandparser irc.ui.load vocabs.loader classes prettyprint ;
 
 RENAME: join sequences => sjoin
 
@@ -30,6 +30,7 @@ TUPLE: irc-tab < frame chat client window ;
     foreground associate format ;
 : dark-red T{ rgba f 0.5 0.0 0.0 1 } ;
 : dark-green T{ rgba f 0.0 0.5 0.0 1 } ;
+: dark-blue T{ rgba f 0.0 0.0 0.5 1 } ;
 
 : dot-or-parens ( string -- string )
     [ "." ]
@@ -41,14 +42,14 @@ M: ping write-irc
     drop "* Ping" blue write-color ;
 
 M: privmsg write-irc
-    "<" blue write-color
+    "<" dark-blue write-color
     [ irc-message-sender write ] keep
-    "> " blue write-color
+    "> " dark-blue write-color
     trailing>> write ;
 
 M: notice write-irc
-    [ type>> blue write-color ] keep
+    [ type>> dark-blue write-color ] keep
-    ": " blue write-color
+    ": " dark-blue write-color
     trailing>> write ;
 
 TUPLE: own-message message nick timestamp ;
@@ -57,9 +58,9 @@ TUPLE: own-message message nick timestamp ;
     now own-message boa ;
 
 M: own-message write-irc
-    "<" blue write-color
+    "<" dark-blue write-color
     [ nick>> bold font-style associate format ] keep
-    "> " blue write-color
+    "> " dark-blue write-color
     message>> write ;
 
 M: join write-irc
@@ -87,26 +88,23 @@ M: kick write-irc
     " from the channel" dark-red write-color
     trailing>> dot-or-parens dark-red write-color ;
 
-: full-mode ( message -- mode )
-    parameters>> rest " " sjoin ;
-
 M: mode write-irc
-    "* " blue write-color
+    "* " dark-blue write-color
-    [ irc-message-sender write ] keep
+    [ name>> write ] keep
-    " has applied mode " blue write-color
+    " has applied mode " dark-blue write-color
-    [ full-mode write ] keep
+    [ mode>> write ] keep
-    " to " blue write-color
+    " to " dark-blue write-color
-    channel>> write ;
+    parameter>> write ;
 
 M: nick write-irc
-    "* " blue write-color
+    "* " dark-blue write-color
     [ irc-message-sender write ] keep
     " is now known as " blue write-color
     trailing>> write ;
 
 M: unhandled write-irc
     "UNHANDLED: " write
-    line>> blue write-color ;
+    line>> dark-blue write-color ;
 
 M: irc-end write-irc
     drop "* You have left IRC" dark-red write-color ;
@@ -121,7 +119,10 @@ M: irc-chat-end write-irc
     drop ;
 
 M: irc-message write-irc
-    drop ; ! catch all unimplemented writes, THIS WILL CHANGE    
+    "UNIMPLEMENTED" write
+    [ class pprint ] keep
+    ": " write
+    line>> dark-blue write-color ;
 
 GENERIC: time-happened ( message -- timestamp )