mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #225 from nfedera/framemarkerupdate

Browse Source 
core: add update callback for the surface frame marker command
This commit is contained in:
Marc-André Moreau 2011-11-25 07:08:37 -08:00
commit afd2569be0
3 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
client/X11/xf_gdi.c
View File

@ -613,6 +613,11 @@ void xf_gdi_mem3blt(rdpContext* context, MEM3BLT_ORDER* mem3blt)
}
void xf_gdi_surface_frame_marker(rdpContext* context, uint16 frame_action, uint32 frame_id)
{
}
void xf_gdi_surface_bits(rdpContext* context, SURFACE_BITS_COMMAND* surface_bits_command)
{
int i, tx, ty;
@ -768,5 +773,6 @@ void xf_gdi_register_update_callbacks(rdpUpdate* update)
primary->EllipseCB = NULL;
update->SurfaceBits = xf_gdi_surface_bits;
update->SurfaceFrameMarker = xf_gdi_surface_frame_marker;
}

4
include/freerdp/update.h
View File

@ -130,6 +130,7 @@ typedef void (*pSuppressOutput)(rdpContext* context, uint8 allow, RECTANGLE_16*
typedef void (*pSurfaceCommand)(rdpContext* context, STREAM* s);
typedef void (*pSurfaceBits)(rdpContext* context, SURFACE_BITS_COMMAND* surface_bits_command);
typedef void (*pSurfaceFrameMarker)(rdpContext* context, uint16 frameAction, uint32 frameId);
struct rdp_update
{
@ -159,7 +160,8 @@ struct rdp_update
pSurfaceCommand SurfaceCommand; /* 64 */
pSurfaceBits SurfaceBits; /* 65 */
uint32 paddingE[80 - 66]; /* 66 */
pSurfaceFrameMarker SurfaceFrameMarker; /* 66 */
uint32 paddingE[80 - 67]; /* 67 */
/* internal */

2
libfreerdp-core/surface.c
View File

@ -54,6 +54,8 @@ static int update_recv_surfcmd_frame_marker(rdpUpdate* update, STREAM* s)
stream_read_uint16(s, frameAction);
stream_read_uint32(s, frameId);
IFCALL(update->SurfaceFrameMarker, update->context, frameAction, frameId);
return 6;
}