Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/TurtleArt
diff options
context:
space:
mode:
Diffstat (limited to 'TurtleArt')
-rw-r--r--TurtleArt/collaboration.py251
-rwxr-xr-xTurtleArt/tacanvas.py66
-rwxr-xr-xTurtleArt/tawindow.py6
3 files changed, 293 insertions, 30 deletions
diff --git a/TurtleArt/collaboration.py b/TurtleArt/collaboration.py
new file mode 100644
index 0000000..21cae17
--- /dev/null
+++ b/TurtleArt/collaboration.py
@@ -0,0 +1,251 @@
+
+from dbus.service import signal
+from dbus.gobject_service import ExportedGObject
+import logging
+import telepathy
+from sugar import profile
+from sugar.presence import presenceservice
+from sugar.presence.tubeconn import TubeConnection
+
+SERVICE = 'org.laptop.TurtleArtActivity'
+IFACE = SERVICE
+PATH = '/org/laptop/TurtleArtActivity'
+_logger = logging.getLogger('turtleart-activity')
+
+class Collaboration():
+ def __init__(self, tw, activity):
+ """ A simplistic sharing model: the sharer is the master """
+ self._tw = tw
+ self._activity = activity
+
+ def setup(self):
+ # TODO: hand off role of master is sharer leaves
+ self.pservice = presenceservice.get_instance()
+ self.initiating = None # sharing (True) or joining (False)
+
+ # Add my buddy object to the list
+ owner = self.pservice.get_owner()
+ self.owner = owner
+ self.tw.buddies.append(self.owner)
+ self._share = ""
+
+ self._activity.connect('shared', self._shared_cb)
+ self._activity.connect('joined', self._joined_cb)
+
+ def _shared_cb(self, activity):
+ self._shared_activity = self._activity._shared_activity
+ if self._shared_activity is None:
+ _logger.error("Failed to share or join activity ... \
+ _shared_activity is null in _shared_cb()")
+ return
+
+ self.initiating = True
+ self.waiting_for_turtles = False
+ self.turtle_dictionary = self._get_dictionary()
+
+ _logger.debug('I am sharing...')
+
+ 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)
+
+ _logger.debug('This is my activity: making a tube...')
+
+ id = self.tubes_chan[telepathy.CHANNEL_TYPE_TUBES].OfferDBusTube(
+ SERVICE, {})
+
+ def _joined_cb(self, activity):
+ self._shared_activity = self._activity._shared_activity
+ if self._shared_activity is None:
+ _logger.error("Failed to share or join activity ... \
+ _shared_activity is null in _shared_cb()")
+ return
+
+ self.initiating = False
+ 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
+
+ # call back for "NewTube" signal
+ self.tubes_chan[telepathy.CHANNEL_TYPE_TUBES].connect_to_signal(
+ 'NewTube', self._new_tube_cb)
+
+ _logger.debug('I am joining an 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)
+
+ # Joiner should request current state from sharer.
+ self.waiting_for_turtles = True
+
+ 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):
+ """ Create a new tube. """
+ _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 == SERVICE):
+ if state == telepathy.TUBE_STATE_LOCAL_PENDING:
+ self.tubes_chan[ \
+ telepathy.CHANNEL_TYPE_TUBES].AcceptDBusTube(id)
+
+ tube_conn = TubeConnection(self.conn,
+ self.tubes_chan[telepathy.CHANNEL_TYPE_TUBES], id, \
+ group_iface=self.text_chan[telepathy.CHANNEL_INTERFACE_GROUP])
+
+ # We'll use a chat tube to send serialized stacks back and forth.
+ self.chattube = ChatTube(tube_conn, self.initiating, \
+ self.event_received_cb)
+
+ # Now that we have the tube, we can ask for the turtle dictionary.
+ if self.waiting_for_turtles:
+ _logger.debug("Sending a request for the turtle dictionary")
+ # we need to send our own nick and colors
+ colors = self._get_colors()
+ event = "t|" + data_to_string([self._get_nick(), colors])
+ _logger.debug(event)
+ self.send_event(event)
+
+ def event_received_cb(self, text):
+ """
+ Events are sent as a tuple, nick|cmd, where nick is a turle name
+ and cmd is a turtle event. Everyone gets the turtle dictionary from
+ the sharer and watches for 't' events, which indicate that a new
+ turtle has joined.
+ """
+ if len(text) == 0:
+ return
+ # Save active Turtle
+ save_active_turtle = self.tw.active_turtle
+ e = text.split("|", 2)
+ text = e[1]
+ if e[0] == 't': # request for turtle dictionary
+ if text > 0:
+ [nick, colors] = data_from_string(text)
+ if nick != self.tw.nick:
+ # There may not be a turtle dictionary.
+ if hasattr(self, "turtle_dictionary"):
+ self.turtle_dictionary[nick] = colors
+ else:
+ self.turtle_dictionary = {nick: colors}
+ # Add new turtle for the joiner.
+ self.tw.canvas.set_turtle(nick, colors)
+ # Sharer should send turtle dictionary.
+ if self.initiating:
+ text = data_to_string(self.turtle_dictionary)
+ self.send_event("T|" + text)
+ elif e[0] == 'T': # Receiving the turtle dictionary.
+ if self.waiting_for_turtles:
+ if len(text) > 0:
+ self.turtle_dictionary = data_from_string(text)
+ for nick in self.turtle_dictionary:
+ if nick != self.tw.nick:
+ colors = self.turtle_dictionary[nick]
+ # add new turtle for the joiner
+ self.tw.canvas.set_turtle(nick, colors)
+ self.waiting_for_turtles = False
+ elif e[0] == 'f': # move a turtle forward
+ if len(text) > 0:
+ [nick, x] = data_from_string(text)
+ if nick != self.tw.nick:
+ self.tw.canvas.set_turtle(nick)
+ self.tw.canvas.forward(x, False)
+ elif e[0] == 'a': # move a turtle in an arc
+ if len(text) > 0:
+ [nick, [a, r]] = data_from_string(text)
+ if nick != self.tw.nick:
+ self.tw.canvas.set_turtle(nick)
+ self.tw.canvas.arc(a, r, False)
+ elif e[0] == 'r': # rotate turtle
+ if len(text) > 0:
+ [nick, h] = data_from_string(text)
+ if nick != self.tw.nick:
+ self.tw.canvas.set_turtle(nick)
+ self.tw.canvas.seth(h, False)
+ elif e[0] == 'x': # set turtle xy position
+ if len(text) > 0:
+ [nick, [x, y]] = data_from_string(text)
+ if nick != self.tw.nick:
+ self.tw.canvas.set_turtle(nick)
+ self.tw.canvas.setxy(x, y, False)
+ elif e[0] == 'c': # set turtle pen color
+ if len(text) > 0:
+ [nick, x] = data_from_string(text)
+ if nick != self.tw.nick:
+ self.tw.canvas.set_turtle(nick)
+ self.tw.canvas.setcolor(x, False)
+ elif e[0] == 'g': # set turtle pen gray level
+ if len(text) > 0:
+ [nick, x] = data_from_string(text)
+ if nick != self.tw.nick:
+ self.tw.canvas.set_turtle(nick)
+ self.tw.canvas.setgray(x, False)
+ elif e[0] == 's': # set turtle pen shade
+ if len(text) > 0:
+ [nick, x] = data_from_string(text)
+ if nick != self.tw.nick:
+ self.tw.canvas.set_turtle(nick)
+ self.tw.canvas.setshade(x, False)
+ elif e[0] == 'w': # set turtle pen width
+ if len(text) > 0:
+ [nick, x] = data_from_string(text)
+ if nick != self.tw.nick:
+ self.tw.canvas.set_turtle(nick)
+ self.tw.canvas.setpensize(x, False)
+ elif e[0] == 'p': # set turtle pen state
+ if len(text) > 0:
+ [nick, x] = data_from_string(text)
+ if nick != self.tw.nick:
+ self.tw.canvas.set_turtle(nick)
+ self.tw.canvas.setpen(x, False)
+ # Restore active Turtle
+ self.tw.canvas.set_turtle(self.tw.turtles.get_turtle_key(
+ save_active_turtle))
+
+ def send_event(self, entry):
+ """ Send event through the tube. """
+ if hasattr(self, 'chattube') and self.chattube is not None:
+ self.chattube.SendText(entry)
+
+ def _get_dictionary(self):
+ d = { self._get_nick(): self._get_colors()}
+ return d
+
+ def _get_nick(self):
+ return self.tw.nick
+
+ def _get_colors(self):
+ return profile.get_color().to_string()
+
+class ChatTube(ExportedGObject):
+
+ def __init__(self, tube, is_initiator, stack_received_cb):
+ """Class for setting up tube for sharing."""
+ super(ChatTube, self).__init__(tube, PATH)
+ self.tube = tube
+ self.is_initiator = is_initiator # Are we sharing or joining activity?
+ self.stack_received_cb = stack_received_cb
+ self.stack = ''
+
+ self.tube.add_signal_receiver(self.send_stack_cb, 'SendText', IFACE, \
+ path=PATH, sender_keyword='sender')
+
+ def send_stack_cb(self, text, sender=None):
+ if sender == self.tube.get_unique_name():
+ return
+ self.stack = text
+ self.stack_received_cb(text)
+
+ @signal(dbus_interface=IFACE, signature='s')
+ def SendText(self, text):
+ self.stack = text
diff --git a/TurtleArt/tacanvas.py b/TurtleArt/tacanvas.py
index ed71c4b..45c389c 100755
--- a/TurtleArt/tacanvas.py
+++ b/TurtleArt/tacanvas.py
@@ -1,5 +1,6 @@
#Copyright (c) 2007-8, Playful Invention Company.
#Copyright (c) 2008-10, Walter Bender
+#Copyright (c) 2011 Collabora Ltd. <http://www.collabora.co.uk/>
#Permission is hereby granted, free of charge, to any person obtaining a copy
#of this software and associated documentation files (the "Software"), to deal
@@ -219,9 +220,8 @@ class TurtleGraphics:
self.height / 2 - self.ycor)
self.tw.svg_string += "\"\n"
self.tw.svg_string += self.svg.style()
- if self.tw.sharing() and share:
- self.tw.activity.send_event("f|%s" % \
- (data_to_string([self.tw.nick, int(n)])))
+ event = "f|%s" % (data_to_string([self._get_my_nick(), int(n)]))
+ self._send_event(event, share)
def seth(self, n, share=True):
""" Set the turtle heading. """
@@ -232,9 +232,8 @@ class TurtleGraphics:
return
self.heading %= 360
self.turn_turtle()
- if self.tw.sharing() and share:
- self.tw.activity.send_event("r|%s" % \
- (data_to_string([self.tw.nick, round_int(self.heading)])))
+ event = "r|%s" % (data_to_string([self._get_my_nick(), round_int(self.heading)]))
+ self._send_event(event, share)
def right(self, n, share=True):
""" Rotate turtle clockwise """
@@ -245,9 +244,8 @@ class TurtleGraphics:
return
self.heading %= 360
self.turn_turtle()
- if self.tw.sharing() and share:
- self.tw.activity.send_event("r|%s" % \
- (data_to_string([self.tw.nick, round_int(self.heading)])))
+ event = "r|%s" % (data_to_string([self._get_my_nick(), round_int(self.heading)]))
+ self._send_event(event, share)
def arc(self, a, r, share=True):
""" Draw an arc """
@@ -262,9 +260,8 @@ class TurtleGraphics:
_logger.debug("bad value sent to %s" % (__name__))
return
self.move_turtle()
- if self.tw.sharing() and share:
- self.tw.activity.send_event("a|%s" % \
- (data_to_string([self.tw.nick, [round_int(a), round_int(r)]])))
+ event = "a|%s" % (data_to_string([self._get_my_nick(), [round_int(a), round_int(r)]]))
+ self._send_event(event, share)
def rarc(self, a, r):
""" draw a clockwise arc """
@@ -350,9 +347,8 @@ class TurtleGraphics:
self.draw_line(oldx, oldy, self.xcor, self.ycor)
self.move_turtle()
- if self.tw.sharing() and share:
- self.tw.activity.send_event("x|%s" % \
- (data_to_string([self.tw.nick, [round_int(x), round_int(y)]])))
+ event = "x|%s" % (data_to_string([self._get_my_nick(), [round_int(x), round_int(y)]]))
+ self._send_event(event, share)
def setpensize(self, ps, share=True):
""" Set the pen size """
@@ -367,9 +363,8 @@ class TurtleGraphics:
self.gc.set_line_attributes(int(self.pensize * self.tw.coord_scale),
gtk.gdk.LINE_SOLID, gtk.gdk.CAP_ROUND, gtk.gdk.JOIN_MITER)
self.svg.set_stroke_width(self.pensize)
- if self.tw.sharing() and share:
- self.tw.activity.send_event("w|%s" % \
- (data_to_string([self.tw.nick, round_int(ps)])))
+ event = "w|%s" % (data_to_string([self._get_my_nick(), round_int(ps)]))
+ self._send_event(event, share)
def setcolor(self, c, share=True):
""" Set the pen color """
@@ -382,9 +377,8 @@ class TurtleGraphics:
self.tw.active_turtle.set_color(c)
self.set_fgcolor()
self.set_textcolor()
- if self.tw.sharing() and share:
- self.tw.activity.send_event("c|%s" % \
- (data_to_string([self.tw.nick, round_int(c)])))
+ event = "c|%s" % (data_to_string([self._get_my_nick(), round_int(c)]))
+ self._send_event(event, share)
def setgray(self, g, share=True):
""" Set the gray level """
@@ -400,9 +394,8 @@ class TurtleGraphics:
self.set_fgcolor()
self.set_textcolor()
self.tw.active_turtle.set_gray(self.gray)
- if self.tw.sharing() and share:
- self.tw.activity.send_event("g|%s" % \
- (data_to_string([self.tw.nick, round_int(self.gray)])))
+ event = "g|%s" % (data_to_string([self._get_my_nick(), round_int(self.gray)]))
+ self._send_event(event, share)
def settextcolor(self, c):
""" Set the text color """
@@ -430,9 +423,8 @@ class TurtleGraphics:
self.tw.active_turtle.set_shade(s)
self.set_fgcolor()
self.set_textcolor()
- if self.tw.sharing() and share:
- self.tw.activity.send_event("s|%s" % \
- (data_to_string([self.tw.nick, round_int(s)])))
+ event = "s|%s" % (data_to_string([self._get_my_nick(), round_int(s)]))
+ self._send_event(event, share)
def fillscreen(self, c, s):
""" Fill screen with color/shade and reset to defaults """
@@ -487,9 +479,8 @@ class TurtleGraphics:
""" Lower or raise the pen """
self.pendown = bool
self.tw.active_turtle.set_pen_state(bool)
- if self.tw.sharing() and share:
- self.tw.activity.send_event("p|%s" % \
- (data_to_string([self.tw.nick, bool])))
+ event = "p|%s" % (data_to_string([self._get_my_nick(), bool]))
+ self._send_event(event, share)
def draw_pixbuf(self, pixbuf, a, b, x, y, w, h, path):
""" Draw a pixbuf """
@@ -657,3 +648,18 @@ class TurtleGraphics:
self.svg.background("#%02x%02x%02x" % \
(self.bgrgb[0], self.bgrgb[1], self.bgrgb[2])),
self.tw.svg_string, self.svg.footer())
+
+ def _get_my_nick(self):
+ return self.tw.nick
+
+ def _send_event(self, entry, share):
+ if not share:
+ return
+
+ if self.tw.sharing():
+ if self.tw.activity:
+ print "Sending: %s" % entry
+ self.tw.activity.send_event(entry)
+ elif self.tw.send_event:
+ print "Sending: %s" % entry
+ self.tw.send_event(entry)
diff --git a/TurtleArt/tawindow.py b/TurtleArt/tawindow.py
index ba5b5cf..f9c0d4b 100755
--- a/TurtleArt/tawindow.py
+++ b/TurtleArt/tawindow.py
@@ -3,6 +3,7 @@
#Copyright (c) 2008-10, Walter Bender
#Copyright (c) 2009-10 Raúl Gutiérrez Segalés
#Copyright (C) 2010 Emiliano Pastorino <epastorino@plan.ceibal.edu.uy>
+#Copyright (c) 2011 Collabora Ltd. <http://www.collabora.co.uk/>
#Permission is hereby granted, free of charge, to any person obtaining a copy
#of this software and associated documentation files (the "Software"), to deal
@@ -100,6 +101,7 @@ class TurtleArtWindow():
self._loaded_project = ''
self.win = None
self.parent = parent
+ self.send_event = None # method to send events over the network
if type(win) == gtk.DrawingArea:
self.interactive_mode = True
self.window = win
@@ -400,6 +402,10 @@ class TurtleArtWindow():
if self.running_sugar and hasattr(self.activity, 'chattube') and\
self.activity.chattube is not None:
return True
+
+ if self.send_event:
+ return True
+
return False
def is_project_empty(self):
generated by cgit v0.9.1 at 2024-05-06 10:06:21 (GMT)