Zengtudor/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2025-06-14 19:52:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

x11_window: getPosition, check child!=NULL to avoid crashes

Browse Source
This commit is contained in:
arturo 2013-07-24 20:03:31 +02:00
parent 4d3926baed
commit db5101323d
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/x11_window.c
View File

@ -290,7 +290,7 @@ static GLboolean createWindow(_GLFWwindow* window,
if(_glfw.x11.XdndAware!=None)
{
//Announce XDND support
unsigned long version=5;
Atom version=5;
XChangeProperty(_glfw.x11.display, window->x11.handle, _glfw.x11.XdndAware, XA_ATOM, 32, PropModeReplace, (unsigned char*)&version, 1);
}
@ -1109,15 +1109,18 @@ void _glfwPlatformGetWindowPos(_GLFWwindow* window, int* xpos, int* ypos)
{
Window child;
int x, y;
int left;
int top;
int left=0;
int top=0;
XTranslateCoordinates(_glfw.x11.display, window->x11.handle, _glfw.x11.root,
0, 0, &x, &y, &child);
XTranslateCoordinates(_glfw.x11.display, window->x11.handle, child,
if(child)
{
XTranslateCoordinates(_glfw.x11.display, window->x11.handle, child,
0, 0, &left, &top, &child);
}
if (xpos)