From f5c2181218256f2711f8029fd412a4a4a399522e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andr=C3=A9=20Moreau?= Date: Wed, 10 Jul 2013 14:04:43 -0700 Subject: [PATCH] channels/disp: update --- channels/disp/client/disp_main.c | 3 +++ include/freerdp/client/disp.h | 2 ++ include/freerdp/event.h | 5 +++++ libfreerdp/core/freerdp.c | 1 + 4 files changed, 11 insertions(+) diff --git a/channels/disp/client/disp_main.c b/channels/disp/client/disp_main.c index 76ce8be97..1e7463c0a 100644 --- a/channels/disp/client/disp_main.c +++ b/channels/disp/client/disp_main.c @@ -98,6 +98,9 @@ int disp_send_display_control_monitor_layout_pdu(DISP_CHANNEL_CALLBACK* callback Stream_Write_UINT32(s, Monitors[index].PhysicalWidth); /* PhysicalWidth (4 bytes) */ Stream_Write_UINT32(s, Monitors[index].PhysicalHeight); /* PhysicalHeight (4 bytes) */ Stream_Write_UINT32(s, Monitors[index].Orientation); /* Orientation (4 bytes) */ + + //Stream_Write_UINT32(s, Monitors[index].DesktopScaleFactor); /* DesktopScaleFactor (4 bytes) */ + //Stream_Write_UINT32(s, Monitors[index].DeviceScaleFactor); /* DeviceScaleFactor (4 bytes) */ } Stream_SealLength(s); diff --git a/include/freerdp/client/disp.h b/include/freerdp/client/disp.h index d51819ccd..e13bdea0b 100644 --- a/include/freerdp/client/disp.h +++ b/include/freerdp/client/disp.h @@ -32,6 +32,8 @@ struct _DISPLAY_CONTROL_MONITOR_LAYOUT UINT32 PhysicalWidth; UINT32 PhysicalHeight; UINT32 Orientation; + UINT32 DesktopScaleFactor; + UINT32 DeviceScaleFactor; }; typedef struct _DISPLAY_CONTROL_MONITOR_LAYOUT DISPLAY_CONTROL_MONITOR_LAYOUT; diff --git a/include/freerdp/event.h b/include/freerdp/event.h index 2e1fae804..cd4c7e7f1 100644 --- a/include/freerdp/event.h +++ b/include/freerdp/event.h @@ -41,6 +41,11 @@ DEFINE_EVENT_BEGIN(ResizeWindow) int width; int height; DEFINE_EVENT_END(ResizeWindow) + +DEFINE_EVENT_BEGIN(LocalResizeWindow) + int width; + int height; +DEFINE_EVENT_END(LocalResizeWindow) DEFINE_EVENT_BEGIN(EmbedWindow) BOOL embed; diff --git a/libfreerdp/core/freerdp.c b/libfreerdp/core/freerdp.c index 87171d493..85f5c3235 100644 --- a/libfreerdp/core/freerdp.c +++ b/libfreerdp/core/freerdp.c @@ -330,6 +330,7 @@ static wEventType FreeRDP_Events[] = { DEFINE_EVENT_ENTRY(WindowStateChange) DEFINE_EVENT_ENTRY(ResizeWindow) + DEFINE_EVENT_ENTRY(LocalResizeWindow) DEFINE_EVENT_ENTRY(EmbedWindow) DEFINE_EVENT_ENTRY(PanningChange) DEFINE_EVENT_ENTRY(ScalingFactorChange)