aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Doxygenfile4
-rw-r--r--boards/addons/ginput/touch/MCU/ginput_lld_mouse_board_olimex_pic32mx_lcd.h4
-rw-r--r--boards/base/Embest-STM32-DMSTF4BB/example_chibios_2.x/board.c4
-rw-r--r--boards/base/Marlin/chibios_board/board.c2
-rw-r--r--boards/base/Mikromedia-STM32-M4-ILI9341/gmouse_lld_MCU_board.h2
-rw-r--r--boards/base/Olimex-SAM7EX256-GE8/board_SSD1306_i2c.h4
-rw-r--r--boards/base/Olimex-STM32-LCD/gmouse_lld_MCU_board.h4
-rw-r--r--demos/3rdparty/notepad-2/main.c2
-rw-r--r--demos/modules/gwin/graph/main.c4
-rw-r--r--drivers/gdisp/SSD1322/gdisp_lld_SSD1322.c2
-rw-r--r--src/gfx.h16
-rw-r--r--src/gfx_mk.c6
-rw-r--r--src/ginput/ginput_mouse.c2
-rw-r--r--src/gos/gos_x_threads.c2
-rw-r--r--src/gos/gos_x_threads_cortexm01.h2
-rw-r--r--src/gos/gos_x_threads_cortexm347.h2
-rw-r--r--src/gos/gos_zephyr.h6
-rw-r--r--src/gwin/gwin.h1524
-rw-r--r--src/gwin/gwin_graph.c2
-rw-r--r--src/gwin/gwin_list.h2
-rw-r--r--tools/gmake_scripts/os_win32.mk1
21 files changed, 804 insertions, 793 deletions
diff --git a/Doxygenfile b/Doxygenfile
index 7b6e7fb4..61e954ea 100644
--- a/Doxygenfile
+++ b/Doxygenfile
@@ -226,7 +226,7 @@ SEPARATE_MEMBER_PAGES = NO
# uses this value to replace tabs by spaces in code fragments.
# Minimum value: 1, maximum value: 16, default value: 4.
-TAB_SIZE = 2
+TAB_SIZE = 4
# This tag can be used to specify a number of aliases that act as commands in
# the documentation. An alias has the form:
@@ -805,6 +805,8 @@ RECURSIVE = YES
EXCLUDE = boards \
drivers \
+ tools \
+ 3rdparty \
demos
# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
diff --git a/boards/addons/ginput/touch/MCU/ginput_lld_mouse_board_olimex_pic32mx_lcd.h b/boards/addons/ginput/touch/MCU/ginput_lld_mouse_board_olimex_pic32mx_lcd.h
index 8473ae00..c338b27a 100644
--- a/boards/addons/ginput/touch/MCU/ginput_lld_mouse_board_olimex_pic32mx_lcd.h
+++ b/boards/addons/ginput/touch/MCU/ginput_lld_mouse_board_olimex_pic32mx_lcd.h
@@ -48,13 +48,13 @@ static struct ADCDriver ADCD;
#define YPOS 11 // D
static const ADCConversionGroup ADC_X_CG = {
- .circular = FALSE,
+ .circular = 0,
.num_channels = 1,
.channels = 1 << XNEG,
};
static const ADCConversionGroup ADC_Y_CG = {
- .circular = FALSE,
+ .circular = 0,
.num_channels = 1,
.channels = 1 << YPOS,
};
diff --git a/boards/base/Embest-STM32-DMSTF4BB/example_chibios_2.x/board.c b/boards/base/Embest-STM32-DMSTF4BB/example_chibios_2.x/board.c
index 48440444..5b03954d 100644
--- a/boards/base/Embest-STM32-DMSTF4BB/example_chibios_2.x/board.c
+++ b/boards/base/Embest-STM32-DMSTF4BB/example_chibios_2.x/board.c
@@ -74,7 +74,7 @@ bool_t sdc_lld_is_write_protected(SDCDriver *sdcp) {
(void)sdcp;
- return FALSE;
+ return 0;
}
#endif /* HAL_USE_SDC */
@@ -96,7 +96,7 @@ bool_t mmc_lld_is_write_protected(MMCDriver *mmcp) {
(void)mmcp;
- return FALSE;
+ return 0;
}
#endif
diff --git a/boards/base/Marlin/chibios_board/board.c b/boards/base/Marlin/chibios_board/board.c
index ada87afb..68eccdd6 100644
--- a/boards/base/Marlin/chibios_board/board.c
+++ b/boards/base/Marlin/chibios_board/board.c
@@ -77,7 +77,7 @@ return (bool_t)!palReadPad(GPIOD, GPIOD_SDIO_CD_N);
bool_t sdc_lld_is_write_protected(SDCDriver *sdcp) {
(void)sdcp;
-return FALSE;
+return 0;
}
#endif /* HAL_USE_SDC */
diff --git a/boards/base/Mikromedia-STM32-M4-ILI9341/gmouse_lld_MCU_board.h b/boards/base/Mikromedia-STM32-M4-ILI9341/gmouse_lld_MCU_board.h
index b45c26b3..b78df8b6 100644
--- a/boards/base/Mikromedia-STM32-M4-ILI9341/gmouse_lld_MCU_board.h
+++ b/boards/base/Mikromedia-STM32-M4-ILI9341/gmouse_lld_MCU_board.h
@@ -27,7 +27,7 @@
#define ADC_BUF_DEPTH 1
static const ADCConversionGroup adcgrpcfg = {
- FALSE,
+ 0,
ADC_NUM_CHANNELS,
0,
0,
diff --git a/boards/base/Olimex-SAM7EX256-GE8/board_SSD1306_i2c.h b/boards/base/Olimex-SAM7EX256-GE8/board_SSD1306_i2c.h
index b5b2aa86..06e38ae2 100644
--- a/boards/base/Olimex-SAM7EX256-GE8/board_SSD1306_i2c.h
+++ b/boards/base/Olimex-SAM7EX256-GE8/board_SSD1306_i2c.h
@@ -84,9 +84,9 @@
gU8 data[2]; \
data[0] = 0; \
data[1] = cmd; \
- i2cMasterTransmitTimeout (UEXT_I2C, I2C_ADDRESS, data, 2, 0, 0, gDelayForever); \
+ i2cMasterTransmitTimeout (UEXT_I2C, I2C_ADDRESS, data, 2, 0, 0, TIME_INFINITE); \
}
- #define I2C_WRITEBYTES(pdata, len) i2cMasterTransmitTimeout (UEXT_I2C, I2C_ADDRESS, pdata, length, 0, 0, gDelayForever)
+ #define I2C_WRITEBYTES(pdata, len) i2cMasterTransmitTimeout (UEXT_I2C, I2C_ADDRESS, pdata, length, 0, 0, TIME_INFINITE)
#else
#error "SSD1306 board file: Unsupported I2C method"
diff --git a/boards/base/Olimex-STM32-LCD/gmouse_lld_MCU_board.h b/boards/base/Olimex-STM32-LCD/gmouse_lld_MCU_board.h
index 67086233..92fe17f4 100644
--- a/boards/base/Olimex-STM32-LCD/gmouse_lld_MCU_board.h
+++ b/boards/base/Olimex-STM32-LCD/gmouse_lld_MCU_board.h
@@ -27,7 +27,7 @@
#define ADC_BUF_DEPTH 1
static const ADCConversionGroup adc_y_config = {
- FALSE,
+ 0,
ADC_NUM_CHANNELS,
0,
0,
@@ -39,7 +39,7 @@ static const ADCConversionGroup adc_y_config = {
};
static const ADCConversionGroup adc_x_config = {
- FALSE,
+ 0,
ADC_NUM_CHANNELS,
0,
0,
diff --git a/demos/3rdparty/notepad-2/main.c b/demos/3rdparty/notepad-2/main.c
index f20d1899..817b4de6 100644
--- a/demos/3rdparty/notepad-2/main.c
+++ b/demos/3rdparty/notepad-2/main.c
@@ -2,7 +2,7 @@
* File: main.c
*
* This file is a part of the Notepad demo application for ChibiOS/GFX
- * Copyright © 2013, Kumar Abhishek [abhishek.kakkar@edaboard.com].
+ * Copyright 2013, Kumar Abhishek [abhishek.kakkar@edaboard.com].
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/demos/modules/gwin/graph/main.c b/demos/modules/gwin/graph/main.c
index 4a89dd04..2492c349 100644
--- a/demos/modules/gwin/graph/main.c
+++ b/demos/modules/gwin/graph/main.c
@@ -47,7 +47,7 @@ static GGraphStyle GraphStyle1 = {
{ GGRAPH_LINE_SOLID, 0, GFX_WHITE }, // Y axis
{ GGRAPH_LINE_DASH, 5, GFX_GRAY, 50 }, // X grid
{ GGRAPH_LINE_DOT, 7, GFX_YELLOW, 50 }, // Y grid
- GWIN_GRAPH_STYLE_POSITIVE_AXIS_ARROWS // Flags
+ GWIN_GRAPH_STYLE_POSITIVE_AXIS_ARROWS // Flags
};
// Another graph styling
@@ -58,7 +58,7 @@ static const GGraphStyle GraphStyle2 = {
{ GGRAPH_LINE_SOLID, 0, GFX_WHITE }, // Y axis
{ GGRAPH_LINE_DASH, 5, GFX_GRAY, 50 }, // X grid
{ GGRAPH_LINE_DOT, 7, GFX_YELLOW, 50 }, // Y grid
- GWIN_GRAPH_STYLE_POSITIVE_AXIS_ARROWS // Flags
+ GWIN_GRAPH_STYLE_POSITIVE_AXIS_ARROWS // Flags
};
int main(void) {
diff --git a/drivers/gdisp/SSD1322/gdisp_lld_SSD1322.c b/drivers/gdisp/SSD1322/gdisp_lld_SSD1322.c
index 054c1201..eee32123 100644
--- a/drivers/gdisp/SSD1322/gdisp_lld_SSD1322.c
+++ b/drivers/gdisp/SSD1322/gdisp_lld_SSD1322.c
@@ -67,6 +67,8 @@
LLDSPEC gBool gdisp_lld_init(GDisplay *g) {
// The private area is the display surface.
g->priv = gfxAlloc(GDISP_SCREEN_HEIGHT * SSD1322_ROW_WIDTH);
+ if (!g->priv)
+ return gFalse;
// Initialise the board interface
init_board(g);
diff --git a/src/gfx.h b/src/gfx.h
index 61b68b73..49b2c8b5 100644
--- a/src/gfx.h
+++ b/src/gfx.h
@@ -33,13 +33,11 @@ extern "C" {
#define GFX_COMPILESTAGE_PREP 1 // gfx.h: Initial preparation
#define GFX_COMPILESTAGE_USERCONFIG 2 // gfx.h: Load the user configuration
#define GFX_COMPILESTAGE_COMPILECONFIG 3 // gfx.h: Determine build environment info - COMPILER, CPU etc
-#define GFX_COMPILESTAGE_OPTIONS 3 // gfx.h: Enumerate all options
-#define GFX_COMPILESTAGE_DRIVERCONFIG 4 // gfx.h: Load driver configuration
-#define GFX_COMPILESTAGE_DRIVERAPI 5 // gfx.h: Load driver public api
-#define GFX_COMPILESTAGE_RULES 6 // gfx.h: Apply configuration rules
-#define GFX_COMPILESTAGE_APIDEFS 7 // gfx.h: Define API definitions
-#define GFX_COMPILESTAGE_COMPILEDRIVERS 100 // gfx.c: Compile drivers
-#define GFX_COMPILESTAGE_COMPILECAPI 101 // gfx.c: Compile the uGFX C API
+#define GFX_COMPILESTAGE_OPTIONS 4 // gfx.h: Enumerate all options
+#define GFX_COMPILESTAGE_RULES 5 // gfx.h: Apply configuration rules
+#define GFX_COMPILESTAGE_APIDEFS 6 // gfx.h: Define API definitions
+#define GFX_COMPILESTAGE_COMPILECAPI 100 // gfx.c: Compile the uGFX C API
+#define GFX_COMPILESTAGE_COMPILEDRIVERINIT 101 // gfx.c: Compile driver init structures
#define GFX_COMPILESTAGE_COMPILECPPAPI 102 // gfx.cpp: Compile the uGFX C++ API
// ------------------------------ Load the user configuration ---------------------------------
@@ -134,10 +132,6 @@ extern "C" {
#include "gadc/gadc_options.h"
#include "gaudio/gaudio_options.h"
-// ------------------------------ Load driver configuration ---------------------------------
-#undef GFX_COMPILESTAGE
-#define GFX_COMPILESTAGE GFX_COMPILESTAGE_DRIVERCONFIG
-
// ------------------------------ Apply configuration rules ---------------------------------
#undef GFX_COMPILESTAGE
#define GFX_COMPILESTAGE GFX_COMPILESTAGE_RULES
diff --git a/src/gfx_mk.c b/src/gfx_mk.c
index 5a9d842b..4ebd75b9 100644
--- a/src/gfx_mk.c
+++ b/src/gfx_mk.c
@@ -5,6 +5,12 @@
* http://ugfx.io/license.html
*/
+/**
+ * @file src/gfx_mk.c
+ * @brief Single File Make.
+ */
+
+// Include the "Single File Make" compatible parts of uGFX
#include "gfx.c"
#include "gos/gos_mk.c"
#include "gdriver/gdriver_mk.c"
diff --git a/src/ginput/ginput_mouse.c b/src/ginput/ginput_mouse.c
index ac434f6e..72292c89 100644
--- a/src/ginput/ginput_mouse.c
+++ b/src/ginput/ginput_mouse.c
@@ -500,7 +500,7 @@ static void MousePoll(void *param) {
}
// Set up the calibration display
- gdispGClear(m->display, GFX_BLUE);
+ gdispGClear(m->display, CALIBRATION_BACKGROUND);
#if GDISP_NEED_TEXT
gdispGFillStringBox(m->display,
0, CALIBRATION_TITLE_Y, w, CALIBRATION_TITLE_HEIGHT,
diff --git a/src/gos/gos_x_threads.c b/src/gos/gos_x_threads.c
index ce431de6..7b483315 100644
--- a/src/gos/gos_x_threads.c
+++ b/src/gos/gos_x_threads.c
@@ -568,4 +568,4 @@ gThreadreturn gfxThreadWait(gThread th) {
return (gThreadreturn)t->param;
}
-#endif /* GFX_USE_OS_RAW32 */
+#endif
diff --git a/src/gos/gos_x_threads_cortexm01.h b/src/gos/gos_x_threads_cortexm01.h
index 1ffde0f3..57a84981 100644
--- a/src/gos/gos_x_threads_cortexm01.h
+++ b/src/gos/gos_x_threads_cortexm01.h
@@ -12,7 +12,7 @@
* The context is saved at the current stack location and a pointer is maintained in the thread structure.
*/
-#if CORTEX_USE_FPU
+#if defined(CORTEX_USE_FPU) && CORTEX_USE_FPU
#if GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_DIRECT
#warning "GOS Threads: You have specified GFX_CPU=GFX_CPU_CORTX_M? with no hardware floating point support but CORTEX_USE_FPU is GFXON. Try using GFX_CPU_GFX_CPU_CORTEX_M?_FP instead"
#elif GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_MACRO
diff --git a/src/gos/gos_x_threads_cortexm347.h b/src/gos/gos_x_threads_cortexm347.h
index 6d9cc26d..07a1b695 100644
--- a/src/gos/gos_x_threads_cortexm347.h
+++ b/src/gos/gos_x_threads_cortexm347.h
@@ -13,7 +13,7 @@
*/
-#if CORTEX_USE_FPU
+#if defined(CORTEX_USE_FPU) && CORTEX_USE_FPU
#if GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_DIRECT
#warning "GOS Threads: You have specified GFX_CPU=GFX_CPU_CORTX_M? with no hardware floating point support but CORTEX_USE_FPU is GFXON. Try using GFX_CPU_GFX_CPU_CORTEX_M?_FP instead"
#elif GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_MACRO
diff --git a/src/gos/gos_zephyr.h b/src/gos/gos_zephyr.h
index c832c0c1..55ef1e35 100644
--- a/src/gos/gos_zephyr.h
+++ b/src/gos/gos_zephyr.h
@@ -5,6 +5,12 @@
* http://ugfx.io/license.html
*/
+/**
+ * @file src/gos/gos_zepyhr.h
+ * @brief GOS - Operating System Support header file for Zephyr RTOS.
+ * Zephyr SDK 0.9.1
+ */
+
#ifndef _GOS_ZEPHYR_H
#define _GOS_ZEPHYR_H
diff --git a/src/gwin/gwin.h b/src/gwin/gwin.h
index b55cb381..6ca9964b 100644
--- a/src/gwin/gwin.h
+++ b/src/gwin/gwin.h
@@ -118,974 +118,974 @@ typedef enum { GWIN_NORMAL, GWIN_MAXIMIZE, GWIN_MINIMIZE } GWindowMinMax;
* Functions that affect all windows
*-------------------------------------------------*/
-/**
- * @brief Clear a GWindowInit structure to all zero's
- * @note This function is provided just to prevent problems
- * on operating systems where using memset() causes issues
- * in the users application.
- *
- * @param[in] pwi The GWindowInit structure to clear
- *
- * @api
- */
-void gwinClearInit(GWindowInit *pwi);
-
-/**
- * @brief Set the default foreground color for all new GWIN windows
- *
- * @param[in] clr The color to be set
- *
- * @api
- */
-void gwinSetDefaultColor(gColor clr);
-
-/**
- * @brief Get the default foreground color for all new GWIN windows
- *
- * @return The current default color for all new GWIN windows
- *
- * @api
- */
-gColor gwinGetDefaultColor(void);
-
-/**
- * @brief Set the default background color for all new GWIN windows
- *
- * @param[in] bgclr The background color
- *
- * @api
- */
-void gwinSetDefaultBgColor(gColor bgclr);
-
-/**
- * @brief Get the default background color for all new GWIN windows
- *
- * @return The current default background color for all new GWIN windows
- *
- * @api
- */
-gColor gwinGetDefaultBgColor(void);
-
-#if GDISP_NEED_TEXT || defined(__DOXYGEN__)
/**
- * @brief Set the default font for all new GWIN windows
+ * @brief Clear a GWindowInit structure to all zero's
+ * @note This function is provided just to prevent problems
+ * on operating systems where using memset() causes issues
+ * in the users application.
*
- * @param[in] font The new font to be set
+ * @param[in] pwi The GWindowInit structure to clear
*
* @api
*/
- void gwinSetDefaultFont(gFont font);
+ void gwinClearInit(GWindowInit *pwi);
/**
- * @brief Get the current default font
+ * @brief Set the default foreground color for all new GWIN windows
*
- * @return The current default font
+ * @param[in] clr The color to be set
*
* @api
*/
- gFont gwinGetDefaultFont(void);
-#endif
-
-/*-------------------------------------------------
-* Base functions
-*-------------------------------------------------*/
-
-/**
- * @brief Create a basic window.
- * @return NULL if there is no resultant drawing area, otherwise a window handle.
- *
- * @param[in] g The GDisplay to display this window on
- * @param[in] pgw The window structure to initialize. If this is NULL the structure is dynamically allocated.
- * @param[in] pInit How to initialise the window
- *
- * @note The drawing color and the background color get set to the current defaults. If you haven't called
- * @p gwinSetDefaultColor() or @p gwinSetDefaultBgColor() then these are GFX_WHITE and GFX_BLACK respectively.
- * @note The font gets set to the current default font. If you haven't called @p gwinSetDefaultFont() then there
- * is no default font and text drawing operations will no nothing.
- * @note A basic window does not save the drawing state. It is not automatically redrawn if the window is moved or
- * its visibility state is changed.
- *
- * @api
- */
-GHandle gwinGWindowCreate(GDisplay *g, GWindowObject *pgw, const GWindowInit *pInit);
-#define gwinWindowCreate(pgw, pInit) gwinGWindowCreate(GDISP, pgw, pInit);
-
-/**
- * @brief Destroy a window (of any type). Releases any dynamically allocated memory.
- *
- * @param[in] gh The window handle
- *
- * @api
- */
-void gwinDestroy(GHandle gh);
+ void gwinSetDefaultColor(gColor clr);
-/**
- * @brief Get the real class name of the GHandle
- * @details Returns a string describing the object class.
- *
- * @param[in] gh The window
- *
- * @return A string describing the object class.
- *
- * @api
- */
-const char* gwinGetClassName(GHandle gh);
-
-/**
- * @brief Get an ID that uniquely describes the class of the GHandle
- *
- * @param[in] gh The window
- *
- * @api
- */
-#define gwinGetClassID(gh) ((void *)((gh)->vmt))
-
-/**
- * @brief Get the X coordinate of the window
- * @details Returns the X coordinate of the origin of the window.
- * The coordinate is relative to the physical screen zero point.
- *
- * @param[in] gh The window
- *
- * @api
- */
-#define gwinGetScreenX(gh) ((gh)->x)
-
-/**
- * @brief Get the Y coordinate of the window
- * @details Returns the Y coordinate of the origin of the window.
- * The coordinate is relative to the physical screen zero point.
- *
- * @param[in] gh The window
- *
- * @api
- */
-#define gwinGetScreenY(gh) ((gh)->y)
-
-/**
- * @brief Get the width of the window
- *
- * @param[in] gh The window
- *
- * @api
- */
-#define gwinGetWidth(gh) ((gh)->width)
-
-/**
- * @brief Get the height of the window
- *
- * @param[in] gh The window
- *
- * @api
- */
-#define gwinGetHeight(gh) ((gh)->height)
-
-/**
- * @brief Set foreground color
- * @details Set the color which will be used to draw
- *
- * @param[in] gh The window
- * @param[in] clr The color to be set
- *
- * @api
- */
-#define gwinSetColor(gh, clr) (gh)->color = (clr)
-
-/**
- * @brief Set background color
- * @details Set the color which will be used as background
- * @note gwinClear() must be called to set the background color
- *
- * @param[in] gh The window
- * @param[in] bgclr The background color
- *
- * @api
- */
-#define gwinSetBgColor(gh, bgclr) (gh)->bgcolor = (bgclr)
-
-/**
- * @brief Get the foreground color of a window
- *
- * @param[in] gh The window
- *
- * @api
- */
-#define gwinGetColor(gh) (gh)->color
-
-/**
- * @brief Get the background color of a window
- *
- * @param[in] gh The window
- *
- * @api
- */
-#define gwinGetBgColor(gh) (gh)->bgcolor
-
-/**
- * @brief Sets whether a window is visible or not
- *
- * @param[in] gh The window
- * @param[in] visible Whether the window should be visible or not
- *
- * @note When a window is marked as not visible, drawing operations
- * on the window do nothing.
- * @note When a window is marked as visible, it is not automatically
- * redrawn as many window types don't remember their drawing state.
- * Widgets such as Buttons, Sliders etc will be redrawn.
- * @note If there is no window manager in use, when a window is marked
- * as not visible, nothing is done to remove the window from the screen.
- * When there is a window manager, it is up to the window manager to
- * handle what happens.
- * @note Even when you mark a window as visible, it may still not be displayed
- * if it's parent is invisible. When the parent becomes visible this child
- * will automatically be shown because it is already marked as visible.
- *
- * @api
- */
-void gwinSetVisible(GHandle gh, gBool visible);
-
-/**
- * @brief Makes a widget become visible
- *
- * @param[in] gh The window handle
- *
- * @api
- */
-#define gwinShow(gh) gwinSetVisible(gh, gTrue)
-
-/**
- * @brief Makes a widget become invisible
- *
- * @param[in] gh The window handle
- *
- * @api
- */
-#define gwinHide(gh) gwinSetVisible(gh, gFalse)
-
-/**
- * @brief Gets the visibility of a window
- * @return gTrue if visible
- *
- * @note It is possible for a child to be marked as visible by @p gwinSetVisible()
- * but for this call to return gFalse if one of its parents are not visible.
- *
- * @param[in] gh The window
- *
- * @api
- */
-gBool gwinGetVisible(GHandle gh);
-
-/**
- * @brief Enable or disable a window
- *
- * @param[in] gh The window handle
- * @param[in] enabled Enable or disable the window
- *
- * @note The window is automatically redrawn if it supports self-redrawing.
- * @note Even when you mark a window as enabled, it may still remain disabled
- * if it's parent is disabled. When the parent becomes enabled this child
- * will automatically be enabled because it is already marked as enabled.
- *
- * @api
- */
-void gwinSetEnabled(GHandle gh, gBool enabled);
-
-/**
- * @brief Enables a widget
- *
- * @param[in] gh The window handle
- *
- * @api
- */
-#define gwinEnable(gh) gwinSetEnabled(gh, gTrue)
-
-/**
- * @brief Disables a widget
- *
- * @param[in] gh The window handle
- *
- * @api
- */
-#define gwinDisable(gh) gwinSetEnabled(gh, gFalse)
-
-/**
- * @brief Gets the enabled state of a window
- * @return gTrue if enabled
- *
- * @note It is possible for a child to be marked as enabled by @p gwinSetEnabled()
- * but for this call to return gFalse if one of its parents are not enabled.
- *
- * @param[in] gh The window
- *
- * @api
- */
-gBool gwinGetEnabled(GHandle gh);
-
-/**
- * @brief Move a window
- *
- * @param[in] gh The window
- * @param[in] x, y The new position (screen relative) for this window
- *
- * @note The final window position may not be the requested position. Windows
- * are clipped to the screen area and the window manager may also affect the position.
- * @note The window is redrawn if it is visible. See the comments in @p gwinSetVisible()
- * with regard to what can be redrawn and what can't.
- * @note It is up to the window manager to determine what happens with the screen area
- * uncovered by moving the window. When there is no window manager, nothing
- * is done with the uncovered area.
- *
- * @api
- */
-void gwinMove(GHandle gh, gCoord x, gCoord y);
-
-/**
- * @brief Resize a window
- *
- * @param[in] gh The window
- * @param[in] width, height The new size of the window
- *
- * @note The final window size may not be the requested size. Windows
- * are clipped to the screen area and the window manager may also affect the size.
- * @note The window is redrawn if it is visible. See the comments in @p gwinSetVisible()
- * with regard to what can be redrawn and what can't.
- * @note It is up to the window manager to determine what happens with any screen area
- * uncovered by resizing the window. When there is no window manager, nothing
- * is done with the uncovered area.
- *
- * @api
- */
-void gwinResize(GHandle gh, gCoord width, gCoord height);
-
-/**
- * @brief Redraw a window
- *
- * @param[in] gh The window
- *
- * @note This is normally never required as windows and widgets will redraw as required.
- * Note that some windows are incapable of redrawing themselves as they don't save
- * their drawing state.
- *
- * @api
- */
-void gwinRedraw(GHandle gh);
-
-#if GWIN_NEED_WINDOWMANAGER || defined (__DOXYGEN__)
/**
- * @brief Redraw a display
+ * @brief Get the default foreground color for all new GWIN windows
*
- * @param[in] g The display to redraw. Passing NULL will redraw all displays.
- * @param[in] preserve Should the redraw try to preserve existing screen data for those
- * windows that can't redraw themselves?
- *
- * @note This is normally never required as windows and widgets will redraw as required.
- * @note Some windows are incapable of redrawing themselves as they don't save
- * their drawing state.
- * @note This does not clear the background - just redraws the gwin windows (where possible)
+ * @return The current default color for all new GWIN windows
*
* @api
*/
- void gwinRedrawDisplay(GDisplay *g, gBool preserve);
+ gColor gwinGetDefaultColor(void);
/**
- * @brief Minimize, Maximize or Restore a window
- * @pre GWIN_NEED_WINDOWMANAGER must be GFXON
+ * @brief Set the default background color for all new GWIN windows
*
- * @param[in] gh The window
- * @param[in] minmax The new minimized/maximized state
- *
- * @note The final window state may not be the requested state. Window Managers
- * do not need to implement changing the minmax state. If there is no
- * window manager this call is ignored.
- * @note The window is redrawn if it is changed. See the comments in @p gwinSetVisible()
- * with regard to what can be redrawn and what can't.
- * @note It is up to the window manager to determine what happens with any screen area
- * uncovered by resizing the window.
- * @note When a window is minimised it may be asked to draw the window or the window
- * manager may draw the minimised window.
+ * @param[in] bgclr The background color
*
* @api
*/
- void gwinSetMinMax(GHandle gh, GWindowMinMax minmax);
+ void gwinSetDefaultBgColor(gColor bgclr);
/**
- * @brief Get the Minimized/Maximized state of a window
- * @pre GWIN_NEED_WINDOWMANAGER must be GFXON
- *
- * @param[in] gh The window
+ * @brief Get the default background color for all new GWIN windows
*
- * @return GWIN_NORMAL, GWIN_MAXIMIZE or GWIN_MINIMIZE
+ * @return The current default background color for all new GWIN windows
*
* @api
*/
- GWindowMinMax gwinGetMinMax(GHandle gh);
+ gColor gwinGetDefaultBgColor(void);
+
+ #if GDISP_NEED_TEXT || defined(__DOXYGEN__)
+ /**
+ * @brief Set the default font for all new GWIN windows
+ *
+ * @param[in] font The new font to be set
+ *
+ * @api
+ */
+ void gwinSetDefaultFont(gFont font);
+
+ /**
+ * @brief Get the current default font
+ *
+ * @return The current default font
+ *
+ * @api
+ */
+ gFont gwinGetDefaultFont(void);
+ #endif
+
+/*-------------------------------------------------
+ * Base functions
+ *-------------------------------------------------*/
/**
- * @brief Raise a window to the top of the z-order
- * @pre GWIN_NEED_WINDOWMANAGER must be GFXON
+ * @brief Create a basic window.
+ * @return NULL if there is no resultant drawing area, otherwise a window handle.
*
- * @param[in] gh The window
+ * @param[in] g The GDisplay to display this window on
+ * @param[in] pgw The window structure to initialize. If this is NULL the structure is dynamically allocated.
+ * @param[in] pInit How to initialise the window
*
- * @note The window z-order is only supported by some window managers. See the comments
- * in @p gwinSetVisible() with regard to what can be redrawn and what can't.
+ * @note The drawing color and the background color get set to the current defaults. If you haven't called
+ * @p gwinSetDefaultColor() or @p gwinSetDefaultBgColor() then these are GFX_WHITE and GFX_BLACK respectively.
+ * @note The font gets set to the current default font. If you haven't called @p gwinSetDefaultFont() then there
+ * is no default font and text drawing operations will no nothing.
+ * @note A basic window does not save the drawing state. It is not automatically redrawn if the window is moved or
+ * its visibility state is changed.
*
* @api
*/
- void gwinRaise(GHandle gh);
+ GHandle gwinGWindowCreate(GDisplay *g, GWindowObject *pgw, const GWindowInit *pInit);
+ #define gwinWindowCreate(pgw, pInit) gwinGWindowCreate(GDISP, pgw, pInit);
/**
- * @brief Get the next window in the z-order
- * @return The next window or NULL if no more windows
+ * @brief Destroy a window (of any type). Releases any dynamically allocated memory.
*
- * @param[in] gh The previous window or NULL to get the first window
- *
- * @note This returns the next window in the system from top to bottom.
- * @note Where there are parent child relationships, this ignores them
- * and will list all windows in the system. There is no defined
- * order between children of siblings and they can in fact be mixed
- * in order. The only relationship honored is that parents will be
- * listed before their children.
+ * @param[in] gh The window handle
*
* @api
*/
- GHandle gwinGetNextWindow(GHandle gh);
+ void gwinDestroy(GHandle gh);
/**
- * @brief Set a window or widget to flash
+ * @brief Get the real class name of the GHandle
+ * @details Returns a string describing the object class.
*
- * @param[in] gh The window handle
- * @param[in] flash Enable or disable the flashing of the window
- *
- * @note The window is automatically redrawn if it supports self-redrawing.
- * @note When a window is set to flash, its appearance changes in some
- * way every flash period (GWIN_FLASHING_PERIOD). How its appearance
- * changes depends on the draw for each window/widget.
+ * @param[in] gh The window
*
- * @pre Requires GWIN_NEED_FLASHING to be GFXON
+ * @return A string describing the object class.
*
* @api
*/
- void gwinSetFlashing(GHandle gh, gBool flash);
+ const char* gwinGetClassName(GHandle gh);
/**
- * @brief Enables flashing of a window or widget
+ * @brief Get an ID that uniquely describes the class of the GHandle
*
- * @param[in] gh The window handle
+ * @param[in] gh The window
*
* @api
*/
- #define gwinFlash(gh) gwinSetFlashing(gh, gTrue)
+ #define gwinGetClassID(gh) ((void *)((gh)->vmt))
/**
- * @brief Disables a widget
+ * @brief Get the X coordinate of the window
+ * @details Returns the X coordinate of the origin of the window.
+ * The coordinate is relative to the physical screen zero point.
*
- * @param[in] gh The window handle
+ * @param[in] gh The window
*
* @api
*/
- #define gwinNoFlash(gh) gwinSetFlashing(gh, gFalse)
-#endif
+ #define gwinGetScreenX(gh) ((gh)->x)
-#if GDISP_NEED_TEXT || defined(__DOXYGEN__)
/**
- * @brief Set the current font for this window.
+ * @brief Get the Y coordinate of the window
+ * @details Returns the Y coordinate of the origin of the window.
+ * The coordinate is relative to the physical screen zero point.
*
- * @param[in] gh The window handle
- * @param[in] font The font to use for text functions
+ * @param[in] gh The window
*
* @api
*/
- void gwinSetFont(GHandle gh, gFont font);
-#endif
-
-/*-------------------------------------------------
-* Drawing functions
-*-------------------------------------------------*/
-
-/**
- * @brief Clear the window
- * @note Uses the current background color to clear the window
- *
- * @param[in] gh The window handle
- *
- * @api
- */
-void gwinClear(GHandle gh);
+ #define gwinGetScreenY(gh) ((gh)->y)
-/**
- * @brief Set a pixel in the window
- * @note Uses the current foreground color to set the pixel
- * @note May leave GDISP clipping to this window's dimensions
- *
- * @param[in] gh The window handle
- * @param[in] x,y The coordinates of the pixel
- *
- * @api
- */
-void gwinDrawPixel(GHandle gh, gCoord x, gCoord y);
-
-/**
- * @brief Draw a line in the window
- * @note Uses the current foreground color to draw the line
- * @note May leave GDISP clipping to this window's dimensions
- *
- * @param[in] gh The window handle
- * @param[in] x0,y0 The start position
- * @param[in] x1,y1 The end position
- *
- * @api
- */
-void gwinDrawLine(GHandle gh, gCoord x0, gCoord y0, gCoord x1, gCoord y1);
-
-/**
- * @brief Draw a box in the window
- * @note Uses the current foreground color to draw the box
- * @note May leave GDISP clipping to this window's dimensions
- *
- * @param[in] gh The window handle
- * @param[in] x,y The start position
- * @param[in] cx,cy The size of the box (outside dimensions)
- *
- * @api
- */
-void gwinDrawBox(GHandle gh, gCoord x, gCoord y, gCoord cx, gCoord cy);
-
-/**
- * @brief Fill an rectangular area in the window
- * @note Uses the current foreground color to fill the box
- * @note May leave GDISP clipping to this window's dimensions
- *
- * @param[in] gh The window handle
- * @param[in] x,y The start position
- * @param[in] cx,cy The size of the box (outside dimensions)
- *
- * @api
- */
-void gwinFillArea(GHandle gh, gCoord x, gCoord y, gCoord cx, gCoord cy);
-
-/**
- * @brief Fill an area in the window using the supplied bitmap.
- * @details The bitmap is in the pixel format specified by the low level driver
- * @note If GDISP_NEED_ASYNC is defined then the buffer must be static
- * or at least retained until this call has finished the blit. You can
- * tell when all graphics drawing is finished by @p gdispIsBusy() going gFalse.
- * @note May leave GDISP clipping to this window's dimensions
- *
- * @param[in] gh The window handle
- * @param[in] x, y The start filled area
- * @param[in] cx, cy The width and height to be filled
- * @param[in] srcx, srcy The bitmap position to start the fill from
- * @param[in] srccx The width of a line in the bitmap.
- * @param[in] buffer The pixels to use to fill the area.
- *
- * @api
- */
-void gwinBlitArea(GHandle gh, gCoord x, gCoord y, gCoord cx, gCoord cy, gCoord srcx, gCoord srcy, gCoord srccx, const gPixel *buffer);
-
-/*-------------------------------------------------
-* Circle, ellipse, arc and arc-sectors functions
-*-------------------------------------------------*/
-
-#if GDISP_NEED_CIRCLE || defined(__DOXYGEN__)
/**
- * @brief Draw a circle in the window.
- * @note Uses the current foreground color to draw the circle
- * @note May leave GDISP clipping to this window's dimensions
+ * @brief Get the width of the window
*
- * @param[in] gh The window handle
- * @param[in] x, y The center of the circle
- * @param[in] radius The radius of the circle
+ * @param[in] gh The window
*
* @api
*/
- void gwinDrawCircle(GHandle gh, gCoord x, gCoord y, gCoord radius);
+ #define gwinGetWidth(gh) ((gh)->width)
/**
- * @brief Draw a filled circle in the window.
- * @note Uses the current foreground color to draw the filled circle
- * @note May leave GDISP clipping to this window's dimensions
+ * @brief Get the height of the window
*
- * @param[in] gh The window handle
- * @param[in] x, y The center of the circle
- * @param[in] radius The radius of the circle
+ * @param[in] gh The window
*
* @api
*/
- void gwinFillCircle(GHandle gh, gCoord x, gCoord y, gCoord radius);
-#endif
+ #define gwinGetHeight(gh) ((gh)->height)
-#if GDISP_NEED_DUALCIRCLE || defined(__DOXYGEN__)
/**
- * @brief Draw two filled circles with the same centre in the window.
- * @note Uses the current foreground color to draw the inner circle
- * @note Uses the current background color to draw the outer circle
- * @note May leave GDISP clipping to this window's dimensions
- * @pre GDISP_NEED_DUALCIRCLE must be GFXON in your gfxconf.h
+ * @brief Set foreground color
+ * @details Set the color which will be used to draw
*
- * @param[in] gh The window handle
- * @param[in] x,y The center of the circle
- * @param[in] radius1 The radius of the larger circle
- * @param[in] radius2 The radius of the smaller circle
+ * @param[in] gh The window
+ * @param[in] clr The color to be set
*
* @api
*/
- void gwinFillDualCircle(GHandle gh, gCoord x, gCoord y, gCoord radius1, gCoord radius2);
-#endif
+ #define gwinSetColor(gh, clr) (gh)->color = (clr)
-#if GDISP_NEED_ELLIPSE || defined(__DOXYGEN__)
/**
- * @brief Draw an ellipse.
- * @note Uses the current foreground color to draw the ellipse
- * @note May leave GDISP clipping to this window's dimensions
+ * @brief Set background color
+ * @details Set the color which will be used as background
+ * @note gwinClear() must be called to set the background color
*
- * @param[in] gh The window handle
- * @param[in] x,y The center of the ellipse
- * @param[in] a,b The dimensions of the ellipse
+ * @param[in] gh The window
+ * @param[in] bgclr The background color
*
* @api
*/
- void gwinDrawEllipse(GHandle gh, gCoord x, gCoord y, gCoord a, gCoord b);
+ #define gwinSetBgColor(gh, bgclr) (gh)->bgcolor = (bgclr)
/**
- * @brief Draw an filled ellipse.
- * @note Uses the current foreground color to draw the filled ellipse
- * @note May leave GDISP clipping to this window's dimensions
+ * @brief Get the foreground color of a window
*
- * @param[in] gh The window handle
- * @param[in] x,y The center of the ellipse
- * @param[in] a,b The dimensions of the ellipse
+ * @param[in] gh The window
*
* @api
*/
- void gwinFillEllipse(GHandle gh, gCoord x, gCoord y, gCoord a, gCoord b);
-#endif
+ #define gwinGetColor(gh) (gh)->color
-#if GDISP_NEED_ARC || defined(__DOXYGEN__)
- /*
- * @brief Draw an arc in the window.
- * @note Uses the current foreground color to draw the arc
- * @note May leave GDISP clipping to this window's dimensions
+ /**
+ * @brief Get the background color of a window
*
- * @param[in] gh The window handle
- * @param[in] x,y The center point
- * @param[in] radius The radius of the arc
- * @param[in] start The start angle (0 to 360)
- * @param[in] end The end angle (0 to 360)
+ * @param[in] gh The window
*
* @api
*/
- void gwinDrawArc(GHandle gh, gCoord x, gCoord y, gCoord radius, gCoord startangle, gCoord endangle);
+ #define gwinGetBgColor(gh) (gh)->bgcolor
- /*
- * @brief Draw a filled arc in the window.
- * @note Uses the current foreground color to draw the filled arc
- * @note May leave GDISP clipping to this window's dimensions
- *
- * @param[in] gh The window handle
- * @param[in] x,y The center point
- * @param[in] radius The radius of the arc
- * @param[in] start The start angle (0 to 360)
- * @param[in] end The end angle (0 to 360)
+ /**
+ * @brief Sets whether a window is visible or not
+ *
+ * @param[in] gh The window
+ * @param[in] visible Whether the window should be visible or not
+ *
+ * @note When a window is marked as not visible, drawing operations
+ * on the window do nothing.
+ * @note When a window is marked as visible, it is not automatically
+ * redrawn as many window types don't remember their drawing state.
+ * Widgets such as Buttons, Sliders etc will be redrawn.
+ * @note If there is no window manager in use, when a window is marked
+ * as not visible, nothing is done to remove the window from the screen.
+ * When there is a window manager, it is up to the window manager to
+ * handle what happens.
+ * @note Even when you mark a window as visible, it may still not be displayed
+ * if it's parent is invisible. When the parent becomes visible this child
+ * will automatically be shown because it is already marked as visible.
*
* @api
*/
- void gwinFillArc(GHandle gh, gCoord x, gCoord y, gCoord radius, gCoord startangle, gCoord endangle);
+ void gwinSetVisible(GHandle gh, gBool visible);
- /*
- * @brief Draw a thick arc in the window.
- * @note Uses the current foreground color to draw the thick arc
- * @note May leave GDISP clipping to this window's dimensions
+ /**
+ * @brief Makes a widget become visible
*
* @param[in] gh The window handle
- * @param[in] x,y The center point
- * @param[in] startradius The inner radius of the thick arc
- * @param[in] endradius The outer radius of the thick arc
- * @param[in] startangle The start angle (0 to 360)
- * @param[in] endangle The end angle (0 to 360)
*
* @api
*/
- void gwinDrawThickArc(GHandle gh, gCoord x, gCoord y, gCoord startradius, gCoord endradius, gCoord startangle, gCoord endangle);
-#endif
+ #define gwinShow(gh) gwinSetVisible(gh, gTrue)
-#if GDISP_NEED_ARCSECTORS || defined(__DOXYGEN__)
- /*
- * @brief Draw a selection of 45 degree arcs of a circle in the window.
- * @note Uses the current foreground color to draw the arc sector
- * @note May leave GDISP clipping to this window's dimensions
+ /**
+ * @brief Makes a widget become invisible
*
* @param[in] gh The window handle
- * @param[in] x,y The center of the circle
- * @param[in] radius The radius of the circle
- * @param[in] sectors Bits determine which sectors are drawn.
- * Bits go anti-clockwise from the 0 degree mark (y = 0, x is positive), as follows:
- * bit 0 - upper right right -----
- * bit 1 - upper upper right /2 1\
- * bit 2 - upper upper left /3 0\
- * bit 3 - upper left left \4 7/
- * bit 4 - lower left left \5 6/
- * bit 5 - lower lower left -----
- * bit 6 - lower lower right
- * bit 7 - lower left left
*
* @api
*/
- void gwinDrawArcSectors(GHandle gh, gCoord x, gCoord y, gCoord radius, gU8 sectors);
+ #define gwinHide(gh) gwinSetVisible(gh, gFalse)
- /*
- * @brief Draw a filled selection of 45 degree arcs of a circle in the window.
- * @note Uses the current foreground color to draw the arc sector
- * @note May leave GDISP clipping to this window's dimensions
+ /**
+ * @brief Gets the visibility of a window
+ * @return gTrue if visible
*
- * @param[in] gh The window handle
- * @param[in] x,y The center of the circle
- * @param[in] radius The radius of the circle
- * @param[in] sectors Bits determine which sectors are drawn.
- * Bits go anti-clockwise from the 0 degree mark (y = 0, x is positive), as follows:
- * bit 0 - upper right right -----
- * bit 1 - upper upper right /2 1\
- * bit 2 - upper upper left /3 0\
- * bit 3 - upper left left \4 7/
- * bit 4 - lower left left \5 6/
- * bit 5 - lower lower left -----
- * bit 6 - lower lower right
- * bit 7 - lower left left
+ * @note It is possible for a child to be marked as visible by @p gwinSetVisible()
+ * but for this call to return gFalse if one of its parents are not visible.
+ *
+ * @param[in] gh The window
*
* @api
*/
- void gwinFillArcSectors(GHandle gh, gCoord x, gCoord y, gCoord radius, gU8 sectors);
-#endif
+ gBool gwinGetVisible(GHandle gh);
-/*-------------------------------------------------
-* Pixel read-back functions
-*-------------------------------------------------*/
-
-#if GDISP_NEED_PIXELREAD || defined(__DOXYGEN__)
/**
- * @brief Get the color of a pixel in the window.
- * @return The color of the pixel.
- * @note May leave GDISP clipping to this window's dimensions
+ * @brief Enable or disable a window
*
* @param[in] gh The window handle
- * @param[in] x,y The position in the window
+ * @param[in] enabled Enable or disable the window
+ *
+ * @note The window is automatically redrawn if it supports self-redrawing.
+ * @note Even when you mark a window as enabled, it may still remain disabled
+ * if it's parent is disabled. When the parent becomes enabled this child
+ * will automatically be enabled because it is already marked as enabled.
*
* @api
*/
- gColor gwinGetPixelColor(GHandle gh, gCoord x, gCoord y);
-#endif
-
-/*-------------------------------------------------
-* Text functions
-*-------------------------------------------------*/
+ void gwinSetEnabled(GHandle gh, gBool enabled);
-#if GDISP_NEED_TEXT || defined(__DOXYGEN__)
/**
- * @brief Draw a text character at the specified position in the window.
- * @pre The font must have been set.
- * @note Uses the current foreground color to draw the character
- * @note May leave GDISP clipping to this window's dimensions
+ * @brief Enables a widget
*
* @param[in] gh The window handle
- * @param[in] x,y The position for the text
- * @param[in] c The character to draw
*
* @api
*/
- void gwinDrawChar(GHandle gh, gCoord x, gCoord y, char c);
+ #define gwinEnable(gh) gwinSetEnabled(gh, gTrue)
/**
- * @brief Draw a text character with a filled background at the specified position in the window.
- * @pre The font must have been set.
- * @note Uses the current foreground color to draw the character and fills the background using the background drawing color
- * @note May leave GDISP clipping to this window's dimensions
+ * @brief Disables a widget
*
* @param[in] gh The window handle
- * @param[in] x,y The position for the text
- * @param[in] c The character to draw
*
* @api
*/
- void gwinFillChar(GHandle gh, gCoord x, gCoord y, char c);
+ #define gwinDisable(gh) gwinSetEnabled(gh, gFalse)
/**
- * @brief Draw a text string in the window
- * @pre The font must have been set.
- * @note Uses the current foreground color to draw the character
- * @note May leave GDISP clipping to this window's dimensions
+ * @brief Gets the enabled state of a window
+ * @return gTrue if enabled
*
- * @param[in] gh The window handle
- * @param[in] x,y The position for the text
- * @param[in] str The string to draw
+ * @note It is possible for a child to be marked as enabled by @p gwinSetEnabled()
+ * but for this call to return gFalse if one of its parents are not enabled.
+ *
+ * @param[in] gh The window
*
* @api
*/
- void gwinDrawString(GHandle gh, gCoord x, gCoord y, const char *str);
+ gBool gwinGetEnabled(GHandle gh);
/**
- * @brief Draw a text string with a filled background in the window
- * @pre The font must have been set.
- * @note Uses the current foreground color to draw the character and fills the background using the background drawing color
- * @note May leave GDISP clipping to this window's dimensions
+ * @brief Move a window
*
- * @param[in] gh The window handle
- * @param[in] x,y The position for the text
- * @param[in] str The string to draw
+ * @param[in] gh The window
+ * @param[in] x, y The new position (screen relative) for this window
+ *
+ * @note The final window position may not be the requested position. Windows
+ * are clipped to the screen area and the window manager may also affect the position.
+ * @note The window is redrawn if it is visible. See the comments in @p gwinSetVisible()
+ * with regard to what can be redrawn and what can't.
+ * @note It is up to the window manager to determine what happens with the screen area
+ * uncovered by moving the window. When there is no window manager, nothing
+ * is done with the uncovered area.
*
* @api
*/
- void gwinFillString(GHandle gh, gCoord x, gCoord y, const char *str);
+ void gwinMove(GHandle gh, gCoord x, gCoord y);
/**
- * @brief Draw a text string verticly centered within the specified box.
- * @pre The font must have been set.
- * @note Uses the current foreground color to draw the character.
- * @note The specified box does not need to align with the window box
- * @note May leave GDISP clipping to this window's dimensions
+ * @brief Resize a window
*
- * @param[in] gh The window handle
- * @param[in] x,y The position for the text (need to define top-right or base-line - check code)
- * @param[in] cx,cy The width and height of the box
- * @param[in] str The string to draw
- * @param[in] justify Justify the text left, center or right within the box
+ * @param[in] gh The window
+ * @param[in] width, height The new size of the window
+ *
+ * @note The final window size may not be the requested size. Windows
+ * are clipped to the screen area and the window manager may also affect the size.
+ * @note The window is redrawn if it is visible. See the comments in @p gwinSetVisible()
+ * with regard to what can be redrawn and what can't.
+ * @note It is up to the window manager to determine what happens with any screen area
+ * uncovered by resizing the window. When there is no window manager, nothing
+ * is done with the uncovered area.
*
* @api
*/
- void gwinDrawStringBox(GHandle gh, gCoord x, gCoord y, gCoord cx, gCoord cy, const char* str, gJustify justify);
+ void gwinResize(GHandle gh, gCoord width, gCoord height);
/**
- * @brief Draw a text string verticly centered within the specified filled box.
- * @pre The font must have been set.
- * @note Uses the current foreground color to draw the character and fills the background using the background drawing color
- * @note The entire box is filled. Note this box does not need to align with the window box
- * @note May leave GDISP clipping to this window's dimensions
+ * @brief Redraw a window
*
- * @param[in] gh The window handle
- * @param[in] x,y The position for the text (need to define top-right or base-line - check code)
- * @param[in] cx,cy The width and height of the box
- * @param[in] str The string to draw
- * @param[in] justify Justify the text left, center or right within the box
+ * @param[in] gh The window
+ *
+ * @note This is normally never required as windows and widgets will redraw as required.
+ * Note that some windows are incapable of redrawing themselves as they don't save
+ * their drawing state.
*
* @api
*/
- void gwinFillStringBox(GHandle gh, gCoord x, gCoord y, gCoord cx, gCoord cy, const char* str, gJustify justify);
-#endif
+ void gwinRedraw(GHandle gh);
+
+ #if GWIN_NEED_WINDOWMANAGER || defined (__DOXYGEN__)
+ /**
+ * @brief Redraw a display
+ *
+ * @param[in] g The display to redraw. Passing NULL will redraw all displays.
+ * @param[in] preserve Should the redraw try to preserve existing screen data for those
+ * windows that can't redraw themselves?
+ *
+ * @note This is normally never required as windows and widgets will redraw as required.
+ * @note Some windows are incapable of redrawing themselves as they don't save
+ * their drawing state.
+ * @note This does not clear the background - just redraws the gwin windows (where possible)
+ *
+ * @api
+ */
+ void gwinRedrawDisplay(GDisplay *g, gBool preserve);
+
+ /**
+ * @brief Minimize, Maximize or Restore a window
+ * @pre GWIN_NEED_WINDOWMANAGER must be GFXON
+ *
+ * @param[in] gh The window
+ * @param[in] minmax The new minimized/maximized state
+ *
+ * @note The final window state may not be the requested state. Window Managers
+ * do not need to implement changing the minmax state. If there is no
+ * window manager this call is ignored.
+ * @note The window is redrawn if it is changed. See the comments in @p gwinSetVisible()
+ * with regard to what can be redrawn and what can't.
+ * @note It is up to the window manager to determine what happens with any screen area
+ * uncovered by resizing the window.
+ * @note When a window is minimised it may be asked to draw the window or the window
+ * manager may draw the minimised window.
+ *
+ * @api
+ */
+ void gwinSetMinMax(GHandle gh, GWindowMinMax minmax);
+
+ /**
+ * @brief Get the Minimized/Maximized state of a window
+ * @pre GWIN_NEED_WINDOWMANAGER must be GFXON
+ *
+ * @param[in] gh The window
+ *
+ * @return GWIN_NORMAL, GWIN_MAXIMIZE or GWIN_MINIMIZE
+ *
+ * @api
+ */
+ GWindowMinMax gwinGetMinMax(GHandle gh);
+
+ /**
+ * @brief Raise a window to the top of the z-order
+ * @pre GWIN_NEED_WINDOWMANAGER must be GFXON
+ *
+ * @param[in] gh The window
+ *
+ * @note The window z-order is only supported by some window managers. See the comments
+ * in @p gwinSetVisible() with regard to what can be redrawn and what can't.
+ *
+ * @api
+ */
+ void gwinRaise(GHandle gh);
+
+ /**
+ * @brief Get the next window in the z-order
+ * @return The next window or NULL if no more windows
+ *
+ * @param[in] gh The previous window or NULL to get the first window
+ *
+ * @note This returns the next window in the system from top to bottom.
+ * @note Where there are parent child relationships, this ignores them
+ * and will list all windows in the system. There is no defined
+ * order between children of siblings and they can in fact be mixed
+ * in order. The only relationship honored is that parents will be
+ * listed before their children.
+ *
+ * @api
+ */
+ GHandle gwinGetNextWindow(GHandle gh);
+
+ /**
+ * @brief Set a window or widget to flash
+ *
+ * @param[in] gh The window handle
+ * @param[in] flash Enable or disable the flashing of the window
+ *
+ * @note The window is automatically redrawn if it supports self-redrawing.
+ * @note When a window is set to flash, its appearance changes in some
+ * way every flash period (GWIN_FLASHING_PERIOD). How its appearance
+ * changes depends on the draw for each window/widget.
+ *
+ * @pre Requires GWIN_NEED_FLASHING to be GFXON
+ *
+ * @api
+ */
+ void gwinSetFlashing(GHandle gh, gBool flash);
+
+ /**
+ * @brief Enables flashing of a window or widget
+ *
+ * @param[in] gh The window handle
+ *
+ * @api
+ */
+ #define gwinFlash(gh) gwinSetFlashing(gh, gTrue)
+
+ /**
+ * @brief Disables a widget
+ *
+ * @param[in] gh The window handle
+ *
+ * @api
+ */
+ #define gwinNoFlash(gh) gwinSetFlashing(gh, gFalse)
+ #endif
+
+ #if GDISP_NEED_TEXT || defined(__DOXYGEN__)
+ /**
+ * @brief Set the current font for this window.
+ *
+ * @param[in] gh The window handle
+ * @param[in] font The font to use for text functions
+ *
+ * @api
+ */
+ void gwinSetFont(GHandle gh, gFont font);
+ #endif
/*-------------------------------------------------
-* Polygon functions
-*-------------------------------------------------*/
+ * Drawing functions
+ *-------------------------------------------------*/
-#if GDISP_NEED_CONVEX_POLYGON || defined(__DOXYGEN__)
/**
- * @brief Draw an enclosed polygon (convex, non-convex or complex).
- *
- * @note Uses the current foreground color.
+ * @brief Clear the window
+ * @note Uses the current background color to clear the window
*
* @param[in] gh The window handle
- * @param[in] tx, ty Transform all points in pntarray by tx, ty
- * @param[in] pntarray An array of points
- * @param[in] cnt The number of points in the array
*
* @api
*/
- void gwinDrawPoly(GHandle gh, gCoord tx, gCoord ty, const gPoint *pntarray, unsigned cnt);
+ void gwinClear(GHandle gh);
/**
- * @brief Fill a convex polygon
- * @details Doesn't handle non-convex or complex polygons.
- *
- * @note Uses the current foreground color.
+ * @brief Set a pixel in the window
+ * @note Uses the current foreground color to set the pixel
+ * @note May leave GDISP clipping to this window's dimensions
*
* @param[in] gh The window handle
- * @param[in] tx, ty Transform all points in pntarray by tx, ty
- * @param[in] pntarray An array of points
- * @param[in] cnt The number of points in the array
- *
- * @note Convex polygons are those that have no internal angles. That is;
- * you can draw a line from any point on the polygon to any other point
- * on the polygon without it going outside the polygon. In our case we generalise
- * this a little by saying that an infinite horizontal line (at any y value) will cross
- * no more than two edges on the polygon. Some non-convex polygons do fit this criteria
- * and can therefore be drawn.
- * @note This routine is designed to be very efficient with even simple display hardware.
+ * @param[in] x,y The coordinates of the pixel
*
* @api
*/
- void gwinFillConvexPoly(GHandle gh, gCoord tx, gCoord ty, const gPoint *pntarray, unsigned cnt);
+ void gwinDrawPixel(GHandle gh, gCoord x, gCoord y);
/**
- * @brief Draw a thick line in the window
- * @details The line thickness is specified in pixels. The line ends can
- * be selected to be either flat or round.
- * @note Uses gdispGFillConvexPoly() internally to perform the drawing.
+ * @brief Draw a line in the window
* @note Uses the current foreground color to draw the line
- *
+ * @note May leave GDISP clipping to this window's dimensions
+ *
* @param[in] gh The window handle
* @param[in] x0,y0 The start position
- * @param[in] x1,y1 The end position
- * @param[in] width The width of the line
- * @param[in] round Use round ends for the line
- *
+ * @param[in] x1,y1 The end position
+ *
* @api
*/
- void gwinDrawThickLine(GHandle gh, gCoord x0, gCoord y0, gCoord x1, gCoord y1, gCoord width, gBool round);
-#endif
+ void gwinDrawLine(GHandle gh, gCoord x0, gCoord y0, gCoord x1, gCoord y1);
-/*-------------------------------------------------
-* Image functions
-*-------------------------------------------------*/
+ /**
+ * @brief Draw a box in the window
+ * @note Uses the current foreground color to draw the box
+ * @note May leave GDISP clipping to this window's dimensions
+ *
+ * @param[in] gh The window handle
+ * @param[in] x,y The start position
+ * @param[in] cx,cy The size of the box (outside dimensions)
+ *
+ * @api
+ */
+ void gwinDrawBox(GHandle gh, gCoord x, gCoord y, gCoord cx, gCoord cy);
-#if GDISP_NEED_IMAGE || defined(__DOXYGEN__)
/**
- * @brief Draw the image
- * @return GDISP_IMAGE_ERR_OK (0) on success or an error code.
+ * @brief Fill an rectangular area in the window
+ * @note Uses the current foreground color to fill the box
+ * @note May leave GDISP clipping to this window's dimensions
*
* @param[in] gh The window handle
- * @param[in] img The image structure
- * @param[in] x,y The window location to draw the image
- * @param[in] cx,cy The area on the screen to draw
- * @param[in] sx,sy The image position to start drawing at
+ * @param[in] x,y The start position
+ * @param[in] cx,cy The size of the box (outside dimensions)
*
- * @pre gdispImageOpen() must have returned successfully.
+ * @api
+ */
+ void gwinFillArea(GHandle gh, gCoord x, gCoord y, gCoord cx, gCoord cy);
+
+ /**
+ * @brief Fill an area in the window using the supplied bitmap.
+ * @details The bitmap is in the pixel format specified by the low level driver
+ * @note If GDISP_NEED_ASYNC is defined then the buffer must be static
+ * or at least retained until this call has finished the blit. You can
+ * tell when all graphics drawing is finished by @p gdispIsBusy() going gFalse.
+ * @note May leave GDISP clipping to this window's dimensions
*
- * @note If sx,sy + cx,cy is outside the image boundaries the area outside the image
- * is simply not drawn.
- * @note If @p gdispImageCache() has been called first for this frame, this routine will draw using a
- * fast blit from the cached frame. If not, it reads the input and decodes it as it
- * is drawing. This may be significantly slower than if the image has been cached (but
- * uses a lot less RAM)
+ * @param[in] gh The window handle
+ * @param[in] x, y The start filled area
+ * @param[in] cx, cy The width and height to be filled
+ * @param[in] srcx, srcy The bitmap position to start the fill from
+ * @param[in] srccx The width of a line in the bitmap.
+ * @param[in] buffer The pixels to use to fill the area.
*
* @api
*/
- gdispImageError gwinDrawImage(GHandle gh, gdispImage *img, gCoord x, gCoord y, gCoord cx, gCoord cy, gCoord sx, gCoord sy);
-#endif
+ void gwinBlitArea(GHandle gh, gCoord x, gCoord y, gCoord cx, gCoord cy, gCoord srcx, gCoord srcy, gCoord srccx, const gPixel *buffer);
/*-------------------------------------------------
-* Additional functionality
-*-------------------------------------------------*/
+ * Circle, ellipse, arc and arc-sectors functions
+ *-------------------------------------------------*/
-/* Include widgets */
-#if GWIN_NEED_WIDGET || defined(__DOXYGEN__)
- #include "gwin_widget.h"
-#endif
+ #if GDISP_NEED_CIRCLE || defined(__DOXYGEN__)
+ /**
+ * @brief Draw a circle in the window.
+ * @note Uses the current foreground color to draw the circle
+ * @note May leave GDISP clipping to this window's dimensions
+ *
+ * @param[in] gh The window handle
+ * @param[in] x, y The center of the circle
+ * @param[in] radius The radius of the circle
+ *
+ * @api
+ */
+ void gwinDrawCircle(GHandle gh, gCoord x, gCoord y, gCoord radius);
+
+ /**
+ * @brief Draw a filled circle in the window.
+ * @note Uses the current foreground color to draw the filled circle
+ * @note May leave GDISP clipping to this window's dimensions
+ *
+ * @param[in] gh The window handle
+ * @param[in] x, y The center of the circle
+ * @param[in] radius The radius of the circle
+ *
+ * @api
+ */
+ void gwinFillCircle(GHandle gh, gCoord x, gCoord y, gCoord radius);
+ #endif
-/* Include containers */
-#if GWIN_NEED_CONTAINERS || defined(__DOXYGEN__)
- #include "gwin_container.h"
-#endif
+ #if GDISP_NEED_DUALCIRCLE || defined(__DOXYGEN__)
+ /**
+ * @brief Draw two filled circles with the same centre in the window.
+ * @note Uses the current foreground color to draw the inner circle
+ * @note Uses the current background color to draw the outer circle
+ * @note May leave GDISP clipping to this window's dimensions
+ * @pre GDISP_NEED_DUALCIRCLE must be GFXON in your gfxconf.h
+ *
+ * @param[in] gh The window handle
+ * @param[in] x,y The center of the circle
+ * @param[in] radius1 The radius of the larger circle
+ * @param[in] radius2 The radius of the smaller circle
+ *
+ * @api
+ */
+ void gwinFillDualCircle(GHandle gh, gCoord x, gCoord y, gCoord radius1, gCoord radius2);
+ #endif
-/* Include vanilla window objects */
-#if GWIN_NEED_CONSOLE || defined(__DOXYGEN__)
- #include "gwin_console.h"
-#endif
-#if GWIN_NEED_GRAPH || defined(__DOXYGEN__)
- #include "gwin_graph.h"
-#endif
-#if GWIN_NEED_IMAGE || defined(__DOXYGEN__)
- #include "gwin_image.h"
-#endif
-#if GWIN_NEED_GL3D || defined(__DOXYGEN__)
- #include "gwin_gl3d.h"
-#endif
+ #if GDISP_NEED_ELLIPSE || defined(__DOXYGEN__)
+ /**
+ * @brief Draw an ellipse.
+ * @note Uses the current foreground color to draw the ellipse
+ * @note May leave GDISP clipping to this window's dimensions
+ *
+ * @param[in] gh The window handle
+ * @param[in] x,y The center of the ellipse
+ * @param[in] a,b The dimensions of the ellipse
+ *
+ * @api
+ */
+ void gwinDrawEllipse(GHandle gh, gCoord x, gCoord y, gCoord a, gCoord b);
+
+ /**
+ * @brief Draw an filled ellipse.
+ * @note Uses the current foreground color to draw the filled ellipse
+ * @note May leave GDISP clipping to this window's dimensions
+ *
+ * @param[in] gh The window handle
+ * @param[in] x,y The center of the ellipse
+ * @param[in] a,b The dimensions of the ellipse
+ *
+ * @api
+ */
+ void gwinFillEllipse(GHandle gh, gCoord x, gCoord y, gCoord a, gCoord b);
+ #endif
+
+ #if GDISP_NEED_ARC || defined(__DOXYGEN__)
+ /*
+ * @brief Draw an arc in the window.
+ * @note Uses the current foreground color to draw the arc
+ * @note May leave GDISP clipping to this window's dimensions
+ *
+ * @param[in] gh The window handle
+ * @param[in] x,y The center point
+ * @param[in] radius The radius of the arc
+ * @param[in] start The start angle (0 to 360)
+ * @param[in] end The end angle (0 to 360)
+ *
+ * @api
+ */
+ void gwinDrawArc(GHandle gh, gCoord x, gCoord y, gCoord radius, gCoord startangle, gCoord endangle);
+
+ /*
+ * @brief Draw a filled arc in the window.
+ * @note Uses the current foreground color to draw the filled arc
+ * @note May leave GDISP clipping to this window's dimensions
+ *
+ * @param[in] gh The window handle
+ * @param[in] x,y The center point
+ * @param[in] radius The radius of the arc
+ * @param[in] start The start angle (0 to 360)
+ * @param[in] end The end angle (0 to 360)
+ *
+ * @api
+ */
+ void gwinFillArc(GHandle gh, gCoord x, gCoord y, gCoord radius, gCoord startangle, gCoord endangle);
+
+ /*
+ * @brief Draw a thick arc in the window.
+ * @note Uses the current foreground color to draw the thick arc
+ * @note May leave GDISP clipping to this window's dimensions
+ *
+ * @param[in] gh The window handle
+ * @param[in] x,y The center point
+ * @param[in] startradius The inner radius of the thick arc
+ * @param[in] endradius The outer radius of the thick arc
+ * @param[in] startangle The start angle (0 to 360)
+ * @param[in] endangle The end angle (0 to 360)
+ *
+ * @api
+ */
+ void gwinDrawThickArc(GHandle gh, gCoord x, gCoord y, gCoord startradius, gCoord endradius, gCoord startangle, gCoord endangle);
+ #endif
+
+ #if GDISP_NEED_ARCSECTORS || defined(__DOXYGEN__)
+ /*
+ * @brief Draw a selection of 45 degree arcs of a circle in the window.
+ * @note Uses the current foreground color to draw the arc sector
+ * @note May leave GDISP clipping to this window's dimensions
+ *
+ * @param[in] gh The window handle
+ * @param[in] x,y The center of the circle
+ * @param[in] radius The radius of the circle
+ * @param[in] sectors Bits determine which sectors are drawn.
+ * Bits go anti-clockwise from the 0 degree mark (y = 0, x is positive), as follows:
+ * bit 0 - upper right right -----
+ * bit 1 - upper upper right /2 1\
+ * bit 2 - upper upper left /3 0\
+ * bit 3 - upper left left \4 7/
+ * bit 4 - lower left left \5 6/
+ * bit 5 - lower lower left -----
+ * bit 6 - lower lower right
+ * bit 7 - lower left left
+ *
+ * @api
+ */
+ void gwinDrawArcSectors(GHandle gh, gCoord x, gCoord y, gCoord radius, gU8 sectors);
+
+ /*
+ * @brief Draw a filled selection of 45 degree arcs of a circle in the window.
+ * @note Uses the current foreground color to draw the arc sector
+ * @note May leave GDISP clipping to this window's dimensions
+ *
+ * @param[in] gh The window handle
+ * @param[in] x,y The center of the circle
+ * @param[in] radius The radius of the circle
+ * @param[in] sectors Bits determine which sectors are drawn.
+ * Bits go anti-clockwise from the 0 degree mark (y = 0, x is positive), as follows:
+ * bit 0 - upper right right -----
+ * bit 1 - upper upper right /2 1\
+ * bit 2 - upper upper left /3 0\
+ * bit 3 - upper left left \4 7/
+ * bit 4 - lower left left \5 6/
+ * bit 5 - lower lower left -----
+ * bit 6 - lower lower right
+ * bit 7 - lower left left
+ *
+ * @api
+ */
+ void gwinFillArcSectors(GHandle gh, gCoord x, gCoord y, gCoord radius, gU8 sectors);
+ #endif
+
+/*-------------------------------------------------
+ * Pixel read-back functions
+ *-------------------------------------------------*/
+
+ #if GDISP_NEED_PIXELREAD || defined(__DOXYGEN__)
+ /**
+ * @brief Get the color of a pixel in the window.
+ * @return The color of the pixel.
+ * @note May leave GDISP clipping to this window's dimensions
+ *
+ * @param[in] gh The window handle
+ * @param[in] x,y The position in the window
+ *
+ * @api
+ */
+ gColor gwinGetPixelColor(GHandle gh, gCoord x, gCoord y);
+ #endif
+
+/*-------------------------------------------------
+ * Text functions
+ *-------------------------------------------------*/
+
+ #if GDISP_NEED_TEXT || defined(__DOXYGEN__)
+ /**
+ * @brief Draw a text character at the specified position in the window.
+ * @pre The font must have been set.
+ * @note Uses the current foreground color to draw the character
+ * @note May leave GDISP clipping to this window's dimensions
+ *
+ * @param[in] gh The window handle
+ * @param[in] x,y The position for the text
+ * @param[in] c The character to draw
+ *
+ * @api
+ */
+ void gwinDrawChar(GHandle gh, gCoord x, gCoord y, char c);
+
+ /**
+ * @brief Draw a text character with a filled background at the specified position in the window.
+ * @pre The font must have been set.
+ * @note Uses the current foreground color to draw the character and fills the background using the background drawing color
+ * @note May leave GDISP clipping to this window's dimensions
+ *
+ * @param[in] gh The window handle
+ * @param[in] x,y The position for the text
+ * @param[in] c The character to draw
+ *
+ * @api
+ */
+ void gwinFillChar(GHandle gh, gCoord x, gCoord y, char c);
+
+ /**
+ * @brief Draw a text string in the window
+ * @pre The font must have been set.
+ * @note Uses the current foreground color to draw the character
+ * @note May leave GDISP clipping to this window's dimensions
+ *
+ * @param[in] gh The window handle
+ * @param[in] x,y The position for the text
+ * @param[in] str The string to draw
+ *
+ * @api
+ */
+ void gwinDrawString(GHandle gh, gCoord x, gCoord y, const char *str);
+
+ /**
+ * @brief Draw a text string with a filled background in the window
+ * @pre The font must have been set.
+ * @note Uses the current foreground color to draw the character and fills the background using the background drawing color
+ * @note May leave GDISP clipping to this window's dimensions
+ *
+ * @param[in] gh The window handle
+ * @param[in] x,y The position for the text
+ * @param[in] str The string to draw
+ *
+ * @api
+ */
+ void gwinFillString(GHandle gh, gCoord x, gCoord y, const char *str);
+
+ /**
+ * @brief Draw a text string verticly centered within the specified box.
+ * @pre The font must have been set.
+ * @note Uses the current foreground color to draw the character.
+ * @note The specified box does not need to align with the window box
+ * @note May leave GDISP clipping to this window's dimensions
+ *
+ * @param[in] gh The window handle
+ * @param[in] x,y The position for the text (need to define top-right or base-line - check code)
+ * @param[in] cx,cy The width and height of the box
+ * @param[in] str The string to draw
+ * @param[in] justify Justify the text left, center or right within the box
+ *
+ * @api
+ */
+ void gwinDrawStringBox(GHandle gh, gCoord x, gCoord y, gCoord cx, gCoord cy, const char* str, gJustify justify);
+
+ /**
+ * @brief Draw a text string verticly centered within the specified filled box.
+ * @pre The font must have been set.
+ * @note Uses the current foreground color to draw the character and fills the background using the background drawing color
+ * @note The entire box is filled. Note this box does not need to align with the window box
+ * @note May leave GDISP clipping to this window's dimensions
+ *
+ * @param[in] gh The window handle
+ * @param[in] x,y The position for the text (need to define top-right or base-line - check code)
+ * @param[in] cx,cy The width and height of the box
+ * @param[in] str The string to draw
+ * @param[in] justify Justify the text left, center or right within the box
+ *
+ * @api
+ */
+ void gwinFillStringBox(GHandle gh, gCoord x, gCoord y, gCoord cx, gCoord cy, const char* str, gJustify justify);
+ #endif
+
+/*-------------------------------------------------
+ * Polygon functions
+ *-------------------------------------------------*/
+
+ #if GDISP_NEED_CONVEX_POLYGON || defined(__DOXYGEN__)
+ /**
+ * @brief Draw an enclosed polygon (convex, non-convex or complex).
+ *
+ * @note Uses the current foreground color.
+ *
+ * @param[in] gh The window handle
+ * @param[in] tx, ty Transform all points in pntarray by tx, ty
+ * @param[in] pntarray An array of points
+ * @param[in] cnt The number of points in the array
+ *
+ * @api
+ */
+ void gwinDrawPoly(GHandle gh, gCoord tx, gCoord ty, const gPoint *pntarray, unsigned cnt);
+
+ /**
+ * @brief Fill a convex polygon
+ * @details Doesn't handle non-convex or complex polygons.
+ *
+ * @note Uses the current foreground color.
+ *
+ * @param[in] gh The window handle
+ * @param[in] tx, ty Transform all points in pntarray by tx, ty
+ * @param[in] pntarray An array of points
+ * @param[in] cnt The number of points in the array
+ *
+ * @note Convex polygons are those that have no internal angles. That is;
+ * you can draw a line from any point on the polygon to any other point
+ * on the polygon without it going outside the polygon. In our case we generalise
+ * this a little by saying that an infinite horizontal line (at any y value) will cross
+ * no more than two edges on the polygon. Some non-convex polygons do fit this criteria
+ * and can therefore be drawn.
+ * @note This routine is designed to be very efficient with even simple display hardware.
+ *
+ * @api
+ */
+ void gwinFillConvexPoly(GHandle gh, gCoord tx, gCoord ty, const gPoint *pntarray, unsigned cnt);
+
+ /**
+ * @brief Draw a thick line in the window
+ * @details The line thickness is specified in pixels. The line ends can
+ * be selected to be either flat or round.
+ * @note Uses gdispGFillConvexPoly() internally to perform the drawing.
+ * @note Uses the current foreground color to draw the line
+ *
+ * @param[in] gh The window handle
+ * @param[in] x0,y0 The start position
+ * @param[in] x1,y1 The end position
+ * @param[in] width The width of the line
+ * @param[in] round Use round ends for the line
+ *
+ * @api
+ */
+ void gwinDrawThickLine(GHandle gh, gCoord x0, gCoord y0, gCoord x1, gCoord y1, gCoord width, gBool round);
+ #endif
+
+/*-------------------------------------------------
+ * Image functions
+ *-------------------------------------------------*/
+
+ #if GDISP_NEED_IMAGE || defined(__DOXYGEN__)
+ /**
+ * @brief Draw the image
+ * @return GDISP_IMAGE_ERR_OK (0) on success or an error code.
+ *
+ * @param[in] gh The window handle
+ * @param[in] img The image structure
+ * @param[in] x,y The window location to draw the image
+ * @param[in] cx,cy The area on the screen to draw
+ * @param[in] sx,sy The image position to start drawing at
+ *
+ * @pre gdispImageOpen() must have returned successfully.
+ *
+ * @note If sx,sy + cx,cy is outside the image boundaries the area outside the image
+ * is simply not drawn.
+ * @note If @p gdispImageCache() has been called first for this frame, this routine will draw using a
+ * fast blit from the cached frame. If not, it reads the input and decodes it as it
+ * is drawing. This may be significantly slower than if the image has been cached (but
+ * uses a lot less RAM)
+ *
+ * @api
+ */
+ gdispImageError gwinDrawImage(GHandle gh, gdispImage *img, gCoord x, gCoord y, gCoord cx, gCoord cy, gCoord sx, gCoord sy);
+ #endif
+
+/*-------------------------------------------------
+ * Additional functionality
+ *-------------------------------------------------*/
+
+ /* Include widgets */
+ #if GWIN_NEED_WIDGET || defined(__DOXYGEN__)
+ #include "gwin_widget.h"
+ #endif
+
+ /* Include containers */
+ #if GWIN_NEED_CONTAINERS || defined(__DOXYGEN__)
+ #include "gwin_container.h"
+ #endif
+
+ /* Include vanilla window objects */
+ #if GWIN_NEED_CONSOLE || defined(__DOXYGEN__)
+ #include "gwin_console.h"
+ #endif
+ #if GWIN_NEED_GRAPH || defined(__DOXYGEN__)
+ #include "gwin_graph.h"
+ #endif
+ #if GWIN_NEED_IMAGE || defined(__DOXYGEN__)
+ #include "gwin_image.h"
+ #endif
+ #if GWIN_NEED_GL3D || defined(__DOXYGEN__)
+ #include "gwin_gl3d.h"
+ #endif
#endif /* GFX_USE_GWIN */
diff --git a/src/gwin/gwin_graph.c b/src/gwin/gwin_graph.c
index 87cdff5b..13011506 100644
--- a/src/gwin/gwin_graph.c
+++ b/src/gwin/gwin_graph.c
@@ -304,7 +304,7 @@ void gwinGraphDrawPoint(GHandle gh, gCoord x, gCoord y) {
void gwinGraphDrawPoints(GHandle gh, const gPoint *points, unsigned count) {
#define gg ((GGraphObject *)gh)
unsigned i;
- const gPoint *p;
+ const gPoint *p;
if (gh->vmt != &graphVMT || !_gwinDrawStart(gh))
return;
diff --git a/src/gwin/gwin_list.h b/src/gwin/gwin_list.h
index a8f915fe..80488c08 100644
--- a/src/gwin/gwin_list.h
+++ b/src/gwin/gwin_list.h
@@ -108,7 +108,7 @@ typedef struct ListItem {
* @brief Create a list widget
*
* @note The drawing color and the background color get set to the current defaults. If you haven't called
- * @p gwinSetDefaultColor() or @p gwinSetDefaultBgColor() then these are GFX_WHITE and GFX_BLACK.
+ * @p gwinSetDefaultColor() or @p gwinSetDefaultBgColor() then these are GFX_BLACK and GFX_WHITE.
* @note The font gets set to the current default font. If you haven't called @p gwinSetDefaultFont() then
* there is no default font and text drawing operations will not display anything.
* @note A list remembers its normal drawing state. If there is a window manager then it is automatically
diff --git a/tools/gmake_scripts/os_win32.mk b/tools/gmake_scripts/os_win32.mk
index eafcec2b..cb6d9e7c 100644
--- a/tools/gmake_scripts/os_win32.mk
+++ b/tools/gmake_scripts/os_win32.mk
@@ -12,3 +12,4 @@
# NONE
#
OPT_CPU = x86
+LIBS += gdi32