From patchwork Tue Apr 16 09:39:29 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 236929 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id B84312C0109 for ; Tue, 16 Apr 2013 20:40:30 +1000 (EST) Received: from localhost ([::1]:36522 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1US2UF-0002MO-Ot for incoming@patchwork.ozlabs.org; Tue, 16 Apr 2013 05:47:39 -0400 Received: from eggs.gnu.org ([208.118.235.92]:47474) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1US2Me-0001XA-SO for qemu-devel@nongnu.org; Tue, 16 Apr 2013 05:39:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1US2MZ-0006vG-Q1 for qemu-devel@nongnu.org; Tue, 16 Apr 2013 05:39:48 -0400 Received: from mx1.redhat.com ([209.132.183.28]:18149) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1US2MZ-0006ui-Es for qemu-devel@nongnu.org; Tue, 16 Apr 2013 05:39:43 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r3G9dgC1011601 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 16 Apr 2013 05:39:42 -0400 Received: from rincewind.home.kraxel.org (ovpn-116-37.ams2.redhat.com [10.36.116.37]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id r3G9deAS011868; Tue, 16 Apr 2013 05:39:41 -0400 Received: by rincewind.home.kraxel.org (Postfix, from userid 500) id 5176F40EF0; Tue, 16 Apr 2013 11:39:39 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Tue, 16 Apr 2013 11:39:29 +0200 Message-Id: <1366105178-26744-16-git-send-email-kraxel@redhat.com> In-Reply-To: <1366105178-26744-1-git-send-email-kraxel@redhat.com> References: <1366105178-26744-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Anthony Liguori , Gerd Hoffmann Subject: [Qemu-devel] [PATCH 15/24] console: zap g_width + g_height X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org We have a surface per QemuConsole now, so there is no need to keep track of the QemuConsole size any more as we can query the surface size directly at any time. Signed-off-by: Gerd Hoffmann --- ui/console.c | 32 +++++++++----------------------- 1 file changed, 9 insertions(+), 23 deletions(-) diff --git a/ui/console.c b/ui/console.c index 537b2fc..dd1a0fc 100644 --- a/ui/console.c +++ b/ui/console.c @@ -123,7 +123,6 @@ struct QemuConsole { graphic_hw_invalidate_ptr hw_invalidate; graphic_hw_text_update_ptr hw_text_update; void *hw; - int g_width, g_height; /* Text console state */ int width; @@ -389,8 +388,8 @@ static void text_console_resize(QemuConsole *s) int w1, x, y, last_width; last_width = s->width; - s->width = s->g_width / FONT_WIDTH; - s->height = s->g_height / FONT_HEIGHT; + s->width = surface_width(s->surface) / FONT_WIDTH; + s->height = surface_height(s->surface) / FONT_HEIGHT; w1 = last_width; if (s->width < w1) @@ -951,18 +950,12 @@ static void console_putchar(QemuConsole *s, int ch) void console_select(unsigned int index) { - DisplaySurface *surface; QemuConsole *s; if (index >= MAX_CONSOLES) return; trace_console_select(index); - if (active_console) { - surface = qemu_console_surface(active_console); - active_console->g_width = surface_width(surface); - active_console->g_height = surface_height(surface); - } s = consoles[index]; if (s) { DisplayState *ds = s->ds; @@ -1089,11 +1082,8 @@ void kbd_put_keysym(int keysym) static void text_console_invalidate(void *opaque) { QemuConsole *s = (QemuConsole *) opaque; - DisplaySurface *surface = qemu_console_surface(s); if (s->ds->have_text && s->console_type == TEXT_CONSOLE) { - s->g_width = surface_width(surface); - s->g_height = surface_height(surface); text_console_resize(s); } console_refresh(s); @@ -1497,6 +1487,8 @@ static void text_console_update_cursor(void *opaque) static void text_console_do_init(CharDriverState *chr, DisplayState *ds) { QemuConsole *s; + int g_width = 80 * FONT_WIDTH; + int g_height = 24 * FONT_HEIGHT; s = chr->opaque; @@ -1512,16 +1504,13 @@ static void text_console_do_init(CharDriverState *chr, DisplayState *ds) s->total_height = DEFAULT_BACKSCROLL; s->x = 0; s->y = 0; - if (s->console_type == TEXT_CONSOLE) { + if (!s->surface) { if (active_console && active_console->surface) { - s->g_width = surface_width(active_console->surface); - s->g_height = surface_height(active_console->surface); - } else { - s->g_width = 80 * FONT_WIDTH; - s->g_height = 24 * FONT_HEIGHT; + g_width = surface_width(active_console->surface); + g_height = surface_height(active_console->surface); } + s->surface = qemu_create_displaysurface(g_width, g_height); } - s->surface = qemu_create_displaysurface(s->g_width, s->g_height); s->cursor_timer = qemu_new_timer_ms(rt_clock, text_console_update_cursor, s); @@ -1583,6 +1572,7 @@ static CharDriverState *text_console_init(ChardevVC *vc) s = new_console(NULL, TEXT_CONSOLE); } else { s = new_console(NULL, TEXT_CONSOLE_FIXED_SIZE); + s->surface = qemu_create_displaysurface(width, height); } if (!s) { @@ -1591,8 +1581,6 @@ static CharDriverState *text_console_init(ChardevVC *vc) } s->chr = chr; - s->g_width = width; - s->g_height = height; chr->opaque = s; chr->chr_set_echo = text_console_set_echo; @@ -1619,8 +1607,6 @@ void qemu_console_resize(QemuConsole *s, int width, int height) DisplaySurface *surface; assert(s->console_type == GRAPHIC_CONSOLE); - s->g_width = width; - s->g_height = height; surface = qemu_create_displaysurface(width, height); dpy_gfx_replace_surface(s, surface); }