X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2894667fa4e04628bcb3cae98a3dbd9cb80593ea..eb537cfb1cc0066c0d53a2415972afa6e303c4b5:/src/cocoa/dc.mm diff --git a/src/cocoa/dc.mm b/src/cocoa/dc.mm index b6c71aaca8..44762feba2 100644 --- a/src/cocoa/dc.mm +++ b/src/cocoa/dc.mm @@ -9,8 +9,13 @@ // Licence: wxWindows license ///////////////////////////////////////////////////////////////////////////// -#include "wx/dc.h" -#include "wx/log.h" +#include "wx/wxprec.h" +#ifndef WX_PRECOMP + #include "wx/log.h" + #include "wx/dc.h" +#endif //WX_PRECOMP + +#include "wx/cocoa/autorelease.h" #import #import @@ -20,12 +25,48 @@ #import #import #import +#import + +#include +WX_DEFINE_LIST(wxCocoaDCStack); IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject) -wxDC *wxDC::sm_focusedDC = NULL; WX_NSTextStorage wxDC::sm_cocoaNSTextStorage = nil; WX_NSLayoutManager wxDC::sm_cocoaNSLayoutManager = nil; WX_NSTextContainer wxDC::sm_cocoaNSTextContainer = nil; +wxCocoaDCStack wxDC::sm_cocoaDCStack; + +inline void CocoaSetPenForNSBezierPath(wxPen &pen, NSBezierPath *bezpath) +{ + [pen.GetNSColor() set]; + const float *pattern; + [bezpath setLineDash:pattern count:pen.GetCocoaLineDash(&pattern) phase:0.0]; + [bezpath setLineWidth:pen.GetWidth()]; + switch(pen.GetJoin()) + { + case wxJOIN_BEVEL: + [bezpath setLineJoinStyle:NSBevelLineJoinStyle]; + break; + case wxJOIN_ROUND: + [bezpath setLineJoinStyle:NSRoundLineJoinStyle]; + break; + case wxJOIN_MITER: + [bezpath setLineJoinStyle:NSMiterLineJoinStyle]; + break; + } + switch(pen.GetCap()) + { + case wxCAP_ROUND: + [bezpath setLineCapStyle:NSRoundLineCapStyle]; + break; + case wxCAP_PROJECTING: + [bezpath setLineCapStyle:NSSquareLineCapStyle]; + break; + case wxCAP_BUTT: + [bezpath setLineCapStyle:NSButtLineCapStyle]; + break; + } +} void wxDC::CocoaInitializeTextSystem() { @@ -54,30 +95,115 @@ void wxDC::CocoaShutdownTextSystem() [sm_cocoaNSTextStorage release]; sm_cocoaNSTextStorage = nil; } +void wxDC::CocoaUnwindStackAndLoseFocus() +{ + wxCocoaDCStack::Node *ourNode=sm_cocoaDCStack.Find(this); + if(ourNode) + { + wxCocoaDCStack::Node *node=sm_cocoaDCStack.GetFirst(); + for(;node!=ourNode; node=sm_cocoaDCStack.GetFirst()) + { + wxDC *dc = node->GetData(); + wxASSERT(dc); + wxASSERT(dc!=this); + if(!dc->CocoaUnlockFocus()) + { + wxFAIL_MSG("Unable to unlock focus on higher-level DC!"); + } + sm_cocoaDCStack.DeleteNode(node); + } + wxASSERT(node==ourNode); + wxASSERT(ourNode->GetData() == this); + ourNode->GetData()->CocoaUnlockFocus(); + sm_cocoaDCStack.DeleteNode(ourNode); + } +} + +bool wxDC::CocoaUnwindStackAndTakeFocus() +{ + wxCocoaDCStack::Node *node=sm_cocoaDCStack.GetFirst(); + for(;node;node = sm_cocoaDCStack.GetFirst()) + { + wxDC *dc = node->GetData(); + wxASSERT(dc); + // If we're on the stack, then it's unwound enough and we have focus + if(dc==this) + return true; + // If unable to unlockFocus (e.g. wxPaintDC) stop here + if(!dc->CocoaUnlockFocus()) + break; + sm_cocoaDCStack.DeleteNode(node); + } + return CocoaLockFocus(); +} + wxDC::wxDC(void) { + m_cocoaFlipped = false; + m_cocoaHeight = 0.0; + m_pen = *wxBLACK_PEN; } wxDC::~wxDC(void) { } +bool wxDC::CocoaLockFocus() +{ + return false; +} + +bool wxDC::CocoaUnlockFocus() +{ + return false; +} + +void wxDC::CocoaApplyTransformations() +{ + // This transform flips the graphics since wxDC uses top-left origin + if(!m_cocoaFlipped) + { + // The transform is auto released + NSAffineTransform *transform = [NSAffineTransform transform]; + /* x' = 1x + 0y + 0 + y' = 0x + -1y + window's height + */ + NSAffineTransformStruct matrix = { + 1, 0 + , 0, -1 + , 0, m_cocoaHeight + }; + [transform setTransformStruct: matrix]; + // Apply the transform + [transform concat]; + } + // TODO: Apply scaling transformation +} + void wxDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height) { + if(!CocoaTakeFocus()) return; NSBezierPath *bezpath = [NSBezierPath bezierPathWithRect:NSMakeRect(x,y,width,height)]; + CocoaSetPenForNSBezierPath(m_pen,bezpath); [bezpath stroke]; + [m_brush.GetNSColor() set]; + [bezpath fill]; } void wxDC::DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2) { + if(!CocoaTakeFocus()) return; NSBezierPath *bezpath = [NSBezierPath bezierPath]; [bezpath moveToPoint:NSMakePoint(x1,y1)]; [bezpath lineToPoint:NSMakePoint(x2,y2)]; + + CocoaSetPenForNSBezierPath(m_pen,bezpath); [bezpath stroke]; } void wxDC::DoGetTextExtent(const wxString& text, wxCoord *x, wxCoord *y, wxCoord *descent, wxCoord *externalLeading, wxFont *theFont) const { + wxAutoNSAutoreleasePool pool; // FIXME: Cache this so it can be used for DoDrawText wxASSERT_MSG(sm_cocoaNSTextStorage && sm_cocoaNSLayoutManager && sm_cocoaNSTextContainer, "Text system has not been initialized. BAD PROGRAMMER!"); NSAttributedString *attributedString = [[NSAttributedString alloc] @@ -88,9 +214,9 @@ void wxDC::DoGetTextExtent(const wxString& text, wxCoord *x, wxCoord *y, wxCoord NSRange glyphRange = [sm_cocoaNSLayoutManager glyphRangeForTextContainer:sm_cocoaNSTextContainer]; NSRect usedRect = [sm_cocoaNSLayoutManager usedRectForTextContainer:sm_cocoaNSTextContainer]; if(x) - *x=usedRect.size.width; + *x=(int)usedRect.size.width; if(y) - *y=usedRect.size.height; + *y=(int)usedRect.size.height; if(descent) *descent=0; if(externalLeading) @@ -99,15 +225,34 @@ void wxDC::DoGetTextExtent(const wxString& text, wxCoord *x, wxCoord *y, wxCoord void wxDC::DoDrawText(const wxString& text, wxCoord x, wxCoord y) { + if(!CocoaTakeFocus()) return; wxASSERT_MSG(sm_cocoaNSTextStorage && sm_cocoaNSLayoutManager && sm_cocoaNSTextContainer, "Text system has not been initialized. BAD PROGRAMMER!"); NSAttributedString *attributedString = [[NSAttributedString alloc] initWithString:[NSString stringWithCString:text.c_str()]]; [sm_cocoaNSTextStorage setAttributedString:attributedString]; [attributedString release]; + // Set the color (and later font) attributes + NSColor *fgColor = m_textForegroundColour.GetNSColor(); + NSColor *bgColor = m_textBackgroundColour.GetNSColor(); + if(!fgColor) + fgColor = [NSColor clearColor]; + if(!bgColor) + bgColor = [NSColor clearColor]; + NSDictionary *attrDict = [[NSDictionary alloc] initWithObjectsAndKeys: + fgColor, NSForegroundColorAttributeName, + bgColor, NSBackgroundColorAttributeName, + nil]; + [sm_cocoaNSTextStorage addAttributes: attrDict range:NSMakeRange(0,[sm_cocoaNSTextStorage length])]; + [attrDict release]; + NSRange glyphRange = [sm_cocoaNSLayoutManager glyphRangeForTextContainer:sm_cocoaNSTextContainer]; NSRect usedRect = [sm_cocoaNSLayoutManager usedRectForTextContainer:sm_cocoaNSTextContainer]; - + // NOTE: We'll crash trying to get the location of glyphAtIndex:0 if + // there is no length or we don't start at zero + if(!glyphRange.length) + return; + wxASSERT_MSG(glyphRange.location==0,"glyphRange must begin at zero"); NSAffineTransform *transform = [NSAffineTransform transform]; [transform translateXBy:x yBy:y]; @@ -127,6 +272,7 @@ void wxDC::DoDrawText(const wxString& text, wxCoord x, wxCoord y) [context saveGraphicsState]; [transform concat]; [flipTransform concat]; + #if 0 // Draw+fill a rectangle so we can see where the shit is supposed to be. wxLogDebug("(%f,%f) (%fx%f)",usedRect.origin.x,usedRect.origin.y,usedRect.size.width,usedRect.size.height); NSBezierPath *bezpath = [NSBezierPath bezierPathWithRect:NSMakeRect(0,0,usedRect.size.width,usedRect.size.height)]; @@ -134,12 +280,14 @@ void wxDC::DoDrawText(const wxString& text, wxCoord x, wxCoord y) [bezpath stroke]; [[NSColor blueColor] set]; [bezpath fill]; + #endif NSPoint layoutLocation = [sm_cocoaNSLayoutManager locationForGlyphAtIndex:0]; layoutLocation.x = 0.0; layoutLocation.y *= -1.0; layoutLocation.y += [[sm_cocoaNSLayoutManager typesetter] baselineOffsetInLayoutManager:sm_cocoaNSLayoutManager glyphIndex:0]; - // NOTE: That's NSMakePoint, not NSMakePint (working on that though) + if(m_backgroundMode==wxSOLID) + [sm_cocoaNSLayoutManager drawBackgroundForGlyphRange:glyphRange atPoint:NSZeroPoint]; [sm_cocoaNSLayoutManager drawGlyphsForGlyphRange:glyphRange atPoint:layoutLocation]; [context restoreGraphicsState]; @@ -156,6 +304,16 @@ int wxDCBase::DeviceToLogicalY(int y) const return y; } +int wxDCBase::DeviceToLogicalXRel(int x) const +{ + return x; +} + +int wxDCBase::DeviceToLogicalYRel(int y) const +{ + return y; +} + int wxDCBase::LogicalToDeviceX(int x) const { return x; @@ -166,6 +324,16 @@ int wxDCBase::LogicalToDeviceY(int y) const return y; } +int wxDCBase::LogicalToDeviceXRel(int x) const +{ + return x; +} + +int wxDCBase::LogicalToDeviceYRel(int y) const +{ + return y; +} + /////////////////////////////////////////////////////////////////////////// // cut here, the rest is stubs /////////////////////////////////////////////////////////////////////////// @@ -228,7 +396,7 @@ wxCoord wxDC::GetCharWidth() const bool wxDC::CanDrawBitmap() const { - return false; + return true; } bool wxDC::DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const @@ -242,10 +410,12 @@ void wxDC::DoDrawArc(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2, wxCoord xc, void wxDC::SetPen(const wxPen& pen) { + m_pen = pen; } void wxDC::SetBrush(const wxBrush& brush) { + m_brush = brush; } void wxDC::DoSetClippingRegionAsRegion(const wxRegion& region) @@ -278,6 +448,49 @@ void wxDC::DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height) void wxDC::DoDrawBitmap(const wxBitmap &bmp, wxCoord x, wxCoord y, bool useMask) { + if(!CocoaTakeFocus()) return; + if(!bmp.Ok()) + return; + +#if 0 + // Draw a rect so we can see where it's supposed to be + wxLogDebug("image at (%d,%d) size %dx%d",x,y,bmp.GetWidth(),bmp.GetHeight()); + NSBezierPath *bezpath = [NSBezierPath bezierPathWithRect:NSMakeRect(x,y,bmp.GetWidth(),bmp.GetHeight())]; + [[NSColor blackColor] set]; + [bezpath stroke]; + [[NSColor blueColor] set]; + [bezpath fill]; +#endif // 0 + + NSAffineTransform *transform = [NSAffineTransform transform]; + [transform translateXBy:x yBy:y]; + + NSAffineTransform *flipTransform = [NSAffineTransform transform]; + /* x' = 1x + 0y + 0 + y' = 0x + -1y + window's height + */ + NSAffineTransformStruct matrix = { + 1, 0 + , 0, -1 + , 0, bmp.GetHeight() + }; + [flipTransform setTransformStruct: matrix]; + + NSGraphicsContext *context = [NSGraphicsContext currentContext]; + [context saveGraphicsState]; + [transform concat]; + [flipTransform concat]; + + NSImage *nsimage = [[NSImage alloc] + initWithSize:NSMakeSize(bmp.GetWidth(), bmp.GetHeight())]; + [nsimage addRepresentation: const_cast(bmp).GetNSBitmapImageRep()]; + [nsimage drawAtPoint: NSMakePoint(0,0) + fromRect: NSMakeRect(0.0,0.0,bmp.GetWidth(),bmp.GetHeight()) + operation: NSCompositeCopy + fraction: 1.0]; + + [nsimage release]; + [context restoreGraphicsState]; } bool wxDC::DoFloodFill(wxCoord x, wxCoord y, const wxColour& col, int style) @@ -291,6 +504,16 @@ void wxDC::DoCrossHair(wxCoord x, wxCoord y) bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height, wxDC *source, wxCoord xsrc, wxCoord ysrc, int rop, bool useMask , wxCoord xsrcMask, wxCoord ysrcMask) +{ + if(!CocoaTakeFocus()) return false; + if(!source) return false; + return source->CocoaDoBlitOnFocusedDC(xdest,ydest,width,height, + xsrc, ysrc, rop, useMask, xsrcMask, ysrcMask); +} + +bool wxDC::CocoaDoBlitOnFocusedDC(wxCoord xdest, wxCoord ydest, + wxCoord width, wxCoord height, wxCoord xsrc, wxCoord ysrc, + int logicalFunc, bool useMask, wxCoord xsrcMask, wxCoord ysrcMask) { return false; } @@ -324,8 +547,9 @@ void wxDC::Clear() { } -void wxDC::SetBackground(const wxBrush&) +void wxDC::SetBackground(const wxBrush& brush) { + m_backgroundBrush = brush; } void wxDC::SetPalette(const wxPalette&)