summaryrefslogtreecommitdiff
path: root/src/lib/ecore_input
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/ecore_input')
-rw-r--r--src/lib/ecore_input/Ecore_Input.h28
-rw-r--r--src/lib/ecore_input/ecore_input_compose.c2
-rw-r--r--src/lib/ecore_input/ecore_input_private.h2
3 files changed, 16 insertions, 16 deletions
diff --git a/src/lib/ecore_input/Ecore_Input.h b/src/lib/ecore_input/Ecore_Input.h
index 0e28909729..1c8763818b 100644
--- a/src/lib/ecore_input/Ecore_Input.h
+++ b/src/lib/ecore_input/Ecore_Input.h
@@ -130,7 +130,7 @@ extern "C" {
130 * An enum of Compose states. 130 * An enum of Compose states.
131 */ 131 */
132 typedef enum _Ecore_Compose_State 132 typedef enum _Ecore_Compose_State
133 { 133 {
134 ECORE_COMPOSE_NONE, 134 ECORE_COMPOSE_NONE,
135 ECORE_COMPOSE_MIDDLE, 135 ECORE_COMPOSE_MIDDLE,
136 ECORE_COMPOSE_DONE 136 ECORE_COMPOSE_DONE
@@ -202,10 +202,10 @@ extern "C" {
202 Ecore_Window window; /**< The main window where event happened */ 202 Ecore_Window window; /**< The main window where event happened */
203 Ecore_Window root_window; /**< The root window where event happened */ 203 Ecore_Window root_window; /**< The root window where event happened */
204 Ecore_Window event_window; /**< The child window where event happened */ 204 Ecore_Window event_window; /**< The child window where event happened */
205 205
206 unsigned int timestamp; /**< Time when the event occurred */ 206 unsigned int timestamp; /**< Time when the event occurred */
207 unsigned int modifiers; /**< The combination of modifiers key (SHIFT,CTRL,ALT,..)*/ 207 unsigned int modifiers; /**< The combination of modifiers key (SHIFT,CTRL,ALT,..)*/
208 208
209 int same_screen; /**< same screen flag */ 209 int same_screen; /**< same screen flag */
210 210
211 unsigned int keycode; /**< Key scan code numeric value @since 1.10 */ 211 unsigned int keycode; /**< Key scan code numeric value @since 1.10 */
@@ -231,14 +231,14 @@ extern "C" {
231 unsigned int double_click; /**< Double click event */ 231 unsigned int double_click; /**< Double click event */
232 unsigned int triple_click; /**< Triple click event */ 232 unsigned int triple_click; /**< Triple click event */
233 int same_screen; /**< Same screen flag */ 233 int same_screen; /**< Same screen flag */
234 234
235 int x; /**< x coordinate relative to window where event happened */ 235 int x; /**< x coordinate relative to window where event happened */
236 int y; /**< y coordinate relative to window where event happened */ 236 int y; /**< y coordinate relative to window where event happened */
237 struct { 237 struct {
238 int x; 238 int x;
239 int y; 239 int y;
240 } root; /**< Coordinates relative to root window */ 240 } root; /**< Coordinates relative to root window */
241 241
242 struct { 242 struct {
243 int device; /**< 0 if normal mouse, 1+ for other mouse-devices (eg multi-touch - other fingers) */ 243 int device; /**< 0 if normal mouse, 1+ for other mouse-devices (eg multi-touch - other fingers) */
244 double radius, radius_x, radius_y; /**< radius of press point - radius_x and y if its an ellipse (radius is the average of the 2) */ 244 double radius, radius_x, radius_y; /**< radius of press point - radius_x and y if its an ellipse (radius is the average of the 2) */
@@ -262,14 +262,14 @@ extern "C" {
262 Ecore_Window window; /**< The main window where event happened */ 262 Ecore_Window window; /**< The main window where event happened */
263 Ecore_Window root_window; /**< The root window where event happened */ 263 Ecore_Window root_window; /**< The root window where event happened */
264 Ecore_Window event_window; /**< The child window where event happened */ 264 Ecore_Window event_window; /**< The child window where event happened */
265 265
266 unsigned int timestamp; /**< Time when the event occurred */ 266 unsigned int timestamp; /**< Time when the event occurred */
267 unsigned int modifiers; /**< The combination of modifiers key (SHIFT,CTRL,ALT,..)*/ 267 unsigned int modifiers; /**< The combination of modifiers key (SHIFT,CTRL,ALT,..)*/
268 268
269 int same_screen; /**< Same screen flag */ 269 int same_screen; /**< Same screen flag */
270 int direction; /**< Orientation of the wheel (horizontal/vertical) */ 270 int direction; /**< Orientation of the wheel (horizontal/vertical) */
271 int z; /**< Value of the wheel event (+1/-1) */ 271 int z; /**< Value of the wheel event (+1/-1) */
272 272
273 int x; /**< x coordinate relative to window where event happened */ 273 int x; /**< x coordinate relative to window where event happened */
274 int y; /**< y coordinate relative to window where event happened */ 274 int y; /**< y coordinate relative to window where event happened */
275 struct { 275 struct {
@@ -289,19 +289,19 @@ extern "C" {
289 Ecore_Window window; /**< The main window where event happened */ 289 Ecore_Window window; /**< The main window where event happened */
290 Ecore_Window root_window; /**< The root window where event happened */ 290 Ecore_Window root_window; /**< The root window where event happened */
291 Ecore_Window event_window; /**< The child window where event happened */ 291 Ecore_Window event_window; /**< The child window where event happened */
292 292
293 unsigned int timestamp; /**< Time when the event occurred */ 293 unsigned int timestamp; /**< Time when the event occurred */
294 unsigned int modifiers; /**< The combination of modifiers key (SHIFT,CTRL,ALT,..)*/ 294 unsigned int modifiers; /**< The combination of modifiers key (SHIFT,CTRL,ALT,..)*/
295 295
296 int same_screen; /**< Same screen flag */ 296 int same_screen; /**< Same screen flag */
297 297
298 int x; /**< x coordinate relative to window where event happened */ 298 int x; /**< x coordinate relative to window where event happened */
299 int y; /**< y coordinate relative to window where event happened */ 299 int y; /**< y coordinate relative to window where event happened */
300 struct { 300 struct {
301 int x; 301 int x;
302 int y; 302 int y;
303 } root; /**< Coordinates relative to root window */ 303 } root; /**< Coordinates relative to root window */
304 304
305 struct { 305 struct {
306 int device; /**< 0 if normal mouse, 1+ for other mouse-devices (eg multi-touch - other fingers) */ 306 int device; /**< 0 if normal mouse, 1+ for other mouse-devices (eg multi-touch - other fingers) */
307 double radius, radius_x, radius_y; /**< radius of press point - radius_x and y if its an ellipse (radius is the average of the 2) */ 307 double radius, radius_x, radius_y; /**< radius of press point - radius_x and y if its an ellipse (radius is the average of the 2) */
@@ -367,10 +367,10 @@ extern "C" {
367 { 367 {
368 Ecore_Window window; /**< The main window where event happened */ 368 Ecore_Window window; /**< The main window where event happened */
369 Ecore_Window event_window; /**< The child window where event happened */ 369 Ecore_Window event_window; /**< The child window where event happened */
370 370
371 unsigned int timestamp; /**< Time when the event occurred */ 371 unsigned int timestamp; /**< Time when the event occurred */
372 unsigned int modifiers; /**< The combination of modifiers key (SHIFT,CTRL,ALT,..)*/ 372 unsigned int modifiers; /**< The combination of modifiers key (SHIFT,CTRL,ALT,..)*/
373 373
374 int x; /**< x coordinate relative to window where event happened */ 374 int x; /**< x coordinate relative to window where event happened */
375 int y; /**< y coordinate relative to window where event happened */ 375 int y; /**< y coordinate relative to window where event happened */
376 376
diff --git a/src/lib/ecore_input/ecore_input_compose.c b/src/lib/ecore_input/ecore_input_compose.c
index 13b90bca09..1c52f550dd 100644
--- a/src/lib/ecore_input/ecore_input_compose.c
+++ b/src/lib/ecore_input/ecore_input_compose.c
@@ -52,7 +52,7 @@ ecore_compose_get(const Eina_List *seq, char **seqstr_ret)
52 for (p = comp; (p < pend) && s;) 52 for (p = comp; (p < pend) && s;)
53 { 53 {
54 int len, jump = -1, bsize = -1; 54 int len, jump = -1, bsize = -1;
55 55
56 len = strlen(p); 56 len = strlen(p);
57 psz = (unsigned char *)(p + len + 1); 57 psz = (unsigned char *)(p + len + 1);
58 // decode jump amount to next entry 58 // decode jump amount to next entry
diff --git a/src/lib/ecore_input/ecore_input_private.h b/src/lib/ecore_input/ecore_input_private.h
index 4d085a19b4..8f53892ac7 100644
--- a/src/lib/ecore_input/ecore_input_private.h
+++ b/src/lib/ecore_input/ecore_input_private.h
@@ -4,7 +4,7 @@
4extern int _ecore_input_log_dom; 4extern int _ecore_input_log_dom;
5 5
6#ifdef ECORE_INPUT_DEFAULT_LOG_COLOR 6#ifdef ECORE_INPUT_DEFAULT_LOG_COLOR
7# undef ECORE_INPUT_DEFAULT_LOG_COLOR 7# undef ECORE_INPUT_DEFAULT_LOG_COLOR
8#endif 8#endif
9 9
10#define ECORE_INPUT_DEFAULT_LOG_COLOR EINA_COLOR_BLUE 10#define ECORE_INPUT_DEFAULT_LOG_COLOR EINA_COLOR_BLUE