gwm17/glfw
1
0
Fork 0
mirror of https://github.com/gwm17/glfw.git synced 2024-11-23 02:38:52 -05:00
Code Issues Projects Releases Wiki Activity

Removed 'screen' from monitor nomenclature.

Browse Source
This commit is contained in:
Camilla Berglund 2012-10-22 02:39:22 +02:00
parent 73ca3bdbb6
commit 2108360671
6 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/GL/glfw3.h
View File

@ -460,8 +460,8 @@ extern "C" {
/* Monitor constants */ /* Monitor constants */
#define GLFW_MONITOR_PHYSICAL_WIDTH 0x00060001 #define GLFW_MONITOR_PHYSICAL_WIDTH 0x00060001
#define GLFW_MONITOR_PHYSICAL_HEIGHT 0x00060002 #define GLFW_MONITOR_PHYSICAL_HEIGHT 0x00060002
#define GLFW_MONITOR_SCREEN_POS_X 0x00060003 #define GLFW_MONITOR_POS_X 0x00060003
#define GLFW_MONITOR_SCREEN_POS_Y 0x00060004 #define GLFW_MONITOR_POS_Y 0x00060004
#define GLFW_MONITOR_CONNECTED 0x00061000 #define GLFW_MONITOR_CONNECTED 0x00061000
#define GLFW_MONITOR_DISCONNECTED 0x00061001 #define GLFW_MONITOR_DISCONNECTED 0x00061001

6
src/internal.h
View File

@ -220,8 +220,8 @@ struct _GLFWmonitor
int physicalWidth; int physicalWidth;
int physicalHeight; int physicalHeight;
// logical orientation of the screen on the desktop // logical orientation of the screen on the desktop
int screenX; int positionX;
int screenY; int positionY;
GLFWvidmode* modes; GLFWvidmode* modes;
@ -401,7 +401,7 @@ GLboolean _glfwIsValidContext(_GLFWwndconfig* wndconfig);
_GLFWmonitor* _glfwCreateMonitor(const char* name, _GLFWmonitor* _glfwCreateMonitor(const char* name,
GLboolean primary, GLboolean primary,
int physicalWidth, int physicalHeight, int physicalWidth, int physicalHeight,
int screenX, int screenY); int x, int y);
void _glfwDestroyMonitor(_GLFWmonitor* monitor); void _glfwDestroyMonitor(_GLFWmonitor* monitor);
void _glfwDestroyMonitors(void); void _glfwDestroyMonitors(void);

14
src/monitor.c
View File

@ -80,7 +80,7 @@ static int compareVideoModes(const void* firstPtr, const void* secondPtr)
_GLFWmonitor* _glfwCreateMonitor(const char* name, _GLFWmonitor* _glfwCreateMonitor(const char* name,
GLboolean primary, GLboolean primary,
int physicalWidth, int physicalHeight, int physicalWidth, int physicalHeight,
int screenX, int screenY) int x, int y)
{ {
_GLFWmonitor* monitor = (_GLFWmonitor*) calloc(1, sizeof(_GLFWmonitor)); _GLFWmonitor* monitor = (_GLFWmonitor*) calloc(1, sizeof(_GLFWmonitor));
if (!monitor) if (!monitor)
@ -93,8 +93,8 @@ _GLFWmonitor* _glfwCreateMonitor(const char* name,
monitor->primary = primary; monitor->primary = primary;
monitor->physicalWidth = physicalWidth; monitor->physicalWidth = physicalWidth;
monitor->physicalHeight = physicalHeight; monitor->physicalHeight = physicalHeight;
monitor->screenX = screenX; monitor->positionX = x;
monitor->screenY = screenY; monitor->positionY = y;
return monitor; return monitor;
} }
@ -318,10 +318,10 @@ GLFWAPI int glfwGetMonitorParam(GLFWmonitor handle, int param)
return monitor->physicalWidth; return monitor->physicalWidth;
case GLFW_MONITOR_PHYSICAL_HEIGHT: case GLFW_MONITOR_PHYSICAL_HEIGHT:
return monitor->physicalHeight; return monitor->physicalHeight;
case GLFW_MONITOR_SCREEN_POS_X: case GLFW_MONITOR_POS_X:
return monitor->screenX; return monitor->positionX;
case GLFW_MONITOR_SCREEN_POS_Y: case GLFW_MONITOR_POS_Y:
return monitor->screenY; return monitor->positionY;
} }
_glfwSetError(GLFW_INVALID_ENUM, _glfwSetError(GLFW_INVALID_ENUM,

12
src/win32_window.c
View File

@ -728,7 +728,7 @@ static int createWindow(_GLFWwindow* window,
const _GLFWfbconfig* fbconfig) const _GLFWfbconfig* fbconfig)
{ {
DWORD dwStyle, dwExStyle; DWORD dwStyle, dwExStyle;
int screenX, screenY, fullWidth, fullHeight; int positionX, positionY, fullWidth, fullHeight;
POINT pos; POINT pos;
WCHAR* wideTitle; WCHAR* wideTitle;
@ -775,8 +775,8 @@ static int createWindow(_GLFWwindow* window,
{ {
// Fullscreen windows are always opened in the upper left corner // Fullscreen windows are always opened in the upper left corner
// regardless of the desktop working area // regardless of the desktop working area
screenX = wndconfig->monitor->screenX; positionX = wndconfig->monitor->positionX;
screenY = wndconfig->monitor->screenY; positionY = wndconfig->monitor->positionY;
} }
else else
{ {
@ -784,8 +784,8 @@ static int createWindow(_GLFWwindow* window,
SystemParametersInfo(SPI_GETWORKAREA, 0, &wa, 0); SystemParametersInfo(SPI_GETWORKAREA, 0, &wa, 0);
// Adjust window position to working area // Adjust window position to working area
screenX = wa.left; positionX = wa.left;
screenY = wa.top; positionY = wa.top;
} }
wideTitle = _glfwCreateWideStringFromUTF8(wndconfig->title); wideTitle = _glfwCreateWideStringFromUTF8(wndconfig->title);
@ -800,7 +800,7 @@ static int createWindow(_GLFWwindow* window,
_GLFW_WNDCLASSNAME, _GLFW_WNDCLASSNAME,
wideTitle, wideTitle,
window->Win32.dwStyle, window->Win32.dwStyle,
screenX, screenY, positionX, positionY,
fullWidth, // Decorated window width fullWidth, // Decorated window width
fullHeight, // Decorated window height fullHeight, // Decorated window height
NULL, // No parent window NULL, // No parent window

4
src/x11_window.c
View File

@ -218,8 +218,8 @@ static GLboolean createWindow(_GLFWwindow* window,
if (wndconfig->monitor) if (wndconfig->monitor)
{ {
hints->flags |= PPosition; hints->flags |= PPosition;
hints->x = wndconfig->monitor->screenX; hints->x = wndconfig->monitor->positionX;
hints->y = wndconfig->monitor->screenY; hints->y = wndconfig->monitor->positionY;
} }
if (!wndconfig->resizable) if (!wndconfig->resizable)

4
tests/modes.c
View File

@ -101,8 +101,8 @@ static void list_modes(GLFWmonitor monitor)
printf("Name: %s\n", glfwGetMonitorName(monitor)); printf("Name: %s\n", glfwGetMonitorName(monitor));
printf("Current mode: %s\n", format_mode(&mode)); printf("Current mode: %s\n", format_mode(&mode));
printf("Virtual position: %i %i\n", printf("Virtual position: %i %i\n",
glfwGetMonitorParam(monitor, GLFW_MONITOR_SCREEN_POS_X), glfwGetMonitorParam(monitor, GLFW_MONITOR_POS_X),
glfwGetMonitorParam(monitor, GLFW_MONITOR_SCREEN_POS_Y)); glfwGetMonitorParam(monitor, GLFW_MONITOR_POS_Y));
widthMM = glfwGetMonitorParam(monitor, GLFW_MONITOR_PHYSICAL_WIDTH); widthMM = glfwGetMonitorParam(monitor, GLFW_MONITOR_PHYSICAL_WIDTH);
heightMM = glfwGetMonitorParam(monitor, GLFW_MONITOR_PHYSICAL_HEIGHT); heightMM = glfwGetMonitorParam(monitor, GLFW_MONITOR_PHYSICAL_HEIGHT);