Separated the RDP5 sending into its own protocol layer.

[rdpsrv] / rdpsrv.c

diff --git a/rdpsrv.c b/rdpsrv.c
index 1718dc1e30f169cfa52f4919bd6b6199dafbbab7..f5bea8a23d0998b7857205c3d5c44d1bbdbf119a 100644 (file)
--- a/rdpsrv.c
+++ b/rdpsrv.c
@@ -8,6 +8,7 @@
 #include <arpa/inet.h>
 
 #include "rdesktop.h"
+#include "scancodes.h"
 
 const int tcp_port_rdp = 3389;
 int create_server_socket();
@@ -58,6 +59,30 @@ int create_server_socket()
        listen(server_sock, 20);
        return server_sock;
 }
+                       
+int map_scancode_to_vnc_key(int scancode)
+{
+       switch (scancode)
+       {
+       case SCANCODE_CHAR_1 ... SCANCODE_CHAR_9:
+               return scancode + '1' - SCANCODE_CHAR_1;
+       case SCANCODE_CHAR_0:
+               return '0';
+       case SCANCODE_CHAR_BACKSPACE:
+               return 0xff08;
+       case SCANCODE_CHAR_TAB:
+               return 0xff09;
+       case SCANCODE_CHAR_Q ... SCANCODE_CHAR_P:
+               return "QWERTYUIOP"[scancode - SCANCODE_CHAR_Q];
+       case SCANCODE_CHAR_A ... SCANCODE_CHAR_L:
+               return "ASDFGHJKL"[scancode - SCANCODE_CHAR_A];
+       case SCANCODE_CHAR_Z ... SCANCODE_CHAR_M:
+               return "ZXCVBNM"[scancode - SCANCODE_CHAR_Z];
+       default:
+               printf("Unknown scancode %x, ignoring\n", scancode);
+               return -1;
+       }
+}
 
 void handle_input_pdu(STREAM s, int vnc_sock)
 {
@@ -67,6 +92,7 @@ void handle_input_pdu(STREAM s, int vnc_sock)
        int i;
        char buf[256];
        static int mouse1_down = 0, mouse2_down = 0;
+       int vnc_key;
 
        in_uint16_le(s, num_events);   // number of events
        in_uint8s(s, 2);        // pad
@@ -86,7 +112,24 @@ void handle_input_pdu(STREAM s, int vnc_sock)
                        printf("- Type: Virtual key (ignored)\n");
                        break;
                case RDP_INPUT_SCANCODE:
-                       printf("- Type: Scancode (ignored)\n");
+                       printf("- Type: Scancode\n");
+                       printf("- Device flags: %x\n", device_flags);
+                       printf("- Key: %x\n", param1);
+                       
+                       vnc_key = map_scancode_to_vnc_key(param1);
+                       
+                       if (vnc_key != -1) {
+                               buf[0] = 4; // message type
+                               buf[1] = (device_flags & KBD_FLAG_DOWN) ? 1 : 0; // down flag
+                               buf[2] = 0; // padding
+                               buf[3] = 0;
+                               buf[4] = vnc_key >> 24;  // keysym
+                               buf[5] = (vnc_key >> 16) & 0xff;
+                               buf[6] = (vnc_key >> 8) & 0xff;
+                               buf[7] = vnc_key & 0xff;
+                               write(vnc_sock, buf, 8);
+                       }
+                       
                        break;
                case RDP_INPUT_MOUSE:
                        printf("- Type: Mouse\n");
@@ -97,6 +140,8 @@ void handle_input_pdu(STREAM s, int vnc_sock)
                                 mouse1_down = (device_flags & MOUSE_FLAG_DOWN) ? 0x01 : 0;
                        if (device_flags & MOUSE_FLAG_BUTTON2)
                                 mouse2_down = (device_flags & MOUSE_FLAG_DOWN) ? 0x02 : 0;
+               
+                       printf("button mask = %x\n", mouse1_down | mouse2_down);
                        
                        buf[0] = 5; // message type
                        buf[1] = mouse1_down | mouse2_down; // button mask
@@ -113,6 +158,20 @@ void handle_input_pdu(STREAM s, int vnc_sock)
                }
                printf("\n");
        }
+       
+       // re-request the entire framebuffer
+       buf[0] = 3; // message type
+       buf[1] = 1; // incremental
+       buf[2] = 0; // xpos
+       buf[3] = 0;
+       buf[4] = 0; // ypos
+       buf[5] = 0;
+       buf[6] = 640 >> 8; // width
+       buf[7] = 640 & 0xff;
+       buf[8] = 480 >> 8; // height
+       buf[9] = 480 & 0xff;
+
+       write(vnc_sock, buf, 10);
 }
 
 struct ServerInitialization {
@@ -153,7 +212,7 @@ int vnc_init()
        if (read(vnc_sock, buf, ntohl(si.name_len)) != ntohl(si.name_len))
                error("short read on server name\n");
 
-       printf("Server name is '%*s' (%u bytes)\n", ntohl(si.name_len), buf, ntohl(si.name_len));
+//     printf("Server name is '%*s' (%u bytes)\n", ntohl(si.name_len), buf, ntohl(si.name_len));
 
        // we can only accept raw encoding
        buf[0] = 2; // message type
@@ -244,7 +303,7 @@ void handle_vnc_fbupdate(int vnc_sock)
                        
                                dst = smallblock;
                                for (y = 0; y < bh; ++y) {
-                                       src = data + ((yt * 64 + (bh + 1 - y)) * width + (xt * 64)) * 4;
+                                       src = data + ((yt * 64 + (bh - 1 - y)) * width + (xt * 64)) * 4;
                                        for (x = 0; x < bw; ++x) {
                                                *dst++ = *src++;
                                                *dst++ = *src++;
@@ -261,10 +320,11 @@ void handle_vnc_fbupdate(int vnc_sock)
        }
 }
 
+int listen_on_vnc = 0;
+
 int serve_client()
 {
        int vnc_sock = vnc_init();
-       int listen_on_vnc = 0;
        
        if (!mcs_recv_connect_initial())
                error("MCS_CONNECT_INITIAL recv failed");
@@ -310,14 +370,29 @@ int serve_client()
 
                        printf("Activity on VNC socket!\n");
                        
-                       if (read(vnc_sock, buf, 2) != 2)
+                       if (read(vnc_sock, buf, 1) != 1)
                                error("short read on vnc_sock\n");
 
                        switch (buf[0]) {
                        case 0:
                                // frame buffer update!
+                               printf("Framebuffer update\n");
+                               if (read(vnc_sock, buf, 1) != 1)
+                                       error("short read on vnc_sock\n");
                                handle_vnc_fbupdate(vnc_sock);
                                break;
+                       case 2: // bell
+                               printf("\a\n");
+                               break;
+                       case 3:
+                               printf("New text in clipboard, ignoring\n");
+                               if (read(vnc_sock, buf, 3) != 3)
+                                       error("short read on vnc_sock\n");
+                               if (read(vnc_sock, buf, 4) != 4)
+                                       error("short read on vnc_sock\n");
+                               if (read(vnc_sock, buf, (buf[0] << 24) | (buf[1] << 16) | (buf[2] << 8) | buf[3]) != 4)
+                                       error("short read on vnc_sock\n");
+                               
                        default:
                                printf("Unknown VNC server message %x\n", buf[0]);
                                exit(1);