Reduce small block size to 32x32, and parametrize (#defines instead of hardcoding)

[rdpsrv] / rdpsrv.c

diff --git a/rdpsrv.c b/rdpsrv.c
index 18c5b7a84af54daefa6397bb30d4ed78d54dfba8..cee8d77f17f4b3b5c038468e48e3d11306311578 100644 (file)
--- a/rdpsrv.c
+++ b/rdpsrv.c
@@ -199,6 +199,20 @@ void handle_control_pdu(STREAM s)
        }
 }
 
+void
+handle_font2_pdu(STREAM s)
+{
+       printf("FONT2 PDU, responding with magic\n");
+
+       s = rdp_init_data(8);
+       out_uint16_le(s, 0);
+       out_uint16_le(s, 0);
+       out_uint16_le(s, 3);
+       out_uint16_le(s, 4);
+       s_mark_end(s);
+       rdp_send_data(s, 0x28);
+}
+
 struct ServerInitialization {
        unsigned short width;
        unsigned short height;
@@ -275,13 +289,16 @@ struct vnc_rectangle {
        unsigned int encoding;
 };
 
+#define SBX 32
+#define SBY 32
+
 void handle_vnc_fbupdate(int vnc_sock)
 {
        struct vnc_rectangle rect;
        unsigned char *data, *ptr, *src, *dst;
        unsigned short num_rect;
        int ret, data_left, i, xt, yt;
-       unsigned char smallblock[64 * 64 * 3];
+       unsigned char smallblock[SBX * SBY * 3];
 
        if (read(vnc_sock, &num_rect, 2) != 2)
                error("short read on num_rect\n");
@@ -316,19 +333,19 @@ void handle_vnc_fbupdate(int vnc_sock)
                // push our 32-bit RGB data into small enough chunks
                // (64x64) so we are sure we can send them without
                // everything crashing and stuff :-)
-               for (yt = 0; yt < (height + 63) / 64; ++yt) {
-                       for (xt = 0; xt < (width + 63) / 64; ++xt) {
+               for (yt = 0; yt < (height + (SBY-1)) / SBY; ++yt) {
+                       for (xt = 0; xt < (width + (SBX-1)) / SBX; ++xt) {
                                int x, y;
-                               int bw = width - xt * 64;
-                               int bh = height - yt * 64;
-                               if (bw > 64)
-                                       bw = 64;
-                               if (bh > 64)
-                                       bh = 64;
+                               int bw = width - xt * SBX;
+                               int bh = height - yt * SBY;
+                               if (bw > SBX)
+                                       bw = SBX;
+                               if (bh > SBY)
+                                       bh = SBY;
                        
                                dst = smallblock;
                                for (y = 0; y < bh; ++y) {
-                                       src = data + ((yt * 64 + (bh - 1 - y)) * width + (xt * 64)) * 4;
+                                       src = data + ((yt * SBY + (bh - 1 - y)) * width + (xt * SBX)) * 4;
                                        for (x = 0; x < bw; ++x) {
                                                *dst++ = *src++;
                                                *dst++ = *src++;
@@ -337,7 +354,7 @@ void handle_vnc_fbupdate(int vnc_sock)
                                        }
                                }
 
-                               rdp_send_bitmap_update(ntohs(rect.x) + xt * 64, ntohs(rect.y) + yt * 64, bw, bh, smallblock);
+                               rdp_send_bitmap_update(ntohs(rect.x) + xt * SBX, ntohs(rect.y) + yt * SBY, bw, bh, smallblock);
                        }
                }
                
@@ -357,6 +374,7 @@ int serve_client()
 
        for ( ;; ) {
                uint8 type, data_pdu_type;
+               uint16 id;
                STREAM s;
 
                fd_set readfs;
@@ -384,7 +402,12 @@ int serve_client()
                                                handle_control_pdu(s);
                                                break;
                                        case RDP_DATA_PDU_SYNCHRONISE:
-                                               rdp_send_synchronise(s);
+                                               in_uint16_le(s, id);
+                                               printf("Synchronise, id=%u\n", id);
+                                               rdp_send_synchronise(id);
+                                               break;
+                                       case RDP_DATA_PDU_FONT2:
+                                               handle_font2_pdu(s);
                                                break;
                                        default:
                                                printf("Unknown data PDU type %u\n", data_pdu_type);