Various hacks to try to make stuff work (still failing).

[rdpsrv] / rdpsrv.c

diff --git a/rdpsrv.c b/rdpsrv.c
index b8bc56aa61001b44ecaf424ab9fb0d45eb69458a..432147b15eac061bbd490d9f206e2877ec124498 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);
@@ -149,8 +146,11 @@ int vnc_init()
        buf[2] = 0; // number of encodings
        buf[3] = 1;
        buf[4] = 0; // raw encoding
+       buf[5] = 0; 
+       buf[6] = 0;
+       buf[7] = 0;
 
-       write(vnc_sock, buf, 5);
+       write(vnc_sock, buf, 8);
        
        // request the entire framebuffer
        buf[0] = 3; // message type
@@ -159,9 +159,9 @@ int vnc_init()
        buf[3] = 0;
        buf[4] = 0; // ypos
        buf[5] = 0;
-       buf[6] = 640 >> 8; // width
+       buf[6] = 0; // width
        buf[7] = 640 % 0xff;
-       buf[8] = 480 >> 8; // height
+       buf[8] = 0; // height
        buf[9] = 480 % 0xff;
 
        write(vnc_sock, buf, 10);
@@ -171,9 +171,52 @@ 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();
+       int listen_on_vnc = 0;
        
        if (!mcs_recv_connect_initial())
                error("MCS_CONNECT_INITIAL recv failed");
@@ -206,6 +249,7 @@ int serve_client()
                                case RDP_DATA_PDU_INPUT:
                                        printf("Input PDU\n");
                                        handle_input_pdu(s);
+                                       listen_on_vnc = 1;
                                        break;
                                default:
                                        printf("Unknown data PDU type %u\n", data_pdu_type);
@@ -214,17 +258,22 @@ int serve_client()
                }
 
                // activity on VNC socket?
-               if (FD_ISSET(vnc_sock, &readfs)) {
-                       char buf[256];
-                       read(vnc_sock, buf, 1);
+               if (FD_ISSET(vnc_sock, &readfs) && listen_on_vnc) {
+                       unsigned char buf[256];
+
+                       printf("Activity on VNC socket!\n");
+                       
+                       if (read(vnc_sock, buf, 2) != 2)
+                               error("short read on vnc_sock\n");
+
                        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]);
-                               exit(1);
+                               printf("Unknown VNC server message %x\n", buf[0]);
+//                             exit(1);
                        }
                }
        }