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 \
[EMAIL PROTECTED]@
-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 \
[EMAIL PROTECTED]@ \
[EMAIL PROTECTED]@
-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 \
[EMAIL PROTECTED]@ \
[EMAIL PROTECTED]@
-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);
}
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs