Fixes #2061 unicode bugs

Two places where full unicode support was failing.
KSP-KOS · Jul 6, 2017 · 1f1b803 · 1f1b803
1 parent ceabc75
commit 1f1b803
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/src/kOS/Persistence/PersistenceExtensions.cs b/src/kOS/Persistence/PersistenceExtensions.cs
@@ -128,7 +128,7 @@ public static ConfigNode ToConfigNode(this HarddiskFile file, string nodeName)
             {
                 if (SafeHouse.Config.UseCompressedPersistence)
                 {
-                    node.AddValue("binary", EncodeBase64(content.String));
+                    node.AddValue("binary", PersistenceUtilities.EncodeBase64(content.Bytes));
                 }
                 else
                 {
@@ -151,9 +151,5 @@ private static FileContent Decode(string input)
             }
         }
 
-        private static string EncodeBase64(string input)
-        {
-            return PersistenceUtilities.EncodeBase64(Encoding.ASCII.GetBytes(input));
-        }
     }
-}
+}
diff --git a/src/kOS/Screen/TermWindow.cs b/src/kOS/Screen/TermWindow.cs
@@ -444,10 +444,14 @@ void ProcessKeyEvents()
             Event e = Event.current;
             if (e.type == EventType.KeyDown)
             {
-                // Unity handles some keys in a particular way
-                // e.g. Keypad7 is mapped to 0xffb7 instead of 0x37
-                var c = (char)(e.character & 0x007f);
-
+                // This ugly hack is here to solve a bug with Unity mapping
+                // Keycodes to Unicode chars incorrectly on its Linux version:
+                char c;
+                if ((e.character & 0xff00) == 0xff00) // Only trigger on Unicode values 0xff00 through 0xffff, to avoid issue #2061
+                    c = (char)(e.character & 0x007f); // When doing this to solve issue #206
+                else
+                    c = e.character;
+
                 // command sequences
                 if (e.keyCode == KeyCode.C && e.control) // Ctrl+C
                 {