--- hatari/src/includes/shortcut.h	2019/04/01 07:11:33	1.1.1.3
+++ hatari/src/includes/shortcut.h	2019/04/09 08:53:17	1.1.1.6
@@ -1,18 +1,15 @@
 /*
   Hatari - shortcut.h
 
-  This file is distributed under the GNU Public License, version 2 or at
-  your option any later version. Read the file gpl.txt for details.
+  This file is distributed under the GNU General Public License, version 2
+  or at your option any later version. Read the file gpl.txt for details.
 */
 
-
-typedef struct
-{
-  unsigned short Key;
-  BOOL bShiftPressed;
-  BOOL bCtrlPressed;
-} SHORTCUT_KEY;
-
-extern SHORTCUT_KEY ShortCutKey;
-
-extern void ShortCut_CheckKeys(void);
+/* If pressed short-cut key modifier or standalone short-cut key,
+ * retain keypress until safe to execute (start of VBL). Returns zero
+ * if key wasn't a shortcut */
+extern int ShortCut_CheckKeys(int modkey, int symkey, bool press);
+/* Invoke shortcut identified by name */
+extern bool Shortcut_Invoke(const char *shortcut);
+/* Act on the stored keypress (in VBL) */
+extern void ShortCut_ActKey(void);