[Pkg-e-commits] [SCM] Python bindings for Evas branch, upstream-vcs, updated. a2d7e40fb9fbbe948f479174a461f735a2f530fb
cmarcelo
cmarcelo at alioth.debian.org
Sat May 24 16:31:56 UTC 2008
The following commit has been merged in the upstream-vcs branch:
commit 70d791f87826874d699c2a14fe78e03ac46bc238
Author: cmarcelo <cmarcelo>
Date: Wed Mar 26 04:43:26 2008 +0000
Add support for new event_flags member in Events structures.
diff --git a/evas/evas.c_evas_object_events.pxi b/evas/evas.c_evas_object_events.pxi
index 3eb67f3..387358b 100644
--- a/evas/evas.c_evas_object_events.pxi
+++ b/evas/evas.c_evas_object_events.pxi
@@ -80,11 +80,11 @@ cdef class EventMouseIn:
def __str__(self):
self._check_validity()
return ("%s(buttons=%d, output=(%d, %d), canvas=(%d, %d), "
- "timestamp=%d)") % \
+ "timestamp=%d, event_flags=%#x)") % \
(self.__class__.__name__, self.obj.buttons,
self.obj.output.x, self.obj.output.y,
self.obj.canvas.x, self.obj.canvas.y,
- self.obj.timestamp)
+ self.obj.timestamp, self.event_flags)
property buttons:
def __get__(self):
@@ -96,6 +96,15 @@ cdef class EventMouseIn:
self._check_validity()
return self.obj.timestamp
+ property event_flags:
+ def __get__(self):
+ self._check_validity()
+ return <int>self.obj.event_flags
+
+ def __set__(self, flags):
+ self._check_validity()
+ self.obj.event_flags = flags
+
cdef class EventMouseOut:
cdef void _set_obj(self, void *ptr):
@@ -114,11 +123,11 @@ cdef class EventMouseOut:
def __str__(self):
self._check_validity()
return ("%s(buttons=%d, output=(%d, %d), canvas=(%d, %d), "
- "timestamp=%d)") % \
+ "timestamp=%d, event_flags=%#x)") % \
(self.__class__.__name__, self.obj.buttons,
self.obj.output.x, self.obj.output.y,
self.obj.canvas.x, self.obj.canvas.y,
- self.obj.timestamp)
+ self.obj.timestamp, self.event_flags)
property buttons:
def __get__(self):
@@ -130,6 +139,15 @@ cdef class EventMouseOut:
self._check_validity()
return self.obj.timestamp
+ property event_flags:
+ def __get__(self):
+ self._check_validity()
+ return <int>self.obj.event_flags
+
+ def __set__(self, flags):
+ self._check_validity()
+ self.obj.event_flags = flags
+
cdef class EventMouseDown:
cdef void _set_obj(self, void *ptr):
@@ -148,11 +166,11 @@ cdef class EventMouseDown:
def __str__(self):
self._check_validity()
return ("%s(button=%d, output=(%d, %d), canvas=(%d, %d), "
- "timestamp=%d)") % \
+ "timestamp=%d, event_flags=%#x)") % \
(self.__class__.__name__, self.obj.button,
self.obj.output.x, self.obj.output.y,
self.obj.canvas.x, self.obj.canvas.y,
- self.obj.timestamp)
+ self.obj.timestamp, self.event_flags)
property button:
def __get__(self):
@@ -164,6 +182,15 @@ cdef class EventMouseDown:
self._check_validity()
return self.obj.timestamp
+ property event_flags:
+ def __get__(self):
+ self._check_validity()
+ return <int>self.obj.event_flags
+
+ def __set__(self, flags):
+ self._check_validity()
+ self.obj.event_flags = flags
+
cdef class EventMouseUp:
cdef void _set_obj(self, void *ptr):
@@ -182,11 +209,11 @@ cdef class EventMouseUp:
def __str__(self):
self._check_validity()
return ("%s(button=%d, output=(%d, %d), canvas=(%d, %d), "
- "timestamp=%d)") % \
+ "timestamp=%d, event_flags=%#x)") % \
(self.__class__.__name__, self.obj.button,
self.obj.output.x, self.obj.output.y,
self.obj.canvas.x, self.obj.canvas.y,
- self.obj.timestamp)
+ self.obj.timestamp, self.event_flags)
property button:
def __get__(self):
@@ -198,6 +225,15 @@ cdef class EventMouseUp:
self._check_validity()
return self.obj.timestamp
+ property event_flags:
+ def __get__(self):
+ self._check_validity()
+ return <int>self.obj.event_flags
+
+ def __set__(self, flags):
+ self._check_validity()
+ self.obj.event_flags = flags
+
cdef class EventMouseMove:
cdef void _set_obj(self, void *ptr):
@@ -220,13 +256,14 @@ cdef class EventMouseMove:
def __str__(self):
self._check_validity()
return ("%s(buttons=%d, output=(%d, %d), canvas=(%d, %d), "
- "prev_output=(%d, %d), prev_canvas=(%d, %d), timestamp=%d)") %\
+ "prev_output=(%d, %d), prev_canvas=(%d, %d), timestamp=%d, "
+ "event_flags=%#x)") %\
(self.__class__.__name__, self.obj.buttons,
self.obj.cur.output.x, self.obj.cur.output.y,
self.obj.cur.canvas.x, self.obj.cur.canvas.y,
self.obj.prev.output.x, self.obj.prev.output.y,
self.obj.prev.canvas.x, self.obj.prev.canvas.y,
- self.obj.timestamp)
+ self.obj.timestamp, self.event_flags)
property buttons:
def __get__(self):
@@ -238,6 +275,15 @@ cdef class EventMouseMove:
self._check_validity()
return self.obj.timestamp
+ property event_flags:
+ def __get__(self):
+ self._check_validity()
+ return <int>self.obj.event_flags
+
+ def __set__(self, flags):
+ self._check_validity()
+ self.obj.event_flags = flags
+
cdef class EventMouseWheel:
cdef void _set_obj(self, void *ptr):
@@ -256,11 +302,11 @@ cdef class EventMouseWheel:
def __str__(self):
self._check_validity()
return ("%s(direction=%d, z=%d, output=(%d, %d), "
- "canvas=(%d, %d), timestamp=%d)") % \
+ "canvas=(%d, %d), timestamp=%d, event_flags=%#x)") % \
(self.__class__.__name__, self.obj.direction, self.obj.z,
self.obj.output.x, self.obj.output.y,
self.obj.canvas.x, self.obj.canvas.y,
- self.obj.timestamp)
+ self.obj.timestamp, self.event_flags)
property timestamp:
def __get__(self):
@@ -277,6 +323,15 @@ cdef class EventMouseWheel:
self._check_validity()
return self.obj.z
+ property event_flags:
+ def __get__(self):
+ self._check_validity()
+ return <int>self.obj.event_flags
+
+ def __set__(self, flags):
+ self._check_validity()
+ self.obj.event_flags = flags
+
cdef class EventKeyDown:
cdef void _set_obj(self, void *ptr):
@@ -292,10 +347,10 @@ cdef class EventKeyDown:
def __str__(self):
self._check_validity()
return ("%s(keyname=%r, key=%r, string=%r, compose=%r, "
- "timestamp=%d)") % \
+ "timestamp=%d, event_flags=%#x)") % \
(self.__class__.__name__, self.keyname,
self.key, self.string, self.compose,
- self.obj.timestamp)
+ self.obj.timestamp, self.event_flags)
property keyname:
def __get__(self):
@@ -334,6 +389,15 @@ cdef class EventKeyDown:
self._check_validity()
return self.obj.timestamp
+ property event_flags:
+ def __get__(self):
+ self._check_validity()
+ return <int>self.obj.event_flags
+
+ def __set__(self, flags):
+ self._check_validity()
+ self.obj.event_flags = flags
+
cdef class EventKeyUp:
cdef void _set_obj(self, void *ptr):
@@ -349,10 +413,10 @@ cdef class EventKeyUp:
def __str__(self):
self._check_validity()
return ("%s(keyname=%r, key=%r, string=%r, compose=%r, "
- "timestamp=%d)") % \
+ "timestamp=%d, event_flags=%#x)") % \
(self.__class__.__name__, self.keyname,
self.key, self.string, self.compose,
- self.obj.timestamp)
+ self.obj.timestamp, self.event_flags)
property keyname:
def __get__(self):
@@ -391,3 +455,11 @@ cdef class EventKeyUp:
self._check_validity()
return self.obj.timestamp
+ property event_flags:
+ def __get__(self):
+ self._check_validity()
+ return <int>self.obj.event_flags
+
+ def __set__(self, flags):
+ self._check_validity()
+ self.obj.event_flags = flags
diff --git a/include/evas/c_evas.pxd b/include/evas/c_evas.pxd
index 72be306..24f2da3 100644
--- a/include/evas/c_evas.pxd
+++ b/include/evas/c_evas.pxd
@@ -42,6 +42,11 @@ cdef extern from "Evas.h":
EVAS_BUTTON_TRIPLE_CLICK
+ ctypedef enum Evas_Event_Flags:
+ EVAS_EVENT_FLAG_NONE
+ EVAS_EVENT_FLAG_ON_HOLD
+
+
ctypedef enum Evas_Font_Hinting_Flags:
EVAS_FONT_HINTING_NONE
EVAS_FONT_HINTING_AUTO
@@ -151,6 +156,7 @@ cdef extern from "Evas.h":
Evas_Modifier *modifiers
Evas_Lock *locks
unsigned int timestamp
+ Evas_Event_Flags event_flags
ctypedef struct Evas_Event_Mouse_Out:
int buttons
@@ -160,6 +166,7 @@ cdef extern from "Evas.h":
Evas_Modifier *modifiers
Evas_Lock *locks
unsigned int timestamp
+ Evas_Event_Flags event_flags
ctypedef struct Evas_Event_Mouse_Down:
int button
@@ -170,6 +177,7 @@ cdef extern from "Evas.h":
Evas_Lock *locks
Evas_Button_Flags flags
unsigned int timestamp
+ Evas_Event_Flags event_flags
ctypedef struct Evas_Event_Mouse_Up:
int button
@@ -180,6 +188,7 @@ cdef extern from "Evas.h":
Evas_Lock *locks
Evas_Button_Flags flags
unsigned int timestamp
+ Evas_Event_Flags event_flags
ctypedef struct Evas_Event_Mouse_Move:
int buttons
@@ -189,6 +198,7 @@ cdef extern from "Evas.h":
Evas_Modifier *modifiers
Evas_Lock *locks
unsigned int timestamp
+ Evas_Event_Flags event_flags
ctypedef struct Evas_Event_Mouse_Wheel:
int direction # 0 = default up/down wheel
@@ -199,6 +209,7 @@ cdef extern from "Evas.h":
Evas_Modifier *modifiers
Evas_Lock *locks
unsigned int timestamp
+ Evas_Event_Flags event_flags
ctypedef struct Evas_Event_Key_Down:
char *keyname
@@ -209,6 +220,7 @@ cdef extern from "Evas.h":
char *string
char *compose
unsigned int timestamp
+ Evas_Event_Flags event_flags
ctypedef struct Evas_Event_Key_Up:
char *keyname
@@ -219,6 +231,7 @@ cdef extern from "Evas.h":
char *string
char *compose
unsigned int timestamp
+ Evas_Event_Flags event_flags
####################################################################
--
Python bindings for Evas
More information about the Pkg-e-commits
mailing list