Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Introduce variables for the display and screen in the video mode functions.

Browse Source 
This cleans up the code somewhat, and prepares for some upcoming changes.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75187 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2013-11-15 06:16:59 +00:00
parent a4e7bf1e89
commit 24321b7b18
1 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/unix/displayx11.cpp
View File

@@ -231,14 +231,14 @@ wxDisplayImpl *wxDisplayFactoryX11::CreateDisplay(unsigned n)
// Correct res rate from GLFW
#define wxCRR2(v,dc) (int) (((1000.0f * (float) dc) /*PIXELS PER SECOND */) / ((float) v.htotal * v.vtotal /*PIXELS PER FRAME*/) + 0.5f)
#define wxCRR(v) wxCRR2(v,v.dotclock)
#define wxCVM2(v, dc) wxVideoMode(v.hdisplay, v.vdisplay, DefaultDepth((Display*)wxGetDisplay(), DefaultScreen((Display*)wxGetDisplay())), wxCRR2(v,dc))
#define wxCVM(v) wxCVM2(v, v.dotclock)
#define wxCVM2(v, dc, display, nScreen) wxVideoMode(v.hdisplay, v.vdisplay, DefaultDepth(display, nScreen), wxCRR2(v,dc))
#define wxCVM(v, display, nScreen) wxCVM2(v, v.dotclock, display, nScreen)
wxArrayVideoModes wxDisplayImplX11::GetModes(const wxVideoMode& mode) const
{
//Convenience...
Display* pDisplay = (Display*) wxGetDisplay(); //default display
int nScreen = DefaultScreen(pDisplay); //default screen of (default) display...
Display* display = (Display*) wxGetDisplay(); //default display
int nScreen = DefaultScreen(display); //default screen of (default) display...
//Some variables..
XF86VidModeModeInfo** ppXModes; //Enumerated Modes (Don't forget XFree() :))
@@ -246,16 +246,18 @@ wxArrayVideoModes wxDisplayImplX11::GetModes(const wxVideoMode& mode) const
wxArrayVideoModes Modes; //modes to return...
if (XF86VidModeGetAllModeLines(pDisplay, nScreen, &nNumModes, &ppXModes) == TRUE)
if (XF86VidModeGetAllModeLines(display, nScreen, &nNumModes, &ppXModes))
{
for (int i = 0; i < nNumModes; ++i)
{
XF86VidModeModeInfo& info = *ppXModes[i];
const wxVideoMode vm = wxCVM(info, display, nScreen);
if (mode == wxDefaultVideoMode || //According to display.h All modes valid if dafault mode...
mode.Matches(wxCVM((*ppXModes[i]))) ) //...?
mode.Matches(vm)) //...?
{
Modes.Add(wxCVM((*ppXModes[i])));
Modes.Add(vm);
}
wxClearXVM((*ppXModes[i]));
wxClearXVM(info);
// XFree(ppXModes[i]); //supposed to free?
}
XFree(ppXModes);
@@ -270,20 +272,23 @@ wxArrayVideoModes wxDisplayImplX11::GetModes(const wxVideoMode& mode) const
wxVideoMode wxDisplayImplX11::GetCurrentMode() const
{
Display* display = static_cast<Display*>(wxGetDisplay());
int nScreen = DefaultScreen(display);
XF86VidModeModeLine VM;
int nDotClock;
XF86VidModeGetModeLine((Display*)wxGetDisplay(), DefaultScreen((Display*)wxGetDisplay()),
&nDotClock, &VM);
XF86VidModeGetModeLine(display, nScreen, &nDotClock, &VM);
wxClearXVM(VM);
return wxCVM2(VM, nDotClock);
return wxCVM2(VM, nDotClock, display, nScreen);
}
bool wxDisplayImplX11::ChangeMode(const wxVideoMode& mode)
{
Display* display = static_cast<Display*>(wxGetDisplay());
int nScreen = DefaultScreen(display);
XF86VidModeModeInfo** ppXModes; //Enumerated Modes (Don't forget XFree() :))
int nNumModes; //Number of modes enumerated....
if( !XF86VidModeGetAllModeLines((Display*)wxGetDisplay(), DefaultScreen((Display*)wxGetDisplay()), &nNumModes, &ppXModes) )
if(!XF86VidModeGetAllModeLines(display, nScreen, &nNumModes, &ppXModes))
{
wxLogSysError(_("Failed to change video mode"));
return false;
@@ -292,8 +297,7 @@ bool wxDisplayImplX11::ChangeMode(const wxVideoMode& mode)
bool bRet = false;
if (mode == wxDefaultVideoMode)
{
bRet = XF86VidModeSwitchToMode((Display*)wxGetDisplay(), DefaultScreen((Display*)wxGetDisplay()),
ppXModes[0]) == TRUE;
bRet = XF86VidModeSwitchToMode(display, nScreen, ppXModes[0]) != 0;
for (int i = 0; i < nNumModes; ++i)
{
@@ -311,8 +315,7 @@ bool wxDisplayImplX11::ChangeMode(const wxVideoMode& mode)
wxCRR((*ppXModes[i])) == mode.GetRefresh())
{
//switch!
bRet = XF86VidModeSwitchToMode((Display*)wxGetDisplay(), DefaultScreen((Display*)wxGetDisplay()),
ppXModes[i]) == TRUE;
bRet = XF86VidModeSwitchToMode(display, nScreen, ppXModes[i]) != 0;
}
wxClearXVM((*ppXModes[i]));
// XFree(ppXModes[i]); //supposed to free?
@@ -324,7 +327,6 @@ bool wxDisplayImplX11::ChangeMode(const wxVideoMode& mode)
return bRet;
}
#else // !HAVE_X11_EXTENSIONS_XF86VMODE_H
wxArrayVideoModes wxDisplayImplX11::GetModes(const wxVideoMode& modeMatch) const