X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/74b31181b345aaaef0c967cc5707bef72ce0a405..606b005fb2b535b34d1ca45d2d06ee86718e8b1c:/src/msw/font.cpp

diff --git a/src/msw/font.cpp b/src/msw/font.cpp
index 4dc30246ce..87ab343794 100644
--- a/src/msw/font.cpp
+++ b/src/msw/font.cpp
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:   	wxWindows licence
+// Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -29,23 +29,28 @@
 #endif
 
 #ifndef WX_PRECOMP
-    #include <stdio.h>
     #include "wx/setup.h"
     #include "wx/list.h"
     #include "wx/utils.h"
     #include "wx/app.h"
     #include "wx/font.h"
+    #include "wx/log.h"
 #endif // WX_PRECOMP
 
+#include "wx/fontutil.h"
+#include "wx/tokenzr.h"
+
 #include "wx/msw/private.h"
+#include "wx/tokenzr.h"
 
-#if !USE_SHARED_LIBRARIES
-    IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)
+IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)
 
-    #if wxUSE_PORTABLE_FONTS_IN_MSW
-        IMPLEMENT_DYNAMIC_CLASS(wxFontNameDirectory, wxObject)
-    #endif
-#endif
+// ----------------------------------------------------------------------------
+// constants
+// ----------------------------------------------------------------------------
+
+// the default font size in points
+static const int wxDEFAULT_FONT_SIZE = 12;
 
 // ----------------------------------------------------------------------------
 // wxFontRefData - the internal description of the font
@@ -58,7 +63,7 @@ friend class WXDLLEXPORT wxFont;
 public:
     wxFontRefData()
     {
-        Init(12, wxDEFAULT, wxNORMAL, wxNORMAL, FALSE,
+        Init(wxDEFAULT_FONT_SIZE, wxDEFAULT, wxNORMAL, wxNORMAL, FALSE,
              "", wxFONTENCODING_DEFAULT);
     }
 
@@ -81,6 +86,11 @@ public:
         Init(size, family, style, weight, underlined, faceName, encoding);
     }
 
+    wxFontRefData(const wxNativeFontInfo& info)
+    {
+        Init(info);
+    }
+
     virtual ~wxFontRefData();
 
 protected:
@@ -93,6 +103,8 @@ protected:
               const wxString& faceName,
               wxFontEncoding encoding);
 
+    void Init(const wxNativeFontInfo& info);
+
     // If TRUE, the pointer to the actual font is temporary and SHOULD NOT BE
     // DELETED by destructor
     bool          m_temporary;
@@ -110,6 +122,10 @@ protected:
 
     // Windows font handle
     WXHFONT       m_hFont;
+
+    // Native font info
+    wxNativeFontInfo m_nativeFontInfo;
+    bool             m_nativeFontInfoOk;
 };
 
 // ============================================================================
@@ -128,32 +144,222 @@ void wxFontRefData::Init(int pointSize,
                          const wxString& faceName,
                          wxFontEncoding encoding)
 {
-	m_style = style;
-  	m_pointSize = pointSize;
-  	m_family = family;
-  	m_style = style;
-  	m_weight = weight;
-  	m_underlined = underlined;
-  	m_faceName = faceName;
+    m_style = style;
+    m_pointSize = pointSize;
+    m_family = family;
+    m_style = style;
+    m_weight = weight;
+    m_underlined = underlined;
+    m_faceName = faceName;
     m_encoding = encoding;
 
-  	m_fontId = 0;
-  	m_temporary = FALSE;
+    m_fontId = 0;
+    m_temporary = FALSE;
 
-  	m_hFont = 0;
+    m_hFont = 0;
+
+    m_nativeFontInfoOk = FALSE;
+}
+
+void wxFontRefData::Init(const wxNativeFontInfo& info)
+{
+    // extract family from pitch-and-family
+    int lfFamily = info.lf.lfPitchAndFamily;
+    if ( lfFamily & FIXED_PITCH )
+        lfFamily -= FIXED_PITCH;
+    if ( lfFamily & VARIABLE_PITCH )
+        lfFamily -= VARIABLE_PITCH;
+
+    switch ( lfFamily )
+    {
+        case FF_ROMAN:
+            m_family = wxROMAN;
+            break;
+
+        case FF_SWISS:
+            m_family = wxSWISS;
+            break;
+
+        case FF_SCRIPT:
+            m_family = wxSCRIPT;
+            break;
+
+        case FF_MODERN:
+            m_family = wxMODERN;
+            break;
+
+        case FF_DECORATIVE:
+            m_family = wxDECORATIVE;
+            break;
+
+        default:
+            m_family = wxSWISS;
+    }
+
+    // weight and style
+    switch ( info.lf.lfWeight )
+    {
+        case FW_LIGHT:
+            m_weight = wxLIGHT;
+            break;
+
+        default:
+        case FW_NORMAL:
+            m_weight = wxNORMAL;
+            break;
+
+        case FW_BOLD:
+            m_weight = wxBOLD;
+            break;
+    }
+
+    m_style = info.lf.lfItalic ? wxITALIC : wxNORMAL;
+
+    m_underlined = info.lf.lfUnderline != 0;
+
+    m_faceName = info.lf.lfFaceName;
+
+    int height = abs(info.lf.lfHeight);
+
+    // remember that 1pt = 1/72inch
+    const int ppInch = ::GetDeviceCaps(ScreenHDC(), LOGPIXELSY);
+    m_pointSize = (int) (((72.0*((double)height))/(double) ppInch) + 0.5);
+
+    m_encoding = wxGetFontEncFromCharSet(info.lf.lfCharSet);
+
+    m_fontId = 0;
+    m_temporary = FALSE;
+
+    m_hFont = 0;
+
+    m_nativeFontInfoOk = TRUE;
+    m_nativeFontInfo = info;
 }
 
 wxFontRefData::~wxFontRefData()
 {
-	if ( m_hFont )
+    if ( m_hFont )
     {
-    	if ( !::DeleteObject((HFONT) m_hFont) )
+        if ( !::DeleteObject((HFONT) m_hFont) )
         {
-            wxLogLastError("DeleteObject(font)");
+            wxLogLastError(wxT("DeleteObject(font)"));
         }
     }
 }
 
+
+// ----------------------------------------------------------------------------
+// wxNativeFontInfo
+// ----------------------------------------------------------------------------
+
+bool wxNativeFontInfo::FromString(const wxString& s)
+{
+    long l;
+
+    wxStringTokenizer tokenizer(s, _T(";"));
+
+    wxString token = tokenizer.GetNextToken();
+    //
+    //  Ignore the version for now
+    //
+
+    token = tokenizer.GetNextToken();
+    if ( !token.ToLong(&l) )
+        return FALSE;
+    lf.lfHeight = l;
+
+    token = tokenizer.GetNextToken();
+    if ( !token.ToLong(&l) )
+        return FALSE;
+    lf.lfWidth = l;
+
+    token = tokenizer.GetNextToken();
+    if ( !token.ToLong(&l) )
+        return FALSE;
+    lf.lfEscapement = l;
+
+    token = tokenizer.GetNextToken();
+    if ( !token.ToLong(&l) )
+        return FALSE;
+    lf.lfOrientation = l;
+
+    token = tokenizer.GetNextToken();
+    if ( !token.ToLong(&l) )
+        return FALSE;
+    lf.lfWeight = l;
+
+    token = tokenizer.GetNextToken();
+    if ( !token.ToLong(&l) )
+        return FALSE;
+    lf.lfItalic = (BYTE)l;
+
+    token = tokenizer.GetNextToken();
+    if ( !token.ToLong(&l) )
+        return FALSE;
+    lf.lfUnderline = (BYTE)l;
+
+    token = tokenizer.GetNextToken();
+    if ( !token.ToLong(&l) )
+        return FALSE;
+    lf.lfStrikeOut = (BYTE)l;
+
+    token = tokenizer.GetNextToken();
+    if ( !token.ToLong(&l) )
+        return FALSE;
+    lf.lfCharSet = (BYTE)l;
+
+    token = tokenizer.GetNextToken();
+    if ( !token.ToLong(&l) )
+        return FALSE;
+    lf.lfOutPrecision = (BYTE)l;
+
+    token = tokenizer.GetNextToken();
+    if ( !token.ToLong(&l) )
+        return FALSE;
+    lf.lfClipPrecision = (BYTE)l;
+
+    token = tokenizer.GetNextToken();
+    if ( !token.ToLong(&l) )
+        return FALSE;
+    lf.lfQuality = (BYTE)l;
+
+    token = tokenizer.GetNextToken();
+    if ( !token.ToLong(&l) )
+        return FALSE;
+    lf.lfPitchAndFamily = (BYTE)l;
+
+    token = tokenizer.GetNextToken();
+    if(!token)
+        return FALSE;
+    wxStrcpy(lf.lfFaceName, token.c_str());
+
+    return TRUE;
+}
+
+wxString wxNativeFontInfo::ToString() const
+{
+    wxString s;
+
+    s.Printf(_T("%d;%d;%d;%d;%d;%d;%d;%d;%d;%d;%d;%d;%d;%d;%s"),
+             0, // version, in case we want to change the format later
+             lf.lfHeight,
+             lf.lfWidth,
+             lf.lfEscapement,
+             lf.lfOrientation,
+             lf.lfWeight,
+             lf.lfItalic,
+             lf.lfUnderline,
+             lf.lfStrikeOut,
+             lf.lfCharSet,
+             lf.lfOutPrecision,
+             lf.lfClipPrecision,
+             lf.lfQuality,
+             lf.lfPitchAndFamily,
+             lf.lfFaceName);
+
+    return s;
+}
+
 // ----------------------------------------------------------------------------
 // wxFont
 // ----------------------------------------------------------------------------
@@ -164,6 +370,24 @@ void wxFont::Init()
         wxTheFontList->Append(this);
 }
 
+bool wxFont::Create(const wxNativeFontInfo& info)
+{
+    UnRef();
+
+    m_refData = new wxFontRefData(info);
+
+    RealizeResource();
+
+    return TRUE;
+}
+
+wxFont::wxFont(const wxString& fontdesc)
+{
+    wxNativeFontInfo info;
+    if ( info.FromString(fontdesc) )
+        (void)Create(info);
+}
+
 /* Constructor for a font. Note that the real construction is done
  * in wxDC::SetFont, when information is available about scaling etc.
  */
@@ -176,6 +400,12 @@ bool wxFont::Create(int pointSize,
                     wxFontEncoding encoding)
 {
     UnRef();
+
+    // wxDEFAULT is a valid value for the font size too so we must treat it
+    // specially here (otherwise the size would be 70 == wxDEFAULT value)
+    if ( pointSize == wxDEFAULT )
+        pointSize = wxDEFAULT_FONT_SIZE;
+
     m_refData = new wxFontRefData(pointSize, family, style, weight,
                                   underlined, faceName, encoding);
 
@@ -200,110 +430,34 @@ bool wxFont::RealizeResource()
     {
         // VZ: the old code returned FALSE in this case, but it doesn't seem
         //     to make sense because the font _was_ created
-        wxLogDebug(_T("Calling wxFont::RealizeResource() twice"));
-
         return TRUE;
     }
 
-    BYTE ff_italic;
-    int ff_weight = 0;
-    int ff_family = 0;
-    wxString ff_face;
-
-    switch (M_FONTDATA->m_family)
+    if(!M_FONTDATA->m_nativeFontInfoOk)
     {
-        case wxSCRIPT:     ff_family = FF_SCRIPT ;
-                           ff_face = _T("Script") ;
-                           break ;
-        case wxDECORATIVE: ff_family = FF_DECORATIVE;
-                           break;
-        case wxROMAN:      ff_family = FF_ROMAN;
-                           ff_face = _T("Times New Roman") ;
-                           break;
-        case wxTELETYPE:
-        case wxMODERN:     ff_family = FF_MODERN;
-                           ff_face = _T("Courier New") ;
-                           break;
-        case wxSWISS:      ff_family = FF_SWISS;
-                           ff_face = _T("Arial") ;
-                           break;
-        case wxDEFAULT:
-        default:           ff_family = FF_SWISS;
-                           ff_face = _T("Arial") ; 
+      wxFillLogFont(&M_FONTDATA->m_nativeFontInfo.lf, this);
+      M_FONTDATA->m_nativeFontInfoOk = TRUE;
     }
 
-    if (M_FONTDATA->m_style == wxITALIC || M_FONTDATA->m_style == wxSLANT)
-        ff_italic = 1;
-    else
-        ff_italic = 0;
-
-    if (M_FONTDATA->m_weight == wxNORMAL)
-        ff_weight = FW_NORMAL;
-    else if (M_FONTDATA->m_weight == wxLIGHT)
-        ff_weight = FW_LIGHT;
-    else if (M_FONTDATA->m_weight == wxBOLD)
-        ff_weight = FW_BOLD;
-
-    const wxChar* pzFace = (const wxChar*) ff_face;
-    if (!M_FONTDATA->m_faceName.IsNull())
-        pzFace = (const wxChar*) M_FONTDATA->m_faceName ;
-
-    /* Always calculate fonts using the screen DC (is this the best strategy?)
-     * There may be confusion if a font is selected into a printer
-     * DC (say), because the height will be calculated very differently.
-    // What sort of display is it?
-    int technology = ::GetDeviceCaps(dc, TECHNOLOGY);
-
-    int nHeight;
-
-    if (technology != DT_RASDISPLAY && technology != DT_RASPRINTER)
-    {
-    // Have to get screen DC Caps, because a metafile will return 0.
-    HDC dc2 = ::GetDC(NULL);
-    nHeight = M_FONTDATA->m_pointSize*GetDeviceCaps(dc2, LOGPIXELSY)/72;
-    ::ReleaseDC(NULL, dc2);
-    }
-    else
+    M_FONTDATA->m_hFont = (WXHFONT)::CreateFontIndirect(&M_FONTDATA->m_nativeFontInfo.lf);
+    M_FONTDATA->m_faceName = M_FONTDATA->m_nativeFontInfo.lf.lfFaceName;
+    if ( !M_FONTDATA->m_hFont )
     {
-    nHeight = M_FONTDATA->m_pointSize*GetDeviceCaps(dc, LOGPIXELSY)/72;
-    }
-     */
-    // Have to get screen DC Caps, because a metafile will return 0.
-    HDC dc2 = ::GetDC(NULL);
-    int ppInch = ::GetDeviceCaps(dc2, LOGPIXELSY);
-    ::ReleaseDC(NULL, dc2);
-
-    // New behaviour: apparently ppInch varies according to
-    // Large/Small Fonts setting in Windows. This messes
-    // up fonts. So, set ppInch to a constant 96 dpi.
-    ppInch = 96;
-
-#if wxFONT_SIZE_COMPATIBILITY
-    // Incorrect, but compatible with old wxWindows behaviour
-    int nHeight = (M_FONTDATA->m_pointSize*ppInch/72);
-#else
-    // Correct for Windows compatibility
-    int nHeight = - (M_FONTDATA->m_pointSize*ppInch/72);
-#endif
+        wxLogLastError(wxT("CreateFont"));
 
-    bool ff_underline = M_FONTDATA->m_underlined;
+        return FALSE;
+    }
 
-    M_FONTDATA->m_hFont = (WXHFONT) CreateFont(nHeight, 0, 0, 0,ff_weight,ff_italic,(BYTE)ff_underline,
-            0, ANSI_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS,
-            PROOF_QUALITY, DEFAULT_PITCH | ff_family, pzFace);
-#ifdef WXDEBUG_CREATE
-    if (m_hFont==NULL) wxError(_T("Cannot create font"),_T("Internal Error")) ;
-#endif
-    return (M_FONTDATA->m_hFont != (WXHFONT) NULL);
+    return TRUE;
 }
 
-bool wxFont::FreeResource(bool force)
+bool wxFont::FreeResource(bool WXUNUSED(force))
 {
     if ( GetResourceHandle() )
     {
         if ( !::DeleteObject((HFONT) M_FONTDATA->m_hFont) )
         {
-            wxLogLastError("DeleteObject(font)");
+            wxLogLastError(wxT("DeleteObject(font)"));
         }
 
         M_FONTDATA->m_hFont = 0;
@@ -314,11 +468,16 @@ bool wxFont::FreeResource(bool force)
 }
 
 WXHANDLE wxFont::GetResourceHandle()
+{
+    return GetHFONT();
+}
+
+WXHFONT wxFont::GetHFONT() const
 {
     if ( !M_FONTDATA )
         return 0;
     else
-        return (WXHANDLE)M_FONTDATA->m_hFont ;
+        return (WXHANDLE)M_FONTDATA->m_hFont;
 }
 
 bool wxFont::IsFree() const
@@ -328,17 +487,17 @@ bool wxFont::IsFree() const
 
 void wxFont::Unshare()
 {
-	// Don't change shared data
-	if ( !m_refData )
+    // Don't change shared data
+    if ( !m_refData )
     {
-		m_refData = new wxFontRefData();
-	}
+        m_refData = new wxFontRefData();
+    }
     else
     {
-		wxFontRefData* ref = new wxFontRefData(*M_FONTDATA);
-		UnRef();
-		m_refData = ref;
-	}
+        wxFontRefData* ref = new wxFontRefData(*M_FONTDATA);
+        UnRef();
+        m_refData = ref;
+    }
 }
 
 // ----------------------------------------------------------------------------
@@ -350,6 +509,7 @@ void wxFont::SetPointSize(int pointSize)
     Unshare();
 
     M_FONTDATA->m_pointSize = pointSize;
+    M_FONTDATA->m_nativeFontInfoOk = FALSE;
 
     RealizeResource();
 }
@@ -359,6 +519,7 @@ void wxFont::SetFamily(int family)
     Unshare();
 
     M_FONTDATA->m_family = family;
+    M_FONTDATA->m_nativeFontInfoOk = FALSE;
 
     RealizeResource();
 }
@@ -368,6 +529,7 @@ void wxFont::SetStyle(int style)
     Unshare();
 
     M_FONTDATA->m_style = style;
+    M_FONTDATA->m_nativeFontInfoOk = FALSE;
 
     RealizeResource();
 }
@@ -377,6 +539,7 @@ void wxFont::SetWeight(int weight)
     Unshare();
 
     M_FONTDATA->m_weight = weight;
+    M_FONTDATA->m_nativeFontInfoOk = FALSE;
 
     RealizeResource();
 }
@@ -386,6 +549,7 @@ void wxFont::SetFaceName(const wxString& faceName)
     Unshare();
 
     M_FONTDATA->m_faceName = faceName;
+    M_FONTDATA->m_nativeFontInfoOk = FALSE;
 
     RealizeResource();
 }
@@ -395,6 +559,7 @@ void wxFont::SetUnderlined(bool underlined)
     Unshare();
 
     M_FONTDATA->m_underlined = underlined;
+    M_FONTDATA->m_nativeFontInfoOk = FALSE;
 
     RealizeResource();
 }
@@ -404,6 +569,18 @@ void wxFont::SetEncoding(wxFontEncoding encoding)
     Unshare();
 
     M_FONTDATA->m_encoding = encoding;
+    M_FONTDATA->m_nativeFontInfoOk = FALSE;
+
+    RealizeResource();
+}
+
+void wxFont::SetNativeFontInfo(const wxNativeFontInfo& info)
+{
+    Unshare();
+
+    FreeResource();
+
+    M_FONTDATA->Init(info);
 
     RealizeResource();
 }
@@ -414,43 +591,65 @@ void wxFont::SetEncoding(wxFontEncoding encoding)
 
 int wxFont::GetPointSize() const
 {
+    wxCHECK_MSG( Ok(), 0, wxT("invalid font") );
+
     return M_FONTDATA->m_pointSize;
 }
 
 int wxFont::GetFamily() const
 {
+    wxCHECK_MSG( Ok(), 0, wxT("invalid font") );
+
     return M_FONTDATA->m_family;
 }
 
 int wxFont::GetFontId() const
 {
+    wxCHECK_MSG( Ok(), 0, wxT("invalid font") );
+
     return M_FONTDATA->m_fontId;
 }
 
 int wxFont::GetStyle() const
 {
+    wxCHECK_MSG( Ok(), 0, wxT("invalid font") );
+
     return M_FONTDATA->m_style;
 }
 
 int wxFont::GetWeight() const
 {
+    wxCHECK_MSG( Ok(), 0, wxT("invalid font") );
+
     return M_FONTDATA->m_weight;
 }
 
 bool wxFont::GetUnderlined() const
 {
+    wxCHECK_MSG( Ok(), FALSE, wxT("invalid font") );
+
     return M_FONTDATA->m_underlined;
 }
 
 wxString wxFont::GetFaceName() const
 {
-    wxString str;
-    if ( M_FONTDATA )
-        str = M_FONTDATA->m_faceName ;
-    return str;
+    wxCHECK_MSG( Ok(), wxT(""), wxT("invalid font") );
+
+    return M_FONTDATA->m_faceName;
 }
 
 wxFontEncoding wxFont::GetEncoding() const
 {
+    wxCHECK_MSG( Ok(), wxFONTENCODING_DEFAULT, wxT("invalid font") );
+
     return M_FONTDATA->m_encoding;
 }
+
+wxNativeFontInfo *wxFont::GetNativeFontInfo() const
+{
+    if( M_FONTDATA->m_nativeFontInfoOk )
+        return new wxNativeFontInfo(M_FONTDATA->m_nativeFontInfo);
+
+    return 0;
+}
+