encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Patched to compile on pre-C99 compilers.

This commit is contained in:
Ryan C. Gordon 2014-10-30 13:44:31 -04:00
parent 3a916c6d7b
commit 43ad9670e6
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/video/x11/SDL_x11mouse.c
View File

@ -378,6 +378,7 @@ X11_GetGlobalMouseState(int *x, int *y)
int rootx, rooty, winx, winy; int rootx, rooty, winx, winy;
unsigned int mask; unsigned int mask;
if (X11_XQueryPointer(display, RootWindow(display, data->screen), &root, &child, &rootx, &rooty, &winx, &winy, &mask)) { if (X11_XQueryPointer(display, RootWindow(display, data->screen), &root, &child, &rootx, &rooty, &winx, &winy, &mask)) {
XWindowAttributes root_attrs;
Uint32 retval = 0; Uint32 retval = 0;
retval |= (mask & Button1Mask) ? SDL_BUTTON_LMASK : 0; retval |= (mask & Button1Mask) ? SDL_BUTTON_LMASK : 0;
retval |= (mask & Button2Mask) ? SDL_BUTTON_MMASK : 0; retval |= (mask & Button2Mask) ? SDL_BUTTON_MMASK : 0;
@ -386,7 +387,6 @@ X11_GetGlobalMouseState(int *x, int *y)
* (observed on dual monitor setup with primary display being the rightmost one - mouse was offset to the right). * (observed on dual monitor setup with primary display being the rightmost one - mouse was offset to the right).
* *
* Adding root position to root-relative coordinates seems to be a better way to get absolute position. */ * Adding root position to root-relative coordinates seems to be a better way to get absolute position. */
XWindowAttributes root_attrs;
X11_XGetWindowAttributes(display, root, &root_attrs); X11_XGetWindowAttributes(display, root, &root_attrs);
*x = root_attrs.x + rootx; *x = root_attrs.x + rootx;
*y = root_attrs.y + rooty; *y = root_attrs.y + rooty;