Eliminated old custom code for ignoresMouseEvents that isn't needed under 10.3+

[ITKit.git] / ITTransientStatusWindow.m

diff --git a/ITTransientStatusWindow.m b/ITTransientStatusWindow.m
old mode 100755 (executable)
new mode 100644 (file)
index 92eba65..24aa83b
--- a/ITTransientStatusWindow.m
+++ b/ITTransientStatusWindow.m
@@ -3,7 +3,7 @@
 #import <ApplicationServices/ApplicationServices.h>
 #import "ITCoreGraphicsHacks.h"
 #import "ITTextField.h"
 #import <ApplicationServices/ApplicationServices.h>
 #import "ITCoreGraphicsHacks.h"
 #import "ITTextField.h"

-#import "ITGrayRoundedView.h"
+#import "ITTSWBackgroundView.h"

 
 #define EFFECT_FPS 30.0
 
 
 #define EFFECT_FPS 30.0
 


@@ -86,6 +86,7 @@ static ITTransientStatusWindow *staticWindow = nil;
         _exitEffect          = nil;
         _reallyIgnoresEvents = YES;
         _exitTimer           = nil;
         _exitEffect          = nil;
         _reallyIgnoresEvents = YES;
         _exitTimer           = nil;

+               [self setScreen:[NSScreen mainScreen]];

 
 //      if ( _backgroundType == ITTransientStatusWindowRounded ) {
 //          _contentSubView = contentView;
 
 //      if ( _backgroundType == ITTransientStatusWindowRounded ) {
 //          _contentSubView = contentView;


@@ -101,31 +102,46 @@ static ITTransientStatusWindow *staticWindow = nil;
     return self;
 }
 
     return self;
 }
 

+- (void)dealloc
+{
+       [_screen release];
+       [super dealloc];
+}

 
 /*************************************************************************/
 #pragma mark -
 #pragma mark INSTANCE METHODS
 /*************************************************************************/
 
 
 /*************************************************************************/
 #pragma mark -
 #pragma mark INSTANCE METHODS
 /*************************************************************************/
 

-- (BOOL)ignoresMouseEvents
+/*- (BOOL)ignoresMouseEvents

 {
     return _reallyIgnoresEvents;
 }
 
 - (void)setIgnoresMouseEvents:(BOOL)flag
 {
 {
     return _reallyIgnoresEvents;
 }
 
 - (void)setIgnoresMouseEvents:(BOOL)flag
 {

-    CGSValueObj         key;
-    CGSValueObj         ignore;
+    //CGSValueObj       key;
+    //CGSValueObj       ignore;
+       CGSWindowTag tags;

 
     key = CGSCreateCString("IgnoreForEvents");
     ignore = CGSCreateBoolean( (flag ? kCGSTrue : kCGSFalse) );
     CGSSetWindowProperty([NSApp contextID], (CGSWindowID)[self windowNumber], key, ignore);
     CGSReleaseObj(key);
     CGSReleaseObj(ignore);
 
     key = CGSCreateCString("IgnoreForEvents");
     ignore = CGSCreateBoolean( (flag ? kCGSTrue : kCGSFalse) );
     CGSSetWindowProperty([NSApp contextID], (CGSWindowID)[self windowNumber], key, ignore);
     CGSReleaseObj(key);
     CGSReleaseObj(ignore);

+       
+       CGSGetWindowTags([NSApp contextID], (CGSWindowID)[self windowNumber], &tags, 32);

 
 

-    _reallyIgnoresEvents = flag;
-}
+       if (flag) {
+               tags = tags | CGSTagTransparent;
+       } else {
+               tags = tags & CGSTagTransparent;
+       }
+NSLog(@"ignore? %i", flag);
+       CGSSetWindowTags([NSApp contextID], (CGSWindowID)[self windowNumber], &tags, 32);

 
 

+    _reallyIgnoresEvents = flag;
+}*/

 
 /*
 
 
 /*
 


@@ -184,6 +200,27 @@ static ITTransientStatusWindow *staticWindow = nil;
     }
 }
 
     }
 }
 

+- (void)setScreen:(NSScreen *)newScreen
+{
+       [_screen release];
+       _screen = [newScreen retain];
+}
+
+- (NSScreen *)screen
+{
+       return _screen;
+}
+
+- (void)setSizing:(ITTransientStatusWindowSizing)newSizing
+{
+    _sizing = newSizing;
+}
+
+- (ITTransientStatusWindowSizing)sizing
+{
+    return _sizing;
+}
+

 - (ITWindowVisibilityState)visibilityState
 {
     return _visibilityState;
 - (ITWindowVisibilityState)visibilityState
 {
     return _visibilityState;


@@ -322,7 +359,7 @@ static ITTransientStatusWindow *staticWindow = nil;
 - (void)rebuildWindow;
 {
     if ( _backgroundType == ITTransientStatusWindowRounded ) {
 - (void)rebuildWindow;
 {
     if ( _backgroundType == ITTransientStatusWindowRounded ) {

-        ITGrayRoundedView *roundedView = [[[ITGrayRoundedView alloc] initWithFrame:[self frame]] autorelease];
+        ITTSWBackgroundView *roundedView = [[[ITTSWBackgroundView alloc] initWithFrame:[self frame]] autorelease];

 
         [self setBackgroundColor:[NSColor clearColor]];
         [self setHasShadow:NO];
 
         [self setBackgroundColor:[NSColor clearColor]];
         [self setHasShadow:NO];