Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
ewl_combo.c ewl_combo.h ewl_embed.c ewl_entry.c ewl_entry.h
ewl_enums.h ewl_iconbox.c ewl_imenu.c ewl_menu.c
ewl_menu_base.c ewl_menu_item.c ewl_spinner.c ewl_spinner.h
Log Message:
- the EWL_CALLBACK_SELECT/DESELECT are the events sent of focus in/out,
change it to be EWL_CALLBACK_FOCUS_IN/OUT
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_combo.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- ewl_combo.c 2 Dec 2005 19:53:44 -0000 1.11
+++ ewl_combo.c 2 Dec 2005 20:09:57 -0000 1.12
@@ -82,7 +82,7 @@
ewl_container_child_append(EWL_CONTAINER(combo), combo->selected);
ewl_widget_show(combo->selected);
- ewl_callback_del(EWL_WIDGET(combo), EWL_CALLBACK_SELECT,
+ ewl_callback_del(EWL_WIDGET(combo), EWL_CALLBACK_FOCUS_IN,
ewl_menu_base_expand_cb);
ewl_container_callback_nointercept(EWL_CONTAINER(combo),
@@ -94,9 +94,9 @@
ewl_container_callback_nointercept(EWL_CONTAINER(combo),
EWL_CALLBACK_MOUSE_MOVE);
ewl_container_callback_nointercept(EWL_CONTAINER(combo),
- EWL_CALLBACK_SELECT);
+ EWL_CALLBACK_FOCUS_IN);
ewl_container_callback_nointercept(EWL_CONTAINER(combo),
- EWL_CALLBACK_DESELECT);
+ EWL_CALLBACK_FOCUS_OUT);
ewl_container_redirect_set(EWL_CONTAINER(combo), redirect);
@@ -163,7 +163,7 @@
}
void
-ewl_combo_item_select_cb(Ewl_Widget *w, void *ev_data __UNUSED__,
+ewl_combo_item_focus_in_cb(Ewl_Widget *w, void *ev_data __UNUSED__,
void *user_data)
{
Ewl_Combo *combo;
@@ -272,9 +272,9 @@
* widget
*/
while ((child = ecore_list_next(pb->children))) {
- ewl_callback_del(child, EWL_CALLBACK_SELECT,
ewl_combo_item_select_cb);
- ewl_callback_append(child, EWL_CALLBACK_SELECT,
- ewl_combo_item_select_cb, combo);
+ ewl_callback_del(child, EWL_CALLBACK_FOCUS_IN,
ewl_combo_item_focus_in_cb);
+ ewl_callback_append(child, EWL_CALLBACK_FOCUS_IN,
+ ewl_combo_item_focus_in_cb, combo);
}
ewl_widget_show(combo->base.popup);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_combo.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- ewl_combo.h 23 Oct 2005 17:20:18 -0000 1.5
+++ ewl_combo.h 2 Dec 2005 20:09:57 -0000 1.6
@@ -47,7 +47,7 @@
/*
* Internally used callbacks, override at your own risk.
*/
-void ewl_combo_item_select_cb(Ewl_Widget *w, void *ev_data, void *user_data);
+void ewl_combo_item_focus_in_cb(Ewl_Widget *w, void *ev_data, void *user_data);
void ewl_combo_configure_cb(Ewl_Widget *w, void *ev_data, void *user_data);
void ewl_combo_value_changed_cb(Ewl_Widget *w, void *ev_data, void *user_data);
void ewl_combo_expand_cb(Ewl_Widget * w, void *ev_data, void *user_data);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_embed.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -3 -r1.27 -r1.28
--- ewl_embed.c 2 Dec 2005 19:53:44 -0000 1.27
+++ ewl_embed.c 2 Dec 2005 20:09:57 -0000 1.28
@@ -264,7 +264,7 @@
{
ewl_object_state_remove(EWL_OBJECT(e->last.clicked),
EWL_FLAG_STATE_SELECTED);
- ewl_callback_call(e->last.clicked, EWL_CALLBACK_DESELECT);
+ ewl_callback_call(e->last.clicked, EWL_CALLBACK_FOCUS_OUT);
e->last.clicked = NULL;
}
@@ -523,14 +523,14 @@
if (deselect) {
ewl_object_state_remove(EWL_OBJECT(deselect),
EWL_FLAG_STATE_SELECTED);
- ewl_callback_call(deselect, EWL_CALLBACK_DESELECT);
+ ewl_callback_call(deselect, EWL_CALLBACK_FOCUS_OUT);
}
if (widget && !(ewl_object_state_has(EWL_OBJECT(widget),
EWL_FLAG_STATE_DISABLED))) {
ewl_object_state_add(EWL_OBJECT(widget),
EWL_FLAG_STATE_SELECTED);
- ewl_callback_call(widget, EWL_CALLBACK_SELECT);
+ ewl_callback_call(widget, EWL_CALLBACK_FOCUS_IN);
}
}
@@ -1263,7 +1263,7 @@
if (embed->last.focused)
{
ewl_widget_state_set(embed->last.focused, "unfocused");
- ewl_callback_call(embed->last.focused, EWL_CALLBACK_DESELECT);
+ ewl_callback_call(embed->last.focused, EWL_CALLBACK_FOCUS_OUT);
}
embed->last.focused = w;
@@ -1271,7 +1271,7 @@
if (embed->last.focused)
{
ewl_widget_state_set(embed->last.focused, "focused");
- ewl_callback_call(embed->last.focused, EWL_CALLBACK_SELECT);
+ ewl_callback_call(embed->last.focused, EWL_CALLBACK_FOCUS_IN);
}
DLEAVE_FUNCTION(DLEVEL_STABLE);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_entry.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -3 -r1.42 -r1.43
--- ewl_entry.c 2 Dec 2005 06:19:04 -0000 1.42
+++ ewl_entry.c 2 Dec 2005 20:09:57 -0000 1.43
@@ -55,8 +55,8 @@
ewl_object_fill_policy_set(EWL_OBJECT(e), EWL_FLAG_FILL_HSHRINK |
EWL_FLAG_FILL_HFILL);
- ewl_container_callback_intercept(EWL_CONTAINER(w), EWL_CALLBACK_SELECT);
- ewl_container_callback_intercept(EWL_CONTAINER(w),
EWL_CALLBACK_DESELECT);
+ ewl_container_callback_intercept(EWL_CONTAINER(w),
EWL_CALLBACK_FOCUS_IN);
+ ewl_container_callback_intercept(EWL_CONTAINER(w),
EWL_CALLBACK_FOCUS_OUT);
/* setup the cursor */
e->cursor = ewl_entry_cursor_new(e);
@@ -70,10 +70,10 @@
ewl_text_selectable_set(EWL_TEXT(e), TRUE);
/* setup callbacks */
- ewl_callback_append(w, EWL_CALLBACK_SELECT,
- ewl_entry_cb_selected, NULL);
- ewl_callback_append(w, EWL_CALLBACK_DESELECT,
- ewl_entry_cb_deselected, NULL);
+ ewl_callback_append(w, EWL_CALLBACK_FOCUS_IN,
+ ewl_entry_cb_focus_in, NULL);
+ ewl_callback_append(w, EWL_CALLBACK_FOCUS_OUT,
+ ewl_entry_cb_focus_out, NULL);
ewl_callback_append(w, EWL_CALLBACK_CONFIGURE,
ewl_entry_cb_configure, NULL);
ewl_callback_append(w, EWL_CALLBACK_MOUSE_DOWN,
@@ -237,7 +237,7 @@
}
void
-ewl_entry_cb_selected(Ewl_Widget *w, void *ev __UNUSED__,
+ewl_entry_cb_focus_in(Ewl_Widget *w, void *ev __UNUSED__,
void *data __UNUSED__)
{
Ewl_Entry *entry;
@@ -254,7 +254,7 @@
}
void
-ewl_entry_cb_deselected(Ewl_Widget *w, void *ev __UNUSED__,
+ewl_entry_cb_focus_out(Ewl_Widget *w, void *ev __UNUSED__,
void *data __UNUSED__)
{
Ewl_Entry *entry;
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_entry.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- ewl_entry.h 29 Nov 2005 05:36:04 -0000 1.14
+++ ewl_entry.h 2 Dec 2005 20:09:57 -0000 1.15
@@ -33,8 +33,8 @@
void ewl_entry_cb_mouse_down(Ewl_Widget *w, void *ev, void *data);
void ewl_entry_cb_mouse_up(Ewl_Widget *w, void *ev, void *data);
void ewl_entry_cb_mouse_move(Ewl_Widget *w, void *ev, void *data);
-void ewl_entry_cb_selected(Ewl_Widget *w, void *ev, void *data);
-void ewl_entry_cb_deselected(Ewl_Widget *w, void *ev, void *data);
+void ewl_entry_cb_focus_in(Ewl_Widget *w, void *ev, void *data);
+void ewl_entry_cb_focus_out(Ewl_Widget *w, void *ev, void *data);
void ewl_entry_cursor_move_left(Ewl_Entry *e);
void ewl_entry_cursor_move_right(Ewl_Entry *e);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_enums.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -3 -r1.26 -r1.27
--- ewl_enums.h 2 Dec 2005 19:53:44 -0000 1.26
+++ ewl_enums.h 2 Dec 2005 20:09:57 -0000 1.27
@@ -35,8 +35,8 @@
EWL_CALLBACK_MOUSE_WHEEL, /**< Mouse wheel scrolled */
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_FOCUS_IN, /**< Widget was selected by mouse or key */
+ EWL_CALLBACK_FOCUS_OUT, /**< Widget was deselected by mouse or key */
EWL_CALLBACK_CLICKED, /**< Mouse was pressed and released on a widget */
EWL_CALLBACK_HILITED, /**< Mouse is over the widget */
EWL_CALLBACK_VALUE_CHANGED, /**< Value in widget changed */
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_iconbox.c,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -3 -r1.88 -r1.89
--- ewl_iconbox.c 30 Nov 2005 08:57:27 -0000 1.88
+++ ewl_iconbox.c 2 Dec 2005 20:09:57 -0000 1.89
@@ -1071,7 +1071,7 @@
//ewl_widget_show(ib->ewl_iconbox_view_menu);
//ewl_widget_show(ib->ewl_iconbox_context_menu);
//ewl_menu_popup_move_cb(EWL_MENU(ib->ewl_iconbox_context_menu)->base.popup,
NULL, ib->ewl_iconbox_context_menu);
- ewl_callback_call(EWL_WIDGET(ib->ewl_iconbox_context_menu),
EWL_CALLBACK_SELECT);
+ ewl_callback_call(EWL_WIDGET(ib->ewl_iconbox_context_menu),
EWL_CALLBACK_FOCUS_IN);
} else if (ev->button == 1 /* Confirm that this is not an icon event */
&& (ib->xdown != ev->x && ib->ydown != ev->y)) {
ewl_object_custom_size_set(EWL_OBJECT(ib->select), 1, 1);
@@ -1120,7 +1120,7 @@
//ewl_floater_follow_set(EWL_FLOATER(ib->icon_box_parent->icon_menu_floater),
ib);
//ewl_widget_show(ib->icon_box_parent->icon_menu_floater);
//ewl_widget_show(ib->icon_box_parent->icon_menu);
- ewl_callback_call(EWL_WIDGET(ib->icon_box_parent->icon_menu),
EWL_CALLBACK_SELECT);
+ ewl_callback_call(EWL_WIDGET(ib->icon_box_parent->icon_menu),
EWL_CALLBACK_FOCUS_IN);
} else {
/*Select/drag start*/
@@ -1187,7 +1187,6 @@
if (ib->background) {
int width,height;
Ewl_Widget* parent = w->parent;
- Ewl_Widget* parent_parent = parent->parent;
width = CURRENT_W(ib);
height = CURRENT_H(ib);
ewl_object_position_request(EWL_OBJECT(ib->background),CURRENT_X(parent),CURRENT_Y(parent));
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_imenu.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- ewl_imenu.c 24 Oct 2005 00:54:07 -0000 1.6
+++ ewl_imenu.c 2 Dec 2005 20:09:57 -0000 1.7
@@ -45,7 +45,7 @@
ewl_widget_inherit(EWL_WIDGET(menu), "imenu");
- ewl_callback_append(EWL_WIDGET(menu), EWL_CALLBACK_SELECT,
+ ewl_callback_append(EWL_WIDGET(menu), EWL_CALLBACK_FOCUS_IN,
ewl_imenu_expand_cb, NULL);
ewl_callback_append(EWL_WIDGET(menu), EWL_CALLBACK_CONFIGURE,
ewl_imenu_configure_cb, NULL);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_menu.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- ewl_menu.c 30 Nov 2005 09:02:34 -0000 1.17
+++ ewl_menu.c 2 Dec 2005 20:09:57 -0000 1.18
@@ -49,7 +49,7 @@
ewl_widget_inherit(EWL_WIDGET(menu), "menu");
- ewl_callback_append(EWL_WIDGET(menu), EWL_CALLBACK_SELECT,
+ ewl_callback_append(EWL_WIDGET(menu), EWL_CALLBACK_FOCUS_IN,
ewl_menu_expand_cb, NULL);
ewl_callback_append(EWL_WIDGET(menu), EWL_CALLBACK_REALIZE,
ewl_menu_realize_cb, NULL);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_menu_base.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- ewl_menu_base.c 21 Nov 2005 05:45:50 -0000 1.13
+++ ewl_menu_base.c 2 Dec 2005 20:09:57 -0000 1.14
@@ -28,9 +28,9 @@
ewl_callback_del(EWL_WIDGET(menu), EWL_CALLBACK_CLICKED,
ewl_menu_item_clicked_cb);
- ewl_callback_append(EWL_WIDGET(menu), EWL_CALLBACK_SELECT,
+ ewl_callback_append(EWL_WIDGET(menu), EWL_CALLBACK_FOCUS_IN,
ewl_menu_base_expand_cb, NULL);
- ewl_callback_append(EWL_WIDGET(menu), EWL_CALLBACK_DESELECT,
+ ewl_callback_append(EWL_WIDGET(menu), EWL_CALLBACK_FOCUS_OUT,
ewl_menu_base_collapse_cb, NULL);
ewl_callback_prepend(EWL_WIDGET(menu), EWL_CALLBACK_DESTROY,
ewl_menu_base_destroy_cb, NULL);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_menu_item.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- ewl_menu_item.c 22 Nov 2005 23:40:50 -0000 1.3
+++ ewl_menu_item.c 2 Dec 2005 20:09:57 -0000 1.4
@@ -59,9 +59,9 @@
* this widget.
*/
ewl_container_callback_intercept(EWL_CONTAINER(item),
- EWL_CALLBACK_SELECT);
+ EWL_CALLBACK_FOCUS_IN);
ewl_container_callback_intercept(EWL_CONTAINER(item),
- EWL_CALLBACK_DESELECT);
+ EWL_CALLBACK_FOCUS_OUT);
DRETURN_INT(TRUE, DLEVEL_STABLE);
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_spinner.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- ewl_spinner.c 25 Oct 2005 05:12:18 -0000 1.13
+++ ewl_spinner.c 2 Dec 2005 20:09:57 -0000 1.14
@@ -75,8 +75,8 @@
ewl_entry_cb_key_down);
ewl_callback_append(s->entry, EWL_CALLBACK_KEY_DOWN,
ewl_spinner_key_down_cb, s);
- ewl_callback_append(s->entry, EWL_CALLBACK_DESELECT,
- ewl_spinner_deselect_cb, s);
+ ewl_callback_append(s->entry, EWL_CALLBACK_FOCUS_OUT,
+ ewl_spinner_focus_out_cb, s);
ewl_callback_append(s->entry, EWL_CALLBACK_MOUSE_WHEEL,
ewl_spinner_wheel_cb, s);
@@ -349,7 +349,7 @@
}
void
-ewl_spinner_deselect_cb(Ewl_Widget *w __UNUSED__, void *ev_data __UNUSED__,
+ewl_spinner_focus_out_cb(Ewl_Widget *w __UNUSED__, void *ev_data __UNUSED__,
void *user_data)
{
Ewl_Spinner *s;
@@ -436,7 +436,7 @@
DCHECK_TYPE("w", w, "widget");
s = EWL_SPINNER(user_data);
- ewl_spinner_deselect_cb(w, NULL, s);
+ ewl_spinner_focus_out_cb(w, NULL, s);
ewl_spinner_calc_value(s, s->value + s->step, TRUE);
@@ -487,7 +487,7 @@
DCHECK_TYPE("w", w, "widget");
s = EWL_SPINNER(user_data);
- ewl_spinner_deselect_cb(w, NULL, s);
+ ewl_spinner_focus_out_cb(w, NULL, s);
ewl_spinner_calc_value(s, s->value - s->step, TRUE);
if (ev_data) {
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_spinner.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- ewl_spinner.h 25 Oct 2005 05:12:18 -0000 1.5
+++ ewl_spinner.h 2 Dec 2005 20:09:57 -0000 1.6
@@ -65,7 +65,7 @@
void *user_data);
void ewl_spinner_key_down_cb(Ewl_Widget *widget, void *ev_data,
void *user_data);
-void ewl_spinner_deselect_cb(Ewl_Widget *w, void *ev_data,
+void ewl_spinner_focus_out_cb(Ewl_Widget *w, void *ev_data,
void *user_data);
void ewl_spinner_wheel_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
