1. fixed (?) blitting bitmaps with mask

[wxWidgets.git] / src / common / filesys.cpp

diff --git a/src/common/filesys.cpp b/src/common/filesys.cpp
index 637ae522fd83e40ac7dce5a65bd1604ec1b5cc8c..d5a3bf6454a1b16cd49a1ae918a5034e632762c8 100644 (file)
--- a/src/common/filesys.cpp
+++ b/src/common/filesys.cpp
@@ -10,21 +10,24 @@
 #pragma implementation
 #endif
 
 #pragma implementation
 #endif
 

-#include <wx/wxprec.h>
+#include "wx/wxprec.h"

 
 #ifdef __BORDLANDC__
 #pragma hdrstop
 #endif
 
 
 #ifdef __BORDLANDC__
 #pragma hdrstop
 #endif
 

-#if wxUSE_FS_INET || wxUSE_FS_ZIP
-
-#ifndef WXPRECOMP
-#include <wx/wx.h>
+#if !wxUSE_SOCKETS
+    #undef wxUSE_FS_INET
+    #define wxUSE_FS_INET 0

 #endif
 
 #endif
 

-#include <wx/wfstream.h>
-#include <wx/module.h>
-#include <wx/filesys.h>
+#if (wxUSE_HTML || wxUSE_FS_INET || wxUSE_FS_ZIP) && wxUSE_STREAMS
+
+#include "wx/wfstream.h"
+#include "wx/module.h"
+#include "wx/filesys.h"
+#include "wx/mimetype.h"
+

 
 
 
 
 
 


@@ -34,8 +37,6 @@
 
 IMPLEMENT_ABSTRACT_CLASS(wxFileSystemHandler, wxObject)
 
 
 IMPLEMENT_ABSTRACT_CLASS(wxFileSystemHandler, wxObject)
 

-wxMimeTypesManager wxFileSystemHandler::m_MimeMng;
-

 
 wxString wxFileSystemHandler::GetMimeTypeFromExt(const wxString& location)
 {
 
 wxString wxFileSystemHandler::GetMimeTypeFromExt(const wxString& location)
 {


@@ -47,14 +48,58 @@ wxString wxFileSystemHandler::GetMimeTypeFromExt(const wxString& location)
 
     l2 = l;
     for (int i = l-1; i >= 0; i--) {
 
     l2 = l;
     for (int i = l-1; i >= 0; i--) {

-        c = loc[i];
-        if (c == '#') l2 = i + 1;
-        if (c == '.') {ext = loc.Right(l2-i-1); break;}
-        if ((c == '/') || (c == '\\') || (c == ':')) {return wxEmptyString;}
+        c = loc[(unsigned int) i];
+        if (c == wxT('#')) l2 = i + 1;
+        if (c == wxT('.')) {ext = loc.Right(l2-i-1); break;}
+        if ((c == wxT('/')) || (c == wxT('\\')) || (c == wxT(':'))) {return wxEmptyString;}
+    }
+
+    static bool s_MinimalMimeEnsured = FALSE;
+    if (!s_MinimalMimeEnsured) {
+        static const wxFileTypeInfo fallbacks[] =
+        {
+            wxFileTypeInfo("image/jpeg",
+                           "",
+                           "",
+                           "JPEG image (from fallback)",
+                           "jpg", "jpeg", NULL),
+            wxFileTypeInfo("image/gif",
+                           "",
+                           "",
+                           "GIF image (from fallback)",
+                           "gif", NULL),
+            wxFileTypeInfo("image/png",
+                           "",
+                           "",
+                           "PNG image (from fallback)",
+                           "png", NULL),
+            wxFileTypeInfo("image/bmp",
+                           "",
+                           "",
+                           "windows bitmap image (from fallback)",
+                           "bmp", NULL),
+            wxFileTypeInfo("text/html",
+                           "",
+                           "",
+                           "HTML document (from fallback)",
+                           "htm", "html", NULL),
+
+            // must terminate the table with this!
+            wxFileTypeInfo()
+        };
+
+        wxTheMimeTypesManager -> AddFallbacks(fallbacks);
+    }
+
+    ft = wxTheMimeTypesManager -> GetFileTypeFromExtension(ext);
+    if (ft && (ft -> GetMimeType(&mime))) {
+        delete ft; 
+        return mime;
+    }
+    else {
+        delete ft;
+        return wxEmptyString;

     }
     }

-    ft = m_MimeMng.GetFileTypeFromExtension(ext);
-    if (ft && (ft -> GetMimeType(&mime))) return mime;
-    else return wxEmptyString;

 }
 
 
 }
 
 


@@ -66,16 +111,15 @@ wxString wxFileSystemHandler::GetProtocol(const wxString& location) const
     bool fnd;
 
     fnd = FALSE;
     bool fnd;
 
     fnd = FALSE;

-    for (i = l-1; (i >= 0) && ((location[i] != '#') || (!fnd)); i--) {
-        if ((location[i] == ':') && (i != 1 /*win: C:\path*/)) fnd = TRUE;
+    for (i = l-1; (i >= 0) && ((location[i] != wxT('#')) || (!fnd)); i--) {
+        if ((location[i] == wxT(':')) && (i != 1 /*win: C:\path*/)) fnd = TRUE;

     }
     }

-    if (!fnd) return "file";
-    for (++i; (i < l) && (location[i] != ':'); i++) s << location[i];
+    if (!fnd) return wxT("file");
+    for (++i; (i < l) && (location[i] != wxT(':')); i++) s << location[i];

     return s;
 }
 
 
     return s;
 }
 
 

-

 wxString wxFileSystemHandler::GetLeftLocation(const wxString& location) const
 {
     int i;
 wxString wxFileSystemHandler::GetLeftLocation(const wxString& location) const
 {
     int i;


@@ -83,25 +127,21 @@ wxString wxFileSystemHandler::GetLeftLocation(const wxString& location) const
 
     fnd = FALSE;
     for (i = location.Length()-1; i >= 0; i--) {
 
     fnd = FALSE;
     for (i = location.Length()-1; i >= 0; i--) {

-        if ((location[i] == ':') && (i != 1 /*win: C:\path*/)) fnd = TRUE;
-        else if (fnd && (location[i] == '#')) return location.Left(i);
+        if ((location[i] == wxT(':')) && (i != 1 /*win: C:\path*/)) fnd = TRUE;
+        else if (fnd && (location[i] == wxT('#'))) return location.Left(i);

     }
     return wxEmptyString;
 }
 
     }
     return wxEmptyString;
 }
 

-
-

 wxString wxFileSystemHandler::GetRightLocation(const wxString& location) const
 {
     int i, l = location.Length();
     int l2 = l + 1;
 wxString wxFileSystemHandler::GetRightLocation(const wxString& location) const
 {
     int i, l = location.Length();
     int l2 = l + 1;

-    for (i = l-1; (i >= 0) && ((location[i] != ':') || (i == 1) || (location[i-2] == ':')); i--) {if (location[i] == '#') l2 = i + 1;}
+    for (i = l-1; (i >= 0) && ((location[i] != wxT(':')) || (i == 1) || (location[i-2] == wxT(':'))); i--) {if (location[i] == wxT('#')) l2 = i + 1;}

     if (i == 0) return wxEmptyString;
     else return location.Mid(i + 1, l2 - i - 2);
 }
 
     if (i == 0) return wxEmptyString;
     else return location.Mid(i + 1, l2 - i - 2);
 }
 

-
-

 wxString wxFileSystemHandler::GetAnchor(const wxString& location) const
 {
     char c;
 wxString wxFileSystemHandler::GetAnchor(const wxString& location) const
 {
     char c;


@@ -109,15 +149,23 @@ wxString wxFileSystemHandler::GetAnchor(const wxString& location) const
 
     for (int i = l-1; i >= 0; i--) {
         c = location[i];
 
     for (int i = l-1; i >= 0; i--) {
         c = location[i];

-        if (c == '#') return location.Right(l-i-1);
-        else if ((c == '.') || (c == '/') || (c == '\\') || (c == ':')) return wxEmptyString;
+        if (c == wxT('#')) return location.Right(l-i-1);
+        else if ((c == wxT('.')) || (c == wxT('/')) || (c == wxT('\\')) || (c == wxT(':'))) return wxEmptyString;

     }
     return wxEmptyString;
 }
 
 
     }
     return wxEmptyString;
 }
 
 

+wxString wxFileSystemHandler::FindFirst(const wxString& WXUNUSED(spec),
+                                        int WXUNUSED(flags))
+{
+    return wxEmptyString;
+}

 
 

-
+wxString wxFileSystemHandler::FindNext()
+{
+    return wxEmptyString;
+}

 
 //--------------------------------------------------------------------------------
 // wxLocalFSHandler
 
 //--------------------------------------------------------------------------------
 // wxLocalFSHandler


@@ -128,17 +176,16 @@ class wxLocalFSHandler : public wxFileSystemHandler
     public:
         virtual bool CanOpen(const wxString& location);
         virtual wxFSFile* OpenFile(wxFileSystem& fs, const wxString& location);
     public:
         virtual bool CanOpen(const wxString& location);
         virtual wxFSFile* OpenFile(wxFileSystem& fs, const wxString& location);

+        virtual wxString FindFirst(const wxString& spec, int flags = 0);
+        virtual wxString FindNext();

 };
 
 
 };
 
 

-

 bool wxLocalFSHandler::CanOpen(const wxString& location)
 {
 bool wxLocalFSHandler::CanOpen(const wxString& location)
 {

-    return GetProtocol(location) == "file";
+    return GetProtocol(location) == wxT("file");

 }
 
 }
 

-
-

 wxFSFile* wxLocalFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString& location)
 {
     wxString right = GetRightLocation(location);
 wxFSFile* wxLocalFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString& location)
 {
     wxString right = GetRightLocation(location);


@@ -146,12 +193,21 @@ wxFSFile* wxLocalFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString&
         return new wxFSFile(new wxFileInputStream(right),
                             right,
                             GetMimeTypeFromExt(location),
         return new wxFSFile(new wxFileInputStream(right),
                             right,
                             GetMimeTypeFromExt(location),

-                            GetAnchor(location));
-    else return NULL;
+                            GetAnchor(location),
+                            wxDateTime(wxFileModificationTime(right)));
+    else return (wxFSFile*) NULL;

 }
 
 }
 

+wxString wxLocalFSHandler::FindFirst(const wxString& spec, int flags)
+{
+    wxString right = GetRightLocation(spec);
+    return wxFindFirstFile(right, flags);
+}

 
 

-
+wxString wxLocalFSHandler::FindNext()
+{
+    return wxFindNextFile();
+}

 
 
 
 
 
 


@@ -172,37 +228,51 @@ void wxFileSystem::ChangePathTo(const wxString& location, bool is_dir)
     m_Path = location;
 
     for (i = m_Path.Length()-1; i >= 0; i--)
     m_Path = location;
 
     for (i = m_Path.Length()-1; i >= 0; i--)

-        if (m_Path[i] == '\\') m_Path.GetWritableChar(i) = '/';         // wanna be windows-safe
+        if (m_Path[(unsigned int) i] == wxT('\\')) m_Path.GetWritableChar(i) = wxT('/');         // wanna be windows-safe

 
 

-    if (is_dir == FALSE) {
-        for (i = m_Path.Length()-1; i >= 0; i--) {
-            if (m_Path[i] == '/') {
-                if ((i > 1) && (m_Path[i-1] == '/') && (m_Path[i-2] == ':')) {
+    if (is_dir)
+    {
+        if (m_Path.Length() > 0 && m_Path.Last() != wxT('/') && m_Path.Last() != wxT(':'))
+               m_Path << wxT('/');
+    }
+    
+    else
+    {
+        for (i = m_Path.Length()-1; i >= 0; i--)
+       {
+            if (m_Path[(unsigned int) i] == wxT('/'))
+               {
+                if ((i > 1) && (m_Path[(unsigned int) (i-1)] == wxT('/')) && (m_Path[(unsigned int) (i-2)] == wxT(':')))
+                       {

                     i -= 2;
                     continue;
                 }
                     i -= 2;
                     continue;
                 }

-                else {
-                    pathpos = i; 
+                else
+                       {
+                    pathpos = i;

                     break;
                 }
             }
                     break;
                 }
             }

-        else if (m_Path[i] == ':') {
-            pathpos = i;
-        break;
+            else if (m_Path[(unsigned int) i] == wxT(':')) {
+                pathpos = i;
+                break;
+            }

         }
         }

-    }
-        if (pathpos == -1) {
-            for (i = 0; i < (int) m_Path.Length(); i++) {
-                if (m_Path[i] == ':') {
-                    //m_Path << '/';
+        if (pathpos == -1)
+       {
+            for (i = 0; i < (int) m_Path.Length(); i++)
+           {
+                if (m_Path[(unsigned int) i] == wxT(':'))
+                       {

                     m_Path.Remove(i+1);
                     break;
                 }
             }
                     m_Path.Remove(i+1);
                     break;
                 }
             }

-            if (i == (int) m_Path.Length()) m_Path = wxEmptyString;
+            if (i == (int) m_Path.Length())
+               m_Path = wxEmptyString;

         }
         }

-        else {
-            if (m_Path[m_Path.Length()-1] != '/') m_Path << '/';
+        else
+       {

             m_Path.Remove(pathpos+1);
         }
     }
             m_Path.Remove(pathpos+1);
         }
     }


@@ -220,37 +290,46 @@ wxFSFile* wxFileSystem::OpenFile(const wxString& location)
 
     ln = loc.Length();
     meta = 0;
 
     ln = loc.Length();
     meta = 0;

-    for (i = 0; i < ln; i++) {
-        if (loc[i] == '\\') loc.GetWritableChar(i) = '/';         // wanna be windows-safe
-        if (!meta) switch (loc[i]) {
-            case '/' : case ':' : case '#' : meta = loc[i];
-        }
+    for (i = 0; i < ln; i++)
+    {
+        if (loc[(unsigned int) i] == wxT('\\')) loc.GetWritableChar(i) = wxT('/');         // wanna be windows-safe
+        if (!meta) 
+            switch (loc[(unsigned int) i])
+               {
+                case wxT('/') : case wxT(':') : case wxT('#') : meta = loc[(unsigned int) i];
+            }

     }
     m_LastName = wxEmptyString;
 
     // try relative paths first :
     }
     m_LastName = wxEmptyString;
 
     // try relative paths first :

-    if (meta != ':') {
+    if (meta != wxT(':'))
+    {

         node = m_Handlers.GetFirst();
         node = m_Handlers.GetFirst();

-        while (node){
+        while (node)
+       {

             wxFileSystemHandler *h = (wxFileSystemHandler*) node -> GetData();
             wxFileSystemHandler *h = (wxFileSystemHandler*) node -> GetData();

-            if (h -> CanOpen(m_Path + location)) {
-                s = h -> OpenFile(*this, m_Path + location);
-                if (s) {m_LastName = m_Path + location; break;}
+            if (h->CanOpen(m_Path + loc))
+               {
+                s = h->OpenFile(*this, m_Path + loc);
+                if (s) { m_LastName = m_Path + loc; break; }

             }
             }

-            node = node -> GetNext();
+            node = node->GetNext();

         }
     }
 
     // if failed, try absolute paths :
         }
     }
 
     // if failed, try absolute paths :

-    if (s == NULL) {
+    if (s == NULL)
+    {

         node = m_Handlers.GetFirst();
         node = m_Handlers.GetFirst();

-        while (node){
-            wxFileSystemHandler *h = (wxFileSystemHandler*) node -> GetData();
-            if (h -> CanOpen(location)) {
-                s = h -> OpenFile(*this, location);
-                if (s) {m_LastName = location; break; }
+        while (node)
+       {
+            wxFileSystemHandler *h = (wxFileSystemHandler*) node->GetData();
+            if (h->CanOpen(loc))
+           {
+                s = h->OpenFile(*this, loc);
+                if (s) { m_LastName = loc; break; }

             }
             }

-            node = node -> GetNext();
+            node = node->GetNext();

         }
     }
     return (s);
         }
     }
     return (s);


@@ -258,17 +337,58 @@ wxFSFile* wxFileSystem::OpenFile(const wxString& location)
 
 
 
 
 
 

-void wxFileSystem::AddHandler(wxFileSystemHandler *handler)
+wxString wxFileSystem::FindFirst(const wxString& spec, int flags)

 {
 {

-    m_Handlers.Append(handler);
+    wxNode *node;
+    wxString spec2(spec);
+    
+    m_FindFileHandler = NULL;
+
+    for (int i = spec2.Length()-1; i >= 0; i--)
+        if (spec2[(unsigned int) i] == wxT('\\')) spec2.GetWritableChar(i) = wxT('/'); // wanna be windows-safe
+
+    node = m_Handlers.GetFirst();
+    while (node)
+    {
+        m_FindFileHandler = (wxFileSystemHandler*) node -> GetData();
+        if (m_FindFileHandler -> CanOpen(m_Path + spec2)) 
+            return m_FindFileHandler -> FindFirst(m_Path + spec2, flags);
+        node = node->GetNext();
+    } 
+
+    node = m_Handlers.GetFirst();
+    while (node)
+    {
+        m_FindFileHandler = (wxFileSystemHandler*) node -> GetData();
+        if (m_FindFileHandler -> CanOpen(spec2))
+            return m_FindFileHandler -> FindFirst(spec2, flags);
+        node = node->GetNext();
+    } 
+    
+    return wxEmptyString;   

 }
 
 
 
 }
 
 
 

+wxString wxFileSystem::FindNext()
+{
+    if (m_FindFileHandler == NULL) return wxEmptyString;
+    else return m_FindFileHandler -> FindNext();
+}
+

 
 
 
 

+void wxFileSystem::AddHandler(wxFileSystemHandler *handler)
+{
+    m_Handlers.Append(handler);
+}

 
 
 
 

+void wxFileSystem::CleanUpHandlers()
+{
+    m_Handlers.DeleteContents(TRUE);
+    m_Handlers.Clear();
+}

 
 
 
 
 
 


@@ -285,12 +405,16 @@ class wxFileSystemModule : public wxModule
             wxFileSystem::AddHandler(new wxLocalFSHandler);
             return TRUE;
         }
             wxFileSystem::AddHandler(new wxLocalFSHandler);
             return TRUE;
         }

-        virtual void OnExit() {}
+        virtual void OnExit()
+       {
+            wxFileSystem::CleanUpHandlers();
+       }

 };
 
 IMPLEMENT_DYNAMIC_CLASS(wxFileSystemModule, wxModule)
 
 };
 
 IMPLEMENT_DYNAMIC_CLASS(wxFileSystemModule, wxModule)
 

+#endif
+  // (wxUSE_FS_INET || wxUSE_FS_ZIP) && wxUSE_STREAMS

 
 
 
 

-#endif // wxUSE_FS_INET || wxUSE_FS_ZIP