Patchwork Re: [PATCH 1/3] cursor: add cursor functions.

login
register
mail settings
Submitter Gerd Hoffmann
Date May 20, 2010, 12:49 p.m.
Message ID <4BF52FE7.6000202@redhat.com>
Download mbox | patch
Permalink /patch/53061/
State New
Headers show

Comments

Gerd Hoffmann - May 20, 2010, 12:49 p.m.
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
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
Anthony Liguori - May 20, 2010, 1:17 p.m.
On 05/20/2010 07:49 AM, Gerd Hoffmann wrote:
>   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.

That works for me.   Nice job.

Regards,

Anthony Liguori

> cheers,
>   Gerd
>

Patch

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                       ",
+    "                                ",
+    "                                ",
+    "                                ",
+    "                                ",
+    "                                ",
+    "                                ",
+    "                                ",
+    "                                ",
+    "                                ",
+    "                                ",
+    "                                ",
+    "                                ",
+    "                                ",
+};