mirror/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2024-11-14 02:31:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into joystickname

Browse Source
This commit is contained in:
Camilla Berglund 2012-12-02 16:36:44 +01:00
commit 821997ad55
36 changed files with 1332 additions and 653 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/gears.c
View File

@ -359,8 +359,6 @@ int main(int argc, char *argv[])
glfwGetWindowSize(window, &width, &height); glfwGetWindowSize(window, &width, &height);
reshape(window, width, height); reshape(window, width, height);
glfwSetInputMode( window, GLFW_KEY_REPEAT, GL_TRUE );
// Parse command-line options // Parse command-line options
init(argc, argv); init(argc, argv);

2
examples/wave.c
View File

@ -419,8 +419,6 @@ int main(int argc, char* argv[])
glfwGetWindowSize(window, &width, &height); glfwGetWindowSize(window, &width, &height);
window_size_callback(window, width, height); window_size_callback(window, width, height);
glfwSetInputMode(window, GLFW_KEY_REPEAT, GL_TRUE);
// Initialize OpenGL // Initialize OpenGL
init_opengl(); init_opengl();

1146
include/GL/glfw3.h
View File

File diff suppressed because it is too large Load Diff

13
readme.html
View File

@ -274,17 +274,18 @@ version of GLFW.</p>
<li>Added <code>glfwSetErrorCallback</code> function and <code>GLFWerrorfun</code> type for receiving more specific and/or nested errors</li> <li>Added <code>glfwSetErrorCallback</code> function and <code>GLFWerrorfun</code> type for receiving more specific and/or nested errors</li>
<li>Added <code>glfwSetWindowUserPointer</code> and <code>glfwGetWindowUserPointer</code> functions for per-window user pointers</li> <li>Added <code>glfwSetWindowUserPointer</code> and <code>glfwGetWindowUserPointer</code> functions for per-window user pointers</li>
<li>Added <code>glfwGetVersionString</code> function for determining which code paths were enabled at compile time</li> <li>Added <code>glfwGetVersionString</code> function for determining which code paths were enabled at compile time</li>
<li>Added <code>glfwGetWindowPos</code> function for querying the position of the specified window</li> <li>Added <code>glfwSetWindowPosCallback</code> function and <code>GLFWwindowposfun</code> type for reciving window position events</li>
<li>Added <code>glfwSetWindowFocusCallback</code> function and <code>GLFWwindowfocusfun</code> type for receiving window focus events</li> <li>Added <code>glfwSetWindowFocusCallback</code> function and <code>GLFWwindowfocusfun</code> type for receiving window focus events</li>
<li>Added <code>glfwSetWindowIconifyCallback</code> function and <code>GLFWwindowiconifyfun</code> type for receiving window iconification events</li> <li>Added <code>glfwSetWindowIconifyCallback</code> function and <code>GLFWwindowiconifyfun</code> type for receiving window iconification events</li>
<li>Added <code>glfwGetClipboardString</code> and <code>glfwSetClipboardString</code> functions for interacting with the system clipboard</li> <li>Added <code>glfwGetClipboardString</code> and <code>glfwSetClipboardString</code> functions for interacting with the system clipboard</li>
<li>Added <code>glfwGetCurrentContext</code> function for retrieving the window whose OpenGL context is current</li> <li>Added <code>glfwGetCurrentContext</code> function for retrieving the window whose OpenGL context is current</li>
<li>Added <code>glfwCopyContext</code> function for copying OpenGL state categories between contexts</li> <li>Added <code>GLFW_SRGB_CAPABLE</code> for requesting sRGB capable framebuffers</li>
<li>Added <code>GLFW_CLIENT_API</code>, <code>GLFW_OPENGL_API</code> and <code>GLFW_OPENGL_ES_API</code> for selecting client API</li> <li>Added <code>GLFW_CLIENT_API</code>, <code>GLFW_OPENGL_API</code> and <code>GLFW_OPENGL_ES_API</code> for selecting client API</li>
<li>Added <code>GLFW_OPENGL_ROBUSTNESS</code> window hint and associated strategy tokens for <code>GL_ARB_robustness</code> support</li> <li>Added <code>GLFW_OPENGL_ROBUSTNESS</code> window hint and associated strategy tokens for <code>GL_ARB_robustness</code> support</li>
<li>Added <code>GLFW_OPENGL_REVISION</code> window parameter to make up for removal of <code>glfwGetGLVersion</code></li> <li>Added <code>GLFW_OPENGL_REVISION</code> window parameter to make up for removal of <code>glfwGetGLVersion</code></li>
<li>Added <code>GLFW_INCLUDE_GLCOREARB</code> macro for including <code>glcorearb.h</code> instead of <code>gl.h</code></li> <li>Added <code>GLFW_INCLUDE_GLCOREARB</code> macro for including <code>glcorearb.h</code> instead of <code>gl.h</code></li>
<li>Added <code>GLFW_VISIBLE</code> window hint and parameter for controlling and polling window visibility</li> <li>Added <code>GLFW_VISIBLE</code> window hint and parameter for controlling and polling window visibility</li>
<li>Added <code>GLFW_POSITION_X</code> and <code>GLFW_POSITION_Y</code> window hints and parameter for controlling and polling window position</li>
<li>Added <code>windows</code> simple multi-window test program</li> <li>Added <code>windows</code> simple multi-window test program</li>
<li>Added <code>sharing</code> simple OpenGL object sharing test program</li> <li>Added <code>sharing</code> simple OpenGL object sharing test program</li>
<li>Added <code>modes</code> video mode enumeration and setting test program</li> <li>Added <code>modes</code> video mode enumeration and setting test program</li>
@ -298,6 +299,7 @@ version of GLFW.</p>
<li>Changed <code>glfwGetVideoModes</code> to return a dynamic, unlimited number of video modes</li> <li>Changed <code>glfwGetVideoModes</code> to return a dynamic, unlimited number of video modes</li>
<li>Renamed <code>glfw.h</code> to <code>glfw3.h</code> to avoid conflicts with 2.x series</li> <li>Renamed <code>glfw.h</code> to <code>glfw3.h</code> to avoid conflicts with 2.x series</li>
<li>Renamed <code>glfwOpenWindowHint</code> to <code>glfwWindowHint</code></li> <li>Renamed <code>glfwOpenWindowHint</code> to <code>glfwWindowHint</code></li>
<li>Renamed <code>GLFW_ACTIVE</code> to <code>GLFW_FOCUSED</code></li>
<li>Renamed <code>GLFW_WINDOW</code> token to <code>GLFW_WINDOWED</code></li> <li>Renamed <code>GLFW_WINDOW</code> token to <code>GLFW_WINDOWED</code></li>
<li>Renamed <code>GLFW_WINDOW_NO_RESIZE</code> to <code>GLFW_RESIZABLE</code></li> <li>Renamed <code>GLFW_WINDOW_NO_RESIZE</code> to <code>GLFW_RESIZABLE</code></li>
<li>Renamed <code>GLFW_BUILD_DLL</code> to <code>_GLFW_BUILD_DLL</code></li> <li>Renamed <code>GLFW_BUILD_DLL</code> to <code>_GLFW_BUILD_DLL</code></li>
@ -312,7 +314,7 @@ version of GLFW.</p>
<li>Replaced <code>glfwEnable</code> and <code>glfwDisable</code> with <code>glfwGetInputMode</code> and <code>glfwSetInputMode</code></li> <li>Replaced <code>glfwEnable</code> and <code>glfwDisable</code> with <code>glfwGetInputMode</code> and <code>glfwSetInputMode</code></li>
<li>Replaced <code>joystick</code> test with graphical version</li> <li>Replaced <code>joystick</code> test with graphical version</li>
<li>Replaced automatic closing of windows with <code>GLFW_CLOSE_REQUESTED</code> window parameter</li> <li>Replaced automatic closing of windows with <code>GLFW_CLOSE_REQUESTED</code> window parameter</li>
<li>Made Unicode character input unaffected by <code>GLFW_KEY_REPEAT</code></li> <li>Removed the <code>GLFW_KEY_REPEAT</code> input option</li>
<li>Removed event auto-polling and the <code>GLFW_AUTO_POLL_EVENTS</code> window enable</li> <li>Removed event auto-polling and the <code>GLFW_AUTO_POLL_EVENTS</code> window enable</li>
<li>Removed the Win32 port .def files</li> <li>Removed the Win32 port .def files</li>
<li>Removed the entire threading API</li> <li>Removed the entire threading API</li>
@ -934,8 +936,9 @@ their skills. Special thanks go out to:</p>
Leopard</li> Leopard</li>
<li>Riku Salminen, for the initial implementation of <li>Riku Salminen, for the initial implementation of
<code>glfwShowWindow</code> and <code>glfwHideWindow</code>, and for making <code>glfwShowWindow</code> and <code>glfwHideWindow</code>, for the idea of
the X11 event processing able to support multi-threaded rendering</li> <code>glfwDefaultWindowHints</code> and for making the X11 event processing
able to support multi-threaded rendering</li>
<li>Douglas C. Schmidt and Irfan Pyarali, for their excellent article <li>Douglas C. Schmidt and Irfan Pyarali, for their excellent article
<a href="http://www.cs.wustl.edu/~schmidt/win32-cv-1.html">Strategies for Implementing POSIX Condition Variables on Win32</a></li> <a href="http://www.cs.wustl.edu/~schmidt/win32-cv-1.html">Strategies for Implementing POSIX Condition Variables on Win32</a></li>

6
src/CMakeLists.txt
View File

@ -13,7 +13,7 @@ set(common_SOURCES clipboard.c fullscreen.c gamma.c init.c input.c
if (_GLFW_COCOA_NSGL) if (_GLFW_COCOA_NSGL)
set(glfw_HEADERS ${common_HEADERS} cocoa_platform.h) set(glfw_HEADERS ${common_HEADERS} cocoa_platform.h)
set(glfw_SOURCES ${common_SOURCES} cocoa_clipboard.m cocoa_fullscreen.m set(glfw_SOURCES ${common_SOURCES} cocoa_clipboard.m cocoa_fullscreen.m
cocoa_gamma.c cocoa_init.m cocoa_input.m cocoa_joystick.m cocoa_gamma.c cocoa_init.m cocoa_joystick.m
cocoa_opengl.m cocoa_time.c cocoa_window.m) cocoa_opengl.m cocoa_time.c cocoa_window.m)
if (GLFW_NATIVE_API) if (GLFW_NATIVE_API)
@ -25,7 +25,7 @@ if (_GLFW_COCOA_NSGL)
elseif (_GLFW_WIN32_WGL) elseif (_GLFW_WIN32_WGL)
set(glfw_HEADERS ${common_HEADERS} win32_platform.h) set(glfw_HEADERS ${common_HEADERS} win32_platform.h)
set(glfw_SOURCES ${common_SOURCES} win32_clipboard.c win32_fullscreen.c set(glfw_SOURCES ${common_SOURCES} win32_clipboard.c win32_fullscreen.c
win32_gamma.c win32_init.c win32_input.c win32_joystick.c win32_gamma.c win32_init.c win32_joystick.c
win32_opengl.c win32_time.c win32_window.c) win32_opengl.c win32_time.c win32_window.c)
if (GLFW_NATIVE_API) if (GLFW_NATIVE_API)
@ -34,7 +34,7 @@ elseif (_GLFW_WIN32_WGL)
elseif (_GLFW_X11_GLX) elseif (_GLFW_X11_GLX)
set(glfw_HEADERS ${common_HEADERS} x11_platform.h) set(glfw_HEADERS ${common_HEADERS} x11_platform.h)
set(glfw_SOURCES ${common_SOURCES} x11_clipboard.c x11_fullscreen.c set(glfw_SOURCES ${common_SOURCES} x11_clipboard.c x11_fullscreen.c
x11_gamma.c x11_init.c x11_input.c x11_joystick.c x11_gamma.c x11_init.c x11_joystick.c
x11_keysym2unicode.c x11_opengl.c x11_time.c x11_window.c) x11_keysym2unicode.c x11_opengl.c x11_time.c x11_window.c)
if (GLFW_NATIVE_API) if (GLFW_NATIVE_API)

53
src/cocoa_input.m
View File

@ -1,53 +0,0 @@
//========================================================================
// GLFW - An OpenGL library
// Platform: Cocoa
// API Version: 3.0
// WWW: http://www.glfw.org/
//------------------------------------------------------------------------
// Copyright (c) 2009-2010 Camilla Berglund <elmindreda@elmindreda.org>
//
// This software is provided 'as-is', without any express or implied
// warranty. In no event will the authors be held liable for any damages
// arising from the use of this software.
//
// Permission is granted to anyone to use this software for any purpose,
// including commercial applications, and to alter it and redistribute it
// freely, subject to the following restrictions:
//
// 1. The origin of this software must not be misrepresented; you must not
// claim that you wrote the original software. If you use this software
// in a product, an acknowledgment in the product documentation would
// be appreciated but is not required.
//
// 2. Altered source versions must be plainly marked as such, and must not
// be misrepresented as being the original software.
//
// 3. This notice may not be removed or altered from any source
// distribution.
//
//========================================================================
#include "internal.h"
//////////////////////////////////////////////////////////////////////////
////// GLFW platform API //////
//////////////////////////////////////////////////////////////////////////
//========================================================================
// Enable and disable system keys
//========================================================================
void _glfwPlatformEnableSystemKeys(_GLFWwindow* window)
{
// This is checked in cocoa_window.m; no action needed here
}
void _glfwPlatformDisableSystemKeys(_GLFWwindow* window)
{
// This is checked in cocoa_window.m; no action needed here
// Note that it may not be possible to disable things like Exposé
// except in full-screen mode.
}

10
src/cocoa_opengl.m
View File

@ -147,13 +147,3 @@ GLFWglproc _glfwPlatformGetProcAddress(const char* procname)
return symbol; return symbol;
} }
//========================================================================
// Copies the specified OpenGL state categories from src to dst
//========================================================================
void _glfwPlatformCopyContext(_GLFWwindow* src, _GLFWwindow* dst, unsigned long mask)
{
[dst->NSGL.context copyAttributesFromContext:src->NSGL.context withMask:mask];
}

27
src/cocoa_window.m
View File

@ -455,7 +455,6 @@ static int convertMacKeyCode(unsigned int macKeyCode)
if ([event modifierFlags] & NSCommandKeyMask) if ([event modifierFlags] & NSCommandKeyMask)
{ {
if (window->systemKeys)
[super keyDown:event]; [super keyDown:event];
} }
else else
@ -686,7 +685,7 @@ static GLboolean createWindow(_GLFWwindow* window,
styleMask = NSBorderlessWindowMask; styleMask = NSBorderlessWindowMask;
window->NS.object = [[NSWindow alloc] window->NS.object = [[NSWindow alloc]
initWithContentRect:NSMakeRect(0, 0, window->width, window->height) initWithContentRect:NSMakeRect(wndconfig->positionX, wndconfig->positionY, window->width, window->height)
styleMask:styleMask styleMask:styleMask
backing:NSBackingStoreBuffered backing:NSBackingStoreBuffered
defer:NO]; defer:NO];
@ -836,6 +835,9 @@ static GLboolean createContext(_GLFWwindow* window,
ADD_ATTR2(NSOpenGLPFASamples, fbconfig->samples); ADD_ATTR2(NSOpenGLPFASamples, fbconfig->samples);
} }
// NOTE: All NSOpenGLPixelFormats on the relevant cards support sRGB
// frambuffer, so there's no need (and no way) to request it
ADD_ATTR(0); ADD_ATTR(0);
#undef ADD_ATTR #undef ADD_ATTR
@ -1006,27 +1008,6 @@ void _glfwPlatformSetWindowSize(_GLFWwindow* window, int width, int height)
} }
//========================================================================
// Set the window position
//========================================================================
void _glfwPlatformSetWindowPos(_GLFWwindow* window, int x, int y)
{
NSRect contentRect =
[window->NS.object contentRectForFrameRect:[window->NS.object frame]];
// We assume here that the client code wants to position the window within the
// screen the window currently occupies
NSRect screenRect = [[window->NS.object screen] visibleFrame];
contentRect.origin = NSMakePoint(screenRect.origin.x + x,
screenRect.origin.y + screenRect.size.height -
y - contentRect.size.height);
[window->NS.object setFrame:[window->NS.object frameRectForContentRect:contentRect]
display:YES];
}
//======================================================================== //========================================================================
// Iconify the window // Iconify the window
//======================================================================== //========================================================================

10
src/init.c
View File

@ -215,21 +215,19 @@ GLFWAPI const char* glfwErrorString(int error)
case GLFW_NOT_INITIALIZED: case GLFW_NOT_INITIALIZED:
return "The GLFW library is not initialized"; return "The GLFW library is not initialized";
case GLFW_NO_CURRENT_CONTEXT: case GLFW_NO_CURRENT_CONTEXT:
return "There is no current OpenGL context"; return "There is no current context";
case GLFW_INVALID_ENUM: case GLFW_INVALID_ENUM:
return "Invalid argument for enum parameter"; return "Invalid argument for enum parameter";
case GLFW_INVALID_VALUE: case GLFW_INVALID_VALUE:
return "Invalid value for parameter"; return "Invalid value for parameter";
case GLFW_OUT_OF_MEMORY: case GLFW_OUT_OF_MEMORY:
return "Out of memory"; return "Out of memory";
case GLFW_OPENGL_UNAVAILABLE: case GLFW_API_UNAVAILABLE:
return "OpenGL is not available on this machine"; return "The requested client API is unavailable";
case GLFW_VERSION_UNAVAILABLE: case GLFW_VERSION_UNAVAILABLE:
return "The requested OpenGL version is unavailable"; return "The requested client API version is unavailable";
case GLFW_PLATFORM_ERROR: case GLFW_PLATFORM_ERROR:
return "A platform-specific error occurred"; return "A platform-specific error occurred";
case GLFW_WINDOW_NOT_ACTIVE:
return "The specified window is not active";
case GLFW_FORMAT_UNAVAILABLE: case GLFW_FORMAT_UNAVAILABLE:
return "The requested format is unavailable"; return "The requested format is unavailable";
} }

45
src/input.c
View File

@ -115,34 +115,6 @@ static void setStickyMouseButtons(_GLFWwindow* window, int enabled)
} }
//========================================================================
// Set system keys for the specified window
//========================================================================
static void setSystemKeys(_GLFWwindow* window, int enabled)
{
if (window->systemKeys == enabled)
return;
if (enabled)
_glfwPlatformEnableSystemKeys(window);
else
_glfwPlatformDisableSystemKeys(window);
window->systemKeys = enabled;
}
//========================================================================
// Set key repeat for the specified window
//========================================================================
static void setKeyRepeat(_GLFWwindow* window, int enabled)
{
window->keyRepeat = enabled;
}
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
////// GLFW internal API ////// ////// GLFW internal API //////
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
@ -172,7 +144,7 @@ void _glfwInputKey(_GLFWwindow* window, int key, int action)
} }
// Call user callback function // Call user callback function
if (window->keyCallback && (window->keyRepeat || !repeated)) if (window->keyCallback && !repeated)
window->keyCallback(window, key, action); window->keyCallback(window, key, action);
} }
@ -295,10 +267,6 @@ GLFWAPI int glfwGetInputMode(GLFWwindow handle, int mode)
return window->stickyKeys; return window->stickyKeys;
case GLFW_STICKY_MOUSE_BUTTONS: case GLFW_STICKY_MOUSE_BUTTONS:
return window->stickyMouseButtons; return window->stickyMouseButtons;
case GLFW_SYSTEM_KEYS:
return window->systemKeys;
case GLFW_KEY_REPEAT:
return window->keyRepeat;
default: default:
_glfwSetError(GLFW_INVALID_ENUM, NULL); _glfwSetError(GLFW_INVALID_ENUM, NULL);
return 0; return 0;
@ -331,12 +299,6 @@ GLFWAPI void glfwSetInputMode(GLFWwindow handle, int mode, int value)
case GLFW_STICKY_MOUSE_BUTTONS: case GLFW_STICKY_MOUSE_BUTTONS:
setStickyMouseButtons(window, value ? GL_TRUE : GL_FALSE); setStickyMouseButtons(window, value ? GL_TRUE : GL_FALSE);
break; break;
case GLFW_SYSTEM_KEYS:
setSystemKeys(window, value ? GL_TRUE : GL_FALSE);
break;
case GLFW_KEY_REPEAT:
setKeyRepeat(window, value ? GL_TRUE : GL_FALSE);
break;
default: default:
_glfwSetError(GLFW_INVALID_ENUM, NULL); _glfwSetError(GLFW_INVALID_ENUM, NULL);
break; break;
@ -445,11 +407,8 @@ GLFWAPI void glfwSetCursorPos(GLFWwindow handle, int xpos, int ypos)
return; return;
} }
if (_glfwLibrary.activeWindow != window) if (_glfwLibrary.focusedWindow != window)
{
_glfwSetError(GLFW_WINDOW_NOT_ACTIVE, NULL);
return; return;
}
// Don't do anything if the cursor position did not change // Don't do anything if the cursor position did not change
if (xpos == window->cursorPosX && ypos == window->cursorPosY) if (xpos == window->cursorPosX && ypos == window->cursorPosY)

15
src/internal.h
View File

@ -100,6 +100,7 @@ struct _GLFWhints
GLboolean resizable; GLboolean resizable;
GLboolean visible; GLboolean visible;
int samples; int samples;
GLboolean sRGB;
int clientAPI; int clientAPI;
int glMajor; int glMajor;
int glMinor; int glMinor;
@ -107,6 +108,8 @@ struct _GLFWhints
GLboolean glDebug; GLboolean glDebug;
int glProfile; int glProfile;
int glRobustness; int glRobustness;
int positionX;
int positionY;
}; };
@ -123,6 +126,8 @@ struct _GLFWwndconfig
int refreshRate; int refreshRate;
GLboolean resizable; GLboolean resizable;
GLboolean visible; GLboolean visible;
int positionX;
int positionY;
int clientAPI; int clientAPI;
int glMajor; int glMajor;
int glMinor; int glMinor;
@ -156,6 +161,7 @@ struct _GLFWfbconfig
int auxBuffers; int auxBuffers;
GLboolean stereo; GLboolean stereo;
int samples; int samples;
GLboolean sRGB;
GLFWintptr platformID; GLFWintptr platformID;
}; };
@ -181,8 +187,6 @@ struct _GLFWwindow
// Window input state // Window input state
GLboolean stickyKeys; GLboolean stickyKeys;
GLboolean stickyMouseButtons; GLboolean stickyMouseButtons;
GLboolean keyRepeat;
GLboolean systemKeys; // system keys enabled flag
int cursorPosX, cursorPosY; int cursorPosX, cursorPosY;
int cursorMode; int cursorMode;
double scrollX, scrollY; double scrollX, scrollY;
@ -197,6 +201,7 @@ struct _GLFWwindow
int glRobustness; int glRobustness;
PFNGLGETSTRINGIPROC GetStringi; PFNGLGETSTRINGIPROC GetStringi;
GLFWwindowposfun windowPosCallback;
GLFWwindowsizefun windowSizeCallback; GLFWwindowsizefun windowSizeCallback;
GLFWwindowclosefun windowCloseCallback; GLFWwindowclosefun windowCloseCallback;
GLFWwindowrefreshfun windowRefreshCallback; GLFWwindowrefreshfun windowRefreshCallback;
@ -223,7 +228,7 @@ struct _GLFWlibrary
_GLFWhints hints; _GLFWhints hints;
_GLFWwindow* windowListHead; _GLFWwindow* windowListHead;
_GLFWwindow* activeWindow; _GLFWwindow* focusedWindow;
GLFWgammaramp currentRamp; GLFWgammaramp currentRamp;
GLFWgammaramp originalRamp; GLFWgammaramp originalRamp;
@ -291,7 +296,6 @@ int _glfwPlatformCreateWindow(_GLFWwindow* window, const _GLFWwndconfig* wndcon
void _glfwPlatformDestroyWindow(_GLFWwindow* window); void _glfwPlatformDestroyWindow(_GLFWwindow* window);
void _glfwPlatformSetWindowTitle(_GLFWwindow* window, const char* title); void _glfwPlatformSetWindowTitle(_GLFWwindow* window, const char* title);
void _glfwPlatformSetWindowSize(_GLFWwindow* window, int width, int height); void _glfwPlatformSetWindowSize(_GLFWwindow* window, int width, int height);
void _glfwPlatformSetWindowPos(_GLFWwindow* window, int x, int y);
void _glfwPlatformIconifyWindow(_GLFWwindow* window); void _glfwPlatformIconifyWindow(_GLFWwindow* window);
void _glfwPlatformRestoreWindow(_GLFWwindow* window); void _glfwPlatformRestoreWindow(_GLFWwindow* window);
void _glfwPlatformShowWindow(_GLFWwindow* window); void _glfwPlatformShowWindow(_GLFWwindow* window);
@ -309,7 +313,6 @@ void _glfwPlatformSwapInterval(int interval);
void _glfwPlatformRefreshWindowParams(_GLFWwindow* window); void _glfwPlatformRefreshWindowParams(_GLFWwindow* window);
int _glfwPlatformExtensionSupported(const char* extension); int _glfwPlatformExtensionSupported(const char* extension);
GLFWglproc _glfwPlatformGetProcAddress(const char* procname); GLFWglproc _glfwPlatformGetProcAddress(const char* procname);
void _glfwPlatformCopyContext(_GLFWwindow* src, _GLFWwindow* dst, unsigned long mask);
//======================================================================== //========================================================================
@ -320,7 +323,7 @@ void _glfwPlatformCopyContext(_GLFWwindow* src, _GLFWwindow* dst, unsigned long
//======================================================================== //========================================================================
// Window event notification (window.c) // Window event notification (window.c)
void _glfwInputWindowFocus(_GLFWwindow* window, GLboolean activated); void _glfwInputWindowFocus(_GLFWwindow* window, GLboolean focused);
void _glfwInputWindowPos(_GLFWwindow* window, int x, int y); void _glfwInputWindowPos(_GLFWwindow* window, int x, int y);
void _glfwInputWindowSize(_GLFWwindow* window, int width, int height); void _glfwInputWindowSize(_GLFWwindow* window, int width, int height);
void _glfwInputWindowIconify(_GLFWwindow* window, int iconified); void _glfwInputWindowIconify(_GLFWwindow* window, int iconified);

35
src/opengl.c
View File

@ -217,6 +217,12 @@ const _GLFWfbconfig* _glfwChooseFBConfig(const _GLFWfbconfig* desired,
extraDiff += (desired->samples - current->samples) * extraDiff += (desired->samples - current->samples) *
(desired->samples - current->samples); (desired->samples - current->samples);
} }
if (desired->sRGB)
{
if (!current->sRGB)
extraDiff++;
}
} }
// Figure out if the current one is better than the best one found so far // Figure out if the current one is better than the best one found so far
@ -682,32 +688,3 @@ GLFWAPI GLFWglproc glfwGetProcAddress(const char* procname)
return _glfwPlatformGetProcAddress(procname); return _glfwPlatformGetProcAddress(procname);
} }
//========================================================================
// Copies the specified OpenGL state categories from src to dst
//========================================================================
GLFWAPI void glfwCopyContext(GLFWwindow hsrc, GLFWwindow hdst, unsigned long mask)
{
_GLFWwindow* src;
_GLFWwindow* dst;
if (!_glfwInitialized)
{
_glfwSetError(GLFW_NOT_INITIALIZED, NULL);
return;
}
src = (_GLFWwindow*) hsrc;
dst = (_GLFWwindow*) hdst;
if (_glfwPlatformGetCurrentContext() == dst)
{
_glfwSetError(GLFW_INVALID_VALUE,
"glfwCopyContext: Cannot copy OpenGL state to a current context");
return;
}
_glfwPlatformCopyContext(src, dst, mask);
}

132
src/win32_input.c
View File

@ -1,132 +0,0 @@
//========================================================================
// GLFW - An OpenGL library
// Platform: Win32
// API version: 3.0
// WWW: http://www.glfw.org/
//------------------------------------------------------------------------
// Copyright (c) 2002-2006 Marcus Geelnard
// Copyright (c) 2006-2010 Camilla Berglund <elmindreda@elmindreda.org>
//
// This software is provided 'as-is', without any express or implied
// warranty. In no event will the authors be held liable for any damages
// arising from the use of this software.
//
// Permission is granted to anyone to use this software for any purpose,
// including commercial applications, and to alter it and redistribute it
// freely, subject to the following restrictions:
//
// 1. The origin of this software must not be misrepresented; you must not
// claim that you wrote the original software. If you use this software
// in a product, an acknowledgment in the product documentation would
// be appreciated but is not required.
//
// 2. Altered source versions must be plainly marked as such, and must not
// be misrepresented as being the original software.
//
// 3. This notice may not be removed or altered from any source
// distribution.
//
//========================================================================
#include "internal.h"
//========================================================================
// Low level keyboard hook (system callback) function
// Used to disable system keys under Windows NT
//========================================================================
static LRESULT CALLBACK keyboardHook(int nCode, WPARAM wParam, LPARAM lParam)
{
BOOL syskeys = FALSE;
PKBDLLHOOKSTRUCT p;
// We are only looking for keyboard events - interpret lParam as a
// pointer to a KBDLLHOOKSTRUCT
p = (PKBDLLHOOKSTRUCT) lParam;
if (nCode == HC_ACTION)
{
// We have a keyboard event
switch (wParam)
{
case WM_KEYDOWN:
case WM_SYSKEYDOWN:
case WM_KEYUP:
case WM_SYSKEYUP:
// Detect: ALT+TAB, ALT+ESC, ALT+F4, CTRL+ESC,
// LWIN, RWIN, APPS (mysterious menu key)
syskeys = (p->vkCode == VK_TAB &&
p->flags & LLKHF_ALTDOWN) ||
(p->vkCode == VK_ESCAPE &&
p->flags & LLKHF_ALTDOWN) ||
(p->vkCode == VK_F4 &&
p->flags & LLKHF_ALTDOWN) ||
(p->vkCode == VK_ESCAPE &&
(GetKeyState(VK_CONTROL) & 0x8000)) ||
p->vkCode == VK_LWIN ||
p->vkCode == VK_RWIN ||
p->vkCode == VK_APPS;
break;
default:
break;
}
}
// Was it a system key combination (e.g. ALT+TAB)?
if (syskeys)
{
_GLFWwindow* window = _glfwLibrary.activeWindow;
// Pass the key event to our window message loop
if (window)
PostMessage(window->Win32.handle, (UINT) wParam, p->vkCode, 0);
// We've taken care of it - don't let the system know about this
// key event
return 1;
}
else
{
// It's a harmless key press, let the system deal with it
return CallNextHookEx(_glfwLibrary.Win32.keyboardHook, nCode, wParam, lParam);
}
}
//////////////////////////////////////////////////////////////////////////
////// GLFW platform API //////
//////////////////////////////////////////////////////////////////////////
//========================================================================
// Enable system keys
//========================================================================
void _glfwPlatformEnableSystemKeys(_GLFWwindow* window)
{
UNREFERENCED_PARAMETER(window);
if (_glfwLibrary.Win32.keyboardHook != NULL)
{
UnhookWindowsHookEx(_glfwLibrary.Win32.keyboardHook);
_glfwLibrary.Win32.keyboardHook = NULL;
}
}
//========================================================================
// Disable system keys
//========================================================================
void _glfwPlatformDisableSystemKeys(_GLFWwindow* window)
{
UNREFERENCED_PARAMETER(window);
_glfwLibrary.Win32.keyboardHook = SetWindowsHookEx(WH_KEYBOARD_LL,
keyboardHook,
_glfwLibrary.Win32.instance,
0);
}

28
src/win32_opengl.c
View File

@ -72,6 +72,7 @@ static void initWGLExtensions(_GLFWwindow* window)
// This needs to include every extension used below except for // This needs to include every extension used below except for
// WGL_ARB_extensions_string and WGL_EXT_extensions_string // WGL_ARB_extensions_string and WGL_EXT_extensions_string
window->WGL.ARB_multisample = GL_FALSE; window->WGL.ARB_multisample = GL_FALSE;
window->WGL.ARB_framebuffer_sRGB = GL_FALSE;
window->WGL.ARB_create_context = GL_FALSE; window->WGL.ARB_create_context = GL_FALSE;
window->WGL.ARB_create_context_profile = GL_FALSE; window->WGL.ARB_create_context_profile = GL_FALSE;
window->WGL.EXT_create_context_es2_profile = GL_FALSE; window->WGL.EXT_create_context_es2_profile = GL_FALSE;
@ -92,6 +93,9 @@ static void initWGLExtensions(_GLFWwindow* window)
if (_glfwPlatformExtensionSupported("WGL_ARB_multisample")) if (_glfwPlatformExtensionSupported("WGL_ARB_multisample"))
window->WGL.ARB_multisample = GL_TRUE; window->WGL.ARB_multisample = GL_TRUE;
if (_glfwPlatformExtensionSupported("WGL_ARB_framebuffer_sRGB"))
window->WGL.ARB_framebuffer_sRGB = GL_TRUE;
if (_glfwPlatformExtensionSupported("WGL_ARB_create_context")) if (_glfwPlatformExtensionSupported("WGL_ARB_create_context"))
{ {
window->WGL.CreateContextAttribsARB = (PFNWGLCREATECONTEXTATTRIBSARBPROC) window->WGL.CreateContextAttribsARB = (PFNWGLCREATECONTEXTATTRIBSARBPROC)
@ -189,7 +193,7 @@ static _GLFWfbconfig* getFBConfigs(_GLFWwindow* window, unsigned int* found)
if (!available) if (!available)
{ {
_glfwSetError(GLFW_OPENGL_UNAVAILABLE, "WGL: No pixel formats found"); _glfwSetError(GLFW_API_UNAVAILABLE, "WGL: No pixel formats found");
return NULL; return NULL;
} }
@ -246,6 +250,11 @@ static _GLFWfbconfig* getFBConfigs(_GLFWwindow* window, unsigned int* found)
f->samples = getPixelFormatAttrib(window, i, WGL_SAMPLES_ARB); f->samples = getPixelFormatAttrib(window, i, WGL_SAMPLES_ARB);
else else
f->samples = 0; f->samples = 0;
if (window->WGL.ARB_framebuffer_sRGB)
f->sRGB = getPixelFormatAttrib(window, i, WGL_FRAMEBUFFER_SRGB_CAPABLE_ARB);
else
f->sRGB = GL_FALSE;
} }
else else
{ {
@ -293,6 +302,9 @@ static _GLFWfbconfig* getFBConfigs(_GLFWwindow* window, unsigned int* found)
// PFD pixel formats do not support FSAA // PFD pixel formats do not support FSAA
f->samples = 0; f->samples = 0;
// PFD pixel formats do not support sRGB
f->sRGB = GL_FALSE;
} }
f->platformID = i; f->platformID = i;
@ -637,17 +649,3 @@ GLFWglproc _glfwPlatformGetProcAddress(const char* procname)
return (GLFWglproc) wglGetProcAddress(procname); return (GLFWglproc) wglGetProcAddress(procname);
} }
//========================================================================
// Copies the specified OpenGL state categories from src to dst
//========================================================================
void _glfwPlatformCopyContext(_GLFWwindow* src, _GLFWwindow* dst, unsigned long mask)
{
if (!wglCopyContext(src->WGL.context, dst->WGL.context, mask))
{
_glfwSetError(GLFW_PLATFORM_ERROR,
"WGL: Failed to copy OpenGL context attributes");
}
}

2
src/win32_platform.h
View File

@ -144,6 +144,7 @@ typedef struct _GLFWcontextWGL
GLboolean EXT_swap_control; GLboolean EXT_swap_control;
GLboolean ARB_multisample; GLboolean ARB_multisample;
GLboolean ARB_pixel_format; GLboolean ARB_pixel_format;
GLboolean ARB_framebuffer_sRGB;
GLboolean ARB_create_context; GLboolean ARB_create_context;
GLboolean ARB_create_context_profile; GLboolean ARB_create_context_profile;
GLboolean EXT_create_context_es2_profile; GLboolean EXT_create_context_es2_profile;
@ -176,7 +177,6 @@ typedef struct _GLFWlibraryWin32
{ {
HINSTANCE instance; // Instance of the application HINSTANCE instance; // Instance of the application
ATOM classAtom; // Window class atom ATOM classAtom; // Window class atom
HHOOK keyboardHook; // Keyboard hook handle
DWORD foregroundLockTimeout; DWORD foregroundLockTimeout;
char* clipboardString; char* clipboardString;

57
src/win32_window.c
View File

@ -328,22 +328,22 @@ static LRESULT CALLBACK windowProc(HWND hWnd, UINT uMsg,
case WM_ACTIVATE: case WM_ACTIVATE:
{ {
// Window was (de)activated and/or (de)iconified // Window was (de)focused and/or (de)iconified
BOOL active = LOWORD(wParam) != WA_INACTIVE; BOOL focused = LOWORD(wParam) != WA_INACTIVE;
BOOL iconified = HIWORD(wParam) ? TRUE : FALSE; BOOL iconified = HIWORD(wParam) ? TRUE : FALSE;
if (active && iconified) if (focused && iconified)
{ {
// This is a workaround for window iconification using the // This is a workaround for window iconification using the
// taskbar leading to windows being told they're active and // taskbar leading to windows being told they're focused and
// iconified and then never told they're deactivated // iconified and then never told they're defocused
active = FALSE; focused = FALSE;
} }
if (!active && _glfwLibrary.activeWindow == window) if (!focused && _glfwLibrary.focusedWindow == window)
{ {
// The window was deactivated (or iconified, see above) // The window was defocused (or iconified, see above)
if (window->cursorMode == GLFW_CURSOR_CAPTURED) if (window->cursorMode == GLFW_CURSOR_CAPTURED)
showCursor(window); showCursor(window);
@ -364,9 +364,9 @@ static LRESULT CALLBACK windowProc(HWND hWnd, UINT uMsg,
} }
} }
} }
else if (active && _glfwLibrary.activeWindow != window) else if (focused && _glfwLibrary.focusedWindow != window)
{ {
// The window was activated // The window was focused
if (window->cursorMode == GLFW_CURSOR_CAPTURED) if (window->cursorMode == GLFW_CURSOR_CAPTURED)
captureCursor(window); captureCursor(window);
@ -386,7 +386,7 @@ static LRESULT CALLBACK windowProc(HWND hWnd, UINT uMsg,
} }
} }
_glfwInputWindowFocus(window, active); _glfwInputWindowFocus(window, focused);
_glfwInputWindowIconify(window, iconified); _glfwInputWindowIconify(window, iconified);
return 0; return 0;
} }
@ -544,7 +544,7 @@ static LRESULT CALLBACK windowProc(HWND hWnd, UINT uMsg,
if (window->cursorMode == GLFW_CURSOR_CAPTURED) if (window->cursorMode == GLFW_CURSOR_CAPTURED)
{ {
if (_glfwLibrary.activeWindow != window) if (_glfwLibrary.focusedWindow != window)
return 0; return 0;
x = newCursorX - window->Win32.oldCursorX; x = newCursorX - window->Win32.oldCursorX;
@ -772,7 +772,11 @@ static int createWindow(_GLFWwindow* window,
if (window->mode == GLFW_FULLSCREEN) if (window->mode == GLFW_FULLSCREEN)
wa.left = wa.top = 0; wa.left = wa.top = 0;
else else
{
SystemParametersInfo(SPI_GETWORKAREA, 0, &wa, 0); SystemParametersInfo(SPI_GETWORKAREA, 0, &wa, 0);
wa.left += wndconfig->positionX;
wa.top += wndconfig->positionY;
}
wideTitle = _glfwCreateWideStringFromUTF8(wndconfig->title); wideTitle = _glfwCreateWideStringFromUTF8(wndconfig->title);
if (!wideTitle) if (!wideTitle)
@ -825,8 +829,8 @@ static void destroyWindow(_GLFWwindow* window)
// This is duplicated from glfwDestroyWindow // This is duplicated from glfwDestroyWindow
// TODO: Stop duplicating code // TODO: Stop duplicating code
if (window == _glfwLibrary.activeWindow) if (window == _glfwLibrary.focusedWindow)
_glfwLibrary.activeWindow = NULL; _glfwLibrary.focusedWindow = NULL;
if (window->Win32.handle) if (window->Win32.handle)
{ {
@ -1054,23 +1058,6 @@ void _glfwPlatformSetWindowSize(_GLFWwindow* window, int width, int height)
} }
//========================================================================
// Set the window position
//========================================================================
void _glfwPlatformSetWindowPos(_GLFWwindow* window, int x, int y)
{
RECT rect;
GetClientRect(window->Win32.handle, &rect);
AdjustWindowRectEx(&rect, window->Win32.dwStyle, FALSE, window->Win32.dwExStyle);
SetWindowPos(window->Win32.handle, HWND_TOP,
x + rect.left, y + rect.top, 0, 0,
SWP_NOOWNERZORDER | SWP_NOSIZE | SWP_NOZORDER);
}
//======================================================================== //========================================================================
// Window iconification // Window iconification
//======================================================================== //========================================================================
@ -1145,7 +1132,7 @@ void _glfwPlatformPollEvents(void)
MSG msg; MSG msg;
_GLFWwindow* window; _GLFWwindow* window;
window = _glfwLibrary.activeWindow; window = _glfwLibrary.focusedWindow;
if (window) if (window)
{ {
window->Win32.cursorCentered = GL_FALSE; window->Win32.cursorCentered = GL_FALSE;
@ -1181,7 +1168,7 @@ void _glfwPlatformPollEvents(void)
// LSHIFT/RSHIFT fixup (keys tend to "stick" without this fix) // LSHIFT/RSHIFT fixup (keys tend to "stick" without this fix)
// This is the only async event handling in GLFW, but it solves some // This is the only async event handling in GLFW, but it solves some
// nasty problems. // nasty problems.
window = _glfwLibrary.activeWindow; window = _glfwLibrary.focusedWindow;
if (window) if (window)
{ {
int lshift_down, rshift_down; int lshift_down, rshift_down;
@ -1199,8 +1186,8 @@ void _glfwPlatformPollEvents(void)
_glfwInputKey(window, GLFW_KEY_RIGHT_SHIFT, GLFW_RELEASE); _glfwInputKey(window, GLFW_KEY_RIGHT_SHIFT, GLFW_RELEASE);
} }
// Did the cursor move in an active window that has captured the cursor // Did the cursor move in an focused window that has captured the cursor
window = _glfwLibrary.activeWindow; window = _glfwLibrary.focusedWindow;
if (window) if (window)
{ {
if (window->cursorMode == GLFW_CURSOR_CAPTURED && if (window->cursorMode == GLFW_CURSOR_CAPTURED &&

136
src/window.c
View File

@ -72,21 +72,21 @@ static void clearScrollOffsets(void)
// Register window focus events // Register window focus events
//======================================================================== //========================================================================
void _glfwInputWindowFocus(_GLFWwindow* window, GLboolean activated) void _glfwInputWindowFocus(_GLFWwindow* window, GLboolean focused)
{ {
if (activated) if (focused)
{ {
if (_glfwLibrary.activeWindow != window) if (_glfwLibrary.focusedWindow != window)
{ {
_glfwLibrary.activeWindow = window; _glfwLibrary.focusedWindow = window;
if (window->windowFocusCallback) if (window->windowFocusCallback)
window->windowFocusCallback(window, activated); window->windowFocusCallback(window, focused);
} }
} }
else else
{ {
if (_glfwLibrary.activeWindow == window) if (_glfwLibrary.focusedWindow == window)
{ {
int i; int i;
@ -104,10 +104,10 @@ void _glfwInputWindowFocus(_GLFWwindow* window, GLboolean activated)
_glfwInputMouseClick(window, i, GLFW_RELEASE); _glfwInputMouseClick(window, i, GLFW_RELEASE);
} }
_glfwLibrary.activeWindow = NULL; _glfwLibrary.focusedWindow = NULL;
if (window->windowFocusCallback) if (window->windowFocusCallback)
window->windowFocusCallback(window, activated); window->windowFocusCallback(window, focused);
} }
} }
} }
@ -119,8 +119,14 @@ void _glfwInputWindowFocus(_GLFWwindow* window, GLboolean activated)
void _glfwInputWindowPos(_GLFWwindow* window, int x, int y) void _glfwInputWindowPos(_GLFWwindow* window, int x, int y)
{ {
if (window->positionX == x && window->positionY == y)
return;
window->positionX = x; window->positionX = x;
window->positionY = y; window->positionY = y;
if (window->windowPosCallback)
window->windowPosCallback(window, x, y);
} }
@ -231,6 +237,7 @@ GLFWAPI GLFWwindow glfwCreateWindow(int width, int height,
fbconfig.auxBuffers = Max(_glfwLibrary.hints.auxBuffers, 0); fbconfig.auxBuffers = Max(_glfwLibrary.hints.auxBuffers, 0);
fbconfig.stereo = _glfwLibrary.hints.stereo ? GL_TRUE : GL_FALSE; fbconfig.stereo = _glfwLibrary.hints.stereo ? GL_TRUE : GL_FALSE;
fbconfig.samples = Max(_glfwLibrary.hints.samples, 0); fbconfig.samples = Max(_glfwLibrary.hints.samples, 0);
fbconfig.sRGB = _glfwLibrary.hints.sRGB ? GL_TRUE : GL_FALSE;
// Set up desired window config // Set up desired window config
wndconfig.mode = mode; wndconfig.mode = mode;
@ -238,6 +245,8 @@ GLFWAPI GLFWwindow glfwCreateWindow(int width, int height,
wndconfig.refreshRate = Max(_glfwLibrary.hints.refreshRate, 0); wndconfig.refreshRate = Max(_glfwLibrary.hints.refreshRate, 0);
wndconfig.resizable = _glfwLibrary.hints.resizable ? GL_TRUE : GL_FALSE; wndconfig.resizable = _glfwLibrary.hints.resizable ? GL_TRUE : GL_FALSE;
wndconfig.visible = _glfwLibrary.hints.visible ? GL_TRUE : GL_FALSE; wndconfig.visible = _glfwLibrary.hints.visible ? GL_TRUE : GL_FALSE;
wndconfig.positionX = _glfwLibrary.hints.positionX;
wndconfig.positionY = _glfwLibrary.hints.positionY;
wndconfig.clientAPI = _glfwLibrary.hints.clientAPI; wndconfig.clientAPI = _glfwLibrary.hints.clientAPI;
wndconfig.glMajor = _glfwLibrary.hints.glMajor; wndconfig.glMajor = _glfwLibrary.hints.glMajor;
wndconfig.glMinor = _glfwLibrary.hints.glMinor; wndconfig.glMinor = _glfwLibrary.hints.glMinor;
@ -261,22 +270,11 @@ GLFWAPI GLFWwindow glfwCreateWindow(int width, int height,
return GL_FALSE; return GL_FALSE;
} }
// Check width & height if (width <= 0 || height <= 0)
if (width > 0 && height <= 0)
{ {
// Set the window aspect ratio to 4:3 _glfwSetError(GLFW_INVALID_VALUE,
height = (width * 3) / 4; "glfwCreateWindow: Invalid window size");
} return GL_FALSE;
else if (width <= 0 && height > 0)
{
// Set the window aspect ratio to 4:3
width = (height * 4) / 3;
}
else if (width <= 0 && height <= 0)
{
// Default window size
width = 640;
height = 480;
} }
window = (_GLFWwindow*) calloc(1, sizeof(_GLFWwindow)); window = (_GLFWwindow*) calloc(1, sizeof(_GLFWwindow));
@ -295,7 +293,6 @@ GLFWAPI GLFWwindow glfwCreateWindow(int width, int height,
window->mode = mode; window->mode = mode;
window->resizable = wndconfig.resizable; window->resizable = wndconfig.resizable;
window->cursorMode = GLFW_CURSOR_NORMAL; window->cursorMode = GLFW_CURSOR_NORMAL;
window->systemKeys = GL_TRUE;
// Open the actual window and create its context // Open the actual window and create its context
if (!_glfwPlatformCreateWindow(window, &wndconfig, &fbconfig)) if (!_glfwPlatformCreateWindow(window, &wndconfig, &fbconfig))
@ -369,6 +366,10 @@ void glfwDefaultWindowHints(void)
_glfwLibrary.hints.resizable = GL_TRUE; _glfwLibrary.hints.resizable = GL_TRUE;
_glfwLibrary.hints.visible = GL_TRUE; _glfwLibrary.hints.visible = GL_TRUE;
// The default window position is the upper left corner of the screen
_glfwLibrary.hints.positionX = 0;
_glfwLibrary.hints.positionY = 0;
// The default is 24 bits of color, 24 bits of depth and 8 bits of stencil // The default is 24 bits of color, 24 bits of depth and 8 bits of stencil
_glfwLibrary.hints.redBits = 8; _glfwLibrary.hints.redBits = 8;
_glfwLibrary.hints.greenBits = 8; _glfwLibrary.hints.greenBits = 8;
@ -437,9 +438,18 @@ GLFWAPI void glfwWindowHint(int target, int hint)
case GLFW_VISIBLE: case GLFW_VISIBLE:
_glfwLibrary.hints.visible = hint; _glfwLibrary.hints.visible = hint;
break; break;
case GLFW_POSITION_X:
_glfwLibrary.hints.positionX = hint;
break;
case GLFW_POSITION_Y:
_glfwLibrary.hints.positionY = hint;
break;
case GLFW_FSAA_SAMPLES: case GLFW_FSAA_SAMPLES:
_glfwLibrary.hints.samples = hint; _glfwLibrary.hints.samples = hint;
break; break;
case GLFW_SRGB_CAPABLE:
_glfwLibrary.hints.sRGB = hint;
break;
case GLFW_CLIENT_API: case GLFW_CLIENT_API:
_glfwLibrary.hints.clientAPI = hint; _glfwLibrary.hints.clientAPI = hint;
break; break;
@ -491,9 +501,9 @@ GLFWAPI void glfwDestroyWindow(GLFWwindow handle)
if (window == _glfwPlatformGetCurrentContext()) if (window == _glfwPlatformGetCurrentContext())
_glfwPlatformMakeContextCurrent(NULL); _glfwPlatformMakeContextCurrent(NULL);
// Clear the active window pointer if this is the active window // Clear the focused window pointer if this is the focused window
if (window == _glfwLibrary.activeWindow) if (window == _glfwLibrary.focusedWindow)
_glfwLibrary.activeWindow = NULL; _glfwLibrary.focusedWindow = NULL;
_glfwPlatformDestroyWindow(window); _glfwPlatformDestroyWindow(window);
@ -586,52 +596,6 @@ GLFWAPI void glfwSetWindowSize(GLFWwindow handle, int width, int height)
} }
//========================================================================
// Get the window position
//========================================================================
GLFWAPI void glfwGetWindowPos(GLFWwindow handle, int* xpos, int* ypos)
{
_GLFWwindow* window = (_GLFWwindow*) handle;
if (!_glfwInitialized)
{
_glfwSetError(GLFW_NOT_INITIALIZED, NULL);
return;
}
if (xpos != NULL)
*xpos = window->positionX;
if (ypos != NULL)
*ypos = window->positionY;
}
//========================================================================
// Set the window position
//========================================================================
GLFWAPI void glfwSetWindowPos(GLFWwindow handle, int xpos, int ypos)
{
_GLFWwindow* window = (_GLFWwindow*) handle;
if (!_glfwInitialized)
{
_glfwSetError(GLFW_NOT_INITIALIZED, NULL);
return;
}
if (window->mode == GLFW_FULLSCREEN || window->iconified)
{
// TODO: Figure out if this is an error
return;
}
_glfwPlatformSetWindowPos(window, xpos, ypos);
}
//======================================================================== //========================================================================
// Window iconification // Window iconification
//======================================================================== //========================================================================
@ -735,8 +699,8 @@ GLFWAPI int glfwGetWindowParam(GLFWwindow handle, int param)
switch (param) switch (param)
{ {
case GLFW_ACTIVE: case GLFW_FOCUSED:
return window == _glfwLibrary.activeWindow; return window == _glfwLibrary.focusedWindow;
case GLFW_ICONIFIED: case GLFW_ICONIFIED:
return window->iconified; return window->iconified;
case GLFW_CLOSE_REQUESTED: case GLFW_CLOSE_REQUESTED:
@ -747,6 +711,10 @@ GLFWAPI int glfwGetWindowParam(GLFWwindow handle, int param)
return window->resizable; return window->resizable;
case GLFW_VISIBLE: case GLFW_VISIBLE:
return window->visible; return window->visible;
case GLFW_POSITION_X:
return window->positionX;
case GLFW_POSITION_Y:
return window->positionY;
case GLFW_CLIENT_API: case GLFW_CLIENT_API:
return window->clientAPI; return window->clientAPI;
case GLFW_OPENGL_VERSION_MAJOR: case GLFW_OPENGL_VERSION_MAJOR:
@ -806,6 +774,24 @@ GLFWAPI void* glfwGetWindowUserPointer(GLFWwindow handle)
} }
//========================================================================
// Set callback function for window position changes
//========================================================================
GLFWAPI void glfwSetWindowPosCallback(GLFWwindow handle, GLFWwindowposfun cbfun)
{
_GLFWwindow* window = (_GLFWwindow*) handle;
if (!_glfwInitialized)
{
_glfwSetError(GLFW_NOT_INITIALIZED, NULL);
return;
}
window->windowPosCallback = cbfun;
}
//======================================================================== //========================================================================
// Set callback function for window size changes // Set callback function for window size changes
//======================================================================== //========================================================================

2
src/x11_init.c
View File

@ -491,7 +491,7 @@ static GLboolean initDisplay(void)
_glfwLibrary.X11.display = XOpenDisplay(NULL); _glfwLibrary.X11.display = XOpenDisplay(NULL);
if (!_glfwLibrary.X11.display) if (!_glfwLibrary.X11.display)
{ {
_glfwSetError(GLFW_OPENGL_UNAVAILABLE, "X11: Failed to open X display"); _glfwSetError(GLFW_API_UNAVAILABLE, "X11: Failed to open X display");
return GL_FALSE; return GL_FALSE;
} }

65
src/x11_input.c
View File

@ -1,65 +0,0 @@
//========================================================================
// GLFW - An OpenGL library
// Platform: X11
// API version: 3.0
// WWW: http://www.glfw.org/
//------------------------------------------------------------------------
// Copyright (c) 2002-2006 Marcus Geelnard
// Copyright (c) 2006-2010 Camilla Berglund <elmindreda@elmindreda.org>
//
// This software is provided 'as-is', without any express or implied
// warranty. In no event will the authors be held liable for any damages
// arising from the use of this software.
//
// Permission is granted to anyone to use this software for any purpose,
// including commercial applications, and to alter it and redistribute it
// freely, subject to the following restrictions:
//
// 1. The origin of this software must not be misrepresented; you must not
// claim that you wrote the original software. If you use this software
// in a product, an acknowledgment in the product documentation would
// be appreciated but is not required.
//
// 2. Altered source versions must be plainly marked as such, and must not
// be misrepresented as being the original software.
//
// 3. This notice may not be removed or altered from any source
// distribution.
//
//========================================================================
#include "internal.h"
//////////////////////////////////////////////////////////////////////////
////// GLFW platform API //////
//////////////////////////////////////////////////////////////////////////
//========================================================================
// Enable system keys
//========================================================================
void _glfwPlatformEnableSystemKeys(_GLFWwindow* window)
{
if (window->X11.keyboardGrabbed)
{
XUngrabKeyboard(_glfwLibrary.X11.display, CurrentTime);
window->X11.keyboardGrabbed = GL_FALSE;
}
}
//========================================================================
// Disable system keys
//========================================================================
void _glfwPlatformDisableSystemKeys(_GLFWwindow* window)
{
if (XGrabKeyboard(_glfwLibrary.X11.display, window->X11.handle,
True, GrabModeAsync, GrabModeAsync, CurrentTime)
== GrabSuccess)
{
window->X11.keyboardGrabbed = GL_TRUE;
}
}

36
src/x11_opengl.c
View File

@ -93,7 +93,7 @@ static _GLFWfbconfig* getFBConfigs(_GLFWwindow* window, unsigned int* found)
{ {
if (!_glfwLibrary.GLX.SGIX_fbconfig) if (!_glfwLibrary.GLX.SGIX_fbconfig)
{ {
_glfwSetError(GLFW_OPENGL_UNAVAILABLE, _glfwSetError(GLFW_API_UNAVAILABLE,
"GLX: GLXFBConfig support not found"); "GLX: GLXFBConfig support not found");
return NULL; return NULL;
} }
@ -103,8 +103,8 @@ static _GLFWfbconfig* getFBConfigs(_GLFWwindow* window, unsigned int* found)
if (strcmp(vendor, "Chromium") == 0) if (strcmp(vendor, "Chromium") == 0)
{ {
// This is a (hopefully temporary) workaround for Chromium (VirtualBox // HACK: This is a (hopefully temporary) workaround for Chromium
// GL) not setting the window bit on any GLXFBConfigs // (VirtualBox GL) not setting the window bit on any GLXFBConfigs
trustWindowBit = GL_FALSE; trustWindowBit = GL_FALSE;
} }
@ -116,7 +116,7 @@ static _GLFWfbconfig* getFBConfigs(_GLFWwindow* window, unsigned int* found)
&count); &count);
if (!count) if (!count)
{ {
_glfwSetError(GLFW_OPENGL_UNAVAILABLE, _glfwSetError(GLFW_API_UNAVAILABLE,
"GLX: No GLXFBConfigs returned"); "GLX: No GLXFBConfigs returned");
return NULL; return NULL;
} }
@ -128,7 +128,7 @@ static _GLFWfbconfig* getFBConfigs(_GLFWwindow* window, unsigned int* found)
&count); &count);
if (!count) if (!count)
{ {
_glfwSetError(GLFW_OPENGL_UNAVAILABLE, _glfwSetError(GLFW_API_UNAVAILABLE,
"GLX: No GLXFBConfigs returned"); "GLX: No GLXFBConfigs returned");
return NULL; return NULL;
} }
@ -190,6 +190,11 @@ static _GLFWfbconfig* getFBConfigs(_GLFWwindow* window, unsigned int* found)
else else
f->samples = 0; f->samples = 0;
if (_glfwLibrary.GLX.ARB_framebuffer_sRGB)
f->sRGB = getFBConfigAttrib(window, fbconfigs[i], GLX_FRAMEBUFFER_SRGB_CAPABLE_ARB);
else
f->sRGB = GL_FALSE;
f->platformID = (GLFWintptr) getFBConfigAttrib(window, fbconfigs[i], GLX_FBCONFIG_ID); f->platformID = (GLFWintptr) getFBConfigAttrib(window, fbconfigs[i], GLX_FBCONFIG_ID);
(*found)++; (*found)++;
@ -465,7 +470,7 @@ int _glfwInitOpenGL(void)
// Check if GLX is supported on this display // Check if GLX is supported on this display
if (!glXQueryExtension(_glfwLibrary.X11.display, NULL, NULL)) if (!glXQueryExtension(_glfwLibrary.X11.display, NULL, NULL))
{ {
_glfwSetError(GLFW_OPENGL_UNAVAILABLE, "GLX: GLX support not found"); _glfwSetError(GLFW_API_UNAVAILABLE, "GLX: GLX support not found");
return GL_FALSE; return GL_FALSE;
} }
@ -473,8 +478,7 @@ int _glfwInitOpenGL(void)
&_glfwLibrary.GLX.majorVersion, &_glfwLibrary.GLX.majorVersion,
&_glfwLibrary.GLX.minorVersion)) &_glfwLibrary.GLX.minorVersion))
{ {
_glfwSetError(GLFW_OPENGL_UNAVAILABLE, _glfwSetError(GLFW_API_UNAVAILABLE, "GLX: Failed to query GLX version");
"GLX: Failed to query GLX version");
return GL_FALSE; return GL_FALSE;
} }
@ -528,6 +532,9 @@ int _glfwInitOpenGL(void)
if (_glfwPlatformExtensionSupported("GLX_ARB_multisample")) if (_glfwPlatformExtensionSupported("GLX_ARB_multisample"))
_glfwLibrary.GLX.ARB_multisample = GL_TRUE; _glfwLibrary.GLX.ARB_multisample = GL_TRUE;
if (_glfwPlatformExtensionSupported("GLX_ARB_framebuffer_sRGB"))
_glfwLibrary.GLX.ARB_framebuffer_sRGB = GL_TRUE;
if (_glfwPlatformExtensionSupported("GLX_ARB_create_context")) if (_glfwPlatformExtensionSupported("GLX_ARB_create_context"))
{ {
_glfwLibrary.GLX.CreateContextAttribsARB = (PFNGLXCREATECONTEXTATTRIBSARBPROC) _glfwLibrary.GLX.CreateContextAttribsARB = (PFNGLXCREATECONTEXTATTRIBSARBPROC)
@ -732,16 +739,3 @@ GLFWglproc _glfwPlatformGetProcAddress(const char* procname)
return _glfw_glXGetProcAddress((const GLubyte*) procname); return _glfw_glXGetProcAddress((const GLubyte*) procname);
} }
//========================================================================
// Copies the specified OpenGL state categories from src to dst
//========================================================================
void _glfwPlatformCopyContext(_GLFWwindow* src, _GLFWwindow* dst, unsigned long mask)
{
glXCopyContext(_glfwLibrary.X11.display,
src->GLX.context,
dst->GLX.context,
mask);
}

8
src/x11_platform.h
View File

@ -135,12 +135,17 @@ typedef struct _GLFWwindowX11
// Various platform specific internal variables // Various platform specific internal variables
GLboolean overrideRedirect; // True if window is OverrideRedirect GLboolean overrideRedirect; // True if window is OverrideRedirect
GLboolean keyboardGrabbed; // True if keyboard is currently grabbed
GLboolean cursorGrabbed; // True if cursor is currently grabbed GLboolean cursorGrabbed; // True if cursor is currently grabbed
GLboolean cursorHidden; // True if cursor is currently hidden GLboolean cursorHidden; // True if cursor is currently hidden
GLboolean cursorCentered; // True if cursor was moved since last poll GLboolean cursorCentered; // True if cursor was moved since last poll
int cursorPosX, cursorPosY; int cursorPosX, cursorPosY;
// Window position hint (commited the first time the window is shown)
GLboolean windowPosSet; // False until the window position has
// been set
int positionX; // The window position to be set the
int positionY; // first time the window is shown
} _GLFWwindowX11; } _GLFWwindowX11;
@ -268,6 +273,7 @@ typedef struct _GLFWlibraryGLX
GLboolean EXT_swap_control; GLboolean EXT_swap_control;
GLboolean MESA_swap_control; GLboolean MESA_swap_control;
GLboolean ARB_multisample; GLboolean ARB_multisample;
GLboolean ARB_framebuffer_sRGB;
GLboolean ARB_create_context; GLboolean ARB_create_context;
GLboolean ARB_create_context_profile; GLboolean ARB_create_context_profile;
GLboolean ARB_create_context_robustness; GLboolean ARB_create_context_robustness;

33
src/x11_window.c
View File

@ -119,7 +119,7 @@ static GLboolean createWindow(_GLFWwindow* window,
window->X11.handle = XCreateWindow(_glfwLibrary.X11.display, window->X11.handle = XCreateWindow(_glfwLibrary.X11.display,
_glfwLibrary.X11.root, _glfwLibrary.X11.root,
0, 0, // Position wndconfig->positionX, wndconfig->positionY,
window->width, window->height, window->width, window->height,
0, // Border width 0, // Border width
visual->depth, // Color depth visual->depth, // Color depth
@ -136,6 +136,12 @@ static GLboolean createWindow(_GLFWwindow* window,
_glfwSetError(GLFW_PLATFORM_ERROR, "X11: Failed to create window"); _glfwSetError(GLFW_PLATFORM_ERROR, "X11: Failed to create window");
return GL_FALSE; return GL_FALSE;
} }
// Request a window position to be set once the window is shown
// (see _glfwPlatformShowWindow)
window->X11.windowPosSet = GL_FALSE;
window->X11.positionX = wndconfig->positionX;
window->X11.positionY = wndconfig->positionY;
} }
if (window->mode == GLFW_FULLSCREEN && !_glfwLibrary.X11.hasEWMH) if (window->mode == GLFW_FULLSCREEN && !_glfwLibrary.X11.hasEWMH)
@ -626,7 +632,7 @@ static void processEvent(XEvent *event)
if (window->cursorMode == GLFW_CURSOR_CAPTURED) if (window->cursorMode == GLFW_CURSOR_CAPTURED)
{ {
if (_glfwLibrary.activeWindow != window) if (_glfwLibrary.focusedWindow != window)
break; break;
x = event->xmotion.x - window->X11.cursorPosX; x = event->xmotion.x - window->X11.cursorPosX;
@ -1006,16 +1012,6 @@ void _glfwPlatformSetWindowSize(_GLFWwindow* window, int width, int height)
} }
//========================================================================
// Set the window position.
//========================================================================
void _glfwPlatformSetWindowPos(_GLFWwindow* window, int x, int y)
{
XMoveWindow(_glfwLibrary.X11.display, window->X11.handle, x, y);
}
//======================================================================== //========================================================================
// Window iconification // Window iconification
//======================================================================== //========================================================================
@ -1060,6 +1056,15 @@ void _glfwPlatformShowWindow(_GLFWwindow* window)
{ {
XMapRaised(_glfwLibrary.X11.display, window->X11.handle); XMapRaised(_glfwLibrary.X11.display, window->X11.handle);
XFlush(_glfwLibrary.X11.display); XFlush(_glfwLibrary.X11.display);
// Set the window position the first time the window is shown
// Note: XMoveWindow has no effect before the window has been mapped.
if (!window->X11.windowPosSet)
{
XMoveWindow(_glfwLibrary.X11.display, window->X11.handle,
window->X11.positionX, window->X11.positionY);
window->X11.windowPosSet = GL_TRUE;
}
} }
@ -1129,11 +1134,11 @@ void _glfwPlatformPollEvents(void)
processEvent(&event); processEvent(&event);
} }
// Check whether the cursor has moved inside an active window that has // Check whether the cursor has moved inside an focused window that has
// captured the cursor (because then it needs to be re-centered) // captured the cursor (because then it needs to be re-centered)
_GLFWwindow* window; _GLFWwindow* window;
window = _glfwLibrary.activeWindow; window = _glfwLibrary.focusedWindow;
if (window) if (window)
{ {
if (window->cursorMode == GLFW_CURSOR_CAPTURED && if (window->cursorMode == GLFW_CURSOR_CAPTURED &&

2
tests/clipboard.c
View File

@ -125,7 +125,7 @@ int main(int argc, char** argv)
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
window = glfwCreateWindow(0, 0, GLFW_WINDOWED, "Clipboard Test", NULL); window = glfwCreateWindow(200, 200, GLFW_WINDOWED, "Clipboard Test", NULL);
if (!window) if (!window)
{ {
glfwTerminate(); glfwTerminate();

2
tests/defaults.c
View File

@ -85,7 +85,7 @@ int main(void)
glfwWindowHint(GLFW_VISIBLE, GL_FALSE); glfwWindowHint(GLFW_VISIBLE, GL_FALSE);
window = glfwCreateWindow(0, 0, GLFW_WINDOWED, "Defaults", NULL); window = glfwCreateWindow(640, 480, GLFW_WINDOWED, "Defaults", NULL);
if (!window) if (!window)
{ {
glfwTerminate(); glfwTerminate();

39
tests/events.c
View File

@ -41,8 +41,6 @@
#include <locale.h> #include <locale.h>
// These must match the input mode defaults // These must match the input mode defaults
static GLboolean keyrepeat = GL_FALSE;
static GLboolean systemkeys = GL_TRUE;
static GLboolean closeable = GL_TRUE; static GLboolean closeable = GL_TRUE;
// Event index // Event index
@ -220,6 +218,15 @@ static const char* get_character_string(int character)
return result; return result;
} }
static void window_pos_callback(GLFWwindow window, int x, int y)
{
printf("%08x at %0.3f: Window position: %i %i\n",
counter++,
glfwGetTime(),
x,
y);
}
static void window_size_callback(GLFWwindow window, int width, int height) static void window_size_callback(GLFWwindow window, int width, int height)
{ {
printf("%08x at %0.3f: Window size: %i %i\n", printf("%08x at %0.3f: Window size: %i %i\n",
@ -249,12 +256,12 @@ static void window_refresh_callback(GLFWwindow window)
} }
} }
static void window_focus_callback(GLFWwindow window, int activated) static void window_focus_callback(GLFWwindow window, int focused)
{ {
printf("%08x at %0.3f: Window %s\n", printf("%08x at %0.3f: Window %s\n",
counter++, counter++,
glfwGetTime(), glfwGetTime(),
activated ? "activated" : "deactivated"); focused ? "focused" : "defocused");
} }
static void window_iconify_callback(GLFWwindow window, int iconified) static void window_iconify_callback(GLFWwindow window, int iconified)
@ -311,24 +318,6 @@ static void key_callback(GLFWwindow window, int key, int action)
switch (key) switch (key)
{ {
case GLFW_KEY_R:
{
keyrepeat = !keyrepeat;
glfwSetInputMode(window, GLFW_KEY_REPEAT, keyrepeat);
printf("(( key repeat %s ))\n", keyrepeat ? "enabled" : "disabled");
break;
}
case GLFW_KEY_S:
{
systemkeys = !systemkeys;
glfwSetInputMode(window, GLFW_SYSTEM_KEYS, systemkeys);
printf("(( system keys %s ))\n", systemkeys ? "enabled" : "disabled");
break;
}
case GLFW_KEY_C: case GLFW_KEY_C:
{ {
closeable = !closeable; closeable = !closeable;
@ -363,7 +352,7 @@ int main(void)
printf("Library initialized\n"); printf("Library initialized\n");
window = glfwCreateWindow(0, 0, GLFW_WINDOWED, "Event Linter", NULL); window = glfwCreateWindow(640, 480, GLFW_WINDOWED, "Event Linter", NULL);
if (!window) if (!window)
{ {
glfwTerminate(); glfwTerminate();
@ -374,6 +363,7 @@ int main(void)
printf("Window opened\n"); printf("Window opened\n");
glfwSetWindowPosCallback(window, window_pos_callback);
glfwSetWindowSizeCallback(window, window_size_callback); glfwSetWindowSizeCallback(window, window_size_callback);
glfwSetWindowCloseCallback(window, window_close_callback); glfwSetWindowCloseCallback(window, window_close_callback);
glfwSetWindowRefreshCallback(window, window_refresh_callback); glfwSetWindowRefreshCallback(window, window_refresh_callback);
@ -392,9 +382,6 @@ int main(void)
glfwGetWindowSize(window, &width, &height); glfwGetWindowSize(window, &width, &height);
printf("Window size should be %ix%i\n", width, height); printf("Window size should be %ix%i\n", width, height);
printf("Key repeat should be %s\n", keyrepeat ? "enabled" : "disabled");
printf("System keys should be %s\n", systemkeys ? "enabled" : "disabled");
printf("Main loop starting\n"); printf("Main loop starting\n");
while (!glfwGetWindowParam(window, GLFW_CLOSE_REQUESTED)) while (!glfwGetWindowParam(window, GLFW_CLOSE_REQUESTED))

6
tests/fsfocus.c
View File

@ -23,7 +23,7 @@
// //
//======================================================================== //========================================================================
// //
// This test is used to test window activation and iconfication for // This test is used to test window focusing and iconfication for
// fullscreen windows with a video mode differing from the desktop mode // fullscreen windows with a video mode differing from the desktop mode
// //
//======================================================================== //========================================================================
@ -35,11 +35,11 @@
static GLboolean running = GL_TRUE; static GLboolean running = GL_TRUE;
static void window_focus_callback(GLFWwindow window, int activated) static void window_focus_callback(GLFWwindow window, int focused)
{ {
printf("%0.3f: Window %s\n", printf("%0.3f: Window %s\n",
glfwGetTime(), glfwGetTime(),
activated ? "activated" : "deactivated"); focused ? "focused" : "defocused");
} }
static void window_key_callback(GLFWwindow window, int key, int action) static void window_key_callback(GLFWwindow window, int key, int action)

4
tests/gamma.c
View File

@ -133,8 +133,8 @@ int main(int argc, char** argv)
} }
else else
{ {
width = 0; width = 200;
height = 0; height = 200;
} }
window = glfwCreateWindow(width, height, mode, "Gamma Test", NULL); window = glfwCreateWindow(width, height, mode, "Gamma Test", NULL);

2
tests/glfwinfo.c
View File

@ -268,7 +268,7 @@ int main(int argc, char** argv)
// We assume here that we stand a better chance of success by leaving all // We assume here that we stand a better chance of success by leaving all
// possible details of pixel format selection to GLFW // possible details of pixel format selection to GLFW
window = glfwCreateWindow(0, 0, GLFW_WINDOWED, "Version", NULL); window = glfwCreateWindow(200, 200, GLFW_WINDOWED, "Version", NULL);
if (!window) if (!window)
{ {
glfwTerminate(); glfwTerminate();

10
tests/iconify.c
View File

@ -75,11 +75,11 @@ static void window_size_callback(GLFWwindow window, int width, int height)
glViewport(0, 0, width, height); glViewport(0, 0, width, height);
} }
static void window_focus_callback(GLFWwindow window, int activated) static void window_focus_callback(GLFWwindow window, int focused)
{ {
printf("%0.2f Window %s\n", printf("%0.2f Window %s\n",
glfwGetTime(), glfwGetTime(),
activated ? "activated" : "deactivated"); focused ? "focused" : "defocused");
} }
static void window_iconify_callback(GLFWwindow window, int iconified) static void window_iconify_callback(GLFWwindow window, int iconified)
@ -128,8 +128,8 @@ int main(int argc, char** argv)
} }
else else
{ {
width = 0; width = 640;
height = 0; height = 480;
} }
window = glfwCreateWindow(width, height, mode, "Iconify", NULL); window = glfwCreateWindow(width, height, mode, "Iconify", NULL);
@ -152,7 +152,7 @@ int main(int argc, char** argv)
printf("Window is %s and %s\n", printf("Window is %s and %s\n",
glfwGetWindowParam(window, GLFW_ICONIFIED) ? "iconified" : "restored", glfwGetWindowParam(window, GLFW_ICONIFIED) ? "iconified" : "restored",
glfwGetWindowParam(window, GLFW_ACTIVE) ? "active" : "inactive"); glfwGetWindowParam(window, GLFW_FOCUSED) ? "focused" : "defocused");
glEnable(GL_SCISSOR_TEST); glEnable(GL_SCISSOR_TEST);

2
tests/joysticks.c
View File

@ -191,7 +191,7 @@ int main(void)
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
window = glfwCreateWindow(0, 0, GLFW_WINDOWED, "Joystick Test", NULL); window = glfwCreateWindow(640, 480, GLFW_WINDOWED, "Joystick Test", NULL);
if (!window) if (!window)
{ {
glfwTerminate(); glfwTerminate();

2
tests/peter.c
View File

@ -92,7 +92,7 @@ static void window_size_callback(GLFWwindow window, int width, int height)
static GLboolean open_window(void) static GLboolean open_window(void)
{ {
window_handle = glfwCreateWindow(0, 0, GLFW_WINDOWED, "Peter Detector", NULL); window_handle = glfwCreateWindow(640, 480, GLFW_WINDOWED, "Peter Detector", NULL);
if (!window_handle) if (!window_handle)
return GL_FALSE; return GL_FALSE;

19
tests/sharing.c
View File

@ -51,10 +51,12 @@ static int window_close_callback(GLFWwindow window)
return GL_FALSE; return GL_FALSE;
} }
static GLFWwindow open_window(const char* title, GLFWwindow share) static GLFWwindow open_window(const char* title, GLFWwindow share, int posX, int posY)
{ {
GLFWwindow window; GLFWwindow window;
glfwWindowHint(GLFW_POSITION_X, posX);
glfwWindowHint(GLFW_POSITION_Y, posY);
window = glfwCreateWindow(WIDTH, HEIGHT, GLFW_WINDOWED, title, share); window = glfwCreateWindow(WIDTH, HEIGHT, GLFW_WINDOWED, title, share);
if (!window) if (!window)
return NULL; return NULL;
@ -125,7 +127,6 @@ static void draw_quad(GLuint texture)
int main(int argc, char** argv) int main(int argc, char** argv)
{ {
GLuint texture; GLuint texture;
int x, y;
if (!glfwInit()) if (!glfwInit())
{ {
@ -133,7 +134,7 @@ int main(int argc, char** argv)
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
windows[0] = open_window("First", NULL); windows[0] = open_window("First", NULL, 0, 0);
if (!windows[0]) if (!windows[0])
{ {
fprintf(stderr, "Failed to open first GLFW window: %s\n", glfwErrorString(glfwGetError())); fprintf(stderr, "Failed to open first GLFW window: %s\n", glfwErrorString(glfwGetError()));
@ -147,7 +148,8 @@ int main(int argc, char** argv)
// It will then be shared with the second context, created below // It will then be shared with the second context, created below
texture = create_texture(); texture = create_texture();
windows[1] = open_window("Second", windows[0]); // Put the second window to the right of the first one
windows[1] = open_window("Second", windows[0], WIDTH + 50, 0);
if (!windows[1]) if (!windows[1])
{ {
fprintf(stderr, "Failed to open second GLFW window: %s\n", glfwErrorString(glfwGetError())); fprintf(stderr, "Failed to open second GLFW window: %s\n", glfwErrorString(glfwGetError()));
@ -156,14 +158,13 @@ int main(int argc, char** argv)
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
// Set drawing color for the first context and copy it to the second // Set drawing color for both contexts
glfwMakeContextCurrent(windows[0]); glfwMakeContextCurrent(windows[0]);
glColor3f(0.6f, 0.f, 0.6f); glColor3f(0.6f, 0.f, 0.6f);
glfwCopyContext(windows[0], windows[1], GL_CURRENT_BIT); glfwMakeContextCurrent(windows[1]);
glColor3f(0.6f, 0.6f, 0.f);
// Put the second window to the right of the first one glfwMakeContextCurrent(windows[0]);
glfwGetWindowPos(windows[0], &x, &y);
glfwSetWindowPos(windows[1], x + WIDTH + 50, y);
while (!closed) while (!closed)
{ {

2
tests/tearing.c
View File

@ -70,7 +70,7 @@ int main(void)
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
window = glfwCreateWindow(0, 0, GLFW_WINDOWED, "", NULL); window = glfwCreateWindow(640, 480, GLFW_WINDOWED, "", NULL);
if (!window) if (!window)
{ {
fprintf(stderr, "Failed to open GLFW window: %s\n", glfwErrorString(glfwGetError())); fprintf(stderr, "Failed to open GLFW window: %s\n", glfwErrorString(glfwGetError()));

4
tests/threads.c
View File

@ -89,6 +89,8 @@ int main(void)
for (i = 0; i < count; i++) for (i = 0; i < count; i++)
{ {
glfwWindowHint(GLFW_POSITION_X, 200 + 250 * i);
glfwWindowHint(GLFW_POSITION_Y, 200);
threads[i].window = glfwCreateWindow(200, 200, threads[i].window = glfwCreateWindow(200, 200,
GLFW_WINDOWED, GLFW_WINDOWED,
threads[i].title, threads[i].title,
@ -100,8 +102,6 @@ int main(void)
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
glfwSetWindowPos(threads[i].window, 200 + 250 * i, 200);
if (thrd_create(&threads[i].id, thread_main, threads + i) != if (thrd_create(&threads[i].id, thread_main, threads + i) !=
thrd_success) thrd_success)
{ {

2
tests/title.c
View File

@ -47,7 +47,7 @@ int main(void)
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
window = glfwCreateWindow(0, 0, GLFW_WINDOWED, "English 日本語 русский язык 官話", NULL); window = glfwCreateWindow(400, 400, GLFW_WINDOWED, "English 日本語 русский язык 官話", NULL);
if (!window) if (!window)
{ {
fprintf(stderr, "Failed to open GLFW window: %s\n", glfwErrorString(glfwGetError())); fprintf(stderr, "Failed to open GLFW window: %s\n", glfwErrorString(glfwGetError()));

4
tests/windows.c
View File

@ -55,6 +55,8 @@ int main(void)
for (i = 0; i < 4; i++) for (i = 0; i < 4; i++)
{ {
glfwWindowHint(GLFW_POSITION_X, 100 + (i & 1) * 300);
glfwWindowHint(GLFW_POSITION_Y, 100 + (i >> 1) * 300);
windows[i] = glfwCreateWindow(200, 200, GLFW_WINDOWED, titles[i], NULL); windows[i] = glfwCreateWindow(200, 200, GLFW_WINDOWED, titles[i], NULL);
if (!windows[i]) if (!windows[i])
{ {
@ -70,8 +72,6 @@ int main(void)
(GLclampf) (i >> 1), (GLclampf) (i >> 1),
i ? 0.f : 1.f, i ? 0.f : 1.f,
0.f); 0.f);
glfwSetWindowPos(windows[i], 100 + (i & 1) * 300, 100 + (i >> 1) * 300);
} }
while (running) while (running)