gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-05-30 16:40:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Small bugfix and performance optimisation.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@27735 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
rfm 2009-01-30 16:27:36 +00:00
parent 49383abd25
commit 4ac3bb0344
4 changed files with 303 additions and 182 deletions
Download patch file Download diff file Expand all files Collapse all files

94
Source/NSScreen.m
View file

@ -72,7 +72,7 @@ static NSMutableArray *screenArray = nil;
+ (void) resetScreens
{
screenArray = nil;
DESTROY(screenArray);
}
/**
@ -260,49 +260,54 @@ static NSMutableArray *screenArray = nil;
*/
- (NSDictionary*) deviceDescription
{
NSMutableDictionary *devDesc;
int bps = 0;
NSSize screenResolution;
NSString *colorSpaceName = nil;
GSDisplayServer *srv;
/*
* This method generates a dictionary from the
* information we have gathered from the screen.
*/
// Set the screen number in the current object.
devDesc = [NSMutableDictionary dictionary];
[devDesc setObject: [NSNumber numberWithInt: _screenNumber]
forKey: @"NSScreenNumber"];
// This is assumed since we are in NSScreen.
[devDesc setObject: @"YES" forKey: NSDeviceIsScreen];
// Add the NSDeviceSize dictionary item
[devDesc setObject: [NSValue valueWithSize: _frame.size]
forKey: NSDeviceSize];
// Add the NSDeviceResolution dictionary item
srv = GSCurrentServer();
if (srv != nil)
if (_reserved == 0)
{
screenResolution = [srv resolutionForScreen: _screenNumber];
[devDesc setObject: [NSValue valueWithSize: screenResolution]
forKey: NSDeviceResolution];
NSMutableDictionary *devDesc;
int bps = 0;
NSSize screenResolution;
NSString *colorSpaceName = nil;
GSDisplayServer *srv;
/*
* This method generates a dictionary from the
* information we have gathered from the screen.
*/
// Set the screen number in the current object.
devDesc = [[NSMutableDictionary alloc] initWithCapacity: 8];
[devDesc setObject: [NSNumber numberWithInt: _screenNumber]
forKey: @"NSScreenNumber"];
// This is assumed since we are in NSScreen.
[devDesc setObject: @"YES" forKey: NSDeviceIsScreen];
// Add the NSDeviceSize dictionary item
[devDesc setObject: [NSValue valueWithSize: _frame.size]
forKey: NSDeviceSize];
// Add the NSDeviceResolution dictionary item
srv = GSCurrentServer();
if (srv != nil)
{
screenResolution = [srv resolutionForScreen: _screenNumber];
[devDesc setObject: [NSValue valueWithSize: screenResolution]
forKey: NSDeviceResolution];
}
// Add the bits per sample entry
bps = NSBitsPerSampleFromDepth(_depth);
[devDesc setObject: [NSNumber numberWithInt: bps]
forKey: NSDeviceBitsPerSample];
// Add the color space entry.
colorSpaceName = NSColorSpaceFromDepth(_depth);
[devDesc setObject: colorSpaceName
forKey: NSDeviceColorSpaceName];
_reserved = (void*)[devDesc copy];
RELEASE(devDesc);
}
// Add the bits per sample entry
bps = NSBitsPerSampleFromDepth(_depth);
[devDesc setObject: [NSNumber numberWithInt: bps]
forKey: NSDeviceBitsPerSample];
// Add the color space entry.
colorSpaceName = NSColorSpaceFromDepth(_depth);
[devDesc setObject: colorSpaceName
forKey: NSDeviceColorSpaceName];
return [NSDictionary dictionaryWithDictionary: devDesc];
return (NSDictionary*)_reserved;
}
// Mac OS X methods
@ -393,7 +398,10 @@ static NSMutableArray *screenArray = nil;
{
NSZoneFree(NSDefaultMallocZone(), _supportedWindowDepths);
}
if (_reserved != 0)
{
[(id)_reserved release];
}
[super dealloc];
}