diff options
author | David Walter Seikel | 2012-01-23 23:30:42 +1000 |
---|---|---|
committer | David Walter Seikel | 2012-01-23 23:30:42 +1000 |
commit | 825a3d837a33f226c879cd02ad15c3fba57e8b2c (patch) | |
tree | 75f57bd9c4253508d338dc79ba8e57a7abc42255 /libraries/ecore/src/lib/ecore_x/xlib/ecore_x_gesture.c | |
parent | Add ability to disable the test harness, or the Lua compile test. (diff) | |
download | SledjHamr-825a3d837a33f226c879cd02ad15c3fba57e8b2c.zip SledjHamr-825a3d837a33f226c879cd02ad15c3fba57e8b2c.tar.gz SledjHamr-825a3d837a33f226c879cd02ad15c3fba57e8b2c.tar.bz2 SledjHamr-825a3d837a33f226c879cd02ad15c3fba57e8b2c.tar.xz |
Update the EFL to what I'm actually using, coz I'm using some stuff not yet released.
Diffstat (limited to '')
-rw-r--r-- | libraries/ecore/src/lib/ecore_x/xlib/ecore_x_gesture.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_gesture.c b/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_gesture.c index e1dc75c..e89421b 100644 --- a/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_gesture.c +++ b/libraries/ecore/src/lib/ecore_x/xlib/ecore_x_gesture.c | |||
@@ -26,7 +26,7 @@ _ecore_x_gesture_init(void) | |||
26 | _gesture_available = EINA_TRUE; | 26 | _gesture_available = EINA_TRUE; |
27 | } | 27 | } |
28 | else | 28 | else |
29 | _gesture_available = EINA_FALSE; | 29 | _gesture_available = EINA_FALSE; |
30 | #else /* ifdef ECORE_XGESTURE */ | 30 | #else /* ifdef ECORE_XGESTURE */ |
31 | _gesture_available = EINA_FALSE; | 31 | _gesture_available = EINA_FALSE; |
32 | #endif /* ifdef ECORE_XGESTURE */ | 32 | #endif /* ifdef ECORE_XGESTURE */ |
@@ -48,11 +48,11 @@ ecore_x_gesture_events_select(Ecore_X_Window win, | |||
48 | { | 48 | { |
49 | #ifdef ECORE_XGESTURE | 49 | #ifdef ECORE_XGESTURE |
50 | if (!_gesture_available) | 50 | if (!_gesture_available) |
51 | return EINA_FALSE; | 51 | return EINA_FALSE; |
52 | 52 | ||
53 | LOGFN(__FILE__, __LINE__, __FUNCTION__); | 53 | LOGFN(__FILE__, __LINE__, __FUNCTION__); |
54 | XGestureSelectEvents(_ecore_x_disp, win, mask); | 54 | XGestureSelectEvents(_ecore_x_disp, win, mask); |
55 | 55 | ||
56 | return EINA_TRUE; | 56 | return EINA_TRUE; |
57 | #else /* ifdef ECORE_XGESTURE */ | 57 | #else /* ifdef ECORE_XGESTURE */ |
58 | return EINA_FALSE; | 58 | return EINA_FALSE; |
@@ -68,7 +68,7 @@ ecore_x_gesture_events_selected_get(Ecore_X_Window win) | |||
68 | Ecore_X_Gesture_Event_Mask mask; | 68 | Ecore_X_Gesture_Event_Mask mask; |
69 | 69 | ||
70 | if (!_gesture_available) | 70 | if (!_gesture_available) |
71 | return ECORE_X_GESTURE_EVENT_MASK_NONE; | 71 | return ECORE_X_GESTURE_EVENT_MASK_NONE; |
72 | 72 | ||
73 | LOGFN(__FILE__, __LINE__, __FUNCTION__); | 73 | LOGFN(__FILE__, __LINE__, __FUNCTION__); |
74 | if (GestureSuccess != XGestureGetSelectedEvents(_ecore_x_disp, win, &mask)) | 74 | if (GestureSuccess != XGestureGetSelectedEvents(_ecore_x_disp, win, &mask)) |
@@ -76,7 +76,7 @@ ecore_x_gesture_events_selected_get(Ecore_X_Window win) | |||
76 | mask = ECORE_X_GESTURE_EVENT_MASK_NONE; | 76 | mask = ECORE_X_GESTURE_EVENT_MASK_NONE; |
77 | return mask; | 77 | return mask; |
78 | } | 78 | } |
79 | 79 | ||
80 | return mask; | 80 | return mask; |
81 | #else /* ifdef ECORE_XGESTURE */ | 81 | #else /* ifdef ECORE_XGESTURE */ |
82 | return ECORE_X_GESTURE_EVENT_MASK_NONE; | 82 | return ECORE_X_GESTURE_EVENT_MASK_NONE; |
@@ -91,14 +91,14 @@ ecore_x_gesture_event_grab(Ecore_X_Window win, | |||
91 | { | 91 | { |
92 | #ifdef ECORE_XGESTURE | 92 | #ifdef ECORE_XGESTURE |
93 | if (!_gesture_available) | 93 | if (!_gesture_available) |
94 | return EINA_FALSE; | 94 | return EINA_FALSE; |
95 | 95 | ||
96 | LOGFN(__FILE__, __LINE__, __FUNCTION__); | 96 | LOGFN(__FILE__, __LINE__, __FUNCTION__); |
97 | if (GestureGrabSuccess != XGestureGrabEvent(_ecore_x_disp, win, type, num_fingers, CurrentTime)) | 97 | if (GestureGrabSuccess != XGestureGrabEvent(_ecore_x_disp, win, type, num_fingers, CurrentTime)) |
98 | { | 98 | { |
99 | return EINA_FALSE; | 99 | return EINA_FALSE; |
100 | } | 100 | } |
101 | 101 | ||
102 | return EINA_TRUE; | 102 | return EINA_TRUE; |
103 | #else /* ifdef ECORE_XGESTURE */ | 103 | #else /* ifdef ECORE_XGESTURE */ |
104 | return EINA_FALSE; | 104 | return EINA_FALSE; |
@@ -117,14 +117,14 @@ ecore_x_gesture_event_ungrab(Ecore_X_Window win, | |||
117 | Ecore_X_Gesture_Event_Mask mask; | 117 | Ecore_X_Gesture_Event_Mask mask; |
118 | 118 | ||
119 | if (!_gesture_available) | 119 | if (!_gesture_available) |
120 | return EINA_FALSE; | 120 | return EINA_FALSE; |
121 | 121 | ||
122 | LOGFN(__FILE__, __LINE__, __FUNCTION__); | 122 | LOGFN(__FILE__, __LINE__, __FUNCTION__); |
123 | if (GestureUngrabSuccess != XGestureUngrabEvent(_ecore_x_disp, win, type, num_fingers, CurrentTime)) | 123 | if (GestureUngrabSuccess != XGestureUngrabEvent(_ecore_x_disp, win, type, num_fingers, CurrentTime)) |
124 | { | 124 | { |
125 | return EINA_FALSE; | 125 | return EINA_FALSE; |
126 | } | 126 | } |
127 | 127 | ||
128 | return EINA_TRUE; | 128 | return EINA_TRUE; |
129 | #else /* ifdef ECORE_XGESTURE */ | 129 | #else /* ifdef ECORE_XGESTURE */ |
130 | return EINA_FALSE; | 130 | return EINA_FALSE; |