Merge branch 'unicode'

SConscript

@@ -67,6 +67,7 @@ AddSconsOption('static', False, False, "Compile statically.")
 AddSconsOption('opengl', False, False, "Build with OpenGL interface support.")
 AddSconsOption('opengl-renderer', False, False, "Build with OpenGL renderer support (turns on --opengl).") #Note: this has nothing to do with --renderer, only tells the game to render particles with opengl
 AddSconsOption('renderer', False, False, "Build the save renderer.")
+AddSconsOption('font', False, False, "Build the font editor.")
 
 AddSconsOption('wall', False, False, "Error on all warnings.")
 AddSconsOption('no-warnings', False, False, "Disable all compiler warnings.")
@@ -266,7 +267,7 @@ def findLibs(env, conf):
 		else:
 			FatalError("SDL.h not found")
 
-	if not GetOption('nolua') and not GetOption('renderer'):
+	if not GetOption('nolua') and not GetOption('renderer') and not GetOption('font'):
 		#Look for Lua
 		if platform == "FreeBSD":
 			luaver = "lua-5.1"
@@ -494,7 +495,7 @@ if GetOption('static'):
 #Add other flags and defines
 if not GetOption('nofft'):
 	env.Append(CPPDEFINES=['GRAVFFT'])
-if not GetOption('nolua') and not GetOption('renderer'):
+if not GetOption('nolua') and not GetOption('renderer') and not GetOption('font'):
 	env.Append(CPPDEFINES=['LUACONSOLE'])
 
 if GetOption('opengl') or GetOption('opengl-renderer'):
@@ -507,6 +508,9 @@ if GetOption('renderer'):
 else:
 	env.Append(CPPDEFINES=['USE_SDL'])
 
+if GetOption('font'):
+	env.Append(CPPDEFINES=['FONTEDITOR'])
+
 if GetOption("wall"):
 	if msvc:
 		env.Append(CCFLAGS=['/WX'])
@@ -540,7 +544,7 @@ if GetOption('beta'):
 
 #Generate list of sources to compile
 sources = Glob("src/*.cpp") + Glob("src/*/*.cpp") + Glob("src/*/*/*.cpp") + Glob("generated/*.cpp")
-if not GetOption('nolua') and not GetOption('renderer'):
+if not GetOption('nolua') and not GetOption('renderer') and not GetOption('font'):
 	sources += Glob("src/lua/socket/*.c") + Glob("src/lua/LuaCompat.c")
 
 if platform == "Windows":
@@ -559,7 +563,11 @@ elif platform == "Darwin":
 if GetOption('output'):
 	programName = GetOption('output')
 else:
-	programName = GetOption('renderer') and "render" or "powder"
+	programName = "powder"
+	if GetOption('renderer'):
+		programName = "render"
+	if GetOption('font'):
+		programName = "font"
 	if "BIT" in env and env["BIT"] == 64:
 		programName += "64"
 	if isX86 and GetOption('no-sse'):

font/editor.c

@@ -7,7 +7,7 @@
 #include <SDL/SDL.h>
 
 #define CELLW	12
-#define CELLH	10
+#define CELLH	12
 
 #define XRES	800
 #define YRES	600

font/packer.c

@@ -6,7 +6,7 @@
 #include <math.h>
 
 #define CELLW	12
-#define CELLH	10
+#define CELLH	12
 //#define EXTENDED_FONT 1
 
 char font[256][CELLH][CELLW];

font/unpacker.c

@@ -11,7 +11,7 @@
 #include "font.h"
 
 #define CELLW	12
-#define CELLH	10
+#define CELLH	12
 
 char font[256][CELLH][CELLW];
 char width[256];

src/Format.cpp

@@ -1,6 +1,6 @@
 
 #include <ctime>
-#include <string>
+#include "common/String.h"
 #include <stdexcept>
 #include <iostream>
 #include <iterator>
@@ -9,7 +9,7 @@
 #include "Format.h"
 #include "graphics/Graphics.h"
 
-std::string format::URLEncode(std::string source)
+ByteString format::URLEncode(ByteString source)
 {
 	char * src = (char *)source.c_str();
 	char * dst = new char[(source.length()*3)+2];
@@ -33,23 +33,23 @@ std::string format::URLEncode(std::string source)
 	}
 	*d = 0;
 
-	std::string finalString(dst);
+	ByteString finalString(dst);
 	delete[] dst;
 	return finalString;
 }
 
-std::string format::UnixtimeToDate(time_t unixtime, std::string dateFormat)
+ByteString format::UnixtimeToDate(time_t unixtime, ByteString dateFormat)
 {
 	struct tm * timeData;
 	char buffer[128];
 
 	timeData = localtime(&unixtime);
 
 	strftime(buffer, 128, dateFormat.c_str(), timeData);
-	return std::string(buffer);
+	return ByteString(buffer);
 }
 
-std::string format::UnixtimeToDateMini(time_t unixtime)
+ByteString format::UnixtimeToDateMini(time_t unixtime)
 {
 	time_t currentTime = time(NULL);
 	struct tm currentTimeData = *localtime(&currentTime);
@@ -69,7 +69,7 @@ std::string format::UnixtimeToDateMini(time_t unixtime)
 	}
 }
 
-std::string format::CleanString(std::string dirtyString, bool ascii, bool color, bool newlines, bool numeric)
+String format::CleanString(String dirtyString, bool ascii, bool color, bool newlines, bool numeric)
 {
 	for (size_t i = 0; i < dirtyString.size(); i++)
 	{
@@ -226,7 +226,7 @@ struct PNGChunk
 
 	//char[4] CRC();
 
-	PNGChunk(int length, std::string name)
+	PNGChunk(int length, ByteString name)
 	{
 		if (name.length()!=4)
 			throw std::runtime_error("Invalid chunk name");

src/Format.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <sstream>
+#include "common/String.h"
 #include <vector>
 
 class VideoBuffer;
@@ -9,24 +9,10 @@ namespace format
 {
 	const static char hex[] = "0123456789ABCDEF";
 
-	template <typename T> std::string NumberToString(T number)
-	{
-		std::stringstream ss;
-		ss << number;
-		return ss.str();
-	}
-
-	template <typename T> T StringToNumber(const std::string & text)
-	{
-		std::stringstream ss(text);
-		T number;
-		return (ss >> number)?number:0;
-	}
-
-	std::string URLEncode(std::string value);
-	std::string UnixtimeToDate(time_t unixtime, std::string dateFomat = "%d %b %Y");
-	std::string UnixtimeToDateMini(time_t unixtime);
-	std::string CleanString(std::string dirtyString, bool ascii, bool color, bool newlines, bool numeric = false);
+	ByteString URLEncode(ByteString value);
+	ByteString UnixtimeToDate(time_t unixtime, ByteString dateFomat = "%d %b %Y");
+	ByteString UnixtimeToDateMini(time_t unixtime);
+	String CleanString(String dirtyString, bool ascii, bool color, bool newlines, bool numeric = false);
 	std::vector<char> VideoBufferToPNG(const VideoBuffer & vidBuf);
 	std::vector<char> VideoBufferToBMP(const VideoBuffer & vidBuf);
 	std::vector<char> VideoBufferToPPM(const VideoBuffer & vidBuf);

src/Misc.h

@@ -2,8 +2,6 @@
 #define UTILS_H
 #include <cstdio>
 #include <cstdlib>
-#include <string>
-#include <sstream>
 #include <vector>
 
 //Linear interpolation

src/Platform.cpp

@@ -20,9 +20,9 @@
 namespace Platform
 {
 
-std::string ExecutableName()
+ByteString ExecutableName()
 {
-	std::string ret;
+	ByteString ret;
 #if defined(WIN)
 	char *name = (char *)malloc(64);
 	DWORD max = 64, res;
@@ -73,7 +73,7 @@ std::string ExecutableName()
 
 void DoRestart()
 {
-	std::string exename = ExecutableName();
+	ByteString exename = ExecutableName();
 	if (exename.length())
 	{
 #ifdef WIN
@@ -85,7 +85,7 @@ void DoRestart()
 	exit(-1);
 }
 
-void OpenURI(std::string uri)
+void OpenURI(ByteString uri)
 {
 #if defined(WIN)
 	ShellExecute(0, "OPEN", uri.c_str(), NULL, NULL, 0);

src/Platform.h

@@ -1,14 +1,14 @@
 #ifndef PLATFORM_H
 #define PLATFORM_H
 
-#include <string>
+#include "common/String.h"
 
 namespace Platform
 {
-	std::string ExecutableName();
+	ByteString ExecutableName();
 	void DoRestart();
 
-	void OpenURI(std::string uri);
+	void OpenURI(ByteString uri);
 
 	void Millisleep(long int t);
 	long unsigned int GetTime();

src/PowderToy.h

@@ -1,9 +1,8 @@
 #pragma once
-#include <string>
 
 void EngineProcess();
-void ClipboardPush(std::string text);
-std::string ClipboardPull();
+void ClipboardPush(ByteString text);
+ByteString ClipboardPull();
 int GetModifiers();
 bool LoadWindowPosition(int scale);
 void SetCursorEnabled(int enabled);

src/PowderToyRenderer.cpp

@@ -2,11 +2,10 @@
 
 #include <ctime>
 #include <iostream>
-#include <sstream>
-#include <string>
 #include <fstream>
 #include <vector>
 
+#include "common/String.h"
 #include "Config.h"
 #include "Format.h"
 #include "gui/interface/Engine.h"
@@ -18,16 +17,16 @@
 
 
 void EngineProcess() {}
-void ClipboardPush(std::string) {}
-std::string ClipboardPull() { return ""; }
+void ClipboardPush(ByteString) {}
+ByteString ClipboardPull() { return ""; }
 int GetModifiers() { return 0; }
 void SetCursorEnabled(int enabled) {}
 unsigned int GetTicks() { return 0; }
 
-void readFile(std::string filename, std::vector<char> & storage)
+void readFile(ByteString filename, std::vector<char> & storage)
 {
 	std::ifstream fileStream;
-	fileStream.open(std::string(filename).c_str(), std::ios::binary);
+	fileStream.open(filename.c_str(), std::ios::binary);
 	if(fileStream.is_open())
 	{
 		fileStream.seekg(0, std::ios::end);
@@ -45,10 +44,10 @@ void readFile(std::string filename, std::vector<char> & storage)
 	}
 }
 
-void writeFile(std::string filename, std::vector<char> & fileData)
+void writeFile(ByteString filename, std::vector<char> & fileData)
 {
 	std::ofstream fileStream;
-	fileStream.open(std::string(filename).c_str(), std::ios::binary);
+	fileStream.open(filename.c_str(), std::ios::binary);
 	if(fileStream.is_open())
 	{
 		fileStream.write(&fileData[0], fileData.size());
@@ -59,13 +58,13 @@ void writeFile(std::string filename, std::vector<char> & fileData)
 int main(int argc, char *argv[])
 {
 	ui::Engine * engine;
-	std::string outputPrefix, inputFilename;
+	ByteString outputPrefix, inputFilename;
 	std::vector<char> inputFile;
-	std::string ppmFilename, ptiFilename, ptiSmallFilename, pngFilename, pngSmallFilename;
+	ByteString ppmFilename, ptiFilename, ptiSmallFilename, pngFilename, pngSmallFilename;
 	std::vector<char> ppmFile, ptiFile, ptiSmallFile, pngFile, pngSmallFile;
 
-	inputFilename = std::string(argv[1]);
-	outputPrefix = std::string(argv[2]);
+	inputFilename = argv[1];
+	outputPrefix = argv[2];
 
 	ppmFilename = outputPrefix+".ppm";
 	ptiFilename = outputPrefix+".pti";
@@ -88,7 +87,7 @@ int main(int argc, char *argv[])
 	catch (ParseException e)
 	{
 		//Render the save again later or something? I don't know
-		if (e.what() == "Save from newer version")
+		if (ByteString(e.what()).FromUtf8() == "Save from newer version")
 			throw e;
 	}