From: Enlightenment C. <no...@cv...> - 2007-08-30 14:31:53
|
Enlightenment CVS committal Author : doursse Project : e17 Module : proto/edvi Dir : e17/proto/edvi/src/plugins Log Message: Directory /cvs/e/e17/proto/edvi/src/plugins added to the repository |
From: Enlightenment C. <no...@cv...> - 2007-08-30 14:32:20
|
Enlightenment CVS committal Author : doursse Project : e17 Module : proto/edvi Dir : e17/proto/edvi/src/plugins/ewl Log Message: Directory /cvs/e/e17/proto/edvi/src/plugins/ewl added to the repository |
From: Enlightenment C. <no...@cv...> - 2007-08-30 14:32:20
|
Enlightenment CVS committal Author : doursse Project : e17 Module : proto/edvi Dir : e17/proto/edvi/src/plugins/epsilon Log Message: Directory /cvs/e/e17/proto/edvi/src/plugins/epsilon added to the repository |
From: Enlightenment C. <no...@cv...> - 2007-08-30 14:44:51
|
Enlightenment CVS committal Author : doursse Project : e17 Module : proto/edvi Dir : e17/proto/edvi/src/plugins/ewl Added Files: Makefile.am ewl_dvi.c Log Message: * Makefile.am: * configure.in: * edvi-config.in: * src/Makefile.am: * src/bin/Makefile.am: * src/lib/Makefile.am: edvi-config removed, use of pkg-config to check the various efl and other minor clean up. * src/bin/edvi_esmart_test.c: (main), (app_resize): * src/bin/edvi_etk_test.c: (main): * src/bin/edvi_evas_test.c: (main): * src/bin/edvi_ewl_test.c: (main): minor clean up of the test programs * src/lib/esmart_dvi.c: (esmart_dvi_init), (_smart_page_render): * src/lib/etk_dvi.c: (etk_dvi_file_set), (_etk_dvi_constructor), (_etk_dvi_load): * src/lib/ewl_dvi.c: (ewl_dvi_init), (ewl_dvi_file_set): the initial value of the page is set to -1. Let the first page to be drawn the first time the widget is showed. * src/plugins/Makefile.am: * src/plugins/epsilon/Makefile.am: * src/plugins/epsilon/epsilon_thumbnailer.c: (epsilon_thumb_imlib_standardize), (clip), (epsilon_generate_thumb), (epsilon_plugin_init): add epsilon thumbnailer * src/plugins/ewl/Makefile.am: * src/plugins/ewl/ewl_dvi.c: (test_info), (_change_page_cb), (create_test), (create_dvi_fd_cb), (create_dvi_fd_window_response), (dvi_load): move ewl test to its own dir |
From: Enlightenment C. <no...@cv...> - 2007-08-30 14:44:51
|
Enlightenment CVS committal Author : doursse Project : e17 Module : proto/edvi Dir : e17/proto/edvi/src/plugins/epsilon Added Files: Makefile.am epsilon_thumbnailer.c Log Message: * Makefile.am: * configure.in: * edvi-config.in: * src/Makefile.am: * src/bin/Makefile.am: * src/lib/Makefile.am: edvi-config removed, use of pkg-config to check the various efl and other minor clean up. * src/bin/edvi_esmart_test.c: (main), (app_resize): * src/bin/edvi_etk_test.c: (main): * src/bin/edvi_evas_test.c: (main): * src/bin/edvi_ewl_test.c: (main): minor clean up of the test programs * src/lib/esmart_dvi.c: (esmart_dvi_init), (_smart_page_render): * src/lib/etk_dvi.c: (etk_dvi_file_set), (_etk_dvi_constructor), (_etk_dvi_load): * src/lib/ewl_dvi.c: (ewl_dvi_init), (ewl_dvi_file_set): the initial value of the page is set to -1. Let the first page to be drawn the first time the widget is showed. * src/plugins/Makefile.am: * src/plugins/epsilon/Makefile.am: * src/plugins/epsilon/epsilon_thumbnailer.c: (epsilon_thumb_imlib_standardize), (clip), (epsilon_generate_thumb), (epsilon_plugin_init): add epsilon thumbnailer * src/plugins/ewl/Makefile.am: * src/plugins/ewl/ewl_dvi.c: (test_info), (_change_page_cb), (create_test), (create_dvi_fd_cb), (create_dvi_fd_window_response), (dvi_load): move ewl test to its own dir |
From: Enlightenment C. <no...@cv...> - 2007-08-30 14:44:52
|
Enlightenment CVS committal Author : doursse Project : e17 Module : proto/edvi Dir : e17/proto/edvi/src/plugins Added Files: Makefile.am Log Message: * Makefile.am: * configure.in: * edvi-config.in: * src/Makefile.am: * src/bin/Makefile.am: * src/lib/Makefile.am: edvi-config removed, use of pkg-config to check the various efl and other minor clean up. * src/bin/edvi_esmart_test.c: (main), (app_resize): * src/bin/edvi_etk_test.c: (main): * src/bin/edvi_evas_test.c: (main): * src/bin/edvi_ewl_test.c: (main): minor clean up of the test programs * src/lib/esmart_dvi.c: (esmart_dvi_init), (_smart_page_render): * src/lib/etk_dvi.c: (etk_dvi_file_set), (_etk_dvi_constructor), (_etk_dvi_load): * src/lib/ewl_dvi.c: (ewl_dvi_init), (ewl_dvi_file_set): the initial value of the page is set to -1. Let the first page to be drawn the first time the widget is showed. * src/plugins/Makefile.am: * src/plugins/epsilon/Makefile.am: * src/plugins/epsilon/epsilon_thumbnailer.c: (epsilon_thumb_imlib_standardize), (clip), (epsilon_generate_thumb), (epsilon_plugin_init): add epsilon thumbnailer * src/plugins/ewl/Makefile.am: * src/plugins/ewl/ewl_dvi.c: (test_info), (_change_page_cb), (create_test), (create_dvi_fd_cb), (create_dvi_fd_window_response), (dvi_load): move ewl test to its own dir |
From: Enlightenment C. <no...@cv...> - 2007-08-30 14:45:19
|
Enlightenment CVS committal Author : doursse Project : e17 Module : proto/edvi Dir : e17/proto/edvi/src Modified Files: Makefile.am Log Message: * Makefile.am: * configure.in: * edvi-config.in: * src/Makefile.am: * src/bin/Makefile.am: * src/lib/Makefile.am: edvi-config removed, use of pkg-config to check the various efl and other minor clean up. * src/bin/edvi_esmart_test.c: (main), (app_resize): * src/bin/edvi_etk_test.c: (main): * src/bin/edvi_evas_test.c: (main): * src/bin/edvi_ewl_test.c: (main): minor clean up of the test programs * src/lib/esmart_dvi.c: (esmart_dvi_init), (_smart_page_render): * src/lib/etk_dvi.c: (etk_dvi_file_set), (_etk_dvi_constructor), (_etk_dvi_load): * src/lib/ewl_dvi.c: (ewl_dvi_init), (ewl_dvi_file_set): the initial value of the page is set to -1. Let the first page to be drawn the first time the widget is showed. * src/plugins/Makefile.am: * src/plugins/epsilon/Makefile.am: * src/plugins/epsilon/epsilon_thumbnailer.c: (epsilon_thumb_imlib_standardize), (clip), (epsilon_generate_thumb), (epsilon_plugin_init): add epsilon thumbnailer * src/plugins/ewl/Makefile.am: * src/plugins/ewl/ewl_dvi.c: (test_info), (_change_page_cb), (create_test), (create_dvi_fd_cb), (create_dvi_fd_window_response), (dvi_load): move ewl test to its own dir =================================================================== RCS file: /cvs/e/e17/proto/edvi/src/Makefile.am,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- Makefile.am 16 Jul 2006 20:51:17 -0000 1.1 +++ Makefile.am 30 Aug 2007 14:44:48 -0000 1.2 @@ -1,4 +1,4 @@ -SUBDIRS = lib bin +SUBDIRS = lib bin plugins MAINTAINERCLEANFILES = Makefile.in |
From: Enlightenment C. <no...@cv...> - 2007-08-30 14:45:19
|
Enlightenment CVS committal Author : doursse Project : e17 Module : proto/edvi Dir : e17/proto/edvi Modified Files: ChangeLog Makefile.am configure.in Removed Files: edvi-config.in Log Message: * Makefile.am: * configure.in: * edvi-config.in: * src/Makefile.am: * src/bin/Makefile.am: * src/lib/Makefile.am: edvi-config removed, use of pkg-config to check the various efl and other minor clean up. * src/bin/edvi_esmart_test.c: (main), (app_resize): * src/bin/edvi_etk_test.c: (main): * src/bin/edvi_evas_test.c: (main): * src/bin/edvi_ewl_test.c: (main): minor clean up of the test programs * src/lib/esmart_dvi.c: (esmart_dvi_init), (_smart_page_render): * src/lib/etk_dvi.c: (etk_dvi_file_set), (_etk_dvi_constructor), (_etk_dvi_load): * src/lib/ewl_dvi.c: (ewl_dvi_init), (ewl_dvi_file_set): the initial value of the page is set to -1. Let the first page to be drawn the first time the widget is showed. * src/plugins/Makefile.am: * src/plugins/epsilon/Makefile.am: * src/plugins/epsilon/epsilon_thumbnailer.c: (epsilon_thumb_imlib_standardize), (clip), (epsilon_generate_thumb), (epsilon_plugin_init): add epsilon thumbnailer * src/plugins/ewl/Makefile.am: * src/plugins/ewl/ewl_dvi.c: (test_info), (_change_page_cb), (create_test), (create_dvi_fd_cb), (create_dvi_fd_window_response), (dvi_load): move ewl test to its own dir =================================================================== RCS file: /cvs/e/e17/proto/edvi/ChangeLog,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- ChangeLog 16 Jul 2006 20:51:17 -0000 1.1 +++ ChangeLog 30 Aug 2007 14:44:47 -0000 1.2 @@ -0,0 +1,37 @@ +2007-08-30 Vincent Torri <doursse at users dot sf dot net> + + * Makefile.am: + * configure.in: + * edvi-config.in: + * src/Makefile.am: + * src/bin/Makefile.am: + * src/lib/Makefile.am: + edvi-config removed, use of pkg-config to check the various efl + and other minor clean up. + + * src/bin/edvi_esmart_test.c: (main), (app_resize): + * src/bin/edvi_etk_test.c: (main): + * src/bin/edvi_evas_test.c: (main): + * src/bin/edvi_ewl_test.c: (main): + minor clean up of the test programs + + * src/lib/esmart_dvi.c: (esmart_dvi_init), (_smart_page_render): + * src/lib/etk_dvi.c: (etk_dvi_file_set), (_etk_dvi_constructor), + (_etk_dvi_load): + * src/lib/ewl_dvi.c: (ewl_dvi_init), (ewl_dvi_file_set): + the initial value of the page is set to -1. Let the first page + to be drawn the first time the widget is showed. + + * src/plugins/Makefile.am: + * src/plugins/epsilon/Makefile.am: + * src/plugins/epsilon/epsilon_thumbnailer.c: + (epsilon_thumb_imlib_standardize), (clip), + (epsilon_generate_thumb), (epsilon_plugin_init): + add epsilon thumbnailer + + * src/plugins/ewl/Makefile.am: + * src/plugins/ewl/ewl_dvi.c: (test_info), (_change_page_cb), + (create_test), (create_dvi_fd_cb), (create_dvi_fd_window_response), + (dvi_load): + move ewl test to its own dir + =================================================================== RCS file: /cvs/e/e17/proto/edvi/Makefile.am,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- Makefile.am 16 Jul 2006 20:51:17 -0000 1.1 +++ Makefile.am 30 Aug 2007 14:44:47 -0000 1.2 @@ -7,9 +7,7 @@ depcomp install-sh ltconfig ltmain.sh missing \ stamp-h.in -bin_SCRIPTS = edvi-config - -EXTRA_DIST = AUTHORS README edvi.pc.in edvi-config.in +EXTRA_DIST = AUTHORS README edvi.pc.in pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = edvi.pc =================================================================== RCS file: /cvs/e/e17/proto/edvi/configure.in,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- configure.in 22 Feb 2007 17:26:50 -0000 1.3 +++ configure.in 30 Aug 2007 14:44:47 -0000 1.4 @@ -1,11 +1,19 @@ AC_PREREQ(2.54) -AC_INIT(edvi, 0.1.0, enl...@li...) +AC_INIT(edvi, 0.1, enl...@li...) AC_CONFIG_HEADERS(config.h) AC_CONFIG_MACRO_DIR([m4]) -AM_INIT_AUTOMAKE + +AM_INIT_AUTOMAKE(1.6) + +define([AC_LIBTOOL_LANG_F77_CONFIG], [:])dnl +define([AC_LIBTOOL_LANG_CXX_CONFIG], [:])dnl AC_PROG_LIBTOOL AC_PROG_CC +AM_PROG_CC_C_O + +evas_version=0.9.9 +ecore_version=0.9.9 AC_PATH_GENERIC(DVIlib2, 2.9.0, [ AC_DEFINE(HAVE_DVILIB_2_9, 1, [have dvilib 2.9.0]) ], @@ -29,69 +37,53 @@ ] ) -AC_PATH_GENERIC(evas, 0.9.9, - [ ], - [ - echo "ERROR:" - echo "The evas-config development script was not found in your execute" - echo "path. This may mean one of several things" - echo "1. You may not have installed the evas-devel (or evas-dev)" - echo " packages." - echo "2. You may have evas installed somewhere not covered by your path." - echo "" - echo "If this is the case make sure you have the packages installed, AND" - echo "that the evas-config script is in your execute path (see your" - echo "shell's manual page on setting the \$PATH environment variable), OR" - echo "alternatively, specify the script to use with --with-evas-config." - AC_MSG_ERROR([Fatal Error: no evas-config detected.]) - ] -) - -AC_PATH_GENERIC(ecore, 0.9.9, - [ ], - [ - echo "ERROR:" - echo "The ecore-config development script was not found in your execute" - echo "path. This may mean one of several things" - echo "1. You may not have installed the ecore-devel (or ecore-dev)" - echo " packages." - echo "2. You may have ecore installed somewhere not covered by your path." - echo "" - echo "If this is the case make sure you have the packages installed, AND" - echo "that the ecore-config script is in your execute path (see your" - echo "shell's manual page on setting the \$PATH environment variable), OR" - echo "alternatively, specify the script to use with --with-ecore-config." - AC_MSG_ERROR([Fatal Error: no ecore-config detected.]) - ] -) +PKG_CHECK_MODULES(EDVI, evas >= ${evas_version} ecore >= ${ecore_version}) +EDVI_CFLAGS="${EDVI_CFLAGS} ${DVILIB2_CFLAGS}" +EDVI_LIBS="${EDVI_LIBS} ${DVILIB2_LIBS}" requirements="evas ecore" -AC_PATH_GENERIC(ewl, 0.0.4, [ have_ewl="yes" ], [ have_ewl="no" ]) -if test "x$have_ewl" = "xyes" ; then +PKG_CHECK_MODULES(EWL, + ewl >= 0.5, + [ + have_ewl="yes" requirements="$requirements ewl" - EWL_TEST_LIBS_DIR="`ewl-config --test-lib-dir`" - EWL_TEST_SOURCE_DIR="`ewl-config --test-src-dir`" + EWL_TEST_LIBS_DIR="`$PKG_CONFIG --variable=testsdir ewl`" + EWL_TEST_SOURCE_DIR="`$PKG_CONFIG --variable=testssrcdir ewl`" AC_SUBST(EWL_TEST_LIBS_DIR) AC_SUBST(EWL_TEST_SOURCE_DIR) -else - EWL_CFLAGS="" - EWL_LIBS="" - AC_SUBST(EWL_CFLAGS) - AC_SUBST(EWL_LIBS) -fi -AM_CONDITIONAL(BUILD_EDVI_EWL, test x$have_ewl = xyes) + ], + [ + have_ewl="no" + ] +) +AM_CONDITIONAL(BUILD_EDVI_EWL, test "x${have_ewl}" = "xyes") -AC_PATH_GENERIC(etk, 0.1.0, [ have_etk="yes" ], [ have_etk="no" ]) -if test "x$have_etk" = "xyes" ; then +PKG_CHECK_MODULES(ETK, + etk >= 0.1, + [ + have_etk="yes" requirements="$requirements etk" -else - ETK_CFLAGS="" - ETK_LIBS="" - AC_SUBST(ETK_CFLAGS) - AC_SUBST(ETK_LIBS) -fi -AM_CONDITIONAL(BUILD_EDVI_ETK, test x$have_etk = xyes) + ], + [ + have_etk="no" + ] +) +AM_CONDITIONAL(BUILD_EDVI_ETK, test "x${have_etk}" = "xyes") + +PKG_CHECK_MODULES(EPSILON, + imlib2 >= 1.4 epsilon >= 0.3, + [ + have_epsilon="yes" + requirements="$requirements epsilon imlib2" + EPSILON_PLUGINS_DIR="`$PKG_CONFIG --variable=pluginsdir epsilon`" + AC_SUBST(EPSILON_PLUGINS_DIR) + ], + [ + have_epsilon="no" + ] +) +AM_CONDITIONAL(BUILD_EDVI_EPSILON, test "x${have_epsilon}" = "xyes") AC_SUBST(requirements) @@ -101,9 +93,9 @@ src/Makefile src/lib/Makefile src/bin/Makefile -edvi-config -],[ -chmod +x edvi-config +src/plugins/Makefile +src/plugins/epsilon/Makefile +src/plugins/ewl/Makefile ]) ##################################################################### @@ -120,13 +112,11 @@ echo echo " Ewl widget...........: $have_ewl" echo " Etk widget...........: $have_etk" +echo " Epsilon plugin.......: ${have_epsilon}" echo echo " Compilation..........: make" echo echo " Installation.........: make install" echo echo " prefix.........: $prefix" -echo " binaries.......: $bindir" -echo " libraries......: $libdir" -echo " headers........: $includedir" echo |
From: Enlightenment C. <no...@cv...> - 2007-08-30 14:45:20
|
Enlightenment CVS committal Author : doursse Project : e17 Module : proto/edvi Dir : e17/proto/edvi/src/lib Modified Files: Makefile.am esmart_dvi.c etk_dvi.c ewl_dvi.c Log Message: * Makefile.am: * configure.in: * edvi-config.in: * src/Makefile.am: * src/bin/Makefile.am: * src/lib/Makefile.am: edvi-config removed, use of pkg-config to check the various efl and other minor clean up. * src/bin/edvi_esmart_test.c: (main), (app_resize): * src/bin/edvi_etk_test.c: (main): * src/bin/edvi_evas_test.c: (main): * src/bin/edvi_ewl_test.c: (main): minor clean up of the test programs * src/lib/esmart_dvi.c: (esmart_dvi_init), (_smart_page_render): * src/lib/etk_dvi.c: (etk_dvi_file_set), (_etk_dvi_constructor), (_etk_dvi_load): * src/lib/ewl_dvi.c: (ewl_dvi_init), (ewl_dvi_file_set): the initial value of the page is set to -1. Let the first page to be drawn the first time the widget is showed. * src/plugins/Makefile.am: * src/plugins/epsilon/Makefile.am: * src/plugins/epsilon/epsilon_thumbnailer.c: (epsilon_thumb_imlib_standardize), (clip), (epsilon_generate_thumb), (epsilon_plugin_init): add epsilon thumbnailer * src/plugins/ewl/Makefile.am: * src/plugins/ewl/ewl_dvi.c: (test_info), (_change_page_cb), (create_test), (create_dvi_fd_cb), (create_dvi_fd_window_response), (dvi_load): move ewl test to its own dir =================================================================== RCS file: /cvs/e/e17/proto/edvi/src/lib/Makefile.am,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- Makefile.am 16 Jul 2006 20:51:17 -0000 1.1 +++ Makefile.am 30 Aug 2007 14:44:48 -0000 1.2 @@ -13,7 +13,7 @@ INCLUDES = \ -I. -I$(top_srcdir)/src/lib \ -@EVAS_CFLAGS@ @ECORE_CFLAGS@ @EWL_CFLAGS@ @ETK_CFLAGS@ @DVILIB2_CFLAGS@ +@EWL_CFLAGS@ @ETK_CFLAGS@ @EDVI_CFLAGS@ lib_LTLIBRARIES = libedvi.la @@ -47,4 +47,4 @@ installed_headersdir = $(prefix)/include/edvi installed_headers_DATA = $(EDVIHEADERS) -libedvi_la_LIBADD = @DVILIB2_LIBS@ @ETK_LIBS@ @EWL_LIBS@ @ECORE_LIBS@ @EVAS_LIBS@ +libedvi_la_LIBADD = @ETK_LIBS@ @EWL_LIBS@ @EDVI_LIBS@ =================================================================== RCS file: /cvs/e/e17/proto/edvi/src/lib/esmart_dvi.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- esmart_dvi.c 4 Aug 2007 15:18:38 -0000 1.3 +++ esmart_dvi.c 30 Aug 2007 14:44:48 -0000 1.4 @@ -98,7 +98,7 @@ if (sp->filename) free (sp->filename); sp->filename = NULL; - sp->page = 0; + sp->page = -1; sp->page_length = 10; sp->dvi_device = edvi_device_new (edvi_dpi_get(), edvi_dpi_get()); @@ -574,9 +574,25 @@ { if (sp->dvi_page) edvi_page_delete (sp->dvi_page); + if (sp->obj) { + unsigned int *m; + int w; + int h; + sp->dvi_page = edvi_page_new (sp->dvi_document, sp->page); + w = edvi_page_width_get (sp->dvi_page); + h = edvi_page_height_get (sp->dvi_page); + evas_object_image_size_set (sp->obj, w, h); + evas_object_image_fill_set (sp->obj, 0, 0, w, h); + m = (unsigned int *)evas_object_image_data_get (sp->obj, 1); + if (!m) + return; + + memset(m, (255 << 24) | (255 << 16) | (255 << 8) | 255, w * h * 4); + evas_object_image_data_update_add (sp->obj, 0, 0, w, h); + evas_object_resize (sp->obj, w, h); edvi_page_render (sp->dvi_page, sp->dvi_device, sp->obj); } evas_object_show (sp->obj); =================================================================== RCS file: /cvs/e/e17/proto/edvi/src/lib/etk_dvi.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- etk_dvi.c 22 Feb 2007 17:26:50 -0000 1.4 +++ etk_dvi.c 30 Aug 2007 14:44:48 -0000 1.5 @@ -89,7 +89,7 @@ edvi_document_delete (dvi->dvi_document); dvi->dvi_document = edvi_document_new (dvi->filename, dvi->dvi_device, dvi->dvi_property); - dvi->page = 0; + dvi->page = -1; _etk_dvi_load(dvi); } @@ -325,7 +325,7 @@ dvi->dvi_object = NULL; dvi->filename = NULL; - dvi->page = 0; + dvi->page = -1; dvi->page_length = 10; dvi->dvi_device = edvi_device_new (edvi_dpi_get(), edvi_dpi_get()); @@ -514,8 +514,8 @@ if (dvi->dvi_object) { unsigned int *m; - int w; - int h; + int w; + int h; dvi->dvi_page = edvi_page_new (dvi->dvi_document, dvi->page); =================================================================== RCS file: /cvs/e/e17/proto/edvi/src/lib/ewl_dvi.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- ewl_dvi.c 22 Feb 2007 17:26:50 -0000 1.6 +++ ewl_dvi.c 30 Aug 2007 14:44:48 -0000 1.7 @@ -78,7 +78,7 @@ NULL); dvi->filename = NULL; - dvi->page = 0; + dvi->page = -1; dvi->page_length = 10; dvi->dvi_device = edvi_device_new (edvi_dpi_get(), edvi_dpi_get()); @@ -145,7 +145,7 @@ } dvi->dvi_document = edvi_document_new (filename, dvi->dvi_device, dvi->dvi_property); - dvi->page = 0; + dvi->page = -1; /* * Load the new dvi if widget has been realized |
From: Enlightenment C. <no...@cv...> - 2007-08-30 14:45:20
|
Enlightenment CVS committal Author : doursse Project : e17 Module : proto/edvi Dir : e17/proto/edvi/src/bin Modified Files: Makefile.am edvi_esmart_test.c edvi_etk_test.c edvi_evas_test.c edvi_ewl_test.c Log Message: * Makefile.am: * configure.in: * edvi-config.in: * src/Makefile.am: * src/bin/Makefile.am: * src/lib/Makefile.am: edvi-config removed, use of pkg-config to check the various efl and other minor clean up. * src/bin/edvi_esmart_test.c: (main), (app_resize): * src/bin/edvi_etk_test.c: (main): * src/bin/edvi_evas_test.c: (main): * src/bin/edvi_ewl_test.c: (main): minor clean up of the test programs * src/lib/esmart_dvi.c: (esmart_dvi_init), (_smart_page_render): * src/lib/etk_dvi.c: (etk_dvi_file_set), (_etk_dvi_constructor), (_etk_dvi_load): * src/lib/ewl_dvi.c: (ewl_dvi_init), (ewl_dvi_file_set): the initial value of the page is set to -1. Let the first page to be drawn the first time the widget is showed. * src/plugins/Makefile.am: * src/plugins/epsilon/Makefile.am: * src/plugins/epsilon/epsilon_thumbnailer.c: (epsilon_thumb_imlib_standardize), (clip), (epsilon_generate_thumb), (epsilon_plugin_init): add epsilon thumbnailer * src/plugins/ewl/Makefile.am: * src/plugins/ewl/ewl_dvi.c: (test_info), (_change_page_cb), (create_test), (create_dvi_fd_cb), (create_dvi_fd_window_response), (dvi_load): move ewl test to its own dir =================================================================== RCS file: /cvs/e/e17/proto/edvi/src/bin/Makefile.am,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- Makefile.am 16 Jul 2006 20:51:17 -0000 1.1 +++ Makefile.am 30 Aug 2007 14:44:48 -0000 1.2 @@ -9,9 +9,9 @@ EDVI_ETK_TEST = edvi_etk_test endif -INCLUDES = \ +INCLUDES = \ -I$(top_srcdir)/src/lib \ -@EVAS_CFLAGS@ @ECORE_CFLAGS@ +@EDVI_CFLAGS@ bin_PROGRAMS = edvi_evas_test edvi_esmart_test $(EDVI_EWL_TEST) $(EDVI_ETK_TEST) @@ -20,16 +20,14 @@ edvi_evas_test_LDADD = \ $(top_builddir)/src/lib/libedvi.la \ - $(EVAS_LIBS) \ - $(ECORE_LIBS) + $(EDVI_LIBS) edvi_esmart_test_SOURCES = \ edvi_esmart_test.c edvi_esmart_test_LDADD = \ $(top_builddir)/src/lib/libedvi.la \ - $(EVAS_LIBS) \ - $(ECORE_LIBS) + $(EDVI_LIBS) edvi_ewl_test_SOURCES = \ edvi_ewl_test.c @@ -38,8 +36,7 @@ edvi_ewl_test_LDADD = \ $(top_builddir)/src/lib/libedvi.la \ - $(EVAS_LIBS) \ - $(ECORE_LIBS) \ + $(EDVI_LIBS) \ $(EWL_LIBS) edvi_etk_test_SOURCES = \ @@ -49,23 +46,4 @@ edvi_etk_test_LDADD = \ $(top_builddir)/src/lib/libedvi.la \ - $(EVAS_LIBS) \ - $(ECORE_LIBS) - -if BUILD_EDVI_EWL -pkgdir = @EWL_TEST_LIBS_DIR@ -pkg_LTLIBRARIES = libewl_test_dvi.la - -libewl_test_dvi_la_SOURCES = ewl_test_dvi.c -libewl_test_dvi_la_CFLAGS = @EWL_CFLAGS@ -libewl_test_dvi_la_LIBADD = \ - $(top_builddir)/src/lib/libedvi.la \ - @EWL_LIBS@ -libewl_test_dvi_la_LDFLAGS = \ - -L$(top_builddir)/src/lib \ - -L$(top_builddir)/src/lib/.libs - -EXTRA_DIST = $(libewl_test_dvi_la_SOURCES) -exampledir = @EWL_TEST_SOURCE_DIR@ -example_DATA = $(libewl_test_dvi_la_SOURCES) -endif + $(EDVI_LIBS) =================================================================== RCS file: /cvs/e/e17/proto/edvi/src/bin/edvi_esmart_test.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- edvi_esmart_test.c 22 Feb 2007 17:26:50 -0000 1.3 +++ edvi_esmart_test.c 30 Aug 2007 14:44:48 -0000 1.4 @@ -19,39 +19,37 @@ Ecore_Evas *ee; Evas *evas; Evas_Object *o; - char *filename; int page_number; if (argc < 3) { printf ("\nUsage: %s filename page_number\n\n", argv[0]); - return -1; + return EXIT_FAILURE; } printf ("[DVI] version : %s\n", edvi_version_get ()); if (!edvi_init (300, "cx", 4, 1.0, 1.0, - 0, 0, 0, 0, 255, 255, 255)) { - return -1; + 0, 255, 255, 255, 0, 0, 0)) { + return EXIT_FAILURE; } - filename = argv[1]; sscanf (argv[2], "%d", &page_number); if (!evas_init()) { edvi_shutdown (); - return -1; + return EXIT_FAILURE; } if (!ecore_init()) { evas_shutdown (); edvi_shutdown (); - return -1; + return EXIT_FAILURE; } if (!ecore_evas_init()) { ecore_shutdown (); evas_shutdown (); edvi_shutdown (); - return -1; + return EXIT_FAILURE; } ee = ecore_evas_software_x11_new(NULL, 0, 0, 0, 600, 850); @@ -61,7 +59,7 @@ ecore_evas_name_class_set(ee, "esmart_dvi_test", "test_esmart_dvi"); ecore_evas_callback_resize_set(ee, app_resize); ecore_evas_show(ee); - + evas = ecore_evas_get(ee); o = esmart_dvi_add (evas); @@ -69,22 +67,22 @@ ecore_evas_shutdown (); ecore_shutdown (); evas_shutdown (); - return -1; + return EXIT_FAILURE; } - esmart_dvi_file_set (o, filename); + + esmart_dvi_file_set (o, argv[1]); esmart_dvi_page_set (o, page_number); - esmart_dvi_scale_set (o, 0.5, 0.5); evas_object_move (o, 0, 0); evas_object_show (o); ecore_main_loop_begin (); - + ecore_evas_shutdown (); ecore_shutdown (); evas_shutdown (); edvi_shutdown (); - return 0; + return EXIT_SUCCESS; } static void @@ -92,7 +90,7 @@ { Evas_Coord w, h; Evas *evas; - + evas = ecore_evas_get(ee); evas_output_viewport_get(evas, NULL, NULL, &w, &h); /* bg_resize(w, h); */ =================================================================== RCS file: /cvs/e/e17/proto/edvi/src/bin/edvi_etk_test.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- edvi_etk_test.c 12 Feb 2007 14:38:31 -0000 1.7 +++ edvi_etk_test.c 30 Aug 2007 14:44:48 -0000 1.8 @@ -25,14 +25,14 @@ if (argc == 1) { printf ("Usage: %s dvi_file\n", argv[0]); - return -1; + return EXIT_FAILURE; } printf ("[DVI] version : %s\n", edvi_version_get ()); if (!edvi_init (300, "cx", 4, 1.0, 1.0, 0, 255, 255, 255, 0, 0, 0)) { - return -1; + return EXIT_FAILURE; } etk_init (&argc, &argv); @@ -45,12 +45,12 @@ printf ("The file %s can't be opened\n", argv[1]); etk_shutdown (); edvi_shutdown (); - return -1; + return EXIT_FAILURE; } window = etk_window_new (); etk_window_title_set (ETK_WINDOW (window), "Etk Dvi Test Application"); - etk_signal_connect ("delete_event", ETK_OBJECT (window), + etk_signal_connect ("delete-event", ETK_OBJECT (window), ETK_CALLBACK(_quit_cb), NULL); hbox = etk_hbox_new (ETK_FALSE, 6); @@ -80,7 +80,7 @@ } /* change page */ - etk_signal_connect ("row_clicked", ETK_OBJECT (list), + etk_signal_connect ("row-clicked", ETK_OBJECT (list), ETK_CALLBACK(_change_page_cb), dvi); /* we attach and show */ @@ -89,7 +89,7 @@ etk_box_append (ETK_BOX (hbox), dvi, ETK_BOX_START, ETK_BOX_NONE, 0); etk_widget_show (dvi); - + etk_widget_show (window); etk_main (); @@ -97,7 +97,7 @@ etk_shutdown (); edvi_shutdown (); - return 0; + return EXIT_SUCCESS; } static void =================================================================== RCS file: /cvs/e/e17/proto/edvi/src/bin/edvi_evas_test.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- edvi_evas_test.c 22 Feb 2007 17:26:50 -0000 1.3 +++ edvi_evas_test.c 30 Aug 2007 14:44:48 -0000 1.4 @@ -42,7 +42,6 @@ int main (int argc, char * argv[]) { - char *filename; Edvi_Device *device; Edvi_Property *property; Edvi_Document *document; @@ -51,20 +50,19 @@ Evas *evas; Evas_Object *o; char *param_kpathsea_mode = "cx"; + int page_number; - if (argc < 2) { - printf ("\nUsage: %s file.dvi\n\n", argv[0]); - return -1; + if (argc < 3) { + printf ("\nUsage: %s file.dvi page_number\n\n", argv[0]); + return EXIT_FAILURE; } - filename = argv[1]; - printf ("[DVI] version : %s\n", edvi_version_get ()); if (!edvi_init (300, param_kpathsea_mode, 4, 1.0, 1.0, 0, 255, 255, 255, 0, 0, 0)) { - return -1; + return EXIT_FAILURE; } device = edvi_device_new (edvi_dpi_get (), edvi_dpi_get ()); @@ -78,12 +76,13 @@ } edvi_property_property_set (property, EDVI_PROPERTY_DELAYED_FONT_OPEN); - document = edvi_document_new (filename, device, property); + document = edvi_document_new (argv[1], device, property); if (!document) { goto free_property; } - page = edvi_page_new (document, 0); + sscanf (argv[2], "%d", &page_number); + page = edvi_page_new (document, page_number); if (!page) { goto free_document; } @@ -121,6 +120,16 @@ ecore_main_loop_begin (); ecore_evas_shutdown (); + ecore_shutdown (); + evas_shutdown (); + edvi_page_delete (page); + edvi_document_delete (document); + edvi_property_delete (property); + edvi_device_delete (device); + edvi_shutdown (); + + return EXIT_SUCCESS; + shutdown_ecore: ecore_shutdown (); shutdown_evas: @@ -136,7 +145,7 @@ shutdown: edvi_shutdown (); - return 0; + return EXIT_FAILURE; } static void =================================================================== RCS file: /cvs/e/e17/proto/edvi/src/bin/edvi_ewl_test.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- edvi_ewl_test.c 25 Jul 2007 17:01:02 -0000 1.6 +++ edvi_ewl_test.c 30 Aug 2007 14:44:48 -0000 1.7 @@ -27,15 +27,14 @@ if (argc == 1) { printf ("Usage: %s dvi_file\n", argv[0]); - return -1; + return EXIT_FAILURE; } printf ("[DVI] version : %s\n", edvi_version_get ()); if (!edvi_init (300, "cx", 4, 1.0, 1.0, - 0, 255, 255, 255, 0, 0, 0)) { - return -1; - } + 0, 255, 255, 255, 0, 0, 0)) + return EXIT_FAILURE; ewl_init (&argc, (char **)argv); str_data = ecore_list_new(); @@ -44,13 +43,13 @@ /* We open the dvi file */ dvi = ewl_dvi_new (); ewl_dvi_file_set (EWL_DVI (dvi), argv[1]); - document = EWL_DVI (dvi)->dvi_document; + document = ewl_dvi_dvi_document_get (EWL_DVI (dvi)); if (!document) { printf ("The file %s can't be opened\n", argv[1]); ecore_list_destroy (str_data); ewl_main_quit (); edvi_shutdown (); - return -1; + return EXIT_FAILURE; } window = ewl_window_new (); @@ -100,7 +99,7 @@ edvi_shutdown (); - return 0; + return EXIT_SUCCESS; } static void _quit_cb (Ewl_Widget * w, void *ev_data, void *user_data) |
From: Enlightenment C. <no...@cv...> - 2007-09-29 18:19:23
|
Enlightenment CVS committal Author : doursse Project : e17 Module : proto/edvi Dir : e17/proto/edvi/src/lib Modified Files: etk_dvi.c Log Message: make edvi compile. adding NULL to the last parameter of etk_type_new. I don't know if it's the correct value as there's no doc about that param, but it seems to work =================================================================== RCS file: /cvs/e/e17/proto/edvi/src/lib/etk_dvi.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- etk_dvi.c 29 Sep 2007 17:54:06 -0000 1.6 +++ etk_dvi.c 29 Sep 2007 18:19:20 -0000 1.7 @@ -49,7 +49,7 @@ if (!dvi_type) { - dvi_type = etk_type_new("Etk_Dvi", ETK_WIDGET_TYPE, sizeof(Etk_Dvi), ETK_CONSTRUCTOR(_etk_dvi_constructor), ETK_DESTRUCTOR(_etk_dvi_destructor)); + dvi_type = etk_type_new("Etk_Dvi", ETK_WIDGET_TYPE, sizeof(Etk_Dvi), ETK_CONSTRUCTOR(_etk_dvi_constructor), ETK_DESTRUCTOR(_etk_dvi_destructor), NULL); etk_type_property_add(dvi_type, "dvi_file", ETK_DVI_FILE_PROPERTY, ETK_PROPERTY_STRING, ETK_PROPERTY_READABLE_WRITABLE, etk_property_value_string(NULL)); |
From: Enlightenment C. <no...@cv...> - 2007-09-29 18:41:16
|
Enlightenment CVS committal Author : doursse Project : e17 Module : proto/edvi Dir : e17/proto/edvi Modified Files: ChangeLog Log Message: update ChangeLog =================================================================== RCS file: /cvs/e/e17/proto/edvi/ChangeLog,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- ChangeLog 30 Aug 2007 14:44:47 -0000 1.2 +++ ChangeLog 29 Sep 2007 18:40:44 -0000 1.3 @@ -1,3 +1,18 @@ +2007-09-29 Vincent Torri <doursse at users dot sf dot net> + + * src/lib/etk_dvi.c: (etk_dvi_type_get) + make edvi compile. adding NULL to the last parameter of + etk_type_new. I don't know if it's the correct value as + there's no doc about that param, but it seems to work + +2007-09-29 Gustavo Barbieri <barbieri at gmail dot com> + + * src/lib/etk_dvi.c: + * src/bin/edvi_etk_test.c: + [UNTESTED] Fix Etk usage to match new signal system. + + Please test as I don't have dvilib2. + 2007-08-30 Vincent Torri <doursse at users dot sf dot net> * Makefile.am: |
From: Enlightenment C. <no...@cv...> - 2007-12-07 16:59:17
|
Enlightenment CVS committal Author : doursse Project : e17 Module : proto/edvi Dir : e17/proto/edvi/src/lib Modified Files: Edvi.h Makefile.am edvi_device.c edvi_page.c ewl_dvi.c Added Files: edvi_main.c edvi_main.h Removed Files: edvi.c edvi.h Log Message: rename edvi.* to edvi_main.* so that case insensitive file systems can compile edvi. Fix ewl macros calls =================================================================== RCS file: /cvs/e/e17/proto/edvi/src/lib/Edvi.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- Edvi.h 16 Jul 2006 20:51:17 -0000 1.1 +++ Edvi.h 7 Dec 2007 16:59:15 -0000 1.2 @@ -7,7 +7,7 @@ #include "edvi_property.h" #include "edvi_document.h" #include "edvi_page.h" -#include "edvi.h" +#include "edvi_main.h" #endif /* __EDVI_H__ */ =================================================================== RCS file: /cvs/e/e17/proto/edvi/src/lib/Makefile.am,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- Makefile.am 30 Aug 2007 14:44:48 -0000 1.2 +++ Makefile.am 7 Dec 2007 16:59:15 -0000 1.3 @@ -19,7 +19,7 @@ EDVIHEADERS = \ Edvi.h \ -edvi.h \ +edvi_main.h \ edvi_device.h \ edvi_document.h \ edvi_enum.h \ @@ -32,7 +32,7 @@ $(EDVI_ETK_HEADER) libedvi_la_SOURCES = \ -edvi.c \ +edvi_main.c \ edvi_device.c \ edvi_document.c \ edvi_framebuffer.c \ =================================================================== RCS file: /cvs/e/e17/proto/edvi/src/lib/edvi_device.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- edvi_device.c 16 Jul 2006 20:51:17 -0000 1.1 +++ edvi_device.c 7 Dec 2007 16:59:15 -0000 1.2 @@ -3,7 +3,7 @@ #include "edvi_enum.h" #include "edvi_forward.h" #include "edvi_private.h" -#include "edvi.h" +#include "edvi_main.h" static Edvi_Framebuffer *_edvi_device_fb = NULL; =================================================================== RCS file: /cvs/e/e17/proto/edvi/src/lib/edvi_page.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- edvi_page.c 20 Dec 2006 20:40:46 -0000 1.3 +++ edvi_page.c 7 Dec 2007 16:59:15 -0000 1.4 @@ -11,7 +11,7 @@ #include "edvi_enum.h" #include "edvi_forward.h" #include "edvi_private.h" -#include "edvi.h" +#include "edvi_main.h" #include "edvi_framebuffer.h" =================================================================== RCS file: /cvs/e/e17/proto/edvi/src/lib/ewl_dvi.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- ewl_dvi.c 30 Aug 2007 14:44:48 -0000 1.7 +++ ewl_dvi.c 7 Dec 2007 16:59:15 -0000 1.8 @@ -55,7 +55,7 @@ Ewl_Widget *w; DENTER_FUNCTION(DLEVEL_STABLE); - DCHECK_PARAM_PTR_RET("dvi", dvi, FALSE); + DCHECK_PARAM_PTR_RET(dvi, FALSE); w = EWL_WIDGET(dvi); @@ -103,8 +103,8 @@ ewl_dvi_page_get(Ewl_Dvi *dvi) { DENTER_FUNCTION(DLEVEL_STABLE); - DCHECK_PARAM_PTR_RET("dvi", dvi, 0); - DCHECK_TYPE_RET("dvi", dvi, EWL_DVI_TYPE, 0); + DCHECK_PARAM_PTR_RET(dvi, 0); + DCHECK_TYPE_RET(dvi, EWL_DVI_TYPE, 0); DRETURN_INT(dvi->page, DLEVEL_STABLE); } @@ -125,8 +125,8 @@ Ewl_Embed *emb; DENTER_FUNCTION(DLEVEL_STABLE); - DCHECK_PARAM_PTR("dvi", dvi); - DCHECK_TYPE("dvi", dvi, EWL_DVI_TYPE); + DCHECK_PARAM_PTR(dvi); + DCHECK_TYPE(dvi, EWL_DVI_TYPE); w = EWL_WIDGET(dvi); emb = ewl_embed_widget_find(w); @@ -169,8 +169,8 @@ void ewl_dvi_page_set(Ewl_Dvi *dvi, int page) { DENTER_FUNCTION(DLEVEL_STABLE); - DCHECK_PARAM_PTR("dvi", dvi); - DCHECK_TYPE("dvi", dvi, EWL_DVI_TYPE); + DCHECK_PARAM_PTR(dvi); + DCHECK_TYPE(dvi, EWL_DVI_TYPE); if (!dvi->dvi_document || (page >= edvi_document_page_count_get (dvi->dvi_document)) || @@ -191,8 +191,8 @@ Edvi_Document *ewl_dvi_dvi_document_get (Ewl_Dvi *dvi) { DENTER_FUNCTION(DLEVEL_STABLE); - DCHECK_PARAM_PTR_RET("dvi", dvi, NULL); - DCHECK_TYPE_RET("dvi", dvi, EWL_DVI_TYPE, NULL); + DCHECK_PARAM_PTR_RET(dvi, NULL); + DCHECK_TYPE_RET(dvi, EWL_DVI_TYPE, NULL); DRETURN_PTR(dvi->dvi_document, DLEVEL_STABLE); } @@ -205,8 +205,8 @@ Edvi_Page *ewl_dvi_dvi_page_get (Ewl_Dvi *dvi) { DENTER_FUNCTION(DLEVEL_STABLE); - DCHECK_PARAM_PTR_RET("dvi", dvi, NULL); - DCHECK_TYPE_RET("dvi", dvi, EWL_DVI_TYPE, NULL); + DCHECK_PARAM_PTR_RET(dvi, NULL); + DCHECK_TYPE_RET(dvi, EWL_DVI_TYPE, NULL); DRETURN_PTR(dvi->dvi_page, DLEVEL_STABLE); } @@ -221,8 +221,8 @@ void ewl_dvi_dvi_size_get (Ewl_Dvi *dvi, int *width, int *height) { DENTER_FUNCTION(DLEVEL_STABLE); - DCHECK_PARAM_PTR("dvi", dvi); - DCHECK_TYPE("dvi", dvi, EWL_DVI_TYPE); + DCHECK_PARAM_PTR(dvi); + DCHECK_TYPE(dvi, EWL_DVI_TYPE); if (!dvi) { if (width) *width = 0; @@ -240,8 +240,8 @@ ewl_dvi_orientation_set (Ewl_Dvi *dvi, Edvi_Page_Orientation o) { DENTER_FUNCTION(DLEVEL_STABLE); - DCHECK_PARAM_PTR("dvi", dvi); - DCHECK_TYPE("dvi", dvi, EWL_DVI_TYPE); + DCHECK_PARAM_PTR(dvi); + DCHECK_TYPE(dvi, EWL_DVI_TYPE); if (!dvi || !dvi->dvi_page || (dvi->orientation == o)) DLEAVE_FUNCTION(DLEVEL_STABLE); @@ -256,8 +256,8 @@ ewl_dvi_orientation_get (Ewl_Dvi *dvi) { DENTER_FUNCTION(DLEVEL_STABLE); - DCHECK_PARAM_PTR_RET("dvi", dvi, EDVI_PAGE_ORIENTATION_PORTRAIT); - DCHECK_TYPE_RET("dvi", dvi, EWL_DVI_TYPE, EDVI_PAGE_ORIENTATION_PORTRAIT); + DCHECK_PARAM_PTR_RET(dvi, EDVI_PAGE_ORIENTATION_PORTRAIT); + DCHECK_TYPE_RET(dvi, EWL_DVI_TYPE, EDVI_PAGE_ORIENTATION_PORTRAIT); if (!dvi || !dvi->dvi_page) DRETURN_INT(EDVI_PAGE_ORIENTATION_PORTRAIT, DLEVEL_STABLE); @@ -269,8 +269,8 @@ ewl_dvi_scale_set (Ewl_Dvi *dvi, double hscale, double vscale) { DENTER_FUNCTION(DLEVEL_STABLE); - DCHECK_PARAM_PTR("dvi", dvi); - DCHECK_TYPE("dvi", dvi, EWL_DVI_TYPE); + DCHECK_PARAM_PTR(dvi); + DCHECK_TYPE(dvi, EWL_DVI_TYPE); if (!dvi) DLEAVE_FUNCTION(DLEVEL_STABLE); @@ -286,8 +286,8 @@ ewl_dvi_scale_get (Ewl_Dvi *dvi, double *hscale, double *vscale) { DENTER_FUNCTION(DLEVEL_STABLE); - DCHECK_PARAM_PTR("dvi", dvi); - DCHECK_TYPE("dvi", dvi, EWL_DVI_TYPE); + DCHECK_PARAM_PTR(dvi); + DCHECK_TYPE(dvi, EWL_DVI_TYPE); if (!dvi) { if (hscale) *hscale = 1.0; @@ -307,8 +307,8 @@ int page; DENTER_FUNCTION(DLEVEL_STABLE); - DCHECK_PARAM_PTR("dvi", dvi); - DCHECK_TYPE("dvi", dvi, EWL_DVI_TYPE); + DCHECK_PARAM_PTR(dvi); + DCHECK_TYPE(dvi, EWL_DVI_TYPE); if (!dvi) DLEAVE_FUNCTION(DLEVEL_STABLE); @@ -327,8 +327,8 @@ int page; DENTER_FUNCTION(DLEVEL_STABLE); - DCHECK_PARAM_PTR("dvi", dvi); - DCHECK_TYPE("dvi", dvi, EWL_DVI_TYPE); + DCHECK_PARAM_PTR(dvi); + DCHECK_TYPE(dvi, EWL_DVI_TYPE); if (!dvi) DLEAVE_FUNCTION(DLEVEL_STABLE); @@ -345,8 +345,8 @@ ewl_dvi_page_page_length_set (Ewl_Dvi *dvi, int page_length) { DENTER_FUNCTION(DLEVEL_STABLE); - DCHECK_PARAM_PTR("dvi", dvi); - DCHECK_TYPE("dvi", dvi, EWL_DVI_TYPE); + DCHECK_PARAM_PTR(dvi); + DCHECK_TYPE(dvi, EWL_DVI_TYPE); if (!dvi || (page_length <= 0) || (dvi->page_length == page_length)) DLEAVE_FUNCTION(DLEVEL_STABLE); @@ -360,8 +360,8 @@ ewl_dvi_page_page_length_get (Ewl_Dvi *dvi) { DENTER_FUNCTION(DLEVEL_STABLE); - DCHECK_PARAM_PTR_RET("dvi", dvi, 0); - DCHECK_TYPE_RET("dvi", dvi, EWL_DVI_TYPE, 0); + DCHECK_PARAM_PTR_RET(dvi, 0); + DCHECK_TYPE_RET(dvi, EWL_DVI_TYPE, 0); if (!dvi) DRETURN_INT(0, DLEVEL_STABLE); @@ -375,8 +375,8 @@ int page; DENTER_FUNCTION(DLEVEL_STABLE); - DCHECK_PARAM_PTR("dvi", dvi); - DCHECK_TYPE("dvi", dvi, EWL_DVI_TYPE); + DCHECK_PARAM_PTR(dvi); + DCHECK_TYPE(dvi, EWL_DVI_TYPE); if (!dvi) DLEAVE_FUNCTION(DLEVEL_STABLE); @@ -395,8 +395,8 @@ int page; DENTER_FUNCTION(DLEVEL_STABLE); - DCHECK_PARAM_PTR("dvi", dvi); - DCHECK_TYPE("dvi", dvi, EWL_DVI_TYPE); + DCHECK_PARAM_PTR(dvi); + DCHECK_TYPE(dvi, EWL_DVI_TYPE); if (!dvi) DLEAVE_FUNCTION(DLEVEL_STABLE); @@ -417,8 +417,8 @@ Ewl_Embed *emb; DENTER_FUNCTION(DLEVEL_STABLE); - DCHECK_PARAM_PTR("w", w); - DCHECK_TYPE("w", w, EWL_WIDGET_TYPE); + DCHECK_PARAM_PTR(w); + DCHECK_TYPE(w, EWL_WIDGET_TYPE); dvi = EWL_DVI(w); emb = ewl_embed_widget_find(w); @@ -487,8 +487,8 @@ Ewl_Embed *emb; DENTER_FUNCTION(DLEVEL_STABLE); - DCHECK_PARAM_PTR("w", w); - DCHECK_TYPE("w", w, EWL_WIDGET_TYPE); + DCHECK_PARAM_PTR(w); + DCHECK_TYPE(w, EWL_WIDGET_TYPE); emb = ewl_embed_widget_find(w); @@ -511,8 +511,8 @@ int dx = 0, dy = 0; DENTER_FUNCTION(DLEVEL_STABLE); - DCHECK_PARAM_PTR("w", w); - DCHECK_TYPE("w", w, EWL_WIDGET_TYPE); + DCHECK_PARAM_PTR(w); + DCHECK_TYPE(w, EWL_WIDGET_TYPE); dvi = EWL_DVI(w); if (!dvi->image) @@ -546,8 +546,8 @@ Ewl_Dvi *dvi; DENTER_FUNCTION(DLEVEL_STABLE); - DCHECK_PARAM_PTR("w", w); - DCHECK_TYPE("w", w, "widget"); + DCHECK_PARAM_PTR(w); + DCHECK_TYPE(w, "widget"); dvi = EWL_DVI(w); |
From: Enlightenment C. <no...@cv...> - 2007-12-07 17:07:15
|
Enlightenment CVS committal Author : doursse Project : e17 Module : proto/edvi Dir : e17/proto/edvi Modified Files: ChangeLog Log Message: rename edvi.* to edvi_main.* so that case insensitive file systems can compile edvi. Fix ewl macros calls =================================================================== RCS file: /cvs/e/e17/proto/edvi/ChangeLog,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- ChangeLog 29 Sep 2007 18:40:44 -0000 1.3 +++ ChangeLog 7 Dec 2007 17:07:14 -0000 1.4 @@ -1,3 +1,15 @@ +2007-12-17 Vincent Torri <doursse at users dot sf dot net> + + * src/lib/Edvi.h: + * src/lib/edvi_page.c: + * src/lib/edvi_device.c: + * src/lib/Makefile.am: + rename edvi.* to edvi_main.* so that case insensitive + file systems can compile edvi. + + * src/lib/ewl_dvi.c: + Fix ewl macros calls + 2007-09-29 Vincent Torri <doursse at users dot sf dot net> * src/lib/etk_dvi.c: (etk_dvi_type_get) |
From: Enlightenment C. <no...@cv...> - 2008-03-01 22:59:56
|
Enlightenment CVS committal Author : doursse Project : e17 Module : proto/edvi Dir : e17/proto/edvi/src/plugins/ewl Modified Files: Makefile.am ewl_dvi.c Log Message: * Makefile.am: * configure.in: * src/bin/Makefile.am: * src/lib/Makefile.am: * src/plugins/epsilon/Makefile.am: * src/plugins/ewl/Makefile.am: clean up the build system * src/bin/edvi_esmart_test.c: (app_signal_exit), (app_delete_request): * src/bin/edvi_etk_test.c: (main), (_quit_cb), (_change_page_cb): * src/bin/edvi_evas_test.c: (app_signal_exit), (app_delete_request): * src/bin/edvi_ewl_test.c: (main), (_quit_cb), (_change_page_cb): * src/lib/Edvi.h: * src/lib/edvi_device.c: (_edvi_device_aa_put), (DEV_put_bitmap_rgb), (DEV_poll), (_edvi_put_rectangle): * src/lib/edvi_device.h: * src/lib/edvi_document.c: (edvi_document_page_count_get): * src/lib/edvi_document.h: * src/lib/edvi_enum.h: * src/lib/edvi_main.c: (edvi_init): * src/lib/edvi_main.h: * src/lib/edvi_page.c: (edvi_page_mag_set), (edvi_page_orientation_get): * src/lib/edvi_page.h: * src/lib/edvi_property.h: * src/lib/esmart_dvi.c: (esmart_dvi_init): * src/lib/esmart_dvi.h: * src/lib/etk_dvi.c: (etk_dvi_file_set), (etk_dvi_dvi_document_get), (etk_dvi_dvi_page_get), (_etk_dvi_constructor), (_etk_dvi_realize_cb), (_etk_dvi_unrealize_cb): * src/lib/etk_dvi.h: * src/lib/ewl_dvi.c: (ewl_dvi_init), (ewl_dvi_file_set), (ewl_dvi_dvi_document_get), (ewl_dvi_dvi_page_get), (ewl_dvi_reveal_cb): * src/lib/ewl_dvi.h: * src/plugins/epsilon/epsilon_thumbnailer.c: (epsilon_generate_thumb): * src/plugins/ewl/ewl_dvi.c: (_change_page_cb), (create_test), (create_dvi_fd_cb), (dvi_load): Add a *lot* of documentation use __UNUSED__ where needed minor fixes =================================================================== RCS file: /cvs/e/e17/proto/edvi/src/plugins/ewl/Makefile.am,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- Makefile.am 30 Aug 2007 14:44:48 -0000 1.1 +++ Makefile.am 1 Mar 2008 22:59:51 -0000 1.2 @@ -4,21 +4,27 @@ if BUILD_EDVI_EWL EDVI_EWL_PLUGIN = libewl_dvi.la else -EDVI_EWL_PLUGIN = +EDVI_EWL_PLUGIN = endif -pkgdir = @EWL_TEST_LIBS_DIR@ -pkg_LTLIBRARIES = $(EDVI_EWL_PLUGIN) +pkgdir = @EWL_TEST_LIBS_DIR@ + +pkg_LTLIBRARIES = $(EDVI_EWL_PLUGIN) libewl_dvi_la_SOURCES = ewl_dvi.c -libewl_dvi_la_CFLAGS = @EWL_CFLAGS@ -I$(top_builddir)/src/lib -libewl_dvi_la_LIBADD = \ - $(top_builddir)/src/lib/libedvi.la \ - @EWL_LIBS@ -libewl_dvi_la_LDFLAGS = \ - -L$(top_builddir)/src/lib \ - -L$(top_builddir)/src/lib/.libs - -EXTRA_DIST = $(libewl_dvi_la_SOURCES) -exampledir = @EWL_TEST_SOURCE_DIR@ -example_DATA = $(libewl_dvi_la_SOURCES) + +libewl_dvi_la_CPPFLAGS = @EWL_CFLAGS@ -I$(top_builddir)/src/lib + +libewl_dvi_la_LIBADD = \ +$(top_builddir)/src/lib/libedvi.la \ +@EWL_LIBS@ + +libewl_dvi_la_LDFLAGS = \ +-module \ +-avoid-version + +EXTRA_DIST = $(libewl_dvi_la_SOURCES) + +exampledir = @EWL_TEST_SOURCE_DIR@ + +example_DATA = $(libewl_dvi_la_SOURCES) =================================================================== RCS file: /cvs/e/e17/proto/edvi/src/plugins/ewl/ewl_dvi.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- ewl_dvi.c 30 Aug 2007 14:44:48 -0000 1.1 +++ ewl_dvi.c 1 Mar 2008 22:59:51 -0000 1.2 @@ -15,6 +15,14 @@ #include "Edvi.h" #include "ewl_dvi.h" +#include "config.h" + +#if HAVE___ATTRIBUTE__ +#define __UNUSED__ __attribute__((unused)) +#else +#define __UNUSED__ +#endif + static Ewl_Widget *dvi; static Ewl_Widget *list; @@ -43,7 +51,7 @@ } static void -_change_page_cb (Ewl_Widget *widget, void *ev_data, void *user_data) +_change_page_cb (Ewl_Widget *widget, void *ev_data __UNUSED__, void *user_data) { Ewl_Dvi *dvi; Ewl_List *list; @@ -55,7 +63,7 @@ idx = ewl_mvc_selected_get(EWL_MVC(list)); dvi = EWL_DVI (user_data); - if (idx->row != ewl_dvi_page_get (dvi)) { + 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); } @@ -67,7 +75,6 @@ Ewl_Widget *hbox; Ewl_Widget *button; Ewl_Widget *scrollpane; - char * dvi_file = NULL; if (!edvi_init (300, "cx", 4, 1.0, 1.0, @@ -142,7 +149,7 @@ } static void -create_dvi_fd_cb(Ewl_Widget *w, void *ev_data, +create_dvi_fd_cb(Ewl_Widget *w __UNUSED__, void *ev_data __UNUSED__, void *user_data) { if (fd) @@ -205,9 +212,9 @@ static void dvi_load (const char *filename) { - Edvi_Document *document; - int page_count; - int i; + const Edvi_Document *document; + int page_count; + int i; if (!filename) return; |
From: Enlightenment C. <no...@cv...> - 2008-03-01 23:00:23
|
Enlightenment CVS committal Author : doursse Project : e17 Module : proto/edvi Dir : e17/proto/edvi Modified Files: ChangeLog Makefile.am configure.in Log Message: * Makefile.am: * configure.in: * src/bin/Makefile.am: * src/lib/Makefile.am: * src/plugins/epsilon/Makefile.am: * src/plugins/ewl/Makefile.am: clean up the build system * src/bin/edvi_esmart_test.c: (app_signal_exit), (app_delete_request): * src/bin/edvi_etk_test.c: (main), (_quit_cb), (_change_page_cb): * src/bin/edvi_evas_test.c: (app_signal_exit), (app_delete_request): * src/bin/edvi_ewl_test.c: (main), (_quit_cb), (_change_page_cb): * src/lib/Edvi.h: * src/lib/edvi_device.c: (_edvi_device_aa_put), (DEV_put_bitmap_rgb), (DEV_poll), (_edvi_put_rectangle): * src/lib/edvi_device.h: * src/lib/edvi_document.c: (edvi_document_page_count_get): * src/lib/edvi_document.h: * src/lib/edvi_enum.h: * src/lib/edvi_main.c: (edvi_init): * src/lib/edvi_main.h: * src/lib/edvi_page.c: (edvi_page_mag_set), (edvi_page_orientation_get): * src/lib/edvi_page.h: * src/lib/edvi_property.h: * src/lib/esmart_dvi.c: (esmart_dvi_init): * src/lib/esmart_dvi.h: * src/lib/etk_dvi.c: (etk_dvi_file_set), (etk_dvi_dvi_document_get), (etk_dvi_dvi_page_get), (_etk_dvi_constructor), (_etk_dvi_realize_cb), (_etk_dvi_unrealize_cb): * src/lib/etk_dvi.h: * src/lib/ewl_dvi.c: (ewl_dvi_init), (ewl_dvi_file_set), (ewl_dvi_dvi_document_get), (ewl_dvi_dvi_page_get), (ewl_dvi_reveal_cb): * src/lib/ewl_dvi.h: * src/plugins/epsilon/epsilon_thumbnailer.c: (epsilon_generate_thumb): * src/plugins/ewl/ewl_dvi.c: (_change_page_cb), (create_test), (create_dvi_fd_cb), (dvi_load): Add a *lot* of documentation use __UNUSED__ where needed minor fixes =================================================================== RCS file: /cvs/e/e17/proto/edvi/ChangeLog,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- ChangeLog 7 Dec 2007 17:07:14 -0000 1.4 +++ ChangeLog 1 Mar 2008 22:59:50 -0000 1.5 @@ -1,3 +1,51 @@ +2008-03-01 Vincent Torri <doursse at users dot sf dot net> + + * Makefile.am: + * configure.in: + * src/bin/Makefile.am: + * src/lib/Makefile.am: + * src/plugins/epsilon/Makefile.am: + * src/plugins/ewl/Makefile.am: + clean up the build system + + * src/bin/edvi_esmart_test.c: (app_signal_exit), + (app_delete_request): + * src/bin/edvi_etk_test.c: (main), (_quit_cb), (_change_page_cb): + * src/bin/edvi_evas_test.c: (app_signal_exit), + (app_delete_request): + * src/bin/edvi_ewl_test.c: (main), (_quit_cb), (_change_page_cb): + * src/lib/Edvi.h: + * src/lib/edvi_device.c: (_edvi_device_aa_put), + (DEV_put_bitmap_rgb), (DEV_poll), (_edvi_put_rectangle): + * src/lib/edvi_device.h: + * src/lib/edvi_document.c: (edvi_document_page_count_get): + * src/lib/edvi_document.h: + * src/lib/edvi_enum.h: + * src/lib/edvi_main.c: (edvi_init): + * src/lib/edvi_main.h: + * src/lib/edvi_page.c: (edvi_page_mag_set), + (edvi_page_orientation_get): + * src/lib/edvi_page.h: + * src/lib/edvi_property.h: + * src/lib/esmart_dvi.c: (esmart_dvi_init): + * src/lib/esmart_dvi.h: + * src/lib/etk_dvi.c: (etk_dvi_file_set), + (etk_dvi_dvi_document_get), (etk_dvi_dvi_page_get), + (_etk_dvi_constructor), (_etk_dvi_realize_cb), + (_etk_dvi_unrealize_cb): + * src/lib/etk_dvi.h: + * src/lib/ewl_dvi.c: (ewl_dvi_init), (ewl_dvi_file_set), + (ewl_dvi_dvi_document_get), (ewl_dvi_dvi_page_get), + (ewl_dvi_reveal_cb): + * src/lib/ewl_dvi.h: + * src/plugins/epsilon/epsilon_thumbnailer.c: + (epsilon_generate_thumb): + * src/plugins/ewl/ewl_dvi.c: (_change_page_cb), (create_test), + (create_dvi_fd_cb), (dvi_load): + Add a *lot* of documentation + use __UNUSED__ where needed + minor fixes + 2007-12-17 Vincent Torri <doursse at users dot sf dot net> * src/lib/Edvi.h: =================================================================== RCS file: /cvs/e/e17/proto/edvi/Makefile.am,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- Makefile.am 30 Aug 2007 14:44:47 -0000 1.2 +++ Makefile.am 1 Mar 2008 22:59:50 -0000 1.3 @@ -2,12 +2,26 @@ SUBDIRS = src -MAINTAINERCLEANFILES = Makefile.in aclocal.m4 compile \ - config.guess config.h.in config.sub configure \ - depcomp install-sh ltconfig ltmain.sh missing \ - stamp-h.in +MAINTAINERCLEANFILES = \ +Makefile.in \ +aclocal.m4 \ +compile \ +config.guess \ +config.h.in \ +config.sub \ +configure \ +depcomp \ +install-sh \ +ltconfig \ +ltmain.sh \ +missing \ +stamp-h.in -EXTRA_DIST = AUTHORS README edvi.pc.in +EXTRA_DIST = \ +AUTHORS \ +README \ +Doxyfile \ +edvi.pc.in pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = edvi.pc =================================================================== RCS file: /cvs/e/e17/proto/edvi/configure.in,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- configure.in 30 Aug 2007 14:44:47 -0000 1.4 +++ configure.in 1 Mar 2008 22:59:50 -0000 1.5 @@ -3,14 +3,37 @@ AC_CONFIG_HEADERS(config.h) AC_CONFIG_MACRO_DIR([m4]) -AM_INIT_AUTOMAKE(1.6) +AM_INIT_AUTOMAKE(1.6 dist-bzip2) define([AC_LIBTOOL_LANG_F77_CONFIG], [:])dnl define([AC_LIBTOOL_LANG_CXX_CONFIG], [:])dnl AC_PROG_LIBTOOL +INTERFACE_CURRENT="0" +INTERFACE_REVISION="1" +INTERFACE_AGE="0" +version_info=${INTERFACE_CURRENT}:${INTERFACE_REVISION}:${INTERFACE_AGE} +AC_SUBST(version_info) + AC_PROG_CC AM_PROG_CC_C_O + +dnl Checking for __attribute__ support +AC_MSG_CHECKING([for __attribute__]) +AC_CACHE_VAL(have___attribute__, + [ + AC_TRY_COMPILE([#include <stdlib.h>], + [int func(int x); int foo(int x __attribute__ ((unused))) { exit(1); }], + [have___attribute__="yes"], + [have___attribute__="no"]) + ] +) + +if test "x${have___attribute__}" = "xyes" ; then + AC_DEFINE(HAVE___ATTRIBUTE__, 1, [Define to 1 if your compiler has __attribute__]) +fi +AC_MSG_RESULT(${have___attribute__}) + evas_version=0.9.9 ecore_version=0.9.9 |
From: Enlightenment C. <no...@cv...> - 2008-03-01 23:00:24
|
Enlightenment CVS committal Author : doursse Project : e17 Module : proto/edvi Dir : e17/proto/edvi/src/bin Modified Files: Makefile.am edvi_esmart_test.c edvi_etk_test.c edvi_evas_test.c edvi_ewl_test.c Log Message: * Makefile.am: * configure.in: * src/bin/Makefile.am: * src/lib/Makefile.am: * src/plugins/epsilon/Makefile.am: * src/plugins/ewl/Makefile.am: clean up the build system * src/bin/edvi_esmart_test.c: (app_signal_exit), (app_delete_request): * src/bin/edvi_etk_test.c: (main), (_quit_cb), (_change_page_cb): * src/bin/edvi_evas_test.c: (app_signal_exit), (app_delete_request): * src/bin/edvi_ewl_test.c: (main), (_quit_cb), (_change_page_cb): * src/lib/Edvi.h: * src/lib/edvi_device.c: (_edvi_device_aa_put), (DEV_put_bitmap_rgb), (DEV_poll), (_edvi_put_rectangle): * src/lib/edvi_device.h: * src/lib/edvi_document.c: (edvi_document_page_count_get): * src/lib/edvi_document.h: * src/lib/edvi_enum.h: * src/lib/edvi_main.c: (edvi_init): * src/lib/edvi_main.h: * src/lib/edvi_page.c: (edvi_page_mag_set), (edvi_page_orientation_get): * src/lib/edvi_page.h: * src/lib/edvi_property.h: * src/lib/esmart_dvi.c: (esmart_dvi_init): * src/lib/esmart_dvi.h: * src/lib/etk_dvi.c: (etk_dvi_file_set), (etk_dvi_dvi_document_get), (etk_dvi_dvi_page_get), (_etk_dvi_constructor), (_etk_dvi_realize_cb), (_etk_dvi_unrealize_cb): * src/lib/etk_dvi.h: * src/lib/ewl_dvi.c: (ewl_dvi_init), (ewl_dvi_file_set), (ewl_dvi_dvi_document_get), (ewl_dvi_dvi_page_get), (ewl_dvi_reveal_cb): * src/lib/ewl_dvi.h: * src/plugins/epsilon/epsilon_thumbnailer.c: (epsilon_generate_thumb): * src/plugins/ewl/ewl_dvi.c: (_change_page_cb), (create_test), (create_dvi_fd_cb), (dvi_load): Add a *lot* of documentation use __UNUSED__ where needed minor fixes =================================================================== RCS file: /cvs/e/e17/proto/edvi/src/bin/Makefile.am,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- Makefile.am 30 Aug 2007 14:44:48 -0000 1.2 +++ Makefile.am 1 Mar 2008 22:59:51 -0000 1.3 @@ -9,41 +9,51 @@ EDVI_ETK_TEST = edvi_etk_test endif -INCLUDES = \ +bin_PROGRAMS = edvi_evas_test edvi_esmart_test $(EDVI_EWL_TEST) $(EDVI_ETK_TEST) + +edvi_evas_test_SOURCES = \ +edvi_evas_test.c + +edvi_evas_test_CPPFLAGS = \ -I$(top_srcdir)/src/lib \ @EDVI_CFLAGS@ -bin_PROGRAMS = edvi_evas_test edvi_esmart_test $(EDVI_EWL_TEST) $(EDVI_ETK_TEST) - -edvi_evas_test_SOURCES = \ - edvi_evas_test.c +edvi_evas_test_LDADD = \ +$(top_builddir)/src/lib/libedvi.la \ +$(EDVI_LIBS) -edvi_evas_test_LDADD = \ - $(top_builddir)/src/lib/libedvi.la \ - $(EDVI_LIBS) +edvi_esmart_test_SOURCES = \ +edvi_esmart_test.c -edvi_esmart_test_SOURCES = \ - edvi_esmart_test.c +edvi_esmart_test_CPPFLAGS = \ +-I$(top_srcdir)/src/lib \ +@EDVI_CFLAGS@ -edvi_esmart_test_LDADD = \ - $(top_builddir)/src/lib/libedvi.la \ - $(EDVI_LIBS) +edvi_esmart_test_LDADD = \ +$(top_builddir)/src/lib/libedvi.la \ +$(EDVI_LIBS) -edvi_ewl_test_SOURCES = \ - edvi_ewl_test.c +edvi_ewl_test_SOURCES = \ +edvi_ewl_test.c -edvi_ewl_test_CFLAGS = @EWL_CFLAGS@ +edvi_ewl_test_CPPFLAGS = \ +-I$(top_srcdir)/src/lib \ +@EDVI_CFLAGS@ \ +@EWL_CFLAGS@ -edvi_ewl_test_LDADD = \ - $(top_builddir)/src/lib/libedvi.la \ - $(EDVI_LIBS) \ - $(EWL_LIBS) +edvi_ewl_test_LDADD = \ +$(top_builddir)/src/lib/libedvi.la \ +$(EDVI_LIBS) \ +$(EWL_LIBS) -edvi_etk_test_SOURCES = \ - edvi_etk_test.c +edvi_etk_test_SOURCES = \ +edvi_etk_test.c -edvi_etk_test_CFLAGS = @ETK_CFLAGS@ +edvi_etk_test_CPPFLAGS = \ +-I$(top_srcdir)/src/lib \ +@EDVI_CFLAGS@ \ +@ETK_CFLAGS@ -edvi_etk_test_LDADD = \ - $(top_builddir)/src/lib/libedvi.la \ - $(EDVI_LIBS) +edvi_etk_test_LDADD = \ +$(top_builddir)/src/lib/libedvi.la \ +$(EDVI_LIBS) =================================================================== RCS file: /cvs/e/e17/proto/edvi/src/bin/edvi_esmart_test.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- edvi_esmart_test.c 30 Aug 2007 14:44:48 -0000 1.4 +++ edvi_esmart_test.c 1 Mar 2008 22:59:51 -0000 1.5 @@ -7,6 +7,14 @@ #include "esmart_dvi.h" +#include "config.h" + +#if HAVE___ATTRIBUTE__ +#define __UNUSED__ __attribute__((unused)) +#else +#define __UNUSED__ +#endif + static void app_resize(Ecore_Evas *ee); static int app_signal_exit(void *data, int ev_type, void *ev); @@ -97,14 +105,14 @@ } static int -app_signal_exit(void *data, int ev_type, void *ev) +app_signal_exit(void *data __UNUSED__, int ev_type __UNUSED__, void *ev __UNUSED__) { ecore_main_loop_quit(); return 1; } static void -app_delete_request(Ecore_Evas *ee) +app_delete_request(Ecore_Evas *ee __UNUSED__) { ecore_main_loop_quit(); } =================================================================== RCS file: /cvs/e/e17/proto/edvi/src/bin/edvi_etk_test.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -3 -r1.9 -r1.10 --- edvi_etk_test.c 29 Sep 2007 17:54:06 -0000 1.9 +++ edvi_etk_test.c 1 Mar 2008 22:59:51 -0000 1.10 @@ -6,6 +6,14 @@ #include "etk_dvi.h" +#include "config.h" + +#if HAVE___ATTRIBUTE__ +#define __UNUSED__ __attribute__((unused)) +#else +#define __UNUSED__ +#endif + static Etk_Bool _quit_cb(void *data); static Etk_Bool _change_page_cb (Etk_Object *object, Etk_Tree_Row *row, Etk_Event_Mouse_Up *event, void *data); @@ -35,7 +43,7 @@ return EXIT_FAILURE; } - etk_init (&argc, &argv); + etk_init (argc, argv); /* We open the dvi file */ dvi = etk_dvi_new (); @@ -102,14 +110,14 @@ } static Etk_Bool -_quit_cb(void *data) +_quit_cb(void *data __UNUSED__) { etk_main_quit (); return ETK_TRUE; } static Etk_Bool -_change_page_cb (Etk_Object *object, Etk_Tree_Row *row, Etk_Event_Mouse_Up *event, void *data) +_change_page_cb (Etk_Object *object, Etk_Tree_Row *row, Etk_Event_Mouse_Up *event __UNUSED__, void *data) { Etk_Tree *tree; Etk_Dvi *dvi; =================================================================== RCS file: /cvs/e/e17/proto/edvi/src/bin/edvi_evas_test.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- edvi_evas_test.c 30 Aug 2007 14:44:48 -0000 1.4 +++ edvi_evas_test.c 1 Mar 2008 22:59:51 -0000 1.5 @@ -8,6 +8,13 @@ #include "Edvi.h" +#include "config.h" + +#if HAVE___ATTRIBUTE__ +#define __UNUSED__ __attribute__((unused)) +#else +#define __UNUSED__ +#endif #define DEFAULT_POLLING_INTERVAL 30 /*instructions/polling*/ @@ -160,14 +167,14 @@ } static int -app_signal_exit(void *data, int ev_type, void *ev) +app_signal_exit(void *data __UNUSED__, int ev_type __UNUSED__, void *ev __UNUSED__) { ecore_main_loop_quit(); return 1; } static void -app_delete_request(Ecore_Evas *ee) +app_delete_request(Ecore_Evas *ee __UNUSED__) { ecore_main_loop_quit(); } =================================================================== RCS file: /cvs/e/e17/proto/edvi/src/bin/edvi_ewl_test.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- edvi_ewl_test.c 30 Aug 2007 14:44:48 -0000 1.7 +++ edvi_ewl_test.c 1 Mar 2008 22:59:51 -0000 1.8 @@ -6,6 +6,14 @@ #include "ewl_dvi.h" +#include "config.h" + +#if HAVE___ATTRIBUTE__ +#define __UNUSED__ __attribute__((unused)) +#else +#define __UNUSED__ +#endif + static void _quit_cb (Ewl_Widget * w, void *ev_data, void *user_data); static void _change_page_cb (Ewl_Widget *widget, void *ev_data, void *user_data); @@ -21,7 +29,7 @@ Ewl_View *view; Ewl_Widget *dvi; Ewl_Widget *sp; - Edvi_Document *document; + const Edvi_Document *document; int page_count; int i; @@ -90,6 +98,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_container_child_append (EWL_CONTAINER (hbox), dvi); ewl_widget_show (dvi); @@ -102,7 +111,7 @@ return EXIT_SUCCESS; } -static void _quit_cb (Ewl_Widget * w, void *ev_data, void *user_data) +static void _quit_cb (Ewl_Widget * w, void *ev_data __UNUSED__, void *user_data) { Ecore_List *list; @@ -115,7 +124,7 @@ } static void -_change_page_cb (Ewl_Widget *widget, void *ev_data, void *user_data) +_change_page_cb (Ewl_Widget *widget, void *ev_data __UNUSED__, void *user_data) { Ewl_Dvi *dvi; Ewl_List *list; @@ -127,7 +136,7 @@ idx = ewl_mvc_selected_get(EWL_MVC(list)); dvi = EWL_DVI (user_data); - if (idx->row != ewl_dvi_page_get (dvi)) { + 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); } |
From: Enlightenment C. <no...@cv...> - 2008-03-01 23:00:24
|
Enlightenment CVS committal Author : doursse Project : e17 Module : proto/edvi Dir : e17/proto/edvi/src/lib Modified Files: Makefile.am Edvi.h edvi_device.c edvi_device.h edvi_document.c edvi_document.h edvi_enum.h edvi_main.c edvi_main.h edvi_page.c edvi_page.h edvi_property.h esmart_dvi.c esmart_dvi.h etk_dvi.c etk_dvi.h ewl_dvi.c ewl_dvi.h Log Message: * Makefile.am: * configure.in: * src/bin/Makefile.am: * src/lib/Makefile.am: * src/plugins/epsilon/Makefile.am: * src/plugins/ewl/Makefile.am: clean up the build system * src/bin/edvi_esmart_test.c: (app_signal_exit), (app_delete_request): * src/bin/edvi_etk_test.c: (main), (_quit_cb), (_change_page_cb): * src/bin/edvi_evas_test.c: (app_signal_exit), (app_delete_request): * src/bin/edvi_ewl_test.c: (main), (_quit_cb), (_change_page_cb): * src/lib/Edvi.h: * src/lib/edvi_device.c: (_edvi_device_aa_put), (DEV_put_bitmap_rgb), (DEV_poll), (_edvi_put_rectangle): * src/lib/edvi_device.h: * src/lib/edvi_document.c: (edvi_document_page_count_get): * src/lib/edvi_document.h: * src/lib/edvi_enum.h: * src/lib/edvi_main.c: (edvi_init): * src/lib/edvi_main.h: * src/lib/edvi_page.c: (edvi_page_mag_set), (edvi_page_orientation_get): * src/lib/edvi_page.h: * src/lib/edvi_property.h: * src/lib/esmart_dvi.c: (esmart_dvi_init): * src/lib/esmart_dvi.h: * src/lib/etk_dvi.c: (etk_dvi_file_set), (etk_dvi_dvi_document_get), (etk_dvi_dvi_page_get), (_etk_dvi_constructor), (_etk_dvi_realize_cb), (_etk_dvi_unrealize_cb): * src/lib/etk_dvi.h: * src/lib/ewl_dvi.c: (ewl_dvi_init), (ewl_dvi_file_set), (ewl_dvi_dvi_document_get), (ewl_dvi_dvi_page_get), (ewl_dvi_reveal_cb): * src/lib/ewl_dvi.h: * src/plugins/epsilon/epsilon_thumbnailer.c: (epsilon_generate_thumb): * src/plugins/ewl/ewl_dvi.c: (_change_page_cb), (create_test), (create_dvi_fd_cb), (dvi_load): Add a *lot* of documentation use __UNUSED__ where needed minor fixes =================================================================== RCS file: /cvs/e/e17/proto/edvi/src/lib/Makefile.am,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- Makefile.am 7 Dec 2007 16:59:15 -0000 1.3 +++ Makefile.am 1 Mar 2008 22:59:51 -0000 1.4 @@ -11,9 +11,12 @@ EDVI_ETK_HEADER = etk_dvi.h endif -INCLUDES = \ --I. -I$(top_srcdir)/src/lib \ -@EWL_CFLAGS@ @ETK_CFLAGS@ @EDVI_CFLAGS@ +AM_CPPFLAGS = \ +-I. \ +-I$(top_srcdir)/src/lib \ +@EWL_CFLAGS@ \ +@ETK_CFLAGS@ \ +@EDVI_CFLAGS@ lib_LTLIBRARIES = libedvi.la @@ -48,3 +51,4 @@ installed_headers_DATA = $(EDVIHEADERS) libedvi_la_LIBADD = @ETK_LIBS@ @EWL_LIBS@ @EDVI_LIBS@ +libedvi_la_LDFLAGS = -version-info @version_info@ =================================================================== RCS file: /cvs/e/e17/proto/edvi/src/lib/Edvi.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- Edvi.h 7 Dec 2007 16:59:15 -0000 1.2 +++ Edvi.h 1 Mar 2008 22:59:51 -0000 1.3 @@ -2,12 +2,122 @@ #define __EDVI_H__ +/** + * @mainpage Edvi library + * + * @section intro_sec Introduction + * + * Edvi is a library that provides a C interface to the dvilib library + * to render DVI documents in different ways, using an Evas frontend. + * Straight Evas can be used, but several widgets implementations can + * integrate a DVI document in an Edje user interface using an Evas + * smart object, or Ewl or Etk user interface using respective widgets. + * + * @section install_sec Installation + * + * The Edvi library requires Evas, Ecore and DVIlib to be installed. + * + * If the Ewl or Etk toolkits are available, then respective widgets + * will be built. Also, an Ewl test will be installed. + * + * If Epsilon is available, then an Epsilon plugin to create DVI + * thumbnails will be installed. + * + * @subsection api_sec API Documentation + * + * For the Edvi library, the complete api can be read in the + * section @ref Edvi. + * + * For the Esmart object library, the complete api can be read in the + * section @ref Esmart_Dvi. + * + * For the Ewl widget, the complete api can be read in the + * section @ref Ewl_Dvi. + * + * For the Etk widget, the complete api can be read in the + * section @ref Etk_Dvi. + */ + + +/** + * @file Edvi.h + * @defgroup Edvi Edvi + * @brief A Dvi library that renders Dvi documents + * + * The Edvi library provides a set of functions to manage DVI documents. + * It wraps the functions of the DVIlib library in a C API and uses + * Evas as front end. + * + * The simplest way to use Edvi is to initialize Edvi with edvi_init(), + * create a device with edvi_device_new() and a property with + * edvi_property_new(), to load a document using edvi_document_new(), + * to create a page using edvi_page_new() and to render the page in an + * Evas object using edvi_page_render(). Here is an example: + * + * @code + * Edvi_Device *device; + * Edvi_Property *property; + * Edvi_Document *document; + * Edvi_Page *page; + * char *filename; + * + * if (!edvi_init (300, param_kpathsea_mode, 4, + * 1.0, 1.0, + * 0, 255, 255, 255, 0, 0, 0)) { + * // manage error here + * } + * + * device = edvi_device_new (edvi_dpi_get (), edvi_dpi_get ()); + * if (!device) { + * // manage error here + * } + * + * property = edvi_property_new (); + * if (!property) { + * // manage error here + * } + * edvi_property_property_set (property, EDVI_PROPERTY_DELAYED_FONT_OPEN); + * + * document = edvi_document_new (filename); + * if (!document) { + * // manage error here + * } + * + * page = edvi_page_new (document, page_number); + * if (!page) { + * // manage error here + * } + * + * o = evas_object_image_add (evas); + * evas_object_move (o, 0, 0); + * edvi_page_render (page, device, o); + * evas_object_show (o); + * + * edvi_page_delete (document); + * edvi_document_delete (document); + * edvi_property_delete (property); + * edvi_device_delete (device); + * edvi_shutdown (); + * @endcode + */ + + +#ifdef __cplusplus +extern "C" { +#endif + + #include "edvi_enum.h" #include "edvi_device.h" #include "edvi_property.h" #include "edvi_document.h" #include "edvi_page.h" #include "edvi_main.h" + + +#ifdef __cplusplus +} +#endif #endif /* __EDVI_H__ */ =================================================================== RCS file: /cvs/e/e17/proto/edvi/src/lib/edvi_device.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- edvi_device.c 7 Dec 2007 16:59:15 -0000 1.2 +++ edvi_device.c 1 Mar 2008 22:59:51 -0000 1.3 @@ -5,6 +5,12 @@ #include "edvi_private.h" #include "edvi_main.h" +#if HAVE___ATTRIBUTE__ +#define __UNUSED__ __attribute__((unused)) +#else +#define __UNUSED__ +#endif + static Edvi_Framebuffer *_edvi_device_fb = NULL; static Evas_Object *_edvi_device_o = NULL; @@ -13,7 +19,10 @@ static int _edvi_device_draw_page_finished = 0; static void -_edvi_device_aa_put (long x, long y, long w, long h) +_edvi_device_aa_put (long x, + long y, + long w, + long h) { unsigned short *aa_buff = NULL; unsigned int *m = NULL; @@ -53,7 +62,7 @@ m = (unsigned int *)evas_object_image_data_get (_edvi_device_o, 1); if (!m) goto sortie; - colormap = edvi_color_map_get (); + colormap = (unsigned int *)edvi_color_map_get (); for (j = 0; j < aa_bh; j++) { for (i = 0; i < aa_bw; i++) { if ((colormap[aa_buff[aa_bw * j + i]] >> 24) == 0) { @@ -71,8 +80,14 @@ } static void -DEV_put_bitmap_rgb(DVI_DEVICE dev, DVI dvi, DVI_BITMAP bm, int font_id, - long dvipos, long code_point, long x, long y) +DEV_put_bitmap_rgb(DVI_DEVICE dev __UNUSED__, + DVI dvi __UNUSED__, + DVI_BITMAP bm, + int font_id __UNUSED__, + long dvipos __UNUSED__, + long code_point __UNUSED__, + long x, + long y) { DVI_fb_put_bitmap (_edvi_device_fb->dvi_framebuffer, bm, x + _edvi_device_offset_x, @@ -83,7 +98,9 @@ } static int -DEV_poll(DVI_DEVICE dev, DVI dvi, int poll_type) +DEV_poll(DVI_DEVICE dev __UNUSED__, + DVI dvi __UNUSED__, + int poll_type) { static int t = 0; @@ -99,8 +116,8 @@ static void -_edvi_put_rectangle(DVI_DEVICE dev, - DVI dvi, +_edvi_put_rectangle(DVI_DEVICE dev __UNUSED__, + DVI dvi __UNUSED__, long x, long y, long w, =================================================================== RCS file: /cvs/e/e17/proto/edvi/src/lib/edvi_device.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- edvi_device.h 16 Jul 2006 20:51:17 -0000 1.1 +++ edvi_device.h 1 Mar 2008 22:59:51 -0000 1.2 @@ -5,10 +5,42 @@ #include "edvi_forward.h" +/** + * @file edvi_device.h + * @defgroup Edvi_Device Edvi Device + * @brief Functions that manage DVI devices + * @ingroup Edvi + * + * Functions that manage DVI devices + */ + + +/** + * Return a newly created Edvi_Device object + * + * @param h_dpi The horizontal dpi. + * @param v_dpi The vertical dpi. + * @return A pointer to a newly created Edvi_Device + * + * Return a newly created Edvi_Device object The result must be freed with + * edvi_device_delete(). + * + * @ingroup Edvi_Device + */ Edvi_Device *edvi_device_new (int h_dpi, int v_dpi); -void edvi_device_delete (Edvi_Device *device); +/** + * Delete an Edvi_Device object + * + * @param device The device to delete + * + * Delete the Edvi_Device @p device that has been created + * with edvi_device_new() + * + * @ingroup Edvi_Device + */ +void edvi_device_delete (Edvi_Device *device); #endif /* __EDVI_DEVICE_H__ */ =================================================================== RCS file: /cvs/e/e17/proto/edvi/src/lib/edvi_document.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- edvi_document.c 11 Sep 2006 07:22:08 -0000 1.2 +++ edvi_document.c 1 Mar 2008 22:59:51 -0000 1.3 @@ -55,7 +55,7 @@ } int -edvi_document_page_count_get (Edvi_Document *document) +edvi_document_page_count_get (const Edvi_Document *document) { if (!document || !document->dvi_document) return 0; =================================================================== RCS file: /cvs/e/e17/proto/edvi/src/lib/edvi_document.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- edvi_document.h 16 Jul 2006 20:51:17 -0000 1.1 +++ edvi_document.h 1 Mar 2008 22:59:51 -0000 1.2 @@ -5,13 +5,56 @@ #include "edvi_forward.h" +/** + * @file edvi_document.h + * @defgroup Edvi_Document Edvi Document + * @brief Functions that manage DVI documents + * @ingroup Edvi + * + * Functions that manage DVI documents + */ + +/** + * Return a newly created Edvi_Document object + * + * @param filename The file name + * @param device Thee dvi device + * @param property Thee dvi property + * @return A pointer to a newly created Edvi_Document + * + * Return a newly created Edvi_Document object built from the + * DVI file whose name is @p filename. The result must be freed with + * edvi_document_delete(). + * + * @ingroup Edvi_Document + */ Edvi_Document *edvi_document_new (const char *filename, Edvi_Device *device, Edvi_Property *property); -void edvi_document_delete (Edvi_Document *document); +/** + * Delete an Edvi_Document object + * + * @param document The document to delete + * + * Delete the Edvi_Document @p document that has been created + * with edvi_document_new() + * + * @ingroup Edvi_Document + */ +void edvi_document_delete (Edvi_Document *document); -int edvi_document_page_count_get (Edvi_Document *document); +/** + * Return the count of the pages of the document + * + * @param document The document + * @return The count of the pages + * + * Return the count of the pages of the document @p document + * + * @ingroup Edvi_Document + */ +int edvi_document_page_count_get (const Edvi_Document *document); #endif /* __EDVI_DOCUMENT_H__ */ =================================================================== RCS file: /cvs/e/e17/proto/edvi/src/lib/edvi_enum.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- edvi_enum.h 22 Feb 2007 17:26:50 -0000 1.2 +++ edvi_enum.h 1 Mar 2008 22:59:51 -0000 1.3 @@ -2,55 +2,86 @@ #define __EDVI_ENUM_H__ +/** + * @file edvi_enum.h + * @defgroup Edvi_Enum Edvi Enumerations + * @brief Enumerations used by Edvi + * @ingroup Edvi + * + * Enumerations used by Edvi + */ + + #define EDVI_DEFAULT_DPI 300 #define EDVI_DEFAULT_SHRINK 5 #define EDVI_DEFAULT_AA 4 #define EDVI_DEFAULT_OFFSET_X 1.00 /*inch*/ #define EDVI_DEFAULT_OFFSET_Y 1.00 /*inch*/ + +/** + * @enum Edvi_Page_Orientation + * @brief Page orientations. + * + * @ingroup Edvi_Enum + */ typedef enum { - EDVI_PAGE_ORIENTATION_PORTRAIT, - EDVI_PAGE_ORIENTATION_LANDSCAPE -}Edvi_Page_Orientation; + EDVI_PAGE_ORIENTATION_PORTRAIT, /**< Portrait orientation */ + EDVI_PAGE_ORIENTATION_LANDSCAPE /**< Landscape orientation */ +} Edvi_Page_Orientation; + +/** + * @enum Edvi_Page_Size + * @brief Page sizes. + * + * @ingroup Edvi_Enum + */ typedef enum { - EDVI_PAGE_SIZE_A1, - EDVI_PAGE_SIZE_A2, - EDVI_PAGE_SIZE_A3, - EDVI_PAGE_SIZE_A4, - EDVI_PAGE_SIZE_A5, - EDVI_PAGE_SIZE_A6, - EDVI_PAGE_SIZE_A7, - EDVI_PAGE_SIZE_B1, - EDVI_PAGE_SIZE_B2, - EDVI_PAGE_SIZE_B3, - EDVI_PAGE_SIZE_B4, - EDVI_PAGE_SIZE_B5, - EDVI_PAGE_SIZE_B6, - EDVI_PAGE_SIZE_B7, - EDVI_PAGE_SIZE_LETTER, - EDVI_PAGE_SIZE_US, - EDVI_PAGE_SIZE_LEGAL -}Edvi_Page_Size; + EDVI_PAGE_SIZE_A1, /**< A1 size */ + EDVI_PAGE_SIZE_A2, /**< A2 size */ + EDVI_PAGE_SIZE_A3, /**< A3 size */ + EDVI_PAGE_SIZE_A4, /**< A4 size */ + EDVI_PAGE_SIZE_A5, /**< A5 size */ + EDVI_PAGE_SIZE_A6, /**< A6 size */ + EDVI_PAGE_SIZE_A7, /**< A7 size */ + EDVI_PAGE_SIZE_B1, /**< B1 size */ + EDVI_PAGE_SIZE_B2, /**< B2 size */ + EDVI_PAGE_SIZE_B3, /**< B3 size */ + EDVI_PAGE_SIZE_B4, /**< B4 size */ + EDVI_PAGE_SIZE_B5, /**< B5 size */ + EDVI_PAGE_SIZE_B6, /**< B6 size */ + EDVI_PAGE_SIZE_B7, /**< B7 size */ + EDVI_PAGE_SIZE_LETTER, /**< Letter size */ + EDVI_PAGE_SIZE_US, /**< US size */ + EDVI_PAGE_SIZE_LEGAL /**< Legal size */ +} Edvi_Page_Size; + +/** + * @enum Edvi_Property_Id + * @brief Propery identifiers. + * + * @ingroup Edvi_Enum + */ typedef enum { - EDVI_PROPERTY_PRINT_FONTS, - EDVI_PROPERTY_PRINT_MISSING_FONTS, - EDVI_PROPERTY_ASCII_JTEX, - EDVI_PROPERTY_SCALE_FONT_IF_NOT_EXIST, - EDVI_PROPERTY_LATEX2E_GRAPHICS_STY, - EDVI_PROPERTY_LATEX209_EPSF_STY, - EDVI_PROPERTY_SKIP_RENDERING, - EDVI_PROPERTY_SKIP_SPECIALS, - EDVI_PROPERTY_LIST_FONTS, - EDVI_PROPERTY_LIST_MISSING_FONTS, - EDVI_PROPERTY_DELAYED_FONT_OPEN, - EDVI_PROPERTY_ASYNC_GS_INVOCATION, - EDVI_PROPERTY_INCREMENTAL_EPS_DISPLAY -}Edvi_Property_Id; + EDVI_PROPERTY_PRINT_FONTS, /**< Print font names. */ + EDVI_PROPERTY_PRINT_MISSING_FONTS, /**< Print font names that are not found. */ + EDVI_PROPERTY_ASCII_JTEX, /**< DVI extension for Japanese TeX by ASCII Coop. */ + EDVI_PROPERTY_SCALE_FONT_IF_NOT_EXIST, /**< Enlarge/shrink font if not a font of correct size is not found. */ + EDVI_PROPERTY_LATEX2E_GRAPHICS_STY, /**< LaTeX 2.09 epsf.sty or graphic[sx].sty for EPS figures. */ + EDVI_PROPERTY_LATEX209_EPSF_STY, /**< LaTeX 2e epsf.sty or graphic[sx].sty for EPS figures. It is the default property. */ + EDVI_PROPERTY_SKIP_RENDERING, /**< Skip rendering characters on output devices. */ + EDVI_PROPERTY_SKIP_SPECIALS, /**< Skip processing special DVI instructions (e.g., rendering EPS files). */ + EDVI_PROPERTY_LIST_FONTS, /**< Report fonts. */ + EDVI_PROPERTY_LIST_MISSING_FONTS, /**< Report missing fonts. */ + EDVI_PROPERTY_DELAYED_FONT_OPEN, /**< Defer opening fonts until it is necessary. */ + EDVI_PROPERTY_ASYNC_GS_INVOCATION, /**< Asynchronous Ghostscript invocation. */ + EDVI_PROPERTY_INCREMENTAL_EPS_DISPLAY /**< Incremental EPS display. */ +} Edvi_Property_Id; #endif /* __EDVI_ENUM_H__ */ =================================================================== RCS file: /cvs/e/e17/proto/edvi/src/lib/edvi_main.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- edvi_main.c 7 Dec 2007 16:59:15 -0000 1.1 +++ edvi_main.c 1 Mar 2008 22:59:51 -0000 1.2 @@ -62,8 +62,8 @@ g = bg_g + ceil(((double)(fg_g - bg_g) * i) / (double)(aa_nlevels - 1)); b = bg_b + ceil(((double)(fg_b - bg_b) * i) / (double)(aa_nlevels - 1)); _edvi_color_map[i] = ((bg_a << 24) | - (r << 16) | - (g << 8) | + (r << 16) | + (g << 8) | (b)); } @@ -100,7 +100,7 @@ return _edvi_offset_y; } -unsigned int * +const unsigned int * edvi_color_map_get () { return _edvi_color_map; =================================================================== RCS file: /cvs/e/e17/proto/edvi/src/lib/edvi_main.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- edvi_main.h 7 Dec 2007 16:59:15 -0000 1.1 +++ edvi_main.h 1 Mar 2008 22:59:51 -0000 1.2 @@ -2,23 +2,130 @@ #define __EDVI_MAIN_H__ -int edvi_init (int dpi, char *kpathsea_mode, int aa, - double offset_x, double offset_y, - int bg_a, int bg_r, int bg_g, int bg_b, - int fg_r, int fg_g, int fg_b); - +/** + * @file edvi_main.h + * @defgroup Edvi_Main Edvi main functions + * @brief Functions that manage initialization, shutdown, and other miscellaneous functions + * @ingroup Edvi + * + * Functions that manage DVI pages + */ + + +/** + * @brief Initialise Edvi + * + * @param dpi Dot per inch + * @param kpathsea_mode Kpathsea mode + * @param aa Anti-aliasing + * @param offset_x Horizontal offset + * @param offset_y Vertical offset + * @param bg_a Alpha component of the background color + * @param bg_r Red component of the background color + * @param bg_g Green component of the background color + * @param bg_b Blue component of the background color + * @param fg_r Red component of the foreground color + * @param fg_g Green component of the foreground color + * @param fg_b Blue component of the foreground color + * + * Initialise Edvi. It set the dot per inch used by the GhostScript + * interpreter, the Kpathsea mode and program. A colormap is also + * initialized. The colors count is given by @p aa * @p aa + 1. The + * offset if used to shift the character in the document. + * + * @ingroup Edvi_Main + */ +int edvi_init (int dpi, + char *kpathsea_mode, + int aa, + double offset_x, + double offset_y, + int bg_a, + int bg_r, + int bg_g, + int bg_b, + int fg_r, + int fg_g, + int fg_b); + +/** + * @brief Shutdown Edvi + * + * Shutdown the Edvi library. This function must be called + * if edvi_init() has been called. + * + * @ingroup Edvi_Main + */ void edvi_shutdown (); +/** + * @brief Return the dpi. + * + * @return The dpi. + * + * Return the dot per inch that was passed to edvi_init(). + * + * @ingroup Edvi_Main + */ int edvi_dpi_get (); +/** + * @brief Return the anti-aliasing. + * + * @return The anti-aliasing. + * + * Return the anti-aliasing that was passed to edvi_init(). + * + * @ingroup Edvi_Main + */ int edvi_aa_get (); +/** + * @brief Return the horizontal offset. + * + * @return The horizontal offset. + * + * Return the horizontal offset that was passed to edvi_init(). + * + * @ingroup Edvi_Main + */ double edvi_offset_x_get (); +/** + * @brief Return the vertical offset. + * + * @return The vertical offset. + * + * Return the vertical offset that was passed to edvi_init(). + * + * @ingroup Edvi_Main + */ double edvi_offset_y_get (); -unsigned int *edvi_color_map_get (); - +/** + * @brief Return the colormap. + * + * @return The colormap. + * + * Return the colormap that was initialized by edvi_init(). The + * number of colors is aa * aa + 1, where aa is the value returned + * by edvi_aa_get(). A color is a 4 bytes long data with the alpha + * component as higher byte and with the blue component as the lower + * byte (ARGB data). The return array must not be freed. + * + * @ingroup Edvi_Main + */ +const unsigned int *edvi_color_map_get (); + +/** + * @brief Return the version of dvilib. + * + * @return The version of dvilib. + * + * Return the version of dvilib as a string. + * + * @ingroup Edvi_Main + */ const char *edvi_version_get (); =================================================================== RCS file: /cvs/e/e17/proto/edvi/src/lib/edvi_page.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- edvi_page.c 7 Dec 2007 16:59:15 -0000 1.4 +++ edvi_page.c 1 Mar 2008 22:59:51 -0000 1.5 @@ -131,7 +131,7 @@ void edvi_page_mag_set (Edvi_Page *page, - double mag) + double mag) { if (!page) return; @@ -219,6 +219,6 @@ { if (!page) return EDVI_PAGE_ORIENTATION_PORTRAIT; - + return page->orientation; } =================================================================== RCS file: /cvs/e/e17/proto/edvi/src/lib/edvi_page.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- edvi_page.h 16 Jul 2006 20:51:17 -0000 1.1 +++ edvi_page.h 1 Mar 2008 22:59:51 -0000 1.2 @@ -7,29 +7,171 @@ #include "edvi_forward.h" -Edvi_Page *edvi_page_new (Edvi_Document *document, int index); - +/** + * @file edvi_page.h + * @defgroup Edvi_Page Edvi Page + * @brief Functions that manage DVI pages + * @ingroup Edvi + * + * Functions that manage DVI pages + */ + + +/** + * Return a newly created Edvi_Page object + * + * @param document The document + * @param index The page number + * @return An Edvi_Page + * + * Return a newly created Edvi_Page object of the document @p + * doc, corresponding to the page @p index. It must be freed with + * edvi_page_delete + * + * @ingroup Edvi_Page + */ +Edvi_Page *edvi_page_new (Edvi_Document *document, + int index); + +/** + * Delete an Edvi_Page object + * + * @param page The page to delete + * + * Delete the Edvi_Page object @p page, created with + * edvi_page_new + * + * @ingroup Edvi_Page + */ void edvi_page_delete (Edvi_Page *page); -void edvi_page_render (Edvi_Page *page, Edvi_Device *device, Evas_Object *o); - +/** + * Render a page on an Evas_Object + * + * @param page The page + * @param device The device + * @param o The Evas_Object on which the page is rendered. + * + * Render page @p page on the Evas_Object @p o. @p hscale and @p vscale + * are respectively the horizontal and vertical scales, in pixel per + * points to render the page. @p orientation set the orientation of the + * page. + * + * @ingroup Edvi_Page + */ +void edvi_page_render (Edvi_Page *page, + Edvi_Device *device, + Evas_Object *o); + +/** + * @brief Get the current page number + * + * @param page The page + * @return The current page number + * + * Get the current page number of @p page. + * + * @ingroup Edvi_Page + */ +int edvi_page_number_get (Edvi_Page *page); + +/** + * @brief Set the magnification + * + * @param page The page + * @param mag The magnification value + * + * Set the magnification value of @p page + * + * @ingroup Edvi_Page + */ void edvi_page_mag_set (Edvi_Page *page, - double mag); + double mag); +/** + * @brief Get the magnification + * + * @param page The page + * @return The magnification value + * + * Get the magnification value of @p page + * + * @ingroup Edvi_Page + */ double edvi_page_mag_get (Edvi_Page *page); +/** + * @brief Set the page size + * + * @param page The page + * @param size The page size + * + * Set the page size of @p page + * + * @ingroup Edvi_Page + */ void edvi_page_size_set (Edvi_Page *page, Edvi_Page_Size size); -Edvi_Page_Size edvi_page_size_get (Edvi_Page *page); - +/** + * @brief Get the page size + * + * @param page The page + * @return The page size + * + * Get the page size of @p page + * + * @ingroup Edvi_Page + */ +Edvi_Page_Size edvi_page_size_get (Edvi_Page *page); + +/** + * @brief Get the width size + * + * @param page The page + * @return The width + * + * Get the width of @p page + * + * @ingroup Edvi_Page + */ int edvi_page_width_get (Edvi_Page *page); +/** + * @brief Get the height size + * + * @param page The page + * @return The height + * + * Get the height of @p page + * + * @ingroup Edvi_Page + */ int edvi_page_height_get (Edvi_Page *page); +/** + * @brief Set the orientation of a page + * + * @param page The page + * @param orientation The orientation + * + * Set the orientation of @p page + * + * @ingroup Edvi_Page + */ void edvi_page_orientation_set (Edvi_Page *page, Edvi_Page_Orientation orientation); +/** + * Return the orientation of a page + * + * @param page The page + * @return The orientation of the page + * + * Return the orientation of the page @p page + * + * @ingroup Edvi_Page + */ Edvi_Page_Orientation edvi_page_orientation_get (Edvi_Page *page); =================================================================== RCS file: /cvs/e/e17/proto/edvi/src/lib/edvi_property.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- edvi_property.h 22 Feb 2007 17:26:50 -0000 1.2 +++ edvi_property.h 1 Mar 2008 22:59:51 -0000 1.3 @@ -5,18 +5,80 @@ #include "edvi_forward.h" +/** + * @file edvi_property.h + * @defgroup Edvi_Property Edvi Property + * @brief Functions that manage DVI properties + * @ingroup Edvi + * + * Functions that manage DVI properties + */ + + +/** + * Return a newly created Edvi_Property object + * + * @return A pointer to a newly created Edvi_Property + * + * Return a newly created Edvi_Property object built from the + * DVI file whose name is @p filename. The result must be freed with + * edvi_property_delete(). + * + * @ingroup Edvi_Property + */ Edvi_Property *edvi_property_new (); -void edvi_property_delete (Edvi_Property *property); +/** + * Delete an Edvi_Property object + * + * @param property The property to delete + * + * Delete the Edvi_Property @p property that has been created + * with edvi_property_new() + * + * @ingroup Edvi_Document + */ +void edvi_property_delete (Edvi_Property *property); -void edvi_property_property_set (Edvi_Property *property, - Edvi_Property_Id id); +/** + * Set an identifier in a given property. + * + * @param property The property + * @param id The property identifier. + * + * Set the property identifier @p id in @p property. + * + * @ingroup Edvi_Document + */ +void edvi_property_property_set (Edvi_Property *property, + Edvi_Property_Id id); -void edvi_property_property_unset (Edvi_Property *property, - Edvi_Property_Id id); +/** + * Unset an identifier in a given property. + * + * @param property The property + * @param id The property identifier. + * + * Unset the property identifier @p id in @p property. + * + * @ingroup Edvi_Document + */ +void edvi_property_property_unset (Edvi_Property *property, + Edvi_Property_Id id); -int edvi_property_property_isset (Edvi_Property *property, - Edvi_Property_Id id); +/** + * Check if an identifier is set in a given property. + * + * @param property The property + * @param id The property identifier. + * @return 1 if the identifier is set, 0 otherwise. + * + * Check if the property identifier @p id is set in @p property. + * + * @ingroup Edvi_Document + */ +int edvi_property_property_isset (Edvi_Property *property, + Edvi_Property_Id id); #endif /* __EDVI_PROPERTY_H__ */ =================================================================== RCS file: /cvs/e/e17/proto/edvi/src/lib/esmart_dvi.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- esmart_dvi.c 30 Aug 2007 14:44:48 -0000 1.4 +++ esmart_dvi.c 1 Mar 2008 22:59:51 -0000 1.5 @@ -63,6 +63,12 @@ /* Externally accessible calls */ /*******************************/ + +/** + * @addtogroup Esmart_Dvi + * @{ + */ + /** * Add a smart dvi object to an evas * @@ -70,7 +76,6 @@ * @return The file name * * Add a smart dvi object to the evas @p evas, or NULL on failure - * */ Evas_Object * esmart_dvi_add (Evas *evas) @@ -87,7 +92,6 @@ * @return 1 on success, 0 otherwise * * Initialize the smart dvi object @p obj - * */ Evas_Bool esmart_dvi_init (Evas_Object *obj) @@ -99,7 +103,6 @@ if (sp->filename) free (sp->filename); sp->filename = NULL; sp->page = -1; - sp->page_length = 10; sp->dvi_device = edvi_device_new (edvi_dpi_get(), edvi_dpi_get()); sp->dvi_property = edvi_property_new(); @@ -121,7 +124,6 @@ * @param filename: The file name * * Set the file name of the smart dvi object @p obj - * */ void esmart_dvi_file_set (Evas_Object *obj, const char *filename) @@ -152,7 +154,6 @@ * @return The name of the file, or @c NULL on failure * * Return the name of the file used for the smart dvi object @p obj - * */ const char * esmart_dvi_file_get (Evas_Object *obj) @@ -171,7 +172,6 @@ * @param page: The page number * * Set the page number of the smart dvi object @p obj - * */ void esmart_dvi_page_set (Evas_Object *obj, int page) @@ -195,7 +195,6 @@ * @return The page number * * Return the page number of the smart dvi object @p obj - * */ int esmart_dvi_page_get(Evas_Object *obj) @@ -214,9 +213,8 @@ * @return The document of the dvi (NULL on failure) * * Return the document of the smart dvi object @p obj - * */ -Edvi_Document * +const Edvi_Document * esmart_dvi_dvi_document_get (Evas_Object *obj) { Smart_Dvi *sp; @@ -233,9 +231,8 @@ * @return The current page of the dvi (NULL on failure) * * Return the current page of the smart dvi object @p obj - * */ -Edvi_Page * +const Edvi_Page * esmart_dvi_dvi_page_get (Evas_Object *obj) { Smart_Dvi *sp; @@ -273,6 +270,12 @@ } } +/** + * @brief Sets the orientation of a smart dvi object + * + * @param obj The Evas object + * @param o The orientation + */ void esmart_dvi_orientation_set (Evas_Object *obj, Edvi_Page_Orientation o) @@ -288,6 +291,12 @@ _smart_page_render (obj); } +/** + * @brief Gets the orientation of a smart dvi object + * + * @param obj The Evas object + * @return The orientation + */ Edvi_Page_Orientation esmart_dvi_orientation_get (Evas_Object *obj) { @@ -298,6 +307,13 @@ return sp->orientation; } +/** + * @brief Sets the scale of the DVI document + * + * @param obj The Evas object + * @param hscale The horizontal scale + * @param vscale The vertical scale + */ void esmart_dvi_scale_set (Evas_Object *obj, double hscale, @@ -316,6 +332,13 @@ _smart_page_render (obj); } +/** + * @brief Gets the scale of the DVI document + * + * @param obj The Evas object + * @param hscale The horizontal scale + * @param vscale The vertical scale + */ void esmart_dvi_scale_get (Evas_Object *obj, double *hscale, @@ -341,6 +364,11 @@ } } +/** + * @brief Go to the next page and render it + * + * @param obj: the smart object + */ void esmart_dvi_page_next (Evas_Object *obj) { @@ -355,6 +383,11 @@ esmart_dvi_page_set (obj, page); } +/** + * @brief Go to the previous page and render it + * + * @param obj: the smart object + */ void esmart_dvi_page_previous (Evas_Object *obj) { @@ -369,55 +402,9 @@ esmart_dvi_page_set (obj, page); } -void -esmart_dvi_page_page_length_set (Evas_Object *obj, int page_length) -{ - Smart_Dvi *sp; - - E_SMART_OBJ_GET(sp, obj, E_OBJ_NAME); - - if ((page_length <= 0) || (sp->page_length == page_length)) - return; - sp->page_length = page_length; -} - -int -esmart_dvi_page_page_length_get (Evas_Object *obj) -{ - Smart_Dvi *sp; - - E_SMART_OBJ_GET_RETURN(sp, obj, E_OBJ_NAME, 0); - - return sp->page_length; -} - -void -esmart_dvi_page_page_next (Evas_Object *obj) -{ - Smart_Dvi *sp; - int page; - - E_SMART_OBJ_GET(sp, obj, E_OBJ_NAME); - - page = sp->page + sp->page_length; - if (page > (edvi_document_page_count_get(sp->dvi_document) - 1)) - page = edvi_document_page_count_get(sp->dvi_document) - 1; - esmart_dvi_page_set (obj, sp->page); -} - -void -esmart_dvi_page_page_previous (Evas_Object *obj) -{ - Smart_Dvi *sp; - int page; - - E_SMART_OBJ_GET(sp, obj, E_OBJ_NAME); - - page = sp->page - sp->page_length; - if (page < 0) - page = 0; - esmart_dvi_page_set (obj, page); -} +/** + * @} + */ /*******************************************/ =================================================================== RCS file: /cvs/e/e17/proto/edvi/src/lib/esmart_dvi.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- esmart_dvi.h 16 Jul 2006 20:51:17 -0000 1.1 +++ esmart_dvi.h 1 Mar 2008 22:59:51 -0000 1.2 @@ -4,22 +4,71 @@ #include "Edvi.h" + +/** + * @file ewl_dvi.h + * @defgroup Esmart_Dvi Esmart Dvi + * @brief An Evas smart object to display DVI document + * + * Provides a smart object for displaying DVI files in an Evas object. + * Add an object to en evas with esmart_dvi_add(), and set the file + * with esmart_dvi_file_set() and set the page with esmart_dvi_page_set(). + * For example: + * + * @code + * #include <Evas.h> + * #include <esmart_dvi.h> + * + * Evas *evas; + * Evas_Object *o; + * char *filename + * + * // get the evas + * + * o = esmart_dvi_add (evas); + * if (!esmart_dvi_init (o)) { + * // manage the error + * } + * + * esmart_dvi_file_set (o, argv[1]); + * esmart_dvi_page_set (o, page_number); + * evas_object_move (o, 0, 0); + * evas_object_show (o); + * @endcode + * + * To change the page, use esmart_dvi_page_set() or esmart_dvi_page_next() + * / esmart_dvi_page_previous(). + * + * The orientation of the page can be changed with + * esmart_dvi_orientation_set(). + * + * @{ + */ + + +/** + * @typedef Smart_Dvi + * @brief A smart dvi object is a simple Evas smart object that displays a DVI document + */ typedef struct _Smart_Dvi Smart_Dvi; +/** + * @struct _Smart_Dvi + * @brief Evas object structure to provide all the facilities of an Evas smart object + */ struct _Smart_Dvi { - Evas_Object *obj; - char *filename; - int page; - int page_length; - - Edvi_Device *dvi_device; - Edvi_Property *dvi_property; - Edvi_Document *dvi_document; - Edvi_Page *dvi_page; - Edvi_Page_Orientation orientation; - double hscale; - double vscale; + Evas_Object *obj; /**< The Evas object */ + char *filename; /**< The file name */ + int page; /**< The page number */ + + Edvi_Device *dvi_device; /**< The Edvi device */ + Edvi_Property *dvi_property; /**< The Edvi property */ + Edvi_Document *dvi_document; /**< The Edvi document */ + Edvi_Page *dvi_page; /**< The Edvi current page */ + Edvi_Page_Orientation orientation; /**< The orientation */ + double hscale; /**< The horizontal scale */ + double vscale; /**< The vertical scale */ }; Evas_Object *esmart_dvi_add (Evas *evas); @@ -27,9 +76,8 @@ void esmart_dvi_file_set (Evas_Object *obj, const char *filename); const char *esmart_dvi_file_get (Evas_Object *obj); void esmart_dvi_page_set (Evas_Object *obj, int page); -double esmart_dvi_position_get(Evas_Object *obj); -Edvi_Document *esmart_dvi_dvi_document_get (Evas_Object *obj); -Edvi_Page *esmart_dvi_dvi_page_get (Evas_Object *obj); +const Edvi_Document *esmart_dvi_dvi_document_get (Evas_Object *obj); +const Edvi_Page *esmart_dvi_dvi_page_get (Evas_Object *obj); void esmart_dvi_orientation_set (Evas_Object *obj, Edvi_Page_Orientation o); Edvi_Page_Orientation esmart_dvi_orientation_get (Evas_Object *obj); @@ -37,9 +85,10 @@ void esmart_dvi_scale_get (Evas_Object *obj, double *hscale, double *vscale); void esmart_dvi_page_next (Evas_Object *obj); void esmart_dvi_page_previous (Evas_Object *obj); -void esmart_dvi_page_page_length_set (Evas_Object *obj, int page_length); -int esmart_dvi_page_page_length_get (Evas_Object *obj); -void esmart_dvi_page_page_next (Evas_Object *obj); -void esmart_dvi_page_page_previous (Evas_Object *obj); + +/** + * @} + */ + #endif /* __ESMART_DVI_H__ */ =================================================================== RCS file: /cvs/e/e17/proto/edvi/src/lib/etk_dvi.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- etk_dvi.c 29 Sep 2007 18:19:20 -0000 1.7 +++ etk_dvi.c 1 Mar 2008 22:59:51 -0000 1.8 @@ -9,6 +9,12 @@ #include "etk_utils.h" #include "config.h" +#if HAVE___ATTRIBUTE__ +#define __UNUSED__ __attribute__((unused)) +#else +#define __UNUSED__ +#endif + #define round(a) ( ((a)<0.0) ? (int)(floor((a) - 0.5)) : (int)(floor((a) + 0.5)) ) @@ -89,7 +95,7 @@ edvi_document_delete (dvi->dvi_document); dvi->dvi_document = edvi_document_new (dvi->filename, dvi->dvi_device, dvi->dvi_property); - dvi->page = -1; + dvi->page = 0; _etk_dvi_load(dvi); } @@ -126,7 +132,6 @@ /** * @brief Get the page number * @param dvi: the dvi to change page - * @param page: the page number * @return Returns the page number */ int etk_dvi_page_get(Etk_Dvi *dvi) @@ -142,7 +147,7 @@ * @param dvi an dvi * @return Returns the document of the dvi (NULL on failure) */ -Edvi_Document *etk_dvi_dvi_document_get (Etk_Dvi *dvi) +const Edvi_Document *etk_dvi_dvi_document_get (Etk_Dvi *dvi) { if (!dvi) return NULL; @@ -155,7 +160,7 @@ * @param dvi an dvi * @return Returns the current page of the dvi document (NULL on failure) */ -Edvi_Page *etk_dvi_dvi_page_get (Etk_Dvi *dvi) +const Edvi_Page *etk_dvi_dvi_page_get (Etk_Dvi *dvi) { if (!dvi) return NULL; @@ -187,6 +192,14 @@ evas_object_image_size_get(dvi->dvi_object, width, height); } +/** + * @param dvi: the dvi to change the orientation + * @param o: the orientation + * @return Returns no value. + * @brief Set an orientation of the document + * + * Sets an orientation @p o of the document + */ void etk_dvi_orientation_set (Etk_Dvi *dvi, Edvi_Page_Orientation o) { if (!dvi || !dvi->dvi_page || (dvi->orientation == o)) @@ -196,6 +209,12 @@ _etk_dvi_load (dvi); } +/** + * @param dvi: the dvi widget to get the orientation of + * @return Returns the orientation of the document. + * @brief get the orientation of the document @p dvi. If @p dvi + * is NULL, return EDVI_PAGE_ORIENTATION_PORTRAIT + */ Edvi_Page_Orientation etk_dvi_orientation_get (Etk_Dvi *dvi) { if (!dvi || !dvi->dvi_page) @@ -204,6 +223,16 @@ return edvi_page_orientation_get (dvi->dvi_page); } +/** + * @param dvi: the dvi to change the scale + * @param hscale: the horizontal scale + * @param vscale: the vertical scale + * @return Returns no value. + * @brief Set the scale of the document + * + * Sets the horizontal scale @p hscale ans the vertical scale @p vscale + * of the document @p dvi + */ void etk_dvi_scale_set (Etk_Dvi *dvi, double hscale, double vscale) { if (!dvi) @@ -217,6 +246,14 @@ _etk_dvi_load (dvi); } +/** + * @param dvi: the dvi widget to get the orientation of + * @param hscale: horizontal scale of the current page + * @param vscale: vertical scale of the current page + * @return Returns no value. + * @brief get the horizontal scale @p hscale ans the vertical scale + * @p vscale of the document @p dvi. If @p dvi is NULL, their values are 1.0 + */ void etk_dvi_scale_get (Etk_Dvi *dvi, double *hscale, double *vscale) { if (!dvi) { @@ -235,6 +272,11 @@ } } +/** + * @param dvi: the dvi widget + * @return Returns no value. + * @brief go to the next page and render it + */ void etk_dvi_page_next (Etk_Dvi *dvi) { @@ -249,6 +291,11 @@ etk_dvi_page_set (dvi, page); } +/** + * @param dvi: the dvi widget + * @return Returns no value. + * @brief go to the previous page and render it + */ void etk_dvi_page_previous (Etk_Dvi *dvi) { @@ -263,52 +310,6 @@ etk_dvi_page_set (dvi, page); } -void -etk_dvi_page_page_length_set (Etk_Dvi *dvi, int page_length) -{ - if (!dvi || (page_length <= 0) || (dvi->page_length == page_length)) - return; - - dvi->page_length = page_length; -} - -int -etk_dvi_page_page_length_get (Etk_Dvi *dvi) -{ - if (!dvi) - return 0; - - return dvi->page_length; -} - -void -etk_dvi_page_page_next (Etk_Dvi *dvi) -{ - int page; - - if (!dvi) - return; - - page = dvi->page + dvi->page_length; - if (page >= edvi_document_page_count_get(dvi->dvi_document)) - page = edvi_document_page_count_get(dvi->dvi_document) - 1; - etk_dvi_page_set (dvi, page); -} - -void -etk_dvi_page_page_previous (Etk_Dvi *dvi) -{ - int page; - - if (!dvi) - return; - - page = dvi->page - dvi->page_length; - if (page < 0) - page = 0; - etk_dvi_page_set (dvi, page); -} - /************************** * * Etk specific functions @@ -326,7 +327,6 @@ dvi->dvi_object = NULL; dvi->filename = NULL; dvi->page = -1; - dvi->page_length = 10; dvi->dvi_device = edvi_device_new (edvi_dpi_get(), edvi_dpi_get()); dvi->dvi_property = edvi_property_new(); @@ -458,7 +458,7 @@ **************************/ /* Called when the dvi is realized */ -static Etk_Bool _etk_dvi_realize_cb(Etk_Object *object, void *data) +static Etk_Bool _etk_dvi_realize_cb(Etk_Object *object, void *data __UNUSED__) { Etk_Dvi *dvi; Evas *evas; @@ -476,7 +476,7 @@ } /* Called when the dvi is unrealized */ -static Etk_Bool _etk_dvi_unrealize_cb(Etk_Object *object, void *data) +static Etk_Bool _etk_dvi_unrealize_cb(Etk_Object *object, void *data __UNUSED__) { Etk_Dvi *dvi; @@ -545,4 +545,6 @@ etk_widget_size_recalc_queue(widget); } -/** @} */ +/** + * @} + */ =================================================================== RCS file: /cvs/e/e17/proto/edvi/src/lib/etk_dvi.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- etk_dvi.h 16 Jul 2006 20:51:17 -0000 1.1 +++ etk_dvi.h 1 Mar 2008 22:59:51 -0000 1.2 @@ -5,11 +5,38 @@ #include <Edvi.h> #include "etk_widget.h" + /** - * @defgroup Etk_Dvi Etk_Dvi + * @file etk_dvi.h + * @defgroup Etk_Dvi Etk Dvi + * @brief A DVI display Widget for the Etk toolkit + * + * Provides a widget for displaying DVI files in an Etk widget. + * To use an Etk_Dwi widget, create it with etk_dvi_new(), and + * set the file with etk_dvi_file_set(). For example: + * + * @code + * #include <Etk.h> + * #include <etk_dvi.h> + * + * Etk_Widget *dvi; + * char *filename + * + * dvi = etk_dvi_new (); + * etk_dvi_file_set (ETK_DVI (dvi), filename); + * etk_widget_show (dvi); + * @endcode + * + * To change the page, use etk_dvi_page_set() or etk_dvi_page_next() + * / etk_dvi_page_previous(). + * + * The orientation of the page can be changed with + * etk_dvi_orientation_set(). + * * @{ */ + /** @brief Gets the type of a dvi */ #define ETK_DVI_TYPE (etk_dvi_type_get()) /** @brief Casts the object to an Etk_Dvi */ @@ -18,29 +45,32 @@ #define ETK_IS_DVI(obj) (ETK_OBJECT_CHECK_TYPE((obj), ETK_DVI_TYPE)) /** - * @struct Etk_Dvi - * @brief A dvi is a simple widget that just displays an dvi + * @typedef Etk_Dvi + * @brief An Etk dvi widget is a simple widget that displays a DVI document */ typedef struct _Etk_Dvi Etk_Dvi; +/** + * @struct _Etk_Dvi + * Inherits from Etk_Widget and extends to provide a dvi widget + */ struct _Etk_Dvi { /* private: */ /* Inherit from Etk_Widget */ - Etk_Widget widget; + Etk_Widget widget; /**< Inherit from Etk_Widget */ - Evas_Object *dvi_object; - char *filename; - int page; - int page_length; - - Edvi_Device *dvi_device; - Edvi_Property *dvi_property; - Edvi_Document *dvi_document; - Edvi_Page *dvi_page; - Edvi_Page_Orientation orientation; - double hscale; - double vscale; + Evas_Object *dvi_object; /**< The evas object for the image */ + char *filename; /**< The file name */ + int page; /**< The page number */ + + Edvi_Device *dvi_device; /**< The Edvi device */ + Edvi_Property *dvi_property; /**< The Edvi property */ + Edvi_Document *dvi_document; /**< The Edvi document */ + Edvi_Page *dvi_page; /**< The Edvi current page */ + Edvi_Page_Orientation orientation; /**< The orientation */ + double hscale; /**< The horizontal scale */ + double vscale; /**< The vertical scale */ }; Etk_Type *etk_dvi_type_get(); @@ -50,8 +80,8 @@ const char *etk_dvi_file_get(Etk_Dvi *dvi); void etk_dvi_page_set(Etk_Dvi *dvi, int page); int etk_dvi_page_get(Etk_Dvi *dvi); -Edvi_Document *etk_dvi_dvi_document_get (Etk_Dvi *dvi); -Edvi_Page *etk_dvi_dvi_page_get (Etk_Dvi *dvi); +const Edvi_Document *etk_dvi_dvi_document_get (Etk_Dvi *dvi); +const Edvi_Page *etk_dvi_dvi_page_get (Etk_Dvi *dvi); void etk_dvi_size_get (Etk_Dvi *dvi, int *width, int *height); void etk_dvi_orientation_set (Etk_Dvi *dvi, Edvi_Page_Orientation o); @@ -61,11 +91,10 @@ void etk_dvi_scale_get (Etk_Dvi *dvi, double *hscale, double *vscale); void etk_dvi_page_next (Etk_Dvi *dvi); void etk_dvi_page_previous (Etk_Dvi *dvi); -void etk_dvi_page_page_length_set (Etk_Dvi *dvi, int page_length); -int etk_dvi_page_page_length_get (Etk_Dvi *dvi); -void etk_dvi_page_page_next (Etk_Dvi *dvi); -void etk_dvi_page_page_previous (Etk_Dvi *dvi); -/** @} */ +/** + * @} + */ + #endif =================================================================== RCS file: /cvs/e/e17/proto/edvi/src/lib/ewl_dvi.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -3 -r1.8 -r1.9 --- ewl_dvi.c 7 Dec 2007 16:59:15 -0000 1.8 +++ ewl_dvi.c 1 Mar 2008 22:59:51 -0000 1.9 @@ -1,5 +1,7 @@ #include <math.h> +#include "config.h" + #include <Ewl.h> #include "ewl_debug.h" #include "ewl_macros.h" @@ -14,6 +16,12 @@ #define round(a) ( ((a)<0.0) ? (int)(floor((a) - 0.5)) : (int)(floor((a) + 0.5)) ) + +/** + * @addtogroup Ewl_Dvi + * @{ + */ + /** * @return Returns a pointer to a new dvi widget on success, NULL on failure. * @brief Load an dvi widget with specified dvi contents @@ -79,7 +87,6 @@ dvi->filename = NULL; dvi->page = -1; - dvi->page_length = 10; dvi->dvi_device = edvi_device_new (edvi_dpi_get(), edvi_dpi_get()); dvi->dvi_property = edvi_property_new(); @@ -145,26 +152,26 @@ } dvi->dvi_document = edvi_document_new (filename, dvi->dvi_device, dvi->dvi_property); - dvi->page = -1; + dvi->page = 0; /* * Load the new dvi if widget has been realized */ if (REALIZED(w)) { ewl_widget_unrealize(w); - ewl_widget_realize(w); + ewl_widget_reveal(w); } DLEAVE_FUNCTION(DLEVEL_STABLE); } /** - * @param dvi: the dvi to change constrain setting - * @param size: the minimum constrain size + * @param dvi: the dvi to set the page of + * @param page: the page number * @return Returns no value. - * @brief Set a size which, if the dvi is bigger than, scale proportionally + * @brief Set the page of the document * - * Sets a size to scale to proportionally if the dvi exceeds this size + * Sets the page of the document @p dvi to @p page */ void ewl_dvi_page_set(Ewl_Dvi *dvi, int page) { @@ -188,7 +195,7 @@ * @return Returns the document of the dvi (NULL on failure) * @brief get the document of the dvi */ -Edvi_Document *ewl_dvi_dvi_document_get (Ewl_Dvi *dvi) +const Edvi_Document *ewl_dvi_dvi_document_get (Ewl_Dvi *dvi) { DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR_RET(dvi, NULL); @@ -202,7 +209,7 @@ * @return Returns the current page of the dvi (NULL on failure) * @brief get the current page of the dvi */ -Edvi_Page *ewl_dvi_dvi_page_get (Ewl_Dvi *dvi) +const Edvi_Page *ewl_dvi_dvi_page_get (Ewl_Dvi *dvi) { DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR_RET(dvi, NULL); @@ -236,6 +243,14 @@ DLEAVE_FUNCTION(DLEVEL_STABLE); } +/** + * @param dvi: the dvi to change the orientation + * @param o: the orientation + * @return Returns no value. + * @brief Set an orientation of the document + * + * Sets an orientation @p o of the document + */ void ewl_dvi_orientation_set (Ewl_Dvi *dvi, Edvi_Page_Orientation o) { @@ -252,6 +267,12 @@ DLEAVE_FUNCTION(DLEVEL_STABLE); } +/** + * @param dvi: the dvi widget to get the orientation of + * @return Returns the orientation of the document. + * @brief get the orientation of the document @p dvi. If @p dvi + * is NULL, return EDVI_PAGE_ORIENTATION_PORTRAIT + */ Edvi_Page_Orientation ewl_dvi_orientation_get (Ewl_Dvi *dvi) { @@ -265,6 +286,16 @@ DRETURN_INT(edvi_page_orientation_get (dvi->dvi_page), DLEVEL_STABLE); } +/** + * @param dvi: the dvi to change the scale + * @param hscale: the horizontal scale + * @param vscale: the vertical scale + * @return Returns no value. + * @brief Set the scale of the document + * + * Sets the horizontal scale @p hscale ans the vertical scale @p vscale + * of the document @p dvi + */ void ewl_dvi_scale_set (Ewl_Dvi *dvi, double hscale, double vscale) { @@ -282,6 +313,14 @@ DLEAVE_FUNCTION(DLEVEL_STABLE); } +/** + * @param dvi: the dvi widget to get the orientation of + * @param hscale: horizontal scale of the current page + * @param vscale: vertical scale of the current page + * @return Returns no value. + * @brief get the horizontal scale @p hscale ans the vertical scale + * @p vscale of the document @p dvi. If @p dvi is NULL, their values are 1.0 + */ void ewl_dvi_scale_get (Ewl_Dvi *dvi, double *hscale, double *vscale) { @@ -301,6 +340,11 @@ DLEAVE_FUNCTION(DLEVEL_STABLE); } +/** + * @param dvi: the dvi widget + * @return Returns no value. + * @brief go to the next page and render it + */ void ewl_dvi_page_next (Ewl_Dvi *dvi) { @@ -321,6 +365,11 @@ DLEAVE_FUNCTION(DLEVEL_STABLE); } +/** + * @param dvi: the dvi widget + * @return Returns no value. + * @brief go to the previous page and render it + */ void ewl_dvi_page_previous (Ewl_Dvi *dvi) { @@ -341,74 +390,14 @@ DLEAVE_FUNCTION(DLEVEL_STABLE); } -void -ewl_dvi_page_page_length_set (Ewl_Dvi *dvi, int page_length) -{ - DENTER_FUNCTION(DLEVEL_STABLE); - DCHECK_PARAM_PTR(dvi); - DCHECK_TYPE(dvi, EWL_DVI_TYPE); - - if (!dvi || (page_length <= 0) || (dvi->page_length == page_length)) - DLEAVE_FUNCTION(DLEVEL_STABLE); - - dvi->page_length = page_length; - - DLEAVE_FUNCTION(DLEVEL_STABLE); -} - -int -ewl_dvi_page_page_length_get (Ewl_Dvi *dvi) -{ - DENTER_FUNCTION(DLEVEL_STABLE); - DCHECK_PARAM_PTR_RET(dvi, 0); - DCHECK_TYPE_RET(dvi, EWL_DVI_TYPE, 0); - - if (!dvi) - DRETURN_INT(0, DLEVEL_STABLE); - - DRETURN_INT(dvi->page_length, DLEVEL_STABLE); -} - -void -ewl_dvi_page_page_next (Ewl_Dvi *dvi) -{ - int page; - - DENTER_FUNCTION(DLEVEL_STABLE); - DCHECK_PARAM_PTR(dvi); - DCHECK_TYPE(dvi, EWL_DVI_TYPE); - - if (!dvi) - DLEAVE_FUNCTION(DLEVEL_STABLE); - - page = dvi->page + dvi->page_length; - if (page >= edvi_document_page_count_get(dvi->dvi_document)) - page = edvi_document_page_count_get(dvi->dvi_document) - 1; - ewl_dvi_page_set (dvi, page); - - DLEAVE_FUNCTION(DLEVEL_STABLE); -} - -void -ewl_dvi_page_page_previous (Ewl_Dvi *dvi) -{ - int page; - - DENTER_FUNCTION(DLEVEL_STABLE); - DCHECK_PARAM_PTR(dvi); - DCHECK_TYPE(dvi, EWL_DVI_TYPE); - - if (!dvi) - DLEAVE_FUNCTION(DLEVEL_STABLE); - - page = dvi->page - dvi->page_length; - if (page < 0) - page = 0; - ewl_dvi_page_set (dvi, page); - - DLEAVE_FUNCTION(DLEVEL_STABLE); -} - +/** + * @internal + * @param w: The widget to work with + * @param ev_data: UNUSED + * @param user_data: UNUSED + * @return Returns no value + * @brief The reveal callback + */ void ewl_dvi_reveal_cb(Ewl_Widget *w, void *ev_data __UNUSED__, void *user_data __UNUSED__) @@ -422,6 +411,8 @@ dvi = EWL_DVI(w); emb = ewl_embed_widget_find(w); + if (!emb) + DRETURN(DLEVEL_STABLE); /* * Load the dvi @@ -435,8 +426,8 @@ if (dvi->dvi_document) { unsigned int *m; - int w; - int h; + int w; + int h; if (dvi->dvi_page) edvi_page_delete (dvi->dvi_page); @@ -447,7 +438,7 @@ evas_object_image_size_set (dvi->image, w, h); evas_object_image_fill_set (dvi->image, 0, 0, w, h); m = (unsigned int *)evas_object_image_data_get (dvi->image, 1); - if (!m) + if (!m) DRETURN(DLEVEL_STABLE); memset(m, (255 << 24) | (255 << 16) | (255 << 8) | 255, w * h * 4); @@ -479,6 +470,14 @@ DLEAVE_FUNCTION(DLEVEL_STABLE); } +/** + * @internal + * @param w: The widget to work with + * @param ev_data: UNUSED + * @param user_data: UNUSED + * @return Returns no value + * @brief The obscure callback + */ void ewl_dvi_obscure_cb(Ewl_Widget *w, void *ev_data __UNUSED__, void *user_data __UNUSED__) @@ -501,6 +500,14 @@ DLEAVE_FUNCTION(DLEVEL_STABLE); } +/** + * @internal + * @param w: The widget to work with + * @param ev_data: UNUSED + * @param user_data: UNUSED + * @return Returns no value + * @brief The configure callback + */ void ewl_dvi_configure_cb(Ewl_Widget *w, void *ev_data __UNUSED__, void *user_data __UNUSED__) @@ -539,6 +546,14 @@ DLEAVE_FUNCTION(DLEVEL_STABLE); } +/** + * @internal + * @param w: The widget to work with + * @param ev_data: UNUSED + * @param user_data: UNUSED + * @return Returns no value + * @brief The destroy callback + */ void ewl_dvi_destroy_cb(Ewl_Widget *w, void *ev_data __UNUSED__, void *user_data __UNUSED__) @@ -563,3 +578,7 @@ DLEAVE_FUNCTION(DLEVEL_STABLE); } + +/** + * @} + */ =================================================================== RCS file: /cvs/e/e17/proto/edvi/src/lib/ewl_dvi.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- ewl_dvi.h 12 Feb 2007 14:38:32 -0000 1.3 +++ ewl_dvi.h 1 Mar 2008 22:59:51 -0000 1.4 @@ -3,10 +3,33 @@ #include <Edvi.h> + /** * @file ewl_dvi.h - * @defgroup Ewl_Dvi Dvi: An Dvi Display Widget - * Provides a widget for displaying evas loadable dvis, and edjes. + * @defgroup Ewl_Dvi Ewl Dvi + * @brief A DVI display Widget for the Ewl toolkit + * + * Provides a widget for displaying DVI files in an Ewl widget. + * To use an Ewl_Dwi widget, create it with ewl_dvi_new(), and + * set the file with ewl_dvi_file_set(). For example: + * + * @code + * #include <Ewl.h> + * #include <ewl_dvi.h> + * + * Ewl_Widget *dvi; + * char *filename + * + * dvi = ewl_dvi_new (); + * ewl_dvi_file_set (EWL_DVI (dvi), filename); + * ewl_widget_show (dvi); + * @endcode + * + * To change the page, use ewl_dvi_page_set() or ewl_dvi_page_next() + * / ewl_dvi_page_previous(). + * + * The orientation of the page can be changed with + * ewl_dvi_orientation_set(). * * @{ */ @@ -23,7 +46,8 @@ #define EWL_DVI_TYPE "dvi" /** - * The Ewl_Dvi widget + * @typedef Ewl_Dvi + * @brief An Ewl dvi widget is a simple widget that displays a DVI document */ typedef struct Ewl_Dvi Ewl_Dvi; @@ -34,25 +58,25 @@ #define EWL_DVI(dvi) ((Ewl_Dvi *) dvi) /** + * @struct Ewl_Dvi * Inherits from Ewl_Widget and extends to provide a dvi widget */ struct Ewl_Dvi { - Ewl_Widget widget; - void *image; - char *filename; - int ow; - int oh; - int page; - int page_length; - - Edvi_Device *dvi_device; - Edvi_Property *dvi_property; - Edvi_Document *dvi_document; - Edvi_Page *dvi_page; - Edvi_Page_Orientation orientation; - double hscale; - double vscale; + Ewl_Widget widget; /**< Inherit from Ewl_Widget */ + void *image; /**< The evas object for the image */ + char *filename; /**< The file name */ + int ow; /**< The original image width */ + int oh; /**< The original image height */ + int page; /**< The page number */ + + Edvi_Device *dvi_device; /**< The Edvi device */ + Edvi_Property *dvi_property; /**< The Edvi property */ + Edvi_Document *dvi_document; /**< The Edvi document */ + Edvi_Page *dvi_page; /**< The Edvi current page */ + Edvi_Page_Orientation orientation; /**< The orientation */ + double hscale; /**< The horizontal scale */ + double vscale; /**< The vertical scale */ }; @@ -61,8 +85,8 @@ void ewl_dvi_file_set(Ewl_Dvi *dvi, const char *filename); void ewl_dvi_page_set(Ewl_Dvi *dvi, int page); int ewl_dvi_page_get(Ewl_Dvi *dvi); -Edvi_Document *ewl_dvi_dvi_document_get (Ewl_Dvi *dvi); -Edvi_Page *ewl_dvi_dvi_page_get (Ewl_Dvi *dvi); +const Edvi_Document *ewl_dvi_dvi_document_get (Ewl_Dvi *dvi); +const Edvi_Page *ewl_dvi_dvi_page_get (Ewl_Dvi *dvi); void ewl_dvi_size_get (Ewl_Dvi *dvi, int *width, int *height); void ewl_dvi_orientation_set (Ewl_Dvi *dvi, Edvi_Page_Orientation o); @@ -72,10 +96,6 @@ void ewl_dvi_scale_get (Ewl_Dvi *dvi, double *hscale, double *vscale); void ewl_dvi_page_next (Ewl_Dvi *dvi); void ewl_dvi_page_previous (Ewl_Dvi *dvi); -void ewl_dvi_page_page_length_set (Ewl_Dvi *dvi, int page_length); -int ewl_dvi_page_page_length_get (Ewl_Dvi *dvi); -void ewl_dvi_page_page_next (Ewl_Dvi *dvi); -void ewl_dvi_page_page_previous (Ewl_Dvi *dvi); /* * Internally used callbacks, override at your own risk. @@ -88,5 +108,6 @@ /** * @} */ + #endif /* __EWL_DVI_H__ */ |
From: Enlightenment C. <no...@cv...> - 2008-03-01 23:00:24
|
Enlightenment CVS committal Author : doursse Project : e17 Module : proto/edvi Dir : e17/proto/edvi/src/plugins/epsilon Modified Files: Makefile.am epsilon_thumbnailer.c Log Message: * Makefile.am: * configure.in: * src/bin/Makefile.am: * src/lib/Makefile.am: * src/plugins/epsilon/Makefile.am: * src/plugins/ewl/Makefile.am: clean up the build system * src/bin/edvi_esmart_test.c: (app_signal_exit), (app_delete_request): * src/bin/edvi_etk_test.c: (main), (_quit_cb), (_change_page_cb): * src/bin/edvi_evas_test.c: (app_signal_exit), (app_delete_request): * src/bin/edvi_ewl_test.c: (main), (_quit_cb), (_change_page_cb): * src/lib/Edvi.h: * src/lib/edvi_device.c: (_edvi_device_aa_put), (DEV_put_bitmap_rgb), (DEV_poll), (_edvi_put_rectangle): * src/lib/edvi_device.h: * src/lib/edvi_document.c: (edvi_document_page_count_get): * src/lib/edvi_document.h: * src/lib/edvi_enum.h: * src/lib/edvi_main.c: (edvi_init): * src/lib/edvi_main.h: * src/lib/edvi_page.c: (edvi_page_mag_set), (edvi_page_orientation_get): * src/lib/edvi_page.h: * src/lib/edvi_property.h: * src/lib/esmart_dvi.c: (esmart_dvi_init): * src/lib/esmart_dvi.h: * src/lib/etk_dvi.c: (etk_dvi_file_set), (etk_dvi_dvi_document_get), (etk_dvi_dvi_page_get), (_etk_dvi_constructor), (_etk_dvi_realize_cb), (_etk_dvi_unrealize_cb): * src/lib/etk_dvi.h: * src/lib/ewl_dvi.c: (ewl_dvi_init), (ewl_dvi_file_set), (ewl_dvi_dvi_document_get), (ewl_dvi_dvi_page_get), (ewl_dvi_reveal_cb): * src/lib/ewl_dvi.h: * src/plugins/epsilon/epsilon_thumbnailer.c: (epsilon_generate_thumb): * src/plugins/ewl/ewl_dvi.c: (_change_page_cb), (create_test), (create_dvi_fd_cb), (dvi_load): Add a *lot* of documentation use __UNUSED__ where needed minor fixes =================================================================== RCS file: /cvs/e/e17/proto/edvi/src/plugins/epsilon/Makefile.am,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- Makefile.am 30 Aug 2007 14:44:48 -0000 1.1 +++ Makefile.am 1 Mar 2008 22:59:51 -0000 1.2 @@ -7,10 +7,13 @@ EDVI_EPSILON_PLUGIN = endif -pkgdir = @EPSILON_PLUGINS_DIR@ -pkg_LTLIBRARIES = $(EDVI_EPSILON_PLUGIN) +pkgdir = @EPSILON_PLUGINS_DIR@ +pkg_LTLIBRARIES = $(EDVI_EPSILON_PLUGIN) edvi_thumbnailer_la_SOURCES = epsilon_thumbnailer.c + +edvi_thumbnailer_la_CPPFLAGS = -I$(top_builddir)/src/lib @EPSILON_CFLAGS@ + edvi_thumbnailer_la_LDFLAGS = -module -avoid-version -edvi_thumbnailer_la_LIBADD = @EPSILON_LIBS@ $(top_builddir)/src/lib/libedvi.la -edvi_thumbnailer_la_CFLAGS = -I$(top_builddir)/src/lib @EPSILON_CFLAGS@ + +edvi_thumbnailer_la_LIBADD = $(top_builddir)/src/lib/libedvi.la @EPSILON_LIBS@ =================================================================== RCS file: /cvs/e/e17/proto/edvi/src/plugins/epsilon/epsilon_thumbnailer.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- epsilon_thumbnailer.c 30 Aug 2007 14:44:48 -0000 1.1 +++ epsilon_thumbnailer.c 1 Mar 2008 22:59:51 -0000 1.2 @@ -62,7 +62,6 @@ Edvi_Property *property; Edvi_Document *document; Edvi_Page *page; - int page_number; const int *pixels; char *param_kpathsea_mode = "cx"; @@ -114,6 +113,7 @@ edvi_device_delete (device); no_device: edvi_shutdown (); + return NULL; } Epsilon_Plugin * |
From: Enlightenment C. <no...@cv...> - 2008-03-04 17:11:42
|
Enlightenment CVS committal Author : doursse Project : e17 Module : proto/edvi Dir : e17/proto/edvi/src/plugins/ewl Modified Files: ewl_dvi.c Log Message: the tree2 --> tree was not finished =================================================================== RCS file: /cvs/e/e17/proto/edvi/src/plugins/ewl/ewl_dvi.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- ewl_dvi.c 1 Mar 2008 22:59:51 -0000 1.2 +++ ewl_dvi.c 4 Mar 2008 17:11:31 -0000 1.3 @@ -10,7 +10,7 @@ #include <ewl_scrollpane.h> #include <ewl_label.h> #include <ewl_list.h> -#include <ewl_tree2.h> +#include <ewl_tree.h> #include "Edvi.h" #include "ewl_dvi.h" |
From: Enlightenment C. <no...@cv...> - 2008-04-17 14:18:46
|
Enlightenment CVS committal Author : doursse Project : e17 Module : proto/edvi Dir : e17/proto/edvi/src/bin Modified Files: edvi_ewl_test.c Log Message: * src/bin/edvi_ewl_test.c: (main): ewl_model_ecore_list_instance() instead of ewl_model_ecore_list_get() =================================================================== RCS file: /cvs/e/e17/proto/edvi/src/bin/edvi_ewl_test.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -3 -r1.8 -r1.9 --- edvi_ewl_test.c 1 Mar 2008 22:59:51 -0000 1.8 +++ edvi_ewl_test.c 17 Apr 2008 14:18:33 -0000 1.9 @@ -84,7 +84,7 @@ ecore_list_append(str_data, txt); } - model = ewl_model_ecore_list_get(); + model = ewl_model_ecore_list_instance(); view = ewl_label_view_get(); list = ewl_list_new (); |
From: Enlightenment C. <no...@cv...> - 2008-04-17 14:19:27
|
Enlightenment CVS committal Author : doursse Project : e17 Module : proto/edvi Dir : e17/proto/edvi Modified Files: ChangeLog Log Message: * src/bin/edvi_ewl_test.c: (main): ewl_model_ecore_list_instance() instead of ewl_model_ecore_list_get() =================================================================== RCS file: /cvs/e/e17/proto/edvi/ChangeLog,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- ChangeLog 1 Mar 2008 22:59:50 -0000 1.5 +++ ChangeLog 17 Apr 2008 14:18:33 -0000 1.6 @@ -1,3 +1,9 @@ +2008-04-17 Vincent Torri <doursse at users dot sf dot net> + + * src/bin/edvi_ewl_test.c: (main): + ewl_model_ecore_list_instance() instead of + ewl_model_ecore_list_get() + 2008-03-01 Vincent Torri <doursse at users dot sf dot net> * Makefile.am: |
From: Enlightenment C. <no...@cv...> - 2008-07-13 10:11:59
|
Enlightenment CVS committal Author : doursse Project : e17 Module : proto/edvi Dir : e17/proto/edvi/src/plugins/ewl Modified Files: ewl_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/plugins/ewl/ewl_dvi.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- ewl_dvi.c 4 Mar 2008 17:11:31 -0000 1.3 +++ ewl_dvi.c 13 Jul 2008 10:11:57 -0000 1.4 @@ -102,7 +102,7 @@ str_data = ecore_list_new(); ecore_list_free_cb_set (str_data, free); - model = ewl_model_ecore_list_get(); + model = ewl_model_ecore_list_instance(); view = ewl_label_view_get(); list = ewl_list_new (); |
From: Enlightenment C. <no...@cv...> - 2008-07-13 10:12:29
|
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 |
From: Enlightenment C. <no...@cv...> - 2008-07-13 10:12:29
|
Enlightenment CVS committal Author : doursse Project : e17 Module : proto/edvi Dir : e17/proto/edvi Modified Files: ChangeLog configure.in Makefile.am edvi.pc.in 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/ChangeLog,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- ChangeLog 17 Apr 2008 14:18:33 -0000 1.6 +++ ChangeLog 13 Jul 2008 10:11:57 -0000 1.7 @@ -1,3 +1,64 @@ +2008-07-13 Vincent Torri <doursse at users dot sf dot net> + + * 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 + 2008-04-17 Vincent Torri <doursse at users dot sf dot net> * src/bin/edvi_ewl_test.c: (main): =================================================================== RCS file: /cvs/e/e17/proto/edvi/configure.in,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- configure.in 1 Mar 2008 22:59:50 -0000 1.5 +++ configure.in 13 Jul 2008 10:11:57 -0000 1.6 @@ -20,19 +20,19 @@ dnl Checking for __attribute__ support AC_MSG_CHECKING([for __attribute__]) -AC_CACHE_VAL(have___attribute__, +AC_CACHE_VAL(_cv_have___attribute__, [ AC_TRY_COMPILE([#include <stdlib.h>], [int func(int x); int foo(int x __attribute__ ((unused))) { exit(1); }], - [have___attribute__="yes"], - [have___attribute__="no"]) + [_cv_have___attribute__="yes"], + [_cv_have___attribute__="no"]) ] ) -if test "x${have___attribute__}" = "xyes" ; then +if test "x${_cv_have___attribute__}" = "xyes" ; then AC_DEFINE(HAVE___ATTRIBUTE__, 1, [Define to 1 if your compiler has __attribute__]) fi -AC_MSG_RESULT(${have___attribute__}) +AC_MSG_RESULT(${_cv_have___attribute__}) evas_version=0.9.9 =================================================================== RCS file: /cvs/e/e17/proto/edvi/Makefile.am,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- Makefile.am 1 Mar 2008 22:59:50 -0000 1.3 +++ Makefile.am 13 Jul 2008 10:11:57 -0000 1.4 @@ -12,10 +12,13 @@ configure \ depcomp \ install-sh \ -ltconfig \ ltmain.sh \ missing \ -stamp-h.in +m4/libtool.m4 \ +m4/lt~obsolete.m4 \ +m4/ltoptions.m4 \ +m4/ltsugar.m4 \ +m4/ltversion.m4 EXTRA_DIST = \ AUTHORS \ =================================================================== RCS file: /cvs/e/e17/proto/edvi/edvi.pc.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- edvi.pc.in 16 Jul 2006 20:51:17 -0000 1.1 +++ edvi.pc.in 13 Jul 2008 10:11:57 -0000 1.2 @@ -8,4 +8,4 @@ Requires: @requirements@ Version: @PACKAGE_VERSION@ Libs: -L${libdir} -ledvi -Cflags: -I${includedir} +Cflags: -I${includedir}/edvi |