Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore_evas
Modified Files:
ecore_evas_x.c
Log Message:
fix ecore_x and ecore-evas to work in multihead at all... :)
===================================================================
RCS file:
/cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_evas/ecore_evas_x.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -3 -r1.26 -r1.27
--- ecore_evas_x.c 8 Nov 2004 00:23:59 -0000 1.26
+++ ecore_evas_x.c 19 Nov 2004 08:16:47 -0000 1.27
@@ -1179,11 +1179,42 @@
einfo = (Evas_Engine_Info_Software_X11 *)evas_engine_info_get(ee->evas);
if (einfo)
{
+ int screen;
+
+ /* FIXME: this is inefficient as its a round trip */
+ screen = DefaultScreen(ecore_x_display_get());
+ if (ScreenCount(ecore_x_display_get()) > 1)
+ {
+ Ecore_X_Window *roots;
+ int num, i;
+
+ num = 0;
+ roots = ecore_x_window_root_list(&num);
+ if (roots)
+ {
+ XWindowAttributes at;
+
+ if (XGetWindowAttributes(ecore_x_display_get(),
+ parent, &at))
+ {
+ for (i = 0; i < num; i++)
+ {
+ if (roots[i] == at.root == roots[i])
+ {
+ screen = i;
+ break;
+ }
+ }
+ }
+ free(roots);
+ }
+ }
+ printf("EVAS ON SCREEN %i\n", screen);
einfo->info.display = ecore_x_display_get();
- einfo->info.visual = DefaultVisual(ecore_x_display_get(),
DefaultScreen(ecore_x_display_get()));
- einfo->info.colormap = DefaultColormap(ecore_x_display_get(),
DefaultScreen(ecore_x_display_get()));
+ einfo->info.visual = DefaultVisual(ecore_x_display_get(), screen);
+ einfo->info.colormap = DefaultColormap(ecore_x_display_get(), screen);
einfo->info.drawable = ee->engine.x.win;
- einfo->info.depth = DefaultDepth(ecore_x_display_get(),
DefaultScreen(ecore_x_display_get()));
+ einfo->info.depth = DefaultDepth(ecore_x_display_get(), screen);
einfo->info.rotation = 0;
einfo->info.debug = 0;
evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo);
@@ -1266,10 +1297,41 @@
if (einfo)
{
XSetWindowAttributes attr;
+ int screen;
+
+ /* FIXME: this is inefficient as its a round trip */
+ screen = DefaultScreen(ecore_x_display_get());
+ if (ScreenCount(ecore_x_display_get()) > 1)
+ {
+ Ecore_X_Window *roots;
+ int num, i;
+
+ num = 0;
+ roots = ecore_x_window_root_list(&num);
+ if (roots)
+ {
+ XWindowAttributes at;
+
+ if (XGetWindowAttributes(ecore_x_display_get(),
+ parent, &at))
+ {
+ for (i = 0; i < num; i++)
+ {
+ if (roots[i] == at.root == roots[i])
+ {
+ screen = i;
+ break;
+ }
+ }
+ }
+ free(roots);
+ }
+ }
+ printf("EVAS ON SCREEN %i\n", screen);
attr.backing_store = NotUseful;
attr.override_redirect = True;
- attr.colormap = einfo->func.best_colormap_get(ecore_x_display_get(),
DefaultScreen(ecore_x_display_get()));
+ attr.colormap = einfo->func.best_colormap_get(ecore_x_display_get(),
screen);
attr.border_pixel = 0;
attr.background_pixmap = None;
attr.event_mask =
@@ -1285,19 +1347,19 @@
ee->engine.x.win_container,
0, 0,
w, h, 0,
- einfo->func.best_depth_get(ecore_x_display_get(),
DefaultScreen(ecore_x_display_get())),
+ einfo->func.best_depth_get(ecore_x_display_get(),
screen),
InputOutput,
- einfo->func.best_visual_get(ecore_x_display_get(),
DefaultScreen(ecore_x_display_get())),
+ einfo->func.best_visual_get(ecore_x_display_get(),
screen),
CWBackingStore | CWColormap |
CWBackPixmap | CWBorderPixel |
CWBitGravity | CWEventMask |
CWOverrideRedirect,
&attr);
einfo->info.display = ecore_x_display_get();
- einfo->info.visual =
einfo->func.best_visual_get(ecore_x_display_get(),
DefaultScreen(ecore_x_display_get()));
- einfo->info.colormap =
einfo->func.best_colormap_get(ecore_x_display_get(),
DefaultScreen(ecore_x_display_get()));
+ einfo->info.visual =
einfo->func.best_visual_get(ecore_x_display_get(), screen);
+ einfo->info.colormap =
einfo->func.best_colormap_get(ecore_x_display_get(), screen);
einfo->info.drawable = ee->engine.x.win;
- einfo->info.depth =
einfo->func.best_depth_get(ecore_x_display_get(),
DefaultScreen(ecore_x_display_get()));
+ einfo->info.depth =
einfo->func.best_depth_get(ecore_x_display_get(), screen);
evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo);
}
evas_key_modifier_add(ee->evas, "Shift");
-------------------------------------------------------
This SF.Net email is sponsored by: InterSystems CACHE
FREE OODBMS DOWNLOAD - A multidimensional database that combines
robust object and relational technologies, making it a perfect match
for Java, C++,COM, XML, ODBC and JDBC. www.intersystems.com/match8
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
