Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : libs/ewl

Dir     : e17/libs/ewl/src/lib


Modified Files:
        ewl_attach.c ewl_combo.c ewl_container.c ewl_datepicker.c 
        ewl_embed.c ewl_embed.h ewl_iconbox.c ewl_image.c ewl_imenu.c 
        ewl_media.c ewl_progressbar.c ewl_spectrum.c ewl_text.c 
        ewl_widget.c ewl_widget.h ewl_window.c 


Log Message:
- patch from pfritz to update the ewl layering system. this makes ewl work a
  lot better when embedded.

===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_attach.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -3 -r1.28 -r1.29
--- ewl_attach.c        8 May 2006 04:33:46 -0000       1.28
+++ ewl_attach.c        21 May 2006 03:51:41 -0000      1.29
@@ -705,7 +705,7 @@
                                                ewl_attach_tooltip->win);
                ewl_container_redirect_set(EWL_CONTAINER(emb), redir);
 
-               ewl_widget_layer_set(ewl_attach_tooltip->win, 1000);
+               ewl_widget_layer_top_set(ewl_attach_tooltip->win, TRUE);
 
                ewl_callback_prepend(ewl_attach_tooltip->win, 
                                        EWL_CALLBACK_DESTROY,
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_combo.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -3 -r1.25 -r1.26
--- ewl_combo.c 21 May 2006 00:10:36 -0000      1.25
+++ ewl_combo.c 21 May 2006 03:51:41 -0000      1.26
@@ -64,7 +64,7 @@
        ewl_floater_follow_set(EWL_FLOATER(combo->popup->popup),
                                                EWL_WIDGET(combo));
        ewl_widget_internal_set(combo->popup->popup, TRUE);
-       ewl_widget_layer_set(combo->popup->popup, 1000);
+       ewl_widget_layer_top_set(combo->popup->popup, TRUE);
        ewl_widget_appearance_set(combo->popup->popup, EWL_IMENU_TYPE);
        ewl_box_orientation_set(EWL_BOX(combo->popup->popup),
                                                EWL_ORIENTATION_VERTICAL);
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_container.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -3 -r1.39 -r1.40
--- ewl_container.c     20 Apr 2006 04:09:51 -0000      1.39
+++ ewl_container.c     21 May 2006 03:51:41 -0000      1.40
@@ -698,10 +698,15 @@
                    && (CURRENT_X(child) + CURRENT_W(child) +
                            INSET_RIGHT(child)) >= x
                    && (CURRENT_Y(child) + CURRENT_H(child) +
-                           INSET_BOTTOM(child)) >= y)
-                       if ((!found || LAYER(found) <= LAYER(child)) 
+                           INSET_BOTTOM(child)) >= y) {
+                       if (child->toplayered && VISIBLE(child)) {
+                               found = child;
+                               break;
+                       }
+                       if ((!found || LAYER(found) <= LAYER(child))
                                        && VISIBLE(child))
                                found = child;
+               }
        }
 
        DRETURN_PTR(found, DLEVEL_STABLE);
@@ -1244,10 +1249,6 @@
        if (!EWL_CONTAINER(w)->children)
                DRETURN(DLEVEL_STABLE);
 
-       if (REALIZED(w) && w->fx_clip_box)
-               evas_object_layer_set(EWL_CONTAINER(w)->clip_box,
-                               evas_object_layer_get(w->fx_clip_box));
-
        /*
         * Reparent all of the containers children
         */
@@ -1323,12 +1324,12 @@
         * Setup the remaining properties for the clip box.
         */
        if (c->clip_box) {
-                evas_object_pass_events_set(c->clip_box, TRUE);
+               evas_object_pass_events_set(c->clip_box, TRUE);
+               evas_object_smart_member_add(c->clip_box, w->smart_object);
 
                if (w->fx_clip_box) {
                        evas_object_clip_set(c->clip_box, w->fx_clip_box);
-                       evas_object_layer_set(c->clip_box,
-                                       evas_object_layer_get(w->fx_clip_box));
+                       evas_object_stack_below(c->clip_box, w->fx_clip_box);
                }
 
                evas_object_color_set(c->clip_box, 255, 255, 255, 255);
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_datepicker.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- ewl_datepicker.c    12 Apr 2006 06:41:55 -0000      1.11
+++ ewl_datepicker.c    21 May 2006 03:51:41 -0000      1.12
@@ -55,8 +55,8 @@
        ewl_object_custom_size_set(EWL_OBJECT(dp->calendar_window), 159, 170);
        ewl_object_fill_policy_set(EWL_OBJECT(dp->calendar_window), 
                                                EWL_FLAG_FILL_FILL);
-        ewl_widget_layer_set(dp->calendar_window, 1000);
-        ewl_window_borderless_set(EWL_WINDOW(dp->calendar_window));
+       ewl_widget_layer_top_set(dp->calendar_window, TRUE);
+       ewl_window_borderless_set(EWL_WINDOW(dp->calendar_window));
 
        dp->calendar = ewl_calendar_new();
        ewl_container_child_append(EWL_CONTAINER(dp->calendar_window), 
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_embed.c,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -3 -r1.56 -r1.57
--- ewl_embed.c 20 Apr 2006 04:09:51 -0000      1.56
+++ ewl_embed.c 21 May 2006 03:51:41 -0000      1.57
@@ -9,10 +9,6 @@
 
 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(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);
 static void ewl_embed_smart_move_cb(Evas_Object *obj, Evas_Coord x,
                                    Evas_Coord y);
 static void ewl_embed_smart_resize_cb(Evas_Object *obj, Evas_Coord w,
@@ -108,8 +104,6 @@
        ewl_callback_prepend(EWL_WIDGET(w), EWL_CALLBACK_FOCUS_OUT,
                             ewl_embed_focus_out_cb, NULL);
 
-       w->max_layer = LAYER(w) = -1000;
-
        ecore_list_append(ewl_embed_list, w);
 
        w->tab_order = ecore_dlist_new();
@@ -161,15 +155,15 @@
        emb->evas_window = evas_window;
 
        if (!embedded_smart) {
-               embedded_smart = evas_smart_new(name, ewl_embed_smart_add_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,
-                       ewl_embed_smart_layer_adjust_rel_cb,
+               embedded_smart = evas_smart_new(name,
+                       ewl_embed_smart_add_cb,
+                       ewl_embed_smart_del_cb,
+                       NULL, NULL, NULL, NULL, NULL,
                        ewl_embed_smart_move_cb,
-                       ewl_embed_smart_resize_cb, ewl_embed_smart_show_cb,
-                       ewl_embed_smart_hide_cb, ewl_embed_smart_color_set_cb,
+                       ewl_embed_smart_resize_cb,
+                       ewl_embed_smart_show_cb,
+                       ewl_embed_smart_hide_cb,
+                       ewl_embed_smart_color_set_cb,
                        ewl_embed_smart_clip_set_cb,
                        ewl_embed_smart_clip_unset_cb, NULL);
        }
@@ -180,9 +174,6 @@
        }
 
        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);
@@ -213,8 +204,8 @@
        DCHECK_TYPE("embed", embed, EWL_EMBED_TYPE);
 
        embed->focus = f;
-       if (embed->ev_clip)
-               evas_object_focus_set(embed->ev_clip, f);
+       if (embed->smart)
+               evas_object_focus_set(embed->smart, f);
 
        DLEAVE_FUNCTION(DLEVEL_STABLE);
 }
@@ -310,46 +301,6 @@
 }
 
 /**
- * @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;
-
-       DENTER_FUNCTION(DLEVEL_STABLE);
-       DCHECK_PARAM_PTR_RET("embed", embed, 0);
-       DCHECK_TYPE_RET("embed", embed, EWL_EMBED_TYPE, 0);
-
-       layer = embed->max_layer;
-
-       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)
-{
-       DENTER_FUNCTION(DLEVEL_STABLE);
-       DCHECK_PARAM_PTR("embed", embed);
-       DCHECK_TYPE("embed", embed, EWL_EMBED_TYPE);
-
-       if (REALIZED(embed))
-               evas_object_layer_set(embed->ev_clip, layer);
-       embed->max_layer = layer;
-
-       DLEAVE_FUNCTION(DLEVEL_STABLE);
-}
-
-/**
  * @param embed: the embed where the key event is to occur
  * @param keyname: the key press to trigger
  * @param mods: the mask of key modifiers currently pressed
@@ -883,6 +834,8 @@
        ev.y = y;
 
        while (embed->last.mouse_in) {
+               ewl_object_state_remove(EWL_OBJECT(embed->last.mouse_in), 
+                                       EWL_FLAG_STATE_MOUSE_IN);
                ewl_callback_call_with_event_data(embed->last.mouse_in,
                                                  EWL_CALLBACK_MOUSE_OUT, &ev);
                embed->last.mouse_in = embed->last.mouse_in->parent;
@@ -1026,6 +979,7 @@
        /* Sanitize the color of this evas pre-cache */
        evas_object_color_set(obj, 255, 255, 255, 255);
 
+       evas_object_smart_member_del(obj);
        evas_object_clip_unset(obj);
        evas_object_hide(obj);
 
@@ -1562,50 +1516,50 @@
        emb = EWL_EMBED(w);
 
        evas_event_freeze(emb->evas);
-       emb->ev_clip = evas_object_rectangle_add(emb->evas);
 
-       if (w->fx_clip_box)
-               evas_object_clip_set(emb->smart, w->fx_clip_box);
-
-       if (emb->ev_clip) {
+       if (!emb->ev_clip) {
                /*
-               if (w->fx_clip_box)
-                       evas_object_clip_set(w->fx_clip_box, emb->ev_clip);
-                       */
+                * first try to get the ev_clip from the cach
+                */
+               emb->ev_clip = ewl_embed_object_request(emb, "rectangle");
+               if (!emb->ev_clip)
+                       emb->ev_clip = evas_object_rectangle_add(emb->evas);
                evas_object_color_set(emb->ev_clip, 0, 0, 0, 0);
+               evas_object_smart_member_add(emb->ev_clip, emb->smart);
                evas_object_show(emb->ev_clip);
-               evas_object_repeat_events_set(emb->ev_clip, FALSE);
-               evas_object_focus_set(emb->ev_clip, emb->focus);
+       }
 
+       if (emb->smart) {
+               evas_object_focus_set(emb->smart, emb->focus);
                /*
                 * Catch mouse events processed through the evas
                 */
-               evas_object_event_callback_add(emb->ev_clip,
+               evas_object_event_callback_add(emb->smart,
                                EVAS_CALLBACK_MOUSE_IN,
                                ewl_embed_evas_mouse_in_cb, emb);
-               evas_object_event_callback_add(emb->ev_clip,
+               evas_object_event_callback_add(emb->smart,
                                EVAS_CALLBACK_MOUSE_OUT,
                                ewl_embed_evas_mouse_out_cb, emb);
-               evas_object_event_callback_add(emb->ev_clip,
+               evas_object_event_callback_add(emb->smart,
                                EVAS_CALLBACK_MOUSE_DOWN,
                                ewl_embed_evas_mouse_down_cb, emb);
-               evas_object_event_callback_add(emb->ev_clip,
+               evas_object_event_callback_add(emb->smart,
                                EVAS_CALLBACK_MOUSE_UP,
                                ewl_embed_evas_mouse_up_cb, emb);
-               evas_object_event_callback_add(emb->ev_clip,
+               evas_object_event_callback_add(emb->smart,
                                EVAS_CALLBACK_MOUSE_MOVE,
                                ewl_embed_evas_mouse_move_cb, emb);
-               evas_object_event_callback_add(emb->ev_clip,
+               evas_object_event_callback_add(emb->smart,
                                EVAS_CALLBACK_MOUSE_WHEEL,
                                ewl_embed_evas_mouse_wheel_cb, emb);
 
                /*
                 * Catch key events processed through the evas
                 */
-               evas_object_event_callback_add(emb->ev_clip,
+               evas_object_event_callback_add(emb->smart,
                                EVAS_CALLBACK_KEY_DOWN,
                                ewl_embed_evas_key_down_cb, emb);
-               evas_object_event_callback_add(emb->ev_clip,
+               evas_object_event_callback_add(emb->smart,
                                EVAS_CALLBACK_KEY_UP, ewl_embed_evas_key_up_cb,
                                emb);
        }
@@ -1617,14 +1571,22 @@
 ewl_embed_unrealize_cb(Ewl_Widget *w, void *ev_data __UNUSED__, 
                                        void *user_data __UNUSED__)
 {
+       Ewl_Embed *emb;
+       
        DENTER_FUNCTION(DLEVEL_STABLE);
        DCHECK_PARAM_PTR("w", w);
        DCHECK_TYPE("w", w, EWL_WIDGET_TYPE);
 
-       if (EWL_EMBED(w)->smart) {
-               evas_object_smart_data_set(EWL_EMBED(w)->smart, NULL);
-               ewl_evas_object_destroy(EWL_EMBED(w)->smart);
-               EWL_EMBED(w)->smart = NULL;
+       emb = EWL_EMBED(w);
+       
+       if (emb->ev_clip) {
+               ewl_evas_object_destroy(emb->ev_clip);
+               emb->ev_clip = NULL;
+       }
+       if (emb->smart) {
+               evas_object_smart_data_set(emb->smart, NULL);
+               ewl_evas_object_destroy(emb->smart);
+               emb->smart = NULL;
        }
 
        DLEAVE_FUNCTION(DLEVEL_STABLE);
@@ -1751,54 +1713,6 @@
 }
 
 static void
-ewl_embed_smart_layer_set_cb(void *data __UNUSED__, Evas_Object *obj, int l)
-{
-       Ewl_Embed *emb;
-
-       DENTER_FUNCTION(DLEVEL_STABLE);
-
-       emb = evas_object_smart_data_get(obj);
-       if (emb)
-               ewl_widget_layer_set(EWL_WIDGET(emb), l);
-
-       DLEAVE_FUNCTION(DLEVEL_STABLE);
-}
-
-static void
-ewl_embed_smart_layer_adjust_cb(Evas_Object *obj)
-{
-       int l;
-       Ewl_Embed *emb;
-
-       DENTER_FUNCTION(DLEVEL_STABLE);
-
-       l = evas_object_layer_get(obj);
-       emb = evas_object_smart_data_get(obj);
-       if (emb)
-               ewl_widget_layer_set(EWL_WIDGET(emb), l);
-
-       DLEAVE_FUNCTION(DLEVEL_STABLE);
-}
-
-static void
-ewl_embed_smart_layer_adjust_rel_cb(Evas_Object *obj, 
-                                       Evas_Object *rel __UNUSED__)
-{
-       int l;
-       Ewl_Embed *emb;
-
-       DENTER_FUNCTION(DLEVEL_STABLE);
-
-       emb = evas_object_smart_data_get(obj);
-       if (emb) {
-               l = evas_object_layer_get(obj);
-               ewl_widget_layer_set(EWL_WIDGET(emb), l);
-       }
-
-       DLEAVE_FUNCTION(DLEVEL_STABLE);
-}
-
-static void
 ewl_embed_smart_move_cb(Evas_Object *obj, Evas_Coord x, Evas_Coord y)
 {
        Ewl_Embed *emb;
@@ -1925,8 +1839,15 @@
        DENTER_FUNCTION(DLEVEL_STABLE);
 
        embed = data;
-       ewl_embed_mouse_out_feed(embed, ev->canvas.x, ev->canvas.y,
-                                ewl_ev_modifiers_get());
+
+       if (ev->canvas.x < CURRENT_X(embed) 
+               || ev->canvas.x >= CURRENT_X(embed) + CURRENT_W(embed)
+               || ev->canvas.y < CURRENT_Y(embed)
+               || ev->canvas.y >= CURRENT_Y(embed) + CURRENT_H(embed))
+       {
+               ewl_embed_mouse_out_feed(embed, ev->canvas.x, ev->canvas.y,
+                                        ewl_ev_modifiers_get());
+       }
 
        DLEAVE_FUNCTION(DLEVEL_STABLE);
 }
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_embed.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- ewl_embed.h 12 Apr 2006 06:41:55 -0000      1.17
+++ ewl_embed.h 21 May 2006 03:51:41 -0000      1.18
@@ -60,7 +60,6 @@
 
        Ecore_Hash     *obj_cache;  /**< Hash of object queues for reuse */
 
-       int             max_layer;   /**< The maximum widget layer used */
        int             focus;       /**< Indicates if it receives focus */
 
        struct
@@ -88,8 +87,6 @@
 void           ewl_embed_active_set(Ewl_Embed *embed, unsigned int act);
 Ewl_Embed      *ewl_embed_active_embed_get(void);
 
-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,
                                        unsigned int modifiers);
 void            ewl_embed_key_up_feed(Ewl_Embed *embed, char *keyname,
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_iconbox.c,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -3 -r1.114 -r1.115
--- ewl_iconbox.c       13 Apr 2006 21:04:14 -0000      1.114
+++ ewl_iconbox.c       21 May 2006 03:51:41 -0000      1.115
@@ -4,10 +4,6 @@
 #include "ewl_private.h"
 
 #define ICON_LABEL_INITIAL 20
-#define ICONBOX_SELECT_LAYER 600
-#define ICONBOX_ICON_LAYER 500
-#define ICONBOX_BACKGROUND_LAYER 500
-#define ICONBOX_ENTRY_LAYER 1000
 #define ICONBOX_REPEAT 10000
 
 static void ewl_iconbox_icon_select(Ewl_Iconbox_Icon *ib, int loc, int 
deselect);
@@ -263,6 +259,7 @@
        ib->ewl_iconbox_menu_floater = ewl_floater_new();
        ewl_floater_follow_set(EWL_FLOATER(ib->ewl_iconbox_menu_floater),
                               ib->ewl_iconbox_pane_inner);
+       ewl_widget_layer_priority_set(ib->ewl_iconbox_menu_floater, -1);
 
        /*-------------------------------------------*/
        /* Get the context menu ready */
@@ -298,6 +295,7 @@
        ib->icon_menu_floater = ewl_floater_new();
        ewl_floater_follow_set(EWL_FLOATER(ib->icon_menu_floater),
                               ib->ewl_iconbox_pane_inner);
+       ewl_widget_layer_priority_set(ib->icon_menu_floater, -1);
        
        ib->icon_menu = ewl_menu_new();
        ewl_button_label_set(EWL_BUTTON(ib->icon_menu), " ");
@@ -338,7 +336,7 @@
        ewl_container_child_append(EWL_CONTAINER(ib->ewl_iconbox_pane_inner), 
ib->select_floater);
        
        ewl_object_custom_size_set(EWL_OBJECT(ib->select), 1, 1);
-       ewl_widget_layer_set(EWL_WIDGET(ib->select_floater), 
ICONBOX_SELECT_LAYER);
+       ewl_widget_layer_top_set(EWL_WIDGET(ib->select_floater), TRUE);
        ewl_widget_color_set(EWL_WIDGET(ib->select), 255, 255, 25, 50);
        ib->drag_box = 0;
 
@@ -369,6 +367,7 @@
        ib->entry_floater = ewl_floater_new();
        ewl_floater_follow_set(EWL_FLOATER(ib->entry_floater),
                                ib->ewl_iconbox_pane_inner);
+       ewl_widget_layer_top_set(ib->entry_floater, TRUE);
        ib->entry_box = ewl_hbox_new();
        ewl_widget_show(ib->entry_box);
        ewl_container_child_append(EWL_CONTAINER(ib->entry_floater), 
ib->entry_box);
@@ -554,6 +553,7 @@
        ewl_image_file_set(EWL_IMAGE(ib->background), file, 0);
        ewl_container_child_append(EWL_CONTAINER(ib->ewl_iconbox_pane_inner), 
                                                        ib->background);
+       ewl_widget_layer_priority_set(ib->background, -1);
 
        if (EWL_WIDGET(ib)->parent) {
                int width, height, sw, sh;
@@ -573,8 +573,7 @@
        }
        
        ewl_widget_show(ib->background);
-       ewl_widget_layer_set(EWL_WIDGET(ib->background), 
ICONBOX_BACKGROUND_LAYER);
-       
+
        ewl_widget_configure(EWL_WIDGET(ib));
 
        DLEAVE_FUNCTION(DLEVEL_STABLE);
@@ -845,7 +844,6 @@
                
                ewl_widget_show(EWL_WIDGET(ib->icon_box_parent->entry_floater));
                
ewl_floater_position_set(EWL_FLOATER(ib->icon_box_parent->entry_floater), 
x,y+ih);
-               
ewl_widget_layer_set(EWL_WIDGET(ib->icon_box_parent->entry_floater), 
ICONBOX_ENTRY_LAYER);
                ewl_widget_focus_send(EWL_WIDGET(ib->icon_box_parent->entry));
 
                /* Record which icon's label we are editing */
@@ -1033,7 +1031,6 @@
        /* Add this icon to the icon list */
        ecore_list_append(iconbox->ewl_iconbox_icon_list, ib);
 
-       ewl_widget_layer_set(EWL_WIDGET(ib), ICONBOX_ICON_LAYER);
        ewl_widget_draggable_set(EWL_WIDGET(ib), 1, ewl_iconbox_drag_data_get);
 
        DRETURN_PTR(EWL_ICONBOX_ICON(ib), DLEVEL_STABLE);
@@ -1555,8 +1552,6 @@
                                CURRENT_X(parent), CURRENT_Y(parent));
                ewl_object_custom_size_set(EWL_OBJECT(ib->background), width-sw,
                                height-sh);
-
-               ewl_widget_layer_set(EWL_WIDGET(ib->background), 
ICONBOX_BACKGROUND_LAYER);
        }
 
        DLEAVE_FUNCTION(DLEVEL_STABLE);
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_image.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -3 -r1.39 -r1.40
--- ewl_image.c 20 Apr 2006 02:58:01 -0000      1.39
+++ ewl_image.c 21 May 2006 03:51:41 -0000      1.40
@@ -660,9 +660,10 @@
                evas_object_image_size_get(i->image, &i->ow, &i->oh);
        }
 
+       evas_object_smart_member_add(i->image, w->smart_object);
+       if (w->fx_clip_box)
+               evas_object_stack_below(i->image, w->fx_clip_box);
 
-
-       evas_object_layer_set(i->image, ewl_widget_layer_sum_get(w));
        if (w->fx_clip_box)
                evas_object_clip_set(i->image, w->fx_clip_box);
 
@@ -764,8 +765,6 @@
        i = EWL_IMAGE(w);
        if (!i->image)
                DRETURN(DLEVEL_STABLE);
-
-       evas_object_layer_set(i->image, ewl_widget_layer_sum_get(w));
 
        DLEAVE_FUNCTION(DLEVEL_STABLE);
 }
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_imenu.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- ewl_imenu.c 12 Jan 2006 18:21:18 -0000      1.9
+++ ewl_imenu.c 21 May 2006 03:51:41 -0000      1.10
@@ -56,7 +56,7 @@
        menu->base.popup = ewl_floater_new();
        ewl_floater_follow_set(EWL_FLOATER(menu->base.popup), EWL_WIDGET(menu));
        ewl_widget_internal_set(menu->base.popup, TRUE);
-       ewl_widget_layer_set(menu->base.popup, 1000);
+       ewl_widget_layer_top_set(menu->base.popup, TRUE);
        ewl_widget_appearance_set(EWL_WIDGET(menu->base.popup), EWL_IMENU_TYPE);
        ewl_box_orientation_set(EWL_BOX(menu->base.popup),
                                EWL_ORIENTATION_VERTICAL);
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_media.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- ewl_media.c 20 Apr 2006 04:09:51 -0000      1.17
+++ ewl_media.c 21 May 2006 03:51:41 -0000      1.18
@@ -489,8 +489,11 @@
        }
 #endif
 
-       if (w->fx_clip_box)
+       evas_object_smart_member_add(m->video, w->smart_object);
+       if (w->fx_clip_box) {
                evas_object_clip_set(m->video, w->fx_clip_box);
+               evas_object_stack_below(m->video, w->fx_clip_box);
+       }
 
        /*
         * Now set the media and display it.
@@ -536,7 +539,6 @@
        if (m->video) {
                evas_object_move(m->video, CURRENT_X(w), CURRENT_Y(w));
                evas_object_resize(m->video, CURRENT_W(w), CURRENT_H(w));
-               evas_object_layer_set(m->video, ewl_widget_layer_sum_get(w));
                evas_object_smart_callback_add(m->video, "frame_decode",
                                ewl_media_update_timer_cb, m);
        }
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_progressbar.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- ewl_progressbar.c   12 Jan 2006 18:21:19 -0000      1.7
+++ ewl_progressbar.c   21 May 2006 03:51:41 -0000      1.8
@@ -4,7 +4,6 @@
 #include "ewl_private.h"
 
 static void ewl_progressbar_child_handle(Ewl_Container *c, Ewl_Widget *w);
-#define EWL_PROGRESSBAR_TEXT_LAYER 100
 
 /**
  * @return Returns NULL on failure, or a pointer to the new progressbar on 
success.
@@ -71,7 +70,6 @@
        ewl_object_alignment_set(EWL_OBJECT(p->label), EWL_FLAG_ALIGN_CENTER);
        ewl_container_child_append(EWL_CONTAINER(p), p->label);
        ewl_widget_show(p->label);
-       ewl_widget_layer_set(p->label, EWL_PROGRESSBAR_TEXT_LAYER);
 
        p->value = 0.0;
        p->range = 100.0;
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_spectrum.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- ewl_spectrum.c      10 Apr 2006 16:01:06 -0000      1.22
+++ ewl_spectrum.c      21 May 2006 03:51:41 -0000      1.23
@@ -97,6 +97,7 @@
 
        sp->type = EWL_SPECTRUM_TYPE_SQUARE;
 
+       /* create the canvas */
        sp->canvas = ewl_image_new();
        ewl_container_child_append(EWL_CONTAINER(sp), sp->canvas);
        ewl_object_fill_policy_set(EWL_OBJECT(sp->canvas), EWL_FLAG_FILL_FILL);
@@ -107,10 +108,12 @@
        sp->cross_hairs.horizontal = ewl_hseparator_new();
        ewl_container_child_append(EWL_CONTAINER(sp), 
sp->cross_hairs.horizontal);
        ewl_widget_internal_set(sp->cross_hairs.horizontal, TRUE);
+       ewl_widget_layer_priority_set(sp->cross_hairs.horizontal, 1);
 
        sp->cross_hairs.vertical = ewl_vseparator_new();
        ewl_container_child_append(EWL_CONTAINER(sp), sp->cross_hairs.vertical);
        ewl_widget_internal_set(sp->cross_hairs.vertical, TRUE);
+       ewl_widget_layer_priority_set(sp->cross_hairs.vertical, 1);
 
        ewl_callback_append(EWL_WIDGET(sp), EWL_CALLBACK_CONFIGURE, 
                        ewl_spectrum_cb_configure, NULL);
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_text.c,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -3 -r1.99 -r1.100
--- ewl_text.c  20 May 2006 18:59:45 -0000      1.99
+++ ewl_text.c  21 May 2006 03:51:41 -0000      1.100
@@ -2625,7 +2625,10 @@
 
                evas_object_pass_events_set(t->textblock, 1);
 
-               evas_object_layer_set(t->textblock, 
ewl_widget_layer_sum_get(w));
+               evas_object_smart_member_add(t->textblock, w->smart_object);
+               if (w->fx_clip_box)
+                       evas_object_stack_below(t->textblock, w->fx_clip_box);
+
                ewl_text_display(t);
                evas_object_show(t->textblock);
        }
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_widget.c,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -3 -r1.75 -r1.76
--- ewl_widget.c        8 May 2006 18:31:51 -0000       1.75
+++ ewl_widget.c        21 May 2006 03:51:41 -0000      1.76
@@ -6,6 +6,7 @@
 static Ecore_Hash *ewl_widget_name_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,
                                                int *t, int *b);
@@ -13,6 +14,10 @@
                                                int *t, int *b);
 static void ewl_widget_appearance_part_text_apply(Ewl_Widget * w,
                                                  const char *part, char *text);
+static void ewl_widget_layer_stack_add(Ewl_Widget *w);
+static void ewl_widget_layer_update(Ewl_Widget *w);
+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_drag_move_cb(Ewl_Widget *w, void *ev_data, void 
*user_data);
 static void ewl_widget_drag_up_cb(Ewl_Widget *w, void *ev_data, void 
*user_data);
@@ -72,7 +77,6 @@
                DRETURN_INT(FALSE, DLEVEL_STABLE);
 
        ewl_object_state_remove(EWL_OBJECT(w), EWL_FLAGS_STATE_MASK);
-       LAYER(w) = 10;
 
        /*
         * Add the common callbacks that all widgets must perform
@@ -1034,29 +1038,20 @@
  * @brief Set the relative layer to it's parent
  *
  * Changes the current layer of @a w relative to it's parent. The default
- * value is 5.
+ * value is 0.
  */
 void
-ewl_widget_layer_set(Ewl_Widget *w, int layer)
+ewl_widget_layer_priority_set(Ewl_Widget *w, int layer)
 {
        DENTER_FUNCTION(DLEVEL_STABLE);
        DCHECK_PARAM_PTR("w", w);
        DCHECK_TYPE("w", w, EWL_WIDGET_TYPE);
 
-       /*
-        * Modify the current layer of the objects if realized.
-        */
-       if (REALIZED(w) && w->fx_clip_box) {
-               int temp;
-
-               temp = evas_object_layer_get(w->fx_clip_box) + layer - LAYER(w);
-               evas_object_layer_set(w->fx_clip_box, temp);
-               if (w->theme_object)
-                       evas_object_layer_set(w->theme_object, temp);
-       }
-
        LAYER(w) = layer;
 
+       if (REALIZED(w))
+               ewl_widget_layer_update(w);
+
        DLEAVE_FUNCTION(DLEVEL_STABLE);
 }
 
@@ -1066,7 +1061,7 @@
  * @brief Retrieve a widgets layer relative to it's parent.
  */
 int
-ewl_widget_layer_get(Ewl_Widget *w)
+ewl_widget_layer_priority_get(Ewl_Widget *w)
 {
        DENTER_FUNCTION(DLEVEL_STABLE);
        DCHECK_PARAM_PTR_RET("w", w, 0);
@@ -1076,25 +1071,47 @@
 }
 
 /**
- * @param w: the widget to retrieve sum of layers
- * @return Returns the absolute layer the widget is placed on.
- * @brief Sums the layers of a widgets parents to determine it's absolute 
layer.
+ * @param w:  the widget to set the top value
+ * @param top: TRUE or FALSE
+ * @return Returns no value.
+ * @brief set the widget to be layered above all other widgets
+ *
+ * This  set the widget to be layered above all other widgets.
  */
-int
-ewl_widget_layer_sum_get(Ewl_Widget *w)
+void
+ewl_widget_layer_top_set(Ewl_Widget *w, int top)
 {
-       int sum = 0;
-
        DENTER_FUNCTION(DLEVEL_STABLE);
-       DCHECK_PARAM_PTR_RET("w", w, 0);
-       DCHECK_TYPE_RET("w", w, EWL_WIDGET_TYPE, 0);
-
-       while (w) {
-               sum += LAYER(w);
-               w = w->parent;
+       DCHECK_PARAM_PTR("w", w);
+       DCHECK_TYPE("w", w, EWL_WIDGET_TYPE);
+       
+       if (w->toplayered == top)
+               DRETURN(DLEVEL_STABLE);
+       
+       w->toplayered = top;
+       
+       if (REALIZED(w)) {
+               ewl_widget_layer_stack_add(w);
+               ewl_widget_layer_update(w);
        }
+       
+       DLEAVE_FUNCTION(DLEVEL_STABLE);
+}
 
-       DRETURN_INT(sum, DLEVEL_STABLE);
+/**
+ * @param w:  the widget to get the top value
+ * @return Returns TRUE or FALSE
+ * @brief Returns if the widget will be drawn above all the others
+ *
+ */
+int
+ewl_widget_layer_top_get(Ewl_Widget *w)
+{
+       DENTER_FUNCTION(DLEVEL_STABLE);
+       DCHECK_PARAM_PTR_RET("w", w, FALSE);
+       DCHECK_TYPE_RET("w", w, EWL_WIDGET_TYPE, 0);
+       
+       DRETURN_INT(w->toplayered, DLEVEL_STABLE);
 }
 
 /**
@@ -1827,6 +1844,151 @@
        DLEAVE_FUNCTION(DLEVEL_STABLE);
 }
 
+static void
+ewl_widget_layer_stack_add(Ewl_Widget *w) 
+{
+       Evas_Object *smart_parent;
+       
+       DENTER_FUNCTION(DLEVEL_STABLE);
+       DCHECK_PARAM_PTR("w", w);
+       DCHECK_TYPE("w", w, EWL_WIDGET_TYPE);
+       
+       if (w->parent && OBSCURED(w->parent))
+               DRETURN(DLEVEL_STABLE);
+       
+       
+       if (w->parent && !w->toplayered) 
+               smart_parent = w->parent->smart_object;
+       else {
+               Ewl_Embed *emb;
+               
+               emb = ewl_embed_widget_find(w);
+               smart_parent = emb->smart;
+       }
+       
+       evas_object_smart_member_add(w->smart_object, smart_parent);
+       
+       if (w->theme_object) {
+               evas_object_smart_member_add(w->theme_object, w->smart_object);
+       }
+       if (w->fx_clip_box) {
+               evas_object_smart_member_add(w->fx_clip_box, w->smart_object);
+       }
+       if (w->theme_object && w->fx_clip_box)
+               evas_object_stack_below(w->theme_object, w->fx_clip_box);
+       
+       DLEAVE_FUNCTION(DLEVEL_STABLE);
+}
+
+static void
+ewl_widget_layer_update(Ewl_Widget *w)
+{
+       Ewl_Widget *p;
+
+       DENTER_FUNCTION(DLEVEL_STABLE);
+       DCHECK_PARAM_PTR("w", w);
+       DCHECK_TYPE("w", w, EWL_WIDGET_TYPE);
+
+       if (!(p = w->parent))
+               DRETURN(DLEVEL_STABLE);
+
+       /* check first if the widget should be on the top */
+       if (w->toplayered) 
+       {
+               evas_object_raise(w->smart_object);
+               DRETURN(DLEVEL_STABLE);
+       }
+       
+       if (LAYER(w) == 0)
+               evas_object_stack_above(w->smart_object, p->fx_clip_box);
+       else if (LAYER(w) > 0) {
+               Evas_Object *above;
+               
+               if (!(above = ewl_widget_layer_neighbor_find_above(w)))
+                       DWARNING("Have not found an object above");
+               evas_object_stack_above(w->smart_object, above);
+       }
+       else {
+               Evas_Object *below;
+
+               if (!(below = ewl_widget_layer_neighbor_find_below(w)))
+                       DWARNING("Have not found an object below");
+               evas_object_stack_below(w->smart_object, below);
+       }
+
+       DLEAVE_FUNCTION(DLEVEL_STABLE);
+}
+
+static Evas_Object *
+ewl_widget_layer_neighbor_find_above(Ewl_Widget *w)
+{
+       Evas_Object *o, *ol;
+
+       DENTER_FUNCTION(DLEVEL_STABLE);
+       DCHECK_PARAM_PTR_RET("w", w, NULL);
+       DCHECK_TYPE_RET("w", w, EWL_WIDGET_TYPE, NULL);
+
+       if (!w->parent)
+               DRETURN_PTR(NULL, DLEVEL_STABLE);
+
+       o = ol = w->parent->fx_clip_box;
+       
+       while ((o = evas_object_above_get(o)))
+       {
+               Ewl_Widget *found;
+               
+               found = evas_object_data_get(o, "EWL");
+               /*
+                * Perhaps it is a cached object so no reason to stop iterating
+                */
+               if (found) {
+                       /* ignore the widget itself */
+                       if (w == found)
+                               continue;
+                       if (LAYER(w) <= LAYER(found))
+                               break;
+                       ol = o;
+               }
+       }
+
+       DRETURN_PTR(ol, DLEVEL_STABLE);
+}
+
+static Evas_Object *
+ewl_widget_layer_neighbor_find_below(Ewl_Widget *w)
+{
+       Evas_Object *o, *ol;
+
+       DENTER_FUNCTION(DLEVEL_STABLE);
+       DCHECK_PARAM_PTR_RET("w", w, NULL);
+       DCHECK_TYPE_RET("w", w, EWL_WIDGET_TYPE, NULL);
+
+       if (!w->parent)
+               DRETURN_PTR(NULL, DLEVEL_STABLE);
+
+       o = ol = w->parent->fx_clip_box;
+       
+       while ((o = evas_object_below_get(o)))
+       {
+               Ewl_Widget *found;
+               
+               found = evas_object_data_get(o, "EWL");
+               /*
+                * Perhaps it is a cached object so no reason to stop iterating
+                */
+               if (found) {
+                       /* ignore the widget itself */
+                       if (w == found)
+                               continue;
+                       if (LAYER(w) >= LAYER(found)) 
+                               break;
+                       ol = o;
+               }
+       }
+
+       DRETURN_PTR(ol, DLEVEL_STABLE)
+}
+
 /*
  * Perform the series of operations common to every widget when
  * they are destroyed. This should ALWAYS be the the last callback
@@ -1937,6 +2099,8 @@
        DCHECK_PARAM_PTR("w", w);
        DCHECK_TYPE("w", w, EWL_WIDGET_TYPE);
 
+       if (w->smart_object)
+               evas_object_show(w->smart_object);
        if (w->fx_clip_box)
                evas_object_show(w->fx_clip_box);
        if (w->theme_object)
@@ -1987,7 +2151,6 @@
 void ewl_widget_reveal_cb(Ewl_Widget * w, void *ev_data __UNUSED__,
                                           void *user_data __UNUSED__)
 {
-       int sum;
        Ewl_Embed *emb;
 
        /* printf("Revealing %s\n", w->appearance); */
@@ -2000,6 +2163,29 @@
                DRETURN(DLEVEL_STABLE);
 
        /*
+        * Smart Object allocation
+        */
+       if (!w->smart_object) {
+               /*
+                * Attempt to load a cached object first, fallback to adding a
+                * new one.
+                */
+               w->smart_object = ewl_embed_object_request(emb, "Ewl Widget 
Smart Object");
+               if (!w->smart_object) {
+                       if (!widget_smart) {
+                               widget_smart = evas_smart_new("Ewl Widget Smart 
Object",
+                                               NULL, NULL, NULL, NULL,
+                                               NULL, NULL, NULL, NULL,
+                                               NULL, NULL, NULL, NULL,
+                                               NULL, NULL, NULL);
+                       }
+                       w->smart_object = evas_object_smart_add(emb->evas,
+                                                       widget_smart);
+               }
+               evas_object_data_set(w->smart_object, "EWL", w);
+       }
+
+       /*
         * No object allocated yet for this widget
         */
        if (!w->theme_object && w->bit_path && w->bit_group) {
@@ -2095,19 +2281,15 @@
        /*
         * Set the layer of the clip box and theme object
         */
-       sum = ewl_widget_layer_sum_get(w);
-       if (sum > ewl_embed_max_layer_get(emb))
-               ewl_embed_max_layer_set(emb, sum);
-       if (w->theme_object) {
-               evas_object_layer_set(w->theme_object, sum);
-               /* printf("Setting layer %d on %s\n", sum, w->appearance); */
+       ewl_widget_layer_stack_add(w);
+
+       if (w->parent && !OBSCURED(w->parent)) {
+               ewl_widget_layer_update(w);
        }
 
        if (w->fx_clip_box) {
                Ewl_Color_Set *color;
 
-               evas_object_layer_set(w->fx_clip_box, sum);
-
                color = ewl_attach_color_get(w);
                if (color)
                        evas_object_color_set(w->fx_clip_box, color->r,
@@ -2168,6 +2350,12 @@
                evas_object_clip_unset(w->theme_object);
                ewl_embed_object_cache(emb, w->fx_clip_box);
                w->fx_clip_box = NULL;
+       }
+       if (w->smart_object) {
+               evas_object_hide(w->smart_object);
+               evas_object_data_del(w->smart_object, "EWL");
+               ewl_embed_object_cache(emb, w->smart_object);
+               w->smart_object = NULL;
        }
 
        DLEAVE_FUNCTION(DLEVEL_STABLE);
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_widget.h,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -3 -r1.41 -r1.42
--- ewl_widget.h        8 May 2006 18:31:51 -0000       1.41
+++ ewl_widget.h        21 May 2006 03:51:41 -0000      1.42
@@ -130,6 +130,7 @@
        Ewl_Callback_Chain callbacks[EWL_CALLBACK_MAX]; /**< Callback chain 
array */
        Ewl_Attach_List *attach;       /**< List of attachments on the widget */
 
+       Evas_Object     *smart_object; /**< Smart Object for the layer stuff */
        Evas_Object     *fx_clip_box;  /**< Clipping rectangle of widget */
 
        Evas_Object     *theme_object; /**< Appearance shown on canvas */
@@ -138,7 +139,9 @@
        const char      *bit_state;    /**< State of the appearance */
        const char      *appearance;   /**< Key to lookup appearance in theme */
        const char      *inheritance;  /**< Inheritance of path widget */
-       int              layer;        /**< Current layer of widget on canvas */
+       int              layer;        /**< the layer relative to the parent */
+       int              toplayered;   /**< Indicates if the widget should 
+                                               be on the top of the layer 
stack */ 
 
        Ecore_Hash      *theme;        /**< Overriding theme settings */
        Ewl_Pair_List    theme_text;   /**< Overriding text in theme */
@@ -192,9 +195,10 @@
 void            ewl_widget_print_verbose(Ewl_Widget *w);
 void           ewl_widget_tree_print(Ewl_Widget *w);
 
-int             ewl_widget_layer_sum_get(Ewl_Widget *w);
-void            ewl_widget_layer_set(Ewl_Widget *w, int layer);
-int             ewl_widget_layer_get(Ewl_Widget *w);
+void            ewl_widget_layer_top_set(Ewl_Widget *w, int top);
+int             ewl_widget_layer_top_get(Ewl_Widget *w);
+void            ewl_widget_layer_priority_set(Ewl_Widget *w, int layer);
+int             ewl_widget_layer_priority_get(Ewl_Widget *w);
 
 void            ewl_widget_internal_set(Ewl_Widget *w, unsigned int val);
 unsigned int    ewl_widget_internal_is(Ewl_Widget *w);
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_window.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -3 -r1.42 -r1.43
--- ewl_window.c        20 Apr 2006 04:09:51 -0000      1.42
+++ ewl_window.c        21 May 2006 03:51:41 -0000      1.43
@@ -77,7 +77,6 @@
        ewl_callback_prepend(EWL_WIDGET(w), EWL_CALLBACK_CONFIGURE,
                             ewl_window_configure_cb, NULL);
 
-       LAYER(w) = -1000;
        ecore_list_append(ewl_window_list, w);
 
        DRETURN_INT(TRUE, DLEVEL_STABLE);
@@ -802,7 +801,6 @@
        DCHECK_PARAM_PTR("w", w);
        DCHECK_TYPE("w", w, EWL_WIDGET_TYPE);
 
-       evas_object_pass_events_set(EWL_EMBED(w)->ev_clip, 1);
        if (EWL_WINDOW(w)->transient)
                ewl_window_transient_for(EWL_WINDOW(w),
                                         EWL_WINDOW(w)->transient);




-------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to