Enlightenment CVS committal
Author : xcomputerman
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore_x
Modified Files:
Ecore_X.h ecore_x_events.c
Log Message:
Realign Ecore_X event masks with Xlib event masks. This fixes the bug
causing some input select requests not to work.
*API Change warning*
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_x/Ecore_X.h,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -3 -r1.44 -r1.45
--- Ecore_X.h 23 Apr 2004 22:48:20 -0000 1.44
+++ Ecore_X.h 24 Apr 2004 05:49:46 -0000 1.45
@@ -69,25 +69,27 @@
typedef enum _Ecore_X_Event_Mask
{
- ECORE_X_EVENT_MASK_KEY_DOWN = (1 << 0),
- ECORE_X_EVENT_MASK_KEY_UP = (1 << 1),
- ECORE_X_EVENT_MASK_MOUSE_DOWN = (1 << 2),
- ECORE_X_EVENT_MASK_MOUSE_UP = (1 << 3),
- ECORE_X_EVENT_MASK_MOUSE_IN = (1 << 4),
- ECORE_X_EVENT_MASK_MOUSE_OUT = (1 << 5),
- ECORE_X_EVENT_MASK_MOUSE_MOVE = (1 << 6),
- ECORE_X_EVENT_MASK_WINDOW_DAMAGE = (1 << 7),
- ECORE_X_EVENT_MASK_WINDOW_VISIBILITY = (1 << 8),
- ECORE_X_EVENT_MASK_WINDOW_CONFIGURE = (1 << 9),
- ECORE_X_EVENT_MASK_WINDOW_MANAGE = (1 << 10),
- ECORE_X_EVENT_MASK_WINDOW_RESIZE_MANAGE = (1 << 11),
- ECORE_X_EVENT_MASK_WINDOW_CHILD_CONFIGURE = (1 << 13),
- ECORE_X_EVENT_MASK_WINDOW_FOCUS_IN = (1 << 14),
- ECORE_X_EVENT_MASK_WINDOW_FOCUS_OUT = (1 << 15),
- ECORE_X_EVENT_MASK_WINDOW_PROPERTY = (1 << 16),
- ECORE_X_EVENT_MASK_WINDOW_COLORMAP = (1 << 17),
- ECORE_X_EVENT_MASK_WINDOW_GRAB = (1 << 18),
- ECORE_X_EVENT_MASK_MOUSE_WHEEL = (1 << 19)
+ ECORE_X_EVENT_MASK_NONE = 0L,
+ ECORE_X_EVENT_MASK_KEY_DOWN = (1L << 0),
+ ECORE_X_EVENT_MASK_KEY_UP = (1L << 1),
+ ECORE_X_EVENT_MASK_MOUSE_DOWN = (1L << 2),
+ ECORE_X_EVENT_MASK_MOUSE_UP = (1L << 3),
+ ECORE_X_EVENT_MASK_MOUSE_IN = (1L << 4),
+ ECORE_X_EVENT_MASK_MOUSE_OUT = (1L << 5),
+ ECORE_X_EVENT_MASK_MOUSE_MOVE = (1L << 6),
+ ECORE_X_EVENT_MASK_WINDOW_DAMAGE = (1L << 15),
+ ECORE_X_EVENT_MASK_WINDOW_VISIBILITY = (1L << 16),
+ ECORE_X_EVENT_MASK_WINDOW_CONFIGURE = (1L << 17),
+ ECORE_X_EVENT_MASK_WINDOW_RESIZE_MANAGE = (1L << 18),
+ ECORE_X_EVENT_MASK_WINDOW_MANAGE = (1L << 19),
+ ECORE_X_EVENT_MASK_WINDOW_CHILD_CONFIGURE = (1L << 20),
+ ECORE_X_EVENT_MSAK_WINDOW_FOCUS_CHANGE = (1L << 21),
+ ECORE_X_EVENT_MASK_WINDOW_PROPERTY = (1L << 22),
+ ECORE_X_EVENT_MASK_WINDOW_COLORMAP = (1L << 23),
+ ECORE_X_EVENT_MASK_WINDOW_GRAB = (1L << 24),
+ ECORE_X_EVENT_MASK_MOUSE_WHEEL = (1L << 29),
+ ECORE_X_EVENT_MASK_WINDOW_FOCUS_IN = (1L << 30),
+ ECORE_X_EVENT_MASK_WINDOW_FOCUS_OUT = (1L << 31)
} Ecore_X_Event_Mask;
typedef struct _Ecore_X_Event_Key_Down Ecore_X_Event_Key_Down;
@@ -697,8 +699,8 @@
int ecore_x_error_request_get(void);
int ecore_x_error_code_get(void);
-void ecore_x_event_mask_set(Ecore_X_Window w, long mask);
-void ecore_x_event_mask_unset(Ecore_X_Window w, long mask);
+void ecore_x_event_mask_set(Ecore_X_Window w, Ecore_X_Event_Mask mask);
+void ecore_x_event_mask_unset(Ecore_X_Window w, Ecore_X_Event_Mask mask);
int ecore_x_selection_primary_set(Ecore_X_Window w, unsigned char *data,
int size);
int ecore_x_selection_primary_clear(void);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_x/ecore_x_events.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -3 -r1.27 -r1.28
--- ecore_x_events.c 23 Apr 2004 22:48:21 -0000 1.27
+++ ecore_x_events.c 24 Apr 2004 05:49:46 -0000 1.28
@@ -16,7 +16,7 @@
static void _ecore_x_event_free_generic(void *data, void *ev);
void
-ecore_x_event_mask_set(Ecore_X_Window w, long mask)
+ecore_x_event_mask_set(Ecore_X_Window w, Ecore_X_Event_Mask mask)
{
XWindowAttributes attr;
XSetWindowAttributes s_attr;
@@ -28,7 +28,7 @@
}
void
-ecore_x_event_mask_unset(Ecore_X_Window w, long mask)
+ecore_x_event_mask_unset(Ecore_X_Window w, Ecore_X_Event_Mask mask)
{
XWindowAttributes attr;
XSetWindowAttributes s_attr;
-------------------------------------------------------
This SF.net email is sponsored by: The Robotic Monkeys at ThinkGeek
For a limited time only, get FREE Ground shipping on all orders of $35
or more. Hurry up and shop folks, this offer expires April 30th!
http://www.thinkgeek.com/freeshipping/?cpg=12297
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
