diff options
author | Alexander Larsson <alexl@redhat.com> | 2010-04-19 16:19:43 +0200 |
---|---|---|
committer | Alexander Larsson <alexl@redhat.com> | 2010-04-23 16:36:35 +0200 |
commit | 98d91203c5d2f6f7249f38941466857b6a566f5d (patch) | |
tree | cdc2b54152f0be3d668ed49b903a35886fcc1c99 /client/red_gdi_canvas.h | |
parent | 619c37af17406f77c7cb76f3b72bbfc268383d91 (diff) | |
download | spice-98d91203c5d2f6f7249f38941466857b6a566f5d.tar.gz spice-98d91203c5d2f6f7249f38941466857b6a566f5d.tar.xz spice-98d91203c5d2f6f7249f38941466857b6a566f5d.zip |
Make client canvas and pixmaps handle more formats and simplify
We now support 16bit format pixmaps as well as the old ones. Including
both 555 and 565 modes.
We drop the palette argument for pixmap construction as it was only
used for black/white anyway.
Canvas creation is simplified so that there is no separate set_mode
state. Canvases are already created in the right mode and never change.
Diffstat (limited to 'client/red_gdi_canvas.h')
-rw-r--r-- | client/red_gdi_canvas.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/client/red_gdi_canvas.h b/client/red_gdi_canvas.h index d117282b..643f3c6c 100644 --- a/client/red_gdi_canvas.h +++ b/client/red_gdi_canvas.h @@ -27,11 +27,11 @@ class RedPixmap; class GDICanvas: public Canvas { public: - GDICanvas(PixmapCache& pixmap_cache, PaletteCache& palette_cache, + GDICanvas(int width, int height, uint32_t format, + PixmapCache& pixmap_cache, PaletteCache& palette_cache, GlzDecoderWindow &glz_decoder_window, CSurfaces &csurfaces); virtual ~GDICanvas(); - virtual void set_mode(int x, int y, int bits); virtual void thread_touch() {} virtual void copy_pixels(const QRegion& region, RedDrawable* dc, const PixmapHeader* pixmap); @@ -40,11 +40,6 @@ public: virtual CanvasType get_pixmap_type(); private: - void create_pixmap(int width, int height); - void destroy_pixmap(); - void destroy(); - -private: RedPixmapGdi *_pixmap; RedPixmapGdi *_helper_pixmap; HDC _dc; |