complete proxy support

Signed-off-by: Vasiliy Tolstov <v.tolstov@selfip.ru>

example/proxy/main.go

@@ -14,8 +14,8 @@ func main() {
 		log.Fatalf("Error listen. %v", err)
 	}
 
-	schServer := make(chan vnc.ClientMessage)
-	schClient := make(chan vnc.ServerMessage)
+	schClient := make(chan vnc.ClientMessage)
+	schServer := make(chan vnc.ServerMessage)
 
 	scfg := &vnc.ServerConfig{
 		Width:             800,
@@ -26,15 +26,13 @@ func main() {
 		ClientInitHandler: vnc.ServerClientInitHandler,
 		ServerInitHandler: vnc.ServerServerInitHandler,
 		Encodings:         []vnc.Encoding{&vnc.RawEncoding{}},
-		PixelFormat:       vnc.PixelFormat24bit,
-		ClientMessageCh:   schServer,
-		ServerMessageCh:   schClient,
+		PixelFormat:       vnc.PixelFormat32bit,
+		ClientMessageCh:   schClient,
+		ServerMessageCh:   schServer,
 		ClientMessages:    vnc.DefaultClientMessages,
 		DesktopName:       []byte("vnc proxy"),
 	}
-	go vnc.Serve(context.Background(), ln, scfg)
-
-	c, err := net.Dial("tcp", "127.0.0.1:5944")
+	c, err := net.Dial("tcp", "127.0.0.1:5995")
 	if err != nil {
 		log.Fatalf("Error dial. %v", err)
 	}
@@ -47,7 +45,7 @@ func main() {
 		SecurityHandlers:  []vnc.SecurityHandler{&vnc.ClientAuthNone{}},
 		ClientInitHandler: vnc.ClientClientInitHandler,
 		ServerInitHandler: vnc.ClientServerInitHandler,
-		PixelFormat:       vnc.PixelFormat24bit,
+		PixelFormat:       vnc.PixelFormat32bit,
 		ClientMessageCh:   cchClient,
 		ServerMessageCh:   cchServer,
 		ServerMessages:    vnc.DefaultServerMessages,
@@ -58,54 +56,49 @@ func main() {
 	if err != nil {
 		log.Fatalf("Error dial. %v", err)
 	}
+
+	scfg.Width = cc.Width()
+	scfg.Height = cc.Height()
+	scfg.PixelFormat = cc.PixelFormat()
+	go vnc.Serve(context.Background(), ln, scfg)
+
 	defer cc.Close()
 	go cc.Handle()
 
 	for {
 		select {
-		case msg := <-cchClient:
-			switch msg.Type() {
-			default:
-				log.Printf("00 Received message type:%v msg:%v\n", msg.Type(), msg)
-			}
 		case msg := <-cchServer:
 			switch msg.Type() {
 			default:
-				log.Printf("01 Received message type:%v msg:%v\n", msg.Type(), msg)
+				schServer <- msg
 			}
 		case msg := <-schClient:
-			switch msg.Type() {
-			default:
-				log.Printf("10 Received message type:%v msg:%v\n", msg.Type(), msg)
-			}
-		case msg := <-schServer:
-			log.Printf("11 Received message type:%v msg:%v\n", msg.Type(), msg)
 			switch msg.Type() {
 			case vnc.SetEncodingsMsgType:
+				msg0 := &vnc.SetPixelFormat{
+					PF: *vnc.PixelFormat32bit,
+				}
+				cchClient <- msg0
+
 				encRaw := &vnc.RawEncoding{}
 				msg1 := &vnc.SetEncodings{
-					MsgType:   vnc.SetEncodingsMsgType,
-					EncNum:    1,
 					Encodings: []vnc.EncodingType{encRaw.Type()},
 				}
-				if err := msg1.Write(cc); err != nil {
-					log.Fatalf("err %v\n", err)
-				}
-				msg2 := &vnc.FramebufferUpdateRequest{
-					MsgType: vnc.FramebufferUpdateRequestMsgType,
-					Inc:     0,
-					X:       0,
-					Y:       0,
-					Width:   cc.Width(),
-					Height:  cc.Height(),
-				}
-				if err := msg2.Write(cc); err != nil {
-					log.Fatalf("err %v\n", err)
-				}
+				cchClient <- msg1
+				/*
+					msg2 := &vnc.FramebufferUpdateRequest{
+						Inc:    0,
+						X:      0,
+						Y:      0,
+						Width:  cc.Width(),
+						Height: cc.Height(),
+					}
+					cchClient <- msg2
+				*/
+			case vnc.SetPixelFormatMsgType:
+				cchClient <- msg
 			default:
-				if err := msg.Write(cc); err != nil {
-					log.Fatalf("err %v\n", err)
-				}
+				cchClient <- msg
 			}
 		}
 	}