From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1LPika-0001mf-Vq
	for qemu-devel@nongnu.org; Wed, 21 Jan 2009 14:28:33 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1LPikQ-0001Xf-55
	for qemu-devel@nongnu.org; Wed, 21 Jan 2009 14:28:22 -0500
Received: from [199.232.76.173] (port=35752 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1LPikO-0001Ww-Pf
	for qemu-devel@nongnu.org; Wed, 21 Jan 2009 14:28:20 -0500
Received: from savannah.gnu.org ([199.232.41.3]:57354 helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <INVALID.NOREPLY@gnu.org>)
	id 1LPikM-00035u-W0
	for qemu-devel@nongnu.org; Wed, 21 Jan 2009 14:28:19 -0500
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1LPikJ-0005cW-RX
	for qemu-devel@nongnu.org; Wed, 21 Jan 2009 19:28:16 +0000
Received: from blueswir1 by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <blueswir1@savannah.gnu.org>) id 1LPikI-0005cS-RK
	for qemu-devel@nongnu.org; Wed, 21 Jan 2009 19:28:15 +0000
MIME-Version: 1.0
Errors-To: blueswir1
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Blue Swirl <blauwirbel@gmail.com>
Message-Id: <E1LPikI-0005cS-RK@cvs.savannah.gnu.org>
Date: Wed, 21 Jan 2009 19:28:14 +0000
Subject: [Qemu-devel] [6391] Fix nographic mode and VNC
Reply-To: qemu-devel@nongnu.org
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org

Revision: 6391
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6391
Author:   blueswir1
Date:     2009-01-21 19:28:13 +0000 (Wed, 21 Jan 2009)

Log Message:
-----------
Fix nographic mode and VNC

Modified Paths:
--------------
    trunk/vl.c

Modified: trunk/vl.c
===================================================================
--- trunk/vl.c	2009-01-21 19:18:00 UTC (rev 6390)
+++ trunk/vl.c	2009-01-21 19:28:13 UTC (rev 6391)
@@ -263,6 +263,7 @@
 static int64_t qemu_icount_bias;
 static QEMUTimer *icount_rt_timer;
 static QEMUTimer *icount_vm_timer;
+static QEMUTimer *nographic_timer;
 
 uint8_t qemu_uuid[16];
 
@@ -3414,6 +3415,13 @@
     qemu_mod_timer(ds->gui_timer, interval + qemu_get_clock(rt_clock));
 }
 
+static void nographic_update(void *opaque)
+{
+    uint64_t interval = GUI_REFRESH_INTERVAL;
+
+    qemu_mod_timer(nographic_timer, interval + qemu_get_clock(rt_clock));
+}
+
 struct vm_change_state_entry {
     VMChangeStateHandler *cb;
     void *opaque;
@@ -5600,6 +5608,11 @@
         dcl = dcl->next;
     }
 
+    if (nographic || (vnc_display && !sdl)) {
+        nographic_timer = qemu_new_timer(rt_clock, nographic_update, NULL);
+        qemu_mod_timer(nographic_timer, qemu_get_clock(rt_clock));
+    }
+
     text_consoles_set_display(display_state);
 
     if (monitor_device && monitor_hd)