jh163888/xrdp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Hand-apply patches (keyboard autorepeat) from Authentic8 branch: b5b58fcbbd9eb57ff1ff4b8df8f4426c1c2881fb

Browse Source
This commit is contained in:
Jay Sorg 2013-07-02 17:16:39 -07:00 committed by Jim Grandy
parent 92c2a9759e
commit 97495a3326
1 changed files with 48 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
xorg/X11R7.6/rdp/rdpinput.c
View File

@ -58,6 +58,7 @@ static int g_tab_down = 0;
/* this is toggled every time num lock key is released, not like the /* this is toggled every time num lock key is released, not like the
above *_down vars */ above *_down vars */
static int g_scroll_lock_down = 0; static int g_scroll_lock_down = 0;
static OsTimerPtr g_kbtimer = 0;
#define MIN_KEY_CODE 8 #define MIN_KEY_CODE 8
#define MAX_KEY_CODE 255 #define MAX_KEY_CODE 255
@ -314,11 +315,58 @@ rdpBell(int volume, DeviceIntPtr pDev, pointer ctrl, int cls)
ErrorF("rdpBell:\n"); ErrorF("rdpBell:\n");
} }
/******************************************************************************/
static CARD32
rdpInDeferredUpdateCallback(OsTimerPtr timer, CARD32 now, pointer arg)
{
//ErrorF("rdpInDeferredUpdateCallback:\n");
/* our keyboard device */
XkbSetRepeatKeys(g_keyboard, -1, AutoRepeatModeOff);
/* the main one for the server */
XkbSetRepeatKeys(inputInfo.keyboard, -1, AutoRepeatModeOff);
return 0;
}
/******************************************************************************/ /******************************************************************************/
void void
rdpChangeKeyboardControl(DeviceIntPtr pDev, KeybdCtrl *ctrl) rdpChangeKeyboardControl(DeviceIntPtr pDev, KeybdCtrl *ctrl)
{ {
XkbControlsPtr ctrls;
ErrorF("rdpChangeKeyboardControl:\n"); ErrorF("rdpChangeKeyboardControl:\n");
ctrls = 0;
if (pDev != 0)
{
if (pDev->key != 0)
{
if (pDev->key->xkbInfo != 0)
{
if (pDev->key->xkbInfo->desc != 0)
{
if (pDev->key->xkbInfo->desc->ctrls != 0)
{
ctrls = pDev->key->xkbInfo->desc->ctrls;
}
}
}
}
}
if (ctrls != 0)
{
if (ctrls->enabled_ctrls & XkbRepeatKeysMask)
{
//ErrorF("rdpChangeKeyboardControl: autoRepeat on\n");
/* schedual to turn off the autorepeat after 100 ms so any app
* polling it will be happy it's on */
g_kbtimer = TimerSet(g_kbtimer, 0, 100, rdpInDeferredUpdateCallback, 0);\
}
else
{
//ErrorF("rdpChangeKeyboardControl: autoRepeat off\n");
}
}
} }
/******************************************************************************/ /******************************************************************************/