Enlightenment CVS committal Author : raster Project : e17 Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore_evas Modified Files: ecore_evas_private.h ecore_evas_x.c Log Message: oh silly! this woudl fuck up on multihead... FIXED! =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_evas/ecore_evas_private.h,v retrieving revision 1.9 retrieving revision 1.10 diff -u -3 -r1.9 -r1.10 --- ecore_evas_private.h 8 Jan 2005 18:40:31 -0000 1.9 +++ ecore_evas_private.h 25 Apr 2005 08:28:27 -0000 1.10 @@ -82,6 +82,7 @@ #ifdef BUILD_ECORE_X struct { + Ecore_X_Window win_root; Ecore_X_Window win_container; Ecore_X_Window win; Ecore_X_Pixmap pmap; =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_evas/ecore_evas_x.c,v retrieving revision 1.34 retrieving revision 1.35 diff -u -3 -r1.34 -r1.35 --- ecore_evas_x.c 31 Mar 2005 15:39:36 -0000 1.34 +++ ecore_evas_x.c 25 Apr 2005 08:28:27 -0000 1.35 @@ -1028,13 +1028,13 @@ if (((ee->prop.override) && (on)) || ((!ee->prop.override) && (!on))) return; ecore_x_window_hide(ee->engine.x.win); - ecore_x_window_reparent(ee->engine.x.win, 0, 0, 0); + ecore_x_window_reparent(ee->engine.x.win, ee->engine.x.win_root, 0, 0); ecore_x_window_del(ee->engine.x.win_container); if (on) - ee->engine.x.win_container = ecore_x_window_override_new(0, ee->x, ee->y, ee->w, ee->h); + ee->engine.x.win_container = ecore_x_window_override_new(ee->engine.x.win_root, ee->x, ee->y, ee->w, ee->h); else { - ee->engine.x.win_container = ecore_x_window_new(0, ee->x, ee->y, ee->w, ee->h); + ee->engine.x.win_container = ecore_x_window_new(ee->engine.x.win_root, ee->x, ee->y, ee->w, ee->h); ecore_x_window_prop_title_set(ee->engine.x.win_container, ee->prop.title); ecore_x_window_prop_name_class_set(ee->engine.x.win_container, ee->prop.name, ee->prop.clas); if (ee->func.fn_delete_request) @@ -1046,8 +1046,8 @@ ecore_x_window_prop_borderless_set(ee->engine.x.win_container, ee->prop.borderless); ecore_x_window_prop_layer_set(ee->engine.x.win_container, ee->prop.layer); ecore_x_window_prop_withdrawn_set(ee->engine.x.win_container, ee->prop.withdrawn); - ecore_x_window_prop_sticky_set(ee->engine.x.win_container, - ee->prop.sticky); + ecore_x_window_prop_sticky_set(ee->engine.x.win_container, + ee->prop.sticky); } ecore_x_window_reparent(ee->engine.x.win, ee->engine.x.win_container, 0, 0); ecore_x_window_show(ee->engine.x.win); @@ -1067,7 +1067,7 @@ ecore_x_window_size_get(0, &rw, &rh); ecore_x_window_move_resize(ee->engine.x.win, 0, 0, rw, rh); - ecore_x_window_reparent(ee->engine.x.win, 0, 0, 0); + ecore_x_window_reparent(ee->engine.x.win, ee->engine.x.win_root, 0, 0); ecore_x_window_raise(ee->engine.x.win); ecore_x_window_show(ee->engine.x.win); ecore_x_window_focus(ee->engine.x.win); @@ -1273,7 +1273,8 @@ evas_output_method_set(ee->evas, rmethod); evas_output_size_set(ee->evas, w, h); evas_output_viewport_set(ee->evas, 0, 0, w, h); - + + ee->engine.x.win_root = parent; ee->engine.x.win_container = ecore_x_window_new(parent, x, y, w, h); ee->engine.x.win = ecore_x_window_override_new(ee->engine.x.win_container, 0, 0, w, h); @@ -1442,6 +1443,7 @@ evas_output_size_set(ee->evas, w, h); evas_output_viewport_set(ee->evas, 0, 0, w, h); + ee->engine.x.win_root = parent; ee->engine.x.win_container = ecore_x_window_new(parent, x, y, w, h); einfo = (Evas_Engine_Info_GL_X11 *)evas_engine_info_get(ee->evas); if (einfo) ------------------------------------------------------- SF email is sponsored by - The IT Product Guide Read honest & candid reviews on hundreds of IT Products from real users. Discover which products truly live up to the hype. Start reading now. http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click _______________________________________________ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs