aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Bodenmann <joel@seriouslyembedded.com>2016-02-07 21:57:03 +0100
committerJoel Bodenmann <joel@seriouslyembedded.com>2016-02-07 21:57:03 +0100
commit6b07b2af74b25f75e6006c13da4826568d0ea3c1 (patch)
treea802be9e3a7b2e3eaa47bdf4121c1b006a866c8c
parenta1ab0a67ba1ce10394e83cc7057e629c4192d798 (diff)
downloaduGFX-6b07b2af74b25f75e6006c13da4826568d0ea3c1.tar.gz
uGFX-6b07b2af74b25f75e6006c13da4826568d0ea3c1.tar.bz2
uGFX-6b07b2af74b25f75e6006c13da4826568d0ea3c1.zip
GTRANS module skeleton
-rw-r--r--demos/modules/gtrans/basic/demo.mk3
-rw-r--r--demos/modules/gtrans/basic/gfxconf.h66
-rw-r--r--demos/modules/gtrans/basic/main.c42
-rw-r--r--gfx.mk1
-rw-r--r--gfxconf.example.h6
-rw-r--r--src/gfx.c10
-rw-r--r--src/gfx_mk.c1
-rw-r--r--src/gtrans/gtrans.c20
-rw-r--r--src/gtrans/gtrans.h39
-rw-r--r--src/gtrans/gtrans.mk6
-rw-r--r--src/gtrans/gtrans_mk.c8
-rw-r--r--src/gtrans/gtrans_options.h21
-rw-r--r--src/gtrans/gtrans_rules.h22
13 files changed, 245 insertions, 0 deletions
diff --git a/demos/modules/gtrans/basic/demo.mk b/demos/modules/gtrans/basic/demo.mk
new file mode 100644
index 00000000..aeda098b
--- /dev/null
+++ b/demos/modules/gtrans/basic/demo.mk
@@ -0,0 +1,3 @@
+DEMODIR = $(GFXLIB)/demos/modules/gtrans/basic
+GFXINC += $(DEMODIR)
+GFXSRC += $(DEMODIR)/main.c
diff --git a/demos/modules/gtrans/basic/gfxconf.h b/demos/modules/gtrans/basic/gfxconf.h
new file mode 100644
index 00000000..a5a0fbef
--- /dev/null
+++ b/demos/modules/gtrans/basic/gfxconf.h
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2012, 2013, Joel Bodenmann aka Tectu <joel@unormal.org>
+ * Copyright (c) 2012, 2013, Andrew Hannam aka inmarket
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of the <organization> nor the
+ * names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef _GFXCONF_H
+#define _GFXCONF_H
+
+/* The operating system to use. One of these must be defined - preferably in your Makefile */
+//#define GFX_USE_OS_CHIBIOS FALSE
+//#define GFX_USE_OS_WIN32 FALSE
+//#define GFX_USE_OS_LINUX FALSE
+//#define GFX_USE_OS_OSX FALSE
+
+#define GFX_USE_GTRANS TRUE
+#define GFX_USE_GDISP TRUE
+
+#define GDISP_NEED_VALIDATION TRUE
+#define GDISP_NEED_CLIP TRUE
+#define GDISP_NEED_TEXT TRUE
+#define GDISP_NEED_ANTIALIAS TRUE
+
+#define GDISP_INCLUDE_USER_FONTS FALSE
+#define GDISP_INCLUDE_FONT_UI1 FALSE
+#define GDISP_INCLUDE_FONT_UI2 FALSE
+#define GDISP_INCLUDE_FONT_LARGENUMBERS FALSE
+#define GDISP_INCLUDE_FONT_DEJAVUSANS10 FALSE
+#define GDISP_INCLUDE_FONT_DEJAVUSANS12 FALSE
+#define GDISP_INCLUDE_FONT_DEJAVUSANS16 TRUE
+#define GDISP_INCLUDE_FONT_DEJAVUSANS24 FALSE
+#define GDISP_INCLUDE_FONT_DEJAVUSANS32 FALSE
+#define GDISP_INCLUDE_FONT_DEJAVUSANSBOLD12 FALSE
+#define GDISP_INCLUDE_FONT_FIXED_10x20 FALSE
+#define GDISP_INCLUDE_FONT_FIXED_7x14 FALSE
+#define GDISP_INCLUDE_FONT_FIXED_5x8 FALSE
+#define GDISP_INCLUDE_FONT_DEJAVUSANS12_AA FALSE
+#define GDISP_INCLUDE_FONT_DEJAVUSANS16_AA FALSE
+#define GDISP_INCLUDE_FONT_DEJAVUSANS24_AA FALSE
+#define GDISP_INCLUDE_FONT_DEJAVUSANS32_AA FALSE
+#define GDISP_INCLUDE_FONT_DEJAVUSANSBOLD12_AA FALSE
+
+#endif /* _GFXCONF_H */
diff --git a/demos/modules/gtrans/basic/main.c b/demos/modules/gtrans/basic/main.c
new file mode 100644
index 00000000..38d163cd
--- /dev/null
+++ b/demos/modules/gtrans/basic/main.c
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2012, 2013, Joel Bodenmann aka Tectu <joel@unormal.org>
+ * Copyright (c) 2012, 2013, Andrew Hannam aka inmarket
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of the <organization> nor the
+ * names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "gfx.h"
+
+int main(void)
+{
+ gfxInit();
+
+ while (TRUE) {
+ gfxSleepMilliseconds(500);
+ }
+
+ return 0;
+}
+
diff --git a/gfx.mk b/gfx.mk
index 1644176d..3201c313 100644
--- a/gfx.mk
+++ b/gfx.mk
@@ -21,6 +21,7 @@ else
include $(GFXLIB)/src/gaudio/gaudio.mk
include $(GFXLIB)/src/gmisc/gmisc.mk
include $(GFXLIB)/src/gfile/gfile.mk
+ include $(GFXLIB)/src/gtrans/gtrans.mk
endif
# Include the boards and drivers
diff --git a/gfxconf.example.h b/gfxconf.example.h
index 03f1f264..df22e86f 100644
--- a/gfxconf.example.h
+++ b/gfxconf.example.h
@@ -209,6 +209,12 @@
///////////////////////////////////////////////////////////////////////////
+// GTRANS //
+///////////////////////////////////////////////////////////////////////////
+//#define GFX_USE_GTRANS FALSE
+
+
+///////////////////////////////////////////////////////////////////////////
// GEVENT //
///////////////////////////////////////////////////////////////////////////
//#define GFX_USE_GEVENT FALSE
diff --git a/src/gfx.c b/src/gfx.c
index 34526e6b..ba7a581e 100644
--- a/src/gfx.c
+++ b/src/gfx.c
@@ -73,6 +73,10 @@ extern void _gosDeinit(void);
extern void _gmiscInit(void);
extern void _gmiscDeinit(void);
#endif
+#if GFX_USE_GTRANS
+ extern void _gtransInit(void);
+ extern void _gtransDeinit(void);
+#endif
void gfxInit(void)
{
@@ -96,6 +100,9 @@ void gfxInit(void)
#if GFX_USE_GMISC
_gmiscInit();
#endif
+ #if GFX_USE_GTRANS
+ _gtransInit();
+ #endif
#if GFX_USE_GEVENT
_geventInit();
#endif
@@ -159,6 +166,9 @@ void gfxDeinit(void)
#if GFX_USE_GEVENT
_geventDeinit();
#endif
+ #if GFX_USE_GTRANS
+ _gtransDeinit();
+ #endif
#if GFX_USE_GMISC
_gmiscDeinit();
#endif
diff --git a/src/gfx_mk.c b/src/gfx_mk.c
index 34e6afd8..625ba680 100644
--- a/src/gfx_mk.c
+++ b/src/gfx_mk.c
@@ -18,3 +18,4 @@
#include "gaudio/gaudio_mk.c"
#include "gmisc/gmisc_mk.c"
#include "gfile/gfile_mk.c"
+#include "gtrans/gtrans_mk.c"
diff --git a/src/gtrans/gtrans.c b/src/gtrans/gtrans.c
new file mode 100644
index 00000000..7e1105d6
--- /dev/null
+++ b/src/gtrans/gtrans.c
@@ -0,0 +1,20 @@
+/*
+ * This file is subject to the terms of the GFX License. If a copy of
+ * the license was not distributed with this file, you can obtain one at:
+ *
+ * http://ugfx.org/license.html
+ */
+
+#include "../../gfx.h"
+
+#if GFX_USE_GTRANS
+
+void _gtransInit(void)
+{
+}
+
+void _gtransDeinit(void)
+{
+}
+
+#endif /* GFX_USE_GTRANS */
diff --git a/src/gtrans/gtrans.h b/src/gtrans/gtrans.h
new file mode 100644
index 00000000..c46b5b28
--- /dev/null
+++ b/src/gtrans/gtrans.h
@@ -0,0 +1,39 @@
+/*
+ * This file is subject to the terms of the GFX License. If a copy of
+ * the license was not distributed with this file, you can obtain one at:
+ *
+ * http://ugfx.org/license.html
+ */
+
+/**
+ * @file src/gtrans/gtrans.h
+ *
+ * @addtogroup GTRANS
+ *
+ * @brief Module to allow changing the language of an application dynamically during run-time.
+ *
+ * @{
+ */
+
+#ifndef _TRANS_H
+#define _TRANS_H
+
+#include "../../gfx.h"
+
+#if GFX_USE_GTRANS || defined(__DOXYGEN__)
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* GFX_USE_GTRANS */
+
+#endif /* _TRANS_H */
+/** @} */
+
diff --git a/src/gtrans/gtrans.mk b/src/gtrans/gtrans.mk
new file mode 100644
index 00000000..e2f474f3
--- /dev/null
+++ b/src/gtrans/gtrans.mk
@@ -0,0 +1,6 @@
+# This file is subject to the terms of the GFX License. If a copy of
+# the license was not distributed with this file, you can obtain one at:
+#
+# http://ugfx.org/license.html
+
+GFXSRC += $(GFXLIB)/src/gtrans/gtrans.c
diff --git a/src/gtrans/gtrans_mk.c b/src/gtrans/gtrans_mk.c
new file mode 100644
index 00000000..57557509
--- /dev/null
+++ b/src/gtrans/gtrans_mk.c
@@ -0,0 +1,8 @@
+/*
+ * This file is subject to the terms of the GFX License. If a copy of
+ * the license was not distributed with this file, you can obtain one at:
+ *
+ * http://ugfx.org/license.html
+ */
+
+#include "gtrans.c"
diff --git a/src/gtrans/gtrans_options.h b/src/gtrans/gtrans_options.h
new file mode 100644
index 00000000..04193f85
--- /dev/null
+++ b/src/gtrans/gtrans_options.h
@@ -0,0 +1,21 @@
+/*
+ * This file is subject to the terms of the GFX License. If a copy of
+ * the license was not distributed with this file, you can obtain one at:
+ *
+ * http://ugfx.org/license.html
+ */
+
+/**
+ * @file src/gtrans/gtrans_options.h
+ *
+ * @addtogroup GTRANS
+ * @{
+ */
+
+#ifndef _GTRANS_OPTIONS_H
+#define _GTRANS_OPTIONS_H
+
+
+
+#endif /* _GTRANS_OPTIONS_H */
+/** @} */
diff --git a/src/gtrans/gtrans_rules.h b/src/gtrans/gtrans_rules.h
new file mode 100644
index 00000000..e5d383ce
--- /dev/null
+++ b/src/gtrans/gtrans_rules.h
@@ -0,0 +1,22 @@
+/*
+ * This file is subject to the terms of the GFX License. If a copy of
+ * the license was not distributed with this file, you can obtain one at:
+ *
+ * http://ugfx.org/license.html
+ */
+
+/**
+ * @file src/gtrans/gtrans_rules.h
+ *
+ * @addtogroup GTRANS
+ * @{
+ */
+
+#ifndef _GTRANS_RULES_H
+#define _GTRANS_RULES_H
+
+#if GFX_USE_GTRANS
+#endif
+
+#endif /* _GTRANS_RULES_H */
+/** @} */