From 0a9ccfca74e071de038e43a95b265f75e5aeb463 Mon Sep 17 00:00:00 2001 From: Kai Huuhko Date: Fri, 13 Mar 2015 20:13:31 +0200 Subject: [PATCH] Ecore-X: Add cursor_free, deprecate screensaver_supend --- efl/ecore_x/efl.ecore_x.pxd | 2 +- efl/ecore_x/efl.ecore_x.pyx | 22 ++++++++++++++++++++-- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/efl/ecore_x/efl.ecore_x.pxd b/efl/ecore_x/efl.ecore_x.pxd index 89b9107..9895bf6 100644 --- a/efl/ecore_x/efl.ecore_x.pxd +++ b/efl/ecore_x/efl.ecore_x.pxd @@ -1317,7 +1317,7 @@ cdef extern from "Ecore_X.h": void ecore_x_screensaver_event_listen_set(Eina_Bool on) Eina_Bool ecore_x_screensaver_custom_blanking_enable() Eina_Bool ecore_x_screensaver_custom_blanking_disable() - void ecore_x_screensaver_supend() + void ecore_x_screensaver_suspend() void ecore_x_screensaver_resume() diff --git a/efl/ecore_x/efl.ecore_x.pyx b/efl/ecore_x/efl.ecore_x.pyx index 4b0ba88..25b9894 100644 --- a/efl/ecore_x/efl.ecore_x.pyx +++ b/efl/ecore_x/efl.ecore_x.pyx @@ -17,6 +17,7 @@ #from cpython cimport PyObject, Py_INCREF, Py_DECREF from cpython cimport PyMem_Malloc, PyMem_Free, PyUnicode_AsUTF8String +from efl.utils.deprecated cimport DEPRECATED def init(name=None): @@ -289,17 +290,34 @@ def screensaver_custom_blanking_disable(): """ .. versionadded:: 1.11 """ return bool(ecore_x_screensaver_custom_blanking_disable()) +@DEPRECATED("1.14", "Use screensaver_suspend() instead.") def screensaver_supend(): """ .. versionadded:: 1.11 """ - ecore_x_screensaver_supend() + ecore_x_screensaver_suspend() + +def screensaver_suspend(): + """ .. versionadded:: 1.14 """ def screensaver_resume(): """ .. versionadded:: 1.11 """ ecore_x_screensaver_resume() def cursor_shape_get(int shape): - """ .. versionadded:: 1.14 """ + """ + :param int shape: The shape ID (check Ecore_X_Cursor.h for these) + :return: The cursor id + :rtype: Ecore_X_Cursor + + .. versionadded:: 1.14 + """ return ecore_x_cursor_shape_get(shape) +def cursor_free(Ecore_X_Cursor c): + """ + :param Ecore_X_Cursor c: The cursor ID + + .. versionadded:: 1.14 + """ + include "efl.ecore_x_window.pxi" include "efl.ecore_x_events.pxi"