AstralTransRocketries/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-09-16 11:06:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

Get rid of Window_CreateSimple and just have Window_Create work out x/y instead

Browse Source
This commit is contained in:
UnknownShadow200 2019-07-28 13:12:07 +10:00
parent 824e43a1ea
commit 7fc6007e49
4 changed files with 28 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Game.c
View File

@ -726,7 +726,7 @@ static void Game_RunLoop(void) {
#endif
void Game_Run(int width, int height, const String* title) {
Window_CreateSimple(width, height);
Window_Create(width, height);
Window_SetTitle(title);
Window_SetVisible(true);

2
src/Launcher.c
View File

@ -216,7 +216,7 @@ static void Launcher_Free(void) {
void Launcher_Run(void) {
static const String title = String_FromConst(GAME_APP_TITLE);
Window_CreateSimple(640, 400);
Window_Create(640, 400);
Window_SetTitle(&title);
Window_SetVisible(true);

48
src/Window.c
View File

@ -14,17 +14,8 @@ Rect2D Display_Bounds;
int Window_X, Window_Y, Window_Width, Window_Height;
bool Window_Exists, Window_Focused;
const void* Window_Handle;
void Window_CreateSimple(int width, int height) {
struct GraphicsMode mode;
int x, y;
x = Display_Bounds.X + (Display_Bounds.Width - width) / 2;
y = Display_Bounds.Y + (Display_Bounds.Height - height) / 2;
GraphicsMode_MakeDefault(&mode);
Window_Create(x, y, width, height, &mode);
}
#define Window_CentreX(width) (Display_Bounds.X + (Display_Bounds.Width - width) / 2)
#define Window_CentreY(height) (Display_Bounds.Y + (Display_Bounds.Height - height) / 2)
#ifndef CC_BUILD_WEBCANVAS
void Clipboard_RequestText(RequestClipboardCallback callback, void* obj) {
@ -360,13 +351,15 @@ void Window_Init(void) {
ReleaseDC(NULL, hdc);
}
void Window_Create(int x, int y, int width, int height, struct GraphicsMode* mode) {
void Window_Create(int width, int height) {
RECT r;
win_instance = GetModuleHandle(NULL);
/* TODO: UngroupFromTaskbar(); */
/* Find out the final window rectangle, after the WM has added its chrome (titlebar, sidebars etc). */
RECT rect = { x, y, x + width, y + height };
AdjustWindowRect(&rect, CC_WIN_STYLE, false);
r.left = Window_CentreX(width); r.right = r.left + width;
r.top = Window_CentreY(height); r.bottom = r.top + height;
AdjustWindowRect(&r, CC_WIN_STYLE, false);
WNDCLASSEX wc = { 0 };
wc.cbSize = sizeof(WNDCLASSEX);
@ -385,8 +378,7 @@ void Window_Create(int x, int y, int width, int height, struct GraphicsMode* mod
if (!atom) Logger_Abort2(GetLastError(), "Failed to register window class");
win_handle = CreateWindowEx(0, MAKEINTATOM(atom), NULL, CC_WIN_STYLE,
rect.left, rect.top, Rect_Width(rect), Rect_Height(rect),
NULL, NULL, win_instance, NULL);
r.left, r.top, Rect_Width(r), Rect_Height(r), NULL, NULL, win_instance, NULL);
if (!win_handle) Logger_Abort2(GetLastError(), "Failed to create window");
Window_RefreshBounds();
@ -801,11 +793,16 @@ void Window_Init(void) {
Display_BitsPerPixel = DefaultDepth(display, screen);
}
void Window_Create(int x, int y, int width, int height, struct GraphicsMode* mode) {
void Window_Create(int width, int height) {
XSetWindowAttributes attributes = { 0 };
XSizeHints hints = { 0 };
struct GraphicsMode mode;
uintptr_t addr;
int supported;
int supported, x, y;
x = Window_CentreX(width);
y = Window_CentreY(height);
GraphicsMode_MakeDefault(&mode);
/* Open a display connection to the X server, and obtain the screen and root window */
addr = (uintptr_t)win_display;
@ -1746,13 +1743,13 @@ void Window_Init(void) {
Display_BitsPerPixel = CGDisplayBitsPerPixel(display);
}
void Window_Create(int x, int y, int width, int height, struct GraphicsMode* mode) {
void Window_Create(int width, int height) {
Rect r;
OSStatus res;
ProcessSerialNumber psn;
r.left = x; r.right = x + width;
r.top = y; r.bottom = y + height;
r.left = Window_CentreX(width); r.right = r.left + width;
r.top = Window_CentreY(height); r.bottom = r.top + height;
res = CreateNewWindow(kDocumentWindowClass,
kWindowStandardDocumentAttributes | kWindowStandardHandlerAttribute |
kWindowInWindowMenuAttribute | kWindowLiveResizeAttribute, &r, &win_handle);
@ -2039,7 +2036,10 @@ void Window_Init(void) {
Display_BitsPerPixel = SDL_BITSPERPIXEL(mode.format);
}
void Window_Create(int x, int y, int width, int height, struct GraphicsMode* mode) {
void Window_Create(int width, int height) {
int x = Window_CentreX(width);
int y = Window_CentreY(height);
/* TODO: Don't set this flag for launcher window */
win_handle = SDL_CreateWindow(NULL, x, y, width, height, SDL_WINDOW_OPENGL);
if (!win_handle) Window_SDLFail("creating window");
@ -2654,7 +2654,7 @@ void Window_Init(void) {
);
}
void Window_Create(int x, int y, int width, int height, struct GraphicsMode* mode) {
void Window_Create(int width, int height) {
Window_Exists = true;
Window_Focused = true;
Window_HookEvents();
@ -2998,7 +2998,7 @@ void Window_Init(void) {
Display_DpiY = JavaCallInt(env, "getDpiY", "()I", NULL);
}
void Window_Create(int x, int y, int width, int height, struct GraphicsMode* mode) {
void Window_Create(int width, int height) {
Window_Exists = true;
/* actual window creation is done when APP_CMD_INIT_WINDOW is received */
}

7
src/Window.h
View File

@ -64,11 +64,8 @@ extern const void* Window_Handle;
void Window_Init(void);
/* Creates a GraphicsMode compatible with the default display device. */
void GraphicsMode_MakeDefault(struct GraphicsMode* m);
/* Creates the window as the given size at centre of the screen, with default graphics mode. */
void Window_CreateSimple(int width, int height);
/* Creates the window as the given size at the given position on screen. */
void Window_Create(int x, int y, int width, int height, struct GraphicsMode* mode);
/* Creates the window as the given size at centre of the screen. */
void Window_Create(int width, int height);
/* Sets the text of the titlebar above the window. */
CC_API void Window_SetTitle(const String* title);
/* TODO: IMPLEMENT void Window_SetIcon(Bitmap* bmp); */