From fb023d05461b4662ea951e51a300c5d5e6c259c8 Mon Sep 17 00:00:00 2001 From: Dimitris Panokostas Date: Wed, 5 Apr 2017 23:38:59 +0200 Subject: [PATCH] - Added a custom mouse pointer (Kickstart 1.3 FTW!) in the menu - Changed default font in the menu to Topaz New, size 14. --- VSLinux/Amiberry.vcxproj | 6 ++++++ VSLinux/Amiberry.vcxproj.filters | 6 ++++++ VisualGDB/Amiberry/Amiberry.vcxproj | 6 ++++++ VisualGDB/Amiberry/Amiberry.vcxproj.filters | 6 ++++++ data/Topaznew.ttf | Bin 0 -> 42264 bytes data/cursor.bmp | Bin 0 -> 4150 bytes src/main.cpp | 2 ++ src/osdep/amiberry_gfx.cpp | 2 +- src/osdep/amiberry_gfx.h | 1 + src/osdep/gui/main_window.cpp | 16 +++++++++++++--- 10 files changed, 41 insertions(+), 4 deletions(-) create mode 100644 data/Topaznew.ttf create mode 100644 data/cursor.bmp diff --git a/VSLinux/Amiberry.vcxproj b/VSLinux/Amiberry.vcxproj index 6a644aa0..7a98d209 100644 --- a/VSLinux/Amiberry.vcxproj +++ b/VSLinux/Amiberry.vcxproj @@ -88,6 +88,9 @@ true + + true + true @@ -132,6 +135,9 @@ true + + true + diff --git a/VSLinux/Amiberry.vcxproj.filters b/VSLinux/Amiberry.vcxproj.filters index 3f9dac14..48d545c0 100644 --- a/VSLinux/Amiberry.vcxproj.filters +++ b/VSLinux/Amiberry.vcxproj.filters @@ -128,11 +128,17 @@ data + + data + data + + data + diff --git a/VisualGDB/Amiberry/Amiberry.vcxproj b/VisualGDB/Amiberry/Amiberry.vcxproj index b4c28b7c..326f4674 100644 --- a/VisualGDB/Amiberry/Amiberry.vcxproj +++ b/VisualGDB/Amiberry/Amiberry.vcxproj @@ -272,6 +272,9 @@ true + + true + true @@ -316,6 +319,9 @@ true + + true + diff --git a/VisualGDB/Amiberry/Amiberry.vcxproj.filters b/VisualGDB/Amiberry/Amiberry.vcxproj.filters index 34e973e1..175c6a34 100644 --- a/VisualGDB/Amiberry/Amiberry.vcxproj.filters +++ b/VisualGDB/Amiberry/Amiberry.vcxproj.filters @@ -599,11 +599,17 @@ Resource files\data + + Resource files\data + Resource files\data + + Resource files\data + diff --git a/data/Topaznew.ttf b/data/Topaznew.ttf new file mode 100644 index 0000000000000000000000000000000000000000..84627763f217b21c969c89ba670f6f09a27a0b85 GIT binary patch literal 42264 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 C)dL0q literal 0 HcmV?d00001 diff --git a/data/cursor.bmp b/data/cursor.bmp new file mode 100644 index 0000000000000000000000000000000000000000..2cc3aba2c1284749b3cf9a6d0506a77f72415329 GIT binary patch literal 4150 zcmeH_OAf;z3`D0FsB(mCBJ~70K=-*bi{6W>q;G>{1rY-qkgQ3-_Tw|}V_%fUF6kv{ z{l_DHNm``O^9)9eamKuZ>4E8i>46FlNQ%Fxsr9HC#fQ6XF$Mn~XDaCduQxyE!Ve*& zV7=rFH97Q$i?-&E;&Ml=`SeG7adS>@K0JJcTJzpMvpCj#FFyBxdUNx4hhym|ek*S2 v`A744k5>Dzd=3|F&8PpBvR~fsuF~&{%R2dYxzy9IRH^gQQZ9L3T>5+g`N-zy literal 0 HcmV?d00001 diff --git a/src/main.cpp b/src/main.cpp index 0890134d..4b2b8c47 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1009,6 +1009,8 @@ static int real_main2 (int argc, TCHAR **argv) if (SDL_SetHint(SDL_HINT_GRAB_KEYBOARD, "1") != SDL_TRUE) SDL_Log("SDL could not grab the keyboard"); + + SDL_ShowCursor(SDL_DISABLE); set_config_changed(); if (restart_config[0]) { diff --git a/src/osdep/amiberry_gfx.cpp b/src/osdep/amiberry_gfx.cpp index fdfc719e..31ed16fd 100644 --- a/src/osdep/amiberry_gfx.cpp +++ b/src/osdep/amiberry_gfx.cpp @@ -175,8 +175,8 @@ static void open_screen(struct uae_prefs* p) void update_display(struct uae_prefs* p) { - open_screen(p); SDL_ShowCursor(SDL_DISABLE); + open_screen(p); framecnt = 1; // Don't draw frame before reset done } diff --git a/src/osdep/amiberry_gfx.h b/src/osdep/amiberry_gfx.h index 6a0d5a7e..79415bd7 100644 --- a/src/osdep/amiberry_gfx.h +++ b/src/osdep/amiberry_gfx.h @@ -4,6 +4,7 @@ extern SDL_Window* sdlWindow; extern SDL_Renderer* renderer; extern SDL_Texture* texture; extern SDL_Surface* screen; +extern SDL_Cursor* cursor; extern SDL_Surface* gui_screen; extern SDL_Texture* gui_texture; diff --git a/src/osdep/gui/main_window.cpp b/src/osdep/gui/main_window.cpp index 3ce938bb..dd9e3e20 100644 --- a/src/osdep/gui/main_window.cpp +++ b/src/osdep/gui/main_window.cpp @@ -12,7 +12,6 @@ #include "uae.h" #include "gui.h" #include "gui_handling.h" -#include "memory.h" #include "amiberry_gfx.h" bool gui_running = false; @@ -62,6 +61,7 @@ enum SDL_Surface* gui_screen; SDL_Texture* gui_texture; SDL_Event gui_event; +SDL_Cursor* cursor; /* * Guisan SDL stuff we need @@ -157,6 +157,13 @@ namespace sdl // Create new screen for GUI //------------------------------------------------- + SDL_Surface *cursorSurface = SDL_LoadBMP("data/cursor.bmp"); + if (cursorSurface) + { + cursor = SDL_CreateColorCursor(cursorSurface, 0, 0); + SDL_SetCursor(cursor); + } + // make the scaled rendering look smoother (linear scaling). SDL_SetHint(SDL_HINT_RENDER_SCALE_QUALITY, "linear"); @@ -194,9 +201,12 @@ namespace sdl delete gui_imageLoader; delete gui_input; delete gui_graphics; - + SDL_FreeSurface(gui_screen); SDL_DestroyTexture(gui_texture); + if (cursor) { + SDL_FreeCursor(cursor); + } gui_screen = nullptr; } @@ -462,7 +472,7 @@ namespace widgets // Initialize fonts //------------------------------------------------- TTF_Init(); - gui_font = new gcn::SDLTrueTypeFont("data/FreeSans.ttf", 14); + gui_font = new gcn::SDLTrueTypeFont("data/Topaznew.ttf", 14); gcn::Widget::setGlobalFont(gui_font); //--------------------------------------------------