Enlightenment CVS committal
Author : rbdpngn
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
ewl_button.c ewl_cell.c ewl_embed.c ewl_widget.c ewl_widget.h
Log Message:
Intercept the layer change for the embed smart object.
Generalize the focus change signals and hook in some containers.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_button.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- ewl_button.c 2 Dec 2005 20:50:21 -0000 1.20
+++ ewl_button.c 15 Dec 2005 01:59:54 -0000 1.21
@@ -78,6 +78,8 @@
ewl_button_stock_type_set(b, EWL_STOCK_NONE);
ewl_box_orientation_set(EWL_BOX(b), EWL_ORIENTATION_VERTICAL);
+ ewl_container_callback_notify(EWL_CONTAINER(b), EWL_CALLBACK_FOCUS_IN);
+ ewl_container_callback_notify(EWL_CONTAINER(b), EWL_CALLBACK_FOCUS_OUT);
b->body = ewl_hbox_new();
ewl_container_child_append(EWL_CONTAINER(b), b->body);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_cell.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- ewl_cell.c 23 Oct 2005 16:37:42 -0000 1.7
+++ ewl_cell.c 15 Dec 2005 01:59:54 -0000 1.8
@@ -53,6 +53,8 @@
ewl_callback_append(EWL_WIDGET(cell), EWL_CALLBACK_CONFIGURE,
ewl_cell_configure_cb, NULL);
+ ewl_container_callback_notify(EWL_CONTAINER(cell),
EWL_CALLBACK_FOCUS_IN);
+ ewl_container_callback_notify(EWL_CONTAINER(cell),
EWL_CALLBACK_FOCUS_OUT);
DRETURN_INT(TRUE, DLEVEL_STABLE);
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_embed.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -3 -r1.30 -r1.31
--- ewl_embed.c 6 Dec 2005 07:26:14 -0000 1.30
+++ ewl_embed.c 15 Dec 2005 01:59:54 -0000 1.31
@@ -9,7 +9,7 @@
static void ewl_embed_smart_add_cb(Evas_Object *obj);
static void ewl_embed_smart_del_cb(Evas_Object *obj);
-static void ewl_embed_smart_layer_set_cb(Evas_Object *obj, int l);
+static void ewl_embed_smart_layer_set_cb(void *data, Evas_Object *obj, int l);
static void ewl_embed_smart_layer_adjust_cb(Evas_Object *obj);
static void ewl_embed_smart_layer_adjust_rel_cb(Evas_Object *obj,
Evas_Object *above);
@@ -157,7 +157,7 @@
if (!embedded_smart) {
embedded_smart = evas_smart_new(name, ewl_embed_smart_add_cb,
- ewl_embed_smart_del_cb, ewl_embed_smart_layer_set_cb,
+ ewl_embed_smart_del_cb, NULL,
ewl_embed_smart_layer_adjust_cb,
ewl_embed_smart_layer_adjust_cb,
ewl_embed_smart_layer_adjust_rel_cb,
@@ -175,6 +175,9 @@
}
emb->smart = evas_object_smart_add(emb->evas, embedded_smart);
+ evas_object_intercept_layer_set_callback_add(emb->smart,
+ ewl_embed_smart_layer_set_cb,
+ NULL);
evas_object_smart_data_set(emb->smart, emb);
w = EWL_WIDGET(emb);
@@ -1264,7 +1267,6 @@
if (embed->last.focused)
{
- ewl_widget_state_set(embed->last.focused, "unfocused");
ewl_callback_call(embed->last.focused, EWL_CALLBACK_FOCUS_OUT);
}
@@ -1272,7 +1274,6 @@
if (embed->last.focused)
{
- ewl_widget_state_set(embed->last.focused, "focused");
ewl_callback_call(embed->last.focused, EWL_CALLBACK_FOCUS_IN);
}
@@ -1530,7 +1531,7 @@
}
static void
-ewl_embed_smart_layer_set_cb(Evas_Object *obj, int l)
+ewl_embed_smart_layer_set_cb(void *data __UNUSED__, Evas_Object *obj, int l)
{
Ewl_Embed *emb;
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_widget.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -3 -r1.49 -r1.50
--- ewl_widget.c 6 Dec 2005 03:46:54 -0000 1.49
+++ ewl_widget.c 15 Dec 2005 01:59:54 -0000 1.50
@@ -92,7 +92,9 @@
NULL);
ewl_callback_append(w, EWL_CALLBACK_WIDGET_DISABLE,
ewl_widget_disable_cb, NULL);
- ewl_callback_append(w, EWL_CALLBACK_MOUSE_IN, ewl_widget_mouse_in_cb,
+ ewl_callback_append(w, EWL_CALLBACK_FOCUS_IN, ewl_widget_focus_in_cb,
+ NULL);
+ ewl_callback_append(w, EWL_CALLBACK_FOCUS_OUT, ewl_widget_focus_out_cb,
NULL);
ewl_callback_append(w, EWL_CALLBACK_MOUSE_OUT, ewl_widget_mouse_out_cb,
NULL);
@@ -2186,6 +2188,38 @@
}
void
+ewl_widget_focus_in_cb(Ewl_Widget *w, void *ev_data __UNUSED__,
+ void *user_data __UNUSED__)
+{
+ DENTER_FUNCTION(DLEVEL_STABLE);
+ DCHECK_PARAM_PTR("w", w);
+ DCHECK_TYPE("w", w, "widget");
+
+ if (ewl_object_state_has(EWL_OBJECT(w), EWL_FLAG_STATE_DISABLED))
+ DRETURN(DLEVEL_STABLE);
+
+ ewl_widget_state_set(w, "focus,in");
+
+ DLEAVE_FUNCTION(DLEVEL_STABLE);
+}
+
+void
+ewl_widget_focus_out_cb(Ewl_Widget *w, void *ev_data __UNUSED__,
+ void *user_data __UNUSED__)
+{
+ DENTER_FUNCTION(DLEVEL_STABLE);
+ DCHECK_PARAM_PTR("w", w);
+ DCHECK_TYPE("w", w, "widget");
+
+ if (ewl_object_state_has(EWL_OBJECT(w), EWL_FLAG_STATE_DISABLED))
+ DRETURN(DLEVEL_STABLE);
+
+ ewl_widget_state_set(w, "focus,out");
+
+ DLEAVE_FUNCTION(DLEVEL_STABLE);
+}
+
+void
ewl_widget_mouse_in_cb(Ewl_Widget *w, void *ev_data __UNUSED__,
void *user_data __UNUSED__)
{
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_widget.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -3 -r1.26 -r1.27
--- ewl_widget.h 7 Dec 2005 06:28:08 -0000 1.26
+++ ewl_widget.h 15 Dec 2005 01:59:54 -0000 1.27
@@ -191,6 +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);
-------------------------------------------------------
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
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs