Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
ewl_attach.c ewl_check.c ewl_combo.c ewl_embed.c ewl_enums.h
ewl_paned.c ewl_text.c ewl_text.h ewl_widget.c ewl_widget.h
Log Message:
- rename callbacks. The EWL_CALLBACK_FOCUS_IN/OUT callbacks were always just
concerned with mouse so I've renamed thme to EWL_CALLBACK_MOUSE_IN/OUT
to make more sense.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_attach.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- ewl_attach.c 17 Nov 2005 06:45:57 -0000 1.19
+++ ewl_attach.c 2 Dec 2005 19:53:44 -0000 1.20
@@ -31,7 +31,7 @@
static void ewl_attach_cb_tooltip_mouse_move(Ewl_Widget *w, void *ev, void
*data);
static void ewl_attach_cb_tooltip_mouse_down(Ewl_Widget *w, void *ev, void
*data);
-static void ewl_attach_cb_tooltip_focus_out(Ewl_Widget *w, void *ev, void
*data);
+static void ewl_attach_cb_tooltip_mouse_out(Ewl_Widget *w, void *ev, void
*data);
static int ewl_attach_cb_tooltip_timer(void *data);
static Ewl_Attach_Tooltip *ewl_attach_tooltip = NULL;
@@ -467,8 +467,8 @@
ewl_attach_cb_tooltip_mouse_move, NULL);
ewl_callback_append(w, EWL_CALLBACK_MOUSE_DOWN,
ewl_attach_cb_tooltip_mouse_down, NULL);
- ewl_callback_append(w, EWL_CALLBACK_FOCUS_OUT,
- ewl_attach_cb_tooltip_focus_out, NULL);
+ ewl_callback_append(w, EWL_CALLBACK_MOUSE_OUT,
+ ewl_attach_cb_tooltip_mouse_out, NULL);
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
@@ -602,7 +602,7 @@
}
static void
-ewl_attach_cb_tooltip_focus_out(Ewl_Widget *w __UNUSED__,
+ewl_attach_cb_tooltip_mouse_out(Ewl_Widget *w __UNUSED__,
void *ev __UNUSED__, void *data)
{
Ewl_Attach *attach;
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_check.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- ewl_check.c 23 Oct 2005 16:44:43 -0000 1.5
+++ ewl_check.c 2 Dec 2005 19:53:44 -0000 1.6
@@ -55,7 +55,7 @@
ewl_callback_append(w, EWL_CALLBACK_CLICKED,
ewl_check_clicked_cb, NULL);
- ewl_callback_append(w, EWL_CALLBACK_FOCUS_OUT,
+ ewl_callback_append(w, EWL_CALLBACK_MOUSE_OUT,
ewl_check_update_check_cb, NULL);
DRETURN_INT(TRUE, DLEVEL_STABLE);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_combo.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- ewl_combo.c 23 Oct 2005 17:20:18 -0000 1.10
+++ ewl_combo.c 2 Dec 2005 19:53:44 -0000 1.11
@@ -179,7 +179,7 @@
ewl_widget_hide(EWL_MENU_BASE(combo)->popup);
ewl_widget_appearance_set(combo->button, "decrement");
- ewl_callback_del(EWL_MENU_BASE(combo)->popbox, EWL_CALLBACK_FOCUS_OUT,
+ ewl_callback_del(EWL_MENU_BASE(combo)->popbox, EWL_CALLBACK_MOUSE_OUT,
ewl_combo_collapse_cb);
ewl_callback_del(combo->button, EWL_CALLBACK_MOUSE_DOWN,
ewl_combo_collapse_cb);
@@ -259,7 +259,7 @@
pb = EWL_CONTAINER(EWL_MENU_BASE(combo)->popbox);
- ewl_callback_append(EWL_WIDGET(pb), EWL_CALLBACK_FOCUS_OUT,
+ ewl_callback_append(EWL_WIDGET(pb), EWL_CALLBACK_MOUSE_OUT,
ewl_combo_collapse_cb, combo);
ewl_callback_del(combo->button, EWL_CALLBACK_MOUSE_DOWN,
ewl_combo_expand_cb);
ewl_callback_append(combo->button, EWL_CALLBACK_MOUSE_DOWN,
@@ -295,7 +295,7 @@
ewl_widget_hide(EWL_MENU_BASE(combo)->popup);
ewl_widget_appearance_set(combo->button, "decrement");
- ewl_callback_del(EWL_MENU_BASE(combo)->popbox, EWL_CALLBACK_FOCUS_OUT,
+ ewl_callback_del(EWL_MENU_BASE(combo)->popbox, EWL_CALLBACK_MOUSE_OUT,
ewl_combo_collapse_cb);
ewl_callback_del(combo->button, EWL_CALLBACK_MOUSE_DOWN,
ewl_combo_collapse_cb);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_embed.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -3 -r1.26 -r1.27
--- ewl_embed.c 2 Dec 2005 06:19:04 -0000 1.26
+++ ewl_embed.c 2 Dec 2005 19:53:44 -0000 1.27
@@ -630,7 +630,7 @@
&&
!ewl_container_parent_of(embed->last.mouse_in, widget)) {
ewl_object_state_remove(EWL_OBJECT(embed->last.mouse_in),
EWL_FLAG_STATE_HILITED);
- ewl_callback_call(embed->last.mouse_in,
EWL_CALLBACK_FOCUS_OUT);
+ ewl_callback_call(embed->last.mouse_in,
EWL_CALLBACK_MOUSE_OUT);
embed->last.mouse_in = embed->last.mouse_in->parent;
}
}
@@ -654,7 +654,7 @@
ewl_object_state_add(EWL_OBJECT(embed->last.mouse_in),
EWL_FLAG_STATE_HILITED);
ewl_callback_call_with_event_data(embed->last.mouse_in,
- EWL_CALLBACK_FOCUS_IN, &ev);
+ EWL_CALLBACK_MOUSE_IN, &ev);
}
ewl_callback_call_with_event_data(embed->last.mouse_in,
@@ -774,7 +774,7 @@
while (embed->last.mouse_in) {
ewl_callback_call_with_event_data(embed->last.mouse_in,
- EWL_CALLBACK_FOCUS_OUT, &ev);
+ EWL_CALLBACK_MOUSE_OUT, &ev);
embed->last.mouse_in = embed->last.mouse_in->parent;
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_enums.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -3 -r1.25 -r1.26
--- ewl_enums.h 2 Dec 2005 06:19:04 -0000 1.25
+++ ewl_enums.h 2 Dec 2005 19:53:44 -0000 1.26
@@ -33,8 +33,8 @@
EWL_CALLBACK_MOUSE_UP, /**< Mouse was released */
EWL_CALLBACK_MOUSE_MOVE, /**< Mouse was moved */
EWL_CALLBACK_MOUSE_WHEEL, /**< Mouse wheel scrolled */
- EWL_CALLBACK_FOCUS_IN, /**< Mouse was placed over the widget */
- EWL_CALLBACK_FOCUS_OUT, /**< Mouse was moved away from the widget */
+ EWL_CALLBACK_MOUSE_IN, /**< Mouse was placed over the widget */
+ EWL_CALLBACK_MOUSE_OUT, /**< Mouse was moved away from the widget */
EWL_CALLBACK_SELECT, /**< Widget was selected by mouse or key */
EWL_CALLBACK_DESELECT, /**< Widget was deselected by mouse or key */
EWL_CALLBACK_CLICKED, /**< Mouse was pressed and released on a widget */
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_paned.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- ewl_paned.c 30 Nov 2005 04:33:32 -0000 1.10
+++ ewl_paned.c 2 Dec 2005 19:53:44 -0000 1.11
@@ -9,9 +9,9 @@
void *user_data);
static void ewl_paned_grabber_mouse_move_cb(Ewl_Widget *w, void *ev,
void *user_data);
-static void ewl_paned_grabber_focus_in_cb(Ewl_Widget *w, void *ev,
+static void ewl_paned_grabber_mouse_in_cb(Ewl_Widget *w, void *ev,
void *user_data);
-static void ewl_paned_grabber_focus_out_cb(Ewl_Widget *w, void *ev,
+static void ewl_paned_grabber_mouse_out_cb(Ewl_Widget *w, void *ev,
void *user_data);
/**
@@ -117,10 +117,10 @@
ewl_paned_grabber_mouse_up_cb,
p);
ewl_callback_append(EWL_WIDGET(p->grabber), EWL_CALLBACK_MOUSE_MOVE,
ewl_paned_grabber_mouse_move_cb, p);
- ewl_callback_append(EWL_WIDGET(p->grabber), EWL_CALLBACK_FOCUS_IN,
- ewl_paned_grabber_focus_in_cb,
p);
- ewl_callback_append(EWL_WIDGET(p->grabber), EWL_CALLBACK_FOCUS_OUT,
- ewl_paned_grabber_focus_out_cb,
p);
+ ewl_callback_append(EWL_WIDGET(p->grabber), EWL_CALLBACK_MOUSE_IN,
+ ewl_paned_grabber_mouse_in_cb,
p);
+ ewl_callback_append(EWL_WIDGET(p->grabber), EWL_CALLBACK_MOUSE_OUT,
+ ewl_paned_grabber_mouse_out_cb,
p);
ewl_widget_layer_set(EWL_WIDGET(p->grabber), 100);
ewl_widget_show(EWL_WIDGET(p->grabber));
@@ -289,7 +289,7 @@
}
static void
-ewl_paned_grabber_focus_in_cb(Ewl_Widget *w __UNUSED__, void *ev __UNUSED__,
+ewl_paned_grabber_mouse_in_cb(Ewl_Widget *w __UNUSED__, void *ev __UNUSED__,
void *user_data __UNUSED__)
{
DENTER_FUNCTION(DLEVEL_STABLE);
@@ -300,7 +300,7 @@
}
static void
-ewl_paned_grabber_focus_out_cb(Ewl_Widget *w __UNUSED__, void *ev __UNUSED__,
+ewl_paned_grabber_mouse_out_cb(Ewl_Widget *w __UNUSED__, void *ev __UNUSED__,
void *user_data __UNUSED__)
{
DENTER_FUNCTION(DLEVEL_STABLE);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_text.c,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -3 -r1.72 -r1.73
--- ewl_text.c 2 Dec 2005 06:19:04 -0000 1.72
+++ ewl_text.c 2 Dec 2005 19:53:44 -0000 1.73
@@ -2917,10 +2917,10 @@
ewl_widget_internal_set(area, TRUE);
ewl_object_geometry_request(EWL_OBJECT(area), x, y, w, h);
- ewl_callback_append(area, EWL_CALLBACK_FOCUS_IN,
- ewl_text_trigger_cb_focus_in, cur);
- ewl_callback_append(area, EWL_CALLBACK_FOCUS_OUT,
- ewl_text_trigger_cb_focus_out, cur);
+ ewl_callback_append(area, EWL_CALLBACK_MOUSE_IN,
+ ewl_text_trigger_cb_mouse_in, cur);
+ ewl_callback_append(area, EWL_CALLBACK_MOUSE_OUT,
+ ewl_text_trigger_cb_mouse_out, cur);
ewl_callback_append(area, EWL_CALLBACK_MOUSE_DOWN,
ewl_text_trigger_cb_mouse_down, cur);
ewl_callback_append(area, EWL_CALLBACK_MOUSE_UP,
@@ -3298,7 +3298,7 @@
}
void
-ewl_text_trigger_cb_focus_in(Ewl_Widget *w __UNUSED__, void *ev, void *data)
+ewl_text_trigger_cb_mouse_in(Ewl_Widget *w __UNUSED__, void *ev, void *data)
{
Ewl_Text_Trigger *trigger;
@@ -3307,13 +3307,13 @@
trigger = data;
ewl_callback_call_with_event_data(EWL_WIDGET(trigger),
- EWL_CALLBACK_FOCUS_IN, ev);
+ EWL_CALLBACK_MOUSE_IN, ev);
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
void
-ewl_text_trigger_cb_focus_out(Ewl_Widget *w __UNUSED__, void *ev, void *data)
+ewl_text_trigger_cb_mouse_out(Ewl_Widget *w __UNUSED__, void *ev, void *data)
{
Ewl_Text_Trigger *trigger;
@@ -3322,7 +3322,7 @@
trigger = data;
ewl_callback_call_with_event_data(EWL_WIDGET(trigger),
- EWL_CALLBACK_FOCUS_OUT, ev);
+ EWL_CALLBACK_MOUSE_OUT, ev);
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_text.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -3 -r1.25 -r1.26
--- ewl_text.h 30 Nov 2005 05:42:01 -0000 1.25
+++ ewl_text.h 2 Dec 2005 19:53:44 -0000 1.26
@@ -263,8 +263,8 @@
void ewl_text_cb_child_del(Ewl_Container *c, Ewl_Widget *w);
void ewl_text_trigger_cb_destroy(Ewl_Widget *w, void *ev, void *data);
-void ewl_text_trigger_cb_focus_in(Ewl_Widget *w, void *ev, void *data);
-void ewl_text_trigger_cb_focus_out(Ewl_Widget *w, void *ev, void *data);
+void ewl_text_trigger_cb_mouse_in(Ewl_Widget *w, void *ev, void *data);
+void ewl_text_trigger_cb_mouse_out(Ewl_Widget *w, void *ev, void *data);
void ewl_text_trigger_cb_mouse_up(Ewl_Widget *w, void *ev, void *data);
void ewl_text_trigger_cb_mouse_down(Ewl_Widget *w, void *ev, void *data);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_widget.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -3 -r1.46 -r1.47
--- ewl_widget.c 2 Dec 2005 06:19:04 -0000 1.46
+++ ewl_widget.c 2 Dec 2005 19:53:44 -0000 1.47
@@ -92,9 +92,9 @@
NULL);
ewl_callback_append(w, EWL_CALLBACK_WIDGET_DISABLE,
ewl_widget_disable_cb, NULL);
- ewl_callback_append(w, EWL_CALLBACK_FOCUS_IN, ewl_widget_focus_in_cb,
+ ewl_callback_append(w, EWL_CALLBACK_MOUSE_IN, ewl_widget_mouse_in_cb,
NULL);
- ewl_callback_append(w, EWL_CALLBACK_FOCUS_OUT, ewl_widget_focus_out_cb,
+ ewl_callback_append(w, EWL_CALLBACK_MOUSE_OUT, ewl_widget_mouse_out_cb,
NULL);
ewl_callback_append(w, EWL_CALLBACK_MOUSE_DOWN,
ewl_widget_mouse_down_cb, NULL);
@@ -2187,7 +2187,7 @@
}
void
-ewl_widget_focus_in_cb(Ewl_Widget *w, void *ev_data __UNUSED__,
+ewl_widget_mouse_in_cb(Ewl_Widget *w, void *ev_data __UNUSED__,
void *user_data __UNUSED__)
{
DENTER_FUNCTION(DLEVEL_STABLE);
@@ -2203,7 +2203,7 @@
}
void
-ewl_widget_focus_out_cb(Ewl_Widget *w, void *ev_data __UNUSED__,
+ewl_widget_mouse_out_cb(Ewl_Widget *w, void *ev_data __UNUSED__,
void *user_data __UNUSED__)
{
DENTER_FUNCTION(DLEVEL_STABLE);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_widget.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -3 -r1.23 -r1.24
--- ewl_widget.h 2 Dec 2005 06:19:04 -0000 1.23
+++ ewl_widget.h 2 Dec 2005 19:53:44 -0000 1.24
@@ -191,8 +191,8 @@
void ewl_widget_reparent_cb(Ewl_Widget *w, void *ev_data, void *user_data);
void ewl_widget_enable_cb(Ewl_Widget *w, void *ev_data, void *user_data);
void ewl_widget_disable_cb(Ewl_Widget *w, void *ev_data, void *user_data);
-void ewl_widget_focus_in_cb(Ewl_Widget *w, void *ev_data, void *user_data);
-void ewl_widget_focus_out_cb(Ewl_Widget *w, void *ev_data, void *user_data);
+void ewl_widget_mouse_in_cb(Ewl_Widget *w, void *ev_data, void *user_data);
+void ewl_widget_mouse_out_cb(Ewl_Widget *w, void *ev_data, void *user_data);
void ewl_widget_mouse_down_cb(Ewl_Widget *w, void *ev_data, void *user_data);
void ewl_widget_mouse_up_cb(Ewl_Widget *w, void *ev_data, void *user_data);
void ewl_widget_child_destroy_cb(Ewl_Widget *w, void *ev_data, void
*user_data);
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
