Enlightenment CVS committal Author : raster Project : e17 Module : apps/e
Dir : e17/apps/e/src/bin Modified Files: Makefile.am e_border.c e_border.h e_includes.h e_int_menus.c e_manager.c e_manager.h e_object.c e_object.h e_test.c e_zone.c Added Files: e_dialog.c e_dialog.h Log Message: 1. start work on dialog stuff 2. fix edge flip stuff 3. fix ghost windows stuff 4. spec =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/Makefile.am,v retrieving revision 1.41 retrieving revision 1.42 diff -u -3 -r1.41 -r1.42 --- Makefile.am 11 Jul 2005 12:31:44 -0000 1.41 +++ Makefile.am 28 Jul 2005 04:35:44 -0000 1.42 @@ -67,7 +67,8 @@ e_bg.h \ e_remember.h \ e_win.h \ -e_pan.h +e_pan.h \ +e_dialog.h enlightenment_SOURCES = \ e_main.c \ @@ -124,6 +125,7 @@ e_remember.c \ e_win.c \ e_pan.c \ +e_dialog.c \ $(ENLIGHTENMENTHEADERS) enlightenment_LDFLAGS = -export-dynamic @e_libs@ @x_libs@ @dlopen_libs@ =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_border.c,v retrieving revision 1.343 retrieving revision 1.344 diff -u -3 -r1.343 -r1.344 --- e_border.c 27 Jul 2005 04:51:41 -0000 1.343 +++ e_border.c 28 Jul 2005 04:35:44 -0000 1.344 @@ -490,7 +490,7 @@ ev = calloc(1, sizeof(E_Event_Border_Zone_Set)); ev->border = bd; e_object_ref(E_OBJECT(bd)); - e_object_breadcrumb_add(E_OBJECT(bd), "border_zone_set_event"); +// e_object_breadcrumb_add(E_OBJECT(bd), "border_zone_set_event"); ev->zone = zone; e_object_ref(E_OBJECT(zone)); ecore_event_add(E_EVENT_BORDER_ZONE_SET, ev, _e_border_event_border_zone_set_free, NULL); @@ -516,7 +516,7 @@ ev = calloc(1, sizeof(E_Event_Border_Desk_Set)); ev->border = bd; e_object_ref(E_OBJECT(bd)); - e_object_breadcrumb_add(E_OBJECT(bd), "border_desk_set_event"); +// e_object_breadcrumb_add(E_OBJECT(bd), "border_desk_set_event"); ev->desk = desk; e_object_ref(E_OBJECT(desk)); ecore_event_add(E_EVENT_BORDER_DESK_SET, ev, _e_border_event_border_desk_set_free, NULL); @@ -545,7 +545,7 @@ ev = calloc(1, sizeof(E_Event_Border_Show)); ev->border = bd; e_object_ref(E_OBJECT(bd)); - e_object_breadcrumb_add(E_OBJECT(bd), "border_show_event"); +// e_object_breadcrumb_add(E_OBJECT(bd), "border_show_event"); ecore_event_add(E_EVENT_BORDER_SHOW, ev, _e_border_event_border_show_free, NULL); } @@ -598,7 +598,7 @@ ev = calloc(1, sizeof(E_Event_Border_Hide)); ev->border = bd; e_object_ref(E_OBJECT(bd)); - e_object_breadcrumb_add(E_OBJECT(bd), "border_hide_event"); +// e_object_breadcrumb_add(E_OBJECT(bd), "border_hide_event"); ecore_event_add(E_EVENT_BORDER_HIDE, ev, _e_border_event_border_hide_free, NULL); } } @@ -647,7 +647,7 @@ ev = calloc(1, sizeof(E_Event_Border_Move)); ev->border = bd; e_object_ref(E_OBJECT(bd)); - e_object_breadcrumb_add(E_OBJECT(bd), "border_move_event"); +// e_object_breadcrumb_add(E_OBJECT(bd), "border_move_event"); ecore_event_add(E_EVENT_BORDER_MOVE, ev, _e_border_event_border_move_free, NULL); } @@ -693,7 +693,7 @@ ev = calloc(1, sizeof(E_Event_Border_Resize)); ev->border = bd; e_object_ref(E_OBJECT(bd)); - e_object_breadcrumb_add(E_OBJECT(bd), "border_resize_event"); +// e_object_breadcrumb_add(E_OBJECT(bd), "border_resize_event"); ecore_event_add(E_EVENT_BORDER_RESIZE, ev, _e_border_event_border_resize_free, NULL); } @@ -748,13 +748,13 @@ mev = calloc(1, sizeof(E_Event_Border_Move)); mev->border = bd; e_object_ref(E_OBJECT(bd)); - e_object_breadcrumb_add(E_OBJECT(bd), "border_move_event"); +// e_object_breadcrumb_add(E_OBJECT(bd), "border_move_event"); ecore_event_add(E_EVENT_BORDER_MOVE, mev, _e_border_event_border_move_free, NULL); rev = calloc(1, sizeof(E_Event_Border_Resize)); rev->border = bd; e_object_ref(E_OBJECT(bd)); - e_object_breadcrumb_add(E_OBJECT(bd), "border_resize_event"); +// e_object_breadcrumb_add(E_OBJECT(bd), "border_resize_event"); ecore_event_add(E_EVENT_BORDER_RESIZE, rev, _e_border_event_border_resize_free, NULL); } @@ -772,7 +772,7 @@ ev = calloc(1, sizeof(E_Event_Border_Raise)); ev->border = bd; e_object_ref(E_OBJECT(bd)); - e_object_breadcrumb_add(E_OBJECT(bd), "border_raise_event"); +// e_object_breadcrumb_add(E_OBJECT(bd), "border_raise_event"); ev->above = NULL; ecore_event_add(E_EVENT_BORDER_RAISE, ev, _e_border_event_border_raise_free, NULL); } @@ -792,7 +792,7 @@ ev = calloc(1, sizeof(E_Event_Border_Lower)); ev->border = bd; e_object_ref(E_OBJECT(bd)); - e_object_breadcrumb_add(E_OBJECT(bd), "border_lower_event"); +// e_object_breadcrumb_add(E_OBJECT(bd), "border_lower_event"); ev->below = NULL; ecore_event_add(E_EVENT_BORDER_LOWER, ev, _e_border_event_border_lower_free, NULL); } @@ -812,10 +812,10 @@ ev = calloc(1, sizeof(E_Event_Border_Raise)); ev->border = bd; e_object_ref(E_OBJECT(bd)); - e_object_breadcrumb_add(E_OBJECT(bd), "border_raise_event"); +// e_object_breadcrumb_add(E_OBJECT(bd), "border_raise_event"); ev->above = above; e_object_ref(E_OBJECT(above)); - e_object_breadcrumb_add(E_OBJECT(above), "border_raise_event.above"); +// e_object_breadcrumb_add(E_OBJECT(above), "border_raise_event.above"); ecore_event_add(E_EVENT_BORDER_RAISE, ev, _e_border_event_border_raise_free, NULL); } } @@ -833,10 +833,10 @@ ev = calloc(1, sizeof(E_Event_Border_Lower)); ev->border = bd; e_object_ref(E_OBJECT(bd)); - e_object_breadcrumb_add(E_OBJECT(bd), "border_lower_event"); +// e_object_breadcrumb_add(E_OBJECT(bd), "border_lower_event"); ev->below = below; e_object_ref(E_OBJECT(below)); - e_object_breadcrumb_add(E_OBJECT(below), "border_lower_event.below"); +// e_object_breadcrumb_add(E_OBJECT(below), "border_lower_event.below"); ecore_event_add(E_EVENT_BORDER_LOWER, ev, _e_border_event_border_lower_free, NULL); } } @@ -1012,7 +1012,7 @@ /* The resize is added in the animator when animation complete */ /* For non-animated, we add it immediately with the new size */ e_object_ref(E_OBJECT(bd)); - e_object_breadcrumb_add(E_OBJECT(bd), "border_resize_event"); +// e_object_breadcrumb_add(E_OBJECT(bd), "border_resize_event"); ecore_event_add(E_EVENT_BORDER_RESIZE, ev, _e_border_event_border_resize_free, NULL); } @@ -1101,7 +1101,7 @@ /* The resize is added in the animator when animation complete */ /* For non-animated, we add it immediately with the new size */ e_object_ref(E_OBJECT(bd)); - e_object_breadcrumb_add(E_OBJECT(bd), "border_resize_event"); +// e_object_breadcrumb_add(E_OBJECT(bd), "border_resize_event"); ecore_event_add(E_EVENT_BORDER_RESIZE, ev, _e_border_event_border_resize_free, NULL); } @@ -1384,7 +1384,7 @@ ev = E_NEW(E_Event_Border_Iconify, 1); ev->border = bd; e_object_ref(E_OBJECT(bd)); - e_object_breadcrumb_add(E_OBJECT(bd), "border_iconify_event"); +// e_object_breadcrumb_add(E_OBJECT(bd), "border_iconify_event"); ecore_event_add(E_EVENT_BORDER_ICONIFY, ev, _e_border_event_border_iconify_free, NULL); } @@ -1413,7 +1413,7 @@ ev = E_NEW(E_Event_Border_Uniconify, 1); ev->border = bd; e_object_ref(E_OBJECT(bd)); - e_object_breadcrumb_add(E_OBJECT(bd), "border_uniconify_event"); +// e_object_breadcrumb_add(E_OBJECT(bd), "border_uniconify_event"); ecore_event_add(E_EVENT_BORDER_UNICONIFY, ev, _e_border_event_border_uniconify_free, NULL); } @@ -1433,7 +1433,7 @@ ev = E_NEW(E_Event_Border_Stick, 1); ev->border = bd; e_object_ref(E_OBJECT(bd)); - e_object_breadcrumb_add(E_OBJECT(bd), "border_stick_event"); +// e_object_breadcrumb_add(E_OBJECT(bd), "border_stick_event"); ecore_event_add(E_EVENT_BORDER_STICK, ev, _e_border_event_border_stick_free, NULL); } @@ -1454,7 +1454,7 @@ ev = E_NEW(E_Event_Border_Unstick, 1); ev->border = bd; e_object_ref(E_OBJECT(bd)); - e_object_breadcrumb_add(E_OBJECT(bd), "border_unstick_event"); +// e_object_breadcrumb_add(E_OBJECT(bd), "border_unstick_event"); ecore_event_add(E_EVENT_BORDER_UNSTICK, ev, _e_border_event_border_unstick_free, NULL); } @@ -1614,13 +1614,11 @@ void e_border_act_move_end(E_Border *bd, Ecore_X_Event_Mouse_Button_Up *ev) { - if (bd->moving) - { - e_zone_flip_win_restore(); - bd->moving = 0; - _e_border_move_end(bd); - e_zone_flip_coords_handle(bd->zone, -1, -1); - } + if (!bd->moving) return; + bd->moving = 0; + e_zone_flip_win_restore(); + _e_border_move_end(bd); + e_zone_flip_coords_handle(bd->zone, -1, -1); } void @@ -1877,11 +1875,7 @@ void e_border_move_cancel(void) { - if (move) - { - move->moving = 0; - _e_border_move_end(move); - } + if (move) _e_border_move_end(move); } void @@ -1933,11 +1927,13 @@ IF_FREE(bd->shape_rects); bd->shape_rects_num = 0; +/* if (bd->dangling_ref_check) { ecore_timer_del(bd->dangling_ref_check); bd->dangling_ref_check = NULL; } + */ if (bd->kill_timer) { ecore_timer_del(bd->kill_timer); @@ -2017,6 +2013,7 @@ free(bd); } +/* static int _e_border_del_dangling_ref_check(void *data) { @@ -2028,18 +2025,21 @@ printf("%p, %i, \"%s\" [\"%s\" \"%s\"]\n", bd, e_object_ref_get(E_OBJECT(bd)), bd->client.icccm.title, bd->client.icccm.name, bd->client.icccm.class); - e_object_breadcrumb_debug(E_OBJECT(bd)); +// e_object_breadcrumb_debug(E_OBJECT(bd)); printf("---\n"); return 1; } +*/ static void _e_border_del(E_Border *bd) { E_Event_Border_Remove *ev; - + +/* if (!bd->dangling_ref_check) bd->dangling_ref_check = ecore_timer_add(1.0, _e_border_del_dangling_ref_check, bd); + */ if (!bd->already_unparented) { ecore_x_window_reparent(bd->client.win, @@ -2055,7 +2055,7 @@ /* FIXME Don't ref this during shutdown. And the event is pointless * during shutdown.. */ e_object_ref(E_OBJECT(bd)); - e_object_breadcrumb_add(E_OBJECT(bd), "border_remove_event"); +// e_object_breadcrumb_add(E_OBJECT(bd), "border_remove_event"); ecore_event_add(E_EVENT_BORDER_REMOVE, ev, _e_border_event_border_remove_free, NULL); } @@ -3995,7 +3995,7 @@ ev = calloc(1, sizeof(E_Event_Border_Icon_Change)); ev->border = bd; e_object_ref(E_OBJECT(bd)); - e_object_breadcrumb_add(E_OBJECT(bd), "border_icon_change_event"); +// e_object_breadcrumb_add(E_OBJECT(bd), "border_icon_change_event"); ecore_event_add(E_EVENT_BORDER_ICON_CHANGE, ev, _e_border_event_border_icon_change_free, NULL); } @@ -4467,7 +4467,7 @@ ev = calloc(1, sizeof(E_Event_Border_Add)); ev->border = bd; e_object_ref(E_OBJECT(bd)); - e_object_breadcrumb_add(E_OBJECT(bd), "border_add_event"); +// e_object_breadcrumb_add(E_OBJECT(bd), "border_add_event"); ecore_event_add(E_EVENT_BORDER_ADD, ev, _e_border_event_border_add_free, NULL); /* Recreate state */ @@ -5081,7 +5081,7 @@ ev = calloc(1, sizeof(E_Event_Border_Resize)); ev->border = bd; e_object_ref(E_OBJECT(bd)); - e_object_breadcrumb_add(E_OBJECT(bd), "border_resize_event"); +// e_object_breadcrumb_add(E_OBJECT(bd), "border_resize_event"); ecore_event_add(E_EVENT_BORDER_RESIZE, ev, _e_border_event_border_resize_free, NULL); return 0; } @@ -6187,7 +6187,7 @@ E_Event_Border_Resize *e; e = ev; - e_object_breadcrumb_del(E_OBJECT(e->border), "border_resize_event"); +// e_object_breadcrumb_del(E_OBJECT(e->border), "border_resize_event"); e_object_unref(E_OBJECT(e->border)); free(e); } @@ -6198,7 +6198,7 @@ E_Event_Border_Move *e; e = ev; - e_object_breadcrumb_del(E_OBJECT(e->border), "border_move_event"); +// e_object_breadcrumb_del(E_OBJECT(e->border), "border_move_event"); e_object_unref(E_OBJECT(e->border)); free(e); } @@ -6209,7 +6209,7 @@ E_Event_Border_Add *e; e = ev; - e_object_breadcrumb_del(E_OBJECT(e->border), "border_add_event"); +// e_object_breadcrumb_del(E_OBJECT(e->border), "border_add_event"); e_object_unref(E_OBJECT(e->border)); free(e); } @@ -6220,7 +6220,7 @@ E_Event_Border_Remove *e; e = ev; - e_object_breadcrumb_del(E_OBJECT(e->border), "border_remove_event"); +// e_object_breadcrumb_del(E_OBJECT(e->border), "border_remove_event"); e_object_unref(E_OBJECT(e->border)); free(e); } @@ -6231,7 +6231,7 @@ E_Event_Border_Show *e; e = ev; - e_object_breadcrumb_del(E_OBJECT(e->border), "border_show_event"); +// e_object_breadcrumb_del(E_OBJECT(e->border), "border_show_event"); e_object_unref(E_OBJECT(e->border)); free(e); } @@ -6242,7 +6242,7 @@ E_Event_Border_Hide *e; e = ev; - e_object_breadcrumb_del(E_OBJECT(e->border), "border_hide_event"); +// e_object_breadcrumb_del(E_OBJECT(e->border), "border_hide_event"); e_object_unref(E_OBJECT(e->border)); free(e); } @@ -6253,7 +6253,7 @@ E_Event_Border_Iconify *e; e = ev; - e_object_breadcrumb_del(E_OBJECT(e->border), "border_iconify_event"); +// e_object_breadcrumb_del(E_OBJECT(e->border), "border_iconify_event"); e_object_unref(E_OBJECT(e->border)); free(e); } @@ -6264,7 +6264,7 @@ E_Event_Border_Uniconify *e; e = ev; - e_object_breadcrumb_del(E_OBJECT(e->border), "border_uniconify_event"); +// e_object_breadcrumb_del(E_OBJECT(e->border), "border_uniconify_event"); e_object_unref(E_OBJECT(e->border)); free(e); } @@ -6275,7 +6275,7 @@ E_Event_Border_Stick *e; e = ev; - e_object_breadcrumb_del(E_OBJECT(e->border), "border_stick_event"); +// e_object_breadcrumb_del(E_OBJECT(e->border), "border_stick_event"); e_object_unref(E_OBJECT(e->border)); free(e); } @@ -6286,7 +6286,7 @@ E_Event_Border_Unstick *e; e = ev; - e_object_breadcrumb_del(E_OBJECT(e->border), "border_unstick_event"); +// e_object_breadcrumb_del(E_OBJECT(e->border), "border_unstick_event"); e_object_unref(E_OBJECT(e->border)); free(e); } @@ -6297,7 +6297,7 @@ E_Event_Border_Zone_Set *e; e = ev; - e_object_breadcrumb_del(E_OBJECT(e->border), "border_zone_set_event"); +// e_object_breadcrumb_del(E_OBJECT(e->border), "border_zone_set_event"); e_object_unref(E_OBJECT(e->border)); e_object_unref(E_OBJECT(e->zone)); free(e); @@ -6309,7 +6309,7 @@ E_Event_Border_Desk_Set *e; e = ev; - e_object_breadcrumb_del(E_OBJECT(e->border), "border_desk_set_event"); +// e_object_breadcrumb_del(E_OBJECT(e->border), "border_desk_set_event"); e_object_unref(E_OBJECT(e->border)); e_object_unref(E_OBJECT(e->desk)); free(e); @@ -6321,11 +6321,11 @@ E_Event_Border_Raise *e; e = ev; - e_object_breadcrumb_del(E_OBJECT(e->border), "border_raise_event"); +// e_object_breadcrumb_del(E_OBJECT(e->border), "border_raise_event"); e_object_unref(E_OBJECT(e->border)); if (e->above) { - e_object_breadcrumb_del(E_OBJECT(e->above), "border_raise_event.above"); +// e_object_breadcrumb_del(E_OBJECT(e->above), "border_raise_event.above"); e_object_unref(E_OBJECT(e->above)); } free(e); @@ -6337,11 +6337,11 @@ E_Event_Border_Lower *e; e = ev; - e_object_breadcrumb_del(E_OBJECT(e->border), "border_lower_event"); +// e_object_breadcrumb_del(E_OBJECT(e->border), "border_lower_event"); e_object_unref(E_OBJECT(e->border)); if (e->below) { - e_object_breadcrumb_del(E_OBJECT(e->below), "border_lower_event.below"); +// e_object_breadcrumb_del(E_OBJECT(e->below), "border_lower_event.below"); e_object_unref(E_OBJECT(e->below)); } free(e); @@ -6353,7 +6353,7 @@ E_Event_Border_Icon_Change *e; e = ev; - e_object_breadcrumb_del(E_OBJECT(e->border), "border_icon_change_event"); +// e_object_breadcrumb_del(E_OBJECT(e->border), "border_icon_change_event"); e_object_unref(E_OBJECT(e->border)); free(e); } =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_border.h,v retrieving revision 1.99 retrieving revision 1.100 diff -u -3 -r1.99 -r1.100 --- e_border.h 21 Jul 2005 11:15:42 -0000 1.99 +++ e_border.h 28 Jul 2005 04:35:44 -0000 1.100 @@ -371,7 +371,7 @@ Ecore_X_Rectangle *shape_rects; E_Remember *remember; - Ecore_Timer *dangling_ref_check; +// Ecore_Timer *dangling_ref_check; }; struct _E_Border_Pending_Move_Resize =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_includes.h,v retrieving revision 1.30 retrieving revision 1.31 diff -u -3 -r1.30 -r1.31 --- e_includes.h 11 Jul 2005 12:31:44 -0000 1.30 +++ e_includes.h 28 Jul 2005 04:35:44 -0000 1.31 @@ -55,3 +55,4 @@ #include "e_remember.h" #include "e_win.h" #include "e_pan.h" +#include "e_dialog.h" =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_int_menus.c,v retrieving revision 1.79 retrieving revision 1.80 diff -u -3 -r1.79 -r1.80 --- e_int_menus.c 8 Jul 2005 08:43:26 -0000 1.79 +++ e_int_menus.c 28 Jul 2005 04:35:45 -0000 1.80 @@ -289,14 +289,6 @@ e_object_del(E_OBJECT(dat->lost_clients)); free(dat); } - else - { - printf("[EMAIL PROTECTED]" - "[EMAIL PROTECTED]" - " main menu object data is NULL!\n" - "[EMAIL PROTECTED]" - "[EMAIL PROTECTED]"); - } } static void @@ -567,7 +559,7 @@ e_menu_item_label_set(mi, _("No name!!")); /* ref the border as we implicitly unref it in the callback */ e_object_ref(E_OBJECT(bd)); - e_object_breadcrumb_add(E_OBJECT(bd), "clients_menu"); +// e_object_breadcrumb_add(E_OBJECT(bd), "clients_menu"); e_menu_item_callback_set(mi, _e_int_menus_clients_item_cb, bd); if (!bd->iconic) e_menu_item_toggle_set(mi, 1); a = e_app_window_name_class_title_role_find(bd->client.icccm.name, @@ -585,6 +577,7 @@ e_menu_item_icon_edje_set(mi, s, "windows"); IF_FREE(s); e_menu_item_callback_set(mi, _e_int_menus_clients_cleanup_cb, zone); + e_object_free_attach_func_set(E_OBJECT(m), _e_int_menus_clients_free_hook); e_object_data_set(E_OBJECT(m), borders); } @@ -597,21 +590,13 @@ m = obj; borders = e_object_data_get(E_OBJECT(m)); - if (borders == NULL) - { - printf("########################################################\n"); - printf("########################################################\n"); - printf("clients menu free cb called and object data is NULL!\n"); - printf("########################################################\n"); - printf("########################################################\n"); - } while (borders) { E_Border *bd; bd = borders->data; borders = evas_list_remove_list(borders, borders); - e_object_breadcrumb_del(E_OBJECT(bd), "clients_menu"); +// e_object_breadcrumb_del(E_OBJECT(bd), "clients_menu"); e_object_unref(E_OBJECT(bd)); } } @@ -831,7 +816,7 @@ e_menu_item_label_set(mi, _("No name!!")); /* ref the border as we implicitly unref it in the callback */ e_object_ref(E_OBJECT(bd)); - e_object_breadcrumb_add(E_OBJECT(bd), "lost_clients_menu"); +// e_object_breadcrumb_add(E_OBJECT(bd), "lost_clients_menu"); e_menu_item_callback_set(mi, _e_int_menus_lost_clients_item_cb, bd); a = e_app_window_name_class_title_role_find(bd->client.icccm.name, bd->client.icccm.class, @@ -857,7 +842,7 @@ bd = borders->data; borders = evas_list_remove_list(borders, borders); - e_object_breadcrumb_del(E_OBJECT(bd), "lost_clients_menu"); +// e_object_breadcrumb_del(E_OBJECT(bd), "lost_clients_menu"); e_object_unref(E_OBJECT(bd)); } } =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_manager.c,v retrieving revision 1.36 retrieving revision 1.37 diff -u -3 -r1.36 -r1.37 --- e_manager.c 21 Jul 2005 11:50:45 -0000 1.36 +++ e_manager.c 28 Jul 2005 04:35:45 -0000 1.37 @@ -338,6 +338,24 @@ ecore_x_window_lower(man->win); } +E_Manager * +e_manager_current_get(void) +{ + Evas_List *l; + E_Manager *man; + int x, y; + + if (!managers) return NULL; + for (l = managers; l; l = l->next) + { + man = l->data; + ecore_x_pointer_xy_get(man->win, &x, &y); + if (E_INSIDE(x, y, man->x, man->y, man->w, man->h)) + return man; + } + return managers->data; +} + E_Container * e_manager_container_number_get(E_Manager *man, int num) { =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_manager.h,v retrieving revision 1.11 retrieving revision 1.12 diff -u -3 -r1.11 -r1.12 --- e_manager.h 2 Jun 2005 09:49:07 -0000 1.11 +++ e_manager.h 28 Jul 2005 04:35:45 -0000 1.12 @@ -37,8 +37,8 @@ EAPI void e_manager_move_resize(E_Manager *man, int x, int y, int w, int h); EAPI void e_manager_raise(E_Manager *man); EAPI void e_manager_lower(E_Manager *man); +EAPI E_Manager *e_manager_current_get(void); -EAPI E_Container *e_manager_container_current_get(E_Manager *man); EAPI E_Container *e_manager_container_number_get(E_Manager *man, int num); EAPI void e_managers_keys_grab(void); =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_object.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -3 -r1.14 -r1.15 --- e_object.c 28 Jun 2005 07:59:13 -0000 1.14 +++ e_object.c 28 Jul 2005 04:35:45 -0000 1.15 @@ -80,11 +80,13 @@ e_object_free(E_Object *obj) { E_OBJECT_CHECK(obj); +/* if (obj->crumbs) { printf("EEEK obj type %x has crumbs still! ->\n", obj->type); e_object_breadcrumb_debug(obj); } + */ if (obj->free_att_func) obj->free_att_func(obj); obj->magic = E_OBJECT_MAGIC_FREED; obj->cleanup_func(obj); @@ -257,6 +259,7 @@ obj->del_att_func = func; } +/* void e_object_breadcrumb_add(E_Object *obj, char *crumb) { @@ -290,6 +293,7 @@ for (l = obj->crumbs; l; l = l->next) printf("CRUMB: %s\n", l->data); } +*/ #ifdef OBJECT_PARANOIA_CHECK /* local subsystem functions */ =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_object.h,v retrieving revision 1.16 retrieving revision 1.17 diff -u -3 -r1.16 -r1.17 --- e_object.h 25 Jun 2005 06:54:22 -0000 1.16 +++ e_object.h 28 Jul 2005 04:35:45 -0000 1.17 @@ -70,7 +70,7 @@ void (*del_att_func) (void *obj); void *data; unsigned char deleted : 1; - Evas_List *crumbs; +// Evas_List *crumbs; }; EAPI void *e_object_alloc (int size, int type, E_Object_Cleanup_Func cleanup_func); @@ -88,9 +88,11 @@ EAPI void e_object_free_attach_func_set(E_Object *obj, void (*func) (void *obj)); EAPI void e_object_del_attach_func_set (E_Object *obj, void (*func) (void *obj)); +/* EAPI void e_object_breadcrumb_add (E_Object *obj, char *crumb); EAPI void e_object_breadcrumb_del (E_Object *obj, char *crumb); EAPI void e_object_breadcrumb_debug (E_Object *obj); +*/ #endif #endif =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_test.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -3 -r1.10 -r1.11 --- e_test.c 25 Jul 2005 09:55:45 -0000 1.10 +++ e_test.c 28 Jul 2005 04:35:45 -0000 1.11 @@ -282,6 +282,29 @@ } } #elif 0 +static void +_e_test_dialog_del(void *obj) +{ + E_Dialog *dia; + + dia = obj; + printf("dialog delete hook!\n"); +} + +static void +_e_test_internal(E_Container *con) +{ + E_Dialog *dia; + + dia = e_dialog_new(con); + e_object_del_attach_func_set(E_OBJECT(dia), _e_test_dialog_del); + e_dialog_title_set(dia, "A Test Dialog"); + e_dialog_button_add(dia, "OK", NULL, NULL, NULL); + e_dialog_button_add(dia, "Apply", NULL, NULL, NULL); + e_dialog_button_add(dia, "Cancel", NULL, NULL, NULL); + e_dialog_show(dia); +} +#elif 0 #else static void _e_test_internal(E_Container *con) =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_zone.c,v retrieving revision 1.69 retrieving revision 1.70 diff -u -3 -r1.69 -r1.70 --- e_zone.c 27 Jul 2005 04:51:42 -0000 1.69 +++ e_zone.c 28 Jul 2005 04:35:45 -0000 1.70 @@ -807,7 +807,6 @@ E_Event_Pointer_Warp *ev; int x, y; - printf("_e_zone_cb_timer()\n"); ev = E_NEW(E_Event_Pointer_Warp, 1); if (!ev) return 0; @@ -834,14 +833,11 @@ } break; case E_DIRECTION_RIGHT: - printf("clip right...\n"); if (E_ZONE_FLIP_RIGHT(zone)) { - printf("ummm...\n"); current = e_desk_at_xy_get(zone, zone->desk_x_current + 1, zone->desk_y_current); if (current) { - printf("show new desk\n"); e_desk_show(current); ecore_x_pointer_warp(zone->container->win, 2, y); ev->curr.y = y; ------------------------------------------------------- SF.Net email is Sponsored by the Better Software Conference & EXPO September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf _______________________________________________ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs