pxcloud/spice
5
0
Fork 0
mirror of https://gitlab.uni-freiburg.de/opensourcevdi/spice synced 2026-01-06 09:39:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

X11 client: Add helper for XImage construction

Browse Source
This commit is contained in:
Alexander Larsson 2010-04-21 13:06:07 +02:00
parent 4200c66cd7
commit d2a2f18b6e
2 changed files with 48 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
client/x11/platform.cpp
View File

@ -255,10 +255,51 @@ err1:
return NULL;
}
void XPlatform::free_x_image(XImage *image,
XShmSegmentInfo *shminfo)
XImage *XPlatform::create_x_image(RedDrawable::Format format,
int width, int height, int depth,
Visual *visual,
XShmSegmentInfo **shminfo_out)
{
XImage *image;
uint8_t *data;
size_t stride;
*shminfo_out = NULL;
if (XPlatform::is_x_shm_avail()) {
image = XPlatform::create_x_shm_image(format, width, height,
depth, visual,
shminfo_out);
}
if (image != NULL) {
return image;
}
stride = SPICE_ALIGN(width * RedDrawable::format_to_bpp (format), 32) / 8;
/* Must use malloc here, not new, because XDestroyImage will free() it */
data = (uint8_t *)malloc(height * stride);
if (data == NULL) {
THROW("Out of memory");
}
if (format == RedDrawable::A1) {
image = XCreateImage(XPlatform::get_display(),
NULL, 1, XYBitmap,
0, (char *)data, width, height, 32, stride);
} else {
image = XCreateImage(XPlatform::get_display(),
visual, depth, ZPixmap,
0, (char *)data, width, height, 32, stride);
}
return image;
}
void XPlatform::free_x_image(XImage *image,
XShmSegmentInfo *shminfo)
{
char *data = image->data;
if (shminfo) {
XShmDetach(XPlatform::get_display(), shminfo);
}
@ -269,8 +310,6 @@ void XPlatform::free_x_image(XImage *image,
XSync(XPlatform::get_display(), False);
shmdt(shminfo->shmaddr);
delete shminfo;
} else {
delete[] data;
}
}

4
client/x11/x_platform.h
View File

@ -41,6 +41,10 @@ public:
int width, int height, int depth,
Visual *visual,
XShmSegmentInfo **shminfo_out);
static XImage *create_x_image(RedDrawable::Format format,
int width, int height, int depth,
Visual *visual,
XShmSegmentInfo **shminfo_out);
static void free_x_image(XImage *image,
XShmSegmentInfo *shminfo);
};