Parse and send on client updates.

[rdpsrv] / rdpsrv.c

diff --git a/rdpsrv.c b/rdpsrv.c
index a6064be6cf628188eae2bf608c7298aa1ae23f27..edb6299206847ffbefa32a5624b2e239188eb398 100644 (file)
--- a/rdpsrv.c
+++ b/rdpsrv.c
@@ -91,9 +91,6 @@ void handle_input_pdu(STREAM s)
                        printf("- Device flags: %x\n", device_flags);
                        printf("- Position: (%u,%u)\n", param1, param2);
 
-                       // debug
-                       rdp_send_bitmap_update(param1, param2);
-                       
                        break;
                default:
                        printf("- Unknown type %x\n", message_type);
@@ -174,6 +171,48 @@ int vnc_init()
        return vnc_sock;
 }
 
+struct vnc_rectangle {
+       unsigned short x, y, width, height;
+       unsigned int encoding;
+};
+
+void handle_vnc_fbupdate(int vnc_sock)
+{
+       struct vnc_rectangle rect;
+       unsigned char *data, *ptr;
+       unsigned short num_rect;
+       int ret, data_left, i;
+
+       if (read(vnc_sock, &num_rect, 2) != 2)
+               error("short read on num_rect\n");
+
+       for (i = 0; i < ntohs(num_rect); ++i) { 
+               if (read(vnc_sock, &rect, sizeof(struct vnc_rectangle)) != sizeof(struct vnc_rectangle))
+                       error("short read on vnc_rectangle\n");
+               
+               printf("UPDATE: %ux%u at (%u,%u)\n", ntohs(rect.width), ntohs(rect.height),
+                       ntohs(rect.x), ntohs(rect.y));
+               
+               if (ntohl(rect.encoding) != 0)
+                       error("unsupported encoding\n");
+
+               ptr = data = xmalloc(ntohs(rect.width) * ntohs(rect.height) * 3);
+               data_left = ntohs(rect.width) * ntohs(rect.height) * 3;
+
+               while (data_left > 0) {
+                       ret = read(vnc_sock, ptr, data_left);
+                       if (ret <= 0)
+                               error("error on data read\n");
+
+                       ptr += ret;
+                       data_left -= ret;
+               }
+
+               rdp_send_bitmap_update(ntohs(rect.x), ntohs(rect.y), ntohs(rect.width), ntohs(rect.height), data);
+               xfree(data);
+       }
+}
+
 int serve_client()
 {
        int vnc_sock = vnc_init();
@@ -222,11 +261,11 @@ int serve_client()
 
                        printf("Activity on VNC socket!\n");
                        
-                       read(vnc_sock, buf, 1);
+                       read(vnc_sock, buf, 2);
                        switch (buf[0]) {
                        case 0:
                                // frame buffer update!
-                               printf("Frame buffer update\n");
+                               handle_vnc_fbupdate(vnc_sock);
                                break;
                        default:
                                printf("Unknown server message %x\n", buf[0]);