summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Haitzler <raster@rasterman.com>2005-01-22 03:36:43 +0000
committerCarsten Haitzler <raster@rasterman.com>2005-01-22 03:36:43 +0000
commit81c8839992b7bfd924724b16fb52dbb82f7c5968 (patch)
treeeeedd24e263e43c82a0baafcd996585a9e24f1b8
parent6697521787ff5731f196adf18ba86c0a35a25212 (diff)
dont start managing unmapped windows. remove e manage info from unmanaged
clients SVN revision: 13050
-rw-r--r--src/bin/e_atoms.c1
-rw-r--r--src/bin/e_atoms.h6
-rw-r--r--src/bin/e_border.c3
-rw-r--r--src/bin/e_main.c24
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)
12 E_ATOM_MANAGED = ecore_x_atom_get("__E_WINDOW_MANAGED"); 12 E_ATOM_MANAGED = ecore_x_atom_get("__E_WINDOW_MANAGED");
13 E_ATOM_DESK = ecore_x_atom_get("__E_WINDOW_DESK"); 13 E_ATOM_DESK = ecore_x_atom_get("__E_WINDOW_DESK");
14 E_ATOM_ICONIC = ecore_x_atom_get("__E_WINDOW_ICONIC"); 14 E_ATOM_ICONIC = ecore_x_atom_get("__E_WINDOW_ICONIC");
15
16 return 1; 15 return 1;
17} 16}
18 17
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 @@
4#define E_ATOMS_H 4#define E_ATOMS_H
5 5
6/* an "overall" atom to see that we recognise the window */ 6/* an "overall" atom to see that we recognise the window */
7extern Ecore_X_Atom E_ATOM_MANAGED; 7extern EAPI Ecore_X_Atom E_ATOM_MANAGED;
8 8
9/* basic window properties */ 9/* basic window properties */
10extern Ecore_X_Atom E_ATOM_DESK; 10extern EAPI Ecore_X_Atom E_ATOM_DESK;
11extern Ecore_X_Atom E_ATOM_ICONIC; 11extern EAPI Ecore_X_Atom E_ATOM_ICONIC;
12 12
13EAPI int e_atoms_init(void); 13EAPI int e_atoms_init(void);
14EAPI int e_atoms_shutdown(void); 14EAPI 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)
883static void 883static void
884_e_border_free(E_Border *bd) 884_e_border_free(E_Border *bd)
885{ 885{
886 ecore_x_window_prop_property_del(bd->client.win, E_ATOM_MANAGED);
887 ecore_x_window_prop_property_del(bd->client.win, E_ATOM_DESK);
888 ecore_x_window_prop_property_del(bd->client.win, E_ATOM_ICONIC);
886 while (bd->pending_move_resize) 889 while (bd->pending_move_resize)
887 { 890 {
888 free(bd->pending_move_resize->data); 891 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)
523 &ret_val, 1); 523 &ret_val, 1);
524 524
525 /* we have seen this window before */ 525 /* we have seen this window before */
526 if (ret > -1 && ret_val == 1) 526 if ((ret > -1) && (ret_val == 1))
527 { 527 {
528 E_Border *bd; 528 E_Border *bd;
529 529
530 /* get all information from window before it is 530 /* get all information from window before it is
531 * reset by e_border_new */ 531 * reset by e_border_new */
532 ret = ecore_x_window_prop_card32_get(windows[i], 532 ret = ecore_x_window_prop_card32_get(windows[i],
@@ -535,16 +535,16 @@ _e_main_screens_init(void)
535 bd = e_border_new(con, windows[i], 1); 535 bd = e_border_new(con, windows[i], 1);
536 if (bd) 536 if (bd)
537 { 537 {
538 if (ret == 2) 538 if (ret == 2)
539 { 539 {
540 E_Desk *target; 540 E_Desk *target;
541 target = e_desk_at_xy_get(bd->zone, 541 target = e_desk_at_xy_get(bd->zone,
542 deskxy[0], 542 deskxy[0],
543 deskxy[1]); 543 deskxy[1]);
544 e_border_desk_set(bd, target); 544 e_border_desk_set(bd, target);
545 if (target == e_desk_current_get(bd->zone)) 545 if (target == e_desk_current_get(bd->zone))
546 e_border_show(bd); 546 e_border_show(bd);
547 } 547 }
548 } 548 }
549 ret = ecore_x_window_prop_card32_get(windows[i], 549 ret = ecore_x_window_prop_card32_get(windows[i],
550 E_ATOM_ICONIC, 550 E_ATOM_ICONIC,