gtksourceview2 0.13.1.3 → 0.13.2.1
raw patch · 24 files changed
+202/−55 lines, 24 files
Files
- Graphics/UI/Gtk/SourceView.hs +18/−18
- Graphics/UI/Gtk/SourceView/Enums.chs +1/−1
- Graphics/UI/Gtk/SourceView/Signals.chs +17/−2
- Graphics/UI/Gtk/SourceView/SourceBuffer.chs +4/−2
- Graphics/UI/Gtk/SourceView/SourceCompletion.chs +4/−4
- Graphics/UI/Gtk/SourceView/SourceCompletionContext.chs +2/−2
- Graphics/UI/Gtk/SourceView/SourceCompletionInfo.chs +2/−2
- Graphics/UI/Gtk/SourceView/SourceCompletionItem.chs +2/−2
- Graphics/UI/Gtk/SourceView/SourceCompletionProposal.chs +2/−2
- Graphics/UI/Gtk/SourceView/SourceCompletionProvider.chs +3/−3
- Graphics/UI/Gtk/SourceView/SourceGutter.chs +2/−2
- Graphics/UI/Gtk/SourceView/SourceIter.chs +3/−3
- Graphics/UI/Gtk/SourceView/SourceLanguage.chs +3/−1
- Graphics/UI/Gtk/SourceView/SourceLanguageManager.chs +3/−1
- Graphics/UI/Gtk/SourceView/SourceMark.chs +4/−2
- Graphics/UI/Gtk/SourceView/SourceStyleScheme.chs +4/−2
- Graphics/UI/Gtk/SourceView/SourceStyleSchemeManager.chs +1/−1
- Graphics/UI/Gtk/SourceView/SourceUndoManager.chs +1/−1
- Graphics/UI/Gtk/SourceView/SourceView.chs +93/−2
- Graphics/UI/Gtk/SourceView/Types.chs +27/−0
- SetupWrapper.hs +1/−1
- gtksourceview2.cabal +1/−1
- gtksourceview2.h +3/−0
- marshal.list +1/−0
Graphics/UI/Gtk/SourceView.hs view
@@ -1,25 +1,25 @@ {-# LANGUAGE CPP #-} module Graphics.UI.Gtk.SourceView (- module Graphics.UI.Gtk.SourceView.SourceBuffer,- module Graphics.UI.Gtk.SourceView.SourceCompletion,- module Graphics.UI.Gtk.SourceView.SourceCompletionContext,- module Graphics.UI.Gtk.SourceView.SourceCompletionInfo,- module Graphics.UI.Gtk.SourceView.SourceCompletionItem,- module Graphics.UI.Gtk.SourceView.SourceCompletionProposal,- module Graphics.UI.Gtk.SourceView.SourceCompletionProvider,- module Graphics.UI.Gtk.SourceView.SourceGutter,+ module Graphics.UI.Gtk.SourceView.SourceBuffer,+ module Graphics.UI.Gtk.SourceView.SourceCompletion,+ module Graphics.UI.Gtk.SourceView.SourceCompletionContext,+ module Graphics.UI.Gtk.SourceView.SourceCompletionInfo,+ module Graphics.UI.Gtk.SourceView.SourceCompletionItem,+ module Graphics.UI.Gtk.SourceView.SourceCompletionProposal,+ module Graphics.UI.Gtk.SourceView.SourceCompletionProvider,+ module Graphics.UI.Gtk.SourceView.SourceGutter, #if GTK_MAJOR_VERSION < 3- module Graphics.UI.Gtk.SourceView.SourceIter,+ module Graphics.UI.Gtk.SourceView.SourceIter, #endif- module Graphics.UI.Gtk.SourceView.SourceLanguage,- module Graphics.UI.Gtk.SourceView.SourceLanguageManager,- module Graphics.UI.Gtk.SourceView.SourceMark,- module Graphics.UI.Gtk.SourceView.SourceStyle,- module Graphics.UI.Gtk.SourceView.SourceStyleScheme,- module Graphics.UI.Gtk.SourceView.SourceStyleSchemeManager,- module Graphics.UI.Gtk.SourceView.SourceUndoManager,- module Graphics.UI.Gtk.SourceView.SourceView,- ) where+ module Graphics.UI.Gtk.SourceView.SourceLanguage,+ module Graphics.UI.Gtk.SourceView.SourceLanguageManager,+ module Graphics.UI.Gtk.SourceView.SourceMark,+ module Graphics.UI.Gtk.SourceView.SourceStyle,+ module Graphics.UI.Gtk.SourceView.SourceStyleScheme,+ module Graphics.UI.Gtk.SourceView.SourceStyleSchemeManager,+ module Graphics.UI.Gtk.SourceView.SourceUndoManager,+ module Graphics.UI.Gtk.SourceView.SourceView,+ ) where import Graphics.UI.Gtk.SourceView.SourceBuffer import Graphics.UI.Gtk.SourceView.SourceCompletion
Graphics/UI/Gtk/SourceView/Enums.chs view
@@ -34,7 +34,7 @@ SourceViewGutterPosition (..) ) where -import Control.Monad (liftM)+import Control.Monad (liftM) import System.Glib.FFI import System.Glib.Flags
Graphics/UI/Gtk/SourceView/Signals.chs view
@@ -49,13 +49,14 @@ connect_OBJECT_BOXED_PTR__NONE, connect_OBJECT_BOXED_OBJECT__BOOL, connect_ENUM_INT__NONE,+ connect_OBJECT__GLIBSTRING, ) where -import Control.Monad (liftM)+import Control.Monad (liftM) import System.Glib.FFI-import System.Glib.UTFString (peekUTFString,maybePeekUTFString)+import System.Glib.UTFString (peekUTFString,maybePeekUTFString,newUTFString) import qualified System.Glib.UTFString as Glib import System.Glib.GError (failOnGError) {#import System.Glib.Signals#}@@ -178,4 +179,18 @@ action _ enum1 int2 = failOnGError $ user (toEnum enum1) int2++connect_OBJECT__GLIBSTRING :: + (GObjectClass a', Glib.GlibString b', GObjectClass obj) => SignalName ->+ ConnectAfter -> obj ->+ (a' -> IO b') ->+ IO (ConnectId obj)+connect_OBJECT__GLIBSTRING signal after obj user =+ connectGeneric signal after obj action+ where action :: Ptr GObject -> Ptr GObject -> IO CString+ action _ obj1 =+ failOnGError $+ makeNewGObject (GObject, objectUnref) (return obj1) >>= \obj1' ->+ user (unsafeCastGObject obj1')+ >>= newUTFString
Graphics/UI/Gtk/SourceView/SourceBuffer.chs view
@@ -44,6 +44,8 @@ -- * Methods castToSourceBuffer,+ gTypeSourceBuffer,+ toSourceBuffer, sourceBufferNew, sourceBufferNewWithLanguage, sourceBufferSetHighlightSyntax,@@ -87,10 +89,10 @@ sourceBufferSourceMarkUpdated, ) where -import Control.Monad (liftM)+import Control.Monad (liftM) import Data.Maybe (fromMaybe) -import Graphics.UI.Gtk.Abstract.Object (makeNewObject)+import Graphics.UI.Gtk.Abstract.Object (makeNewObject) import System.Glib.Attributes import System.Glib.FFI import System.Glib.UTFString
Graphics/UI/Gtk/SourceView/SourceCompletion.chs view
@@ -60,17 +60,17 @@ sourceCompletionShowSignal, ) where -import Control.Monad (liftM)+import Control.Monad (liftM) import Data.Maybe (fromMaybe) -import Graphics.UI.Gtk.Abstract.Object (makeNewObject)+import Graphics.UI.Gtk.Abstract.Object (makeNewObject) import Graphics.UI.Gtk.General.Enums (ScrollStep (..)) import Graphics.UI.Gtk.Multiline.TextView (TextWindowType (..)) import System.Glib.Attributes import System.Glib.FFI import System.Glib.GError-import System.Glib.GList (fromGList, withGList)-import System.Glib.GObject (makeNewGObject)+import System.Glib.GList (fromGList, withGList)+import System.Glib.GObject (makeNewGObject) import System.Glib.Properties import System.Glib.UTFString
Graphics/UI/Gtk/SourceView/SourceCompletionContext.chs view
@@ -43,12 +43,12 @@ sourceCompletionContextCancelled, ) where -import Control.Monad (liftM)+import Control.Monad (liftM) import Graphics.UI.Gtk.SourceView.Enums import System.Glib.Attributes import System.Glib.FFI-import System.Glib.GList (fromGList, withGList)+import System.Glib.GList (fromGList, withGList) import System.Glib.Properties import System.Glib.UTFString
Graphics/UI/Gtk/SourceView/SourceCompletionInfo.chs view
@@ -52,10 +52,10 @@ -- * Signals sourceCompletionInfoBeforeShow, ) where-import Control.Monad (liftM)+import Control.Monad (liftM) import Data.Maybe (fromMaybe) -import Graphics.UI.Gtk.Abstract.Object (makeNewObject)+import Graphics.UI.Gtk.Abstract.Object (makeNewObject) import System.Glib.Attributes import System.Glib.FFI import System.Glib.Properties
Graphics/UI/Gtk/SourceView/SourceCompletionItem.chs view
@@ -41,12 +41,12 @@ sourceCompletionItemText, ) where -import Control.Monad (liftM)+import Control.Monad (liftM) import Data.Maybe (fromMaybe) import System.Glib.Attributes import System.Glib.FFI-import System.Glib.GObject (wrapNewGObject)+import System.Glib.GObject (wrapNewGObject) import System.Glib.Properties import System.Glib.UTFString
Graphics/UI/Gtk/SourceView/SourceCompletionProposal.chs view
@@ -46,11 +46,11 @@ sourceCompletionProposalChanged, ) where -import Control.Monad (liftM)+import Control.Monad (liftM) import System.Glib.Attributes import System.Glib.FFI-import System.Glib.GObject (wrapNewGObject)+import System.Glib.GObject (wrapNewGObject) import System.Glib.Properties import System.Glib.UTFString
Graphics/UI/Gtk/SourceView/SourceCompletionProvider.chs view
@@ -45,13 +45,13 @@ sourceCompletionProviderActivateProposal, ) where -import Control.Monad (liftM)+import Control.Monad (liftM) -import Graphics.UI.Gtk.Abstract.Object (makeNewObject)+import Graphics.UI.Gtk.Abstract.Object (makeNewObject) import Graphics.UI.Gtk.SourceView.Enums import System.Glib.Attributes import System.Glib.FFI-import System.Glib.GObject (wrapNewGObject)+import System.Glib.GObject (wrapNewGObject) import System.Glib.Properties import System.Glib.UTFString
Graphics/UI/Gtk/SourceView/SourceGutter.chs view
@@ -69,7 +69,7 @@ sourceGutterQueryTooltip, ) where -import Control.Monad (liftM)+import Control.Monad (liftM) import Control.Monad.Reader ( runReaderT ) import Graphics.UI.Gtk.Gdk.EventM (EventM, EAny)@@ -77,7 +77,7 @@ import Graphics.UI.GtkInternals ( TextIter, mkTextIterCopy ) import System.Glib.Attributes import System.Glib.FFI-import System.Glib.GObject (makeNewGObject)+import System.Glib.GObject (makeNewGObject) import System.Glib.Properties import System.Glib.UTFString
Graphics/UI/Gtk/SourceView/SourceIter.chs view
@@ -41,13 +41,13 @@ ) where #if GTK_MAJOR_VERSION < 3-import Control.Monad (liftM)+import Control.Monad (liftM) import Data.Maybe (fromMaybe) -import Graphics.UI.Gtk.Abstract.Object (makeNewObject)+import Graphics.UI.Gtk.Abstract.Object (makeNewObject) import Graphics.UI.Gtk.SourceView.Enums import System.Glib.FFI-import System.Glib.Flags (Flags, fromFlags)+import System.Glib.Flags (Flags, fromFlags) import System.Glib.UTFString {#import Graphics.UI.Gtk.Multiline.TextIter#}
Graphics/UI/Gtk/SourceView/SourceLanguage.chs view
@@ -37,6 +37,8 @@ -- * Methods castToSourceLanguage,+ gTypeSourceLanguage,+ toSourceLanguage, sourceLanguageGetId, sourceLanguageGetName, sourceLanguageGetSection,@@ -54,7 +56,7 @@ sourceLanguageSection ) where -import Control.Monad (liftM)+import Control.Monad (liftM) import Data.Maybe (fromMaybe) import System.Glib.Attributes
Graphics/UI/Gtk/SourceView/SourceLanguageManager.chs view
@@ -39,6 +39,8 @@ -- * Methods castToSourceLanguageManager,+ gTypeSourceLanguageManager,+ toSourceLanguageManager, sourceLanguageManagerNew, sourceLanguageManagerGetDefault, sourceLanguageManagerSetSearchPath,@@ -52,7 +54,7 @@ sourceLanguageManagerSearchPath, ) where -import Control.Monad (liftM)+import Control.Monad (liftM) import Data.Maybe (fromMaybe) import System.Glib.Attributes
Graphics/UI/Gtk/SourceView/SourceMark.chs view
@@ -43,6 +43,8 @@ -- * Methods castToSourceMark,+ gTypeSourceMark,+ toSourceMark, sourceMarkNew, sourceMarkGetCategory, sourceMarkNext,@@ -52,11 +54,11 @@ sourceMarkCategory ) where -import Control.Monad (liftM)+import Control.Monad (liftM) import System.Glib.Attributes import System.Glib.FFI-import System.Glib.GObject (wrapNewGObject, makeNewGObject)+import System.Glib.GObject (wrapNewGObject, makeNewGObject) import System.Glib.Properties import System.Glib.UTFString
Graphics/UI/Gtk/SourceView/SourceStyleScheme.chs view
@@ -39,6 +39,8 @@ -- * Methods castToSourceStyleScheme,+ gTypeSourceStyleScheme,+ toSourceStyleScheme, sourceStyleSchemeGetId, sourceStyleSchemeGetName, sourceStyleSchemeGetDescription,@@ -53,12 +55,12 @@ sourceStyleSchemeName, ) where -import Control.Monad (liftM)+import Control.Monad (liftM) import Graphics.UI.Gtk.SourceView.SourceStyle import System.Glib.Attributes import System.Glib.FFI-import System.Glib.GObject (makeNewGObject)+import System.Glib.GObject (makeNewGObject) import System.Glib.UTFString {#import Graphics.UI.Gtk.SourceView.SourceStyle.Internal#}
Graphics/UI/Gtk/SourceView/SourceStyleSchemeManager.chs view
@@ -47,7 +47,7 @@ {# context lib="gtk" prefix="gtk" #} -import Control.Monad (liftM)+import Control.Monad (liftM) import Data.Maybe (fromMaybe) import System.Glib.Attributes
Graphics/UI/Gtk/SourceView/SourceUndoManager.chs view
@@ -49,7 +49,7 @@ sourceUndoManagerCanUndoChanged, ) where -import Control.Monad (liftM)+import Control.Monad (liftM) import System.Glib.Attributes import System.Glib.FFI
Graphics/UI/Gtk/SourceView/SourceView.chs view
@@ -41,6 +41,8 @@ -- * Methods castToSourceView,+ gTypeSourceView,+ toSourceView, sourceViewNew, sourceViewNewWithBuffer, sourceViewSetAutoIndent,@@ -78,6 +80,16 @@ sourceViewGetDrawSpaces, sourceViewGetGutter, +#if GTK_MAJOR_VERSION >= 3+#if MIN_VERSION_gtksourceview_3_0(3, 16, 0)+ sourceViewIndentLines,+ sourceViewUnindentLines,+#endif+ sourceViewGetVisualColumn,+ sourceViewSetMarkAttributes,+ sourceViewGetMarkAttributes,+#endif+ -- * Attributes sourceViewAutoIndent, sourceViewCompletion,@@ -108,7 +120,9 @@ #endif ) where -import Control.Monad (liftM)+import Control.Applicative+import Prelude+import Control.Monad (liftM) import Control.Monad.Reader ( runReaderT ) import Data.Maybe (fromMaybe) @@ -118,7 +132,7 @@ import Graphics.UI.Gtk.Multiline.TextView (TextWindowType (..)) import Graphics.UI.Gtk.SourceView.Enums import Graphics.UI.GtkInternals ( TextIter, mkTextIterCopy )-import System.Glib.GObject (wrapNewGObject, makeNewGObject)+import System.Glib.GObject (wrapNewGObject, makeNewGObject) import System.Glib.Attributes import System.Glib.FFI import System.Glib.UTFString@@ -434,6 +448,83 @@ (toSourceView sv) categoryPtr (castPtr colorPtr)+#endif++#if GTK_MAJOR_VERSION >= 3+#if MIN_VERSION_gtksourceview_3_0(3, 16, 0)+-- | Insert one indentation level at the beginning of the specified lines.+--+sourceViewIndentLines :: SourceViewClass sv+ => sv+ -> TextIter -- ^ @start@ the first line to indent.+ -> TextIter -- ^ @end@ the last line to indent.+ -> IO ()+sourceViewIndentLines sv start end =+ {# call gtk_source_view_indent_lines #}+ (toSourceView sv)+ start+ end++-- | Removes one indentation level at the beginning of the specified lines.+--+sourceViewUnindentLines :: SourceViewClass sv+ => sv+ -> TextIter -- ^ @start@ the first line to indent.+ -> TextIter -- ^ @end@ the last line to indent.+ -> IO ()+sourceViewUnindentLines sv start end =+ {# call gtk_source_view_unindent_lines #}+ (toSourceView sv)+ start+ end+#endif++-- | Determines the visual column at iter taking into consideration the `tabWidth` of the view.+--+sourceViewGetVisualColumn :: SourceViewClass sv+ => sv+ -> TextIter -- ^ @iter@ a position in view.+ -> IO Word+sourceViewGetVisualColumn sv iter = fromIntegral <$>+ {# call gtk_source_view_get_visual_column #}+ (toSourceView sv)+ iter++-- | Sets attributes and priority for the category.+--+sourceViewSetMarkAttributes :: (SourceViewClass sv, GlibString category, SourceMarkAttributesClass attributes)+ => sv+ -> category+ -> Maybe attributes+ -> Int+ -> IO ()+sourceViewSetMarkAttributes sv category attributes priority =+ withUTFString category $ \categoryPtr ->+ {# call gtk_source_view_set_mark_attributes #}+ (toSourceView sv)+ categoryPtr+ (maybe (SourceMarkAttributes nullForeignPtr) toSourceMarkAttributes attributes)+ (fromIntegral priority)++-- | Gets attributes and priority for the category+--+sourceViewGetMarkAttributes :: (SourceViewClass sv, GlibString category)+ => sv+ -> category+ -> IO (Maybe (SourceMarkAttributes, Int))+sourceViewGetMarkAttributes sv category =+ withUTFString category $ \categoryPtr ->+ alloca $ \ priority -> do+ attributes <- maybeNull (makeNewObject mkSourceMarkAttributes) $+ {# call gtk_source_view_get_mark_attributes #}+ (toSourceView sv)+ categoryPtr+ priority+ case attributes of+ Just a -> do+ p <- peek priority+ return $ Just (a, fromIntegral p)+ Nothing -> return Nothing #endif -- | Whether to enable auto indentation.
Graphics/UI/Gtk/SourceView/Types.chs view
@@ -77,6 +77,10 @@ toSourceMark, mkSourceMark, unSourceMark, castToSourceMark, gTypeSourceMark,+ SourceMarkAttributes(SourceMarkAttributes), SourceMarkAttributesClass,+ toSourceMarkAttributes, + mkSourceMarkAttributes, unSourceMarkAttributes,+ castToSourceMarkAttributes, gTypeSourceMarkAttributes, SourceCompletionInfo(SourceCompletionInfo), SourceCompletionInfoClass, toSourceCompletionInfo, mkSourceCompletionInfo, unSourceCompletionInfo,@@ -363,6 +367,29 @@ gTypeSourceMark :: GType gTypeSourceMark = {# call fun unsafe gtk_source_mark_get_type #}++-- ******************************************************* SourceMarkAttributes++{#pointer *GtkSourceMarkAttributes as SourceMarkAttributes foreign newtype #} deriving (Eq,Ord)++mkSourceMarkAttributes = (SourceMarkAttributes, objectUnrefFromMainloop)+unSourceMarkAttributes (SourceMarkAttributes o) = o++class GObjectClass o => SourceMarkAttributesClass o+toSourceMarkAttributes :: SourceMarkAttributesClass o => o -> SourceMarkAttributes+toSourceMarkAttributes = unsafeCastGObject . toGObject++instance SourceMarkAttributesClass SourceMarkAttributes+instance GObjectClass SourceMarkAttributes where+ toGObject = GObject . castForeignPtr . unSourceMarkAttributes+ unsafeCastGObject = SourceMarkAttributes . castForeignPtr . unGObject++castToSourceMarkAttributes :: GObjectClass obj => obj -> SourceMarkAttributes+castToSourceMarkAttributes = castTo gTypeSourceMarkAttributes "SourceMarkAttributes"++gTypeSourceMarkAttributes :: GType+gTypeSourceMarkAttributes =+ {# call fun unsafe gtk_source_mark_attributes_get_type #} -- ******************************************************* SourceCompletionInfo
SetupWrapper.hs view
@@ -20,7 +20,7 @@ import System.Process import System.Exit (ExitCode(..), exitWith) import System.FilePath-import System.Directory+import System.Directory (doesFileExist, getModificationTime) import qualified Control.Exception as Exception import System.IO.Error (isDoesNotExistError)
gtksourceview2.cabal view
@@ -1,5 +1,5 @@ Name: gtksourceview2-Version: 0.13.1.3+Version: 0.13.2.1 License: LGPL-2.1 License-file: COPYING Copyright: (c) 2001-2010 The Gtk2Hs Team
gtksourceview2.h view
@@ -19,4 +19,7 @@ #include <gtksourceview/gtksourcecompletionprovider.h> #include <gtksourceview/gtksourcecompletionproposal.h> #include <gtksourceview/gtksourcemark.h>+#if GTK_MAJOR_VERSION >= 3+#include <gtksourceview/gtksourcemarkattributes.h>+#endif #include <gtksourceview/gtksourcecompletioninfo.h>
marshal.list view
@@ -50,3 +50,4 @@ NONE:OBJECT,BOXED,POINTER BOOL:OBJECT,BOXED,OBJECT NONE:ENUM,INT+GLIBSTRING:OBJECT