josh/jes
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

turn off custom key repeats and just use X key repeats

Browse Source
This commit is contained in:
Josh Holtrop 2017-10-12 20:44:16 -04:00
parent 6eeb0d5b9a
commit de31e97556
3 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/Window.cc
View File

@ -163,10 +163,12 @@ void Window::handle_event(Jtk_Event & event)
#endif #endif
case JTK_EVENT_KEY_PRESS: case JTK_EVENT_KEY_PRESS:
#if 0
if (!event.key.repeat) if (!event.key.repeat)
{ {
Jtk_BeginKeyRepeat(&event.key, 300u, 25u); Jtk_BeginKeyRepeat(&event.key, 300u, 25u);
} }
#endif
handle_keypress(event.key.key); handle_keypress(event.key.key);
m_redraw_requested = true; m_redraw_requested = true;
break; break;

8
src/gui/jtk/Jtk_event.cc
View File

@ -15,6 +15,7 @@
static std::unordered_map<unsigned int, size_t> g_repeating_keys; static std::unordered_map<unsigned int, size_t> g_repeating_keys;
static std::unordered_map<size_t, unsigned int> g_key_repeat_timers; static std::unordered_map<size_t, unsigned int> g_key_repeat_timers;
#if 0
static void StopKeyRepeat(unsigned int x_keycode) static void StopKeyRepeat(unsigned int x_keycode)
{ {
auto it = g_repeating_keys.find(x_keycode); auto it = g_repeating_keys.find(x_keycode);
@ -26,6 +27,7 @@ static void StopKeyRepeat(unsigned int x_keycode)
g_key_repeat_timers.erase(timer_id); g_key_repeat_timers.erase(timer_id);
} }
} }
#endif
static unsigned int GetXState() static unsigned int GetXState()
{ {
@ -190,6 +192,7 @@ static uint32_t XKeyToJtkKey(unsigned int x_keycode)
return key; return key;
} }
#if 0
static Bool KeyRepeatCheckIfEvent(Display * display, XEvent * chkev, static Bool KeyRepeatCheckIfEvent(Display * display, XEvent * chkev,
XPointer arg) XPointer arg)
{ {
@ -217,6 +220,7 @@ static bool IsRepeatKey(Display * display, XEvent * event)
} }
return false; return false;
} }
#endif
/** /**
* Process an X key press event. * Process an X key press event.
@ -246,11 +250,13 @@ static bool ProcessXKeyPressEvent(XEvent * x_event, Jtk_Event * event)
*/ */
static bool ProcessXKeyReleaseEvent(XEvent * x_event, Jtk_Event * event) static bool ProcessXKeyReleaseEvent(XEvent * x_event, Jtk_Event * event)
{ {
#if 0
if (IsRepeatKey(g_display, x_event)) if (IsRepeatKey(g_display, x_event))
{ {
return false; return false;
} }
StopKeyRepeat(x_event->xkey.keycode); StopKeyRepeat(x_event->xkey.keycode);
#endif
return false; return false;
} }
@ -348,6 +354,7 @@ void Jtk_WaitEvent(Jtk_Event * event)
} }
} }
#if 0
void Jtk_BeginKeyRepeat(Jtk_KeyEvent * key_event, uint32_t delay, uint32_t interval) void Jtk_BeginKeyRepeat(Jtk_KeyEvent * key_event, uint32_t delay, uint32_t interval)
{ {
StopKeyRepeat(key_event->x_keycode); StopKeyRepeat(key_event->x_keycode);
@ -355,5 +362,6 @@ void Jtk_BeginKeyRepeat(Jtk_KeyEvent * key_event, uint32_t delay, uint32_t inter
g_repeating_keys[key_event->x_keycode] = timer_id; g_repeating_keys[key_event->x_keycode] = timer_id;
g_key_repeat_timers[timer_id] = key_event->x_keycode; g_key_repeat_timers[timer_id] = key_event->x_keycode;
} }
#endif
#endif #endif

2
src/gui/jtk/Jtk_event.h
View File

@ -45,6 +45,8 @@ typedef struct
} Jtk_Event; } Jtk_Event;
void Jtk_WaitEvent(Jtk_Event * event); void Jtk_WaitEvent(Jtk_Event * event);
#if 0
void Jtk_BeginKeyRepeat(Jtk_KeyEvent * key_event, uint32_t delay, uint32_t interval); void Jtk_BeginKeyRepeat(Jtk_KeyEvent * key_event, uint32_t delay, uint32_t interval);
#endif
#endif #endif