mirror of
https://github.com/glfw/glfw.git
synced 2024-11-10 00:51:47 +00:00
Added GLFW_REPEAT.
This commit is contained in:
parent
919bc0679d
commit
253e0d6b23
@ -286,6 +286,7 @@ GLFW.
|
||||
`GLES2/gl2.h` instead of `GL/gl.h`
|
||||
* Added `GLFW_VISIBLE` window hint and parameter for controlling and polling
|
||||
window visibility
|
||||
* Added `GLFW_REPEAT` key action for repeated keys
|
||||
* Added `windows` simple multi-window test program
|
||||
* Added `sharing` simple OpenGL object sharing test program
|
||||
* Added `modes` video mode enumeration and setting test program
|
||||
|
@ -242,6 +242,10 @@ extern "C" {
|
||||
* @ingroup input
|
||||
*/
|
||||
#define GLFW_PRESS 1
|
||||
/*! @brief The key was held down until it repeated.
|
||||
* @ingroup input
|
||||
*/
|
||||
#define GLFW_REPEAT 2
|
||||
/*! @} */
|
||||
|
||||
/* Keyboard raw key codes.
|
||||
@ -676,7 +680,7 @@ typedef void (* GLFWscrollfun)(GLFWwindow*,double,double);
|
||||
* @param[in] window The window that received the event.
|
||||
* @param[in] key The @link keys keyboard key @endlink that was pressed or
|
||||
* released.
|
||||
* @param[in] action One of @c GLFW_PRESS or @c GLFW_RELEASE.
|
||||
* @param[in] action @ref GLFW_PRESS, @ref GLFW_RELEASE or @ref GLFW_REPEAT.
|
||||
* @ingroup input
|
||||
*
|
||||
* @sa glfwSetKeyCallback
|
||||
|
@ -438,24 +438,21 @@ static int convertMacKeyCode(unsigned int macKeyCode)
|
||||
{
|
||||
NSUInteger i, length;
|
||||
NSString* characters;
|
||||
int key = convertMacKeyCode([event keyCode]);
|
||||
const int key = convertMacKeyCode([event keyCode]);
|
||||
if (key == -1)
|
||||
return;
|
||||
|
||||
if (key != -1)
|
||||
_glfwInputKey(window, key, GLFW_PRESS);
|
||||
|
||||
if ([event modifierFlags] & NSCommandKeyMask)
|
||||
[super keyDown:event];
|
||||
else
|
||||
{
|
||||
_glfwInputKey(window, key, GLFW_PRESS);
|
||||
characters = [event characters];
|
||||
length = [characters length];
|
||||
|
||||
if ([event modifierFlags] & NSCommandKeyMask)
|
||||
{
|
||||
[super keyDown:event];
|
||||
}
|
||||
else
|
||||
{
|
||||
characters = [event characters];
|
||||
length = [characters length];
|
||||
|
||||
for (i = 0; i < length; i++)
|
||||
_glfwInputChar(window, [characters characterAtIndex:i]);
|
||||
}
|
||||
for (i = 0; i < length; i++)
|
||||
_glfwInputChar(window, [characters characterAtIndex:i]);
|
||||
}
|
||||
}
|
||||
|
||||
|
17
src/input.c
17
src/input.c
@ -120,23 +120,18 @@ void _glfwInputKey(_GLFWwindow* window, int key, int action)
|
||||
if (key < 0 || key > GLFW_KEY_LAST)
|
||||
return;
|
||||
|
||||
// Are we trying to release an already released key?
|
||||
if (action == GLFW_RELEASE && window->key[key] != GLFW_PRESS)
|
||||
return;
|
||||
if (action == GLFW_PRESS && window->key[key] == GLFW_PRESS)
|
||||
repeated = GL_TRUE;
|
||||
|
||||
// Register key action
|
||||
if (action == GLFW_RELEASE && window->stickyKeys)
|
||||
window->key[key] = _GLFW_STICK;
|
||||
else
|
||||
{
|
||||
if (action == GLFW_PRESS && window->key[key] == GLFW_PRESS)
|
||||
repeated = GL_TRUE;
|
||||
|
||||
window->key[key] = (char) action;
|
||||
}
|
||||
|
||||
// Call user callback function
|
||||
if (window->callbacks.key && !repeated)
|
||||
if (repeated)
|
||||
action = GLFW_REPEAT;
|
||||
|
||||
if (window->callbacks.key)
|
||||
window->callbacks.key((GLFWwindow*) window, key, action);
|
||||
}
|
||||
|
||||
|
@ -107,7 +107,7 @@ typedef struct _GLFWmonitor _GLFWmonitor;
|
||||
//========================================================================
|
||||
|
||||
// Internal key state used for sticky keys
|
||||
#define _GLFW_STICK 2
|
||||
#define _GLFW_STICK 3
|
||||
|
||||
|
||||
//========================================================================
|
||||
|
@ -488,11 +488,17 @@ static GLboolean initDisplay(void)
|
||||
return GL_FALSE;
|
||||
}
|
||||
|
||||
XkbSetDetectableAutoRepeat(_glfw.x11.display, True, &supported);
|
||||
if (!XkbSetDetectableAutoRepeat(_glfw.x11.display, True, &supported))
|
||||
{
|
||||
_glfwInputError(GLFW_PLATFORM_ERROR,
|
||||
"X11: Failed to set detectable key repeat");
|
||||
return GL_FALSE;
|
||||
}
|
||||
|
||||
if (!supported)
|
||||
{
|
||||
_glfwInputError(GLFW_PLATFORM_ERROR,
|
||||
"X11: Detectable key repeat is not available");
|
||||
"X11: Detectable key repeat is not supported");
|
||||
return GL_FALSE;
|
||||
}
|
||||
|
||||
|
@ -183,6 +183,8 @@ static const char* get_action_name(int action)
|
||||
return "pressed";
|
||||
case GLFW_RELEASE:
|
||||
return "released";
|
||||
case GLFW_REPEAT:
|
||||
return "repeated";
|
||||
}
|
||||
|
||||
return "caused unknown action";
|
||||
|
Loading…
Reference in New Issue
Block a user