pxcloud/spice
6
0
Fork 0
mirror of https://gitlab.uni-freiburg.de/opensourcevdi/spice synced 2026-08-10 18:53:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix up win32 client with recent changes

Browse Source
This commit is contained in:
Alexander Larsson 2010-04-23 16:35:31 +02:00
parent b2165b4d04
commit a1ec6e065a
3 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
client/red_gdi_canvas.cpp
View File

@ -31,12 +31,12 @@ GDICanvas::GDICanvas(int width, int height, uint32_t format,
{
_pixmap = new RedPixmapGdi(width, height,
RedDrawable::format_from_surface(format),
true, NULL);
true);
if (!(_canvas = gdi_canvas_create(width, height, _pixmap->get_dc(),
&_pixmap->get_mutex(),
depth, &pixmap_cache().base,
&palette_cache().base,
&csurfaces().base,
format, &pixmap_cache.base,
&palette_cache.base,
&csurfaces.base,
&glz_decoder()))) {
THROW("create canvas failed");
}
@ -44,8 +44,8 @@ GDICanvas::GDICanvas(int width, int height, uint32_t format,
GDICanvas::~GDICanvas()
{
_canvas->ops->destroy(_canvas);
_canvas = NULL;
_canvas->ops->destroy(_canvas);
_canvas = NULL;
delete _pixmap;
_pixmap = NULL;
}
@ -72,10 +72,6 @@ void GDICanvas::copy_pixels(const QRegion& region, RedDrawable* dest_dc, const P
copy_pixels(region, *dest_dc);
}
void GDICanvas::set_mode(int width, int height, int depth)
{
destroy();
}
CanvasType GDICanvas::get_pixmap_type()
{

2
client/windows/red_pixmap_gdi.cpp
View File

@ -30,7 +30,7 @@ struct RedPixmap_p {
};
RedPixmapGdi::RedPixmapGdi(int width, int height, RedDrawable::Format format, bool top_bottom)
: RedPixmap(width, height, format, top_bottom, pallet)
: RedPixmap(width, height, format, top_bottom )
{
ASSERT(format == RedDrawable::ARGB32 || format == RedDrawable::RGB32 || format == RedDrawable::A1);
ASSERT(sizeof(RedPixmap_p) <= PIXELES_SOURCE_OPAQUE_SIZE);

9
client/windows/red_window.cpp
View File

@ -364,6 +364,15 @@ void RedWindow_p::destroy(PixelsSource_p& pixels_source)
DestroyWindow(_win);
}
RedDrawable::Format RedWindow::get_format()
{
/* TODO: Windows will convert types when
blitting, so this works (and is what we did before).
but it would be better to return the right format here */
return RedDrawable::RGB32;
}
void RedWindow_p::on_pos_changing(RedWindow& red_window)
{
if (_minimized || IsIconic(_win)) {