Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Feature] IsKey... safety checks and more #3256

Merged
merged 27 commits into from
Aug 26, 2023
Merged

[Feature] IsKey... safety checks and more #3256

Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
9a9535d
[Feature] Add GetKeyRepeat
nickyMcDonald Aug 17, 2023
5b1f233
Update rcore.c
nickyMcDonald Aug 17, 2023
d09b3e6
Simpler design, only one repeat per frame
nickyMcDonald Aug 19, 2023
4d07530
Update config.h
nickyMcDonald Aug 19, 2023
31c339d
Update rcore.c
nickyMcDonald Aug 19, 2023
207c1b6
Add KEYBOARD_KEYS_MASK
nickyMcDonald Aug 19, 2023
ae1f098
Update config.h
nickyMcDonald Aug 19, 2023
3001a4a
reversions
nickyMcDonald Aug 20, 2023
1fed487
Update rcore.c
nickyMcDonald Aug 20, 2023
c3c397e
Update rcore.c
nickyMcDonald Aug 20, 2023
36e867e
change docs
nickyMcDonald Aug 20, 2023
5bfe3b0
Update rcore.c
nickyMcDonald Aug 20, 2023
a14176e
Update rcore.c
nickyMcDonald Aug 20, 2023
298b871
Update rcore.c
nickyMcDonald Aug 20, 2023
258ddbf
Update rcore.c
nickyMcDonald Aug 20, 2023
7004eeb
Update rcore.c
nickyMcDonald Aug 20, 2023
0908c13
Merge branch 'master' into IsKeyPressedRepeat
nickyMcDonald Aug 20, 2023
0d021ae
Update raylib.h
nickyMcDonald Aug 20, 2023
caca605
Merge branch 'IsKeyPressedRepeat' of https://github.com/n77y/raylib i…
nickyMcDonald Aug 20, 2023
5a87235
Update rcore.c
nickyMcDonald Aug 20, 2023
7b1d90b
Update rcore.c
nickyMcDonald Aug 20, 2023
90c4f28
Update rcore.c
nickyMcDonald Aug 20, 2023
75d23ae
Update rcore.c
nickyMcDonald Aug 20, 2023
87adb5b
Update rcore.c
nickyMcDonald Aug 20, 2023
3439f5d
Update rcore.c
nickyMcDonald Aug 20, 2023
903e04f
Update rcore.c
nickyMcDonald Aug 20, 2023
2fab75d
Update rcore.c
nickyMcDonald Aug 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 21 additions & 3 deletions src/rcore.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3750,6 +3750,7 @@ void OpenURL(const char *url)
// Check if a key has been pressed once
bool IsKeyPressed(int key)
{
if ((key < 0) || (key >= MAX_KEYBOARD_KEYS)) return false;
bool pressed = false;

if ((CORE.Input.Keyboard.previousKeyState[key] == 0) && (CORE.Input.Keyboard.currentKeyState[key] == 1)) pressed = true;
Expand All @@ -3760,20 +3761,23 @@ bool IsKeyPressed(int key)
// Check if a key has been pressed again (only PLATFORM_DESKTOP)
bool IsKeyPressedRepeat(int key)
{
if ((key < 0) || (key >= MAX_KEYBOARD_KEYS)) return false;
if (CORE.Input.Keyboard.keyRepeatInFrame[key] == 1) return true;
else return false;
}

// Check if a key is being pressed (key held down)
bool IsKeyDown(int key)
{
if ((key < 0) || (key >= MAX_KEYBOARD_KEYS)) return false;
if (CORE.Input.Keyboard.currentKeyState[key] == 1) return true;
else return false;
}

// Check if a key has been released once
bool IsKeyReleased(int key)
{
if ((key < 0) || (key >= MAX_KEYBOARD_KEYS)) return false;
bool released = false;

if ((CORE.Input.Keyboard.previousKeyState[key] == 1) && (CORE.Input.Keyboard.currentKeyState[key] == 0)) released = true;
Expand All @@ -3784,6 +3788,7 @@ bool IsKeyReleased(int key)
// Check if a key is NOT being pressed (key not held down)
bool IsKeyUp(int key)
{
if ((key < 0) || (key >= MAX_KEYBOARD_KEYS)) return false;
if (CORE.Input.Keyboard.currentKeyState[key] == 0) return true;
else return false;
}
Expand Down Expand Up @@ -5226,7 +5231,11 @@ void PollInputEvents(void)
// Keyboard/Mouse input polling (automatically managed by GLFW3 through callback)

// Register previous keys states
for (int i = 0; i < MAX_KEYBOARD_KEYS; i++) CORE.Input.Keyboard.previousKeyState[i] = CORE.Input.Keyboard.currentKeyState[i];
for (int i = 0; i < MAX_KEYBOARD_KEYS; i++)
{
CORE.Input.Keyboard.previousKeyState[i] = CORE.Input.Keyboard.currentKeyState[i];
CORE.Input.Keyboard.keyRepeatInFrame[i] = 0;
}

// Register previous mouse states
for (int i = 0; i < MAX_MOUSE_BUTTONS; i++) CORE.Input.Mouse.previousButtonState[i] = CORE.Input.Mouse.currentButtonState[i];
Expand Down Expand Up @@ -5408,7 +5417,11 @@ void PollInputEvents(void)
#if defined(PLATFORM_ANDROID)
// Register previous keys states
// NOTE: Android supports up to 260 keys
for (int i = 0; i < 260; i++) CORE.Input.Keyboard.previousKeyState[i] = CORE.Input.Keyboard.currentKeyState[i];
for (int i = 0; i < 260; i++)
{
CORE.Input.Keyboard.previousKeyState[i] = CORE.Input.Keyboard.currentKeyState[i];
CORE.Input.Keyboard.keyRepeatInFrame[i] = 0;
}

// Android ALooper_pollAll() variables
int pollResult = 0;
Expand Down Expand Up @@ -6073,6 +6086,7 @@ static int32_t AndroidInputCallback(struct android_app *app, AInputEvent *event)
CORE.Input.Keyboard.keyPressedQueue[CORE.Input.Keyboard.keyPressedQueueCount] = keycode;
CORE.Input.Keyboard.keyPressedQueueCount++;
}
else if (AKeyEvent_getAction(event) == AKEY_EVENT_ACTION_MULTIPLE) CORE.Input.Keyboard.keyRepeatInFrame[keycode] = 1;
else CORE.Input.Keyboard.currentKeyState[keycode] = 0; // Key up

if (keycode == AKEYCODE_POWER)
Expand Down Expand Up @@ -6496,7 +6510,11 @@ static void InitEvdevInput(void)
}

// Reset keyboard key state
for (int i = 0; i < MAX_KEYBOARD_KEYS; i++) CORE.Input.Keyboard.currentKeyState[i] = 0;
for (int i = 0; i < MAX_KEYBOARD_KEYS; i++)
{
CORE.Input.Keyboard.currentKeyState[i] = 0;
CORE.Input.Keyboard.keyRepeatInFrame[i] = 0;
}

// Open the linux directory of "/dev/input"
directory = opendir(DEFAULT_EVDEV_PATH);
Expand Down