[Pkg-e-commits] [SCM] Python bindings for Evas branch, master, updated. debian/0.2.1-2-187-g93188c7
Albin Tonnerre
albin.tonnerre at gmail.com
Sat Aug 29 21:23:49 UTC 2009
The following commit has been merged in the master branch:
commit 261f3a670577078d20c631541b919fb1dd8c32c3
Author: Albin Tonnerre <albin.tonnerre at gmail.com>
Date: Sat Aug 29 19:43:11 2009 +0200
Import new SVN snapshot
diff --git a/evas/evas.c_evas_canvas.pxi b/evas/evas.c_evas_canvas.pxi
index 42b250c..29b3a25 100644
--- a/evas/evas.c_evas_canvas.pxi
+++ b/evas/evas.c_evas_canvas.pxi
@@ -142,6 +142,45 @@ cdef public class Canvas [object PyEvasCanvas, type PyEvasCanvas_Type]:
def __get__(self):
return self.output_method_get()
+ def engine_info_set(self, unsigned long ptr):
+ """Set the engine information pointer.
+
+ Note that given value is a pointer, usually acquired with L{info_get()}
+ and is totally engine and platform dependent.
+
+ This call is very low level and is meant for extension to use,
+ they usually do the machinery in C and just handle pointers as
+ integers.
+
+ If in doubt, don't mess with it. Use ecore.evas instead, it's
+ the way to go for regular uses.
+ """
+ evas_engine_info_set(self.obj, <void *>ptr)
+
+ def engine_info_get(self):
+ """Get the engine information pointer.
+
+ Note that given value is a pointer and is totally engine and
+ platform dependent.
+
+ This call is very low level and is meant for extension to use,
+ they usually do the machinery in C and just handle pointers as
+ integers.
+
+ If in doubt, don't mess with it. Use ecore.evas instead, it's
+ the way to go for regular uses.
+
+ @return: pointer as integer (unsigned long).
+ """
+ return <unsigned long><void *>evas_engine_info_get(self.obj)
+
+ property engine_info:
+ def __set__(self, ptr):
+ self.engine_info_set(ptr)
+
+ def __get__(self):
+ return self.engine_info_get()
+
def size_set(self, int w, int h):
"""Set canvas size.
diff --git a/include/evas/c_evas.pxd b/include/evas/c_evas.pxd
index e6e8199..a21a302 100644
--- a/include/evas/c_evas.pxd
+++ b/include/evas/c_evas.pxd
@@ -139,7 +139,7 @@ cdef extern from "Evas.h":
void *accounting
- ctypedef struct Evas_Rectangle:
+ ctypedef struct Eina_Rectangle:
int x
int y
int w
@@ -277,7 +277,7 @@ cdef extern from "Evas.h":
# Other typedefs
#
ctypedef int Evas_Coord
- ctypedef int Evas_Bool
+ ctypedef int Eina_Bool
ctypedef int Evas_Angle
ctypedef int Evas_Font_Size
ctypedef void (*evas_event_callback_t)(void *data, Evas *e, Evas_Object *obj, void *event_info)
@@ -305,6 +305,9 @@ cdef extern from "Evas.h":
void evas_output_method_set(Evas *e, int render_method)
int evas_output_method_get(Evas *e)
+ void *evas_engine_info_get(Evas *e)
+ int evas_engine_info_set(Evas *e, void *info)
+
void evas_output_size_set(Evas *e, int w, int h)
void evas_output_size_get(Evas *e, int *w, int *h)
void evas_output_viewport_set(Evas *e, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h)
@@ -317,14 +320,14 @@ cdef extern from "Evas.h":
void evas_pointer_output_xy_get(Evas *e, int *x, int *y)
void evas_pointer_canvas_xy_get(Evas *e, Evas_Coord *x, Evas_Coord *y)
int evas_pointer_button_down_mask_get(Evas *e)
- Evas_Bool evas_pointer_inside_get(Evas *e)
+ Eina_Bool evas_pointer_inside_get(Evas *e)
- Evas_Object *evas_object_top_at_xy_get(Evas *e, Evas_Coord x, Evas_Coord y, Evas_Bool include_pass_events_objects, Evas_Bool include_hidden_objects)
+ Evas_Object *evas_object_top_at_xy_get(Evas *e, Evas_Coord x, Evas_Coord y, Eina_Bool include_pass_events_objects, Eina_Bool include_hidden_objects)
Evas_Object *evas_object_top_at_pointer_get(Evas *e)
- Evas_Object *evas_object_top_in_rectangle_get(Evas *e, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h, Evas_Bool include_pass_events_objects, Evas_Bool include_hidden_objects)
+ Evas_Object *evas_object_top_in_rectangle_get(Evas *e, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h, Eina_Bool include_pass_events_objects, Eina_Bool include_hidden_objects)
- Eina_List *evas_objects_at_xy_get(Evas *e, Evas_Coord x, Evas_Coord y, Evas_Bool include_pass_events_objects, Evas_Bool include_hidden_objects)
- Eina_List *evas_objects_in_rectangle_get(Evas *e, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h, Evas_Bool include_pass_events_objects, Evas_Bool include_hidden_objects)
+ Eina_List *evas_objects_at_xy_get(Evas *e, Evas_Coord x, Evas_Coord y, Eina_Bool include_pass_events_objects, Eina_Bool include_hidden_objects)
+ Eina_List *evas_objects_in_rectangle_get(Evas *e, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h, Eina_Bool include_pass_events_objects, Eina_Bool include_hidden_objects)
void evas_damage_rectangle_add(Evas *e, int x, int y, int w, int h)
void evas_obscured_rectangle_add(Evas *e, int x, int y, int w, int h)
@@ -351,7 +354,7 @@ cdef extern from "Evas.h":
void evas_font_hinting_set(Evas *e, Evas_Font_Hinting_Flags hinting)
Evas_Font_Hinting_Flags evas_font_hinting_get(Evas *e)
- Evas_Bool evas_font_hinting_can_hint(Evas *e, Evas_Font_Hinting_Flags hinting)
+ Eina_Bool evas_font_hinting_can_hint(Evas *e, Evas_Font_Hinting_Flags hinting)
void evas_font_cache_flush(Evas *e)
void evas_font_cache_set(Evas *e, int size)
@@ -411,13 +414,13 @@ cdef extern from "Evas.h":
void evas_object_show(Evas_Object *obj)
void evas_object_hide(Evas_Object *obj)
- Evas_Bool evas_object_visible_get(Evas_Object *obj)
+ Eina_Bool evas_object_visible_get(Evas_Object *obj)
void evas_object_render_op_set(Evas_Object *obj, Evas_Render_Op op)
Evas_Render_Op evas_object_render_op_get(Evas_Object *obj)
- void evas_object_anti_alias_set(Evas_Object *obj, Evas_Bool antialias)
- Evas_Bool evas_object_anti_alias_get(Evas_Object *obj)
+ void evas_object_anti_alias_set(Evas_Object *obj, Eina_Bool antialias)
+ Eina_Bool evas_object_anti_alias_get(Evas_Object *obj)
void evas_object_color_set(Evas_Object *obj, int r, int g, int b, int a)
void evas_object_color_get(Evas_Object *obj, int *r, int *g, int *b, int *a)
@@ -446,17 +449,17 @@ cdef extern from "Evas.h":
void evas_object_event_callback_add(Evas_Object *obj, Evas_Callback_Type type, evas_event_callback_t func, void *data)
void *evas_object_event_callback_del(Evas_Object *obj, Evas_Callback_Type type, evas_event_callback_t func)
- void evas_object_pass_events_set(Evas_Object *obj, Evas_Bool p)
- Evas_Bool evas_object_pass_events_get(Evas_Object *obj)
- void evas_object_repeat_events_set(Evas_Object *obj, Evas_Bool repeat)
- Evas_Bool evas_object_repeat_events_get(Evas_Object *obj)
- void evas_object_propagate_events_set(Evas_Object *obj, Evas_Bool prop)
- Evas_Bool evas_object_propagate_events_get(Evas_Object *obj)
+ void evas_object_pass_events_set(Evas_Object *obj, Eina_Bool p)
+ Eina_Bool evas_object_pass_events_get(Evas_Object *obj)
+ void evas_object_repeat_events_set(Evas_Object *obj, Eina_Bool repeat)
+ Eina_Bool evas_object_repeat_events_get(Evas_Object *obj)
+ void evas_object_propagate_events_set(Evas_Object *obj, Eina_Bool prop)
+ Eina_Bool evas_object_propagate_events_get(Evas_Object *obj)
void evas_object_pointer_mode_set(Evas_Object *obj, Evas_Object_Pointer_Mode setting)
Evas_Object_Pointer_Mode evas_object_pointer_mode_get(Evas_Object *obj)
- void evas_object_focus_set(Evas_Object *obj, Evas_Bool focus)
- Evas_Bool evas_object_focus_get(Evas_Object *obj)
+ void evas_object_focus_set(Evas_Object *obj, Eina_Bool focus)
+ Eina_Bool evas_object_focus_get(Evas_Object *obj)
####################################################################
@@ -509,8 +512,8 @@ cdef extern from "Evas.h":
void evas_object_image_file_get(Evas_Object *obj, char **file, char **key)
void evas_object_image_border_set(Evas_Object *obj, int l, int r, int t, int b)
void evas_object_image_border_get(Evas_Object *obj, int *l, int *r, int *t, int *b)
- void evas_object_image_border_center_fill_set(Evas_Object *obj, Evas_Bool fill)
- Evas_Bool evas_object_image_border_center_fill_get(Evas_Object *obj)
+ void evas_object_image_border_center_fill_set(Evas_Object *obj, Eina_Bool fill)
+ Eina_Bool evas_object_image_border_center_fill_get(Evas_Object *obj)
void evas_object_image_fill_set(Evas_Object *obj, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h)
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)
@@ -518,20 +521,20 @@ cdef extern from "Evas.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)
+ void *evas_object_image_data_get(Evas_Object *obj, Eina_Bool for_writing)
void evas_object_image_data_copy_set(Evas_Object *obj, void *data)
void evas_object_image_data_update_add(Evas_Object *obj, int x, int y, int w, int h)
- void evas_object_image_alpha_set(Evas_Object *obj, Evas_Bool has_alpha)
- Evas_Bool evas_object_image_alpha_get(Evas_Object *obj)
- void evas_object_image_smooth_scale_set(Evas_Object *obj, Evas_Bool smooth_scale)
- Evas_Bool evas_object_image_smooth_scale_get(Evas_Object *obj)
- void evas_object_image_preload(Evas_Object *obj, Evas_Bool cancel)
+ void evas_object_image_alpha_set(Evas_Object *obj, Eina_Bool has_alpha)
+ Eina_Bool evas_object_image_alpha_get(Evas_Object *obj)
+ void evas_object_image_smooth_scale_set(Evas_Object *obj, Eina_Bool smooth_scale)
+ Eina_Bool evas_object_image_smooth_scale_get(Evas_Object *obj)
+ void evas_object_image_preload(Evas_Object *obj, Eina_Bool cancel)
void evas_object_image_reload(Evas_Object *obj)
- Evas_Bool evas_object_image_save(Evas_Object *obj, char *file, char *key, char *flags)
- #Evas_Bool evas_object_image_pixels_import(Evas_Object *obj, Evas_Pixel_Import_Source *pixels)
+ Eina_Bool evas_object_image_save(Evas_Object *obj, char *file, char *key, char *flags)
+ #Eina_Bool evas_object_image_pixels_import(Evas_Object *obj, Evas_Pixel_Import_Source *pixels)
void evas_object_image_pixels_get_callback_set(Evas_Object *obj, void (*func) (void *data, Evas_Object *o), void *data)
- void evas_object_image_pixels_dirty_set(Evas_Object *obj, Evas_Bool dirty)
- Evas_Bool evas_object_image_pixels_dirty_get(Evas_Object *obj)
+ void evas_object_image_pixels_dirty_set(Evas_Object *obj, Eina_Bool dirty)
+ Eina_Bool evas_object_image_pixels_dirty_get(Evas_Object *obj)
void evas_object_image_load_dpi_set(Evas_Object *obj, double dpi)
double evas_object_image_load_dpi_get(Evas_Object *obj)
void evas_object_image_load_size_set(Evas_Object *obj, int w, int h)
@@ -550,7 +553,7 @@ cdef extern from "Evas.h":
Evas_Object *evas_object_gradient_add(Evas *e)
void evas_object_gradient_color_stop_add(Evas_Object *obj, int r, int g, int b, int a, int delta)
void evas_object_gradient_alpha_stop_add(Evas_Object *obj, int a, int delta)
- void evas_object_gradient_color_data_set(Evas_Object *obj, void *color_data, int len, Evas_Bool has_alpha)
+ void evas_object_gradient_color_data_set(Evas_Object *obj, void *color_data, int len, Eina_Bool has_alpha)
void evas_object_gradient_alpha_data_set(Evas_Object *obj, void *alpha_data, int len)
void evas_object_gradient_clear(Evas_Object *obj)
void evas_object_gradient_type_set(Evas_Object *obj, char *type, char *instance_params)
@@ -631,17 +634,17 @@ cdef extern from "Evas.h":
void evas_textblock_cursor_free(Evas_Textblock_Cursor *cur)
void evas_textblock_cursor_node_first(Evas_Textblock_Cursor *cur)
void evas_textblock_cursor_node_last(Evas_Textblock_Cursor *cur)
- Evas_Bool evas_textblock_cursor_node_next(Evas_Textblock_Cursor *cur)
- Evas_Bool evas_textblock_cursor_node_prev(Evas_Textblock_Cursor *cur)
- Evas_Bool evas_textblock_cursor_char_next(Evas_Textblock_Cursor *cur)
- Evas_Bool evas_textblock_cursor_char_prev(Evas_Textblock_Cursor *cur)
+ Eina_Bool evas_textblock_cursor_node_next(Evas_Textblock_Cursor *cur)
+ Eina_Bool evas_textblock_cursor_node_prev(Evas_Textblock_Cursor *cur)
+ Eina_Bool evas_textblock_cursor_char_next(Evas_Textblock_Cursor *cur)
+ Eina_Bool evas_textblock_cursor_char_prev(Evas_Textblock_Cursor *cur)
void evas_textblock_cursor_char_first(Evas_Textblock_Cursor *cur)
void evas_textblock_cursor_char_last(Evas_Textblock_Cursor *cur)
void evas_textblock_cursor_line_first(Evas_Textblock_Cursor *cur)
void evas_textblock_cursor_line_last(Evas_Textblock_Cursor *cur)
int evas_textblock_cursor_pos_get(Evas_Textblock_Cursor *cur)
void evas_textblock_cursor_pos_set(Evas_Textblock_Cursor *cur, int pos)
- Evas_Bool evas_textblock_cursor_line_set(Evas_Textblock_Cursor *cur, int line)
+ Eina_Bool evas_textblock_cursor_line_set(Evas_Textblock_Cursor *cur, int line)
int evas_textblock_cursor_compare(Evas_Textblock_Cursor *cur1, Evas_Textblock_Cursor *cur2)
void evas_textblock_cursor_copy(Evas_Textblock_Cursor *cur, Evas_Textblock_Cursor *cur_dest)
void evas_textblock_cursor_text_append(Evas_Textblock_Cursor *cur, char *text)
@@ -654,14 +657,14 @@ cdef extern from "Evas.h":
char *evas_textblock_cursor_node_text_get(Evas_Textblock_Cursor *cur)
int evas_textblock_cursor_node_text_length_get(Evas_Textblock_Cursor *cur)
char *evas_textblock_cursor_node_format_get(Evas_Textblock_Cursor *cur)
- Evas_Bool evas_textblock_cursor_node_format_is_visible_get(Evas_Textblock_Cursor *cur)
+ Eina_Bool evas_textblock_cursor_node_format_is_visible_get(Evas_Textblock_Cursor *cur)
char *evas_textblock_cursor_range_text_get(Evas_Textblock_Cursor *cur1, Evas_Textblock_Cursor *cur2, Evas_Textblock_Text_Type format)
int evas_textblock_cursor_char_geometry_get(Evas_Textblock_Cursor *cur, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch)
int evas_textblock_cursor_line_geometry_get(Evas_Textblock_Cursor *cur, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch)
- Evas_Bool evas_textblock_cursor_char_coord_set(Evas_Textblock_Cursor *cur, Evas_Coord x, Evas_Coord y)
+ Eina_Bool evas_textblock_cursor_char_coord_set(Evas_Textblock_Cursor *cur, Evas_Coord x, Evas_Coord y)
int evas_textblock_cursor_line_coord_set(Evas_Textblock_Cursor *cur, Evas_Coord y)
Eina_List *evas_textblock_cursor_range_geometry_get(Evas_Textblock_Cursor *cur1, Evas_Textblock_Cursor *cur2)
- Evas_Bool evas_object_textblock_line_number_geometry_get(Evas_Object *obj, int line, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch)
+ Eina_Bool evas_object_textblock_line_number_geometry_get(Evas_Object *obj, int line, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch)
void evas_object_textblock_clear(Evas_Object *obj)
void evas_object_textblock_size_formatted_get(Evas_Object *obj, Evas_Coord *w, Evas_Coord *h)
void evas_object_textblock_size_native_get(Evas_Object *obj, Evas_Coord *w, Evas_Coord *h)
diff --git a/tests/01-canvas-basics.py b/tests/01-canvas-basics.py
index 59f5c9d..cd3d99f 100644
--- a/tests/01-canvas-basics.py
+++ b/tests/01-canvas-basics.py
@@ -9,10 +9,11 @@ class CanvasConstructor(unittest.TestCase):
self.assertEqual(c.viewport_get(), (0, 0, 1, 1))
def testConstructorArgs(self):
- m = "software_x11"
+ m = "buffer"
s = (400, 500)
v = (0, 0, 30, 40)
c = evas.Canvas(method=m, size=s, viewport=v)
+ c.engine_info_set(c.engine_info_get())
self.assertEqual(c.output_method_get(), evas.render_method_lookup(m))
self.assertEqual(c.size_get(), s)
self.assertEqual(c.viewport_get(), v)
@@ -22,7 +23,8 @@ class CanvasConstructor(unittest.TestCase):
class CanvasMethods(unittest.TestCase):
def setUp(self):
- self.canvas = evas.Canvas(method="software_x11", size=(400, 500))
+ self.canvas = evas.Canvas(method="buffer", size=(400, 500))
+ self.canvas.engine_info_set(self.canvas.engine_info_get())
def tearDown(self):
del self.canvas
@@ -37,7 +39,8 @@ class CanvasMethods(unittest.TestCase):
class CanvasProperties(unittest.TestCase):
def setUp(self):
- self.canvas = evas.Canvas(method="software_x11", size=(400, 500))
+ self.canvas = evas.Canvas(method="buffer", size=(400, 500))
+ self.canvas.engine_info_set(self.canvas.engine_info_get())
def tearDown(self):
del self.canvas
diff --git a/tests/02-object-basics.py b/tests/02-object-basics.py
index 7af21f9..4ef74a0 100644
--- a/tests/02-object-basics.py
+++ b/tests/02-object-basics.py
@@ -3,9 +3,10 @@ import unittest
class ObjectBasics(unittest.TestCase):
def setUp(self):
- self.canvas = evas.Canvas(method="software_x11",
+ self.canvas = evas.Canvas(method="buffer",
size=(400, 500),
viewport=(0, 0, 400, 500))
+ self.canvas.engine_info_set(self.canvas.engine_info_get())
def tearDown(self):
del self.canvas
@@ -111,9 +112,10 @@ class ObjectBasics(unittest.TestCase):
class ObjectProperties(unittest.TestCase):
def setUp(self):
- self.canvas = evas.Canvas(method="software_x11",
+ self.canvas = evas.Canvas(method="buffer",
size=(400, 500),
viewport=(0, 0, 400, 500))
+ self.canvas.engine_info_set(self.canvas.engine_info_get())
self.obj = evas.Rectangle(self.canvas,
geometry=(10, 20, 30, 40))
diff --git a/tests/04-object-image.py b/tests/04-object-image.py
index 29bee81..e823a63 100644
--- a/tests/04-object-image.py
+++ b/tests/04-object-image.py
@@ -3,9 +3,10 @@ import unittest
class ImageBasics(unittest.TestCase):
def setUp(self):
- self.canvas = evas.Canvas(method="software_x11",
+ self.canvas = evas.Canvas(method="buffer",
size=(400, 500),
viewport=(0, 0, 400, 500))
+ self.canvas.engine_info_set(self.canvas.engine_info_get())
def tearDown(self):
del self.canvas
diff --git a/tests/05-smart-object.py b/tests/05-smart-object.py
index da12f87..b306d0e 100644
--- a/tests/05-smart-object.py
+++ b/tests/05-smart-object.py
@@ -27,9 +27,10 @@ class MyObject(evas.SmartObject):
class SmartObjectTest(unittest.TestCase):
def setUp(self):
- self.canvas = evas.Canvas(method="software_x11",
+ self.canvas = evas.Canvas(method="buffer",
size=(400, 500),
viewport=(0, 0, 400, 500))
+ self.canvas.engine_info_set(self.canvas.engine_info_get())
self.obj = MyObject(self.canvas)
def testMembers(self):
diff --git a/tests/06-canvas-as-factory.py b/tests/06-canvas-as-factory.py
index d10a3cf..1f50835 100644
--- a/tests/06-canvas-as-factory.py
+++ b/tests/06-canvas-as-factory.py
@@ -4,9 +4,10 @@ import unittest
class CanvasFactory(unittest.TestCase):
def setUp(self):
- self.canvas = evas.Canvas(method="software_x11",
+ self.canvas = evas.Canvas(method="buffer",
size=(400, 500),
viewport=(0, 0, 400, 500))
+ self.canvas.engine_info_set(self.canvas.engine_info_get())
def tearDown(self):
del self.canvas
diff --git a/tests/07-smart_object-as-factory.py b/tests/07-smart_object-as-factory.py
index 695e2ac..4e2be0c 100644
--- a/tests/07-smart_object-as-factory.py
+++ b/tests/07-smart_object-as-factory.py
@@ -7,9 +7,10 @@ class MyObject(evas.SmartObject):
class CanvasFactory(unittest.TestCase):
def setUp(self):
- self.canvas = evas.Canvas(method="software_x11",
+ self.canvas = evas.Canvas(method="buffer",
size=(400, 500),
viewport=(0, 0, 400, 500))
+ self.canvas.engine_info_set(self.canvas.engine_info_get())
self.so = MyObject(self.canvas)
def tearDown(self):
diff --git a/tests/08-object-gradient.py b/tests/08-object-gradient.py
index 84884be..1ab98b3 100644
--- a/tests/08-object-gradient.py
+++ b/tests/08-object-gradient.py
@@ -4,9 +4,10 @@ import unittest
class GradientBasics(unittest.TestCase):
def setUp(self):
- self.canvas = evas.Canvas(method="software_x11",
+ self.canvas = evas.Canvas(method="buffer",
size=(400, 500),
viewport=(0, 0, 400, 500))
+ self.canvas.engine_info_set(self.canvas.engine_info_get())
def tearDown(self):
del self.canvas
diff --git a/tests/09-object-polygon.py b/tests/09-object-polygon.py
index 5a5f9a6..184f8c0 100644
--- a/tests/09-object-polygon.py
+++ b/tests/09-object-polygon.py
@@ -4,9 +4,10 @@ import unittest
class PolygonBasics(unittest.TestCase):
def setUp(self):
- self.canvas = evas.Canvas(method="software_x11",
+ self.canvas = evas.Canvas(method="buffer",
size=(400, 500),
viewport=(0, 0, 400, 500))
+ self.canvas.engine_info_set(self.canvas.engine_info_get())
def tearDown(self):
del self.canvas
diff --git a/tests/10-object_text.py b/tests/10-object_text.py
index 5f4240c..15c317a 100644
--- a/tests/10-object_text.py
+++ b/tests/10-object_text.py
@@ -4,9 +4,10 @@ import unittest
class TextBasics(unittest.TestCase):
def setUp(self):
- self.canvas = evas.Canvas(method="software_x11",
+ self.canvas = evas.Canvas(method="buffer",
size=(400, 500),
viewport=(0, 0, 400, 500))
+ self.canvas.engine_info_set(self.canvas.engine_info_get())
def tearDown(self):
del self.canvas
diff --git a/tests/11-decorators.py b/tests/11-decorators.py
index 342eb32..1bf3a52 100644
--- a/tests/11-decorators.py
+++ b/tests/11-decorators.py
@@ -4,9 +4,10 @@ import unittest
class DecoratorsTests(unittest.TestCase):
def setUp(self):
- self.canvas = evas.Canvas(method="software_x11",
+ self.canvas = evas.Canvas(method="buffer",
size=(400, 500),
viewport=(0, 0, 400, 500))
+ self.canvas.engine_info_set(self.canvas.engine_info_get())
def tearDown(self):
del self.canvas
diff --git a/tests/13-image-rotate.py b/tests/13-image-rotate.py
index c5b1ad0..df7da56 100755
--- a/tests/13-image-rotate.py
+++ b/tests/13-image-rotate.py
@@ -5,11 +5,8 @@ import ecore
import evas
import ecore.evas
-if 'x11' in sys.argv:
- ee = ecore.evas.SoftwareX11(w=800, h=480)
-else:
- ee = ecore.evas.SoftwareX11_16(w=800, h=480)
+ee = ecore.evas.new(w=800, h=400)
bg = ee.evas.Rectangle(color=(255, 255, 255, 255))
bg.size = ee.evas.size
bg.show()
diff --git a/tests/14-image-preload.py b/tests/14-image-preload.py
index f8cd082..e673e3d 100644
--- a/tests/14-image-preload.py
+++ b/tests/14-image-preload.py
@@ -6,23 +6,12 @@ import ecore
import evas
import ecore.evas
-ee = None
-required_image = "icon.png"
-for a in sys.argv[1:]:
- if a == 'x11':
- ee = ecore.evas.SoftwareX11(w=800, h=480)
- elif a == 'x11-16':
- ee = ecore.evas.SoftwareX11_16(w=800, h=480)
- else:
- if os.path.exists(a):
- required_image = a
- else:
- raise SystemExit(("invalid argument: %s. "
- "Expected x11, x11-16 or image path.") % a)
-
-if not ee:
- ee = ecore.evas.SoftwareX11_16(w=800, h=480)
+try:
+ required_image = sys.argv[1]
+except IndexError:
+ required_image = os.path.join(os.path.dirname(sys.argv[0]), "icon.png")
+ee = ecore.evas.new(w=800, h=400)
bg = ee.evas.Rectangle(color=(255, 255, 255, 255))
bg.size = ee.evas.size
bg.show()
--
Python bindings for Evas
More information about the Pkg-e-commits
mailing list