gwm17/glfw
1
0
Fork 0
mirror of https://github.com/gwm17/glfw.git synced 2024-11-23 10:48:51 -05:00
Code Issues Projects Releases Wiki Activity

Fixed original video mode being overwritten.

Browse Source
This commit is contained in:
Camilla Berglund 2013-08-06 19:51:29 +02:00
parent 63a191eb8d
commit 261f290abf
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -124,6 +124,8 @@ See the [GLFW documentation](http://www.glfw.org/docs/latest/).
race condition race condition
- [X11] Bugfix: The reported window position did not account for the size of - [X11] Bugfix: The reported window position did not account for the size of
the window frame on some WMs the window frame on some WMs
- [X11] Bugfix: The original video mode of a monitor was overwritten by calls
to glfwSetWindowSize
## Contact ## Contact

6
src/x11_monitor.c
View File

@ -111,6 +111,7 @@ void _glfwSetVideoMode(_GLFWmonitor* monitor, const GLFWvidmode* desired)
} }
} }
if (monitor->x11.oldMode == None)
monitor->x11.oldMode = ci->mode; monitor->x11.oldMode = ci->mode;
XRRSetCrtcConfig(_glfw.x11.display, XRRSetCrtcConfig(_glfw.x11.display,
@ -137,6 +138,9 @@ void _glfwRestoreVideoMode(_GLFWmonitor* monitor)
XRRScreenResources* sr; XRRScreenResources* sr;
XRRCrtcInfo* ci; XRRCrtcInfo* ci;
if (monitor->x11.oldMode == None)
return;
sr = XRRGetScreenResources(_glfw.x11.display, _glfw.x11.root); sr = XRRGetScreenResources(_glfw.x11.display, _glfw.x11.root);
ci = XRRGetCrtcInfo(_glfw.x11.display, sr, monitor->x11.crtc); ci = XRRGetCrtcInfo(_glfw.x11.display, sr, monitor->x11.crtc);
@ -151,6 +155,8 @@ void _glfwRestoreVideoMode(_GLFWmonitor* monitor)
XRRFreeCrtcInfo(ci); XRRFreeCrtcInfo(ci);
XRRFreeScreenResources(sr); XRRFreeScreenResources(sr);
monitor->x11.oldMode = None;
} }
} }