Changeset 9459

Timestamp:

04/11/08 05:52:45 (8 months ago)

Author:

bct

Message:

functioning tic-tac-toe :D

Location:

branches/session_centric

Files:

• data/glade/roster_contact_context_menu.glade (modified) (1 diff)
• src/common/connection_handlers.py (modified) (10 diffs)
• src/common/stanza_session.py (modified) (3 diffs)
• src/roster_window.py (modified) (2 diffs)
• src/session.py (modified) (2 diffs)
• src/tictactoe.py (added)

branches/session_centric/data/glade/roster_contact_context_menu.glade

@@ -90 +90 @@
           </widget>
         </child>
+      </widget>
+    </child>
+    <child>
+      <widget class="GtkImageMenuItem" id="tictactoe_menuitem">
+        <property name="visible">True</property>
+        <property name="label" translatable="yes">Play Tic Tac Toe</property>
+        <property name="use_underline">True</property>
       </widget>
     </child>

branches/session_centric/src/common/connection_handlers.py

@@ -51 +51 @@
 
 # XXX interface leaking into the back end?
-import session
+from session import ChatControlSession
+import tictactoe
 
 STATUS_LIST = ['offline', 'connecting', 'online', 'chat', 'away', 'xa', 'dnd',
@@ -769 +770 @@
                                         q.addChild('feature', attrs = {'var': common.xmpp.NS_MOOD + '+notify'})
                                 q.addChild('feature', attrs = {'var': common.xmpp.NS_ESESSION_INIT})
+                                q.addChild('feature', attrs = {'var': 'http://jabber.org/protocol/games'})
 
                         if (node is None or extension == 'cstates') and gajim.config.get('outgoing_chat_state_notifactions') != 'disabled':
@@ -779 +781 @@
                                 q.addChild('feature', attrs = {'var': common.xmpp.NS_PING})
                                 q.addChild('feature', attrs = {'var': common.xmpp.NS_TIME_REVISED})
+
+                        if node == 'http://jabber.org/protocol/games':
+                                q.addChild('feature', attrs = {'var': 'http://jabber.org/protocol/games/tictactoe'})
 
                         if q.getChildren():
@@ -1539 +1544 @@
                         mtype = 'normal'
 
-                if not mtype == 'groupchat':
+                game_invite = msg.getTag('invite', namespace='http://jabber.org/protocol/games')
+                if game_invite:
+                        game = game_invite.getTag('game')
+
+                        if game.getAttr('var') == 'http://jabber.org/protocol/games/tictactoe':
+                                klass = tictactoe.TicTacToeSession
+
+                        # this assumes that the invitation came with a thread_id we haven't seen
+                        session = self.make_new_session(frm, thread_id, klass=klass)
+
+                        session.invited(msg)
+
+                        return
+                elif mtype != 'groupchat':
                         session = self.get_session(frm, thread_id, mtype)
 
@@ -1551 +1569 @@
 
                 # check if the message is a xep70-confirmation-request
-                if msg.getTag('confirm') and msg.getTag('confirm').namespace == \
-                common.xmpp.NS_HTTP_AUTH:
+                if msg.getTag('confirm', namespace=common.xmpp.NS_HTTP_AUTH):
                         self._HttpAuthCB(con, msg)
                         return
 
                 # check if the message is a XEP 0020 feature negotiation request
-                if msg.getTag('feature') and msg.getTag('feature').namespace == \
-                common.xmpp.NS_FEATURE:
+                if msg.getTag('feature', namespace=common.xmpp.NS_FEATURE):
                         if gajim.HAVE_PYCRYPTO:
                                 self._FeatureNegCB(con, msg, session)
@@ -1564 +1580 @@
 
                 # check if the message is initiating an ESession negotiation
-                if msg.getTag('init') and msg.getTag('init').namespace == \
-                common.xmpp.NS_ESESSION_INIT:
+                if msg.getTag('init', namespace=common.xmpp.NS_ESESSION_INIT):
                         self._InitE2ECB(con, msg, session)
 
                 encrypted = False
 
-                e2e_tag = msg.getTag('c', namespace = common.xmpp.NS_STANZA_CRYPTO)
-                if e2e_tag:
+                if msg.getTag('c', namespace = common.xmpp.NS_STANZA_CRYPTO):
                         encrypted = True
 
@@ -1702 +1716 @@
                         mtype = treat_as
 
-                session.received(frm, msgtxt, tim, encrypted, mtype, subject, chatstate,
-      msg_id, composing_xep, user_nick, msghtml, form_node)
+                # XXX horrible hack
+                if isinstance(session, ChatControlSession):
+                        session.received(frm, msgtxt, tim, encrypted, mtype, subject, chatstate,
+                                msg_id, composing_xep, user_nick, msghtml, form_node)
+                else:
+                        session.received(msg)
         # END messageCB
 
         # process and dispatch an error message
-        def dispatch_error_message(self, msg, msgtxt, session, frm, tim, subject)
+        def dispatch_error_message(self, msg, msgtxt, session, frm, tim, subject):
                 error_msg = msg.getError()
 
@@ -1762 +1780 @@
                                         self.dispatch('ERROR', (_('Disk Write Error'), str(e)))
 
-        def dispatch_invite_message(self, invite, frm)
+        def dispatch_invite_message(self, invite, frm):
                 item = invite.getTag('invite')
 
@@ -1834 +1852 @@
 
 returns the session that we last sent a message to.'''
-                
+
                 sessions_with_jid = self.sessions[jid].values()
                 no_threadid_sessions = filter(lambda s: not s.received_thread_id, sessions_with_jid)
@@ -1844 +1862 @@
                         return None
 
-        def make_new_session(self, jid, thread_id = None, type = 'chat'):
-                sess = session.ChatControlSession(self, common.xmpp.JID(jid), thread_id, type)
+        def make_new_session(self, jid, thread_id=None, type='chat', klass=None):
+                if not klass:
+                        klass = ChatControlSession
+
+                sess = klass(self, common.xmpp.JID(jid), thread_id, type)
 
                 if not jid in self.sessions:

branches/session_centric/src/common/stanza_session.py

@@ -33 +33 @@
                                 self.thread_id = self.generate_thread_id()
 
+                self.loggable = True
+
                 self.last_send = 0
                 self.status = None
                 self.negotiated = {}
+
+        def is_loggable(self):
+                account = self.conn.name
+                no_log_for = gajim.config.get_per('accounts', account, 'no_log_for')
+
+                if not no_log_for:
+                        no_log_for = ''
+
+                no_log_for = no_log_for.split()
+
+                return self.loggable and account not in no_log_for and self.jid not in no_log_for
 
         def generate_thread_id(self):
@@ -132 +145 @@
         def __init__(self, conn, jid, thread_id, type = 'chat'):
                 StanzaSession.__init__(self, conn, jid, thread_id, type = 'chat')
-
-                self.loggable = True
 
                 self.xes = {}
@@ -892 +903 @@
                 self.km_o = ''
 
-        def is_loggable(self):
-                account = self.conn.name
-                no_log_for = gajim.config.get_per('accounts', account, 'no_log_for')
-
-                if not no_log_for:
-                        no_log_for = ''
-
-                no_log_for = no_log_for.split()
-
-                return self.loggable and account not in no_log_for and self.jid not in no_log_for
-
         def cancelled_negotiation(self):
                 StanzaSession.cancelled_negotiation(self)

branches/session_centric/src/roster_window.py

@@ -2346 +2346 @@
 
                 else: # one resource
+                        tictactoe_menuitem = xml.get_widget( 'tictactoe_menuitem')
+                        tictactoe_menuitem.connect('activate', self.play_tictactoe, contact, account, contact.resource)
+
                         start_chat_menuitem.connect('activate',
                                 self.on_open_chat_window, contact, account)
@@ -4278 +4281 @@
                         return True
                 return False
+
+        def play_tictactoe(self, widget, contact, account, resource=None):
+                jid = contact.jid
+
+                if resource is not None:
+                        jid = jid + u'/' + resource
+
+                import tictactoe
+
+                sess = gajim.connections[account].make_new_session(jid, klass=tictactoe.TicTacToeSession)
+                sess.begin()
 
         def on_execute_command(self, widget, contact, account, resource=None):

branches/session_centric/src/session.py

@@ -17 +17 @@
                 self.control = None
 
+        # dispatch a received <message> stanza
         def received(self, full_jid_with_resource, message, tim, encrypted, msg_type, subject, chatstate, msg_id, composing_xep, user_nick, xhtml, form_node):
 
@@ -115 +116 @@
                                                 composing_xep, user_nick, xhtml, form_node]))
 
+        # display the message or show notification in the roster
         def roster_message(self, jid, msg, tim, encrypted=False, msg_type='',
         subject=None, resource='', msg_id=None, user_nick='',