diff --git a/Data/GI/Base/BasicTypes.hsc b/Data/GI/Base/BasicTypes.hsc --- a/Data/GI/Base/BasicTypes.hsc +++ b/Data/GI/Base/BasicTypes.hsc @@ -170,10 +170,10 @@ instance Exception UnexpectedNullPointerReturn --- | A . See "Data.GI.Base.GVariant" for further methods. +-- | A . See "Data.GI.Base.GVariant" for further methods. newtype GVariant = GVariant (ManagedPtr GVariant) --- | A . See "Data.GI.Base.GParamSpec" for further methods. +-- | A . See "Data.GI.Base.GParamSpec" for further methods. newtype GParamSpec = GParamSpec (ManagedPtr GParamSpec) -- | A convenient synonym for @Nothing :: Maybe GParamSpec@. @@ -183,22 +183,22 @@ -- | An enum usable as a flag for a function. class Enum a => IsGFlag a --- | A . Marshalling for this type is done in "Data.GI.Base.BasicConversions", it is mapped to a list on the Haskell side. +-- | A . Marshalling for this type is done in "Data.GI.Base.BasicConversions", it is mapped to a list on the Haskell side. data GArray a = GArray (Ptr (GArray a)) --- | A . Marshalling for this type is done in "Data.GI.Base.BasicConversions", it is mapped to a list on the Haskell side. +-- | A . Marshalling for this type is done in "Data.GI.Base.BasicConversions", it is mapped to a list on the Haskell side. data GPtrArray a = GPtrArray (Ptr (GPtrArray a)) --- | A . Marshalling for this type is done in "Data.GI.Base.BasicConversions", it is packed to a 'Data.ByteString.ByteString' on the Haskell side. +-- | A . Marshalling for this type is done in "Data.GI.Base.BasicConversions", it is packed to a 'Data.ByteString.ByteString' on the Haskell side. data GByteArray = GByteArray (Ptr GByteArray) --- | A . It is mapped to a 'Data.Map.Map' on the Haskell side. +-- | A . It is mapped to a 'Data.Map.Map' on the Haskell side. data GHashTable a b = GHashTable (Ptr (GHashTable a b)) --- | A , mapped to a list on the Haskell side. Marshalling is done in "Data.GI.Base.BasicConversions". +-- | A , mapped to a list on the Haskell side. Marshalling is done in "Data.GI.Base.BasicConversions". data GList a = GList (Ptr (GList a)) --- | A , mapped to a list on the Haskell side. Marshalling is done in "Data.GI.Base.BasicConversions". +-- | A , mapped to a list on the Haskell side. Marshalling is done in "Data.GI.Base.BasicConversions". data GSList a = GSList (Ptr (GSList a)) -- | Some APIs, such as `GHashTable`, pass around scalar types diff --git a/Data/GI/Base/GObject.hsc b/Data/GI/Base/GObject.hsc --- a/Data/GI/Base/GObject.hsc +++ b/Data/GI/Base/GObject.hsc @@ -35,6 +35,7 @@ , gobjectInstallProperty , gobjectInstallCIntProperty , gobjectInstallCStringProperty + , gobjectInstallGBooleanProperty ) where import Data.Maybe (catMaybes) @@ -69,7 +70,8 @@ import Data.GI.Base.GParamSpec (PropertyInfo(..), gParamSpecValue, CIntPropertyInfo(..), CStringPropertyInfo(..), - gParamSpecCInt, gParamSpecCString, + GBooleanPropertyInfo(..), + gParamSpecCInt, gParamSpecCString, gParamSpecGBoolean, getGParamSpecGetterSetter, PropGetSetter(..)) import Data.GI.Base.GQuark (GQuark(..), gQuarkFromString) @@ -409,5 +411,13 @@ GObjectClass -> CStringPropertyInfo o -> IO () gobjectInstallCStringProperty klass propInfo = do pspec <- gParamSpecCString propInfo + withManagedPtr pspec $ \pspecPtr -> + g_object_class_install_property klass 1 pspecPtr + +-- | Add a `${type gboolean}`-valued property to the given object class. +gobjectInstallGBooleanProperty :: DerivedGObject o => + GObjectClass -> GBooleanPropertyInfo o -> IO () +gobjectInstallGBooleanProperty klass propInfo = do + pspec <- gParamSpecGBoolean propInfo withManagedPtr pspec $ \pspecPtr -> g_object_class_install_property klass 1 pspecPtr diff --git a/Data/GI/Base/GParamSpec.hsc b/Data/GI/Base/GParamSpec.hsc --- a/Data/GI/Base/GParamSpec.hsc +++ b/Data/GI/Base/GParamSpec.hsc @@ -20,6 +20,8 @@ , gParamSpecCString , CIntPropertyInfo(..) , gParamSpecCInt + , GBooleanPropertyInfo(..) + , gParamSpecGBoolean , GParamFlag(..) -- * Get\/Set @@ -33,6 +35,7 @@ castStablePtrToPtr, castPtrToStablePtr) import Control.Monad (void) import Data.Coerce (coerce) +import Data.Int import Data.Maybe (fromMaybe) import Data.Text (Text) @@ -316,6 +319,48 @@ withTextCString value $ \cdefault -> g_param_spec_string cname cnick cblurb cdefault (maybe defaultFlags gflagsToWord flags) + quark <- pspecQuark + gParamSpecSetQData pspecPtr quark (wrapGetSet getter setter gvalueSet_) + wrapGParamSpecPtr pspecPtr + +-- | Information on a property of type `type gboolean` to be registered. A +-- property name consists of segments consisting of ASCII letters and +-- digits, separated by either the \'-\' or \'_\' character. The first +-- character of a property name must be a letter. Names which violate +-- these rules lead to undefined behaviour. +-- +-- When creating and looking up a property, either separator can be +-- used, but they cannot be mixed. Using \'-\' is considerably more +-- efficient and in fact required when using property names as detail +-- strings for signals. +-- +-- Beyond the name, properties have two more descriptive strings +-- associated with them, the @nick@, which should be suitable for use +-- as a label for the property in a property editor, and the @blurb@, +-- which should be a somewhat longer description, suitable for e.g. a +-- tooltip. The @nick@ and @blurb@ should ideally be localized. +data GBooleanPropertyInfo o = GBooleanPropertyInfo + { name :: Text + , nick :: Text + , blurb :: Text + , defaultValue :: Bool + , flags :: Maybe [GParamFlag] + , setter :: o -> Bool -> IO () + , getter :: o -> IO (Bool) + } + +foreign import ccall g_param_spec_boolean :: + CString -> CString -> CString -> #{type gboolean} -> CInt -> IO (Ptr GParamSpec) + +-- | Create a `GParamSpec` for a bool param. +gParamSpecGBoolean :: GObject o => GBooleanPropertyInfo o -> IO GParamSpec +gParamSpecGBoolean (GBooleanPropertyInfo {..}) = + withTextCString name $ \cname -> + withTextCString nick $ \cnick -> + withTextCString blurb $ \cblurb -> do + pspecPtr <- g_param_spec_boolean cname cnick cblurb + ((fromIntegral . fromEnum) defaultValue) + (maybe defaultFlags gflagsToWord flags) quark <- pspecQuark gParamSpecSetQData pspecPtr quark (wrapGetSet getter setter gvalueSet_) wrapGParamSpecPtr pspecPtr diff --git a/Data/GI/Base/GType.hsc b/Data/GI/Base/GType.hsc --- a/Data/GI/Base/GType.hsc +++ b/Data/GI/Base/GType.hsc @@ -107,10 +107,6 @@ gtypeVariant :: GType gtypeVariant = GType #const G_TYPE_VARIANT --- | The `GType` corresponding to 'Data.GI.Base.GError.GError'. -gtypeError :: GType -gtypeError = GType #const G_TYPE_ERROR - -- | The `GType` corresponding to 'Data.GI.Base.BasicTypes.GParamSpec'. gtypeParam :: GType gtypeParam = GType #const G_TYPE_PARAM @@ -140,3 +136,9 @@ -- | The `GType` for boxed `StablePtr`s. gtypeStablePtr :: GType gtypeStablePtr = GType haskell_gi_StablePtr_get_type + +foreign import ccall "g_error_get_type" g_error_get_type :: CGType + +-- | The `GType` corresponding to 'Data.GI.Base.GError.GError'. +gtypeError :: GType +gtypeError = GType g_error_get_type diff --git a/Data/GI/Base/GVariant.hsc b/Data/GI/Base/GVariant.hsc --- a/Data/GI/Base/GVariant.hsc +++ b/Data/GI/Base/GVariant.hsc @@ -238,7 +238,7 @@ -- | Get the expected type of a 'GVariant', in 'GVariant' -- notation. See --- +-- -- for the meaning of the resulting format string. gvariantGetTypeString :: GVariant -> IO Text gvariantGetTypeString variant = diff --git a/Data/GI/Base/ShortPrelude.hs b/Data/GI/Base/ShortPrelude.hs --- a/Data/GI/Base/ShortPrelude.hs +++ b/Data/GI/Base/ShortPrelude.hs @@ -1,3 +1,6 @@ +#if MIN_VERSION_base(4,20,0) +{-# LANGUAGE ExplicitNamespaces #-} +#endif -- | The Haskell Prelude exports a number of symbols that can easily -- collide with functions appearing in bindings. The generated code -- requires just a small subset of the functions in the Prelude, @@ -57,6 +60,9 @@ , when , fromIntegral , realToFrac +#if MIN_VERSION_base(4,20,0) + , type (~) +#endif ) where import Control.Monad (when, (>=>)) diff --git a/Data/GI/Base/Signals.hs b/Data/GI/Base/Signals.hs --- a/Data/GI/Base/Signals.hs +++ b/Data/GI/Base/Signals.hs @@ -18,7 +18,7 @@ -- | Routines for connecting `GObject`s to signals. There are two -- basic variants, 'on' and 'after', which correspond to --- and , respectively. +-- and , respectively. -- -- Basic usage is -- diff --git a/haskell-gi-base.cabal b/haskell-gi-base.cabal --- a/haskell-gi-base.cabal +++ b/haskell-gi-base.cabal @@ -1,5 +1,5 @@ name: haskell-gi-base -version: 0.26.4 +version: 0.26.5 synopsis: Foundation for libraries generated by haskell-gi description: Foundation for libraries generated by haskell-gi homepage: https://github.com/haskell-gi/haskell-gi