diff --git a/src/sdl/main.c b/src/sdl/main.c
index b3627fc2f92ef66cb54a83e39e228d16380aaac9..4f529db45c1667da9e7b40e0c3b1e41444174cd2 100644 (file)
--- a/src/sdl/main.c
+++ b/src/sdl/main.c
#include <stdio.h>
#include <stdarg.h>
#include <stdlib.h> // srand exit
-#include <string.h> // strcasecmp
#include <assert.h>
#include "system.h"
#include "input.h"
static int quit = 0;
static SDL_Surface *surf = NULL;
static int mode = MODE_NONE;
+static int text_input;
+static videomode_t vlist;
/* --- error.h --- */
return s != NULL;
}
+static void init_videomode_list (Uint32 flags) {
+ int i, n;
+ SDL_Rect **r;
+ if (vlist.modes != NULL) {
+ free(vlist.modes);
+ vlist.modes = NULL;
+ vlist.n = 0;
+ }
+ r = SDL_ListModes(NULL, flags);
+ if (r == (SDL_Rect **)-1) {
+ if ((flags & SDL_FULLSCREEN) == 0) {
+ init_videomode_list(flags | SDL_FULLSCREEN);
+ }
+ } else if (r != (SDL_Rect**)0) {
+ n = 0;
+ while (r[n] != NULL) {
+ n++;
+ }
+ vlist.modes = malloc(n * sizeof(videomode_size_t));
+ if (vlist.modes != NULL) {
+ vlist.n = n;
+ for (i = 0; i < n; i++) {
+ vlist.modes[i] = (videomode_size_t) {
+ .w = r[i]->w,
+ .h = r[i]->h
+ };
+ }
+ }
+ }
+}
+
+const videomode_t *Y_get_videomode_list_opengl (int fullscreen) {
+ init_videomode_list(SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0));
+ return &vlist;
+}
+
+const videomode_t *Y_get_videomode_list_software (int fullscreen) {
+ init_videomode_list(SDL_SWSURFACE | SDL_HWPALETTE | (fullscreen ? SDL_FULLSCREEN : 0));
+ return &vlist;
+}
+
void Y_get_videomode (int *w, int *h) {
if (mode != MODE_NONE) {
*w = surf->w;
SDL_Flip(surf);
}
+void Y_enable_text_input (void) {
+ text_input = 1;
+}
+
+void Y_disable_text_input (void) {
+ text_input = 0;
+}
+
/* --- main --- */
static int sdl_to_key (int code) {
}
}
-static void poll_events (void (*h)(int key, int down)) {
- int key;
+static void poll_events (void) {
+ int key, sym, down;
SDL_Event ev;
while (SDL_PollEvent(&ev)) {
switch (ev.type) {
break;
case SDL_KEYDOWN:
case SDL_KEYUP:
- key = sdl_to_key(ev.key.keysym.sym);
- I_press(key, ev.type == SDL_KEYDOWN);
- if (h != NULL) {
- (*h)(key, ev.type == SDL_KEYDOWN);
+ sym = ev.key.keysym.sym;
+ down = ev.type == SDL_KEYDOWN;
+ key = sdl_to_key(sym);
+ I_press(key, down);
+ GM_key(key, down);
+ if (down && text_input && sym >= 0x20 && sym <= 0x7e) {
+ // TODO fix this
+ GM_input(sym);
}
break;
}
}
static void step (void) {
- poll_events(&G_keyf);
+ poll_events();
S_updatemusic();
Uint32 t = SDL_GetTicks();
if (t - ticks > DELAY) {
logo("main: failed to init SDL: %s\n", SDL_GetError());
return 1;
}
- SDL_WM_SetCaption("Doom 2D v1.351", "Doom 2D");
+ SDL_WM_SetCaption("Doom 2D (SDL)", "Doom 2D");
// Player 1 defaults
pl1.ku = KEY_KP_8;
pl1.kd = KEY_KP_5;