Skip to content
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

Jump to bottom

Backport MSTSC resize fix. #2292

Merged
merged 3 commits into from
Aug 22, 2022
Merged

Backport MSTSC resize fix. #2292

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4a6f003
Backport MSTSC resize fix.
Nexarian Jun 27, 2022
a07da5b
Backporting already this size fix.
Nexarian Jul 9, 2022
326f466
Fixing astyle error.
Nexarian Jul 10, 2022
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
62 changes: 41 additions & 21 deletions xrdp/xrdp_mm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1107,27 +1107,47 @@ dynamic_monitor_data(intptr_t id, int chan_id, char *data, int bytes)
}
session_width = rect.right - rect.left;
session_height = rect.bottom - rect.top;
if ((session_width > 0) && (session_height > 0))
{
// TODO: Unify this logic with server_reset
libxrdp_reset(wm->session, session_width, session_height, wm->screen->bpp);
/* reset cache */
xrdp_cache_reset(wm->cache, wm->client_info);
/* resize the main window */
xrdp_bitmap_resize(wm->screen, session_width, session_height);
/* load some stuff */
xrdp_wm_load_static_colors_plus(wm, 0);
xrdp_wm_load_static_pointers(wm);
/* redraw */
xrdp_bitmap_invalidate(wm->screen, 0);

struct xrdp_mod *v = wm->mm->mod;
if (v != 0)
{
v->mod_server_version_message(v);
v->mod_server_monitor_resize(v, session_width, session_height);
v->mod_server_monitor_full_invalidate(v, session_width, session_height);
}

if (session_width <= 0 && session_height <= 0)
{
return 0;
}
if (session_width == wm->client_info->width
&& session_height == wm->client_info->height)
{
return 0;
}

// TODO: Unify this logic with server_reset
libxrdp_reset(wm->session, session_width, session_height, wm->screen->bpp);
/* reset cache */
xrdp_cache_reset(wm->cache, wm->client_info);
/* resize the main window */
xrdp_bitmap_resize(wm->screen, session_width, session_height);
/* load some stuff */
xrdp_wm_load_static_colors_plus(wm, 0);
xrdp_wm_load_static_pointers(wm);
/* redraw */
xrdp_bitmap_invalidate(wm->screen, 0);

struct xrdp_mod *v = wm->mm->mod;
if (v == 0)
{
return 0;
}
v->mod_server_version_message(v);
v->mod_server_monitor_resize(v, session_width, session_height);
v->mod_server_monitor_full_invalidate(v, session_width, session_height);

// Need to recreate the encoder for connections that use it.
if (wm->mm->encoder != NULL)
{
xrdp_encoder_delete(wm->mm->encoder);
wm->mm->encoder = NULL;
}
if (wm->mm->encoder == NULL)
{
wm->mm->encoder = xrdp_encoder_create(wm->mm);
}
return 0;
}
Expand Down