Changeset 9895 for OpenSceneGraph/trunk/src/osgViewer/GraphicsWindowCocoa.mm

Timestamp:

03/11/09 11:34:29 (4 years ago)

Author:

robert

Message:

Converted tabs to four spaces

Files:

• OpenSceneGraph/trunk/src/osgViewer/GraphicsWindowCocoa.mm (modified) (39 diffs)

OpenSceneGraph/trunk/src/osgViewer/GraphicsWindowCocoa.mm

@@ -143 +143 @@
 std::ostream& operator<<(std::ostream& os, const NSRect& rect) 
 {
-        os << rect.origin.x << "/" << rect.origin.y << " " << rect.size.width << "x" << rect.size.height;
-        return os;
+    os << rect.origin.x << "/" << rect.origin.y << " " << rect.size.width << "x" << rect.size.height;
+    return os;
 }
 
@@ -158 +158 @@
     NSRect frame = [[[NSScreen screens] objectAtIndex: 0] frame];
     float y = frame.size.height - rect.origin.y - rect.size.height;
-        NSRect converted = NSMakeRect(rect.origin.x, y, rect.size.width, rect.size.height);
-        
-        // std::cout << "converting from Quartz " << rect << " to " << converted << " using screen rect " << frame << std::endl;
-        
+    NSRect converted = NSMakeRect(rect.origin.x, y, rect.size.width, rect.size.height);
+    
+    // std::cout << "converting from Quartz " << rect << " to " << converted << " using screen rect " << frame << std::endl;
+    
     return converted;
 }
@@ -170 +170 @@
     
     float y = frame.size.height - (rect.origin.y + rect.size.height);
-        NSRect converted = NSMakeRect(rect.origin.x, y, rect.size.width, rect.size.height);
-        
-        // std::cout << "converting To Quartz   " << rect << " to " << converted << " using screen rect " << frame << std::endl;
-        
+    NSRect converted = NSMakeRect(rect.origin.x, y, rect.size.width, rect.size.height);
+    
+    // std::cout << "converting To Quartz   " << rect << " to " << converted << " using screen rect " << frame << std::endl;
+    
     return converted;
 }
@@ -245 +245 @@
         BOOL _isUsingCtrlClick, _isUsingOptionClick;
         unsigned int _cachedModifierFlags;
-                BOOL _handleTabletEvents;
+        BOOL _handleTabletEvents;
         
 }
@@ -362 +362 @@
 
 - (void)flagsChanged:(NSEvent *)theEvent {
-        [self handleModifiers: theEvent];
+    [self handleModifiers: theEvent];
 }
 
@@ -393 +393 @@
         [self doLeftMouseButtonDown:theEvent];
     }
-        
-        if ([theEvent subtype] == NSTabletPointEventSubtype) {
-                _handleTabletEvents = true;
-                [self handleTabletEvents:theEvent];
-        }
+    
+    if ([theEvent subtype] == NSTabletPointEventSubtype) {
+        _handleTabletEvents = true;
+        [self handleTabletEvents:theEvent];
+    }
 }
 
@@ -405 +405 @@
     NSPoint converted_point = [self getLocalPoint: theEvent];    
     _win->getEventQueue()->mouseMotion(converted_point.x, converted_point.y);
-        
-        if (_handleTabletEvents)
-                [self handleTabletEvents:theEvent];
+    
+    if (_handleTabletEvents)
+        [self handleTabletEvents:theEvent];
 }
 
@@ -431 +431 @@
         [self doLeftMouseButtonUp:theEvent];
     }
-        _handleTabletEvents = false;
+    _handleTabletEvents = false;
 }
 
@@ -449 +449 @@
 {
     [self doRightMouseButtonUp:theEvent];
-        _handleTabletEvents = false;
+    _handleTabletEvents = false;
 }
 
@@ -638 +638 @@
 - (void)tabletPoint:(NSEvent *)theEvent
 {
-        //_handleTabletEvents = YES;
-        //[self handleTabletEvents:theEvent];
+    //_handleTabletEvents = YES;
+    //[self handleTabletEvents:theEvent];
 }
 
 -(void)handleTabletEvents:(NSEvent *)theEvent
 {
-        float pressure = [theEvent pressure];
-        _win->getEventQueue()->penPressure(pressure);
-        NSPoint tilt = [theEvent tilt];
-        
-        _win->getEventQueue()->penOrientation (tilt.x, tilt.y, [theEvent rotation]);
+    float pressure = [theEvent pressure];
+    _win->getEventQueue()->penPressure(pressure);
+    NSPoint tilt = [theEvent tilt];
+    
+    _win->getEventQueue()->penOrientation (tilt.x, tilt.y, [theEvent rotation]);
 }
 
@@ -654 +654 @@
 - (void)tabletProximity:(NSEvent *)theEvent
 {
-        osgGA::GUIEventAdapter::TabletPointerType pt(osgGA::GUIEventAdapter::UNKNOWN);
-        switch ([theEvent pointingDeviceType]) {
-                case NSPenPointingDevice:
-                        pt = osgGA::GUIEventAdapter::PEN;
-                        break;
-                case NSCursorPointingDevice:
-                        pt = osgGA::GUIEventAdapter::PUCK;
-                        break;
-                case NSEraserPointingDevice:
-                        pt = osgGA::GUIEventAdapter::ERASER;
-                        break;
-                default:
-                        break;
-        }
-        _win->getEventQueue()->penProximity(pt, [theEvent isEnteringProximity]); 
+    osgGA::GUIEventAdapter::TabletPointerType pt(osgGA::GUIEventAdapter::UNKNOWN);
+    switch ([theEvent pointingDeviceType]) {
+        case NSPenPointingDevice:
+            pt = osgGA::GUIEventAdapter::PEN;
+            break;
+        case NSCursorPointingDevice:
+            pt = osgGA::GUIEventAdapter::PUCK;
+            break;
+        case NSEraserPointingDevice:
+            pt = osgGA::GUIEventAdapter::ERASER;
+            break;
+        default:
+            break;
+    }
+    _win->getEventQueue()->penProximity(pt, [theEvent isEnteringProximity]); 
 }
 
@@ -762 +762 @@
     
     virtual bool valid() { return (_win.valid() && _win->valid()); }
-        
+    
     virtual void getWindowBounds(CGRect& rect) 
     {
@@ -773 +773 @@
         rect.size.height = nsrect.size.height;
     }
-        
+    
     virtual osgViewer::GraphicsWindow* getWindow() {return _win.get(); }
 private:
@@ -808 +808 @@
 
     [win setReleasedWhenClosed:NO];
-        [win setDisplaysWhenScreenProfileChanges:YES];  
+    [win setDisplaysWhenScreenProfileChanges:YES];    
     GraphicsWindowCocoaDelegate* delegate = [[GraphicsWindowCocoaDelegate alloc] initWith: this];
     [win setDelegate: delegate ];
     //[delegate autorelease];
-            
+        
     [win makeKeyAndOrderFront:nil];
     [win setAcceptsMouseMovedEvents: YES];
@@ -836 +836 @@
             style |= NSResizableWindowMask;
     }
-        
+        
     DarwinWindowingSystemInterface* wsi = dynamic_cast<DarwinWindowingSystemInterface*>(osg::GraphicsContext::getWindowingSystemInterface());
     int screenLeft(0), screenTop(0);
@@ -843 +843 @@
     }
     
-        NSRect rect = NSMakeRect(_traits->x + screenLeft, _traits->y + screenTop, _traits->width, _traits->height);
-    
-        _window = [[GraphicsWindowCocoaWindow alloc] initWithContentRect: rect styleMask: style backing: NSBackingStoreBuffered defer: NO];
-        
+    NSRect rect = NSMakeRect(_traits->x + screenLeft, _traits->y + screenTop, _traits->width, _traits->height);
+    
+    _window = [[GraphicsWindowCocoaWindow alloc] initWithContentRect: rect styleMask: style backing: NSBackingStoreBuffered defer: NO];
+    
     if (!_window) {
         osg::notify(osg::WARN) << "GraphicsWindowCocoa::realizeImplementation :: could not create window" << std::endl;
@@ -854 +854 @@
     rect = convertFromQuartzCoordinates(rect);
     [_window setFrameOrigin: rect.origin];
-         
-        NSOpenGLPixelFormatAttribute attr[32];
+     
+    NSOpenGLPixelFormatAttribute attr[32];
     int i = 0;
     
@@ -902 +902 @@
         }
     }
-        
-        NSOpenGLPixelFormat* pixelformat = [[NSOpenGLPixelFormat alloc] initWithAttributes:attr ];
+    
+    NSOpenGLPixelFormat* pixelformat = [[NSOpenGLPixelFormat alloc] initWithAttributes:attr ];
     _context = [[NSOpenGLContext alloc] initWithFormat: pixelformat shareContext: sharedContext];
     
@@ -910 +910 @@
         return false;
     }
-        GraphicsWindowCocoaGLView* theView = [[ GraphicsWindowCocoaGLView alloc ] initWithFrame:[ _window frame ] ];
+    GraphicsWindowCocoaGLView* theView = [[ GraphicsWindowCocoaGLView alloc ] initWithFrame:[ _window frame ] ];
     [theView setAutoresizingMask:  (NSViewWidthSizable | NSViewHeightSizable) ];
     [theView setGraphicsWindowCocoa: this];
     [theView setOpenGLContext:_context];
-        [_window setContentView: theView];
-        
+    [_window setContentView: theView];
+    
     setupNSWindow(_window);
     
     [theView release];
     [pool release];
-        
+    
     MenubarController::instance()->attachWindow( new CocoaWindowAdapter(this) );
     
@@ -951 +951 @@
     if (mbc) mbc->detachWindow(this);
     
-        [_window close];
+    [_window close];
     [_window release];
 }
@@ -962 +962 @@
 bool GraphicsWindowCocoa:: makeCurrentImplementation()
 {
-        [_context makeCurrentContext];
-        return true;
+    [_context makeCurrentContext];
+    return true;
 }
 
@@ -973 +973 @@
 bool GraphicsWindowCocoa::releaseContextImplementation()
 {
-        [NSOpenGLContext clearCurrentContext];
-        return true;
+    [NSOpenGLContext clearCurrentContext];
+    return true;
 }
 
@@ -984 +984 @@
 void GraphicsWindowCocoa::swapBuffersImplementation()
 {
-        [_context flushBuffer];
+    [_context flushBuffer];
 }
 
@@ -994 +994 @@
 void GraphicsWindowCocoa::checkEvents()
 {
-        NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
     
     while(1)
@@ -1013 +1013 @@
             break;
         [[NSApplication sharedApplication] sendEvent: event];
-    }   
+    }    
     
     if (_closeRequested)
@@ -1023 +1023 @@
     }
         
-        [pool release];
+    [pool release];
 }
 
@@ -1038 +1038 @@
 {
     if (!_realized) return false;
-        
+    
     unsigned int style(NSBorderlessWindowMask);
     
@@ -1048 +1048 @@
             style |= NSResizableWindowMask;
     }
-        NSRect rect = [_window contentRectForFrameRect: [_window frame] ];
-        GraphicsWindowCocoaWindow* new_win = [[GraphicsWindowCocoaWindow alloc] initWithContentRect: rect styleMask: style backing: NSBackingStoreBuffered defer: NO];
+    NSRect rect = [_window contentRectForFrameRect: [_window frame] ];
+    GraphicsWindowCocoaWindow* new_win = [[GraphicsWindowCocoaWindow alloc] initWithContentRect: rect styleMask: style backing: NSBackingStoreBuffered defer: NO];
     
     if (new_win) {
@@ -1062 +1062 @@
     }
     
-        return true;
+    return true;
 }
 
@@ -1071 +1071 @@
 void GraphicsWindowCocoa::grabFocus()
 {
-        [_window makeKeyAndOrderFront: nil];
+    [_window makeKeyAndOrderFront: nil];
 }
 
@@ -1080 +1080 @@
 void GraphicsWindowCocoa::grabFocusIfPointerInWindow()
 {
-        osg::notify(osg::INFO) << "GraphicsWindowCocoa :: grabFocusIfPointerInWindow not implemented yet " << std::endl;
+    osg::notify(osg::INFO) << "GraphicsWindowCocoa :: grabFocusIfPointerInWindow not implemented yet " << std::endl;
 }
 
@@ -1090 +1090 @@
 void GraphicsWindowCocoa::resizedImplementation(int x, int y, int width, int height)
 {
-        std::cout << "resized implementation" << x << " " << y << " " << width << " " << height << std::endl; 
-        GraphicsContext::resizedImplementation(x, y, width, height);
+    std::cout << "resized implementation" << x << " " << y << " " << width << " " << height << std::endl; 
+    GraphicsContext::resizedImplementation(x, y, width, height);
    
     [_context update];
     MenubarController::instance()->update();
-        getEventQueue()->windowResize(x,y,width, height, getEventQueue()->getTime());
+    getEventQueue()->windowResize(x,y,width, height, getEventQueue()->getTime());
 }
 
@@ -1106 +1106 @@
 bool GraphicsWindowCocoa::setWindowRectangleImplementation(int x, int y, int width, int height)
 {
-        DarwinWindowingSystemInterface* wsi = dynamic_cast<DarwinWindowingSystemInterface*>(osg::GraphicsContext::getWindowingSystemInterface());
+    DarwinWindowingSystemInterface* wsi = dynamic_cast<DarwinWindowingSystemInterface*>(osg::GraphicsContext::getWindowingSystemInterface());
     int screenLeft(0), screenTop(0);
     if (wsi) {
@@ -1131 +1131 @@
 {
 
-        DarwinWindowingSystemInterface* wsi = dynamic_cast<DarwinWindowingSystemInterface*>(osg::GraphicsContext::getWindowingSystemInterface());
+    DarwinWindowingSystemInterface* wsi = dynamic_cast<DarwinWindowingSystemInterface*>(osg::GraphicsContext::getWindowingSystemInterface());
     int screenLeft(0), screenTop(0);
     if (wsi) {
-                
-                // get the screen containing the window
-                unsigned int screenNdx = wsi->getScreenContaining(x,y,w,h);
-                
-                // update traits
-                _traits->screenNum = screenNdx;
-                
-                // get top left of screen
+        
+        // get the screen containing the window
+        unsigned int screenNdx = wsi->getScreenContaining(x,y,w,h);
+        
+        // update traits
+        _traits->screenNum = screenNdx;
+        
+        // get top left of screen
         wsi->getScreenTopLeft((*_traits), screenLeft, screenTop);
     }
-        
-        resized(x-screenLeft,y-screenTop,w,h);
+    
+    resized(x-screenLeft,y-screenTop,w,h);
 }
 
@@ -1155 +1155 @@
 void GraphicsWindowCocoa::setWindowName (const std::string & name)
 {
-        NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
     
     NSString* title = [NSString stringWithCString: name.c_str() encoding: NSUTF8StringEncoding];
-        [_window setTitle: title];
-        [title release];
+    [_window setTitle: title];
+    [title release];
     [pool release];
 }
@@ -1170 +1170 @@
 void GraphicsWindowCocoa::useCursor(bool cursorOn)
 {
-        if (_traits.valid())
+    if (_traits.valid())
         _traits->useCursor = cursorOn;
     DarwinWindowingSystemInterface* wsi = dynamic_cast<DarwinWindowingSystemInterface*>(osg::GraphicsContext::getWindowingSystemInterface());
@@ -1201 +1201 @@
 void GraphicsWindowCocoa::setCursor(MouseCursor mouseCursor)
 {
-        switch (mouseCursor) 
+    switch (mouseCursor) 
     {
 
@@ -1233 +1233 @@
 {
     GLint VBL(f?1:0);
-        [_context setValues:&VBL forParameter:NSOpenGLCPSwapInterval];
+    [_context setValues:&VBL forParameter:NSOpenGLCPSwapInterval];
 }
 
@@ -1254 +1254 @@
 
 struct CocoaWindowingSystemInterface : public DarwinWindowingSystemInterface {
-        
-        CocoaWindowingSystemInterface()
-        :       DarwinWindowingSystemInterface() 
-        {
-                localPool = [[NSAutoreleasePool alloc] init];
+    
+    CocoaWindowingSystemInterface()
+    :    DarwinWindowingSystemInterface() 
+    {
+        localPool = [[NSAutoreleasePool alloc] init];
         [[NSApplication sharedApplication] setDelegate: [[CocoaAppDelegate alloc] init] ];
-        }
-        
-        virtual osg::GraphicsContext* createGraphicsContext(osg::GraphicsContext::Traits* traits) 
-        {
-                return createGraphicsContextImplementation<PixelBufferCocoa, GraphicsWindowCocoa>(traits);
-        }
-        
-        virtual ~CocoaWindowingSystemInterface() 
-        {
-                [localPool release];
-        }
-        
-        NSAutoreleasePool *localPool;
+    }
+    
+    virtual osg::GraphicsContext* createGraphicsContext(osg::GraphicsContext::Traits* traits) 
+    {
+        return createGraphicsContextImplementation<PixelBufferCocoa, GraphicsWindowCocoa>(traits);
+    }
+    
+    virtual ~CocoaWindowingSystemInterface() 
+    {
+        [localPool release];
+    }
+    
+    NSAutoreleasePool *localPool;
 
 };