diff options
| author | speidy <speidy@gmail.com> | 2016-12-13 15:08:37 -0500 |
|---|---|---|
| committer | speidy <speidy@gmail.com> | 2016-12-13 15:08:37 -0500 |
| commit | 3dc0f2860c19e7c7d43d4c5a709dc13f16ff1f7a (patch) | |
| tree | 098ba1d99caf1e762fb30f729672138b96669b9b /common | |
| parent | 5e39bb1f87d3d01b360f03cc81f65f03dd3d6e87 (diff) | |
| parent | a0cf6030df8364d4a5ab775a8e91ccfeb0ef4209 (diff) | |
| download | xrdp-proprietary-3dc0f2860c19e7c7d43d4c5a709dc13f16ff1f7a.tar.gz xrdp-proprietary-3dc0f2860c19e7c7d43d4c5a709dc13f16ff1f7a.zip | |
Merge branch 'surface_cmds' of git://github.com/speidy/xrdp into surface_cmds
Diffstat (limited to 'common')
| -rw-r--r-- | common/os_calls.c | 2 | ||||
| -rw-r--r-- | common/xrdp_constants.h | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/common/os_calls.c b/common/os_calls.c index 9ebaa880..5db59caa 100644 --- a/common/os_calls.c +++ b/common/os_calls.c @@ -681,7 +681,7 @@ g_sck_close(int sck) char addr[48]; struct sockaddr_in6 *sock_addr_in6 = &sock_info.sock_addr_in6; - g_snprintf(sockname, sizeof(sockname), "AF_INET6 %s:%d", + g_snprintf(sockname, sizeof(sockname), "AF_INET6 %s port %d", inet_ntop(sock_addr_in6->sin6_family, &sock_addr_in6->sin6_addr, addr, sizeof(addr)), ntohs(sock_addr_in6->sin6_port)); diff --git a/common/xrdp_constants.h b/common/xrdp_constants.h index 73fd95d7..82b4c059 100644 --- a/common/xrdp_constants.h +++ b/common/xrdp_constants.h @@ -160,6 +160,7 @@ #define RDP_INPUT_CODEPOINT 1 #define RDP_INPUT_VIRTKEY 2 #define RDP_INPUT_SCANCODE 4 +#define RDP_INPUT_UNICODE 5 #define RDP_INPUT_MOUSE 0x8001 #define RDP_INPUT_MOUSEX 0x8002 @@ -629,4 +630,10 @@ #define XRDP_MAX_BITMAP_CACHE_IDX 2000 #define XRDP_BITMAP_CACHE_ENTRIES 2048 +#define XR_MIN_KEY_CODE 8 +#define XR_MAX_KEY_CODE 256 + +#define XR_RDP_SCAN_LSHIFT 42 +#define XR_RDP_SCAN_ALT 56 + #endif |