mirrors/SFML
1
0
Fork 0
mirror of https://github.com/SFML/SFML.git synced 2024-11-24 20:31:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Assume XrandR version >=1.3

Browse Source 
As far as I can tell XrandR 1.3 was released in ~2009. It's safe to
assume anyone using SFML 3 or newer will have this version installed.
This commit is contained in:
Chris Thrasher 2024-05-28 06:51:28 +00:00
parent ac620900ac
commit 7987d3cedc
2 changed files with 18 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
src/SFML/Window/Unix/WindowImplX11.cpp
View File

@ -1274,9 +1274,7 @@ void WindowImplX11::setVideoMode(const VideoMode& mode)
return;
// Check if the XRandR extension is present
int xRandRMajor = 0;
int xRandRMinor = 0;
if (!checkXRandR(xRandRMajor, xRandRMinor))
if (!checkXRandR())
{
// XRandR extension is not supported: we cannot use fullscreen mode
err() << "Fullscreen is not supported, switching to window mode" << std::endl;
@ -1294,7 +1292,7 @@ void WindowImplX11::setVideoMode(const VideoMode& mode)
return;
}
RROutput output = getOutputPrimary(rootWindow, res.get(), xRandRMajor, xRandRMinor);
RROutput output = getOutputPrimary(rootWindow, res.get());
// Get output info from output
const auto outputInfo = X11Ptr<XRROutputInfo>(XRRGetOutputInfo(m_display.get(), res.get(), output));
@ -1365,9 +1363,7 @@ void WindowImplX11::resetVideoMode()
{
// Try to set old configuration
// Check if the XRandR extension
int xRandRMajor = 0;
int xRandRMinor = 0;
if (checkXRandR(xRandRMajor, xRandRMinor))
if (checkXRandR())
{
const auto res = X11Ptr<XRRScreenResources>(
XRRGetScreenResources(m_display.get(), DefaultRootWindow(m_display.get())));
@ -1385,21 +1381,12 @@ void WindowImplX11::resetVideoMode()
return;
}
RROutput output = 0;
// Get the primary screen
RROutput output = XRRGetOutputPrimary(m_display.get(), DefaultRootWindow(m_display.get()));
// if version >= 1.3 get the primary screen else take the first screen
if ((xRandRMajor == 1 && xRandRMinor >= 3) || xRandRMajor > 1)
{
output = XRRGetOutputPrimary(m_display.get(), DefaultRootWindow(m_display.get()));
// Check if returned output is valid, otherwise use the first screen
if (output == None)
output = res->outputs[0];
}
else
{
// Check if returned output is valid, otherwise use the first screen
if (output == None)
output = res->outputs[0];
}
XRRSetCrtcConfig(m_display.get(),
res.get(),
@ -2045,7 +2032,7 @@ bool WindowImplX11::processEvent(XEvent& windowEvent)
////////////////////////////////////////////////////////////
bool WindowImplX11::checkXRandR(int& xRandRMajor, int& xRandRMinor)
bool WindowImplX11::checkXRandR()
{
// Check if the XRandR extension is present
int version = 0;
@ -2055,35 +2042,20 @@ bool WindowImplX11::checkXRandR(int& xRandRMajor, int& xRandRMinor)
return false;
}
// Check XRandR version, 1.2 required
if (!XRRQueryVersion(m_display.get(), &xRandRMajor, &xRandRMinor) || xRandRMajor < 1 ||
(xRandRMajor == 1 && xRandRMinor < 2))
{
err() << "XRandR is too old" << std::endl;
return false;
}
return true;
}
////////////////////////////////////////////////////////////
RROutput WindowImplX11::getOutputPrimary(::Window& rootWindow, XRRScreenResources* res, int xRandRMajor, int xRandRMinor)
RROutput WindowImplX11::getOutputPrimary(::Window& rootWindow, XRRScreenResources* res)
{
// if xRandR version >= 1.3 get the primary screen else take the first screen
if ((xRandRMajor == 1 && xRandRMinor >= 3) || xRandRMajor > 1)
{
const RROutput output = XRRGetOutputPrimary(m_display.get(), rootWindow);
const RROutput output = XRRGetOutputPrimary(m_display.get(), rootWindow);
// Check if returned output is valid, otherwise use the first screen
if (output == None)
return res->outputs[0];
else
return output;
}
// xRandr version can't get the primary screen, use the first screen
return res->outputs[0];
// Check if returned output is valid, otherwise use the first screen
if (output == None)
return res->outputs[0];
else
return output;
}
@ -2103,13 +2075,7 @@ Vector2i WindowImplX11::getPrimaryMonitorPosition()
return monitorPosition;
}
// Get xRandr version
int xRandRMajor = 0;
int xRandRMinor = 0;
if (!checkXRandR(xRandRMajor, xRandRMinor))
xRandRMajor = xRandRMinor = 0;
const RROutput output = getOutputPrimary(rootWindow, res.get(), xRandRMajor, xRandRMinor);
const RROutput output = getOutputPrimary(rootWindow, res.get());
// Get output info from output
const auto outputInfo = X11Ptr<XRROutputInfo>(XRRGetOutputInfo(m_display.get(), res.get(), output));

9
src/SFML/Window/Unix/WindowImplX11.hpp
View File

@ -284,26 +284,21 @@ private:
////////////////////////////////////////////////////////////
/// \brief Check if a valid version of XRandR extension is present
///
/// \param xRandRMajor XRandR major version
/// \param xRandRMinor XRandR minor version
///
/// \return True if a valid XRandR version found, false otherwise
///
////////////////////////////////////////////////////////////
bool checkXRandR(int& xRandRMajor, int& xRandRMinor);
bool checkXRandR();
////////////////////////////////////////////////////////////
/// \brief Get the RROutput of the primary monitor
///
/// \param rootWindow the root window
/// \param res screen resources
/// \param xRandRMajor XRandR major version
/// \param xRandRMinor XRandR minor version
///
/// \return RROutput of the primary monitor
///
////////////////////////////////////////////////////////////
RROutput getOutputPrimary(::Window& rootWindow, XRRScreenResources* res, int xRandRMajor, int xRandRMinor);
RROutput getOutputPrimary(::Window& rootWindow, XRRScreenResources* res);
////////////////////////////////////////////////////////////
/// \brief Get coordinates of the primary monitor