claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #1404 from ts-korhonen/opengl

Browse Source 
Remove shader option to OpenGL Core and a window fix
This commit is contained in:
Miran Grča
2021-04-27 04:14:53 +02:00
committed by GitHub
parent 544125ea71 fcac2d7e78
commit e99f40689b
4 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/win/86Box.rc
View File

@@ -251,6 +251,7 @@ BEGIN
END
MENUITEM "&VSync", IDM_VID_GL_VSYNC
MENUITEM "&Select shader...", IDM_VID_GL_SHADER
MENUITEM "&Remove shader", IDM_VID_GL_NOSHADER
END
#endif

5
src/win/win_opengl.c
View File

@@ -185,8 +185,13 @@ static void handle_window_messages(UINT message, WPARAM wParam, LPARAM lParam, i
case WM_LBUTTONDOWN:
case WM_MBUTTONUP:
case WM_MBUTTONDOWN:
case WM_RBUTTONUP:
case WM_RBUTTONDOWN:
if (!fullscreen)
{
/* Bring main window to front. */
SetForegroundWindow(GetAncestor(parent, GA_ROOT));
/* Mouse events that enter and exit capture. */
PostMessage(parent, message, wParam, lParam);
}

9
src/win/win_ui.c
View File

@@ -234,6 +234,7 @@ show_render_options_menu()
CheckMenuItem(menuMain, IDM_VID_GL_FPS_60, video_framerate == 60 ? MF_CHECKED : MF_UNCHECKED);
CheckMenuItem(menuMain, IDM_VID_GL_FPS_75, video_framerate == 75 ? MF_CHECKED : MF_UNCHECKED);
CheckMenuItem(menuMain, IDM_VID_GL_VSYNC, video_vsync ? MF_CHECKED : MF_UNCHECKED);
EnableMenuItem(menuMain, IDM_VID_GL_NOSHADER, strlen(video_shader) > 0 ? MF_ENABLED : MF_DISABLED);
break;
}
}
@@ -778,10 +779,18 @@ MainWindowProcedure(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
case IDM_VID_GL_SHADER:
win_notify_dlg_open();
if (file_dlg_st(hwnd, IDS_2143, video_shader, NULL, 0) == 0)
{
strcpy_s(video_shader, sizeof(video_shader), openfilestring);
EnableMenuItem(menuMain, IDM_VID_GL_NOSHADER, strlen(video_shader) > 0 ? MF_ENABLED : MF_DISABLED);
}
win_notify_dlg_closed();
plat_vid_reload_options();
break;
case IDM_VID_GL_NOSHADER:
video_shader[0] = '\0';
EnableMenuItem(menuMain, IDM_VID_GL_NOSHADER, MF_DISABLED);
plat_vid_reload_options();
break;
#endif
case IDM_VID_FULLSCREEN: