X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fsdl2%2Fmain.c;h=f9eb159fe7b7342c1ab28cd2fd9a9a9a5ed783c7;hb=9f3ca6bf02300e3dc72e3c2085a8e35aa9242678;hp=1375a29c6a32a9050d427f807d37476153792f3b;hpb=b047ed3a09b3738defa4f0c323dbe698ff6831ce;p=flatwaifu.git diff --git a/src/sdl2/main.c b/src/sdl2/main.c index 1375a29..f9eb159 100644 --- a/src/sdl2/main.c +++ b/src/sdl2/main.c @@ -11,26 +11,87 @@ #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 +#include "args.h" // ARG_parse #include "memory.h" // M_startup #include "game.h" // G_init G_act #include "sound.h" // S_init S_done #include "music.h" // S_initmusic S_updatemusic S_donemusic #include "render.h" // R_init R_draw R_done -#define TITLE_STR "DooM 2D (SDL2)" +#define TITLE_STR "Doom 2D (SDL2)" static Uint32 ticks; 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}, + {"mon", &nomon, Y_SW_OFF}, + {"warp", &_warp, Y_BYTE}, +// {"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}, + {"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) { + const cfg_t *list[] = { arg, R_args() }; + ARG_parse(argc, argv, 2, list); +} + +static void CFG_load (void) { + const cfg_t *list[] = { cfg, R_conf() }; + CFG_read_config("default.cfg", 2, list); + CFG_read_config("doom2d.cfg", 2, list); +} + +static void CFG_save (void) { + const cfg_t *list[] = { cfg, R_conf() }; + CFG_update_config("doom2d.cfg", "doom2d.cfg", 2, list, "generated by doom2d, do not modify"); +} /* --- error.h --- */ @@ -201,6 +262,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); @@ -261,6 +364,14 @@ void Y_repaint (void) { Y_repaint_rect(0, 0, surf->w, surf->h); } +void Y_enable_text_input (void) { + SDL_StartTextInput(); +} + +void Y_disable_text_input (void) { + SDL_StopTextInput(); +} + /* --- main --- */ static int sdl_to_key (int code) { @@ -384,8 +495,25 @@ static void window_event_handler (SDL_WindowEvent *ev) { } } -static void poll_events (void (*h)(int key, int down)) { - int key; +static int utf8_to_wchar (char *x) { + int i = 0; + byte *s = (byte*)x; + if (s[0] < 0x80) { + return s[0]; + } else if (s[0] < 0xE0) { + if (s[0] - 192 >= 0 && s[1] >= 0x80 && s[1] < 0xE0) { + i = (s[0] - 192) * 64 + s[1] - 128; + } + } else if (s[0] < 0xF0) { + if (s[1] >= 0x80 && s[1] < 0xE0 && s[2] >= 0x80 && s[2] < 0xE0) { + i = ((s[0] - 224) * 64 + s[1] - 128) * 64 + s[2] - 128; + } + } + return i; +} + +static void poll_events (void) { + int key, down, uch, ch; SDL_Event ev; while (SDL_PollEvent(&ev)) { switch (ev.type) { @@ -399,10 +527,16 @@ static void poll_events (void (*h)(int key, int down)) { break; case SDL_KEYDOWN: case SDL_KEYUP: + down = ev.type == SDL_KEYDOWN; key = sdl_to_key(ev.key.keysym.scancode); - I_press(key, ev.type == SDL_KEYDOWN); - if (h != NULL) { - (*h)(key, ev.type == SDL_KEYDOWN); + I_press(key, down); + GM_key(key, down); + break; + case SDL_TEXTINPUT: + uch = utf8_to_wchar(ev.text.text); + ch = cp866_utoc(uch); + if (ch >= 0) { + GM_input(ch); } break; } @@ -410,7 +544,7 @@ static void poll_events (void (*h)(int key, int down)) { } static void step (void) { - poll_events(&G_keyf); + poll_events(); S_updatemusic(); Uint32 t = SDL_GetTicks(); if (t - ticks > DELAY) { @@ -422,6 +556,7 @@ static void step (void) { int main (int argc, char **argv) { char *pw; + CFG_args(argc, argv); logo("system: initialize SDL2\n"); if (SDL_Init(SDL_INIT_TIMER | SDL_INIT_VIDEO | SDL_INIT_EVENTS) == -1) { logo("system: failed to init SDL2: %s\n", SDL_GetError()); @@ -449,6 +584,7 @@ int main (int argc, char **argv) { pl2.kp = KEY_E; srand(SDL_GetTicks()); F_startup(); + CFG_load(); #ifndef WIN32 pw = "/usr/share/doom2d-rembo/doom2d.wad"; #else @@ -459,8 +595,6 @@ int main (int argc, char **argv) { } else { F_addwad("doom2d.wad"); } - CFG_args(argc, argv); - CFG_load(); F_initwads(); M_startup(); F_allocres();