- 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

@@ -88,6 +88,9 @@
     <Image Include="..\data\cpu.ico">
       <DeploymentContent>true</DeploymentContent>
     </Image>
+    <Image Include="..\data\cursor.bmp">
+      <DeploymentContent>true</DeploymentContent>
+    </Image>
     <Image Include="..\data\delete.png">
       <DeploymentContent>true</DeploymentContent>
     </Image>
@@ -132,6 +135,9 @@
     <Font Include="..\data\FreeSans.ttf">
       <DeploymentContent>true</DeploymentContent>
     </Font>
+    <Font Include="..\data\Topaznew.ttf">
+      <DeploymentContent>true</DeploymentContent>
+    </Font>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\Makefile">

VSLinux/Amiberry.vcxproj.filters

@@ -128,11 +128,17 @@
     <Image Include="..\data\sound.ico">
       <Filter>data</Filter>
     </Image>
+    <Image Include="..\data\cursor.bmp">
+      <Filter>data</Filter>
+    </Image>
   </ItemGroup>
   <ItemGroup>
     <Font Include="..\data\FreeSans.ttf">
       <Filter>data</Filter>
     </Font>
+    <Font Include="..\data\Topaznew.ttf">
+      <Filter>data</Filter>
+    </Font>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\Makefile" />

VisualGDB/Amiberry/Amiberry.vcxproj

@@ -272,6 +272,9 @@
     <Image Include="..\..\data\cpu.ico">
       <DeploymentContent>true</DeploymentContent>
     </Image>
+    <Image Include="..\..\data\cursor.bmp">
+      <DeploymentContent>true</DeploymentContent>
+    </Image>
     <Image Include="..\..\data\delete.png">
       <DeploymentContent>true</DeploymentContent>
     </Image>
@@ -316,6 +319,9 @@
     <Font Include="..\..\data\FreeSans.ttf">
       <DeploymentContent>true</DeploymentContent>
     </Font>
+    <Font Include="..\..\data\Topaznew.ttf">
+      <DeploymentContent>true</DeploymentContent>
+    </Font>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\archivers\7z\7zAlloc.h" />

VisualGDB/Amiberry/Amiberry.vcxproj.filters

@@ -599,11 +599,17 @@
     <Image Include="..\..\data\sound.ico">
       <Filter>Resource files\data</Filter>
     </Image>
+    <Image Include="..\..\data\cursor.bmp">
+      <Filter>Resource files\data</Filter>
+    </Image>
   </ItemGroup>
   <ItemGroup>
     <Font Include="..\..\data\FreeSans.ttf">
       <Filter>Resource files\data</Filter>
     </Font>
+    <Font Include="..\..\data\Topaznew.ttf">
+      <Filter>Resource files\data</Filter>
+    </Font>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\include\akiko.h">

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]) {

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
 }
 

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;

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