More DOS updates:

- adjust log name (logging works without timestamp)
- customize config name and provide config directory
- move keyboard input handling to regular input driver
- remove hardcoded joypad keys (RA defaults work fine)
- extend keyboard map
- adjust RGUI for a better default layout

Author: zoltanvb

file_path_special.h

@@ -105,7 +105,11 @@ RETRO_BEGIN_DECLS
 #define FILE_PATH_BACKGROUND_IMAGE "bg.png"
 #define FILE_PATH_TTF_FONT "font.ttf"
 #define FILE_PATH_RUNTIME_EXTENSION ".lrtl"
+#ifdef DJGPP
+#define FILE_PATH_DEFAULT_EVENT_LOG "retrodos.log"
+#else
 #define FILE_PATH_DEFAULT_EVENT_LOG "retroarch.log"
+#endif
 #define FILE_PATH_EVENT_LOG_EXTENSION ".log"
 #define FILE_PATH_DISK_CONTROL_INDEX_EXTENSION ".ldci"
 #define FILE_PATH_CORE_BACKUP_EXTENSION ".lcbk"

frontend/drivers/platform_dos.c

@@ -26,6 +26,7 @@
 #include "../../command.h"
 #include "../../defaults.h"
 #include "../../paths.h"
+#include "../../file_path_special.h"
 #include "../../verbosity.h"
 
 static enum frontend_fork dos_fork_mode = FRONTEND_FORK_NONE;
@@ -52,8 +53,6 @@ static void frontend_dos_get_env_settings(int *argc, char *argv[],
    char *slash;
    char base_path[PATH_MAX];
 
-   retro_main_log_file_init("retrodos.txt", false);
-
    strlcpy(base_path, argv[0], sizeof(base_path));
    if ((slash = strrchr(base_path, '/')))
       *slash = '\0';
@@ -73,6 +72,8 @@ static void frontend_dos_get_env_settings(int *argc, char *argv[],
 
    fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_MENU_CONFIG], base_path,
          "config", sizeof(g_defaults.dirs[DEFAULT_DIR_MENU_CONFIG]));
+   fill_pathname_join(g_defaults.path_config, g_defaults.dirs[DEFAULT_DIR_MENU_CONFIG],
+         FILE_PATH_MAIN_CONFIG,  sizeof(g_defaults.path_config));
    fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_REMAP],
          g_defaults.dirs[DEFAULT_DIR_MENU_CONFIG],
          "remaps", sizeof(g_defaults.dirs[DEFAULT_DIR_REMAP]));
@@ -107,7 +108,7 @@ static void frontend_dos_get_env_settings(int *argc, char *argv[],
 static void frontend_dos_exec(const char *path, bool should_load_game)
 {
 	char *newargv[]    = { NULL, NULL };
-	size_t _len        = strlen(path);
+	size_t _len        = strlen(path) + 1;
 
 	newargv[0] = (char*)malloc(_len);
 
@@ -140,14 +141,15 @@ static bool frontend_dos_set_fork(enum frontend_fork fork_mode)
          break;
       case FRONTEND_FORK_RESTART:
          dos_fork_mode  = FRONTEND_FORK_CORE;
-
+#ifndef IS_SALAMANDER
          {
             char executable_path[PATH_MAX_LENGTH] = {0};
             fill_pathname_application_path(executable_path,
                   sizeof(executable_path));
             path_set(RARCH_PATH_CORE, executable_path);
          }
          command_event(CMD_EVENT_QUIT, NULL);
+#endif
          break;
       case FRONTEND_FORK_NONE:
       default:

gfx/drivers/vga_gfx.c

@@ -488,6 +488,15 @@ static void vga_gfx_get_poke_interface(void *data,
 void vga_gfx_set_viewport(void *data, unsigned vp_width,
       unsigned vp_height, bool force_full, bool allow_rotate) { }
 
+static void vga_gfx_viewport_info(void *data, struct video_viewport *vp)
+{
+
+   vp->x = vp->y = 0;
+
+   vp->width  = vp->full_width  = VGA_WIDTH;
+   vp->height = vp->full_height = VGA_HEIGHT;
+}
+
 video_driver_t video_vga = {
    vga_gfx_init,
    vga_gfx_frame,
@@ -501,7 +510,7 @@ video_driver_t video_vga = {
    "vga",
    vga_gfx_set_viewport,
    NULL, /* set_rotation */
-   NULL, /* viewport_info */
+   vga_gfx_viewport_info,
    NULL, /* read_viewport */
    NULL, /* read_frame_raw */
 #ifdef HAVE_OVERLAY

input/drivers/dos_input.c

@@ -15,6 +15,11 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <pc.h>
+#include <dos.h>
+#include <go32.h>
+#include <dpmi.h>
+#include <sys/segments.h>
 #include <stdint.h>
 #include <stdlib.h>
 
@@ -26,25 +31,91 @@
 
 #define MAX_KEYS LAST_KEYCODE + 1
 
-/* TODO/FIXME -
- * fix game focus toggle */
+#define END_FUNC(x) static void x##_End() { }
+
+#define LOCK_VAR(x) LockData((void*)&x, sizeof(x))
+#define LOCK_FUNC(x) LockCode(x, (int)x##_End - (int)x)
+
+/* TODO/FIXME - static globals */
+static uint16_t normal_keys[MAX_KEYS];
+static _go32_dpmi_seginfo old_kbd_int;
+static _go32_dpmi_seginfo kbd_int;
+
+static int LockData(void *a, int size)
+{
+   uint32_t baseaddr;
+   if (__dpmi_get_segment_base_address(_my_ds(), &baseaddr) != -1)
+   {
+      __dpmi_meminfo region;
+      region.handle  = 0;
+      region.size    = size;
+      region.address = baseaddr + (uint32_t)a;
+      if (__dpmi_lock_linear_region(&region) != -1)
+         return 0;
+   }
+   return -1;
+}
+
+static int LockCode(void *a, int size)
+{
+   uint32_t baseaddr;
+   if (__dpmi_get_segment_base_address(_my_cs(), &baseaddr) != -1)
+   {
+      __dpmi_meminfo region;
+      region.handle  = 0;
+      region.size    = size;
+      region.address = baseaddr + (uint32_t)a;
+      if (__dpmi_lock_linear_region(&region) != -1)
+         return 0;
+   }
+   return -1;
+}
+
+static void keyb_int(void)
+{
+   unsigned char buffer = normal_keys[LAST_KEYCODE];
+   unsigned char rawcode       = inp(0x60);
+   /* read scancode from keyboard controller */
+   unsigned char make_break    = !(rawcode & 0x80);
+   /* bit 7: 0 = make, 1 = break */
+   int scancode                = rawcode & 0x7F;
+
+   if (buffer == 0xE0)
+   {
+      /* second byte of an extended key */
+      if (scancode < 0x60)
+         normal_keys[scancode | (1 << 8)] = make_break;
+
+      buffer = 0;
+   }
+   else if (buffer >= 0xE1 && buffer <= 0xE2)
+      buffer = 0; /* ignore these extended keys */
+   else if (rawcode >= 0xE0 && rawcode <= 0xE2)
+      buffer = rawcode; /* first byte of an extended key */
+   else if (scancode < 0x60)
+   {
+      normal_keys[scancode] = make_break;
+      buffer = 0;
+   }
+   normal_keys[LAST_KEYCODE] = buffer;
+   outp(0x20, 0x20); /* must send EOI to finish interrupt */
+}
+END_FUNC(keyb_int)
 
-/* First ports are used to keeping track of gamepad states. Last port is used for keyboard state */
 /* TODO/FIXME - static globals */
-static uint16_t dos_key_state[DEFAULT_MAX_PADS+1][MAX_KEYS];
+static uint16_t dos_key_state[MAX_KEYS];
 
-uint16_t *dos_keyboard_state_get(unsigned port)
+uint16_t *dos_keyboard_state_get(void)
 {
-   return dos_key_state[port];
+   return dos_key_state;
 }
 
 static void dos_keyboard_free(void)
 {
-   unsigned i, j;
+   unsigned j;
 
-   for (i = 0; i < DEFAULT_MAX_PADS; i++)
-      for (j = 0; j < MAX_KEYS; j++)
-         dos_key_state[i][j] = 0;
+   for (j = 0; j < MAX_KEYS; j++)
+      dos_key_state[j] = 0;
 }
 
 static int16_t dos_input_state(
@@ -59,7 +130,7 @@ static int16_t dos_input_state(
       unsigned idx,
       unsigned id)
 {
-   if (port <= 0)
+   if (port < MAX_USERS)
    {
       switch (device)
       {
@@ -69,13 +140,11 @@ static int16_t dos_input_state(
                unsigned i;
                int16_t ret = 0;
 
-               for (i = 0; i < RARCH_FIRST_CUSTOM_BIND; i++)
+               for (i = 0; i < RARCH_FIRST_CUSTOM_BIND && !keyboard_mapping_blocked; i++)
                {
-                  if (binds[port][i].valid)
+                  if (binds[port][i].valid && binds[port][i].key && binds[port][i].key < RETROK_LAST)
                   {
-                     if (id < RARCH_BIND_LIST_END)
-                        if (dos_key_state[DOS_KEYBOARD_PORT]
-                              [rarch_keysym_lut[binds[port][i].key]])
+                        if (dos_key_state[rarch_keysym_lut[(enum retro_key)binds[port][i].key]])
                            ret |= (1 << i);
                   }
                }
@@ -85,44 +154,87 @@ static int16_t dos_input_state(
 
             if (binds[port][id].valid)
             {
-               if (
-                     (id < RARCH_BIND_LIST_END
-                      && dos_key_state[DOS_KEYBOARD_PORT]
-                      [rarch_keysym_lut[binds[port][id].key]])
+               if (  (binds[port][id].key && binds[port][id].key < RETROK_LAST)
+                      && (id < RARCH_BIND_LIST_END
+                      && dos_key_state[rarch_keysym_lut[(enum retro_key)binds[port][id].key]])
+                      && (id == RARCH_GAME_FOCUS_TOGGLE || !keyboard_mapping_blocked)
                   )
                   return 1;
             }
             break;
          case RETRO_DEVICE_KEYBOARD:
-            if (id < RARCH_BIND_LIST_END)
-               return (dos_key_state[DOS_KEYBOARD_PORT]
-                     [rarch_keysym_lut[binds[port][id].key]]);
+
+            if (id && id < RETROK_LAST)
+            {
+               unsigned sym = rarch_keysym_lut[(enum retro_key)id] & LAST_KEYCODE;
+               return dos_key_state[sym];
+            }
             break;
       }
    }
 
    return 0;
 }
 
+static void dos_input_poll(void *data)
+{
+   uint32_t key;
+   uint16_t *cur_state = dos_keyboard_state_get();
+
+   for (key = 0; key < LAST_KEYCODE; key++)
+   {
+      if (cur_state[key] != normal_keys[key])
+      {
+         unsigned code = input_keymaps_translate_keysym_to_rk(key);
+         input_keyboard_event(normal_keys[key], code, code, 0, RETRO_DEVICE_KEYBOARD);
+      }
+   }
+   memcpy(cur_state, normal_keys, sizeof(normal_keys));
+}
+
 static void dos_input_free_input(void *data)
 {
    dos_keyboard_free();
+   if (old_kbd_int.pm_offset)
+   {
+      _go32_dpmi_set_protected_mode_interrupt_vector(9, &old_kbd_int);
+      _go32_dpmi_free_iret_wrapper(&kbd_int);
+
+      memset(&old_kbd_int, 0, sizeof(old_kbd_int));
+   }
+
 }
 
 static void* dos_input_init(const char *joypad_driver)
 {
+   _go32_dpmi_get_protected_mode_interrupt_vector(9, &old_kbd_int);
+
+   memset(&kbd_int,    0, sizeof(kbd_int));
+   memset(normal_keys, 0, sizeof(normal_keys));
+
+   LOCK_FUNC(keyb_int);
+   LOCK_VAR(normal_keys);
+
+   kbd_int.pm_selector = _go32_my_cs();
+   kbd_int.pm_offset   = (uint32_t)&keyb_int;
+
+   _go32_dpmi_allocate_iret_wrapper(&kbd_int);
+
+   _go32_dpmi_set_protected_mode_interrupt_vector(9, &kbd_int);
+
    input_keymaps_init_keyboard_lut(rarch_key_map_dos);
    return (void*)-1;
 }
 
 static uint64_t dos_input_get_capabilities(void *data)
 {
-   return UINT64_C(1) << RETRO_DEVICE_JOYPAD;
+   return (1 << RETRO_DEVICE_JOYPAD)
+        | (1 << RETRO_DEVICE_KEYBOARD);
 }
 
 input_driver_t input_dos = {
    dos_input_init,
-   NULL,                         /* poll */
+   dos_input_poll,
    dos_input_state,
    dos_input_free_input,
    NULL,