marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

winemac: Simplify display mode code. 

When originalDisplayModes has entries, the app is active.  When the app is
active, latentDisplayModes is empty.
oldstable
Ken Thomases 2014-01-10 03:11:33 -06:00 committed by Alexandre Julliard
parent d4d92a759e
commit ce5a87b1ef
1 changed files with 9 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
dlls/winemac.drv/cocoa_app.m
View File

@ -709,7 +709,6 @@ int macdrv_err_on;
- (BOOL) setMode:(CGDisplayModeRef)mode forDisplay:(CGDirectDisplayID)displayID
{
BOOL ret = FALSE;
BOOL active = [NSApp isActive];
NSNumber* displayIDKey = [NSNumber numberWithUnsignedInt:displayID];
CGDisplayModeRef originalMode;
@ -719,39 +718,28 @@ int macdrv_err_on;
{
if ([originalDisplayModes count] == 1) // If this is the last changed display, do a blanket reset
{
if (active)
{
CGRestorePermanentDisplayConfiguration();
if (!displaysCapturedForFullscreen)
CGReleaseAllDisplays();
}
CGRestorePermanentDisplayConfiguration();
if (!displaysCapturedForFullscreen)
CGReleaseAllDisplays();
[originalDisplayModes removeAllObjects];
[latentDisplayModes removeAllObjects];
ret = TRUE;
}
else // ... otherwise, try to restore just the one display
{
if (active)
mode = [self modeMatchingMode:mode forDisplay:displayID];
if (mode && CGDisplaySetDisplayMode(displayID, mode, NULL) == CGDisplayNoErr)
{
mode = [self modeMatchingMode:mode forDisplay:displayID];
if (mode)
ret = (CGDisplaySetDisplayMode(displayID, mode, NULL) == CGDisplayNoErr);
}
else
{
[latentDisplayModes removeObjectForKey:displayIDKey];
[originalDisplayModes removeObjectForKey:displayIDKey];
ret = TRUE;
}
if (ret)
[originalDisplayModes removeObjectForKey:displayIDKey];
}
}
else
{
CGDisplayModeRef currentMode = NULL;
BOOL active = [NSApp isActive];
CGDisplayModeRef currentMode;
if (!active)
currentMode = CGDisplayModeRetain((CGDisplayModeRef)[latentDisplayModes objectForKey:displayIDKey]);
currentMode = CGDisplayModeRetain((CGDisplayModeRef)[latentDisplayModes objectForKey:displayIDKey]);
if (!currentMode)
currentMode = CGDisplayCopyDisplayMode(displayID);
if (!currentMode) // Invalid display ID
@ -790,7 +778,6 @@ int macdrv_err_on;
else if (![originalDisplayModes count])
{
CGRestorePermanentDisplayConfiguration();
[latentDisplayModes removeAllObjects];
if (!displaysCapturedForFullscreen)
CGReleaseAllDisplays();
}