Zengtudor/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2025-10-05 06:06:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
Christopher Pelloux 2016-03-05 10:00:12 -05:00
parent 4ccda807aa
commit a0d82754d5
2 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
examples/gears.c
View File

@ -298,17 +298,9 @@ static void init(void)
glEnable(GL_NORMALIZE); glEnable(GL_NORMALIZE);
} }
GLFWerrorfun ErrorFun(int i, const char* str) {
char buf[255];
sprintf(buf, "%d: %s", i, str);
MessageBoxA(0, buf, "Error", MB_ICONERROR | MB_OK);
}
/* program entry */ /* program entry */
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
glfwSetErrorCallback(ErrorFun);
GLFWwindow* window; GLFWwindow* window;
int width, height; int width, height;

17
src/wgl_context.c
View File

@ -366,12 +366,14 @@ isWindowsVersionOrGreater(WORD wMajorVersion, WORD wMinorVersion, WORD wServiceP
return VerifyVersionInfoW(&osvi, VER_MAJORVERSION | VER_MINORVERSION | VER_SERVICEPACKMAJOR, dwlConditionMask) != FALSE; return VerifyVersionInfoW(&osvi, VER_MAJORVERSION | VER_MINORVERSION | VER_SERVICEPACKMAJOR, dwlConditionMask) != FALSE;
} }
static GLFWbool isWindows8OrGreater() { static GLFWbool isWindows8OrGreater()
{
GLFWbool isWin8OrGreater = isWindowsVersionOrGreater(HIBYTE(_WIN32_WINNT_WIN8), LOBYTE(_WIN32_WINNT_WIN8), 0) ? GLFW_TRUE: GLFW_FALSE; GLFWbool isWin8OrGreater = isWindowsVersionOrGreater(HIBYTE(_WIN32_WINNT_WIN8), LOBYTE(_WIN32_WINNT_WIN8), 0) ? GLFW_TRUE: GLFW_FALSE;
return isWin8OrGreater; return isWin8OrGreater;
} }
static GLFWbool setupTransparentWindow(HWND handle, GLFWbool isDecorated) { static GLFWbool setupTransparentWindow(_GLFWwindow* window)
{
if (!isCompositionEnabled) { if (!isCompositionEnabled) {
_glfwInputError(GLFW_PLATFORM_ERROR, _glfwInputError(GLFW_PLATFORM_ERROR,
"WGL: Composition needed for transparent window is disabled"); "WGL: Composition needed for transparent window is disabled");
@ -383,6 +385,7 @@ static GLFWbool setupTransparentWindow(HWND handle, GLFWbool isDecorated) {
} }
HRESULT hr = S_OK; HRESULT hr = S_OK;
HWND handle = window->win32.handle;
DWM_BLURBEHIND bb = { 0 }; DWM_BLURBEHIND bb = { 0 };
bb.dwFlags = DWM_BB_ENABLE | DWM_BB_BLURREGION; bb.dwFlags = DWM_BB_ENABLE | DWM_BB_BLURREGION;
@ -403,7 +406,8 @@ static GLFWbool setupTransparentWindow(HWND handle, GLFWbool isDecorated) {
// the layered window, all pixels painted by the window in this color will be transparent. // the layered window, all pixels painted by the window in this color will be transparent.
// That doesn't seem to be the case anymore on Windows 8+, at least when used with // That doesn't seem to be the case anymore on Windows 8+, at least when used with
// DwmEnableBlurBehindWindow + negative region. // DwmEnableBlurBehindWindow + negative region.
if (isDecorated && isWindows8OrGreater()) { if (window->decorated && isWindows8OrGreater())
{
long style = GetWindowLong(handle, GWL_EXSTYLE); long style = GetWindowLong(handle, GWL_EXSTYLE);
if (!style) { if (!style) {
_glfwInputError(GLFW_PLATFORM_ERROR, _glfwInputError(GLFW_PLATFORM_ERROR,
@ -433,6 +437,7 @@ static GLFWbool setupTransparentWindow(HWND handle, GLFWbool isDecorated) {
return GLFW_FALSE; return GLFW_FALSE;
} }
} }
return GLFW_TRUE; return GLFW_TRUE;
} }
@ -585,10 +590,10 @@ GLFWbool _glfwCreateContextWGL(_GLFWwindow* window,
} }
} }
if (window->transparent) { if (window->transparent)
if (!setupTransparentWindow(window->win32.handle, window->decorated)) { {
if (!setupTransparentWindow(window))
window->transparent = GLFW_FALSE; window->transparent = GLFW_FALSE;
}
} }
return GLFW_TRUE; return GLFW_TRUE;