Skip to content

GUACAMOLE-2123: Fix remote app render issues. Use per-window guac_dis… #673

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jjheinon wants to merge 1 commit into
base: staging/1.6.1
Choose a base branch
from
Open

GUACAMOLE-2123: Fix remote app render issues. Use per-window guac_dis… #673

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 48 additions & 0 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1080,6 +1080,54 @@ then
[#include <freerdp/freerdp.h>])
fi
if test "x${have_freerdp}" = "xyes"
then
AC_MSG_CHECKING([whether FreeRDP supports RDPGFX surface area updates])
AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
#include <freerdp/client/rdpgfx.h>
#include <freerdp/codec/color.h>
#include <freerdp/codec/region.h>
#include <freerdp/gdi/gdi.h>
#include <freerdp/gdi/gfx.h>

int main() {
RdpgfxClientContext* context = 0;
rdpGdi* gdi = 0;
gdiGfxSurface* surface = 0;

(void) context->GetSurfaceData(context, 0);
(void) gdi_graphics_pipeline_init_ex(gdi, context, 0, 0, 0);
(void) surface->windowId;
(void) surface->mappedWidth;
(void) surface->mappedHeight;
(void) surface->outputTargetWidth;
(void) surface->outputTargetHeight;

return 0;
}
]])],
[AC_MSG_RESULT([yes])]
[AC_DEFINE([HAVE_RDPGFX_SURFACE_AREA_UPDATE],,
[Defined if FreeRDP supports RDPGFX surface area update callbacks])],
[AC_MSG_RESULT([no])])
fi
if test "x${have_freerdp}" = "xyes"
then
AC_MSG_CHECKING([whether FreeRDP supports RDPGFX window surface updates])
AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
#include <freerdp/client/rdpgfx.h>

int main() {
RdpgfxClientContext* context = 0;
context->UpdateWindowFromSurface = 0;
return 0;
}
]])],
[AC_MSG_RESULT([yes])]
[AC_DEFINE([HAVE_RDPGFX_WINDOW_SURFACE_UPDATE],,
[Defined if FreeRDP supports RDPGFX updates for window-mapped surfaces])],
[AC_MSG_RESULT([no])])
fi
if test "x${have_freerdp}" = "xyes"
then
# Check whether FreeRDP 3.x requires const for GetPluginData
AC_MSG_CHECKING([whether GetPluginData requires const for the returned args])
Expand Down
4 changes: 0 additions & 4 deletions src/common/surface.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1895,8 +1895,6 @@ static void __guac_common_surface_flush(guac_common_surface* surface) {
guac_common_surface_bitmap_rect* current = surface->bitmap_queue;
int i, j;
int original_queue_length;
int flushed = 0;

original_queue_length = surface->bitmap_queue_length;

/* Sort updates to make combination less costly */
Expand Down Expand Up @@ -1943,8 +1941,6 @@ static void __guac_common_surface_flush(guac_common_surface* surface) {
/* Flush as bitmap otherwise */
else if (surface->dirty) {

flushed++;

int opaque = __guac_common_surface_is_opaque(surface,
&surface->dirty_rect);

Expand Down
Loading