diff --git a/src/sdl2/main.c b/src/sdl2/main.c
index 42fda3e41c0910050f60518392a46825b3193f0a..c1b872ca71a417cf29817d220d91b251dd07e10b 100644 (file)
--- a/src/sdl2/main.c
+++ b/src/sdl2/main.c
static int Y_set_videomode_opengl (int w, int h, int fullscreen) {
assert(w > 0);
assert(h > 0);
- Uint32 flags = SDL_WINDOW_HIDDEN | SDL_WINDOW_OPENGL;
+ Uint32 flags = SDL_WINDOW_RESIZABLE | SDL_WINDOW_OPENGL;
flags |= fullscreen ? SDL_WINDOW_FULLSCREEN : 0;
// TODO set context version and type
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 1);
window = win;
context = ctx;
SDL_GL_MakeCurrent(window, context);
- SDL_ShowWindow(window);
} else {
SDL_DestroyWindow(win);
win = NULL;
assert(h > 0);
int x = SDL_WINDOWPOS_CENTERED;
int y = SDL_WINDOWPOS_CENTERED;
- Uint32 flags = SDL_WINDOW_HIDDEN | SDL_WINDOW_OPENGL;
+ Uint32 flags = SDL_WINDOW_RESIZABLE;
flags |= fullscreen ? SDL_WINDOW_FULLSCREEN : 0;
SDL_Window *win = SDL_CreateWindow(TITLE_STR, x, y, w, h, flags);
if (win != NULL) {
Y_unset_videomode();
window = win;
surf = s;
- SDL_ShowWindow(window);
} else {
SDL_DestroyWindow(win);
win = NULL;
return win != NULL;
}
+static int Y_resize_window (int w, int h, int fullscreen) {
+ assert(w > 0);
+ assert(h > 0);
+ assert(window != NULL);
+ if (surf != NULL) {
+ SDL_Surface *s = SDL_CreateRGBSurface(0, w, h, 8, 0, 0, 0, 0);
+ if (s != NULL) {
+ SDL_SetPaletteColors(s->format->palette, surf->format->palette->colors, 0, surf->format->palette->ncolors);
+ SDL_FreeSurface(surf);
+ surf = s;
+ }
+ }
+ SDL_SetWindowSize(window, w, h);
+ Y_set_fullscreen(fullscreen);
+ return 1;
+}
+
int Y_set_videomode (int w, int h, int flags) {
assert(w > 0);
assert(h > 0);
int fullscreen = (flags & SYSTEM_USE_FULLSCREEN) != 0;
if (flags & SYSTEM_USE_OPENGL) {
- return Y_set_videomode_opengl(w, h, fullscreen);
+ if (window != NULL && context != NULL) {
+ return Y_resize_window(w, h, fullscreen);
+ } else {
+ return Y_set_videomode_opengl(w, h, fullscreen);
+ }
+ } else {
+ if (window != NULL && surf != NULL) {
+ return Y_resize_window(w, h, fullscreen);
+ } else {
+ return Y_set_videomode_software(w, h, fullscreen);
+ }
+ }
+}
+
+void Y_get_videomode (int *w, int *h) {
+ if (window != NULL) {
+ SDL_GetWindowSize(window, w, h);
} else {
- return Y_set_videomode_software(w, h, fullscreen);
+ *w = 0;
+ *h = 0;
}
}
}
}
+static void window_event_handler (SDL_WindowEvent *ev) {
+ switch (ev->event) {
+ case SDL_WINDOWEVENT_RESIZED:
+ if (window != NULL && ev->windowID == SDL_GetWindowID(window)) {
+ R_set_videomode(ev->data1, ev->data2, Y_get_fullscreen());
+ }
+ break;
+ case SDL_WINDOWEVENT_CLOSE:
+ ERR_quit();
+ break;
+ }
+}
+
static void poll_events (void (*h)(int key, int down)) {
int key;
SDL_Event ev;
case SDL_QUIT:
ERR_quit();
break;
+ case SDL_WINDOWEVENT:
+ window_event_handler(&ev.window);
+ break;
case SDL_KEYDOWN:
case SDL_KEYUP:
key = sdl_to_key(ev.key.keysym.scancode);