mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4116 from ChickenPeanut/patch-1

Browse Source 
Fixed BadValue with XCreateWindow
This commit is contained in:
Bernhard Miklautz 2017-09-21 14:50:34 +02:00 committed by GitHub
commit aa9ff84978
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
client/X11/xf_window.c
View File

@ -594,16 +594,6 @@ void xf_FixWindowCoordinates(xfContext* xfc, int* x, int* y, int* width,
vscreen_width = xfc->vscreen.area.right - xfc->vscreen.area.left + 1; vscreen_width = xfc->vscreen.area.right - xfc->vscreen.area.left + 1;
vscreen_height = xfc->vscreen.area.bottom - xfc->vscreen.area.top + 1; vscreen_height = xfc->vscreen.area.bottom - xfc->vscreen.area.top + 1;
if (*width < 1)
{
*width = 1;
}
if (*height < 1)
{
*height = 1;
}
if (*x < xfc->vscreen.area.left) if (*x < xfc->vscreen.area.left)
{ {
*width += *x; *width += *x;
@ -625,6 +615,16 @@ void xf_FixWindowCoordinates(xfContext* xfc, int* x, int* y, int* width,
{ {
*height = vscreen_height; *height = vscreen_height;
} }
if (*width < 1)
{
*width = 1;
}
if (*height < 1)
{
*height = 1;
}
} }
int xf_AppWindowInit(xfContext* xfc, xfAppWindow* appWindow) int xf_AppWindowInit(xfContext* xfc, xfAppWindow* appWindow)