From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1KWb0I-0002AA-8t for qemu-devel@nongnu.org; Fri, 22 Aug 2008 14:04:54 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1KWb0G-000292-72 for qemu-devel@nongnu.org; Fri, 22 Aug 2008 14:04:53 -0400 Received: from [199.232.76.173] (port=53687 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KWb0F-00028n-Tu for qemu-devel@nongnu.org; Fri, 22 Aug 2008 14:04:51 -0400 Received: from e31.co.us.ibm.com ([32.97.110.149]:41942) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1KWb0E-0003gR-Bi for qemu-devel@nongnu.org; Fri, 22 Aug 2008 14:04:51 -0400 Received: from d03relay02.boulder.ibm.com (d03relay02.boulder.ibm.com [9.17.195.227]) by e31.co.us.ibm.com (8.13.8/8.13.8) with ESMTP id m7MI3ijl021119 for ; Fri, 22 Aug 2008 14:03:44 -0400 Received: from d03av04.boulder.ibm.com (d03av04.boulder.ibm.com [9.17.195.170]) by d03relay02.boulder.ibm.com (8.13.8/8.13.8/NCO v9.0) with ESMTP id m7MI3ioq161924 for ; Fri, 22 Aug 2008 12:03:44 -0600 Received: from d03av04.boulder.ibm.com (loopback [127.0.0.1]) by d03av04.boulder.ibm.com (8.12.11.20060308/8.13.3) with ESMTP id m7MI3i3J005523 for ; Fri, 22 Aug 2008 12:03:44 -0600 From: Ryan Harper Date: Fri, 22 Aug 2008 13:03:40 -0500 Message-Id: <1219428221-22947-2-git-send-email-ryanh@us.ibm.com> In-Reply-To: <1219428221-22947-1-git-send-email-ryanh@us.ibm.com> References: <1219428221-22947-1-git-send-email-ryanh@us.ibm.com> Subject: [Qemu-devel] [PATCH 1/2] Fix text console size/resize when using curses 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 Cc: Ryan Harper , kvm@vger.kernel.org, Ian Kirk The current console output is broken in curses mode size the default starting size might not match the launching terminal size. Change initial size to be based on the terminal. Also, resize events fail to ensure that both the text console and curses display areas are the same size; this causes broken output like: QEMU 0.9.1 monitor - type 'help' for more information (qemu) (qemu) (qemu) To fix this, ensure that the display width and the text area width are sync for text consoles on refresh; also force a resize event whenever we invalidate the text console. Signed-off-by: Ryan Harper diff --git a/console.c b/console.c index 1c94980..89bdc52 100644 --- a/console.c +++ b/console.c @@ -608,6 +608,9 @@ static void console_refresh(TextConsole *s) s->text_y[0] = 0; s->text_x[1] = s->width - 1; s->text_y[1] = s->height - 1; + /* ensure that textconsole area is the same size as the display */ + s->g_width = s->ds->width; + s->g_height = s->ds->height; s->cursor_invalidate = 1; return; } @@ -1158,6 +1161,8 @@ static void text_console_invalidate(void *opaque) TextConsole *s = (TextConsole *) opaque; console_refresh(s); + /* resize if needed */ + text_console_resize(s); } static void text_console_update(void *opaque, console_ch_t *chardata) diff --git a/curses.c b/curses.c index d09eff2..a8972f4 100644 --- a/curses.c +++ b/curses.c @@ -362,8 +362,8 @@ void curses_display_init(DisplayState *ds, int full_screen) ds->data = (void *) screen; ds->linesize = 0; ds->depth = 0; - ds->width = 640; - ds->height = 400; + ds->width = COLS * FONT_WIDTH; + ds->height = LINES * FONT_HEIGHT; ds->dpy_update = curses_update; ds->dpy_resize = curses_resize; ds->dpy_refresh = curses_refresh; @@ -371,6 +371,6 @@ void curses_display_init(DisplayState *ds, int full_screen) invalidate = 1; - /* Standard VGA initial text mode dimensions */ - curses_resize(ds, 80, 25); + /* setup up initial display size based on terminal settings */ + curses_resize(ds, COLS, LINES); }