Enlightenment CVS committal
Author : doursse
Project : e17
Module : proto
Dir : e17/proto/edvi/src/lib
Modified Files:
edvi.c edvi_document.c edvi_framebuffer.c edvi_page.c
edvi_private.h edvi_property.c etk_dvi.c
Log Message:
support older (2.8.0) dvilib. Use new etk api. Ewl widget does not work, I
don't understand why yet
===================================================================
RCS file: /cvs/e/e17/proto/edvi/src/lib/edvi.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- edvi.c 16 Jul 2006 20:51:17 -0000 1.1
+++ edvi.c 11 Sep 2006 07:22:08 -0000 1.2
@@ -2,7 +2,13 @@
#include <stdio.h>
#include <math.h>
-#include <libdvi29.h>
+#include "config.h"
+
+#ifdef HAVE_DVILIB_2_9
+# include <libdvi29.h>
+#else
+# include <dvi-2_6.h>
+#endif /* HAVE_DVILIB_2_9 */
#include "edvi_enum.h"
#include "edvi_forward.h"
===================================================================
RCS file: /cvs/e/e17/proto/edvi/src/lib/edvi_document.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- edvi_document.c 16 Jul 2006 20:51:17 -0000 1.1
+++ edvi_document.c 11 Sep 2006 07:22:08 -0000 1.2
@@ -1,6 +1,12 @@
#include <stdlib.h>
-#include <libdvi29.h>
+#include "config.h"
+
+#ifdef HAVE_DVILIB_2_9
+# include <libdvi29.h>
+#else
+# include <dvi-2_6.h>
+#endif /* HAVE_DVILIB_2_9 */
#include "edvi_enum.h"
#include "edvi_forward.h"
===================================================================
RCS file: /cvs/e/e17/proto/edvi/src/lib/edvi_framebuffer.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- edvi_framebuffer.c 16 Jul 2006 20:51:17 -0000 1.1
+++ edvi_framebuffer.c 11 Sep 2006 07:22:08 -0000 1.2
@@ -1,6 +1,12 @@
#include <stdlib.h>
-#include <libdvi29.h>
+#include "config.h"
+
+#ifdef HAVE_DVILIB_2_9
+# include <libdvi29.h>
+#else
+# include <dvi-2_6.h>
+#endif /* HAVE_DVILIB_2_9 */
#include "edvi_enum.h"
#include "edvi_forward.h"
===================================================================
RCS file: /cvs/e/e17/proto/edvi/src/lib/edvi_page.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- edvi_page.c 16 Jul 2006 20:51:17 -0000 1.1
+++ edvi_page.c 11 Sep 2006 07:22:08 -0000 1.2
@@ -1,6 +1,12 @@
#include <stdlib.h>
-#include <libdvi29.h>
+#include "config.h"
+
+#ifdef HAVE_DVILIB_2_9
+# include <libdvi29.h>
+#else
+# include <dvi-2_6.h>
+#endif /* HAVE_DVILIB_2_9 */
#include "edvi_enum.h"
#include "edvi_forward.h"
===================================================================
RCS file: /cvs/e/e17/proto/edvi/src/lib/edvi_private.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- edvi_private.h 16 Jul 2006 20:51:17 -0000 1.1
+++ edvi_private.h 11 Sep 2006 07:22:08 -0000 1.2
@@ -2,7 +2,13 @@
#define __EDVI_PRIVATE_H__
-#include <libdvi29.h>
+#include "config.h"
+
+#ifdef HAVE_DVILIB_2_9
+# include <libdvi29.h>
+#else
+# include <dvi-2_6.h>
+#endif /* HAVE_DVILIB_2_9 */
#include <Evas.h>
===================================================================
RCS file: /cvs/e/e17/proto/edvi/src/lib/edvi_property.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- edvi_property.c 16 Jul 2006 20:51:17 -0000 1.1
+++ edvi_property.c 11 Sep 2006 07:22:08 -0000 1.2
@@ -1,6 +1,12 @@
#include <stdlib.h>
-#include <libdvi29.h>
+#include "config.h"
+
+#ifdef HAVE_DVILIB_2_9
+# include <libdvi29.h>
+#else
+# include <dvi-2_6.h>
+#endif /* HAVE_DVILIB_2_9 */
#include "edvi_enum.h"
#include "edvi_forward.h"
===================================================================
RCS file: /cvs/e/e17/proto/edvi/src/lib/etk_dvi.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- etk_dvi.c 16 Jul 2006 20:51:17 -0000 1.1
+++ etk_dvi.c 11 Sep 2006 07:22:08 -0000 1.2
@@ -458,9 +458,15 @@
{
Etk_Dvi *dvi;
Evas *evas;
+/* Evas_Object *o; */
if (!(dvi = ETK_DVI(object)) || !(evas =
etk_widget_toplevel_evas_get(ETK_WIDGET(dvi))))
return;
+
+/* o = evas_object_rectangle_add(evas); */
+/* evas_object_color_set(o, 255, 255, 0, 128); */
+/* etk_widget_member_object_add(ETK_WIDGET(object), o); */
+/* evas_object_show(o); */
_etk_dvi_load(dvi);
}
@@ -508,7 +514,6 @@
if (dvi->dvi_object)
{
dvi->dvi_page = edvi_page_new (dvi->dvi_document, dvi->page);
-
edvi_page_render (dvi->dvi_page, dvi->dvi_device, dvi->dvi_object);
}
evas_object_show(dvi->dvi_object);
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
