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

cleanup - reformat

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36868 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Surovell
2006-01-14 07:31:29 +00:00
parent 0f4c3aa2cc
commit a571434502
1 changed files with 204 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

324
src/mac/carbon/display.cpp
View File

@@ -9,7 +9,6 @@
// Licence: wxWindows licence // Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h" #include "wx/wxprec.h"
#ifdef __BORLANDC__ #ifdef __BORLANDC__
@@ -30,7 +29,7 @@
#include <Gestalt.h> #include <Gestalt.h>
#include <Displays.h> #include <Displays.h>
#include <Quickdraw.h> #include <Quickdraw.h>
#include <Video.h> //for VDSwitchInfoRec #include <Video.h> // for VDSwitchInfoRec
#include <FixMath.h> #include <FixMath.h>
#endif #endif
@@ -53,12 +52,10 @@ public:
size_t wxDisplayBase::GetCount() size_t wxDisplayBase::GetCount()
{ {
CGDisplayCount count; CGDisplayCount count;
#ifdef __WXDEBUG__ CGDisplayErr err = CGGetActiveDisplayList(0, NULL, &count);
CGDisplayErr err =
#endif
CGGetActiveDisplayList(0, NULL, &count);
wxASSERT(err == CGDisplayNoErr); wxASSERT(err == CGDisplayNoErr);
return count; return count;
} }
@@ -69,6 +66,7 @@ int wxDisplayBase::GetFromPoint(const wxPoint &p)
CGDisplayCount theCount; CGDisplayCount theCount;
CGDisplayErr err = CGGetDisplaysWithPoint(thePoint, 1, &theID, &theCount); CGDisplayErr err = CGGetDisplaysWithPoint(thePoint, 1, &theID, &theCount);
wxASSERT(err == CGDisplayNoErr); wxASSERT(err == CGDisplayNoErr);
int nWhich = -1; int nWhich = -1;
if (theCount) if (theCount)
@@ -78,15 +76,15 @@ int wxDisplayBase::GetFromPoint(const wxPoint &p)
err = CGGetActiveDisplayList(theCount, theIDs, &theCount); err = CGGetActiveDisplayList(theCount, theIDs, &theCount);
wxASSERT(err == CGDisplayNoErr); wxASSERT(err == CGDisplayNoErr);
for(nWhich = 0; nWhich < (int) theCount; ++nWhich) for (nWhich = 0; nWhich < (int) theCount; ++nWhich)
{ {
if(theIDs[nWhich] == theID) if (theIDs[nWhich] == theID)
break; break;
} }
delete[] theIDs; delete [] theIDs;
if(nWhich == (int) theCount) if (nWhich == (int) theCount)
{ {
wxFAIL_MSG(wxT("Failed to find display in display list")); wxFAIL_MSG(wxT("Failed to find display in display list"));
nWhich = -1; nWhich = -1;
@@ -94,24 +92,23 @@ int wxDisplayBase::GetFromPoint(const wxPoint &p)
} }
return nWhich; return nWhich;
}//CFUserNotification[NSBundle bundleForClass:[self class]] }
wxDisplay::wxDisplay(size_t index) : wxDisplayBase ( index ) , wxDisplay::wxDisplay(size_t index)
m_priv ( new wxDisplayMacPriv() ) : wxDisplayBase( index ) ,
m_priv( new wxDisplayMacPriv() )
{ {
CGDisplayCount theCount = GetCount(); CGDisplayCount theCount = GetCount();
CGDirectDisplayID* theIDs = new CGDirectDisplayID[theCount]; CGDirectDisplayID* theIDs = new CGDirectDisplayID[theCount];
#ifdef __WXDEBUG__
CGDisplayErr err =
#endif
CGGetActiveDisplayList(theCount, theIDs, &theCount);
wxASSERT(err == CGDisplayNoErr); CGDisplayErr err = CGGetActiveDisplayList(theCount, theIDs, &theCount);
wxASSERT(index < theCount);
wxASSERT( err == CGDisplayNoErr );
wxASSERT( index < theCount );
m_priv->m_id = theIDs[index]; m_priv->m_id = theIDs[index];
delete[] theIDs; delete [] theIDs;
} }
wxRect wxDisplay::GetGeometry() const wxRect wxDisplay::GetGeometry() const
@@ -125,7 +122,7 @@ wxRect wxDisplay::GetGeometry() const
int wxDisplay::GetDepth() const int wxDisplay::GetDepth() const
{ {
return (int) CGDisplayBitsPerPixel(m_priv->m_id); //size_t return (int) CGDisplayBitsPerPixel( m_priv->m_id ); //size_t
} }
wxString wxDisplay::GetName() const wxString wxDisplay::GetName() const
@@ -136,67 +133,70 @@ wxString wxDisplay::GetName() const
static int wxCFDictKeyToInt( CFDictionaryRef desc, CFStringRef key ) static int wxCFDictKeyToInt( CFDictionaryRef desc, CFStringRef key )
{ {
CFNumberRef value; CFNumberRef value = (CFNumberRef) CFDictionaryGetValue( desc, key );
int num = 0; if (value == NULL)
if ( (value = (CFNumberRef) CFDictionaryGetValue(desc, key)) == NULL )
return 0; return 0;
CFNumberGetValue(value, kCFNumberIntType, &num);
int num = 0;
CFNumberGetValue( value, kCFNumberIntType, &num );
return num; return num;
} }
wxArrayVideoModes wxArrayVideoModes
wxDisplay::GetModes(const wxVideoMode& mode) const wxDisplay::GetModes(const wxVideoMode& mode) const
{ {
wxArrayVideoModes Modes; wxArrayVideoModes resultModes;
CFArrayRef theArray = CGDisplayAvailableModes(m_priv->m_id); CFArrayRef theArray = CGDisplayAvailableModes( m_priv->m_id );
for(CFIndex i = 0; i < CFArrayGetCount(theArray); ++i) for (CFIndex i = 0; i < CFArrayGetCount(theArray); ++i)
{ {
CFDictionaryRef theValue = (CFDictionaryRef) CFArrayGetValueAtIndex(theArray, i); CFDictionaryRef theValue = (CFDictionaryRef) CFArrayGetValueAtIndex( theArray, i );
wxVideoMode theMode(wxCFDictKeyToInt(theValue, kCGDisplayWidth), wxVideoMode theMode(
wxCFDictKeyToInt(theValue, kCGDisplayHeight), wxCFDictKeyToInt( theValue, kCGDisplayWidth ),
wxCFDictKeyToInt(theValue, kCGDisplayBitsPerPixel), wxCFDictKeyToInt( theValue, kCGDisplayHeight ),
wxCFDictKeyToInt(theValue, kCGDisplayRefreshRate)); wxCFDictKeyToInt( theValue, kCGDisplayBitsPerPixel ),
wxCFDictKeyToInt( theValue, kCGDisplayRefreshRate ));
if (theMode.Matches(mode)) if (theMode.Matches( mode ))
Modes.Add(theMode); resultModes.Add( theMode );
} }
return Modes; return resultModes;
} }
wxVideoMode wxDisplay::GetCurrentMode() const wxVideoMode wxDisplay::GetCurrentMode() const
{ {
CFDictionaryRef theValue = CGDisplayCurrentMode (m_priv->m_id); CFDictionaryRef theValue = CGDisplayCurrentMode( m_priv->m_id );
return wxVideoMode(wxCFDictKeyToInt(theValue, kCGDisplayWidth), return wxVideoMode(
wxCFDictKeyToInt(theValue, kCGDisplayHeight), wxCFDictKeyToInt( theValue, kCGDisplayWidth ),
wxCFDictKeyToInt(theValue, kCGDisplayBitsPerPixel), wxCFDictKeyToInt( theValue, kCGDisplayHeight ),
wxCFDictKeyToInt(theValue, kCGDisplayRefreshRate)); wxCFDictKeyToInt( theValue, kCGDisplayBitsPerPixel ),
wxCFDictKeyToInt( theValue, kCGDisplayRefreshRate ));
} }
bool wxDisplay::ChangeMode(const wxVideoMode& mode) bool wxDisplay::ChangeMode( const wxVideoMode& mode )
{ {
//Changing to default mode (wxDefualtVideoMode) doesn't // Changing to default mode (wxDefaultVideoMode) doesn't
//work because we don't have access to the system's 'scrn' // work because we don't have access to the system's 'scrn'
//resource which holds the user's mode which the system // resource which holds the user's mode which the system
//will return to after this app is done // will return to after this app is done
boolean_t bExactMatch; boolean_t bExactMatch;
CFDictionaryRef theCGMode = CGDisplayBestModeForParametersAndRefreshRate ( CFDictionaryRef theCGMode = CGDisplayBestModeForParametersAndRefreshRate(
m_priv->m_id, m_priv->m_id,
(size_t)mode.bpp, (size_t)mode.bpp,
(size_t)mode.w, (size_t)mode.w,
(size_t)mode.h, (size_t)mode.h,
(double)mode.refresh, (double)mode.refresh,
&bExactMatch); &bExactMatch );
bool bOK = bExactMatch; bool bOK = bExactMatch;
if(bOK) if (bOK)
bOK = CGDisplaySwitchToMode(m_priv->m_id, theCGMode) == CGDisplayNoErr; bOK = CGDisplaySwitchToMode( m_priv->m_id, theCGMode ) == CGDisplayNoErr;
return bOK; return bOK;
} }
@@ -223,11 +223,12 @@ size_t wxDisplayBase::GetCount()
GDHandle hndl; GDHandle hndl;
size_t num = 0; size_t num = 0;
hndl = DMGetFirstScreenDevice(true); hndl = DMGetFirstScreenDevice(true);
while(hndl) while (hndl)
{ {
num++; num++;
hndl = DMGetNextScreenDevice(hndl, true); hndl = DMGetNextScreenDevice(hndl, true);
} }
return num; return num;
} }
@@ -236,7 +237,8 @@ int wxDisplayBase::GetFromPoint(const wxPoint &p)
GDHandle hndl; GDHandle hndl;
size_t num = 0; size_t num = 0;
hndl = DMGetFirstScreenDevice(true); hndl = DMGetFirstScreenDevice(true);
while(hndl)
while (hndl)
{ {
Rect screenrect = (*hndl)->gdRect; Rect screenrect = (*hndl)->gdRect;
if (p.x >= screenrect.left && if (p.x >= screenrect.left &&
@@ -246,24 +248,27 @@ int wxDisplayBase::GetFromPoint(const wxPoint &p)
{ {
return num; return num;
} }
num++; num++;
hndl = DMGetNextScreenDevice(hndl, true); hndl = DMGetNextScreenDevice(hndl, true);
} }
return -1; return -1;
} }
wxDisplay::wxDisplay(size_t index) : wxDisplayBase ( index ), wxDisplay::wxDisplay( size_t index )
m_priv ( new wxDisplayMacPriv() ) : wxDisplayBase( index ),
m_priv( new wxDisplayMacPriv() )
{ {
GDHandle hndl; GDHandle hndl;
hndl = DMGetFirstScreenDevice(true); hndl = DMGetFirstScreenDevice(true);
m_priv->m_hndl = NULL; m_priv->m_hndl = NULL;
while(hndl)
while (hndl)
{ {
if (index == 0) if (index == 0)
{
m_priv->m_hndl = hndl; m_priv->m_hndl = hndl;
}
index--; index--;
hndl = DMGetNextScreenDevice(hndl, true); hndl = DMGetNextScreenDevice(hndl, true);
} }
@@ -271,25 +276,28 @@ wxDisplay::wxDisplay(size_t index) : wxDisplayBase ( index ),
wxRect wxDisplay::GetGeometry() const wxRect wxDisplay::GetGeometry() const
{ {
if (!(m_priv)) return wxRect(0, 0, 0, 0); if ((m_priv == NULL) || (m_priv->m_hndl == NULL))
if (!(m_priv->m_hndl)) return wxRect(0, 0, 0, 0); return wxRect(0, 0, 0, 0);
Rect screenrect = (*(m_priv->m_hndl))->gdRect; Rect screenrect = (*(m_priv->m_hndl))->gdRect;
return wxRect( screenrect.left, screenrect.top, return wxRect(
screenrect.right - screenrect.left, screenrect.bottom - screenrect.top); screenrect.left, screenrect.top,
screenrect.right - screenrect.left,
screenrect.bottom - screenrect.top );
} }
int wxDisplay::GetDepth() const int wxDisplay::GetDepth() const
{ {
if (!(m_priv)) return 0; if ((m_priv == NULL) || (m_priv->m_hndl == NULL))
if (!(m_priv->m_hndl)) return 0; return 0;
// This cryptic looking code is based on Apple's sample code: // This cryptic looking code is based on Apple's sample code:
// http://developer.apple.com/samplecode/Sample_Code/Graphics_2D/GDevVideo/Gen.cp.htm // http://developer.apple.com/samplecode/Sample_Code/Graphics_2D/GDevVideo/Gen.cp.htm
//RN - according to the docs // RN - according to the docs
//gdPMap is a bitmap-type representation of the GDevice, and all // gdPMap is a bitmap-type representation of the GDevice, and all
//0x0000FFFF does is get the lower 16 bits of pixelSize. However, // 0x0000FFFF does is get the lower 16 bits of pixelSize. However,
//since pixelSize is only 16 bits (a short)... // since pixelSize is only 16 bits (a short)...
return ((*(*(m_priv->m_hndl))->gdPMap)->pixelSize) & 0x0000FFFF; return ((*(*(m_priv->m_hndl))->gdPMap)->pixelSize) & 0x0000FFFF;
} }
@@ -305,31 +313,35 @@ struct DMModeIteratorRec
const wxVideoMode* pMatchMode; const wxVideoMode* pMatchMode;
}; };
pascal void DMModeListIteratorProc ( void* pData, pascal void DMModeListIteratorProc(
void* pData,
DMListIndexType nIndex, DMListIndexType nIndex,
DMDisplayModeListEntryPtr pInfo) DMDisplayModeListEntryPtr pInfo)
{ {
DMModeIteratorRec* pInfoData = (DMModeIteratorRec*) pData; DMModeIteratorRec* pInfoData = (DMModeIteratorRec*) pData;
//Note that in testing the refresh rate is always 0 on my ibook - RN // Note that in testing the refresh rate is always 0 on my ibook - RN
int refresh = (int) Fix2Long(pInfo->displayModeResolutionInfo->csRefreshRate); int refresh = (int) Fix2Long(pInfo->displayModeResolutionInfo->csRefreshRate);
for(unsigned long i = 0; i < pInfo->displayModeDepthBlockInfo->depthBlockCount; ++i)
{
#define pDBI pInfo->displayModeDepthBlockInfo->depthVPBlock[i].depthVPBlock #define pDBI pInfo->displayModeDepthBlockInfo->depthVPBlock[i].depthVPBlock
if (wxVideoMode((int) pInfo->displayModeResolutionInfo->csHorizontalPixels, for (unsigned long i = 0; i < pInfo->displayModeDepthBlockInfo->depthBlockCount; ++i)
{
if (wxVideoMode( (int) pInfo->displayModeResolutionInfo->csHorizontalPixels,
(int) pInfo->displayModeResolutionInfo->csVerticalLines, (int) pInfo->displayModeResolutionInfo->csVerticalLines,
(int) pDBI->vpPixelSize, (int) pDBI->vpPixelSize,
refresh).Matches(*pInfoData->pMatchMode) ) refresh).Matches(*pInfoData->pMatchMode) )
{ {
pInfoData->pModes->Add(wxVideoMode((int) pInfo->displayModeResolutionInfo->csHorizontalPixels, pInfoData->pModes->Add(
wxVideoMode(
(int) pInfo->displayModeResolutionInfo->csHorizontalPixels,
(int) pInfo->displayModeResolutionInfo->csVerticalLines, (int) pInfo->displayModeResolutionInfo->csVerticalLines,
(int) pDBI->vpPixelSize, (int) pDBI->vpPixelSize,
refresh)); refresh ) );
} }
}
#undef pDBI #undef pDBI
}
} }
struct DMModeInfoRec struct DMModeInfoRec
@@ -339,29 +351,34 @@ struct DMModeInfoRec
bool bMatched; bool bMatched;
}; };
pascal void DMModeInfoProc ( void* pData, pascal void DMModeInfoProc(
void* pData,
DMListIndexType nIndex, DMListIndexType nIndex,
DMDisplayModeListEntryPtr pInfo) DMDisplayModeListEntryPtr pInfo )
{ {
DMModeInfoRec* pInfoData = (DMModeInfoRec*) pData; DMModeInfoRec* pInfoData = (DMModeInfoRec*) pData;
Fixed refresh = Long2Fix(pInfoData->pMode->refresh); Fixed refresh = Long2Fix(pInfoData->pMode->refresh);
for(unsigned long i = 0; i < pInfo->displayModeDepthBlockInfo->depthBlockCount; ++i)
{
#define pDBI pInfo->displayModeDepthBlockInfo->depthVPBlock[i].depthVPBlock #define pDBI pInfo->displayModeDepthBlockInfo->depthVPBlock[i].depthVPBlock
for (unsigned long i = 0; i < pInfo->displayModeDepthBlockInfo->depthBlockCount; ++i)
{
if (pInfoData->pMode->w == (int&) pInfo->displayModeResolutionInfo->csHorizontalPixels && if (pInfoData->pMode->w == (int&) pInfo->displayModeResolutionInfo->csHorizontalPixels &&
pInfoData->pMode->h == (int&) pInfo->displayModeResolutionInfo->csVerticalLines && pInfoData->pMode->h == (int&) pInfo->displayModeResolutionInfo->csVerticalLines &&
pInfoData->pMode->bpp == (int) pDBI->vpPixelSize && pInfoData->pMode->bpp == (int) pDBI->vpPixelSize &&
refresh == pInfo->displayModeResolutionInfo->csRefreshRate) refresh == pInfo->displayModeResolutionInfo->csRefreshRate)
{ {
memcpy(&pInfoData->sMode, pInfo->displayModeDepthBlockInfo->depthVPBlock[i].depthSwitchInfo, memcpy(
&pInfoData->sMode,
pInfo->displayModeDepthBlockInfo->depthVPBlock[i].depthSwitchInfo,
sizeof(VDSwitchInfoRec)); sizeof(VDSwitchInfoRec));
pInfoData->sMode.csMode = pDBI->vpPixelSize; pInfoData->sMode.csMode = pDBI->vpPixelSize;
pInfoData->bMatched = true; pInfoData->bMatched = true;
break; break;
} }
#undef pDBI
} }
#undef pDBI
} }
struct DMModeTransRec struct DMModeTransRec
@@ -371,41 +388,43 @@ struct DMModeTransRec
bool bMatched; bool bMatched;
}; };
pascal void DMModeTransProc ( void* pData, pascal void DMModeTransProc(
void* pData,
DMListIndexType nIndex, DMListIndexType nIndex,
DMDisplayModeListEntryPtr pInfo) DMDisplayModeListEntryPtr pInfo)
{ {
DMModeTransRec* pInfoData = (DMModeTransRec*) pData; DMModeTransRec* pInfoData = (DMModeTransRec*) pData;
for(unsigned long i = 0; i < pInfo->displayModeDepthBlockInfo->depthBlockCount; ++i)
{
#define pDBI pInfo->displayModeDepthBlockInfo->depthVPBlock[i].depthVPBlock #define pDBI pInfo->displayModeDepthBlockInfo->depthVPBlock[i].depthVPBlock
for (unsigned long i = 0; i < pInfo->displayModeDepthBlockInfo->depthBlockCount; ++i)
{
if (pInfoData->psMode->csData == pInfo->displayModeDepthBlockInfo->depthVPBlock[i].depthSwitchInfo->csData) if (pInfoData->psMode->csData == pInfo->displayModeDepthBlockInfo->depthVPBlock[i].depthSwitchInfo->csData)
{ {
pInfoData->Mode = wxVideoMode((int) pInfo->displayModeResolutionInfo->csHorizontalPixels, pInfoData->Mode = wxVideoMode(
(int) pInfo->displayModeResolutionInfo->csHorizontalPixels,
(int) pInfo->displayModeResolutionInfo->csVerticalLines, (int) pInfo->displayModeResolutionInfo->csVerticalLines,
(int) pDBI->vpPixelSize, (int) pDBI->vpPixelSize,
(int) Fix2Long(pInfo->displayModeResolutionInfo->csRefreshRate) ); (int) Fix2Long(pInfo->displayModeResolutionInfo->csRefreshRate) );
pInfoData->bMatched = true; pInfoData->bMatched = true;
break; break;
} }
#undef pDBI
} }
#undef pDBI
} }
wxArrayVideoModes wxArrayVideoModes
wxDisplay::GetModes(const wxVideoMode& mode) const wxDisplay::GetModes(const wxVideoMode& mode) const
{ {
wxArrayVideoModes Modes; wxArrayVideoModes Modes;
unsigned long dwDMVer; unsigned long dwDMVer;
Gestalt(gestaltDisplayMgrVers, (long*) &dwDMVer);
//Check DM version (for backward compatibility only - 7.5.3+ use 2.0) // Check DM version == 2
if (dwDMVer >= 0x020000) //version 2? // (for backward compatibility only - 7.5.3+ use 2.0)
Gestalt( gestaltDisplayMgrVers, (long*) &dwDMVer );
if (dwDMVer >= 0x020000)
{ {
DMListIndexType nNumModes; DMListIndexType nNumModes;
DMListType pModes; DMListType pModes;
DMDisplayModeListIteratorUPP uppMLI; DMDisplayModeListIteratorUPP uppMLI;
@@ -413,34 +432,36 @@ wxArrayVideoModes
OSErr err; OSErr err;
err = DMGetDisplayIDByGDevice(m_priv->m_hndl, &nDisplayID, false); err = DMGetDisplayIDByGDevice(m_priv->m_hndl, &nDisplayID, false);
wxASSERT(err == noErr); verify_noerr( err );
//Create a new list... // Create a new list...
err = DMNewDisplayModeList(nDisplayID, NULL, NULL, &nNumModes, &pModes); err = DMNewDisplayModeList(nDisplayID, NULL, NULL, &nNumModes, &pModes);
wxASSERT_MSG(err == noErr, wxT("Could not create a new display mode list") ); wxASSERT_MSG( err == noErr, wxT("Could not create a new display mode list") );
uppMLI = NewDMDisplayModeListIteratorUPP(DMModeListIteratorProc); uppMLI = NewDMDisplayModeListIteratorUPP(DMModeListIteratorProc);
wxASSERT(uppMLI); wxASSERT( uppMLI );
DMModeIteratorRec sModeInfo; DMModeIteratorRec sModeInfo;
sModeInfo.pModes = &Modes; sModeInfo.pModes = &Modes;
sModeInfo.pMatchMode = &mode; sModeInfo.pMatchMode = &mode;
for (DMListIndexType i = 0; i < nNumModes; ++i) for (DMListIndexType i = 0; i < nNumModes; ++i)
{ {
err = DMGetIndexedDisplayModeFromList(pModes, i, NULL, uppMLI, &sModeInfo); err = DMGetIndexedDisplayModeFromList(pModes, i, NULL, uppMLI, &sModeInfo);
wxASSERT(err == noErr); verify_noerr( err );
} }
DisposeDMDisplayModeListIteratorUPP(uppMLI);
DisposeDMDisplayModeListIteratorUPP(uppMLI);
err = DMDisposeList(pModes); err = DMDisposeList(pModes);
wxASSERT(err == noErr); verify_noerr( err );
} }
else //DM 1.0, 1.2, 1.x else // DM 1.0, 1.2, 1.x
{ {
wxLogSysError(wxString::Format(wxT("Display Manager Version %u Not Supported! Present? %s"), wxLogSysError(
wxString::Format(
wxT("Display Manager Version %u Not Supported! Present? %s"),
(unsigned int) dwDMVer / 0x10000, (unsigned int) dwDMVer / 0x10000,
(dwDMVer & (1 << gestaltDisplayMgrPresent) ? wxT("Yes") : wxT("No")) ) (dwDMVer & (1 << gestaltDisplayMgrPresent) ? wxT("Yes") : wxT("No")) ) );
);
} }
return Modes; return Modes;
@@ -451,28 +472,31 @@ wxVideoMode wxDisplay::GetCurrentMode() const
unsigned long dwDMVer; unsigned long dwDMVer;
wxVideoMode RetMode; wxVideoMode RetMode;
Gestalt(gestaltDisplayMgrVers, (long*) &dwDMVer); // Check DM version == 2
//Check DM version (for backward compatibility only - 7.5.3+ use 2.0) // (for backward compatibility only - 7.5.3+ use 2.0)
if (dwDMVer >= 0x020000) //version 2? Gestalt( gestaltDisplayMgrVers, (long*) &dwDMVer );
if (dwDMVer >= 0x020000)
{ {
VDSwitchInfoRec sMode; //Note - csMode member also contains the bit depth VDSwitchInfoRec sMode; // Note: csMode member also contains the bit depth
if (DMGetDisplayMode(m_priv->m_hndl, &sMode) == noErr) OSErr err;
err = DMGetDisplayMode( m_priv->m_hndl, &sMode );
if (err == noErr)
{ {
DMListIndexType nNumModes; DMListIndexType nNumModes;
DMListType pModes; DMListType pModes;
DMDisplayModeListIteratorUPP uppMLI; DMDisplayModeListIteratorUPP uppMLI;
DisplayIDType nDisplayID; DisplayIDType nDisplayID;
OSErr err;
err = DMGetDisplayIDByGDevice(m_priv->m_hndl, &nDisplayID, false); err = DMGetDisplayIDByGDevice(m_priv->m_hndl, &nDisplayID, false);
wxASSERT(err == noErr); verify_noerr( err );
//Create a new list... // Create a new list...
err = DMNewDisplayModeList(nDisplayID, NULL, NULL, &nNumModes, &pModes); err = DMNewDisplayModeList(nDisplayID, NULL, NULL, &nNumModes, &pModes);
wxASSERT_MSG(err == noErr, wxT("Could not create a new display mode list") ); wxASSERT_MSG( err == noErr, wxT("Could not create a new display mode list") );
uppMLI = NewDMDisplayModeListIteratorUPP(DMModeTransProc); uppMLI = NewDMDisplayModeListIteratorUPP(DMModeTransProc);
wxASSERT(uppMLI); wxASSERT( uppMLI );
DMModeTransRec sModeInfo; DMModeTransRec sModeInfo;
sModeInfo.bMatched = false; sModeInfo.bMatched = false;
@@ -480,7 +504,7 @@ wxVideoMode wxDisplay::GetCurrentMode() const
for (DMListIndexType i = 0; i < nNumModes; ++i) for (DMListIndexType i = 0; i < nNumModes; ++i)
{ {
err = DMGetIndexedDisplayModeFromList(pModes, i, NULL, uppMLI, &sModeInfo); err = DMGetIndexedDisplayModeFromList(pModes, i, NULL, uppMLI, &sModeInfo);
wxASSERT(err == noErr); verify_noerr( err );
if ( sModeInfo.bMatched ) if ( sModeInfo.bMatched )
{ {
@@ -490,22 +514,24 @@ wxVideoMode wxDisplay::GetCurrentMode() const
} }
DisposeDMDisplayModeListIteratorUPP(uppMLI); DisposeDMDisplayModeListIteratorUPP(uppMLI);
err = DMDisposeList(pModes); err = DMDisposeList(pModes);
wxASSERT(err == noErr); verify_noerr( err );
} }
else //Can't get current mode? else // Can't get current mode?
{ {
wxLogSysError(wxString::Format(wxT("Couldn't obtain current display mode!!!\ndwDMVer:%u"), wxLogSysError(
wxString::Format(
wxT("Couldn't obtain current display mode!!!\ndwDMVer:%u"),
(unsigned int) dwDMVer)); (unsigned int) dwDMVer));
} }
} }
else //DM ver 1 else // DM ver 1
{ {
wxLogSysError(wxString::Format(wxT("Display Manager Version %u Not Supported! Present? %s"), wxLogSysError(
wxString::Format(
wxT("Display Manager Version %u Not Supported! Present? %s"),
(unsigned int) dwDMVer / 0x10000, (unsigned int) dwDMVer / 0x10000,
(dwDMVer & (1 << gestaltDisplayMgrPresent) ? wxT("Yes") : wxT("No")) ) (dwDMVer & (1 << gestaltDisplayMgrPresent) ? wxT("Yes") : wxT("No")) ) );
);
} }
return RetMode; return RetMode;
@@ -514,11 +540,15 @@ wxVideoMode wxDisplay::GetCurrentMode() const
bool wxDisplay::ChangeMode(const wxVideoMode& mode) bool wxDisplay::ChangeMode(const wxVideoMode& mode)
{ {
unsigned long dwDMVer; unsigned long dwDMVer;
Gestalt(gestaltDisplayMgrVers, (long*)&dwDMVer);
Gestalt( gestaltDisplayMgrVers, (long*)&dwDMVer );
if (GetCount() == 1 || dwDMVer >= 0x020000) if (GetCount() == 1 || dwDMVer >= 0x020000)
{ {
if (mode == wxDefaultVideoMode) if (mode == wxDefaultVideoMode)
{ {
return true;
#if 0
//#ifndef __DARWIN__ //#ifndef __DARWIN__
// Handle hDisplayState; // Handle hDisplayState;
// if (DMBeginConfigureDisplays(&hDisplayState) != noErr) // if (DMBeginConfigureDisplays(&hDisplayState) != noErr)
@@ -526,20 +556,22 @@ bool wxDisplay::ChangeMode(const wxVideoMode& mode)
// wxLogSysError(wxT("Could not lock display for display mode changing!")); // wxLogSysError(wxT("Could not lock display for display mode changing!"));
// return false; // return false;
// } // }
//
// wxASSERT( DMUseScreenPrefs(true, hDisplayState) == noErr); // wxASSERT( DMUseScreenPrefs(true, hDisplayState) == noErr);
// DMEndConfigureDisplays(hDisplayState); // DMEndConfigureDisplays(hDisplayState);
// return true; // return true;
//#else //#else
//hmmmmm.... // hmmmmm....
return true; // return true;
//#endif //#endif
#endif
} }
//0 & NULL for params 2 & 3 of DMSetVideoMode signal it to use defaults (current mode) //0 & NULL for params 2 & 3 of DMSetVideoMode signal it to use defaults (current mode)
//DM 2.0+ doesn't use params 2 & 3 of DMSetDisplayMode //DM 2.0+ doesn't use params 2 & 3 of DMSetDisplayMode
//so we have to use this icky structure //so we have to use this icky structure
VDSwitchInfoRec sMode; VDSwitchInfoRec sMode;
memset(&sMode, 0, sizeof(VDSwitchInfoRec) ); memset( &sMode, 0, sizeof(VDSwitchInfoRec) );
DMListIndexType nNumModes; DMListIndexType nNumModes;
DMListType pModes; DMListType pModes;
@@ -548,9 +580,9 @@ bool wxDisplay::ChangeMode(const wxVideoMode& mode)
OSErr err; OSErr err;
err = DMGetDisplayIDByGDevice(m_priv->m_hndl, &nDisplayID, false); err = DMGetDisplayIDByGDevice(m_priv->m_hndl, &nDisplayID, false);
wxASSERT(err == noErr); verify_noerr( err );
//Create a new list... // Create a new list...
err = DMNewDisplayModeList(nDisplayID, NULL, NULL, &nNumModes, &pModes); err = DMNewDisplayModeList(nDisplayID, NULL, NULL, &nNumModes, &pModes);
wxASSERT_MSG(err == noErr, wxT("Could not create a new display mode list") ); wxASSERT_MSG(err == noErr, wxT("Could not create a new display mode list") );
@@ -561,10 +593,11 @@ bool wxDisplay::ChangeMode(const wxVideoMode& mode)
sModeInfo.bMatched = false; sModeInfo.bMatched = false;
sModeInfo.pMode = &mode; sModeInfo.pMode = &mode;
unsigned int i; unsigned int i;
for(i = 0; i < nNumModes; ++i)
for (i = 0; i < nNumModes; ++i)
{ {
err = DMGetIndexedDisplayModeFromList(pModes, i, NULL, uppMLI, &sModeInfo); err = DMGetIndexedDisplayModeFromList(pModes, i, NULL, uppMLI, &sModeInfo);
wxASSERT(err == noErr); verify_noerr( err );
if (sModeInfo.bMatched) if (sModeInfo.bMatched)
{ {
@@ -572,13 +605,14 @@ bool wxDisplay::ChangeMode(const wxVideoMode& mode)
break; break;
} }
} }
if(i == nNumModes)
if (i == nNumModes)
return false; return false;
DisposeDMDisplayModeListIteratorUPP(uppMLI); DisposeDMDisplayModeListIteratorUPP(uppMLI);
err = DMDisposeList(pModes); err = DMDisposeList(pModes);
wxASSERT(err == noErr); verify_noerr( err );
// For the really paranoid - // For the really paranoid -
// unsigned long flags; // unsigned long flags;
@@ -591,26 +625,34 @@ bool wxDisplay::ChangeMode(const wxVideoMode& mode)
if (DMBeginConfigureDisplays(&hDisplayState) != noErr) if (DMBeginConfigureDisplays(&hDisplayState) != noErr)
{ {
wxLogSysError(wxT("Could not lock display for display mode changing!")); wxLogSysError(wxT("Could not lock display for display mode changing!"));
return false; return false;
} }
unsigned long dwBPP = (unsigned long) mode.bpp; unsigned long dwBPP = (unsigned long) mode.bpp;
if (DMSetDisplayMode(m_priv->m_hndl, sMode.csData, err = DMSetDisplayMode(
(unsigned long*) &(dwBPP), NULL m_priv->m_hndl, sMode.csData,
//(unsigned long) &sMode (unsigned long*) &(dwBPP),
, hDisplayState NULL, //(unsigned long) &sMode
) != noErr) hDisplayState );
if (err != noErr)
{ {
DMEndConfigureDisplays(hDisplayState); DMEndConfigureDisplays(hDisplayState);
wxMessageBox(wxString::Format(wxT("Could not set the display mode"))); wxMessageBox( wxString::Format(wxT("Could not set the display mode")) );
return false; return false;
} }
DMEndConfigureDisplays(hDisplayState); DMEndConfigureDisplays(hDisplayState);
} }
else //DM 1.0, 1.2, 1.x else // DM 1.0, 1.2, 1.x
{ {
wxLogSysError(wxString::Format(wxT("Monitor gravitation not supported yet. dwDMVer:%u"), wxLogSysError(
wxString::Format(
wxT("Monitor gravitation not supported yet. dwDMVer:%u"),
(unsigned int) dwDMVer)); (unsigned int) dwDMVer));
return false; return false;
} }