Enlightenment CVS committal
Author : sebastid
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_border.c
Log Message:
Focus is fixed, so remove focus fix function.
Add _e_border_menus_del()
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_border.c,v
retrieving revision 1.335
retrieving revision 1.336
diff -u -3 -r1.335 -r1.336
--- e_border.c 19 Jul 2005 08:04:19 -0000 1.335
+++ e_border.c 19 Jul 2005 08:15:03 -0000 1.336
@@ -21,6 +21,7 @@
/* local subsystem functions */
static void _e_border_free(E_Border *bd);
static void _e_border_del(E_Border *bd);
+static void _e_border_menus_del(E_Border *bd);
/* FIXME: these likely belong in a separate icccm/client handler */
/* and the border needs to become a dumb object that just does what its */
@@ -119,7 +120,6 @@
static int _e_border_move_end(E_Border *bd);
static void _e_border_move_update(E_Border *bd);
-static int _e_border_cb_focus_fix(void *data);
static int _e_border_cb_ping_timer(void *data);
static int _e_border_cb_kill_timer(void *data);
@@ -134,8 +134,6 @@
static E_Border *resize = NULL;
static E_Border *move = NULL;
-static Ecore_Timer *focus_fix_timer = NULL;
-
static int grabbed = 0;
static Evas_List *focus_stack = NULL;
@@ -205,8 +203,6 @@
E_EVENT_BORDER_LOWER = ecore_event_type_new();
E_EVENT_BORDER_ICON_CHANGE = ecore_event_type_new();
- //focus_fix_timer = ecore_timer_add(0.1, _e_border_cb_focus_fix, NULL);
-
return 1;
}
@@ -221,8 +217,6 @@
handlers = evas_list_remove_list(handlers, handlers);
ecore_event_handler_del(h);
}
- //ecore_timer_del(focus_fix_timer);
- focus_fix_timer = NULL;
return 1;
}
@@ -1965,26 +1959,9 @@
free(bd->pending_move_resize->data);
bd->pending_move_resize =
evas_list_remove_list(bd->pending_move_resize, bd->pending_move_resize);
}
- if (bd->border_menu)
- {
- e_object_del(E_OBJECT(bd->border_menu));
- bd->border_menu = NULL;
- }
- if (bd->border_locks_menu)
- {
- e_object_del(E_OBJECT(bd->border_locks_menu));
- bd->border_locks_menu = NULL;
- }
- if (bd->border_remember_menu)
- {
- e_object_del(E_OBJECT(bd->border_remember_menu));
- bd->border_remember_menu = NULL;
- }
- if (bd->border_stacking_menu)
- {
- e_object_del(E_OBJECT(bd->border_stacking_menu));
- bd->border_stacking_menu = NULL;
- }
+
+ _e_border_menus_del(bd);
+
if (focused == bd)
{
// ecore_x_window_focus(bd->zone->container->manager->root);
@@ -2083,6 +2060,31 @@
ecore_event_add(E_EVENT_BORDER_REMOVE, ev,
_e_border_event_border_remove_free, NULL);
}
+static void
+_e_border_menus_del(E_Border *bd)
+{
+ if (bd->border_locks_menu)
+ {
+ e_object_del(E_OBJECT(bd->border_locks_menu));
+ bd->border_locks_menu = NULL;
+ }
+ if (bd->border_remember_menu)
+ {
+ e_object_del(E_OBJECT(bd->border_remember_menu));
+ bd->border_remember_menu = NULL;
+ }
+ if (bd->border_stacking_menu)
+ {
+ e_object_del(E_OBJECT(bd->border_stacking_menu));
+ bd->border_stacking_menu = NULL;
+ }
+ if (bd->border_menu)
+ {
+ e_object_del(E_OBJECT(bd->border_menu));
+ bd->border_menu = NULL;
+ }
+}
+
static int
_e_border_cb_window_show_request(void *data, int ev_type, void *ev)
{
@@ -5073,24 +5075,10 @@
bd = e_object_data_get(E_OBJECT(m));
if (bd)
{
- if (bd->border_locks_menu)
- {
- e_object_del(E_OBJECT(bd->border_locks_menu));
- bd->border_locks_menu = NULL;
- }
- if (bd->border_remember_menu)
- {
- e_object_del(E_OBJECT(bd->border_remember_menu));
- bd->border_remember_menu = NULL;
- }
- if (bd->border_stacking_menu)
- {
- e_object_del(E_OBJECT(bd->border_stacking_menu));
- bd->border_stacking_menu = NULL;
- }
- bd->border_menu = NULL;
+ _e_border_menus_del(bd);
}
- e_object_del(E_OBJECT(m));
+ else
+ e_object_del(E_OBJECT(m));
}
#define NEW_LOCK_FN(var) \
@@ -6502,34 +6490,6 @@
}
static int
-_e_border_cb_focus_fix(void *data)
-{
- if (!focused)
- {
-/*
- Evas_List *managers;
- E_Manager *man;
-
- managers = e_manager_list();
- if (managers)
- {
- E_Container *con;
-
- man = managers->data;
- con = e_manager_container_current_get(man);
- if (con)
- {
- printf("set foc to %x [%x]\n",
- man->focus_win, ecore_x_window_focus_get());
- ecore_x_window_focus(man->root);
- }
- }
- */
- }
- return 1;
-}
-
-static int
_e_border_cb_ping_timer(void *data)
{
E_Border *bd;
-------------------------------------------------------
SF.Net email is sponsored by: Discover Easy Linux Migration Strategies
from IBM. Find simple to follow Roadmaps, straightforward articles,
informative Webcasts and more! Get everything you need to get up to
speed, fast. http://ads.osdn.com/?ad_id=7477&alloc_id=16492&op=click
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs