From: Gerd Hoffmann <kraxel@redhat.com>
To: Anthony Liguori <anthony@codemonkey.ws>
Cc: Blue Swirl <blauwirbel@gmail.com>,
Paolo Bonzini <pbonzini@redhat.com>,
qemu-devel@nongnu.org
Subject: Re: [Qemu-devel] Re: [PATCH 1/3] cursor: add cursor functions.
Date: Thu, 20 May 2010 14:49:43 +0200 [thread overview]
Message-ID: <4BF52FE7.6000202@redhat.com> (raw)
In-Reply-To: <4BF4372C.7060000@codemonkey.ws>
[-- Attachment #1: Type: text/plain, Size: 1005 bytes --]
Hi,
>>> Well. You can't have both. We can have a efficiently packed format (i.e.
>>> two bitmaps). Or we can do it in a way which doesn't need parsing,
>>> but that
>>> wouldn't be the most compact format ...
>> You're right, so packing or introducing a small conversion function is
>> not critical. I'd still prefer a standard format if possible.
>
> Personally, I'd rather see Gerd's original format but read from a file
> instead of hard coded in a .c file. IOW, a
> /usr/share/qemu/default-cursor.qpm that contained the appropriate
> strings. A couple extra lines that made it an xpm I think would be worth
> it too.
xpms are designed to be easily #include-able, and parsing them that way
is easier than loading them at runtime. At least without adding a
dependency to libXpm.
So how about the following incremental RfC patch? It adds the cursors
as separate files which are standard xpm format. Nevertheless they are
compiled in, i.e. they can't be changed at runtime.
cheers,
Gerd
[-- Attachment #2: 0001-cursor-switch-to-xpm.patch --]
[-- Type: text/plain, Size: 7423 bytes --]
From 7066e5a759ec887191601e6a96deab59a1dda721 Mon Sep 17 00:00:00 2001
From: Gerd Hoffmann <kraxel@redhat.com>
Date: Thu, 20 May 2010 14:39:26 +0200
Subject: [PATCH] cursor: switch to xpm
---
cursor.c | 94 ++++++++++++++++++++++++++-------------------------
cursor_hidden.xpm | 37 ++++++++++++++++++++
cursor_left_ptr.xpm | 39 +++++++++++++++++++++
3 files changed, 124 insertions(+), 46 deletions(-)
create mode 100644 cursor_hidden.xpm
create mode 100644 cursor_left_ptr.xpm
diff --git a/cursor.c b/cursor.c
index 3995a31..dfb9eef 100644
--- a/cursor.c
+++ b/cursor.c
@@ -1,51 +1,57 @@
#include "qemu-common.h"
#include "console.h"
-static const char cursor_hidden_32[32*32];
-static const char cursor_left_ptr_32[32*32] = {
- " "
- " X "
- " XX "
- " X.X "
- " X..X "
- " X...X "
- " X....X "
- " X.....X "
- " X......X "
- " X.......X "
- " X........X "
- " X.....XXXXX "
- " X..X..X "
- " X.X X..X "
- " XX X..X "
- " X X..X "
- " X..X "
- " X..X "
- " X..X "
- " XX "
- " "
-};
+#include "cursor_hidden.xpm"
+#include "cursor_left_ptr.xpm"
/* for creating built-in cursors */
-static void cursor_parse_ascii_art(QEMUCursor *c, const char *ptr)
+static QEMUCursor *cursor_parse_xpm(const char *xpm[])
{
- int i, pixels;
-
- pixels = c->width * c->height;
- for (i = 0; i < pixels; i++) {
- switch (ptr[i]) {
- case 'X': /* black */
- c->data[i] = 0xff000000;
- break;
- case '.': /* white */
- c->data[i] = 0xffffffff;
- break;
- case ' ': /* transparent */
- default:
- c->data[i] = 0x00000000;
- break;
+ QEMUCursor *c;
+ uint32_t ctab[128];
+ unsigned int width, height, colors, chars;
+ unsigned int line = 0, i, r, g, b, x, y, pixel;
+ char name[16];
+ uint8_t idx;
+
+ /* parse header line: width, height, #colors, #chars */
+ if (sscanf(xpm[line], "%d %d %d %d", &width, &height, &colors, &chars) != 4) {
+ fprintf(stderr, "%s: header parse error: \"%s\"\n",
+ __FUNCTION__, xpm[line]);
+ return NULL;
+ }
+ if (chars != 1) {
+ fprintf(stderr, "%s: chars != 1 not supported\n", __FUNCTION__);
+ return NULL;
+ }
+ line++;
+
+ /* parse color table */
+ for (i = 0; i < colors; i++, line++) {
+ if (sscanf(xpm[line], "%c c %15s", &idx, name) == 2) {
+ if (sscanf(name, "#%02x%02x%02x", &r, &g, &b) == 3) {
+ ctab[idx] = (0xff << 24) | (b << 16) | (g << 8) | r;
+ continue;
+ }
+ if (strcmp(name, "None") == 0) {
+ ctab[idx] = 0x00000000;
+ continue;
+ }
}
+ fprintf(stderr, "%s: color parse error: \"%s\"\n",
+ __FUNCTION__, xpm[line]);
+ return NULL;
}
+
+ /* parse pixel data */
+ c = cursor_alloc(width, height);
+ for (pixel = 0, y = 0; y < height; y++, line++) {
+ for (x = 0; x < height; x++, pixel++) {
+ idx = xpm[line][x];
+ c->data[pixel] = ctab[idx];
+ }
+ }
+ return c;
}
/* nice for debugging */
@@ -75,8 +81,7 @@ QEMUCursor *cursor_builtin_hidden(void)
{
QEMUCursor *c;
- c = cursor_alloc(32, 32);
- cursor_parse_ascii_art(c, cursor_hidden_32);
+ c = cursor_parse_xpm(cursor_hidden_xpm);
return c;
}
@@ -84,10 +89,7 @@ QEMUCursor *cursor_builtin_left_ptr(void)
{
QEMUCursor *c;
- c = cursor_alloc(32, 32);
- cursor_parse_ascii_art(c, cursor_left_ptr_32);
- c->hot_x = 1;
- c->hot_y = 1;
+ c = cursor_parse_xpm(cursor_left_ptr_xpm);
return c;
}
diff --git a/cursor_hidden.xpm b/cursor_hidden.xpm
new file mode 100644
index 0000000..354e7a9
--- /dev/null
+++ b/cursor_hidden.xpm
@@ -0,0 +1,37 @@
+/* XPM */
+static const char *cursor_hidden_xpm[] = {
+ "32 32 1 1",
+ " c None",
+ " ",
+ " ",
+ " ",
+ " ",
+ " ",
+ " ",
+ " ",
+ " ",
+ " ",
+ " ",
+ " ",
+ " ",
+ " ",
+ " ",
+ " ",
+ " ",
+ " ",
+ " ",
+ " ",
+ " ",
+ " ",
+ " ",
+ " ",
+ " ",
+ " ",
+ " ",
+ " ",
+ " ",
+ " ",
+ " ",
+ " ",
+ " ",
+};
diff --git a/cursor_left_ptr.xpm b/cursor_left_ptr.xpm
new file mode 100644
index 0000000..6c9ada9
--- /dev/null
+++ b/cursor_left_ptr.xpm
@@ -0,0 +1,39 @@
+/* XPM */
+static const char *cursor_left_ptr_xpm[] = {
+ "32 32 3 1",
+ "X c #000000",
+ ". c #ffffff",
+ " c None",
+ "X ",
+ "XX ",
+ "X.X ",
+ "X..X ",
+ "X...X ",
+ "X....X ",
+ "X.....X ",
+ "X......X ",
+ "X.......X ",
+ "X........X ",
+ "X.....XXXXX ",
+ "X..X..X ",
+ "X.X X..X ",
+ "XX X..X ",
+ "X X..X ",
+ " X..X ",
+ " X..X ",
+ " X..X ",
+ " XX ",
+ " ",
+ " ",
+ " ",
+ " ",
+ " ",
+ " ",
+ " ",
+ " ",
+ " ",
+ " ",
+ " ",
+ " ",
+ " ",
+};
--
1.6.6.1
next prev parent reply other threads:[~2010-05-20 12:50 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-05 12:51 [Qemu-devel] [PATCH 0/3] local cursor patches Gerd Hoffmann
2010-05-05 12:51 ` [Qemu-devel] [PATCH 1/3] cursor: add cursor functions Gerd Hoffmann
2010-05-06 18:12 ` Blue Swirl
2010-05-06 19:27 ` Gerd Hoffmann
2010-05-06 19:42 ` Blue Swirl
2010-05-07 7:05 ` [Qemu-devel] " Paolo Bonzini
2010-05-07 15:23 ` Blue Swirl
2010-05-19 8:16 ` Gerd Hoffmann
2010-05-19 18:57 ` Blue Swirl
2010-05-19 19:08 ` Anthony Liguori
2010-05-20 12:49 ` Gerd Hoffmann [this message]
2010-05-20 13:17 ` Anthony Liguori
2010-05-05 12:51 ` [Qemu-devel] [PATCH 2/3] use new cursor struct + functions for vmware vga and sdl Gerd Hoffmann
2010-05-05 12:51 ` [Qemu-devel] [PATCH 3/3] vnc: rich cursor support Gerd Hoffmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4BF52FE7.6000202@redhat.com \
--to=kraxel@redhat.com \
--cc=anthony@codemonkey.ws \
--cc=blauwirbel@gmail.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).