[haver-commits] r840 - trunk/clients/ravish

[haver]

Author: nornagon
Date: 2005-07-05 19:54:04 -0400 (Tue, 05 Jul 2005)
New Revision: 840

Modified:
   trunk/clients/ravish/ravish2.rb
Log:
Ravish does speaking now. I think.

Modified: trunk/clients/ravish/ravish2.rb
===================================================================
--- trunk/clients/ravish/ravish2.rb     2005-07-05 23:30:52 UTC (rev 839)
+++ trunk/clients/ravish/ravish2.rb     2005-07-05 23:54:04 UTC (rev 840)
@@ -21,6 +21,7 @@
                'listitem'      => 'de on de',
                'nickdecs'      => 'bold black on black',
                'nick'          => 'de on de',
+               'donick'        => 'bold de on de',
                'mynick'        => 'bold de on de',
        }
 
@@ -74,8 +75,10 @@
                        if self.respond_to?(func)
                                self.send func, args
                        else
-                               self.send 'unknown_user_cmd', cmd, args
+                               self.unknown_user_cmd cmd, args
                        end
+               else
+                       self.user_nocmd line
                end
        end
        
@@ -190,20 +193,38 @@
                win = find_window(cid)[1] || @servwin
                win.print "%(listdecs)[%(listtitle)#{listed} %(listcid)#{cid}"+
                        "%(listdecs)]%(default)"
-               users += ['aakeuser1', 'cakeuser2', 'dake_usaaaaar', 
'fake!user',
-               'gake.user', 'fake|user']
-               users += users + ['buser']
                users.sort!
                win.columnize users, {'before_each' => 
'%(listdecs)[%(listitem)',
                                                          'after_each'  => 
'%(listdecs)]%(default)'}
        end
 
+       def ev_IN cid, uid, type, *msg
+               if type == 'say'
+                       pref = "%(nickdecs)<%(" + (uid == @nick ? 'my' : '') + 
"nick)" +
+                                  "#{uid}%(nickdecs)>%(default) "
+               elsif type == 'do'
+                       pref = "%(donick)* #{uid}%(default)"
+               end
+               if win = find_window(cid)
+                       win[1].addline msg.join(' '), pref      
+               else
+                       @servwin.addline msg.join, "#{cid}:#{pref}"
+               end
+       end
+
        ## CLIENT COMMANDS ##
 
        def unknown_user_cmd cmd, args
                srvmsg "Unknown command: #{cmd}"
        end
 
+       def user_nocmd line
+               win = find_window(@term.current_window)
+               unless win[0] == '(server)'
+                       @haver.msg 'IN', win[0], 'say', line
+               end
+       end
+
        def user_JOIN args
                @haver.msg 'JOIN', args[0]
        end