From ce5531fffc331250b67dc2328e4d0b988296b033 Mon Sep 17 00:00:00 2001 From: Jens Nolte <git@queezle.net> Date: Tue, 26 Jul 2022 02:33:23 +0200 Subject: [PATCH] Rename Fixed to WlFixed --- src/Quasar/Wayland/Protocol.hs | 2 +- src/Quasar/Wayland/Protocol/Core.hs | 12 ++++++------ src/Quasar/Wayland/Protocol/TH.hs | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Quasar/Wayland/Protocol.hs b/src/Quasar/Wayland/Protocol.hs index 6348d33..002f22a 100644 --- a/src/Quasar/Wayland/Protocol.hs +++ b/src/Quasar/Wayland/Protocol.hs @@ -10,7 +10,7 @@ module Quasar.Wayland.Protocol ( getMessageHandler, -- ** Wayland types - Fixed(..), + WlFixed(..), WlString(..), toString, diff --git a/src/Quasar/Wayland/Protocol/Core.hs b/src/Quasar/Wayland/Protocol/Core.hs index b343768..a27e54b 100644 --- a/src/Quasar/Wayland/Protocol/Core.hs +++ b/src/Quasar/Wayland/Protocol/Core.hs @@ -6,7 +6,7 @@ module Quasar.Wayland.Protocol.Core ( NewId, GenericNewId, Opcode, - Fixed(..), + WlFixed(..), WlString(..), toString, fromString, @@ -115,10 +115,10 @@ data GenericNewId = GenericNewId WlString Version Word32 -- | Signed 24.8 decimal numbers. -newtype Fixed = Fixed Word32 +newtype WlFixed = WlFixed Word32 deriving newtype Eq -instance Show Fixed where +instance Show WlFixed where show x = "[fixed " <> show x <> "]" @@ -162,9 +162,9 @@ instance WireFormat Word32 where getArgument = pure <$> getWord32host showArgument = show -instance WireFormat Fixed where - putArgument (Fixed repr) = pure $ MessagePart (putWord32host repr) 4 mempty - getArgument = pure . Fixed <$> getWord32host +instance WireFormat WlFixed where + putArgument (WlFixed repr) = pure $ MessagePart (putWord32host repr) 4 mempty + getArgument = pure . WlFixed <$> getWord32host showArgument = show instance WireFormat WlString where diff --git a/src/Quasar/Wayland/Protocol/TH.hs b/src/Quasar/Wayland/Protocol/TH.hs index 6a45f3d..b15df19 100644 --- a/src/Quasar/Wayland/Protocol/TH.hs +++ b/src/Quasar/Wayland/Protocol/TH.hs @@ -498,7 +498,7 @@ argumentWireType argSpec = liftArgumentWireType argSpec.argType liftArgumentWireType :: ArgumentType -> Q Type liftArgumentWireType IntArgument = [t|Int32|] liftArgumentWireType UIntArgument = [t|Word32|] -liftArgumentWireType FixedArgument = [t|Fixed|] +liftArgumentWireType FixedArgument = [t|WlFixed|] liftArgumentWireType StringArgument = [t|WlString|] liftArgumentWireType ArrayArgument = [t|BS.ByteString|] liftArgumentWireType (ObjectArgument iName) = [t|ObjectId $(litT (strTyLit iName))|] -- GitLab