Merge branch 'master' into stable

nesbox · nesbox · commit 6aad6d892984 · 2017-11-28T10:01:16.000+03:00
diff --git a/bin/assets/tic.js.dat b/bin/assets/tic.js.dat
diff --git a/build/android/AndroidManifest.xml b/build/android/AndroidManifest.xml
@@ -4,8 +4,8 @@
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="com.nesbox.tic"
-      android:versionCode="5000"
-      android:versionName="0.50.0"
+      android:versionCode="5001"
+      android:versionName="0.50.1"
       android:installLocation="auto">
 
     <!-- Android 2.3.3 -->
diff --git a/build/macosx/Info.plist b/build/macosx/Info.plist
@@ -19,9 +19,9 @@
   <key>CFBundlePackageType</key>
   <string>APPL</string>
   <key>CFBundleShortVersionString</key>
-  <string>0.50.0</string>
+  <string>0.50.1</string>
   <key>CFBundleVersion</key>
-  <string>0.50.0</string>
+  <string>0.50.1</string>
   <key>NSHumanReadableCopyright</key>
   <string>http://tic.computer © 2017</string>
   <key>NSHighResolutionCapable</key>
diff --git a/build/windows/tic80/tic80.aps b/build/windows/tic80/tic80.aps
diff --git a/build/windows/tic80/tic80.rc b/build/windows/tic80/tic80.rc
diff --git a/lib/windows/tic.rc b/lib/windows/tic.rc
diff --git a/src/console.c b/src/console.c
@@ -464,6 +464,12 @@ static void* getDemoCart(Console* console, tic_script_lang script, s32* size)
 	return data;
 }
 
+static void setCartName(Console* console, const char* name)
+{
+	if(name != console->romName)
+		strcpy(console->romName, name);
+}
+
 static void onConsoleLoadDemoCommandConfirmed(Console* console, const char* param)
 {
 	void* data = NULL;
@@ -480,7 +486,7 @@ static void onConsoleLoadDemoCommandConfirmed(Console* console, const char* para
 
 	const char* name = getCartName(param);
 
-	strcpy(console->romName, name);
+	setCartName(console, name);
 
 	loadRom(console->tic, data, size, true);
 
@@ -495,7 +501,7 @@ static void onConsoleLoadDemoCommandConfirmed(Console* console, const char* para
 
 static void onCartLoaded(Console* console, const char* name)
 {
-	strcpy(console->romName, name);
+	setCartName(console, name);
 
 	studioRomLoaded();
 
@@ -1343,15 +1349,21 @@ static void onImportSprites(const char* name, const void* buffer, size_t size, v
 	commandDone(console);
 }
 
+static void injectMap(Console* console, const void* buffer, s32 size)
+{
+	enum {Size = sizeof(tic_map)};
+
+	SDL_memset(&console->tic->cart.gfx.map, 0, Size);
+	SDL_memcpy(&console->tic->cart.gfx.map, buffer, SDL_min(size, Size));
+}
+
 static void onImportMap(const char* name, const void* buffer, size_t size, void* data)
 {
 	Console* console = (Console*)data;
 
-	enum {Size = sizeof(tic_map)};
-
-	if(name && buffer && size == Size)
+	if(name && buffer && size <= sizeof(tic_map))
 	{
-		memcpy(&console->tic->cart.gfx.map, buffer, size);
+		injectMap(console, buffer, size);
 
 		printLine(console);
 		printBack(console, "map successfully imported");
@@ -1889,7 +1901,7 @@ static CartSaveResult saveCartName(Console* console, const char* name)
 
 				if(size && fsSaveFile(console->fs, name, buffer, size, true))
 				{
-					strcpy(console->romName, name);
+					setCartName(console, name);
 					success = true;
 					studioRomSaved();
 				}
@@ -2627,7 +2639,7 @@ static void cmdLoadCart(Console* console, const char* name)
 		if(hasProjectExt(name))
 		{
 			loadProject(console, name, data, size, &embed.file);
-			strcpy(console->romName, fsFilename(name));
+			setCartName(console, fsFilename(name));
 			embed.yes = true;
 			embed.fast = true;
 		}
@@ -2637,7 +2649,7 @@ static void cmdLoadCart(Console* console, const char* name)
 		if(hasExt(name, CART_EXT))
 		{
 			loadCart(console->tic, &embed.file, data, size, true);			
-			strcpy(console->romName, fsFilename(name));
+			setCartName(console, fsFilename(name));
 			embed.yes = true;
 		}
 		
@@ -2755,9 +2767,9 @@ static void cmdInjectMap(Console* console, const char* param, const char* name)
 
 		if(map)
 		{
-			if(size == sizeof(tic_map))
+			if(size <= sizeof(tic_map))
 			{
-				SDL_memcpy(embed.file.gfx.map.data, map, size);
+				injectMap(console, map, size);
 
 				embed.yes = true;
 				embed.fast = true;
@@ -2862,6 +2874,8 @@ void initConsole(Console* console, tic_mem* tic, FileSystem* fs, Config* config,
 				config->data.noSound = true;
 			else if(strcmp(argv[i], "-surf") == 0)
 				console->startSurf = true;
+			else if(strcmp(argv[i], "-fullscreen") == 0)
+				goFullscreen();
 		}
 	}
 
diff --git a/src/run.c b/src/run.c
@@ -115,6 +115,57 @@ static void tick(Run* run)
 		setStudioMode(TIC_CONSOLE_MODE);
 }
 
+static void processDoFile(void* data, char* dst)
+{
+	Run* run = (Run*)data;
+	tic_mem* tic = run->tic;
+
+	static const char DoFileTag[] = "dofile(";
+	enum {Size = sizeof DoFileTag - 1};
+
+	if (memcmp(tic->cart.code.data, DoFileTag, Size) == 0)
+	{
+		const char* start = tic->cart.code.data + Size;
+		const char* end = strchr(start, ')');
+
+		if(end && *start == *(end-1) && (*start == '"' || *start == '\''))
+		{
+			char filename[FILENAME_MAX] = {0};
+			memcpy(filename, start + 1, end - start - 2);
+			memset(dst, 0, sizeof(tic_code));
+
+			s32 size = 0;
+			void* buffer = fsReadFile(filename, &size);
+
+			if(buffer)
+			{
+				if(size > 0)
+				{
+					if(size > TIC_CODE_SIZE)
+					{
+						char buffer[256];
+						sprintf(buffer, "code is larger than %i symbols", TIC_CODE_SIZE);
+						onError(run, buffer);
+
+						return;
+					}
+					else SDL_memcpy(dst, buffer, size);
+				}
+			}
+			else
+			{
+				char buffer[256];
+				sprintf(buffer, "dofile: file '%s' not found", filename);
+				onError(run, buffer);
+
+				return;
+			}
+		}
+	}
+
+	return;
+}
+
 void initRun(Run* run, Console* console, tic_mem* tic)
 {
 	*run = (Run)
@@ -133,6 +184,7 @@ void initRun(Run* run, Console* console, tic_mem* tic)
 			.start = 0,
 			.data = run,
 			.exit = onExit,
+			.preprocessor = processDoFile,
 		},
 	};
 
diff --git a/src/sprite.c b/src/sprite.c
@@ -1352,6 +1352,8 @@ static void drawSpriteToolbar(Sprite* sprite)
 		{
 			setCursor(SDL_SYSTEM_CURSOR_HAND);
 
+			showTooltip("CANVAS ZOOM");
+
 			if(checkMouseDown(&rect, SDL_BUTTON_LEFT))
 			{
 				s32 mx = getMouseX() - rect.x;
diff --git a/src/studio.c b/src/studio.c
@@ -1371,7 +1371,7 @@ static void processMouse()
 	}
 }
 
-static void onFullscreen()
+void goFullscreen()
 {
 	studio.fullscreen = !studio.fullscreen;
 	SDL_SetWindowFullscreen(studio.window, studio.fullscreen ? SDL_WINDOW_FULLSCREEN_DESKTOP : 0);
@@ -1555,12 +1555,12 @@ static bool processShortcuts(SDL_KeyboardEvent* event)
 			studio.gamepad.backProcessed = true;
 			return true;
 		case SDLK_F11:
-			onFullscreen();
+			goFullscreen();
 			return true;
 		case SDLK_RETURN:
 			if(mod & KMOD_RALT)
 			{
-				onFullscreen();
+				goFullscreen();
 				return true;
 			}
 			break;
@@ -1627,11 +1627,11 @@ static bool processShortcuts(SDL_KeyboardEvent* event)
 			return true;
 		}
 		break;
-	case SDLK_F11: onFullscreen(); return true;
+	case SDLK_F11: goFullscreen(); return true;
 	case SDLK_RETURN:
 		if(mod & KMOD_RALT)
 		{
-			onFullscreen();
+			goFullscreen();
 			return true;
 		}
 		else if(mod & TIC_MOD_CTRL)
diff --git a/src/studio.h b/src/studio.h
@@ -199,3 +199,4 @@ void gotoCode();
 void gotoSurf();
 void exitFromGameMenu();
 void runProject();
+void goFullscreen();
diff --git a/src/tic.c b/src/tic.c
@@ -1377,44 +1377,61 @@ static void api_tick(tic_mem* memory, tic_tick_data* data)
 	
 	if(!machine->state.initialized)
 	{
-		cart2ram(memory);
 
-		const char* code = machine->memory.cart.code.data;
+		char* code = malloc(sizeof(tic_code));
 
-		if(strlen(code))
+		if(code)
 		{
-			memory->input = compareMetatag(code, "input", "mouse") ? tic_mouse_input : tic_gamepad_input;
+			memcpy(code, machine->memory.cart.code.data, sizeof(tic_code));
 
-			if(memory->input == tic_mouse_input)
-				memory->ram.vram.vars.mask.data = 0;
+			if(data->preprocessor)
+				data->preprocessor(data->data, code);
 
-			memory->script = tic_script_lua;
+			bool done = false;
 
-			if (isMoonscript(code))
+			if(strlen(code))
 			{
-				if(!initMoonscript(machine, code))
-					return;
+				cart2ram(memory);
+				memory->input = compareMetatag(code, "input", "mouse") ? tic_mouse_input : tic_gamepad_input;
+
+				if(memory->input == tic_mouse_input)
+					memory->ram.vram.vars.mask.data = 0;
+
+				memory->script = tic_script_lua;
 
-				memory->script = tic_script_moon;
+				if (isMoonscript(code))
+				{
+					if(initMoonscript(machine, code))
+					{
+						memory->script = tic_script_moon;
+						done = true;
+					}
+				}
+				else if(isJavascript(code))
+				{
+					if(initJavascript(machine, code))
+					{
+						memory->script = tic_script_js;
+						done = true;
+					}
+				}
+				else if(initLua(machine, code))
+					done = true;
 			}
-			else if(isJavascript(code))
+			else
 			{
-				if(!initJavascript(machine, code))
-					return;
+				machine->data->error(machine->data->data, "the code is empty");
+			}
+
+			free(code);
 
-				memory->script = tic_script_js;
+			if(done)
+			{
+				machine->state.scanline = memory->script == tic_script_js ? callJavascriptScanline : callLuaScanline;
+				machine->state.initialized = true;				
 			}
-			else if(!initLua(machine, code))
-				return;
+			else return;
 		}
-		else
-		{
-			machine->data->error(machine->data->data, "the code is empty");
-			return;
-		}
-
-		machine->state.scanline = memory->script == tic_script_js ? callJavascriptScanline : callLuaScanline;
-		machine->state.initialized = true;
 	}
 
 	memory->script == tic_script_js
diff --git a/src/tic.h b/src/tic.h
@@ -28,7 +28,7 @@
 
 #define TIC_VERSION_MAJOR 0
 #define TIC_VERSION_MINOR 50
-#define TIC_VERSION_PATCH 0
+#define TIC_VERSION_PATCH 1
 #define TIC_VERSION_STATUS ""
 
 #if defined(TIC80_PRO)
diff --git a/src/ticapi.h b/src/ticapi.h
@@ -56,6 +56,8 @@ typedef struct
 	u64 (*freq)();
 	u64 start;
 
+	void (*preprocessor)(void* data, char* dst);
+
 	void* data;
 } tic_tick_data;
 

Original file line number	Diff line number	Diff line change
`@@ -464,6 +464,12 @@ static void* getDemoCart(Console* console, tic_script_lang script, s32* size)`
`464`	`464`	`return data;`
`465`	`465`	`}`
`466`	`466`
	`467`	`+static void setCartName(Console* console, const char* name)`
	`468`	`+{`
	`469`	`+ if(name != console->romName)`
	`470`	`+ strcpy(console->romName, name);`
	`471`	`+}`
	`472`	`+`
`467`	`473`	`static void onConsoleLoadDemoCommandConfirmed(Console* console, const char* param)`
`468`	`474`	`{`
`469`	`475`	`void* data = NULL;`
`@@ -480,7 +486,7 @@ static void onConsoleLoadDemoCommandConfirmed(Console* console, const char* para`
`480`	`486`
`481`	`487`	`const char* name = getCartName(param);`
`482`	`488`
`483`		`- strcpy(console->romName, name);`
	`489`	`+ setCartName(console, name);`
`484`	`490`
`485`	`491`	`loadRom(console->tic, data, size, true);`
`486`	`492`
`@@ -495,7 +501,7 @@ static void onConsoleLoadDemoCommandConfirmed(Console* console, const char* para`
`495`	`501`
`496`	`502`	`static void onCartLoaded(Console* console, const char* name)`
`497`	`503`	`{`
`498`		`- strcpy(console->romName, name);`
	`504`	`+ setCartName(console, name);`
`499`	`505`
`500`	`506`	`studioRomLoaded();`
`501`	`507`
`@@ -1343,15 +1349,21 @@ static void onImportSprites(const char* name, const void* buffer, size_t size, v`
`1343`	`1349`	`commandDone(console);`
`1344`	`1350`	`}`
`1345`	`1351`
	`1352`	`+static void injectMap(Console* console, const void* buffer, s32 size)`
	`1353`	`+{`
	`1354`	`+ enum {Size = sizeof(tic_map)};`
	`1355`	`+`
	`1356`	`+ SDL_memset(&console->tic->cart.gfx.map, 0, Size);`
	`1357`	`+ SDL_memcpy(&console->tic->cart.gfx.map, buffer, SDL_min(size, Size));`
	`1358`	`+}`
	`1359`	`+`
`1346`	`1360`	`static void onImportMap(const char* name, const void* buffer, size_t size, void* data)`
`1347`	`1361`	`{`
`1348`	`1362`	`Console* console = (Console*)data;`
`1349`	`1363`
`1350`		`- enum {Size = sizeof(tic_map)};`
`1351`		`-`
`1352`		`- if(name && buffer && size == Size)`
	`1364`	`+ if(name && buffer && size <= sizeof(tic_map))`
`1353`	`1365`	`{`
`1354`		`- memcpy(&console->tic->cart.gfx.map, buffer, size);`
	`1366`	`+ injectMap(console, buffer, size);`
`1355`	`1367`
`1356`	`1368`	`printLine(console);`
`1357`	`1369`	`printBack(console, "map successfully imported");`
`@@ -1889,7 +1901,7 @@ static CartSaveResult saveCartName(Console* console, const char* name)`
`1889`	`1901`
`1890`	`1902`	`if(size && fsSaveFile(console->fs, name, buffer, size, true))`
`1891`	`1903`	`{`
`1892`		`- strcpy(console->romName, name);`
	`1904`	`+ setCartName(console, name);`
`1893`	`1905`	`success = true;`
`1894`	`1906`	`studioRomSaved();`
`1895`	`1907`	`}`
`@@ -2627,7 +2639,7 @@ static void cmdLoadCart(Console* console, const char* name)`
`2627`	`2639`	`if(hasProjectExt(name))`
`2628`	`2640`	`{`
`2629`	`2641`	`loadProject(console, name, data, size, &embed.file);`
`2630`		`- strcpy(console->romName, fsFilename(name));`
	`2642`	`+ setCartName(console, fsFilename(name));`
`2631`	`2643`	`embed.yes = true;`
`2632`	`2644`	`embed.fast = true;`
`2633`	`2645`	`}`
`@@ -2637,7 +2649,7 @@ static void cmdLoadCart(Console* console, const char* name)`
`2637`	`2649`	`if(hasExt(name, CART_EXT))`
`2638`	`2650`	`{`
`2639`	`2651`	`loadCart(console->tic, &embed.file, data, size, true);`
`2640`		`- strcpy(console->romName, fsFilename(name));`
	`2652`	`+ setCartName(console, fsFilename(name));`
`2641`	`2653`	`embed.yes = true;`
`2642`	`2654`	`}`
`2643`	`2655`
`@@ -2755,9 +2767,9 @@ static void cmdInjectMap(Console* console, const char* param, const char* name)`
`2755`	`2767`
`2756`	`2768`	`if(map)`
`2757`	`2769`	`{`
`2758`		`- if(size == sizeof(tic_map))`
	`2770`	`+ if(size <= sizeof(tic_map))`
`2759`	`2771`	`{`
`2760`		`- SDL_memcpy(embed.file.gfx.map.data, map, size);`
	`2772`	`+ injectMap(console, map, size);`
`2761`	`2773`
`2762`	`2774`	`embed.yes = true;`
`2763`	`2775`	`embed.fast = true;`
`@@ -2862,6 +2874,8 @@ void initConsole(Console* console, tic_mem* tic, FileSystem* fs, Config* config,`
`2862`	`2874`	`config->data.noSound = true;`
`2863`	`2875`	`else if(strcmp(argv[i], "-surf") == 0)`
`2864`	`2876`	`console->startSurf = true;`
	`2877`	`+ else if(strcmp(argv[i], "-fullscreen") == 0)`
	`2878`	`+ goFullscreen();`
`2865`	`2879`	`}`
`2866`	`2880`	`}`
`2867`	`2881`
Original file line number	Diff line number	Diff line change
`@@ -1352,6 +1352,8 @@ static void drawSpriteToolbar(Sprite* sprite)`
`1352`	`1352`	`{`
`1353`	`1353`	`setCursor(SDL_SYSTEM_CURSOR_HAND);`
`1354`	`1354`
	`1355`	`+ showTooltip("CANVAS ZOOM");`
	`1356`	`+`
`1355`	`1357`	`if(checkMouseDown(&rect, SDL_BUTTON_LEFT))`
`1356`	`1358`	`{`
`1357`	`1359`	`s32 mx = getMouseX() - rect.x;`
Original file line number	Diff line number	Diff line change
`@@ -1371,7 +1371,7 @@ static void processMouse()`
`1371`	`1371`	`}`
`1372`	`1372`	`}`
`1373`	`1373`
`1374`		`-static void onFullscreen()`
	`1374`	`+void goFullscreen()`
`1375`	`1375`	`{`
`1376`	`1376`	`studio.fullscreen = !studio.fullscreen;`
`1377`	`1377`	`SDL_SetWindowFullscreen(studio.window, studio.fullscreen ? SDL_WINDOW_FULLSCREEN_DESKTOP : 0);`
`@@ -1555,12 +1555,12 @@ static bool processShortcuts(SDL_KeyboardEvent* event)`
`1555`	`1555`	`studio.gamepad.backProcessed = true;`
`1556`	`1556`	`return true;`
`1557`	`1557`	`case SDLK_F11:`
`1558`		`- onFullscreen();`
	`1558`	`+ goFullscreen();`
`1559`	`1559`	`return true;`
`1560`	`1560`	`case SDLK_RETURN:`
`1561`	`1561`	`if(mod & KMOD_RALT)`
`1562`	`1562`	`{`
`1563`		`- onFullscreen();`
	`1563`	`+ goFullscreen();`
`1564`	`1564`	`return true;`
`1565`	`1565`	`}`
`1566`	`1566`	`break;`
`@@ -1627,11 +1627,11 @@ static bool processShortcuts(SDL_KeyboardEvent* event)`
`1627`	`1627`	`return true;`
`1628`	`1628`	`}`
`1629`	`1629`	`break;`
`1630`		`- case SDLK_F11: onFullscreen(); return true;`
	`1630`	`+ case SDLK_F11: goFullscreen(); return true;`
`1631`	`1631`	`case SDLK_RETURN:`
`1632`	`1632`	`if(mod & KMOD_RALT)`
`1633`	`1633`	`{`
`1634`		`- onFullscreen();`
	`1634`	`+ goFullscreen();`
`1635`	`1635`	`return true;`
`1636`	`1636`	`}`
`1637`	`1637`	`else if(mod & TIC_MOD_CTRL)`