Enlightenment CVS committal

Author  : sebastid
Project : e17
Module  : apps/e

Dir     : e17/apps/e/src/bin


Modified Files:
        e_border.c e_dnd.c e_dnd.h e_popup.c 


Log Message:
Dnd is relative to the background evas/modules, so feed a new drag
with container, not zone.

===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_border.c,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -3 -r1.186 -r1.187
--- e_border.c  10 May 2005 19:35:11 -0000      1.186
+++ e_border.c  10 May 2005 22:05:01 -0000      1.187
@@ -2492,7 +2492,7 @@
                                 E_Drag *drag;
                                 Evas_Coord w, h;
                                 
-                                drag = e_drag_new(bd->zone,
+                                drag = e_drag_new(bd->zone->container,
                                                   "enlightenment/border", bd,
                                                   NULL,
                                                   a->path, "icon");
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_dnd.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- e_dnd.c     10 May 2005 19:35:12 -0000      1.20
+++ e_dnd.c     10 May 2005 22:05:01 -0000      1.21
@@ -3,11 +3,6 @@
  */
 #include "e.h"
 
-/*
- * TODO:
- * - check with multiple zones!
- */
-
 /* local subsystem functions */
 
 static void _e_drag_free(E_Drag *drag);
@@ -120,7 +115,7 @@
 }
 
 E_Drag*
-e_drag_new(E_Zone *zone,
+e_drag_new(E_Container *container,
           const char *type, void *data,
           void (*finished_cb)(E_Drag *drag, int dropped),
           const char *icon_path, const char *icon)
@@ -135,14 +130,14 @@
    drag->w = 24;
    drag->h = 24;
    drag->layer = 250;
-   drag->zone = zone;
+   drag->container = container;
+   e_object_ref(E_OBJECT(drag->container));
    if (e_canvas_engine_decide(e_config->evas_engine_drag) ==
        E_EVAS_ENGINE_GL_X11)
      {
        drag->ecore_evas = ecore_evas_gl_x11_new(NULL,
-                                                drag->zone->container->win,
-                                                drag->zone->x + drag->x,
-                                                drag->zone->y + drag->y,
+                                                drag->container->win,
+                                                drag->x, drag->y,
                                                 drag->w, drag->h);
        ecore_evas_gl_x11_direct_resize_set(drag->ecore_evas, 1);
        drag->evas_win = ecore_evas_gl_x11_window_get(drag->ecore_evas);
@@ -150,24 +145,22 @@
    else
      {
        drag->ecore_evas = ecore_evas_software_x11_new(NULL,
-                                                     
drag->zone->container->win,
-                                                     drag->zone->x + drag->x,
-                                                     drag->zone->y + drag->y,
+                                                     drag->container->win,
+                                                     drag->x, drag->y,
                                                      drag->w, drag->h);
        ecore_evas_software_x11_direct_resize_set(drag->ecore_evas, 1);
        drag->evas_win = ecore_evas_software_x11_window_get(drag->ecore_evas);
      }
    e_canvas_add(drag->ecore_evas);
-   drag->shape = e_container_shape_add(drag->zone->container);
-   e_container_shape_move(drag->shape, drag->zone->x + drag->x, drag->zone->y 
+ drag->y);
+   drag->shape = e_container_shape_add(drag->container);
+   e_container_shape_move(drag->shape, drag->x, drag->y);
    e_container_shape_resize(drag->shape, drag->w, drag->h);
 
    drag->evas = ecore_evas_get(drag->ecore_evas);
-   e_container_window_raise(drag->zone->container, drag->evas_win, 
drag->layer);
+   e_container_window_raise(drag->container, drag->evas_win, drag->layer);
    ecore_x_window_shape_events_select(drag->evas_win, 1);
    ecore_evas_name_class_set(drag->ecore_evas, "E", "_e_drag_window");
    ecore_evas_title_set(drag->ecore_evas, "E Drag");
-   e_object_ref(E_OBJECT(drag->zone));
 
    ecore_evas_shaped_set(drag->ecore_evas, 1);
 
@@ -211,11 +204,11 @@
    drag->x = x;
    drag->y = y;
    ecore_evas_move(drag->ecore_evas,
-                  drag->zone->x + drag->x, 
-                  drag->zone->y + drag->y);
+                  drag->x, 
+                  drag->y);
    e_container_shape_move(drag->shape,
-                         drag->zone->x + drag->x, 
-                         drag->zone->y + drag->y);
+                         drag->x, 
+                         drag->y);
 }
 
 void
@@ -239,9 +232,9 @@
 {
    Evas_List *l;
 
-   _drag_win = ecore_x_window_input_new(drag->zone->container->win, 
-                                       drag->zone->container->x, 
drag->zone->container->y,
-                                       drag->zone->container->w, 
drag->zone->container->h);
+   _drag_win = ecore_x_window_input_new(drag->container->win, 
+                                       drag->container->x, drag->container->y,
+                                       drag->container->w, drag->container->h);
    ecore_x_window_show(_drag_win);
    ecore_x_pointer_confine_grab(_drag_win);
    ecore_x_keyboard_grab(_drag_win);
@@ -405,7 +398,7 @@
 {
    _draggies = evas_list_remove(_draggies, drag);
 
-   e_object_unref(E_OBJECT(drag->zone));
+   e_object_unref(E_OBJECT(drag->container));
    evas_object_del(drag->object);
    e_canvas_del(drag->ecore_evas);
    ecore_evas_free(drag->ecore_evas);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_dnd.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- e_dnd.h     10 May 2005 19:35:12 -0000      1.14
+++ e_dnd.h     10 May 2005 22:05:02 -0000      1.15
@@ -26,7 +26,7 @@
    struct {
        void (*finished)(E_Drag *drag, int dropped);
    } cb;
-   E_Zone            *zone;
+   E_Container       *container;
    Ecore_Evas        *ecore_evas;
    Evas              *evas;
    Ecore_X_Window     evas_win;
@@ -85,7 +85,7 @@
 
 EAPI int  e_dnd_active(void);
 
-EAPI E_Drag* e_drag_new(E_Zone *zone, const char *type, void *data,
+EAPI E_Drag* e_drag_new(E_Container *container, const char *type, void *data,
                        void (*finished_cb)(E_Drag *drag, int dropped),
                        const char *icon_path, const char *icon);
 EAPI void    e_drag_show(E_Drag *drag);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_popup.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- e_popup.c   7 May 2005 13:50:38 -0000       1.2
+++ e_popup.c   10 May 2005 22:05:02 -0000      1.3
@@ -16,7 +16,8 @@
 int
 e_popup_init(void)
 {
-   _e_popup_window_shape_handler = 
ecore_event_handler_add(ECORE_X_EVENT_WINDOW_SHAPE,      
_e_popup_cb_window_shape, NULL);
+   _e_popup_window_shape_handler = 
ecore_event_handler_add(ECORE_X_EVENT_WINDOW_SHAPE,
+                                                          
_e_popup_cb_window_shape, NULL);
    return 1;
 }
 




-------------------------------------------------------
This SF.Net email is sponsored by Oracle Space Sweepstakes
Want to be the first software developer in space?
Enter now for the Oracle Space Sweepstakes!
http://ads.osdn.com/?ad_id=7393&alloc_id=16281&op=click
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to