diff --git a/LICENSE b/LICENSE --- a/LICENSE +++ b/LICENSE @@ -1,21 +1,177 @@ -// MIT -Copyright (c) 2014 Tycho Andersen + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. + 1. Definitions. -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS diff --git a/generator/Data/XCB/Python/Parse.hs b/generator/Data/XCB/Python/Parse.hs --- a/generator/Data/XCB/Python/Parse.hs +++ b/generator/Data/XCB/Python/Parse.hs @@ -1,3 +1,18 @@ +{- + - Copyright 2014 Tycho Andersen + - + - Licensed under the Apache License, Version 2.0 (the "License"); + - you may not use this file except in compliance with the License. + - You may obtain a copy of the License at + - + - http://www.apache.org/licenses/LICENSE-2.0 + - + - Unless required by applicable law or agreed to in writing, software + - distributed under the License is distributed on an "AS IS" BASIS, + - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + - See the License for the specific language governing permissions and + - limitations under the License. + -} {-# LANGUAGE ViewPatterns #-} module Data.XCB.Python.Parse ( parseXHeaders, @@ -232,13 +247,13 @@ getConst _ = Nothing xEnumElemsToPyEnum :: (String -> String) -> [XEnumElem] -> [(String, Expr ())] -xEnumElemsToPyEnum accessor membs = reverse $ conv membs [] [1..] +xEnumElemsToPyEnum accessor membs = reverse $ conv membs [] [0..] where exprConv = xExpressionToPyExpr accessor conv :: [XEnumElem] -> [(String, Expr ())] -> [Int] -> [(String, Expr ())] conv ((EnumElem name expr) : els) acc is = let expr' = fromMaybe (mkInt (head is)) $ fmap exprConv expr - is' = tail is + is' = dropWhile (<= (fromIntegral (int_value expr'))) is acc' = (name, expr') : acc in conv els acc' is' conv [] acc _ = acc @@ -362,6 +377,8 @@ CompositeType _ _ -> error ( "ValueParams other than CARD{16,32} not allowed.") +buf :: Suite () +buf = [mkAssign "buf" (mkCall "six.BytesIO" noArgs)] mkPackStmts :: String -> String @@ -371,8 +388,7 @@ -> [GenStructElem Type] -> ([String], Suite ()) mkPackStmts ext name m accessor prefix membs = - let buf = [mkAssign "buf" (mkCall "six.BytesIO" noArgs)] - packF = structElemToPyPack ext m accessor + let packF = structElemToPyPack ext m accessor (toPack, stmts) = partitionEithers $ map packF membs listWrites = map (flip StmtExpr () . mkCall "buf.write" . (: [])) lists (args, keys) = let (as, ks) = unzip toPack in (catMaybes as, ks) @@ -396,18 +412,36 @@ write = mkCall "buf.write" [mkCall "struct.pack" (mkStr ('=' : packStr) : (map mkName args))] writeStmt = if length packStr > 0 then [StmtExpr write ()] else [] - in (args ++ listNames', buf ++ writeStmt ++ listWrites) + in (args ++ listNames', writeStmt ++ listWrites) mkPackMethod :: String -> String -> TypeInfoMap + -> Maybe (String, Int) -> [GenStructElem Type] + -> Maybe Int -> Statement () -mkPackMethod ext name m structElems = +mkPackMethod ext name m prefixAndOp structElems minLen = let accessor = ((++) "self.") - (_, packStmts) = mkPackStmts ext name m accessor "" structElems + (prefix, op) = case prefixAndOp of + Just ('x' : rest, i) -> + let packOpcode = mkCall "struct.pack" [mkStr "=B", mkInt i] + write = mkCall "buf.write" [packOpcode] + in (rest, [StmtExpr write ()]) + Just (rest, _) -> error ("internal API error: " ++ show rest) + Nothing -> ("", []) + (_, packStmts) = mkPackStmts ext name m accessor prefix structElems + extend = concat $ do + len <- maybeToList minLen + let bufLen = mkName "buf_len" + bufLenAssign = mkAssign bufLen $ mkCall "len" [mkCall "buf.getvalue" noArgs] + test = (BinaryOp (LessThan ()) bufLen (mkInt len)) () + bufWriteLen = Paren (BinaryOp (Minus ()) (mkInt 32) bufLen ()) () + extra = mkCall "struct.pack" [repeatStr "x" bufWriteLen] + writeExtra = [StmtExpr (mkCall "buf.write" [extra]) ()] + return $ [bufLenAssign, mkIf test writeExtra] ret = [mkReturn $ mkCall "buf.getvalue" noArgs] - in mkMethod "pack" (mkParams ["self"]) $ packStmts ++ ret + in mkMethod "pack" (mkParams ["self"]) $ buf ++ op ++ packStmts ++ extend ++ ret data StructUnpackState = StructUnpackState { -- | stNeedsPad is whether or not a type_pad() is needed. As near @@ -518,7 +552,7 @@ processXDecl ext (XStruct n membs) = do m <- get let (statements, len) = mkStructStyleUnpack "" ext m membs - pack = mkPackMethod ext n m membs + pack = mkPackMethod ext n m Nothing membs Nothing fixedLength = maybeToList $ do theLen <- len let rhs = mkInt theLen @@ -528,8 +562,8 @@ processXDecl ext (XEvent name opcode membs noSequence) = do m <- get let cname = name ++ "Event" - pack = mkPackMethod ext name m membs prefix = if fromMaybe False noSequence then "x" else "x%c2x" + pack = mkPackMethod ext name m (Just (prefix, opcode)) membs (Just 32) (statements, _) = mkStructStyleUnpack prefix ext m membs eventsUpd = mkDictUpdate "_events" opcode cname return $ Declaration [ mkXClass cname "xcffib.Event" statements [pack] @@ -538,8 +572,9 @@ processXDecl ext (XError name opcode membs) = do m <- get let cname = name ++ "Error" - pack = mkPackMethod ext name m membs - (statements, _) = mkStructStyleUnpack "xx2x" ext m membs + prefix = "xx2x" + pack = mkPackMethod ext name m (Just (prefix, opcode)) membs Nothing + (statements, _) = mkStructStyleUnpack prefix ext m membs errorsUpd = mkDictUpdate "_errors" opcode cname alias = mkAssign ("Bad" ++ name) (mkName cname) return $ Declaration [ mkXClass cname "xcffib.Error" statements [pack] @@ -572,7 +607,7 @@ ]) ++ hasReply ++ [argChecked]) - requestBody = packStmts ++ [ret] + requestBody = buf ++ packStmts ++ [ret] request = mkMethod name allArgs requestBody return $ Request request replyDecl processXDecl ext (XUnion name membs) = do @@ -583,7 +618,10 @@ (names, exprs, _, _) = unzip4 listInfo lists = map (uncurry mkAssign) $ zip (map mkAttr names) exprs initMethod = lists ++ toUnpack - decl = [mkXClass name "xcffib.Union" initMethod []] + -- Here, we only want to pack the first member of the union, since every + -- member is the same data and we don't want to repeatedly pack it. + pack = mkPackMethod ext name m Nothing [head membs] Nothing + decl = [mkXClass name "xcffib.Union" initMethod [pack]] modify $ mkModify ext name (CompositeType ext name) return $ Declaration decl where diff --git a/generator/Data/XCB/Python/PyHelpers.hs b/generator/Data/XCB/Python/PyHelpers.hs --- a/generator/Data/XCB/Python/PyHelpers.hs +++ b/generator/Data/XCB/Python/PyHelpers.hs @@ -1,3 +1,18 @@ +{- + - Copyright 2014 Tycho Andersen + - + - Licensed under the Apache License, Version 2.0 (the "License"); + - you may not use this file except in compliance with the License. + - You may obtain a copy of the License at + - + - http://www.apache.org/licenses/LICENSE-2.0 + - + - Unless required by applicable law or agreed to in writing, software + - distributed under the License is distributed on an "AS IS" BASIS, + - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + - See the License for the specific language governing permissions and + - limitations under the License. + -} {-# LANGUAGE TypeSynonymInstances, FlexibleInstances #-} module Data.XCB.Python.PyHelpers ( mkImport, @@ -23,7 +38,9 @@ pyTruth, mkParams, ident, - pyNone + pyNone, + mkIf, + repeatStr ) where import Data.List.Split @@ -165,3 +182,9 @@ pyNone :: Expr () pyNone = None () + +mkIf :: Expr () -> Suite () -> Statement () +mkIf e s = Conditional [(e, s)] [] () + +repeatStr :: String -> Expr () -> Expr () +repeatStr s i = BinaryOp (Multiply ()) (mkStr s) i () diff --git a/generator/xcffibgen.hs b/generator/xcffibgen.hs --- a/generator/xcffibgen.hs +++ b/generator/xcffibgen.hs @@ -1,4 +1,20 @@ +{- + - Copyright 2014 Tycho Andersen + - + - Licensed under the Apache License, Version 2.0 (the "License"); + - you may not use this file except in compliance with the License. + - You may obtain a copy of the License at + - + - http://www.apache.org/licenses/LICENSE-2.0 + - + - Unless required by applicable law or agreed to in writing, software + - distributed under the License is distributed on an "AS IS" BASIS, + - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + - See the License for the specific language governing permissions and + - limitations under the License. + -} module Main where + import Data.XCB.Types import Data.XCB.Python.Parse diff --git a/tests/GeneratorTests.hs b/tests/GeneratorTests.hs --- a/tests/GeneratorTests.hs +++ b/tests/GeneratorTests.hs @@ -1,3 +1,18 @@ +{- + - Copyright 2014 Tycho Andersen + - + - Licensed under the Apache License, Version 2.0 (the "License"); + - you may not use this file except in compliance with the License. + - You may obtain a copy of the License at + - + - http://www.apache.org/licenses/LICENSE-2.0 + - + - Unless required by applicable law or agreed to in writing, software + - distributed under the License is distributed on an "AS IS" BASIS, + - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + - See the License for the specific language governing permissions and + - limitations under the License. + -} module Main (main) where import Language.Python.Common @@ -22,6 +37,8 @@ , "request_reply" , "no_sequence" , "type_pad" + , "render_1.7" + , "xproto_1.7" ] mkFname :: String -> FilePath diff --git a/tests/PyHelpersTests.hs b/tests/PyHelpersTests.hs --- a/tests/PyHelpersTests.hs +++ b/tests/PyHelpersTests.hs @@ -1,3 +1,18 @@ +{- + - Copyright 2014 Tycho Andersen + - + - Licensed under the Apache License, Version 2.0 (the "License"); + - you may not use this file except in compliance with the License. + - You may obtain a copy of the License at + - + - http://www.apache.org/licenses/LICENSE-2.0 + - + - Unless required by applicable law or agreed to in writing, software + - distributed under the License is distributed on an "AS IS" BASIS, + - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + - See the License for the specific language governing permissions and + - limitations under the License. + -} module Main (main) where import Language.Python.Common diff --git a/xcffib.cabal b/xcffib.cabal --- a/xcffib.cabal +++ b/xcffib.cabal @@ -1,8 +1,8 @@ name: xcffib -version: 0.1.5 +version: 0.2.0 synopsis: A cffi-based python binding for X homepage: http://github.com/tych0/xcffib -license: MIT +license: OtherLicense license-file: LICENSE author: Tycho Andersen maintainer: Tycho Andersen @@ -18,7 +18,7 @@ library build-depends: base ==4.*, - xcb-types >= 0.7.1, + xcb-types >= 0.7.0, language-python >= 0.4.0, filepath, filemanip, @@ -39,7 +39,7 @@ xcffib >= 0.1.0, language-python >= 0.4.0, split, - xcb-types >= 0.7.1, + xcb-types >= 0.7.0, optparse-applicative >= 0.5, filepath, filemanip, @@ -67,7 +67,7 @@ type: exitcode-stdio-1.0 build-depends: base ==4.*, xcffib >= 0.1.0, - xcb-types >= 0.7.1, + xcb-types >= 0.7.0, language-python >= 0.4.0, HUnit, test-framework,