DisplayState interface change
PATCH 1/1 DisplayState interface change
Import "DisplayState interface change" from qemu mainstream: the patch has been adapted to qemu-xen and merged with several following fixes.
The original qemu svn commit is the following:
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6336 c046a42c-6fe2-441c-8c8c-71466251a162
Signed-off-by Stefano Stabellini <[email protected]>
---
console.c +189 -37
@@ -1000,20 +1000,16 @@if (index >=MAX_CONSOLES )return ; + active_console->g_width =ds_get_width (active_console->ds); + active_console->g_height =ds_get_height (active_console->ds); s = consoles[index];if (s) { +DisplayState *ds = s->ds; active_console = s; -if (s->console_type ==TEXT_CONSOLE ) { -if (s->g_width != s->ds->width || - s->g_height != s->ds->height) { - s->g_width = s->ds->width; - s->g_height = s->ds->height; -text_console_resize (s); - } -console_refresh (s); - }else { -vga_hw_invalidate (); - } + ds->surface =qemu_resize_displaysurface (ds->surface, s->g_width, + s->g_height,32 ,4 * s->g_width); +dpy_resize (s->ds); +vga_hw_invalidate (); } }
@@ -1121,15 +1117,6 @@ {TextConsole *s = (TextConsole *) opaque; -if (s->g_width !=ds_get_width (s->ds) || s->g_height !=ds_get_height (s->ds)) { -if (s->console_type ==TEXT_CONSOLE_FIXED_SIZE ) -dpy_resize (s->ds, s->g_width, s->g_height); -else { - s->g_width =ds_get_width (s->ds); - s->g_height =ds_get_height (s->ds); -text_console_resize (s); - } - }console_refresh (s); }
@@ -1263,8 +1250,8 @@ s->total_height =DEFAULT_BACKSCROLL ; s->x =0 ; s->y =0 ; - s->g_width = s->ds->width; - s->g_height = s->ds->height; + s->g_width =ds_get_width (s->ds); + s->g_height =ds_get_height (s->ds);/* Set text attribute defaults */ s->t_attrib_default.bold =0 ;
@@ -1286,26 +1273,191 @@void qemu_console_resize (QEMUConsole *console,int width,int height) { -if (console->g_width != width || console->g_height != height - || !ds_get_data (console->ds)) { - console->g_width = width; - console->g_height = height; -if (active_console == console) { -dpy_resize (console->ds, width, height); - } + console->g_width = width; + console->g_height = height; +if (active_console == console) { +DisplayState *ds = console->ds; + ds->surface =qemu_resize_displaysurface (ds->surface, width, height,32 ,4 * width); +dpy_resize (console->ds); } }void qemu_console_copy (QEMUConsole *console,int src_x,int src_y,int dst_x,int dst_y,int w,int h) { -if (active_console == console) { -if (console->ds->dpy_copy) - console->ds->dpy_copy (console->ds, - src_x, src_y, dst_x, dst_y, w, h); -else { -/* TODO */ - console->ds->dpy_update (console->ds, dst_x, dst_y, w, h); - } +if (active_console == console) +dpy_copy (console->ds, src_x, src_y, dst_x, dst_y, w, h); +} + +PixelFormat qemu_different_endianness_pixelformat (int bpp) +{ +PixelFormat pf; + +memset (&pf,0x00 ,sizeof (PixelFormat)); + + pf.bits_per_pixel = bpp; + pf.bytes_per_pixel = bpp /8 ; + pf.depth = bpp ==32 ?24 : bpp; + +switch (bpp) { +case 24 : + pf.rmask =0x000000FF ; + pf.gmask =0x0000FF00 ; + pf.bmask =0x00FF0000 ; + pf.rmax =255 ; + pf.gmax =255 ; + pf.bmax =255 ; + pf.rshift =0 ; + pf.gshift =8 ; + pf.bshift =16 ; +break ; +case 32 : + pf.rmask =0x0000FF00 ; + pf.gmask =0x00FF0000 ; + pf.bmask =0xFF000000 ; + pf.amask =0x00000000 ; + pf.amax =255 ; + pf.rmax =255 ; + pf.gmax =255 ; + pf.bmax =255 ; + pf.ashift =0 ; + pf.rshift =8 ; + pf.gshift =16 ; + pf.bshift =24 ; +break ; +default : +break ; } +return pf; } + +PixelFormat qemu_default_pixelformat (int bpp) +{ +PixelFormat pf; + +memset (&pf,0x00 ,sizeof (PixelFormat)); + + pf.bits_per_pixel = bpp; + pf.bytes_per_pixel = bpp /8 ; + pf.depth = bpp ==32 ?24 : bpp; + +switch (bpp) { +case 16 : + pf.rmask =0x0000F800 ; + pf.gmask =0x000007E0 ; + pf.bmask =0x0000001F ; + pf.rmax =31 ; + pf.gmax =63 ; + pf.bmax =31 ; + pf.rshift =11 ; + pf.gshift =5 ; + pf.bshift =0 ; +break ; +case 24 : + pf.rmask =0x00FF0000 ; + pf.gmask =0x0000FF00 ; + pf.bmask =0x000000FF ; + pf.rmax =255 ; + pf.gmax =255 ; + pf.bmax =255 ; + pf.rshift =16 ; + pf.gshift =8 ; + pf.bshift =0 ; +case 32 : + pf.rmask =0x00FF0000 ; + pf.gmask =0x0000FF00 ; + pf.bmask =0x000000FF ; + pf.amax =255 ; + pf.rmax =255 ; + pf.gmax =255 ; + pf.bmax =255 ; + pf.ashift =24 ; + pf.rshift =16 ; + pf.gshift =8 ; + pf.bshift =0 ; +break ; +default : +break ; + } +return pf; +} + +DisplaySurface *qemu_create_displaysurface (int width,int height,int bpp,int linesize) +{ +DisplaySurface *surface = (DisplaySurface *)qemu_mallocz (sizeof (DisplaySurface)); +if (surface ==NULL ) { +fprintf (stderr,"qemu_create_displaysurface: malloc failed\n" ); +exit (1 ); + } + + surface->width = width; + surface->height = height; + surface->linesize = linesize; + surface->pf =qemu_default_pixelformat (bpp); +#ifdef WORDS_BIGENDIAN + surface->flags =QEMU_ALLOCATED_FLAG |QEMU_BIG_ENDIAN_FLAG ; +#else + surface->flags =QEMU_ALLOCATED_FLAG ; +#endif + surface->data = (uint8_t *)qemu_mallocz (surface->linesize * surface->height); +if (surface->data ==NULL ) { +fprintf (stderr,"qemu_create_displaysurface: malloc failed\n" ); +exit (1 ); + } + +return surface; +} + +DisplaySurface *qemu_resize_displaysurface (DisplaySurface *surface, +int width,int height,int bpp,int linesize) +{ + surface->width = width; + surface->height = height; + surface->linesize = linesize; + surface->pf =qemu_default_pixelformat (bpp); +if (surface->flags &QEMU_ALLOCATED_FLAG ) + surface->data = (uint8_t *)qemu_realloc (surface->data, surface->linesize * surface->height); +else + surface->data = (uint8_t *)qemu_malloc (surface->linesize * surface->height); +if (surface->data ==NULL ) { +fprintf (stderr,"qemu_resize_displaysurface: malloc failed\n" ); +exit (1 ); + } +#ifdef WORDS_BIGENDIAN + surface->flags =QEMU_ALLOCATED_FLAG |QEMU_BIG_ENDIAN_FLAG ; +#else + surface->flags =QEMU_ALLOCATED_FLAG ; +#endif + +return surface; +} + +DisplaySurface *qemu_create_displaysurface_from (int width,int height,int bpp, +int linesize,uint8_t *data) +{ +DisplaySurface *surface = (DisplaySurface *)qemu_mallocz (sizeof (DisplaySurface)); +if (surface ==NULL ) { +fprintf (stderr,"qemu_create_displaysurface_from: malloc failed\n" ); +exit (1 ); + } + + surface->width = width; + surface->height = height; + surface->linesize = linesize; + surface->pf =qemu_default_pixelformat (bpp); +#ifdef WORDS_BIGENDIAN + surface->flags =QEMU_BIG_ENDIAN_FLAG ; +#endif + surface->data = data; + +return surface; +} + +void qemu_free_displaysurface (DisplaySurface *surface) +{ +if (surface ==NULL ) +return ; +if (surface->flags &QEMU_ALLOCATED_FLAG ) +qemu_free (surface->data); +qemu_free (surface); +}
console.h +117 -27
197 lines not on this page · raw message
curses.c +20 -18
@@ -97,13 +97,13 @@ } } -static void curses_resize (DisplayState *ds,int w,int h) +static void curses_resize (DisplayState *ds) { -if (w == gwidth && h == gheight) +if (ds_get_width (ds) == gwidth &&ds_get_height (ds) == gheight)return ; - gwidth = w; - gheight = h; + gwidth =ds_get_width (ds); + gheight =ds_get_height (ds);curses_calc_pad (); }
@@ -169,8 +169,8 @@clear ();refresh ();curses_calc_pad (); - ds->width =FONT_WIDTH * width; - ds->height =FONT_HEIGHT * height; + ds->surface->width =FONT_WIDTH * width; + ds->surface->height =FONT_HEIGHT * height;vga_hw_invalidate (); invalidate =0 ; }
@@ -197,8 +197,8 @@refresh ();curses_calc_pad ();curses_update (ds,0 ,0 , width, height); - ds->width =FONT_WIDTH * width; - ds->height =FONT_HEIGHT * height; + ds->surface->width =FONT_WIDTH * width; + ds->surface->height =FONT_HEIGHT * height; continue; }#endif
@@ -338,6 +338,7 @@void curses_display_init (DisplayState *ds,int full_screen) { +DisplayChangeListener *dcl;#ifndef _WIN32if (!isatty (1 )) {fprintf (stderr,"We need a terminal output\n" );
@@ -357,18 +358,19 @@#endif #endif - ds->data = (void *) screen; - ds->linesize =0 ; - ds->depth =0 ; - ds->width =640 ; - ds->height =400 ; - ds->dpy_update = curses_update; - ds->dpy_resize = curses_resize; - ds->dpy_refresh = curses_refresh; - ds->dpy_text_cursor = curses_cursor_position; + dcl = (DisplayChangeListener *)qemu_mallocz (sizeof (DisplayChangeListener)); +if (!dcl) +exit (1 ); + dcl->dpy_update = curses_update; + dcl->dpy_resize = curses_resize; + dcl->dpy_refresh = curses_refresh; + dcl->dpy_text_cursor = curses_cursor_position; +register_displaychangelistener (ds, dcl); +qemu_free_displaysurface (ds->surface); + ds->surface =qemu_create_displaysurface_from (80 ,25 ,0 ,0 , (uint8_t *) screen); invalidate =1 ;/* Standard VGA initial text mode dimensions */ -curses_resize (ds,80 ,25 ); +curses_resize (ds); }
hw/cirrus_vga.c +3 -20
@@ -794,26 +794,9 @@static int cirrus_bitblt_videotovideo_copy (CirrusVGAState * s) { -if (s->ds->dpy_copy) { -cirrus_do_copy (s, s->cirrus_blt_dstaddr - s->start_addr, - s->cirrus_blt_srcaddr - s->start_addr, - s->cirrus_blt_width, s->cirrus_blt_height); - }else { - -if (BLTUNSAFE (s)) -return 0 ; - - (*s->cirrus_rop) (s, s->vram_ptr + - (s->cirrus_blt_dstaddr & s->cirrus_addr_mask), - s->vram_ptr + - (s->cirrus_blt_srcaddr & s->cirrus_addr_mask), - s->cirrus_blt_dstpitch, s->cirrus_blt_srcpitch, - s->cirrus_blt_width, s->cirrus_blt_height); - -cirrus_invalidate_region (s, s->cirrus_blt_dstaddr, - s->cirrus_blt_dstpitch, s->cirrus_blt_width, - s->cirrus_blt_height); - } +cirrus_do_copy (s, s->cirrus_blt_dstaddr - s->start_addr, + s->cirrus_blt_srcaddr - s->start_addr, + s->cirrus_blt_width, s->cirrus_blt_height);return 1 ; }
hw/nseries.c +2 -1
@@ -1361,7 +1361,8 @@/* FIXME: We shouldn't really be doing this here. The LCD controller will set the size once configured, so this just sets an initial size until the guest activates the display. */ -dpy_resize (ds,800 ,480 ); + ds->surface =qemu_resize_displaysurface (ds->surface,800 ,480 ,32 ,4 *800 ); +dpy_resize (ds); }static struct arm_boot_info n800_binfo = {
hw/palm.c +2 -1
@@ -278,7 +278,8 @@/* FIXME: We shouldn't really be doing this here. The LCD controller will set the size once configured, so this just sets an initial size until the guest activates the display. */ -dpy_resize (ds,320 ,320 ); + ds->surface =qemu_resize_displaysurface (ds->surface,320 ,320 ,32 ,4 *320 ); +dpy_resize (ds); }QEMUMachine palmte_machine = {
hw/vga.c +69 -54
227 lines not on this page · raw message
hw/xenfb.c +20 -9
@@ -700,21 +700,30 @@ {struct XenFB *xenfb = opaque;int i; +struct DisplayChangeListener *l;if (xenfb->feature_update) {#ifdef XENFB_TYPE_REFRESH_PERIOD -int period; +int period =99999999 ; +int idle =1 ;if (xenfb_queue_full (xenfb))return ; -if (xenfb->c.ds->idle) - period =XENFB_NO_REFRESH ; -else { - period = xenfb->c.ds->gui_timer_interval; -if (!period) - period =GUI_REFRESH_INTERVAL ; - } +for (l = xenfb->c.ds->listeners; l !=NULL ; l = l->next) { +if (l->idle) +continue ; + idle =0 ; +if (!l->gui_timer_interval) { +if (period >GUI_REFRESH_INTERVAL ) + period =GUI_REFRESH_INTERVAL ; + }else { +if (period > l->gui_timer_interval) + period = l->gui_timer_interval; + } + } +if (idle) + period =XENFB_NO_REFRESH ;if (xenfb->refresh_period != period) {xenfb_send_refresh_period (xenfb, period);
@@ -733,7 +742,9 @@if (xenfb->width !=ds_get_width (xenfb->c.ds) || xenfb->height !=ds_get_height (xenfb->c.ds)) {xen_be_printf (&xenfb->c.xendev,1 ,"update: resizing: %dx%d\n" , xenfb->width, xenfb->height); -dpy_resize (xenfb->c.ds, xenfb->width, xenfb->height); + xenfb->c.ds->surface->width = xenfb->width; + xenfb->c.ds->surface->height = xenfb->height; +dpy_resize (xenfb->c.ds); xenfb->up_fullscreen =1 ; }
qemu-common.h +3 -0
@@ -131,6 +131,9 @@typedef struct AudioState AudioState ;typedef struct BlockDriverState BlockDriverState ;typedef struct DisplayState DisplayState ; +typedef struct DisplayChangeListener DisplayChangeListener ; +typedef struct DisplaySurface DisplaySurface ; +typedef struct PixelFormat PixelFormat ;typedef struct TextConsole TextConsole ;typedef TextConsole QEMUConsole ;typedef struct CharDriverState CharDriverState ;
sdl.c +82 -179
402 lines not on this page · raw message
vl.c +64 -42
182 lines not on this page · raw message
vnc.c +59 -135
399 lines not on this page · raw message
xenfbfront.c +25 -51
126 lines not on this page · raw message