font setting fix and some errors text updated

Author: awkitsune

.vscode/c_cpp_properties.json

@@ -6,7 +6,7 @@
                 "${workspaceFolder}/**",
                 "C:/devkitPro/libnds/include/**",
                 "C:/devkitPro/devkitARM/arm-none-eabi/include/**",
-                "${workspaceFolder}/include"
+                "${workspaceFolder}/include/**"
             ],
             "defines": [
                 "ARM9",
@@ -15,7 +15,8 @@
             "compilerPath": "/usr/bin/g++",
             "cStandard": "c11",
             "cppStandard": "c++17",
-            "intelliSenseMode": "${default}"
+            "intelliSenseMode": "${default}",
+            "configurationProvider": "ms-vscode.makefile-tools"
         }
     ],
     "version": 4

.vscode/settings.json

@@ -3,6 +3,24 @@
         "fstream": "cpp",
         "xstring": "cpp",
         "vector": "cpp",
-        "utility": "cpp"
+        "utility": "cpp",
+        "xtree": "cpp",
+        "set": "cpp",
+        "functional": "cpp",
+        "random": "cpp",
+        "xlocale": "cpp",
+        "xlocnum": "cpp",
+        "xloctime": "cpp",
+        "istream": "cpp",
+        "array": "cpp",
+        "deque": "cpp",
+        "initializer_list": "cpp",
+        "list": "cpp",
+        "queue": "cpp",
+        "ranges": "cpp",
+        "span": "cpp",
+        "type_traits": "cpp",
+        "xhash": "cpp",
+        "xutility": "cpp"
     }
 }

arm9/source/book.cpp

@@ -411,8 +411,6 @@ void Book :: loadMarks()
 
 string fileReq(const string& path)
 {
-	char fname[MAXNAMLEN];
-	
 	DIR* dir = opendir(path.c_str());
 	struct dirent* ent;
 	if(!dir) bsod(("book.filereq: cannot open "  + path).c_str());

arm9/source/epub.cpp

@@ -18,7 +18,7 @@ u32 loadFromZip(unzFile& zip, const char* file, char *&buf)
 			if(buf == NULL) bsod("Out of memory");
 			unzReadCurrentFile(zip, buf, info.uncompressed_size);
 			unzCloseCurrentFile(zip);
-		} else bsod("Can't open epub. (3)");
+		} else bsod("epub.loadFromZip:Can't open epub. (3)");
 	} else bsod("Can't open epub. (2)");
 	return info.uncompressed_size;
 }
@@ -29,10 +29,10 @@ void epub_book :: parse()
 	{
 		encoding = eUtf8;
 		pugi::xml_document doc;
-		const char err[] = "Can't load epub. (1)";
+		const char err[] = "epub_book::parse:Can't load epub. (1)";
 		char *buf = NULL;
 		unzFile hArchiveFile = unzOpen(bookFile.c_str());
-		if (hArchiveFile == NULL) bsod("Can't open epub.");
+		if (hArchiveFile == NULL) bsod("epub_book::parse:Can't open epub.");
 
 		loadFromZip(hArchiveFile, "META-INF/container.xml", buf);
 		pugi::xml_parse_result result = doc.load(buf);
@@ -68,9 +68,9 @@ void epub_book :: parse()
 		renderer::clearScreens(0);
 		for(u32 i = 0; i < chapter_files.size(); i++) {
 			consoleClear();
-			iprintf("unpacking %d/%d\n", i+1, chapter_files.size());
+			iprintf("unpacking %lu/%d\n", i+1, chapter_files.size());
 			u32 size = loadFromZip(hArchiveFile, (chapter_path + chapter_files[i]).c_str(), buf);
-			if(offsets.back() + size > giant_buf_size - 1u) bsod("book buffer exhausted");
+			if(offsets.back() + size > giant_buf_size - 1u) bsod("epub_book::parse:book buffer exhausted");
 			memcpy(giant_buffer + offsets[i], buf, size);
 			offsets.push_back(offsets.back() + size);
 			delete[] buf;
@@ -81,7 +81,7 @@ void epub_book :: parse()
 	iprintf("parsing...\n");
 	pugi::xml_parse_result result = document.load_buffer_inplace(giant_buffer, offsets.back());
 	if(result.status != pugi::status_ok) {
-		if(result.status == pugi::status_out_of_memory) bsod("Out of memory.");
+		if(result.status == pugi::status_out_of_memory) bsod("epub_book::parse:Out of memory.");
 		//else bsod("Parser error (bad format).");
 	}
 	parse_doc(document);

arm9/source/fb2.cpp

@@ -3,7 +3,7 @@
 #include <algorithm>
 #include "renderer.h"
 
-const char giant_buf_err[] = "Exhausted book buffer.";
+const char giant_buf_err[] = "fb2.bufferFb2:Exhausted book buffer.";
 
 u32 bufferFb2(const char* file)
 {
@@ -30,7 +30,7 @@ u32 bufferFb2(const char* file)
 u32 fb2_loadToGiantBuffer(const char* filename)
 {
 	FILE* File = fopen(filename, "rb"); 
-	if(File == NULL) bsod("Can't load file.");
+	if(File == NULL) bsod("fb2.fb2_loadToGiantBuffer:Can't load file.");
 	fseek(File, 0 , SEEK_END);
 	int size = ftell (File);
 	rewind(File);
@@ -39,7 +39,7 @@ u32 fb2_loadToGiantBuffer(const char* filename)
 		return bufferFb2(filename);
 	}
 	int read = fread(giant_buffer, 1, size, File);
-	if(read < size) bsod("Error reading file.");
+	if(read < size) bsod("fb2.fb2_loadToGiantBuffer:Error reading file.");
 	fclose(File);
 	return size;
 }
@@ -49,8 +49,8 @@ void fb2_book :: parse()
 	u32 size = fb2_loadToGiantBuffer(bookFile.c_str());
 	pugi::xml_parse_result result = doc.load_buffer_inplace(giant_buffer, size, pugi::parse_default | pugi::parse_declaration);
 	if(result.status != pugi::status_ok) {
-		if(result.status == pugi::status_out_of_memory) bsod("Out of memory.");
-		else bsod("Parser error (bad format).");
+		if(result.status == pugi::status_out_of_memory) bsod("fb2.fb2_book:Out of memory.");
+		else bsod("fb2.fb2_book:Parser error (bad format).");
 	}
 	push_it = true;
 	string enc = doc.first_child().attribute("encoding").value();

arm9/source/file_browser.cpp

@@ -22,11 +22,10 @@ void file_browser :: cd()
 {
 	pos = 0;
 	flist.clear();
-	char fname[MAXNAMLEN];
 
 	DIR* dir = opendir(path.c_str());
 	struct dirent* ent;
-	if(!dir) bsod(("file_browser.cd: cannot open "  + path).c_str());
+	if(!dir) bsod(("file_browser.cd:cannot open "  + path).c_str());
 
 	if(path != "/") flist.push_back(entry(folder, ".."));
 
@@ -77,7 +76,7 @@ string file_browser :: run()
 	string start_path = settings::recent_book.substr(0, settings::recent_book.find_last_of('/')) + '/';
 
 	DIR* dir = opendir(path.c_str());
-	if(!dir) bsod(("file_browser.run(): cannot open "  + path).c_str());
+	if(!dir) bsod(("file_browser.run:cannot open "  + path).c_str());
 
 	if(dir == NULL || settings::recent_book.empty()) {
 		start_path = "/books/";

arm9/source/main.cpp

@@ -31,7 +31,7 @@ void drawMenu()
 	menu.push(SAY(light), 3);
 	renderer::clearScreens(settings::bgCol);
 	menu.draw();
-	renderer::printStr(eUtf8, top_scr,5,17,"IkuReader 0.065",0,0,12);
+	renderer::printStr(eUtf8, top_scr,5,17,"IkuReader 6.5_modern",0,0,12);
 	powerOn(PM_BACKLIGHT_BOTTOM | PM_BACKLIGHT_TOP);
 }
 
@@ -60,7 +60,7 @@ int main(int argc, char *argv[])
 	settings::binname = binname;
 
 	iprintf("loading file system... ");
-	if (!fatInitDefault()) bsod("main: error\n\ntried DLDI patch?");
+	if (!fatInitDefault()) bsod("main:error\n\ntried DLDI patch?");
 	consoleClear();
 	DIR* dir = opendir("/data/ikureader/");
 	if(!dir) bsod("main: \nFolder data/ikureader not found.\nCopy it to the root of your\nflash card from the installation package.");

arm9/source/renderer.cpp

@@ -3,8 +3,6 @@
 #include "encoding_tables.h"
 #include <algorithm>
 #include <time.h>
-#include <sys/dir.h>
-#include <sys/unistd.h>
 #include <set>
 
 #include <nds.h>
@@ -195,7 +193,7 @@ FT_Error ftcFaceRequester(FTC_FaceID faceID, FT_Library lib, FT_Pointer reqData,
 	else file = p + *st;
 
 	FT_Error ft_err = FT_New_Face (ft_lib, file.c_str(), 0, aface); 
-	if(ft_err) bsod("Can't load font.");
+	if(ft_err) bsod("renderer.ftcFaceRequester:Can't load font.");
 	FT_Select_Charmap(face, FT_ENCODING_UNICODE);
 	return ft_err;
 }
@@ -213,7 +211,7 @@ void initFonts()
 		FT_Library_SetLcdFilter(ft_lib, FT_LCD_FILTER_DEFAULT) ||
 		FTC_Manager_New(ft_lib, 3, 0, 0, ftcFaceRequester, 0, &ftcManager) ||
 		FTC_SBitCache_New(ftcManager, &ftcSBitCache)
-	) bsod("Freetype error.");
+	) bsod("renderer.init_fonts:Freetype error.");
 	FTC_Manager_LookupFace(ftcManager, &settings::font, &face);
 	FTC_Manager_LookupFace(ftcManager, &settings::font_bold, &faceB);
 	FTC_Manager_LookupFace(ftcManager, &settings::font_italic, &faceI);
@@ -383,21 +381,20 @@ void printClock(scr_id scr, bool forced)
 
 void changeFont()
 {
-	char fname[MAXNAMLEN];
 	DIR* dir = opendir ("/data/ikureader/fonts/");
-	if (dir == NULL) bsod("Cannot open fonts directory.");
+	if (dir == NULL) bsod("renderer.change_font:Cannot open fonts directory.");
 	struct dirent* ent;
 	std::set<string> files;
 	while ((ent = readdir(dir)) != NULL)
-		if (ent->d_type != DT_DIR) if(extention(fname) == "ttf") files.insert(noExt(fname));
+		if (ent->d_type != DT_DIR) if(extention(ent->d_name) == "ttf") files.insert(noExt(ent->d_name));
 	closedir(dir);
 	std::set<string> fonts;
 
 	for (std::set<string>::iterator it = files.begin(); it != files.end(); ++it)
 		if(files.find(*it + 'b') != files.end() && files.find(*it + 'i') != files.end())
 			fonts.insert(*it);
 
-	if(fonts.empty()) bsod("No fonts found.");
+	if(fonts.empty()) bsod("renderer.change_font:No fonts found.");
 
 	std::set<string>::iterator current = ++fonts.find(noExt(settings::font));
 	if(current == fonts.end()) current = fonts.begin();
@@ -408,6 +405,7 @@ void changeFont()
 	FTC_Manager_Done(ftcManager);
 	FT_Done_FreeType(ft_lib);
 	initFonts();
+	save();
 }
 
 void TFlashClock :: show(scr_id scr)

arm9/source/settings.cpp

@@ -90,8 +90,8 @@ void load()
 	}
 
 	if(end.compare("end") || !techCorrect) {  //bad settings file
-		iprintf("Warning: Can't read settings. Try using different firmware/loader.\n");
-		iprintf("Press A to load defaults.\n");
+		iprintf("settings.load:Warning: Can't read settings. Try using different firmware/loader.\n");
+		iprintf("settings.load:Press A to load defaults.\n");
 		while(!(keysDown() & KEY_A)) {scanKeys();}
 		reset();
 		save();
@@ -104,7 +104,7 @@ void save()
 	std::ofstream os;
 	os.open(SETTFILE, std::ios::binary);
 	os.seekp(0 , std::ios::beg);
-	if(!os.good() || !os.is_open()) bsod("Can't save settigns.");
+	if(!os.good() || !os.is_open()) bsod("settings.save:Can't save settings.");
 	settStruct st;
 	os.write((char*)&st, sizeof(settStruct));
 	os<<font		<<'\n'<<

arm9/source/txt.cpp

@@ -4,7 +4,7 @@
 void txt_book :: parse()
 {
 	file_stream.open (bookFile.c_str(), std::fstream::binary);
-	if(!file_stream.good()) bsod("Can't open book");
+	if(!file_stream.good()) bsod("txt.txt_book:Can't open book");
 	const u8 Bom[] = "\xEF\xBB\xBF";
 	char beginning[3];
 	file_stream.read(beginning, 3);