Ticket #3649: 0001-Run-pygi-convert.sh-script-for-GTK-3-port.patch

File 0001-Run-pygi-convert.sh-script-for-GTK-3-port.patch, 6.9 KB (added by manuq, 12 years ago)

  • sugargame/canvas.py 

    From 320fde8bf80f92c772eec5a7f836236d490b8872 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20Qui=C3=B1ones?= <manuq@laptop.org>
Date: Mon, 28 May 2012 23:27:03 -0300
Subject: [PATCH Sugargame 1/2] Run pygi-convert.sh script for GTK+3 port
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Mail-Followup-To: <sugar-devel@lists.sugarlabs.org>

Signed-off-by: Manuel Quiñones <manuq@laptop.org>
---
 sugargame/canvas.py  |   14 +++++++-------
 sugargame/event.py   |   38 +++++++++++++++++++-------------------
 test/TestActivity.py |    4 ++--
 test/TestGame.py     |    6 +++---
 4 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/sugargame/canvas.py b/sugargame/canvas.py
index 980cb73..d070a96 100644
    a b  
    11import os
    2 import gtk
    3 import gobject
     2from gi.repository import Gtk
     3from gi.repository import GObject
    44import pygame
    55import event
    66
    77CANVAS = None
    88
    9 class PygameCanvas(gtk.EventBox):
     9class PygameCanvas(Gtk.EventBox):
    1010   
    1111    """
    1212    mainwindow is the activity intself.
    1313    """
    1414    def __init__(self, mainwindow, pointer_hint = True):
    15         gtk.EventBox.__init__(self)
     15        GObject.GObject.__init__(self)
    1616
    1717        global CANVAS
    1818        assert CANVAS == None, "Only one PygameCanvas can be created, ever."
    … … class PygameCanvas(gtk.EventBox): 
    2323       
    2424        self._mainwindow = mainwindow
    2525
    26         self.set_flags(gtk.CAN_FOCUS)
     26        self.set_flags(Gtk.CAN_FOCUS)
    2727       
    28         self._socket = gtk.Socket()
     28        self._socket = Gtk.Socket()
    2929        self.add(self._socket)
    3030        self.show_all()
    3131
    … … class PygameCanvas(gtk.EventBox): 
    3434        # Sugar activity is not properly created until after its constructor returns.
    3535        # If the Pygame main loop is called from the activity constructor, the
    3636        # constructor never returns and the activity freezes.
    37         gobject.idle_add(self._run_pygame_cb, main_fn)
     37        GObject.idle_add(self._run_pygame_cb, main_fn)
    3838
    3939    def _run_pygame_cb(self, main_fn):
    4040        assert pygame.display.get_surface() is None, "PygameCanvas.run_pygame can only be called once."

  • sugargame/event.py 

    diff --git a/sugargame/event.py b/sugargame/event.py
index 4cc3be8..0aeee50 100644
    a b  
    1 import gtk
    2 import gobject
     1from gi.repository import Gtk
     2from gi.repository import GObject
    33import pygame
    44import pygame.event
    55import logging
    … … class Translator(object): 
    4646        # Enable events
    4747        # (add instead of set here because the main window is already realized)
    4848        self._mainwindow.add_events(
    49             gtk.gdk.KEY_PRESS_MASK | \
    50             gtk.gdk.KEY_RELEASE_MASK \
     49            Gdk.EventMask.KEY_PRESS_MASK | \
     50            Gdk.EventMask.KEY_RELEASE_MASK \
    5151        )
    5252       
    5353        self._inner_evb.set_events(
    54             gtk.gdk.POINTER_MOTION_MASK | \
    55             gtk.gdk.POINTER_MOTION_HINT_MASK | \
    56             gtk.gdk.BUTTON_MOTION_MASK | \
    57             gtk.gdk.BUTTON_PRESS_MASK | \
    58             gtk.gdk.BUTTON_RELEASE_MASK
     54            Gdk.EventMask.POINTER_MOTION_MASK | \
     55            Gdk.EventMask.POINTER_MOTION_HINT_MASK | \
     56            Gdk.EventMask.BUTTON_MOTION_MASK | \
     57            Gdk.EventMask.BUTTON_PRESS_MASK | \
     58            Gdk.EventMask.BUTTON_RELEASE_MASK
    5959        )
    6060
    61         self._mainwindow.set_flags(gtk.CAN_FOCUS)
    62         self._inner_evb.set_flags(gtk.CAN_FOCUS)
     61        self._mainwindow.set_flags(Gtk.CAN_FOCUS)
     62        self._inner_evb.set_flags(Gtk.CAN_FOCUS)
    6363       
    6464        # Callback functions to link the event systems
    6565        self._mainwindow.connect('unrealize', self._quit_cb)
    … … class Translator(object): 
    133133        return mod
    134134       
    135135    def _keyevent(self, widget, event, type):
    136         key = gtk.gdk.keyval_name(event.keyval)
     136        key = Gdk.keyval_name(event.keyval)
    137137        if key is None:
    138138            # No idea what this key is.
    139139            return False
    … … class Translator(object): 
    157157            self.__keystate[keycode] = type == pygame.KEYDOWN
    158158            if type == pygame.KEYUP:
    159159                mod = self._keymods()
    160             ukey = unichr(gtk.gdk.keyval_to_unicode(event.keyval))
     160            ukey = unichr(Gdk.keyval_to_unicode(event.keyval))
    161161            if ukey == '\000':
    162162                ukey = ''
    163163            evt = pygame.event.Event(type, key=keycode, unicode=ukey, mod=mod)
    … … class Translator(object): 
    193193        else:
    194194            x = event.x
    195195            y = event.y
    196             state = event.state
     196            state = event.get_state()
    197197
    198198        rel = (x - self.__mouse_pos[0], y - self.__mouse_pos[1])
    199199        self.__mouse_pos = (x, y)
    200200       
    201201        self.__button_state = [
    202             state & gtk.gdk.BUTTON1_MASK and 1 or 0,
    203             state & gtk.gdk.BUTTON2_MASK and 1 or 0,
    204             state & gtk.gdk.BUTTON3_MASK and 1 or 0,
     202            state & Gdk.ModifierType.BUTTON1_MASK and 1 or 0,
     203            state & Gdk.ModifierType.BUTTON2_MASK and 1 or 0,
     204            state & Gdk.ModifierType.BUTTON3_MASK and 1 or 0,
    205205        ]
    206206       
    207207        evt = pygame.event.Event(pygame.MOUSEMOTION,
    … … class Translator(object): 
    224224       
    225225    def _set_repeat(self, delay=None, interval=None):
    226226        if delay is not None and self.__repeat[0] is None:
    227             self.__tick_id = gobject.timeout_add(10, self._tick_cb)
     227            self.__tick_id = GObject.timeout_add(10, self._tick_cb)
    228228        elif delay is None and self.__repeat[0] is not None:
    229             gobject.source_remove(self.__tick_id)
     229            GObject.source_remove(self.__tick_id)
    230230        self.__repeat = (delay, interval)
    231231       
    232232    def _get_mouse_pos(self):

  • test/TestActivity.py 

    diff --git a/test/TestActivity.py b/test/TestActivity.py
index 9569659..a3981c4 100644
    a b  
    11from gettext import gettext as _
    22
    33import sys
    4 import gtk
     4from gi.repository import Gtk
    55import pygame
    66
    77import sugar.activity.activity
    … … class TestActivity(sugar.activity.activity.Activity): 
    6262
    6363        # Blank space (separator) and Stop button at the end:
    6464
    65         separator = gtk.SeparatorToolItem()
     65        separator = Gtk.SeparatorToolItem()
    6666        separator.props.draw = False
    6767        separator.set_expand(True)
    6868        toolbar_box.toolbar.insert(separator, -1)

  • test/TestGame.py 

    diff --git a/test/TestGame.py b/test/TestGame.py
index 590b921..848e220 100755
    a b  
    11#!/usr/bin/python
    22import pygame
    3 import gtk
     3from gi.repository import Gtk
    44
    55
    66class TestGame:
    … … class TestGame: 
    3636
    3737        while self.running:
    3838            # Pump GTK messages.
    39             while gtk.events_pending():
    40                 gtk.main_iteration()
     39            while Gtk.events_pending():
     40                Gtk.main_iteration()
    4141
    4242            # Pump PyGame messages.
    4343            for event in pygame.event.get():