pvfb: Add offset in resize event

Also support depth change.

Signed-off-by: Samuel Thibault <samuel.thibault@eu.citrix.com>

diff --git a/tools/ioemu/hw/xenfb.c b/tools/ioemu/hw/xenfb.c
index 0ea088580ae468ec8b122fa2a8e92bf38238a0ec..b6995523618868443fe7638088fe6d9041513a87 100644 (file)
--- a/tools/ioemu/hw/xenfb.c
+++ b/tools/ioemu/hw/xenfb.c
@@ -56,6 +56,7 @@ struct xenfb {
        int depth;              /* colour depth of guest framebuffer */
        int width;              /* pixel width of guest framebuffer */
        int height;             /* pixel height of guest framebuffer */
+       int offset;             /* offset of the framebuffer */
        int abs_pointer_wanted; /* Whether guest supports absolute pointer */
        int button_state;       /* Last seen pointer button state */
        char protocol[64];      /* frontend protocol */
@@ -519,11 +520,13 @@ static void xenfb_on_fb_event(struct xenfb *xenfb)
                case XENFB_TYPE_RESIZE:
                        xenfb->width  = event->resize.width;
                        xenfb->height = event->resize.height;
+                       xenfb->depth = event->resize.depth;
                        xenfb->row_stride = event->resize.stride;
+                       xenfb->offset = event->resize.offset;
                        dpy_colourdepth(xenfb->ds, xenfb->depth);
                        dpy_resize(xenfb->ds, xenfb->width, xenfb->height, xenfb->row_stride);
                        if (xenfb->ds->shared_buf)
-                               dpy_setdata(xenfb->ds, xenfb->pixels);
+                               dpy_setdata(xenfb->ds, xenfb->pixels + xenfb->offset);
                        xenfb_invalidate(xenfb);
                        break;
                }
@@ -1105,6 +1108,7 @@ static void xenfb_mouse_event(void *opaque,
 #define BLT(SRC_T,DST_T,RSB,GSB,BSB,RDB,GDB,BDB)                        \
     for (line = y ; line < (y+h) ; line++) {                            \
         SRC_T *src = (SRC_T *)(xenfb->pixels                            \
+                               + xenfb->offset                          \
                                + (line * xenfb->row_stride)             \
                                + (x * xenfb->depth / 8));               \
         DST_T *dst = (DST_T *)(xenfb->ds->data                                 \
@@ -1147,7 +1151,7 @@ static void xenfb_guest_copy(struct xenfb *xenfb, int x, int y, int w, int h)
         if (xenfb->depth == xenfb->ds->depth) { /* Perfect match can use fast path */
             for (line = y ; line < (y+h) ; line++) {
                 memcpy(xenfb->ds->data + (line * xenfb->ds->linesize) + (x * xenfb->ds->depth / 8),
-                        xenfb->pixels + (line * xenfb->row_stride) + (x * xenfb->depth / 8),
+                        xenfb->pixels + xenfb->offset + (line * xenfb->row_stride) + (x * xenfb->depth / 8),
                         w * xenfb->depth / 8);
             }
         } else { /* Mismatch requires slow pixel munging */

diff --git a/xen/include/public/io/fbif.h b/xen/include/public/io/fbif.h
index d27cfa091a93953af71f273856819f0c34923731..aecd1cd8106462437a4f02764418e1003b2921d7 100644 (file)
--- a/xen/include/public/io/fbif.h
+++ b/xen/include/public/io/fbif.h
@@ -63,6 +63,7 @@ struct xenfb_resize
     int32_t height;  /* height in pixels */
     int32_t stride;  /* stride in bytes */
     int32_t depth;   /* depth in bits */
+    int32_t offset;  /* offset of the framebuffer in bytes */
 };
 
 #define XENFB_OUT_EVENT_SIZE 40