aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorinmarket <andrewh@inmarket.com.au>2018-07-08 10:54:19 +1000
committerinmarket <andrewh@inmarket.com.au>2018-07-08 10:54:19 +1000
commit2ab2d77fcba42467b62f2be732cb8dc00510fe19 (patch)
tree8dbd616faa116a2946ad47c62c20d4a34fb749b2 /drivers
parent7e95acb7310d83284288a6e89a6b3fe4bf4e8668 (diff)
downloaduGFX-2ab2d77fcba42467b62f2be732cb8dc00510fe19.tar.gz
uGFX-2ab2d77fcba42467b62f2be732cb8dc00510fe19.tar.bz2
uGFX-2ab2d77fcba42467b62f2be732cb8dc00510fe19.zip
Change coord_t to gCoord
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gdisp/AlteraFramereader/gdisp_lld_alteraframereader.c6
-rw-r--r--drivers/gdisp/Fb24bpp/gdisp_lld_fb24bpp.c6
-rw-r--r--drivers/gdisp/Nokia6610GE8/gdisp_lld_Nokia6610GE8.c2
-rw-r--r--drivers/gdisp/PCD8544/gdisp_lld_PCD8544.c8
-rw-r--r--drivers/gdisp/PCF8812/gdisp_lld_PCF8812.c8
-rw-r--r--drivers/gdisp/QImage/gdisp_lld_qimage.cpp2
-rw-r--r--drivers/gdisp/QImage/gdisp_lld_qimage.h2
-rw-r--r--drivers/gdisp/SSD1289/gdisp_lld_SSD1289.c2
-rw-r--r--drivers/gdisp/SSD1306/gdisp_lld_SSD1306.c10
-rw-r--r--drivers/gdisp/SSD1322/gdisp_lld_SSD1322.c4
-rw-r--r--drivers/gdisp/SSD1848/gdisp_lld_SSD1848.c12
-rw-r--r--drivers/gdisp/SSD1963/gdisp_lld_SSD1963.c2
-rw-r--r--drivers/gdisp/SSD2119/gdisp_lld_SSD2119.c2
-rw-r--r--drivers/gdisp/ST7565/gdisp_lld_ST7565.c4
-rw-r--r--drivers/gdisp/STM32LTDC/gdisp_lld_STM32LTDC.c20
-rw-r--r--drivers/gdisp/TLS8204/gdisp_lld_TLS8204.c8
-rw-r--r--drivers/gdisp/UC1601s/gdisp_lld_UC1601s.c8
-rw-r--r--drivers/gdisp/UC1610/gdisp_lld_UC1610.c12
-rw-r--r--drivers/gdisp/UC8173/gdisp_lld_UC8173.c4
-rw-r--r--drivers/gdisp/WS29EPD/gdisp_lld_WS29EPD.c2
-rw-r--r--drivers/gdisp/framebuffer/gdisp_lld_framebuffer.c6
-rw-r--r--drivers/ginput/touch/FT5336/gmouse_lld_FT5336.c4
-rw-r--r--drivers/ginput/touch/FT5x06/gmouse_lld_FT5x06.c4
-rw-r--r--drivers/ginput/touch/FT6x06/gmouse_lld_FT6x06.c4
-rw-r--r--drivers/ginput/touch/MAX11802/gmouse_lld_MAX11802.c2
-rw-r--r--drivers/ginput/touch/QWidget/example/mywidget.cpp6
-rw-r--r--drivers/ginput/touch/QWidget/gmouse_lld_QWidget.c6
-rw-r--r--drivers/ginput/touch/STMPE610/gmouse_lld_STMPE610.c6
-rw-r--r--drivers/ginput/touch/STMPE811/gmouse_lld_STMPE811.c6
-rw-r--r--drivers/multiple/SDL/gdisp_lld_SDL.c2
-rw-r--r--drivers/multiple/Win32/gdisp_lld_Win32.c44
-rw-r--r--drivers/multiple/Win32/gdisp_lld_config.h4
-rw-r--r--drivers/multiple/X/gdisp_lld_X.c2
-rw-r--r--drivers/multiple/uGFXnet/gdisp_lld_uGFXnet.c4
-rw-r--r--drivers/multiple/uGFXnetESP8266/gdisp_lld_uGFXnetESP8266.cpp4
35 files changed, 114 insertions, 114 deletions
diff --git a/drivers/gdisp/AlteraFramereader/gdisp_lld_alteraframereader.c b/drivers/gdisp/AlteraFramereader/gdisp_lld_alteraframereader.c
index 1fb34378..2c03ed59 100644
--- a/drivers/gdisp/AlteraFramereader/gdisp_lld_alteraframereader.c
+++ b/drivers/gdisp/AlteraFramereader/gdisp_lld_alteraframereader.c
@@ -29,7 +29,7 @@
typedef struct fbPriv {
void* pixels; // The pixel buffer
- coord_t linelen; // The number of bytes per display line
+ gCoord linelen; // The number of bytes per display line
void* frame0;
void* frame1;
} fbPriv;
@@ -177,7 +177,7 @@ LLDSPEC color_t gdisp_lld_get_pixel_color(GDisplay* g)
case GDISP_ROTATE_0:
case GDISP_ROTATE_180:
if (g->g.Orientation == GDISP_ROTATE_90 || g->g.Orientation == GDISP_ROTATE_270) {
- coord_t tmp;
+ gCoord tmp;
tmp = g->g.Width;
g->g.Width = g->g.Height;
@@ -187,7 +187,7 @@ LLDSPEC color_t gdisp_lld_get_pixel_color(GDisplay* g)
case GDISP_ROTATE_90:
case GDISP_ROTATE_270:
if (g->g.Orientation == GDISP_ROTATE_0 || g->g.Orientation == GDISP_ROTATE_180) {
- coord_t tmp;
+ gCoord tmp;
tmp = g->g.Width;
g->g.Width = g->g.Height;
diff --git a/drivers/gdisp/Fb24bpp/gdisp_lld_fb24bpp.c b/drivers/gdisp/Fb24bpp/gdisp_lld_fb24bpp.c
index 61f7b500..d3aeadfe 100644
--- a/drivers/gdisp/Fb24bpp/gdisp_lld_fb24bpp.c
+++ b/drivers/gdisp/Fb24bpp/gdisp_lld_fb24bpp.c
@@ -15,7 +15,7 @@
typedef struct fbInfo {
void * pixels; // The pixel buffer
- coord_t linelen; // The number of bytes per display line
+ gCoord linelen; // The number of bytes per display line
} fbInfo;
#include "board_fb24bpp.h"
@@ -155,7 +155,7 @@ LLDSPEC color_t gdisp_lld_get_pixel_color(GDisplay *g) {
case GDISP_ROTATE_0:
case GDISP_ROTATE_180:
if (g->g.Orientation == GDISP_ROTATE_90 || g->g.Orientation == GDISP_ROTATE_270) {
- coord_t tmp;
+ gCoord tmp;
tmp = g->g.Width;
g->g.Width = g->g.Height;
@@ -165,7 +165,7 @@ LLDSPEC color_t gdisp_lld_get_pixel_color(GDisplay *g) {
case GDISP_ROTATE_90:
case GDISP_ROTATE_270:
if (g->g.Orientation == GDISP_ROTATE_0 || g->g.Orientation == GDISP_ROTATE_180) {
- coord_t tmp;
+ gCoord tmp;
tmp = g->g.Width;
g->g.Width = g->g.Height;
diff --git a/drivers/gdisp/Nokia6610GE8/gdisp_lld_Nokia6610GE8.c b/drivers/gdisp/Nokia6610GE8/gdisp_lld_Nokia6610GE8.c
index 86f4a94f..2a9d2488 100644
--- a/drivers/gdisp/Nokia6610GE8/gdisp_lld_Nokia6610GE8.c
+++ b/drivers/gdisp/Nokia6610GE8/gdisp_lld_Nokia6610GE8.c
@@ -342,7 +342,7 @@ LLDSPEC gBool gdisp_lld_init(GDisplay *g) {
#if GDISP_HARDWARE_BITFILLS
LLDSPEC void gdisp_lld_blit_area(GDisplay *g) {
- coord_t lg, x, y;
+ gCoord lg, x, y;
uint16_t c1, c2;
unsigned tuples;
const pixel_t *buffer;
diff --git a/drivers/gdisp/PCD8544/gdisp_lld_PCD8544.c b/drivers/gdisp/PCD8544/gdisp_lld_PCD8544.c
index 568860e0..7f4f2050 100644
--- a/drivers/gdisp/PCD8544/gdisp_lld_PCD8544.c
+++ b/drivers/gdisp/PCD8544/gdisp_lld_PCD8544.c
@@ -117,7 +117,7 @@ LLDSPEC gBool gdisp_lld_init(GDisplay *g) {
#if GDISP_HARDWARE_DRAWPIXEL
LLDSPEC void gdisp_lld_draw_pixel(GDisplay *g) {
- coord_t x, y;
+ gCoord x, y;
#if GDISP_NEED_CONTROL
switch(g->g.Orientation) {
@@ -156,7 +156,7 @@ LLDSPEC gBool gdisp_lld_init(GDisplay *g) {
#if GDISP_HARDWARE_PIXELREAD
LLDSPEC color_t gdisp_lld_get_pixel_color(GDisplay *g) {
- coord_t x, y;
+ gCoord x, y;
switch(g->g.Orientation) {
default:
@@ -209,7 +209,7 @@ LLDSPEC gBool gdisp_lld_init(GDisplay *g) {
case GDISP_ROTATE_0:
case GDISP_ROTATE_180:
if (g->g.Orientation == GDISP_ROTATE_90 || g->g.Orientation == GDISP_ROTATE_270) {
- coord_t tmp;
+ gCoord tmp;
tmp = g->g.Width;
g->g.Width = g->g.Height;
@@ -219,7 +219,7 @@ LLDSPEC gBool gdisp_lld_init(GDisplay *g) {
case GDISP_ROTATE_90:
case GDISP_ROTATE_270:
if (g->g.Orientation == GDISP_ROTATE_0 || g->g.Orientation == GDISP_ROTATE_180) {
- coord_t tmp;
+ gCoord tmp;
tmp = g->g.Width;
g->g.Width = g->g.Height;
diff --git a/drivers/gdisp/PCF8812/gdisp_lld_PCF8812.c b/drivers/gdisp/PCF8812/gdisp_lld_PCF8812.c
index e7e621cc..0812057f 100644
--- a/drivers/gdisp/PCF8812/gdisp_lld_PCF8812.c
+++ b/drivers/gdisp/PCF8812/gdisp_lld_PCF8812.c
@@ -127,7 +127,7 @@ LLDSPEC gBool gdisp_lld_init(GDisplay *g) {
#if GDISP_HARDWARE_DRAWPIXEL
LLDSPEC void gdisp_lld_draw_pixel(GDisplay *g) {
- coord_t x, y;
+ gCoord x, y;
#if GDISP_NEED_CONTROL
switch(g->g.Orientation) {
@@ -166,7 +166,7 @@ LLDSPEC gBool gdisp_lld_init(GDisplay *g) {
#if GDISP_HARDWARE_PIXELREAD
LLDSPEC color_t gdisp_lld_get_pixel_color(GDisplay *g) {
- coord_t x, y;
+ gCoord x, y;
switch(g->g.Orientation) {
default:
@@ -219,7 +219,7 @@ LLDSPEC gBool gdisp_lld_init(GDisplay *g) {
case GDISP_ROTATE_0:
case GDISP_ROTATE_180:
if (g->g.Orientation == GDISP_ROTATE_90 || g->g.Orientation == GDISP_ROTATE_270) {
- coord_t tmp;
+ gCoord tmp;
tmp = g->g.Width;
g->g.Width = g->g.Height;
@@ -229,7 +229,7 @@ LLDSPEC gBool gdisp_lld_init(GDisplay *g) {
case GDISP_ROTATE_90:
case GDISP_ROTATE_270:
if (g->g.Orientation == GDISP_ROTATE_0 || g->g.Orientation == GDISP_ROTATE_180) {
- coord_t tmp;
+ gCoord tmp;
tmp = g->g.Width;
g->g.Width = g->g.Height;
diff --git a/drivers/gdisp/QImage/gdisp_lld_qimage.cpp b/drivers/gdisp/QImage/gdisp_lld_qimage.cpp
index ba7cf44d..2d2876f0 100644
--- a/drivers/gdisp/QImage/gdisp_lld_qimage.cpp
+++ b/drivers/gdisp/QImage/gdisp_lld_qimage.cpp
@@ -3,7 +3,7 @@
#include "../../../src/gdisp/gdisp_driver.h"
#include "gdisp_lld_qimage.h"
-gBool qimage_init(GDisplay* g, coord_t width, coord_t height)
+gBool qimage_init(GDisplay* g, gCoord width, gCoord height)
{
QImage* qimage = new QImage(width, height, QImage::Format_RGB888);
if (!qimage) {
diff --git a/drivers/gdisp/QImage/gdisp_lld_qimage.h b/drivers/gdisp/QImage/gdisp_lld_qimage.h
index 512fdf53..b8b0d9c9 100644
--- a/drivers/gdisp/QImage/gdisp_lld_qimage.h
+++ b/drivers/gdisp/QImage/gdisp_lld_qimage.h
@@ -7,7 +7,7 @@
extern "C" {
#endif
-gBool qimage_init(GDisplay* g, coord_t width, coord_t height);
+gBool qimage_init(GDisplay* g, gCoord width, gCoord height);
void qimage_setPixel(GDisplay* g);
color_t qimage_getPixel(GDisplay* g);
diff --git a/drivers/gdisp/SSD1289/gdisp_lld_SSD1289.c b/drivers/gdisp/SSD1289/gdisp_lld_SSD1289.c
index c4e0a941..b8ee55cb 100644
--- a/drivers/gdisp/SSD1289/gdisp_lld_SSD1289.c
+++ b/drivers/gdisp/SSD1289/gdisp_lld_SSD1289.c
@@ -259,7 +259,7 @@ LLDSPEC gBool gdisp_lld_init(GDisplay *g) {
LLDSPEC void gdisp_lld_blit_area(GDisplay *g) {
pixel_t *buffer;
- coord_t ycnt;
+ gCoord ycnt;
buffer = (pixel_t *)g->p.ptr + g->p.x1 + g->p.y1 * g->p.x2;
diff --git a/drivers/gdisp/SSD1306/gdisp_lld_SSD1306.c b/drivers/gdisp/SSD1306/gdisp_lld_SSD1306.c
index 9658cc26..c91e77a3 100644
--- a/drivers/gdisp/SSD1306/gdisp_lld_SSD1306.c
+++ b/drivers/gdisp/SSD1306/gdisp_lld_SSD1306.c
@@ -169,9 +169,9 @@ LLDSPEC gBool gdisp_lld_init(GDisplay *g) {
#if GDISP_HARDWARE_FILLS
LLDSPEC void gdisp_lld_fill_area(GDisplay *g) {
- coord_t sy, ey;
- coord_t sx, ex;
- coord_t col;
+ gCoord sy, ey;
+ gCoord sx, ex;
+ gCoord col;
unsigned spage, zpages;
uint8_t * base;
uint8_t mask;
@@ -236,7 +236,7 @@ LLDSPEC gBool gdisp_lld_init(GDisplay *g) {
#if GDISP_HARDWARE_DRAWPIXEL
LLDSPEC void gdisp_lld_draw_pixel(GDisplay *g) {
- coord_t x, y;
+ gCoord x, y;
switch(g->g.Orientation) {
default:
@@ -267,7 +267,7 @@ LLDSPEC gBool gdisp_lld_init(GDisplay *g) {
#if GDISP_HARDWARE_PIXELREAD
LLDSPEC color_t gdisp_lld_get_pixel_color(GDisplay *g) {
- coord_t x, y;
+ gCoord x, y;
switch(g->g.Orientation) {
default:
diff --git a/drivers/gdisp/SSD1322/gdisp_lld_SSD1322.c b/drivers/gdisp/SSD1322/gdisp_lld_SSD1322.c
index 6793b461..9b50f753 100644
--- a/drivers/gdisp/SSD1322/gdisp_lld_SSD1322.c
+++ b/drivers/gdisp/SSD1322/gdisp_lld_SSD1322.c
@@ -189,7 +189,7 @@ LLDSPEC gBool gdisp_lld_init(GDisplay *g) {
#if GDISP_HARDWARE_DRAWPIXEL
LLDSPEC void gdisp_lld_draw_pixel(GDisplay *g) {
- coord_t x, y;
+ gCoord x, y;
uint8_t *ram;
switch(g->g.Orientation) {
@@ -220,7 +220,7 @@ LLDSPEC gBool gdisp_lld_init(GDisplay *g) {
#if GDISP_HARDWARE_PIXELREAD
LLDSPEC color_t gdisp_lld_get_pixel_color(GDisplay *g) {
- coord_t x, y;
+ gCoord x, y;
LLDCOLOR_TYPE c;
switch(g->g.Orientation) {
diff --git a/drivers/gdisp/SSD1848/gdisp_lld_SSD1848.c b/drivers/gdisp/SSD1848/gdisp_lld_SSD1848.c
index 412ba042..cec6f1df 100644
--- a/drivers/gdisp/SSD1848/gdisp_lld_SSD1848.c
+++ b/drivers/gdisp/SSD1848/gdisp_lld_SSD1848.c
@@ -341,8 +341,8 @@ LLDSPEC void gdisp_lld_clear (GDisplay *g)
#if GDISP_HARDWARE_FILLS
LLDSPEC void gdisp_lld_fill_area (GDisplay *g)
{
- coord_t scol, ecol, sx, ex;
- coord_t y, col, x;
+ gCoord scol, ecol, sx, ex;
+ gCoord y, col, x;
uint16_t area = (uint16_t) g->p.cx * g->p.cy;
uint8_t temp;
@@ -400,7 +400,7 @@ LLDSPEC void gdisp_lld_fill_area (GDisplay *g)
#if GDISP_HARDWARE_DRAWPIXEL
LLDSPEC void gdisp_lld_draw_pixel (GDisplay *g)
{
- coord_t x, y;
+ gCoord x, y;
switch (g->g.Orientation)
{
@@ -436,7 +436,7 @@ LLDSPEC void gdisp_lld_draw_pixel (GDisplay *g)
#if GDISP_HARDWARE_PIXELREAD
LLDSPEC color_t gdisp_lld_get_pixel_color (GDisplay *g)
{
- coord_t x, y;
+ gCoord x, y;
switch (g->g.Orientation)
{
@@ -554,8 +554,8 @@ LLDSPEC void gdisp_lld_control (GDisplay *g)
#if GDISP_HARDWARE_BITFILLS
LLDSPEC void gdisp_lld_blit_area (GDisplay *g)
{
- coord_t scol, ecol, sx;
- coord_t y, col;
+ gCoord scol, ecol, sx;
+ gCoord y, col;
uint16_t area;
uint8_t temp, temp2, i;
diff --git a/drivers/gdisp/SSD1963/gdisp_lld_SSD1963.c b/drivers/gdisp/SSD1963/gdisp_lld_SSD1963.c
index f5d9fd63..1bf3a45d 100644
--- a/drivers/gdisp/SSD1963/gdisp_lld_SSD1963.c
+++ b/drivers/gdisp/SSD1963/gdisp_lld_SSD1963.c
@@ -17,7 +17,7 @@
#define CALC_FPR(w,h,hb,hf,hp,vb,vf,vp,fps) ((fps * CALC_PERIOD(w,hb,hf,hp) * CALC_PERIOD(h,vb,vf,vp) * 1048576)/100000000)
typedef struct LCD_Parameters {
- coord_t width, height; // Panel width and height
+ gCoord width, height; // Panel width and height
uint16_t hbporch; // Horizontal Back Porch
uint16_t hfporch; // Horizontal Front Porch
uint16_t hpulse; // Horizontal Pulse
diff --git a/drivers/gdisp/SSD2119/gdisp_lld_SSD2119.c b/drivers/gdisp/SSD2119/gdisp_lld_SSD2119.c
index 75bea819..0631b0c0 100644
--- a/drivers/gdisp/SSD2119/gdisp_lld_SSD2119.c
+++ b/drivers/gdisp/SSD2119/gdisp_lld_SSD2119.c
@@ -295,7 +295,7 @@ LLDSPEC gBool gdisp_lld_init(GDisplay* g) {
LLDSPEC void gdisp_lld_blit_area(GDisplay* g) {
pixel_t* buffer;
- coord_t ycnt;
+ gCoord ycnt;
buffer = (pixel_t*)g->p.ptr + g->p.x1 + g->p.y1 * g->p.x2;
diff --git a/drivers/gdisp/ST7565/gdisp_lld_ST7565.c b/drivers/gdisp/ST7565/gdisp_lld_ST7565.c
index 2639e268..d347c22b 100644
--- a/drivers/gdisp/ST7565/gdisp_lld_ST7565.c
+++ b/drivers/gdisp/ST7565/gdisp_lld_ST7565.c
@@ -166,7 +166,7 @@ LLDSPEC gBool gdisp_lld_init(GDisplay *g) {
#if GDISP_HARDWARE_DRAWPIXEL
LLDSPEC void gdisp_lld_draw_pixel(GDisplay *g) {
- coord_t x, y;
+ gCoord x, y;
switch(g->g.Orientation) {
default:
@@ -197,7 +197,7 @@ LLDSPEC gBool gdisp_lld_init(GDisplay *g) {
#if GDISP_HARDWARE_PIXELREAD
LLDSPEC color_t gdisp_lld_get_pixel_color(GDisplay *g) {
- coord_t x, y;
+ gCoord x, y;
switch(g->g.Orientation) {
default:
diff --git a/drivers/gdisp/STM32LTDC/gdisp_lld_STM32LTDC.c b/drivers/gdisp/STM32LTDC/gdisp_lld_STM32LTDC.c
index 57253b0d..763c4c29 100644
--- a/drivers/gdisp/STM32LTDC/gdisp_lld_STM32LTDC.c
+++ b/drivers/gdisp/STM32LTDC/gdisp_lld_STM32LTDC.c
@@ -48,13 +48,13 @@
typedef struct ltdcLayerConfig {
// Frame
LLDCOLOR_TYPE* frame; // Frame buffer address
- coord_t width, height; // Frame size in pixels
- coord_t pitch; // Line pitch, in bytes
+ gCoord width, height; // Frame size in pixels
+ gCoord pitch; // Line pitch, in bytes
uint16_t fmt; // Pixel format in LTDC format
// Window
- coord_t x, y; // Start pixel position of the virtual layer
- coord_t cx, cy; // Size of the virtual layer
+ gCoord x, y; // Start pixel position of the virtual layer
+ gCoord cx, cy; // Size of the virtual layer
uint32_t defcolor; // Default color, ARGB8888
uint32_t keycolor; // Color key, RGB888
@@ -66,10 +66,10 @@ typedef struct ltdcLayerConfig {
} ltdcLayerConfig;
typedef struct ltdcConfig {
- coord_t width, height; // Screen size
- coord_t hsync, vsync; // Horizontal and Vertical sync pixels
- coord_t hbackporch, vbackporch; // Horizontal and Vertical back porch pixels
- coord_t hfrontporch, vfrontporch; // Horizontal and Vertical front porch pixels
+ gCoord width, height; // Screen size
+ gCoord hsync, vsync; // Horizontal and Vertical sync pixels
+ gCoord hbackporch, vbackporch; // Horizontal and Vertical back porch pixels
+ gCoord hfrontporch, vfrontporch; // Horizontal and Vertical front porch pixels
uint32_t syncflags; // Sync flags
uint32_t bgcolor; // Clear screen color RGB888
@@ -382,7 +382,7 @@ LLDSPEC color_t gdisp_lld_get_pixel_color(GDisplay* g) {
case GDISP_ROTATE_0:
case GDISP_ROTATE_180:
if (g->g.Orientation == GDISP_ROTATE_90 || g->g.Orientation == GDISP_ROTATE_270) {
- coord_t tmp;
+ gCoord tmp;
tmp = g->g.Width;
g->g.Width = g->g.Height;
@@ -392,7 +392,7 @@ LLDSPEC color_t gdisp_lld_get_pixel_color(GDisplay* g) {
case GDISP_ROTATE_90:
case GDISP_ROTATE_270:
if (g->g.Orientation == GDISP_ROTATE_0 || g->g.Orientation == GDISP_ROTATE_180) {
- coord_t tmp;
+ gCoord tmp;
tmp = g->g.Width;
g->g.Width = g->g.Height;
diff --git a/drivers/gdisp/TLS8204/gdisp_lld_TLS8204.c b/drivers/gdisp/TLS8204/gdisp_lld_TLS8204.c
index be5bf3c7..5d605cd4 100644
--- a/drivers/gdisp/TLS8204/gdisp_lld_TLS8204.c
+++ b/drivers/gdisp/TLS8204/gdisp_lld_TLS8204.c
@@ -133,7 +133,7 @@ LLDSPEC gBool gdisp_lld_init(GDisplay *g) {
#if GDISP_HARDWARE_DRAWPIXEL
LLDSPEC void gdisp_lld_draw_pixel(GDisplay *g) {
- coord_t x, y;
+ gCoord x, y;
#if GDISP_NEED_CONTROL
switch(g->g.Orientation) {
@@ -172,7 +172,7 @@ LLDSPEC gBool gdisp_lld_init(GDisplay *g) {
#if GDISP_HARDWARE_PIXELREAD
LLDSPEC color_t gdisp_lld_get_pixel_color(GDisplay *g) {
- coord_t x, y;
+ gCoord x, y;
switch(g->g.Orientation) {
default:
@@ -229,7 +229,7 @@ LLDSPEC gBool gdisp_lld_init(GDisplay *g) {
case GDISP_ROTATE_0:
case GDISP_ROTATE_180:
if (g->g.Orientation == GDISP_ROTATE_90 || g->g.Orientation == GDISP_ROTATE_270) {
- coord_t tmp;
+ gCoord tmp;
tmp = g->g.Width;
g->g.Width = g->g.Height;
@@ -239,7 +239,7 @@ LLDSPEC gBool gdisp_lld_init(GDisplay *g) {
case GDISP_ROTATE_90:
case GDISP_ROTATE_270:
if (g->g.Orientation == GDISP_ROTATE_0 || g->g.Orientation == GDISP_ROTATE_180) {
- coord_t tmp;
+ gCoord tmp;
tmp = g->g.Width;
g->g.Width = g->g.Height;
diff --git a/drivers/gdisp/UC1601s/gdisp_lld_UC1601s.c b/drivers/gdisp/UC1601s/gdisp_lld_UC1601s.c
index 479e49e9..9da593d6 100644
--- a/drivers/gdisp/UC1601s/gdisp_lld_UC1601s.c
+++ b/drivers/gdisp/UC1601s/gdisp_lld_UC1601s.c
@@ -138,7 +138,7 @@ LLDSPEC gBool gdisp_lld_init(GDisplay *g) {
#if GDISP_HARDWARE_DRAWPIXEL
LLDSPEC void gdisp_lld_draw_pixel(GDisplay *g) {
- coord_t x, y;
+ gCoord x, y;
#if GDISP_NEED_CONTROL
switch(g->g.Orientation) {
@@ -177,7 +177,7 @@ LLDSPEC gBool gdisp_lld_init(GDisplay *g) {
#if GDISP_HARDWARE_PIXELREAD
LLDSPEC color_t gdisp_lld_get_pixel_color(GDisplay *g) {
- coord_t x, y;
+ gCoord x, y;
switch(g->g.Orientation) {
default:
@@ -234,7 +234,7 @@ LLDSPEC gBool gdisp_lld_init(GDisplay *g) {
case GDISP_ROTATE_0:
case GDISP_ROTATE_180:
if (g->g.Orientation == GDISP_ROTATE_90 || g->g.Orientation == GDISP_ROTATE_270) {
- coord_t tmp;
+ gCoord tmp;
tmp = g->g.Width;
g->g.Width = g->g.Height;
@@ -244,7 +244,7 @@ LLDSPEC gBool gdisp_lld_init(GDisplay *g) {
case GDISP_ROTATE_90:
case GDISP_ROTATE_270:
if (g->g.Orientation == GDISP_ROTATE_0 || g->g.Orientation == GDISP_ROTATE_180) {
- coord_t tmp;
+ gCoord tmp;
tmp = g->g.Width;
g->g.Width = g->g.Height;
diff --git a/drivers/gdisp/UC1610/gdisp_lld_UC1610.c b/drivers/gdisp/UC1610/gdisp_lld_UC1610.c
index b0d4660b..bd11dce0 100644
--- a/drivers/gdisp/UC1610/gdisp_lld_UC1610.c
+++ b/drivers/gdisp/UC1610/gdisp_lld_UC1610.c
@@ -45,10 +45,10 @@
#define GDISP_FLG_NEEDFLUSH (GDISP_FLG_DRIVER << 0)
typedef struct UC1610_Window {
- coord_t x1;
- coord_t y1;
- coord_t x2;
- coord_t y2;
+ gCoord x1;
+ gCoord y1;
+ gCoord x2;
+ gCoord y2;
} UC1610_Window;
/*===========================================================================*/
@@ -133,7 +133,7 @@ LLDSPEC gBool gdisp_lld_init(GDisplay *g) {
#if GDISP_HARDWARE_DRAWPIXEL
LLDSPEC void gdisp_lld_draw_pixel(GDisplay *g) {
- coord_t x, y;
+ gCoord x, y;
uint8_t *c;
// handle orientation
@@ -170,7 +170,7 @@ LLDSPEC gBool gdisp_lld_init(GDisplay *g) {
#if GDISP_HARDWARE_FLUSH
LLDSPEC void gdisp_lld_flush(GDisplay* g)
{
- coord_t x1, y1, x2, y2, cx;
+ gCoord x1, y1, x2, y2, cx;
uint8_t *c;
// Don't flush unless we really need to
diff --git a/drivers/gdisp/UC8173/gdisp_lld_UC8173.c b/drivers/gdisp/UC8173/gdisp_lld_UC8173.c
index ec135f1a..724c6f36 100644
--- a/drivers/gdisp/UC8173/gdisp_lld_UC8173.c
+++ b/drivers/gdisp/UC8173/gdisp_lld_UC8173.c
@@ -309,7 +309,7 @@ LLDSPEC gBool gdisp_lld_init(GDisplay* g)
#if GDISP_HARDWARE_FLUSH
LLDSPEC void gdisp_lld_flush(GDisplay* g)
{
- coord_t cy, cx, dx, dy;
+ gCoord cy, cx, dx, dy;
LLDCOLOR_TYPE *fb;
UC8173_Private *priv;
@@ -390,7 +390,7 @@ LLDSPEC gBool gdisp_lld_init(GDisplay* g)
#if GDISP_HARDWARE_DRAWPIXEL
LLDSPEC void gdisp_lld_draw_pixel(GDisplay* g)
{
- coord_t x, y;
+ gCoord x, y;
UC8173_Private *priv;
priv = (UC8173_Private *)g->priv;
diff --git a/drivers/gdisp/WS29EPD/gdisp_lld_WS29EPD.c b/drivers/gdisp/WS29EPD/gdisp_lld_WS29EPD.c
index ab700b0a..009e52f2 100644
--- a/drivers/gdisp/WS29EPD/gdisp_lld_WS29EPD.c
+++ b/drivers/gdisp/WS29EPD/gdisp_lld_WS29EPD.c
@@ -163,7 +163,7 @@ LLDSPEC gBool gdisp_lld_init(GDisplay *g) {
#if GDISP_HARDWARE_DRAWPIXEL
LLDSPEC void gdisp_lld_draw_pixel(GDisplay *g) {
- coord_t x, y;
+ gCoord x, y;
switch(g->g.Orientation) {
default:
diff --git a/drivers/gdisp/framebuffer/gdisp_lld_framebuffer.c b/drivers/gdisp/framebuffer/gdisp_lld_framebuffer.c
index 40f476b4..121787e1 100644
--- a/drivers/gdisp/framebuffer/gdisp_lld_framebuffer.c
+++ b/drivers/gdisp/framebuffer/gdisp_lld_framebuffer.c
@@ -15,7 +15,7 @@
typedef struct fbInfo {
void * pixels; // The pixel buffer
- coord_t linelen; // The number of bytes per display line
+ gCoord linelen; // The number of bytes per display line
} fbInfo;
#include "board_framebuffer.h"
@@ -135,7 +135,7 @@ LLDSPEC color_t gdisp_lld_get_pixel_color(GDisplay *g) {
case GDISP_ROTATE_0:
case GDISP_ROTATE_180:
if (g->g.Orientation == GDISP_ROTATE_90 || g->g.Orientation == GDISP_ROTATE_270) {
- coord_t tmp;
+ gCoord tmp;
tmp = g->g.Width;
g->g.Width = g->g.Height;
@@ -145,7 +145,7 @@ LLDSPEC color_t gdisp_lld_get_pixel_color(GDisplay *g) {
case GDISP_ROTATE_90:
case GDISP_ROTATE_270:
if (g->g.Orientation == GDISP_ROTATE_0 || g->g.Orientation == GDISP_ROTATE_180) {
- coord_t tmp;
+ gCoord tmp;
tmp = g->g.Width;
g->g.Width = g->g.Height;
diff --git a/drivers/ginput/touch/FT5336/gmouse_lld_FT5336.c b/drivers/ginput/touch/FT5336/gmouse_lld_FT5336.c
index 082c372a..3f23cad2 100644
--- a/drivers/ginput/touch/FT5336/gmouse_lld_FT5336.c
+++ b/drivers/ginput/touch/FT5336/gmouse_lld_FT5336.c
@@ -65,8 +65,8 @@ static gBool ft5336ReadXYZ(GMouse* m, GMouseReading* pdr)
// Only take a reading if exactly one touch contact point
if (read_byte(m, FT5336_TD_STAT_REG) == 1) {
// Get and return X, Y an Z values
- pdr->y = (coord_t)(read_word(m, FT5336_P1_XH_REG) & 0x0FFF);
- pdr->x = (coord_t)(read_word(m, FT5336_P1_YH_REG) & 0x0FFF);
+ pdr->y = (gCoord)(read_word(m, FT5336_P1_XH_REG) & 0x0FFF);
+ pdr->x = (gCoord)(read_word(m, FT5336_P1_YH_REG) & 0x0FFF);
pdr->z = 1;
}
diff --git a/drivers/ginput/touch/FT5x06/gmouse_lld_FT5x06.c b/drivers/ginput/touch/FT5x06/gmouse_lld_FT5x06.c
index 50fa36a0..aef4de42 100644
--- a/drivers/ginput/touch/FT5x06/gmouse_lld_FT5x06.c
+++ b/drivers/ginput/touch/FT5x06/gmouse_lld_FT5x06.c
@@ -68,8 +68,8 @@ static gBool read_xyz(GMouse* m, GMouseReading* pdr)
if ((read_byte(m, FT5x06_TOUCH_POINTS) & 0x07)) {
/* Get the X, Y, Z values */
- pdr->x = (coord_t)(read_word(m, FT5x06_TOUCH1_XH) & 0x0fff);
- pdr->y = (coord_t)read_word(m, FT5x06_TOUCH1_YH);
+ pdr->x = (gCoord)(read_word(m, FT5x06_TOUCH1_XH) & 0x0fff);
+ pdr->y = (gCoord)read_word(m, FT5x06_TOUCH1_YH);
pdr->z = 1;
// Rescale X,Y if we are using self-calibration
diff --git a/drivers/ginput/touch/FT6x06/gmouse_lld_FT6x06.c b/drivers/ginput/touch/FT6x06/gmouse_lld_FT6x06.c
index 5f3902b3..674a057a 100644
--- a/drivers/ginput/touch/FT6x06/gmouse_lld_FT6x06.c
+++ b/drivers/ginput/touch/FT6x06/gmouse_lld_FT6x06.c
@@ -68,8 +68,8 @@ static gBool read_xyz(GMouse* m, GMouseReading* pdr)
if ((read_byte(m, FT6x06_TOUCH_POINTS) & 0x07)) {
/* Get the X, Y, Z values */
- pdr->x = (coord_t)(read_word(m, FT6x06_TOUCH1_XH) & 0x0fff);
- pdr->y = (coord_t)read_word(m, FT6x06_TOUCH1_YH);
+ pdr->x = (gCoord)(read_word(m, FT6x06_TOUCH1_XH) & 0x0fff);
+ pdr->y = (gCoord)read_word(m, FT6x06_TOUCH1_YH);
pdr->z = 1;
// Rescale X,Y if we are using self-calibration
diff --git a/drivers/ginput/touch/MAX11802/gmouse_lld_MAX11802.c b/drivers/ginput/touch/MAX11802/gmouse_lld_MAX11802.c
index f2222898..034f8e3a 100644
--- a/drivers/ginput/touch/MAX11802/gmouse_lld_MAX11802.c
+++ b/drivers/ginput/touch/MAX11802/gmouse_lld_MAX11802.c
@@ -152,7 +152,7 @@ static gBool read_xyz(GMouse* m, GMouseReading* pdr)
return gTrue;
}
- // Strip the tags (we need to take care because coord_t is signed - and sign bit gets extended on shift!)
+ // Strip the tags (we need to take care because gCoord is signed - and sign bit gets extended on shift!)
pdr->x = (uint16_t)(pdr->x) >> 4;
pdr->y = (uint16_t)(pdr->y) >> 4;
pdr->z = Z_MAX;
diff --git a/drivers/ginput/touch/QWidget/example/mywidget.cpp b/drivers/ginput/touch/QWidget/example/mywidget.cpp
index b14713b1..c4599193 100644
--- a/drivers/ginput/touch/QWidget/example/mywidget.cpp
+++ b/drivers/ginput/touch/QWidget/example/mywidget.cpp
@@ -2,9 +2,9 @@
#include "ugfx/src/ginput/ginput_driver_mouse.h"
extern GMouse* qwidgetMouse;
-extern coord_t qwidgetMouseX;
-extern coord_t qwidgetMouseY;
-extern coord_t qwidgetMouseZ;
+extern gCoord qwidgetMouseX;
+extern gCoord qwidgetMouseY;
+extern gCoord qwidgetMouseZ;
extern uint16_t qwidgetMouseButtons;
MyWidget::MyWidget(QWidget* parent) : QWidget(parent)
diff --git a/drivers/ginput/touch/QWidget/gmouse_lld_QWidget.c b/drivers/ginput/touch/QWidget/gmouse_lld_QWidget.c
index 53b167bb..13037136 100644
--- a/drivers/ginput/touch/QWidget/gmouse_lld_QWidget.c
+++ b/drivers/ginput/touch/QWidget/gmouse_lld_QWidget.c
@@ -14,9 +14,9 @@
#include "../../../../src/ginput/ginput_driver_mouse.h"
GMouse* qwidgetMouse;
-coord_t qwidgetMouseX;
-coord_t qwidgetMouseY;
-coord_t qwidgetMouseZ;
+gCoord qwidgetMouseX;
+gCoord qwidgetMouseY;
+gCoord qwidgetMouseZ;
uint16_t qwidgetMouseButtons;
static gBool _init(GMouse* m, unsigned driverinstance)
diff --git a/drivers/ginput/touch/STMPE610/gmouse_lld_STMPE610.c b/drivers/ginput/touch/STMPE610/gmouse_lld_STMPE610.c
index eab13de4..3d3acc55 100644
--- a/drivers/ginput/touch/STMPE610/gmouse_lld_STMPE610.c
+++ b/drivers/ginput/touch/STMPE610/gmouse_lld_STMPE610.c
@@ -171,10 +171,10 @@ static gBool read_xyz(GMouse* m, GMouseReading* pdr)
#endif
// Time to get some readings
- pdr->x = (coord_t)read_word(m, STMPE610_REG_TSC_DATA_X);
- pdr->y = (coord_t)read_word(m, STMPE610_REG_TSC_DATA_Y);
+ pdr->x = (gCoord)read_word(m, STMPE610_REG_TSC_DATA_X);
+ pdr->y = (gCoord)read_word(m, STMPE610_REG_TSC_DATA_Y);
#if GMOUSE_STMPE610_READ_PRESSURE
- pdr->z = (coord_t)read_byte(m, STMPE610_REG_TSC_DATA_Z);
+ pdr->z = (gCoord)read_byte(m, STMPE610_REG_TSC_DATA_Z);
#else
pdr->z = gmvmt(m)->z_max;
#endif
diff --git a/drivers/ginput/touch/STMPE811/gmouse_lld_STMPE811.c b/drivers/ginput/touch/STMPE811/gmouse_lld_STMPE811.c
index fe978828..6f8b442e 100644
--- a/drivers/ginput/touch/STMPE811/gmouse_lld_STMPE811.c
+++ b/drivers/ginput/touch/STMPE811/gmouse_lld_STMPE811.c
@@ -171,10 +171,10 @@ static gBool read_xyz(GMouse* m, GMouseReading* pdr)
#endif
// Time to get some readings
- pdr->x = (coord_t)read_word(m, STMPE811_REG_TSC_DATA_X);
- pdr->y = (coord_t)read_word(m, STMPE811_REG_TSC_DATA_Y);
+ pdr->x = (gCoord)read_word(m, STMPE811_REG_TSC_DATA_X);
+ pdr->y = (gCoord)read_word(m, STMPE811_REG_TSC_DATA_Y);
#if GMOUSE_STMPE811_READ_PRESSURE
- pdr->z = (coord_t)read_byte(m, STMPE811_REG_TSC_DATA_Z);
+ pdr->z = (gCoord)read_byte(m, STMPE811_REG_TSC_DATA_Z);
#else
pdr->z = gmvmt(m)->z_max;
#endif
diff --git a/drivers/multiple/SDL/gdisp_lld_SDL.c b/drivers/multiple/SDL/gdisp_lld_SDL.c
index 3ea2168f..54830d7f 100644
--- a/drivers/multiple/SDL/gdisp_lld_SDL.c
+++ b/drivers/multiple/SDL/gdisp_lld_SDL.c
@@ -161,7 +161,7 @@ struct SDL_UGFXContext {
int16_t need_redraw;
int minx,miny,maxx,maxy;
#if GINPUT_NEED_MOUSE
- coord_t mousex, mousey;
+ gCoord mousex, mousey;
uint16_t buttons;
#endif
#if GINPUT_NEED_KEYBOARD
diff --git a/drivers/multiple/Win32/gdisp_lld_Win32.c b/drivers/multiple/Win32/gdisp_lld_Win32.c
index 86af1d80..5e23b3d5 100644
--- a/drivers/multiple/Win32/gdisp_lld_Win32.c
+++ b/drivers/multiple/Win32/gdisp_lld_Win32.c
@@ -442,18 +442,18 @@ typedef struct winPriv {
HBITMAP dcBitmap;
HBITMAP dcOldBitmap;
#if GFX_USE_GINPUT && GINPUT_NEED_MOUSE
- coord_t mousex, mousey;
+ gCoord mousex, mousey;
uint16_t mousebuttons;
GMouse *mouse;
gBool mouseenabled;
- void (*capfn)(void * hWnd, GDisplay *g, uint16_t buttons, coord_t x, coord_t y);
+ void (*capfn)(void * hWnd, GDisplay *g, uint16_t buttons, gCoord x, gCoord y);
#endif
#if GFX_USE_GINPUT && GINPUT_NEED_TOGGLE
uint8_t toggles;
#endif
#if GDISP_HARDWARE_STREAM_WRITE || GDISP_HARDWARE_STREAM_READ
- coord_t x0, y0, x1, y1;
- coord_t x, y;
+ gCoord x0, y0, x1, y1;
+ gCoord x, y;
#endif
} winPriv;
@@ -462,7 +462,7 @@ void gfxEmulatorSetParentWindow(void *hwnd) {
}
#if GFX_USE_GINPUT && GINPUT_NEED_MOUSE
- void gfxEmulatorMouseInject(GDisplay *g, uint16_t buttons, coord_t x, coord_t y) {
+ void gfxEmulatorMouseInject(GDisplay *g, uint16_t buttons, gCoord x, gCoord y) {
winPriv * priv;
priv = (winPriv *)g->priv;
@@ -475,7 +475,7 @@ void gfxEmulatorSetParentWindow(void *hwnd) {
void gfxEmulatorMouseEnable(GDisplay *g, gBool enabled) {
((winPriv *)g->priv)->mouseenabled = enabled;
}
- void gfxEmulatorMouseCapture(GDisplay *g, void (*capfn)(void * hWnd, GDisplay *g, uint16_t buttons, coord_t x, coord_t y)) {
+ void gfxEmulatorMouseCapture(GDisplay *g, void (*capfn)(void * hWnd, GDisplay *g, uint16_t buttons, gCoord x, gCoord y)) {
((winPriv *)g->priv)->capfn = capfn;
}
#endif
@@ -495,7 +495,7 @@ static LRESULT myWindowProc(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam)
RECT rect;
HGDIOBJ old;
POINT p;
- coord_t pos;
+ gCoord pos;
uint8_t bit;
#endif
@@ -526,7 +526,7 @@ static LRESULT myWindowProc(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam)
// Handle mouse down on the window
#if GINPUT_NEED_MOUSE
- if ((coord_t)HIWORD(lParam) < GDISP_SCREEN_HEIGHT) {
+ if ((gCoord)HIWORD(lParam) < GDISP_SCREEN_HEIGHT) {
btns = priv->mousebuttons;
btns |= GINPUT_MOUSE_BTN_LEFT;
goto mousemove;
@@ -535,8 +535,8 @@ static LRESULT myWindowProc(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam)
// Handle mouse down on the toggle area
#if GINPUT_NEED_TOGGLE
- if ((coord_t)HIWORD(lParam) >= GDISP_SCREEN_HEIGHT && (g->flags & GDISP_FLG_HASTOGGLE)) {
- bit = 1 << ((coord_t)LOWORD(lParam)*8/g->g.Width);
+ if ((gCoord)HIWORD(lParam) >= GDISP_SCREEN_HEIGHT && (g->flags & GDISP_FLG_HASTOGGLE)) {
+ bit = 1 << ((gCoord)LOWORD(lParam)*8/g->g.Width);
priv->toggles ^= bit;
rect.left = 0;
rect.right = GDISP_SCREEN_WIDTH;
@@ -576,7 +576,7 @@ static LRESULT myWindowProc(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam)
// Handle mouse up on the window
#if GINPUT_NEED_MOUSE
- if ((coord_t)HIWORD(lParam) < GDISP_SCREEN_HEIGHT) {
+ if ((gCoord)HIWORD(lParam) < GDISP_SCREEN_HEIGHT) {
btns = priv->mousebuttons;
btns &= ~GINPUT_MOUSE_BTN_LEFT;
goto mousemove;
@@ -589,7 +589,7 @@ static LRESULT myWindowProc(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam)
case WM_MBUTTONDOWN:
g = (GDisplay *)GetWindowLongPtr(hWnd, GWLP_USERDATA);
priv = (winPriv *)g->priv;
- if ((coord_t)HIWORD(lParam) < GDISP_SCREEN_HEIGHT) {
+ if ((gCoord)HIWORD(lParam) < GDISP_SCREEN_HEIGHT) {
btns = priv->mousebuttons;
btns |= GINPUT_MOUSE_BTN_MIDDLE;
goto mousemove;
@@ -598,7 +598,7 @@ static LRESULT myWindowProc(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam)
case WM_MBUTTONUP:
g = (GDisplay *)GetWindowLongPtr(hWnd, GWLP_USERDATA);
priv = (winPriv *)g->priv;
- if ((coord_t)HIWORD(lParam) < GDISP_SCREEN_HEIGHT) {
+ if ((gCoord)HIWORD(lParam) < GDISP_SCREEN_HEIGHT) {
btns = priv->mousebuttons;
btns &= ~GINPUT_MOUSE_BTN_MIDDLE;
goto mousemove;
@@ -607,7 +607,7 @@ static LRESULT myWindowProc(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam)
case WM_RBUTTONDOWN:
g = (GDisplay *)GetWindowLongPtr(hWnd, GWLP_USERDATA);
priv = (winPriv *)g->priv;
- if ((coord_t)HIWORD(lParam) < GDISP_SCREEN_HEIGHT) {
+ if ((gCoord)HIWORD(lParam) < GDISP_SCREEN_HEIGHT) {
btns = priv->mousebuttons;
btns |= GINPUT_MOUSE_BTN_RIGHT;
goto mousemove;
@@ -616,7 +616,7 @@ static LRESULT myWindowProc(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam)
case WM_RBUTTONUP:
g = (GDisplay *)GetWindowLongPtr(hWnd, GWLP_USERDATA);
priv = (winPriv *)g->priv;
- if ((coord_t)HIWORD(lParam) < GDISP_SCREEN_HEIGHT) {
+ if ((gCoord)HIWORD(lParam) < GDISP_SCREEN_HEIGHT) {
btns = priv->mousebuttons;
btns &= ~GINPUT_MOUSE_BTN_RIGHT;
goto mousemove;
@@ -625,17 +625,17 @@ static LRESULT myWindowProc(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam)
case WM_MOUSEMOVE:
g = (GDisplay *)GetWindowLongPtr(hWnd, GWLP_USERDATA);
priv = (winPriv *)g->priv;
- if ((coord_t)HIWORD(lParam) >= GDISP_SCREEN_HEIGHT)
+ if ((gCoord)HIWORD(lParam) >= GDISP_SCREEN_HEIGHT)
break;
btns = priv->mousebuttons;
mousemove:
if (priv->capfn)
- priv->capfn(hWnd, g, btns, (coord_t)LOWORD(lParam), (coord_t)HIWORD(lParam));
+ priv->capfn(hWnd, g, btns, (gCoord)LOWORD(lParam), (gCoord)HIWORD(lParam));
if (priv->mouseenabled) {
priv->mousebuttons = btns;
- priv->mousex = (coord_t)LOWORD(lParam);
- priv->mousey = (coord_t)HIWORD(lParam);
+ priv->mousex = (gCoord)LOWORD(lParam);
+ priv->mousey = (gCoord)HIWORD(lParam);
if ((gmvmt(priv->mouse)->d.flags & GMOUSE_VFLG_NOPOLL)) // For normal setup this is always true
_gmouseWakeup(priv->mouse);
}
@@ -1229,7 +1229,7 @@ LLDSPEC gBool gdisp_lld_init(GDisplay *g) {
pixel_t *dst;
const pixel_t *src;
size_t sz;
- coord_t i, j;
+ gCoord i, j;
// Allocate the destination buffer
sz = (size_t)g->p.cx * (size_t)g->p.cy;
@@ -1408,7 +1408,7 @@ LLDSPEC gBool gdisp_lld_init(GDisplay *g) {
LLDSPEC void gdisp_lld_vertical_scroll(GDisplay *g) {
winPriv * priv;
RECT rect;
- coord_t lines;
+ gCoord lines;
priv = g->priv;
@@ -1571,7 +1571,7 @@ LLDSPEC gBool gdisp_lld_init(GDisplay *g) {
#if GDISP_NEED_CONTROL
// If the self-rotation has been set in the VMT then do that here (TESTING ONLY)
if ((gmvmt(m)->d.flags & GMOUSE_VFLG_SELFROTATION)) { // For normal setup this is always False
- coord_t t;
+ gCoord t;
switch(gdispGGetOrientation(m->display)) {
case GDISP_ROTATE_0:
diff --git a/drivers/multiple/Win32/gdisp_lld_config.h b/drivers/multiple/Win32/gdisp_lld_config.h
index c95b554a..568c4c3d 100644
--- a/drivers/multiple/Win32/gdisp_lld_config.h
+++ b/drivers/multiple/Win32/gdisp_lld_config.h
@@ -55,14 +55,14 @@ void gfxEmulatorSetParentWindow(void *hwnd);
#if GINPUT_NEED_MOUSE
// This function allows you to inject mouse events into the ugfx mouse driver
- void gfxEmulatorMouseInject(GDisplay *g, uint16_t buttons, coord_t x, coord_t y);
+ void gfxEmulatorMouseInject(GDisplay *g, uint16_t buttons, gCoord x, gCoord y);
// This function enables you to turn on/off normal mouse functions on a ugfx Win32 display window.
void gfxEmulatorMouseEnable(GDisplay *g, gBool enabled);
// This function enables you to capture mouse events on a ugfx Win32 display window.
// Passing NULL turns off the capture
- void gfxEmulatorMouseCapture(GDisplay *g, void (*capfn)(void * hWnd, GDisplay *g, uint16_t buttons, coord_t x, coord_t y));
+ void gfxEmulatorMouseCapture(GDisplay *g, void (*capfn)(void * hWnd, GDisplay *g, uint16_t buttons, gCoord x, gCoord y));
#endif
#endif /* GFX_USE_GDISP */
diff --git a/drivers/multiple/X/gdisp_lld_X.c b/drivers/multiple/X/gdisp_lld_X.c
index 05e80614..78a9cb02 100644
--- a/drivers/multiple/X/gdisp_lld_X.c
+++ b/drivers/multiple/X/gdisp_lld_X.c
@@ -181,7 +181,7 @@ typedef struct xPriv {
GC gc;
Window win;
#if GINPUT_NEED_MOUSE
- coord_t mousex, mousey;
+ gCoord mousex, mousey;
uint16_t buttons;
GMouse * mouse;
#endif
diff --git a/drivers/multiple/uGFXnet/gdisp_lld_uGFXnet.c b/drivers/multiple/uGFXnet/gdisp_lld_uGFXnet.c
index 653b75c4..24460e97 100644
--- a/drivers/multiple/uGFXnet/gdisp_lld_uGFXnet.c
+++ b/drivers/multiple/uGFXnet/gdisp_lld_uGFXnet.c
@@ -159,7 +159,7 @@ typedef struct netPriv {
unsigned databytes; // How many bytes have been read
uint16_t data[2]; // Buffer for storing data read.
#if GINPUT_NEED_MOUSE
- coord_t mousex, mousey;
+ gCoord mousex, mousey;
uint16_t mousebuttons;
GMouse * mouse;
#endif
@@ -540,7 +540,7 @@ LLDSPEC gBool gdisp_lld_init(GDisplay *g) {
netPriv * priv;
pixel_t * buffer;
uint16_t buf[5];
- coord_t x, y;
+ gCoord x, y;
#if GDISP_DONT_WAIT_FOR_NET_DISPLAY
if (!(g->flags & GDISP_FLG_CONNECTED))
diff --git a/drivers/multiple/uGFXnetESP8266/gdisp_lld_uGFXnetESP8266.cpp b/drivers/multiple/uGFXnetESP8266/gdisp_lld_uGFXnetESP8266.cpp
index 8df5e08d..f8420bd3 100644
--- a/drivers/multiple/uGFXnetESP8266/gdisp_lld_uGFXnetESP8266.cpp
+++ b/drivers/multiple/uGFXnetESP8266/gdisp_lld_uGFXnetESP8266.cpp
@@ -119,7 +119,7 @@ typedef struct netPriv {
unsigned databytes; // How many bytes have been read
uint16_t data[2]; // Buffer for storing data read.
#if GINPUT_NEED_MOUSE
- coord_t mousex, mousey;
+ gCoord mousex, mousey;
uint16_t mousebuttons;
GMouse * mouse;
#endif
@@ -423,7 +423,7 @@ LLDSPEC gBool gdisp_lld_init(GDisplay *g) {
netPriv * priv;
pixel_t * buffer;
uint16_t buf[5];
- coord_t x, y;
+ gCoord x, y;
#if GDISP_DONT_WAIT_FOR_NET_DISPLAY
if (!(g->flags & GDISP_FLG_CONNECTED))