Enlightenment CVS committal
Author : rbdpngn
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src
Modified Files:
ewl_combo.c ewl_container.c ewl_embed.c ewl_embed.h
ewl_events.c ewl_image.c ewl_imenu.c ewl_media.c ewl_menu.c
ewl_misc.c ewl_selectionbar.c ewl_text.c ewl_widget.c
Log Message:
* Added focus settings to the embed.
* Minor changes to the embed API name scheme.
* Added dan sinclair to authors.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_combo.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- ewl_combo.c 23 Aug 2004 01:17:30 -0000 1.8
+++ ewl_combo.c 23 Aug 2004 18:51:51 -0000 1.9
@@ -224,7 +224,7 @@
ewl_menu_base_expand_cb(EWL_WIDGET(combo), ev_data, NULL);
if (!REALIZED(combo->base.popup)) {
- emb = ewl_embed_find_by_widget(w);
+ emb = ewl_embed_widget_find(w);
ewl_container_child_append(EWL_CONTAINER(emb),
combo->base.popup);
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_container.c,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -3 -r1.76 -r1.77
--- ewl_container.c 22 Aug 2004 04:50:28 -0000 1.76
+++ ewl_container.c 23 Aug 2004 18:51:51 -0000 1.77
@@ -921,7 +921,7 @@
c = EWL_CONTAINER(w);
- emb = ewl_embed_find_by_widget(w);
+ emb = ewl_embed_widget_find(w);
/*
* Create the clip box for this container, this keeps children clipped
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_embed.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -3 -r1.45 -r1.46
--- ewl_embed.c 23 Aug 2004 01:29:37 -0000 1.45
+++ ewl_embed.c 23 Aug 2004 18:51:51 -0000 1.46
@@ -173,6 +173,40 @@
DRETURN_PTR(emb->smart, DLEVEL_STABLE);
}
+/**
+ * @param embed: the embed to inidicate if it takes focus
+ * @param f: boolean to determine if the embed takes focus
+ * @return Returns no value.
+ * @brief Sets the boolean flag in the embed to determine if it takes focus.
+ */
+void ewl_embed_focus_set(Ewl_Embed *embed, int f)
+{
+ DENTER_FUNCTION(DLEVEL_STABLE);
+
+ embed->focus = f;
+ if (embed->ev_clip)
+ evas_object_focus_set(embed->ev_clip, f);
+
+ DLEAVE_FUNCTION(DLEVEL_STABLE);
+}
+
+/**
+ * @param embed: the embed to indicate if it takes focus
+ * @return Returns a boolean indicating if the embed takes focus.
+ * @brief Retrieve the boolean value that indicates if the emebd takes focus.
+ */
+int ewl_embed_focus_get(Ewl_Embed *embed)
+{
+ DENTER_FUNCTION(DLEVEL_STABLE);
+
+ DRETURN_INT(embed->focus, DLEVEL_STABLE);
+}
+
+/**
+ * @param embed: the embed to retrieve maximum layer
+ * @return Returns the layer used for obtaining evas events.
+ * @brief Retrieve the layer being used for receiving evas events.
+ */
int ewl_embed_max_layer_get(Ewl_Embed *embed)
{
int layer;
@@ -183,6 +217,13 @@
DRETURN_INT(layer, DLEVEL_STABLE);
}
+/**
+ *
+ * @param embed: embed to set the maximum layer
+ * @param layer: the maximum layer used for handling evas events
+ * @return Returns no value.
+ * @brief Sets the layer for the embed to receive events.
+ */
void ewl_embed_max_layer_set(Ewl_Embed *embed, int layer)
{
if (REALIZED(embed))
@@ -593,7 +634,7 @@
* @return Returns the found embed on success, NULL on failure.
* @brief Find an ewl embed by its evas window
*/
-Ewl_Embed *ewl_embed_find_by_evas_window(Ewl_Embed_Evas_Window *window)
+Ewl_Embed *ewl_embed_evas_window_find(Ewl_Embed_Evas_Window *window)
{
Ewl_Embed *retemb;
@@ -615,7 +656,7 @@
* @return Returns the found embed on success, NULL on failure.
* @brief Find an ewl embed by a widget inside
*/
-Ewl_Embed *ewl_embed_find_by_widget(Ewl_Widget * w)
+Ewl_Embed *ewl_embed_widget_find(Ewl_Widget * w)
{
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR_RET("w", w, NULL);
@@ -737,6 +778,7 @@
evas_object_color_set(emb->ev_clip, 0, 0, 0, 0);
evas_object_show(emb->ev_clip);
evas_object_repeat_events_set(emb->ev_clip, FALSE);
+ evas_object_focus_set(emb->ev_clip, emb->focus);
/*
* Catch mouse events processed through the evas
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_embed.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -3 -r1.27 -r1.28
--- ewl_embed.h 23 Aug 2004 01:29:37 -0000 1.27
+++ ewl_embed.h 23 Aug 2004 18:51:52 -0000 1.28
@@ -44,22 +44,27 @@
*/
struct Ewl_Embed
{
- Ewl_Overlay overlay; /**< Inherits from the Ewl_Overlay class */
+ Ewl_Overlay overlay; /**< Inherits from the Ewl_Overlay class */
- Evas *evas; /**< Evas where drawing takes place. */
+ Evas *evas; /**< Evas where drawing takes place. */
void *evas_window; /**< The window holding the evas. */
- Evas_Object *smart; /**< Object to manipulate Ewl_Embed from evas */
- Evas_Object *ev_clip; /**< Clip box to receive evas events */
- Ecore_List *tab_order; /**< Order of widgets to send focus on tab */
+ Evas_Object *smart; /**< Manipulate Ewl_Embed from evas */
+ Evas_Object *ev_clip; /**< Clip box to receive evas events */
+ Ecore_List *tab_order; /**< Order of widgets to send focus */
- int max_layer; /**< The maximum widget layer used */
+ int max_layer; /**< The maximum widget layer used */
+ int focus; /**< Indicates if it receives focus */
};
Ewl_Widget *ewl_embed_new(void);
int ewl_embed_init(Ewl_Embed * win);
Evas_Object *ewl_embed_evas_set(Ewl_Embed *emb, Evas *evas,
Ewl_Embed_Evas_Window *evas_window);
+
+void ewl_embed_focus_set(Ewl_Embed *embed, int f);
+int ewl_embed_focus_get(Ewl_Embed *embed);
+
int ewl_embed_max_layer_get(Ewl_Embed *embed);
void ewl_embed_max_layer_set(Ewl_Embed *embed, int layer);
void ewl_embed_key_down_feed(Ewl_Embed *embed, char *keyname,
@@ -76,9 +81,11 @@
unsigned int modifiers);
void ewl_embed_mouse_wheel_feed(Ewl_Embed *embed, int x, int y,
int z, int dir, unsigned int mods);
+
void ewl_embed_font_path_add(char *path);
-Ewl_Embed *ewl_embed_find_by_evas_window(Ewl_Embed_Evas_Window *win);
-Ewl_Embed *ewl_embed_find_by_widget(Ewl_Widget * w);
+Ewl_Embed *ewl_embed_evas_window_find(Ewl_Embed_Evas_Window *win);
+Ewl_Embed *ewl_embed_widget_find(Ewl_Widget * w);
+
void ewl_embed_tab_order_next(Ewl_Embed *e);
void ewl_embed_tab_order_remove(Ewl_Embed *e, Ewl_Widget *w);
void ewl_embed_tab_order_push(Ewl_Embed *e, Ewl_Widget *w);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_events.c,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -3 -r1.67 -r1.68
--- ewl_events.c 23 Aug 2004 01:29:37 -0000 1.67
+++ ewl_events.c 23 Aug 2004 18:51:52 -0000 1.68
@@ -149,7 +149,7 @@
ev = e;
- embed = ewl_embed_find_by_evas_window((void *)ev->win);
+ embed = ewl_embed_evas_window_find((void *)ev->win);
if (!embed)
DRETURN_INT(TRUE, DLEVEL_STABLE);
@@ -248,7 +248,7 @@
ev = e;
- embed = ewl_embed_find_by_evas_window((void *)ev->win);
+ embed = ewl_embed_evas_window_find((void *)ev->win);
if (!embed)
DRETURN_INT(TRUE, DLEVEL_STABLE);
@@ -291,7 +291,7 @@
ev = e;
- embed = ewl_embed_find_by_evas_window((void *)ev->win);
+ embed = ewl_embed_evas_window_find((void *)ev->win);
if (!embed)
DRETURN_INT(TRUE, DLEVEL_STABLE);
@@ -336,7 +336,7 @@
ev = e;
- embed = ewl_embed_find_by_evas_window((void *)ev->win);
+ embed = ewl_embed_evas_window_find((void *)ev->win);
if (!embed)
DRETURN_INT(TRUE, DLEVEL_STABLE);
@@ -371,7 +371,7 @@
ev = e;
- embed = ewl_embed_find_by_evas_window((void *)ev->win);
+ embed = ewl_embed_evas_window_find((void *)ev->win);
if (!embed)
DRETURN_INT(TRUE, DLEVEL_STABLE);
@@ -399,7 +399,7 @@
ev = e;
- embed = ewl_embed_find_by_evas_window((void *)ev->win);
+ embed = ewl_embed_evas_window_find((void *)ev->win);
if (!embed)
DRETURN_INT(TRUE, DLEVEL_STABLE);
@@ -424,7 +424,7 @@
DENTER_FUNCTION(DLEVEL_STABLE);
- embed = ewl_embed_find_by_evas_window((void *)ev->win);
+ embed = ewl_embed_evas_window_find((void *)ev->win);
if (!embed)
DRETURN_INT(TRUE, DLEVEL_STABLE);
@@ -449,7 +449,7 @@
DENTER_FUNCTION(DLEVEL_STABLE);
- embed = ewl_embed_find_by_evas_window((void *)ev->win);
+ embed = ewl_embed_evas_window_find((void *)ev->win);
if (!embed)
DRETURN_INT(TRUE, DLEVEL_STABLE);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_image.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -3 -r1.50 -r1.51
--- ewl_image.c 23 Aug 2004 00:58:04 -0000 1.50
+++ ewl_image.c 23 Aug 2004 18:51:52 -0000 1.51
@@ -104,7 +104,7 @@
w = EWL_WIDGET(i);
- emb = ewl_embed_find_by_widget(w);
+ emb = ewl_embed_widget_find(w);
IF_FREE(i->path);
IF_FREE(i->key);
@@ -256,7 +256,7 @@
i = EWL_IMAGE(w);
- emb = ewl_embed_find_by_widget(w);
+ emb = ewl_embed_widget_find(w);
/*
* Load the image based on the type.
@@ -343,7 +343,7 @@
if (!i->image)
return;
- emb = ewl_embed_find_by_widget(w);
+ emb = ewl_embed_widget_find(w);
ww = CURRENT_W(w);
hh = CURRENT_H(w);
@@ -405,7 +405,7 @@
DCHECK_PARAM_PTR("w", w);
i = EWL_IMAGE(w);
- emb = ewl_embed_find_by_widget(w);
+ emb = ewl_embed_widget_find(w);
ev = ev_data;
if (i->type == EWL_IMAGE_TYPE_EDJE)
@@ -424,7 +424,7 @@
DCHECK_PARAM_PTR("w", w);
i = EWL_IMAGE(w);
- emb = ewl_embed_find_by_widget(w);
+ emb = ewl_embed_widget_find(w);
ev = ev_data;
if (i->type == EWL_IMAGE_TYPE_EDJE)
@@ -443,7 +443,7 @@
DCHECK_PARAM_PTR("w", w);
i = EWL_IMAGE(w);
- emb = ewl_embed_find_by_widget(w);
+ emb = ewl_embed_widget_find(w);
ev = ev_data;
if (i->type == EWL_IMAGE_TYPE_EDJE)
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_imenu.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -3 -r1.24 -r1.25
--- ewl_imenu.c 23 Aug 2004 01:17:30 -0000 1.24
+++ ewl_imenu.c 23 Aug 2004 18:51:52 -0000 1.25
@@ -94,7 +94,7 @@
menu = EWL_IMENU(w);
if (!REALIZED(menu->base.popup)) {
- emb = ewl_embed_find_by_widget(w);
+ emb = ewl_embed_widget_find(w);
ewl_container_child_append(EWL_CONTAINER(emb),
menu->base.popup);
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_media.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- ewl_media.c 13 Aug 2004 00:41:13 -0000 1.12
+++ ewl_media.c 23 Aug 2004 18:51:52 -0000 1.13
@@ -313,7 +313,7 @@
/*
* Find the embed so we know which evas to draw onto.
*/
- emb = ewl_embed_find_by_widget(w);
+ emb = ewl_embed_widget_find(w);
/*
* Create the emotion
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_menu.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -3 -r1.23 -r1.24
--- ewl_menu.c 19 Aug 2004 20:03:32 -0000 1.23
+++ ewl_menu.c 23 Aug 2004 18:51:52 -0000 1.24
@@ -72,7 +72,7 @@
DENTER_FUNCTION(DLEVEL_STABLE);
- emb = ewl_embed_find_by_widget(w);
+ emb = ewl_embed_widget_find(w);
if (ewl_widget_type_is(EWL_WIDGET(emb), "window"))
ewl_window_position_get(EWL_WINDOW(emb), &x, &y);
@@ -106,7 +106,7 @@
menu = EWL_MENU(w);
if (!REALIZED(menu->base.popup)) {
- emb = ewl_embed_find_by_widget(w);
+ emb = ewl_embed_widget_find(w);
ewl_container_child_append(EWL_CONTAINER(emb),
menu->base.popup);
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_misc.c,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -3 -r1.79 -r1.80
--- ewl_misc.c 23 Aug 2004 00:42:12 -0000 1.79
+++ ewl_misc.c 23 Aug 2004 18:51:52 -0000 1.80
@@ -394,7 +394,7 @@
if (ewl_object_queued_has(EWL_OBJECT(w), EWL_FLAG_QUEUED_DSCHEDULED))
DRETURN(DLEVEL_STABLE);
- emb = ewl_embed_find_by_widget(w);
+ emb = ewl_embed_widget_find(w);
if (!emb)
DRETURN(DLEVEL_STABLE);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_selectionbar.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -3 -r1.23 -r1.24
--- ewl_selectionbar.c 18 Aug 2004 03:15:20 -0000 1.23
+++ ewl_selectionbar.c 23 Aug 2004 18:51:52 -0000 1.24
@@ -73,7 +73,7 @@
ewl_selectionbar_focus_in_cb, w);
- embed = ewl_embed_find_by_widget(parent);
+ embed = ewl_embed_widget_find(parent);
ewl_callback_append(EWL_WIDGET(embed), EWL_CALLBACK_CONFIGURE,
ewl_selectionbar_parent_configure_cb, w);
@@ -302,7 +302,7 @@
* First check that the mouse left the selectionbar and that
* focus didn't just go to one of it's children
*/
- embed = ewl_embed_find_by_widget(w);
+ embed = ewl_embed_widget_find(w);
/*
* FIXME: This is not in ecore yet.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_text.c,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -3 -r1.77 -r1.78
--- ewl_text.c 18 Aug 2004 03:04:32 -0000 1.77
+++ ewl_text.c 23 Aug 2004 18:51:52 -0000 1.78
@@ -535,7 +535,7 @@
/*
* Find the embed so we know which evas to draw onto.
*/
- emb = ewl_embed_find_by_widget(w);
+ emb = ewl_embed_widget_find(w);
/*
* Create the etox
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_widget.c,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -3 -r1.121 -r1.122
--- ewl_widget.c 23 Aug 2004 01:29:38 -0000 1.121
+++ ewl_widget.c 23 Aug 2004 18:51:53 -0000 1.122
@@ -696,7 +696,7 @@
DCHECK_PARAM_PTR("w", w);
DENTER_FUNCTION(DLEVEL_STABLE);
- e = ewl_embed_find_by_widget(w);
+ e = ewl_embed_widget_find(w);
ewl_embed_tab_order_push(EWL_EMBED(e), w);
DLEAVE_FUNCTION(DLEVEL_STABLE);
@@ -828,7 +828,7 @@
if (val) {
Ewl_Embed *emb;
- emb = ewl_embed_find_by_widget(w);
+ emb = ewl_embed_widget_find(w);
if (!emb || !emb->evas)
DRETURN(DLEVEL_STABLE);
@@ -1002,7 +1002,7 @@
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("w", w);
- emb = ewl_embed_find_by_widget(w);
+ emb = ewl_embed_widget_find(w);
/*
* Create the fx clip box where special fx can be drawn to affect the
@@ -1061,7 +1061,7 @@
group = ewl_theme_data_str_get(w, "group");
if (group) {
- emb = ewl_embed_find_by_widget(w);
+ emb = ewl_embed_widget_find(w);
if (!emb)
DRETURN(DLEVEL_STABLE);
@@ -1150,7 +1150,7 @@
/*
* First find it's parent embed so we can destroy the evas objects.
*/
- emb = ewl_embed_find_by_widget(w);
+ emb = ewl_embed_widget_find(w);
/*
* Destroy the clip box used for fx.
@@ -1181,7 +1181,7 @@
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("w", w);
- emb = ewl_embed_find_by_widget(w);
+ emb = ewl_embed_widget_find(w);
/*
* Adjust the clip box to display the widget.
@@ -1236,7 +1236,7 @@
else if (w->theme_object)
oevas = evas_object_evas_get(w->theme_object);
- emb = ewl_embed_find_by_widget(w);
+ emb = ewl_embed_widget_find(w);
if (!emb || oevas != emb->evas)
ewl_widget_unrealize(w);
else {
-------------------------------------------------------
SF.Net email is sponsored by Shop4tech.com-Lowest price on Blank Media
100pk Sonic DVD-R 4x for only $29 -100pk Sonic DVD+R for only $33
Save 50% off Retail on Ink & Toner - Free Shipping and Free Gift.
http://www.shop4tech.com/z/Inkjet_Cartridges/9_108_r285
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
