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

Numlock out of sync fix

Browse Source
This commit is contained in:
ArvidNorr 2014-05-16 08:17:11 +02:00
parent 4f4a7a8c8c
commit f748345ea0
2 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
neutrinordp/xrdp-neutrinordp.c
View File

@ -27,7 +27,7 @@
#ifdef XRDP_DEBUG
#define LOG_LEVEL 99
#else
#define LOG_LEVEL 10
#define LOG_LEVEL 0
#endif
#define LLOG(_level, _args) \
@ -195,14 +195,31 @@ lxrdp_event(struct mod *mod, int msg, long param1, long param2,
switch (msg)
{
case 15: /* key down */
// Before we handle the first character we synchronize
// capslock and numlock.
// We collect the state during the first synchronize ( see msg 17)
if(!mod->bool_keyBoardSynced)
{
LLOGLN(0, ("Additional Sync event handled : %d",mod->keyBoardLockInfo));
mod->inst->input->SynchronizeEvent(mod->inst->input, mod->keyBoardLockInfo);
mod->bool_keyBoardSynced = 1;
}
mod->inst->input->KeyboardEvent(mod->inst->input, param4, param3);
break;
case 16: /* key up */
mod->inst->input->KeyboardEvent(mod->inst->input, param4, param3);
break;
case 17: /*Synchronize*/
LLOGLN(11, ("Synchronized event handled"));
mod->inst->input->SynchronizeEvent(mod->inst->input, 0);
case 17: /*Synchronize*/
LLOGLN(11, ("Synchronized event handled : %d",param1));
// In some situations the Synchronize event come to early.
// Therefore we store this information and use it when we
// receive the first keyboard event
// Without this fix numlock and capslock can come out of sync.
mod->inst->input->SynchronizeEvent(mod->inst->input, param1);
if(!mod->bool_keyBoardSynced)
{
mod->keyBoardLockInfo = param1 ;
}
break;
case 100: /* mouse move */
LLOGLN(12, ("mouse move %d %d", param1, param2));

2
neutrinordp/xrdp-neutrinordp.h
View File

@ -172,6 +172,8 @@ struct mod
int vrev;
char username[256];
char password[256];
int bool_keyBoardSynced ; /*Numlock can be out of sync, we hold state here to resolve */
int keyBoardLockInfo ; /* Holds initial numlock capslock state */
struct xrdp_client_info client_info;