--- hatari/src/includes/configuration.h	2019/04/01 07:12:40	1.1.1.7
+++ hatari/src/includes/configuration.h	2019/04/01 07:13:07	1.1.1.8
@@ -8,7 +8,6 @@
 #ifndef HATARI_CONFIGURATION_H
 #define HATARI_CONFIGURATION_H
 
-
 /* Logging */
 typedef struct
 {
@@ -68,6 +67,31 @@ typedef struct
 } CNF_KEYBOARD;
 
 
+typedef enum {
+  SHORTCUT_OPTIONS,
+  SHORTCUT_FULLSCREEN,
+  SHORTCUT_MOUSEMODE,
+  SHORTCUT_COLDRESET,
+  SHORTCUT_WARMRESET,
+  SHORTCUT_SCREENSHOT,
+  SHORTCUT_BOSSKEY,
+  SHORTCUT_CURSOREMU,
+  SHORTCUT_MAXSPEED,
+  SHORTCUT_RECANIM,
+  SHORTCUT_RECSOUND,
+  SHORTCUT_SOUND,
+  SHORTCUT_QUIT,
+  SHORTCUT_KEYS,  /* number of shortcuts */
+  SHORTCUT_NONE
+} SHORTCUTKEYIDX;
+
+typedef struct
+{
+  int withModifier[SHORTCUT_KEYS];
+  int withoutModifier[SHORTCUT_KEYS];
+} CNF_SHORTCUT;
+
+
 typedef struct
 {
   int nMemorySize;
@@ -91,9 +115,11 @@ typedef struct
   int nKeyCodeUp, nKeyCodeDown, nKeyCodeLeft, nKeyCodeRight, nKeyCodeFire;
 } JOYSTICK;
 
+#define JOYSTICK_COUNT 6
+
 typedef struct
 {
-  JOYSTICK Joy[6];
+  JOYSTICK Joy[JOYSTICK_COUNT];
 } CNF_JOYSTICKS;
 
 
@@ -183,7 +209,8 @@ typedef enum
 typedef enum
 {
   MACHINE_ST,
-  MACHINE_STE
+  MACHINE_STE,
+  MACHINE_TT
 } MACHINETYPE;
 
 typedef struct
@@ -210,6 +237,7 @@ typedef struct
   CNF_SCREEN Screen;
   CNF_JOYSTICKS Joysticks;
   CNF_KEYBOARD Keyboard;
+  CNF_SHORTCUT Shortcut;
   CNF_SOUND Sound;
   CNF_MEMORY Memory;
   CNF_DISKIMAGE DiskImage;