Add window flags

simple2d · Nov 20, 2015 · 129b5a2 · 129b5a2
1 parent 2ebc833
commit 129b5a2
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 8 deletions.
diff --git a/include/simple2d.h b/include/simple2d.h
@@ -4,6 +4,11 @@
 #define S2D_WARN  2
 #define S2D_ERROR 3
 
+#define S2D_RESIZABLE  SDL_WINDOW_RESIZABLE
+#define S2D_BORDERLESS SDL_WINDOW_BORDERLESS
+#define S2D_FULLSCREEN SDL_WINDOW_FULLSCREEN_DESKTOP
+#define S2D_HIGHDPI    SDL_WINDOW_ALLOW_HIGHDPI
+
 // If ARM, assume GLES
 #ifdef __arm__
   #define GLES true
@@ -183,7 +188,9 @@ void print_gl_context();
 /*
  * Create the window
  */
-Window* S2D_CreateWindow(char *title, int width, int height, Update, Render);
+Window* S2D_CreateWindow(
+  char *title, int width, int height, Update, Render, int flags
+);
 
 /*
  * Show the window

diff --git a/src/simple2d.c b/src/simple2d.c
@@ -443,7 +443,7 @@ void S2D_FreeMusic(Music music) {
  * Create a window
  */
 Window* S2D_CreateWindow(char *title, int width, int height,
-                         Update update, Render render) {
+                         Update update, Render render, int flags) {
 
   // Allocate window and set default values
   Window *window = (Window*)malloc(sizeof(Window));
@@ -492,14 +492,11 @@ Window* S2D_CreateWindow(char *title, int width, int height,
   }
 
   // Create SDL window
-  // TODO: Add `SDL_WINDOW_FULLSCREEN_DESKTOP` option to flags, or...
-  //       Call `SDL_SetWindowFullscreen` in update loop
-  // TODO: Add SDL_WINDOW_ALLOW_HIGHDPI flag
   window->sdl = SDL_CreateWindow(
     window->title,                                   // title
     SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED,  // window position
     window->width, window->height,                   // window size
-    SDL_WINDOW_OPENGL                                // flags
+    SDL_WINDOW_OPENGL | flags                        // flags
   );
 
   if (!window->sdl) S2D_Error("SDL_CreateWindow", SDL_GetError());

diff --git a/tests/audio.c b/tests/audio.c
@@ -105,7 +105,7 @@ void on_key(const char *key) {
 int main(int argc, char const *argv[]) {
 
   window = S2D_CreateWindow(
-    "Audio", 200, 150, NULL, NULL
+    "Audio", 200, 150, NULL, NULL, 0
   );
 
   window->on_key = on_key;

diff --git a/tests/testcard.c b/tests/testcard.c
@@ -200,7 +200,7 @@ int main(int argc, char const *argv[]) {
 
   S2D_Diagnostics(true);
 
-  window = S2D_CreateWindow("Simple 2D – Testcard", 600, 500, update, render);
+  window = S2D_CreateWindow("Simple 2D – Testcard", 600, 500, update, render, 0);
 
   window->on_key = on_key;
   window->on_key_down = on_key_down;