X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fsdl2%2Fmain.c;h=37b4c26334bfdd97514161b68610c5152d2fb18b;hb=49c7dbd3920be7bb57a9ec39779d9695fbe8f0c5;hp=a6b98d6813f6020130572574a6ea010cc6025694;hpb=7b2f2285593458477b8185e62099d61975faf7d4;p=flatwaifu.git

diff --git a/src/sdl2/main.c b/src/sdl2/main.c
index a6b98d6..37b4c26 100644
--- a/src/sdl2/main.c
+++ b/src/sdl2/main.c
@@ -11,10 +11,13 @@
 #include "system.h"
 #include "input.h"
 
+#include "cp866.h"
+
 #include "my.h" // fexists
 #include "player.h" // pl1 pl2
 #include "menu.h" // G_keyf
 #include "error.h" // logo
+#include "monster.h" // nomon
 
 #include "files.h" // F_startup F_addwad F_initwads F_allocres
 #include "config.h" // CFG_args CFG_load CFG_save
@@ -31,6 +34,88 @@ static int quit = 0;
 static SDL_Window *window;
 static SDL_GLContext context;
 static SDL_Surface *surf;
+static videomode_t vlist;
+
+static const cfg_t arg[] = {
+  {"file", NULL, Y_FILES},
+  {"cheat", &cheat, Y_SW_ON},
+//  {"vga", &shot_vga, Y_SW_ON},
+  {"sndvol", &snd_vol, Y_WORD},
+  {"musvol", &mus_vol, Y_WORD},
+//  {"fullscr", &fullscreen, Y_SW_ON},
+//  {"window", &fullscreen, Y_SW_OFF},
+  {"mon", &nomon, Y_SW_OFF},
+//  {"gamma", &gammaa, Y_DWORD},
+  {"warp", &_warp, Y_BYTE},
+//  {"width", &SCRW, Y_DWORD},
+//  {"height", &SCRH, Y_DWORD},
+//  {"config", NULL, cfg_file, Y_STRING},
+  {NULL, NULL, 0} // end
+};
+
+static const cfg_t cfg[] = {
+//  {"screenshot", &shot_vga, Y_SW_ON},
+  {"sound_volume", &snd_vol, Y_WORD},
+  {"music_volume", &mus_vol, Y_WORD},
+//  {"fullscreen", &fullscreen, Y_SW_ON},
+  {"sky", &w_horiz, Y_SW_ON},
+//  {"gamma", &gammaa, Y_DWORD},
+//  {"screen_width", &SCRW, Y_DWORD},
+//  {"screen_height", &SCRH, Y_DWORD},
+  {"music_random", &music_random, Y_SW_ON},
+  {"music_time", &music_time, Y_DWORD},
+  {"music_fade", &music_fade, Y_DWORD},
+  {"pl1_left", &pl1.kl, Y_KEY},
+  {"pl1_right",&pl1.kr, Y_KEY},
+  {"pl1_up", &pl1.ku, Y_KEY},
+  {"pl1_down", &pl1.kd, Y_KEY},
+  {"pl1_jump", &pl1.kj, Y_KEY},
+  {"pl1_fire", &pl1.kf, Y_KEY},
+  {"pl1_next", &pl1.kwr, Y_KEY},
+  {"pl1_prev", &pl1.kwl, Y_KEY},
+  {"pl1_use", &pl1.kp, Y_KEY},
+  {"pl2_left", &pl2.kl, Y_KEY},
+  {"pl2_right", &pl2.kr, Y_KEY},
+  {"pl2_up", &pl2.ku, Y_KEY},
+  {"pl2_down", &pl2.kd, Y_KEY},
+  {"pl2_jump", &pl2.kj, Y_KEY},
+  {"pl2_fire", &pl2.kf, Y_KEY},
+  {"pl2_next", &pl2.kwr, Y_KEY},
+  {"pl2_prev", &pl2.kwl, Y_KEY},
+  {"pl2_use", &pl2.kp, Y_KEY},
+  {NULL, NULL, 0} // end
+};
+
+static void CFG_args (int argc, char **argv) {
+  int i;
+  for (i = 1; i < argc; i++) {
+    if (argv[i][0] == '-' && argv[i][1] != 0) {
+      if (i + 1 >= argc) {
+        ERR_failinit("CFG_args: not enough arguments for parameter %s\n", argv[i]);
+      } else {
+        if (CFG_update_key(&argv[i][1], argv[i + 1], arg) != 0) {
+          ERR_failinit("CFG_args: unknown parameter %s\n", argv[i]);
+        }
+        i += 1;
+      }
+    } else {
+      ERR_failinit("CFG_args: something wrong here: %s\n", argv[i]);
+    }
+  }
+}
+
+static void CFG_load (void) {
+  CFG_read_config("default.cfg", cfg);
+  CFG_read_config("doom2d.cfg", cfg);
+}
+
+static void CFG_save (void) {
+  const cfg_t *list[] = { &cfg, NULL };
+  CFG_update_config("doom2d.cfg", "doom2d.cfg", 1, list, "generated by doom2d, do not modify");
+  //CFG_update_config("doom2d.cfg", "doom2d.tmp", cfg, "temporary file");
+  //CFG_update_config("doom2d.tmp", "doom2d.cfg", cfg, "generated by doom2d, do not modify");
+  //remove("doom2d.tmp");
+}
 
 /* --- error.h --- */
 
@@ -201,6 +286,48 @@ void Y_unset_videomode (void) {
   }
 }
 
+static void init_videomode_list (void) {
+  int i, j, k;
+  SDL_DisplayMode m;
+  int n = SDL_GetNumDisplayModes(0);
+  if (vlist.modes != NULL) {
+    free(vlist.modes);
+    vlist.modes = NULL;
+    vlist.n = 0;
+  }
+  if (n > 0) {
+    vlist.modes = malloc(n * sizeof(videomode_size_t));
+    if (vlist.modes != NULL) {
+      j = 0;
+      for (i = 0; i < n; i++) {
+        SDL_GetDisplayMode(0, i, &m);
+        k = 0;
+        while (k < j && (m.w != vlist.modes[k].w || m.h != vlist.modes[k].h)) {
+          k++;
+        }
+        if (k >= j) {
+          vlist.modes[j] = (videomode_size_t) {
+            .w = m.w,
+            .h = m.h
+          };
+          j++;
+        }
+      }
+      vlist.n = j;
+    }
+  }
+}
+
+const videomode_t *Y_get_videomode_list_opengl (int fullscreen) {
+  init_videomode_list();
+  return &vlist;
+}
+
+const videomode_t *Y_get_videomode_list_software (int fullscreen) {
+  init_videomode_list();
+  return &vlist;
+}
+
 void Y_set_fullscreen (int yes) {
   if (window != NULL) {
     SDL_SetWindowFullscreen(window, yes ? SDL_WINDOW_FULLSCREEN : 0);
@@ -409,37 +536,6 @@ static int utf8_to_wchar (char *x) {
   return i;
 }
 
-static int wchar_to_cp866 (int uch) {
-  if (uch <= 0x7f) {
-    return uch;
-  } else if (uch >= 0x410 && uch <= 0x43f) {
-    return uch - 0x410 + 0x80;
-  } else if (uch >= 0x440 && uch <= 0x44f) {
-    return uch - 0x440 + 0xe0;
-  } else {
-    switch (uch) {
-      // TODO graphics from 0xb0..0xdf
-      case 0x401: return 0xf0;
-      case 0x451: return 0xf1;
-      case 0x404: return 0xf2;
-      case 0x454: return 0xf3;
-      case 0x407: return 0xf4;
-      case 0x457: return 0xf5;
-      case 0x40e: return 0xf6;
-      case 0x45e: return 0xf7;
-      case 0xb0: return 0xf8;
-      case 0x2219: return 0xf9;
-      case 0xb7: return 0xfa;
-      case 0x221a: return 0xfb;
-      case 0x2116: return 0xfc;
-      case 0xa4: return 0xfd;
-      case 0x25a0: return 0xfe;
-      case 0xa0: return 0xff;
-      default: return 0; // unknown
-    }
-  }
-}
-
 static void poll_events (void) {
   int key, down, uch, ch;
   SDL_Event ev;
@@ -462,8 +558,10 @@ static void poll_events (void) {
         break;
       case SDL_TEXTINPUT:
         uch = utf8_to_wchar(ev.text.text);
-        ch = wchar_to_cp866(uch);
-        GM_input(ch);
+        ch = cp866_utoc(uch);
+        if (ch >= 0) {
+          GM_input(ch);
+        }
         break;
     }
   }