#509: fixed custom cursor rendering

Author: nesbox

build/assets/config.tic.dat

@@ -1,12 +1,5 @@
 THEME=
 {
-	CURSOR=
-	{
-		ARROW=64,
-		HAND=65,
-		IBEAM=66,
-	},
-
 	CODE =
 	{
 		BG     =15,
@@ -243,9 +236,6 @@ CRT_SHADER=
 -- 048:c2ccccccc2222222c222ccccc2222cccc2222222c1111111cc000cccecccccec
 -- 049:ccc200cc22220ccec2220cee22220cee22220cee1111ccee000cceeecccceeee
 -- 052:000000000fffff00000000000000000000000000000000000000000000000000
--- 064:ff000000fcf00000fccf0000fcccf000fccccf00fcccf000fcffcf000f00f000
--- 065:000f000000fcf00000fcff000ffcccf0fcfccccf0fcccccf00fcccf0000fff00
--- 066:0fff0000fcccf0000fcf00000fcf00000fcf00000fcf0000fcccf0000fff0000
 -- 080:0000000000c0c00000c0c000000c00000cc0cc000cc0cc000000000000000000
 -- 081:000000000cccc0000c00c0000c0ccc000ccc0c00000ccc000000000000000000
 -- 082:0000000000ccc0000c000c000ccccc000cc0cc000ccccc000000000000000000
@@ -375,6 +365,9 @@ CRT_SHADER=
 -- </TILES>
 
 -- <SPRITES>
+-- 000:ff000000fcf00000fccf0000fcccf000fccccf00fcccf000fcffcf000f00f000
+-- 001:000f000000fcf00000fcff000ffcccf0fcfccccf0fcccccf00fcccf0000fff00
+-- 002:0fff0000fcccf0000fcf00000fcf00000fcf00000fcf0000fcccf0000fff0000
 -- 033:00cc000000cc000000cc00000000000000cc0000000000000000000000000000
 -- 034:0c0c00000c0c0000000000000000000000000000000000000000000000000000
 -- 035:0c0c0000ccccc0000c0c0000ccccc0000c0c0000000000000000000000000000

config.lua

@@ -126,20 +126,6 @@ static void readConfigCrtShader(Config* config, lua_State* lua)
 
 #endif
 
-static void readCursorTheme(Config* config, lua_State* lua)
-{
-    lua_getfield(lua, -1, "CURSOR");
-
-    if(lua_type(lua, -1) == LUA_TTABLE)
-    {
-        readInteger(lua, "ARROW", &config->data.theme.cursor.arrow);
-        readInteger(lua, "HAND", &config->data.theme.cursor.hand);
-        readInteger(lua, "IBEAM", &config->data.theme.cursor.ibeam);
-    }
-
-    lua_pop(lua, 1);
-}
-
 static void readCodeTheme(Config* config, lua_State* lua)
 {
     lua_getfield(lua, -1, "CODE");
@@ -187,7 +173,6 @@ static void readTheme(Config* config, lua_State* lua)
 
     if(lua_type(lua, -1) == LUA_TTABLE)
     {
-        readCursorTheme(config, lua);
         readCodeTheme(config, lua);
         readGamepadTheme(config, lua);
     }

src/studio/config.c

@@ -1941,27 +1941,23 @@ static void blitCursor()
     {
         const tic_bank* bank = &tic->cart.bank0;
 
-        struct CursorInfo
-        {
-            tic_cursor cursor;
-            tic_point hot;
-        } info = {tic->ram.vram.vars.cursor.sprite};
+        tic_point hot = {0};
 
         if(tic->ram.vram.vars.cursor.system)
         {
             bank = &getConfig()->cart->bank0;
-            info = (struct CursorInfo[])
+            hot = (tic_point[])
             {
-                {getConfig()->theme.cursor.arrow,   {0, 0}},
-                {getConfig()->theme.cursor.hand,    {3, 0}},
-                {getConfig()->theme.cursor.ibeam,   {2, 3}},
+                {0, 0},
+                {3, 0},
+                {2, 3},
             }[tic->ram.vram.vars.cursor.sprite];
         }
 
         const tic_palette* pal = &bank->palette.scn;
-        const tic_tile* tile = &bank->tiles.data[info.cursor];
+        const tic_tile* tile = &bank->sprites.data[tic->ram.vram.vars.cursor.sprite];
 
-        u32 *dst = tic->screen + (m->x - info.hot.x) + (m->y - info.hot.y) * TIC80_FULLWIDTH, 
+        u32 *dst = tic->screen + (m->x - hot.x) + (m->y - hot.y) * TIC80_FULLWIDTH, 
             *end = tic->screen + TIC80_FULLWIDTH * TIC80_FULLHEIGHT;
 
         for(s32 src = 0; src != TIC_SPRITESIZE * TIC_SPRITESIZE; dst += TIC80_FULLWIDTH - TIC_SPRITESIZE)

src/studio/studio.c

@@ -77,13 +77,6 @@ typedef struct
     {
         struct
         {
-            s32 arrow;
-            s32 hand;
-            s32 ibeam;
-        } cursor;
-
-        struct
-        {
 #define     CODE_COLOR_DEF(VAR) u8 VAR;
             CODE_COLORS_LIST(CODE_COLOR_DEF)
 #undef      CODE_COLOR_DEF