davemds pushed a commit to branch master. http://git.enlightenment.org/bindings/python/python-efl.git/commit/?id=84a09b61b6d650b5056ce576f686e19b7ced05b6
commit 84a09b61b6d650b5056ce576f686e19b7ced05b6 Author: Dave Andreoli <[email protected]> Date: Sun Jan 4 14:34:04 2015 +0100 Remove specific X code from elm Just using unsigned int for the Ecore_X_ID type --- efl/elementary/window.pxd | 14 ++------------ efl/elementary/window.pyx | 42 ++++++++---------------------------------- 2 files changed, 10 insertions(+), 46 deletions(-) diff --git a/efl/elementary/window.pxd b/efl/elementary/window.pxd index 0ae4406..a1bd1b4 100644 --- a/efl/elementary/window.pxd +++ b/efl/elementary/window.pxd @@ -2,13 +2,6 @@ from efl.evas cimport Eina_Bool, Evas_Object from enums cimport Elm_Illume_Command, Elm_Win_Type, Elm_Win_Indicator_Mode, \ Elm_Win_Indicator_Opacity_Mode, Elm_Win_Keyboard_Mode -cdef extern from "Ecore_X.h": - ctypedef unsigned int Ecore_X_ID - ctypedef Ecore_X_ID Ecore_X_Window - -# TODO: -# cdef extern from "Ecore_Evas_Types.h": - # ctypedef struct Ecore_Wl_Window cdef extern from "Elementary.h": Evas_Object *elm_win_add(Evas_Object *parent, const char *name, Elm_Win_Type type) @@ -127,11 +120,8 @@ cdef extern from "Elementary.h": Eina_Bool elm_win_wm_rotation_manual_rotation_done_get(const Evas_Object *obj) void elm_win_wm_rotation_manual_rotation_done(Evas_Object *obj) - # X specific call - won't work on non-x engines (return 0) - Ecore_X_Window elm_win_xwindow_get(const Evas_Object *obj) - # TODO: Ecore_Wl_Window *elm_win_wl_window_get(const Evas_Object *obj) - void elm_win_floating_mode_set(Evas_Object *obj, Eina_Bool floating) Eina_Bool elm_win_floating_mode_get(const Evas_Object *obj) - # TODO: Ecore_Window elm_win_window_id_get(const Evas_Object *obj) + # X specific call - won't work on non-x engines (return 0) + unsigned int elm_win_xwindow_get(const Evas_Object *obj) diff --git a/efl/elementary/window.pyx b/efl/elementary/window.pyx index 207dea0..a771791 100644 --- a/efl/elementary/window.pyx +++ b/efl/elementary/window.pyx @@ -1659,39 +1659,27 @@ cdef class Window(Object): """Returns the X Window id. X Window id is a value of type long int which can be used in - combination with some functions/objects in the ecore.x module. + combination with some functions/objects in the ecore_x module. For example you can hide the mouse cursor with:: - import ecore.x + import ecore_x xid = your_elm_win.xwindow_xid - xwin = ecore.x.Window_from_xid(xid) + xwin = ecore_x.Window_from_xid(xid) xwin.cursor_hide() - .. note:: This is not portable at all. Works only under the X window - system. + .. warning:: This is not portable at all. Works only under the X + window system. And you must build python-efl with ecore_x + enabled. :type: long """ def __get__(self): - cdef Ecore_X_Window xwin - xwin = elm_win_xwindow_get(self.obj) - return xwin + return elm_win_xwindow_get(self.obj) def xwindow_xid_get(self): - cdef Ecore_X_Window xwin - xwin = elm_win_xwindow_get(self.obj) - return xwin - - # TODO: - # property wl_window: - # """Get the Ecore_Wl_Window of an Evas_Object - - # :type: Ecore_Wl_Window - - # """ - # Ecore_Wl_Window *elm_win_wl_window_get(const Evas_Object *obj) + return elm_win_xwindow_get(self.obj) property floating_mode: """Floating mode of a window. @@ -1712,20 +1700,6 @@ cdef class Window(Object): def floating_mode_get(self): return bool(elm_win_floating_mode_get(self.obj)) - # TODO: - # property window_id: - # """ - - # Get the Ecore_Window of an Evas_Object - - # When Elementary is using a Wayland engine, this function will return the surface id of the elm window's surface. - - # :type: Ecore_Window - # :since: 1.8 - - # """ - # def __get__(self): - # return Ecore_Window elm_win_window_id_get(self.obj) def callback_delete_request_add(self, func, *args, **kwargs): """The user requested to close the window. See :py:attr:`autodel`.""" --
