mirrors
/
xrdp
mirror of https://github.com/neutrinolabs/xrdp
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

vnc: implement suppress output

This commit is contained in:
Jay Sorg 2019-04-09 18:24:24 -07:00
parent f4aebe021a
commit 4cbf84d99b
2 changed files with 90 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

120
vnc/vnc.c
View File

@ -380,20 +380,23 @@ lib_mod_event(struct vnc *v, int msg, long param1, long param2,
}
else if (msg == 200) /* invalidate */
{
/* FramebufferUpdateRequest */
init_stream(s, 8192);
out_uint8(s, 3);
out_uint8(s, 0);
x = (param1 >> 16) & 0xffff;
out_uint16_be(s, x);
y = param1 & 0xffff;
out_uint16_be(s, y);
cx = (param2 >> 16) & 0xffff;
out_uint16_be(s, cx);
cy = param2 & 0xffff;
out_uint16_be(s, cy);
s_mark_end(s);
error = lib_send_copy(v, s);
if (v->suppress_output == 0)
{
/* FramebufferUpdateRequest */
init_stream(s, 8192);
out_uint8(s, 3);
out_uint8(s, 0);
x = (param1 >> 16) & 0xffff;
out_uint16_be(s, x);
y = param1 & 0xffff;
out_uint16_be(s, y);
cx = (param2 >> 16) & 0xffff;
out_uint16_be(s, cx);
cy = param2 & 0xffff;
out_uint16_be(s, cy);
s_mark_end(s);
error = lib_send_copy(v, s);
}
}
free_stream(s);
@ -742,16 +745,19 @@ lib_framebuffer_update(struct vnc *v)
if (error == 0)
{
/* FramebufferUpdateRequest */
init_stream(s, 8192);
out_uint8(s, 3);
out_uint8(s, 1);
out_uint16_be(s, 0);
out_uint16_be(s, 0);
out_uint16_be(s, v->mod_width);
out_uint16_be(s, v->mod_height);
s_mark_end(s);
error = lib_send_copy(v, s);
if (v->suppress_output == 0)
{
/* FramebufferUpdateRequest */
init_stream(s, 8192);
out_uint8(s, 3);
out_uint8(s, 1);
out_uint16_be(s, 0);
out_uint16_be(s, 0);
out_uint16_be(s, v->mod_width);
out_uint16_be(s, v->mod_height);
s_mark_end(s);
error = lib_send_copy(v, s);
}
}
free_stream(s);
@ -916,7 +922,7 @@ lib_mod_process_message(struct vnc *v, struct stream *s)
}
else
{
g_sprintf(text, "VNC unknown in lib_mod_signal %d", type);
g_sprintf(text, "VNC unknown in lib_mod_process_message %d", type);
v->server_msg(v, text, 1);
}
}
@ -1340,17 +1346,20 @@ lib_mod_connect(struct vnc *v)
if (error == 0)
{
/* FramebufferUpdateRequest */
init_stream(s, 8192);
out_uint8(s, 3);
out_uint8(s, 0);
out_uint16_be(s, 0);
out_uint16_be(s, 0);
out_uint16_be(s, v->mod_width);
out_uint16_be(s, v->mod_height);
v->server_msg(v, "VNC sending framebuffer update request", 0);
s_mark_end(s);
error = trans_force_write_s(v->trans, s);
if (v->suppress_output == 0)
{
/* FramebufferUpdateRequest */
init_stream(s, 8192);
out_uint8(s, 3);
out_uint8(s, 0);
out_uint16_be(s, 0);
out_uint16_be(s, 0);
out_uint16_be(s, v->mod_width);
out_uint16_be(s, v->mod_height);
v->server_msg(v, "VNC sending framebuffer update request", 0);
s_mark_end(s);
error = trans_force_write_s(v->trans, s);
}
}
if (error == 0)
@ -1492,6 +1501,43 @@ lib_mod_check_wait_objs(struct vnc *v)
return rv;
}
/******************************************************************************/
/* return error */
int
lib_mod_frame_ack(struct vnc* v, int flags, int frame_id)
{
return 0;
}
/******************************************************************************/
/* return error */
int
lib_mod_suppress_output(struct vnc* v, int suppress,
int left, int top, int right, int bottom)
{
int error;
struct stream *s;
error = 0;
v->suppress_output = suppress;
if (suppress == 0)
{
/* FramebufferUpdateRequest */
make_stream(s);
init_stream(s, 8192);
out_uint8(s, 3);
out_uint8(s, 0);
out_uint16_be(s, 0);
out_uint16_be(s, 0);
out_uint16_be(s, v->mod_width);
out_uint16_be(s, v->mod_height);
s_mark_end(s);
error = lib_send_copy(v, s);
free_stream(s);
}
return error;
}
/******************************************************************************/
tintptr EXPORT_CC
mod_init(void)
@ -1511,6 +1557,8 @@ mod_init(void)
v->mod_set_param = lib_mod_set_param;
v->mod_get_wait_objs = lib_mod_get_wait_objs;
v->mod_check_wait_objs = lib_mod_check_wait_objs;
v->mod_frame_ack = lib_mod_frame_ack;
v->mod_suppress_output = lib_mod_suppress_output;
return (tintptr) v;
}

8
vnc/vnc.h
View File

@ -42,8 +42,11 @@ struct vnc
int (*mod_get_wait_objs)(struct vnc* v, tbus* read_objs, int* rcount,
tbus* write_objs, int* wcount, int* timeout);
int (*mod_check_wait_objs)(struct vnc* v);
tintptr mod_dumby[100 - 9]; /* align, 100 minus the number of mod
functions above */
int (*mod_frame_ack)(struct vnc* v, int flags, int frame_id);
int (*mod_suppress_output)(struct vnc* v, int suppress,
int left, int top, int right, int bottom);
tintptr mod_dumby[100 - 11]; /* align, 100 minus the number of mod
functions above */
/* server functions */
int (*server_begin_update)(struct vnc* v);
int (*server_end_update)(struct vnc* v);
@ -116,4 +119,5 @@ struct vnc
struct trans *trans;
int got_guid;
tui8 guid[16];
int suppress_output;
};