Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Fixed: #1057 X11 Key auto repeat

Browse source
This commit is contained in:
kervala 2010-08-05 14:21:41 +02:00
parent 719e589d0d
commit 898e36a8d8
1 changed files with 35 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
code/nel/src/3d/driver/opengl/unix_event_emitter.cpp
View file

@ -393,6 +393,24 @@ TKey getKeyFromKeySym (KeySym keysym)
return KeyNOKEY;
}
// check if the next pressed key is the same
static bool keyRepeat(Display *display, XEvent *event)
{
XEvent peekevent;
if (XPending(display))
{
XPeekEvent(display, &peekevent);
if ((peekevent.type == KeyPress) &&
(peekevent.xkey.keycode == event->xkey.keycode) &&
((peekevent.xkey.time-event->xkey.time) < 2))
return true;
}
return false;
}
bool CUnixEventEmitter::processMessage (XEvent &event, CEventServer *server)
{
if (!server)
@ -541,21 +559,33 @@ bool CUnixEventEmitter::processMessage (XEvent &event, CEventServer *server)
}
case KeyRelease:
{
TKey key = getKeyFromKeySym(XKeycodeToKeysym(_dpy, event.xkey.keycode, 0));
if(key == KeyNOKEY)
key = getKeyFromKeycode(event.xkey.keycode);
if (!keyRepeat(_dpy, &event))
{
KeySym k;
// only need to get correct KeySym
int c = XLookupString(&event.xkey, NULL, 0, &k, NULL);
server->postEvent (new CEventKeyUp (key, getKeyButton(event.xbutton.state), this));
_PreviousKey = KeyNOKEY;
TKey key = getKeyFromKeySym(k);
if(key == KeyNOKEY)
key = getKeyFromKeycode(event.xkey.keycode);
server->postEvent (new CEventKeyUp (key, getKeyButton(event.xbutton.state), this));
_PreviousKey = KeyNOKEY;
}
break;
}
case FocusIn:
// keyboard focus
if (_ic) XSetICFocus(_ic);
break;
case FocusOut:
// keyboard focus
if (_ic) XUnsetICFocus(_ic);
break;
case KeymapNotify:
break;
case MappingNotify:
// update keymap
XRefreshKeyboardMapping((XMappingEvent *)&event);
break;
case DestroyNotify: