Enlightenment CVS committal
Author : doursse
Project : e17
Module : proto/edvi
Dir : e17/proto/edvi/src/bin
Modified Files:
edvi_esmart_test.c edvi_evas_test.c edvi_ewl_test.c
ewl_test_dvi.c
Log Message:
* configure.in:
fix autoconf warnings
* Makefile.am:
more files in maintainer rule
* edvi.pc.in:
fix cflags
* src/bin/edvi_esmart_test.c: (main):
* src/bin/edvi_evas_test.c: (main):
* src/bin/edvi_ewl_test.c: (main), (_change_page_cb):
* src/bin/ewl_test_dvi.c: (dvi_load):
* src/lib/Edvi.h:
* src/lib/edvi_document.c: (edvi_document_new):
* src/lib/edvi_document.h:
* src/lib/edvi_enum.h:
* src/lib/edvi_main.h:
* src/lib/edvi_page.c: (_edvi_format_string_get), (edvi_page_new),
(edvi_page_render), (edvi_page_page_set), (edvi_page_page_get),
(edvi_page_size_get), (edvi_page_mag_get), (edvi_page_format_set),
(edvi_page_format_get), (edvi_page_orientation_get):
* src/lib/edvi_page.h:
* src/lib/edvi_private.h:
* src/lib/esmart_dvi.c: (esmart_dvi_init), (esmart_dvi_file_set),
(esmart_dvi_page_set), (esmart_dvi_page_get),
(esmart_dvi_size_get), (esmart_dvi_orientation_set),
(esmart_dvi_orientation_get), (esmart_dvi_mag_set),
(esmart_dvi_mag_get), (esmart_dvi_page_next),
(esmart_dvi_page_previous), (esmart_dvi_render),
(esmart_dvi_dvi_document_get), (esmart_dvi_dvi_page_get),
(_smart_clip_unset):
* src/lib/esmart_dvi.h:
* src/lib/etk_dvi.c: (etk_dvi_file_set), (etk_dvi_page_set),
(etk_dvi_page_get), (etk_dvi_size_get), (etk_dvi_orientation_set),
(etk_dvi_mag_set), (etk_dvi_mag_get), (etk_dvi_page_next),
(etk_dvi_page_previous), (etk_dvi_dvi_document_get),
(etk_dvi_dvi_page_get), (_etk_dvi_constructor),
(_etk_dvi_destructor), (_etk_dvi_realize_cb),
(_etk_dvi_unrealize_cb), (_etk_dvi_load):
* src/lib/etk_dvi.h:
* src/lib/ewl_dvi.c: (ewl_dvi_new), (ewl_dvi_init),
(ewl_dvi_file_set), (ewl_dvi_file_get), (ewl_dvi_page_set),
(ewl_dvi_page_get), (ewl_dvi_dvi_size_get),
(ewl_dvi_orientation_set), (ewl_dvi_orientation_get),
(ewl_dvi_mag_set), (ewl_dvi_mag_get), (ewl_dvi_page_next),
(ewl_dvi_page_previous), (ewl_dvi_dvi_document_get),
(ewl_dvi_dvi_page_get), (ewl_dvi_reveal_cb), (ewl_dvi_obscure_cb),
(ewl_dvi_configure_cb), (ewl_dvi_destroy_cb):
* src/lib/ewl_dvi.h:
updates to fit Epdf API
* src/plugins/epsilon/epsilon_thumbnailer.c:
(epsilon_generate_thumb):
update to the newest Epsilon API
* src/plugins/ewl/ewl_dvi.c: (create_test):
use ewl_model_ecore_list_instance instead of ewl_model_ecore_list_get
===================================================================
RCS file: /cvs/e/e17/proto/edvi/src/bin/edvi_esmart_test.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- edvi_esmart_test.c 1 Mar 2008 22:59:51 -0000 1.5
+++ edvi_esmart_test.c 13 Jul 2008 10:11:57 -0000 1.6
@@ -80,6 +80,7 @@
esmart_dvi_file_set (o, argv[1]);
esmart_dvi_page_set (o, page_number);
+ esmart_dvi_render (o);
evas_object_move (o, 0, 0);
evas_object_show (o);
===================================================================
RCS file: /cvs/e/e17/proto/edvi/src/bin/edvi_evas_test.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- edvi_evas_test.c 1 Mar 2008 22:59:51 -0000 1.5
+++ edvi_evas_test.c 13 Jul 2008 10:11:57 -0000 1.6
@@ -58,6 +58,8 @@
Evas_Object *o;
char *param_kpathsea_mode = "cx";
int page_number;
+ int width;
+ int height;
if (argc < 3) {
printf ("\nUsage: %s file.dvi page_number\n\n", argv[0]);
@@ -89,24 +91,30 @@
}
sscanf (argv[2], "%d", &page_number);
- page = edvi_page_new (document, page_number);
+ page = edvi_page_new (document);
if (!page) {
goto free_document;
}
+ edvi_page_page_set (page, page_number);
+ edvi_page_size_get (page, &width, &height);
- /* evas stuff */
- if (!evas_init()) {
- goto free_page;
- }
if (!ecore_init()) {
- goto shutdown_evas;
+ goto free_page;
}
if (!ecore_evas_init()) {
goto shutdown_ecore;
}
- ee = ecore_evas_software_x11_new (NULL, 0, 0, 0, 600, 850);
+ ee = ecore_evas_software_x11_new (NULL, 0, 0, 0, width, height);
+ /* these tests can be improved... */
+ if (!ee) {
+ printf ("Can not find Software X11 engine. Trying DirectDraw engine...\n");
+ ee = ecore_evas_software_ddraw_new (NULL, 0, 0, width, height);
+ if (!ee) {
+ goto shutdown_ecore_evas;
+ }
+ }
ecore_event_handler_add (ECORE_EVENT_SIGNAL_EXIT, app_signal_exit, NULL);
ecore_evas_callback_delete_request_set (ee, app_delete_request);
ecore_evas_title_set (ee, "Evas Dvi Test");
@@ -118,11 +126,9 @@
o = evas_object_image_add (evas);
evas_object_move (o, 0, 0);
- evas_object_image_size_set (o, edvi_page_width_get (page),
edvi_page_height_get (page));
_evas_object_bg_set (o, 255, 255, 255);
edvi_page_render (page, device, o);
evas_object_show (o);
- ecore_evas_resize (ee, edvi_page_width_get (page), edvi_page_height_get
(page));
ecore_main_loop_begin ();
@@ -137,10 +143,10 @@
return EXIT_SUCCESS;
+ shutdown_ecore_evas:
+ ecore_evas_shutdown ();
shutdown_ecore:
ecore_shutdown ();
- shutdown_evas:
- evas_shutdown ();
free_page:
edvi_page_delete (page);
free_document:
===================================================================
RCS file: /cvs/e/e17/proto/edvi/src/bin/edvi_ewl_test.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- edvi_ewl_test.c 17 Apr 2008 14:18:33 -0000 1.9
+++ edvi_ewl_test.c 13 Jul 2008 10:11:57 -0000 1.10
@@ -50,13 +50,10 @@
/* We open the dvi file */
dvi = ewl_dvi_new ();
- ewl_dvi_file_set (EWL_DVI (dvi), argv[1]);
- document = ewl_dvi_dvi_document_get (EWL_DVI (dvi));
- if (!document) {
- printf ("The file %s can't be opened\n", argv[1]);
+ if (!ewl_dvi_file_set (EWL_DVI (dvi), argv[1])) {
+ printf ("Can not load the document %s\nExiting...", argv[1]);
ecore_list_destroy (str_data);
- ewl_main_quit ();
- edvi_shutdown ();
+ ewl_main_quit();
return EXIT_FAILURE;
}
@@ -74,6 +71,7 @@
ewl_container_child_append (EWL_CONTAINER (hbox), sp);
ewl_widget_show (sp);
+ document = ewl_dvi_dvi_document_get (EWL_DVI (dvi));
page_count = edvi_document_page_count_get (document);
for (i = 0; i < page_count; i++) {
char row_text[64];
@@ -98,7 +96,7 @@
ewl_container_child_append (EWL_CONTAINER (sp), list);
ewl_widget_show (list);
- ewl_dvi_scale_set (EWL_DVI (dvi), 0.5, 0.5);
+ ewl_dvi_mag_set (EWL_DVI (dvi), 0.5);
ewl_container_child_append (EWL_CONTAINER (hbox), dvi);
ewl_widget_show (dvi);
@@ -138,6 +136,6 @@
dvi = EWL_DVI (user_data);
if (idx->row != (unsigned int)ewl_dvi_page_get (dvi)) {
ewl_dvi_page_set (dvi, idx->row);
- ewl_callback_call (EWL_WIDGET (dvi), EWL_CALLBACK_REVEAL);
+ ewl_widget_configure(EWL_WIDGET(dvi));
}
}
===================================================================
RCS file: /cvs/e/e17/proto/edvi/src/bin/ewl_test_dvi.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- ewl_test_dvi.c 8 Jul 2007 07:20:07 -0000 1.2
+++ ewl_test_dvi.c 13 Jul 2008 10:11:57 -0000 1.3
@@ -201,7 +201,7 @@
EWL_CALLBACK_DESTROY,
EWL_CALLBACK_FUNCTION (_row_data_free_cb),
NULL);
- }
+ }
}
static void
-------------------------------------------------------------------------
Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW!
Studies have shown that voting for your favorite open source project,
along with a healthy diet, reduces your potential for chronic lameness
and boredom. Vote Now at http://www.sourceforge.net/community/cca08
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
