From 2ab2d77fcba42467b62f2be732cb8dc00510fe19 Mon Sep 17 00:00:00 2001 From: inmarket Date: Sun, 8 Jul 2018 10:54:19 +1000 Subject: Change coord_t to gCoord --- src/gwin/gwin.h | 72 ++++++++++++++++++++++++++++----------------------------- 1 file changed, 36 insertions(+), 36 deletions(-) (limited to 'src/gwin/gwin.h') diff --git a/src/gwin/gwin.h b/src/gwin/gwin.h index e313743a..c27aadc3 100644 --- a/src/gwin/gwin.h +++ b/src/gwin/gwin.h @@ -44,10 +44,10 @@ typedef struct GWindowObject { #endif const struct gwinVMT* vmt; /**< The VMT for this GWIN */ GDisplay * display; /**< The display this window is on */ - coord_t x; /**< The position relative to the screen */ - coord_t y; /**< The position relative to the screen */ - coord_t width; /**< The width of this window */ - coord_t height; /**< The height of this window */ + gCoord x; /**< The position relative to the screen */ + gCoord y; /**< The position relative to the screen */ + gCoord width; /**< The width of this window */ + gCoord height; /**< The height of this window */ color_t color; /**< The current foreground drawing color */ color_t bgcolor; /**< The current background drawing color */ uint32_t flags; /**< Window flags (the meaning is private to the GWIN class) */ @@ -73,10 +73,10 @@ typedef struct GWindowObject { * @{ */ typedef struct GWindowInit { - coord_t x; /**< The initial position relative to its parent */ - coord_t y; /**< The initial position relative to its parent */ - coord_t width; /**< The width */ - coord_t height; /**< The height */ + gCoord x; /**< The initial position relative to its parent */ + gCoord y; /**< The initial position relative to its parent */ + gCoord width; /**< The width */ + gCoord height; /**< The height */ gBool show; /**< Should the window be visible initially */ #if GWIN_NEED_CONTAINERS GHandle parent; /**< The parent - must be a container or NULL */ @@ -437,7 +437,7 @@ gBool gwinGetEnabled(GHandle gh); * * @api */ -void gwinMove(GHandle gh, coord_t x, coord_t y); +void gwinMove(GHandle gh, gCoord x, gCoord y); /** * @brief Resize a window @@ -455,7 +455,7 @@ void gwinMove(GHandle gh, coord_t x, coord_t y); * * @api */ -void gwinResize(GHandle gh, coord_t width, coord_t height); +void gwinResize(GHandle gh, gCoord width, gCoord height); /** * @brief Redraw a window @@ -622,7 +622,7 @@ void gwinClear(GHandle gh); * * @api */ -void gwinDrawPixel(GHandle gh, coord_t x, coord_t y); +void gwinDrawPixel(GHandle gh, gCoord x, gCoord y); /** * @brief Draw a line in the window @@ -635,7 +635,7 @@ void gwinDrawPixel(GHandle gh, coord_t x, coord_t y); * * @api */ -void gwinDrawLine(GHandle gh, coord_t x0, coord_t y0, coord_t x1, coord_t y1); +void gwinDrawLine(GHandle gh, gCoord x0, gCoord y0, gCoord x1, gCoord y1); /** * @brief Draw a box in the window @@ -648,7 +648,7 @@ void gwinDrawLine(GHandle gh, coord_t x0, coord_t y0, coord_t x1, coord_t y1); * * @api */ -void gwinDrawBox(GHandle gh, coord_t x, coord_t y, coord_t cx, coord_t cy); +void gwinDrawBox(GHandle gh, gCoord x, gCoord y, gCoord cx, gCoord cy); /** * @brief Fill an rectangular area in the window @@ -661,7 +661,7 @@ void gwinDrawBox(GHandle gh, coord_t x, coord_t y, coord_t cx, coord_t cy); * * @api */ -void gwinFillArea(GHandle gh, coord_t x, coord_t y, coord_t cx, coord_t cy); +void gwinFillArea(GHandle gh, gCoord x, gCoord y, gCoord cx, gCoord cy); /** * @brief Fill an area in the window using the supplied bitmap. @@ -680,7 +680,7 @@ void gwinFillArea(GHandle gh, coord_t x, coord_t y, coord_t cx, coord_t cy); * * @api */ -void gwinBlitArea(GHandle gh, coord_t x, coord_t y, coord_t cx, coord_t cy, coord_t srcx, coord_t srcy, coord_t srccx, const pixel_t *buffer); +void gwinBlitArea(GHandle gh, gCoord x, gCoord y, gCoord cx, gCoord cy, gCoord srcx, gCoord srcy, gCoord srccx, const pixel_t *buffer); /*------------------------------------------------- * Circle, ellipse, arc and arc-sectors functions @@ -698,7 +698,7 @@ void gwinBlitArea(GHandle gh, coord_t x, coord_t y, coord_t cx, coord_t cy, coor * * @api */ - void gwinDrawCircle(GHandle gh, coord_t x, coord_t y, coord_t radius); + void gwinDrawCircle(GHandle gh, gCoord x, gCoord y, gCoord radius); /** * @brief Draw a filled circle in the window. @@ -711,7 +711,7 @@ void gwinBlitArea(GHandle gh, coord_t x, coord_t y, coord_t cx, coord_t cy, coor * * @api */ - void gwinFillCircle(GHandle gh, coord_t x, coord_t y, coord_t radius); + void gwinFillCircle(GHandle gh, gCoord x, gCoord y, gCoord radius); #endif #if GDISP_NEED_DUALCIRCLE || defined(__DOXYGEN__) @@ -729,7 +729,7 @@ void gwinBlitArea(GHandle gh, coord_t x, coord_t y, coord_t cx, coord_t cy, coor * * @api */ - void gwinFillDualCircle(GHandle gh, coord_t x, coord_t y, coord_t radius1, coord_t radius2); + void gwinFillDualCircle(GHandle gh, gCoord x, gCoord y, gCoord radius1, gCoord radius2); #endif #if GDISP_NEED_ELLIPSE || defined(__DOXYGEN__) @@ -744,7 +744,7 @@ void gwinBlitArea(GHandle gh, coord_t x, coord_t y, coord_t cx, coord_t cy, coor * * @api */ - void gwinDrawEllipse(GHandle gh, coord_t x, coord_t y, coord_t a, coord_t b); + void gwinDrawEllipse(GHandle gh, gCoord x, gCoord y, gCoord a, gCoord b); /** * @brief Draw an filled ellipse. @@ -757,7 +757,7 @@ void gwinBlitArea(GHandle gh, coord_t x, coord_t y, coord_t cx, coord_t cy, coor * * @api */ - void gwinFillEllipse(GHandle gh, coord_t x, coord_t y, coord_t a, coord_t b); + void gwinFillEllipse(GHandle gh, gCoord x, gCoord y, gCoord a, gCoord b); #endif #if GDISP_NEED_ARC || defined(__DOXYGEN__) @@ -774,7 +774,7 @@ void gwinBlitArea(GHandle gh, coord_t x, coord_t y, coord_t cx, coord_t cy, coor * * @api */ - void gwinDrawArc(GHandle gh, coord_t x, coord_t y, coord_t radius, coord_t startangle, coord_t endangle); + void gwinDrawArc(GHandle gh, gCoord x, gCoord y, gCoord radius, gCoord startangle, gCoord endangle); /* * @brief Draw a filled arc in the window. @@ -789,7 +789,7 @@ void gwinBlitArea(GHandle gh, coord_t x, coord_t y, coord_t cx, coord_t cy, coor * * @api */ - void gwinFillArc(GHandle gh, coord_t x, coord_t y, coord_t radius, coord_t startangle, coord_t endangle); + void gwinFillArc(GHandle gh, gCoord x, gCoord y, gCoord radius, gCoord startangle, gCoord endangle); /* * @brief Draw a thick arc in the window. @@ -805,7 +805,7 @@ void gwinBlitArea(GHandle gh, coord_t x, coord_t y, coord_t cx, coord_t cy, coor * * @api */ - void gwinDrawThickArc(GHandle gh, coord_t x, coord_t y, coord_t startradius, coord_t endradius, coord_t startangle, coord_t endangle); + void gwinDrawThickArc(GHandle gh, gCoord x, gCoord y, gCoord startradius, gCoord endradius, gCoord startangle, gCoord endangle); #endif #if GDISP_NEED_ARCSECTORS || defined(__DOXYGEN__) @@ -830,7 +830,7 @@ void gwinBlitArea(GHandle gh, coord_t x, coord_t y, coord_t cx, coord_t cy, coor * * @api */ - void gwinDrawArcSectors(GHandle gh, coord_t x, coord_t y, coord_t radius, uint8_t sectors); + void gwinDrawArcSectors(GHandle gh, gCoord x, gCoord y, gCoord radius, uint8_t sectors); /* * @brief Draw a filled selection of 45 degree arcs of a circle in the window. @@ -853,7 +853,7 @@ void gwinBlitArea(GHandle gh, coord_t x, coord_t y, coord_t cx, coord_t cy, coor * * @api */ - void gwinFillArcSectors(GHandle gh, coord_t x, coord_t y, coord_t radius, uint8_t sectors); + void gwinFillArcSectors(GHandle gh, gCoord x, gCoord y, gCoord radius, uint8_t sectors); #endif /*------------------------------------------------- @@ -871,7 +871,7 @@ void gwinBlitArea(GHandle gh, coord_t x, coord_t y, coord_t cx, coord_t cy, coor * * @api */ - color_t gwinGetPixelColor(GHandle gh, coord_t x, coord_t y); + color_t gwinGetPixelColor(GHandle gh, gCoord x, gCoord y); #endif /*------------------------------------------------- @@ -891,7 +891,7 @@ void gwinBlitArea(GHandle gh, coord_t x, coord_t y, coord_t cx, coord_t cy, coor * * @api */ - void gwinDrawChar(GHandle gh, coord_t x, coord_t y, char c); + 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. @@ -905,7 +905,7 @@ void gwinBlitArea(GHandle gh, coord_t x, coord_t y, coord_t cx, coord_t cy, coor * * @api */ - void gwinFillChar(GHandle gh, coord_t x, coord_t y, char c); + void gwinFillChar(GHandle gh, gCoord x, gCoord y, char c); /** * @brief Draw a text string in the window @@ -919,7 +919,7 @@ void gwinBlitArea(GHandle gh, coord_t x, coord_t y, coord_t cx, coord_t cy, coor * * @api */ - void gwinDrawString(GHandle gh, coord_t x, coord_t y, const char *str); + void gwinDrawString(GHandle gh, gCoord x, gCoord y, const char *str); /** * @brief Draw a text string with a filled background in the window @@ -933,7 +933,7 @@ void gwinBlitArea(GHandle gh, coord_t x, coord_t y, coord_t cx, coord_t cy, coor * * @api */ - void gwinFillString(GHandle gh, coord_t x, coord_t y, const char *str); + void gwinFillString(GHandle gh, gCoord x, gCoord y, const char *str); /** * @brief Draw a text string verticly centered within the specified box. @@ -950,7 +950,7 @@ void gwinBlitArea(GHandle gh, coord_t x, coord_t y, coord_t cx, coord_t cy, coor * * @api */ - void gwinDrawStringBox(GHandle gh, coord_t x, coord_t y, coord_t cx, coord_t cy, const char* str, justify_t justify); + void gwinDrawStringBox(GHandle gh, gCoord x, gCoord y, gCoord cx, gCoord cy, const char* str, justify_t justify); /** * @brief Draw a text string verticly centered within the specified filled box. @@ -967,7 +967,7 @@ void gwinBlitArea(GHandle gh, coord_t x, coord_t y, coord_t cx, coord_t cy, coor * * @api */ - void gwinFillStringBox(GHandle gh, coord_t x, coord_t y, coord_t cx, coord_t cy, const char* str, justify_t justify); + void gwinFillStringBox(GHandle gh, gCoord x, gCoord y, gCoord cx, gCoord cy, const char* str, justify_t justify); #endif /*------------------------------------------------- @@ -987,7 +987,7 @@ void gwinBlitArea(GHandle gh, coord_t x, coord_t y, coord_t cx, coord_t cy, coor * * @api */ - void gwinDrawPoly(GHandle gh, coord_t tx, coord_t ty, const gPoint *pntarray, unsigned cnt); + void gwinDrawPoly(GHandle gh, gCoord tx, gCoord ty, const gPoint *pntarray, unsigned cnt); /** * @brief Fill a convex polygon @@ -1010,7 +1010,7 @@ void gwinBlitArea(GHandle gh, coord_t x, coord_t y, coord_t cx, coord_t cy, coor * * @api */ - void gwinFillConvexPoly(GHandle gh, coord_t tx, coord_t ty, const gPoint *pntarray, unsigned cnt); + void gwinFillConvexPoly(GHandle gh, gCoord tx, gCoord ty, const gPoint *pntarray, unsigned cnt); /** * @brief Draw a thick line in the window @@ -1027,7 +1027,7 @@ void gwinBlitArea(GHandle gh, coord_t x, coord_t y, coord_t cx, coord_t cy, coor * * @api */ - void gwinDrawThickLine(GHandle gh, coord_t x0, coord_t y0, coord_t x1, coord_t y1, coord_t width, gBool round); + void gwinDrawThickLine(GHandle gh, gCoord x0, gCoord y0, gCoord x1, gCoord y1, gCoord width, gBool round); #endif /*------------------------------------------------- @@ -1056,7 +1056,7 @@ void gwinBlitArea(GHandle gh, coord_t x, coord_t y, coord_t cx, coord_t cy, coor * * @api */ - gdispImageError gwinDrawImage(GHandle gh, gdispImage *img, coord_t x, coord_t y, coord_t cx, coord_t cy, coord_t sx, coord_t sy); + gdispImageError gwinDrawImage(GHandle gh, gdispImage *img, gCoord x, gCoord y, gCoord cx, gCoord cy, gCoord sx, gCoord sy); #endif /*------------------------------------------------- -- cgit v1.2.3