mirror/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2024-11-10 00:51:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Formatting.

Browse Source
This commit is contained in:
Camilla Berglund 2011-02-09 12:57:11 +01:00
parent 508e76e53d
commit e0ba9e4e1f
3 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/GL/glfw3.h
View File

@ -517,8 +517,8 @@ GLFWAPI void glfwCloseWindow(GLFWwindow window);
GLFWAPI void glfwSetWindowTitle(GLFWwindow, const char* title); GLFWAPI void glfwSetWindowTitle(GLFWwindow, const char* title);
GLFWAPI void glfwGetWindowSize(GLFWwindow, int* width, int* height); GLFWAPI void glfwGetWindowSize(GLFWwindow, int* width, int* height);
GLFWAPI void glfwSetWindowSize(GLFWwindow, int width, int height); GLFWAPI void glfwSetWindowSize(GLFWwindow, int width, int height);
GLFWAPI void glfwGetWindowPos(GLFWwindow, int* x, int* y); GLFWAPI void glfwGetWindowPos(GLFWwindow, int* xpos, int* ypos);
GLFWAPI void glfwSetWindowPos(GLFWwindow, int x, int y); GLFWAPI void glfwSetWindowPos(GLFWwindow, int xpos, int ypos);
GLFWAPI void glfwIconifyWindow(GLFWwindow window); GLFWAPI void glfwIconifyWindow(GLFWwindow window);
GLFWAPI void glfwRestoreWindow(GLFWwindow window); GLFWAPI void glfwRestoreWindow(GLFWwindow window);
GLFWAPI int glfwGetWindowParam(GLFWwindow window, int param); GLFWAPI int glfwGetWindowParam(GLFWwindow window, int param);
@ -539,7 +539,7 @@ GLFWAPI int glfwGetKey(GLFWwindow window, int key);
GLFWAPI int glfwGetMouseButton(GLFWwindow window, int button); GLFWAPI int glfwGetMouseButton(GLFWwindow window, int button);
GLFWAPI void glfwGetMousePos(GLFWwindow window, int* xpos, int* ypos); GLFWAPI void glfwGetMousePos(GLFWwindow window, int* xpos, int* ypos);
GLFWAPI void glfwSetMousePos(GLFWwindow window, int xpos, int ypos); GLFWAPI void glfwSetMousePos(GLFWwindow window, int xpos, int ypos);
GLFWAPI void glfwGetScrollOffset(GLFWwindow window, int* x, int* y); GLFWAPI void glfwGetScrollOffset(GLFWwindow window, int* xoffset, int* yoffset);
GLFWAPI void glfwSetKeyCallback(GLFWkeyfun cbfun); GLFWAPI void glfwSetKeyCallback(GLFWkeyfun cbfun);
GLFWAPI void glfwSetCharCallback(GLFWcharfun cbfun); GLFWAPI void glfwSetCharCallback(GLFWcharfun cbfun);
GLFWAPI void glfwSetMouseButtonCallback(GLFWmousebuttonfun cbfun); GLFWAPI void glfwSetMouseButtonCallback(GLFWmousebuttonfun cbfun);

10
src/input.c
View File

@ -159,7 +159,7 @@ GLFWAPI void glfwSetMousePos(GLFWwindow handle, int xpos, int ypos)
// Returns the scroll offset for the specified window // Returns the scroll offset for the specified window
//======================================================================== //========================================================================
GLFWAPI void glfwGetScrollOffset(GLFWwindow handle, int* x, int* y) GLFWAPI void glfwGetScrollOffset(GLFWwindow handle, int* xoffset, int* yoffset)
{ {
if (!_glfwInitialized) if (!_glfwInitialized)
{ {
@ -169,11 +169,11 @@ GLFWAPI void glfwGetScrollOffset(GLFWwindow handle, int* x, int* y)
_GLFWwindow* window = (_GLFWwindow*) handle; _GLFWwindow* window = (_GLFWwindow*) handle;
if (x) if (xoffset)
*x = window->scrollX; *xoffset = window->scrollX;
if (y) if (yoffset)
*y = window->scrollY; *yoffset = window->scrollY;
} }

22
src/window.c
View File

@ -186,13 +186,13 @@ void _glfwInputChar(_GLFWwindow* window, int character)
// Register scroll events // Register scroll events
//======================================================================== //========================================================================
void _glfwInputScroll(_GLFWwindow* window, int x, int y) void _glfwInputScroll(_GLFWwindow* window, int xoffset, int yoffset)
{ {
window->scrollX += x; window->scrollX += xoffset;
window->scrollY += y; window->scrollY += yoffset;
if (_glfwLibrary.scrollCallback) if (_glfwLibrary.scrollCallback)
_glfwLibrary.scrollCallback(window, x, y); _glfwLibrary.scrollCallback(window, xoffset, yoffset);
} }
@ -896,7 +896,7 @@ GLFWAPI void glfwSetWindowSize(GLFWwindow handle, int width, int height)
// Get the window position // Get the window position
//======================================================================== //========================================================================
GLFWAPI void glfwGetWindowPos(GLFWwindow handle, int* x, int* y) GLFWAPI void glfwGetWindowPos(GLFWwindow handle, int* xpos, int* ypos)
{ {
if (!_glfwInitialized) if (!_glfwInitialized)
{ {
@ -906,11 +906,11 @@ GLFWAPI void glfwGetWindowPos(GLFWwindow handle, int* x, int* y)
_GLFWwindow* window = (_GLFWwindow*) handle; _GLFWwindow* window = (_GLFWwindow*) handle;
if (x != NULL) if (xpos != NULL)
*x = window->positionX; *xpos = window->positionX;
if (y != NULL) if (ypos != NULL)
*y = window->positionY; *ypos = window->positionY;
} }
@ -918,7 +918,7 @@ GLFWAPI void glfwGetWindowPos(GLFWwindow handle, int* x, int* y)
// Set the window position // Set the window position
//======================================================================== //========================================================================
GLFWAPI void glfwSetWindowPos(GLFWwindow handle, int x, int y) GLFWAPI void glfwSetWindowPos(GLFWwindow handle, int xpos, int ypos)
{ {
if (!_glfwInitialized) if (!_glfwInitialized)
{ {
@ -934,7 +934,7 @@ GLFWAPI void glfwSetWindowPos(GLFWwindow handle, int x, int y)
return; return;
} }
_glfwPlatformSetWindowPos(window, x, y); _glfwPlatformSetWindowPos(window, xpos, ypos);
} }