kuuko pushed a commit to branch master.
commit 3b196172b4bbe63b74a6908a996b430e1fe1035b
Author: Kai Huuhko <[email protected]>
Date: Wed Apr 3 19:39:11 2013 +0000
Add an enums file for Evas so it gets the values directly from C lib.
---
efl/elementary/general.pxd | 24 ++--
efl/elementary/object.pxd | 3 +-
efl/elementary/object.pyx | 14 ++-
efl/elementary/photocam.pxd | 3 +-
efl/elementary/photocam.pyx | 1 +
efl/evas/efl.evas.pyx | 267 ++++++++++++++++++++++---------------------
include/efl.evas.enums.pxd | 270 ++++++++++++++++++++++++++++++++++++++++++++
include/efl.evas.pxd | 147 ++++++++++++------------
8 files changed, 498 insertions(+), 231 deletions(-)
diff --git a/efl/elementary/general.pxd b/efl/elementary/general.pxd
index 31dba3a..da4d174 100644
--- a/efl/elementary/general.pxd
+++ b/efl/elementary/general.pxd
@@ -17,23 +17,15 @@
#
from efl.evas cimport Eina_List, Eina_Bool, const_Eina_List
-from efl.evas cimport Eina_Rectangle, Eina_Compare_Cb
-from efl.evas cimport Evas_Object, const_Evas_Object
-from efl.evas cimport Evas_Coord
-from efl.evas cimport Evas_Callback_Type, Evas_Smart_Cb
-from efl.evas cimport Evas_Font_Size
-from efl.evas cimport Evas_Load_Error
-from efl.evas cimport Evas_Event_Flags
+#from efl.evas cimport Eina_Rectangle, Eina_Compare_Cb
+from efl.evas cimport Evas_Object, const_Evas_Object, Evas_Smart_Cb, \
+ Evas_Font_Size, Evas_Coord
+from efl.evas.enums cimport Evas_Callback_Type
+#from efl.evas cimport Evas_Load_Error
+#from efl.evas cimport Evas_Event_Flags
from enums cimport Elm_Policy, Elm_Policy_Quit
-from libc.string cimport const_char
-from libc.stdlib cimport const_void
-
-cdef extern from "stdlib.h":
- void free(void *ptr)
-
-cdef extern from "string.h":
- void *memcpy(void *dst, void *src, int n)
- char *strdup(char *str)
+from libc.string cimport const_char, memcpy, strdup
+from libc.stdlib cimport const_void, free
cdef extern from "time.h":
struct tm:
diff --git a/efl/elementary/object.pxd b/efl/elementary/object.pxd
index 4b7c515..d1a78be 100644
--- a/efl/elementary/object.pxd
+++ b/efl/elementary/object.pxd
@@ -17,7 +17,8 @@
from cpython cimport PyObject, Py_INCREF, Py_DECREF
from efl.evas cimport Eina_Bool, Eina_List, const_Eina_List
-from efl.evas cimport Evas_Object, Evas_Callback_Type, Evas_Smart_Cb
+from efl.evas cimport Evas_Object, Evas_Smart_Cb
+from efl.evas.enums cimport Evas_Callback_Type
from efl.evas cimport Object as evasObject
from efl.evas cimport Canvas as evasCanvas
from enums cimport Elm_Focus_Direction
diff --git a/efl/elementary/object.pyx b/efl/elementary/object.pyx
index e8d2949..aae77ad 100644
--- a/efl/elementary/object.pyx
+++ b/efl/elementary/object.pyx
@@ -40,9 +40,7 @@ from efl.evas cimport EventKeyDown, EventKeyUp,
EventMouseWheel
from efl.evas cimport evas_object_smart_callback_add
from efl.evas cimport evas_object_smart_callback_del
-from efl.evas import EVAS_CALLBACK_KEY_DOWN
-from efl.evas import EVAS_CALLBACK_KEY_UP
-from efl.evas import EVAS_CALLBACK_MOUSE_WHEEL
+cimport efl.evas.enums as evasenums
from efl.eo cimport _object_list_to_python
@@ -63,6 +61,10 @@ cimport enums
ELM_FOCUS_PREVIOUS = enums.ELM_FOCUS_PREVIOUS
ELM_FOCUS_NEXT = enums.ELM_FOCUS_NEXT
+EVAS_CALLBACK_KEY_DOWN = evasenums.EVAS_CALLBACK_KEY_DOWN
+EVAS_CALLBACK_KEY_UP = evasenums.EVAS_CALLBACK_KEY_UP
+EVAS_CALLBACK_MOUSE_WHEEL = evasenums.EVAS_CALLBACK_MOUSE_WHEEL
+
cdef void _object_callback(void *data,
Evas_Object *o, void *event_info) with gil:
cdef Object obj
@@ -101,17 +103,17 @@ cdef Eina_Bool _event_callback(void *data, Evas_Object
*o, Evas_Object *src, Eva
cdef EventKeyDown down_event
cdef EventKeyUp up_event
- if t == EVAS_CALLBACK_KEY_DOWN:
+ if t == evasenums.EVAS_CALLBACK_KEY_DOWN:
down_event = EventKeyDown()
down_event._set_obj(event_info)
ret = _event_dispatcher(obj, src_obj, t, down_event)
down_event._unset_obj()
- elif t == EVAS_CALLBACK_KEY_UP:
+ elif t == evasenums.EVAS_CALLBACK_KEY_UP:
up_event = EventKeyUp()
up_event._set_obj(event_info)
ret = _event_dispatcher(obj, src_obj, t, up_event)
up_event._unset_obj()
- elif t == EVAS_CALLBACK_MOUSE_WHEEL:
+ elif t == evasenums.EVAS_CALLBACK_MOUSE_WHEEL:
wheel_event = EventMouseWheel()
wheel_event._set_obj(event_info)
ret = _event_dispatcher(obj, src_obj, t, wheel_event)
diff --git a/efl/elementary/photocam.pxd b/efl/elementary/photocam.pxd
index eba8485..9cf7f97 100644
--- a/efl/elementary/photocam.pxd
+++ b/efl/elementary/photocam.pxd
@@ -1,4 +1,5 @@
-from efl.evas cimport Eina_Bool, Evas_Object, Evas_Load_Error
+from efl.evas cimport Eina_Bool, Evas_Object
+from efl.evas.enums cimport Evas_Load_Error
from enums cimport Elm_Photocam_Zoom_Mode
from libc.string cimport const_char
diff --git a/efl/elementary/photocam.pyx b/efl/elementary/photocam.pyx
index 4e8e2c1..44c5b91 100644
--- a/efl/elementary/photocam.pyx
+++ b/efl/elementary/photocam.pyx
@@ -108,6 +108,7 @@ cdef class Photocam(Object):
"""
def __set__(self, file):
if isinstance(file, unicode): file = file.encode("UTF-8")
+ # TODO: Check if Evas_Load_Error is being used correctly here
if not elm_photocam_file_set(self.obj,
<const_char *>file if file is not None else NULL):
raise RuntimeError("Could not set file")
diff --git a/efl/evas/efl.evas.pyx b/efl/evas/efl.evas.pyx
index ab76c74..084254e 100644
--- a/efl/evas/efl.evas.pyx
+++ b/efl/evas/efl.evas.pyx
@@ -20,141 +20,137 @@ from cpython cimport bool
from efl cimport *
from efl.eo cimport Eo, object_from_instance, _object_mapping_register
from efl.eo cimport _ctouni, _touni
-
-#
-# TODO: Put these in enums.pxd and cimport + assign them here, for exposing
-# to Python API.
-#
-# Use the C values (enums.VALUE) internally.
-#
-EVAS_LAYER_MIN = -32768
-EVAS_LAYER_MAX = 32767
-
-EVAS_HINT_EXPAND = 1.0
-EVAS_HINT_FILL = -1.0
-
-EVAS_CALLBACK_MOUSE_IN = 0
-EVAS_CALLBACK_MOUSE_OUT = 1
-EVAS_CALLBACK_MOUSE_DOWN = 2
-EVAS_CALLBACK_MOUSE_UP = 3
-EVAS_CALLBACK_MOUSE_MOVE = 4
-EVAS_CALLBACK_MOUSE_WHEEL = 5
-EVAS_CALLBACK_MULTI_DOWN = 6
-EVAS_CALLBACK_MULTI_UP = 7
-EVAS_CALLBACK_MULTI_MOVE = 8
-EVAS_CALLBACK_FREE = 9
-EVAS_CALLBACK_KEY_DOWN = 10
-EVAS_CALLBACK_KEY_UP = 11
-EVAS_CALLBACK_FOCUS_IN = 12
-EVAS_CALLBACK_FOCUS_OUT = 13
-EVAS_CALLBACK_SHOW = 14
-EVAS_CALLBACK_HIDE = 15
-EVAS_CALLBACK_MOVE = 16
-EVAS_CALLBACK_RESIZE = 17
-EVAS_CALLBACK_RESTACK = 18
-EVAS_CALLBACK_DEL = 19
-EVAS_CALLBACK_HOLD = 20
-EVAS_CALLBACK_CHANGED_SIZE_HINTS = 21
-EVAS_CALLBACK_IMAGE_PRELOADED = 22
-EVAS_CALLBACK_CANVAS_FOCUS_IN = 23
-EVAS_CALLBACK_CANVAS_FOCUS_OUT = 24
-EVAS_CALLBACK_RENDER_FLUSH_PRE = 25
-EVAS_CALLBACK_RENDER_FLUSH_POST = 26
-EVAS_CALLBACK_CANVAS_OBJECT_FOCUS_IN = 27
-EVAS_CALLBACK_CANVAS_OBJECT_FOCUS_OUT = 28
-EVAS_CALLBACK_IMAGE_UNLOADED = 29
-EVAS_CALLBACK_RENDER_PRE = 30
-EVAS_CALLBACK_RENDER_POST = 31
-EVAS_CALLBACK_IMAGE_RESIZE = 32
-EVAS_CALLBACK_DEVICE_CHANGED = 33
-EVAS_CALLBACK_LAST = 34
-
-EVAS_BUTTON_NONE = 0
-EVAS_BUTTON_DOUBLE_CLICK = 1
-EVAS_BUTTON_TRIPLE_CLICK = 2
-
-EVAS_EVENT_FLAG_NONE = 0
-EVAS_EVENT_FLAG_ON_HOLD = 1 << 0
-
-EVAS_RENDER_BLEND = 0
-EVAS_RENDER_BLEND_REL = 1
-EVAS_RENDER_COPY = 2
-EVAS_RENDER_COPY_REL = 3
-EVAS_RENDER_ADD = 4
-EVAS_RENDER_ADD_REL = 5
-EVAS_RENDER_SUB = 6
-EVAS_RENDER_SUB_REL = 7
-EVAS_RENDER_TINT = 8
-EVAS_RENDER_TINT_REL = 9
-EVAS_RENDER_MASK = 10
-EVAS_RENDER_MUL = 11
-
-EVAS_TEXTURE_REFLECT = 0
-EVAS_TEXTURE_REPEAT = 1
-EVAS_TEXTURE_RESTRICT = 2
-EVAS_TEXTURE_RESTRICT_REFLECT = 3
-EVAS_TEXTURE_RESTRICT_REPEAT = 4
-EVAS_TEXTURE_PAD = 5
-
-EVAS_ALLOC_ERROR_NONE = 0
-EVAS_ALLOC_ERROR_FATAL = 1
-EVAS_ALLOC_ERROR_RECOVERED = 2
-
-EVAS_LOAD_ERROR_NONE = 0
-EVAS_LOAD_ERROR_GENERIC = 1
-EVAS_LOAD_ERROR_DOES_NOT_EXIST = 2
-EVAS_LOAD_ERROR_PERMISSION_DENIED = 3
-EVAS_LOAD_ERROR_RESOURCE_ALLOCATION_FAILED = 4
-EVAS_LOAD_ERROR_CORRUPT_FILE = 5
-EVAS_LOAD_ERROR_UNKNOWN_FORMAT = 6
-
-EVAS_COLOR_SPACE_ARGB = 0
-EVAS_COLOR_SPACE_AHSV = 1
-
-EVAS_COLORSPACE_ARGB8888 = 0
-EVAS_COLORSPACE_YCBCR422P601_PL = 1
-EVAS_COLORSPACE_YCBCR422P709_PL = 2
-EVAS_COLORSPACE_RGB565_A5P = 3
-
-EVAS_PIXEL_FORMAT_NONE = 0
-EVAS_PIXEL_FORMAT_ARGB32 = 1
-EVAS_PIXEL_FORMAT_YUV420P_601 = 2
-
-EVAS_FONT_HINTING_NONE = 0
-EVAS_FONT_HINTING_AUTO = 1
-EVAS_FONT_HINTING_BYTECODE = 2
-
-EVAS_TEXT_STYLE_PLAIN = 0
-EVAS_TEXT_STYLE_SHADOW = 1
-EVAS_TEXT_STYLE_OUTLINE = 2
-EVAS_TEXT_STYLE_SOFT_OUTLINE = 3
-EVAS_TEXT_STYLE_GLOW = 4
-EVAS_TEXT_STYLE_OUTLINE_SHADOW = 5
-EVAS_TEXT_STYLE_FAR_SHADOW = 6
-EVAS_TEXT_STYLE_OUTLINE_SOFT_SHADOW = 7
-EVAS_TEXT_STYLE_SOFT_SHADOW = 8
-EVAS_TEXT_STYLE_FAR_SOFT_SHADOW = 9
-
-EVAS_TEXT_INVALID = -1
-EVAS_TEXT_SPECIAL = -2
-
-EVAS_TEXTBLOCK_TEXT_RAW = 0
-EVAS_TEXTBLOCK_TEXT_PLAIN = 1
-
-EVAS_OBJECT_POINTER_MODE_AUTOGRAB = 0
-EVAS_OBJECT_POINTER_MODE_NOGRAB = 1
+cimport efl.evas.enums as enums
+
+EVAS_LAYER_MIN = enums.EVAS_LAYER_MIN
+EVAS_LAYER_MAX = enums.EVAS_LAYER_MAX
+
+EVAS_HINT_EXPAND = enums.EVAS_HINT_EXPAND
+EVAS_HINT_FILL = enums.EVAS_HINT_FILL
+
+EVAS_CALLBACK_MOUSE_IN = enums.EVAS_CALLBACK_MOUSE_IN
+EVAS_CALLBACK_MOUSE_OUT = enums.EVAS_CALLBACK_MOUSE_OUT
+EVAS_CALLBACK_MOUSE_DOWN = enums.EVAS_CALLBACK_MOUSE_DOWN
+EVAS_CALLBACK_MOUSE_UP = enums.EVAS_CALLBACK_MOUSE_UP
+EVAS_CALLBACK_MOUSE_MOVE = enums.EVAS_CALLBACK_MOUSE_MOVE
+EVAS_CALLBACK_MOUSE_WHEEL = enums.EVAS_CALLBACK_MOUSE_WHEEL
+EVAS_CALLBACK_MULTI_DOWN = enums.EVAS_CALLBACK_MULTI_DOWN
+EVAS_CALLBACK_MULTI_UP = enums.EVAS_CALLBACK_MULTI_UP
+EVAS_CALLBACK_MULTI_MOVE = enums.EVAS_CALLBACK_MULTI_MOVE
+EVAS_CALLBACK_FREE = enums.EVAS_CALLBACK_FREE
+EVAS_CALLBACK_KEY_DOWN = enums.EVAS_CALLBACK_KEY_DOWN
+EVAS_CALLBACK_KEY_UP = enums.EVAS_CALLBACK_KEY_UP
+EVAS_CALLBACK_FOCUS_IN = enums.EVAS_CALLBACK_FOCUS_IN
+EVAS_CALLBACK_FOCUS_OUT = enums.EVAS_CALLBACK_FOCUS_OUT
+EVAS_CALLBACK_SHOW = enums.EVAS_CALLBACK_SHOW
+EVAS_CALLBACK_HIDE = enums.EVAS_CALLBACK_HIDE
+EVAS_CALLBACK_MOVE = enums.EVAS_CALLBACK_MOVE
+EVAS_CALLBACK_RESIZE = enums.EVAS_CALLBACK_RESIZE
+EVAS_CALLBACK_RESTACK = enums.EVAS_CALLBACK_RESTACK
+EVAS_CALLBACK_DEL = enums.EVAS_CALLBACK_DEL
+EVAS_CALLBACK_HOLD = enums.EVAS_CALLBACK_HOLD
+EVAS_CALLBACK_CHANGED_SIZE_HINTS = enums.EVAS_CALLBACK_CHANGED_SIZE_HINTS
+EVAS_CALLBACK_IMAGE_PRELOADED = enums.EVAS_CALLBACK_IMAGE_PRELOADED
+EVAS_CALLBACK_CANVAS_FOCUS_IN = enums.EVAS_CALLBACK_CANVAS_FOCUS_IN
+EVAS_CALLBACK_CANVAS_FOCUS_OUT = enums.EVAS_CALLBACK_CANVAS_FOCUS_OUT
+EVAS_CALLBACK_RENDER_FLUSH_PRE = enums.EVAS_CALLBACK_RENDER_FLUSH_PRE
+EVAS_CALLBACK_RENDER_FLUSH_POST = enums.EVAS_CALLBACK_RENDER_FLUSH_POST
+EVAS_CALLBACK_CANVAS_OBJECT_FOCUS_IN =
enums.EVAS_CALLBACK_CANVAS_OBJECT_FOCUS_IN
+EVAS_CALLBACK_CANVAS_OBJECT_FOCUS_OUT =
enums.EVAS_CALLBACK_CANVAS_OBJECT_FOCUS_OUT
+EVAS_CALLBACK_IMAGE_UNLOADED = enums.EVAS_CALLBACK_IMAGE_UNLOADED
+EVAS_CALLBACK_RENDER_PRE = enums.EVAS_CALLBACK_RENDER_PRE
+EVAS_CALLBACK_RENDER_POST = enums.EVAS_CALLBACK_RENDER_POST
+EVAS_CALLBACK_IMAGE_RESIZE = enums.EVAS_CALLBACK_IMAGE_RESIZE
+EVAS_CALLBACK_DEVICE_CHANGED = enums.EVAS_CALLBACK_DEVICE_CHANGED
+EVAS_CALLBACK_LAST = enums.EVAS_CALLBACK_LAST
+
+EVAS_BUTTON_NONE = enums.EVAS_BUTTON_NONE
+EVAS_BUTTON_DOUBLE_CLICK = enums.EVAS_BUTTON_DOUBLE_CLICK
+EVAS_BUTTON_TRIPLE_CLICK = enums.EVAS_BUTTON_TRIPLE_CLICK
+
+EVAS_EVENT_FLAG_NONE = enums.EVAS_EVENT_FLAG_NONE
+EVAS_EVENT_FLAG_ON_HOLD = enums.EVAS_EVENT_FLAG_ON_HOLD
+
+EVAS_RENDER_BLEND = enums.EVAS_RENDER_BLEND
+EVAS_RENDER_BLEND_REL = enums.EVAS_RENDER_BLEND_REL
+EVAS_RENDER_COPY = enums.EVAS_RENDER_COPY
+EVAS_RENDER_COPY_REL = enums.EVAS_RENDER_COPY_REL
+EVAS_RENDER_ADD = enums.EVAS_RENDER_ADD
+EVAS_RENDER_ADD_REL = enums.EVAS_RENDER_ADD_REL
+EVAS_RENDER_SUB = enums.EVAS_RENDER_SUB
+EVAS_RENDER_SUB_REL = enums.EVAS_RENDER_SUB_REL
+EVAS_RENDER_TINT = enums.EVAS_RENDER_TINT
+EVAS_RENDER_TINT_REL = enums.EVAS_RENDER_TINT_REL
+EVAS_RENDER_MASK = enums.EVAS_RENDER_MASK
+EVAS_RENDER_MUL = enums.EVAS_RENDER_MUL
+
+EVAS_TEXTURE_REFLECT = enums.EVAS_TEXTURE_REFLECT
+EVAS_TEXTURE_REPEAT = enums.EVAS_TEXTURE_REPEAT
+EVAS_TEXTURE_RESTRICT = enums.EVAS_TEXTURE_RESTRICT
+EVAS_TEXTURE_RESTRICT_REFLECT = enums.EVAS_TEXTURE_RESTRICT_REFLECT
+EVAS_TEXTURE_RESTRICT_REPEAT = enums.EVAS_TEXTURE_RESTRICT_REPEAT
+EVAS_TEXTURE_PAD = enums.EVAS_TEXTURE_PAD
+
+EVAS_ALLOC_ERROR_NONE = enums.EVAS_ALLOC_ERROR_NONE
+EVAS_ALLOC_ERROR_FATAL = enums.EVAS_ALLOC_ERROR_FATAL
+EVAS_ALLOC_ERROR_RECOVERED = enums.EVAS_ALLOC_ERROR_RECOVERED
+
+EVAS_LOAD_ERROR_NONE = enums.EVAS_LOAD_ERROR_NONE
+EVAS_LOAD_ERROR_GENERIC = enums.EVAS_LOAD_ERROR_GENERIC
+EVAS_LOAD_ERROR_DOES_NOT_EXIST = enums.EVAS_LOAD_ERROR_DOES_NOT_EXIST
+EVAS_LOAD_ERROR_PERMISSION_DENIED = enums.EVAS_LOAD_ERROR_PERMISSION_DENIED
+EVAS_LOAD_ERROR_RESOURCE_ALLOCATION_FAILED =
enums.EVAS_LOAD_ERROR_RESOURCE_ALLOCATION_FAILED
+EVAS_LOAD_ERROR_CORRUPT_FILE = enums.EVAS_LOAD_ERROR_CORRUPT_FILE
+EVAS_LOAD_ERROR_UNKNOWN_FORMAT = enums.EVAS_LOAD_ERROR_UNKNOWN_FORMAT
+
+EVAS_COLOR_SPACE_ARGB = enums.EVAS_COLOR_SPACE_ARGB
+EVAS_COLOR_SPACE_AHSV = enums.EVAS_COLOR_SPACE_AHSV
+
+EVAS_COLORSPACE_ARGB8888 = enums.EVAS_COLORSPACE_ARGB8888
+EVAS_COLORSPACE_YCBCR422P601_PL = enums.EVAS_COLORSPACE_YCBCR422P601_PL
+EVAS_COLORSPACE_YCBCR422P709_PL = enums.EVAS_COLORSPACE_YCBCR422P709_PL
+EVAS_COLORSPACE_RGB565_A5P = enums.EVAS_COLORSPACE_RGB565_A5P
+
+EVAS_PIXEL_FORMAT_NONE = enums.EVAS_PIXEL_FORMAT_NONE
+EVAS_PIXEL_FORMAT_ARGB32 = enums.EVAS_PIXEL_FORMAT_ARGB32
+EVAS_PIXEL_FORMAT_YUV420P_601 = enums.EVAS_PIXEL_FORMAT_YUV420P_601
+
+EVAS_FONT_HINTING_NONE = enums.EVAS_FONT_HINTING_NONE
+EVAS_FONT_HINTING_AUTO = enums.EVAS_FONT_HINTING_AUTO
+EVAS_FONT_HINTING_BYTECODE = enums.EVAS_FONT_HINTING_BYTECODE
+
+EVAS_TEXT_STYLE_PLAIN = enums.EVAS_TEXT_STYLE_PLAIN
+EVAS_TEXT_STYLE_SHADOW = enums.EVAS_TEXT_STYLE_SHADOW
+EVAS_TEXT_STYLE_OUTLINE = enums.EVAS_TEXT_STYLE_OUTLINE
+EVAS_TEXT_STYLE_SOFT_OUTLINE = enums.EVAS_TEXT_STYLE_SOFT_OUTLINE
+EVAS_TEXT_STYLE_GLOW = enums.EVAS_TEXT_STYLE_GLOW
+EVAS_TEXT_STYLE_OUTLINE_SHADOW = enums.EVAS_TEXT_STYLE_OUTLINE_SHADOW
+EVAS_TEXT_STYLE_FAR_SHADOW = enums.EVAS_TEXT_STYLE_FAR_SHADOW
+EVAS_TEXT_STYLE_OUTLINE_SOFT_SHADOW = enums.EVAS_TEXT_STYLE_OUTLINE_SOFT_SHADOW
+EVAS_TEXT_STYLE_SOFT_SHADOW = enums.EVAS_TEXT_STYLE_SOFT_SHADOW
+EVAS_TEXT_STYLE_FAR_SOFT_SHADOW = enums.EVAS_TEXT_STYLE_FAR_SOFT_SHADOW
+
+EVAS_TEXT_INVALID = enums.EVAS_TEXT_INVALID
+EVAS_TEXT_SPECIAL = enums.EVAS_TEXT_SPECIAL
+
+EVAS_TEXTBLOCK_TEXT_RAW = enums.EVAS_TEXTBLOCK_TEXT_RAW
+EVAS_TEXTBLOCK_TEXT_PLAIN = enums.EVAS_TEXTBLOCK_TEXT_PLAIN
+
+EVAS_OBJECT_POINTER_MODE_AUTOGRAB = enums.EVAS_OBJECT_POINTER_MODE_AUTOGRAB
+EVAS_OBJECT_POINTER_MODE_NOGRAB = enums.EVAS_OBJECT_POINTER_MODE_NOGRAB
EVAS_IMAGE_ROTATE_NONE = 0
EVAS_IMAGE_ROTATE_90 = 1
EVAS_IMAGE_ROTATE_180 = 2
EVAS_IMAGE_ROTATE_270 = 3
-EVAS_ASPECT_CONTROL_NONE = 0
-EVAS_ASPECT_CONTROL_NEITHER = 1
-EVAS_ASPECT_CONTROL_HORIZONTAL = 2
-EVAS_ASPECT_CONTROL_VERTICAL = 3
-EVAS_ASPECT_CONTROL_BOTH = 4
+EVAS_ASPECT_CONTROL_NONE = enums.EVAS_ASPECT_CONTROL_NONE
+EVAS_ASPECT_CONTROL_NEITHER = enums.EVAS_ASPECT_CONTROL_NEITHER
+EVAS_ASPECT_CONTROL_HORIZONTAL = enums.EVAS_ASPECT_CONTROL_HORIZONTAL
+EVAS_ASPECT_CONTROL_VERTICAL = enums.EVAS_ASPECT_CONTROL_VERTICAL
+EVAS_ASPECT_CONTROL_BOTH = enums.EVAS_ASPECT_CONTROL_BOTH
+EVAS_SMART_CLASS_VERSION = enums.EVAS_SMART_CLASS_VERSION
def init():
# when changing these, also change __init__.py!
@@ -216,6 +212,7 @@ def color_parse(desc, is_premul=None):
b = 0
a = 0
+ # TODO: Unicode/py3
if isinstance(desc, str):
if not desc or desc[0] != "#":
raise ValueError("Invalid color description")
@@ -288,19 +285,19 @@ def color_rgb_to_hsv(int r, int g, int b):
class EvasLoadError(Exception):
def __init__(self, int code, filename, key):
- if code == EVAS_LOAD_ERROR_NONE:
+ if code == enums.EVAS_LOAD_ERROR_NONE:
msg = "No error on load"
- elif code == EVAS_LOAD_ERROR_GENERIC:
+ elif code == enums.EVAS_LOAD_ERROR_GENERIC:
msg = "A non-specific error occurred"
- elif code == EVAS_LOAD_ERROR_DOES_NOT_EXIST:
+ elif code == enums.EVAS_LOAD_ERROR_DOES_NOT_EXIST:
msg = "File (or file path) does not exist"
- elif code == EVAS_LOAD_ERROR_PERMISSION_DENIED:
+ elif code == enums.EVAS_LOAD_ERROR_PERMISSION_DENIED:
msg = "Permission deinied to an existing file (or path)"
- elif code == EVAS_LOAD_ERROR_RESOURCE_ALLOCATION_FAILED:
+ elif code == enums.EVAS_LOAD_ERROR_RESOURCE_ALLOCATION_FAILED:
msg = "Allocation of resources failure prevented load"
- elif code == EVAS_LOAD_ERROR_CORRUPT_FILE:
+ elif code == enums.EVAS_LOAD_ERROR_CORRUPT_FILE:
msg = "File corrupt (but was detected as a known format)"
- elif code == EVAS_LOAD_ERROR_UNKNOWN_FORMAT:
+ elif code == enums.EVAS_LOAD_ERROR_UNKNOWN_FORMAT:
msg = "File is not a known format"
self.code = code
self.file = filename
diff --git a/include/efl.evas.enums.pxd b/include/efl.evas.enums.pxd
new file mode 100644
index 0000000..480f6a2
--- /dev/null
+++ b/include/efl.evas.enums.pxd
@@ -0,0 +1,270 @@
+cdef extern from "Evas.h":
+ ctypedef enum:
+ EVAS_LAYER_MIN # bottom-most layer number
+ EVAS_LAYER_MAX # top-most layer number
+
+ EVAS_COLOR_SPACE_ARGB # Not used for anything
+ EVAS_COLOR_SPACE_AHSV # Not used for anything
+ EVAS_TEXT_INVALID # Not used for anything
+ EVAS_TEXT_SPECIAL # Not used for anything
+
+ EVAS_HINT_EXPAND # Use with
evas_object_size_hint_weight_set(),
+ # evas_object_size_hint_weight_get(),
+ # evas_object_size_hint_expand_set(),
+ # evas_object_size_hint_expand_get()
+ EVAS_HINT_FILL # Use with
evas_object_size_hint_align_set(),
+ # evas_object_size_hint_align_get(),
+ # evas_object_size_hint_fill_set(),
+ # evas_object_size_hint_fill_get()
+
+ EVAS_SMART_CLASS_VERSION
+
+ ctypedef enum Evas_BiDi_Direction:
+ EVAS_BIDI_DIRECTION_NATURAL
+ EVAS_BIDI_DIRECTION_NEUTRAL
+ EVAS_BIDI_DIRECTION_LTR
+ EVAS_BIDI_DIRECTION_RTL
+
+ ctypedef enum Evas_Callback_Type:
+ # The types of events triggering a callback
+ #
+ # The following events are only for use with Evas objects, with
+ # evas_object_event_callback_add():
+ EVAS_CALLBACK_MOUSE_IN # Mouse In Event
+ EVAS_CALLBACK_MOUSE_OUT # Mouse Out Event
+ EVAS_CALLBACK_MOUSE_DOWN # Mouse Button Down Event
+ EVAS_CALLBACK_MOUSE_UP # Mouse Button Up Event
+ EVAS_CALLBACK_MOUSE_MOVE # Mouse Move Event
+ EVAS_CALLBACK_MOUSE_WHEEL # Mouse Wheel Event
+ EVAS_CALLBACK_MULTI_DOWN # Multi-touch Down Event
+ EVAS_CALLBACK_MULTI_UP # Multi-touch Up Event
+ EVAS_CALLBACK_MULTI_MOVE # Multi-touch Move Event
+ EVAS_CALLBACK_FREE # Object Being Freed (Called after Del)
+ EVAS_CALLBACK_KEY_DOWN # Key Press Event
+ EVAS_CALLBACK_KEY_UP # Key Release Event
+ EVAS_CALLBACK_FOCUS_IN # Focus In Event
+ EVAS_CALLBACK_FOCUS_OUT # Focus Out Event
+ EVAS_CALLBACK_SHOW # Show Event
+ EVAS_CALLBACK_HIDE # Hide Event
+ EVAS_CALLBACK_MOVE # Move Event
+ EVAS_CALLBACK_RESIZE # Resize Event
+ EVAS_CALLBACK_RESTACK # Restack Event
+ EVAS_CALLBACK_DEL # Object Being Deleted (called before Free)
+ EVAS_CALLBACK_HOLD # Events go on/off hold
+ EVAS_CALLBACK_CHANGED_SIZE_HINTS # Size hints changed event
+ EVAS_CALLBACK_IMAGE_PRELOADED # Image has been preloaded
+
+ # The following events are only for use with Evas canvases, with
+ # evas_event_callback_add():
+ EVAS_CALLBACK_CANVAS_FOCUS_IN # Canvas got focus as a whole
+ EVAS_CALLBACK_CANVAS_FOCUS_OUT # Canvas lost focus as a whole
+ EVAS_CALLBACK_RENDER_FLUSH_PRE # Called just before rendering is
updated on the canvas target
+ EVAS_CALLBACK_RENDER_FLUSH_POST # Called just after rendering is
updated on the canvas target
+ EVAS_CALLBACK_CANVAS_OBJECT_FOCUS_IN # Canvas object got focus
+ EVAS_CALLBACK_CANVAS_OBJECT_FOCUS_OUT # Canvas object lost focus
+
+ # More Evas object event types - see evas_object_event_callback_add():
+ EVAS_CALLBACK_IMAGE_UNLOADED # Image data has been unloaded (by some
mechanism in Evas that throw out original image data)
+
+ EVAS_CALLBACK_RENDER_PRE # Called just before rendering starts on the
canvas target @since 1.2
+ EVAS_CALLBACK_RENDER_POST # Called just after rendering stops on the
canvas target @since 1.2
+
+ EVAS_CALLBACK_IMAGE_RESIZE # Image size is changed @since 1.8
+ EVAS_CALLBACK_DEVICE_CHANGED # Devices added, removed or changed on
canvas @since 1.8
+ EVAS_CALLBACK_LAST # kept as last element/sentinel -- not really an
event
+
+ ctypedef enum Evas_Button_Flags:
+ # Flags for Mouse Button events
+ EVAS_BUTTON_NONE # No extra mouse button data
+ EVAS_BUTTON_DOUBLE_CLICK # This mouse button press was the 2nd press
of a double click
+ EVAS_BUTTON_TRIPLE_CLICK # This mouse button press was the 3rd press
of a triple click
+
+ ctypedef enum Evas_Event_Flags:
+ # Flags for Events
+ EVAS_EVENT_FLAG_NONE # No fancy flags set
+ EVAS_EVENT_FLAG_ON_HOLD # This event is being delivered but should be
put "on hold" until the on hold flag is unset. the event should be used for
informational purposes and maybe some indications visually, but not actually
perform anything
+ EVAS_EVENT_FLAG_ON_SCROLL # This event flag indicates the event occurs
while scrolling; for example, DOWN event occurs during scrolling; the event
should be used for informational purposes and maybe some indications visually,
but not actually perform anything
+
+ ctypedef enum Evas_Touch_Point_State:
+ EVAS_TOUCH_POINT_DOWN # Touch point is pressed down
+ EVAS_TOUCH_POINT_UP # Touch point is released
+ EVAS_TOUCH_POINT_MOVE # Touch point is moved
+ EVAS_TOUCH_POINT_STILL # Touch point is not moved after pressed
+ EVAS_TOUCH_POINT_CANCEL # Touch point is cancelled
+
+ ctypedef enum Evas_Font_Hinting_Flags:
+ # Flags for Font Hinting
+ EVAS_FONT_HINTING_NONE # No font hinting
+ EVAS_FONT_HINTING_AUTO # Automatic font hinting
+ EVAS_FONT_HINTING_BYTECODE # Bytecode font hinting
+
+ ctypedef enum Evas_Colorspace:
+ # Colorspaces for pixel data supported by Evas
+ EVAS_COLORSPACE_ARGB8888 # ARGB 32 bits per pixel, high-byte is Alpha,
accessed 1 32bit word at a time
+ # these are not currently supported - but planned for the future
+ EVAS_COLORSPACE_YCBCR422P601_PL # YCbCr 4:2:2 Planar, ITU.BT-601
specifications. The data pointed to is just an array of row pointer, pointing
to the Y rows, then the Cb, then Cr rows
+ EVAS_COLORSPACE_YCBCR422P709_PL # YCbCr 4:2:2 Planar, ITU.BT-709
specifications. The data pointed to is just an array of row pointer, pointing
to the Y rows, then the Cb, then Cr rows
+ EVAS_COLORSPACE_RGB565_A5P # 16bit rgb565 + Alpha plane at end - 5
bits of the 8 being used per alpha byte
+ EVAS_COLORSPACE_GRY8 # 8bit grayscale
+ EVAS_COLORSPACE_YCBCR422601_PL # YCbCr 4:2:2, ITU.BT-601
specifications. The data pointed to is just an array of row pointer, pointing
to line of Y,Cb,Y,Cr bytes
+ EVAS_COLORSPACE_YCBCR420NV12601_PL # YCbCr 4:2:0, ITU.BT-601
specification. The data pointed to is just an array of row pointer, pointing to
the Y rows, then the Cb,Cr rows.
+ EVAS_COLORSPACE_YCBCR420TM12601_PL # YCbCr 4:2:0, ITU.BT-601
specification. The data pointed to is just an array of tiled row pointer,
pointing to the Y rows, then the Cb,Cr rows.
+
+ ctypedef enum Evas_Object_Table_Homogeneous_Mode:
+ # Table cell pack mode.
+ EVAS_OBJECT_TABLE_HOMOGENEOUS_NONE
+ EVAS_OBJECT_TABLE_HOMOGENEOUS_TABLE
+ EVAS_OBJECT_TABLE_HOMOGENEOUS_ITEM
+
+ ctypedef enum Evas_Aspect_Control:
+ # Aspect types/policies for scaling size hints, used for
evas_object_size_hint_aspect_set()
+ EVAS_ASPECT_CONTROL_NONE = 0 # Preference on scaling unset
+ EVAS_ASPECT_CONTROL_NEITHER = 1 # Same effect as unset preference on
scaling
+ EVAS_ASPECT_CONTROL_HORIZONTAL = 2 # Use all horizontal container
space to place an object, using the given aspect
+ EVAS_ASPECT_CONTROL_VERTICAL = 3 # Use all vertical container space to
place an object, using the given aspect
+ EVAS_ASPECT_CONTROL_BOTH = 4 # Use all horizontal @b and vertical
container spaces to place an object (never growing it out of those bounds),
using the given aspect
+
+ ctypedef enum Evas_Display_Mode:
+ # object's display mode type related with compress/expand or etc mode
+ EVAS_DISPLAY_MODE_NONE = 0 # Default mode
+ EVAS_DISPLAY_MODE_INHERIT = 1 # Use this mode when object's display
mode depend on ancestor's
+ EVAS_DISPLAY_MODE_COMPRESS = 2 # Use this mode want to give comppress
display mode hint to object
+ EVAS_DISPLAY_MODE_EXPAND = 3 # Use this mode want to give expand
display mode hint to object
+ EVAS_DISPLAY_MODE_DONT_CHANGE = 4 # Use this mode when object should
not change display mode
+
+ ctypedef enum Evas_Load_Error:
+ # Evas image load error codes one can get - see evas_load_error_str()
too.
+ EVAS_LOAD_ERROR_NONE = 0 # No error on load
+ EVAS_LOAD_ERROR_GENERIC = 1 # A non-specific error occurred
+ EVAS_LOAD_ERROR_DOES_NOT_EXIST = 2 # File (or file path) does not exist
+ EVAS_LOAD_ERROR_PERMISSION_DENIED = 3 # Permission denied to an
existing file (or path)
+ EVAS_LOAD_ERROR_RESOURCE_ALLOCATION_FAILED = 4 # Allocation of
resources failure prevented load
+ EVAS_LOAD_ERROR_CORRUPT_FILE = 5 # File corrupt (but was detected as a
known format)
+ EVAS_LOAD_ERROR_UNKNOWN_FORMAT = 6 # File is not a known format
+
+ ctypedef enum Evas_Alloc_Error:
+ # Possible allocation errors returned by evas_alloc_error()
+ EVAS_ALLOC_ERROR_NONE = 0 # No allocation error
+ EVAS_ALLOC_ERROR_FATAL = 1 # Allocation failed despite attempts to
free up memory
+ EVAS_ALLOC_ERROR_RECOVERED = 2 # Allocation succeeded, but extra
memory had to be found by freeing up speculative resources
+
+ ctypedef enum Evas_Fill_Spread:
+ # Fill types used for evas_object_image_fill_spread_set()
+ EVAS_TEXTURE_REFLECT = 0 # image fill tiling mode - tiling reflects
+ EVAS_TEXTURE_REPEAT = 1 # tiling repeats
+ EVAS_TEXTURE_RESTRICT = 2 # tiling clamps - range offset ignored
+ EVAS_TEXTURE_RESTRICT_REFLECT = 3 # tiling clamps and any range offset
reflects
+ EVAS_TEXTURE_RESTRICT_REPEAT = 4 # tiling clamps and any range offset
repeats
+ EVAS_TEXTURE_PAD = 5 # tiling extends with end values
+
+ ctypedef enum Evas_Pixel_Import_Pixel_Format:
+ # Pixel format for import call. See evas_object_image_pixels_import()
+ EVAS_PIXEL_FORMAT_NONE = 0 # No pixel format
+ EVAS_PIXEL_FORMAT_ARGB32 = 1 # ARGB 32bit pixel format with A in the
high byte per 32bit pixel word
+ EVAS_PIXEL_FORMAT_YUV420P_601 = 2 # YUV 420 Planar format with CCIR
601 color encoding with contiguous planes in the order Y, U and V
+
+ ctypedef enum Evas_Native_Surface_Type:
+ EVAS_NATIVE_SURFACE_NONE
+ EVAS_NATIVE_SURFACE_X11
+ EVAS_NATIVE_SURFACE_OPENGL
+
+ ctypedef enum Evas_Render_Op:
+ # How the object should be rendered to output.
+ EVAS_RENDER_BLEND = 0 # default op: d = d*(1-sa) + s
+ EVAS_RENDER_BLEND_REL = 1 # d = d*(1 - sa) + s*da
+ EVAS_RENDER_COPY = 2 # d = s
+ EVAS_RENDER_COPY_REL = 3 # d = s*da
+ EVAS_RENDER_ADD = 4 # d = d + s
+ EVAS_RENDER_ADD_REL = 5 # d = d + s*da
+ EVAS_RENDER_SUB = 6 # d = d - s
+ EVAS_RENDER_SUB_REL = 7 # d = d - s*da
+ EVAS_RENDER_TINT = 8 # d = d*s + d*(1 - sa) + s*(1 - da)
+ EVAS_RENDER_TINT_REL = 9 # d = d*(1 - sa + s)
+ EVAS_RENDER_MASK = 10 # d = d*sa
+ EVAS_RENDER_MUL = 11 # d = d*s
+
+ ctypedef enum Evas_Border_Fill_Mode:
+ # How an image's center region (the complement to the border region)
should be rendered by Evas
+ EVAS_BORDER_FILL_NONE = 0 # Image's center region is @b not to be
rendered
+ EVAS_BORDER_FILL_DEFAULT = 1 # Image's center region is to be @b
blended with objects underneath it, if it has transparency. This is the default
behavior for image objects
+ EVAS_BORDER_FILL_SOLID = 2 # Image's center region is to be made
solid, even if it has transparency on it
+
+ ctypedef enum Evas_Image_Scale_Hint:
+ # How an image's data is to be treated by Evas, with regard to scaling
cache
+ EVAS_IMAGE_SCALE_HINT_NONE = 0 # No scale hint at all
+ EVAS_IMAGE_SCALE_HINT_DYNAMIC = 1 # Image is being re-scaled over
time, thus turning scaling cache @b off for its data
+ EVAS_IMAGE_SCALE_HINT_STATIC = 2 # Image is not being re-scaled over
time, thus turning scaling cache @b on for its data
+
+ ctypedef enum Evas_Image_Animated_Loop_Hint:
+ EVAS_IMAGE_ANIMATED_HINT_NONE = 0
+ EVAS_IMAGE_ANIMATED_HINT_LOOP = 1 # Image's animation mode is loop
like 1->2->3->1->2->3
+ EVAS_IMAGE_ANIMATED_HINT_PINGPONG = 2 # Image's animation mode is
pingpong like 1->2->3->2->1-> ...
+
+ ctypedef enum Evas_Engine_Render_Mode:
+ EVAS_RENDER_MODE_BLOCKING = 0
+ EVAS_RENDER_MODE_NONBLOCKING = 1
+
+ ctypedef enum Evas_Image_Content_Hint:
+ # How an image's data is to be treated by Evas, for optimization
+ EVAS_IMAGE_CONTENT_HINT_NONE = 0 # No hint at all
+ EVAS_IMAGE_CONTENT_HINT_DYNAMIC = 1 # The contents will change over
time
+ EVAS_IMAGE_CONTENT_HINT_STATIC = 2 # The contents won't change over
time
+
+ ctypedef enum Evas_Device_Class:
+ EVAS_DEVICE_CLASS_NONE # Not a device @since 1.8
+ EVAS_DEVICE_CLASS_SEAT # The user/seat (the user themselves) @since 1.8
+ EVAS_DEVICE_CLASS_KEYBOARD # A regular keyboard, numberpad or attached
buttons @since 1.8
+ EVAS_DEVICE_CLASS_MOUSE # A mouse, trackball or touchpad relative
motion device @since 1.8
+ EVAS_DEVICE_CLASS_TOUCH # A touchscreen with fingers or stylus @since
1.8
+ EVAS_DEVICE_CLASS_PEN # A special pen device @since 1.8
+ EVAS_DEVICE_CLASS_POINTER # A laser pointer, wii-style or "minority
report" pointing device @since 1.8
+ EVAS_DEVICE_CLASS_GAMEPAD # A gamepad controller or joystick @since
1.8
+
+ ctypedef enum Evas_Object_Pointer_Mode:
+ # How the mouse pointer should be handled by Evas.
+ EVAS_OBJECT_POINTER_MODE_AUTOGRAB # default, X11-like
+ EVAS_OBJECT_POINTER_MODE_NOGRAB # pointer always bound to the object
right below it
+ EVAS_OBJECT_POINTER_MODE_NOGRAB_NO_REPEAT_UPDOWN # useful on object
with "repeat events" enabled, where mouse/touch up and down events WONT be
repeated to objects and these objects wont be auto-grabbed. @since 1.2
+
+ ctypedef enum Evas_Text_Style_Type:
+ # Types of styles to be applied on text objects. The @c
EVAS_TEXT_STYLE_SHADOW_DIRECTION_* ones are to be ORed together with others
imposing shadow, to change shadow's direction
+ EVAS_TEXT_STYLE_PLAIN # plain, standard text
+ EVAS_TEXT_STYLE_SHADOW # text with shadow underneath
+ EVAS_TEXT_STYLE_OUTLINE # text with an outline
+ EVAS_TEXT_STYLE_SOFT_OUTLINE # text with a soft outline
+ EVAS_TEXT_STYLE_GLOW # text with a glow effect
+ EVAS_TEXT_STYLE_OUTLINE_SHADOW # text with both outline and
shadow effects
+ EVAS_TEXT_STYLE_FAR_SHADOW # text with (far) shadow underneath
+ EVAS_TEXT_STYLE_OUTLINE_SOFT_SHADOW # text with outline and soft
shadow effects combined
+ EVAS_TEXT_STYLE_SOFT_SHADOW # text with (soft) shadow underneath
+ EVAS_TEXT_STYLE_FAR_SOFT_SHADOW # text with (far soft) shadow
underneath
+
+ # OR these to modify shadow direction (3 bits needed)
+ EVAS_TEXT_STYLE_SHADOW_DIRECTION_BOTTOM_RIGHT = (0x0 << 4) #
shadow growing to bottom right
+ EVAS_TEXT_STYLE_SHADOW_DIRECTION_BOTTOM = (0x1 << 4) #
shadow growing to the bottom
+ EVAS_TEXT_STYLE_SHADOW_DIRECTION_BOTTOM_LEFT = (0x2 << 4) #
shadow growing to bottom left
+ EVAS_TEXT_STYLE_SHADOW_DIRECTION_LEFT = (0x3 << 4) #
shadow growing to the left
+ EVAS_TEXT_STYLE_SHADOW_DIRECTION_TOP_LEFT = (0x4 << 4) #
shadow growing to top left
+ EVAS_TEXT_STYLE_SHADOW_DIRECTION_TOP = (0x5 << 4) #
shadow growing to the top
+ EVAS_TEXT_STYLE_SHADOW_DIRECTION_TOP_RIGHT = (0x6 << 4) #
shadow growing to top right
+ EVAS_TEXT_STYLE_SHADOW_DIRECTION_RIGHT = (0x7 << 4) #
shadow growing to the right
+
+ ctypedef enum Evas_Textblock_Text_Type:
+ EVAS_TEXTBLOCK_TEXT_RAW
+ EVAS_TEXTBLOCK_TEXT_PLAIN
+ EVAS_TEXTBLOCK_TEXT_MARKUP
+
+ ctypedef enum Evas_Textblock_Cursor_Type:
+ EVAS_TEXTBLOCK_CURSOR_UNDER
+ EVAS_TEXTBLOCK_CURSOR_BEFORE
+
+ ctypedef enum Evas_Textgrid_Palette:
+ EVAS_TEXTGRID_PALETTE_NONE # No palette is used
+ EVAS_TEXTGRID_PALETTE_STANDARD # standard palette (around 16 colors)
+ EVAS_TEXTGRID_PALETTE_EXTENDED # extended palette (at max 256 colors)
+ EVAS_TEXTGRID_PALETTE_LAST # ignore it
+
+ ctypedef enum Evas_Textgrid_Font_Style:
+ EVAS_TEXTGRID_FONT_STYLE_NORMAL = (1 << 0) # Normal style
+ EVAS_TEXTGRID_FONT_STYLE_BOLD = (1 << 1) # Bold style
+ EVAS_TEXTGRID_FONT_STYLE_ITALIC = (1 << 2) # Oblique style
diff --git a/include/efl.evas.pxd b/include/efl.evas.pxd
index 7cd521a..4c889d5 100644
--- a/include/efl.evas.pxd
+++ b/include/efl.evas.pxd
@@ -20,7 +20,10 @@ from efl.eo cimport Eo
# cimport efl.c_eo as c_eo
from efl.c_eo cimport Eo as cEo
from efl.c_eo cimport const_Eo_Class
-
+from efl.evas.enums cimport Evas_Event_Flags, Evas_Button_Flags, \
+ Evas_Font_Hinting_Flags, Evas_Aspect_Control, Evas_Render_Op, \
+ Evas_Callback_Type, Evas_Object_Pointer_Mode, Evas_Colorspace, \
+ Evas_Text_Style_Type, Evas_Textblock_Text_Type
cdef extern from "Evas.h":
####################################################################
@@ -34,75 +37,75 @@ cdef extern from "Evas.h":
####################################################################
# Enumerations
#
- ctypedef enum Evas_Layer:
- pass
-
- ctypedef enum Evas_Text:
- pass
-
- ctypedef enum Evas_Callback_Type:
- pass
-
-
- ctypedef enum Evas_Pixel_Format:
- pass
-
-
- ctypedef enum Evas_Color_Space:
- pass
-
-
- ctypedef enum Evas_Texture:
- pass
-
-
- cdef enum Evas_Alloc_Error:
- pass
-
-
- cdef enum Evas_Load_Error:
- pass
-
-
- ctypedef enum Evas_Button_Flags:
- pass
-
-
- ctypedef enum Evas_Event_Flags:
- pass
-
-
- ctypedef enum Evas_Font_Hinting_Flags:
- pass
-
-
- ctypedef enum Evas_Colorspace:
- pass
-
-
- ctypedef enum Evas_Render_Op:
- pass
-
-
- ctypedef enum Evas_Text_Style_Type:
- pass
-
-
- ctypedef enum Evas_Textblock_Text_Type:
- pass
-
-
- ctypedef enum Evas_Smart_Class_Version:
- EVAS_SMART_CLASS_VERSION
-
-
- ctypedef enum Evas_Object_Pointer_Mode:
- pass
-
-
- ctypedef enum Evas_Aspect_Control:
- pass
-
+# ctypedef enum Evas_Layer:
+# pass
+#
+# ctypedef enum Evas_Text:
+# pass
+#
+# ctypedef enum Evas_Callback_Type:
+# pass
+#
+#
+# ctypedef enum Evas_Pixel_Format:
+# pass
+#
+#
+# ctypedef enum Evas_Color_Space:
+# pass
+#
+#
+# ctypedef enum Evas_Texture:
+# pass
+#
+#
+# cdef enum Evas_Alloc_Error:
+# pass
+#
+#
+# cdef enum Evas_Load_Error:
+# pass
+#
+#
+# ctypedef enum Evas_Button_Flags:
+# pass
+#
+#
+# ctypedef enum Evas_Event_Flags:
+# pass
+#
+#
+# ctypedef enum Evas_Font_Hinting_Flags:
+# pass
+#
+#
+# ctypedef enum Evas_Colorspace:
+# pass
+#
+#
+# ctypedef enum Evas_Render_Op:
+# pass
+#
+#
+# ctypedef enum Evas_Text_Style_Type:
+# pass
+#
+#
+# ctypedef enum Evas_Textblock_Text_Type:
+# pass
+#
+#
+# ctypedef enum Evas_Smart_Class_Version:
+# EVAS_SMART_CLASS_VERSION
+#
+#
+# ctypedef enum Evas_Object_Pointer_Mode:
+# pass
+#
+#
+# ctypedef enum Evas_Aspect_Control:
+# pass
+#
####################################################################
# Structures
#
@@ -357,7 +360,7 @@ cdef extern from "Evas.h":
Evas *evas_new()
void evas_free(Evas *e)
const_Eo_Class *evas_class_get()
-
+
int evas_render_method_lookup(const_char *name)
Eina_List *evas_render_method_list()
void evas_render_method_list_free(Eina_List *list)
@@ -811,7 +814,7 @@ cdef class Rect:
cdef class Canvas(Eo):
# cdef Evas *obj
cdef object _callbacks
-#
+#
# cdef int _set_obj(self, Evas *obj) except 0
# cdef int _unset_obj(self) except 0
--
------------------------------------------------------------------------------
Minimize network downtime and maximize team effectiveness.
Reduce network management and security costs.Learn how to hire
the most talented Cisco Certified professionals. Visit the
Employer Resources Portal
http://www.cisco.com/web/learning/employer_resources/index.html
