mirrors
/
FreeRDP
mirror of https://github.com/FreeRDP/FreeRDP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #280 from nfedera/fullscreenfix 

xfreerdp: fix non-xinerama fullscreen issue (issue #266)
This commit is contained in:
Marc-André Moreau 2011-12-15 07:04:27 -08:00
parent 2edfcb50fb f52526f120
commit 1def0258ca
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
client/X11/xf_monitor.c
View File

@ -51,7 +51,12 @@ boolean xf_detect_monitors(xfInfo* xfi, rdpSettings* settings)
xfi->workArea.height = HeightOfScreen(xfi->screen);
}
if (settings->workarea)
if (settings->fullscreen)
{
settings->width = WidthOfScreen(xfi->screen);
settings->height = HeightOfScreen(xfi->screen);
}
else if (settings->workarea)
{
settings->width = xfi->workArea.width;
settings->height = xfi->workArea.height;
@ -112,8 +117,11 @@ boolean xf_detect_monitors(xfInfo* xfi, rdpSettings* settings)
vscreen->area.bottom = MAX(vscreen->monitors[i].area.bottom, vscreen->area.bottom);
}
settings->width = vscreen->area.right - vscreen->area.left + 1;
settings->height = vscreen->area.bottom - vscreen->area.top + 1;
if (settings->num_monitors)
{
settings->width = vscreen->area.right - vscreen->area.left + 1;
settings->height = vscreen->area.bottom - vscreen->area.top + 1;
}
return true;
}

6
client/X11/xfreerdp.c
View File

@ -293,12 +293,6 @@ void xf_create_window(xfInfo* xfi)
if (xfi->remote_app != true)
{
if (xfi->fullscreen)
{
width = xfi->fullscreen ? WidthOfScreen(xfi->screen) : xfi->width;
height = xfi->fullscreen ? HeightOfScreen(xfi->screen) : xfi->height;
}
if (xfi->instance->settings->window_title != NULL)
{
win_title = xmalloc(sizeof(xfi->instance->settings->window_title));