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

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

@@ -9,7 +9,6 @@
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#ifdef __BORLANDC__
@@ -53,12 +52,10 @@ public:
size_t wxDisplayBase::GetCount()
{
CGDisplayCount count;
#ifdef __WXDEBUG__
CGDisplayErr err =
#endif
CGGetActiveDisplayList(0, NULL, &count);
CGDisplayErr err = CGGetActiveDisplayList(0, NULL, &count);
wxASSERT(err == CGDisplayNoErr);
return count;
}
@@ -69,6 +66,7 @@ int wxDisplayBase::GetFromPoint(const wxPoint &p)
CGDisplayCount theCount;
CGDisplayErr err = CGGetDisplaysWithPoint(thePoint, 1, &theID, &theCount);
wxASSERT(err == CGDisplayNoErr);
int nWhich = -1;
if (theCount)
@@ -94,17 +92,16 @@ int wxDisplayBase::GetFromPoint(const wxPoint &p)
}
return nWhich;
}//CFUserNotification[NSBundle bundleForClass:[self class]]
}
wxDisplay::wxDisplay(size_t index) : wxDisplayBase ( index ) ,
wxDisplay::wxDisplay(size_t index)
: wxDisplayBase( index ) ,
m_priv( new wxDisplayMacPriv() )
{
CGDisplayCount theCount = GetCount();
CGDirectDisplayID* theIDs = new CGDirectDisplayID[theCount];
#ifdef __WXDEBUG__
CGDisplayErr err =
#endif
CGGetActiveDisplayList(theCount, theIDs, &theCount);
CGDisplayErr err = CGGetActiveDisplayList(theCount, theIDs, &theCount);
wxASSERT( err == CGDisplayNoErr );
wxASSERT( index < theCount );
@@ -136,19 +133,20 @@ wxString wxDisplay::GetName() const
static int wxCFDictKeyToInt( CFDictionaryRef desc, CFStringRef key )
{
CFNumberRef value;
int num = 0;
if ( (value = (CFNumberRef) CFDictionaryGetValue(desc, key)) == NULL )
CFNumberRef value = (CFNumberRef) CFDictionaryGetValue( desc, key );
if (value == NULL)
return 0;
int num = 0;
CFNumberGetValue( value, kCFNumberIntType, &num );
return num;
}
wxArrayVideoModes
wxDisplay::GetModes(const wxVideoMode& mode) const
{
wxArrayVideoModes Modes;
wxArrayVideoModes resultModes;
CFArrayRef theArray = CGDisplayAvailableModes( m_priv->m_id );
@@ -156,23 +154,25 @@ wxArrayVideoModes
{
CFDictionaryRef theValue = (CFDictionaryRef) CFArrayGetValueAtIndex( theArray, i );
wxVideoMode theMode(wxCFDictKeyToInt(theValue, kCGDisplayWidth),
wxVideoMode theMode(
wxCFDictKeyToInt( theValue, kCGDisplayWidth ),
wxCFDictKeyToInt( theValue, kCGDisplayHeight ),
wxCFDictKeyToInt( theValue, kCGDisplayBitsPerPixel ),
wxCFDictKeyToInt( theValue, kCGDisplayRefreshRate ));
if (theMode.Matches( mode ))
Modes.Add(theMode);
resultModes.Add( theMode );
}
return Modes;
return resultModes;
}
wxVideoMode wxDisplay::GetCurrentMode() const
{
CFDictionaryRef theValue = CGDisplayCurrentMode( m_priv->m_id );
return wxVideoMode(wxCFDictKeyToInt(theValue, kCGDisplayWidth),
return wxVideoMode(
wxCFDictKeyToInt( theValue, kCGDisplayWidth ),
wxCFDictKeyToInt( theValue, kCGDisplayHeight ),
wxCFDictKeyToInt( theValue, kCGDisplayBitsPerPixel ),
wxCFDictKeyToInt( theValue, kCGDisplayRefreshRate ));
@@ -180,7 +180,7 @@ wxVideoMode wxDisplay::GetCurrentMode() const
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'
// resource which holds the user's mode which the system
// will return to after this app is done
@@ -228,6 +228,7 @@ size_t wxDisplayBase::GetCount()
num++;
hndl = DMGetNextScreenDevice(hndl, true);
}
return num;
}
@@ -236,6 +237,7 @@ int wxDisplayBase::GetFromPoint(const wxPoint &p)
GDHandle hndl;
size_t num = 0;
hndl = DMGetFirstScreenDevice(true);
while (hndl)
{
Rect screenrect = (*hndl)->gdRect;
@@ -246,24 +248,27 @@ int wxDisplayBase::GetFromPoint(const wxPoint &p)
{
return num;
}
num++;
hndl = DMGetNextScreenDevice(hndl, true);
}
return -1;
}
wxDisplay::wxDisplay(size_t index) : wxDisplayBase ( index ),
wxDisplay::wxDisplay( size_t index )
: wxDisplayBase( index ),
m_priv( new wxDisplayMacPriv() )
{
GDHandle hndl;
hndl = DMGetFirstScreenDevice(true);
m_priv->m_hndl = NULL;
while (hndl)
{
if (index == 0)
{
m_priv->m_hndl = hndl;
}
index--;
hndl = DMGetNextScreenDevice(hndl, true);
}
@@ -271,17 +276,20 @@ wxDisplay::wxDisplay(size_t index) : wxDisplayBase ( index ),
wxRect wxDisplay::GetGeometry() const
{
if (!(m_priv)) return wxRect(0, 0, 0, 0);
if (!(m_priv->m_hndl)) return wxRect(0, 0, 0, 0);
if ((m_priv == NULL) || (m_priv->m_hndl == NULL))
return wxRect(0, 0, 0, 0);
Rect screenrect = (*(m_priv->m_hndl))->gdRect;
return wxRect( screenrect.left, screenrect.top,
screenrect.right - screenrect.left, screenrect.bottom - screenrect.top);
return wxRect(
screenrect.left, screenrect.top,
screenrect.right - screenrect.left,
screenrect.bottom - screenrect.top );
}
int wxDisplay::GetDepth() const
{
if (!(m_priv)) return 0;
if (!(m_priv->m_hndl)) return 0;
if ((m_priv == NULL) || (m_priv->m_hndl == NULL))
return 0;
// This cryptic looking code is based on Apple's sample code:
// http://developer.apple.com/samplecode/Sample_Code/Graphics_2D/GDevVideo/Gen.cp.htm
@@ -305,7 +313,8 @@ struct DMModeIteratorRec
const wxVideoMode* pMatchMode;
};
pascal void DMModeListIteratorProc ( void* pData,
pascal void DMModeListIteratorProc(
void* pData,
DMListIndexType nIndex,
DMDisplayModeListEntryPtr pInfo)
{
@@ -314,22 +323,25 @@ pascal void DMModeListIteratorProc ( void* pData,
// Note that in testing the refresh rate is always 0 on my ibook - RN
int refresh = (int) Fix2Long(pInfo->displayModeResolutionInfo->csRefreshRate);
for(unsigned long i = 0; i < pInfo->displayModeDepthBlockInfo->depthBlockCount; ++i)
{
#define pDBI pInfo->displayModeDepthBlockInfo->depthVPBlock[i].depthVPBlock
for (unsigned long i = 0; i < pInfo->displayModeDepthBlockInfo->depthBlockCount; ++i)
{
if (wxVideoMode( (int) pInfo->displayModeResolutionInfo->csHorizontalPixels,
(int) pInfo->displayModeResolutionInfo->csVerticalLines,
(int) pDBI->vpPixelSize,
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) pDBI->vpPixelSize,
refresh ) );
}
#undef pDBI
}
#undef pDBI
}
struct DMModeInfoRec
@@ -339,29 +351,34 @@ struct DMModeInfoRec
bool bMatched;
};
pascal void DMModeInfoProc ( void* pData,
pascal void DMModeInfoProc(
void* pData,
DMListIndexType nIndex,
DMDisplayModeListEntryPtr pInfo )
{
DMModeInfoRec* pInfoData = (DMModeInfoRec*) pData;
Fixed refresh = Long2Fix(pInfoData->pMode->refresh);
#define pDBI pInfo->displayModeDepthBlockInfo->depthVPBlock[i].depthVPBlock
for (unsigned long i = 0; i < pInfo->displayModeDepthBlockInfo->depthBlockCount; ++i)
{
#define pDBI pInfo->displayModeDepthBlockInfo->depthVPBlock[i].depthVPBlock
if (pInfoData->pMode->w == (int&) pInfo->displayModeResolutionInfo->csHorizontalPixels &&
pInfoData->pMode->h == (int&) pInfo->displayModeResolutionInfo->csVerticalLines &&
pInfoData->pMode->bpp == (int) pDBI->vpPixelSize &&
refresh == pInfo->displayModeResolutionInfo->csRefreshRate)
{
memcpy(&pInfoData->sMode, pInfo->displayModeDepthBlockInfo->depthVPBlock[i].depthSwitchInfo,
memcpy(
&pInfoData->sMode,
pInfo->displayModeDepthBlockInfo->depthVPBlock[i].depthSwitchInfo,
sizeof(VDSwitchInfoRec));
pInfoData->sMode.csMode = pDBI->vpPixelSize;
pInfoData->bMatched = true;
break;
}
#undef pDBI
}
#undef pDBI
}
struct DMModeTransRec
@@ -371,41 +388,43 @@ struct DMModeTransRec
bool bMatched;
};
pascal void DMModeTransProc ( void* pData,
pascal void DMModeTransProc(
void* pData,
DMListIndexType nIndex,
DMDisplayModeListEntryPtr pInfo)
{
DMModeTransRec* pInfoData = (DMModeTransRec*) pData;
#define pDBI pInfo->displayModeDepthBlockInfo->depthVPBlock[i].depthVPBlock
for (unsigned long i = 0; i < pInfo->displayModeDepthBlockInfo->depthBlockCount; ++i)
{
#define pDBI pInfo->displayModeDepthBlockInfo->depthVPBlock[i].depthVPBlock
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) pDBI->vpPixelSize,
(int) Fix2Long(pInfo->displayModeResolutionInfo->csRefreshRate) );
pInfoData->bMatched = true;
break;
}
#undef pDBI
}
#undef pDBI
}
wxArrayVideoModes
wxDisplay::GetModes(const wxVideoMode& mode) const
{
wxArrayVideoModes Modes;
unsigned long dwDMVer;
// Check DM version == 2
// (for backward compatibility only - 7.5.3+ use 2.0)
Gestalt( gestaltDisplayMgrVers, (long*) &dwDMVer );
//Check DM version (for backward compatibility only - 7.5.3+ use 2.0)
if (dwDMVer >= 0x020000) //version 2?
if (dwDMVer >= 0x020000)
{
DMListIndexType nNumModes;
DMListType pModes;
DMDisplayModeListIteratorUPP uppMLI;
@@ -413,7 +432,7 @@ wxArrayVideoModes
OSErr err;
err = DMGetDisplayIDByGDevice(m_priv->m_hndl, &nDisplayID, false);
wxASSERT(err == noErr);
verify_noerr( err );
// Create a new list...
err = DMNewDisplayModeList(nDisplayID, NULL, NULL, &nNumModes, &pModes);
@@ -425,22 +444,24 @@ wxArrayVideoModes
DMModeIteratorRec sModeInfo;
sModeInfo.pModes = &Modes;
sModeInfo.pMatchMode = &mode;
for (DMListIndexType i = 0; i < nNumModes; ++i)
{
err = DMGetIndexedDisplayModeFromList(pModes, i, NULL, uppMLI, &sModeInfo);
wxASSERT(err == noErr);
verify_noerr( err );
}
DisposeDMDisplayModeListIteratorUPP(uppMLI);
DisposeDMDisplayModeListIteratorUPP(uppMLI);
err = DMDisposeList(pModes);
wxASSERT(err == noErr);
verify_noerr( err );
}
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,
(dwDMVer & (1 << gestaltDisplayMgrPresent) ? wxT("Yes") : wxT("No")) )
);
(dwDMVer & (1 << gestaltDisplayMgrPresent) ? wxT("Yes") : wxT("No")) ) );
}
return Modes;
@@ -451,21 +472,24 @@ wxVideoMode wxDisplay::GetCurrentMode() const
unsigned long dwDMVer;
wxVideoMode RetMode;
// Check DM version == 2
// (for backward compatibility only - 7.5.3+ use 2.0)
Gestalt( gestaltDisplayMgrVers, (long*) &dwDMVer );
//Check DM version (for backward compatibility only - 7.5.3+ use 2.0)
if (dwDMVer >= 0x020000) //version 2?
if (dwDMVer >= 0x020000)
{
VDSwitchInfoRec sMode; //Note - csMode member also contains the bit depth
if (DMGetDisplayMode(m_priv->m_hndl, &sMode) == noErr)
VDSwitchInfoRec sMode; // Note: csMode member also contains the bit depth
OSErr err;
err = DMGetDisplayMode( m_priv->m_hndl, &sMode );
if (err == noErr)
{
DMListIndexType nNumModes;
DMListType pModes;
DMDisplayModeListIteratorUPP uppMLI;
DisplayIDType nDisplayID;
OSErr err;
err = DMGetDisplayIDByGDevice(m_priv->m_hndl, &nDisplayID, false);
wxASSERT(err == noErr);
verify_noerr( err );
// Create a new list...
err = DMNewDisplayModeList(nDisplayID, NULL, NULL, &nNumModes, &pModes);
@@ -480,7 +504,7 @@ wxVideoMode wxDisplay::GetCurrentMode() const
for (DMListIndexType i = 0; i < nNumModes; ++i)
{
err = DMGetIndexedDisplayModeFromList(pModes, i, NULL, uppMLI, &sModeInfo);
wxASSERT(err == noErr);
verify_noerr( err );
if ( sModeInfo.bMatched )
{
@@ -490,22 +514,24 @@ wxVideoMode wxDisplay::GetCurrentMode() const
}
DisposeDMDisplayModeListIteratorUPP(uppMLI);
err = DMDisposeList(pModes);
wxASSERT(err == noErr);
verify_noerr( err );
}
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));
}
}
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,
(dwDMVer & (1 << gestaltDisplayMgrPresent) ? wxT("Yes") : wxT("No")) )
);
(dwDMVer & (1 << gestaltDisplayMgrPresent) ? wxT("Yes") : wxT("No")) ) );
}
return RetMode;
@@ -514,11 +540,15 @@ wxVideoMode wxDisplay::GetCurrentMode() const
bool wxDisplay::ChangeMode(const wxVideoMode& mode)
{
unsigned long dwDMVer;
Gestalt( gestaltDisplayMgrVers, (long*)&dwDMVer );
if (GetCount() == 1 || dwDMVer >= 0x020000)
{
if (mode == wxDefaultVideoMode)
{
return true;
#if 0
//#ifndef __DARWIN__
// Handle hDisplayState;
// if (DMBeginConfigureDisplays(&hDisplayState) != noErr)
@@ -526,13 +556,15 @@ bool wxDisplay::ChangeMode(const wxVideoMode& mode)
// wxLogSysError(wxT("Could not lock display for display mode changing!"));
// return false;
// }
//
// wxASSERT( DMUseScreenPrefs(true, hDisplayState) == noErr);
// DMEndConfigureDisplays(hDisplayState);
// return true;
//#else
// hmmmmm....
return true;
// return true;
//#endif
#endif
}
//0 & NULL for params 2 & 3 of DMSetVideoMode signal it to use defaults (current mode)
@@ -548,7 +580,7 @@ bool wxDisplay::ChangeMode(const wxVideoMode& mode)
OSErr err;
err = DMGetDisplayIDByGDevice(m_priv->m_hndl, &nDisplayID, false);
wxASSERT(err == noErr);
verify_noerr( err );
// Create a new list...
err = DMNewDisplayModeList(nDisplayID, NULL, NULL, &nNumModes, &pModes);
@@ -561,10 +593,11 @@ bool wxDisplay::ChangeMode(const wxVideoMode& mode)
sModeInfo.bMatched = false;
sModeInfo.pMode = &mode;
unsigned int i;
for (i = 0; i < nNumModes; ++i)
{
err = DMGetIndexedDisplayModeFromList(pModes, i, NULL, uppMLI, &sModeInfo);
wxASSERT(err == noErr);
verify_noerr( err );
if (sModeInfo.bMatched)
{
@@ -572,13 +605,14 @@ bool wxDisplay::ChangeMode(const wxVideoMode& mode)
break;
}
}
if (i == nNumModes)
return false;
DisposeDMDisplayModeListIteratorUPP(uppMLI);
err = DMDisposeList(pModes);
wxASSERT(err == noErr);
verify_noerr( err );
// For the really paranoid -
// unsigned long flags;
@@ -591,26 +625,34 @@ bool wxDisplay::ChangeMode(const wxVideoMode& mode)
if (DMBeginConfigureDisplays(&hDisplayState) != noErr)
{
wxLogSysError(wxT("Could not lock display for display mode changing!"));
return false;
}
unsigned long dwBPP = (unsigned long) mode.bpp;
if (DMSetDisplayMode(m_priv->m_hndl, sMode.csData,
(unsigned long*) &(dwBPP), NULL
//(unsigned long) &sMode
, hDisplayState
) != noErr)
err = DMSetDisplayMode(
m_priv->m_hndl, sMode.csData,
(unsigned long*) &(dwBPP),
NULL, //(unsigned long) &sMode
hDisplayState );
if (err != noErr)
{
DMEndConfigureDisplays(hDisplayState);
wxMessageBox( wxString::Format(wxT("Could not set the display mode")) );
return false;
}
DMEndConfigureDisplays(hDisplayState);
}
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));
return false;
}