Applied patches from bug report #1276480, "GUI: Accented characters". This

changes quite a lot of things in the font renderer and the convbdf tools, so
there may be regressions, but we want this feature for 0.9.0.

svn-id: r23208

6 files changed, 21 insertions, 21 deletions

diff --git a/gui/console.cpp b/gui/console.cpp
index 33e9679dcb..cab49cccd9 100644
--- a/gui/console.cpp
+++ b/gui/console.cpp
@@ -408,11 +408,11 @@ void ConsoleDialog::handleKeyDown(uint16 ascii, int keycode, int modifiers) {
 			slideUpAndClose();
 		} else if (modifiers == OSystem::KBD_CTRL) {
 			specialKeys(keycode);
-		} else if (isprint((char)ascii)) {
+		} else if ((ascii >= 32 && ascii <= 127) || (ascii >= 160 && ascii <= 255)) {
 			for (i = _promptEndPos - 1; i >= _currentPos; i--)
 				buffer(i + 1) = buffer(i);
 			_promptEndPos++;
-			putchar((char)ascii);
+			putchar((byte)ascii);
 			scrollToCurrent();
 		}
 	}
diff --git a/gui/credits.h b/gui/credits.h
index dadddce0a2..0aee4e89cf 100644
--- a/gui/credits.h
+++ b/gui/credits.h
@@ -9,7 +9,7 @@ static const char *credits[] = {
 "\\C\\c0""",
 "\\C\\c1""Engine Teams",
 "\\C\\c1""SCUMM",
-"\\C\\c0""Torbjorn Andersson",
+"\\C\\c0""Torbj\366rn Andersson",
 "\\C\\c0""James Brown",
 "\\C\\c0""Jonathan Gray",
 "\\C\\c0""Max Horn",
@@ -30,15 +30,15 @@ static const char *credits[] = {
 "\\C\\c0""Eugene Sandulenko",
 "\\C\\c0""",
 "\\C\\c1""BASS",
-"\\C\\c0""Robert Goeffringmann",
+"\\C\\c0""Robert G\366ffringmann",
 "\\C\\c0""Oliver Kiehl",
 "\\C\\c0""Joost Peters",
 "\\C\\c0""",
 "\\C\\c1""Broken Sword 1",
-"\\C\\c0""Robert Goeffringmann",
+"\\C\\c0""Robert G\366ffringmann",
 "\\C\\c0""",
 "\\C\\c1""Broken Sword 2",
-"\\C\\c0""Torbjorn Andersson",
+"\\C\\c0""Torbj\366rn Andersson",
 "\\C\\c0""Jonathan Gray",
 "\\C\\c0""",
 "\\C\\c1""Cinematique evo 1",
@@ -52,7 +52,7 @@ static const char *credits[] = {
 "\\C\\c0""Joost Peters",
 "\\C\\c0""",
 "\\C\\c1""Gob",
-"\\C\\c0""Torbjorn Andersson",
+"\\C\\c0""Torbj\366rn Andersson",
 "\\C\\c0""Sven Hesse",
 "\\C\\c0""Willem Jan Palenstijn",
 "\\C\\c0""Eugene Sandulenko",
@@ -63,7 +63,7 @@ static const char *credits[] = {
 "\\C\\c0""Johannes Schickel",
 "\\C\\c0""",
 "\\C\\c1""SAGA",
-"\\C\\c0""Torbjorn Andersson",
+"\\C\\c0""Torbj\366rn Andersson",
 "\\C\\c0""Andrew Kurushin",
 "\\C\\c0""Eugene Sandulenko",
 "\\C\\c0""",
@@ -88,7 +88,7 @@ static const char *credits[] = {
 "\\C\\c0""Kostas Nakos",
 "\\C\\c0""",
 "\\C\\c1""PlayStation 2",
-"\\C\\c0""Robert Goeffringmann",
+"\\C\\c0""Robert G\366ffringmann",
 "\\C\\c0""",
 "\\C\\c1""PSP (PlayStation Portable)",
 "\\C\\c0""Joost Peters",
@@ -153,8 +153,8 @@ static const char *credits[] = {
 "\\C\\c0""",
 "\\C\\c1""Packages",
 "\\C\\c1""AmigaOS 4",
-"\\C\\c0""Hans-Jorg Frieden",
-"\\C\\c0""Juha Niemimaki",
+"\\C\\c0""Hans-J\366rg Frieden",
+"\\C\\c0""Juha Niemim\344ki",
 "\\C\\c0""",
 "\\C\\c1""BeOS",
 "\\C\\c0""Stefan Parviainen",
@@ -185,7 +185,7 @@ static const char *credits[] = {
 "\\C\\c0""",
 "\\C\\c0""",
 "\\C\\c1""Websites (design)",
-"\\C\\c0""Dobo Balazs",
+"\\C\\c0""Dob\363 Bal\341zs",
 "\\C\\c2""Website design",
 "\\C\\c0""Yaroslav Fedevych",
 "\\C\\c2""HTML/CSS for the website",
@@ -209,7 +209,7 @@ static const char *credits[] = {
 "\\C\\c2""Encoder for DXA videos",
 "\\C\\c0""Janne Huttunen",
 "\\C\\c2""V3 actor mask support, Dig/FT SMUSH audio",
-"\\C\\c0""Kovacs Endre Janos",
+"\\C\\c0""Kov\341cs Endre J\341nos",
 "\\C\\c2""Several fixes for Simon1",
 "\\C\\c0""Jeroen Janssen",
 "\\C\\c2""Numerous readability and bugfix patches",
@@ -225,13 +225,13 @@ static const char *credits[] = {
 "\\C\\c2""Config file and ALSA support",
 "\\C\\c0""Quietust",
 "\\C\\c2""Sound support for Amiga SCUMM V2/V3 games, MM NES support",
-"\\C\\c0""Andreas Roever",
+"\\C\\c0""Andreas R\366ver",
 "\\C\\c2""Broken Sword 1/2 MPEG2 cutscene support",
 "\\C\\c0""Edward Rudd",
 "\\C\\c2""Fixes for playing MP3 versions of MI1/Loom audio",
 "\\C\\c0""Daniel Schepler",
 "\\C\\c2""Final MI1 CD music support, initial Ogg Vorbis support",
-"\\C\\c0""Andre Souza",
+"\\C\\c0""Andr\351 Souza",
 "\\C\\c2""SDL-based OpenGL renderer",
 "\\C\\c0""Tim ???",
 "\\C\\c2""Initial MI1 CD music support",
@@ -259,7 +259,7 @@ static const char *credits[] = {
 "\\C\\c2""For deep tech details about C64 Zak & MM",
 "\\C\\c0""Sarien Team",
 "\\C\\c2""Original AGI engine code",
-"\\C\\c0""Jimmi Thogersen",
+"\\C\\c0""Jimmi Th\370gersen",
 "\\C\\c2""For ScummRev, and much obscure code/documentation",
 "\\C\\c0""Tristan",
 "\\C\\c2""For additional work on the original MT-32 emulator",
diff --git a/gui/editable.cpp b/gui/editable.cpp
index 6e845802b3..ce4bf6401c 100644
--- a/gui/editable.cpp
+++ b/gui/editable.cpp
@@ -61,8 +61,8 @@ void EditableWidget::setEditString(const String &str) {
 		_editScrollOffset = 0;
 }
 
-bool EditableWidget::tryInsertChar(char c, int pos) {
-	if (isprint(c)) {
+bool EditableWidget::tryInsertChar(byte c, int pos) {
+	if ((c >= 32 && c <= 127) || (c >= 160 && c <= 255)) {
 		_editString.insertChar(c, pos);
 		return true;
 	}
@@ -133,7 +133,7 @@ bool EditableWidget::handleKeyDown(uint16 ascii, int keycode, int modifiers) {
 		forcecaret = true;
 		break;
 	default:
-		if (tryInsertChar((char)ascii, _caretPos)) {
+		if (tryInsertChar((byte)ascii, _caretPos)) {
 			_caretPos++;
 			dirty = true;
 			forcecaret = true;
diff --git a/gui/editable.h b/gui/editable.h
index 6e0475559f..4c6def3731 100644
--- a/gui/editable.h
+++ b/gui/editable.h
@@ -76,7 +76,7 @@ protected:
 
 	void setFontStyle(Theme::FontStyle font) { _font = font; }
 
-	virtual bool tryInsertChar(char c, int pos);
+	virtual bool tryInsertChar(byte c, int pos);
 };
 
 } // End of namespace GUI
diff --git a/gui/launcher.cpp b/gui/launcher.cpp
index 15fe879bca..7f8af551ee 100644
--- a/gui/launcher.cpp
+++ b/gui/launcher.cpp
@@ -86,7 +86,7 @@ public:
 	}
 
 protected:
-	bool tryInsertChar(char c, int pos) {
+	bool tryInsertChar(byte c, int pos) {
 		if (isalnum(c) || c == '-' || c == '_') {
 			_editString.insertChar(c, pos);
 			return true;
diff --git a/gui/themes/modern.zip b/gui/themes/modern.zip
index ca783aefca..739c6d23ac 100644
--- a/gui/themes/modern.zip
+++ b/gui/themes/modern.zip