From cbf1d4dfa095bc1fae927228ad108b6086738f01 Mon Sep 17 00:00:00 2001 From: inmarket Date: Sun, 8 Jul 2018 13:05:27 +1000 Subject: Added type gFont to replace V2.x font_t --- demos/3rdparty/notepad-2/main.c | 2 +- demos/3rdparty/notepad-2/notepadApp.c | 2 +- demos/applications/combo/main.c | 2 +- demos/applications/notepad/main.c | 2 +- demos/benchmarks/main.c | 2 +- demos/games/justget10/jg10.c | 2 +- demos/games/justget10/main.c | 2 +- demos/games/minesweeper/main.c | 2 +- demos/games/minesweeper/mines.c | 10 +++++----- demos/games/tetris/tetris.c | 4 ++-- demos/modules/gadc/main.c | 2 +- demos/modules/gaudio/play-vs1053/main.c | 2 +- demos/modules/gaudio/play-wave/main.c | 2 +- demos/modules/gdisp/fonts/main.c | 2 +- demos/modules/gdisp/fonts_cyrillic/main.c | 2 +- demos/modules/gdisp/multiple_displays/main.c | 4 ++-- demos/modules/gtrans/basic/main.c | 2 +- demos/modules/gwin/console/main.c | 2 +- demos/modules/gwin/keyboard/main.c | 2 +- demos/modules/gwin/widgets/main.c | 2 +- demos/tools/touch_calibration_grabber/main.c | 2 +- demos/tools/touch_driver_test/main.c | 2 +- demos/tools/touch_raw_readings/main.c | 2 +- demos/tools/uGFXnetDisplay/main.c | 2 +- 24 files changed, 30 insertions(+), 30 deletions(-) (limited to 'demos') diff --git a/demos/3rdparty/notepad-2/main.c b/demos/3rdparty/notepad-2/main.c index ec9acd0c..c61e7d94 100644 --- a/demos/3rdparty/notepad-2/main.c +++ b/demos/3rdparty/notepad-2/main.c @@ -75,7 +75,7 @@ const char *tsCalibRead(uint16_t instance) { int main(void) { - font_t font = gdispOpenFont("UI2"); + gFont font = gdispOpenFont("UI2"); /* initialize the hardware and the OS */ gfxInit(); diff --git a/demos/3rdparty/notepad-2/notepadApp.c b/demos/3rdparty/notepad-2/notepadApp.c index 7526faad..f274a23f 100644 --- a/demos/3rdparty/notepad-2/notepadApp.c +++ b/demos/3rdparty/notepad-2/notepadApp.c @@ -47,7 +47,7 @@ static GHandle gstatusConsole; // GConsole Handle to the Status Bar static GEventMouse curPtr; // Holder for current pointer location -static font_t font; +static gFont font; static gCoord swidth, sheight; // The toolbar buttons - Self-Explanatory diff --git a/demos/applications/combo/main.c b/demos/applications/combo/main.c index 1e7c6584..a614b23b 100644 --- a/demos/applications/combo/main.c +++ b/demos/applications/combo/main.c @@ -70,7 +70,7 @@ static const GWidgetStyle YellowWidgetStyle = { }; /* The variables we need */ -static font_t font; +static gFont font; static GListener gl; static GHandle ghConsole; static GTimer FlashTimer; diff --git a/demos/applications/notepad/main.c b/demos/applications/notepad/main.c index 852396c2..43933355 100644 --- a/demos/applications/notepad/main.c +++ b/demos/applications/notepad/main.c @@ -44,7 +44,7 @@ void drawScreen(void) { char *msg = "uGFX"; - font_t font1, font2; + gFont font1, font2; font1 = gdispOpenFont("DejaVuSans24*"); font2 = gdispOpenFont("DejaVuSans12*"); diff --git a/demos/benchmarks/main.c b/demos/benchmarks/main.c index 553af7bd..43af099e 100644 --- a/demos/benchmarks/main.c +++ b/demos/benchmarks/main.c @@ -90,7 +90,7 @@ void benchmark(void) { char pps_str[25]; gCoord height, width, rx, ry, rcx, rcy; gColor random_color; - font_t font; + gFont font; gdispSetOrientation(GDISP_ROTATE_90); diff --git a/demos/games/justget10/jg10.c b/demos/games/justget10/jg10.c index 7d5f8a46..160be7a7 100644 --- a/demos/games/justget10/jg10.c +++ b/demos/games/justget10/jg10.c @@ -30,7 +30,7 @@ gdispImage jg10Image[JG10_MAX_COUNT]; const char *jg10GraphAnim[] = {"a1.bmp","a2.bmp","a3.bmp","a4.bmp","background.bmp"}; // 5 elements (0-4) gdispImage jg10ImageAnim[JG10_ANIM_IMAGES]; uint8_t jg10MaxVal=4; // Max value in field... -font_t font; +gFont font; #if JG10_SHOW_SPLASH GTimer jg10SplashBlink; gBool jg10SplashTxtVisible = gFalse; diff --git a/demos/games/justget10/main.c b/demos/games/justget10/main.c index d4238fed..c41c152b 100644 --- a/demos/games/justget10/main.c +++ b/demos/games/justget10/main.c @@ -5,7 +5,7 @@ int main(void) { GEventMouse ev; #if !JG10_SHOW_SPLASH - font_t font; + gFont font; #endif gfxInit(); diff --git a/demos/games/minesweeper/main.c b/demos/games/minesweeper/main.c index 54b79743..dad36aaf 100644 --- a/demos/games/minesweeper/main.c +++ b/demos/games/minesweeper/main.c @@ -40,7 +40,7 @@ int main(void) { GEventMouse ev; #if !MINES_SHOW_SPLASH - font_t font; + gFont font; #endif gfxInit(); diff --git a/demos/games/minesweeper/mines.c b/demos/games/minesweeper/mines.c index 1b58fc6b..19d8c373 100644 --- a/demos/games/minesweeper/mines.c +++ b/demos/games/minesweeper/mines.c @@ -93,7 +93,7 @@ static void printStats(void) { char pps_str[12]; - font_t font = gdispOpenFont("fixed_5x8"); + gFont font = gdispOpenFont("fixed_5x8"); uitoa(MINES_MINE_COUNT, pps_str, sizeof(pps_str)); gdispFillString(minesStatusIconWidth+8, gdispGetHeight()-11, " ", font, GFX_BLACK, GFX_BLACK); gdispDrawString(minesStatusIconWidth+8, gdispGetHeight()-11, pps_str, font, GFX_WHITE); @@ -110,7 +110,7 @@ static void minesUpdateTime(void) if (minesTime > 9999) minesTime = 9999; - font_t font = gdispOpenFont("digital_7__mono_20"); + gFont font = gdispOpenFont("digital_7__mono_20"); uitoa(minesTime, pps_str, sizeof(pps_str)); gdispFillArea((MINES_FIELD_WIDTH*MINES_CELL_WIDTH)-gdispGetStringWidth("9999", font), gdispGetHeight()-15, gdispGetWidth(), 15, GFX_BLACK); gdispDrawString((MINES_FIELD_WIDTH*MINES_CELL_WIDTH)-gdispGetStringWidth(pps_str, font), gdispGetHeight()-15, pps_str, font, GFX_LIME); @@ -251,7 +251,7 @@ static DECLARE_THREAD_FUNCTION(thdMines, msg) static void printGameOver(void) { if (minesGameOver) { - font_t font = gdispOpenFont("DejaVuSans16"); + gFont font = gdispOpenFont("DejaVuSans16"); if (minesGameWinner) { gdispDrawString((gdispGetWidth()-gdispGetStringWidth("You LIVE!", font))/2, gdispGetHeight()-15, "You LIVE!", font, GFX_WHITE); } else { @@ -271,7 +271,7 @@ static void initField(void) minesGameOver = gFalse; printGameOver(); - font_t font = gdispOpenFont("fixed_5x8"); + gFont font = gdispOpenFont("fixed_5x8"); gdispImageOpenFile(&minesImage, "plainmine.bmp"); // Saving status icons width/height for later use minesStatusIconWidth = minesImage.width; @@ -391,7 +391,7 @@ void minesStart(void) if (!minesGameWinner) { // Print generated mines for player to see - font_t font = gdispOpenFont("fixed_10x20"); + gFont font = gdispOpenFont("fixed_10x20"); for (x = 0; x < MINES_FIELD_WIDTH; x++) { for (y = 0; y < MINES_FIELD_HEIGHT; y++) { if (minesField[x][y].num == 9 && !minesField[x][y].flag) { diff --git a/demos/games/tetris/tetris.c b/demos/games/tetris/tetris.c index e24c5122..53c0e34b 100644 --- a/demos/games/tetris/tetris.c +++ b/demos/games/tetris/tetris.c @@ -89,8 +89,8 @@ unsigned long tetrisScore = 0; gBool tetrisKeysPressed[5] = {gFalse, gFalse, gFalse, gFalse, gFalse}; // left/down/right/up/pause gBool tetrisPaused = gFalse; gBool tetrisGameOver = gFalse; -font_t font16; -font_t font12; +gFont font16; +gFont font12; GEventMouse ev; diff --git a/demos/modules/gadc/main.c b/demos/modules/gadc/main.c index 92312e83..1a4733f9 100644 --- a/demos/modules/gadc/main.c +++ b/demos/modules/gadc/main.c @@ -137,7 +137,7 @@ int main(void) { gCoord swidth, sheight; #if defined(MY_DIAL_DEVICE) || defined(MY_TEMP_DEVICE) GHandle ghText; - font_t font; + gFont font; #endif gfxInit(); diff --git a/demos/modules/gaudio/play-vs1053/main.c b/demos/modules/gaudio/play-vs1053/main.c index 21e28c98..4e9c4b97 100644 --- a/demos/modules/gaudio/play-vs1053/main.c +++ b/demos/modules/gaudio/play-vs1053/main.c @@ -43,7 +43,7 @@ * Application entry point. */ int main(void) { - font_t font; + gFont font; GFILE *f; char *errmsg; uint32_t toplay; diff --git a/demos/modules/gaudio/play-wave/main.c b/demos/modules/gaudio/play-wave/main.c index 4c863fcf..9717b4fe 100644 --- a/demos/modules/gaudio/play-wave/main.c +++ b/demos/modules/gaudio/play-wave/main.c @@ -45,7 +45,7 @@ static char whdr[32]; * Application entry point. */ int main(void) { - font_t font; + gFont font; GFILE *f; char *errmsg; uint32_t toplay; diff --git a/demos/modules/gdisp/fonts/main.c b/demos/modules/gdisp/fonts/main.c index ce66aabd..5a4b02df 100644 --- a/demos/modules/gdisp/fonts/main.c +++ b/demos/modules/gdisp/fonts/main.c @@ -31,7 +31,7 @@ int main(void) { gCoord width, y; - font_t font1, font2; + gFont font1, font2; gCoord fheight1, fheight2; const char *line1, *line2; char buf[8]; diff --git a/demos/modules/gdisp/fonts_cyrillic/main.c b/demos/modules/gdisp/fonts_cyrillic/main.c index 1f6a30a9..ac1d8c71 100644 --- a/demos/modules/gdisp/fonts_cyrillic/main.c +++ b/demos/modules/gdisp/fonts_cyrillic/main.c @@ -30,7 +30,7 @@ #include "gfx.h" int main(void) { - font_t font1; + gFont font1; // Initialize uGFX and the underlying system gfxInit(); diff --git a/demos/modules/gdisp/multiple_displays/main.c b/demos/modules/gdisp/multiple_displays/main.c index 5df0e479..f1379f40 100644 --- a/demos/modules/gdisp/multiple_displays/main.c +++ b/demos/modules/gdisp/multiple_displays/main.c @@ -47,7 +47,7 @@ int main(void) { gCoord width, height; gCoord display, i, j, cnt; - font_t f; + gFont f; GDisplay *g; char buf[16]; @@ -91,7 +91,7 @@ int main(void) { gCoord width, height; gCoord display, i, j, cnt; - font_t f; + gFont f; char buf[16]; /* Initialize and clear the display */ diff --git a/demos/modules/gtrans/basic/main.c b/demos/modules/gtrans/basic/main.c index 283a7211..e4a6e608 100644 --- a/demos/modules/gtrans/basic/main.c +++ b/demos/modules/gtrans/basic/main.c @@ -33,7 +33,7 @@ #define COLOR_BACKGROUND GFX_SILVER #define COLOR_TEXT GFX_BLACK -font_t font; +gFont font; // English Translation static const char* EnglishStrings[] = { diff --git a/demos/modules/gwin/console/main.c b/demos/modules/gwin/console/main.c index 53b80fcb..9cd4af76 100644 --- a/demos/modules/gwin/console/main.c +++ b/demos/modules/gwin/console/main.c @@ -34,7 +34,7 @@ GHandle GW1, GW2, GW3; int main(void) { uint8_t i; - font_t font1, font2; + gFont font1, font2; /* initialize and clear the display */ gfxInit(); diff --git a/demos/modules/gwin/keyboard/main.c b/demos/modules/gwin/keyboard/main.c index b43e72d1..cf31118f 100644 --- a/demos/modules/gwin/keyboard/main.c +++ b/demos/modules/gwin/keyboard/main.c @@ -28,7 +28,7 @@ #include "gfx.h" /* The variables we need */ -static font_t font; +static gFont font; static GListener gl; static GHandle ghConsole; static GHandle ghKeyboard; diff --git a/demos/modules/gwin/widgets/main.c b/demos/modules/gwin/widgets/main.c index fd0bee1a..4b8e1146 100644 --- a/demos/modules/gwin/widgets/main.c +++ b/demos/modules/gwin/widgets/main.c @@ -77,7 +77,7 @@ static const GWidgetStyle YellowWidgetStyle = { }; /* The variables we need */ -static font_t font; +static gFont font; static GListener gl; static GHandle ghConsole; static GTimer FlashTimer; diff --git a/demos/tools/touch_calibration_grabber/main.c b/demos/tools/touch_calibration_grabber/main.c index 81032b83..1aa5a9f8 100644 --- a/demos/tools/touch_calibration_grabber/main.c +++ b/demos/tools/touch_calibration_grabber/main.c @@ -33,7 +33,7 @@ #include "src/ginput/ginput_driver_mouse.h" static GConsoleObject gc; -static font_t font; +static gFont font; static gCoord bHeight; static GHandle ghc; static gCoord swidth, sheight; diff --git a/demos/tools/touch_driver_test/main.c b/demos/tools/touch_driver_test/main.c index 3915c2a8..c338e24c 100644 --- a/demos/tools/touch_driver_test/main.c +++ b/demos/tools/touch_driver_test/main.c @@ -37,7 +37,7 @@ static GConsoleObject gc; static GListener gl; -static font_t font; +static gFont font; static gCoord bWidth, bWidth2, bHeight; static GHandle ghc; static gCoord swidth, sheight; diff --git a/demos/tools/touch_raw_readings/main.c b/demos/tools/touch_raw_readings/main.c index 9077b1ac..9b3c125c 100644 --- a/demos/tools/touch_raw_readings/main.c +++ b/demos/tools/touch_raw_readings/main.c @@ -37,7 +37,7 @@ static GConsoleObject gc; static GListener gl; -static font_t font; +static gFont font; static gCoord bHeight; static GHandle ghc; static gCoord swidth, sheight; diff --git a/demos/tools/uGFXnetDisplay/main.c b/demos/tools/uGFXnetDisplay/main.c index 18e6d2ef..de814dde 100644 --- a/demos/tools/uGFXnetDisplay/main.c +++ b/demos/tools/uGFXnetDisplay/main.c @@ -111,7 +111,7 @@ static GListener gl; #endif static SOCKET_TYPE netfd = (SOCKET_TYPE)-1; -static font_t font; +static gFont font; #define STRINGOF_RAW(s) #s #define STRINGOF(s) STRINGOF_RAW(s) -- cgit v1.2.3