Zengtudor/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2025-07-29 11:00:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge 445fe35d45 into f1397843ee

Browse Source
This commit is contained in:
siavashserver 2013-07-11 09:13:11 -07:00
commit 2ebe27208f
4 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/glx_context.c
View File

@ -344,7 +344,7 @@ void _glfwTerminateContextAPI(void)
{ \ { \
attribs[index++] = attribName; \ attribs[index++] = attribName; \
attribs[index++] = attribValue; \ attribs[index++] = attribValue; \
assert(index < sizeof(attribs) / sizeof(attribs[0])); \ assert(index < (int)(sizeof(attribs) / sizeof(attribs[0]))); \
} }
// Prepare for creation of the OpenGL context // Prepare for creation of the OpenGL context

12
src/input.c
View File

@ -30,6 +30,9 @@
#include "internal.h" #include "internal.h"
#include <float.h>
#include <math.h>
// Internal key state used for sticky keys // Internal key state used for sticky keys
#define _GLFW_STICK 3 #define _GLFW_STICK 3
@ -154,9 +157,6 @@ void _glfwInputKey(_GLFWwindow* window, int key, int scancode, int action, int m
void _glfwInputChar(_GLFWwindow* window, unsigned int character) void _glfwInputChar(_GLFWwindow* window, unsigned int character)
{ {
if (character == -1)
return;
if (character < 32 || (character > 126 && character < 160)) if (character < 32 || (character > 126 && character < 160))
return; return;
@ -189,7 +189,7 @@ void _glfwInputCursorMotion(_GLFWwindow* window, double x, double y)
{ {
if (window->cursorMode == GLFW_CURSOR_DISABLED) if (window->cursorMode == GLFW_CURSOR_DISABLED)
{ {
if (x == 0.0 && y == 0.0) if (fabs(x) <= DBL_EPSILON && fabs(y) <= DBL_EPSILON)
return; return;
window->cursorPosX += x; window->cursorPosX += x;
@ -197,7 +197,7 @@ void _glfwInputCursorMotion(_GLFWwindow* window, double x, double y)
} }
else else
{ {
if (window->cursorPosX == x && window->cursorPosY == y) if (fabs(window->cursorPosX - x) <= DBL_EPSILON && fabs(window->cursorPosY - y) <= DBL_EPSILON)
return; return;
window->cursorPosX = x; window->cursorPosX = x;
@ -334,7 +334,7 @@ GLFWAPI void glfwSetCursorPos(GLFWwindow* handle, double xpos, double ypos)
return; return;
// Don't do anything if the cursor position did not change // Don't do anything if the cursor position did not change
if (xpos == window->cursorPosX && ypos == window->cursorPosY) if (fabs(xpos - window->cursorPosX) <= DBL_EPSILON && fabs(ypos - window->cursorPosY) <= DBL_EPSILON)
return; return;
// Set GLFW cursor position // Set GLFW cursor position

2
src/x11_joystick.c
View File

@ -177,7 +177,7 @@ void _glfwInitJoysticks(void)
return; return;
} }
for (i = 0; i < sizeof(dirs) / sizeof(dirs[0]); i++) for (i = 0; i < (int)(sizeof(dirs) / sizeof(dirs[0])); i++)
{ {
struct dirent* entry; struct dirent* entry;

13
src/x11_window.c
View File

@ -36,6 +36,8 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <limits.h> #include <limits.h>
#include <float.h>
#include <math.h>
// Action for EWMH client messages // Action for EWMH client messages
#define _NET_WM_STATE_REMOVE 0 #define _NET_WM_STATE_REMOVE 0
@ -520,7 +522,12 @@ static void processEvent(XEvent *event)
_glfwInputKey(window, key, event->xkey.keycode, GLFW_PRESS, mods); _glfwInputKey(window, key, event->xkey.keycode, GLFW_PRESS, mods);
if (!(mods & GLFW_MOD_CONTROL) && !(mods & GLFW_MOD_ALT)) if (!(mods & GLFW_MOD_CONTROL) && !(mods & GLFW_MOD_ALT))
_glfwInputChar(window, translateChar(&event->xkey)); {
const int translatedChar = translateChar(&event->xkey);
if (translatedChar != -1)
_glfwInputChar(window, translatedChar);
}
break; break;
} }
@ -786,8 +793,8 @@ static void processEvent(XEvent *event)
window = _glfwFindWindowByHandle(data->event); window = _glfwFindWindowByHandle(data->event);
if (window) if (window)
{ {
if (data->event_x != window->x11.warpPosX || if (fabs(data->event_x - window->x11.warpPosX) >= DBL_EPSILON ||
data->event_y != window->x11.warpPosY) fabs(data->event_y - window->x11.warpPosY) >= DBL_EPSILON)
{ {
// The cursor was moved by something other than GLFW // The cursor was moved by something other than GLFW