summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKai Huuhko <kai.huuhko@gmail.com>2015-03-13 20:13:31 +0200
committerKai Huuhko <kai.huuhko@gmail.com>2015-03-13 20:13:31 +0200
commit0a9ccfca74e071de038e43a95b265f75e5aeb463 (patch)
tree58eb690be39baa6f5f489e32e2e47a0ccba582fe
parent6036567b41d91f8b1023546d158bc742f72d65d2 (diff)
Ecore-X: Add cursor_free, deprecate screensaver_supend
-rw-r--r--efl/ecore_x/efl.ecore_x.pxd2
-rw-r--r--efl/ecore_x/efl.ecore_x.pyx22
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":
1317 void ecore_x_screensaver_event_listen_set(Eina_Bool on) 1317 void ecore_x_screensaver_event_listen_set(Eina_Bool on)
1318 Eina_Bool ecore_x_screensaver_custom_blanking_enable() 1318 Eina_Bool ecore_x_screensaver_custom_blanking_enable()
1319 Eina_Bool ecore_x_screensaver_custom_blanking_disable() 1319 Eina_Bool ecore_x_screensaver_custom_blanking_disable()
1320 void ecore_x_screensaver_supend() 1320 void ecore_x_screensaver_suspend()
1321 void ecore_x_screensaver_resume() 1321 void ecore_x_screensaver_resume()
1322 1322
1323 1323
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 @@
17 17
18#from cpython cimport PyObject, Py_INCREF, Py_DECREF 18#from cpython cimport PyObject, Py_INCREF, Py_DECREF
19from cpython cimport PyMem_Malloc, PyMem_Free, PyUnicode_AsUTF8String 19from cpython cimport PyMem_Malloc, PyMem_Free, PyUnicode_AsUTF8String
20from efl.utils.deprecated cimport DEPRECATED
20 21
21 22
22def init(name=None): 23def init(name=None):
@@ -289,17 +290,34 @@ def screensaver_custom_blanking_disable():
289 """ .. versionadded:: 1.11 """ 290 """ .. versionadded:: 1.11 """
290 return bool(ecore_x_screensaver_custom_blanking_disable()) 291 return bool(ecore_x_screensaver_custom_blanking_disable())
291 292
293@DEPRECATED("1.14", "Use screensaver_suspend() instead.")
292def screensaver_supend(): 294def screensaver_supend():
293 """ .. versionadded:: 1.11 """ 295 """ .. versionadded:: 1.11 """
294 ecore_x_screensaver_supend() 296 ecore_x_screensaver_suspend()
297
298def screensaver_suspend():
299 """ .. versionadded:: 1.14 """
295 300
296def screensaver_resume(): 301def screensaver_resume():
297 """ .. versionadded:: 1.11 """ 302 """ .. versionadded:: 1.11 """
298 ecore_x_screensaver_resume() 303 ecore_x_screensaver_resume()
299 304
300def cursor_shape_get(int shape): 305def cursor_shape_get(int shape):
301 """ .. versionadded:: 1.14 """ 306 """
307 :param int shape: The shape ID (check Ecore_X_Cursor.h for these)
308 :return: The cursor id
309 :rtype: Ecore_X_Cursor
310
311 .. versionadded:: 1.14
312 """
302 return ecore_x_cursor_shape_get(shape) 313 return ecore_x_cursor_shape_get(shape)
303 314
315def cursor_free(Ecore_X_Cursor c):
316 """
317 :param Ecore_X_Cursor c: The cursor ID
318
319 .. versionadded:: 1.14
320 """
321
304include "efl.ecore_x_window.pxi" 322include "efl.ecore_x_window.pxi"
305include "efl.ecore_x_events.pxi" 323include "efl.ecore_x_events.pxi"