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

neutrinordp: minor changes, coding style, log level

Browse Source
This commit is contained in:
Jay Sorg 2014-05-19 12:45:49 -07:00
parent eaa801f134
commit b30e5ca14a
2 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
neutrinordp/xrdp-neutrinordp.c
View File

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

2
neutrinordp/xrdp-neutrinordp.h
View File

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