E CVS: proto/python-efl barbieri
Enlightenment CVS committal
Author : barbieri
Project : e17
Module : proto/python-efl
Dir : e17/proto/python-efl/python-emotion/emotion
Modified Files:
emotion.c_emotion.pyx
Log Message:
Fix way to get the address of python objects.
Cython changed the way casts are interpreted some time ago and
object is not valid anymore because it would check for
an integer-capable object (ie: __init__()).
Instead we must make it a void pointer (object) and then cast
this to the integer type.
===
RCS file:
/cvs/e/e17/proto/python-efl/python-emotion/emotion/emotion.c_emotion.pyx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- emotion.c_emotion.pyx 7 Aug 2008 03:13:11 - 1.10
+++ emotion.c_emotion.pyx 10 Aug 2008 14:59:12 - 1.11
@@ -81,10 +81,10 @@
def __repr__(self):
x, y, w, h = self.geometry_get()
r, g, b, a = self.color_get()
-return ("%s(0x%x, type=%r, refcount=%d, Evas_Object=0x%x, name=%r, "
+return ("%s(%#x, type=%r, refcount=%d, Evas_Object=%#x, name=%r, "
"file=%r, geometry=(%d, %d, %d, %d), "
"color=(%d, %d, %d, %d), layer=%s, clip=%r, visible=%s)") % \
- (self.__class__.__name__, self,
+ (self.__class__.__name__, self,
self.type_get(), PY_REFCOUNT(self), self.obj,
self.name_get(), self.file_get(), x, y, w, h, r, g, b, a,
self.layer_get(), self.clip_get(), self.visible_get())
-
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto/python-efl barbieri
Enlightenment CVS committal
Author : barbieri
Project : e17
Module : proto/python-efl
Dir : e17/proto/python-efl/python-evas/evas
Modified Files:
evas.c_evas_canvas.pxi evas.c_evas_object.pxi
Log Message:
Fix way to get the address of python objects.
Cython changed the way casts are interpreted some time ago and
object is not valid anymore because it would check for
an integer-capable object (ie: __init__()).
Instead we must make it a void pointer (object) and then cast
this to the integer type.
===
RCS file: /cvs/e/e17/proto/python-efl/python-evas/evas/evas.c_evas_canvas.pxi,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- evas.c_evas_canvas.pxi 7 Aug 2008 03:13:12 - 1.18
+++ evas.c_evas_canvas.pxi 10 Aug 2008 14:59:12 - 1.19
@@ -106,9 +106,9 @@
def __repr__(self):
w, h = self.size_get()
-return ("%s(0x%x, refcount=%d, Evas_Object=0x%x, size=(%d, %d), "
+return ("%s(%#x, refcount=%d, Evas_Object=%#x, size=(%d, %d), "
"method=%r)") % \
- (self.__class__.__name__, self,
+ (self.__class__.__name__, self,
PY_REFCOUNT(self), self.obj,
w, h, self.output_method_get())
===
RCS file: /cvs/e/e17/proto/python-efl/python-evas/evas/evas.c_evas_object.pxi,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -3 -r1.26 -r1.27
--- evas.c_evas_object.pxi 7 Aug 2008 03:13:12 - 1.26
+++ evas.c_evas_object.pxi 10 Aug 2008 14:59:12 - 1.27
@@ -246,10 +246,10 @@
x, y, w, h = self.geometry_get()
r, g, b, a = self.color_get()
clip = bool(self.clip_get() is not None)
-return ("%s(0x%x, type=%r, refcount=%d, Evas_Object=0x%x, name=%r, "
+return ("%s(%#x, type=%r, refcount=%d, Evas_Object=%#x, name=%r, "
"geometry=(%d, %d, %d, %d), color=(%d, %d, %d, %d), "
"layer=%s, clip=%r, visible=%s)") % \
- (self.__class__.__name__, self,
+ (self.__class__.__name__, self,
self.type_get(), PY_REFCOUNT(self), self.obj,
self.name_get(), x, y, w, h, r, g, b, a, self.layer_get(),
clip, self.visible_get())
-
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto/python-efl barbieri
Enlightenment CVS committal
Author : barbieri
Project : e17
Module : proto/python-efl
Dir : e17/proto/python-efl/python-epsilon/epsilon
Modified Files:
epsilon.c_epsilon.pyx epsilon.request.pyx
Log Message:
Fix way to get the address of python objects.
Cython changed the way casts are interpreted some time ago and
object is not valid anymore because it would check for
an integer-capable object (ie: __init__()).
Instead we must make it a void pointer (object) and then cast
this to the integer type.
===
RCS file:
/cvs/e/e17/proto/python-efl/python-epsilon/epsilon/epsilon.c_epsilon.pyx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- epsilon.c_epsilon.pyx 7 Aug 2008 03:13:11 - 1.3
+++ epsilon.c_epsilon.pyx 10 Aug 2008 14:59:12 - 1.4
@@ -58,9 +58,9 @@
self.thumb_size, self.resolution)
def __repr__(self):
-return ("%s(0x%x, path=%r, key=%s, thumb_file=%r, thumb_size=%r, "
+return ("%s(%#x, path=%r, key=%s, thumb_file=%r, thumb_size=%r, "
"resolution=%r, Epsilon=%#x, refcount=%d)") % \
- (self.__class__.__name__, self,
+ (self.__class__.__name__, self,
self.file, self.key, self.thumb_file,
self.thumb_size, self.resolution,
self.obj, PY_REFCOUNT(self))
===
RCS file:
/cvs/e/e17/proto/python-efl/python-epsilon/epsilon/epsilon.request.pyx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- epsilon.request.pyx 7 Aug 2008 03:13:11 - 1.5
+++ epsilon.request.pyx 10 Aug 2008 14:59:12 - 1.6
@@ -70,9 +70,9 @@
self.request_id, self.status)
def __repr__(self):
-return ("%s(0x%x, path=%r, dest=%r, size=%r, request_id=%r, status=%r,
"
+return ("%s(%#x, path=%r, dest=%r, size=%r, request_id=%r, status=%r, "
"Epsilon_Request=%#x, refcount=%d)") % \
- (self.__class__.__name__, self,
+ (self.__class__.__name__, self,
self.path, self.dest, self.size, self.request_id, self.status,
self.obj, PY_REFCOUNT(self))
-
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto/python-efl barbieri
Enlightenment CVS committal Author : barbieri Project : e17 Module : proto/python-efl Dir : e17/proto/python-efl/python-ecore/ecore/x Modified Files: ecore.x.c_ecore_x_window.pxi Log Message: Fix way to get the address of python objects. Cython changed the way casts are interpreted some time ago and object is not valid anymore because it would check for an integer-capable object (ie: __init__()). Instead we must make it a void pointer (object) and then cast this to the integer type. === RCS file: /cvs/e/e17/proto/python-efl/python-ecore/ecore/x/ecore.x.c_ecore_x_window.pxi,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- ecore.x.c_ecore_x_window.pxi7 Aug 2008 03:13:09 - 1.3 +++ ecore.x.c_ecore_x_window.pxi10 Aug 2008 14:59:12 - 1.4 @@ -77,7 +77,7 @@ ecore_x_window_geometry_get(self.xid, &x, &y, &w, &h) parent = ecore_x_window_parent_get(self.xid) return "%s(%#x, xid=%#x, parent=%#x, x=%d, y=%d, w=%d, h=%d)" % \ - (self.__class__.__name__, self, + (self.__class__.__name__, self, self.xid, parent, x, y, w, h) def __richcmp__(self, other, int op): - This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK & win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100&url=/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto/python-efl barbieri
Enlightenment CVS committal
Author : barbieri
Project : e17
Module : proto/python-efl
Dir : e17/proto/python-efl/python-ecore/ecore
Modified Files:
ecore.c_ecore_animator.pxi ecore.c_ecore_events.pxi
ecore.c_ecore_fd_handler.pxi ecore.c_ecore_idle_enterer.pxi
ecore.c_ecore_idle_exiter.pxi ecore.c_ecore_idler.pxi
ecore.c_ecore_timer.pxi
Log Message:
Fix way to get the address of python objects.
Cython changed the way casts are interpreted some time ago and
object is not valid anymore because it would check for
an integer-capable object (ie: __init__()).
Instead we must make it a void pointer (object) and then cast
this to the integer type.
===
RCS file:
/cvs/e/e17/proto/python-efl/python-ecore/ecore/ecore.c_ecore_animator.pxi,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- ecore.c_ecore_animator.pxi 7 Aug 2008 03:13:09 - 1.9
+++ ecore.c_ecore_animator.pxi 10 Aug 2008 14:59:12 - 1.10
@@ -72,9 +72,9 @@
(self.__class__.__name__, self.func, self.args, self.kargs)
def __repr__(self):
-return ("%s(0x%x, func=%s, args=%s, kargs=%s, Ecore_Animator=0x%x, "
+return ("%s(%#x, func=%s, args=%s, kargs=%s, Ecore_Animator=%#x, "
"refcount=%d)") % \
- (self.__class__.__name__, self,
+ (self.__class__.__name__, self,
self.func, self.args, self.kargs,
self.obj, PY_REFCOUNT(self))
===
RCS file:
/cvs/e/e17/proto/python-efl/python-ecore/ecore/ecore.c_ecore_events.pxi,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- ecore.c_ecore_events.pxi7 Aug 2008 03:13:09 - 1.2
+++ ecore.c_ecore_events.pxi10 Aug 2008 14:59:12 - 1.3
@@ -113,7 +113,7 @@
def __repr__(self):
return ("%s(%#x, type=%d, func=%s, args=%s, kargs=%s, event_cls=%s, "
"Ecore_Event_Handler=%#x, refcount=%d)") % \
- (self.__class__.__name__, self,
+ (self.__class__.__name__, self,
self.type, self.func, self.args, self.kargs, self.event_cls,
self.obj, PY_REFCOUNT(self))
===
RCS file:
/cvs/e/e17/proto/python-efl/python-ecore/ecore/ecore.c_ecore_fd_handler.pxi,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- ecore.c_ecore_fd_handler.pxi7 Aug 2008 03:13:09 - 1.10
+++ ecore.c_ecore_fd_handler.pxi10 Aug 2008 14:59:12 - 1.11
@@ -118,9 +118,9 @@
else:
fd = self.fd_get()
flags = flags2str(self.active_get(7))
-return ("%s(0x%x, func=%s, args=%s, kargs=%s, fd=%s, flags=[%s], "
-"Ecore_Fd_Handler=0x%x, refcount=%d)") % \
- (self.__class__.__name__, self,
+return ("%s(%#x, func=%s, args=%s, kargs=%s, fd=%s, flags=[%s], "
+"Ecore_Fd_Handler=%#x, refcount=%d)") % \
+ (self.__class__.__name__, self,
self.func, self.args, self.kargs, fd, flags,
self.obj, PY_REFCOUNT(self))
===
RCS file:
/cvs/e/e17/proto/python-efl/python-ecore/ecore/ecore.c_ecore_idle_enterer.pxi,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- ecore.c_ecore_idle_enterer.pxi 7 Aug 2008 03:13:09 - 1.9
+++ ecore.c_ecore_idle_enterer.pxi 10 Aug 2008 14:59:12 - 1.10
@@ -72,9 +72,9 @@
(self.__class__.__name__, self.func, self.args, self.kargs)
def __repr__(self):
-return ("%s(0x%x, func=%s, args=%s, kargs=%s, "
-"Ecore_Idle_Enterer=0x%x, refcount=%d)") % \
- (self.__class__.__name__, self,
+return ("%s(%#x, func=%s, args=%s, kargs=%s, "
+"Ecore_Idle_Enterer=%#x, refcount=%d)") % \
+ (self.__class__.__name__, self,
self.func, self.args, self.kargs,
self.obj, PY_REFCOUNT(self))
===
RCS file:
/cvs/e/e17/proto/python-efl/python-ecore/ecore/ecore.c_ecore_idle_exiter.pxi,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- ecore.c_ecore_idle_exiter.pxi 7 Aug 2008 03:13:09 - 1.9
+++ ecore.c_ecore_idle_exiter.pxi 10 Aug 2008 14:59:12 - 1.10
@@ -70,9 +70,9 @@
(self.__class__.__name__, self.func, self.args, self.kargs)
def __repr__(self):
-return ("%s(0x%x, func=%s, args=%s, kargs=%s, Ecore_Idle_Exiter=0x%x, "
+return ("%s(%#x, func=%s, args=%s, kargs=%s, Ecore_Idle_Exiter=%#x, "
"refcount=%d)") % \
- (self.__class__.__name__,
E CVS: proto/python-efl barbieri
Enlightenment CVS committal
Author : barbieri
Project : e17
Module : proto/python-efl
Dir : e17/proto/python-efl/python-edje/edje
Modified Files:
edje.c_edje_object.pxi
Log Message:
Fix way to get the address of python objects.
Cython changed the way casts are interpreted some time ago and
object is not valid anymore because it would check for
an integer-capable object (ie: __init__()).
Instead we must make it a void pointer (object) and then cast
this to the integer type.
===
RCS file: /cvs/e/e17/proto/python-efl/python-edje/edje/edje.c_edje_object.pxi,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -3 -r1.25 -r1.26
--- edje.c_edje_object.pxi 7 Aug 2008 03:13:10 - 1.25
+++ edje.c_edje_object.pxi 10 Aug 2008 14:59:12 - 1.26
@@ -192,10 +192,10 @@
r, g, b, a = self.color_get()
file, group = self.file_get()
clip = bool(self.clip_get() is not None)
-return ("%s(0x%x, type=%r, refcount=%d, Evas_Object=0x%x, name=%r, "
+return ("%s(%#x, type=%r, refcount=%d, Evas_Object=%#x, name=%r, "
"file=%r, group=%r, geometry=(%d, %d, %d, %d), "
"color=(%d, %d, %d, %d), layer=%s, clip=%r, visible=%s)") % \
- (self.__class__.__name__, self,
+ (self.__class__.__name__, self,
self.type_get(), PY_REFCOUNT(self), self.obj,
self.name_get(), file, group, x, y, w, h, r, g, b, a,
self.layer_get(), clip, self.visible_get())
-
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto/python-efl barbieri
Enlightenment CVS committal Author : barbieri Project : e17 Module : proto/python-efl Dir : e17/proto/python-efl/python-ecore/ecore/evas Modified Files: ecore.evas.c_ecore_evas_base.pxi Log Message: Fix way to get the address of python objects. Cython changed the way casts are interpreted some time ago and object is not valid anymore because it would check for an integer-capable object (ie: __init__()). Instead we must make it a void pointer (object) and then cast this to the integer type. === RCS file: /cvs/e/e17/proto/python-efl/python-ecore/ecore/evas/ecore.evas.c_ecore_evas_base.pxi,v retrieving revision 1.13 retrieving revision 1.14 diff -u -3 -r1.13 -r1.14 --- ecore.evas.c_ecore_evas_base.pxi7 Aug 2008 03:13:09 - 1.13 +++ ecore.evas.c_ecore_evas_base.pxi10 Aug 2008 14:59:12 - 1.14 @@ -234,8 +234,8 @@ return "%s(Evas=%s)" % (self.__class__.__name__, self.evas) def __repr__(self): -return "%s(0x%x, refcount=%d, Ecore_Evas=0x%x, Evas=%r)" % \ - (self.__class__.__name__, self, +return "%s(%#x, refcount=%d, Ecore_Evas=%#x, Evas=%r)" % \ + (self.__class__.__name__, self, PY_REFCOUNT(self), self.obj, self.evas) - This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK & win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100&url=/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto/python-efl barbieri
Enlightenment CVS committal
Author : barbieri
Project : e17
Module : proto/python-efl
Dir : e17/proto/python-efl/python-evas/tests
Modified Files:
01-canvas-basics.py 02-object-basics.py
Log Message:
Fix way to get the address of python objects.
Cython changed the way casts are interpreted some time ago and
object is not valid anymore because it would check for
an integer-capable object (ie: __init__()).
Instead we must make it a void pointer (object) and then cast
this to the integer type.
===
RCS file: /cvs/e/e17/proto/python-efl/python-evas/tests/01-canvas-basics.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- 01-canvas-basics.py 19 Jul 2007 16:07:07 - 1.2
+++ 01-canvas-basics.py 10 Aug 2008 14:59:12 - 1.3
@@ -16,6 +16,8 @@
self.assertEqual(c.output_method_get(), evas.render_method_lookup(m))
self.assertEqual(c.size_get(), s)
self.assertEqual(c.viewport_get(), v)
+self.assertEqual(isinstance(str(c), str), True)
+self.assertEqual(isinstance(repr(c), str), True)
class CanvasMethods(unittest.TestCase):
===
RCS file: /cvs/e/e17/proto/python-efl/python-evas/tests/02-object-basics.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- 02-object-basics.py 19 Jul 2007 16:07:07 - 1.2
+++ 02-object-basics.py 10 Aug 2008 14:59:12 - 1.3
@@ -99,6 +99,14 @@
o2 = self.canvas.object_name_find("Test 123")
self.assertEqual(o1, o2)
+def testStr(self):
+o = evas.Rectangle(self.canvas)
+self.assertEqual(isinstance(str(o), str), True)
+
+def testRepr(self):
+o = evas.Rectangle(self.canvas)
+self.assertEqual(isinstance(repr(o), str), True)
+
class ObjectProperties(unittest.TestCase):
-
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto/python-efl barbieri
Enlightenment CVS committal Author : barbieri Project : e17 Module : proto/python-efl Dir : e17/proto/python-efl/python-evas/evas Modified Files: evas_object_image_mask.c evas_object_image_rotate.c Log Message: Fix build of modules dependent on python-evas. Move evas_object_image_python_extras.h inside include/evas and install it so python-ecore doesn't fail. === RCS file: /cvs/e/e17/proto/python-efl/python-evas/evas/evas_object_image_mask.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- evas_object_image_mask.c12 Mar 2008 19:55:57 - 1.3 +++ evas_object_image_mask.c12 Mar 2008 19:57:49 - 1.4 @@ -2,7 +2,7 @@ #include #include -#include "evas_object_image_python_extras.h" +#include "evas/evas_object_image_python_extras.h" #define BPIXEL(base, x, y, stride) (base + (y * stride + x)) #define MEDPIXEL(src, msk, srf) (((src) * (msk)) + (srf) * (255 - (msk)))/255 === RCS file: /cvs/e/e17/proto/python-efl/python-evas/evas/evas_object_image_rotate.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- evas_object_image_rotate.c 12 Mar 2008 19:55:57 - 1.5 +++ evas_object_image_rotate.c 12 Mar 2008 19:57:49 - 1.6 @@ -2,7 +2,7 @@ #include #include -#include "evas_object_image_python_extras.h" +#include "evas/evas_object_image_python_extras.h" static inline int _calc_stride(int w) - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto/python-efl barbieri
Enlightenment CVS committal Author : barbieri Project : e17 Module : proto/python-efl Dir : e17/proto/python-efl/python-evas Modified Files: setup.py Log Message: Fix build of modules dependent on python-evas. Move evas_object_image_python_extras.h inside include/evas and install it so python-ecore doesn't fail. === RCS file: /cvs/e/e17/proto/python-efl/python-evas/setup.py,v retrieving revision 1.26 retrieving revision 1.27 diff -u -3 -r1.26 -r1.27 --- setup.py12 Mar 2008 17:42:06 - 1.26 +++ setup.py12 Mar 2008 19:57:49 - 1.27 @@ -60,6 +60,7 @@ headers = ['evas/evas.c_evas.h', + 'include/evas/evas_object_image_python_extras.h', 'include/evas/python_evas_utils.h', 'include/evas/c_evas.pxd', 'include/evas/python.pxd', - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto/python-efl barbieri
Enlightenment CVS committal Author : barbieri Project : e17 Module : proto/python-efl Dir : e17/proto/python-efl/python-evas/include/evas Modified Files: c_evas.pxd Added Files: evas_object_image_python_extras.h Log Message: Fix build of modules dependent on python-evas. Move evas_object_image_python_extras.h inside include/evas and install it so python-ecore doesn't fail. === RCS file: /cvs/e/e17/proto/python-efl/python-evas/include/evas/c_evas.pxd,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- c_evas.pxd 12 Mar 2008 18:53:55 - 1.7 +++ c_evas.pxd 12 Mar 2008 19:57:49 - 1.8 @@ -531,7 +531,7 @@ void evas_object_text_style_pad_get(Evas_Object *obj, int *l, int *r, int *t, int *b) -cdef extern from "evas_object_image_python_extras.h": +cdef extern from "evas/evas_object_image_python_extras.h": ctypedef enum Evas_Object_Image_Rotation: ROTATE_NONE ROTATE_90 - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto/python-efl barbieri
Enlightenment CVS committal Author : barbieri Project : e17 Module : proto/python-efl Dir : e17/proto/python-efl/python-evas/include Removed Files: evas_object_image_python_extras.h Log Message: Fix build of modules dependent on python-evas. Move evas_object_image_python_extras.h inside include/evas and install it so python-ecore doesn't fail. - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto/python-efl barbieri
Enlightenment CVS committal
Author : barbieri
Project : e17
Module : proto/python-efl
Dir : e17/proto/python-efl/python-evas/evas
Modified Files:
evas_object_image_rotate.c evas_object_image_mask.c
Log Message:
Cleanup pointer types.
Avoid doing casts all over the places.
===
RCS file:
/cvs/e/e17/proto/python-efl/python-evas/evas/evas_object_image_rotate.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- evas_object_image_rotate.c 12 Mar 2008 18:53:55 - 1.4
+++ evas_object_image_rotate.c 12 Mar 2008 19:55:57 - 1.5
@@ -34,10 +34,12 @@
switch (colorspace)
{
case EVAS_COLORSPACE_ARGB:
-image_byte_size = IMG_BYTE_SIZE_ARGB(dst_stride, dst_height,
has_alpha);
+image_byte_size = IMG_BYTE_SIZE_ARGB(dst_stride, dst_height,
+ has_alpha);
break;
case EVAS_COLORSPACE_RGB565_A5P:
-image_byte_size = IMG_BYTE_SIZE_RGB565(dst_stride, dst_height,
has_alpha);
+image_byte_size = IMG_BYTE_SIZE_RGB565(dst_stride, dst_height,
+ has_alpha);
break;
default:
image_byte_size = -1;
@@ -48,18 +50,20 @@
}
static void
-_data8_image_rotate_90(char *dst, const char *src, int dst_stride, int
src_stride, int out_x, int out_y, int w, int h)
+_data8_image_rotate_90(DATA8 *dst, const DATA8 *src, int dst_stride, int
src_stride, int out_x, int out_y, int w, int h)
{
- DATA8 *dp, *sp;
- int x, y;
+ const DATA8 *sp;
+ DATA8 *dp;
+ int y;
- sp = (DATA8 *) src;
- dp = ((DATA8 *) dst) + ((out_x +
- (w + out_y - 1) * dst_stride));
+ sp = src;
+ dp = dst + ((out_x + (w + out_y - 1) * dst_stride));
for (y = 0; y < h; y++)
{
-DATA8 *dp_itr, *sp_itr;
+ const DATA8 *sp_itr;
+DATA8 *dp_itr;
+ int x;
sp_itr = sp;
dp_itr = dp;
@@ -77,18 +81,20 @@
}
static void
-_data16_image_rotate_90(char *dst, const char *src, int dst_stride, int
src_stride, int out_x, int out_y, int w, int h)
+_data16_image_rotate_90(DATA16 *dst, const DATA16 *src, int dst_stride, int
src_stride, int out_x, int out_y, int w, int h)
{
- DATA16 *dp, *sp;
- int x, y;
+ const DATA16 *sp;
+ DATA16 *dp;
+ int y;
- sp = (DATA16 *) src;
- dp = ((DATA16 *) dst) + ((out_x +
-(w + out_y - 1) * dst_stride));
+ sp = src;
+ dp = dst + ((out_x + (w + out_y - 1) * dst_stride));
for (y = 0; y < h; y++)
{
-DATA16 *dp_itr, *sp_itr;
+ const DATA16 *sp_itr;
+DATA16 *dp_itr;
+ int x;
sp_itr = sp;
dp_itr = dp;
@@ -106,18 +112,20 @@
}
static void
-_data32_image_rotate_90(char *dst, const char *src, int dst_stride, int
src_stride, int out_x, int out_y, int w, int h)
+_data32_image_rotate_90(DATA32 *dst, const DATA32 *src, int dst_stride, int
src_stride, int out_x, int out_y, int w, int h)
{
- DATA32 *dp, *sp;
- int x, y;
+ const DATA32 *sp;
+ DATA32 *dp;
+ int y;
- sp = (DATA32 *) src;
- dp = ((DATA32 *) dst) + ((out_x +
-(w + out_y - 1) * dst_stride));
+ sp = src;
+ dp = dst + ((out_x + (w + out_y - 1) * dst_stride));
for (y = 0; y < h; y++)
{
-DATA32 *dp_itr, *sp_itr;
+ const DATA32 *sp_itr;
+DATA32 *dp_itr;
+ int x;
sp_itr = sp;
dp_itr = dp;
@@ -135,18 +143,21 @@
}
static void
-_data8_image_rotate_180(char *dst, const char *src, int dst_stride, int
src_stride, int out_x, int out_y, int w, int h)
+_data8_image_rotate_180(DATA8 *dst, const DATA8 *src, int dst_stride, int
src_stride, int out_x, int out_y, int w, int h)
{
- DATA8 *dp, *sp;
- int x, y;
+ const DATA8 *sp;
+ DATA8 *dp;
+ int y;
- sp = (DATA8 *) src;
- dp = ((DATA8 *) dst) + ((w + out_x - 1) +
- (h + out_y - 1) * dst_stride);
+ sp = src;
+ dp = dst + ((w + out_x - 1) + (h + out_y - 1) * dst_stride);
for (y = 0; y < h; y++)
{
-DATA8 *dp_itr, *sp_itr;
+ const DATA8 *sp_itr;
+DATA8 *dp_itr;
+ int x;
+
sp_itr = sp;
dp_itr = dp;
@@ -163,18 +174,21 @@
}
static void
-_data16_image_rotate_180(char *dst, const char *src, int dst_stride, int
src_stride, int out_x, int out_y, int w, int h)
+_data16_image_rotate_180(DATA16 *dst, const DATA16 *src, int dst_stride, int
src_stride, int out_x, int out_y, int w, int h)
{
- DATA16 *dp, *sp;
- int x, y;
+ const DATA16 *sp;
+ DATA16 *dp;
+ int y;
- sp = (DATA16 *) src;
- dp = ((DATA16 *) dst) + ((w + out_x - 1) +
- (h + out_y - 1) * dst_stride);
+ sp = src;
+ dp = dst + ((w + out_x - 1) + (h + out_y - 1) * dst_stride);
for (y = 0; y < h; y++)
{
-DATA16 *dp_itr, *sp_itr;
+
E CVS: proto/python-efl barbieri
Enlightenment CVS committal
Author : barbieri
Project : e17
Module : proto/python-efl
Dir : e17/proto/python-efl/python-evas/evas
Modified Files:
evas.c_evas_object_image.pxi evas_object_image_mask.c
evas_object_image_rotate.c
Log Message:
Reformat to fit coding style + unify headers
This should change no logic, just coding style. Next commits will
change types and break some functions into smaller pieces.
===
RCS file:
/cvs/e/e17/proto/python-efl/python-evas/evas/evas.c_evas_object_image.pxi,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- evas.c_evas_object_image.pxi6 Dec 2007 15:28:11 - 1.15
+++ evas.c_evas_object_image.pxi12 Mar 2008 18:53:55 - 1.16
@@ -1,30 +1,9 @@
# This file is included verbatim by c_evas.pyx
-## for mask support
-cdef extern from "evas_object_image_mask.h":
-int evas_object_image_mask_fill(Evas_Object *src, Evas_Object *mask,
-Evas_Object *surface, int x_mask, int y_mask, int x_surface, int
y_surface)
-
-def image_mask_fill(source, mask, surface, int x_mask, int y_mask,
-int x_surface, int y_surface):
-cdef Image isource = source
-cdef Image imask = mask
-cdef Image isurface = surface
-evas_object_image_mask_fill(isource.obj, imask.obj, isurface.obj,
- x_mask, y_mask, x_surface, y_surface)
-
-
-## for rotate support
-cdef extern from "evas_object_image_rotate.h":
-ctypedef enum Rotation:
-ROTATE_NONE
-ROTATE_90
-ROTATE_180
-ROTATE_270
-
-void evas_object_image_rotate(Evas_Object *image, Rotation rotation)
-
+def image_mask_fill(Image source, Image mask, Image surface, int x_mask, int
y_mask, int x_surface, int y_surface):
+evas_object_image_mask_fill(source.obj, mask.obj, surface.obj,
+x_mask, y_mask, x_surface, y_surface)
cdef int _data_size_get(Evas_Object *obj):
cdef int stride, h, bpp, cspace, have_alpha
@@ -464,7 +443,7 @@
self.colorspace_set(value)
def rotate(self, int rotation):
-evas_object_image_rotate(self.obj, rotation)
+evas_object_image_rotate(self.obj,
rotation)
def reload(self):
"Force reload of image data."
===
RCS file:
/cvs/e/e17/proto/python-efl/python-evas/evas/evas_object_image_mask.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- evas_object_image_mask.c6 Dec 2007 15:28:11 - 1.1
+++ evas_object_image_mask.c12 Mar 2008 18:53:55 - 1.2
@@ -2,51 +2,42 @@
#include
#include
-#include "evas_object_image_mask.h"
-
-typedef unsigned char DATA8;
-typedef short int DATA16;
-typedef int DATA32;
-
-enum {FALSE, TRUE};
-
+#include "evas_object_image_python_extras.h"
#define BPIXEL(base, x, y, stride) (base + (y * stride + x))
-
#define MEDPIXEL(src, msk, srf) (((src) * (msk)) + (srf) * (255 - (msk)))/255
static void
-_argb_image_mask_fill(char *dst, const char *src,
-const char *msk, const char *srf,
-int x_msk, int y_msk, int x_srf, int y_srf,
-int src_stride, int src_width, int src_height,
-int msk_stride, int msk_width, int msk_height,
-int srf_stride, int srf_width, int srf_height)
+_argb_image_mask_fill(char *dst, const char *src, const char *msk, const
char *srf, int x_msk, int y_msk, int x_srf, int y_srf, int src_stride, int
src_width, int src_height, int msk_stride, int msk_width, int msk_height, int
srf_stride, int srf_width, int srf_height)
{
-int x, y, xp, yp, xs, ys;
-int r, g, b, a;
-DATA32 pixel, pxa, pxb;
-DATA32 *sp = (DATA32 *) src;
-DATA32 *mp = (DATA32 *) msk;
-DATA32 *fp = (DATA32 *) srf;
-DATA32 *dp = (DATA32 *) dst;
-
-for (y = 0; y < src_height; y++)
-for (x = 0; x < src_width; x++)
-{
-xp = x - x_msk;
-yp = y - y_msk;
-xs = x - x_srf;
-ys = y - y_srf;
-
-pixel = *(BPIXEL(sp, x, y, src_stride));
-
-if (xp >= 0 && xp < msk_width && yp >= 0 && yp < msk_height
-&& xs >= 0 && xs < srf_width && ys >= 0 && ys < srf_height) {
-pxa = *(BPIXEL(mp, xp, yp, msk_stride));
-pxb = *(BPIXEL(fp, xs, ys, srf_stride));
-if(pxa != 0) {
+ int x, y, xp, yp, xs, ys;
+ int r, g, b, a;
+ DATA32 pixel, pxa, pxb;
+ DATA32 *sp = (DATA32 *) src;
+ DATA32 *mp = (DATA32 *) msk;
+ DATA32 *fp = (DATA32 *) srf;
+ DATA32 *dp = (DATA32 *) dst;
+
+ for (y = 0; y < src_height; y++)
+ for (x = 0; x < src_width; x++)
+ {
+ xp = x - x_msk;
+ yp = y - y_msk;
+ xs = x - x_srf;
+ ys = y - y_srf;
+
+ pixel = *(BPIXEL(sp, x, y, src_stride));
+
+ if ((xp >= 0) && (xp < msk_width) &&
+
E CVS: proto/python-efl barbieri
Enlightenment CVS committal Author : barbieri Project : e17 Module : proto/python-efl Dir : e17/proto/python-efl/python-evas/include/evas Modified Files: c_evas.pxd Log Message: Reformat to fit coding style + unify headers This should change no logic, just coding style. Next commits will change types and break some functions into smaller pieces. === RCS file: /cvs/e/e17/proto/python-efl/python-evas/include/evas/c_evas.pxd,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- c_evas.pxd 13 Nov 2007 21:55:33 - 1.6 +++ c_evas.pxd 12 Mar 2008 18:53:55 - 1.7 @@ -531,6 +531,18 @@ void evas_object_text_style_pad_get(Evas_Object *obj, int *l, int *r, int *t, int *b) +cdef extern from "evas_object_image_python_extras.h": +ctypedef enum Evas_Object_Image_Rotation: +ROTATE_NONE +ROTATE_90 +ROTATE_180 +ROTATE_270 + +int evas_object_image_mask_fill(Evas_Object *src, Evas_Object *mask, Evas_Object *surface, int x_mask, int y_mask, int x_surface, int y_surface) +void evas_object_image_rotate(Evas_Object *image, Evas_Object_Image_Rotation rotation) + + + cdef public class Rect [object PyEvasRect, type PyEvasRect_Type]: cdef int x0, y0, x1, y1, cx, cy, _w, _h - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto/python-efl barbieri
Enlightenment CVS committal Author : barbieri Project : e17 Module : proto/python-efl Dir : e17/proto/python-efl/python-evas/include Added Files: evas_object_image_python_extras.h Removed Files: evas_object_image_mask.h evas_object_image_rotate.h Log Message: Reformat to fit coding style + unify headers This should change no logic, just coding style. Next commits will change types and break some functions into smaller pieces. - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto/python-efl barbieri
Enlightenment CVS committal Author : barbieri Project : e17 Module : proto/python-efl Dir : e17/proto/python-efl/python-evas/evas Removed Files: evas_object_image_mask.h Log Message: mv evas/evas_object_image_mask.h include/ - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto/python-efl barbieri
Enlightenment CVS committal Author : barbieri Project : e17 Module : proto/python-efl Dir : e17/proto/python-efl/python-evas/include Added Files: evas_object_image_mask.h Log Message: mv evas/evas_object_image_mask.h include/ - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto/python-efl barbieri
Enlightenment CVS committal Author : barbieri Project : e17 Module : proto/python-efl Dir : e17/proto/python-efl/python-evas Modified Files: setup.py Log Message: micro-version++ === RCS file: /cvs/e/e17/proto/python-efl/python-evas/setup.py,v retrieving revision 1.25 retrieving revision 1.26 diff -u -3 -r1.25 -r1.26 --- setup.py15 Feb 2008 21:06:26 - 1.25 +++ setup.py12 Mar 2008 17:42:06 - 1.26 @@ -123,7 +123,7 @@ setup(name='python-evas', - version='0.2.1', + version='0.2.2', license='BSD', author='Gustavo Sverzut Barbieri', author_email='[EMAIL PROTECTED]', - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto/python-efl barbieri
Enlightenment CVS committal
Author : barbieri
Project : e17
Module : proto/python-efl
Dir : e17/proto/python-efl/python-evas/evas
Modified Files:
evas_object_image_rotate.c
Log Message:
Bugfixes from Leonardo Sobral.
===
RCS file:
/cvs/e/e17/proto/python-efl/python-evas/evas/evas_object_image_rotate.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- evas_object_image_rotate.c 22 Nov 2007 15:26:05 - 1.2
+++ evas_object_image_rotate.c 12 Mar 2008 14:30:38 - 1.3
@@ -10,10 +10,40 @@
int pad;
pad = w % 4;
- if (!pad) return w;
+ if (!pad) return w;
else return w + 4 - pad;
}
+static inline int
+_calc_image_byte_size(Evas_Colorspace colorspace, Rotation rotation,
+ int stride, int w, int h, unsigned char has_alpha)
+{
+int dst_stride, dst_height;
+int image_byte_size;
+
+if (rotation == ROTATE_90 || rotation == ROTATE_270) {
+dst_stride = _calc_stride(h);
+dst_height = w;
+} else {
+dst_stride = stride;
+dst_height = h;
+}
+
+switch (colorspace) {
+case EVAS_COLORSPACE_ARGB:
+image_byte_size = IMG_BYTE_SIZE_ARGB(dst_stride, dst_height,
has_alpha);
+break;
+case EVAS_COLORSPACE_RGB565_A5P:
+image_byte_size = IMG_BYTE_SIZE_RGB565(dst_stride, dst_height,
has_alpha);
+break;
+default:
+image_byte_size = -1;
+break;
+}
+
+return image_byte_size;
+}
+
static void
_data8_image_rotate_90(char *dst, const char *src,
int dst_stride, int src_stride,
@@ -279,42 +309,48 @@
char *dst_alpha;
const char *src_alpha;
-if(has_alpha) {
-dst_alpha = &dst[src_stride * h * 2];
-src_alpha = &src[h * w * 2];
-}
+if (has_alpha)
+src_alpha = src + src_stride * h * 2;
-switch(rotation) {
+switch (rotation) {
case ROTATE_90:
dst_stride = _calc_stride(h);
_data16_image_rotate_90(dst, src,
dst_stride, src_stride,
out_x, out_y, w, h);
-if(has_alpha)
+if (has_alpha) {
+dst_alpha = dst + dst_stride * w * 2;
_data8_image_rotate_90(dst_alpha, src_alpha,
dst_stride, src_stride,
out_x, out_y, w, h);
+}
break;
case ROTATE_180:
-dst_stride = _calc_stride(src_stride);
+dst_stride = src_stride;
_data16_image_rotate_180(dst, src,
dst_stride, src_stride,
out_x, out_y, w, h);
-if(has_alpha)
+if (has_alpha) {
+dst_alpha = dst + dst_stride * h * 2;
_data8_image_rotate_180(dst_alpha, src_alpha,
dst_stride, src_stride,
out_x, out_y, w, h);
+}
break;
case ROTATE_270:
dst_stride = _calc_stride(h);
_data16_image_rotate_270(dst, src,
dst_stride, src_stride,
out_x, out_y, w, h);
-if(has_alpha)
+if (has_alpha) {
+dst_alpha = dst + dst_stride * w * 2;
_data8_image_rotate_270(dst_alpha, src_alpha,
dst_stride, src_stride,
out_x, out_y, w, h);
+}
break;
+case ROTATE_NONE:
+ break;
}
}
@@ -345,6 +381,8 @@
dst_stride, src_stride,
out_x, out_y, w, h);
break;
+case ROTATE_NONE:
+ break;
}
}
@@ -362,33 +400,30 @@
stride = evas_object_image_stride_get(image);
has_alpha = evas_object_image_alpha_get(image);
-switch(colorspace) {
-case EVAS_COLORSPACE_ARGB:
-image_byte_size = IMG_BYTE_SIZE_ARGB(stride, height, stride);
-if(image_byte_size <= 0)
-return;
+image_byte_size = _calc_image_byte_size(colorspace, rotation,
+stride, width,
+height, has_alpha);
+if (image_byte_size <= 0)
+return;
-new_buffer = (char*) malloc(image_byte_size);
-src_data = (char*) evas_object_image_data_get(image, FALSE);
+new_buffer = malloc(image_byte_size);
+src_data = evas_object_image_data_get(image, FALSE);
-/* dst_stride set to original height */
+switch (colorspace) {
+case EVAS_COLORSPACE
E CVS: proto/python-efl barbieri
Enlightenment CVS committal
Author : barbieri
Project : e17
Module : proto/python-efl
Dir : e17/proto/python-efl/python-ecore
Modified Files:
build.sh setup.py
Log Message:
Initial support for ecore_imf.
By: Eduardo Lima (Etrunko)
===
RCS file: /cvs/e/e17/proto/python-efl/python-ecore/build.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- build.sh5 Nov 2007 21:50:55 - 1.2
+++ build.sh4 Mar 2008 20:09:05 - 1.3
@@ -1,7 +1,7 @@
#!/bin/sh
PREFIX="$HOME/usr"
-PYX_FILES="ecore/ecore.c_ecore.pyx ecore/evas/ecore.evas.c_ecore_evas.pyx
ecore/x/ecore.x.c_ecore_x.pyx ecore/x/ecore.x.screensaver.pyx"
+PYX_FILES="ecore/ecore.c_ecore.pyx ecore/evas/ecore.evas.c_ecore_evas.pyx
ecore/x/ecore.x.c_ecore_x.pyx ecore/x/ecore.x.screensaver.pyx
ecore/imf/ecore.imf.c_ecore_imf.pyx"
for arg in $@; do
case $arg in
===
RCS file: /cvs/e/e17/proto/python-efl/python-ecore/setup.py,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- setup.py15 Feb 2008 21:06:25 - 1.21
+++ setup.py4 Mar 2008 20:09:05 - 1.22
@@ -61,19 +61,26 @@
'ecore/evas/ecore.evas.c_ecore_evas_software_x11_16.pxi',
'include/ecore/evas/c_ecore_evas.pxd',
],
-**pkgconfig('"ecore-evas >= 0.9.9.040"'))
+**pkgconfig('"ecore-evas >= 0.9.9.042"'))
ecorexmodule = Extension('ecore.x.c_ecore_x',
-sources=['ecore/x/ecore.x.c_ecore_x.pyx'],
-depends=['ecore/x/ecore.x.c_ecore_x_window.pxi',
- 'include/ecore/x/c_ecore_x.pxd',
- ],
-**pkgconfig('"ecore-x >= 0.9.9.040"'))
-ecorexscreensavermodule = Extension('ecore.x.screensaver',
-sources=['ecore/x/ecore.x.screensaver.pyx'],
-depends=['include/ecore/x/screensaver.pxd'],
-**pkgconfig('"ecore-x >= 0.9.9.040"'))
+ sources=['ecore/x/ecore.x.c_ecore_x.pyx'],
+ depends=['ecore/x/ecore.x.c_ecore_x_window.pxi',
+ 'include/ecore/x/c_ecore_x.pxd',
+ ],
+ **pkgconfig('"ecore-x >= 0.9.9.042"'))
+ecorexscreensavermodule = Extension('ecore.x.screensaver',
+
sources=['ecore/x/ecore.x.screensaver.pyx'],
+
depends=['include/ecore/x/screensaver.pxd'],
+**pkgconfig('"ecore-x >= 0.9.9.042"'))
+
+ecoreimfmodule = Extension('ecore.imf.c_ecore_imf',
+ sources=['ecore/imf/ecore.imf.c_ecore_imf.pyx'],
+ depends=['include/ecore/c_ecore_data.pxd',
+'include/ecore/imf/c_ecore_imf.pxd',
+ ],
+ **pkgconfig('"ecore-imf >= 0.9.9.042"'))
trove_classifiers = [
"Development Status :: 3 - Alpha",
@@ -119,7 +126,7 @@
setup(name='python-ecore',
- version='0.2.1',
+ version='0.3.0',
license='BSD',
author='Gustavo Sverzut Barbieri',
author_email='[EMAIL PROTECTED]',
@@ -132,7 +139,8 @@
install_requires=['python-evas>=0.2.1'],
setup_requires=['python-evas>=0.2.1'],
ext_modules=[ecoremodule, ecoreevasmodule, ecorexmodule,
- ecorexscreensavermodule],
+ ecorexscreensavermodule, ecoreimfmodule,
+ ],
zip_safe=False,
cmdclass={'build_ext': ecore_build_ext,},
)
-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto/python-efl barbieri
Enlightenment CVS committal Author : barbieri Project : e17 Module : proto/python-efl Dir : e17/proto/python-efl/python-ecore/include/ecore/imf Added Files: c_ecore_imf.pxd Log Message: Initial support for ecore_imf. By: Eduardo Lima (Etrunko) - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto/python-efl barbieri
Enlightenment CVS committal Author : barbieri Project : e17 Module : proto/python-efl Dir : e17/proto/python-efl/python-ecore/include/ecore Added Files: c_ecore_data.pxd Log Message: Initial support for ecore_imf. By: Eduardo Lima (Etrunko) - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto/python-efl barbieri
Enlightenment CVS committal Author : barbieri Project : e17 Module : proto/python-efl Dir : e17/proto/python-efl/python-ecore/ecore/imf Added Files: __init__.py ecore.imf.c_ecore_imf.pyx Log Message: Initial support for ecore_imf. By: Eduardo Lima (Etrunko) - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto/python-efl barbieri
Enlightenment CVS committal Author : barbieri Project : e17 Module : proto/python-efl Dir : e17/proto/python-efl/python-ecore/ecore/imf Log Message: Directory /cvs/e/e17/proto/python-efl/python-ecore/ecore/imf added to the repository - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto/python-efl barbieri
Enlightenment CVS committal Author : barbieri Project : e17 Module : proto/python-efl Dir : e17/proto/python-efl/python-ecore/include/ecore/imf Log Message: Directory /cvs/e/e17/proto/python-efl/python-ecore/include/ecore/imf added to the repository - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto/python-efl barbieri
Enlightenment CVS committal
Author : barbieri
Project : e17
Module : proto/python-efl
Dir : e17/proto/python-efl/python-e_dbus
Modified Files:
setup.cfg setup.py
Log Message:
Add missing pkg-config check
===
RCS file: /cvs/e/e17/proto/python-efl/python-e_dbus/setup.cfg,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- setup.cfg 28 Sep 2007 13:33:03 - 1.1
+++ setup.cfg 17 Feb 2008 12:35:53 - 1.2
@@ -2,7 +2,7 @@
optimize=1
[build_rpm]
-requires=ecore >= 0.9.9.041, dbus-1 >= 0.62, edbus >= 0.1.0.003
-build_requires=ecore >= 0.9.9.041, dbus-1 >= 0.62, edbus >= 0.1.0.003
+requires=ecore >= 0.9.9.041, dbus-1 >= 0.62, edbus >= 0.1.0.003, dbus-python
+build_requires=ecore >= 0.9.9.041, dbus-1 >= 0.62, edbus >= 0.1.0.003,
dbus-python
group=System Environment/Libraries
release=1
===
RCS file: /cvs/e/e17/proto/python-efl/python-e_dbus/setup.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- setup.py15 Feb 2008 21:06:25 - 1.5
+++ setup.py17 Feb 2008 12:35:53 - 1.6
@@ -36,7 +36,8 @@
e_dbus_module = Extension("e_dbus",
sources=["module.c",],
- **pkgconfig('"edbus >= 0.1.0.042"'))
+ **pkgconfig('"edbus >= 0.1.0.042" '
+ '"dbus-python"'))
setup(name="python-e_dbus",
-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto/python-efl barbieri
Enlightenment CVS committal
Author : barbieri
Project : e17
Module : proto/python-efl
Dir : e17/proto/python-efl/python-edje
Modified Files:
setup.py
Log Message:
Bump python-efl version.
===
RCS file: /cvs/e/e17/proto/python-efl/python-edje/setup.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- setup.py8 Feb 2008 21:27:31 - 1.12
+++ setup.py15 Feb 2008 21:06:25 - 1.13
@@ -43,7 +43,7 @@
'edje/edje.c_edje_message.pxi',
'include/edje/c_edje.pxd',
],
- **pkgconfig('"edje >= 0.5.0.040"'))
+ **pkgconfig('"edje >= 0.5.0.042"'))
trove_classifiers = [
@@ -111,7 +111,7 @@
setup(name='python-edje',
- version='0.2.0',
+ version='0.2.1',
license='BSD',
author='Gustavo Sverzut Barbieri',
author_email='[EMAIL PROTECTED]',
@@ -121,8 +121,8 @@
keywords='wrapper binding enlightenment graphics raster evas canvas
theme',
classifiers=trove_classifiers,
packages=find_packages(),
- install_requires=['python-evas>=0.2.0'],
- setup_requires=['python-evas>=0.2.0'],
+ install_requires=['python-evas>=0.2.1'],
+ setup_requires=['python-evas>=0.2.1'],
ext_modules=[edjemodule],
zip_safe=False,
cmdclass={'build_ext': edje_build_ext,},
-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto/python-efl barbieri
Enlightenment CVS committal
Author : barbieri
Project : e17
Module : proto/python-efl
Dir : e17/proto/python-efl/python-emotion
Modified Files:
setup.py
Log Message:
Bump python-efl version.
===
RCS file: /cvs/e/e17/proto/python-efl/python-emotion/setup.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- setup.py8 Feb 2008 21:27:31 - 1.11
+++ setup.py15 Feb 2008 21:06:26 - 1.12
@@ -41,7 +41,7 @@
],
depends=['include/emotion/c_emotion.pxd',
],
- **pkgconfig('"emotion >= 0.0.1.007"'))
+ **pkgconfig('"emotion >= 0.1.0.042"'))
trove_classifiers = [
@@ -78,7 +78,7 @@
setup(name='python-emotion',
- version='0.2.0',
+ version='0.2.1',
license='BSD',
author='Gustavo Sverzut Barbieri',
author_email='[EMAIL PROTECTED]',
@@ -88,8 +88,8 @@
keywords='wrapper binding enlightenment graphics raster evas canvas
multimida playback xine gstreamer',
classifiers=trove_classifiers,
packages=find_packages(),
- install_requires=['python-evas>=0.2.0'],
- setup_requires=['python-evas>=0.2.0'],
+ install_requires=['python-evas>=0.2.1'],
+ setup_requires=['python-evas>=0.2.1'],
ext_modules=[emotionmodule],
zip_safe=False,
cmdclass={'build_ext': emotion_build_ext,},
-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto/python-efl barbieri
Enlightenment CVS committal
Author : barbieri
Project : e17
Module : proto/python-efl
Dir : e17/proto/python-efl/python-ecore
Modified Files:
setup.py
Log Message:
Bump python-efl version.
===
RCS file: /cvs/e/e17/proto/python-efl/python-ecore/setup.py,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- setup.py8 Feb 2008 21:27:31 - 1.20
+++ setup.py15 Feb 2008 21:06:25 - 1.21
@@ -46,7 +46,7 @@
'ecore/ecore.c_ecore_fd_handler.pxi',
'include/ecore/c_ecore.pxd',
],
-**pkgconfig('"ecore >= 0.9.9.040"'))
+**pkgconfig('"ecore >= 0.9.9.042"'))
ecoreevasmodule = Extension('ecore.evas.c_ecore_evas',
@@ -119,7 +119,7 @@
setup(name='python-ecore',
- version='0.2.0',
+ version='0.2.1',
license='BSD',
author='Gustavo Sverzut Barbieri',
author_email='[EMAIL PROTECTED]',
@@ -129,8 +129,8 @@
keywords='wrapper binding enlightenment abstraction event ecore',
classifiers=trove_classifiers,
packages=find_packages(),
- install_requires=['python-evas>=0.2.0'],
- setup_requires=['python-evas>=0.2.0'],
+ install_requires=['python-evas>=0.2.1'],
+ setup_requires=['python-evas>=0.2.1'],
ext_modules=[ecoremodule, ecoreevasmodule, ecorexmodule,
ecorexscreensavermodule],
zip_safe=False,
-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto/python-efl barbieri
Enlightenment CVS committal
Author : barbieri
Project : e17
Module : proto/python-efl
Dir : e17/proto/python-efl/python-e_dbus
Modified Files:
setup.py
Log Message:
Bump python-efl version.
===
RCS file: /cvs/e/e17/proto/python-efl/python-e_dbus/setup.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- setup.py8 Feb 2008 21:27:31 - 1.4
+++ setup.py15 Feb 2008 21:06:25 - 1.5
@@ -36,11 +36,11 @@
e_dbus_module = Extension("e_dbus",
sources=["module.c",],
- **pkgconfig('"edbus >= 0.1.0.003"'))
+ **pkgconfig('"edbus >= 0.1.0.042"'))
setup(name="python-e_dbus",
- version="0.1.0",
+ version="0.1.1",
license="BSD",
author="Ulisses Furquim",
author_email="[EMAIL PROTECTED]",
-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto/python-efl barbieri
Enlightenment CVS committal
Author : barbieri
Project : e17
Module : proto/python-efl
Dir : e17/proto/python-efl/python-epsilon
Modified Files:
setup.py
Log Message:
Bump python-efl version.
===
RCS file: /cvs/e/e17/proto/python-efl/python-epsilon/setup.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- setup.py8 Feb 2008 21:27:31 - 1.4
+++ setup.py15 Feb 2008 21:06:26 - 1.5
@@ -41,14 +41,14 @@
],
depends=['include/epsilon/c_epsilon.pxd',
],
- **pkgconfig('"epsilon >= 0.3.0.011"'))
+ **pkgconfig('"epsilon >= 0.3.0.012"'))
epsilonrequestmodule = Extension('epsilon.request',
sources=['epsilon/epsilon.request.pyx',
],
depends=['include/epsilon/request.pxd',
],
- **pkgconfig('"epsilon >= 0.3.0.011"'))
+ **pkgconfig('"epsilon >= 0.3.0.012"'))
trove_classifiers = [
@@ -90,7 +90,7 @@
setup(name='python-epsilon',
- version='0.2.0',
+ version='0.2.1',
license='BSD',
author='Gustavo Sverzut Barbieri',
author_email='[EMAIL PROTECTED]',
@@ -100,8 +100,8 @@
keywords='wrapper binding enlightenment graphics jpg jpeg png thumbnail
freedesktop.org',
classifiers=trove_classifiers,
packages=find_packages(),
- install_requires=['python-ecore>=0.2.0'],
- setup_requires=['python-ecore>=0.2.0'],
+ install_requires=['python-ecore>=0.2.1'],
+ setup_requires=['python-ecore>=0.2.1'],
ext_modules=[epsilonmodule, epsilonrequestmodule],
zip_safe=False,
cmdclass={'build_ext': epsilon_build_ext,},
-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto/python-efl barbieri
Enlightenment CVS committal
Author : barbieri
Project : e17
Module : proto/python-efl
Dir : e17/proto/python-efl/python-evas
Modified Files:
setup.py
Log Message:
Bump python-efl version.
===
RCS file: /cvs/e/e17/proto/python-efl/python-evas/setup.py,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -3 -r1.24 -r1.25
--- setup.py8 Feb 2008 21:27:31 - 1.24
+++ setup.py15 Feb 2008 21:06:26 - 1.25
@@ -55,7 +55,7 @@
'include/evas/c_evas.pxd',
'include/evas/python.pxd',
],
- **pkgconfig('"evas >= 0.9.9.040"')
+ **pkgconfig('"evas >= 0.9.9.042"')
)
@@ -123,7 +123,7 @@
setup(name='python-evas',
- version='0.2.0',
+ version='0.2.1',
license='BSD',
author='Gustavo Sverzut Barbieri',
author_email='[EMAIL PROTECTED]',
-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto/python-efl barbieri
Enlightenment CVS committal
Author : barbieri
Project : e17
Module : proto/python-efl
Dir : e17/proto/python-efl/python-epsilon
Modified Files:
setup.py
Log Message:
Replace commands (unix only) with subprocess.
===
RCS file: /cvs/e/e17/proto/python-efl/python-epsilon/setup.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- setup.py29 Jan 2008 15:47:32 - 1.3
+++ setup.py8 Feb 2008 21:27:31 - 1.4
@@ -5,10 +5,17 @@
use_setuptools('0.6c3')
from setuptools import setup, find_packages, Extension
-import commands
+import subprocess
+import shlex
from Cython.Distutils import build_ext
+def getstatusoutput(cmdline):
+cmd = shlex.split(cmdline)
+p = subprocess.Popen(cmd, stdout=subprocess.PIPE)
+out, err = p.communicate()
+return p.returncode, out
+
def pkgconfig(*packages, **kw):
flag_map = {'-I': 'include_dirs', '-L': 'library_dirs', '-l': 'libraries',
@@ -16,7 +23,7 @@
pkgs = ' '.join(packages)
cmdline = 'pkg-config --libs --cflags %s' % pkgs
-status, output = commands.getstatusoutput(cmdline)
+status, output = getstatusoutput(cmdline)
if status != 0:
raise ValueError("could not find pkg-config module: %s" % pkgs)
-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto/python-efl barbieri
Enlightenment CVS committal
Author : barbieri
Project : e17
Module : proto/python-efl
Dir : e17/proto/python-efl/python-e_dbus
Modified Files:
setup.py
Log Message:
Replace commands (unix only) with subprocess.
===
RCS file: /cvs/e/e17/proto/python-efl/python-e_dbus/setup.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- setup.py29 Jan 2008 15:47:32 - 1.3
+++ setup.py8 Feb 2008 21:27:31 - 1.4
@@ -5,7 +5,14 @@
use_setuptools("0.6c3")
from setuptools import setup, Extension
-import commands
+import subprocess
+import shlex
+
+def getstatusoutput(cmdline):
+cmd = shlex.split(cmdline)
+p = subprocess.Popen(cmd, stdout=subprocess.PIPE)
+out, err = p.communicate()
+return p.returncode, out
def pkgconfig(*packages, **kw):
@@ -14,7 +21,7 @@
pkgs = ' '.join(packages)
cmdline = 'pkg-config --libs --cflags %s' % pkgs
-status, output = commands.getstatusoutput(cmdline)
+status, output = getstatusoutput(cmdline)
if status != 0:
raise ValueError("could not find pkg-config module: %s" % pkgs)
-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto/python-efl barbieri
Enlightenment CVS committal
Author : barbieri
Project : e17
Module : proto/python-efl
Dir : e17/proto/python-efl/python-edje
Modified Files:
setup.py
Log Message:
Replace commands (unix only) with subprocess.
===
RCS file: /cvs/e/e17/proto/python-efl/python-edje/setup.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- setup.py29 Jan 2008 15:47:32 - 1.11
+++ setup.py8 Feb 2008 21:27:31 - 1.12
@@ -5,10 +5,17 @@
use_setuptools('0.6c3')
from setuptools import setup, find_packages, Extension
-import commands
+import subprocess
+import shlex
from Cython.Distutils import build_ext
+def getstatusoutput(cmdline):
+cmd = shlex.split(cmdline)
+p = subprocess.Popen(cmd, stdout=subprocess.PIPE)
+out, err = p.communicate()
+return p.returncode, out
+
def pkgconfig(*packages, **kw):
flag_map = {'-I': 'include_dirs', '-L': 'library_dirs', '-l': 'libraries',
@@ -16,7 +23,7 @@
pkgs = ' '.join(packages)
cmdline = 'pkg-config --libs --cflags %s' % pkgs
-status, output = commands.getstatusoutput(cmdline)
+status, output = getstatusoutput(cmdline)
if status != 0:
raise ValueError("could not find pkg-config module: %s" % pkgs)
-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto/python-efl barbieri
Enlightenment CVS committal
Author : barbieri
Project : e17
Module : proto/python-efl
Dir : e17/proto/python-efl/python-emotion
Modified Files:
setup.py
Log Message:
Replace commands (unix only) with subprocess.
===
RCS file: /cvs/e/e17/proto/python-efl/python-emotion/setup.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- setup.py29 Jan 2008 15:47:32 - 1.10
+++ setup.py8 Feb 2008 21:27:31 - 1.11
@@ -5,10 +5,17 @@
use_setuptools('0.6c3')
from setuptools import setup, find_packages, Extension
-import commands
+import subprocess
+import shlex
from Cython.Distutils import build_ext
+def getstatusoutput(cmdline):
+cmd = shlex.split(cmdline)
+p = subprocess.Popen(cmd, stdout=subprocess.PIPE)
+out, err = p.communicate()
+return p.returncode, out
+
def pkgconfig(*packages, **kw):
flag_map = {'-I': 'include_dirs', '-L': 'library_dirs', '-l': 'libraries',
@@ -16,7 +23,7 @@
pkgs = ' '.join(packages)
cmdline = 'pkg-config --libs --cflags %s' % pkgs
-status, output = commands.getstatusoutput(cmdline)
+status, output = getstatusoutput(cmdline)
if status != 0:
raise ValueError("could not find pkg-config module: %s" % pkgs)
-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto/python-efl barbieri
Enlightenment CVS committal
Author : barbieri
Project : e17
Module : proto/python-efl
Dir : e17/proto/python-efl/python-ecore
Modified Files:
setup.py
Log Message:
Replace commands (unix only) with subprocess.
===
RCS file: /cvs/e/e17/proto/python-efl/python-ecore/setup.py,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- setup.py29 Jan 2008 15:47:32 - 1.19
+++ setup.py8 Feb 2008 21:27:31 - 1.20
@@ -5,10 +5,17 @@
use_setuptools('0.6c3')
from setuptools import setup, find_packages, Extension
-import commands
+import subprocess
+import shlex
from Cython.Distutils import build_ext
+def getstatusoutput(cmdline):
+cmd = shlex.split(cmdline)
+p = subprocess.Popen(cmd, stdout=subprocess.PIPE)
+out, err = p.communicate()
+return p.returncode, out
+
def pkgconfig(*packages, **kw):
flag_map = {'-I': 'include_dirs', '-L': 'library_dirs', '-l': 'libraries',
@@ -16,7 +23,7 @@
pkgs = ' '.join(packages)
cmdline = 'pkg-config --libs --cflags %s' % pkgs
-status, output = commands.getstatusoutput(cmdline)
+status, output = getstatusoutput(cmdline)
if status != 0:
raise ValueError("could not find pkg-config module: %s" % pkgs)
-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto/python-efl barbieri
Enlightenment CVS committal
Author : barbieri
Project : e17
Module : proto/python-efl
Dir : e17/proto/python-efl/python-evas
Modified Files:
setup.py
Log Message:
Replace commands (unix only) with subprocess.
===
RCS file: /cvs/e/e17/proto/python-efl/python-evas/setup.py,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -3 -r1.23 -r1.24
--- setup.py29 Jan 2008 15:47:32 - 1.23
+++ setup.py8 Feb 2008 21:27:31 - 1.24
@@ -7,10 +7,17 @@
from setuptools import setup, find_packages, Extension
from distutils.command.install_headers import install_headers
from distutils.sysconfig import get_python_inc
-import commands
+import subprocess
+import shlex
from Cython.Distutils import build_ext
+def getstatusoutput(cmdline):
+cmd = shlex.split(cmdline)
+p = subprocess.Popen(cmd, stdout=subprocess.PIPE)
+out, err = p.communicate()
+return p.returncode, out
+
def pkgconfig(*packages, **kw):
flag_map = {'-I': 'include_dirs', '-L': 'library_dirs', '-l': 'libraries',
@@ -18,7 +25,7 @@
pkgs = ' '.join(packages)
cmdline = 'pkg-config --libs --cflags %s' % pkgs
-status, output = commands.getstatusoutput(cmdline)
+status, output = getstatusoutput(cmdline)
if status != 0:
raise ValueError("could not find pkg-config module: %s" % pkgs)
-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto/python-efl barbieri
Enlightenment CVS committal Author : barbieri Project : e17 Module : proto/python-efl Dir : e17/proto/python-efl/python-edje/examples Modified Files: 01-swallow.py Log Message: Missing member_add() === RCS file: /cvs/e/e17/proto/python-efl/python-edje/examples/01-swallow.py,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- 01-swallow.py 2 Feb 2008 18:01:05 - 1.1 +++ 01-swallow.py 5 Feb 2008 19:32:16 - 1.2 @@ -40,6 +40,7 @@ def add(self, child): self.children.append(child) +self.member_add(child) self.reconfigure(*self.geometry) - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto/python-efl barbieri
Enlightenment CVS committal Author : barbieri Project : e17 Module : proto/python-efl Dir : e17/proto/python-efl Modified Files: build-all.sh Log Message: Use /bin/sh instead of /bin/bash === RCS file: /cvs/e/e17/proto/python-efl/build-all.sh,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- build-all.sh7 Nov 2007 15:34:42 - 1.2 +++ build-all.sh2 Feb 2008 18:28:46 - 1.3 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh PREFIX=$1 [ -z "$PREFIX" ] && PREFIX="$HOME/usr" - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto/python-efl barbieri
Enlightenment CVS committal Author : barbieri Project : e17 Module : proto/python-efl Dir : e17/proto/python-efl/python-edje/examples Added Files: .cvsignore 01-swallow.edc 01-swallow.py Log Message: Edje swallow example - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto/python-efl barbieri
Enlightenment CVS committal Author : barbieri Project : e17 Module : proto/python-efl Dir : e17/proto/python-efl/python-evas/examples Added Files: 01-smart_object.py Log Message: Example of ClippedSmartObject, really simple but useful. - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto/python-efl barbieri
Enlightenment CVS committal Author : barbieri Project : e17 Module : proto/python-efl Dir : e17/proto/python-efl/python-evas/examples Log Message: Directory /cvs/e/e17/proto/python-efl/python-evas/examples added to the repository - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto/python-efl barbieri
Enlightenment CVS committal
Author : barbieri
Project : e17
Module : proto/python-efl
Dir : e17/proto/python-efl/python-evas
Modified Files:
setup.py
Log Message:
Support -D in pkg-config flags, avoid failing on unknown flags.
Thanks to Vincent (caro) for reporting.
===
RCS file: /cvs/e/e17/proto/python-efl/python-evas/setup.py,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- setup.py6 Dec 2007 15:28:11 - 1.22
+++ setup.py29 Jan 2008 15:47:32 - 1.23
@@ -13,7 +13,8 @@
def pkgconfig(*packages, **kw):
-flag_map = {'-I': 'include_dirs', '-L': 'library_dirs', '-l': 'libraries'}
+flag_map = {'-I': 'include_dirs', '-L': 'library_dirs', '-l': 'libraries',
+'-D': 'prepro_vars'}
pkgs = ' '.join(packages)
cmdline = 'pkg-config --libs --cflags %s' % pkgs
@@ -22,7 +23,11 @@
raise ValueError("could not find pkg-config module: %s" % pkgs)
for token in output.split():
-kw.setdefault(flag_map.get(token[:2]), []).append(token[2:])
+flag = flag_map.get(token[:2], None)
+if flag is not None:
+kw.setdefault(flag, []).append(token[2:])
+else:
+print "WARNING: Unknown pkg-config flag: %s" % token
return kw
-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto/python-efl barbieri
Enlightenment CVS committal
Author : barbieri
Project : e17
Module : proto/python-efl
Dir : e17/proto/python-efl/python-emotion
Modified Files:
setup.py
Log Message:
Support -D in pkg-config flags, avoid failing on unknown flags.
Thanks to Vincent (caro) for reporting.
===
RCS file: /cvs/e/e17/proto/python-efl/python-emotion/setup.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- setup.py5 Nov 2007 22:11:45 - 1.9
+++ setup.py29 Jan 2008 15:47:32 - 1.10
@@ -11,7 +11,8 @@
def pkgconfig(*packages, **kw):
-flag_map = {'-I': 'include_dirs', '-L': 'library_dirs', '-l': 'libraries'}
+flag_map = {'-I': 'include_dirs', '-L': 'library_dirs', '-l': 'libraries',
+'-D': 'prepro_vars'}
pkgs = ' '.join(packages)
cmdline = 'pkg-config --libs --cflags %s' % pkgs
@@ -20,7 +21,11 @@
raise ValueError("could not find pkg-config module: %s" % pkgs)
for token in output.split():
-kw.setdefault(flag_map.get(token[:2]), []).append(token[2:])
+flag = flag_map.get(token[:2], None)
+if flag is not None:
+kw.setdefault(flag, []).append(token[2:])
+else:
+print "WARNING: Unknown pkg-config flag: %s" % token
return kw
-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto/python-efl barbieri
Enlightenment CVS committal
Author : barbieri
Project : e17
Module : proto/python-efl
Dir : e17/proto/python-efl/python-epsilon
Modified Files:
setup.py
Log Message:
Support -D in pkg-config flags, avoid failing on unknown flags.
Thanks to Vincent (caro) for reporting.
===
RCS file: /cvs/e/e17/proto/python-efl/python-epsilon/setup.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- setup.py5 Nov 2007 22:10:24 - 1.2
+++ setup.py29 Jan 2008 15:47:32 - 1.3
@@ -11,7 +11,8 @@
def pkgconfig(*packages, **kw):
-flag_map = {'-I': 'include_dirs', '-L': 'library_dirs', '-l': 'libraries'}
+flag_map = {'-I': 'include_dirs', '-L': 'library_dirs', '-l': 'libraries',
+'-D': 'prepro_vars'}
pkgs = ' '.join(packages)
cmdline = 'pkg-config --libs --cflags %s' % pkgs
@@ -20,7 +21,11 @@
raise ValueError("could not find pkg-config module: %s" % pkgs)
for token in output.split():
-kw.setdefault(flag_map.get(token[:2]), []).append(token[2:])
+flag = flag_map.get(token[:2], None)
+if flag is not None:
+kw.setdefault(flag, []).append(token[2:])
+else:
+print "WARNING: Unknown pkg-config flag: %s" % token
return kw
-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto/python-efl barbieri
Enlightenment CVS committal
Author : barbieri
Project : e17
Module : proto/python-efl
Dir : e17/proto/python-efl/python-e_dbus
Modified Files:
setup.py
Log Message:
Support -D in pkg-config flags, avoid failing on unknown flags.
Thanks to Vincent (caro) for reporting.
===
RCS file: /cvs/e/e17/proto/python-efl/python-e_dbus/setup.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- setup.py29 Sep 2007 16:29:51 - 1.2
+++ setup.py29 Jan 2008 15:47:32 - 1.3
@@ -9,16 +9,21 @@
def pkgconfig(*packages, **kw):
-flag_map = {"-I": "include_dirs", "-L": "library_dirs", "-l": "libraries"}
-pkgs = " ".join(packages)
-cmdline = "pkg-config --libs --cflags %s" % pkgs
+flag_map = {'-I': 'include_dirs', '-L': 'library_dirs', '-l': 'libraries',
+'-D': 'prepro_vars'}
+pkgs = ' '.join(packages)
+cmdline = 'pkg-config --libs --cflags %s' % pkgs
status, output = commands.getstatusoutput(cmdline)
if status != 0:
raise ValueError("could not find pkg-config module: %s" % pkgs)
for token in output.split():
-kw.setdefault(flag_map.get(token[:2]), []).append(token[2:])
+flag = flag_map.get(token[:2], None)
+if flag is not None:
+kw.setdefault(flag, []).append(token[2:])
+else:
+print "WARNING: Unknown pkg-config flag: %s" % token
return kw
-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto/python-efl barbieri
Enlightenment CVS committal
Author : barbieri
Project : e17
Module : proto/python-efl
Dir : e17/proto/python-efl/python-ecore
Modified Files:
setup.py
Log Message:
Support -D in pkg-config flags, avoid failing on unknown flags.
Thanks to Vincent (caro) for reporting.
===
RCS file: /cvs/e/e17/proto/python-efl/python-ecore/setup.py,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- setup.py5 Nov 2007 22:05:54 - 1.18
+++ setup.py29 Jan 2008 15:47:32 - 1.19
@@ -11,7 +11,8 @@
def pkgconfig(*packages, **kw):
-flag_map = {'-I': 'include_dirs', '-L': 'library_dirs', '-l': 'libraries'}
+flag_map = {'-I': 'include_dirs', '-L': 'library_dirs', '-l': 'libraries',
+'-D': 'prepro_vars'}
pkgs = ' '.join(packages)
cmdline = 'pkg-config --libs --cflags %s' % pkgs
@@ -20,7 +21,11 @@
raise ValueError("could not find pkg-config module: %s" % pkgs)
for token in output.split():
-kw.setdefault(flag_map.get(token[:2]), []).append(token[2:])
+flag = flag_map.get(token[:2], None)
+if flag is not None:
+kw.setdefault(flag, []).append(token[2:])
+else:
+print "WARNING: Unknown pkg-config flag: %s" % token
return kw
-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto/python-efl barbieri
Enlightenment CVS committal
Author : barbieri
Project : e17
Module : proto/python-efl
Dir : e17/proto/python-efl/python-edje
Modified Files:
setup.py
Log Message:
Support -D in pkg-config flags, avoid failing on unknown flags.
Thanks to Vincent (caro) for reporting.
===
RCS file: /cvs/e/e17/proto/python-efl/python-edje/setup.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- setup.py5 Nov 2007 22:08:46 - 1.10
+++ setup.py29 Jan 2008 15:47:32 - 1.11
@@ -11,7 +11,8 @@
def pkgconfig(*packages, **kw):
-flag_map = {'-I': 'include_dirs', '-L': 'library_dirs', '-l': 'libraries'}
+flag_map = {'-I': 'include_dirs', '-L': 'library_dirs', '-l': 'libraries',
+'-D': 'prepro_vars'}
pkgs = ' '.join(packages)
cmdline = 'pkg-config --libs --cflags %s' % pkgs
@@ -20,7 +21,11 @@
raise ValueError("could not find pkg-config module: %s" % pkgs)
for token in output.split():
-kw.setdefault(flag_map.get(token[:2]), []).append(token[2:])
+flag = flag_map.get(token[:2], None)
+if flag is not None:
+kw.setdefault(flag, []).append(token[2:])
+else:
+print "WARNING: Unknown pkg-config flag: %s" % token
return kw
-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto/python-efl barbieri
Enlightenment CVS committal Author : barbieri Project : e17 Module : proto/python-efl Dir : e17/proto/python-efl/python-ecore/ecore/x Modified Files: ecore.x.c_ecore_x_events.pxi Log Message: Do not segfault on NULL strings. This happen mostly with keys without key_compose (ie: F1), but checking all shouldn't hurt. === RCS file: /cvs/e/e17/proto/python-efl/python-ecore/ecore/x/ecore.x.c_ecore_x_events.pxi,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- ecore.x.c_ecore_x_events.pxi12 Nov 2007 01:55:04 - 1.1 +++ ecore.x.c_ecore_x_events.pxi27 Nov 2007 07:44:59 - 1.2 @@ -1,12 +1,19 @@ # This file is included verbatim by c_ecore_x.pyx +cdef object _charp_to_str(char *p): +if p != NULL: +return p +else: +return None + + cdef class EventKeyDown(ecore.c_ecore.Event): cdef int _set_obj(self, void *o) except 0: cdef Ecore_X_Event_Key_Down *obj obj = o -self.keyname = obj.keyname -self.keysymbol = obj.keysymbol -self.key_compose = obj.key_compose +self.keyname = _charp_to_str(obj.keyname) +self.keysymbol = _charp_to_str(obj.keysymbol) +self.key_compose = _charp_to_str(obj.key_compose) self.modifiers = obj.modifiers self.win = Window_from_xid(obj.win) self.event_win = Window_from_xid(obj.event_win) @@ -18,9 +25,9 @@ cdef int _set_obj(self, void *o) except 0: cdef Ecore_X_Event_Key_Up *obj obj = o -self.keyname = obj.keyname -self.keysymbol = obj.keysymbol -self.key_compose = obj.key_compose +self.keyname = _charp_to_str(obj.keyname) +self.keysymbol = _charp_to_str(obj.keysymbol) +self.key_compose = _charp_to_str(obj.key_compose) self.modifiers = obj.modifiers self.win = Window_from_xid(obj.win) self.event_win = Window_from_xid(obj.event_win) - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2005. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto/python-efl barbieri
Enlightenment CVS committal Author : barbieri Project : e17 Module : proto/python-efl Dir : e17/proto/python-efl/python-evas/evas Modified Files: evas.c_evas_canvas.pxi evas.c_evas_object.pxi Log Message: Python-Evas minor adjustments. * Now that pxd usage was improved, use _unset_obj() as cdef. * obj_free_cb() unsets self.obj and self.evas before using callback. === RCS file: /cvs/e/e17/proto/python-efl/python-evas/evas/evas.c_evas_canvas.pxi,v retrieving revision 1.15 retrieving revision 1.16 diff -u -3 -r1.15 -r1.16 --- evas.c_evas_canvas.pxi 19 Oct 2007 13:16:32 - 1.15 +++ evas.c_evas_canvas.pxi 13 Nov 2007 21:55:32 - 1.16 @@ -65,12 +65,10 @@ Canvas_remember(self.obj, self) return 1 -# XXX: this should be C-only, but it would require ecore_evas -# XXX: being able to use it. -def _unset_obj(self): -"Remove internally wrapped Evas*." +cdef int _unset_obj(self) except 0: Canvas_forget(self.obj) self.obj = NULL +return 1 def _new_evas(self): """Creates an internal (wrapped) 'Evas*' for this object. === RCS file: /cvs/e/e17/proto/python-efl/python-evas/evas/evas.c_evas_object.pxi,v retrieving revision 1.22 retrieving revision 1.23 diff -u -3 -r1.22 -r1.23 --- evas.c_evas_object.pxi 5 Nov 2007 21:47:48 - 1.22 +++ evas.c_evas_object.pxi 13 Nov 2007 21:55:33 - 1.23 @@ -29,6 +29,9 @@ cdef Object self self = data +self.obj = NULL +self.evas = None + lst = self._callbacks[EVAS_CALLBACK_FREE] if lst is not None: for func, args, kargs in lst: @@ -37,7 +40,8 @@ except Exception, e: traceback.print_exc() -self._unset_obj() +_free_wrapper_resources(self) +python.Py_DECREF(self) cdef _register_decorated_callbacks(obj): - This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto/python-efl barbieri
Enlightenment CVS committal Author : barbieri Project : e17 Module : proto/python-efl Dir : e17/proto/python-efl/python-evas/include/evas Modified Files: c_evas.pxd Log Message: Python-Evas minor adjustments. * Now that pxd usage was improved, use _unset_obj() as cdef. * obj_free_cb() unsets self.obj and self.evas before using callback. === RCS file: /cvs/e/e17/proto/python-efl/python-evas/include/evas/c_evas.pxd,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- c_evas.pxd 7 Nov 2007 15:36:29 - 1.5 +++ c_evas.pxd 13 Nov 2007 21:55:33 - 1.6 @@ -623,6 +623,8 @@ cdef Evas *obj cdef int _set_obj(self, Evas *obj) except 0 +cdef int _unset_obj(self) except 0 + cdef public class Object [object PyEvasObject, type PyEvasObject_Type]: cdef Evas_Object *obj - This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto/python-efl barbieri
Enlightenment CVS committal Author : barbieri Project : e17 Module : proto/python-efl Dir : e17/proto/python-efl/python-evas/evas Modified Files: evas.c_evas_object_image.pxi Log Message: Ops, use the char*, not python object. === RCS file: /cvs/e/e17/proto/python-efl/python-evas/evas/evas.c_evas_object_image.pxi,v retrieving revision 1.12 retrieving revision 1.13 diff -u -3 -r1.12 -r1.13 --- evas.c_evas_object_image.pxi5 Nov 2007 21:47:48 - 1.12 +++ evas.c_evas_object_image.pxi13 Nov 2007 15:53:45 - 1.13 @@ -459,7 +459,7 @@ f = flags else: f = NULL -evas_object_image_save(self.obj, filename, key, flags) +evas_object_image_save(self.obj, filename, k, f) def __getsegcount__(self, int *p_len): if p_len == NULL: - This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto/python-efl barbieri
Enlightenment CVS committal Author : barbieri Project : e17 Module : proto/python-efl Dir : e17/proto/python-efl/python-ecore/include/ecore/x Modified Files: c_ecore_x.pxd Log Message: Ecore events support and ecore.x.Window improvements, with examples. ecore now provides event support, it's generic, but types need to be registered with ecore._event_mapping_register(type, class) before they're used. ecore.x was improved to handle almost all events, example were added to examples/x. === RCS file: /cvs/e/e17/proto/python-efl/python-ecore/include/ecore/x/c_ecore_x.pxd,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- c_ecore_x.pxd 5 Nov 2007 21:50:55 - 1.1 +++ c_ecore_x.pxd 12 Nov 2007 01:55:05 - 1.2 @@ -1310,7 +1310,338 @@ void ecore_x_dpms_timeout_off_set(unsigned int new_timeout) +cimport ecore.c_ecore + + cdef class Window: cdef readonly Ecore_X_Window xid cdef int _set_xid(self, Ecore_X_Window xid) + + +cdef class EventKeyDown(ecore.c_ecore.Event): +cdef readonly object keyname +cdef readonly object keysymbol +cdef readonly object key_compose +cdef readonly int modifiers +cdef readonly Window win +cdef readonly Window event_win +cdef readonly unsigned int time + + +cdef class EventKeyUp(ecore.c_ecore.Event): +cdef readonly object keyname +cdef readonly object keysymbol +cdef readonly object key_compose +cdef readonly int modifiers +cdef readonly Window win +cdef readonly Window event_win +cdef readonly unsigned int time + + +cdef class EventPoint: +cdef readonly int x +cdef readonly int y + + +cdef class EventMouseButtonDown(ecore.c_ecore.Event): +cdef readonly int button +cdef readonly int modifiers +cdef readonly int x +cdef readonly int y +cdef readonly EventPoint root +cdef readonly Window win +cdef readonly Window event_win +cdef readonly unsigned int time +cdef readonly int double_click +cdef readonly int triple_click + + +cdef class EventMouseButtonUp(ecore.c_ecore.Event): +cdef readonly int button +cdef readonly int modifiers +cdef readonly int x +cdef readonly int y +cdef readonly EventPoint root +cdef readonly Window win +cdef readonly Window event_win +cdef readonly unsigned int time +cdef readonly int double_click +cdef readonly int triple_click + + +cdef class EventMouseMove(ecore.c_ecore.Event): +cdef readonly int modifiers +cdef readonly int x +cdef readonly int y +cdef readonly EventPoint root +cdef readonly Window win +cdef readonly Window event_win +cdef readonly unsigned int time + + +cdef class EventMouseIn(ecore.c_ecore.Event): +cdef readonly int modifiers +cdef readonly int x +cdef readonly int y +cdef readonly EventPoint root +cdef readonly Window win +cdef readonly Window event_win +cdef readonly int mode +cdef readonly int detail +cdef readonly unsigned int time + + +cdef class EventMouseOut(ecore.c_ecore.Event): +cdef readonly int modifiers +cdef readonly int x +cdef readonly int y +cdef readonly EventPoint root +cdef readonly Window win +cdef readonly Window event_win +cdef readonly int mode +cdef readonly int detail +cdef readonly unsigned int time + + +cdef class EventMouseWheel(ecore.c_ecore.Event): +cdef readonly int direction +cdef readonly int z +cdef readonly int modifiers +cdef readonly int x +cdef readonly int y +cdef readonly EventPoint root +cdef readonly Window win +cdef readonly Window event_win +cdef readonly unsigned int time + + +cdef class EventWindowFocusIn(ecore.c_ecore.Event): +cdef readonly Window win +cdef readonly int mode +cdef readonly int detail +cdef readonly unsigned int time + + +cdef class EventWindowFocusOut(ecore.c_ecore.Event): +cdef readonly Window win +cdef readonly int mode +cdef readonly int detail +cdef readonly unsigned int time + + +cdef class EventWindowKeymap(ecore.c_ecore.Event): +cdef readonly Window win + + +cdef class EventWindowDamage(ecore.c_ecore.Event): +cdef readonly Window win +cdef readonly int x +cdef readonly int y +cdef readonly int w +cdef readonly int h +cdef readonly int count +cdef readonly unsigned int time + + +cdef class EventWindowVisibilityChange(ecore.c_ecore.Event): +cdef readonly Window win +cdef readonly int fully_obscured +cdef readonly unsigned int time + + +cdef class EventWindowCreate(ecore.c_ecore.Event): +cdef readonly Window win +cdef readonly int override +cdef readonly unsigned int time + + +cdef class EventWindowDestroy(ecore.c_ecore.Event): +cdef readonly Window win +cdef readonly unsigned int time + + +cdef class EventWindowHide(ecore.c_ecore.Event): +cdef rea
E CVS: proto/python-efl barbieri
Enlightenment CVS committal Author : barbieri Project : e17 Module : proto/python-efl Dir : e17/proto/python-efl/python-ecore/ecore/x Modified Files: __init__.py ecore.x.c_ecore_x.pyx ecore.x.c_ecore_x_window.pxi Added Files: ecore.x.c_ecore_x_events.pxi Log Message: Ecore events support and ecore.x.Window improvements, with examples. ecore now provides event support, it's generic, but types need to be registered with ecore._event_mapping_register(type, class) before they're used. ecore.x was improved to handle almost all events, example were added to examples/x. === RCS file: /cvs/e/e17/proto/python-efl/python-ecore/ecore/x/__init__.py,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- __init__.py 5 Nov 2007 22:52:56 - 1.3 +++ __init__.py 12 Nov 2007 01:55:04 - 1.4 @@ -121,3 +121,118 @@ ECORE_X_GRAVITY_S = 8 ECORE_X_GRAVITY_SE = 9 ECORE_X_GRAVITY_STATIC = 10 + +ECORE_X_WINDOW_STATE_ICONIFIED = 0 +ECORE_X_WINDOW_STATE_MODAL = 1 +ECORE_X_WINDOW_STATE_STICKY = 2 +ECORE_X_WINDOW_STATE_MAXIMIZED_VERT = 3 +ECORE_X_WINDOW_STATE_MAXIMIZED_HORZ = 4 +ECORE_X_WINDOW_STATE_SHADED = 5 +ECORE_X_WINDOW_STATE_SKIP_TASKBAR = 6 +ECORE_X_WINDOW_STATE_SKIP_PAGER = 7 +ECORE_X_WINDOW_STATE_HIDDEN = 8 +ECORE_X_WINDOW_STATE_FULLSCREEN = 9 +ECORE_X_WINDOW_STATE_ABOVE = 10 +ECORE_X_WINDOW_STATE_BELOW = 11 +ECORE_X_WINDOW_STATE_DEMANDS_ATTENTION = 12 +ECORE_X_WINDOW_STATE_UNKNOWN = 13 + +ECORE_X_WINDOW_STATE_ACTION_REMOVE = 0 +ECORE_X_WINDOW_STATE_ACTION_ADD = 1 +ECORE_X_WINDOW_STATE_ACTION_TOGGLE = 2 + +ECORE_X_WINDOW_STACK_ABOVE = 0 +ECORE_X_WINDOW_STACK_BELOW = 1 +ECORE_X_WINDOW_STACK_TOP_IF = 2 +ECORE_X_WINDOW_STACK_BOTTOM_IF = 3 +ECORE_X_WINDOW_STACK_OPPOSITE = 4 + +ECORE_X_RANDR_ROT_0 = 1 +ECORE_X_RANDR_ROT_90 = 2 +ECORE_X_RANDR_ROT_180 = 4 +ECORE_X_RANDR_ROT_270 = 8, +ECORE_X_RANDR_FLIP_X = 16, +ECORE_X_RANDR_FLIP_Y = 32 + +ECORE_X_SHAPE_BOUNDING = 0 +ECORE_X_SHAPE_CLIP = 1 + +ECORE_X_WM_PROTOCOL_DELETE_REQUEST = 0 +ECORE_X_WM_PROTOCOL_TAKE_FOCUS = 1 +ECORE_X_NET_WM_PROTOCOL_PING = 2 +ECORE_X_NET_WM_PROTOCOL_SYNC_REQUEST = 3 +ECORE_X_WM_PROTOCOL_NUM = 4 + +ECORE_X_WINDOW_INPUT_MODE_NONE = 0 +ECORE_X_WINDOW_INPUT_MODE_PASSIVE = 1 +ECORE_X_WINDOW_INPUT_MODE_ACTIVE_LOCAL = 2 +ECORE_X_WINDOW_INPUT_MODE_ACTIVE_GLOBAL = 3 + +ECORE_X_WINDOW_STATE_HINT_NONE = -1 +ECORE_X_WINDOW_STATE_HINT_WITHDRAWN = 0 +ECORE_X_WINDOW_STATE_HINT_NORMAL = 1 +ECORE_X_WINDOW_STATE_HINT_ICONIC = 2 + +ECORE_X_WINDOW_TYPE_DESKTOP = 0 +ECORE_X_WINDOW_TYPE_DOCK = 1 +ECORE_X_WINDOW_TYPE_TOOLBAR = 2 +ECORE_X_WINDOW_TYPE_MENU = 3 +ECORE_X_WINDOW_TYPE_UTILITY = 4 +ECORE_X_WINDOW_TYPE_SPLASH = 5 +ECORE_X_WINDOW_TYPE_DIALOG = 6 +ECORE_X_WINDOW_TYPE_NORMAL = 7 +ECORE_X_WINDOW_TYPE_UNKNOWN = 8 + +ECORE_X_ACTION_MOVE = 0 +ECORE_X_ACTION_RESIZE = 1 +ECORE_X_ACTION_MINIMIZE = 2 +ECORE_X_ACTION_SHADE = 3 +ECORE_X_ACTION_STICK = 4 +ECORE_X_ACTION_MAXIMIZE_HORZ = 5 +ECORE_X_ACTION_MAXIMIZE_VERT = 6 +ECORE_X_ACTION_FULLSCREEN = 7 +ECORE_X_ACTION_CHANGE_DESKTOP = 8 +ECORE_X_ACTION_CLOSE = 9 + +ECORE_X_WINDOW_CONFIGURE_MASK_X = 1 +ECORE_X_WINDOW_CONFIGURE_MASK_Y = 2 +ECORE_X_WINDOW_CONFIGURE_MASK_W = 4 +ECORE_X_WINDOW_CONFIGURE_MASK_H = 8 +ECORE_X_WINDOW_CONFIGURE_MASK_BORDER_WIDTH = 16 +ECORE_X_WINDOW_CONFIGURE_MASK_SIBLING = 32 +ECORE_X_WINDOW_CONFIGURE_MASK_STACK_MODE = 64 + +ECORE_X_WINDOW_LAYER_BELOW = 2 +ECORE_X_WINDOW_LAYER_NORMAL = 4 +ECORE_X_WINDOW_LAYER_ABOVE = 6 + +ECORE_X_PROP_LIST_REMOVE = 0 +ECORE_X_PROP_LIST_ADD = 1 +ECORE_X_PROP_LIST_TOGGLE = 2 + +ECORE_X_MWM_HINT_FUNC_ALL = 1 +ECORE_X_MWM_HINT_FUNC_RESIZE = 2 +ECORE_X_MWM_HINT_FUNC_MOVE = 4 +ECORE_X_MWM_HINT_FUNC_MINIMIZE = 8 +ECORE_X_MWM_HINT_FUNC_MAXIMIZE = 16 +ECORE_X_MWM_HINT_FUNC_CLOSE = 32 + +ECORE_X_MWM_HINT_DECOR_ALL = 1 +ECORE_X_MWM_HINT_DECOR_BORDER = 2 +ECORE_X_MWM_HINT_DECOR_RESIZEH = 4 +ECORE_X_MWM_HINT_DECOR_TITLE = 8 +ECORE_X_MWM_HINT_DECOR_MENU = 16 +ECORE_X_MWM_HINT_DECOR_MINIMIZE = 32 +ECORE_X_MWM_HINT_DECOR_MAXIMIZE = 64 + +ECORE_X_MWM_HINT_INPUT_MODELESS = 0 +ECORE_X_MWM_HINT_INPUT_PRIMARY_APPLICATION_MODAL = 1 +ECORE_X_MWM_HINT_INPUT_SYSTEM_MODAL = 2 +ECORE_X_MWM_HINT_INPUT_FULL_APPLICATION_MODAL = 3 + +ECORE_X_DAMAGE_REPORT_RAW_RECTANGLES = 0 +ECORE_X_DAMAGE_REPORT_DELTA_RECTANGLES = 1 +ECORE_X_DAMAGE_REPORT_BOUNDING_BOX = 2 +ECORE_X_DAMAGE_REPORT_NON_EMPTY = 3 + +init() === RCS file: /cvs/e/e17/proto/python-efl/python-ecore/ecore/x/ecore.x.c_ecore_x.pyx,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- ecore.x.c_ecore_x.pyx 5 Nov 2007 21:50:55 - 1.1 +++ ecore.x.c_ecore_x.pyx 12 Nov 2007 01:55:04 - 1.2 @@ -12,11 +12,14 @@ @rtype: int """ cdef char *s +cdef int i if name is None: s = NULL else: s = name -return ecore_x_init(s) +i = ecore_x_init(s) +x_events_register
E CVS: proto/python-efl barbieri
Enlightenment CVS committal Author : barbieri Project : e17 Module : proto/python-efl Dir : e17/proto/python-efl/python-ecore/include/ecore Modified Files: c_ecore.pxd Log Message: Ecore events support and ecore.x.Window improvements, with examples. ecore now provides event support, it's generic, but types need to be registered with ecore._event_mapping_register(type, class) before they're used. ecore.x was improved to handle almost all events, example were added to examples/x. === RCS file: /cvs/e/e17/proto/python-efl/python-ecore/include/ecore/c_ecore.pxd,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- c_ecore.pxd 30 Sep 2007 22:18:52 - 1.1 +++ c_ecore.pxd 12 Nov 2007 01:55:05 - 1.2 @@ -15,6 +15,7 @@ cdef struct Ecore_Idle_Enterer cdef struct Ecore_Idle_Exiter ctypedef struct Ecore_Fd_Handler +ctypedef void Ecore_Event_Handler int ecore_init() int ecore_shutdown() @@ -50,6 +51,10 @@ int ecore_main_fd_handler_active_get(Ecore_Fd_Handler *fd_handler, Ecore_Fd_Handler_Flags flags) void ecore_main_fd_handler_active_set(Ecore_Fd_Handler *fd_handler, Ecore_Fd_Handler_Flags flags) +Ecore_Event_Handler *ecore_event_handler_add(int type, int (*func) (void *data, int type, void *event), void *data) +void *ecore_event_handler_del(Ecore_Event_Handler *event_handler) + + cdef class Timer: cdef Ecore_Timer *obj @@ -105,3 +110,20 @@ cdef object _prepare_callback cdef object _exec(self) + + +cdef public class Event [object PyEcoreEvent, type PyEcoreEvent_Type]: +cdef int _set_obj(self, void *obj) except 0 + + +cdef class EventHandler: +cdef Ecore_Event_Handler *obj +cdef readonly int type +cdef readonly object event_cls +cdef readonly object func +cdef readonly object args +cdef readonly object kargs + +cdef int _set_obj(self, Ecore_Event_Handler *obj) except 0 +cdef int _unset_obj(self) except 0 +cdef int _exec(self, void *event) except 2 - This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto/python-efl barbieri
Enlightenment CVS committal Author : barbieri Project : e17 Module : proto/python-efl Dir : e17/proto/python-efl/python-ecore/ecore Modified Files: .cvsignore __init__.py ecore.c_ecore.pyx Added Files: ecore.c_ecore_events.pxi Log Message: Ecore events support and ecore.x.Window improvements, with examples. ecore now provides event support, it's generic, but types need to be registered with ecore._event_mapping_register(type, class) before they're used. ecore.x was improved to handle almost all events, example were added to examples/x. === RCS file: /cvs/e/e17/proto/python-efl/python-ecore/ecore/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- .cvsignore 6 Jul 2007 20:44:05 - 1.1 +++ .cvsignore 12 Nov 2007 01:55:04 - 1.2 @@ -1,3 +1,5 @@ *.pyc *.pyo ecore.c_ecore.c +ecore.c_ecore.h +ecore.c_ecore.pxi === RCS file: /cvs/e/e17/proto/python-efl/python-ecore/ecore/__init__.py,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- __init__.py 2 Sep 2007 15:11:54 - 1.5 +++ __init__.py 12 Nov 2007 01:55:04 - 1.6 @@ -3,10 +3,11 @@ import c_ecore from c_ecore import shutdown, time_get, timer_add, \ - main_loop_begin, main_loop_quit, main_loop_iterate, \ + main_loop_begin, main_loop_quit, main_loop_iterate, event_handler_add, \ animator_add, animator_frametime_set, animator_frametime_get, \ idler_add, idle_enterer_add, idle_exiter_add, fd_handler_add, \ - Animator, Timer, Idler, IdleExiter, IdleEnterer, FdHandler + Animator, Timer, Idler, IdleExiter, IdleEnterer, FdHandler, \ + Event, EventHandler ECORE_FD_NONE = 0 === RCS file: /cvs/e/e17/proto/python-efl/python-ecore/ecore/ecore.c_ecore.pyx,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- ecore.c_ecore.pyx 1 Oct 2007 04:34:47 - 1.7 +++ ecore.c_ecore.pyx 12 Nov 2007 01:55:04 - 1.8 @@ -57,3 +57,4 @@ include "ecore.c_ecore_idle_enterer.pxi" include "ecore.c_ecore_idle_exiter.pxi" include "ecore.c_ecore_fd_handler.pxi" +include "ecore.c_ecore_events.pxi" - This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto/python-efl barbieri
Enlightenment CVS committal Author : barbieri Project : e17 Module : proto/python-efl Dir : e17/proto/python-efl/python-ecore/examples/x Added Files: mplayer_embed.py window_creation.py Log Message: Ecore events support and ecore.x.Window improvements, with examples. ecore now provides event support, it's generic, but types need to be registered with ecore._event_mapping_register(type, class) before they're used. ecore.x was improved to handle almost all events, example were added to examples/x. - This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto/python-efl barbieri
Enlightenment CVS committal Author : barbieri Project : e17 Module : proto/python-efl Dir : e17/proto/python-efl/python-ecore/examples/x Log Message: Directory /cvs/e/e17/proto/python-efl/python-ecore/examples/x added to the repository - This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto/python-efl barbieri
Enlightenment CVS committal Author : barbieri Project : e17 Module : proto/python-efl Dir : e17/proto/python-efl/python-evas/include/evas Modified Files: c_evas.pxd Log Message: Event classes now keep a copy of values, so it can be stored and used out of the callback. === RCS file: /cvs/e/e17/proto/python-efl/python-evas/include/evas/c_evas.pxd,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- c_evas.pxd 21 Oct 2007 00:51:03 - 1.4 +++ c_evas.pxd 7 Nov 2007 15:36:29 - 1.5 @@ -536,7 +536,8 @@ cdef class EventPoint: -cdef Evas_Point *obj +cdef readonly int x +cdef readonly int y cdef void _set_obj(self, Evas_Point *obj) @@ -549,56 +550,71 @@ cdef class EventMouseIn: -cdef Evas_Event_Mouse_In *obj cdef readonly EventPosition position +cdef readonly int buttons +cdef readonly unsigned timestamp cdef void _set_obj(self, void *ptr) cdef class EventMouseOut: -cdef Evas_Event_Mouse_Out *obj cdef readonly EventPosition position +cdef readonly int buttons +cdef readonly unsigned timestamp cdef void _set_obj(self, void *ptr) cdef class EventMouseDown: -cdef Evas_Event_Mouse_Down *obj cdef readonly EventPosition position +cdef readonly int button +cdef readonly unsigned timestamp cdef void _set_obj(self, void *ptr) cdef class EventMouseUp: -cdef Evas_Event_Mouse_Up *obj cdef readonly EventPosition position +cdef readonly int button +cdef readonly unsigned timestamp cdef void _set_obj(self, void *ptr) cdef class EventMouseMove: -cdef Evas_Event_Mouse_Move *obj cdef readonly EventPosition position cdef readonly EventPosition prev_position +cdef readonly int buttons +cdef readonly unsigned timestamp cdef void _set_obj(self, void *ptr) cdef class EventMouseWheel: -cdef Evas_Event_Mouse_Wheel *obj cdef readonly EventPosition position +cdef readonly int direction +cdef readonly int z +cdef readonly unsigned timestamp cdef void _set_obj(self, void *ptr) cdef class EventKeyDown: -cdef Evas_Event_Key_Down *obj +cdef readonly object keyname +cdef readonly object key +cdef readonly object string +cdef readonly object compose +cdef readonly unsigned timestamp cdef void _set_obj(self, void *ptr) cdef class EventKeyUp: -cdef Evas_Event_Key_Up *obj +cdef readonly object keyname +cdef readonly object key +cdef readonly object string +cdef readonly object compose +cdef readonly unsigned timestamp cdef void _set_obj(self, void *ptr) - This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto/python-efl barbieri
Enlightenment CVS committal
Author : barbieri
Project : e17
Module : proto/python-efl
Dir : e17/proto/python-efl/python-evas/evas
Modified Files:
evas.c_evas_object_events.pxi
Log Message:
Event classes now keep a copy of values, so it can be stored and used out of
the callback.
===
RCS file:
/cvs/e/e17/proto/python-efl/python-evas/evas/evas.c_evas_object_events.pxi,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- evas.c_evas_object_events.pxi 28 Sep 2007 18:06:26 - 1.2
+++ evas.c_evas_object_events.pxi 7 Nov 2007 15:36:29 - 1.3
@@ -2,31 +2,24 @@
cdef class EventPoint:
cdef void _set_obj(self, Evas_Point *obj):
-self.obj = obj
+self.x = obj.x
+self.y = obj.y
def __str__(self):
-return "%s(%d, %d)" % (self.__class__.__name__, self.obj.x, self.obj.y)
-
-property x:
-def __get__(self):
-return self.obj.x
-
-property y:
-def __get__(self):
-return self.obj.y
+return "%s(%d, %d)" % (self.__class__.__name__, self.x, self.y)
property xy:
def __get__(self):
-return (self.obj.x, self.obj.y)
+return (self.x, self.y)
def __len__(self):
return 2
def __getitem__(self, int index):
if index == 0:
-return self.obj.x
+return self.x
elif index == 1:
-return self.obj.y
+return self.y
else:
raise IndexError("list index out of range")
@@ -48,235 +41,180 @@
cdef class EventMouseIn:
cdef void _set_obj(self, void *ptr):
-self.obj = ptr
+cdef Evas_Event_Mouse_In *obj
+obj = ptr
+self.buttons = obj.buttons
+self.timestamp = obj.timestamp
self.position = EventPosition()
-self.position._set_objs(&self.obj.output, &self.obj.canvas)
+self.position._set_objs(&obj.output, &obj.canvas)
def __str__(self):
return ("%s(buttons=%d, output=(%d, %d), canvas=(%d, %d), "
"timestamp=%d)") % \
-(self.__class__.__name__, self.obj.buttons,
- self.obj.output.x, self.obj.output.y,
- self.obj.canvas.x, self.obj.canvas.y,
- self.obj.timestamp)
-
-property buttons:
-def __get__(self):
-return self.obj.buttons
-
-property timestamp:
-def __get__(self):
-return self.obj.timestamp
+(self.__class__.__name__, self.buttons,
+ self.position.output.x, self.position.output.y,
+ self.position.canvas.x, self.position.canvas.y,
+ self.timestamp)
cdef class EventMouseOut:
cdef void _set_obj(self, void *ptr):
-self.obj = ptr
+cdef Evas_Event_Mouse_Out *obj
+obj = ptr
+self.buttons = obj.buttons
+self.timestamp = obj.timestamp
self.position = EventPosition()
-self.position._set_objs(&self.obj.output, &self.obj.canvas)
+self.position._set_objs(&obj.output, &obj.canvas)
def __str__(self):
return ("%s(buttons=%d, output=(%d, %d), canvas=(%d, %d), "
"timestamp=%d)") % \
-(self.__class__.__name__, self.obj.buttons,
- self.obj.output.x, self.obj.output.y,
- self.obj.canvas.x, self.obj.canvas.y,
- self.obj.timestamp)
-
-property buttons:
-def __get__(self):
-return self.obj.buttons
-
-property timestamp:
-def __get__(self):
-return self.obj.timestamp
+(self.__class__.__name__, self.buttons,
+ self.position.output.x, self.position.output.y,
+ self.position.canvas.x, self.position.canvas.y,
+ self.timestamp)
cdef class EventMouseDown:
cdef void _set_obj(self, void *ptr):
-self.obj = ptr
+cdef Evas_Event_Mouse_Down *obj
+obj = ptr
+self.button = obj.button
+self.timestamp = obj.timestamp
self.position = EventPosition()
-self.position._set_objs(&self.obj.output, &self.obj.canvas)
+self.position._set_objs(&obj.output, &obj.canvas)
def __str__(self):
return ("%s(button=%d, output=(%d, %d), canvas=(%d, %d), "
"timestamp=%d)") % \
-(self.__class__.__name__, self.obj.button,
- self.obj.output.x, self.obj.output.y,
- self.obj.canvas.x, self.obj.canvas.y,
- self.obj.timestamp)
-
-property button:
-def __get__(self):
-return self.obj.button
-
-property timestamp:
-def __get__(self):
-return self.obj.timestamp
+(self.__class__.__name__, self.button,
+ self.position.output.x, self.position.out
E CVS: proto/python-efl barbieri
Enlightenment CVS committal Author : barbieri Project : e17 Module : proto/python-efl Dir : e17/proto/python-efl Modified Files: build-all.sh Log Message: Update build script. === RCS file: /cvs/e/e17/proto/python-efl/build-all.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- build-all.sh2 Oct 2007 01:18:30 - 1.1 +++ build-all.sh7 Nov 2007 15:34:42 - 1.2 @@ -10,7 +10,7 @@ echo "Install to $PREFIX" CWD=$PWD -for m in evas ecore edje emotion e_dbus; do +for m in evas ecore edje emotion e_dbus epsilon; do cd $CWD/python-$m || die "cd python-$m" ./build.sh --force $PREFIX || die "failed to build python-$m" done - This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto/python-efl barbieri
Enlightenment CVS committal Author : barbieri Project : e17 Module : proto/python-efl Dir : e17/proto/python-efl/python-ecore/ecore/x Modified Files: __init__.py Log Message: Define some constants. === RCS file: /cvs/e/e17/proto/python-efl/python-ecore/ecore/x/__init__.py,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- __init__.py 5 Nov 2007 21:50:55 - 1.2 +++ __init__.py 5 Nov 2007 22:52:56 - 1.3 @@ -78,3 +78,46 @@ ECORE_X_CURSOR_UR_ANGLE = 148 ECORE_X_CURSOR_WATCH = 150 ECORE_X_CURSOR_XTERM = 152 + +ECORE_X_WINDOW_CONFIGURE_MASK_X = 1 +ECORE_X_WINDOW_CONFIGURE_MASK_Y = 2 +ECORE_X_WINDOW_CONFIGURE_MASK_W = 4 +ECORE_X_WINDOW_CONFIGURE_MASK_H = 8 +ECORE_X_WINDOW_CONFIGURE_MASK_BORDER_WIDTH = 16 +ECORE_X_WINDOW_CONFIGURE_MASK_SIBLING = 32 +ECORE_X_WINDOW_CONFIGURE_MASK_STACK_MODE = 64 + +ECORE_X_EVENT_MASK_NONE = 0L # 0L +ECORE_X_EVENT_MASK_KEY_DOWN = 1L # (1L << 0) +ECORE_X_EVENT_MASK_KEY_UP = 2L # (1L << 1) +ECORE_X_EVENT_MASK_MOUSE_DOWN = 4L # (1L << 2) +ECORE_X_EVENT_MASK_MOUSE_UP = 8L # (1L << 3) +ECORE_X_EVENT_MASK_MOUSE_IN = 16L# (1L << 4) +ECORE_X_EVENT_MASK_MOUSE_OUT = 32L # (1L << 5) +ECORE_X_EVENT_MASK_MOUSE_MOVE = 64L # (1L << 6) +ECORE_X_EVENT_MASK_WINDOW_DAMAGE = 32768L# (1L << 15) +ECORE_X_EVENT_MASK_WINDOW_VISIBILITY = 65536L# (1L << 16) +ECORE_X_EVENT_MASK_WINDOW_CONFIGURE = 131072L# (1L << 17) +ECORE_X_EVENT_MASK_WINDOW_RESIZE_MANAGE = 262144L# (1L << 18) +ECORE_X_EVENT_MASK_WINDOW_MANAGE = 524288L # (1L << 19) +ECORE_X_EVENT_MASK_WINDOW_CHILD_CONFIGURE = 1048576L # (1L << 20) +ECORE_X_EVENT_MASK_WINDOW_FOCUS_CHANGE = 2097152L# (1L << 21) +ECORE_X_EVENT_MASK_WINDOW_PROPERTY = 4194304L# (1L << 22) +ECORE_X_EVENT_MASK_WINDOW_COLORMAP = 8388608L# (1L << 23) +ECORE_X_EVENT_MASK_WINDOW_GRAB = 16777216L # (1L << 24) +ECORE_X_EVENT_MASK_MOUSE_WHEEL = 536870912L # (1L << 29) +ECORE_X_EVENT_MASK_WINDOW_FOCUS_IN = 1073741824L # (1L << 30) +ECORE_X_EVENT_MASK_WINDOW_FOCUS_OUT = 2147483648L# (1L << 31) + +ECORE_X_GRAVITY_FORGET = 0 +ECORE_X_GRAVITY_UNMAP = 0 +ECORE_X_GRAVITY_NW = 1 +ECORE_X_GRAVITY_N = 2 +ECORE_X_GRAVITY_NE = 3 +ECORE_X_GRAVITY_W = 4 +ECORE_X_GRAVITY_CENTER = 5 +ECORE_X_GRAVITY_E = 6 +ECORE_X_GRAVITY_SW = 7 +ECORE_X_GRAVITY_S = 8 +ECORE_X_GRAVITY_SE = 9 +ECORE_X_GRAVITY_STATIC = 10 - This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto/python-efl barbieri
Enlightenment CVS committal
Author : barbieri
Project : e17
Module : proto/python-efl
Dir : e17/proto/python-efl/python-ecore
Modified Files:
build.sh setup.py
Log Message:
Basic Ecore_X (Window) support.
===
RCS file: /cvs/e/e17/proto/python-efl/python-ecore/build.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- build.sh2 Oct 2007 01:18:30 - 1.1
+++ build.sh5 Nov 2007 21:50:55 - 1.2
@@ -1,7 +1,7 @@
#!/bin/sh
PREFIX="$HOME/usr"
-PYX_FILES="ecore/ecore.c_ecore.pyx ecore/evas/ecore.evas.c_ecore_evas.pyx"
+PYX_FILES="ecore/ecore.c_ecore.pyx ecore/evas/ecore.evas.c_ecore_evas.pyx
ecore/x/ecore.x.c_ecore_x.pyx ecore/x/ecore.x.screensaver.pyx"
for arg in $@; do
case $arg in
===
RCS file: /cvs/e/e17/proto/python-efl/python-ecore/setup.py,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- setup.py4 Oct 2007 19:21:33 - 1.16
+++ setup.py5 Nov 2007 21:50:55 - 1.17
@@ -51,6 +51,17 @@
],
**pkgconfig('"ecore-evas >= 0.9.9.040"'))
+ecorexmodule = Extension('ecore.x.c_ecore_x',
+sources=['ecore/x/ecore.x.c_ecore_x.pyx'],
+depends=['ecore/x/ecore.x.c_ecore_x_window.pxi',
+ 'include/ecore/x/c_ecore_x.pxd',
+ ],
+**pkgconfig('"ecore-x >= 0.9.9.040"'))
+ecorexscreensavermodule = Extension('ecore.x.screensaver',
+sources=['ecore/x/ecore.x.screensaver.pyx'],
+depends=['include/ecore/x/screensaver.pxd'],
+**pkgconfig('"ecore-x >= 0.9.9.040"'))
+
trove_classifiers = [
"Development Status :: 3 - Alpha",
@@ -82,6 +93,9 @@
applications, also updating the screen when necessary (expose events,
for instance), toggling fullscreen, setting window shape, border and
other parameters.
+
+Ecore/X is acts on low-level X11 API, providing resources like XDamage,
+XFixes, window management and more.
"""
@@ -104,7 +118,8 @@
packages=find_packages(),
install_requires=['python-evas>=0.2.0'],
setup_requires=['python-evas>=0.2.0'],
- ext_modules=[ecoremodule, ecoreevasmodule],
+ ext_modules=[ecoremodule, ecoreevasmodule, ecorexmodule,
+ ecorexscreensavermodule],
zip_safe=False,
cmdclass={'build_ext': ecore_build_ext,},
)
-
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto/python-efl barbieri
Enlightenment CVS committal Author : barbieri Project : e17 Module : proto/python-efl Dir : e17/proto/python-efl/python-ecore/ecore/x Modified Files: .cvsignore __init__.py Added Files: ecore.x.c_ecore_x.pyx ecore.x.c_ecore_x_window.pxi ecore.x.screensaver.pyx Log Message: Basic Ecore_X (Window) support. === RCS file: /cvs/e/e17/proto/python-efl/python-ecore/ecore/x/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- .cvsignore 6 Sep 2007 04:17:50 - 1.1 +++ .cvsignore 5 Nov 2007 21:50:55 - 1.2 @@ -1,2 +1,4 @@ *.pyc *.pyo +ecore.x.c_ecore_x.c +ecore.x.screensaver.c === RCS file: /cvs/e/e17/proto/python-efl/python-ecore/ecore/x/__init__.py,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- __init__.py 6 Sep 2007 04:17:50 - 1.1 +++ __init__.py 5 Nov 2007 21:50:55 - 1.2 @@ -1,6 +1,6 @@ #!/usr/bin/env python2 -# XXX TODO: implement ecore_x +from c_ecore_x import * ECORE_X_CURSOR_X = 0 ECORE_X_CURSOR_ARROW = 2 - This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto/python-efl barbieri
Enlightenment CVS committal Author : barbieri Project : e17 Module : proto/python-efl Dir : e17/proto/python-efl/python-ecore/include/ecore/x Added Files: c_ecore_x.pxd screensaver.pxd Log Message: Basic Ecore_X (Window) support. - This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto/python-efl barbieri
Enlightenment CVS committal Author : barbieri Project : e17 Module : proto/python-efl Dir : e17/proto/python-efl/python-ecore/include/ecore/x Log Message: Directory /cvs/e/e17/proto/python-efl/python-ecore/include/ecore/x added to the repository - This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto/python-efl barbieri
Enlightenment CVS committal Author : barbieri Project : e17 Module : proto/python-efl Dir : e17/proto/python-efl/python-ecore/doc/api Added Files: .cvsignore Log Message: .cvsignore++ - This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto/python-efl barbieri
Enlightenment CVS committal Author : barbieri Project : e17 Module : proto/python-efl Dir : e17/proto/python-efl/python-evas/doc/api Added Files: .cvsignore Log Message: .cvsignore++ - This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto/python-efl barbieri
Enlightenment CVS committal Author : barbieri Project : e17 Module : proto/python-efl Dir : e17/proto/python-efl/python-epsilon Added Files: build.sh Log Message: Add build script. - This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto/python-efl barbieri
Enlightenment CVS committal Author : barbieri Project : e17 Module : proto/python-efl Dir : e17/proto/python-efl/python-edje/edje Modified Files: .cvsignore Log Message: .cvsignore++ === RCS file: /cvs/e/e17/proto/python-efl/python-edje/edje/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- .cvsignore 6 Jul 2007 20:44:05 - 1.1 +++ .cvsignore 5 Nov 2007 20:40:48 - 1.2 @@ -1,3 +1,5 @@ *.pyc *.pyo edje.c_edje.c +edje.c_edje.h +edje.c_edje.pxi - This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto/python-efl barbieri
Enlightenment CVS committal Author : barbieri Project : e17 Module : proto/python-efl Dir : e17/proto/python-efl/python-edje/doc/api Added Files: .cvsignore Log Message: .cvsignore++ - This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto/python-efl barbieri
Enlightenment CVS committal
Author : barbieri
Project : e17
Module : proto/python-efl
Dir : e17/proto/python-efl/python-emotion/examples
Modified Files:
emotion_test.py
Log Message:
Make Python-Emotion example work with last Emotion changes.
===
RCS file: /cvs/e/e17/proto/python-efl/python-emotion/examples/emotion_test.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- emotion_test.py 1 Sep 2007 16:10:17 - 1.3
+++ emotion_test.py 4 Nov 2007 02:21:11 - 1.4
@@ -183,7 +183,7 @@
def frame_signal_speed_cb(self, frame, emission, source):
x, y = frame.part_drag_value_get(source)
-spd = 255 * y
+spd = int(255 * y)
frame.color = (spd, spd, spd, spd)
frame.part_text_set("video_speed_txt", "%0.0f" % spd)
@@ -366,7 +366,7 @@
default=(800, 600),
help="use given window geometry")
parser.add_option("-e", "--engine", type="choice",
- choices=("xine", "gst"), default="xine",
+ choices=("xine", "gstreamer"), default="xine",
help=("which multimedia engine to use (xine, gst), "
"default=%default"))
parser.add_option("-d", "--display", type="choice",
@@ -400,11 +400,7 @@
}
cls = display_map[options.display]
-engine_map = {
-"xine": "emotion_decoder_xine.so",
-"gst": "emotion_decoder_gstreamer.so",
-}
-media_module = engine_map[options.engine]
+media_module = options.engine
w, h = options.geometry
ee = cls(w=w, h=h)
-
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto/python-efl barbieri
Enlightenment CVS committal
Author : barbieri
Project : e17
Module : proto/python-efl
Dir : e17/proto/python-efl/python-epsilon/epsilon
Modified Files:
epsilon.request.pyx
Log Message:
Epsilon major overhaul, breaks API.
I fixed many issues with epsilon, mainly the Epsilon_Requests, since
it broke the ABI, I also changed the API and now it looks a bit
better.
Changes overview:
- epsilon_thumb_{init,shutdown} -> epsilon_request_{init,shutdown}
- epsilon_del -> epsilon_request_del()
- epsilon_add(file, dest, size, data) -> epsilon_request_add(file, size, data)
reason: nobody was using "dest", and if one tried to, it was not
implemented. Instead of implementing this, leave to users that
could call ecore_file_cp() on the handler.
- epsilon_request_add() has a fast path check for already existent
thumbnails, instead of going to the server, just
ecore_event_add(). To handle epsilon_request_del() fine, we now
have to keep the Ecore_Event for further deletion.
- epsilon_exists() now just checks the mtime of source and thumbnail,
if source is newer, then return EPSILON_FAIL so users regenerate
it. There is a possible optimization to be done (it's marked on
code in the right place) that can read original file tags to avoid
regenerating for copies, but it's not reliable and should be
checked after the current ones.
- reoder CFLAGS path order to first use local headers instead of the
system.
- check for errors when loading plugins.
- updated every use of these API in e17 CVS.
If you find a problem with these, let me know and I'll fix.
===
RCS file:
/cvs/e/e17/proto/python-efl/python-epsilon/epsilon/epsilon.request.pyx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- epsilon.request.pyx 31 Oct 2007 15:25:32 - 1.2
+++ epsilon.request.pyx 2 Nov 2007 08:03:46 - 1.3
@@ -6,10 +6,10 @@
)
def shutdown():
-epsilon_shutdown()
+epsilon_request_shutdown()
def init():
-return epsilon_thumb_init()
+return epsilon_request_init()
EPSILON_THUMB_NORMAL = 0
EPSILON_THUMB_LARGE = 1
@@ -26,17 +26,14 @@
The thumbnailer daemon 'epsilon_thumbd' is automatically started.
"""
-def __init__(self, func, char *path, dest=None,
- int size=EPSILON_THUMB_NORMAL):
+def __init__(self, func, char *path, int size=EPSILON_THUMB_NORMAL):
"""Epsilon Request constructor.
@parm func: function to call when request is served.
@parm path: file to process.
-@path dest: if provided (not None), specify where to store the thumb.
@path size: EPSILON_THUMB_NORMAL or EPSILON_THUMB_LARGE (it's not the
size in pixels!)
"""
-cdef char *d
if not callable(func):
raise TypeError("Parameter 'func' must be callable")
@@ -46,11 +43,7 @@
if self.obj == NULL:
self.func = func
-if dest is not None:
-d = dest
-else:
-d = NULL
-self.obj = epsilon_add(path, d, size, self)
+self.obj = epsilon_request_add(path, size, self)
if self.obj != NULL:
python.Py_INCREF(self)
@@ -68,13 +61,13 @@
def __dealloc__(self):
if self.obj != NULL:
-epsilon_del(self.obj)
+epsilon_request_del(self.obj)
self.obj = NULL
def delete(self):
"Stop thumbnail request, free resources."
if self.obj != NULL:
-epsilon_del(self.obj)
+epsilon_request_del(self.obj)
self.obj = NULL
self.func = None
python.Py_DECREF(self)
@@ -106,7 +99,7 @@
property status:
def __get__(self):
if self.obj != NULL:
-return self.obj.status
+return bool(self.obj.status)
init()
-
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto/python-efl barbieri
Enlightenment CVS committal
Author : barbieri
Project : e17
Module : proto/python-efl
Dir : e17/proto/python-efl/python-epsilon/include/epsilon
Modified Files:
request.pxd
Log Message:
Epsilon major overhaul, breaks API.
I fixed many issues with epsilon, mainly the Epsilon_Requests, since
it broke the ABI, I also changed the API and now it looks a bit
better.
Changes overview:
- epsilon_thumb_{init,shutdown} -> epsilon_request_{init,shutdown}
- epsilon_del -> epsilon_request_del()
- epsilon_add(file, dest, size, data) -> epsilon_request_add(file, size, data)
reason: nobody was using "dest", and if one tried to, it was not
implemented. Instead of implementing this, leave to users that
could call ecore_file_cp() on the handler.
- epsilon_request_add() has a fast path check for already existent
thumbnails, instead of going to the server, just
ecore_event_add(). To handle epsilon_request_del() fine, we now
have to keep the Ecore_Event for further deletion.
- epsilon_exists() now just checks the mtime of source and thumbnail,
if source is newer, then return EPSILON_FAIL so users regenerate
it. There is a possible optimization to be done (it's marked on
code in the right place) that can read original file tags to avoid
regenerating for copies, but it's not reliable and should be
checked after the current ones.
- reoder CFLAGS path order to first use local headers instead of the
system.
- check for errors when loading plugins.
- updated every use of these API in e17 CVS.
If you find a problem with these, let me know and I'll fix.
===
RCS file:
/cvs/e/e17/proto/python-efl/python-epsilon/include/epsilon/request.pxd,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- request.pxd 31 Oct 2007 15:25:33 - 1.2
+++ request.pxd 2 Nov 2007 08:03:46 - 1.3
@@ -13,10 +13,10 @@
int EPSILON_EVENT_DONE
-int epsilon_thumb_init()
-int epsilon_shutdown()
-Epsilon_Request *epsilon_add(char *path, char *dst, int size, void *data)
-void epsilon_del(Epsilon_Request *thumb)
+int epsilon_request_init()
+int epsilon_request_shutdown()
+Epsilon_Request *epsilon_request_add(char *path, int size, void *data)
+void epsilon_request_del(Epsilon_Request *thumb)
cdef extern from "Ecore.h":
-
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto/python-efl barbieri
Enlightenment CVS committal
Author : barbieri
Project : e17
Module : proto/python-efl
Dir : e17/proto/python-efl/python-epsilon/epsilon
Modified Files:
__init__.py epsilon.c_epsilon.pyx
Log Message:
Implement epsilon API (most of).
===
RCS file: /cvs/e/e17/proto/python-efl/python-epsilon/epsilon/__init__.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- __init__.py 31 Oct 2007 00:06:43 - 1.1
+++ __init__.py 1 Nov 2007 18:46:42 - 1.2
@@ -1 +1,3 @@
#!/usr/bin/env python
+
+from c_epsilon import init, EPSILON_THUMB_NORMAL, EPSILON_THUMB_LARGE, Epsilon
===
RCS file:
/cvs/e/e17/proto/python-efl/python-epsilon/epsilon/epsilon.c_epsilon.pyx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- epsilon.c_epsilon.pyx 31 Oct 2007 00:06:43 - 1.1
+++ epsilon.c_epsilon.pyx 1 Nov 2007 18:46:42 - 1.2
@@ -1 +1,161 @@
-# TODO
+
+__extra_epydoc_fields__ = (
+("parm", "Parameter", "Parameters"), # epydoc don't support pyrex properly
+)
+
+def init():
+return epsilon_init()
+
+EPSILON_THUMB_NORMAL = 0
+EPSILON_THUMB_LARGE = 1
+
+cdef class Epsilon:
+"""Epsilon thumbnail generator.
+
+Epsilon produces freedesktop.org-compatible thumbnails, it can
+use Imlib2, EPEG and external plugins. Imlib2 is the general
+purpose image loader, EPEG is a super-fast JPEG, external plugins
+can provide any thumbnail support, like xine to use videos.
+"""
+def __init__(self, char *path, thumb_size=None, key=None, resolution=None):
+"""Epsilon constructor.
+
+@parm path: full path of image to process.
+@parm thumb_size: one of EPSILON_THUMB_NORMAL or EPSILON_THUMB_LARGE
+@parm key: just used by edje to specify the part to process.
+@parm resolution: just used by edje to specify render size.
+"""
+if self.obj == NULL:
+self.obj = epsilon_new(path)
+if thumb_size is not None:
+self.thumb_size_set(thumb_size)
+if key is not None:
+self.key_set(key)
+if resolution is not None:
+self.resolution_set(resolution)
+
+def __str__(self):
+return ("%s(path=%r, key=%s, thumb_file=%r, thumb_size=%r, "
+"resolution=%r)") % \
+ (self.__class__.__name__, self.file, self.key, self.thumb_file,
+self.thumb_size, self.resolution)
+
+def __repr__(self):
+return ("%s(0x%x, path=%r, key=%s, thumb_file=%r, thumb_size=%r, "
+"resolution=%r, Epsilon=%#x, refcount=%d)") % \
+ (self.__class__.__name__, self,
+self.file, self.key, self.thumb_file,
+self.thumb_size, self.resolution,
+self.obj, PY_REFCOUNT(self))
+
+def __dealloc__(self):
+if self.obj != NULL:
+epsilon_free(self.obj)
+self.obj = NULL
+
+def exists(self):
+"""Check if thumbnail exists.
+
+ @rtype: bool
+"""
+return bool(epsilon_exists(self.obj) == EPSILON_OK)
+
+def generate(self):
+"""Force thumbnail generation.
+
+ @note: this will overwrite existing thumbnail.
+"""
+return bool(epsilon_generate(self.obj) == EPSILON_OK)
+
+def key_set(self, char *key):
+"""Specify key inside file to use.
+
+ So far, this is just used by Edje to choose which group to use.
+"""
+epsilon_key_set(self.obj, key)
+
+def key_get(self):
+"@rtype: str or None"
+if self.obj and self.obj.key:
+return self.obj.key
+
+property key:
+def __set__(self, char *key):
+self.key_set(key)
+
+def __get__(self):
+return self.key_get()
+
+def resolution_set(self, int w, int h):
+"""Specify resolution to render thumbnail before scaling.
+
+ So far, this is just used to render Edje objects.
+"""
+epsilon_resolution_set(self.obj, w, h)
+
+def resolution_get(self):
+"@rtype: tuple of int"
+if self.obj:
+return (self.obj.w, self.obj.h)
+else:
+return (0, 0)
+
+property resolution:
+def __set__(self, value):
+cdef int w, h
+w, h = value
+self.resolution_set(w, h)
+
+def __get__(self):
+return self.resolution_get()
+
+def thumb_size_set(self, int value):
+"""Specify thumbnail size, either EPSILON_THUMB_NORMAL (128x128) or
+ EPSILON_THUMB_LARGE (256x256).
+"""
+if value != EPSILON_THUMB_NORMAL and value != EPSILON_THUMB_LARGE:
+raise ValueError("value must be either EPSILON_THUMB_NORMAL or "
+ "EPSILON_THUMB_LARGE")
+
E CVS: proto/python-efl barbieri
Enlightenment CVS committal Author : barbieri Project : e17 Module : proto/python-efl Dir : e17/proto/python-efl/python-epsilon/examples Added Files: epsilon_test.py Log Message: Implement epsilon API (most of). - This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto/python-efl barbieri
Enlightenment CVS committal Author : barbieri Project : e17 Module : proto/python-efl Dir : e17/proto/python-efl/python-epsilon/include/epsilon Modified Files: c_epsilon.pxd Log Message: Implement epsilon API (most of). === RCS file: /cvs/e/e17/proto/python-efl/python-epsilon/include/epsilon/c_epsilon.pxd,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- c_epsilon.pxd 31 Oct 2007 00:06:43 - 1.1 +++ c_epsilon.pxd 1 Nov 2007 18:46:42 - 1.2 @@ -0,0 +1,55 @@ +cdef extern from "evas/python_evas_utils.h": +int PY_REFCOUNT(object) + + +cdef extern from "Epsilon.h": +cdef enum Epsilon_Return_Value: +EPSILON_FAIL = 0 +EPSILON_OK = 1 + +cdef struct _Epsilon: +char *hash +char *src +char *thumb +char *key +int w +int h +int tw +int th + +ctypedef void Epsilon_Exif_Info + +cdef struct _Epsilon_Info: +char *uri +unsigned long long int mtime +int w +int h +char *mimetype +Epsilon_Exif_Info *eei + + +int epsilon_init() + +_Epsilon *epsilon_new(char *file) +void epsilon_free(_Epsilon *e) +void epsilon_key_set(_Epsilon *e, char *key) +void epsilon_resolution_set(_Epsilon *e, int w, int h) + +char *epsilon_file_get(_Epsilon *e) +char *epsilon_thumb_file_get(_Epsilon *e) +int epsilon_exists(_Epsilon *e) +int epsilon_generate(_Epsilon *e) +void epsilon_thumb_size(_Epsilon *e, int size) + +_Epsilon_Info *epsilon_info_get (_Epsilon *e) + +void epsilon_info_free(_Epsilon_Info *ei) +int epsilon_info_exif_props_as_int_get(_Epsilon_Info *ei, unsigned short lvl, long prop) +char *epsilon_info_exif_props_as_string_get(_Epsilon_Info *ei, unsigned short lvl, long prop) + +void epsilon_info_exif_props_print(_Epsilon_Info *ei) +int epsilon_info_exif_get(_Epsilon_Info *ei) + + +cdef class Epsilon: +cdef _Epsilon *obj - This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto/python-efl barbieri
Enlightenment CVS committal Author : barbieri Project : e17 Module : proto/python-efl Dir : e17/proto/python-efl/python-epsilon/examples Modified Files: epsilon_thumb_test.py Log Message: Have it to run python. === RCS file: /cvs/e/e17/proto/python-efl/python-epsilon/examples/epsilon_thumb_test.py,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- epsilon_thumb_test.py 31 Oct 2007 15:25:33 - 1.2 +++ epsilon_thumb_test.py 1 Nov 2007 07:00:57 - 1.3 @@ -1,3 +1,4 @@ +#!/usr/bin/env python import epsilon.request import ecore import sys - This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto/python-efl barbieri
Enlightenment CVS committal
Author : barbieri
Project : e17
Module : proto/python-efl
Dir : e17/proto/python-efl/python-epsilon/epsilon
Modified Files:
epsilon.request.pyx
Log Message:
Change API, it's way better now.
===
RCS file:
/cvs/e/e17/proto/python-efl/python-epsilon/epsilon/epsilon.request.pyx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- epsilon.request.pyx 31 Oct 2007 00:06:43 - 1.1
+++ epsilon.request.pyx 31 Oct 2007 15:25:32 - 1.2
@@ -9,7 +9,7 @@
epsilon_shutdown()
def init():
-epsilon_thumb_init()
+return epsilon_thumb_init()
EPSILON_THUMB_NORMAL = 0
EPSILON_THUMB_LARGE = 1
@@ -20,21 +20,32 @@
This is an asynchronous request to the thumbnailer, that will take care
of checking if thumbnail needs to be generated and if so, generate it.
-After it's processed, it will be dispatched using callback set with
-L{event_done_handler_set()} and then B{deleted} (it will become shallow
-and no attribute will work, so don't store it).
+After it's processed, it will be dispatched using callback 'func' provided
+to constructor and then the request will be B{deleted} (it will become
+shallow and no attribute will work, so don't store it).
The thumbnailer daemon 'epsilon_thumbd' is automatically started.
"""
-def __init__(self, char *path, dest=None, int size=EPSILON_THUMB_NORMAL):
+def __init__(self, func, char *path, dest=None,
+ int size=EPSILON_THUMB_NORMAL):
"""Epsilon Request constructor.
+@parm func: function to call when request is served.
@parm path: file to process.
@path dest: if provided (not None), specify where to store the thumb.
-@path size: EPSILON_THUMB_NORMAL or EPSILON_THUMB_LARGE
+@path size: EPSILON_THUMB_NORMAL or EPSILON_THUMB_LARGE (it's not the
+ size in pixels!)
"""
cdef char *d
+if not callable(func):
+raise TypeError("Parameter 'func' must be callable")
+
+if size != EPSILON_THUMB_NORMAL and size != EPSILON_THUMB_LARGE:
+raise ValueError("Invalid size, must be EPSILON_THUMB_NORMAL or "
+ "EPSILON_THUMB_LARGE")
+
if self.obj == NULL:
+self.func = func
if dest is not None:
d = dest
else:
@@ -65,6 +76,7 @@
if self.obj != NULL:
epsilon_del(self.obj)
self.obj = NULL
+self.func = None
python.Py_DECREF(self)
def stop(self):
@@ -98,49 +110,23 @@
init()
-cdef object _epsilon_handler_py = None
cdef Ecore_Event_Handler *_epsilon_event_handler = NULL
cdef int _epsilon_event_handler_cb(void *data, int type, void *event) with GIL:
cdef Epsilon_Request *er
cdef Request obj
-global _epsilon_handler_py
er = event
obj = er.data # this may bring problems if Epsilon is used
# by other non-python lib in this same process.
-if _epsilon_handler_py is not None:
-func, args, kargs = _epsilon_handler_py
-try:
-r = func(obj, *args, **kargs)
-except Exception, e:
-traceback.print_exc()
-r = False
-
-if not r:
-_epsilon_handler_py = None
+try:
+obj.func(obj)
+except Exception, e:
+traceback.print_exc()
obj.delete()
return 1
-
-def event_done_handler_set(func, *args, **kargs):
-"""Set callback to call when requests are processed.
-
-Signature: C{function(request, *args, **kargs)}
-"""
-global _epsilon_handler_py
-if func is None:
-_epsilon_handler_py = None
-elif callable(func):
-_epsilon_handler_py = (func, args, kargs)
-else:
-raise TypeError("Parameter 'func' must be callable")
-
-def event_done_handler_unset():
-"Do not deliver requests anymore."
-_epsilon_handler_py = None
-
# Call after init()
# Always execute to clean up generated objects
-
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto/python-efl barbieri
Enlightenment CVS committal Author : barbieri Project : e17 Module : proto/python-efl Dir : e17/proto/python-efl/python-epsilon/examples Modified Files: epsilon_thumb_test.py Log Message: Change API, it's way better now. === RCS file: /cvs/e/e17/proto/python-efl/python-epsilon/examples/epsilon_thumb_test.py,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- epsilon_thumb_test.py 31 Oct 2007 00:06:43 - 1.1 +++ epsilon_thumb_test.py 31 Oct 2007 15:25:33 - 1.2 @@ -15,14 +15,11 @@ count[0] -= 1 if count[0] < 1: ecore.main_loop_quit() -return True - -epsilon.request.event_done_handler_set(cb) for f in os.listdir(folder): p = os.path.join(folder, f) if os.path.isfile(p): -print "REQ:", epsilon.request.Request(p) +print "REQ:", epsilon.request.Request(cb, p) count[0] += 1 ecore.main_loop_begin() - This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto/python-efl barbieri
Enlightenment CVS committal Author : barbieri Project : e17 Module : proto/python-efl Dir : e17/proto/python-efl/python-epsilon/include/epsilon Modified Files: request.pxd Log Message: Change API, it's way better now. === RCS file: /cvs/e/e17/proto/python-efl/python-epsilon/include/epsilon/request.pxd,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- request.pxd 31 Oct 2007 00:06:43 - 1.1 +++ request.pxd 31 Oct 2007 15:25:33 - 1.2 @@ -26,3 +26,4 @@ cdef class Request: cdef Epsilon_Request *obj +cdef object func - This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto/python-efl barbieri
Enlightenment CVS committal Author : barbieri Project : e17 Module : proto/python-efl Dir : e17/proto/python-efl/python-epsilon/examples Added Files: epsilon_thumb_test.py Log Message: Add Python-Epsilon, at least the Epsilon_Request API. - This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto/python-efl barbieri
Enlightenment CVS committal Author : barbieri Project : e17 Module : proto/python-efl Dir : e17/proto/python-efl/python-epsilon Added Files: .cvsignore AUTHORS COPYING COPYING-PLAIN MANIFEST.in README ez_setup.py setup.cfg setup.py Log Message: Add Python-Epsilon, at least the Epsilon_Request API. - This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto/python-efl barbieri
Enlightenment CVS committal Author : barbieri Project : e17 Module : proto/python-efl Dir : e17/proto/python-efl/python-epsilon/include/epsilon Added Files: c_epsilon.pxd request.pxd Log Message: Add Python-Epsilon, at least the Epsilon_Request API. - This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto/python-efl barbieri
Enlightenment CVS committal Author : barbieri Project : e17 Module : proto/python-efl Dir : e17/proto/python-efl/python-epsilon/epsilon Added Files: .cvsignore __init__.py epsilon.c_epsilon.pyx epsilon.request.pyx Log Message: Add Python-Epsilon, at least the Epsilon_Request API. - This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto/python-efl barbieri
Enlightenment CVS committal Author : barbieri Project : e17 Module : proto/python-efl Dir : e17/proto/python-efl/python-epsilon/include Log Message: Directory /cvs/e/e17/proto/python-efl/python-epsilon/include added to the repository - This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto/python-efl barbieri
Enlightenment CVS committal Author : barbieri Project : e17 Module : proto/python-efl Dir : e17/proto/python-efl/python-epsilon/include/epsilon Log Message: Directory /cvs/e/e17/proto/python-efl/python-epsilon/include/epsilon added to the repository - This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto/python-efl barbieri
Enlightenment CVS committal Author : barbieri Project : e17 Module : proto/python-efl Dir : e17/proto/python-efl/python-epsilon/epsilon Log Message: Directory /cvs/e/e17/proto/python-efl/python-epsilon/epsilon added to the repository - This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto/python-efl barbieri
Enlightenment CVS committal Author : barbieri Project : e17 Module : proto/python-efl Dir : e17/proto/python-efl/python-epsilon Log Message: Directory /cvs/e/e17/proto/python-efl/python-epsilon added to the repository - This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto/python-efl barbieri
Enlightenment CVS committal Author : barbieri Project : e17 Module : proto/python-efl Dir : e17/proto/python-efl/python-epsilon/examples Log Message: Directory /cvs/e/e17/proto/python-efl/python-epsilon/examples added to the repository - This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto/python-efl barbieri
Enlightenment CVS committal Author : barbieri Project : e17 Module : proto/python-efl Dir : e17/proto/python-efl/python-ecore/ecore Modified Files: ecore.c_ecore_animator.pxi ecore.c_ecore_fd_handler.pxi ecore.c_ecore_idle_enterer.pxi ecore.c_ecore_idle_exiter.pxi ecore.c_ecore_idler.pxi ecore.c_ecore_timer.pxi Log Message: Handler errors nicely: avoid taking references when them occur. === RCS file: /cvs/e/e17/proto/python-efl/python-ecore/ecore/ecore.c_ecore_animator.pxi,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- ecore.c_ecore_animator.pxi 1 Oct 2007 04:34:47 - 1.6 +++ ecore.c_ecore_animator.pxi 30 Oct 2007 21:57:48 - 1.7 @@ -47,7 +47,8 @@ self.kargs = kargs if self.obj == NULL: self.obj = ecore_animator_add(animator_cb, self) -python.Py_INCREF(self) +if self.obj != NULL: +python.Py_INCREF(self) def __str__(self): return "%s(func=%s, args=%s, kargs=%s)" % \ === RCS file: /cvs/e/e17/proto/python-efl/python-ecore/ecore/ecore.c_ecore_fd_handler.pxi,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- ecore.c_ecore_fd_handler.pxi1 Oct 2007 04:34:47 - 1.7 +++ ecore.c_ecore_fd_handler.pxi30 Oct 2007 21:57:48 - 1.8 @@ -80,7 +80,8 @@ flags, fd_handler_cb, self, NULL, NULL) -python.Py_INCREF(self) +if self.obj != NULL: +python.Py_INCREF(self) def __str__(self): if self.obj == NULL: === RCS file: /cvs/e/e17/proto/python-efl/python-ecore/ecore/ecore.c_ecore_idle_enterer.pxi,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- ecore.c_ecore_idle_enterer.pxi 1 Oct 2007 04:34:47 - 1.6 +++ ecore.c_ecore_idle_enterer.pxi 30 Oct 2007 21:57:48 - 1.7 @@ -47,7 +47,8 @@ self.kargs = kargs if self.obj == NULL: self.obj = ecore_idle_enterer_add(idle_enterer_cb, self) -python.Py_INCREF(self) +if self.obj != NULL: +python.Py_INCREF(self) def __str__(self): return "%s(func=%s, args=%s, kargs=%s)" % \ === RCS file: /cvs/e/e17/proto/python-efl/python-ecore/ecore/ecore.c_ecore_idle_exiter.pxi,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- ecore.c_ecore_idle_exiter.pxi 1 Oct 2007 04:34:47 - 1.6 +++ ecore.c_ecore_idle_exiter.pxi 30 Oct 2007 21:57:48 - 1.7 @@ -45,7 +45,8 @@ self.kargs = kargs if self.obj == NULL: self.obj = ecore_idle_exiter_add(idle_exiter_cb, self) -python.Py_INCREF(self) +if self.obj != NULL: +python.Py_INCREF(self) def __str__(self): return "%s(func=%s, args=%s, kargs=%s)" % \ === RCS file: /cvs/e/e17/proto/python-efl/python-ecore/ecore/ecore.c_ecore_idler.pxi,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- ecore.c_ecore_idler.pxi 1 Oct 2007 04:34:47 - 1.6 +++ ecore.c_ecore_idler.pxi 30 Oct 2007 21:57:48 - 1.7 @@ -45,7 +45,8 @@ self.kargs = kargs if self.obj == NULL: self.obj = ecore_idler_add(idler_cb, self) -python.Py_INCREF(self) +if self.obj != NULL: +python.Py_INCREF(self) def __str__(self): return "%s(func=%s, args=%s, kargs=%s)" % \ === RCS file: /cvs/e/e17/proto/python-efl/python-ecore/ecore/ecore.c_ecore_timer.pxi,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- ecore.c_ecore_timer.pxi 1 Oct 2007 04:34:47 - 1.6 +++ ecore.c_ecore_timer.pxi 30 Oct 2007 21:57:48 - 1.7 @@ -47,7 +47,8 @@ self.kargs = kargs if self.obj == NULL: self.obj = ecore_timer_add(interval, timer_cb, self) -python.Py_INCREF(self) +if self.obj != NULL: +python.Py_INCREF(self) def __str__(self): return "%s(interval=%f, func=%s, args=%s, kargs=%s)" % \ - This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk
E CVS: proto/python-efl barbieri
Enlightenment CVS committal Author : barbieri Project : e17 Module : proto/python-efl Dir : e17/proto/python-efl/python-evas/evas Modified Files: evas.c_evas_object_smart.pxi Log Message: Method to move every children relatively. This is required so users can override move() and still have a fast way to move children since it does NOT work to call the parent class! (it's just the Evas-virtual, not the book-keeping, obj->cur.geometry is not updated). === RCS file: /cvs/e/e17/proto/python-efl/python-evas/evas/evas.c_evas_object_smart.pxi,v retrieving revision 1.21 retrieving revision 1.22 diff -u -3 -r1.21 -r1.22 --- evas.c_evas_object_smart.pxi8 Oct 2007 15:09:01 - 1.21 +++ evas.c_evas_object_smart.pxi29 Oct 2007 21:07:37 - 1.22 @@ -421,14 +421,15 @@ itr = itr.next evas_list_free(lst) -def move(self, int x, int y): -"Default implementation to move all children." +def move_children_relative(self, int dx, int dy): +"Move all children relatively." cdef Evas_List *lst, *itr cdef Evas_Object *o -cdef int orig_x, orig_y, dx, dy -evas_object_geometry_get(self.obj, &orig_x, &orig_y, NULL, NULL) -dx = x - orig_x -dy = y - orig_y +cdef int orig_x, orig_y + +if dx == 0 and dy == 0: +return + lst = evas_object_smart_members_get(self.obj) itr = lst while itr: @@ -437,6 +438,14 @@ evas_object_move(o, orig_x + dx, orig_y + dy) itr = itr.next evas_list_free(lst) + +def move(self, int x, int y): +"Default implementation to move all children." +cdef int orig_x, orig_y, dx, dy +evas_object_geometry_get(self.obj, &orig_x, &orig_y, NULL, NULL) +dx = x - orig_x +dy = y - orig_y +self.move_children_relative(dx, dy) def resize(self, int w, int h): "Virtual method resize(w, h) of SmartObject" - This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto/python-efl barbieri
Enlightenment CVS committal Author : barbieri Project : e17 Module : proto/python-efl Dir : e17/proto/python-efl/python-evas/evas Modified Files: evas.c_evas.pyx Log Message: Fix EvasLoadError exception constructor. === RCS file: /cvs/e/e17/proto/python-efl/python-evas/evas/evas.c_evas.pyx,v retrieving revision 1.13 retrieving revision 1.14 diff -u -3 -r1.13 -r1.14 --- evas.c_evas.pyx 8 Oct 2007 15:09:01 - 1.13 +++ evas.c_evas.pyx 25 Oct 2007 16:20:12 - 1.14 @@ -260,7 +260,7 @@ class EvasLoadError(Exception): -def __init__(self, int code, char *filename, char *key): +def __init__(self, int code, filename, key): if code == EVAS_LOAD_ERROR_NONE: msg = "No error on load" elif code == EVAS_LOAD_ERROR_GENERIC: - This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto/python-efl barbieri
Enlightenment CVS committal
Author : barbieri
Project : e17
Module : proto/python-efl
Dir : e17/proto/python-efl/python-evas/evas
Modified Files:
utils.py
Added Files:
debug.py
Log Message:
Utils:
- add support for "del" event.
- functions to disconnect observers/callbacks
Debug:
- DebugObserver: log information after every object event, these selectable
using object attributes.
- VisualDebug: smart object to provide visual debug of objects, much like
edje_editor's interface: red for top-left, blue for bottom-right. This is
really helpful!
===
RCS file: /cvs/e/e17/proto/python-efl/python-evas/evas/utils.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- utils.py28 Sep 2007 18:06:26 - 1.2
+++ utils.py22 Oct 2007 00:55:08 - 1.3
@@ -6,6 +6,7 @@
"mouse_move",
"mouse_wheel",
"free",
+"del",
"key_down",
"key_up",
"focus_in",
@@ -43,6 +44,15 @@
setter(cb)
+def disconnect_observer(evas, observer):
+"""Disconnect observer connected using connect_observer()"""
+for cb_name in __callbacks:
+cb = __get_callback(observer, cb_name)
+if cb:
+unsetter = getattr(evas, "on_%s_del" % cb_name)
+unsetter(cb)
+
+
def connect_callbacks_by_name(evas, mapping):
"""Connect callbacks specified in mapping to Evas callbacks.
@@ -59,3 +69,14 @@
except AttributeError, e:
raise ValueError("invalid callback name: %s" % name)
setter(func)
+
+def disconnect_callbacks_by_name(evas, mapping):
+"""Disconnect callbacks specified in mapping to Evas callbacks."""
+if isinstance(mapping, dict):
+mapping = mapping.iteritems()
+for name, func in mapping:
+try:
+unsetter = getattr(evas, "on_%s_del" % name)
+except AttributeError, e:
+raise ValueError("invalid callback name: %s" % name)
+unsetter(func)
-
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto/python-efl barbieri
Enlightenment CVS committal Author : barbieri Project : e17 Module : proto/python-efl Dir : e17/proto/python-efl/python-evas/include/evas Modified Files: c_evas.pxd Log Message: Implement data_get() using Python Buffer API, related methods and add comments. === RCS file: /cvs/e/e17/proto/python-efl/python-evas/include/evas/c_evas.pxd,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- c_evas.pxd 8 Oct 2007 00:02:19 - 1.3 +++ c_evas.pxd 21 Oct 2007 00:51:03 - 1.4 @@ -52,6 +52,7 @@ EVAS_COLORSPACE_ARGB EVAS_COLORSPACE_YCBCR422P601_PL EVAS_COLORSPACE_YCBCR422P709_PL +EVAS_COLORSPACE_RGB565_A5P ctypedef enum Evas_Render_Op: @@ -437,6 +438,7 @@ void evas_object_image_fill_get(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h) void evas_object_image_size_set(Evas_Object *obj, int w, int h) void evas_object_image_size_get(Evas_Object *obj, int *w, int *h) +int evas_object_image_stride_get(Evas_Object *obj) int evas_object_image_load_error_get(Evas_Object *obj) void evas_object_image_data_set(Evas_Object *obj, void *data) void *evas_object_image_data_get(Evas_Object *obj, Evas_Bool for_writing) - This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto/python-efl barbieri
Enlightenment CVS committal
Author : barbieri
Project : e17
Module : proto/python-efl
Dir : e17/proto/python-efl/python-evas/evas
Modified Files:
evas.c_evas_object_image.pxi
Log Message:
Implement data_get() using Python Buffer API, related methods and add comments.
===
RCS file:
/cvs/e/e17/proto/python-efl/python-evas/evas/evas.c_evas_object_image.pxi,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- evas.c_evas_object_image.pxi8 Oct 2007 15:09:01 - 1.10
+++ evas.c_evas_object_image.pxi21 Oct 2007 00:51:02 - 1.11
@@ -1,8 +1,95 @@
# This file is included verbatim by c_evas.pyx
+cdef int _data_size_get(Evas_Object *obj):
+cdef int stride, h, bpp, cspace, have_alpha
+stride = evas_object_image_stride_get(obj)
+evas_object_image_size_get(obj, NULL, &h)
+cspace = evas_object_image_colorspace_get(obj)
+have_alpha = evas_object_image_alpha_get(obj)
+if cspace == EVAS_COLORSPACE_ARGB:
+bpp = 4
+elif cspace == EVAS_COLORSPACE_RGB565_A5P:
+if have_alpha == 0:
+bpp = 2
+else:
+bpp = 3
+else:
+return 0 # XXX not supported.
+
+return stride * h * bpp
+
+
cdef public class Image(Object) [object PyEvasImage, type PyEvasImage_Type]:
"""Image from file or buffer.
+Introduction
+
+
+Image will consider the object's L{geometry} as
+the area to paint with tiles as described by L{fill_set()} and the real
+pixels (image data) will be stored as described by
+L{image_size}. This can be tricky to understand at
+first, but gives flexibility to do everything.
+
+If an image is loaded from file, it will have
+L{image_size} set to its original size, unless some
+other size was set with L{load_size_set()}, L{load_dpi_set()} or
+L{load_scale_down_set()}.
+
+Pixels will be scaled to match size specified by L{fill_set()}
+using either sampled or smooth methods, these can be specified with
+L{smooth_scale_set()}. The scale will consider borders as specified by
+L{border_set()} and L{border_center_fill_set()}, while the former specify
+the border dimensions (top and bottom will scale horizontally, while
+right and left will do vertically, corners are kept unscaled), the latter
+says whenever the center of the image will be used (useful to create
+frames).
+
+Contents will be tiled using L{fill_set()} information in order to paint
+L{geometry}, so if you want an image to be drawn
+just once, you should match every L{geometry_set(x, y, w, h)} by a call
+to L{fill_set(0, 0, w, h)}. L{FilledImage} does that for you.
+
+Pixel data and buffer API
+=
+
+Images implement the Python Buffer API, so it's possible to use it
+where buffers are expected (ie: file.write()). Available data will
+depend on L{alpha}, L{colorspace} and
+L{image_size}, lines should be considered multiple
+of L{stride}, with the following considerations about
+colorspace:
+ - B{EVAS_COLORSPACE_ARGB:} This pixel format is a linear block of
+ pixels, starting at the top-left row by row until the bottom right of
+ the image or pixel region. All pixels are 32-bit unsigned int's with
+ the high-byte being alpha and the low byte being blue in the format
+ ARGB. Alpha may or may not be used by evas depending on the alpha flag
+ of the image, but if not used, should be set to 0xff anyway.
+ This colorspace uses premultiplied alpha. That means that R, G and B
+ cannot exceed A in value. The conversion from non-premultiplied
+ colorspace is::
+ R = (r * a) / 255; G = (g * a) / 255; B = (b * a) / 255;
+ So 50% transparent blue will be: 0x8080. This will not be "dark" -
+ just 50% transparent. Values are 0 == black, 255 == solid or full
+ red, green or blue.
+ - B{EVAS_COLORSPACE_RGB565_A5P:} In the process of being implemented in
+ 1 engine only. This may change. This is a pointer to image data for
+ 16-bit half-word pixel data in 16bpp RGB 565 format (5 bits red,
+ 6 bits green, 5 bits blue), with the high-byte containing red and the
+ low byte containing blue, per pixel. This data is packed row by row
+ from the top-left to the bottom right. If the image has an alpha
+ channel enabled there will be an extra alpha plane B{after} the color
+ pixel plane. If not, then this data will not exist and should not be
+ accessed in any way. This plane is a set of pixels with 1 byte per
+ pixel defining the alpha values of all pixels in the image from
+ the top-left to the bottom right of the image, row by row. Even though
+ the values of the alpha pixels can be 0 to 255, only values 0 through
+ to 31 are used, 31 being solid
E CVS: proto/python-efl barbieri
Enlightenment CVS committal Author : barbieri Project : e17 Module : proto/python-efl Dir : e17/proto/python-efl/python-evas/tests Added Files: 12-image_as_buffer.py Log Message: Implement data_get() using Python Buffer API, related methods and add comments. - This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto/python-efl barbieri
Enlightenment CVS committal Author : barbieri Project : e17 Module : proto/python-efl Dir : e17/proto/python-efl/python-evas/evas Modified Files: evas.c_evas_rect.pxi Log Message: add Rect.contains_point(x, y) === RCS file: /cvs/e/e17/proto/python-efl/python-evas/evas/evas.c_evas_rect.pxi,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- evas.c_evas_rect.pxi28 Sep 2007 18:06:26 - 1.4 +++ evas.c_evas_rect.pxi19 Oct 2007 14:49:42 - 1.5 @@ -430,6 +430,11 @@ "Checks if contains given rectangle." return obj in self +def contains_point(self, x, y): +"Checks if contains the given point." +return bool(self.x0 <= x <= self.x1 and \ +self.y0 <= y <= self.y1) + def intercepts(self, obj): "Checks if intercepts given rectangle." cdef Rect o - This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
