From e5872590e081f832a09575c428254657108e21b6 Mon Sep 17 00:00:00 2001
From: Pecusx <Pecus@poczta.fm>
Date: Thu, 6 May 2021 18:18:38 +0200
Subject: [PATCH] First try to new keyboard

---
 libretro/platform.c |  9 +++++----
 libretro/vkbd_def.h | 46 ++++++++++++++++++++++-----------------------
 2 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/libretro/platform.c b/libretro/platform.c
index bf9af63..07f70f2 100644
--- a/libretro/platform.c
+++ b/libretro/platform.c
@@ -492,19 +492,19 @@ int PLATFORM_Keyboard(void)
 		if (Key_Sate[RETROK_z])return AKEY_Z;
 
 		if (Key_Sate[RETROK_1])return AKEY_EXCLAMATION;
-		if (Key_Sate[RETROK_2])return AKEY_AT;
+		if (Key_Sate[RETROK_2])return AKEY_DBLQUOTE;
 		if (Key_Sate[RETROK_3])return AKEY_HASH;
 		if (Key_Sate[RETROK_4])return AKEY_DOLLAR;
 		if (Key_Sate[RETROK_5])return AKEY_PERCENT;
 		if (Key_Sate[RETROK_6])return AKEY_CARET;
 		if (Key_Sate[RETROK_7])return AKEY_AMPERSAND;
-		if (Key_Sate[RETROK_8])return AKEY_ASTERISK;
+		if (Key_Sate[RETROK_8])return AKEY_AT;
 		if (Key_Sate[RETROK_9])return AKEY_PARENLEFT;
 		if (Key_Sate[RETROK_0])return AKEY_PARENRIGHT;
 
 		if (Key_Sate[RETROK_BACKSLASH])return AKEY_BAR;
-		if (Key_Sate[RETROK_COMMA])return AKEY_LESS;
-		if (Key_Sate[RETROK_PERIOD])return AKEY_GREATER;
+		if (Key_Sate[RETROK_COMMA])return AKEY_BRACKETLEFT;
+		if (Key_Sate[RETROK_PERIOD])return AKEY_BRACKETRIGHT;
 		if (Key_Sate[RETROK_MINUS])return AKEY_UNDERSCORE;
 		if (Key_Sate[RETROK_EQUALS])return AKEY_PLUS;
 		if (Key_Sate[RETROK_LEFTBRACKET])return AKEY_BRACKETLEFT; // no curly braces on Atari
@@ -562,6 +562,7 @@ int PLATFORM_Keyboard(void)
 		if (Key_Sate[RETROK_SEMICOLON])return AKEY_SEMICOLON;
 		if (Key_Sate[RETROK_QUOTE])return AKEY_QUOTE;
 		if (Key_Sate[RETROK_SLASH])return AKEY_SLASH;
+		if (Key_Sate[RETROK_ASTERISK])return AKEY_ASTERISK;
 
 	}
 
diff --git a/libretro/vkbd_def.h b/libretro/vkbd_def.h
index d37dec7..18928a8 100644
--- a/libretro/vkbd_def.h
+++ b/libretro/vkbd_def.h
@@ -17,11 +17,12 @@ Mvk MVk[NPLGN*NLIGN*2]={
 	{ " 5" ," %"  ,RETROK_5 },
 	{ " 6" ," &"  ,RETROK_6 },
 	{ " 7" ," \'"  ,RETROK_7 },
-	{ " 8" ," ("  ,RETROK_8 },
-	{ " 9" ," )"  ,RETROK_9 },
-	{ " 0" ," _"  ,RETROK_0 },
-	{ " ^" ,"Pnd"  ,0x30 },
+	{ " 8" ," @"  ,RETROK_8 },
+	{ " 9" ," ("  ,RETROK_9 },
+	{ " 0" ," )"  ,RETROK_0 },
+	{ "Brk" ,"Brk"  ,RETROK_PAUSE },
 
+	{ "Tab" ,"Tab"  ,RETROK_TAB},
 	{ " q" ," Q"  ,RETROK_q}, //10+2
 	{ " w" ," W"  ,RETROK_w},
 	{ " e" ," E"  ,RETROK_e},
@@ -32,9 +33,9 @@ Mvk MVk[NPLGN*NLIGN*2]={
 	{ " i" ," I"  ,RETROK_i},
 	{ " o" ," O"  ,RETROK_o},
 	{ " p" ," P"  ,RETROK_p},
-	{ " @" ," |"  ,RETROK_QUOTEDBL},
-	{ " [" ," ["  ,RETROK_LEFTBRACKET},
+	{ "Ret" ,"Ret"  ,RETROK_RETURN},
 
+	{ "CTRL" ,"CTRL"  ,RETROK_LCTRL},
 	{ " a" ," A"  ,RETROK_a}, //20+4
 	{ " s" ," S"  ,RETROK_s},
 	{ " d" ," D"  ,RETROK_d},
@@ -44,10 +45,10 @@ Mvk MVk[NPLGN*NLIGN*2]={
 	{ " j" ," J"  ,RETROK_j},
 	{ " k" ," K"  ,RETROK_k},	
 	{ " l" ," L"  ,RETROK_l},
-	{ " :" ," *"  ,RETROK_COLON},
-	{ " ;" ," +"  ,RETROK_SEMICOLON},
-	{ " ]" ," ]"  ,RETROK_RIGHTBRACKET},
+	{ " ;" ," :"  ,RETROK_SEMICOLON},
+	{ "Cap" ,"Cap"  ,RETROK_CAPSLOCK},
 
+	{ "SHFT" ,"SHFT"  ,RETROK_LSHIFT},
 	{ " z" ," Z"  ,RETROK_z},//30+6
 	{ " x" ," X"  ,RETROK_x},
 	{ " c" ," C"  ,RETROK_c},
@@ -55,24 +56,23 @@ Mvk MVk[NPLGN*NLIGN*2]={
 	{ " b" ," B"  ,RETROK_b},
 	{ " n" ," N"  ,RETROK_n},
 	{ " m"," M"   ,RETROK_m},
-	{ " ,"," <"   ,RETROK_COMMA},
-	{ " ."," >"   ,RETROK_PERIOD},
+	{ " ,"," ["   ,RETROK_COMMA},
+	{ " ."," ]"   ,RETROK_PERIOD},
 	{ " /" ," ?"  ,RETROK_SLASH},
-	{ " \\"," \\"   ,RETROK_BACKSLASH},
-	{ "SHFT" ,"SHFT"  ,0x25},
+	{ "Inv","Inv"   ,RETROK_LSUPER},
 
 	{ "PG2","PG2" ,-2}, //40+8
-	{ "TAB","TAB" ,RETROK_TAB},
-	{ "CPSL" ,"CPSL"  ,0x86},
-	{ "RET" ,"RET"  ,RETROK_RETURN},
-	{ "DEL" ,"DEL"  ,0x97},
-	{ "CTRL" ,"CTRL"  ,0x27},
-	{ "CLR" ,"CLR" , 0x20},
+	{ "Del" ,"Del"  ,RETROK_DELETE},
+	{ "Spc" ,"Spc",RETROK_SPACE},
+	{ "Clr" ,"Clr" , RETROK_HOME},
+	{ "Ins" ,"Ins"  ,RETROK_INSERT},
+	{ " +" ," \\"  ,RETROK_EQUALS},
+	{ " _" ," -"  ,RETROK_HASH},
+	{ " ="," |" ,RETROK_EQUALS},
+	{ " *" ," ^",  RETROK_ASTERISK},
+	{ " <" ," <"  ,0x86},
+	{ " >" ," >"  ,0x27},
 	{ "Spc" ,"Spc",RETROK_SPACE},
-	{ "= " ,"= "  ,RETROK_EQUALS},
-	{ " *" ," *",  RETROK_ASTERISK},
-	{ "# " ,"# "  ,RETROK_HASH},
-	{ "Ent" ,"Ent",0x06},
 
 
 	{ "ESC" ,"ESC"  ,RETROK_ESCAPE },//50+1°