Renamed GLFW_SAMPLES and GLFW_SHOULD_CLOSE.

examples/boing.c

@@ -614,7 +614,7 @@ int main( void )
        /* Check if we are still running */
        if (glfwGetKey( window, GLFW_KEY_ESCAPE ))
            break;
-       if (glfwGetWindowParam(window, GLFW_CLOSE_REQUESTED))
+       if (glfwGetWindowParam(window, GLFW_SHOULD_CLOSE))
            break;
    }
 

examples/splitview.c

@@ -502,7 +502,7 @@ int main(void)
         // Check if the ESC key was pressed or the window should be closed
         if (glfwGetKey(window, GLFW_KEY_ESCAPE))
             break;
-        if (glfwGetWindowParam(window, GLFW_CLOSE_REQUESTED))
+        if (glfwGetWindowParam(window, GLFW_SHOULD_CLOSE))
             break;
     }
 

examples/triangle.c

@@ -90,7 +90,7 @@ int main(void)
         // Check if the ESC key was pressed or the window should be closed
         if (glfwGetKey(window, GLFW_KEY_ESCAPE))
             break;
-        if (glfwGetWindowParam(window, GLFW_CLOSE_REQUESTED))
+        if (glfwGetWindowParam(window, GLFW_SHOULD_CLOSE))
             break;
     }
 

include/GL/glfw3.h

@@ -481,11 +481,11 @@ extern "C" {
  *  otherwise.
  *  @see glfwGetWindowParam
  */
-#define GLFW_CLOSE_REQUESTED      0x00020003
+#define GLFW_SHOULD_CLOSE         0x00020003
 /*! @brief The client API version revision.
  *  @see glfwGetWindowParam
  */
-#define GLFW_CONTEXT_REVISION      0x00020004
+#define GLFW_CONTEXT_REVISION     0x00020004
 
 /*! @brief The bit depth of the red component of the color buffer.
  *  @see glfwWindowHint
@@ -543,7 +543,7 @@ extern "C" {
  *  zero to disable multisampling.
  *  @see glfwWindowHint
  */
-#define GLFW_FSAA_SAMPLES         0x0002100E
+#define GLFW_SAMPLES              0x0002100E
 /*! @brief @c GL_TRUE if the framebuffer should be sRGB capable, or @c GL_FALSE
  *  otherwise.
  *  @see glfwWindowHint
@@ -1075,8 +1075,8 @@ GLFWAPI void glfwDefaultWindowHints(void);
  *
  *  The @ref GLFW_STEREO hint specifies whether to use stereoscopic rendering.
  *
- *  The @ref GLFW_FSAA_SAMPLES hint specifies the desired number of samples to
+ *  The @ref GLFW_SAMPLES hint specifies the desired number of samples to use
- *  use for multisampling.
+ *  for multisampling.
  *
  *  The @ref GLFW_SRGB_CAPABLE hint specifies whether the framebuffer should be
  *  sRGB capable.
@@ -1304,7 +1304,7 @@ GLFWAPI void glfwHideWindow(GLFWwindow window);
  *  The @ref GLFW_RESIZABLE property indicates whether the window is resizable
  *  by the user.
  *
- *  The @ref GLFW_CLOSE_REQUESTED property indicates whether the window has been
+ *  The @ref GLFW_SHOULD_CLOSE property indicates whether the window has been
  *  requested by the user to close.
  *
  *  The @ref GLFW_REFRESH_RATE property will be replaced when the @c
@@ -1383,7 +1383,7 @@ GLFWAPI void glfwSetWindowSizeCallback(GLFWwindow window, GLFWwindowsizefun cbfu
  *  callback to be called.
  *
  *  The return value of the close callback becomes the new value of the @ref
- *  GLFW_CLOSE_REQUESTED window parameter.
+ *  GLFW_SHOULD_CLOSE window parameter.
  */
 GLFWAPI void glfwSetWindowCloseCallback(GLFWwindow window, GLFWwindowclosefun cbfun);
 

readme.html

@@ -301,6 +301,7 @@ version of GLFW.</p>
   <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>GLFW_ACTIVE</code> to <code>GLFW_FOCUSED</code></li>
+  <li>Renamed <code>GLFW_FSAA_SAMPLES</code> to <code>GLFW_SAMPLES</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_BUILD_DLL</code> to <code>_GLFW_BUILD_DLL</code></li>
@@ -314,7 +315,7 @@ version of GLFW.</p>
   <li>Replaced mouse wheel interface with two-dimensional, floating point scrolling interface</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 automatic closing of windows with <code>GLFW_CLOSE_REQUESTED</code> window parameter</li>
+  <li>Replaced automatic closing of windows with <code>GLFW_SHOULD_CLOSE</code> window parameter</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 the Win32 port .def files</li>

src/window.c

@@ -442,7 +442,7 @@ GLFWAPI void glfwWindowHint(int target, int hint)
         case GLFW_POSITION_Y:
             _glfwLibrary.hints.positionY = hint;
             break;
-        case GLFW_FSAA_SAMPLES:
+        case GLFW_SAMPLES:
             _glfwLibrary.hints.samples = hint;
             break;
         case GLFW_SRGB_CAPABLE:
@@ -715,7 +715,7 @@ GLFWAPI int glfwGetWindowParam(GLFWwindow handle, int param)
             return window == _glfwLibrary.focusedWindow;
         case GLFW_ICONIFIED:
             return window->iconified;
-        case GLFW_CLOSE_REQUESTED:
+        case GLFW_SHOULD_CLOSE:
             return window->closeRequested;
         case GLFW_REFRESH_RATE:
             return window->refreshRate;

tests/accuracy.c

@@ -108,7 +108,7 @@ int main(void)
 
     set_swap_interval(window, swap_interval);
 
-    while (!glfwGetWindowParam(window, GLFW_CLOSE_REQUESTED))
+    while (!glfwGetWindowParam(window, GLFW_SHOULD_CLOSE))
     {
         glClear(GL_COLOR_BUFFER_BIT);
 

tests/events.c

@@ -386,7 +386,7 @@ int main(void)
 
     printf("Main loop starting\n");
 
-    while (!glfwGetWindowParam(window, GLFW_CLOSE_REQUESTED))
+    while (!glfwGetWindowParam(window, GLFW_SHOULD_CLOSE))
         glfwWaitEvents();
 
     glfwTerminate();

tests/fsaa.c

@@ -97,7 +97,7 @@ int main(int argc, char** argv)
     else
         printf("Requesting that FSAA not be available\n");
 
-    glfwWindowHint(GLFW_FSAA_SAMPLES, samples);
+    glfwWindowHint(GLFW_SAMPLES, samples);
 
     window = glfwCreateWindow(800, 400, GLFW_WINDOWED, "Aliasing Detector", NULL);
     if (!window)
@@ -128,7 +128,7 @@ int main(int argc, char** argv)
     gluOrtho2D(0.f, 1.f, 0.f, 0.5f);
     glMatrixMode(GL_MODELVIEW);
 
-    while (!glfwGetWindowParam(window, GLFW_CLOSE_REQUESTED))
+    while (!glfwGetWindowParam(window, GLFW_SHOULD_CLOSE))
     {
         GLfloat time = (GLfloat) glfwGetTime();
 

tests/joysticks.c

@@ -207,7 +207,7 @@ int main(void)
     glfwMakeContextCurrent(window);
     glfwSwapInterval(1);
 
-    while (!glfwGetWindowParam(window, GLFW_CLOSE_REQUESTED))
+    while (!glfwGetWindowParam(window, GLFW_SHOULD_CLOSE))
     {
         glClear(GL_COLOR_BUFFER_BIT);
 

tests/peter.c

@@ -129,7 +129,7 @@ int main(void)
 
     glClearColor(0.f, 0.f, 0.f, 0.f);
 
-    while (!glfwGetWindowParam(window_handle, GLFW_CLOSE_REQUESTED))
+    while (!glfwGetWindowParam(window_handle, GLFW_SHOULD_CLOSE))
     {
         glClear(GL_COLOR_BUFFER_BIT);
 

tests/tearing.c

@@ -91,7 +91,7 @@ int main(void)
     glOrtho(-1.f, 1.f, -1.f, 1.f, 1.f, -1.f);
     glMatrixMode(GL_MODELVIEW);
 
-    while (!glfwGetWindowParam(window, GLFW_CLOSE_REQUESTED))
+    while (!glfwGetWindowParam(window, GLFW_SHOULD_CLOSE))
     {
         glClear(GL_COLOR_BUFFER_BIT);
 

tests/threads.c

@@ -122,7 +122,7 @@ int main(void)
 
         for (i = 0;  i < count;  i++)
         {
-            if (glfwGetWindowParam(threads[i].window, GLFW_CLOSE_REQUESTED))
+            if (glfwGetWindowParam(threads[i].window, GLFW_SHOULD_CLOSE))
                 running = GL_FALSE;
         }
     }

tests/title.c

@@ -63,7 +63,7 @@ int main(void)
 
     glfwSetWindowSizeCallback(window, window_size_callback);
 
-    while (!glfwGetWindowParam(window, GLFW_CLOSE_REQUESTED))
+    while (!glfwGetWindowParam(window, GLFW_SHOULD_CLOSE))
     {
         glClear(GL_COLOR_BUFFER_BIT);
         glfwSwapBuffers(window);

tests/windows.c

@@ -82,7 +82,7 @@ int main(void)
             glClear(GL_COLOR_BUFFER_BIT);
             glfwSwapBuffers(windows[i]);
 
-            if (glfwGetWindowParam(windows[i], GLFW_CLOSE_REQUESTED))
+            if (glfwGetWindowParam(windows[i], GLFW_SHOULD_CLOSE))
                 running = GL_FALSE;
         }