Changeset 0f676825acafe08500114fc64f438732f780fb0a

Timestamp:

01/06/07 23:33:37 (6 years ago)

Author:

Philipp Kern <phil@…>

Parents:

e51abc748ac27b1dfa0fccd9de3ba9cdecb743f0

Children:

f9c68bd2c0ebf3153d48dbda4861b51439515eec

git-committer:

Philipp Kern <phil@0x539.de> / 2007-01-06T22:33:37Z+0000

Message:

[project @ Separate mime map]

Original author: Armin Burgmeier <armin@…>
Date: 2005-05-07 10:32:46+00:00

Files:

• Makefile.am (modified) (2 diffs)
• inc/document.hpp (modified) (2 diffs)
• inc/folder.hpp (modified) (3 diffs)
• inc/mimemap.hpp (added)
• src/document.cpp (modified) (3 diffs)
• src/folder.cpp (modified) (1 diff)
• src/mimemap.cpp (added)

Makefile.am

@@ -22 +22 @@
 else
 noinst_HEADERS += inc/buffer_wrapper_generic.hpp
+endif
+if WITH_GTKSOURCEVIEW
+noinst_HEADERS += inc/mimemap.hpp
 endif
 noinst_HEADERS += inc/historyentry.hpp
@@ -54 +57 @@
 gobby_SOURCES += src/buffer_wrapper_generic.cpp
 endif
+if WITH_GTKSOURCEVIEW
+gobby_SOURCES += src/mimemap.cpp
+endif
 gobby_SOURCES += src/historyentry.cpp
 gobby_SOURCES += src/logview.cpp

inc/document.hpp

@@ -38 +38 @@
 {
 public:
-        typedef std::map<Glib::ustring, Glib::ustring> MimeMap;
         typedef sigc::signal<void> signal_update_type;
 
@@ -87 +86 @@
         Gtk::TextView m_view;
 #endif
+        /** Variable to prevent event functions from endless recursion. After
+         * an obby insert or textbuffer insert has occured, this variable is
+         * set to true, after the event has been handled, to false. If an
+         * obby event arrives and we insert the newly written text into the
+         * buffer, a textbuffer-insert event would occur. But if m_editing is
+         * true, the event is ignored.
+         */
         bool m_editing;
         
         signal_update_type m_signal_update;
-
-public:
-#ifdef WITH_GTKSOURCEVIEW
-        static const MimeMap& create_mime_map();
-        static const MimeMap& m_mime_map;
-#endif
 };
 

inc/folder.hpp

@@ -24 +24 @@
 #include <obby/user.hpp>
 #include <obby/document.hpp>
+
 #include "document.hpp"
 #include "sourceview/sourcelanguage.hpp"
+
+#ifdef WITH_GTKSOURCEVIEW
+# include "mimemap.hpp"
+#endif
 
 namespace Gobby
@@ -40 +45 @@
         Folder();
         ~Folder();
+
+        // Access to the mime map
+        const MimeMap& get_mime_map() const;
 
         // Calls from the window
@@ -57 +65 @@
 
         signal_document_update_type m_signal_document_update;
+
+#ifdef WITH_GTKSOURCEVIEW
+        MimeMap m_mime_map;
+#endif
 };
 

src/document.cpp

@@ -24 +24 @@
 #include "folder.hpp"
 
-#ifdef WITH_GTKSOURCEVIEW
-const Gobby::Document::MimeMap& Gobby::Document::m_mime_map =
-        Gobby::Document::create_mime_map();
-#endif
-
 Gobby::Document::Document(obby::document& doc, const Folder& folder)
  : Gtk::ScrolledWindow(), m_doc(doc), m_folder(folder), m_editing(true)
@@ -49 +44 @@
 
 #ifdef WITH_GTKSOURCEVIEW
-        // Set source language by file extension
-        Glib::ustring title = doc.get_title();
-        Glib::ustring::size_type pos = title.rfind('.');
-        if(pos != Glib::ustring::npos)
+        // Set SourceLanguage by file extension
+        Glib::ustring mime_type =
+                folder.get_mime_map().get_mime_type_by_file(doc.get_title() );
+        if(!mime_type.empty() )
         {
-                Glib::ustring extension = title.substr(pos + 1);
-                MimeMap::const_iterator iter = m_mime_map.find(extension);
-                if(iter != m_mime_map.end() )
+                Glib::RefPtr<Gtk::SourceLanguage> language = 
+                        m_lang_manager->get_language_from_mime_type(mime_type);
+                if(language)
                 {
-                        Glib::ustring mime = iter->second;
-                        Glib::RefPtr<Gtk::SourceLanguage> language = 
-                                m_lang_manager->get_language_from_mime_type(
-                                        mime
-                                );
-                        if(language)
-                        {
-                                buf->set_language(language);
-                        }
-                        else
-                        {
-                                g_warning("Could not find syntax file for file "
-                                          "extension %s (mime-type %s)",
-                                          extension.c_str(), mime.c_str() );
-                        }
-                }
-                else
-                {
-                        g_warning("Could not detect file type of file "
-                                  "extension '%s'", extension.c_str() );
+                        buf->set_language(language);
                 }
         }
@@ -264 +240 @@
 }
 
-#ifdef WITH_GTKSOURCEVIEW
-const Gobby::Document::MimeMap& Gobby::Document::create_mime_map()
-{
-        static MimeMap map;
-
-        // Translates file extension to mime type
-        map["ada"] = "text/x-ada";
-        map["c"] = "text/x-c";
-        map["h"] = "text/x-c++";
-        map["hh"] = "text/x-c++";
-        map["cpp"] = "text/x-c++";
-        map["hpp"] = "text/x-c++";
-        map["cc"] = "text/x-c++";
-        map["css"] = "text/css";
-        map["cs"] = "text/x-csharp";
-        map["diff"] = "text/x-diff";
-        map["f"] = "text/x-fortran";
-        map["f77"] = "text/x-fortran";
-        map["hs"] = "text/x-haskell";
-        map["htm"] = "text/html";
-        map["html"] = "text/html";
-        map["xhtml"] = "text/html";
-        // Wi geth IDL?
-        map["java"] = "text/x-java";
-        map["js"] = "text/x-javascript";
-        map["tex"] = "text/x-tex";
-        map["latex"] = "text/x-tex";
-        map["lua"] = "text/x-lua";
-        // Wi geth MSIL?
-        map["dpr"] = "text/x-pascal";
-        map["pas"] = "text/x-pascal";
-        map["pl"] = "text/x-perl";
-        map["pm"] = "text/x-perl";
-        map["php"] = "text/x-php";
-        map["php3"] = "text/x-php";
-        map["php4"] = "text/x-php";
-        map["php5"] = "text/x-php";
-        map["po"] = "text/x-gettext-translation";
-        map["py"] = "text/x-python";
-        map["rb"] = "text/x-ruby";
-        map["sql"] = "text/x-sql";
-        // Wi geth texinfo?
-        // Wi geth vb.NET?
-        // Wi geth verilog?
-        map["xml"] = "text/xml";
-
-        return map;
-}
-#endif

src/folder.cpp

@@ -30 +30 @@
         for(int i = 0; i < get_n_pages(); ++ i)
                 delete get_nth_page(i);
+}
+
+const Gobby::MimeMap& Gobby::Folder::get_mime_map() const
+{
+        return m_mime_map;
 }