commit ac5fee4d20557078562f08327dc779321d20dd6d
author Camilla Berglund <elmindreda@elmindreda.org> Thu Jan 17 21:56:02 2013 +0100
committer Camilla Berglund <elmindreda@elmindreda.org> Mon Feb 04 12:33:09 2013 +0100
tree 983ceb291020ddb43a2c901b2f34bff98e5384ab
parent 2cea6e37cfd1144ffa04fa0313c2f4cc825c4295

Re-used POSITION_* tokens for monitor position.

include/GL/glfw3.h

diff --git a/include/GL/glfw3.h b/include/GL/glfw3.h
index 2f21e5f..d26dec1 100644
--- a/include/GL/glfw3.h
+++ b/include/GL/glfw3.h
@@ -541,8 +541,8 @@
 
 #define GLFW_MONITOR_WIDTH_MM       0x00060001
 #define GLFW_MONITOR_HEIGHT_MM      0x00060002
-#define GLFW_MONITOR_POS_X          0x00060003
-#define GLFW_MONITOR_POS_Y          0x00060004
+/* reuse GLFW_POSITION_X */
+/* reuse GLFW_POSITION_Y */
 
 #define GLFW_CONNECTED              0x00061000
 #define GLFW_DISCONNECTED           0x00061001

src/monitor.c

diff --git a/src/monitor.c b/src/monitor.c
index be52b1e..107622b 100644
--- a/src/monitor.c
+++ b/src/monitor.c
@@ -323,9 +323,9 @@
             return monitor->widthMM;
         case GLFW_MONITOR_HEIGHT_MM:
             return monitor->heightMM;
-        case GLFW_MONITOR_POS_X:
+        case GLFW_POSITION_X:
             return monitor->positionX;
-        case GLFW_MONITOR_POS_Y:
+        case GLFW_POSITION_Y:
             return monitor->positionY;
     }
 

tests/events.c

diff --git a/tests/events.c b/tests/events.c
index 596eab0..0bea006 100644
--- a/tests/events.c
+++ b/tests/events.c
@@ -351,8 +351,8 @@
                glfwGetTime(),
                glfwGetMonitorName(monitor),
                mode.width, mode.height,
-               glfwGetMonitorParam(monitor, GLFW_MONITOR_POS_X),
-               glfwGetMonitorParam(monitor, GLFW_MONITOR_POS_Y),
+               glfwGetMonitorParam(monitor, GLFW_POSITION_X),
+               glfwGetMonitorParam(monitor, GLFW_POSITION_Y),
                glfwGetMonitorParam(monitor, GLFW_MONITOR_WIDTH_MM),
                glfwGetMonitorParam(monitor, GLFW_MONITOR_HEIGHT_MM));
     }

tests/modes.c

diff --git a/tests/modes.c b/tests/modes.c
index d2b8d08..64c63b0 100644
--- a/tests/modes.c
+++ b/tests/modes.c
@@ -101,8 +101,8 @@
            glfwGetPrimaryMonitor() == monitor ? "primary" : "secondary");
     printf("Current mode: %s\n", format_mode(&mode));
     printf("Virtual position: %i %i\n",
-           glfwGetMonitorParam(monitor, GLFW_MONITOR_POS_X),
-           glfwGetMonitorParam(monitor, GLFW_MONITOR_POS_Y));
+           glfwGetMonitorParam(monitor, GLFW_POSITION_X),
+           glfwGetMonitorParam(monitor, GLFW_POSITION_Y));
 
     widthMM = glfwGetMonitorParam(monitor, GLFW_MONITOR_WIDTH_MM);
     heightMM = glfwGetMonitorParam(monitor, GLFW_MONITOR_HEIGHT_MM);