From patchwork Wed Mar 20 09:43: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: 229294 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 12F252C0091 for ; Wed, 20 Mar 2013 20:53:29 +1100 (EST) Received: from localhost ([::1]:32864 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UIFi3-0002pb-CQ for incoming@patchwork.ozlabs.org; Wed, 20 Mar 2013 05:53:27 -0400 Received: from eggs.gnu.org ([208.118.235.92]:38059) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UIFYn-00045r-2e for qemu-devel@nongnu.org; Wed, 20 Mar 2013 05:44:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UIFYj-0005lU-Ur for qemu-devel@nongnu.org; Wed, 20 Mar 2013 05:43:52 -0400 Received: from mx1.redhat.com ([209.132.183.28]:53266) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UIFYj-0005kz-9n for qemu-devel@nongnu.org; Wed, 20 Mar 2013 05:43:49 -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 r2K9hmPi006929 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 20 Mar 2013 05:43:48 -0400 Received: from rincewind.home.kraxel.org (ovpn-116-26.ams2.redhat.com [10.36.116.26]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id r2K9hlJU010192; Wed, 20 Mar 2013 05:43:48 -0400 Received: by rincewind.home.kraxel.org (Postfix, from userid 500) id 35BDA42628; Wed, 20 Mar 2013 10:43:46 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Wed, 20 Mar 2013 10:43:29 +0100 Message-Id: <1363772625-9182-8-git-send-email-kraxel@redhat.com> In-Reply-To: <1363772625-9182-1-git-send-email-kraxel@redhat.com> References: <1363772625-9182-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 07/23] console: switch color_table_rgb to pixman_color_t 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 Now that all text console rendering uses pixman we can easily switch the color tables to use pixman_color_t directly. Signed-off-by: Gerd Hoffmann --- ui/console.c | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/ui/console.c b/ui/console.c index 4e79268..fbec6cb 100644 --- a/ui/console.c +++ b/ui/console.c @@ -32,9 +32,6 @@ #define MAX_CONSOLES 12 #define CONSOLE_CURSOR_PERIOD 500 -#define QEMU_RGBA(r, g, b, a) (((a) << 24) | ((r) << 16) | ((g) << 8) | (b)) -#define QEMU_RGB(r, g, b) QEMU_RGBA(r, g, b, 0xff) - typedef struct TextAttributes { uint8_t fgcol:4; uint8_t bgcol:4; @@ -210,17 +207,15 @@ void vga_hw_text_update(console_ch_t *chardata) static void vga_fill_rect(QemuConsole *con, int posx, int posy, int width, int height, - uint32_t color) + pixman_color_t color) { DisplaySurface *surface = qemu_console_surface(con); pixman_rectangle16_t rect = { .x = posx, .y = posy, .width = width, .height = height }; - pixman_color_t pcolor; - pcolor = qemu_pixman_color(&surface->pf, color); pixman_image_fill_rectangles(PIXMAN_OP_SRC, surface->image, - &pcolor, 1, &rect); + &color, 1, &rect); } /* copy from (xs, ys) to (xd, yd) a rectangle of size (w, h) */ @@ -255,7 +250,10 @@ enum color_names { }; #endif -static const uint32_t color_table_rgb[2][8] = { +#define QEMU_RGB(r, g, b) \ + { .red = r << 8, .green = g << 8, .blue = b << 8, .alpha = 0 } + +static const pixman_color_t color_table_rgb[2][8] = { { /* dark */ QEMU_RGB(0x00, 0x00, 0x00), /* black */ QEMU_RGB(0xaa, 0x00, 0x00), /* red */ @@ -316,9 +314,7 @@ static void vga_putcharxy(QemuConsole *s, int x, int y, int ch, { static pixman_image_t *glyphs[256]; DisplaySurface *surface = qemu_console_surface(s); - unsigned int fgcol, bgcol; - pixman_image_t *ifg, *ibg; - pixman_color_t cfg, cbg; + pixman_color_t fgcol, bgcol; if (t_attrib->invers) { bgcol = color_table_rgb[t_attrib->bold][t_attrib->fgcol]; @@ -327,16 +323,12 @@ static void vga_putcharxy(QemuConsole *s, int x, int y, int ch, fgcol = color_table_rgb[t_attrib->bold][t_attrib->fgcol]; bgcol = color_table_rgb[t_attrib->bold][t_attrib->bgcol]; } - cfg = qemu_pixman_color(&surface->pf, fgcol); - cbg = qemu_pixman_color(&surface->pf, bgcol); - ifg = pixman_image_create_solid_fill(&cfg); - ibg = pixman_image_create_solid_fill(&cbg); if (!glyphs[ch]) { glyphs[ch] = qemu_pixman_glyph_from_vgafont(FONT_HEIGHT, vgafont16, ch); } qemu_pixman_glyph_render(glyphs[ch], surface->image, - &cfg, &cbg, x, y, FONT_WIDTH, FONT_HEIGHT); + &fgcol, &bgcol, x, y, FONT_WIDTH, FONT_HEIGHT); } static void text_console_resize(QemuConsole *s)