From d69f2f57eed1c3d7fc10b030ad3c5e126ca6f64d Mon Sep 17 00:00:00 2001
From: ocornut <omarcornut@gmail.com>
Date: Wed, 27 May 2015 15:17:44 +0100
Subject: [PATCH] Added configurable io.KeyRepeatDelay, io.KeyRepeatRate

---
 imgui.cpp | 22 ++++++++++++----------
 imgui.h   |  2 ++
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/imgui.cpp b/imgui.cpp
index 2e56ad7e..15907308 100644
--- a/imgui.cpp
+++ b/imgui.cpp
@@ -653,6 +653,8 @@ ImGuiIO::ImGuiIO()
     MouseDoubleClickTime = 0.30f;
     MouseDoubleClickMaxDist = 6.0f;
     MouseDragThreshold = 6.0f;
+    KeyRepeatDelay = 0.250f;
+    KeyRepeatRate = 0.020f;
     UserData = NULL;
 
     // User functions
@@ -2864,12 +2866,12 @@ bool ImGui::IsKeyPressed(int key_index, bool repeat)
     if (t == 0.0f)
         return true;
 
-    // FIXME: Repeat rate should be provided elsewhere?
-    const float KEY_REPEAT_DELAY = 0.250f;
-    const float KEY_REPEAT_RATE = 0.020f;
-    if (repeat && t > KEY_REPEAT_DELAY)
-        if ((fmodf(t - KEY_REPEAT_DELAY, KEY_REPEAT_RATE) > KEY_REPEAT_RATE*0.5f) != (fmodf(t - KEY_REPEAT_DELAY - g.IO.DeltaTime, KEY_REPEAT_RATE) > KEY_REPEAT_RATE*0.5f))
+    if (repeat && t > g.IO.KeyRepeatDelay)
+    {
+        float delay = g.IO.KeyRepeatDelay, rate = g.IO.KeyRepeatRate;
+        if ((fmodf(t - delay, rate) > rate*0.5f) != (fmodf(t - delay - g.IO.DeltaTime, rate) > rate*0.5f))
             return true;
+    }
 
     return false;
 }
@@ -2889,12 +2891,12 @@ bool ImGui::IsMouseClicked(int button, bool repeat)
     if (t == 0.0f)
         return true;
 
-    // FIXME: Repeat rate should be provided elsewhere?
-    const float MOUSE_REPEAT_DELAY = 0.250f;
-    const float MOUSE_REPEAT_RATE = 0.020f;
-    if (repeat && t > MOUSE_REPEAT_DELAY)
-        if ((fmodf(t - MOUSE_REPEAT_DELAY, MOUSE_REPEAT_RATE) > MOUSE_REPEAT_RATE*0.5f) != (fmodf(t - MOUSE_REPEAT_DELAY - g.IO.DeltaTime, MOUSE_REPEAT_RATE) > MOUSE_REPEAT_RATE*0.5f))
+    if (repeat && t > g.IO.KeyRepeatDelay)
+    {
+        float delay = g.IO.KeyRepeatDelay, rate = g.IO.KeyRepeatRate;
+        if ((fmodf(t - delay, rate) > rate*0.5f) != (fmodf(t - delay - g.IO.DeltaTime, rate) > rate*0.5f))
             return true;
+    }
 
     return false;
 }
diff --git a/imgui.h b/imgui.h
index 79fd4597..c3071368 100644
--- a/imgui.h
+++ b/imgui.h
@@ -603,6 +603,8 @@ struct ImGuiIO
     float         MouseDoubleClickMaxDist;  // = 6.0f               // Distance threshold to stay in to validate a double-click, in pixels.
     float         MouseDragThreshold;       // = 6.0f               // Distance threshold before considering we are dragging
     int           KeyMap[ImGuiKey_COUNT];   // <unset>              // Map of indices into the KeysDown[512] entries array
+    float         KeyRepeatDelay;           // = 0.250f             // When holding a key/button, time before it starts repeating, in seconds. (for actions where 'repeat' is active)
+    float         KeyRepeatRate;            // = 0.020f             // When holding a key/button, rate at which it repeats, in seconds.
     void*         UserData;                 // = NULL               // Store your own data for retrieval by callbacks.
 
     ImFontAtlas*  Fonts;                    // <auto>               // Load and assemble one or more fonts into a single tightly packed texture. Output to Fonts array.