irc.ui: Fixed mode stuff

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