diff options
| -rw-r--r-- | Makefile.target | 2 | ||||
| -rw-r--r-- | hw/cirrus_vga.c | 3 | ||||
| -rw-r--r-- | hw/pc.c | 6 | ||||
| -rw-r--r-- | hw/vga.c | 12 | ||||
| -rw-r--r-- | hw/vga_int.h | 4 | ||||
| -rw-r--r-- | hw/vmware_vga.c | 1187 | ||||
| -rw-r--r-- | sdl.c | 95 | ||||
| -rw-r--r-- | vl.c | 13 | ||||
| -rw-r--r-- | vl.h | 13 |
9 files changed, 1327 insertions, 8 deletions
diff --git a/Makefile.target b/Makefile.target index f53b02442d..f1fbc578d3 100644 --- a/Makefile.target +++ b/Makefile.target @@ -403,7 +403,7 @@ ifeq ($(TARGET_BASE_ARCH), i386) VL_OBJS+= ide.o pckbd.o ps2.o vga.o $(SOUND_HW) dma.o $(AUDIODRV) VL_OBJS+= fdc.o mc146818rtc.o serial.o i8259.o i8254.o pcspk.o pc.o VL_OBJS+= cirrus_vga.o mixeng.o apic.o parallel.o acpi.o piix_pci.o -VL_OBJS+= usb-uhci.o smbus_eeprom.o vmmouse.o +VL_OBJS+= usb-uhci.o smbus_eeprom.o vmmouse.o vmware_vga.o CPPFLAGS += -DHAS_AUDIO endif ifeq ($(TARGET_BASE_ARCH), ppc) diff --git a/hw/cirrus_vga.c b/hw/cirrus_vga.c index d8fb37a897..2cbafe1745 100644 --- a/hw/cirrus_vga.c +++ b/hw/cirrus_vga.c @@ -3193,6 +3193,9 @@ void pci_cirrus_vga_init(PCIBus *bus, DisplayState *ds, uint8_t *vga_ram_base, vga_common_init((VGAState *)s, ds, vga_ram_base, vga_ram_offset, vga_ram_size); cirrus_init_common(s, device_id, 1); + + graphic_console_init(s->ds, s->update, s->invalidate, s->screen_dump, s); + s->pci_dev = (PCIDevice *)d; /* setup memory space */ @@ -664,6 +664,12 @@ static void pc_init1(int ram_size, int vga_ram_size, int boot_device, isa_cirrus_vga_init(ds, phys_ram_base + vga_ram_addr, vga_ram_addr, vga_ram_size); } + } else if (vmsvga_enabled) { + if (pci_enabled) + pci_vmsvga_init(pci_bus, ds, phys_ram_base + ram_size, + ram_size, vga_ram_size); + else + fprintf(stderr, "%s: vmware_vga: no PCI bus\n", __FUNCTION__); } else { if (pci_enabled) { pci_vga_init(pci_bus, ds, phys_ram_base + vga_ram_addr, @@ -1788,12 +1788,13 @@ void vga_common_init(VGAState *s, DisplayState *ds, uint8_t *vga_ram_base, s->get_bpp = vga_get_bpp; s->get_offsets = vga_get_offsets; s->get_resolution = vga_get_resolution; - graphic_console_init(s->ds, vga_update_display, vga_invalidate_display, - vga_screen_dump, s); + s->update = vga_update_display; + s->invalidate = vga_invalidate_display; + s->screen_dump = vga_screen_dump; } /* used by both ISA and PCI */ -static void vga_init(VGAState *s) +void vga_init(VGAState *s) { int vga_io_memory; @@ -1856,6 +1857,8 @@ int isa_vga_init(DisplayState *ds, uint8_t *vga_ram_base, vga_common_init(s, ds, vga_ram_base, vga_ram_offset, vga_ram_size); vga_init(s); + graphic_console_init(s->ds, s->update, s->invalidate, s->screen_dump, s); + #ifdef CONFIG_BOCHS_VBE /* XXX: use optimized standard vga accesses */ cpu_register_physical_memory(VBE_DISPI_LFB_PHYSICAL_ADDRESS, @@ -1881,6 +1884,9 @@ int pci_vga_init(PCIBus *bus, DisplayState *ds, uint8_t *vga_ram_base, vga_common_init(s, ds, vga_ram_base, vga_ram_offset, vga_ram_size); vga_init(s); + + graphic_console_init(s->ds, s->update, s->invalidate, s->screen_dump, s); + s->pci_dev = &d->dev; pci_conf = d->dev.config; diff --git a/hw/vga_int.h b/hw/vga_int.h index 633f344c73..e7df0f72bf 100644 --- a/hw/vga_int.h +++ b/hw/vga_int.h @@ -134,6 +134,9 @@ uint32_t cursor_offset; \ unsigned int (*rgb_to_pixel)(unsigned int r, \ unsigned int g, unsigned b); \ + vga_hw_update_ptr update; \ + vga_hw_invalidate_ptr invalidate; \ + vga_hw_screen_dump_ptr screen_dump; \ /* hardware mouse cursor support */ \ uint32_t invalidated_y_table[VGA_MAX_HEIGHT / 32]; \ void (*cursor_invalidate)(struct VGAState *s); \ @@ -157,6 +160,7 @@ static inline int c6_to_8(int v) void vga_common_init(VGAState *s, DisplayState *ds, uint8_t *vga_ram_base, unsigned long vga_ram_offset, int vga_ram_size); +void vga_init(VGAState *s); uint32_t vga_mem_readb(void *opaque, target_phys_addr_t addr); void vga_mem_writeb(void *opaque, target_phys_addr_t addr, uint32_t val); void vga_invalidate_scanlines(VGAState *s, int y1, int y2); diff --git a/hw/vmware_vga.c b/hw/vmware_vga.c new file mode 100644 index 0000000000..1a4f4cd9d3 --- /dev/null +++ b/hw/vmware_vga.c @@ -0,0 +1,1187 @@ +/* + * QEMU VMware-SVGA "chipset". + * + * Copyright (c) 2007 Andrzej Zaborowski <balrog@zabor.org> + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +#include "vl.h" + +#define VERBOSE +#define EMBED_STDVGA +#undef DIRECT_VRAM +#define HW_RECT_ACCEL +#define HW_FILL_ACCEL +#define HW_MOUSE_ACCEL + +#ifdef EMBED_STDVGA +# include "vga_int.h" +#endif + +struct vmsvga_state_s { +#ifdef EMBED_STDVGA + VGA_STATE_COMMON +#endif + + int width; + int height; + int invalidated; + int depth; + int bypp; + int enable; + int config; + struct { + int id; + int x; + int y; + int on; + } cursor; + +#ifndef EMBED_STDVGA + DisplayState *ds; + int vram_size; +#endif + uint8_t *vram; + + int index; + int scratch_size; + uint32_t *scratch; + int new_width; + int new_height; + uint32_t guest; + uint32_t svgaid; + uint32_t wred; + uint32_t wgreen; + uint32_t wblue; + int syncing; + int fb_size; + + union { + uint32_t *fifo; + struct __attribute__((__packed__)) { + uint32_t min; + uint32_t max; + uint32_t next_cmd; + uint32_t stop; + /* Add registers here when adding capabilities. */ + uint32_t fifo[0]; + } *cmd; + }; + +#define REDRAW_FIFO_LEN 512 + struct vmsvga_rect_s { + int x, y, w, h; + } redraw_fifo[REDRAW_FIFO_LEN]; + int redraw_fifo_first, redraw_fifo_last; +}; + +struct pci_vmsvga_state_s { + PCIDevice card; + struct vmsvga_state_s chip; +}; + +#define SVGA_MAGIC 0x900000UL +#define SVGA_MAKE_ID(ver) (SVGA_MAGIC << 8 | (ver)) +#define SVGA_ID_0 SVGA_MAKE_ID(0) +#define SVGA_ID_1 SVGA_MAKE_ID(1) +#define SVGA_ID_2 SVGA_MAKE_ID(2) + +#define SVGA_LEGACY_BASE_PORT 0x4560 +#define SVGA_INDEX_PORT 0x0 +#define SVGA_VALUE_PORT 0x1 +#define SVGA_BIOS_PORT 0x2 + +#define SVGA_VERSION_2 + +#ifdef SVGA_VERSION_2 +# define SVGA_ID SVGA_ID_2 +# define SVGA_IO_BASE SVGA_LEGACY_BASE_PORT +# define SVGA_IO_MUL 1 +# define SVGA_FIFO_SIZE 0x10000 +# define SVGA_MEM_BASE 0xec000000 +# define SVGA_PCI_DEVICE_ID PCI_DEVICE_ID_VMWARE_SVGA2 +#else +# define SVGA_ID SVGA_ID_1 +# define SVGA_IO_BASE SVGA_LEGACY_BASE_PORT +# define SVGA_IO_MUL 4 +# define SVGA_FIFO_SIZE 0x10000 +# define SVGA_MEM_BASE 0xec000000 +# define SVGA_PCI_DEVICE_ID PCI_DEVICE_ID_VMWARE_SVGA +#endif + +enum { + /* ID 0, 1 and 2 registers */ + SVGA_REG_ID = 0, + SVGA_REG_ENABLE = 1, + SVGA_REG_WIDTH = 2, + SVGA_REG_HEIGHT = 3, + SVGA_REG_MAX_WIDTH = 4, + SVGA_REG_MAX_HEIGHT = 5, + SVGA_REG_DEPTH = 6, + SVGA_REG_BITS_PER_PIXEL = 7, /* Current bpp in the guest */ + SVGA_REG_PSEUDOCOLOR = 8, + SVGA_REG_RED_MASK = 9, + SVGA_REG_GREEN_MASK = 10, + SVGA_REG_BLUE_MASK = 11, + SVGA_REG_BYTES_PER_LINE = 12, + SVGA_REG_FB_START = 13, + SVGA_REG_FB_OFFSET = 14, + SVGA_REG_VRAM_SIZE = 15, + SVGA_REG_FB_SIZE = 16, + + /* ID 1 and 2 registers */ + SVGA_REG_CAPABILITIES = 17, + SVGA_REG_MEM_START = 18, /* Memory for command FIFO */ + SVGA_REG_MEM_SIZE = 19, + SVGA_REG_CONFIG_DONE = 20, /* Set when memory area configured */ + SVGA_REG_SYNC = 21, /* Write to force synchronization */ + SVGA_REG_BUSY = 22, /* Read to check if sync is done */ + SVGA_REG_GUEST_ID = 23, /* Set guest OS identifier */ + SVGA_REG_CURSOR_ID = 24, /* ID of cursor */ + SVGA_REG_CURSOR_X = 25, /* Set cursor X position */ + SVGA_REG_CURSOR_Y = 26, /* Set cursor Y position */ + SVGA_REG_CURSOR_ON = 27, /* Turn cursor on/off */ + SVGA_REG_HOST_BITS_PER_PIXEL = 28, /* Current bpp in the host */ + SVGA_REG_SCRATCH_SIZE = 29, /* Number of scratch registers */ + SVGA_REG_MEM_REGS = 30, /* Number of FIFO registers */ + SVGA_REG_NUM_DISPLAYS = 31, /* Number of guest displays */ + SVGA_REG_PITCHLOCK = 32, /* Fixed pitch for all modes */ + + SVGA_PALETTE_BASE = 1024, /* Base of SVGA color map */ + SVGA_PALETTE_END = SVGA_PALETTE_BASE + 767, + SVGA_SCRATCH_BASE = SVGA_PALETTE_BASE + 768, +}; + +#define SVGA_CAP_NONE 0 +#define SVGA_CAP_RECT_FILL (1 << 0) +#define SVGA_CAP_RECT_COPY (1 << 1) +#define SVGA_CAP_RECT_PAT_FILL (1 << 2) +#define SVGA_CAP_LEGACY_OFFSCREEN (1 << 3) +#define SVGA_CAP_RASTER_OP (1 << 4) +#define SVGA_CAP_CURSOR (1 << 5) +#define SVGA_CAP_CURSOR_BYPASS (1 << 6) +#define SVGA_CAP_CURSOR_BYPASS_2 (1 << 7) +#define SVGA_CAP_8BIT_EMULATION (1 << 8) +#define SVGA_CAP_ALPHA_CURSOR (1 << 9) +#define SVGA_CAP_GLYPH (1 << 10) +#define SVGA_CAP_GLYPH_CLIPPING (1 << 11) +#define SVGA_CAP_OFFSCREEN_1 (1 << 12) +#define SVGA_CAP_ALPHA_BLEND (1 << 13) +#define SVGA_CAP_3D (1 << 14) +#define SVGA_CAP_EXTENDED_FIFO (1 << 15) +#define SVGA_CAP_MULTIMON (1 << 16) +#define SVGA_CAP_PITCHLOCK (1 << 17) + +/* + * FIFO offsets (seen as an array of 32-bit words) + */ +enum { + /* + * The original defined FIFO offsets + */ + SVGA_FIFO_MIN = 0, + SVGA_FIFO_MAX, /* The distance from MIN to MAX must be at least 10K */ + SVGA_FIFO_NEXT_CMD, + SVGA_FIFO_STOP, + + /* + * Additional offsets added as of SVGA_CAP_EXTENDED_FIFO + */ + SVGA_FIFO_CAPABILITIES = 4, + SVGA_FIFO_FLAGS, + SVGA_FIFO_FENCE, + SVGA_FIFO_3D_HWVERSION, + SVGA_FIFO_PITCHLOCK, +}; + +#define SVGA_FIFO_CAP_NONE 0 +#define SVGA_FIFO_CAP_FENCE (1 << 0) +#define SVGA_FIFO_CAP_ACCELFRONT (1 << 1) +#define SVGA_FIFO_CAP_PITCHLOCK (1 << 2) + +#define SVGA_FIFO_FLAG_NONE 0 +#define SVGA_FIFO_FLAG_ACCELFRONT (1 << 0) + +/* These values can probably be changed arbitrarily. */ +#define SVGA_SCRATCH_SIZE 0x8000 +#define SVGA_MAX_WIDTH 2360 +#define SVGA_MAX_HEIGHT 1770 + +#ifdef VERBOSE +# define GUEST_OS_BASE 0x5001 +static const char *vmsvga_guest_id[] = { + [0x0] = "Dos", + [0x1] = "Windows 3.1", + [0x2] = "Windows 95", + [0x3] = "Windows 98", + [0x4] = "Windows ME", + [0x5] = "Windows NT", + [0x6] = "Windows 2000", + [0x7] = "Linux", + [0x8] = "OS/2", + [0x9] = "Unknown", + [0xa] = "BSD", + [0xb] = "Whistler", +}; +#endif + +enum { + SVGA_CMD_INVALID_CMD = 0, + SVGA_CMD_UPDATE = 1, + SVGA_CMD_RECT_FILL = 2, + SVGA_CMD_RECT_COPY = 3, + SVGA_CMD_DEFINE_BITMAP = 4, + SVGA_CMD_DEFINE_BITMAP_SCANLINE = 5, + SVGA_CMD_DEFINE_PIXMAP = 6, + SVGA_CMD_DEFINE_PIXMAP_SCANLINE = 7, + SVGA_CMD_RECT_BITMAP_FILL = 8, + SVGA_CMD_RECT_PIXMAP_FILL = 9, + SVGA_CMD_RECT_BITMAP_COPY = 10, + SVGA_CMD_RECT_PIXMAP_COPY = 11, + SVGA_CMD_FREE_OBJECT = 12, + SVGA_CMD_RECT_ROP_FILL = 13, + SVGA_CMD_RECT_ROP_COPY = 14, + SVGA_CMD_RECT_ROP_BITMAP_FILL = 15, + SVGA_CMD_RECT_ROP_PIXMAP_FILL = 16, + SVGA_CMD_RECT_ROP_BITMAP_COPY = 17, + SVGA_CMD_RECT_ROP_PIXMAP_COPY = 18, + SVGA_CMD_DEFINE_CURSOR = 19, + SVGA_CMD_DISPLAY_CURSOR = 20, + SVGA_CMD_MOVE_CURSOR = 21, + SVGA_CMD_DEFINE_ALPHA_CURSOR = 22, + SVGA_CMD_DRAW_GLYPH = 23, + SVGA_CMD_DRAW_GLYPH_CLIPPED = 24, + SVGA_CMD_UPDATE_VERBOSE = 25, + SVGA_CMD_SURFACE_FILL = 26, + SVGA_CMD_SURFACE_COPY = 27, + SVGA_CMD_SURFACE_ALPHA_BLEND = 28, + SVGA_CMD_FRONT_ROP_FILL = 29, + SVGA_CMD_FENCE = 30, +}; + +/* Legal values for the SVGA_REG_CURSOR_ON register in cursor bypass mode */ +enum { + SVGA_CURSOR_ON_HIDE = 0, + SVGA_CURSOR_ON_SHOW = 1, + SVGA_CURSOR_ON_REMOVE_FROM_FB = 2, + SVGA_CURSOR_ON_RESTORE_TO_FB = 3, +}; + +static inline void vmsvga_update_rect(struct vmsvga_state_s *s, + int x, int y, int w, int h) +{ +#ifndef DIRECT_VRAM + int line = h; + int bypl = s->bypp * s->width; + int width = s->bypp * w; + int start = s->bypp * x + bypl * y; + uint8_t *src = s->vram + start; + uint8_t *dst = s->ds->data + start; + + for (; line > 0; line --, src += bypl, dst += bypl) + memcpy(dst, src, width); +#endif + + dpy_update(s->ds, x, y, w, h); +} + +static inline void vmsvga_update_screen(struct vmsvga_state_s *s) +{ +#ifndef DIRECT_VRAM + memcpy(s->ds->data, s->vram, s->bypp * s->width * s->height); +#endif + + dpy_update(s->ds, 0, 0, s->width, s->height); +} + +#ifdef DIRECT_VRAM +# define vmsvga_update_rect_delayed vmsvga_update_rect +#else +static inline void vmsvga_update_rect_delayed(struct vmsvga_state_s *s, + int x, int y, int w, int h) +{ + struct vmsvga_rect_s *rect = &s->redraw_fifo[s->redraw_fifo_last ++]; + s->redraw_fifo_last &= REDRAW_FIFO_LEN - 1; + rect->x = x; + rect->y = y; + rect->w = w; + rect->h = h; +} +#endif + +static inline void vmsvga_update_rect_flush(struct vmsvga_state_s *s) +{ + struct vmsvga_rect_s *rect; + if (s->invalidated) { + s->redraw_fifo_first = s->redraw_fifo_last; + return; + } + /* Overlapping region updates can be optimised out here - if someone + * knows a smart algorithm to do that, please share. */ + while (s->redraw_fifo_first != s->redraw_fifo_last) { + rect = &s->redraw_fifo[s->redraw_fifo_first ++]; + s->redraw_fifo_first &= REDRAW_FIFO_LEN - 1; + vmsvga_update_rect(s, rect->x, rect->y, rect->w, rect->h); + } +} + +#ifdef HW_RECT_ACCEL +static inline void vmsvga_copy_rect(struct vmsvga_state_s *s, + int x0, int y0, int x1, int y1, int w, int h) +{ +# ifdef DIRECT_VRAM + uint8_t *vram = s->ds->data; +# else + uint8_t *vram = s->vram; +# endif + int bypl = s->bypp * s->width; + int width = s->bypp * w; + int line = h; + uint8_t *ptr[2]; + +# ifdef DIRECT_VRAM + if (s->ds->dpy_copy) + s->ds->dpy_copy(s->ds, x0, y0, x1, y1, w, h); + else +# endif + { + if (y1 > y0) { + ptr[0] = vram + s->bypp * x0 + bypl * (y0 + h - 1); + ptr[1] = vram + s->bypp * x1 + bypl * (y1 + h - 1); + for (; line > 0; line --, ptr[0] -= bypl, ptr[1] -= bypl) + memmove(ptr[1], ptr[0], width); + } else { + ptr[0] = vram + s->bypp * x0 + bypl * y0; + ptr[1] = vram + s->bypp * x1 + bypl * y1; + for (; line > 0; line --, ptr[0] += bypl, ptr[1] += bypl) + memmove(ptr[1], ptr[0], width); + } + } + + vmsvga_update_rect_delayed(s, x1, y1, w, h); +} +#endif + +#ifdef HW_FILL_ACCEL +static inline void vmsvga_fill_rect(struct vmsvga_state_s *s, + uint32_t c, int x, int y, int w, int h) +{ +# ifdef DIRECT_VRAM + uint8_t *vram = s->ds->data; +# else + uint8_t *vram = s->vram; +# endif + int bypp = s->bypp; + int bypl = bypp * s->width; + int width = bypp * w; + int line = h; + int column; + uint8_t *fst = vram + bypp * x + bypl * y; + uint8_t *dst; + uint8_t *src; + uint8_t col[4]; + +# ifdef DIRECT_VRAM + if (s->ds->dpy_fill) + s->ds->dpy_fill(s->ds, x, y, w, h, c); + else +# endif + { + col[0] = c; + col[1] = c >> 8; + col[2] = c >> 16; + col[3] = c >> 24; + + if (line --) { + dst = fst; + src = col; + for (column = width; column > 0; column --) { + *(dst ++) = *(src ++); + if (src - col == bypp) + src = col; + } + dst = fst; + for (; line > 0; line --) { + dst += bypl; + memcpy(dst, fst, width); + } + } + } + + vmsvga_update_rect_delayed(s, x, y, w, h); +} +#endif + +struct vmsvga_cursor_definition_s { + int width; + int height; + int id; + int bpp; + int hot_x; + int hot_y; + uint32_t mask[1024]; + uint32_t image[1024]; +}; + +#define SVGA_BITMAP_SIZE(w, h) ((((w) + 31) >> 5) * (h)) +#define SVGA_PIXMAP_SIZE(w, h, bpp) (((((w) * (bpp)) + 31) >> 5) * (h)) + +#ifdef HW_MOUSE_ACCEL +static inline void vmsvga_cursor_define(struct vmsvga_state_s *s, + struct vmsvga_cursor_definition_s *c) +{ + int i; + for (i = SVGA_BITMAP_SIZE(c->width, c->height) - 1; i >= 0; i --) + c->mask[i] = ~c->mask[i]; + + if (s->ds->cursor_define) + s->ds->cursor_define(c->width, c->height, c->bpp, c->hot_x, c->hot_y, + (uint8_t *) c->image, (uint8_t *) c->mask); +} +#endif + +static inline int vmsvga_fifo_empty(struct vmsvga_state_s *s) +{ + if (!s->config || !s->enable) + return 0; + return (s->cmd->next_cmd == s->cmd->stop); +} + +static inline uint32_t vmsvga_fifo_read(struct vmsvga_state_s *s) +{ + uint32_t cmd = s->fifo[s->cmd->stop >> 2]; + s->cmd->stop += 4; + if (s->cmd->stop >= s->cmd->max) + s->cmd->stop = s->cmd->min; + return cmd; +} + +static void vmsvga_fifo_run(struct vmsvga_state_s *s) +{ + uint32_t cmd, colour; + int args = 0; + int x, y, dx, dy, width, height; + struct vmsvga_cursor_definition_s cursor; + while (!vmsvga_fifo_empty(s)) + switch (cmd = vmsvga_fifo_read(s)) { + case SVGA_CMD_UPDATE: + case SVGA_CMD_UPDATE_VERBOSE: + x = vmsvga_fifo_read(s); + y = vmsvga_fifo_read(s); + width = vmsvga_fifo_read(s); + height = vmsvga_fifo_read(s); + vmsvga_update_rect_delayed(s, x, y, width, height); + break; + + case SVGA_CMD_RECT_FILL: + colour = vmsvga_fifo_read(s); + x = vmsvga_fifo_read(s); + y = vmsvga_fifo_read(s); + width = vmsvga_fifo_read(s); + height = vmsvga_fifo_read(s); +#ifdef HW_FILL_ACCEL + vmsvga_fill_rect(s, colour, x, y, width, height); + break; +#else + goto badcmd; +#endif + + case SVGA_CMD_RECT_COPY: + x = vmsvga_fifo_read(s); + y = vmsvga_fifo_read(s); + dx = vmsvga_fifo_read(s); + dy = vmsvga_fifo_read(s); + width = vmsvga_fifo_read(s); + height = vmsvga_fifo_read(s); +#ifdef HW_RECT_ACCEL + vmsvga_copy_rect(s, x, y, dx, dy, width, height); + break; +#else + goto badcmd; +#endif + + case SVGA_CMD_DEFINE_CURSOR: + cursor.id = vmsvga_fifo_read(s); + cursor.hot_x = vmsvga_fifo_read(s); + cursor.hot_y = vmsvga_fifo_read(s); + cursor.width = x = vmsvga_fifo_read(s); + cursor.height = y = vmsvga_fifo_read(s); + vmsvga_fifo_read(s); + cursor.bpp = vmsvga_fifo_read(s); + for (args = 0; args < SVGA_BITMAP_SIZE(x, y); args ++) + cursor.mask[args] = vmsvga_fifo_read(s); + for (args = 0; args < SVGA_PIXMAP_SIZE(x, y, cursor.bpp); args ++) + cursor.image[args] = vmsvga_fifo_read(s); +#ifdef HW_MOUSE_ACCEL + vmsvga_cursor_define(s, &cursor); + break; +#else + args = 0; + goto badcmd; +#endif + + /* + * Other commands that we at least know the number of arguments + * for so we can avoid FIFO desync if driver uses them illegally. + */ + case SVGA_CMD_DEFINE_ALPHA_CURSOR: + vmsvga_fifo_read(s); + vmsvga_fifo_read(s); + vmsvga_fifo_read(s); + x = vmsvga_fifo_read(s); + y = vmsvga_fifo_read(s); + args = x * y; + goto badcmd; + case SVGA_CMD_RECT_ROP_FILL: + args = 6; + goto badcmd; + case SVGA_CMD_RECT_ROP_COPY: + args = 7; + goto badcmd; + case SVGA_CMD_DRAW_GLYPH_CLIPPED: + vmsvga_fifo_read(s); + vmsvga_fifo_read(s); + args = 7 + (vmsvga_fifo_read(s) >> 2); + goto badcmd; + case SVGA_CMD_SURFACE_ALPHA_BLEND: + args = 12; + goto badcmd; + + /* + * Other commands that are not listed as depending on any + * CAPABILITIES bits, but are not described in the README either. + */ + case SVGA_CMD_SURFACE_FILL: + case SVGA_CMD_SURFACE_COPY: + case SVGA_CMD_FRONT_ROP_FILL: + case SVGA_CMD_FENCE: + case SVGA_CMD_INVALID_CMD: + break; /* Nop */ + + default: + badcmd: + while (args --) + vmsvga_fifo_read(s); + printf("%s: Unknown command 0x%02x in SVGA command FIFO\n", + __FUNCTION__, cmd); + break; + } + + s->syncing = 0; +} + +static uint32_t vmsvga_index_read(void *opaque, uint32_t address) +{ + struct vmsvga_state_s *s = (struct vmsvga_state_s *) opaque; + return s->index; +} + +static void vmsvga_index_write(void *opaque, uint32_t address, uint32_t index) +{ + struct vmsvga_state_s *s = (struct vmsvga_state_s *) opaque; + s->index = index; +} + +static uint32_t vmsvga_value_read(void *opaque, uint32_t address) +{ + uint32_t caps; + struct vmsvga_state_s *s = (struct vmsvga_state_s *) opaque; + switch (s->index) { + case SVGA_REG_ID: + return s->svgaid; + + case SVGA_REG_ENABLE: + return s->enable; + + case SVGA_REG_WIDTH: + return s->width; + + case SVGA_REG_HEIGHT: + return s->height; + + case SVGA_REG_MAX_WIDTH: + return SVGA_MAX_WIDTH; + + case SVGA_REG_MAX_HEIGHT: + return SVGA_MAX_WIDTH; + + case SVGA_REG_DEPTH: + return s->depth; + + case SVGA_REG_BITS_PER_PIXEL: + return (s->depth + 7) & ~7; + + case SVGA_REG_PSEUDOCOLOR: + return 0x0; + + case SVGA_REG_RED_MASK: + return s->wred; + case SVGA_REG_GREEN_MASK: + return s->wgreen; + case SVGA_REG_BLUE_MASK: + return s->wblue; + + case SVGA_REG_BYTES_PER_LINE: + return ((s->depth + 7) >> 3) * s->new_width; + + case SVGA_REG_FB_START: + return SVGA_MEM_BASE; + + case SVGA_REG_FB_OFFSET: + return 0x0; + + case SVGA_REG_VRAM_SIZE: + return s->vram_size - SVGA_FIFO_SIZE; + + case SVGA_REG_FB_SIZE: + return s->fb_size; + + case SVGA_REG_CAPABILITIES: + caps = SVGA_CAP_NONE; +#ifdef HW_RECT_ACCEL + caps |= SVGA_CAP_RECT_COPY; +#endif +#ifdef HW_FILL_ACCEL + caps |= SVGA_CAP_RECT_FILL; +#endif +#ifdef HW_MOUSE_ACCEL + if (s->ds->mouse_set) + caps |= SVGA_CAP_CURSOR | SVGA_CAP_CURSOR_BYPASS_2 | + SVGA_CAP_CURSOR_BYPASS; +#endif + return caps; + + case SVGA_REG_MEM_START: + return SVGA_MEM_BASE + s->vram_size - SVGA_FIFO_SIZE; + + case SVGA_REG_MEM_SIZE: + return SVGA_FIFO_SIZE; + + case SVGA_REG_CONFIG_DONE: + return s->config; + + case SVGA_REG_SYNC: + case SVGA_REG_BUSY: + return s->syncing; + + case SVGA_REG_GUEST_ID: + return s->guest; + + case SVGA_REG_CURSOR_ID: + return s->cursor.id; + + case SVGA_REG_CURSOR_X: + return s->cursor.x; + + case SVGA_REG_CURSOR_Y: + return s->cursor.x; + + case SVGA_REG_CURSOR_ON: + return s->cursor.on; + + case SVGA_REG_HOST_BITS_PER_PIXEL: + return (s->depth + 7) & ~7; + + case SVGA_REG_SCRATCH_SIZE: + return s->scratch_size; + + case SVGA_REG_MEM_REGS: + case SVGA_REG_NUM_DISPLAYS: + case SVGA_REG_PITCHLOCK: + case SVGA_PALETTE_BASE ... SVGA_PALETTE_END: + return 0; + + default: + if (s->index >= SVGA_SCRATCH_BASE && + s->index < SVGA_SCRATCH_BASE + s->scratch_size) + return s->scratch[s->index - SVGA_SCRATCH_BASE]; + printf("%s: Bad register %02x\n", __FUNCTION__, s->index); + } + + return 0; +} + +static void vmsvga_value_write(void *opaque, uint32_t address, uint32_t value) +{ + struct vmsvga_state_s *s = (struct vmsvga_state_s *) opaque; + switch (s->index) { + case SVGA_REG_ID: + if (value == SVGA_ID_2 || value == SVGA_ID_1 || value == SVGA_ID_0) + s->svgaid = value; + break; + + case SVGA_REG_ENABLE: + s->enable = s->config = value & s->config; + s->width = -1; + s->height = -1; + s->invalidated = 1; +#ifdef EMBED_STDVGA + s->invalidate(opaque); +#endif + if (s->enable) + s->fb_size = ((s->depth + 7) >> 3) * s->new_width * s->new_height; + break; + + case SVGA_REG_WIDTH: + s->new_width = value; + s->invalidated = 1; + break; + + case SVGA_REG_HEIGHT: + s->new_height = value; + s->invalidated = 1; + break; + + case SVGA_REG_DEPTH: + case SVGA_REG_BITS_PER_PIXEL: + if (value != s->depth) { + printf("%s: Bad colour depth: %i bits\n", __FUNCTION__, value); + s->config = 0; + } + break; + + case SVGA_REG_CONFIG_DONE: + if (value) { + s->fifo = (uint32_t *) &s->vram[s->vram_size - SVGA_FIFO_SIZE]; + /* Check range and alignment. */ + if ((s->cmd->min | s->cmd->max | + s->cmd->next_cmd | s->cmd->stop) & 3) + break; + if (s->cmd->min < (uint8_t *) s->cmd->fifo - (uint8_t *) s->fifo) + break; + if (s->cmd->max > SVGA_FIFO_SIZE) + break; + if (s->cmd->max < s->cmd->min + 10 * 1024) + break; + } + s->config = value; + break; + + case SVGA_REG_SYNC: + s->syncing = 1; + vmsvga_fifo_run(s); /* Or should we just wait for update_display? */ + break; + + case SVGA_REG_GUEST_ID: + s->guest = value; +#ifdef VERBOSE + if (value >= GUEST_OS_BASE && value < GUEST_OS_BASE + + sizeof(vmsvga_guest_id) / sizeof(*vmsvga_guest_id)) + printf("%s: guest runs %s.\n", __FUNCTION__, + vmsvga_guest_id[value - GUEST_OS_BASE]); +#endif + break; + + case SVGA_REG_CURSOR_ID: + s->cursor.id = value; + break; + + case SVGA_REG_CURSOR_X: + s->cursor.x = value; + break; + + case SVGA_REG_CURSOR_Y: + s->cursor.y = value; + break; + + case SVGA_REG_CURSOR_ON: + s->cursor.on |= (value == SVGA_CURSOR_ON_SHOW); + s->cursor.on &= (value != SVGA_CURSOR_ON_HIDE); +#ifdef HW_MOUSE_ACCEL + if (s->ds->mouse_set && value <= SVGA_CURSOR_ON_SHOW) + s->ds->mouse_set(s->cursor.x, s->cursor.y, s->cursor.on); +#endif + break; + + case SVGA_REG_MEM_REGS: + case SVGA_REG_NUM_DISPLAYS: + case SVGA_REG_PITCHLOCK: + case SVGA_PALETTE_BASE ... SVGA_PALETTE_END: + break; + + default: + if (s->index >= SVGA_SCRATCH_BASE && + s->index < SVGA_SCRATCH_BASE + s->scratch_size) { + s->scratch[s->index - SVGA_SCRATCH_BASE] = value; + break; + } + printf("%s: Bad register %02x\n", __FUNCTION__, s->index); + } +} + +static uint32_t vmsvga_bios_read(void *opaque, uint32_t address) +{ + printf("%s: what are we supposed to return?\n", __FUNCTION__); + return 0xcafe; +} + +static void vmsvga_bios_write(void *opaque, uint32_t address, uint32_t data) +{ + printf("%s: what are we supposed to do with (%08x)?\n", + __FUNCTION__, data); +} + +static inline void vmsvga_size(struct vmsvga_state_s *s) +{ + if (s->new_width != s->width || s->new_height != s->height) { + s->width = s->new_width; + s->height = s->new_height; + dpy_resize(s->ds, s->width, s->height); + s->invalidated = 1; + } +} + +static void vmsvga_update_display(void *opaque) +{ + struct vmsvga_state_s *s = (struct vmsvga_state_s *) opaque; + if (!s->enable) { +#ifdef EMBED_STDVGA + s->update(opaque); +#endif + return; + } + + vmsvga_size(s); + + vmsvga_fifo_run(s); + vmsvga_update_rect_flush(s); + + /* + * Is it more efficient to look at vram VGA-dirty bits or wait + * for the driver to issue SVGA_CMD_UPDATE? + */ + if (s->invalidated) { + s->invalidated = 0; + vmsvga_update_screen(s); + } +} + +static void vmsvga_reset(struct vmsvga_state_s *s) +{ + s->index = 0; + s->enable = 0; + s->config = 0; + s->width = -1; + s->height = -1; + s->svgaid = SVGA_ID; + s->depth = s->ds->depth ? s->ds->depth : 24; + s->bypp = (s->depth + 7) >> 3; + s->cursor.on = 0; + s->redraw_fifo_first = 0; + s->redraw_fifo_last = 0; + switch (s->depth) { + case 8: + s->wred = 0x00000007; + s->wgreen = 0x00000038; + s->wblue = 0x000000c0; + break; + case 15: + s->wred = 0x0000001f; + s->wgreen = 0x000003e0; + s->wblue = 0x00007c00; + break; + case 16: + s->wred = 0x0000001f; + s->wgreen = 0x000007e0; + s->wblue = 0x0000f800; + break; + case 24: + s->wred = 0x000000ff; + s->wgreen = 0x0000ff00; + s->wblue = 0x00ff0000; + break; + case 32: + s->wred = 0x000000ff; + s->wgreen = 0x0000ff00; + s->wblue = 0x00ff0000; + break; + } + s->syncing = 0; +} + +static void vmsvga_invalidate_display(void *opaque) +{ + struct vmsvga_state_s *s = (struct vmsvga_state_s *) opaque; + if (!s->enable) { +#ifdef EMBED_STDVGA + s->invalidate(opaque); +#endif + return; + } + + s->invalidated = 1; +} + +static void vmsvga_screen_dump(void *opaque, const char *filename) +{ + struct vmsvga_state_s *s = (struct vmsvga_state_s *) opaque; + if (!s->enable) { +#ifdef EMBED_STDVGA + s->screen_dump(opaque, filename); +#endif + return; + } + + /* TODO */ +} + +#ifdef DIRECT_VRAM +static uint32_t vmsvga_vram_readb(void *opaque, target_phys_addr_t addr) +{ + struct vmsvga_state_s *s = (struct vmsvga_state_s *) opaque; + addr -= SVGA_MEM_BASE; + if (addr < s->fb_size) + return *(uint8_t *) (s->ds->data + addr); + else + return *(uint8_t *) (s->vram + addr); +} + +static uint32_t vmsvga_vram_readw(void *opaque, target_phys_addr_t addr) +{ + struct vmsvga_state_s *s = (struct vmsvga_state_s *) opaque; + addr -= SVGA_MEM_BASE; + if (addr < s->fb_size) + return *(uint16_t *) (s->ds->data + addr); + else + return *(uint16_t *) (s->vram + addr); +} + +static uint32_t vmsvga_vram_readl(void *opaque, target_phys_addr_t addr) +{ + struct vmsvga_state_s *s = (struct vmsvga_state_s *) opaque; + addr -= SVGA_MEM_BASE; + if (addr < s->fb_size) + return *(uint32_t *) (s->ds->data + addr); + else + return *(uint32_t *) (s->vram + addr); +} + +static void vmsvga_vram_writeb(void *opaque, target_phys_addr_t addr, + uint32_t value) +{ + struct vmsvga_state_s *s = (struct vmsvga_state_s *) opaque; + addr -= SVGA_MEM_BASE; + if (addr < s->fb_size) + *(uint8_t *) (s->ds->data + addr) = value; + else + *(uint8_t *) (s->vram + addr) = value; +} + +static void vmsvga_vram_writew(void *opaque, target_phys_addr_t addr, + uint32_t value) +{ + struct vmsvga_state_s *s = (struct vmsvga_state_s *) opaque; + addr -= SVGA_MEM_BASE; + if (addr < s->fb_size) + *(uint16_t *) (s->ds->data + addr) = value; + else + *(uint16_t *) (s->vram + addr) = value; +} + +static void vmsvga_vram_writel(void *opaque, target_phys_addr_t addr, + uint32_t value) +{ + struct vmsvga_state_s *s = (struct vmsvga_state_s *) opaque; + addr -= SVGA_MEM_BASE; + if (addr < s->fb_size) + *(uint32_t *) (s->ds->data + addr) = value; + else + *(uint32_t *) (s->vram + addr) = value; +} + +static CPUReadMemoryFunc *vmsvga_vram_read[] = { + vmsvga_vram_readb, + vmsvga_vram_readw, + vmsvga_vram_readl, +}; + +static CPUWriteMemoryFunc *vmsvga_vram_write[] = { + vmsvga_vram_writeb, + vmsvga_vram_writew, + vmsvga_vram_writel, +}; +#endif + +static void vmsvga_save(struct vmsvga_state_s *s, QEMUFile *f) +{ + qemu_put_be32s(f, &s->depth); + qemu_put_be32s(f, &s->enable); + qemu_put_be32s(f, &s->config); + qemu_put_be32s(f, &s->cursor.id); + qemu_put_be32s(f, &s->cursor.x); + qemu_put_be32s(f, &s->cursor.y); + qemu_put_be32s(f, &s->cursor.on); + qemu_put_be32s(f, &s->index); + qemu_put_buffer(f, (uint8_t *) s->scratch, s->scratch_size * 4); + qemu_put_be32s(f, &s->new_width); + qemu_put_be32s(f, &s->new_height); + qemu_put_be32s(f, &s->guest); + qemu_put_be32s(f, &s->svgaid); + qemu_put_be32s(f, &s->syncing); + qemu_put_be32s(f, &s->fb_size); +} + +static int vmsvga_load(struct vmsvga_state_s *s, QEMUFile *f) +{ + int depth; + qemu_get_be32s(f, &depth); + qemu_get_be32s(f, &s->enable); + qemu_get_be32s(f, &s->config); + qemu_get_be32s(f, &s->cursor.id); + qemu_get_be32s(f, &s->cursor.x); + qemu_get_be32s(f, &s->cursor.y); + qemu_get_be32s(f, &s->cursor.on); + qemu_get_be32s(f, &s->index); + qemu_get_buffer(f, (uint8_t *) s->scratch, s->scratch_size * 4); + qemu_get_be32s(f, &s->new_width); + qemu_get_be32s(f, &s->new_height); + qemu_get_be32s(f, &s->guest); + qemu_get_be32s(f, &s->svgaid); + qemu_get_be32s(f, &s->syncing); + qemu_get_be32s(f, &s->fb_size); + + if (s->enable && depth != s->depth) { + printf("%s: need colour depth of %i bits to resume operation.\n", + __FUNCTION__, depth); + return -EINVAL; + } + + s->invalidated = 1; + if (s->config) + s->fifo = (uint32_t *) &s->vram[s->vram_size - SVGA_FIFO_SIZE]; + + return 0; +} + +static void vmsvga_init(struct vmsvga_state_s *s, DisplayState *ds, + uint8_t *vga_ram_base, unsigned long vga_ram_offset, + int vga_ram_size) +{ + int iomemtype; + s->ds = ds; + s->vram = vga_ram_base; + s->vram_size = vga_ram_size; + + s->scratch_size = SVGA_SCRATCH_SIZE; + s->scratch = (uint32_t *) qemu_malloc(s->scratch_size * 4); + + vmsvga_reset(s); + +#ifdef DIRECT_VRAM + iomemtype = cpu_register_io_memory(0, vmsvga_vram_read, + vmsvga_vram_write, s); +#else + iomemtype = vga_ram_offset | IO_MEM_RAM; +#endif + cpu_register_physical_memory(SVGA_MEM_BASE, vga_ram_size, + iomemtype); + + register_ioport_read(SVGA_IO_BASE + SVGA_IO_MUL * SVGA_INDEX_PORT, + 1, 4, vmsvga_index_read, s); + register_ioport_write(SVGA_IO_BASE + SVGA_IO_MUL * SVGA_INDEX_PORT, + 1, 4, vmsvga_index_write, s); + register_ioport_read(SVGA_IO_BASE + SVGA_IO_MUL * SVGA_VALUE_PORT, + 1, 4, vmsvga_value_read, s); + register_ioport_write(SVGA_IO_BASE + SVGA_IO_MUL * SVGA_VALUE_PORT, + 1, 4, vmsvga_value_write, s); + register_ioport_read(SVGA_IO_BASE + SVGA_IO_MUL * SVGA_BIOS_PORT, + 1, 4, vmsvga_bios_read, s); + register_ioport_write(SVGA_IO_BASE + SVGA_IO_MUL * SVGA_BIOS_PORT, + 1, 4, vmsvga_bios_write, s); + + graphic_console_init(ds, vmsvga_update_display, + vmsvga_invalidate_display, vmsvga_screen_dump, s); + +#ifdef EMBED_STDVGA + vga_common_init((VGAState *) s, ds, + vga_ram_base, vga_ram_offset, vga_ram_size); + vga_init((VGAState *) s); +#endif +} + +static void pci_vmsvga_save(QEMUFile *f, void *opaque) +{ + struct pci_vmsvga_state_s *s = (struct pci_vmsvga_state_s *) opaque; + pci_device_save(&s->card, f); + vmsvga_save(&s->chip, f); +} + +static int pci_vmsvga_load(QEMUFile *f, void *opaque, int version_id) +{ + struct pci_vmsvga_state_s *s = (struct pci_vmsvga_state_s *) opaque; + int ret; + + ret = pci_device_load(&s->card, f); + if (ret < 0) + return ret; + + ret = vmsvga_load(&s->chip, f); + if (ret < 0) + return ret; + + return 0; +} + +#define PCI_VENDOR_ID_VMWARE 0x15ad +#define PCI_DEVICE_ID_VMWARE_SVGA2 0x0405 +#define PCI_DEVICE_ID_VMWARE_SVGA 0x0710 +#define PCI_DEVICE_ID_VMWARE_NET 0x0720 +#define PCI_DEVICE_ID_VMWARE_SCSI 0x0730 +#define PCI_DEVICE_ID_VMWARE_IDE 0x1729 +#define PCI_CLASS_BASE_DISPLAY 0x03 +#define PCI_CLASS_SUB_VGA 0x00 +#define PCI_CLASS_HEADERTYPE_00h 0x00 + +void pci_vmsvga_init(PCIBus *bus, DisplayState *ds, uint8_t *vga_ram_base, + unsigned long vga_ram_offset, int vga_ram_size) +{ + struct pci_vmsvga_state_s *s; + + /* Setup PCI configuration */ + s = (struct pci_vmsvga_state_s *) + pci_register_device(bus, "QEMUware SVGA", + sizeof(struct pci_vmsvga_state_s), -1, 0, 0); + s->card.config[PCI_VENDOR_ID] = PCI_VENDOR_ID_VMWARE & 0xff; + s->card.config[PCI_VENDOR_ID + 1] = PCI_VENDOR_ID_VMWARE >> 8; + s->card.config[PCI_DEVICE_ID] = SVGA_PCI_DEVICE_ID & 0xff; + s->card.config[PCI_DEVICE_ID + 1] = SVGA_PCI_DEVICE_ID >> 8; + s->card.config[PCI_COMMAND] = 0x07; /* I/O + Memory */ + s->card.config[PCI_CLASS_DEVICE] = PCI_CLASS_SUB_VGA; + s->card.config[0x0b] = PCI_CLASS_BASE_DISPLAY; + s->card.config[0x0c] = 0x08; /* Cache line size */ + s->card.config[0x0d] = 0x40; /* Latency timer */ + s->card.config[0x0e] = PCI_CLASS_HEADERTYPE_00h; + s->card.config[0x10] = ((SVGA_IO_BASE >> 0) & 0xff) | 1; + s->card.config[0x11] = (SVGA_IO_BASE >> 8) & 0xff; + s->card.config[0x12] = (SVGA_IO_BASE >> 16) & 0xff; + s->card.config[0x13] = (SVGA_IO_BASE >> 24) & 0xff; + s->card.config[0x18] = (SVGA_MEM_BASE >> 0) & 0xff; + s->card.config[0x19] = (SVGA_MEM_BASE >> 8) & 0xff; + s->card.config[0x1a] = (SVGA_MEM_BASE >> 16) & 0xff; + s->card.config[0x1b] = (SVGA_MEM_BASE >> 24) & 0xff; + s->card.config[0x2c] = PCI_VENDOR_ID_VMWARE & 0xff; + s->card.config[0x2d] = PCI_VENDOR_ID_VMWARE >> 8; + s->card.config[0x2e] = SVGA_PCI_DEVICE_ID & 0xff; + s->card.config[0x2f] = SVGA_PCI_DEVICE_ID >> 8; + s->card.config[0x3c] = 0xff; /* End */ + + vmsvga_init(&s->chip, ds, vga_ram_base, vga_ram_offset, vga_ram_size); + + register_savevm("vmware_vga", 0, 0, pci_vmsvga_save, pci_vmsvga_load, s); +} @@ -44,6 +44,9 @@ static int width, height; static SDL_Cursor *sdl_cursor_normal; static SDL_Cursor *sdl_cursor_hidden; static int absolute_enabled = 0; +static int guest_cursor = 0; +static int guest_x, guest_y; +static SDL_Cursor *guest_sprite = 0; static void sdl_update(DisplayState *ds, int x, int y, int w, int h) { @@ -245,13 +248,21 @@ static void sdl_show_cursor(void) { if (!kbd_mouse_is_absolute()) { SDL_ShowCursor(1); - SDL_SetCursor(sdl_cursor_normal); + if (guest_cursor && + (gui_grab || kbd_mouse_is_absolute() || absolute_enabled)) + SDL_SetCursor(guest_sprite); + else + SDL_SetCursor(sdl_cursor_normal); } } static void sdl_grab_start(void) { - sdl_hide_cursor(); + if (guest_cursor) { + SDL_SetCursor(guest_sprite); + SDL_WarpMouse(guest_x, guest_y); + } else + sdl_hide_cursor(); SDL_WM_GrabInput(SDL_GRAB_ON); /* dummy read to avoid moving the mouse */ SDL_GetRelativeMouseState(NULL, NULL); @@ -262,8 +273,8 @@ static void sdl_grab_start(void) static void sdl_grab_end(void) { SDL_WM_GrabInput(SDL_GRAB_OFF); - sdl_show_cursor(); gui_grab = 0; + sdl_show_cursor(); sdl_update_caption(); } @@ -294,6 +305,12 @@ static void sdl_send_mouse_event(int dz) } else if (absolute_enabled) { sdl_show_cursor(); absolute_enabled = 0; + } else if (guest_cursor) { + SDL_GetMouseState(&dx, &dy); + dx -= guest_x; + dy -= guest_y; + guest_x += dx; + guest_y += dy; } kbd_mouse_event(dx, dy, dz, buttons); @@ -472,8 +489,77 @@ static void sdl_refresh(DisplayState *ds) } } +static void sdl_fill(DisplayState *ds, int x, int y, int w, int h, uint32_t c) +{ + SDL_Rect dst = { x, y, w, h }; + SDL_FillRect(screen, &dst, c); +} + +static void sdl_mouse_warp(int x, int y, int on) +{ + if (on) { + if (!guest_cursor) + sdl_show_cursor(); + if (gui_grab || kbd_mouse_is_absolute() || absolute_enabled) { + SDL_SetCursor(guest_sprite); + SDL_WarpMouse(x, y); + } + } else if (gui_grab) + sdl_hide_cursor(); + guest_cursor = on; + guest_x = x, guest_y = y; +} + +static void sdl_mouse_define(int width, int height, int bpp, + int hot_x, int hot_y, + uint8_t *image, uint8_t *mask) +{ + uint8_t sprite[256], *line; + int x, y, dst, bypl, src = 0; + if (guest_sprite) + SDL_FreeCursor(guest_sprite); + + memset(sprite, 0, 256); + bypl = ((width * bpp + 31) >> 5) << 2; + for (y = 0, dst = 0; y < height; y ++, image += bypl) { + line = image; + for (x = 0; x < width; x ++, dst ++) { + switch (bpp) { + case 24: + src = *(line ++); src |= *(line ++); src |= *(line ++); + break; + case 16: + case 15: + src = *(line ++); src |= *(line ++); + break; + case 8: + src = *(line ++); + break; + case 4: + src = 0xf & (line[x >> 1] >> ((x & 1)) << 2); + break; + case 2: + src = 3 & (line[x >> 2] >> ((x & 3)) << 1); + break; + case 1: + src = 1 & (line[x >> 3] >> (x & 7)); + break; + } + if (!src) + sprite[dst >> 3] |= (1 << (~dst & 7)) & mask[dst >> 3]; + } + } + guest_sprite = SDL_CreateCursor(sprite, mask, width, height, hot_x, hot_y); + + if (guest_cursor && + (gui_grab || kbd_mouse_is_absolute() || absolute_enabled)) + SDL_SetCursor(guest_sprite); +} + static void sdl_cleanup(void) { + if (guest_sprite) + SDL_FreeCursor(guest_sprite); SDL_Quit(); } @@ -510,6 +596,9 @@ void sdl_display_init(DisplayState *ds, int full_screen, int no_frame) ds->dpy_update = sdl_update; ds->dpy_resize = sdl_resize; ds->dpy_refresh = sdl_refresh; + ds->dpy_fill = sdl_fill; + ds->mouse_set = sdl_mouse_warp; + ds->cursor_define = sdl_mouse_define; sdl_resize(ds, 640, 400); sdl_update_caption(); @@ -154,6 +154,7 @@ QEMUTimer *gui_timer; int vm_running; int rtc_utc = 1; int cirrus_vga_enabled = 1; +int vmsvga_enabled = 0; #ifdef TARGET_SPARC int graphic_width = 1024; int graphic_height = 768; @@ -543,6 +544,10 @@ int kbd_mouse_is_absolute(void) return qemu_put_mouse_event_current->qemu_put_mouse_event_absolute; } +void (*kbd_mouse_set)(int x, int y, int on) = NULL; +void (*kbd_cursor_define)(int width, int height, int bpp, int hot_x, int hot_y, + uint8_t *image, uint8_t *mask) = NULL; + void do_info_mice(void) { QEMUPutMouseEntry *cursor; @@ -6509,6 +6514,7 @@ enum { QEMU_OPTION_k, QEMU_OPTION_localtime, QEMU_OPTION_cirrusvga, + QEMU_OPTION_vmsvga, QEMU_OPTION_g, QEMU_OPTION_std_vga, QEMU_OPTION_echr, @@ -6616,6 +6622,7 @@ const QEMUOption qemu_options[] = { /* temporary options */ { "usb", 0, QEMU_OPTION_usb }, { "cirrusvga", 0, QEMU_OPTION_cirrusvga }, + { "vmwarevga", 0, QEMU_OPTION_vmsvga }, { "no-acpi", 0, QEMU_OPTION_no_acpi }, { "no-reboot", 0, QEMU_OPTION_no_reboot }, { "daemonize", 0, QEMU_OPTION_daemonize }, @@ -7184,9 +7191,15 @@ int main(int argc, char **argv) break; case QEMU_OPTION_cirrusvga: cirrus_vga_enabled = 1; + vmsvga_enabled = 0; + break; + case QEMU_OPTION_vmsvga: + cirrus_vga_enabled = 0; + vmsvga_enabled = 1; break; case QEMU_OPTION_std_vga: cirrus_vga_enabled = 0; + vmsvga_enabled = 0; break; case QEMU_OPTION_g: { @@ -149,6 +149,7 @@ extern int ram_size; extern int bios_size; extern int rtc_utc; extern int cirrus_vga_enabled; +extern int vmsvga_enabled; extern int graphic_width; extern int graphic_height; extern int graphic_depth; @@ -903,7 +904,13 @@ struct DisplayState { void (*dpy_update)(struct DisplayState *s, int x, int y, int w, int h); void (*dpy_resize)(struct DisplayState *s, int w, int h); void (*dpy_refresh)(struct DisplayState *s); - void (*dpy_copy)(struct DisplayState *s, int src_x, int src_y, int dst_x, int dst_y, int w, int h); + void (*dpy_copy)(struct DisplayState *s, int src_x, int src_y, + int dst_x, int dst_y, int w, int h); + void (*dpy_fill)(struct DisplayState *s, int x, int y, + int w, int h, uint32_t c); + 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); }; static inline void dpy_update(DisplayState *s, int x, int y, int w, int h) @@ -928,6 +935,10 @@ void pci_cirrus_vga_init(PCIBus *bus, DisplayState *ds, uint8_t *vga_ram_base, void isa_cirrus_vga_init(DisplayState *ds, uint8_t *vga_ram_base, unsigned long vga_ram_offset, int vga_ram_size); +/* vmware_vga.c */ +void pci_vmsvga_init(PCIBus *bus, DisplayState *ds, uint8_t *vga_ram_base, + unsigned long vga_ram_offset, int vga_ram_size); + /* sdl.c */ void sdl_display_init(DisplayState *ds, int full_screen, int no_frame); |