Zengtudor/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2025-10-04 21:56:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace tab by space

Browse Source
This commit is contained in:
Raja 2017-11-28 12:20:50 -05:00
parent 2e75d2321f
commit 23e5365016
4 changed files with 1426 additions and 1426 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/input.c
View File

@ -234,12 +234,12 @@ void _glfwInputMouseClick(_GLFWwindow* window, int button, int action, int mods)
void _glfwInputPenPressure(_GLFWwindow* window, double pressure, int x, int y)
{
window->penPressure = pressure;
window->penXposition = x;
window->penYposition = y;
window->penPressure = pressure;
window->penXposition = x;
window->penYposition = y;
if (window->callbacks.penPressure)
window->callbacks.penPressure((GLFWwindow*)window, pressure, x, y);
if (window->callbacks.penPressure)
window->callbacks.penPressure((GLFWwindow*)window, pressure, x, y);
}
void _glfwInputCursorPos(_GLFWwindow* window, double xpos, double ypos)
@ -527,12 +527,12 @@ GLFWAPI int glfwGetMouseButton(GLFWwindow* handle, int button)
/***************************PEN**************************************************/
GLFWAPI double glfwGetPenPressure(GLFWwindow* handle)
{
_GLFWwindow* window = (_GLFWwindow*)handle;
assert(window != NULL);
_GLFWwindow* window = (_GLFWwindow*)handle;
assert(window != NULL);
_GLFW_REQUIRE_INIT_OR_RETURN(0);
_GLFW_REQUIRE_INIT_OR_RETURN(0);
return window->penPressure;
return window->penPressure;
}
/**************************PEN***************************************************/
@ -732,14 +732,14 @@ GLFWAPI GLFWmousebuttonfun glfwSetMouseButtonCallback(GLFWwindow* handle,
}
GLFWAPI GLFWpenpressurefun glfwSetPenPressureCallback(GLFWwindow* handle,
GLFWpenpressurefun cbfun)
GLFWpenpressurefun cbfun)
{
_GLFWwindow* window = (_GLFWwindow*)handle;
assert(window != NULL);
_GLFWwindow* window = (_GLFWwindow*)handle;
assert(window != NULL);
_GLFW_REQUIRE_INIT_OR_RETURN(NULL);
_GLFW_SWAP_POINTERS(window->callbacks.penPressure, cbfun);
return cbfun;
_GLFW_REQUIRE_INIT_OR_RETURN(NULL);
_GLFW_SWAP_POINTERS(window->callbacks.penPressure, cbfun);
return cbfun;
}
GLFWAPI GLFWcursorposfun glfwSetCursorPosCallback(GLFWwindow* handle,

16
src/internal.h
View File

@ -84,8 +84,8 @@ typedef GLFWglproc (* _GLFWgetprocaddressfun)(const char*);
typedef void (* _GLFWdestroycontextfun)(_GLFWwindow*);
#define GL_VERSION 0x1f02
#define GL_NONE 0
#define GL_COLOR_BUFFER_BIT 0x00004000
#define GL_NONE 0
#define GL_COLOR_BUFFER_BIT 0x00004000
#define GL_UNSIGNED_BYTE 0x1401
#define GL_EXTENSIONS 0x1f03
#define GL_NUM_EXTENSIONS 0x821d
@ -102,7 +102,7 @@ typedef void (* _GLFWdestroycontextfun)(_GLFWwindow*);
#define GL_CONTEXT_RELEASE_BEHAVIOR_FLUSH 0x82fc
#define GL_CONTEXT_FLAG_NO_ERROR_BIT_KHR 0x00000008
typedef int GLint;
typedef int GLint;
typedef unsigned int GLuint;
typedef unsigned int GLenum;
typedef unsigned int GLbitfield;
@ -419,9 +419,9 @@ struct _GLFWwindow
GLFWbool stickyKeys;
GLFWbool stickyMouseButtons;
double penPressure;
int penXposition;
int penYposition;
double penPressure;
int penXposition;
int penYposition;
int cursorMode;
char mouseButtons[GLFW_MOUSE_BUTTON_LAST + 1];
char keys[GLFW_KEY_LAST + 1];
@ -439,8 +439,8 @@ struct _GLFWwindow
GLFWwindowiconifyfun iconify;
GLFWwindowmaximizefun maximize;
GLFWframebuffersizefun fbsize;
GLFWmousebuttonfun mouseButton;
GLFWpenpressurefun penPressure;
GLFWmousebuttonfun mouseButton;
GLFWpenpressurefun penPressure;
GLFWcursorposfun cursorPos;
GLFWcursorenterfun cursorEnter;
GLFWscrollfun scroll;

2
src/win32_platform.h
View File

@ -285,7 +285,7 @@ BOOL IsWindowsVersionOrGreater(WORD major, WORD minor, WORD sp);
// HACK: Define macros that some dinput.h variants don't
#ifndef DIDFT_OPTIONAL
#define DIDFT_OPTIONAL 0x80000000
#define DIDFT_OPTIONAL 0x80000000
#endif
// winmm.dll function pointer typedefs

2804
src/win32_window.c
View File

File diff suppressed because it is too large Load Diff