Skip to content
Snippets Groups Projects
Commit ce5531ff authored by Jens Nolte's avatar Jens Nolte
Browse files

Rename Fixed to WlFixed

parent 899979e2
No related branches found
No related tags found
No related merge requests found
...@@ -10,7 +10,7 @@ module Quasar.Wayland.Protocol ( ...@@ -10,7 +10,7 @@ module Quasar.Wayland.Protocol (
getMessageHandler, getMessageHandler,
-- ** Wayland types -- ** Wayland types
Fixed(..), WlFixed(..),
WlString(..), WlString(..),
toString, toString,
......
...@@ -6,7 +6,7 @@ module Quasar.Wayland.Protocol.Core ( ...@@ -6,7 +6,7 @@ module Quasar.Wayland.Protocol.Core (
NewId, NewId,
GenericNewId, GenericNewId,
Opcode, Opcode,
Fixed(..), WlFixed(..),
WlString(..), WlString(..),
toString, toString,
fromString, fromString,
...@@ -115,10 +115,10 @@ data GenericNewId = GenericNewId WlString Version Word32 ...@@ -115,10 +115,10 @@ data GenericNewId = GenericNewId WlString Version Word32
-- | Signed 24.8 decimal numbers. -- | Signed 24.8 decimal numbers.
newtype Fixed = Fixed Word32 newtype WlFixed = WlFixed Word32
deriving newtype Eq deriving newtype Eq
instance Show Fixed where instance Show WlFixed where
show x = "[fixed " <> show x <> "]" show x = "[fixed " <> show x <> "]"
...@@ -162,9 +162,9 @@ instance WireFormat Word32 where ...@@ -162,9 +162,9 @@ instance WireFormat Word32 where
getArgument = pure <$> getWord32host getArgument = pure <$> getWord32host
showArgument = show showArgument = show
instance WireFormat Fixed where instance WireFormat WlFixed where
putArgument (Fixed repr) = pure $ MessagePart (putWord32host repr) 4 mempty putArgument (WlFixed repr) = pure $ MessagePart (putWord32host repr) 4 mempty
getArgument = pure . Fixed <$> getWord32host getArgument = pure . WlFixed <$> getWord32host
showArgument = show showArgument = show
instance WireFormat WlString where instance WireFormat WlString where
......
...@@ -498,7 +498,7 @@ argumentWireType argSpec = liftArgumentWireType argSpec.argType ...@@ -498,7 +498,7 @@ argumentWireType argSpec = liftArgumentWireType argSpec.argType
liftArgumentWireType :: ArgumentType -> Q Type liftArgumentWireType :: ArgumentType -> Q Type
liftArgumentWireType IntArgument = [t|Int32|] liftArgumentWireType IntArgument = [t|Int32|]
liftArgumentWireType UIntArgument = [t|Word32|] liftArgumentWireType UIntArgument = [t|Word32|]
liftArgumentWireType FixedArgument = [t|Fixed|] liftArgumentWireType FixedArgument = [t|WlFixed|]
liftArgumentWireType StringArgument = [t|WlString|] liftArgumentWireType StringArgument = [t|WlString|]
liftArgumentWireType ArrayArgument = [t|BS.ByteString|] liftArgumentWireType ArrayArgument = [t|BS.ByteString|]
liftArgumentWireType (ObjectArgument iName) = [t|ObjectId $(litT (strTyLit iName))|] liftArgumentWireType (ObjectArgument iName) = [t|ObjectId $(litT (strTyLit iName))|]
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment