Skip to content

Commit aaa42b0

Browse files
valentinbreizvalentinbreiz
authored
Merge branch 'master' into zarlo/docs/0
2 parents bdc6836 + 4cde93d commit aaa42b0

File tree

9 files changed

+9
-9
lines changed

9 files changed

+9
-9
lines changed

‎source/Cosmos.Debug.Hosts/Bochs.Configuration.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ private void InitializeKeyValues()
3636
//+ "cpu: count=1, ips=4000000, model=bx_generic, reset_on_triple_fault=1, cpuid_limit_winnt=0, ignore_bad_msrs=1, mwait_is_nop=0\n"
3737
+ "cpu: count=1, ips=40000000, model=p4_prescott_celeron_336, reset_on_triple_fault=1, cpuid_limit_winnt=0, ignore_bad_msrs=1, mwait_is_nop=0\n"
3838
+ "print_timestamps: enabled=0\n" + "port_e9_hack: enabled=0\n"
39-
+ "private_colormap: enabled=0\n" + "clock: sync=none, time0=local, rtc_sync=0\n"
39+
+ "private_colormap: enabled=0\n" + "clock: sync=realtime, time0=local, rtc_sync=0\n"
4040
+ "# no cmosimage\n" + "# no loader\n" + "log: -\n" + "logprefix: %t%e%d\n"
4141
+ "debug: action=ignore\n" + "info: action=report\n" + "error: action=report\n"
4242
+ "panic: action=ask\n"

‎source/Cosmos.System2/IO/StdInReader.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ public bool ReadLineCore(bool consumeKeys)
150150
{
151151
readLineSB.Append(current.KeyChar);
152152

153-
Global.Console.Write(encoding.GetBytes(new char[1] { current.KeyChar })[0]);
153+
Global.Console.Write(encoding.GetBytes(new char[] { current.KeyChar }));
154154
Global.Console.UpdateCursorFromCache();
155155
currentCount++;
156156
}

‎source/Cosmos.System2/Keyboard/ScanMaps/DEStandardLayout.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ protected override void InitKeys()
3939
Keys.Add(new KeyMapping(0x0C, 'ß', '?', 'ß', 'ß', '?', 'ß', '\\', ConsoleKeyEx.Minus));
4040
Keys.Add(new KeyMapping(0x0D, '´', '`', '´', '´', '`', '´', ConsoleKeyEx.Equal));
4141
Keys.Add(new KeyMapping(0x0E, ConsoleKeyEx.Backspace));
42-
Keys.Add(new KeyMapping(0x0F, ConsoleKeyEx.Tab));
42+
Keys.Add(new KeyMapping(0x0F, '\t', ConsoleKeyEx.Tab));
4343
/* qwertzuiopü+ QWERTZUIOPÜ* @_€________~ */
4444
Keys.Add(new KeyMapping(0x10, 'q', 'Q', 'q', 'Q', 'q', 'Q', '@', ConsoleKeyEx.Q));
4545
Keys.Add(new KeyMapping(0x11, 'w', 'W', 'w', 'W', 'w', 'W', ConsoleKeyEx.W));

‎source/Cosmos.System2/Keyboard/ScanMaps/ESStandardLayout.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ protected override void InitKeys()
3838
Keys.Add(new KeyMapping(0x0C, '\'', '?', '\'', '-', '?', '?', ConsoleKeyEx.Minus));
3939
Keys.Add(new KeyMapping(0x0D, '¡', '¿', '¡', '¡', '¿', '¿', ConsoleKeyEx.Equal));
4040
Keys.Add(new KeyMapping(0x0E, ConsoleKeyEx.Backspace));
41-
Keys.Add(new KeyMapping(0x0F, ConsoleKeyEx.Tab));
41+
Keys.Add(new KeyMapping(0x0F, '\t', ConsoleKeyEx.Tab));
4242
/* QWERTYUIOP[] */
4343
Keys.Add(new KeyMapping(0x10, 'q', 'Q', 'q', 'Q', 'q', 'Q', ConsoleKeyEx.Q));
4444
Keys.Add(new KeyMapping(0x11, 'w', 'W', 'w', 'W', 'w', 'W', ConsoleKeyEx.W));

‎source/Cosmos.System2/Keyboard/ScanMaps/FRStandardLayout.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ protected override void InitKeys()
3434
Keys.Add(new KeyMapping(0x0C, ')', '°', ')', '°', ')', '°', ConsoleKeyEx.Minus));
3535
Keys.Add(new KeyMapping(0x0D, '=', '+', '=', '+', '=', '+', ConsoleKeyEx.Equal));
3636
Keys.Add(new KeyMapping(0x0E, ConsoleKeyEx.Backspace));
37-
Keys.Add(new KeyMapping(0x0F, ConsoleKeyEx.Tab));
37+
Keys.Add(new KeyMapping(0x0F, '\t', ConsoleKeyEx.Tab));
3838
/* QWERTYUIOP[] */
3939
Keys.Add(new KeyMapping(0x10, 'a', 'A', 'a', 'A', 'a', 'A', ConsoleKeyEx.A));
4040
Keys.Add(new KeyMapping(0x11, 'z', 'Z', 'z', 'Z', 'z', 'Z', ConsoleKeyEx.Z));

‎source/Cosmos.System2/Keyboard/ScanMaps/GBStandardLayout.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ protected override void InitKeys()
4545
Keys.Add(new KeyMapping(0x0C, '-', '_', '-', '-', '_', '-', ConsoleKeyEx.Minus));
4646
Keys.Add(new KeyMapping(0x0D, '=', '+', '=', '=', '+', '=', ConsoleKeyEx.Equal));
4747
Keys.Add(new KeyMapping(0x0E, ConsoleKeyEx.Backspace));
48-
Keys.Add(new KeyMapping(0x0F, ConsoleKeyEx.Tab));
48+
Keys.Add(new KeyMapping(0x0F, '\t', ConsoleKeyEx.Tab));
4949
/* QWERTYUIOP[] */
5050
Keys.Add(new KeyMapping(0x10, 'q', 'Q', 'q', 'Q', 'q', 'Q', ConsoleKeyEx.Q));
5151
Keys.Add(new KeyMapping(0x11, 'w', 'W', 'w', 'W', 'w', 'W', ConsoleKeyEx.W));

‎source/Cosmos.System2/Keyboard/ScanMaps/TRStandardLayout.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ protected override void InitKeys()
5252
Keys.Add(new KeyMapping(0x0C, '*', '?', '*', '*', '?', '*', ConsoleKeyEx.NoName));
5353
Keys.Add(new KeyMapping(0x0D, '-', '_', '-', '-', '_', '-', ConsoleKeyEx.Minus));
5454
Keys.Add(new KeyMapping(0x0E, ConsoleKeyEx.Backspace));
55-
Keys.Add(new KeyMapping(0x0F, ConsoleKeyEx.Tab));
55+
Keys.Add(new KeyMapping(0x0F, '\t', ConsoleKeyEx.Tab));
5656
/* QWERTYUIOP[] */
5757
Keys.Add(new KeyMapping(0x10, 'q', 'Q', 'q', 'Q', 'q', 'Q', ConsoleKeyEx.Q));
5858
Keys.Add(new KeyMapping(0x11, 'w', 'W', 'w', 'W', 'w', 'W', ConsoleKeyEx.W));

‎source/Cosmos.System2/Keyboard/ScanMaps/USDvorakLayout.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ protected override void InitKeys()
4747
//Keys.Add(new KeyMapping(0x0C, '-', '_', '-', '-', '_', '-', ConsoleKeyEx.Minus));
4848
//Keys.Add(new KeyMapping(0x0D, '=', '+', '=', '=', '+', '=', ConsoleKeyEx.Equal));
4949
Keys.Add(new KeyMapping(0x0E, ConsoleKeyEx.Backspace));
50-
Keys.Add(new KeyMapping(0x0F, ConsoleKeyEx.Tab));
50+
Keys.Add(new KeyMapping(0x0F, '\t', ConsoleKeyEx.Tab));
5151
Keys.Add(new KeyMapping(0x10, '\'', '"', '\'', '\'', '"', '"', ConsoleKeyEx.Apostrophe)); //'q', 'Q', 'q', 'Q', 'q', 'Q', ConsoleKeyEx.Q));
5252
Keys.Add(new KeyMapping(0x11, ',', '<', ',', ',', '<', '<', ConsoleKeyEx.Comma)); //'w', 'W', 'w', 'W', 'w', 'W', ConsoleKeyEx.W));
5353
Keys.Add(new KeyMapping(0x12, '.', '>', '.', '.', '>', '>', ConsoleKeyEx.Period)); //'e', 'E', 'e', 'E', 'e', 'E', ConsoleKeyEx.E));

‎source/Cosmos.System2/Keyboard/ScanMaps/USStandardLayout.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ protected override void InitKeys()
3838
Keys.Add(new KeyMapping(0x0C, '-', '_', '-', '-', '_', '-', ConsoleKeyEx.Minus));
3939
Keys.Add(new KeyMapping(0x0D, '=', '+', '=', '=', '+', '=', ConsoleKeyEx.Equal));
4040
Keys.Add(new KeyMapping(0x0E, ConsoleKeyEx.Backspace));
41-
Keys.Add(new KeyMapping(0x0F, ConsoleKeyEx.Tab));
41+
Keys.Add(new KeyMapping(0x0F, '\t', ConsoleKeyEx.Tab));
4242
/* QWERTYUIOP[] */
4343
Keys.Add(new KeyMapping(0x10, 'q', 'Q', 'q', 'Q', 'q', 'Q', ConsoleKeyEx.Q));
4444
Keys.Add(new KeyMapping(0x11, 'w', 'W', 'w', 'W', 'w', 'W', ConsoleKeyEx.W));

0 commit comments

Comments
 (0)