fixing focus, fixes #9985

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

diff --git a/src/osx/carbon/font.cpp b/src/osx/carbon/font.cpp
index d37f02f402d02e227f1a423c7be02306c118f328..1a699dcee8afb68b29d9be4f206463998cbed1c7 100644 (file)
--- a/src/osx/carbon/font.cpp
+++ b/src/osx/carbon/font.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        src/mac/carbon/font.cpp
+// Name:        src/osx/carbon/font.cpp

 // Purpose:     wxFont class
 // Author:      Stefan Csomor
 // Modified by:
 // Purpose:     wxFont class
 // Author:      Stefan Csomor
 // Modified by:


@@ -25,10 +25,11 @@
 #include "wx/graphics.h"
 #include "wx/settings.h"
 
 #include "wx/graphics.h"
 #include "wx/settings.h"
 

-#include "wx/osx/uma.h"
+#include "wx/osx/private.h"

 
 

-#ifndef __DARWIN__
-#include <ATSUnicode.h>
+#if wxOSX_USE_ATSU_TEXT && !wxOSX_USE_CARBON
+// include themeing support
+#include <Carbon/Carbon.h>

 #endif
 
 #include <map>
 #endif
 
 #include <map>


@@ -63,7 +64,7 @@ public:
         Init(size, family, style, weight, underlined, faceName, encoding);
     }
 
         Init(size, family, style, weight, underlined, faceName, encoding);
     }
 

-#if wxMAC_USE_CORE_TEXT
+#if wxOSX_USE_CORE_TEXT

     wxFontRefData( wxUint32 coreTextFontType );
     wxFontRefData( CTFontRef font );
     wxFontRefData( CTFontDescriptorRef fontdescriptor, int size );
     wxFontRefData( wxUint32 coreTextFontType );
     wxFontRefData( CTFontRef font );
     wxFontRefData( CTFontDescriptorRef fontdescriptor, int size );


@@ -148,7 +149,7 @@ protected:
               const wxString& faceName,
               wxFontEncoding encoding);
 
               const wxString& faceName,
               wxFontEncoding encoding);
 

-#if wxMAC_USE_CORE_TEXT
+#if wxOSX_USE_CORE_TEXT

     void Init( CTFontRef font );
 #endif
     // font characterstics
     void Init( CTFontRef font );
 #endif
     // font characterstics


@@ -162,7 +163,7 @@ protected:
     bool            m_noAA;      // No anti-aliasing
 
 public:
     bool            m_noAA;      // No anti-aliasing
 
 public:

-#if wxMAC_USE_ATSU_TEXT
+#if wxOSX_USE_ATSU_TEXT

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


@@ -180,11 +181,10 @@ public:
     // information here, as this speeds up and optimizes rendering
     ThemeFontID     m_macThemeFontID ;
 #endif
     // information here, as this speeds up and optimizes rendering
     ThemeFontID     m_macThemeFontID ;
 #endif

-#if wxMAC_USE_CORE_TEXT
+#if wxOSX_USE_CORE_TEXT

     wxCFRef<CTFontRef> m_ctFont;
     wxCFRef<CTFontRef> m_ctFont;

-    wxCFRef<CTFontDescriptorRef> m_ctFontDescriptor;

 #endif
 #endif

-#if wxMAC_USE_CORE_TEXT || wxMAC_USE_ATSU_TEXT
+#if wxOSX_USE_CORE_TEXT || wxOSX_USE_ATSU_TEXT

     ATSUStyle       m_macATSUStyle ;
 #endif
     wxNativeFontInfo  m_info;
     ATSUStyle       m_macATSUStyle ;
 #endif
     wxNativeFontInfo  m_info;


@@ -218,7 +218,7 @@ void wxFontRefData::Init(int pointSize,
     m_faceName = faceName;
     m_encoding = encoding;
     m_noAA = false;
     m_faceName = faceName;
     m_encoding = encoding;
     m_noAA = false;

-#if wxMAC_USE_ATSU_TEXT
+#if wxOSX_USE_ATSU_TEXT

     m_macFontFamily = 0 ;
     m_macFontSize = 0;
     m_macFontStyle = 0;
     m_macFontFamily = 0 ;
     m_macFontSize = 0;
     m_macFontStyle = 0;


@@ -226,14 +226,14 @@ void wxFontRefData::Init(int pointSize,
     m_macATSUAdditionalQDStyles = 0 ;
     m_macThemeFontID = kThemeCurrentPortFont ;
 #endif
     m_macATSUAdditionalQDStyles = 0 ;
     m_macThemeFontID = kThemeCurrentPortFont ;
 #endif

-#if wxMAC_USE_CORE_TEXT || wxMAC_USE_ATSU_TEXT
+#if wxOSX_USE_CORE_TEXT || wxOSX_USE_ATSU_TEXT

     m_macATSUStyle = NULL ;
 #endif
 }
 
 wxFontRefData::~wxFontRefData()
 {
     m_macATSUStyle = NULL ;
 #endif
 }
 
 wxFontRefData::~wxFontRefData()
 {

-#if wxMAC_USE_CORE_TEXT || wxMAC_USE_ATSU_TEXT
+#if wxOSX_USE_CORE_TEXT || wxOSX_USE_ATSU_TEXT

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


@@ -244,11 +244,10 @@ wxFontRefData::~wxFontRefData()
 
 void wxFontRefData::MacInvalidateNativeFont()
 {
 
 void wxFontRefData::MacInvalidateNativeFont()
 {

-#if wxMAC_USE_CORE_TEXT
+#if wxOSX_USE_CORE_TEXT

     m_ctFont.reset();
     m_ctFont.reset();

-    m_ctFontDescriptor.reset();

 #endif
 #endif

-#if wxMAC_USE_CORE_TEXT || wxMAC_USE_ATSU_TEXT
+#if wxOSX_USE_CORE_TEXT || wxOSX_USE_ATSU_TEXT

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


@@ -257,7 +256,7 @@ void wxFontRefData::MacInvalidateNativeFont()
 #endif
 }
 
 #endif
 }
 

-#if wxMAC_USE_CORE_TEXT
+#if wxOSX_USE_CORE_TEXT

 
 /* from Core Text Manual Common Operations */
 
 
 /* from Core Text Manual Common Operations */
 


@@ -338,7 +337,7 @@ wxFontRefData::wxFontRefData( CTFontDescriptorRef fontdescriptor, int size )
         float fsize;
         if ( CFNumberGetValue( value , kCFNumberFloatType , &fsize ) )
         {
         float fsize;
         if ( CFNumberGetValue( value , kCFNumberFloatType , &fsize ) )
         {

-            size = (int) fsize + 0.5 ;
+            size = (int)( fsize + 0.5 );

         }
     }
     Init( CTFontCreateWithFontDescriptor(fontdescriptor, size,NULL)  );
         }
     }
     Init( CTFontCreateWithFontDescriptor(fontdescriptor, size,NULL)  );


@@ -357,7 +356,7 @@ void wxFontRefData::Init( CTFontRef font )
 void wxFontRefData::MacFindFont()
 {
 
 void wxFontRefData::MacFindFont()
 {
 

-#if wxMAC_USE_CORE_TEXT
+#if wxOSX_USE_CORE_TEXT

     if (  UMAGetSystemVersion() >= 0x1050 )
     {
         if ( m_faceName.empty() && m_family == wxDEFAULT )
     if (  UMAGetSystemVersion() >= 0x1050 )
     {
         if ( m_faceName.empty() && m_family == wxDEFAULT )


@@ -375,8 +374,6 @@ void wxFontRefData::MacFindFont()
                 m_style = wxITALIC;
             if (  traits & kCTFontBoldTrait )
                 m_weight = wxBOLD ;
                 m_style = wxITALIC;
             if (  traits & kCTFontBoldTrait )
                 m_weight = wxBOLD ;

-            if ( !m_ctFontDescriptor.get() )
-                m_ctFontDescriptor.reset( CTFontCopyFontDescriptor( m_ctFont ) );

         }
         else
         {
         }
         else
         {


@@ -391,12 +388,16 @@ void wxFontRefData::MacFindFont()
                         break ;
 
                     case wxSWISS :
                         break ;
 
                     case wxSWISS :

-                        m_faceName =  wxT("Lucida Grande");
+                        m_faceName =  wxT("Helvetica");

                         break ;
 
                     case wxMODERN :
                     case wxTELETYPE:
                         break ;
 
                     case wxMODERN :
                     case wxTELETYPE:

-                        m_faceName =  wxT("Monaco");
+                        m_faceName =  wxT("Courier");
+                        if ( m_style == wxITALIC && m_weight == wxNORMAL )
+                        {
+                            m_style = wxITALIC;
+                        }

                         break ;
 
                     default:
                         break ;
 
                     default:


@@ -413,43 +414,70 @@ void wxFontRefData::MacFindFont()
             if (m_style == wxITALIC || m_style == wxSLANT)
                 traits |= kCTFontItalicTrait;
      
             if (m_style == wxITALIC || m_style == wxSLANT)
                 traits |= kCTFontItalicTrait;
      

-// use font descriptor caching
-#if 1
-            wxString lookupname = wxString::Format( "%s_%ld", m_faceName.c_str(), traits );
-            
-            static std::map< std::wstring , wxCFRef< CTFontDescriptorRef > > fontdescriptorcache ;
-            
-            m_ctFontDescriptor = fontdescriptorcache[ std::wstring(lookupname.wc_str()) ];
-            if ( !m_ctFontDescriptor )
-            {
-                wxCFStringRef cf( m_faceName, wxLocale::GetSystemEncoding() );
-                m_ctFontDescriptor.reset( wxMacCreateCTFontDescriptor( cf, traits ) );
-                fontdescriptorcache[ std::wstring(lookupname.wc_str()) ] = m_ctFontDescriptor;
-            }
-#else
-            wxCFStringRef cf( m_faceName, wxLocale::GetSystemEncoding() );
-            m_ctFontDescriptor.reset( wxMacCreateCTFontDescriptor( cf, traits ) );
-#endif
-            
-// use font caching
-#if 1
+            // use font caching

             wxString lookupnameWithSize = wxString::Format( "%s_%ld_%ld", m_faceName.c_str(), traits, m_pointSize );
             
             static std::map< std::wstring , wxCFRef< CTFontRef > > fontcache ;
             m_ctFont = fontcache[ std::wstring(lookupnameWithSize.wc_str()) ];
             if ( !m_ctFont )
             {
             wxString lookupnameWithSize = wxString::Format( "%s_%ld_%ld", m_faceName.c_str(), traits, m_pointSize );
             
             static std::map< std::wstring , wxCFRef< CTFontRef > > fontcache ;
             m_ctFont = fontcache[ std::wstring(lookupnameWithSize.wc_str()) ];
             if ( !m_ctFont )
             {

-                m_ctFont.reset( CTFontCreateWithFontDescriptor( m_ctFontDescriptor, m_pointSize, NULL ) );
+                // QD selection algorithm is the fastest by orders of magnitude on 10.5
+                if ( m_faceName.IsAscii() )
+                {
+                    uint8 qdstyle = 0;
+                    if (m_weight == wxBOLD)
+                        qdstyle |= bold;
+                    if (m_style == wxITALIC || m_style == wxSLANT)
+                        qdstyle |= italic;
+                    
+                    Str255 qdFontName ;
+                    wxMacStringToPascal( m_faceName , qdFontName );
+                    m_ctFont.reset( CTFontCreateWithQuickdrawInstance(qdFontName, 0 , qdstyle, m_pointSize) );
+                }
+                else
+                {
+
+                    static std::map< std::wstring , wxCFRef< CTFontDescriptorRef > > fontdescriptorcache ;
+                    wxString lookupname = wxString::Format( "%s_%ld", m_faceName.c_str(), traits );
+                    // descriptor caching
+                    wxCFRef< CTFontDescriptorRef > descriptor = fontdescriptorcache[ std::wstring(lookupname.wc_str()) ];
+                    if ( !descriptor )
+                    {
+                        wxCFStringRef cf( m_faceName, wxLocale::GetSystemEncoding() );
+                        descriptor.reset( wxMacCreateCTFontDescriptor( cf, traits ) );
+                        fontdescriptorcache[ std::wstring(lookupname.wc_str()) ] = descriptor;
+                    }
+                    m_ctFont.reset( CTFontCreateWithFontDescriptor( descriptor, m_pointSize, NULL ) );
+                    CTFontSymbolicTraits received = CTFontGetSymbolicTraits( m_ctFont ) & 0x03;
+                    if ( traits != received )
+                    {
+                        // TODO further fallbacks, synthesizing bold and italic, trying direct PostScript names etc
+                    }
+                }
+                

                 fontcache[ std::wstring(lookupnameWithSize.wc_str()) ] = m_ctFont;
                 fontcache[ std::wstring(lookupnameWithSize.wc_str()) ] = m_ctFont;

+#if 1 // debugging coretext font matching
+                CTFontSymbolicTraits received = CTFontGetSymbolicTraits( m_ctFont ) & 0x03;
+                if ( received != traits )
+                {
+                    float angle = CTFontGetSlantAngle( m_ctFont );
+                    CFDictionaryRef dict = CTFontCopyTraits( m_ctFont );
+                    CFNumberRef number = (CFNumberRef) CFDictionaryGetValue(dict, kCTFontWeightTrait );
+                    float floatnumber;
+                    CFNumberGetValue( number, kCFNumberFloatType, &floatnumber );
+                    {
+                        printf( wxString::Format( "font %s expected %d but got %d traits, %f angle \n" , m_faceName.c_str(), traits, received, angle ) );
+                    }
+                    CFShow( dict );
+                    CFRelease( dict );
+                }
+#endif  

             }
             }

-#else
-            m_ctFont.reset( CTFontCreateWithFontDescriptor( m_ctFontDescriptor, m_pointSize, NULL ) );
-#endif
+

         }
         }

-#if wxMAC_USE_ATSU_TEXT
+#if wxOSX_USE_ATSU_TEXT

         OSStatus status = noErr;
         OSStatus status = noErr;

-        CTFontDescriptorRef desc = m_ctFontDescriptor ;
-        ATSFontRef atsfont = CTFontGetPlatformFont( m_ctFont, &desc );
+        ATSFontRef atsfont = CTFontGetPlatformFont( m_ctFont, NULL );

         FMFont fmfont = FMGetFontFromATSFontRef( atsfont );
         ATSUAttributeTag atsuTags[] =
         {
         FMFont fmfont = FMGetFontFromATSFontRef( atsfont );
         ATSUAttributeTag atsuTags[] =
         {


@@ -498,7 +526,7 @@ void wxFontRefData::MacFindFont()
 #endif
     }
 #endif
 #endif
     }
 #endif

-#if wxMAC_USE_ATSU_TEXT
+#if wxOSX_USE_ATSU_TEXT

     {
         OSStatus status = noErr;
         Str255 qdFontName ;
     {
         OSStatus status = noErr;
         Str255 qdFontName ;


@@ -542,12 +570,12 @@ void wxFontRefData::MacFindFont()
                             break ;
 
                         case wxSWISS :
                             break ;
 
                         case wxSWISS :

-                            m_faceName =  wxT("Lucida Grande");
+                            m_faceName =  wxT("Helvetica");

                             break ;
 
                         case wxMODERN :
                         case wxTELETYPE:
                             break ;
 
                         case wxMODERN :
                         case wxTELETYPE:

-                            m_faceName =  wxT("Monaco");
+                            m_faceName =  wxT("Courier");

                             break ;
 
                         default:
                             break ;
 
                         default:


@@ -699,7 +727,7 @@ bool wxFont::Create(int pointSize,
     return true;
 }
 
     return true;
 }
 

-#if wxMAC_USE_CORE_TEXT
+#if wxOSX_USE_CORE_TEXT

 
 bool wxFont::MacCreateFromUIFont(wxUint32 ctFontType )
 {
 
 bool wxFont::MacCreateFromUIFont(wxUint32 ctFontType )
 {


@@ -724,15 +752,16 @@ bool wxFont::MacCreateFromCTFontDescriptor( const void * ctFontDescriptor , int
 
 #endif
 
 
 #endif
 

+#if wxOSX_USE_CARBON

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

-#if wxMAC_USE_CORE_TEXT
+#if wxOSX_USE_CORE_TEXT

     if ( UMAGetSystemVersion() >= 0x1050)
     {
         return MacCreateFromUIFont(HIThemeGetUIFontType(themeFontID));
     }
 #endif
     if ( UMAGetSystemVersion() >= 0x1050)
     {
         return MacCreateFromUIFont(HIThemeGetUIFontType(themeFontID));
     }
 #endif

-#if wxMAC_USE_ATSU_TEXT
+#if wxOSX_USE_ATSU_TEXT

     {
         UnRef();
 
     {
         UnRef();
 


@@ -747,6 +776,7 @@ bool wxFont::MacCreateFromThemeFont(wxUint16 themeFontID)
 #endif
     return false;
 }
 #endif
     return false;
 }

+#endif

 
 wxFont::~wxFont()
 {
 
 wxFont::~wxFont()
 {


@@ -938,7 +968,7 @@ bool wxFont::GetNoAntiAliasing() const
     return M_FONTDATA->GetNoAntiAliasing();
 }
 
     return M_FONTDATA->GetNoAntiAliasing();
 }
 

-#if wxMAC_USE_ATSU_TEXT
+#if wxOSX_USE_ATSU_TEXT

 
 short wxFont::MacGetFontNum() const
 {
 
 short wxFont::MacGetFontNum() const
 {


@@ -983,7 +1013,7 @@ wxUint16 wxFont::MacGetThemeFontID() const
 }
 #endif
 
 }
 #endif
 

-#if wxMAC_USE_CORE_TEXT || wxMAC_USE_ATSU_TEXT
+#if wxOSX_USE_CORE_TEXT || wxOSX_USE_ATSU_TEXT

 void * wxFont::MacGetATSUStyle() const
 {
     wxCHECK_MSG( M_FONTDATA != NULL , NULL, wxT("invalid font") );
 void * wxFont::MacGetATSUStyle() const
 {
     wxCHECK_MSG( M_FONTDATA != NULL , NULL, wxT("invalid font") );


@@ -992,7 +1022,7 @@ void * wxFont::MacGetATSUStyle() const
 }
 #endif
 
 }
 #endif
 

-#if wxMAC_USE_CORE_TEXT
+#if wxOSX_USE_CORE_TEXT

 
 const void * wxFont::MacGetCTFont() const
 {
 
 const void * wxFont::MacGetCTFont() const
 {


@@ -1001,13 +1031,6 @@ const void * wxFont::MacGetCTFont() const
     return (CTFontRef)(M_FONTDATA->m_ctFont);
 }
 
     return (CTFontRef)(M_FONTDATA->m_ctFont);
 }
 

-const void * wxFont::MacGetCTFontDescriptor() const
-{
-    wxCHECK_MSG( M_FONTDATA != NULL , 0, wxT("invalid font") );
-
-    return (CTFontDescriptorRef)(M_FONTDATA->m_ctFontDescriptor);
-}
-

 #endif
 
 const wxNativeFontInfo * wxFont::GetNativeFontInfo() const
 #endif
 
 const wxNativeFontInfo * wxFont::GetNativeFontInfo() const