porting forward scrolling fix

[wxWidgets.git] / src / mac / carbon / font.cpp

diff --git a/src/mac/carbon/font.cpp b/src/mac/carbon/font.cpp
index 1d4d28e4d68e0307bd2274c4acdbba91647a4e6e..e509a7f34b8bbb67545b70bc86deffdd316e6d30 100644 (file)
--- a/src/mac/carbon/font.cpp
+++ b/src/mac/carbon/font.cpp
@@ -15,12 +15,14 @@
 
 #ifndef WX_PRECOMP
     #include "wx/string.h"
 
 #ifndef WX_PRECOMP
     #include "wx/string.h"

+    #include "wx/utils.h"
+    #include "wx/intl.h"
+    #include "wx/gdicmn.h"
+    #include "wx/log.h"

 #endif
 
 #include "wx/fontutil.h"
 #endif
 
 #include "wx/fontutil.h"

-#include "wx/gdicmn.h"
-#include "wx/utils.h"
-#include "wx/fontutil.h"
+#include "wx/graphics.h"

 
 #include "wx/mac/private.h"
 
 
 #include "wx/mac/private.h"
 


@@ -34,7 +36,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)
 
 class WXDLLEXPORT wxFontRefData: public wxGDIRefData
 {
 
 class WXDLLEXPORT wxFontRefData: public wxGDIRefData
 {

-    friend class WXDLLEXPORT wxFont;
+    friend class wxFont;

 
 public:
     wxFontRefData()
 
 public:
     wxFontRefData()


@@ -46,11 +48,14 @@ public:
         , m_underlined(false)
         , m_faceName(wxT("applicationfont"))
         , m_encoding(wxFONTENCODING_DEFAULT)
         , m_underlined(false)
         , m_faceName(wxT("applicationfont"))
         , m_encoding(wxFONTENCODING_DEFAULT)

+#ifdef __LP64__
+#else

         , m_macFontFamily(0)
         , m_macFontSize(0)
         , m_macFontStyle(0)
         , m_macFontFamily(0)
         , m_macFontSize(0)
         , m_macFontStyle(0)

-        , m_macATSUStyle(0)

         , m_macATSUFontID(0)
         , m_macATSUFontID(0)

+#endif
+        , m_macATSUStyle(0)

     {
         Init(m_pointSize, m_family, m_style, m_weight,
              m_underlined, m_faceName, m_encoding);
     {
         Init(m_pointSize, m_family, m_style, m_weight,
              m_underlined, m_faceName, m_encoding);


@@ -66,11 +71,14 @@ public:
         , m_underlined(data.m_underlined)
         , m_faceName(data.m_faceName)
         , m_encoding(data.m_encoding)
         , m_underlined(data.m_underlined)
         , m_faceName(data.m_faceName)
         , m_encoding(data.m_encoding)

+#ifdef __LP64__
+#else

         , m_macFontFamily(data.m_macFontFamily)
         , m_macFontSize(data.m_macFontSize)
         , m_macFontStyle(data.m_macFontStyle)
         , m_macFontFamily(data.m_macFontFamily)
         , m_macFontSize(data.m_macFontSize)
         , m_macFontStyle(data.m_macFontStyle)

-        , m_macATSUStyle(0)

         , m_macATSUFontID(data.m_macATSUFontID)
         , m_macATSUFontID(data.m_macATSUFontID)

+#endif
+        , m_macATSUStyle(0)

     {
         Init(data.m_pointSize, data.m_family, data.m_style, data.m_weight,
              data.m_underlined, data.m_faceName, data.m_encoding);
     {
         Init(data.m_pointSize, data.m_family, data.m_style, data.m_weight,
              data.m_underlined, data.m_faceName, data.m_encoding);


@@ -91,11 +99,14 @@ public:
         , m_underlined(underlined)
         , m_faceName(faceName)
         , m_encoding(encoding)
         , m_underlined(underlined)
         , m_faceName(faceName)
         , m_encoding(encoding)

+#ifdef __LP64__
+#else

         , m_macFontFamily(0)
         , m_macFontSize(0)
         , m_macFontStyle(0)
         , m_macFontFamily(0)
         , m_macFontSize(0)
         , m_macFontStyle(0)

-        , m_macATSUStyle(0)

         , m_macATSUFontID(0)
         , m_macATSUFontID(0)

+#endif
+        , m_macATSUStyle(0)

     {
         Init(size, family, style, weight, underlined, faceName, encoding);
     }
     {
         Init(size, family, style, weight, underlined, faceName, encoding);
     }


@@ -132,6 +143,7 @@ protected:
     bool            m_noAA;      // No anti-aliasing
 
 public:
     bool            m_noAA;      // No anti-aliasing
 
 public:

+#ifndef __LP64__

     FMFontFamily    m_macFontFamily;
     FMFontSize      m_macFontSize;
     FMFontStyle     m_macFontStyle;
     FMFontFamily    m_macFontFamily;
     FMFontSize      m_macFontSize;
     FMFontStyle     m_macFontStyle;


@@ -142,17 +154,22 @@ public:
     // contain some styles (special bold fonts etc) and
     // these are the additional qd styles that are not
     // included in the ATSU font id
     // contain some styles (special bold fonts etc) and
     // these are the additional qd styles that are not
     // included in the ATSU font id

-    ATSUStyle       m_macATSUStyle ;

     ATSUFontID      m_macATSUFontID;
     FMFontStyle     m_macATSUAdditionalQDStyles ;
 
     // for true themeing support we must store the correct font
     // information here, as this speeds up and optimizes rendering
     ThemeFontID     m_macThemeFontID ;
     ATSUFontID      m_macATSUFontID;
     FMFontStyle     m_macATSUAdditionalQDStyles ;
 
     // for true themeing support we must store the correct font
     // information here, as this speeds up and optimizes rendering
     ThemeFontID     m_macThemeFontID ;

-
+#else
+    CTFontRef       m_macFontRef;
+    CTFontUIFontType m_macUIFontType;
+#endif
+    ATSUStyle       m_macATSUStyle ;

     wxNativeFontInfo  m_info;
 };
 
     wxNativeFontInfo  m_info;
 };
 

+#define M_FONTDATA ((wxFontRefData*)m_refData)
+

 
 // ============================================================================
 // implementation
 
 // ============================================================================
 // implementation


@@ -178,15 +195,19 @@ void wxFontRefData::Init(int pointSize,
     m_underlined = underlined;
     m_faceName = faceName;
     m_encoding = encoding;
     m_underlined = underlined;
     m_faceName = faceName;
     m_encoding = encoding;

-
+#ifdef __LP64__
+    m_macUIFontType = kCTFontNoFontType;
+    m_macFontRef = 0;
+#else

     m_macFontFamily = 0 ;
     m_macFontSize = 0;
     m_macFontStyle = 0;
     m_macATSUFontID = 0;
     m_macATSUAdditionalQDStyles = 0 ;
     m_macFontFamily = 0 ;
     m_macFontSize = 0;
     m_macFontStyle = 0;
     m_macATSUFontID = 0;
     m_macATSUAdditionalQDStyles = 0 ;

-    m_macATSUStyle = NULL ;

 
     m_macThemeFontID = kThemeCurrentPortFont ;
 
     m_macThemeFontID = kThemeCurrentPortFont ;

+#endif
+    m_macATSUStyle = NULL ;

     m_noAA = false;
 }
 
     m_noAA = false;
 }
 


@@ -201,9 +222,117 @@ wxFontRefData::~wxFontRefData()
 
 void wxFontRefData::MacFindFont()
 {
 
 void wxFontRefData::MacFindFont()
 {

-    OSStatus status ;
-    
+    OSStatus status = noErr;

     Str255 qdFontName ;
     Str255 qdFontName ;

+
+#ifdef __LP64__
+    if ( m_faceName.empty() && m_family == wxDEFAULT )
+    {
+        m_macUIFontType = kCTFontSystemFontType;
+    }
+    
+    if ( m_macUIFontType != kCTFontNoFontType )
+    {
+        m_macFontRef = CTFontCreateUIFontForLanguage( m_macUIFontType, 0.0, NULL );
+               wxMacCFStringHolder name( CTFontCopyFamilyName( m_macFontRef ) );
+        m_faceName = name.AsString();
+    }
+    else
+    {
+        if ( m_faceName.empty() )
+        {
+            switch ( m_family )
+            {
+                case wxSCRIPT :
+                case wxROMAN :
+                case wxDECORATIVE :
+                    m_faceName = wxT("Times");
+                    break ;
+
+                case wxSWISS :
+                    m_faceName =  wxT("Lucida Grande");
+                    break ;
+
+                case wxMODERN :
+                case wxTELETYPE:
+                    m_faceName =  wxT("Monaco");
+                    break ;
+
+                default:
+                    m_faceName =  wxT("Times");
+                    break ;
+            }
+        }
+
+        wxMacCFStringHolder cf( m_faceName, wxLocale::GetSystemEncoding() );
+        m_macFontRef = CTFontCreateWithName( cf, m_pointSize, NULL);
+    }
+
+    if ( m_macATSUStyle )
+    {
+        ::ATSUDisposeStyle((ATSUStyle)m_macATSUStyle);
+        m_macATSUStyle = NULL ;
+    }
+
+    status = ::ATSUCreateStyle((ATSUStyle *)&m_macATSUStyle);
+    wxASSERT_MSG( status == noErr , wxT("couldn't create ATSU style") );
+
+    ATSUAttributeTag atsuTags[] =
+    {
+        kATSUSizeTag ,
+        kATSUVerticalCharacterTag,
+        kATSUQDBoldfaceTag ,
+        kATSUQDItalicTag ,
+        kATSUQDUnderlineTag ,
+        kATSUQDCondensedTag ,
+        kATSUQDExtendedTag ,
+        kATSUFontTag ,
+    };
+    ByteCount atsuSizes[sizeof(atsuTags) / sizeof(ATSUAttributeTag)] =
+    {
+        sizeof( Fixed ) ,
+        sizeof( ATSUVerticalCharacterType),
+        sizeof( Boolean ) ,
+        sizeof( Boolean ) ,
+        sizeof( Boolean ) ,
+        sizeof( Boolean ) ,
+        sizeof( Boolean ) ,
+        sizeof( ATSUFontID ) ,
+    };
+
+    Boolean kTrue = true ;
+    Boolean kFalse = false ;
+
+    Fixed atsuSize = IntToFixed( m_pointSize );
+       short m_macATSUAdditionalQDStyles = 0;
+    ATSUVerticalCharacterType kHorizontal = kATSUStronglyHorizontal;
+       ATSUFontID atsuFontID = 0;
+       int attributeCount = sizeof(atsuTags) / sizeof(ATSUAttributeTag) ;
+       
+       // attempt to add atsu font 
+#if 0 
+       status = ATSUFindFontFromName(m_faceName.c_str(), strlen(m_faceName.c_str()), kFontFamilyName, kFontNoPlatform, kFontNoScript, kFontNoLanguage, &atsuFontID);
+       if ( status != noErr )
+       {
+               attributeCount--;
+       }
+#endif
+    ATSUAttributeValuePtr    atsuValues[sizeof(atsuTags) / sizeof(ATSUAttributeTag)] =
+    {
+            &atsuSize ,
+            &kHorizontal,
+            (m_macATSUAdditionalQDStyles & bold) ? &kTrue : &kFalse ,
+            (m_macATSUAdditionalQDStyles & italic) ? &kTrue : &kFalse ,
+            (m_macATSUAdditionalQDStyles & underline) ? &kTrue : &kFalse ,
+            (m_macATSUAdditionalQDStyles & condense) ? &kTrue : &kFalse ,
+            (m_macATSUAdditionalQDStyles & extend) ? &kTrue : &kFalse ,
+                       &atsuFontID ,
+      };
+
+    status = ::ATSUSetAttributes( (ATSUStyle)m_macATSUStyle, attributeCount, atsuTags, atsuSizes, atsuValues);
+
+    wxASSERT_MSG( status == noErr , wxT("couldn't modify ATSU style") );
+#else

     if ( m_macThemeFontID != kThemeCurrentPortFont )
     {
         Style style ;
     if ( m_macThemeFontID != kThemeCurrentPortFont )
     {
         Style style ;


@@ -219,7 +348,6 @@ void wxFontRefData::MacFindFont()
         if ( m_macFontStyle & underline )
             m_underlined = true ;
         m_pointSize = m_macFontSize ;
         if ( m_macFontStyle & underline )
             m_underlined = true ;
         m_pointSize = m_macFontSize ;

-        

         m_macFontFamily = FMGetFontFamilyFromName( qdFontName );
     }
     else
         m_macFontFamily = FMGetFontFamilyFromName( qdFontName );
     }
     else


@@ -247,6 +375,7 @@ void wxFontRefData::MacFindFont()
                         break ;
 
                     case wxMODERN :
                         break ;
 
                     case wxMODERN :

+                    case wxTELETYPE:

                         m_faceName =  wxT("Monaco");
                         break ;
 
                         m_faceName =  wxT("Monaco");
                         break ;
 


@@ -256,6 +385,11 @@ void wxFontRefData::MacFindFont()
                 }
                 wxMacStringToPascal( m_faceName , qdFontName );
                 m_macFontFamily = FMGetFontFamilyFromName( qdFontName );
                 }
                 wxMacStringToPascal( m_faceName , qdFontName );
                 m_macFontFamily = FMGetFontFamilyFromName( qdFontName );

+                if ( m_macFontFamily == kInvalidFontFamily )
+                {
+                    wxLogDebug( wxT("ATSFontFamilyFindFromName failed for %s"), m_faceName.c_str() );
+                    m_macFontFamily = GetAppFont();
+                }

             }
         }
         else
             }
         }
         else


@@ -268,7 +402,13 @@ void wxFontRefData::MacFindFont()
             {
                 wxMacCFStringHolder cf( m_faceName, wxLocale::GetSystemEncoding() );
                 ATSFontFamilyRef atsfamily = ATSFontFamilyFindFromName( cf , kATSOptionFlagsDefault );
             {
                 wxMacCFStringHolder cf( m_faceName, wxLocale::GetSystemEncoding() );
                 ATSFontFamilyRef atsfamily = ATSFontFamilyFindFromName( cf , kATSOptionFlagsDefault );

-                m_macFontFamily = FMGetFontFamilyFromATSFontFamilyRef( atsfamily );
+                if ( atsfamily == (ATSFontFamilyRef) -1 )
+                {
+                    wxLogDebug( wxT("ATSFontFamilyFindFromName failed for ") + m_faceName );
+                    m_macFontFamily = GetAppFont();
+                }
+                else
+                    m_macFontFamily = FMGetFontFamilyFromATSFontFamilyRef( atsfamily );

             }
         }
 
             }
         }
 


@@ -289,9 +429,8 @@ void wxFontRefData::MacFindFont()
     FMFontStyle intrinsicStyle = 0 ;
     status = FMGetFontFromFontFamilyInstance( m_macFontFamily , m_macFontStyle , &m_macATSUFontID , &intrinsicStyle);
     wxASSERT_MSG( status == noErr , wxT("couldn't get an ATSUFont from font family") );
     FMFontStyle intrinsicStyle = 0 ;
     status = FMGetFontFromFontFamilyInstance( m_macFontFamily , m_macFontStyle , &m_macATSUFontID , &intrinsicStyle);
     wxASSERT_MSG( status == noErr , wxT("couldn't get an ATSUFont from font family") );

-

     m_macATSUAdditionalQDStyles = m_macFontStyle & (~intrinsicStyle );
     m_macATSUAdditionalQDStyles = m_macFontStyle & (~intrinsicStyle );

-    
+

     if ( m_macATSUStyle )
     {
         ::ATSUDisposeStyle((ATSUStyle)m_macATSUStyle);
     if ( m_macATSUStyle )
     {
         ::ATSUDisposeStyle((ATSUStyle)m_macATSUStyle);


@@ -347,6 +486,7 @@ void wxFontRefData::MacFindFont()
         atsuTags, atsuSizes, atsuValues);
 
     wxASSERT_MSG( status == noErr , wxT("couldn't modify ATSU style") );
         atsuTags, atsuSizes, atsuValues);
 
     wxASSERT_MSG( status == noErr , wxT("couldn't modify ATSU style") );

+#endif

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -386,8 +526,29 @@ bool wxFont::Create(int pointSize,
     return true;
 }
 
     return true;
 }
 

+#ifdef __LP64__
+
+bool wxFont::MacCreateUIFont(wxUint32 ctFontType )
+{
+    UnRef();
+
+    m_refData = new wxFontRefData(
+        12, wxDEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL,
+        false, wxEmptyString, wxFONTENCODING_DEFAULT );
+
+    M_FONTDATA->m_macUIFontType = ctFontType ;
+    RealizeResource();
+
+    return true;
+}
+
+#endif
+

 bool wxFont::MacCreateThemeFont(wxUint16 themeFontID)
 {
 bool wxFont::MacCreateThemeFont(wxUint16 themeFontID)
 {

+#ifdef __LP64__
+       return MacCreateUIFont(HIThemeGetUIFontType(themeFontID));
+#else

     UnRef();
 
     m_refData = new wxFontRefData(
     UnRef();
 
     m_refData = new wxFontRefData(


@@ -398,6 +559,7 @@ bool wxFont::MacCreateThemeFont(wxUint16 themeFontID)
     RealizeResource();
 
     return true;
     RealizeResource();
 
     return true;

+#endif

 }
 
 wxFont::~wxFont()
 }
 
 wxFont::~wxFont()


@@ -471,13 +633,15 @@ void wxFont::SetWeight(int weight)
     RealizeResource();
 }
 
     RealizeResource();
 }
 

-void wxFont::SetFaceName(const wxString& faceName)
+bool wxFont::SetFaceName(const wxString& faceName)

 {
     Unshare();
 
     M_FONTDATA->m_faceName = faceName;
 
     RealizeResource();
 {
     Unshare();
 
     M_FONTDATA->m_faceName = faceName;
 
     RealizeResource();

+
+    return wxFontBase::SetFaceName(faceName);

 }
 
 void wxFont::SetUnderlined(bool underlined)
 }
 
 void wxFont::SetUnderlined(bool underlined)


@@ -511,6 +675,21 @@ int wxFont::GetPointSize() const
     return M_FONTDATA->m_pointSize;
 }
 
     return M_FONTDATA->m_pointSize;
 }
 

+wxSize wxFont::GetPixelSize() const
+{
+#if wxUSE_GRAPHICS_CONTEXT
+    // TODO: consider caching the value
+    wxGraphicsContext* dc = wxGraphicsContext::CreateFromNative((CGContextRef) NULL);
+    dc->SetFont(*(wxFont *)this,*wxBLACK);
+    wxDouble width, height = 0;
+    dc->GetTextExtent( wxT("g"), &width, &height, NULL, NULL);
+    delete dc;
+    return wxSize((int)width, (int)height);
+#else
+    return wxFontBase::GetPixelSize();
+#endif
+}
+

 int wxFont::GetFamily() const
 {
     wxCHECK_MSG( M_FONTDATA != NULL , 0, wxT("invalid font") );
 int wxFont::GetFamily() const
 {
     wxCHECK_MSG( M_FONTDATA != NULL , 0, wxT("invalid font") );


@@ -560,6 +739,8 @@ bool wxFont::GetNoAntiAliasing() const
     return M_FONTDATA->m_noAA;
 }
 
     return M_FONTDATA->m_noAA;
 }
 

+#ifndef __LP64__
+

 short wxFont::MacGetFontNum() const
 {
     wxCHECK_MSG( M_FONTDATA != NULL , 0, wxT("invalid font") );
 short wxFont::MacGetFontNum() const
 {
     wxCHECK_MSG( M_FONTDATA != NULL , 0, wxT("invalid font") );


@@ -608,6 +789,23 @@ wxUint16 wxFont::MacGetThemeFontID() const
 
     return M_FONTDATA->m_macThemeFontID;
 }
 
     return M_FONTDATA->m_macThemeFontID;
 }

+#else
+const void * wxFont::MacGetCTFont() const
+{
+    wxCHECK_MSG( M_FONTDATA != NULL , 0, wxT("invalid font") );
+
+    return M_FONTDATA->m_macFontRef;
+}
+
+// to be removed
+void * wxFont::MacGetATSUStyle() const
+{
+    wxCHECK_MSG( M_FONTDATA != NULL , NULL, wxT("invalid font") );
+
+    return M_FONTDATA->m_macATSUStyle;
+}
+
+#endif

 
 const wxNativeFontInfo * wxFont::GetNativeFontInfo() const
 {
 
 const wxNativeFontInfo * wxFont::GetNativeFontInfo() const
 {