X-Git-Url: https://git.sesse.net/?p=rdpsrv;a=blobdiff_plain;f=rdp.c;h=cd2f7c9d9b8e9a313798ebe3f23d05b12a23c711;hp=09586920ba6bd1ed556dc132bf69620c4221314c;hb=b6e6afccf37f4ad0515ef2a698f714fdf1bf23b3;hpb=b4491f06537d42359e0675c45e44f04f7bd09281

diff --git a/rdp.c b/rdp.c
index 0958692..cd2f7c9 100644
--- a/rdp.c
+++ b/rdp.c
@@ -148,17 +148,17 @@ rdp_in_unistr(STREAM s, char *string, int len)
 	s->p += len;
 }
 
-void rdp_send_bitmap_update(void)
+void rdp_send_bitmap_update(unsigned x, unsigned y)
 {
 	STREAM s;
 
 	s = rdp_init_data(11*2 + 2*2*3);
 	out_uint16_le(s, RDP_UPDATE_BITMAP);
 	out_uint16_le(s, 1); // one update
-	out_uint16_le(s, 1); // left, top, right, bottom
-	out_uint16_le(s, 2);
-	out_uint16_le(s, 3);
-	out_uint16_le(s, 4);
+	out_uint16_le(s, x); // left, top, right, bottom
+	out_uint16_le(s, y);
+	out_uint16_le(s, x+2);
+	out_uint16_le(s, y+2);
 	out_uint16_le(s, 2); // width, height
 	out_uint16_le(s, 2);
 	out_uint16_le(s, 24); // bpp
@@ -253,25 +253,15 @@ rdp_send_synchronise(void)
 	rdp_send_data(s, RDP_DATA_PDU_SYNCHRONISE);
 }
 
-/* Send a single input event */
+/* Receive a single input event */
 void
-rdp_send_input(uint32 time, uint16 message_type, uint16 device_flags, uint16 param1, uint16 param2)
+rdp_recv_input(STREAM s, uint32 *time, uint16 *message_type, uint16 *device_flags, uint16 *param1, uint16 *param2)
 {
-	STREAM s;
-
-	s = rdp_init_data(16);
-
-	out_uint16_le(s, 1);	/* number of events */
-	out_uint16(s, 0);	/* pad */
-
-	out_uint32_le(s, time);
-	out_uint16_le(s, message_type);
-	out_uint16_le(s, device_flags);
-	out_uint16_le(s, param1);
-	out_uint16_le(s, param2);
-
-	s_mark_end(s);
-	rdp_send_data(s, RDP_DATA_PDU_INPUT);
+	in_uint32_le(s, *time);
+	in_uint16_le(s, *message_type);
+	in_uint16_le(s, *device_flags);
+	in_uint16_le(s, *param1);
+	in_uint16_le(s, *param2);
 }
 
 /* Disconnect from the RDP layer */