From: Anthony Liguori <aliguori@linux.vnet.ibm.com>
To: Gerd Hoffmann <kraxel@redhat.com>
Cc: qemu-devel@nongnu.org
Subject: Re: [Qemu-devel] [PATCH 1/3] cursor: add cursor functions.
Date: Mon, 24 May 2010 15:30:11 -0500 [thread overview]
Message-ID: <4BFAE1D3.4070005@linux.vnet.ibm.com> (raw)
In-Reply-To: <1274435674-9027-2-git-send-email-kraxel@redhat.com>
On 05/21/2010 04:54 AM, Gerd Hoffmann wrote:
> Add a new cursor type to console.h and a bunch of functions to
> deal with cursors the (new) cursor.c file.
>
> Signed-off-by: Gerd Hoffmann<kraxel@redhat.com>
>
Applied all. Thanks.
Regards,
Anthony Liguori
> ---
> Makefile.objs | 3 +-
> console.h | 24 ++++++-
> cursor.c | 210 +++++++++++++++++++++++++++++++++++++++++++++++++++
> cursor_hidden.xpm | 37 +++++++++
> cursor_left_ptr.xpm | 39 ++++++++++
> 5 files changed, 310 insertions(+), 3 deletions(-)
> create mode 100644 cursor.c
> create mode 100644 cursor_hidden.xpm
> create mode 100644 cursor_left_ptr.xpm
>
> diff --git a/Makefile.objs b/Makefile.objs
> index acbaf22..c73c8f0 100644
> --- a/Makefile.objs
> +++ b/Makefile.objs
> @@ -48,7 +48,8 @@ common-obj-y = $(block-obj-y)
> common-obj-y += $(net-obj-y)
> common-obj-y += $(qobject-obj-y)
> common-obj-$(CONFIG_LINUX) += $(fsdev-obj-$(CONFIG_LINUX))
> -common-obj-y += readline.o console.o async.o qemu-error.o
> +common-obj-y += readline.o console.o cursor.o async.o qemu-error.o
> +
> common-obj-y += tcg-runtime.o host-utils.o
> common-obj-y += irq.o ioport.o input.o
> common-obj-$(CONFIG_PTIMER) += ptimer.o
> diff --git a/console.h b/console.h
> index 6def115..88861cb 100644
> --- a/console.h
> +++ b/console.h
> @@ -126,6 +126,27 @@ struct DisplaySurface {
> struct PixelFormat pf;
> };
>
> +/* cursor data format is 32bit RGBA */
> +typedef struct QEMUCursor {
> + int width, height;
> + int hot_x, hot_y;
> + int refcount;
> + uint32_t data[];
> +} QEMUCursor;
> +
> +QEMUCursor *cursor_alloc(int width, int height);
> +void cursor_get(QEMUCursor *c);
> +void cursor_put(QEMUCursor *c);
> +QEMUCursor *cursor_builtin_hidden(void);
> +QEMUCursor *cursor_builtin_left_ptr(void);
> +void cursor_print_ascii_art(QEMUCursor *c, const char *prefix);
> +int cursor_get_mono_bpl(QEMUCursor *c);
> +void cursor_set_mono(QEMUCursor *c,
> + uint32_t foreground, uint32_t background, uint8_t *image,
> + int transparent, uint8_t *mask);
> +void cursor_get_mono_image(QEMUCursor *c, int foreground, uint8_t *mask);
> +void cursor_get_mono_mask(QEMUCursor *c, int transparent, uint8_t *mask);
> +
> struct DisplayChangeListener {
> int idle;
> uint64_t gui_timer_interval;
> @@ -158,8 +179,7 @@ struct DisplayState {
> struct DisplayChangeListener* listeners;
>
> void (*mouse_set)(int x, int y, int on);
> - void (*cursor_define)(int width, int height, int bpp, int hot_x, int hot_y,
> - uint8_t *image, uint8_t *mask);
> + void (*cursor_define)(QEMUCursor *cursor);
>
> struct DisplayState *next;
> };
> diff --git a/cursor.c b/cursor.c
> new file mode 100644
> index 0000000..dfb9eef
> --- /dev/null
> +++ b/cursor.c
> @@ -0,0 +1,210 @@
> +#include "qemu-common.h"
> +#include "console.h"
> +
> +#include "cursor_hidden.xpm"
> +#include "cursor_left_ptr.xpm"
> +
> +/* for creating built-in cursors */
> +static QEMUCursor *cursor_parse_xpm(const char *xpm[])
> +{
> + 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 */
> +void cursor_print_ascii_art(QEMUCursor *c, const char *prefix)
> +{
> + uint32_t *data = c->data;
> + int x,y;
> +
> + for (y = 0; y< c->height; y++) {
> + fprintf(stderr, "%s: %2d: |", prefix, y);
> + for (x = 0; x< c->width; x++, data++) {
> + if ((*data& 0xff000000) != 0xff000000) {
> + fprintf(stderr, " "); /* transparent */
> + } else if ((*data& 0x00ffffff) == 0x00ffffff) {
> + fprintf(stderr, "."); /* white */
> + } else if ((*data& 0x00ffffff) == 0x00000000) {
> + fprintf(stderr, "X"); /* black */
> + } else {
> + fprintf(stderr, "o"); /* other */
> + }
> + }
> + fprintf(stderr, "|\n");
> + }
> +}
> +
> +QEMUCursor *cursor_builtin_hidden(void)
> +{
> + QEMUCursor *c;
> +
> + c = cursor_parse_xpm(cursor_hidden_xpm);
> + return c;
> +}
> +
> +QEMUCursor *cursor_builtin_left_ptr(void)
> +{
> + QEMUCursor *c;
> +
> + c = cursor_parse_xpm(cursor_left_ptr_xpm);
> + return c;
> +}
> +
> +QEMUCursor *cursor_alloc(int width, int height)
> +{
> + QEMUCursor *c;
> + int datasize = width * height * sizeof(uint32_t);
> +
> + c = qemu_mallocz(sizeof(QEMUCursor) + datasize);
> + c->width = width;
> + c->height = height;
> + c->refcount = 1;
> + return c;
> +}
> +
> +void cursor_get(QEMUCursor *c)
> +{
> + c->refcount++;
> +}
> +
> +void cursor_put(QEMUCursor *c)
> +{
> + if (c == NULL)
> + return;
> + c->refcount--;
> + if (c->refcount)
> + return;
> + qemu_free(c);
> +}
> +
> +int cursor_get_mono_bpl(QEMUCursor *c)
> +{
> + return (c->width + 7) / 8;
> +}
> +
> +void cursor_set_mono(QEMUCursor *c,
> + uint32_t foreground, uint32_t background, uint8_t *image,
> + int transparent, uint8_t *mask)
> +{
> + uint32_t *data = c->data;
> + uint8_t bit;
> + int x,y,bpl;
> +
> + bpl = cursor_get_mono_bpl(c);
> + for (y = 0; y< c->height; y++) {
> + bit = 0x80;
> + for (x = 0; x< c->width; x++, data++) {
> + if (transparent&& mask[x/8]& bit) {
> + *data = 0x00000000;
> + } else if (!transparent&& !(mask[x/8]& bit)) {
> + *data = 0x00000000;
> + } else if (image[x/8]& bit) {
> + *data = 0xff000000 | foreground;
> + } else {
> + *data = 0xff000000 | background;
> + }
> + bit>>= 1;
> + if (bit == 0) {
> + bit = 0x80;
> + }
> + }
> + mask += bpl;
> + image += bpl;
> + }
> +}
> +
> +void cursor_get_mono_image(QEMUCursor *c, int foreground, uint8_t *image)
> +{
> + uint32_t *data = c->data;
> + uint8_t bit;
> + int x,y,bpl;
> +
> + bpl = cursor_get_mono_bpl(c);
> + memset(image, 0, bpl * c->height);
> + for (y = 0; y< c->height; y++) {
> + bit = 0x80;
> + for (x = 0; x< c->width; x++, data++) {
> + if (((*data& 0xff000000) == 0xff000000)&&
> + ((*data& 0x00ffffff) == foreground)) {
> + image[x/8] |= bit;
> + }
> + bit>>= 1;
> + if (bit == 0) {
> + bit = 0x80;
> + }
> + }
> + image += bpl;
> + }
> +}
> +
> +void cursor_get_mono_mask(QEMUCursor *c, int transparent, uint8_t *mask)
> +{
> + uint32_t *data = c->data;
> + uint8_t bit;
> + int x,y,bpl;
> +
> + bpl = cursor_get_mono_bpl(c);
> + memset(mask, 0, bpl * c->height);
> + for (y = 0; y< c->height; y++) {
> + bit = 0x80;
> + for (x = 0; x< c->width; x++, data++) {
> + if ((*data& 0xff000000) != 0xff000000) {
> + if (transparent != 0) {
> + mask[x/8] |= bit;
> + }
> + } else {
> + if (transparent == 0) {
> + mask[x/8] |= bit;
> + }
> + }
> + bit>>= 1;
> + if (bit == 0) {
> + bit = 0x80;
> + }
> + }
> + mask += bpl;
> + }
> +}
> 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 ",
> + " ",
> + " ",
> + " ",
> + " ",
> + " ",
> + " ",
> + " ",
> + " ",
> + " ",
> + " ",
> + " ",
> + " ",
> + " ",
> +};
>
next prev parent reply other threads:[~2010-05-24 20:30 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-21 9:54 [Qemu-devel] [PATCH 0/3] cursor patches Gerd Hoffmann
2010-05-21 9:54 ` [Qemu-devel] [PATCH 1/3] cursor: add cursor functions Gerd Hoffmann
2010-05-21 12:29 ` Anthony Liguori
2010-05-21 18:53 ` Blue Swirl
2010-05-24 20:30 ` Anthony Liguori [this message]
2010-05-21 9:54 ` [Qemu-devel] [PATCH 2/3] use new cursor struct + functions for vmware vga and sdl Gerd Hoffmann
2010-05-21 9:54 ` [Qemu-devel] [PATCH 3/3] vnc: rich cursor support Gerd Hoffmann
-- strict thread matches above, loose matches on Subject: below --
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
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=4BFAE1D3.4070005@linux.vnet.ibm.com \
--to=aliguori@linux.vnet.ibm.com \
--cc=kraxel@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.