uGFX
/
ugfx
2
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

Minor fixups

release/v2.9
inmarket 2018-11-10 10:45:28 +10:00
parent 8a9ed5195b
commit d528fb218d
21 changed files with 924 additions and 913 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Doxygenfile
View File

@ -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

4
boards/addons/ginput/touch/MCU/ginput_lld_mouse_board_olimex_pic32mx_lcd.h
View File

@ -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,
};

4
boards/base/Embest-STM32-DMSTF4BB/example_chibios_2.x/board.c
View File

@ -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

2
boards/base/Marlin/chibios_board/board.c
View File

@ -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 */

2
boards/base/Mikromedia-STM32-M4-ILI9341/gmouse_lld_MCU_board.h
View File

@ -27,7 +27,7 @@
#define ADC_BUF_DEPTH 1
static const ADCConversionGroup adcgrpcfg = {
FALSE,
0,
ADC_NUM_CHANNELS,
0,
0,

4
boards/base/Olimex-SAM7EX256-GE8/board_SSD1306_i2c.h
View File

@ -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"

4
boards/base/Olimex-STM32-LCD/gmouse_lld_MCU_board.h
View File

@ -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,

2
demos/3rdparty/notepad-2/main.c vendored
View File

@ -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

2
drivers/gdisp/SSD1322/gdisp_lld_SSD1322.c
View File

@ -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);

16
src/gfx.h
View File

@ -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

6
src/gfx_mk.c
View File

@ -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"

2
src/ginput/ginput_mouse.c
View File

@ -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,

2
src/gos/gos_x_threads.c
View File

@ -568,4 +568,4 @@ gThreadreturn gfxThreadWait(gThread th) {
return (gThreadreturn)t->param;
}
#endif /* GFX_USE_OS_RAW32 */
#endif

2
src/gos/gos_x_threads_cortexm01.h
View File

@ -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

2
src/gos/gos_x_threads_cortexm347.h
View File

@ -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

6
src/gos/gos_zephyr.h
View File

@ -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

248
src/gwin/gwin.h
View File

@ -118,7 +118,7 @@ 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
@ -128,45 +128,45 @@ typedef enum { GWIN_NORMAL, GWIN_MAXIMIZE, GWIN_MINIMIZE } GWindowMinMax;
*
* @api
*/
void gwinClearInit(GWindowInit *pwi);
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);
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);
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);
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);
gColor gwinGetDefaultBgColor(void);
#if GDISP_NEED_TEXT || defined(__DOXYGEN__)
#if GDISP_NEED_TEXT || defined(__DOXYGEN__)
/**
* @brief Set the default font for all new GWIN windows
*
@ -184,13 +184,13 @@ gColor gwinGetDefaultBgColor(void);
* @api
*/
gFont gwinGetDefaultFont(void);
#endif
#endif
/*-------------------------------------------------
* Base functions
*-------------------------------------------------*/
* Base functions
*-------------------------------------------------*/
/**
/**
* @brief Create a basic window.
* @return NULL if there is no resultant drawing area, otherwise a window handle.
*
@ -207,19 +207,19 @@ gColor gwinGetDefaultBgColor(void);
*
* @api
*/
GHandle gwinGWindowCreate(GDisplay *g, GWindowObject *pgw, const GWindowInit *pInit);
#define gwinWindowCreate(pgw, pInit) gwinGWindowCreate(GDISP, pgw, pInit);
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 gwinDestroy(GHandle gh);
/**
/**
* @brief Get the real class name of the GHandle
* @details Returns a string describing the object class.
*
@ -229,18 +229,18 @@ void gwinDestroy(GHandle gh);
*
* @api
*/
const char* gwinGetClassName(GHandle gh);
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))
#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.
@ -249,9 +249,9 @@ const char* gwinGetClassName(GHandle gh);
*
* @api
*/
#define gwinGetScreenX(gh) ((gh)->x)
#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.
@ -260,27 +260,27 @@ const char* gwinGetClassName(GHandle gh);
*
* @api
*/
#define gwinGetScreenY(gh) ((gh)->y)
#define gwinGetScreenY(gh) ((gh)->y)
/**
/**
* @brief Get the width of the window
*
* @param[in] gh The window
*
* @api
*/
#define gwinGetWidth(gh) ((gh)->width)
#define gwinGetWidth(gh) ((gh)->width)
/**
/**
* @brief Get the height of the window
*
* @param[in] gh The window
*
* @api
*/
#define gwinGetHeight(gh) ((gh)->height)
#define gwinGetHeight(gh) ((gh)->height)
/**
/**
* @brief Set foreground color
* @details Set the color which will be used to draw
*
@ -289,9 +289,9 @@ const char* gwinGetClassName(GHandle gh);
*
* @api
*/
#define gwinSetColor(gh, clr) (gh)->color = (clr)
#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
@ -301,27 +301,27 @@ const char* gwinGetClassName(GHandle gh);
*
* @api
*/
#define gwinSetBgColor(gh, bgclr) (gh)->bgcolor = (bgclr)
#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
#define gwinGetColor(gh) (gh)->color
/**
/**
* @brief Get the background color of a window
*
* @param[in] gh The window
*
* @api
*/
#define gwinGetBgColor(gh) (gh)->bgcolor
#define gwinGetBgColor(gh) (gh)->bgcolor
/**
/**
* @brief Sets whether a window is visible or not
*
* @param[in] gh The window
@ -342,27 +342,27 @@ const char* gwinGetClassName(GHandle gh);
*
* @api
*/
void gwinSetVisible(GHandle gh, gBool visible);
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)
#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)
#define gwinHide(gh) gwinSetVisible(gh, gFalse)
/**
/**
* @brief Gets the visibility of a window
* @return gTrue if visible
*
@ -373,9 +373,9 @@ void gwinSetVisible(GHandle gh, gBool visible);
*
* @api
*/
gBool gwinGetVisible(GHandle gh);
gBool gwinGetVisible(GHandle gh);
/**
/**
* @brief Enable or disable a window
*
* @param[in] gh The window handle
@ -388,27 +388,27 @@ gBool gwinGetVisible(GHandle gh);
*
* @api
*/
void gwinSetEnabled(GHandle gh, gBool enabled);
void gwinSetEnabled(GHandle gh, gBool enabled);
/**
/**
* @brief Enables a widget
*
* @param[in] gh The window handle
*
* @api
*/
#define gwinEnable(gh) gwinSetEnabled(gh, gTrue)
#define gwinEnable(gh) gwinSetEnabled(gh, gTrue)
/**
/**
* @brief Disables a widget
*
* @param[in] gh The window handle
*
* @api
*/
#define gwinDisable(gh) gwinSetEnabled(gh, gFalse)
#define gwinDisable(gh) gwinSetEnabled(gh, gFalse)
/**
/**
* @brief Gets the enabled state of a window
* @return gTrue if enabled
*
@ -419,9 +419,9 @@ void gwinSetEnabled(GHandle gh, gBool enabled);
*
* @api
*/
gBool gwinGetEnabled(GHandle gh);
gBool gwinGetEnabled(GHandle gh);
/**
/**
* @brief Move a window
*
* @param[in] gh The window
@ -437,9 +437,9 @@ gBool gwinGetEnabled(GHandle gh);
*
* @api
*/
void gwinMove(GHandle gh, gCoord x, gCoord y);
void gwinMove(GHandle gh, gCoord x, gCoord y);
/**
/**
* @brief Resize a window
*
* @param[in] gh The window
@ -455,9 +455,9 @@ void gwinMove(GHandle gh, gCoord x, gCoord y);
*
* @api
*/
void gwinResize(GHandle gh, gCoord width, gCoord height);
void gwinResize(GHandle gh, gCoord width, gCoord height);
/**
/**
* @brief Redraw a window
*
* @param[in] gh The window
@ -468,9 +468,9 @@ void gwinResize(GHandle gh, gCoord width, gCoord height);
*
* @api
*/
void gwinRedraw(GHandle gh);
void gwinRedraw(GHandle gh);
#if GWIN_NEED_WINDOWMANAGER || defined (__DOXYGEN__)
#if GWIN_NEED_WINDOWMANAGER || defined (__DOXYGEN__)
/**
* @brief Redraw a display
*
@ -584,9 +584,9 @@ void gwinRedraw(GHandle gh);
* @api
*/
#define gwinNoFlash(gh) gwinSetFlashing(gh, gFalse)
#endif
#endif
#if GDISP_NEED_TEXT || defined(__DOXYGEN__)
#if GDISP_NEED_TEXT || defined(__DOXYGEN__)
/**
* @brief Set the current font for this window.
*
@ -596,13 +596,13 @@ void gwinRedraw(GHandle gh);
* @api
*/
void gwinSetFont(GHandle gh, gFont font);
#endif
#endif
/*-------------------------------------------------
* Drawing functions
*-------------------------------------------------*/
* Drawing functions
*-------------------------------------------------*/
/**
/**
* @brief Clear the window
* @note Uses the current background color to clear the window
*
@ -610,9 +610,9 @@ void gwinRedraw(GHandle gh);
*
* @api
*/
void gwinClear(GHandle gh);
void gwinClear(GHandle gh);
/**
/**
* @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
@ -622,9 +622,9 @@ void gwinClear(GHandle gh);
*
* @api
*/
void gwinDrawPixel(GHandle gh, gCoord x, gCoord y);
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
@ -635,9 +635,9 @@ void gwinDrawPixel(GHandle gh, gCoord x, gCoord y);
*
* @api
*/
void gwinDrawLine(GHandle gh, gCoord x0, gCoord y0, gCoord x1, gCoord y1);
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
@ -648,9 +648,9 @@ void gwinDrawLine(GHandle gh, gCoord x0, gCoord y0, gCoord x1, gCoord y1);
*
* @api
*/
void gwinDrawBox(GHandle gh, gCoord x, gCoord y, gCoord cx, gCoord cy);
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
@ -661,9 +661,9 @@ void gwinDrawBox(GHandle gh, gCoord x, gCoord y, gCoord cx, gCoord cy);
*
* @api
*/
void gwinFillArea(GHandle gh, gCoord x, gCoord y, gCoord cx, gCoord cy);
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
@ -680,13 +680,13 @@ void gwinFillArea(GHandle gh, gCoord x, gCoord y, gCoord cx, gCoord cy);
*
* @api
*/
void gwinBlitArea(GHandle gh, gCoord x, gCoord y, gCoord cx, gCoord cy, gCoord srcx, gCoord srcy, gCoord srccx, const gPixel *buffer);
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
*-------------------------------------------------*/
* Circle, ellipse, arc and arc-sectors functions
*-------------------------------------------------*/
#if GDISP_NEED_CIRCLE || defined(__DOXYGEN__)
#if GDISP_NEED_CIRCLE || defined(__DOXYGEN__)
/**
* @brief Draw a circle in the window.
* @note Uses the current foreground color to draw the circle
@ -712,9 +712,9 @@ void gwinBlitArea(GHandle gh, gCoord x, gCoord y, gCoord cx, gCoord cy, gCoord s
* @api
*/
void gwinFillCircle(GHandle gh, gCoord x, gCoord y, gCoord radius);
#endif
#endif
#if GDISP_NEED_DUALCIRCLE || defined(__DOXYGEN__)
#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
@ -730,9 +730,9 @@ void gwinBlitArea(GHandle gh, gCoord x, gCoord y, gCoord cx, gCoord cy, gCoord s
* @api
*/
void gwinFillDualCircle(GHandle gh, gCoord x, gCoord y, gCoord radius1, gCoord radius2);
#endif
#endif
#if GDISP_NEED_ELLIPSE || defined(__DOXYGEN__)
#if GDISP_NEED_ELLIPSE || defined(__DOXYGEN__)
/**
* @brief Draw an ellipse.
* @note Uses the current foreground color to draw the ellipse
@ -758,9 +758,9 @@ void gwinBlitArea(GHandle gh, gCoord x, gCoord y, gCoord cx, gCoord cy, gCoord s
* @api
*/
void gwinFillEllipse(GHandle gh, gCoord x, gCoord y, gCoord a, gCoord b);
#endif
#endif
#if GDISP_NEED_ARC || defined(__DOXYGEN__)
#if GDISP_NEED_ARC || defined(__DOXYGEN__)
/*
* @brief Draw an arc in the window.
* @note Uses the current foreground color to draw the arc
@ -806,9 +806,9 @@ void gwinBlitArea(GHandle gh, gCoord x, gCoord y, gCoord cx, gCoord cy, gCoord s
* @api
*/
void gwinDrawThickArc(GHandle gh, gCoord x, gCoord y, gCoord startradius, gCoord endradius, gCoord startangle, gCoord endangle);
#endif
#endif
#if GDISP_NEED_ARCSECTORS || defined(__DOXYGEN__)
#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
@ -854,13 +854,13 @@ void gwinBlitArea(GHandle gh, gCoord x, gCoord y, gCoord cx, gCoord cy, gCoord s
* @api
*/
void gwinFillArcSectors(GHandle gh, gCoord x, gCoord y, gCoord radius, gU8 sectors);
#endif
#endif
/*-------------------------------------------------
* Pixel read-back functions
*-------------------------------------------------*/
* Pixel read-back functions
*-------------------------------------------------*/
#if GDISP_NEED_PIXELREAD || defined(__DOXYGEN__)
#if GDISP_NEED_PIXELREAD || defined(__DOXYGEN__)
/**
* @brief Get the color of a pixel in the window.
* @return The color of the pixel.
@ -872,13 +872,13 @@ void gwinBlitArea(GHandle gh, gCoord x, gCoord y, gCoord cx, gCoord cy, gCoord s
* @api
*/
gColor gwinGetPixelColor(GHandle gh, gCoord x, gCoord y);
#endif
#endif
/*-------------------------------------------------
* Text functions
*-------------------------------------------------*/
* Text functions
*-------------------------------------------------*/
#if GDISP_NEED_TEXT || defined(__DOXYGEN__)
#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.
@ -968,13 +968,13 @@ void gwinBlitArea(GHandle gh, gCoord x, gCoord y, gCoord cx, gCoord cy, gCoord s
* @api
*/
void gwinFillStringBox(GHandle gh, gCoord x, gCoord y, gCoord cx, gCoord cy, const char* str, gJustify justify);
#endif
#endif
/*-------------------------------------------------
* Polygon functions
*-------------------------------------------------*/
* Polygon functions
*-------------------------------------------------*/
#if GDISP_NEED_CONVEX_POLYGON || defined(__DOXYGEN__)
#if GDISP_NEED_CONVEX_POLYGON || defined(__DOXYGEN__)
/**
* @brief Draw an enclosed polygon (convex, non-convex or complex).
*
@ -1028,13 +1028,13 @@ void gwinBlitArea(GHandle gh, gCoord x, gCoord y, gCoord cx, gCoord cy, gCoord s
* @api
*/
void gwinDrawThickLine(GHandle gh, gCoord x0, gCoord y0, gCoord x1, gCoord y1, gCoord width, gBool round);
#endif
#endif
/*-------------------------------------------------
* Image functions
*-------------------------------------------------*/
* Image functions
*-------------------------------------------------*/
#if GDISP_NEED_IMAGE || defined(__DOXYGEN__)
#if GDISP_NEED_IMAGE || defined(__DOXYGEN__)
/**
* @brief Draw the image
* @return GDISP_IMAGE_ERR_OK (0) on success or an error code.
@ -1057,35 +1057,35 @@ void gwinBlitArea(GHandle gh, gCoord x, gCoord y, gCoord cx, gCoord cy, gCoord s
* @api
*/
gdispImageError gwinDrawImage(GHandle gh, gdispImage *img, gCoord x, gCoord y, gCoord cx, gCoord cy, gCoord sx, gCoord sy);
#endif
#endif
/*-------------------------------------------------
* Additional functionality
*-------------------------------------------------*/
* Additional functionality
*-------------------------------------------------*/
/* Include widgets */
#if GWIN_NEED_WIDGET || defined(__DOXYGEN__)
/* Include widgets */
#if GWIN_NEED_WIDGET || defined(__DOXYGEN__)
#include "gwin_widget.h"
#endif
#endif
/* Include containers */
#if GWIN_NEED_CONTAINERS || defined(__DOXYGEN__)
/* Include containers */
#if GWIN_NEED_CONTAINERS || defined(__DOXYGEN__)
#include "gwin_container.h"
#endif
#endif
/* Include vanilla window objects */
#if GWIN_NEED_CONSOLE || defined(__DOXYGEN__)
/* Include vanilla window objects */
#if GWIN_NEED_CONSOLE || defined(__DOXYGEN__)
#include "gwin_console.h"
#endif
#if GWIN_NEED_GRAPH || defined(__DOXYGEN__)
#endif
#if GWIN_NEED_GRAPH || defined(__DOXYGEN__)
#include "gwin_graph.h"
#endif
#if GWIN_NEED_IMAGE || defined(__DOXYGEN__)
#endif
#if GWIN_NEED_IMAGE || defined(__DOXYGEN__)
#include "gwin_image.h"
#endif
#if GWIN_NEED_GL3D || defined(__DOXYGEN__)
#endif
#if GWIN_NEED_GL3D || defined(__DOXYGEN__)
#include "gwin_gl3d.h"
#endif
#endif
#endif /* GFX_USE_GWIN */

2
src/gwin/gwin_list.h
View File

@ -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

1
tools/gmake_scripts/os_win32.mk
View File

@ -12,3 +12,4 @@
# NONE
#
OPT_CPU = x86
LIBS += gdi32