From 1ae63bea967e9952c60814d8f0caa36534262498 Mon Sep 17 00:00:00 2001 From: Clownacy Date: Sat, 4 Apr 2020 20:51:07 +0100 Subject: [PATCH] Move window ownership to the window backend --- CMakeLists.txt | 4 ++-- src/Backends/GLFW3/Misc.cpp | 4 +--- src/Backends/GLFW3/Window-OpenGL3.cpp | 4 +++- src/Backends/GLFW3/{Misc.h => Window.h} | 0 src/Backends/Rendering/SDLSurface.cpp | 4 +++- src/Backends/Rendering/SDLTexture.cpp | 4 +++- src/Backends/Rendering/Software.cpp | 4 +++- src/Backends/SDL2/Misc.cpp | 4 +--- src/Backends/SDL2/Window-OpenGL3.cpp | 4 +++- src/Backends/SDL2/{Misc.h => Window.h} | 0 10 files changed, 19 insertions(+), 13 deletions(-) rename src/Backends/GLFW3/{Misc.h => Window.h} (100%) rename src/Backends/SDL2/{Misc.h => Window.h} (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index fbe3d069..13efa613 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -338,13 +338,13 @@ if(BACKEND_PLATFORM MATCHES "SDL2") "src/Backends/SDL2/Controller.cpp" "src/Backends/SDL2/Controller.h" "src/Backends/SDL2/Misc.cpp" - "src/Backends/SDL2/Misc.h" + "src/Backends/SDL2/Window.h" ) elseif(BACKEND_PLATFORM MATCHES "GLFW3") target_sources(CSE2 PRIVATE "src/Backends/GLFW3/Controller.cpp" "src/Backends/GLFW3/Misc.cpp" - "src/Backends/GLFW3/Misc.h" + "src/Backends/GLFW3/Window.h" ) endif() diff --git a/src/Backends/GLFW3/Misc.cpp b/src/Backends/GLFW3/Misc.cpp index f881ae07..0a45eff3 100644 --- a/src/Backends/GLFW3/Misc.cpp +++ b/src/Backends/GLFW3/Misc.cpp @@ -1,5 +1,4 @@ #include "../Misc.h" -#include "Misc.h" #include #include @@ -12,6 +11,7 @@ #include "../../WindowsWrapper.h" +#include "Window.h" #include "../Rendering.h" #include "../../Main.h" #include "../../Organya.h" @@ -23,8 +23,6 @@ backend_keyboard_state[BACKEND_KEY] = action == GLFW_PRESS; \ break; -GLFWwindow *window; - BOOL bActive = TRUE; BOOL backend_keyboard_state[BACKEND_KEYBOARD_TOTAL]; BOOL backend_previous_keyboard_state[BACKEND_KEYBOARD_TOTAL]; diff --git a/src/Backends/GLFW3/Window-OpenGL3.cpp b/src/Backends/GLFW3/Window-OpenGL3.cpp index a8ce93ed..07130be1 100644 --- a/src/Backends/GLFW3/Window-OpenGL3.cpp +++ b/src/Backends/GLFW3/Window-OpenGL3.cpp @@ -1,4 +1,5 @@ #include "../Window-OpenGL.h" +#include "Window.h" #include #include @@ -13,7 +14,8 @@ #include "../../WindowsWrapper.h" #include "../Misc.h" -#include "Misc.h" + +GLFWwindow *window; BOOL WindowBackend_OpenGL_CreateWindow(const char *window_title, int *screen_width, int *screen_height, BOOL fullscreen) { diff --git a/src/Backends/GLFW3/Misc.h b/src/Backends/GLFW3/Window.h similarity index 100% rename from src/Backends/GLFW3/Misc.h rename to src/Backends/GLFW3/Window.h diff --git a/src/Backends/Rendering/SDLSurface.cpp b/src/Backends/Rendering/SDLSurface.cpp index 6e8a3ab7..d225750c 100644 --- a/src/Backends/Rendering/SDLSurface.cpp +++ b/src/Backends/Rendering/SDLSurface.cpp @@ -9,7 +9,7 @@ #include "../../WindowsWrapper.h" #include "../Misc.h" -#include "../SDL2/Misc.h" +#include "../SDL2/Window.h" typedef struct RenderBackend_Surface { @@ -21,6 +21,8 @@ typedef struct RenderBackend_Glyph SDL_Surface *sdlsurface; } RenderBackend_Glyph; +SDL_Window *window; + static SDL_Surface *window_sdlsurface; static RenderBackend_Surface framebuffer; diff --git a/src/Backends/Rendering/SDLTexture.cpp b/src/Backends/Rendering/SDLTexture.cpp index 41e0f7fd..45d5dc7f 100644 --- a/src/Backends/Rendering/SDLTexture.cpp +++ b/src/Backends/Rendering/SDLTexture.cpp @@ -13,7 +13,7 @@ #include "../../WindowsWrapper.h" #include "../Misc.h" -#include "../SDL2/Misc.h" +#include "../SDL2/Window.h" #include "../../Draw.h" #include "../../Ending.h" #include "../../MapName.h" @@ -38,6 +38,8 @@ typedef struct RenderBackend_Glyph unsigned int height; } RenderBackend_Glyph; +SDL_Window *window; + static SDL_Renderer *renderer; static RenderBackend_Surface framebuffer; diff --git a/src/Backends/Rendering/Software.cpp b/src/Backends/Rendering/Software.cpp index dc775717..0ad6c985 100644 --- a/src/Backends/Rendering/Software.cpp +++ b/src/Backends/Rendering/Software.cpp @@ -9,7 +9,7 @@ #include "../../WindowsWrapper.h" #include "../Misc.h" -#include "../SDL2/Misc.h" +#include "../SDL2/Window.h" #define MIN(a, b) ((a) < (b) ? (a) : (b)) #define MAX(a, b) ((a) > (b) ? (a) : (b)) @@ -36,6 +36,8 @@ static RenderBackend_Surface framebuffer; static unsigned char glyph_colour_channels[3]; static RenderBackend_Surface *glyph_destination_surface; +SDL_Window *window; + RenderBackend_Surface* RenderBackend_Init(const char *window_title, int screen_width, int screen_height, BOOL fullscreen) { window = SDL_CreateWindow(window_title, SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, screen_width, screen_height, 0); diff --git a/src/Backends/SDL2/Misc.cpp b/src/Backends/SDL2/Misc.cpp index 773e523e..bb858d90 100644 --- a/src/Backends/SDL2/Misc.cpp +++ b/src/Backends/SDL2/Misc.cpp @@ -1,5 +1,4 @@ #include "../Misc.h" -#include "Misc.h" #include #include @@ -10,6 +9,7 @@ #include "../../WindowsWrapper.h" #include "Controller.h" +#include "Window.h" #include "../Rendering.h" #include "../../Main.h" #include "../../Organya.h" @@ -21,8 +21,6 @@ backend_keyboard_state[BACKEND_KEY] = event.key.type == SDL_KEYDOWN; \ break; -SDL_Window *window; - BOOL bActive = TRUE; BOOL backend_keyboard_state[BACKEND_KEYBOARD_TOTAL]; BOOL backend_previous_keyboard_state[BACKEND_KEYBOARD_TOTAL]; diff --git a/src/Backends/SDL2/Window-OpenGL3.cpp b/src/Backends/SDL2/Window-OpenGL3.cpp index f0679dbe..d3caba49 100644 --- a/src/Backends/SDL2/Window-OpenGL3.cpp +++ b/src/Backends/SDL2/Window-OpenGL3.cpp @@ -1,4 +1,5 @@ #include "../Window-OpenGL.h" +#include "Window.h" #include @@ -12,9 +13,10 @@ #include "../../WindowsWrapper.h" #include "../Misc.h" -#include "Misc.h" #include "../../Resource.h" +SDL_Window *window; + static SDL_GLContext context; BOOL WindowBackend_OpenGL_CreateWindow(const char *window_title, int *screen_width, int *screen_height, BOOL fullscreen) diff --git a/src/Backends/SDL2/Misc.h b/src/Backends/SDL2/Window.h similarity index 100% rename from src/Backends/SDL2/Misc.h rename to src/Backends/SDL2/Window.h