aboutsummaryrefslogtreecommitdiffstats
path: root/demos/modules/gwin
diff options
context:
space:
mode:
authorinmarket <andrewh@inmarket.com.au>2013-07-07 19:41:15 +1000
committerinmarket <andrewh@inmarket.com.au>2013-07-07 19:41:15 +1000
commitfb131f8d26319c787286a9adf24d9876d9793b2f (patch)
treeceb20326caa3326eab1baa90737eaeec896740d5 /demos/modules/gwin
parent3957505ab119b21c7b0f4e72f56030c97711988a (diff)
downloaduGFX-fb131f8d26319c787286a9adf24d9876d9793b2f.tar.gz
uGFX-fb131f8d26319c787286a9adf24d9876d9793b2f.tar.bz2
uGFX-fb131f8d26319c787286a9adf24d9876d9793b2f.zip
Remove Slider demo. It is replaced by the Wdigets demo
Diffstat (limited to 'demos/modules/gwin')
-rw-r--r--demos/modules/gwin/slider/gfxconf.h84
-rw-r--r--demos/modules/gwin/slider/main.c97
-rw-r--r--demos/modules/gwin/slider/readme.txt6
-rw-r--r--demos/modules/gwin/slider/result_647x490.pngbin24141 -> 0 bytes
4 files changed, 0 insertions, 187 deletions
diff --git a/demos/modules/gwin/slider/gfxconf.h b/demos/modules/gwin/slider/gfxconf.h
deleted file mode 100644
index b7b39a3f..00000000
--- a/demos/modules/gwin/slider/gfxconf.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * 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 */
-#define GFX_USE_OS_CHIBIOS TRUE
-#define GFX_USE_OS_WIN32 FALSE
-#define GFX_USE_OS_POSIX FALSE
-
-/* GFX sub-systems to turn on */
-#define GFX_USE_GDISP TRUE
-#define GFX_USE_GWIN TRUE
-#define GFX_USE_GEVENT TRUE
-#define GFX_USE_GTIMER TRUE
-#define GFX_USE_GINPUT TRUE
-
-/* Features for the GDISP sub-system. */
-#define GDISP_NEED_VALIDATION TRUE
-#define GDISP_NEED_CLIP TRUE
-#define GDISP_NEED_TEXT TRUE
-#define GDISP_NEED_CIRCLE FALSE
-#define GDISP_NEED_ELLIPSE FALSE
-#define GDISP_NEED_ARC FALSE
-#define GDISP_NEED_CONVEX_POLYGON FALSE
-#define GDISP_NEED_SCROLL FALSE
-#define GDISP_NEED_PIXELREAD FALSE
-#define GDISP_NEED_CONTROL FALSE
-#define GDISP_NEED_IMAGE FALSE
-#define GDISP_NEED_MULTITHREAD TRUE
-#define GDISP_NEED_ASYNC FALSE
-#define GDISP_NEED_MSGAPI FALSE
-
-/* Builtin Fonts */
-#define GDISP_INCLUDE_FONT_SMALL FALSE
-#define GDISP_INCLUDE_FONT_LARGER FALSE
-#define GDISP_INCLUDE_FONT_UI1 FALSE
-#define GDISP_INCLUDE_FONT_UI2 TRUE
-#define GDISP_INCLUDE_FONT_LARGENUMBERS FALSE
-
-/* GDISP image decoders */
-#define GDISP_NEED_IMAGE_NATIVE FALSE
-#define GDISP_NEED_IMAGE_GIF FALSE
-#define GDISP_NEED_IMAGE_BMP FALSE
-#define GDISP_NEED_IMAGE_JPG FALSE
-#define GDISP_NEED_IMAGE_PNG FALSE
-
-/* Features for the GWIN sub-system. */
-#define GWIN_NEED_BUTTON FALSE
-#define GWIN_NEED_CONSOLE TRUE
-#define GWIN_NEED_SLIDER TRUE
-
-/* Features for the GINPUT sub-system. */
-#define GINPUT_NEED_MOUSE TRUE
-#define GINPUT_NEED_DIAL TRUE
-
-#endif /* _GFXCONF_H */
diff --git a/demos/modules/gwin/slider/main.c b/demos/modules/gwin/slider/main.c
deleted file mode 100644
index 15dc3e26..00000000
--- a/demos/modules/gwin/slider/main.c
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * 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"
-#include "chprintf.h"
-
-static GListener gl;
-
-#define SLIDER_WIDTH 20
-
-int main(void) {
- coord_t swidth, sheight;
- GHandle ghSliderH, ghSliderV, ghConsole;
- font_t fui2;
- GEvent * pe;
- GEventGWinSlider * pSliderEvent;
- BaseSequentialStream *consout;
-
- gfxInit(); // Initialize the display
-
- // Get the display dimensions
- swidth = gdispGetWidth();
- sheight = gdispGetHeight();
-
- // Get the font
- fui2 = gdispOpenFont("UI2");
-
- // Create out gwin windows/widgets
- ghSliderH = gwinCreateSlider(NULL, 5, 5, swidth-10, SLIDER_WIDTH);
- ghSliderV = gwinCreateSlider(NULL, 5, 10+SLIDER_WIDTH, SLIDER_WIDTH, sheight-15+SLIDER_WIDTH);
- ghConsole = gwinCreateConsole(NULL, 10+SLIDER_WIDTH, 10+SLIDER_WIDTH, swidth-15-SLIDER_WIDTH, sheight-15-SLIDER_WIDTH, fui2);
- consout = gwinGetConsoleStream(ghConsole);
-
- // Color up the console window
- gwinSetColor(ghConsole, White);
- gwinSetBgColor(ghConsole, Blue);
-
- // Assign the mouse and dials to the sliders.
-#if GINPUT_NEED_MOUSE
- gwinAttachSliderMouse(ghSliderH, 0);
- gwinAttachSliderMouse(ghSliderV, 0);
-#endif
-#if GINPUT_NEED_DIAL
- gwinAttachSliderDial(ghSliderV, 0);
- gwinAttachSliderDial(ghSliderH, 1);
-#endif
-
- // We want to listen for slider events
- geventListenerInit(&gl);
- geventAttachSource(&gl, gwinGetSliderSource(ghSliderH), 0);
- geventAttachSource(&gl, gwinGetSliderSource(ghSliderV), 0);
-
- // Draw everything on the screen
- gwinClear(ghConsole);
- gwinSliderDraw(ghSliderH);
- gwinSliderDraw(ghSliderV);
-
- while(1) {
- // Get an Event
- pe = geventEventWait(&gl, TIME_INFINITE);
-
- switch(pe->type) {
- case GEVENT_GWIN_SLIDER:
- pSliderEvent = (GEventGWinSlider *)pe;
- chprintf(consout, "%c=%d\n", pSliderEvent->slider == ghSliderH ? 'H' : 'V', pSliderEvent->position);
- break;
- }
- }
-
- return 0;
-}
diff --git a/demos/modules/gwin/slider/readme.txt b/demos/modules/gwin/slider/readme.txt
deleted file mode 100644
index 02d733e9..00000000
--- a/demos/modules/gwin/slider/readme.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-This demo supports input from both a mouse/touch and/or a dial input.
-If your platform does not support one or the other, turn it off in
-gfxconf.h
-
-Note that you will need to include the drivers into your project
-makefile for whichever inputs you decide to use.
diff --git a/demos/modules/gwin/slider/result_647x490.png b/demos/modules/gwin/slider/result_647x490.png
deleted file mode 100644
index c7b12a93..00000000
--- a/demos/modules/gwin/slider/result_647x490.png
+++ /dev/null
Binary files differ