Enlightenment CVS committal

Author  : handyande
Project : e17
Module  : apps/e

Dir     : e17/apps/e/src/bin


Modified Files:
        e_border.c 


Log Message:
Add add and remove - except remove does not work, free's are causing problems - 
can someone tell me how to fix please?
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_border.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -3 -r1.53 -r1.54
--- e_border.c  10 Jan 2005 22:24:23 -0000      1.53
+++ e_border.c  11 Jan 2005 00:04:43 -0000      1.54
@@ -72,6 +72,8 @@
 
 static void _e_border_event_border_resize_free(void *data, void *ev);
 static void _e_border_event_border_move_free(void *data, void *ev);
+static void _e_border_event_border_add_free(void *data, void *ev);
+static void _e_border_event_border_remove_free(void *data, void *ev);
 
 /* local subsystem globals */
 static Evas_List *handlers = NULL;
@@ -80,6 +82,8 @@
 
 int E_EVENT_BORDER_RESIZE = 0;
 int E_EVENT_BORDER_MOVE = 0;
+int E_EVENT_BORDER_ADD = 0;
+int E_EVENT_BORDER_REMOVE = 0;
 
 #define GRAV_SET(bd, grav) \
 printf("GRAV TO %i\n", grav); \
@@ -111,6 +115,8 @@
 
    E_EVENT_BORDER_RESIZE = ecore_event_type_new();
    E_EVENT_BORDER_MOVE = ecore_event_type_new();
+   E_EVENT_BORDER_ADD = ecore_event_type_new();
+   E_EVENT_BORDER_REMOVE = ecore_event_type_new();
    
    return 1;
 }
@@ -134,6 +140,7 @@
 {
    E_Border *bd;
    Ecore_X_Window_Attributes *att;
+   E_Event_Border_Add *ev;
    
    bd = E_OBJECT_ALLOC(E_Border, _e_border_free);
    if (!bd) return NULL;
@@ -259,6 +266,10 @@
    con->clients = evas_list_append(con->clients, bd);
    borders = evas_list_append(borders, bd);
 
+   ev = calloc(1, sizeof(E_Event_Border_Add));
+   ev->border = bd;
+   e_object_ref(E_OBJECT(bd));
+   ecore_event_add(E_EVENT_BORDER_ADD, ev, _e_border_event_border_add_free, 
NULL);
    return bd;
 }
 
@@ -308,6 +319,8 @@
 void
 e_border_move(E_Border *bd, int x, int y)
 {
+   E_Event_Border_Move *ev;
+
    E_OBJECT_CHECK(bd);
    if ((x == bd->x) && (y == bd->y)) return;
    bd->x = x;
@@ -319,11 +332,17 @@
                                  bd->y + bd->client_inset.t, 
                                  bd->client.w,
                                  bd->client.h);
+
+   ev = calloc(1, sizeof(E_Event_Border_Resize));
+   ev->border = bd;
+   e_object_ref(E_OBJECT(bd));
+   ecore_event_add(E_EVENT_BORDER_RESIZE, ev, 
_e_border_event_border_resize_free, NULL);
 }
 
 void
 e_border_resize(E_Border *bd, int w, int h)
 {
+   E_Event_Border_Resize *ev;
    E_OBJECT_CHECK(bd);
    if ((w == bd->w) && (h == bd->h)) return;
    bd->w = w;
@@ -337,6 +356,11 @@
                                  bd->y + bd->client_inset.t, 
                                  bd->client.w,
                                  bd->client.h);
+
+   ev = calloc(1, sizeof(E_Event_Border_Resize));
+   ev->border = bd;
+   e_object_ref(E_OBJECT(bd));
+   ecore_event_add(E_EVENT_BORDER_RESIZE, ev, 
_e_border_event_border_resize_free, NULL);
 }
 
 void
@@ -716,6 +740,16 @@
 static void
 _e_border_free(E_Border *bd)
 {
+   E_Event_Border_Remove *ev;
+
+   /* FIXME - can the bd is getting freed no matter so the event gets NULL :(
+    * any ideas?
+   ev = calloc(1, sizeof(E_Event_Border_Remove));
+   ev->border = bd;
+   e_object_ref(E_OBJECT(bd));
+   ecore_event_add(E_EVENT_BORDER_REMOVE, ev, 
_e_border_event_border_remove_free, NULL);
+   */
+
    if (focused == bd) focused = NULL;
    while (bd->handlers)
      {
@@ -773,6 +807,7 @@
    e = ev;
    bd = e_border_find_by_client_window(e->win);
    if (!bd) return 1;
+
    e_object_del(E_OBJECT(bd));
    return 1;
 }
@@ -1604,7 +1639,6 @@
    bd->mouse.current.my = ev->root.y;
    if (bd->moving)
      {
-       E_Event_Border_Move *pass;
        int x, y, new_x, new_y;
        Evas_List *skiplist = NULL;
        
@@ -1632,19 +1666,10 @@
        evas_list_free(skiplist);
        e_border_move(bd, new_x, new_y);
 
-       pass = calloc(1, sizeof(E_Event_Border_Move));
-       pass->border = bd; 
-       e_object_ref(E_OBJECT(bd));
-       ecore_event_add(E_EVENT_BORDER_MOVE, pass, 
_e_border_event_border_move_free, NULL);
      }
    else if (bd->resize_mode != RESIZE_NONE)
      {
-       E_Event_Border_Resize *pass;
        _e_border_resize_handle(bd);
-       pass = calloc(1, sizeof(E_Event_Border_Resize));
-       pass->border = bd; 
-       e_object_ref(E_OBJECT(bd));
-       ecore_event_add(E_EVENT_BORDER_RESIZE, pass, 
_e_border_event_border_resize_free, NULL);     
      }
    else
      {
@@ -2671,3 +2696,23 @@
    free(e);
 }
 
+static void
+_e_border_event_border_add_free(void *data, void *ev)
+{
+   E_Event_Border_Add *e;
+
+   e = ev;
+   e_object_unref(E_OBJECT(e->border));
+   free(e);
+}
+
+static void
+_e_border_event_border_remove_free(void *data, void *ev)
+{
+   E_Event_Border_Resize *e;
+
+   e = ev;
+   e_object_unref(E_OBJECT(e->border));
+   free(e);
+}
+




-------------------------------------------------------
The SF.Net email is sponsored by: Beat the post-holiday blues
Get a FREE limited edition SourceForge.net t-shirt from ThinkGeek.
It's fun and FREE -- well, almost....http://www.thinkgeek.com/sfshirt
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to