Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LSuVl-00017X-2p for qemu-devel@nongnu.org; Fri, 30 Jan 2009 09:38:25 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LSuVh-00013e-CS for qemu-devel@nongnu.org; Fri, 30 Jan 2009 09:38:22 -0500 Received: from [199.232.76.173] (port=37696 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LSuVg-00013O-NB for qemu-devel@nongnu.org; Fri, 30 Jan 2009 09:38:20 -0500 Received: from mx2.suse.de ([195.135.220.15]:48171) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1LSuVg-0007yH-4c for qemu-devel@nongnu.org; Fri, 30 Jan 2009 09:38:20 -0500 From: Alexander Graf Date: Fri, 30 Jan 2009 15:38:12 +0100 Message-Id: <1233326293-8591-7-git-send-email-agraf@suse.de> In-Reply-To: <1233326293-8591-6-git-send-email-agraf@suse.de> References: <1233326293-8591-1-git-send-email-agraf@suse.de> <1233326293-8591-2-git-send-email-agraf@suse.de> <1233326293-8591-3-git-send-email-agraf@suse.de> <1233326293-8591-4-git-send-email-agraf@suse.de> <1233326293-8591-5-git-send-email-agraf@suse.de> <1233326293-8591-6-git-send-email-agraf@suse.de> Subject: [Qemu-devel] [PATCH 6/7] Move the framebuffer update package out Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Currently the send_framebuffer_update_raw and send_framebuffer_update_hextile respectively send a send_framebuffer_update packet themselves. We need to reuse send_framebuffer_update_raw for zlib encoding though, so let's move it out. Signed-off-by: Alexander Graf --- vnc.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/vnc.c b/vnc.c index b3b4bfd..b91ecff 100644 --- a/vnc.c +++ b/vnc.c @@ -417,8 +417,6 @@ static void send_framebuffer_update_raw(VncState *vs, int x, int y, int w, int h int i; uint8_t *row; - vnc_framebuffer_update(vs, x, y, w, h, VNC_ENCODING_RAW); - row = ds_get_data(vs->ds) + y * ds_get_linesize(vs->ds) + x * ds_get_bytes_per_pixel(vs->ds); for (i = 0; i < h; i++) { vs->write_pixels(vs, row, w * ds_get_bytes_per_pixel(vs->ds)); @@ -468,8 +466,6 @@ static void send_framebuffer_update_hextile(VncState *vs, int x, int y, int w, i int has_fg, has_bg; uint8_t *last_fg, *last_bg; - vnc_framebuffer_update(vs, x, y, w, h, VNC_ENCODING_HEXTILE); - last_fg = (uint8_t *) malloc(vs->serverds.pf.bytes_per_pixel); last_bg = (uint8_t *) malloc(vs->serverds.pf.bytes_per_pixel); has_fg = has_bg = 0; @@ -489,9 +485,11 @@ static void send_framebuffer_update(VncState *vs, int x, int y, int w, int h) { switch(vs->vnc_encoding) { case VNC_ENCODING_HEXTILE: + vnc_framebuffer_update(vs, x, y, w, h, VNC_ENCODING_HEXTILE); send_framebuffer_update_hextile(vs, x, y, w, h); break; default: + vnc_framebuffer_update(vs, x, y, w, h, VNC_ENCODING_RAW); send_framebuffer_update_raw(vs, x, y, w, h); break; } -- 1.6.0.2