From 81c8839992b7bfd924724b16fb52dbb82f7c5968 Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Sat, 22 Jan 2005 03:36:43 +0000 Subject: [PATCH] dont start managing unmapped windows. remove e manage info from unmanaged clients SVN revision: 13050 --- src/bin/e_atoms.c | 1 - src/bin/e_atoms.h | 6 +++--- src/bin/e_border.c | 3 +++ src/bin/e_main.c | 24 ++++++++++++------------ 4 files changed, 18 insertions(+), 16 deletions(-) diff --git a/src/bin/e_atoms.c b/src/bin/e_atoms.c index ba78d6ee0..4661c55af 100644 --- a/src/bin/e_atoms.c +++ b/src/bin/e_atoms.c @@ -12,7 +12,6 @@ e_atoms_init(void) E_ATOM_MANAGED = ecore_x_atom_get("__E_WINDOW_MANAGED"); E_ATOM_DESK = ecore_x_atom_get("__E_WINDOW_DESK"); E_ATOM_ICONIC = ecore_x_atom_get("__E_WINDOW_ICONIC"); - return 1; } diff --git a/src/bin/e_atoms.h b/src/bin/e_atoms.h index 78ca0eeed..15334d005 100644 --- a/src/bin/e_atoms.h +++ b/src/bin/e_atoms.h @@ -4,11 +4,11 @@ #define E_ATOMS_H /* an "overall" atom to see that we recognise the window */ -extern Ecore_X_Atom E_ATOM_MANAGED; +extern EAPI Ecore_X_Atom E_ATOM_MANAGED; /* basic window properties */ -extern Ecore_X_Atom E_ATOM_DESK; -extern Ecore_X_Atom E_ATOM_ICONIC; +extern EAPI Ecore_X_Atom E_ATOM_DESK; +extern EAPI Ecore_X_Atom E_ATOM_ICONIC; EAPI int e_atoms_init(void); EAPI int e_atoms_shutdown(void); diff --git a/src/bin/e_border.c b/src/bin/e_border.c index 89c3cc3ab..4a6d6daeb 100644 --- a/src/bin/e_border.c +++ b/src/bin/e_border.c @@ -883,6 +883,9 @@ e_border_idler_before(void) static void _e_border_free(E_Border *bd) { + ecore_x_window_prop_property_del(bd->client.win, E_ATOM_MANAGED); + ecore_x_window_prop_property_del(bd->client.win, E_ATOM_DESK); + ecore_x_window_prop_property_del(bd->client.win, E_ATOM_ICONIC); while (bd->pending_move_resize) { free(bd->pending_move_resize->data); diff --git a/src/bin/e_main.c b/src/bin/e_main.c index f12461d4b..2695bd5fb 100644 --- a/src/bin/e_main.c +++ b/src/bin/e_main.c @@ -523,10 +523,10 @@ _e_main_screens_init(void) &ret_val, 1); /* we have seen this window before */ - if (ret > -1 && ret_val == 1) + if ((ret > -1) && (ret_val == 1)) { E_Border *bd; - + /* get all information from window before it is * reset by e_border_new */ ret = ecore_x_window_prop_card32_get(windows[i], @@ -535,16 +535,16 @@ _e_main_screens_init(void) bd = e_border_new(con, windows[i], 1); if (bd) { - if (ret == 2) - { - E_Desk *target; - target = e_desk_at_xy_get(bd->zone, - deskxy[0], - deskxy[1]); - e_border_desk_set(bd, target); - if (target == e_desk_current_get(bd->zone)) - e_border_show(bd); - } + if (ret == 2) + { + E_Desk *target; + target = e_desk_at_xy_get(bd->zone, + deskxy[0], + deskxy[1]); + e_border_desk_set(bd, target); + if (target == e_desk_current_get(bd->zone)) + e_border_show(bd); + } } ret = ecore_x_window_prop_card32_get(windows[i], E_ATOM_ICONIC,