Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
ewl_attach.c ewl_button.c ewl_embed.c ewl_entry.c ewl_events.h
ewl_filedialog.c ewl_filelist.c ewl_image.c ewl_menu.c
ewl_menu_base.c ewl_paned.c ewl_password.c ewl_seeker.c
ewl_spectrum.c ewl_spinner.c ewl_text.c ewl_tree.c
ewl_widget.c
Log Message:
- Consolidate the Ewl_Event_Key_* and Ewl_Event_Mouse_* structures down to
having common inherited base structs.
- This is an API break if you're using any of these structures.
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_attach.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -3 -r1.41 -r1.42
--- ewl_attach.c 13 Feb 2007 05:26:21 -0000 1.41
+++ ewl_attach.c 3 Mar 2007 01:58:19 -0000 1.42
@@ -595,7 +595,7 @@
ewl_attach_cb_tooltip_mouse_move(Ewl_Widget *w, void *ev, void *data
__UNUSED__)
{
Ewl_Attach *attach;
- Ewl_Event_Mouse_Move *e;
+ Ewl_Event_Mouse *e;
const char *delay_str;
double delay = 1.0;
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_button.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -3 -r1.45 -r1.46
--- ewl_button.c 6 Feb 2007 13:42:16 -0000 1.45
+++ ewl_button.c 3 Mar 2007 01:58:19 -0000 1.46
@@ -338,7 +338,7 @@
void
ewl_button_cb_key_down(Ewl_Widget *w, void *ev, void *data __UNUSED__)
{
- Ewl_Event_Key_Up *event;
+ Ewl_Event_Key *event;
DENTER_FUNCTION(DLEVEL_STABLE);
@@ -352,10 +352,10 @@
{
Ewl_Event_Mouse_Up e;
- e.x = 0;
- e.y = 0;
+ e.base.modifiers = 0;
+ e.base.x = 0;
+ e.base.y = 0;
e.button = 1;
- e.modifiers = 0;
ewl_callback_call_with_event_data(w, EWL_CALLBACK_CLICKED, &e);
}
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_embed.c,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -3 -r1.112 -r1.113
--- ewl_embed.c 2 Mar 2007 02:33:10 -0000 1.112
+++ ewl_embed.c 3 Mar 2007 01:58:19 -0000 1.113
@@ -395,8 +395,8 @@
/*
* setup the event struct
*/
- ev.modifiers = mods;
- ev.keyname = strdup(keyname);
+ ev.base.modifiers = mods;
+ ev.base.keyname = strdup(keyname);
/*
* If a widget has been selected then we send the keystroke to the
@@ -429,7 +429,7 @@
temp = temp->parent;
}
- FREE(ev.keyname);
+ FREE(ev.base.keyname);
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
@@ -460,8 +460,8 @@
&& (!strcmp(keyname, "Tab")))
DRETURN(DLEVEL_STABLE);
- ev.modifiers = mods;
- ev.keyname = strdup(keyname);
+ ev.base.modifiers = mods;
+ ev.base.keyname = strdup(keyname);
/*
* Dispatcher of key up events, these get sent to the last widget
@@ -475,7 +475,7 @@
temp = temp->parent;
}
- FREE(ev.keyname);
+ FREE(ev.base.keyname);
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
@@ -532,9 +532,9 @@
*/
embed->last.clicked = widget;
- ev.modifiers = mods;
- ev.x = x;
- ev.y = y;
+ ev.base.modifiers = mods;
+ ev.base.x = x;
+ ev.base.y = y;
ev.button = b;
ev.clicks = clicks;
@@ -611,9 +611,9 @@
ewl_embed_active_set(embed, TRUE);
- ev.modifiers = mods;
- ev.x = x;
- ev.y = y;
+ ev.base.modifiers = mods;
+ ev.base.x = x;
+ ev.base.y = y;
ev.button = b;
/*
@@ -656,9 +656,9 @@
ewl_embed_active_set(embed, TRUE);
- ev.modifiers = mods;
- ev.x = x;
- ev.y = y;
+ ev.base.modifiers = mods;
+ ev.base.x = x;
+ ev.base.y = y;
/*
* Focus a new widget if the mouse isn't pressed on the currently
@@ -942,9 +942,9 @@
ewl_embed_active_set(embed, TRUE);
- ev.modifiers = mods;
- ev.x = x;
- ev.y = y;
+ ev.base.modifiers = mods;
+ ev.base.x = x;
+ ev.base.y = y;
while (embed->last.mouse_in) {
ewl_object_state_remove(EWL_OBJECT(embed->last.mouse_in),
@@ -979,9 +979,9 @@
ewl_embed_active_set(embed, TRUE);
- ev.modifiers = mods;
- ev.x = x;
- ev.y = y;
+ ev.base.modifiers = mods;
+ ev.base.x = x;
+ ev.base.y = y;
ev.z = z;
ev.dir = dir;
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_entry.c,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -3 -r1.72 -r1.73
--- ewl_entry.c 6 Feb 2007 13:42:17 -0000 1.72
+++ ewl_entry.c 3 Mar 2007 01:58:19 -0000 1.73
@@ -336,7 +336,7 @@
void
ewl_entry_cb_key_down(Ewl_Widget *w, void *ev, void *data __UNUSED__)
{
- Ewl_Event_Key_Down *event;
+ Ewl_Event_Key *event;
Ewl_Entry *e;
DENTER_FUNCTION(DLEVEL_STABLE);
@@ -415,7 +415,7 @@
void
ewl_entry_cb_mouse_down(Ewl_Widget *w, void *ev, void *data __UNUSED__)
{
- Ewl_Event_Mouse_Down *event;
+ Ewl_Event_Mouse *event;
Ewl_Entry *e;
unsigned int idx = 0;
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_events.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -3 -r1.23 -r1.24
--- ewl_events.h 3 Mar 2007 01:11:25 -0000 1.23
+++ ewl_events.h 3 Mar 2007 01:58:19 -0000 1.24
@@ -26,6 +26,20 @@
};
/**
+ * The Ewl_Event_Key structure
+ */
+typedef struct Ewl_Event_Key Ewl_Event_Key;
+
+/**
+ * Provides the basic information about key events
+ */
+struct Ewl_Event_Key
+{
+ unsigned int modifiers; /**< Key modifiers that were pressed */
+ char *keyname; /**< Name of the key that was pressed */
+};
+
+/**
* The Ewl_Event_Window_Key_Down structure
*/
typedef struct Ewl_Event_Key_Down Ewl_Event_Key_Down;
@@ -35,8 +49,7 @@
*/
struct Ewl_Event_Key_Down
{
- unsigned int modifiers; /**< Modifiers that were pressed */
- char *keyname; /**< Name of the key that was pressed */
+ Ewl_Event_Key base; /**< Basic key information */
};
/**
@@ -49,8 +62,22 @@
*/
struct Ewl_Event_Key_Up
{
+ Ewl_Event_Key base; /**< Basic key information */
+};
+
+/**
+ * The Ewl_Event_Mouse structure
+ */
+typedef struct Ewl_Event_Mouse Ewl_Event_Mouse;
+
+/**
+ * Provides base mouse information
+ */
+struct Ewl_Event_Mouse
+{
unsigned int modifiers; /**< Modifiers that were pressed */
- char *keyname; /**< Name of the key that was released */
+ int x; /**< X coordinate the mouse release occurred at
*/
+ int y; /**< Y coordinate the mouse release occurred at
*/
};
/**
@@ -63,11 +90,9 @@
*/
struct Ewl_Event_Mouse_Down
{
- unsigned int modifiers; /**< Modifiers that were pressed */
- int button; /**< The mouse button that was pressed */
- int clicks; /**< Number of consecutive clicks */
- int x; /**< X coordinate the mouse press occurred at */
- int y; /**< Y coordinate the mouse press occurred at */
+ Ewl_Event_Mouse base; /**< Base mouse information */
+ int button; /**< The mouse button that was released */
+ int clicks; /**< Number of consecutive clicks */
};
/**
@@ -80,10 +105,8 @@
*/
struct Ewl_Event_Mouse_Up
{
- unsigned int modifiers; /**< Modifiers that were pressed */
- int button; /**< The mouse button that was released */
- int x; /**< X coordinate the mouse release occurred at */
- int y; /**< Y coordinate the mouse release occurred at */
+ Ewl_Event_Mouse base; /**< Base mouse information */
+ int button; /**< The mouse button that was released */
};
/**
@@ -96,9 +119,7 @@
*/
struct Ewl_Event_Mouse_Move
{
- unsigned int modifiers; /**< Modifiers that were pressed */
- int x; /**< X coordinate the mouse moved to */
- int y; /**< Y coordinate the mouse moved to */
+ Ewl_Event_Mouse base; /**< Base mouse information */
};
/**
@@ -111,9 +132,7 @@
*/
struct Ewl_Event_Mouse_In
{
- unsigned int modifiers; /**< Modifiers that were pressed */
- int x; /**< X coordinate the mouse entered at */
- int y; /**< Y coordinate the mouse entered at */
+ Ewl_Event_Mouse base; /**< Base mouse information */
};
/**
@@ -126,9 +145,7 @@
*/
struct Ewl_Event_Mouse_Out
{
- unsigned int modifiers; /**< Modifiers that were pressed */
- int x; /**< X coordinate the mouse left at */
- int y; /**< Y coordinate the mouse left at */
+ Ewl_Event_Mouse base; /**< Base mouse information */
};
/**
@@ -141,11 +158,9 @@
*/
struct Ewl_Event_Mouse_Wheel
{
- unsigned int modifiers; /**< Modifiers that were pressed */
- int x; /**< X coordinate the mouse left at */
- int y; /**< Y coordinate the mouse left at */
- int z; /**< Z value of mouse wheel */
- int dir; /**< Direction mouse wheel scrolled */
+ Ewl_Event_Mouse base; /**< Base mouse information */
+ int z; /**< Z value of mouse wheel */
+ int dir; /**< Direction mouse wheel scrolled */
};
/**
@@ -160,10 +175,14 @@
{
int num_types; /**< The number of DND types */
char** types; /**< The list of DND types */
-
};
/**
+ * The Ewl_Event_Dnd_Position type
+ */
+typedef struct Ewl_Event_Dnd_Position Ewl_Event_Dnd_Position;
+
+/**
* Provides information about dnd drops movement
*/
struct Ewl_Event_Dnd_Position
@@ -173,9 +192,9 @@
};
/**
- * The Ewl_Event_Dnd_Position type
+ * The Ewl_Event_Dnd_Drop type
*/
-typedef struct Ewl_Event_Dnd_Position Ewl_Event_Dnd_Position;
+typedef struct Ewl_Event_Dnd_Drop Ewl_Event_Dnd_Drop;
/**
* Provides information about dnd drops movement
@@ -188,9 +207,9 @@
};
/**
- * The Ewl_Event_Dnd_Drop type
+ * The Ewl_Event_Dnd_Data_Received type
*/
-typedef struct Ewl_Event_Dnd_Drop Ewl_Event_Dnd_Drop;
+typedef struct Ewl_Event_Dnd_Data_Received Ewl_Event_Dnd_Data_Received;
/**
* Provides information about dnd drop data
@@ -204,9 +223,9 @@
};
/**
- * The Ewl_Event_Dnd_Data_Received type
+ * The Ewl_Event_Dnd_Data_Requested type
*/
-typedef struct Ewl_Event_Dnd_Data_Received Ewl_Event_Dnd_Data_Received;
+typedef struct Ewl_Event_Dnd_Data_Request Ewl_Event_Dnd_Data_Request;
/**
* Provides information about dnd data requests
@@ -216,11 +235,6 @@
void *handle; /**< Engine specific handle for responding to request */
char *type; /**< Type of data requested */
};
-
-/**
- * The Ewl_Event_Dnd_Data_Requested type
- */
-typedef struct Ewl_Event_Dnd_Data_Request Ewl_Event_Dnd_Data_Request;
/**
* The Ewl_Dialog_Evenet type
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_filedialog.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -3 -r1.31 -r1.32
--- ewl_filedialog.c 7 Feb 2007 07:45:32 -0000 1.31
+++ ewl_filedialog.c 3 Mar 2007 01:58:19 -0000 1.32
@@ -510,7 +510,7 @@
menu = EWL_MENU(fd->menu);
ewl_window_move(EWL_WINDOW(menu->base.popup),
- x + event->x, y + event->y);
+ x + event->base.x, y + event->base.y);
ewl_widget_show(fd->menu);
ewl_callback_call(EWL_WIDGET(fd->menu),
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_filelist.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -3 -r1.24 -r1.25
--- ewl_filelist.c 6 Feb 2007 13:42:17 -0000 1.24
+++ ewl_filelist.c 3 Mar 2007 01:58:19 -0000 1.25
@@ -804,8 +804,8 @@
DRETURN(DLEVEL_STABLE);
/* are the multiselect keys pressed? */
- if ((ev->modifiers & EWL_KEY_MODIFIER_SHIFT)
- || (ev->modifiers & EWL_KEY_MODIFIER_CTRL))
+ if ((ev->base.modifiers & EWL_KEY_MODIFIER_SHIFT)
+ || (ev->base.modifiers & EWL_KEY_MODIFIER_CTRL))
multi = TRUE;
/* we are not in multiselect mode, or the multiselect keys aren't
@@ -831,7 +831,7 @@
/* ok, we're in multiselect mode and either shift or ctrl are
* pressed */
- if (ev->modifiers & EWL_KEY_MODIFIER_SHIFT)
+ if (ev->base.modifiers & EWL_KEY_MODIFIER_SHIFT)
{
/* we have no base selected so this is the first click with
* the shift. set base and set the clicked as selected */
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_image.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -3 -r1.55 -r1.56
--- ewl_image.c 12 Feb 2007 13:16:05 -0000 1.55
+++ ewl_image.c 3 Mar 2007 01:58:19 -0000 1.56
@@ -1091,7 +1091,7 @@
{
Ewl_Image *i;
Ewl_Embed *emb;
- Ewl_Event_Mouse_Move *ev;
+ Ewl_Event_Mouse *ev;
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("w", w);
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_menu.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -3 -r1.41 -r1.42
--- ewl_menu.c 2 Mar 2007 04:39:46 -0000 1.41
+++ ewl_menu.c 3 Mar 2007 01:58:19 -0000 1.42
@@ -238,7 +238,7 @@
void
ewl_menu_cb_mouse_move(Ewl_Widget *w, void *ev_data, void *user_data)
{
- Ewl_Event_Mouse_Move *ev;
+ Ewl_Event_Mouse *ev;
Ewl_Menu *menu;
Ewl_Embed *embed, *menu_embed;
int x, y, wx, wy;
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_menu_base.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -3 -r1.25 -r1.26
--- ewl_menu_base.c 2 Mar 2007 04:39:46 -0000 1.25
+++ ewl_menu_base.c 3 Mar 2007 01:58:19 -0000 1.26
@@ -204,7 +204,7 @@
ewl_menu_base_cb_popbox_key_down(Ewl_Widget *w __UNUSED__, void *ev_data,
void *user_data __UNUSED__)
{
- Ewl_Event_Key_Down *ev;
+ Ewl_Event_Key *ev;
DENTER_FUNCTION(DLEVEL_STABLE);
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_paned.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -3 -r1.47 -r1.48
--- ewl_paned.c 2 Mar 2007 04:39:46 -0000 1.47
+++ ewl_paned.c 3 Mar 2007 01:58:19 -0000 1.48
@@ -742,7 +742,7 @@
void *data __UNUSED__)
{
Ewl_Paned *p;
- Ewl_Event_Mouse_Down *event;
+ Ewl_Event_Mouse *event;
int ds;
DENTER_FUNCTION(DLEVEL_STABLE);
@@ -783,7 +783,7 @@
static void
ewl_paned_grabber_cb_mouse_move(Ewl_Widget *w, void *ev, void *data)
{
- Ewl_Event_Mouse_Move *e;
+ Ewl_Event_Mouse *e;
Ewl_Paned_Grabber *stop_grabber = NULL;
Ewl_Widget *child;
Ewl_Container *c;
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_password.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- ewl_password.c 6 Feb 2007 13:42:17 -0000 1.17
+++ ewl_password.c 3 Mar 2007 01:58:19 -0000 1.18
@@ -218,7 +218,7 @@
{
int len;
Ewl_Password *e;
- Ewl_Event_Key_Down *ev;
+ Ewl_Event_Key *ev;
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("w", w);
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_seeker.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -3 -r1.23 -r1.24
--- ewl_seeker.c 6 Feb 2007 13:42:17 -0000 1.23
+++ ewl_seeker.c 3 Mar 2007 01:58:19 -0000 1.24
@@ -341,7 +341,7 @@
ewl_seeker_cb_button_mouse_down(Ewl_Widget *w, void *ev_data,
void *user_data __UNUSED__)
{
- Ewl_Event_Mouse_Down *ev;
+ Ewl_Event_Mouse *ev;
Ewl_Seeker *s;
int xx, yy, ww, hh;
@@ -396,7 +396,7 @@
ewl_seeker_cb_mouse_move(Ewl_Widget *w, void *ev_data,
void *user_data __UNUSED__)
{
- Ewl_Event_Mouse_Move *ev;
+ Ewl_Event_Mouse *ev;
Ewl_Seeker *s;
Ewl_Range *r;
double scale;
@@ -456,7 +456,7 @@
{
Ewl_Seeker *s;
Ewl_Range *r;
- Ewl_Event_Mouse_Down *ev;
+ Ewl_Event_Mouse *ev;
double value, step = 0;
int xx, yy, ww, hh;
@@ -551,7 +551,7 @@
void *user_data __UNUSED__)
{
Ewl_Range *r;
- Ewl_Event_Key_Down *ev;
+ Ewl_Event_Key *ev;
double start, end;
void (*increase)(Ewl_Range *r);
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_spectrum.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -3 -r1.33 -r1.34
--- ewl_spectrum.c 6 Feb 2007 13:42:17 -0000 1.33
+++ ewl_spectrum.c 3 Mar 2007 01:58:19 -0000 1.34
@@ -355,7 +355,7 @@
ewl_spectrum_cb_mouse_down(Ewl_Widget *w, void *ev, void *data __UNUSED__)
{
Ewl_Spectrum *sp;
- Ewl_Event_Mouse_Down *e;
+ Ewl_Event_Mouse *e;
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("w", w);
@@ -384,7 +384,7 @@
ewl_spectrum_cb_mouse_move(Ewl_Widget *w, void *ev, void *data __UNUSED__)
{
Ewl_Spectrum *sp;
- Ewl_Event_Mouse_Move *e;
+ Ewl_Event_Mouse *e;
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("w", w);
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_spinner.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -3 -r1.27 -r1.28
--- ewl_spinner.c 6 Feb 2007 13:42:17 -0000 1.27
+++ ewl_spinner.c 3 Mar 2007 01:58:19 -0000 1.28
@@ -272,7 +272,7 @@
{
Ewl_Entry *e;
Ewl_Spinner *s;
- Ewl_Event_Key_Down *ev;
+ Ewl_Event_Key *ev;
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("w", w);
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_text.c,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -3 -r1.157 -r1.158
--- ewl_text.c 12 Feb 2007 13:16:05 -0000 1.157
+++ ewl_text.c 3 Mar 2007 01:58:19 -0000 1.158
@@ -3794,7 +3794,7 @@
ewl_text_cb_mouse_down(Ewl_Widget *w, void *ev, void *data __UNUSED__)
{
Ewl_Text *t;
- Ewl_Event_Mouse_Down *event;
+ Ewl_Event_Mouse *event;
unsigned int char_idx = 0;
unsigned int modifiers;
@@ -3865,7 +3865,7 @@
ewl_text_cb_mouse_up(Ewl_Widget *w, void *ev, void *data __UNUSED__)
{
Ewl_Text *t;
- Ewl_Event_Mouse_Up *event;
+ Ewl_Event_Mouse *event;
unsigned int modifiers;
DENTER_FUNCTION(DLEVEL_STABLE);
@@ -3906,7 +3906,7 @@
ewl_text_cb_mouse_move(Ewl_Widget *w, void *ev, void *data __UNUSED__)
{
Ewl_Text *t;
- Ewl_Event_Mouse_Move *event;
+ Ewl_Event_Mouse *event;
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("w", w);
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_tree.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -3 -r1.45 -r1.46
--- ewl_tree.c 2 Mar 2007 04:39:47 -0000 1.45
+++ ewl_tree.c 3 Mar 2007 01:58:19 -0000 1.46
@@ -1352,7 +1352,7 @@
{
Ewl_Tree *tree;
Ewl_Tree_Node *node;
- Ewl_Event_Mouse_Down *ev;
+ Ewl_Event_Mouse *ev;
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("w", w);
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_widget.c,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -3 -r1.127 -r1.128
--- ewl_widget.c 3 Mar 2007 00:22:54 -0000 1.127
+++ ewl_widget.c 3 Mar 2007 01:58:19 -0000 1.128
@@ -3047,8 +3047,8 @@
int x, y;
ewl_widget_state_set(w, "mouse,in", EWL_STATE_TRANSIENT);
- x = e->x - (CURRENT_X(w) - INSET_LEFT(w));
- y = e->y - (CURRENT_Y(w) - INSET_TOP(w));
+ x = e->base.x - (CURRENT_X(w) - INSET_LEFT(w));
+ y = e->base.y - (CURRENT_Y(w) - INSET_TOP(w));
if ((x > 0) && (x < CURRENT_W(w) + INSET_HORIZONTAL(w)) &&
(y > 0) && (y < CURRENT_H(w) +
INSET_VERTICAL(w))) {
ewl_callback_call_with_event_data(w,
@@ -3056,7 +3056,7 @@
}
else {
ewl_embed_mouse_move_feed(ewl_embed_widget_find(w),
- e->x, e->y, e->modifiers);
+ e->base.x, e->base.y,
e->base.modifiers);
}
} else
ewl_widget_state_set(w, "mouse,out", EWL_STATE_TRANSIENT);
@@ -3078,7 +3078,7 @@
{
Ewl_Embed *embed;
Ewl_Object *o;
- Ewl_Event_Mouse_Move *ev = ev_data;
+ Ewl_Event_Mouse *ev = ev_data;
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("w", w);
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
