pxcloud/spice-gtk
5
0
Fork 0
mirror of https://gitlab.uni-freiburg.de/opensourcevdi/spice-gtk synced 2026-02-02 02:34:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

widget: modify update-area to not require primary surface

Browse Source 
If egl display is enabled, use GL scanout geometry to check intersection
with the monitor area. This solves displaying GL display without
software canvas (currently d->area is empty and gl drawing fails)

Signed-off-by: Marc-André Lureau <marcandre.lureau@gmail.com>
Acked-by: Pavel Grunt <pgrunt@redhat.com>
This commit is contained in:
Marc-André Lureau 2016-03-21 18:50:36 +01:00
parent ec6bfc00f8
commit c075c54729
1 changed files with 28 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/spice-widget.c
View File

@ -2188,32 +2188,47 @@ static void update_area(SpiceDisplay *display,
gint x, gint y, gint width, gint height)
{
SpiceDisplayPrivate *d = display->priv;
GdkRectangle primary = {
.x = 0,
.y = 0,
.width = d->width,
.height = d->height
};
GdkRectangle area = {
GdkRectangle primary;
SPICE_DEBUG("update area +%d+%d %dx%d", x, y, width, height);
d->area = (GdkRectangle) {
.x = x,
.y = y,
.width = width,
.height = height
};
SPICE_DEBUG("update area, primary: %dx%d, area: +%d+%d %dx%d", d->width, d->height, area.x, area.y, area.width, area.height);
#ifndef G_OS_WIN32
if (d->egl.enabled) {
primary = (GdkRectangle) {
.width = d->egl.scanout.width,
.height = d->egl.scanout.height
};
} else
#endif
{
primary = (GdkRectangle) {
.width = d->width,
.height = d->height
};
}
if (!gdk_rectangle_intersect(&primary, &area, &area)) {
SPICE_DEBUG("primary: %dx%d", primary.width, primary.height);
if (!gdk_rectangle_intersect(&primary, &d->area, &d->area)) {
SPICE_DEBUG("The monitor area is not intersecting primary surface");
memset(&d->area, '\0', sizeof(d->area));
set_monitor_ready(display, false);
return;
}
spicex_image_destroy(display);
d->area = area;
if (gtk_widget_get_realized(GTK_WIDGET(display)))
update_image(display);
#ifndef G_OS_WIN32
if (!d->egl.enabled)
#endif
{
spicex_image_destroy(display);
if (gtk_widget_get_realized(GTK_WIDGET(display)))
update_image(display);
}
update_size_request(display);