convert windows console chardev to QemuOpts.

[qemu] / vnc.h

diff --git a/vnc.h b/vnc.h
index 8b6bc5e..fcc6824 100644 (file)
--- a/vnc.h
+++ b/vnc.h
@@ -84,14 +84,24 @@ typedef struct VncDisplay VncDisplay;
 #include "vnc-auth-sasl.h"
 #endif
 
+struct VncSurface
+{
+    uint32_t dirty[VNC_MAX_HEIGHT][VNC_DIRTY_WORDS];
+    DisplaySurface *ds;
+};
 
 struct VncDisplay
 {
+    QEMUTimer *timer;
+    int timer_interval;
     int lsock;
     DisplayState *ds;
     VncState *clients;
     kbd_layout_t *kbd_layout;
 
+    struct VncSurface guest;   /* guest visible surface (aka ds->surface) */
+    DisplaySurface *server;  /* vnc server surface */
+
     char *display;
     char *password;
     int auth;
@@ -106,13 +116,14 @@ struct VncDisplay
 
 struct VncState
 {
-    QEMUTimer *timer;
     int csock;
+
     DisplayState *ds;
+    uint32_t dirty[VNC_MAX_HEIGHT][VNC_DIRTY_WORDS];
+
     VncDisplay *vd;
     int need_update;
-    uint32_t dirty_row[VNC_MAX_HEIGHT][VNC_DIRTY_WORDS];
-    char *old_data;
+    int force_update;
     uint32_t features;
     int absolute;
     int last_x;
@@ -138,7 +149,7 @@ struct VncState
     /* current output mode information */
     VncWritePixels *write_pixels;
     VncSendHextileTile *send_hextile_tile;
-    DisplaySurface clientds, serverds;
+    DisplaySurface clientds;
 
     CaptureVoiceOut *audio_cap;
     struct audsettings as;