80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Merge branch 'master' of https://github.com/86Box/86Box

Browse Source
This commit is contained in:
OBattler
2020-11-16 23:48:59 +01:00
parent dc7973d2e2 e0ff781a34
commit 31c697e2a0
4 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
.github/pull_request_template.md vendored
View File

@@ -2,17 +2,12 @@ Summary
======= =======
_Briefly describe what you are submitting._ _Briefly describe what you are submitting._
Approach
========
_How did you address the problem?_
Checklist Checklist
========= =========
* [ ] Closes issue #xxx * [ ] Closes #xxx
* [ ] I have discussed this with core contributors already * [ ] I have discussed this with core contributors already
* [ ] This pull request requires inclusion of a ROM in the romset * [ ] This pull request requires changes to the ROM set
* [ ] I have opened a roms pull request - https://github.com/86Box/roms/pull/changeme/ * [ ] I have opened a roms pull request - https://github.com/86Box/roms/pull/changeme/
* [ ] My commit messages are descriptive and I have not added any irrelevant files to the repository
References References
========== ==========

1
src/include/86box/win.h
View File

@@ -99,6 +99,7 @@ extern HWND hwndMain,
extern HANDLE ghMutex; extern HANDLE ghMutex;
extern LCID lang_id; extern LCID lang_id;
extern HICON hIcon[256]; extern HICON hIcon[256];
extern RECT oldclip;
// extern int status_is_open; // extern int status_is_open;

4
src/win/win_sdl.c
View File

@@ -326,7 +326,7 @@ sdl_init_common(int flags)
wchar_t temp[128]; wchar_t temp[128];
SDL_version ver; SDL_version ver;
int w = 0, h = 0, x = 0, y = 0; int w = 0, h = 0, x = 0, y = 0;
RECT rect, oldclip; RECT rect;
sdl_log("SDL: init (fs=%d)\n", fs); sdl_log("SDL: init (fs=%d)\n", fs);
@@ -389,8 +389,6 @@ sdl_init_common(int flags)
/* Now create the SDL window from that. */ /* Now create the SDL window from that. */
sdl_win = SDL_CreateWindowFrom((void *)sdl_hwnd); sdl_win = SDL_CreateWindowFrom((void *)sdl_hwnd);
GetClipCursor(&oldclip);
old_capture = mouse_capture; old_capture = mouse_capture;
GetWindowRect(sdl_hwnd, &rect); GetWindowRect(sdl_hwnd, &rect);

2
src/win/win_ui.c
View File

@@ -1089,6 +1089,8 @@ ui_init(int nCmdShow)
/* Make the window visible on the screen. */ /* Make the window visible on the screen. */
ShowWindow(hwnd, nCmdShow); ShowWindow(hwnd, nCmdShow);
GetClipCursor(&oldclip);
/* Initialize the RawInput (keyboard) module. */ /* Initialize the RawInput (keyboard) module. */
memset(&ridev, 0x00, sizeof(ridev)); memset(&ridev, 0x00, sizeof(ridev));
ridev.usUsagePage = 0x01; ridev.usUsagePage = 0x01;