m/grafX2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

GFX2_GetScreenSize()

Browse Source 
remove #include <windows.h> in init.c
This commit is contained in:
Thomas Bernard 2020-04-12 00:34:31 +02:00
parent 776884f0fe
commit f2e1ea8921
No known key found for this signature in database
GPG Key ID: 0FF11B67A5C0863C
3 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/init.c
View File

@ -50,9 +50,6 @@
#if defined(USE_SDL) #if defined(USE_SDL)
#include <SDL_byteorder.h> #include <SDL_byteorder.h>
#endif #endif
#if defined(WIN32) && !defined(USE_SDL) && !defined(USE_SDL2)
#include <windows.h>
#endif
#if defined (__MINT__) #if defined (__MINT__)
#include <mint/osbind.h> #include <mint/osbind.h>
#endif #endif
@ -1585,9 +1582,9 @@ void Set_all_video_modes(void)
} }
#elif defined(WIN32) #elif defined(WIN32)
{ {
int width = GetSystemMetrics(SM_CXSCREEN); int width = 0;
int height = GetSystemMetrics(SM_CYSCREEN); int height = 0;
if (width > 0 && height > 0) if (GFX2_GetScreenSize(&width, &height))
{ {
Video_mode[Nb_video_modes].Width = width; Video_mode[Nb_video_modes].Width = width;
Video_mode[Nb_video_modes].Height = height; Video_mode[Nb_video_modes].Height = height;

5
src/screen.h
View File

@ -89,4 +89,9 @@ void Define_icon(void);
/// set (system) mouse cursor position /// set (system) mouse cursor position
void Set_mouse_position(void); void Set_mouse_position(void);
/**
* Get Screen dimensions
*/
int GFX2_GetScreenSize(int * width, int * height);
#endif // SCREEN_H_INCLUDED #endif // SCREEN_H_INCLUDED

11
src/win32screen.c
View File

@ -693,3 +693,14 @@ void Set_mouse_position(void)
GFX2_Log(GFX2_WARNING, "SetCursorPos(%ld, %ld) failed\n", pt.x, pt.y); GFX2_Log(GFX2_WARNING, "SetCursorPos(%ld, %ld) failed\n", pt.x, pt.y);
} }
} }
int GFX2_GetScreenSize(int * width, int * height)
{
if (width == NULL || height == NULL)
return 0;
*width = GetSystemMetrics(SM_CXSCREEN);
*height = GetSystemMetrics(SM_CYSCREEN);
return (*width > 0 && *height > 0);
}