From patchwork Fri Mar 1 09:00:39 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 224261 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 8B6BA2C029C for ; Fri, 1 Mar 2013 20:06:06 +1100 (EST) Received: from localhost ([::1]:58469 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UBLum-0003Sw-F7 for incoming@patchwork.ozlabs.org; Fri, 01 Mar 2013 04:06:04 -0500 Received: from eggs.gnu.org ([208.118.235.92]:43623) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UBLpn-0003ph-Nv for qemu-devel@nongnu.org; Fri, 01 Mar 2013 04:01:02 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UBLph-00032F-Um for qemu-devel@nongnu.org; Fri, 01 Mar 2013 04:00:55 -0500 Received: from mx1.redhat.com ([209.132.183.28]:50905) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UBLpg-00031d-U4 for qemu-devel@nongnu.org; Fri, 01 Mar 2013 04:00:49 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r2190mRA008260 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 1 Mar 2013 04:00:48 -0500 Received: from rincewind.home.kraxel.org (ovpn-116-72.ams2.redhat.com [10.36.116.72]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r2190ksf028858; Fri, 1 Mar 2013 04:00:47 -0500 Received: by rincewind.home.kraxel.org (Postfix, from userid 500) id 1119840D0D; Fri, 1 Mar 2013 10:00:44 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Fri, 1 Mar 2013 10:00:39 +0100 Message-Id: <1362128443-15687-9-git-send-email-kraxel@redhat.com> In-Reply-To: <1362128443-15687-1-git-send-email-kraxel@redhat.com> References: <1362128443-15687-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Anthony Liguori , Gerd Hoffmann Subject: [Qemu-devel] [RfC PATCH 08/12] console: rework DisplaySurface handling [dcl/ui side] X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Replace the dpy_gfx_resize and dpy_gfx_setdata DisplayChangeListener callbacks with a dpy_gfx_switch callback which notifies the ui code when the framebuffer backing storage changes. Signed-off-by: Gerd Hoffmann --- hw/qxl.c | 9 +++++---- include/ui/console.h | 7 +++---- include/ui/spice-display.h | 3 ++- ui/console.c | 8 ++++---- ui/gtk.c | 15 ++++++++------- ui/sdl.c | 10 +++++----- ui/spice-display.c | 12 +++++++----- ui/vnc.c | 21 +++++---------------- 8 files changed, 39 insertions(+), 46 deletions(-) diff --git a/hw/qxl.c b/hw/qxl.c index 8177008..1ec03a5 100644 --- a/hw/qxl.c +++ b/hw/qxl.c @@ -1875,13 +1875,14 @@ static void display_update(DisplayChangeListener *dcl, } } -static void display_resize(DisplayChangeListener *dcl, - struct DisplayState *ds) +static void display_switch(DisplayChangeListener *dcl, + struct DisplayState *ds, + struct DisplaySurface *surface) { PCIQXLDevice *qxl = container_of(dcl, PCIQXLDevice, ssd.dcl); if (qxl->mode == QXL_MODE_VGA) { - qemu_spice_display_resize(&qxl->ssd); + qemu_spice_display_switch(&qxl->ssd, surface); } } @@ -1902,7 +1903,7 @@ static void display_refresh(DisplayChangeListener *dcl, static DisplayChangeListenerOps display_listener_ops = { .dpy_name = "spice/qxl", .dpy_gfx_update = display_update, - .dpy_gfx_resize = display_resize, + .dpy_gfx_switch = display_switch, .dpy_refresh = display_refresh, }; diff --git a/include/ui/console.h b/include/ui/console.h index bbf3b1d..f15a541 100644 --- a/include/ui/console.h +++ b/include/ui/console.h @@ -156,10 +156,9 @@ typedef struct DisplayChangeListenerOps { void (*dpy_gfx_update)(DisplayChangeListener *dcl, struct DisplayState *s, int x, int y, int w, int h); - void (*dpy_gfx_resize)(DisplayChangeListener *dcl, - struct DisplayState *s); - void (*dpy_gfx_setdata)(DisplayChangeListener *dcl, - struct DisplayState *s); + void (*dpy_gfx_switch)(DisplayChangeListener *dcl, + struct DisplayState *s, + struct DisplaySurface *new_surface); void (*dpy_gfx_copy)(DisplayChangeListener *dcl, struct DisplayState *s, int src_x, int src_y, int dst_x, int dst_y, int w, int h); diff --git a/include/ui/spice-display.h b/include/ui/spice-display.h index f2752aa..82f8246 100644 --- a/include/ui/spice-display.h +++ b/include/ui/spice-display.h @@ -117,7 +117,8 @@ void qemu_spice_display_init_common(SimpleSpiceDisplay *ssd, DisplayState *ds); void qemu_spice_display_update(SimpleSpiceDisplay *ssd, int x, int y, int w, int h); -void qemu_spice_display_resize(SimpleSpiceDisplay *ssd); +void qemu_spice_display_switch(SimpleSpiceDisplay *ssd, + DisplaySurface *surface); void qemu_spice_display_refresh(SimpleSpiceDisplay *ssd); void qemu_spice_cursor_refresh_unlocked(SimpleSpiceDisplay *ssd); diff --git a/ui/console.c b/ui/console.c index 54c7bf3..461cda8 100644 --- a/ui/console.c +++ b/ui/console.c @@ -1372,8 +1372,8 @@ void register_displaychangelistener(DisplayState *ds, dcl->ds = ds; QLIST_INSERT_HEAD(&ds->listeners, dcl, next); gui_setup_refresh(ds); - if (dcl->ops->dpy_gfx_resize) { - dcl->ops->dpy_gfx_resize(dcl, ds); + if (dcl->ops->dpy_gfx_switch) { + dcl->ops->dpy_gfx_switch(dcl, ds, ds->surface); } } @@ -1413,8 +1413,8 @@ void dpy_gfx_replace_surface(DisplayState *s, s->surface = surface; QLIST_FOREACH(dcl, &s->listeners, next) { - if (dcl->ops->dpy_gfx_resize) { - dcl->ops->dpy_gfx_resize(dcl, s); + if (dcl->ops->dpy_gfx_switch) { + dcl->ops->dpy_gfx_switch(dcl, s, surface); } } qemu_free_displaysurface(old_surface); diff --git a/ui/gtk.c b/ui/gtk.c index fe58494..abef1ca 100644 --- a/ui/gtk.c +++ b/ui/gtk.c @@ -266,8 +266,9 @@ static void gd_refresh(DisplayChangeListener *dcl, vga_hw_update(); } -static void gd_resize(DisplayChangeListener *dcl, - DisplayState *ds) +static void gd_switch(DisplayChangeListener *dcl, + DisplayState *ds, + DisplaySurface *surface) { GtkDisplayState *s = container_of(dcl, GtkDisplayState, dcl); cairo_format_t kind; @@ -738,7 +739,7 @@ static void gd_menu_zoom_in(GtkMenuItem *item, void *opaque) s->scale_x += .25; s->scale_y += .25; - gd_resize(&s->dcl, s->ds); + gd_switch(&s->dcl, s->ds, s->ds->surface); } static void gd_menu_zoom_out(GtkMenuItem *item, void *opaque) @@ -754,7 +755,7 @@ static void gd_menu_zoom_out(GtkMenuItem *item, void *opaque) s->scale_x = MAX(s->scale_x, .25); s->scale_y = MAX(s->scale_y, .25); - gd_resize(&s->dcl, s->ds); + gd_switch(&s->dcl, s->ds, s->ds->surface); } static void gd_menu_zoom_fixed(GtkMenuItem *item, void *opaque) @@ -764,7 +765,7 @@ static void gd_menu_zoom_fixed(GtkMenuItem *item, void *opaque) s->scale_x = 1.0; s->scale_y = 1.0; - gd_resize(&s->dcl, s->ds); + gd_switch(&s->dcl, s->ds, s->ds->surface); } static void gd_menu_zoom_fit(GtkMenuItem *item, void *opaque) @@ -778,7 +779,7 @@ static void gd_menu_zoom_fit(GtkMenuItem *item, void *opaque) s->free_scale = FALSE; } - gd_resize(&s->dcl, s->ds); + gd_switch(&s->dcl, s->ds, s->ds->surface); gdk_drawable_get_size(gtk_widget_get_window(s->drawing_area), &ww, &wh); gtk_widget_queue_draw_area(s->drawing_area, 0, 0, ww, wh); @@ -1287,7 +1288,7 @@ static void gd_create_menus(GtkDisplayState *s) static const DisplayChangeListenerOps dcl_ops = { .dpy_name = "gtk", .dpy_gfx_update = gd_update, - .dpy_gfx_resize = gd_resize, + .dpy_gfx_switch = gd_switch, .dpy_refresh = gd_refresh, }; diff --git a/ui/sdl.c b/ui/sdl.c index fc4dc1b..85eefdf 100644 --- a/ui/sdl.c +++ b/ui/sdl.c @@ -117,8 +117,9 @@ static void do_sdl_resize(int width, int height, int bpp) } } -static void sdl_resize(DisplayChangeListener *dcl, - DisplayState *ds) +static void sdl_switch(DisplayChangeListener *dcl, + DisplayState *ds, + DisplaySurface *surface) { if (!scaling_active) { do_sdl_resize(ds_get_width(ds), ds_get_height(ds), 0); @@ -513,7 +514,7 @@ static void handle_keydown(DisplayState *ds, SDL_Event *ev) case 0x16: /* 'u' key on US keyboard */ if (scaling_active) { scaling_active = 0; - sdl_resize(dcl, ds); + sdl_switch(dcl, ds, ds->surface); vga_hw_invalidate(); vga_hw_update(); } @@ -856,9 +857,8 @@ static void sdl_cleanup(void) static const DisplayChangeListenerOps dcl_ops = { .dpy_name = "sdl", .dpy_gfx_update = sdl_update, - .dpy_gfx_resize = sdl_resize, + .dpy_gfx_switch = sdl_switch, .dpy_refresh = sdl_refresh, - .dpy_gfx_setdata = sdl_setdata, .dpy_mouse_set = sdl_mouse_warp, .dpy_cursor_define = sdl_mouse_define, }; diff --git a/ui/spice-display.c b/ui/spice-display.c index b2bda23..cc2a78e 100644 --- a/ui/spice-display.c +++ b/ui/spice-display.c @@ -367,7 +367,8 @@ void qemu_spice_display_update(SimpleSpiceDisplay *ssd, qemu_spice_rect_union(&ssd->dirty, &update_area); } -void qemu_spice_display_resize(SimpleSpiceDisplay *ssd) +void qemu_spice_display_switch(SimpleSpiceDisplay *ssd, + DisplaySurface *surface) { SimpleSpiceUpdate *update; @@ -589,11 +590,12 @@ static void display_update(DisplayChangeListener *dcl, qemu_spice_display_update(ssd, x, y, w, h); } -static void display_resize(DisplayChangeListener *dcl, - struct DisplayState *ds) +static void display_switch(DisplayChangeListener *dcl, + struct DisplayState *ds, + struct DisplaySurface *surface) { SimpleSpiceDisplay *ssd = container_of(dcl, SimpleSpiceDisplay, dcl); - qemu_spice_display_resize(ssd); + qemu_spice_display_switch(ssd, surface); } static void display_refresh(DisplayChangeListener *dcl, @@ -606,7 +608,7 @@ static void display_refresh(DisplayChangeListener *dcl, static const DisplayChangeListenerOps display_listener_ops = { .dpy_name = "spice", .dpy_gfx_update = display_update, - .dpy_gfx_resize = display_resize, + .dpy_gfx_switch = display_switch, .dpy_refresh = display_refresh, }; diff --git a/ui/vnc.c b/ui/vnc.c index a6111d6..f8398c3 100644 --- a/ui/vnc.c +++ b/ui/vnc.c @@ -574,8 +574,9 @@ void *vnc_server_fb_ptr(VncDisplay *vd, int x, int y) return ptr; } -static void vnc_dpy_resize(DisplayChangeListener *dcl, - DisplayState *ds) +static void vnc_dpy_switch(DisplayChangeListener *dcl, + DisplayState *ds, + DisplaySurface *surface) { VncDisplay *vd = container_of(dcl, VncDisplay, dcl); VncState *vs; @@ -1981,17 +1982,6 @@ static void pixel_format_message (VncState *vs) { vs->write_pixels = vnc_write_pixels_copy; } -static void vnc_dpy_setdata(DisplayChangeListener *dcl, - DisplayState *ds) -{ - VncDisplay *vd = container_of(dcl, VncDisplay, dcl); - - qemu_pixman_image_unref(vd->guest.fb); - vd->guest.fb = pixman_image_ref(ds->surface->image); - vd->guest.format = ds->surface->format; - vnc_dpy_update(dcl, ds, 0, 0, ds_get_width(ds), ds_get_height(ds)); -} - static void vnc_colordepth(VncState *vs) { if (vnc_has_feature(vs, VNC_FEATURE_WMVI)) { @@ -2696,7 +2686,7 @@ static void vnc_init_timer(VncDisplay *vd) vd->timer_interval = VNC_REFRESH_INTERVAL_BASE; if (vd->timer == NULL && !QTAILQ_EMPTY(&vd->clients)) { vd->timer = qemu_new_timer_ms(rt_clock, vnc_refresh, vd); - vnc_dpy_resize(&vd->dcl, vd->ds); + vnc_dpy_switch(&vd->dcl, vd->ds, vd->ds->surface); vnc_refresh(vd); } } @@ -2836,8 +2826,7 @@ static const DisplayChangeListenerOps dcl_ops = { .dpy_name = "vnc", .dpy_gfx_copy = vnc_dpy_copy, .dpy_gfx_update = vnc_dpy_update, - .dpy_gfx_resize = vnc_dpy_resize, - .dpy_gfx_setdata = vnc_dpy_setdata, + .dpy_gfx_switch = vnc_dpy_switch, .dpy_mouse_set = vnc_mouse_set, .dpy_cursor_define = vnc_dpy_cursor_define, };