Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
ewl_embed.c ewl_enums.h ewl_events.c ewl_iconbox.c
ewl_widget.c ewl_window.c
Log Message:
- cleanup
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_embed.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- ewl_embed.c 20 Nov 2005 03:03:34 -0000 1.22
+++ ewl_embed.c 21 Nov 2005 04:13:41 -0000 1.23
@@ -381,7 +381,6 @@
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
-
/**
* @param embed: the embed where the key event is to occur
* @param keyname: the key release to trigger
@@ -440,7 +439,6 @@
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
-
/**
* @param embed: the embed where the mouse event is to occur
* @param b: the number of the button pressed
@@ -533,7 +531,6 @@
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
-
/**
* @param embed: the embed where the mouse event is to occur
* @param b: the number of the button released
@@ -581,7 +578,6 @@
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
-
/**
* @param embed: the embed where the mouse event is to occur
* @param x: the x coordinate of the mouse move
@@ -678,7 +674,6 @@
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
-
/**
* @param embed: the embed where the DND position event is to occur
* @param x: the x coordinate of the mouse move
@@ -702,13 +697,14 @@
ewl_embed_active_set(embed, TRUE);
widget = ewl_container_child_at_recursive_get(EWL_CONTAINER(embed), x,
y);
-
if (widget) {
Ewl_Widget* parent = widget;
- printf("Found widget %p\n", widget);
+// printf("Found widget %p\n", widget);
- /*Pass the event up the chain*/
+ /*
+ * Pass the event up the chain
+ */
while (parent) {
ewl_callback_call_with_event_data(parent,
EWL_CALLBACK_DND_POSITION, &ev);
@@ -725,7 +721,6 @@
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
-
/**
* @param embed: the embed where the mouse event is to occur
* @param x: the x coordinate of the mouse out
@@ -1783,7 +1778,7 @@
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
-/**
+/*
* Uppercase the given string
*/
static void
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_enums.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -3 -r1.23 -r1.24
--- ewl_enums.h 20 Nov 2005 03:03:34 -0000 1.23
+++ ewl_enums.h 21 Nov 2005 04:13:41 -0000 1.24
@@ -44,7 +44,6 @@
EWL_CALLBACK_APPEARANCE_CHANGED, /**< Theme key of widget changed */
EWL_CALLBACK_WIDGET_ENABLE, /**< Widget has been re-enabled */
EWL_CALLBACK_WIDGET_DISABLE, /**< Widget no longer takes input */
- EWL_CALLBACK_PASTE, /**< Data is ready to be pasted */
EWL_CALLBACK_DND_POSITION, /** A DND position event **/
EWL_CALLBACK_DND_ENTER, /** On enter of a widget **/
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_events.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- ewl_events.c 20 Nov 2005 03:03:34 -0000 1.9
+++ ewl_events.c 21 Nov 2005 04:13:41 -0000 1.10
@@ -64,9 +64,9 @@
ecore_event_handler_add(ECORE_X_EVENT_KEY_UP, ewl_ev_x_key_up,
NULL);
-
- /* Register dispatching functions for DND events */
-
+ /*
+ * Register dispatching functions for DND events
+ */
ecore_event_handler_add(ECORE_X_EVENT_XDND_POSITION,
ewl_ev_dnd_position, NULL);
@@ -427,7 +427,6 @@
ev = e;
-
embed = ewl_embed_evas_window_find((void *)ev->win);
if (!embed)
DRETURN_INT(TRUE, DLEVEL_STABLE);
@@ -512,7 +511,7 @@
* @param data: user specified data passed to the function
* @param type: the type of event triggering the function call
* @param e: the dnd position information
- * @return Returns no value.
+ * @return Returns TRUE on success or FALSE on failure.
* @brief Handles the data for an XDND position event
*
* Tells an XDND source if we can accept DND at this window location
@@ -520,25 +519,28 @@
int
ewl_ev_dnd_position(void *data __UNUSED__, int type __UNUSED__, void *e)
{
- Ewl_Window* window;
- Ecore_X_Event_Xdnd_Position *ev = e;
- int x,y,wx,wy;
+ Ewl_Window *window;
+ Ecore_X_Event_Xdnd_Position *ev;
+ int x, y, wx, wy;
Ecore_X_Rectangle rect;
DENTER_FUNCTION(DLEVEL_STABLE);
+ DCHECK_PARAM_PTR_RET("e", e, FALSE);
+
+ ev = e;
window = ewl_window_window_find((void *)ev->win);
if (window) {
- Ewl_Widget* notify;
- Ewl_Embed* embed;
+ Ewl_Embed *embed;
- ewl_window_position_get(EWL_WINDOW(window), &wx,&wy);
+ ewl_window_position_get(EWL_WINDOW(window), &wx, &wy);
x = ev->position.x - wx;
y = ev->position.y - wy;
//printf("Received event at window pos (%d:%d),
%d:%d\n",CURRENT_X(window), CURRENT_Y(window), x,y);
-
- /*Look for the child here*/
+ /*
+ * Look for the child here
+ */
embed = ewl_embed_evas_window_find((void *)ev->win);
if (embed) {
//printf("Found embed, feeding..\n");
@@ -547,23 +549,15 @@
//printf("Could not find embed for window..\n");
}
-
-
rect.x = 0;
rect.y = 0;
rect.width = 0;
rect.height = 0;
ecore_x_dnd_send_status(1, 0, rect, ECORE_X_DND_ACTION_PRIVATE);
-
-
}
-
DRETURN_INT(TRUE, DLEVEL_STABLE);
}
-
-
-
#endif
#ifdef ENABLE_EWL_FB
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_iconbox.c,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -3 -r1.77 -r1.78
--- ewl_iconbox.c 20 Nov 2005 03:03:34 -0000 1.77
+++ ewl_iconbox.c 21 Nov 2005 04:13:41 -0000 1.78
@@ -330,7 +330,7 @@
ewl_callback_append(ib->ewl_iconbox_pane_inner, EWL_CALLBACK_MOUSE_UP,
ewl_iconbox_mouse_up, ib);
ewl_callback_append(ib->ewl_iconbox_pane_inner,
EWL_CALLBACK_DND_POSITION, ewl_iconbox_dnd_position_cb, ib);
ewl_callback_append(EWL_WIDGET(ib), EWL_CALLBACK_CONFIGURE,
ewl_iconbox_configure_cb, NULL);
- ewl_callback_append(EWL_WIDGET(ib), EWL_CALLBACK_DESTROY,
ewl_iconbox_destroy_cb, NULL);
+ ewl_callback_prepend(EWL_WIDGET(ib), EWL_CALLBACK_DESTROY,
ewl_iconbox_destroy_cb, NULL);
/*printf("Setup the iconbox...\n");*/
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_widget.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -3 -r1.40 -r1.41
--- ewl_widget.c 16 Nov 2005 23:25:36 -0000 1.40
+++ ewl_widget.c 21 Nov 2005 04:13:41 -0000 1.41
@@ -629,24 +629,6 @@
ret = ewl_widget_appearance_path_size_get(w, &len);
- /*
- if (w->parent)
- tmp = ewl_widget_appearance_path_get(w->parent);
- else
- tmp = strdup("");
- */
-
- /* one for the / one for the \0 */
- /*
- len = strlen(tmp) + 2;
- len += (w->appearance ? strlen(w->appearance) : 0);
-
- ret = malloc(sizeof(char) * len);
- snprintf(ret, len, "%s/%s", tmp,
- (w->appearance ? w->appearance : ""));
- FREE(tmp);
- */
-
DRETURN_PTR(ret, DLEVEL_STABLE);
}
@@ -1860,7 +1842,6 @@
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
-
/*
* Perform the basic operations necessary for realizing a widget
*/
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_window.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- ewl_window.c 20 Nov 2005 03:03:34 -0000 1.22
+++ ewl_window.c 21 Nov 2005 04:13:41 -0000 1.23
@@ -591,8 +591,6 @@
DRETURN_INT(override, DLEVEL_STABLE);
}
-
-
/**
* @param win: the window to remove the border
* @return Returns no value.
@@ -608,15 +606,11 @@
DCHECK_TYPE("win", win, "window");
win->flags |= EWL_FLAG_PROPERTY_DND_AWARE;
- if (win->window) ecore_x_dnd_aware_set((Ecore_X_Window)win->window,1);
+ if (win->window) ecore_x_dnd_aware_set((Ecore_X_Window)win->window, 1);
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
-
-
-
-
void
ewl_window_realize_cb(Ewl_Widget *w, void *ev_data __UNUSED__,
void *user_data __UNUSED__)
-------------------------------------------------------
This SF.Net email is sponsored by the JBoss Inc. Get Certified Today
Register for a JBoss Training Course. Free Certification Exam
for All Training Attendees Through End of 2005. For more info visit:
http://ads.osdn.com/?ad_id=7628&alloc_id=16845&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
