Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore_evas
Modified Files:
Tag: SPLIT
ecore_evas_fb.c ecore_evas_private.h ecore_evas_x.c
Log Message:
ooooooops.. thats better!
===================================================================
RCS file:
/cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_evas/Attic/ecore_evas_fb.c,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -3 -r1.1.2.2 -r1.1.2.3
--- ecore_evas_fb.c 11 Feb 2003 11:26:05 -0000 1.1.2.2
+++ ecore_evas_fb.c 12 Feb 2003 04:40:32 -0000 1.1.2.3
@@ -134,6 +134,7 @@
ee->h = h;
evas_output_size_set(ee->evas, ee->w, ee->h);
evas_output_viewport_set(ee->evas, 0, 0, ee->w, ee->h);
+ evas_damage_rectangle_add(ee->evas, 0, 0, ee->w, ee->h);
if (ee->func.fn_resize) ee->func.fn_resize(ee);
}
@@ -145,6 +146,7 @@
ee->h = h;
evas_output_size_set(ee->evas, ee->w, ee->h);
evas_output_viewport_set(ee->evas, 0, 0, ee->w, ee->h);
+ evas_damage_rectangle_add(ee->evas, 0, 0, ee->w, ee->h);
if (ee->func.fn_resize) ee->func.fn_resize(ee);
}
@@ -185,6 +187,50 @@
evas_object_show(ee->prop.cursor.object);
}
+static void
+_ecore_evas_fullscreen_set(Ecore_Evas *ee, int on)
+{
+ int resized = 0;
+
+ if (((ee->prop.fullscreen) && (on)) ||
+ ((!ee->prop.fullscreen) && (!on))) return;
+ if (on)
+ {
+ int w, h;
+
+ ee->engine.fb.real_w = ee->w;
+ ee->engine.fb.real_h = ee->h;
+ w = ee->w;
+ h = ee->h;
+ ecore_fb_size_get(&w, &h);
+ if ((w == 0) && (h == 0))
+ {
+ w = ee->w;
+ h = ee->h;
+ }
+ if ((w != ee->w) || (h != ee->h)) resized = 1;
+ ee->w = w;
+ ee->h = h;
+ evas_output_size_set(ee->evas, ee->w, ee->h);
+ evas_output_viewport_set(ee->evas, 0, 0, ee->w, ee->h);
+ evas_damage_rectangle_add(ee->evas, 0, 0, ee->w, ee->h);
+ }
+ else
+ {
+ if ((ee->engine.fb.real_w != ee->w) || (ee->engine.fb.real_h != ee->h))
+resized = 1;
+ ee->w = ee->engine.fb.real_w;
+ ee->h = ee->engine.fb.real_h;
+ evas_output_size_set(ee->evas, ee->w, ee->h);
+ evas_output_viewport_set(ee->evas, 0, 0, ee->w, ee->h);
+ evas_damage_rectangle_add(ee->evas, 0, 0, ee->w, ee->h);
+ }
+ ee->prop.fullscreen = on;
+ if (resized)
+ {
+ if (ee->func.fn_resize) ee->func.fn_resize(ee);
+ }
+}
+
static const Ecore_Evas_Engine_Func _ecore_fb_engine_func =
{
_ecore_evas_fb_free,
@@ -220,7 +266,7 @@
NULL,
NULL,
NULL,
- NULL,
+ _ecore_evas_fullscreen_set,
NULL
};
@@ -281,7 +327,9 @@
ee->rotation = rotation;
ee->visible = 1;
-
+ ee->w = w;
+ ee->h = h;
+
ee->prop.max.w = 240;
ee->prop.max.h = 320;
ee->prop.layer = 0;
@@ -289,7 +337,7 @@
ee->prop.borderless = 1;
ee->prop.override = 1;
ee->prop.maximized = 1;
- ee->prop.fullscreen = 1;
+ ee->prop.fullscreen = 0;
/* init evas here */
ee->evas = evas_new();
===================================================================
RCS file:
/cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_evas/Attic/ecore_evas_private.h,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -3 -r1.1.2.9 -r1.1.2.10
--- ecore_evas_private.h 11 Feb 2003 06:27:09 -0000 1.1.2.9
+++ ecore_evas_private.h 12 Feb 2003 04:40:32 -0000 1.1.2.10
@@ -68,6 +68,12 @@
Region damages;
} x;
#endif
+#ifdef BUILD_ECORE_FB
+ struct {
+ int real_w;
+ int real_h;
+ } fb;
+#endif
};
struct _Ecore_Evas
===================================================================
RCS file:
/cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_evas/Attic/ecore_evas_x.c,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -3 -r1.1.2.2 -r1.1.2.3
--- ecore_evas_x.c 11 Feb 2003 11:26:05 -0000 1.1.2.2
+++ ecore_evas_x.c 12 Feb 2003 04:40:32 -0000 1.1.2.3
@@ -842,6 +842,11 @@
ee->driver = strdup("software_x11");
if (disp_name) ee->name = strdup(disp_name);
+
+ ee->x = x;
+ ee->y = y;
+ ee->w = w;
+ ee->h = h;
ee->prop.max.w = 32767;
ee->prop.max.h = 32767;
-------------------------------------------------------
This SF.NET email is sponsored by:
SourceForge Enterprise Edition + IBM + LinuxWorld = Something 2 See!
http://www.vasoftware.com
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
