Merge screen_resolution_independent branch

- total refactoring of code;
- support various screen resolutions;
- use jobjects for characters, backgrounds and sounds;
- add collaboration code

1 files changed, 130 insertions, 0 deletions

diff --git a/shared.py b/shared.py
new file mode 100644
index 0000000..98fb965
--- /dev/null
+++ b/shared.py
@@ -0,0 +1,130 @@
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+import logging
+import telepathy
+from gobject import property, SIGNAL_RUN_FIRST, TYPE_PYOBJECT
+
+from sugar.activity.activity import Activity
+from sugar.presence.sugartubeconn import SugarTubeConnection
+
+logger = logging.getLogger('cartoon-builder')
+
+class CanvasActivity(Activity):
+    __gsignals__ = {
+        'init' : (SIGNAL_RUN_FIRST, None, []) } 
+
+    def __init__(self, canvas, *args):
+        Activity.__init__(self, *args)
+
+        self._inited = False
+
+        # XXX do it after(possible) read_file() invoking
+        # have to rely on calling read_file() from map_cb in sugar-toolkit
+        canvas.connect_after('map', self._map_cb)
+        self.set_canvas(canvas)
+
+    def get_inited(self):
+        return self._inited
+
+    inited = property(type=bool, default=False, getter=get_inited, setter=None)
+
+    def _map_cb(self, widget):
+        self._inited = True
+        self.emit('init')
+
+class SharedActivity(CanvasActivity):
+    __gsignals__ = {
+        'tube' : (SIGNAL_RUN_FIRST, None, 2*[TYPE_PYOBJECT]) } 
+
+    def __init__(self, canvas, service, *args):
+        CanvasActivity.__init__(self, canvas, *args)
+
+        self.service = service
+        self._postpone_tubes = []
+
+        self.connect('init', self._init_sharedactivity_cb)
+        self.connect('shared', self._shared_cb)
+
+        # Owner.props.key
+        if self._shared_activity:
+            # We are joining the activity
+            self.connect('joined', self._joined_cb)
+            if self.get_shared():
+                # We've already joined
+                self._joined_cb()
+
+    def _init_sharedactivity_cb(self):
+        for i in self._postpone_tubes:
+            self.emit('tube', i, self._initiating)
+        self._postpone_tubes = []
+
+    def _shared_cb(self, activity):
+        logger.debug('My activity was shared')
+        self._initiating = True
+        self._sharing_setup()
+
+        logger.debug('This is my activity: making a tube...')
+        id = self._tubes_chan[telepathy.CHANNEL_TYPE_TUBES].OfferDBusTube(
+            self.service, {})
+
+    def _joined_cb(self, activity):
+        if not self._shared_activity:
+            return
+
+        logger.debug('Joined an existing shared activity')
+
+        self._initiating = False
+        self._sharing_setup()
+        
+        logger.debug('This is not my activity: waiting for a tube...')
+        self._tubes_chan[telepathy.CHANNEL_TYPE_TUBES].ListTubes(
+            reply_handler=self._list_tubes_reply_cb, 
+            error_handler=self._list_tubes_error_cb)
+
+    def _sharing_setup(self):
+        if self._shared_activity is None:
+            logger.error('Failed to share or join activity')
+            return
+        self._conn = self._shared_activity.telepathy_conn
+        self._tubes_chan = self._shared_activity.telepathy_tubes_chan
+        self._text_chan = self._shared_activity.telepathy_text_chan
+        
+        self._tubes_chan[telepathy.CHANNEL_TYPE_TUBES].connect_to_signal('NewTube', self._new_tube_cb)
+        
+    def _list_tubes_reply_cb(self, tubes):
+        for tube_info in tubes:
+            self._new_tube_cb(*tube_info)
+
+    def _list_tubes_error_cb(self, e):
+        logger.error('ListTubes() failed: %s', e)
+
+    def _new_tube_cb(self, id, initiator, type, service, params, state):
+        logger.debug('New tube: ID=%d initator=%d type=%d service=%s '
+                     'params=%r state=%d', id, initiator, type, service, 
+                     params, state)
+
+        if (type == telepathy.TUBE_TYPE_DBUS and
+                service == self.service):
+            if state == telepathy.TUBE_STATE_LOCAL_PENDING:
+                self._tubes_chan[telepathy.CHANNEL_TYPE_TUBES].AcceptDBusTube(id)
+
+            tube_conn = SugarTubeConnection(self._conn, 
+                self._tubes_chan[telepathy.CHANNEL_TYPE_TUBES], 
+                id, group_iface=self._text_chan[telepathy.CHANNEL_INTERFACE_GROUP])
+            
+            if self.get_inited():
+                self.emit('tube', tube_conn, self._initiating)
+            else:
+                self._postpone_tubes.append(tube_conn)