Enlightenment CVS committal
Author : ningerso
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
ewl_enums.h ewl_widget.c ewl_widget.h
Log Message:
Remove old internal DND code and variables that are no longer used.
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_enums.h,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -3 -r1.79 -r1.80
--- ewl_enums.h 9 Jul 2007 20:54:37 -0000 1.79
+++ ewl_enums.h 16 Jul 2007 19:23:17 -0000 1.80
@@ -156,7 +156,6 @@
EWL_FLAG_STATE_FOCUSED = 0x10000000, /**< Widget has focus */
EWL_FLAG_STATE_DISABLED = 0x20000000, /**< Widget is disabled */
EWL_FLAG_STATE_DND = 0x40000000, /**< Widget is engaged in DND */
- EWL_FLAG_STATE_DND_WAIT = 0x80000000, /**< Widget is in DND wait
state */
};
/**
@@ -214,7 +213,7 @@
#define EWL_FLAGS_STATE_MASK (EWL_FLAG_STATE_NORMAL | \
EWL_FLAG_STATE_MOUSE_IN | EWL_FLAG_STATE_PRESSED | \
EWL_FLAG_STATE_FOCUSED | EWL_FLAG_STATE_DND | \
- EWL_FLAG_STATE_DISABLED | EWL_FLAG_STATE_DND_WAIT)
+ EWL_FLAG_STATE_DISABLED)
/**
* @enum Ewl_Position
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_widget.c,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -3 -r1.135 -r1.136
--- ewl_widget.c 13 Jul 2007 14:44:31 -0000 1.135
+++ ewl_widget.c 16 Jul 2007 19:23:17 -0000 1.136
@@ -6,8 +6,6 @@
static Ecore_Hash *ewl_widget_name_table = NULL;
static Ecore_Hash *ewl_widget_data_table = NULL;
-static int ewl_widget_dnd_drag_move_count = 0;
-static Ewl_Widget *ewl_widget_drag_widget= NULL;
static Evas_Smart *widget_smart = NULL;
static void ewl_widget_theme_padding_get(Ewl_Widget *w, int *l, int *r,
@@ -21,13 +19,6 @@
static Evas_Object *ewl_widget_layer_neighbor_find_above(Ewl_Widget *w);
static Evas_Object *ewl_widget_layer_neighbor_find_below(Ewl_Widget *w);
-static void ewl_widget_cb_drag_move(Ewl_Widget *w, void *ev_data,
- void *user_data);
-static void ewl_widget_cb_drag_up(Ewl_Widget *w, void *ev_data,
- void *user_data);
-static void ewl_widget_cb_drag_down(Ewl_Widget *w, void *ev_data,
- void *user_data);
-
static void ewl_widget_name_table_shutdown(void);
/**
@@ -422,10 +413,6 @@
if (DESTROYED(w))
DRETURN(DLEVEL_STABLE);
- /* cleanup any dnd widgets */
- if (w == ewl_widget_drag_candidate_get())
- ewl_widget_dnd_reset();
-
emb = ewl_embed_widget_find(w);
if (emb) ewl_embed_info_widgets_cleanup(emb, w);
@@ -3148,206 +3135,6 @@
key = edje_object_data_get(w->theme_object, "inset/bottom");
if (key && b) *b = atoi(key);
-
- DLEAVE_FUNCTION(DLEVEL_STABLE);
-}
-
-/**
- * @internal
- * @param w: The widget to work with
- * @param ev_data: The Ewl_Event_Mouse_Down data
- * @param user_data: UNUSED
- * @return Returns no value
- * @brief The mouse down callback
- */
-void
-ewl_widget_cb_drag_down(Ewl_Widget *w, void *ev_data ,
- void *user_data __UNUSED__)
-{
- Ewl_Event_Mouse_Down *ev;
-
- DENTER_FUNCTION(DLEVEL_STABLE);
- DCHECK_PARAM_PTR("ev_data", ev_data);
-
- ev = ev_data;
- if (!ewl_dnd_status_get())
- DRETURN(DLEVEL_STABLE);
-
- if ((ev->button == 1) && !ewl_object_flags_has(EWL_OBJECT(w),
- EWL_FLAG_STATE_DND_WAIT,
- EWL_FLAGS_STATE_MASK))
- {
- ewl_object_flags_add(EWL_OBJECT(w), EWL_FLAG_STATE_DND_WAIT,
- EWL_FLAGS_STATE_MASK);
- ewl_widget_dnd_drag_move_count = 0;
- ewl_widget_drag_widget = w;
- }
-
- DLEAVE_FUNCTION(DLEVEL_STABLE);
-}
-
-/**
- * @internal
- * @param w: UNUSED
- * @param ev_data: UNUSED
- * @param user_data: UNUSED
- * @return Returns no value
- * @brief The drag move callback
- */
-void
-ewl_widget_cb_drag_move(Ewl_Widget *w __UNUSED__, void *ev_data __UNUSED__,
- void *user_data __UNUSED__)
-{
- DENTER_FUNCTION(DLEVEL_STABLE);
-
- if (!ewl_dnd_status_get())
- DRETURN(DLEVEL_STABLE);
-
- if (ewl_widget_drag_widget
- &&
ewl_object_flags_has(EWL_OBJECT(ewl_widget_drag_widget),
- EWL_FLAG_STATE_DND_WAIT,
- EWL_FLAGS_STATE_MASK))
- {
- ewl_widget_dnd_drag_move_count++;
-
- if (ewl_widget_dnd_drag_move_count > 2)
- {
-
ewl_object_flags_remove(EWL_OBJECT(ewl_widget_drag_widget),
- EWL_FLAG_STATE_DND_WAIT,
- EWL_FLAGS_STATE_MASK);
-
ewl_object_flags_add(EWL_OBJECT(ewl_widget_drag_widget),
- EWL_FLAG_STATE_DND,
- EWL_FLAGS_STATE_MASK);
-
- ewl_dnd_drag_start(ewl_widget_drag_widget);
- }
- }
-
- DLEAVE_FUNCTION(DLEVEL_STABLE);
-}
-
-/**
- * @internal
- * @param w: UNUSED
- * @param ev_data: UNUSED
- * @param user_data: UNUSED
- * @return Returns no value
- * @brief The drag up callback
- */
-void
-ewl_widget_cb_drag_up(Ewl_Widget *w __UNUSED__, void *ev_data __UNUSED__,
- void *user_data __UNUSED__)
-{
- DENTER_FUNCTION(DLEVEL_STABLE);
-
- if (ewl_object_flags_has(EWL_OBJECT(ewl_widget_drag_widget),
- EWL_FLAG_STATE_DND_WAIT,
- EWL_FLAGS_STATE_MASK))
- ewl_object_flags_remove(EWL_OBJECT(ewl_widget_drag_widget),
- EWL_FLAG_STATE_DND_WAIT,
- EWL_FLAGS_STATE_MASK);
-
- ewl_widget_dnd_drag_move_count = 0;
- ewl_widget_drag_widget = NULL;
-
- DLEAVE_FUNCTION(DLEVEL_STABLE);
-}
-
-/**
- * @param w: the widget to set draggable state
- * @param val: the true/false state of draggable
- * @param cb: The drag callback to set
- * @return Returns no value.
- * @brief Set the draggable state, and setup any callbacks
- */
-void
-ewl_widget_draggable_set(Ewl_Widget *w, unsigned int val, Ewl_Widget_Drag cb)
-{
- DENTER_FUNCTION(DLEVEL_STABLE);
- DCHECK_PARAM_PTR("w", w);
- DCHECK_TYPE("w", w, EWL_WIDGET_TYPE);
-
- if (val) {
- if (!ewl_object_flags_has(EWL_OBJECT(w),
- EWL_FLAG_PROPERTY_DND_SOURCE,
- EWL_FLAGS_PROPERTY_MASK))
- {
- ewl_object_flags_add(EWL_OBJECT(w),
- EWL_FLAG_PROPERTY_DND_SOURCE,
- EWL_FLAGS_PROPERTY_MASK );
-
- ewl_callback_append(w, EWL_CALLBACK_MOUSE_DOWN,
- ewl_widget_cb_drag_down, NULL);
- ewl_callback_append(w, EWL_CALLBACK_MOUSE_MOVE,
- ewl_widget_cb_drag_move, NULL);
- ewl_callback_append(w, EWL_CALLBACK_MOUSE_UP,
- ewl_widget_cb_drag_up, NULL);
-
- /* XXX I don't like using widget_data for this cb.
- * Should be an attach at the least */
- if (cb) ewl_widget_data_set(w, "DROP_CB", (void *)cb);
- }
- }
- else
- {
- if (ewl_object_flags_has(EWL_OBJECT(w),
- EWL_FLAG_PROPERTY_DND_SOURCE,
- EWL_FLAGS_PROPERTY_MASK))
- {
- ewl_callback_del(w, EWL_CALLBACK_MOUSE_DOWN,
- ewl_widget_cb_drag_down);
- ewl_callback_del(w, EWL_CALLBACK_MOUSE_MOVE,
- ewl_widget_cb_drag_move);
- ewl_callback_del(w, EWL_CALLBACK_MOUSE_UP,
- ewl_widget_cb_drag_up);
-
- ewl_object_flags_remove(EWL_OBJECT(w),
- EWL_FLAG_PROPERTY_DND_SOURCE,
- EWL_FLAGS_PROPERTY_MASK);
- }
- }
-
- DLEAVE_FUNCTION(DLEVEL_STABLE);
-}
-
-/**
- * @return Returns the current widget that has been clicked or moved
- * (i.e. drag_wait)
- * @brief Accessor function for the current drag candidate widget
- *
- */
-Ewl_Widget *
-ewl_widget_drag_candidate_get(void)
-{
- DENTER_FUNCTION(DLEVEL_STABLE);
-
- DRETURN_PTR(ewl_widget_drag_widget, DLEVEL_STABLE);
-}
-
-/**
- * @return none
- * @brief Cancel any active dnd_wait state widgets
- */
-void
-ewl_widget_dnd_reset(void)
-{
- DENTER_FUNCTION(DLEVEL_STABLE);
-
- if (ewl_widget_drag_widget) {
- Ewl_Widget* temp = ewl_widget_drag_widget;
-
- while (temp) {
- ewl_object_state_remove(EWL_OBJECT(temp),
- EWL_FLAG_STATE_PRESSED);
- temp = temp->parent;
- }
-
- ewl_embed_active_set(ewl_embed_widget_find(
- ewl_widget_drag_widget), 0);
- }
-
- ewl_widget_dnd_drag_move_count = 0;
- ewl_widget_drag_widget = NULL;
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_widget.h,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -3 -r1.62 -r1.63
--- ewl_widget.h 1 Jul 2007 04:53:43 -0000 1.62
+++ ewl_widget.h 16 Jul 2007 19:23:17 -0000 1.63
@@ -241,7 +241,6 @@
int ewl_widget_parent_of(Ewl_Widget *c, Ewl_Widget *w);
-void ewl_widget_draggable_set(Ewl_Widget *w, unsigned int val,
Ewl_Widget_Drag cb);
Ewl_Widget *ewl_widget_drag_candidate_get(void);
void ewl_widget_dnd_reset(void);
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
