hoodle-render 0.4 → 0.5

raw patch · 16 files changed

+616/−1170 lines, 16 filesdep +gtk3dep +hashabledep +timedep ~gtkdep ~hoodle-typesPVP ok

version bump matches the API change (PVP)

Dependencies added: gtk3, hashable, time

Dependency ranges changed: gtk, hoodle-types

API changes (from Hackage documentation)

Files

• CHANGES +0/−10
• LICENSE +20/−681
• hoodle-render.cabal +17/−7
• src/Graphics/Hoodle/Render.hs +163/−129
• src/Graphics/Hoodle/Render/Background.hs +55/−30
• src/Graphics/Hoodle/Render/Debug.hs +0/−138
• src/Graphics/Hoodle/Render/Engine.hs +140/−0
• src/Graphics/Hoodle/Render/Generic.hs +57/−43
• src/Graphics/Hoodle/Render/Item.hs +15/−61
• src/Graphics/Hoodle/Render/Primitive.hs +22/−14
• src/Graphics/Hoodle/Render/Type.hs +2/−2
• src/Graphics/Hoodle/Render/Type/Background.hs +6/−7
• src/Graphics/Hoodle/Render/Type/Hoodle.hs +9/−12
• src/Graphics/Hoodle/Render/Type/Item.hs +4/−2
• src/Graphics/Hoodle/Render/Type/RenderCache.hs +0/−21
• src/Graphics/Hoodle/Render/Type/Renderer.hs +106/−13

@@ -1,10 +0,0 @@-0.2: 12 Dec 2011-   * First public release-0.3: 18 Dec 2011 -   * Rename modules and make compatible with new xournal-types package-0.4: 25 Dec 2011-   * Double buffer support-0.5: 15 Jan 2012-   * ZipperSelect support-0.6: 12 Feb 2012-   * Variable width support

@@ -1,686 +1,25 @@-Copyright (C) 2011-2014 Ian-Woo Kim--Hoodle is free software: you can redistribute it and/or modify-it under the terms of the GNU General Public License as published by-the Free Software Foundation, either version 3 of the License, or-(at your option) any later version.--Hoodle is distributed in the hope that it will be useful,-but WITHOUT ANY WARRANTY; without even the implied warranty of-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the-GNU General Public License for more details.--                    GNU GENERAL PUBLIC LICENSE-                       Version 3, 29 June 2007-- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>- Everyone is permitted to copy and distribute verbatim copies- of this license document, but changing it is not allowed.--                            Preamble--  The GNU General Public License is a free, copyleft license for-software and other kinds of works.--  The licenses for most software and other practical works are designed-to take away your freedom to share and change the works.  By contrast,-the GNU General Public License is intended to guarantee your freedom to-share and change all versions of a program--to make sure it remains free-software for all its users.  We, the Free Software Foundation, use the-GNU General Public License for most of our software; it applies also to-any other work released this way by its authors.  You can apply it to-your programs, too.--  When we speak of free software, we are referring to freedom, not-price.  Our General Public Licenses are designed to make sure that you-have the freedom to distribute copies of free software (and charge for-them if you wish), that you receive source code or can get it if you-want it, that you can change the software or use pieces of it in new-free programs, and that you know you can do these things.--  To protect your rights, we need to prevent others from denying you-these rights or asking you to surrender the rights.  Therefore, you have-certain responsibilities if you distribute copies of the software, or if-you modify it: responsibilities to respect the freedom of others.--  For example, if you distribute copies of such a program, whether-gratis or for a fee, you must pass on to the recipients the same-freedoms that you received.  You must make sure that they, too, receive-or can get the source code.  And you must show them these terms so they-know their rights.--  Developers that use the GNU GPL protect your rights with two steps:-(1) assert copyright on the software, and (2) offer you this License-giving you legal permission to copy, distribute and/or modify it.--  For the developers' and authors' protection, the GPL clearly explains-that there is no warranty for this free software.  For both users' and-authors' sake, the GPL requires that modified versions be marked as-changed, so that their problems will not be attributed erroneously to-authors of previous versions.--  Some devices are designed to deny users access to install or run-modified versions of the software inside them, although the manufacturer-can do so.  This is fundamentally incompatible with the aim of-protecting users' freedom to change the software.  The systematic-pattern of such abuse occurs in the area of products for individuals to-use, which is precisely where it is most unacceptable.  Therefore, we-have designed this version of the GPL to prohibit the practice for those-products.  If such problems arise substantially in other domains, we-stand ready to extend this provision to those domains in future versions-of the GPL, as needed to protect the freedom of users.--  Finally, every program is threatened constantly by software patents.-States should not allow patents to restrict development and use of-software on general-purpose computers, but in those that do, we wish to-avoid the special danger that patents applied to a free program could-make it effectively proprietary.  To prevent this, the GPL assures that-patents cannot be used to render the program non-free.--  The precise terms and conditions for copying, distribution and-modification follow.--                       TERMS AND CONDITIONS--  0. Definitions.--  "This License" refers to version 3 of the GNU General Public License.--  "Copyright" also means copyright-like laws that apply to other kinds of-works, such as semiconductor masks.--  "The Program" refers to any copyrightable work licensed under this-License.  Each licensee is addressed as "you".  "Licensees" and-"recipients" may be individuals or organizations.--  To "modify" a work means to copy from or adapt all or part of the work-in a fashion requiring copyright permission, other than the making of an-exact copy.  The resulting work is called a "modified version" of the-earlier work or a work "based on" the earlier work.--  A "covered work" means either the unmodified Program or a work based-on the Program.--  To "propagate" a work means to do anything with it that, without-permission, would make you directly or secondarily liable for-infringement under applicable copyright law, except executing it on a-computer or modifying a private copy.  Propagation includes copying,-distribution (with or without modification), making available to the-public, and in some countries other activities as well.--  To "convey" a work means any kind of propagation that enables other-parties to make or receive copies.  Mere interaction with a user through-a computer network, with no transfer of a copy, is not conveying.--  An interactive user interface displays "Appropriate Legal Notices"-to the extent that it includes a convenient and prominently visible-feature that (1) displays an appropriate copyright notice, and (2)-tells the user that there is no warranty for the work (except to the-extent that warranties are provided), that licensees may convey the-work under this License, and how to view a copy of this License.  If-the interface presents a list of user commands or options, such as a-menu, a prominent item in the list meets this criterion.--  1. Source Code.--  The "source code" for a work means the preferred form of the work-for making modifications to it.  "Object code" means any non-source-form of a work.--  A "Standard Interface" means an interface that either is an official-standard defined by a recognized standards body, or, in the case of-interfaces specified for a particular programming language, one that-is widely used among developers working in that language.--  The "System Libraries" of an executable work include anything, other-than the work as a whole, that (a) is included in the normal form of-packaging a Major Component, but which is not part of that Major-Component, and (b) serves only to enable use of the work with that-Major Component, or to implement a Standard Interface for which an-implementation is available to the public in source code form.  A-"Major Component", in this context, means a major essential component-(kernel, window system, and so on) of the specific operating system-(if any) on which the executable work runs, or a compiler used to-produce the work, or an object code interpreter used to run it.--  The "Corresponding Source" for a work in object code form means all-the source code needed to generate, install, and (for an executable-work) run the object code and to modify the work, including scripts to-control those activities.  However, it does not include the work's-System Libraries, or general-purpose tools or generally available free-programs which are used unmodified in performing those activities but-which are not part of the work.  For example, Corresponding Source-includes interface definition files associated with source files for-the work, and the source code for shared libraries and dynamically-linked subprograms that the work is specifically designed to require,-such as by intimate data communication or control flow between those-subprograms and other parts of the work.--  The Corresponding Source need not include anything that users-can regenerate automatically from other parts of the Corresponding-Source.--  The Corresponding Source for a work in source code form is that-same work.--  2. Basic Permissions.--  All rights granted under this License are granted for the term of-copyright on the Program, and are irrevocable provided the stated-conditions are met.  This License explicitly affirms your unlimited-permission to run the unmodified Program.  The output from running a-covered work is covered by this License only if the output, given its-content, constitutes a covered work.  This License acknowledges your-rights of fair use or other equivalent, as provided by copyright law.--  You may make, run and propagate covered works that you do not-convey, without conditions so long as your license otherwise remains-in force.  You may convey covered works to others for the sole purpose-of having them make modifications exclusively for you, or provide you-with facilities for running those works, provided that you comply with-the terms of this License in conveying all material for which you do-not control copyright.  Those thus making or running the covered works-for you must do so exclusively on your behalf, under your direction-and control, on terms that prohibit them from making any copies of-your copyrighted material outside their relationship with you.--  Conveying under any other circumstances is permitted solely under-the conditions stated below.  Sublicensing is not allowed; section 10-makes it unnecessary.--  3. Protecting Users' Legal Rights From Anti-Circumvention Law.--  No covered work shall be deemed part of an effective technological-measure under any applicable law fulfilling obligations under article-11 of the WIPO copyright treaty adopted on 20 December 1996, or-similar laws prohibiting or restricting circumvention of such-measures.--  When you convey a covered work, you waive any legal power to forbid-circumvention of technological measures to the extent such circumvention-is effected by exercising rights under this License with respect to-the covered work, and you disclaim any intention to limit operation or-modification of the work as a means of enforcing, against the work's-users, your or third parties' legal rights to forbid circumvention of-technological measures.--  4. Conveying Verbatim Copies.--  You may convey verbatim copies of the Program's source code as you-receive it, in any medium, provided that you conspicuously and-appropriately publish on each copy an appropriate copyright notice;-keep intact all notices stating that this License and any-non-permissive terms added in accord with section 7 apply to the code;-keep intact all notices of the absence of any warranty; and give all-recipients a copy of this License along with the Program.--  You may charge any price or no price for each copy that you convey,-and you may offer support or warranty protection for a fee.--  5. Conveying Modified Source Versions.--  You may convey a work based on the Program, or the modifications to-produce it from the Program, in the form of source code under the-terms of section 4, provided that you also meet all of these conditions:--    a) The work must carry prominent notices stating that you modified-    it, and giving a relevant date.--    b) The work must carry prominent notices stating that it is-    released under this License and any conditions added under section-    7.  This requirement modifies the requirement in section 4 to-    "keep intact all notices".--    c) You must license the entire work, as a whole, under this-    License to anyone who comes into possession of a copy.  This-    License will therefore apply, along with any applicable section 7-    additional terms, to the whole of the work, and all its parts,-    regardless of how they are packaged.  This License gives no-    permission to license the work in any other way, but it does not-    invalidate such permission if you have separately received it.--    d) If the work has interactive user interfaces, each must display-    Appropriate Legal Notices; however, if the Program has interactive-    interfaces that do not display Appropriate Legal Notices, your-    work need not make them do so.--  A compilation of a covered work with other separate and independent-works, which are not by their nature extensions of the covered work,-and which are not combined with it such as to form a larger program,-in or on a volume of a storage or distribution medium, is called an-"aggregate" if the compilation and its resulting copyright are not-used to limit the access or legal rights of the compilation's users-beyond what the individual works permit.  Inclusion of a covered work-in an aggregate does not cause this License to apply to the other-parts of the aggregate.--  6. Conveying Non-Source Forms.--  You may convey a covered work in object code form under the terms-of sections 4 and 5, provided that you also convey the-machine-readable Corresponding Source under the terms of this License,-in one of these ways:--    a) Convey the object code in, or embodied in, a physical product-    (including a physical distribution medium), accompanied by the-    Corresponding Source fixed on a durable physical medium-    customarily used for software interchange.--    b) Convey the object code in, or embodied in, a physical product-    (including a physical distribution medium), accompanied by a-    written offer, valid for at least three years and valid for as-    long as you offer spare parts or customer support for that product-    model, to give anyone who possesses the object code either (1) a-    copy of the Corresponding Source for all the software in the-    product that is covered by this License, on a durable physical-    medium customarily used for software interchange, for a price no-    more than your reasonable cost of physically performing this-    conveying of source, or (2) access to copy the-    Corresponding Source from a network server at no charge.--    c) Convey individual copies of the object code with a copy of the-    written offer to provide the Corresponding Source.  This-    alternative is allowed only occasionally and noncommercially, and-    only if you received the object code with such an offer, in accord-    with subsection 6b.--    d) Convey the object code by offering access from a designated-    place (gratis or for a charge), and offer equivalent access to the-    Corresponding Source in the same way through the same place at no-    further charge.  You need not require recipients to copy the-    Corresponding Source along with the object code.  If the place to-    copy the object code is a network server, the Corresponding Source-    may be on a different server (operated by you or a third party)-    that supports equivalent copying facilities, provided you maintain-    clear directions next to the object code saying where to find the-    Corresponding Source.  Regardless of what server hosts the-    Corresponding Source, you remain obligated to ensure that it is-    available for as long as needed to satisfy these requirements.--    e) Convey the object code using peer-to-peer transmission, provided-    you inform other peers where the object code and Corresponding-    Source of the work are being offered to the general public at no-    charge under subsection 6d.--  A separable portion of the object code, whose source code is excluded-from the Corresponding Source as a System Library, need not be-included in conveying the object code work.--  A "User Product" is either (1) a "consumer product", which means any-tangible personal property which is normally used for personal, family,-or household purposes, or (2) anything designed or sold for incorporation-into a dwelling.  In determining whether a product is a consumer product,-doubtful cases shall be resolved in favor of coverage.  For a particular-product received by a particular user, "normally used" refers to a-typical or common use of that class of product, regardless of the status-of the particular user or of the way in which the particular user-actually uses, or expects or is expected to use, the product.  A product-is a consumer product regardless of whether the product has substantial-commercial, industrial or non-consumer uses, unless such uses represent-the only significant mode of use of the product.--  "Installation Information" for a User Product means any methods,-procedures, authorization keys, or other information required to install-and execute modified versions of a covered work in that User Product from-a modified version of its Corresponding Source.  The information must-suffice to ensure that the continued functioning of the modified object-code is in no case prevented or interfered with solely because-modification has been made.--  If you convey an object code work under this section in, or with, or-specifically for use in, a User Product, and the conveying occurs as-part of a transaction in which the right of possession and use of the-User Product is transferred to the recipient in perpetuity or for a-fixed term (regardless of how the transaction is characterized), the-Corresponding Source conveyed under this section must be accompanied-by the Installation Information.  But this requirement does not apply-if neither you nor any third party retains the ability to install-modified object code on the User Product (for example, the work has-been installed in ROM).--  The requirement to provide Installation Information does not include a-requirement to continue to provide support service, warranty, or updates-for a work that has been modified or installed by the recipient, or for-the User Product in which it has been modified or installed.  Access to a-network may be denied when the modification itself materially and-adversely affects the operation of the network or violates the rules and-protocols for communication across the network.--  Corresponding Source conveyed, and Installation Information provided,-in accord with this section must be in a format that is publicly-documented (and with an implementation available to the public in-source code form), and must require no special password or key for-unpacking, reading or copying.--  7. Additional Terms.--  "Additional permissions" are terms that supplement the terms of this-License by making exceptions from one or more of its conditions.-Additional permissions that are applicable to the entire Program shall-be treated as though they were included in this License, to the extent-that they are valid under applicable law.  If additional permissions-apply only to part of the Program, that part may be used separately-under those permissions, but the entire Program remains governed by-this License without regard to the additional permissions.--  When you convey a copy of a covered work, you may at your option-remove any additional permissions from that copy, or from any part of-it.  (Additional permissions may be written to require their own-removal in certain cases when you modify the work.)  You may place-additional permissions on material, added by you to a covered work,-for which you have or can give appropriate copyright permission.--  Notwithstanding any other provision of this License, for material you-add to a covered work, you may (if authorized by the copyright holders of-that material) supplement the terms of this License with terms:--    a) Disclaiming warranty or limiting liability differently from the-    terms of sections 15 and 16 of this License; or--    b) Requiring preservation of specified reasonable legal notices or-    author attributions in that material or in the Appropriate Legal-    Notices displayed by works containing it; or--    c) Prohibiting misrepresentation of the origin of that material, or-    requiring that modified versions of such material be marked in-    reasonable ways as different from the original version; or--    d) Limiting the use for publicity purposes of names of licensors or-    authors of the material; or--    e) Declining to grant rights under trademark law for use of some-    trade names, trademarks, or service marks; or--    f) Requiring indemnification of licensors and authors of that-    material by anyone who conveys the material (or modified versions of-    it) with contractual assumptions of liability to the recipient, for-    any liability that these contractual assumptions directly impose on-    those licensors and authors.--  All other non-permissive additional terms are considered "further-restrictions" within the meaning of section 10.  If the Program as you-received it, or any part of it, contains a notice stating that it is-governed by this License along with a term that is a further-restriction, you may remove that term.  If a license document contains-a further restriction but permits relicensing or conveying under this-License, you may add to a covered work material governed by the terms-of that license document, provided that the further restriction does-not survive such relicensing or conveying.--  If you add terms to a covered work in accord with this section, you-must place, in the relevant source files, a statement of the-additional terms that apply to those files, or a notice indicating-where to find the applicable terms.--  Additional terms, permissive or non-permissive, may be stated in the-form of a separately written license, or stated as exceptions;-the above requirements apply either way.--  8. Termination.--  You may not propagate or modify a covered work except as expressly-provided under this License.  Any attempt otherwise to propagate or-modify it is void, and will automatically terminate your rights under-this License (including any patent licenses granted under the third-paragraph of section 11).--  However, if you cease all violation of this License, then your-license from a particular copyright holder is reinstated (a)-provisionally, unless and until the copyright holder explicitly and-finally terminates your license, and (b) permanently, if the copyright-holder fails to notify you of the violation by some reasonable means-prior to 60 days after the cessation.--  Moreover, your license from a particular copyright holder is-reinstated permanently if the copyright holder notifies you of the-violation by some reasonable means, this is the first time you have-received notice of violation of this License (for any work) from that-copyright holder, and you cure the violation prior to 30 days after-your receipt of the notice.--  Termination of your rights under this section does not terminate the-licenses of parties who have received copies or rights from you under-this License.  If your rights have been terminated and not permanently-reinstated, you do not qualify to receive new licenses for the same-material under section 10.--  9. Acceptance Not Required for Having Copies.--  You are not required to accept this License in order to receive or-run a copy of the Program.  Ancillary propagation of a covered work-occurring solely as a consequence of using peer-to-peer transmission-to receive a copy likewise does not require acceptance.  However,-nothing other than this License grants you permission to propagate or-modify any covered work.  These actions infringe copyright if you do-not accept this License.  Therefore, by modifying or propagating a-covered work, you indicate your acceptance of this License to do so.--  10. Automatic Licensing of Downstream Recipients.--  Each time you convey a covered work, the recipient automatically-receives a license from the original licensors, to run, modify and-propagate that work, subject to this License.  You are not responsible-for enforcing compliance by third parties with this License.--  An "entity transaction" is a transaction transferring control of an-organization, or substantially all assets of one, or subdividing an-organization, or merging organizations.  If propagation of a covered-work results from an entity transaction, each party to that-transaction who receives a copy of the work also receives whatever-licenses to the work the party's predecessor in interest had or could-give under the previous paragraph, plus a right to possession of the-Corresponding Source of the work from the predecessor in interest, if-the predecessor has it or can get it with reasonable efforts.--  You may not impose any further restrictions on the exercise of the-rights granted or affirmed under this License.  For example, you may-not impose a license fee, royalty, or other charge for exercise of-rights granted under this License, and you may not initiate litigation-(including a cross-claim or counterclaim in a lawsuit) alleging that-any patent claim is infringed by making, using, selling, offering for-sale, or importing the Program or any portion of it.--  11. Patents.--  A "contributor" is a copyright holder who authorizes use under this-License of the Program or a work on which the Program is based.  The-work thus licensed is called the contributor's "contributor version".--  A contributor's "essential patent claims" are all patent claims-owned or controlled by the contributor, whether already acquired or-hereafter acquired, that would be infringed by some manner, permitted-by this License, of making, using, or selling its contributor version,-but do not include claims that would be infringed only as a-consequence of further modification of the contributor version.  For-purposes of this definition, "control" includes the right to grant-patent sublicenses in a manner consistent with the requirements of-this License.--  Each contributor grants you a non-exclusive, worldwide, royalty-free-patent license under the contributor's essential patent claims, to-make, use, sell, offer for sale, import and otherwise run, modify and-propagate the contents of its contributor version.--  In the following three paragraphs, a "patent license" is any express-agreement or commitment, however denominated, not to enforce a patent-(such as an express permission to practice a patent or covenant not to-sue for patent infringement).  To "grant" such a patent license to a-party means to make such an agreement or commitment not to enforce a-patent against the party.--  If you convey a covered work, knowingly relying on a patent license,-and the Corresponding Source of the work is not available for anyone-to copy, free of charge and under the terms of this License, through a-publicly available network server or other readily accessible means,-then you must either (1) cause the Corresponding Source to be so-available, or (2) arrange to deprive yourself of the benefit of the-patent license for this particular work, or (3) arrange, in a manner-consistent with the requirements of this License, to extend the patent-license to downstream recipients.  "Knowingly relying" means you have-actual knowledge that, but for the patent license, your conveying the-covered work in a country, or your recipient's use of the covered work-in a country, would infringe one or more identifiable patents in that-country that you have reason to believe are valid.--  If, pursuant to or in connection with a single transaction or-arrangement, you convey, or propagate by procuring conveyance of, a-covered work, and grant a patent license to some of the parties-receiving the covered work authorizing them to use, propagate, modify-or convey a specific copy of the covered work, then the patent license-you grant is automatically extended to all recipients of the covered-work and works based on it.--  A patent license is "discriminatory" if it does not include within-the scope of its coverage, prohibits the exercise of, or is-conditioned on the non-exercise of one or more of the rights that are-specifically granted under this License.  You may not convey a covered-work if you are a party to an arrangement with a third party that is-in the business of distributing software, under which you make payment-to the third party based on the extent of your activity of conveying-the work, and under which the third party grants, to any of the-parties who would receive the covered work from you, a discriminatory-patent license (a) in connection with copies of the covered work-conveyed by you (or copies made from those copies), or (b) primarily-for and in connection with specific products or compilations that-contain the covered work, unless you entered into that arrangement,-or that patent license was granted, prior to 28 March 2007.--  Nothing in this License shall be construed as excluding or limiting-any implied license or other defenses to infringement that may-otherwise be available to you under applicable patent law.--  12. No Surrender of Others' Freedom.--  If conditions are imposed on you (whether by court order, agreement or-otherwise) that contradict the conditions of this License, they do not-excuse you from the conditions of this License.  If you cannot convey a-covered work so as to satisfy simultaneously your obligations under this-License and any other pertinent obligations, then as a consequence you may-not convey it at all.  For example, if you agree to terms that obligate you-to collect a royalty for further conveying from those to whom you convey-the Program, the only way you could satisfy both those terms and this-License would be to refrain entirely from conveying the Program.--  13. Use with the GNU Affero General Public License.--  Notwithstanding any other provision of this License, you have-permission to link or combine any covered work with a work licensed-under version 3 of the GNU Affero General Public License into a single-combined work, and to convey the resulting work.  The terms of this-License will continue to apply to the part which is the covered work,-but the special requirements of the GNU Affero General Public License,-section 13, concerning interaction through a network will apply to the-combination as such.--  14. Revised Versions of this License.--  The Free Software Foundation may publish revised and/or new versions of-the GNU General Public License from time to time.  Such new versions will-be similar in spirit to the present version, but may differ in detail to-address new problems or concerns.--  Each version is given a distinguishing version number.  If the-Program specifies that a certain numbered version of the GNU General-Public License "or any later version" applies to it, you have the-option of following the terms and conditions either of that numbered-version or of any later version published by the Free Software-Foundation.  If the Program does not specify a version number of the-GNU General Public License, you may choose any version ever published-by the Free Software Foundation.--  If the Program specifies that a proxy can decide which future-versions of the GNU General Public License can be used, that proxy's-public statement of acceptance of a version permanently authorizes you-to choose that version for the Program.--  Later license versions may give you additional or different-permissions.  However, no additional obligations are imposed on any-author or copyright holder as a result of your choosing to follow a-later version.--  15. Disclaimer of Warranty.--  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.--  16. Limitation of Liability.--  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF-SUCH DAMAGES.--  17. Interpretation of Sections 15 and 16.--  If the disclaimer of warranty and limitation of liability provided-above cannot be given local legal effect according to their terms,-reviewing courts shall apply local law that most closely approximates-an absolute waiver of all civil liability in connection with the-Program, unless a warranty or assumption of liability accompanies a-copy of the Program in return for a fee.--                     END OF TERMS AND CONDITIONS--            How to Apply These Terms to Your New Programs--  If you develop a new program, and you want it to be of the greatest-possible use to the public, the best way to achieve this is to make it-free software which everyone can redistribute and change under these terms.--  To do so, attach the following notices to the program.  It is safest-to attach them to the start of each source file to most effectively-state the exclusion of warranty; and each file should have at least-the "copyright" line and a pointer to where the full notice is found.--    <one line to give the program's name and a brief idea of what it does.>-    Copyright (C) <year>  <name of author>--    This program is free software: you can redistribute it and/or modify-    it under the terms of the GNU General Public License as published by-    the Free Software Foundation, either version 3 of the License, or-    (at your option) any later version.--    This program is distributed in the hope that it will be useful,-    but WITHOUT ANY WARRANTY; without even the implied warranty of-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the-    GNU General Public License for more details.--    You should have received a copy of the GNU General Public License-    along with this program.  If not, see <http://www.gnu.org/licenses/>.--Also add information on how to contact you by electronic and paper mail.+The following license covers this documentation, and the source code, except+where otherwise indicated. -  If the program does terminal interaction, make it output a short-notice like this when it starts in an interactive mode:+Copyright 2011-2014, Ian-Woo Kim. All rights reserved. -    <program>  Copyright (C) <year>  <name of author>-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.-    This is free software, and you are welcome to redistribute it-    under certain conditions; type `show c' for details.+Redistribution and use in source and binary forms, with or without+modification, are permitted provided that the following conditions are met: -The hypothetical commands `show w' and `show c' should show the appropriate-parts of the General Public License.  Of course, your program's commands-might be different; for a GUI interface, you would use an "about box".+* Redistributions of source code must retain the above copyright notice, this+  list of conditions and the following disclaimer. -  You should also get your employer (if you work as a programmer) or school,-if any, to sign a "copyright disclaimer" for the program, if necessary.-For more information on this, and how to apply and follow the GNU GPL, see-<http://www.gnu.org/licenses/>.+* Redistributions in binary form must reproduce the above copyright notice,+  this list of conditions and the following disclaimer in the documentation+  and/or other materials provided with the distribution. -  The GNU General Public License does not permit incorporating your program-into proprietary programs.  If your program is a subroutine library, you-may consider it more useful to permit linking proprietary applications with-the library.  If this is what you want to do, use the GNU Lesser General-Public License instead of this License.  But first, please read-<http://www.gnu.org/philosophy/why-not-lgpl.html>.+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS "AS IS" AND ANY EXPRESS OR+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO+EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY DIRECT, INDIRECT,+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,+OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE+OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF+ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

@@ -1,19 +1,23 @@ Name:		hoodle-render-Version:	0.4+Version:	0.5 Synopsis:       Hoodle file renderer Description: 	Rendering library using cairo for hoodle file format-License: 	GPL-3+License: 	BSD3 License-file:	LICENSE Author:		Ian-Woo Kim Maintainer: 	Ian-Woo Kim <ianwookim@gmail.com> Category:       Graphics Build-Type: 	Simple Cabal-Version:  >= 1.8-data-files:     CHANGES+data-files:      Source-repository head   type: git   location: http://www.github.com/wavewave/hoodle-render +flag gtk3+  description: compile with gtk3+  default: False+ Library   hs-source-dirs: src   ghc-options: 	-Wall -fno-warn-orphans -funbox-strict-fields -fno-warn-unused-do-bind@@ -28,8 +32,8 @@                  directory,                   filepath,                   gd >= 3000.7,  -                 gtk >= 0.12,-                 hoodle-types >= 0.3,+                 hashable,+                 hoodle-types >= 0.3.0,                  lens >= 2.5,                   monad-loops >= 0.3,                    mtl == 2.*, @@ -37,16 +41,22 @@                  stm,                  strict >= 0.3,                   svgcairo >= 0.12,+                 time,                  transformers >= 0.3,                  unix >= 2.5,                  unordered-containers,                   uuid >= 1.2 +  if flag(gtk3)+    build-depends: gtk3 >= 0.13+  else +    build-depends: gtk > 0.13     Exposed-Modules:                     Graphics.Hoodle.Render                     Graphics.Hoodle.Render.Background-                   Graphics.Hoodle.Render.Debug+                   -- Graphics.Hoodle.Render.Debug+                   Graphics.Hoodle.Render.Engine                    Graphics.Hoodle.Render.Generic                    Graphics.Hoodle.Render.Highlight                    Graphics.Hoodle.Render.Item  @@ -56,7 +66,7 @@                    Graphics.Hoodle.Render.Type.HitTest                    Graphics.Hoodle.Render.Type.Hoodle                    Graphics.Hoodle.Render.Type.Item-                   Graphics.Hoodle.Render.Type.RenderCache+                   -- Graphics.Hoodle.Render.Type.RenderCache                    Graphics.Hoodle.Render.Type.Renderer                    Graphics.Hoodle.Render.Type.Select                    Graphics.Hoodle.Render.Util

@@ -1,13 +1,14 @@-{-# LANGUAGE CPP #-} {-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE RecordWildCards #-}+{-# LANGUAGE ScopedTypeVariables #-}+{-# LANGUAGE TupleSections #-}  ----------------------------------------------------------------------------- -- | -- Module      : Graphics.Hoodle.Render --- Copyright   : (c) 2011-2014 Ian-Woo Kim+-- Copyright   : (c) 2011-2015 Ian-Woo Kim ----- License     : GPL-3+-- License     : BSD3 -- Maintainer  : Ian-Woo Kim <ianwookim@gmail.com> -- Stability   : experimental -- Portability : GHC@@ -25,6 +26,7 @@ , renderImg , renderBkg , renderItem +, renderLayer , renderPage -- * simple rendering using R-structure  , renderRBkg@@ -44,9 +46,13 @@ , cnstrctRBkg_StateT , cnstrctRPage_StateT , cnstrctRHoodle  +-- * some simple render with state+, renderPage_StateT+, initRenderContext ) where -import           Control.Concurrent (putMVar)+import           Control.Applicative+-- import           Control.Concurrent (putMVar) import           Control.Concurrent.STM import           Control.Lens (view,set) import           Control.Monad.Identity (runIdentity)@@ -55,13 +61,13 @@ import qualified Data.ByteString.Char8 as C import           Data.Foldable import qualified Data.HashMap.Strict as HM-import           Data.Sequence ( (|>))-import qualified Data.Sequence as Seq (null)-import           Data.Traversable (mapM)-import           Data.UUID.V4+-- import qualified Data.Sequence as Seq (null)+import           Data.Traversable (mapM,sequenceA)+-- import           Data.UUID.V4 import qualified Graphics.Rendering.Cairo as Cairo import qualified Graphics.Rendering.Cairo.SVG as RSVG-import qualified Graphics.UI.Gtk.Poppler.Page as PopplerPage+import           System.Directory (doesFileExist)+import           System.FilePath (takeExtension) -- from hoodle-platform  import           Data.Hoodle.Generic import           Data.Hoodle.Simple@@ -70,21 +76,18 @@ import           Data.Hoodle.Zipper -- from this package import           Graphics.Hoodle.Render.Background--- import Graphics.Hoodle.Render.Highlight import           Graphics.Hoodle.Render.Item import           Graphics.Hoodle.Render.Primitive import           Graphics.Hoodle.Render.Type-import           Graphics.Hoodle.Render.Type.HitTest import           Graphics.Hoodle.Render.Util-import           Graphics.Hoodle.Render.Util.HitTest --  import           Prelude hiding (curry,uncurry,mapM,mapM_,concatMap)  data Xform4Page = Xform4Page { transx :: Double-                                                 , transy :: Double -                                                 , scalex :: Double-                                                 , scaley :: Double } -                          deriving (Show)+                             , transy :: Double +                             , scalex :: Double+                             , scaley :: Double } +                deriving (Show)  ------------ -- simple --@@ -117,12 +120,47 @@  -- | render image : not fully implemented  renderImg :: Image -> Cairo.Render () -renderImg (Image _ (x,y) (Dim w h)) = do  -      Cairo.setSourceRGBA 0 0 0 1-      Cairo.setLineWidth 10-      Cairo.rectangle x y w h-      Cairo.stroke+renderImg img@(Image src (x,y) (Dim w h))  = do  +    let (x2,y2) = (x+w,y+h)+        -- imgbbx = BBox (x,y) (x2,y2)+        embed = getByteStringIfEmbeddedPNG src +    msfc <- liftIO $ case embed of         +      Just bstr -> do +        sfc <- saveTempPNGToCreateSurface bstr +        return (Just sfc)+      Nothing -> do+	let filesrc = C.unpack (img_src img)+	    filesrcext = takeExtension filesrc +	    imgaction +	      | filesrcext == ".PNG" || filesrcext == ".png" = do +		  b <- doesFileExist filesrc +		  if b then Just <$> Cairo.imageSurfaceCreateFromPNG filesrc+		       else return Nothing +	      | filesrcext == ".JPG" || filesrcext == ".jpg" = do +		  b <- doesFileExist filesrc +		  if b then Just <$> getJPGandCreateSurface filesrc +		       else return Nothing +	      | otherwise = return Nothing +	imgaction+    case msfc of +      Nothing -> do -- fall back+        Cairo.setSourceRGBA 0 0 0 1+        Cairo.setLineWidth 10+        Cairo.rectangle x y w h+        Cairo.stroke +      Just sfc -> do +        ix <- liftM fromIntegral (Cairo.imageSurfaceGetWidth sfc)+        iy <- liftM fromIntegral (Cairo.imageSurfaceGetHeight sfc)+        Cairo.save +        Cairo.translate x y +        Cairo.scale ((x2-x)/ix) ((y2-y)/iy)+        Cairo.setSourceSurface sfc 0 0 +        Cairo.paint +        Cairo.restore +++ -- | render svg   renderSVG :: SVG -> Cairo.Render ()  renderSVG svg@(SVG _ _ bstr _ _) = do  @@ -172,15 +210,6 @@            Cairo.restore            Cairo.resetClip             return () --- renderLink lnk@LinkAnchor {..} = do---    let lnkbbx = runIdentity (makeBBoxed lnk)---        bbox@(BBox (x0,y0) (x1,y1)) = getBBox lnkbbx---    clipBBox (Just bbox)---    Cairo.setSourceRGBA 0 1 0 1 ---    Cairo.rectangle x0 y0 (x1-x0) (y1-y0)---    Cairo.fill---    Cairo.resetClip---    return ()   -- | @@ -224,15 +253,21 @@ renderItem (ItemLink lnk) = renderLink lnk renderItem (ItemAnchor anc) = renderAnchor anc  +-- | renderLayer+renderLayer :: Layer -> Cairo.Render ()+renderLayer = mapM_ renderItem . view items++ -- | renderPage :: Page -> Cairo.Render () renderPage page = do    renderBkg (view background page,view dimension page)   Cairo.setLineCap Cairo.LineCapRound   Cairo.setLineJoin Cairo.LineJoinRound-  mapM_ (mapM renderItem . view items) . view layers $ page+  mapM_ renderLayer . view layers $ page   Cairo.stroke + ----- -- R-structure  ----@@ -242,31 +277,20 @@   Cairo.setSourceRGBA 1 1 1 1    Cairo.rectangle 0 0 w h    Cairo.fill -  Cairo.setSourceRGBA 0 0 0 1 -  Cairo.setLineWidth 5-  Cairo.moveTo 0 0-  Cairo.lineTo w h -  Cairo.stroke -  Cairo.moveTo w 0 -  Cairo.lineTo 0 h-  Cairo.stroke     -- |  renderRBkg :: RenderCache +           -> CanvasId            -> (RBackground,Dimension, Maybe Xform4Page)             -> Cairo.Render (RBackground,Dimension, Maybe Xform4Page)-renderRBkg cache (r,dim,mx) = -    case r of -      (RBkgSmpl _ _ _)     ->  renderBkg (rbkg2Bkg r,dim) >> return (r,dim,mx)-      (RBkgPDF _ _ _ _ _)  -> renderRBkg_Buf cache (r,dim,mx)-      (RBkgEmbedPDF _ _ _) -> renderRBkg_Buf cache (r,dim,mx)+renderRBkg = renderRBkg_Buf + -- |-renderRItem :: RenderCache -> RItem -> Cairo.Render RItem  -renderRItem _ itm@(RItemStroke strk) = renderStrk (bbxed_content strk) >> return itm-renderRItem cache itm@(RItemImage img msfc {- uuid -} ) = do-    -- let mssfc = HM.lookup uuid cache+renderRItem :: RenderCache -> CanvasId -> RItem -> Cairo.Render RItem  +renderRItem _ _ itm@(RItemStroke strk) = renderStrk (bbxed_content strk) >> return itm+renderRItem _cache _cid itm@(RItemImage img msfc) = do     case msfc of       Nothing -> renderImg (bbxed_content img)       Just sfc -> do @@ -277,12 +301,11 @@ 	Cairo.save  	Cairo.translate x y          Cairo.scale ((x2-x1)/ix) ((y2-y1)/iy)-	-- Cairo.scale ((x2-x1)/ix/s) ((y2-y1)/iy/s) 	Cairo.setSourceSurface sfc 0 0  	Cairo.paint  	Cairo.restore     return itm -renderRItem _ itm@(RItemSVG svgbbx mrsvg) = do +renderRItem _ _ itm@(RItemSVG svgbbx mrsvg) = do      case mrsvg of       Nothing -> renderSVG (bbxed_content svgbbx)       Just rsvg -> do @@ -298,7 +321,7 @@ 	Cairo.restore 	return ()      return itm -renderRItem _ itm@(RItemLink lnkbbx mrsvg) = do +renderRItem _ _ itm@(RItemLink lnkbbx mrsvg) = do      case mrsvg of       Nothing -> renderLink (bbxed_content lnkbbx)       Just rsvg -> do @@ -314,7 +337,7 @@ 	Cairo.restore 	return ()      return itm -renderRItem _ itm@(RItemAnchor ancbbx mrsvg) = do+renderRItem _ _ itm@(RItemAnchor ancbbx mrsvg) = do     case mrsvg of       Nothing -> renderAnchor (bbxed_content ancbbx)       Just rsvg -> do @@ -338,114 +361,93 @@  -- | background drawing in bbox  renderRBkg_InBBox :: RenderCache +                  -> CanvasId                   -> Maybe BBox                    -> (RBackground,Dimension,Maybe Xform4Page)                    -> Cairo.Render (RBackground,Dimension, Maybe Xform4Page)-renderRBkg_InBBox cache mbbox (b,dim,mx) = do +renderRBkg_InBBox cache cid mbbox (b,dim,mx) = do      clipBBox (fmap (flip inflate 1) mbbox)-    renderRBkg_Buf cache (b,dim,mx)+    renderRBkg_Buf cache cid (b,dim,mx)     Cairo.resetClip     return (b,dim,mx)   -- | render RLayer within BBox after hittest items-renderRLayer_InBBox :: RenderCache -> Maybe BBox -> RLayer -> Cairo.Render RLayer-renderRLayer_InBBox cache mbbox layer = do  -  clipBBox (fmap (flip inflate 2) mbbox)  -- temporary-  let hittestbbox = case mbbox of -        Nothing -> NotHitted [] -                   :- Hitted (view gitems layer) -                   :- Empty -        Just bbox -> (hltHittedByBBox bbox . view gitems) layer-  (mapM_ (renderRItem cache) . concatMap unHitted  . getB) hittestbbox-  Cairo.resetClip  -  -- simply twice rendering if whole redraw happening -  case view gbuffer layer of -    LyBuf (Just sfc) -> do -      liftIO $ Cairo.renderWith sfc $ do -        clipBBox (fmap (flip inflate 2) mbbox ) -- temporary-        Cairo.setSourceRGBA 0 0 0 0 -        Cairo.setOperator Cairo.OperatorSource-        Cairo.paint-        Cairo.setOperator Cairo.OperatorOver-        (mapM_ (renderRItem cache) . concatMap unHitted  . getB) hittestbbox-        Cairo.resetClip -        return layer -    _ -> return layer +renderRLayer_InBBox :: RenderCache -> CanvasId -> Maybe BBox +                    -> (RLayer,Dimension,Maybe Xform4Page) +                    -> Cairo.Render (RLayer, Dimension, Maybe Xform4Page)+renderRLayer_InBBox = renderRLayer_InBBoxBuf  ----------------------- -- draw using buffer --  ----------------------- +adjustScale :: Double -> Maybe Xform4Page -> Cairo.Render ()+adjustScale s mx =+  case mx of +    Nothing -> Cairo.scale (1/s) (1/s) +    Just xform -> if (scalex xform /s > 0.999 && scalex xform /s < 1.001) +                    then do Cairo.identityMatrix+                            Cairo.translate (transx xform) (transy xform)+                    else Cairo.scale (1/s) (1/s)++ -- | Background rendering using buffer renderRBkg_Buf :: RenderCache+               -> CanvasId                -> (RBackground,Dimension,Maybe Xform4Page)                 -> Cairo.Render (RBackground,Dimension,Maybe Xform4Page)-renderRBkg_Buf cache (b,dim,mx) = do -    case HM.lookup (rbkg_uuid b) cache of+renderRBkg_Buf cache _cid (b,dim,mx) = do +    case HM.lookup (rbkg_surfaceid b) cache of       Nothing -> drawFallBackBkg dim >> return ()       Just (s,sfc) -> do -        -- liftIO $ print mx-        -- liftIO $ print (1/s)         Cairo.save-        case mx of -          Nothing -> Cairo.scale (1/s) (1/s) -          Just xform -> if (scalex xform /s > 0.999 && scalex xform /s < 1.001) -                          then do Cairo.identityMatrix-                                  Cairo.translate (transx xform) (transy xform)-                                  Cairo.setAntialias Cairo.AntialiasNone-                          else Cairo.scale (1/s) (1/s)+        adjustScale s mx         Cairo.setSourceSurface sfc 0 0          Cairo.paint          Cairo.restore     return (b,dim,mx)  -- | -renderRLayer_InBBoxBuf :: RenderCache -                       -> Maybe BBox -> RLayer -> Cairo.Render RLayer -renderRLayer_InBBoxBuf cache mbbox lyr = do+renderRLayer_InBBoxBuf :: RenderCache -> CanvasId -> Maybe BBox +                       -> (RLayer,Dimension,Maybe Xform4Page) +                       -> Cairo.Render (RLayer,Dimension,Maybe Xform4Page) +renderRLayer_InBBoxBuf cache _cid mbbox (lyr,dim,mx) = do     case view gbuffer lyr of -      LyBuf (Just sfc) -> do -        clipBBox mbbox-        Cairo.setSourceSurface sfc 0 0 -        Cairo.paint -        Cairo.resetClip -        return lyr -      _ -> do -        renderRLayer_InBBox cache mbbox lyr         +      LyBuf sfcid -> do +        case HM.lookup sfcid cache of+          Nothing -> return (lyr,dim,mx)+          Just (s,sfc) -> do +            clipBBox (fmap (flip inflate 2) mbbox)+            -- clipBBox mbbox+            Cairo.save+            adjustScale s mx+            Cairo.setSourceSurface sfc 0 0 +            Cairo.paint +            Cairo.restore+            Cairo.resetClip +            return (lyr,dim,mx)  ------------------- -- update buffer -------------------  -- | -updateLayerBuf :: RenderCache -> Dimension -> Maybe BBox -> RLayer -> IO RLayer-updateLayerBuf cache (Dim w h) mbbox lyr = do +updateLayerBuf :: CanvasId -> RLayer -> Renderer ()+updateLayerBuf _cid lyr = do +  qgen <- rendererGenCmdQ <$> ask   case view gbuffer lyr of -    LyBuf (Just sfc) -> do -      Cairo.renderWith sfc $ do -        renderRLayer_InBBox cache mbbox lyr -      return lyr-    LyBuf Nothing -> do -      sfc <- Cairo.createImageSurface Cairo.FormatARGB32 (floor w) (floor h)-      Cairo.renderWith sfc $ do -        renderRLayer_InBBox cache Nothing lyr-      return (set gbuffer (LyBuf (Just sfc)) lyr) -      +    LyBuf sfcid -> do+      cmdid <- issueGenCommandID+      (liftIO . atomically) (sendGenCommand qgen cmdid (LayerRedraw sfcid (view gitems lyr)))+ -- | -updatePageBuf :: RenderCache -> RPage -> IO RPage -updatePageBuf cache pg = do -  let dim = view gdimension pg-      mbbox = Just . dimToBBox $ dim -  nlyrs <- mapM (updateLayerBuf cache dim mbbox) . view glayers $ pg -  return (set glayers nlyrs pg)+updatePageBuf :: CanvasId -> RPage -> Renderer ()+updatePageBuf cid = mapM_ (updateLayerBuf cid) . view glayers  -- | -updateHoodleBuf :: RenderCache -> RHoodle -> IO RHoodle -updateHoodleBuf cache hdl = do -  let pgs = view gpages hdl -  npgs <- mapM (updatePageBuf cache) pgs-  return . set gpages npgs $ hdl+updateHoodleBuf :: CanvasId -> RHoodle -> Renderer ()+updateHoodleBuf cid = mapM_ (updatePageBuf cid) . view gpages  ------- -- smart constructor for R hoodle structures@@ -460,17 +462,23 @@       pgs = view pages hdl       pdf = view embeddedPdf hdl        txt = view embeddedText hdl-  (_,qvar) <- ask+  (qpdf,_qgen) <- ((,) <$> rendererPDFCmdQ <*> rendererGenCmdQ)<$> ask   mdoc <- maybe (return Nothing) (\src -> liftIO $ do-            uuid <- nextRandom+            cmdid <- issuePDFCommandID             docvar <- atomically newEmptyTMVar-            atomically $ sendPDFCommand uuid qvar (GetDocFromDataURI src docvar)+            atomically $ sendPDFCommand qpdf cmdid (GetDocFromDataURI src docvar)             atomically $ takeTMVar docvar            ) pdf-+  let getNumPgs doc = liftIO $ do+        cmdid <- issuePDFCommandID+        nvar <- atomically newEmptyTMVar+        atomically $ sendPDFCommand qpdf cmdid (GetNPages doc nvar)+        atomically $ takeTMVar nvar+  mnumpdfpgs <- sequenceA (getNumPgs <$> mdoc)+  -- liftIO $print mnumpdfpgs   npgs <- evalStateT (mapM cnstrctRPage_StateT pgs)                       (Just (Context "" "" Nothing mdoc)) -  return $ GHoodle hid ttl revs pdf txt (fromList npgs)          +  return $ GHoodle hid ttl revs (PDFData <$> pdf <*> mnumpdfpgs) txt (fromList npgs)               -- | cnstrctRPage_StateT :: Page -> StateT (Maybe Context) Renderer RPage@@ -479,7 +487,8 @@       dim = view dimension pg        lyrs = view layers pg   nlyrs_lst <- lift (mapM cnstrctRLayer lyrs)-  let nlyrs_nonemptylst = if null nlyrs_lst then (emptyRLayer,[]) else (head nlyrs_lst,tail nlyrs_lst) +  sfcid <- issueSurfaceID+  let nlyrs_nonemptylst = if null nlyrs_lst then (emptyRLayer sfcid,[]) else (head nlyrs_lst,tail nlyrs_lst)        nlyrs = fromNonEmptyList nlyrs_nonemptylst    nbkg <- cnstrctRBkg_StateT dim bkg   return $ GPage dim nbkg nlyrs @@ -487,5 +496,30 @@ -- | cnstrctRLayer :: Layer -> Renderer RLayer  cnstrctRLayer lyr = do +  sfcid <- issueSurfaceID   nitms <- (mapM cnstrctRItem . view items) lyr -  return (set gitems nitms emptyRLayer)+  return (set gitems nitms (emptyRLayer sfcid))++++-------------------------------------------------------+-- simple rendering with pdf (or global information) --+-------------------------------------------------------++-- |+renderPage_StateT :: Page -> StateT Context Cairo.Render ()+renderPage_StateT pg = do  +  let bkg = view background pg+      dim = view dimension pg +      lyrs = view layers pg+  renderBackground_StateT dim bkg+  lift (mapM_ renderLayer lyrs)+  +-- | +initRenderContext :: Hoodle -> IO Context+initRenderContext hdl = do+  let pdf = view embeddedPdf hdl +  mdoc <- join <$> mapM popplerGetDocFromDataURI pdf+  return (Context "" "" Nothing mdoc)++

@@ -3,10 +3,10 @@  ----------------------------------------------------------------------------- -- |--- Module      : Graphics.Hoodle.Render.PDFBackground --- Copyright   : (c) 2011-2014 Ian-Woo Kim+-- Module      : Graphics.Hoodle.Render.Background +-- Copyright   : (c) 2011-2015 Ian-Woo Kim ----- License     : GPL-3+-- License     : BSD3 -- Maintainer  : Ian-Woo Kim <ianwookim@gmail.com> -- Stability   : experimental -- Portability : GHC@@ -15,7 +15,8 @@  module Graphics.Hoodle.Render.Background where -import           Control.Concurrent+import           Control.Applicative+-- import           Control.Concurrent import           Control.Concurrent.STM import           Control.Monad.State hiding (mapM_) import           Control.Monad.Trans.Maybe@@ -28,7 +29,7 @@ import           Data.Monoid import           Data.UUID.V4 (nextRandom) import qualified Graphics.Rendering.Cairo as Cairo-import           Graphics.UI.Gtk (postGUIAsync)+-- import           Graphics.UI.Gtk (postGUIAsync) import qualified Graphics.UI.Gtk.Poppler.Document as Poppler import qualified Graphics.UI.Gtk.Poppler.Page as PopplerPage import           System.Directory@@ -196,40 +197,31 @@     Cairo.rectangle 0 0 w h      Cairo.fill -- -- | this has some bugs. need to fix  cnstrctRBkg_StateT :: Dimension                     -> Background                     -> StateT (Maybe Context) Renderer RBackground-cnstrctRBkg_StateT dim@(Dim w h) bkg = do  -  (handler,qvar) <- lift ask-  uuid <- liftIO nextRandom+cnstrctRBkg_StateT _ bkg = do  +  (qpdf,_qgen) <- ((,) <$> rendererPDFCmdQ <*> rendererGenCmdQ) <$> lift ask+  sfcid <- issueSurfaceID   case bkg of -    Background _t c s -> return (RBkgSmpl c s uuid) +    Background _t c s -> return (RBkgSmpl c s sfcid)      BackgroundPdf _t md mf pn -> do        r <- runMaybeT $ do-        (pg,rbkg) <- case (md,mf) of +        (_pg,rbkg) <- case (md,mf) of            (Just d, Just f) -> do -            uuiddoc <- liftIO nextRandom+            cmdiddoc <- issuePDFCommandID             docvar <- liftIO (atomically newEmptyTMVar)-            liftIO . atomically $ sendPDFCommand uuiddoc qvar (GetDocFromFile f docvar)+            liftIO . atomically $ sendPDFCommand qpdf cmdiddoc (GetDocFromFile f docvar)             doc <- MaybeT . liftIO $ atomically $ takeTMVar docvar              lift . put $ Just (Context d f (Just doc) Nothing)-            ---            uuidpg <- liftIO nextRandom-            pgvar <- liftIO (atomically newEmptyTMVar)-            liftIO . atomically $ sendPDFCommand uuidpg qvar (GetPageFromDoc doc pn pgvar)-            pg <- MaybeT . liftIO $ atomically $ takeTMVar pgvar        -            return (pg, RBkgPDF md f pn (Just pg) uuid)+            pg <- pdfRequest qpdf doc pn+            return (pg, RBkgPDF md f pn (Just pg) sfcid)           _ -> do              Context oldd oldf olddoc _ <- MaybeT get             doc <- MaybeT . return $ olddoc  -            uuidpg <- liftIO nextRandom-            pgvar <- liftIO (atomically newEmptyTMVar)-            liftIO . atomically $ sendPDFCommand uuidpg qvar (GetPageFromDoc doc pn pgvar)-            pg <- MaybeT . liftIO $ atomically $ takeTMVar pgvar        -            return (pg, RBkgPDF (Just oldd) oldf pn (Just pg) uuid)+            pg <- pdfRequest qpdf doc pn+            return (pg, RBkgPDF (Just oldd) oldf pn (Just pg) sfcid)         return rbkg       case r of         Nothing -> error "error in cnstrctRBkg_StateT"@@ -238,11 +230,44 @@       r <- runMaybeT $ do          Context _ _ _ mdoc <- MaybeT get         doc <- (MaybeT . return) mdoc -        uuidpg <- liftIO nextRandom-        pgvar <- liftIO (atomically newEmptyTMVar)-        liftIO . atomically $ sendPDFCommand uuidpg qvar (GetPageFromDoc doc pn pgvar)-        pg <- MaybeT . liftIO $ atomically $ takeTMVar pgvar        -        return (RBkgEmbedPDF pn (Just pg) uuid)+        pg <- pdfRequest qpdf doc pn+        return (RBkgEmbedPDF pn (Just pg) sfcid)       case r of          Nothing -> error "error in cnstrctRBkg_StateT"         Just x -> return x+  where pdfRequest q doc pn = do+          cmdidpg <- issuePDFCommandID+          pgvar <- liftIO (atomically newEmptyTMVar)+          liftIO . atomically $ sendPDFCommand q cmdidpg (GetPageFromDoc doc pn pgvar)+          MaybeT . liftIO $ atomically $ takeTMVar pgvar++ +-- | For simple hoodle background+renderBackground_StateT :: Dimension -> Background -> StateT Context Cairo.Render ()+renderBackground_StateT dim@(Dim w h) bkg = do+    case bkg of +      Background _t _c _s -> lift (renderBkg (bkg,dim))+      BackgroundPdf _t md mf pn -> do +        r <- runMaybeT $ do+          case (md,mf) of +            (Just d, Just f) -> do+              doc <- (MaybeT . liftIO . popplerGetDocFromFile) f+              lift . put $ (Context d f (Just doc) Nothing)+              pdfRenderDoc doc pn+            _ -> do +              Context _oldd _oldf olddoc _ <- lift get+              doc <- MaybeT . return $ olddoc  +              pdfRenderDoc doc pn+        maybe (error "renderBackground_StateT") (const (return ())) r+      BackgroundEmbedPdf _ pn -> do +        r <- runMaybeT $ do +          Context _ _ _ mdoc <- lift get+          doc <- (MaybeT . return) mdoc+          pdfRenderDoc doc pn+        maybe (error "renderBackground_StateT") (const (return ())) r+  where pdfRender pg = do Cairo.setSourceRGBA 1 1 1 1+                          Cairo.rectangle 0 0 w h+                          Cairo.fill+                          PopplerPage.pageRender pg+        pdfRenderDoc doc pn = (MaybeT . liftIO) (popplerGetPageFromDoc doc pn)+                              >>= lift . lift . pdfRender

@@ -1,138 +0,0 @@-{-# LANGUAGE CPP #-}-{-# LANGUAGE OverloadedStrings #-}---------------------------------------------------------------------------------- |--- Module      : Graphics.Hoodle.Render.Debug--- Copyright   : (c) 2011-2014 Ian-Woo Kim------ License     : BSD3--- Maintainer  : Ian-Woo Kim <ianwookim@gmail.com>--- Stability   : experimental--- Portability : GHC------ collection of rendering routine ------------------------------------------------------------------------------------module Graphics.Hoodle.Render.Debug-(      --- * dummy rendering -  renderRBkg_Dummy  --- * nopdf-, renderRBkg_NoPDF--- * render only bbox (for debug purpose)-, renderStrkBBx_BBoxOnly-, renderImgBBx_BBoxOnly-, renderRItem_BBoxOnly-, renderRLayer_BBoxOnly-, renderRPage_BBoxOnly--- * render using buf -, renderRBkg_Buf-, renderRLayer_InBBoxBuf-) where--import           Control.Lens -import           Control.Monad.State hiding (mapM,mapM_)-import           Data.Foldable-import qualified Data.Map as M-import qualified Graphics.Rendering.Cairo as Cairo--- from hoodle-platform -import           Data.Hoodle.Generic-import           Data.Hoodle.Simple-import           Data.Hoodle.BBox-import           Data.Hoodle.Predefined --- from this package-import           Graphics.Hoodle.Render-import           Graphics.Hoodle.Render.Highlight-import           Graphics.Hoodle.Render.Type --- -import Prelude hiding (curry,uncurry,mapM,mapM_,concatMap)------- --- Dummy (for testing) --------renderRBkg_Dummy :: RenderCache -> (RBackground,Dimension,Maybe Xform4Page) -> Cairo.Render ()-renderRBkg_Dummy _ (_,Dim w h,_) = do -    Cairo.setSourceRGBA 1 1 1 1-    Cairo.rectangle 0 0 w h -    Cairo.fill ---------------- NoPDF -- ---------------- | render background without pdf -renderRBkg_NoPDF :: RenderCache -> (RBackground,Dimension,Maybe Xform4Page) -> Cairo.Render ()-renderRBkg_NoPDF cache r@(RBkgSmpl _ _ _,_,_) = renderRBkg cache r >> return ()-renderRBkg_NoPDF _ (RBkgPDF _ _ _ _ _,_,_) = return ()-renderRBkg_NoPDF _ (RBkgEmbedPDF _ _ _,_,_) = return ()------------------- BBoxOnly --------------------- | render only bounding box of a StrokeBBox      -renderStrkBBx_BBoxOnly :: BBoxed Stroke -> Cairo.Render () -renderStrkBBx_BBoxOnly sbbox = do  -    let s = bbxed_content sbbox-    case M.lookup (stroke_color s) predefined_pencolor of -      Just (r,g,b,a) -> Cairo.setSourceRGBA r g b a-      Nothing -> Cairo.setSourceRGBA 0 0 0 1 -    Cairo.setSourceRGBA 0 0 0 1-    Cairo.setLineWidth (stroke_width s) -    let BBox (x1,y1) (x2,y2) = getBBox sbbox-    Cairo.rectangle x1 y1 (x2-x1) (y2-y1)-    Cairo.stroke-  --- |     -renderImgBBx_BBoxOnly :: BBoxed Image -> Cairo.Render ()-renderImgBBx_BBoxOnly ibbox = do -    Cairo.setSourceRGBA 0 0 0 1-    Cairo.setLineWidth 10-    let BBox (x1,y1) (x2,y2) = getBBox ibbox-    Cairo.rectangle x1 y1 (x2-x1) (y2-y1)-    Cairo.stroke--renderSVGBBx_BBoxOnly :: BBoxed SVG -> Cairo.Render ()-renderSVGBBx_BBoxOnly svg = do -    Cairo.setSourceRGBA 0 0 0 1-    Cairo.setLineWidth 10-    let BBox (x1,y1) (x2,y2) = getBBox svg-    Cairo.rectangle x1 y1 (x2-x1) (y2-y1)-    Cairo.stroke--renderLnkBBx_BBoxOnly :: BBoxed Link -> Cairo.Render ()-renderLnkBBx_BBoxOnly lnk = do -    Cairo.setSourceRGBA 0 0 0 1-    Cairo.setLineWidth 10-    let BBox (x1,y1) (x2,y2) = getBBox lnk-    Cairo.rectangle x1 y1 (x2-x1) (y2-y1)-    Cairo.stroke---- | -renderRItem_BBoxOnly :: RenderCache -> RItem -> Cairo.Render () -renderRItem_BBoxOnly _ (RItemStroke sbbox) = renderStrkBBx_BBoxOnly sbbox-renderRItem_BBoxOnly _ (RItemImage ibbox _) = renderImgBBx_BBoxOnly ibbox-renderRItem_BBoxOnly _ (RItemSVG svg _) = renderSVGBBx_BBoxOnly svg-renderRItem_BBoxOnly _ (RItemLink lnk _) = renderLnkBBx_BBoxOnly lnk-renderRItem_BBoxOnly _ itm@(RItemAnchor anc _) = (renderHltBBox . getBBox) anc---- | -renderRLayer_BBoxOnly :: RenderCache -> RLayer -> Cairo.Render ()-renderRLayer_BBoxOnly cache = mapM_  (renderRItem_BBoxOnly cache) . view gitems---  --- | render only bounding box of a StrokeBBox      -renderRPage_BBoxOnly :: RenderCache -> RPage -> Cairo.Render ()  -renderRPage_BBoxOnly cache page = do-    let dim = view gdimension page-        bkg = view gbackground page -        lyrs =  view glayers page-    renderRBkg_NoPDF cache (bkg,dim,Nothing)-    mapM_ (renderRLayer_BBoxOnly cache) lyrs--

@@ -0,0 +1,140 @@+{-# LANGUAGE OverloadedStrings #-}++-----------------------------------------------------------------------------+-- |+-- Module      : Graphics.Hoodle.Render.Engine+-- Copyright   : (c) 2014, 2015 Ian-Woo Kim+--+-- License     : BSD3+-- Maintainer  : Ian-Woo Kim <ianwookim@gmail.com>+-- Stability   : experimental+-- Portability : GHC+--+-- rendering engine that can run as a separate thread+--+-----------------------------------------------------------------------------++module Graphics.Hoodle.Render.Engine+( pdfRendererMain+, genRendererMain+, transparentClear+) where++import           Control.Concurrent.STM+import           Control.Monad (forever)+import qualified Data.HashMap.Strict as HM+import           Data.Sequence ( viewl, ViewL(..) )+import qualified Graphics.Rendering.Cairo as Cairo+import qualified Graphics.UI.Gtk.Poppler.Document as Poppler+import qualified Graphics.UI.Gtk.Poppler.Page as Poppler+--+import           Data.Hoodle.Simple+--+import           Graphics.Hoodle.Render+import           Graphics.Hoodle.Render.Type+import           Graphics.Hoodle.Render.Background++-- | main pdf renderer engine. need to be in a single thread+pdfRendererMain :: (RendererEvent->IO ()) -> PDFCommandQueue -> IO () +pdfRendererMain handler tvar = forever $ do     +    p <- atomically $ do +      lst' <- readTVar tvar+      case viewl lst' of+        EmptyL -> retry+        p :< ps -> do +          writeTVar tvar ps +          return p +    pdfWorker handler (snd p)++pdfWorker :: (RendererEvent->IO ()) -> PDFCommand -> IO ()+pdfWorker _handler (GetDocFromFile fp tmvar) = do+    mdoc <- popplerGetDocFromFile fp+    atomically $ putTMVar tmvar mdoc +pdfWorker _handler (GetDocFromDataURI str tmvar) = do+    mdoc <- popplerGetDocFromDataURI str+    atomically $ putTMVar tmvar mdoc+pdfWorker _handler (GetPageFromDoc doc pn tmvar) = do+    mpg <- popplerGetPageFromDoc doc pn+    atomically $ putTMVar tmvar mpg+pdfWorker _handler (GetNPages doc tmvar) = do+    n <- Poppler.documentGetNPages doc+    atomically $ putTMVar tmvar n+pdfWorker handler (RenderPageScaled sfcid page (Dim ow _oh) (Dim w h)) = do+    let s = w / ow+    sfc <- Cairo.createImageSurface Cairo.FormatARGB32 (floor w) (floor h)+    Cairo.renderWith sfc $ do   +      Cairo.setSourceRGBA 1 1 1 1+      Cairo.rectangle 0 0 w h +      Cairo.fill+      Cairo.scale s s+      Poppler.pageRender page +    handler (SurfaceUpdate (sfcid,(s,sfc)))++-- | generic renderer engine+genRendererMain :: TVar RenderCache -> (RendererEvent->IO ()) +                -> GenCommandQueue -> IO () +genRendererMain cachevar handler tvar = forever $ do     +    (p,cache) <- atomically $ do +      cache <- readTVar cachevar+      lst' <- readTVar tvar+      case viewl lst' of+        EmptyL -> retry+        p :< ps -> do +          writeTVar tvar ps +          return (p,cache)+    genWorker cache handler (snd p)++genWorker :: RenderCache -> (RendererEvent->IO ()) -> GenCommand -> IO ()+genWorker _cache handler (BkgSmplScaled sfcid col sty dim@(Dim ow _oh) (Dim w h)) = do+    let s = w / ow+        bkg = Background "solid" col sty+    sfc <- Cairo.createImageSurface Cairo.FormatARGB32 (floor w) (floor h)+    Cairo.renderWith sfc $ do   +      Cairo.setSourceRGBA 1 1 1 1+      Cairo.rectangle 0 0 w h +      Cairo.fill+      Cairo.scale s s+      renderBkg (bkg,dim)+    handler (SurfaceUpdate (sfcid,(s,sfc)))+genWorker _cache handler (LayerInit sfcid ritms) = do+    sfc <- Cairo.createImageSurface Cairo.FormatARGB32 612 792 -- (floor w) (floor h) -- for the time being+    Cairo.renderWith sfc $ do   +      Cairo.setSourceRGBA 0 0 0 0+      Cairo.setOperator Cairo.OperatorSource+      Cairo.paint+      Cairo.setOperator Cairo.OperatorOver+      mapM_ (renderRItem undefined undefined) ritms+    handler (SurfaceUpdate (sfcid,(1.0,sfc)))+genWorker cache handler (LayerRedraw sfcid ritms) = do+    case HM.lookup sfcid cache of+      Nothing -> genWorker cache handler (LayerInit sfcid ritms)+      Just (s,sfc) -> do+        Cairo.renderWith sfc $ do   +          Cairo.setSourceRGBA 0 0 0 0+          Cairo.setOperator Cairo.OperatorSource+          Cairo.paint+          Cairo.setOperator Cairo.OperatorOver+          Cairo.scale s s+          mapM_ (renderRItem undefined undefined) ritms+        handler (SurfaceUpdate (sfcid,(s,sfc)))+        handler (FinishCommandFor sfcid)+genWorker _cache handler (LayerScaled sfcid ritms (Dim ow _) (Dim w h)) = do+    let s = w / ow+    sfc <- Cairo.createImageSurface Cairo.FormatARGB32 (floor w) (floor h)+    Cairo.renderWith sfc $ do   +      Cairo.setSourceRGBA 0 0 0 0+      Cairo.setOperator Cairo.OperatorSource+      Cairo.paint+      Cairo.setOperator Cairo.OperatorOver+      Cairo.scale s s+      mapM_ (renderRItem undefined undefined) ritms+    handler (SurfaceUpdate (sfcid,(s,sfc)))++transparentClear :: Cairo.Render ()+transparentClear = do+  Cairo.setSourceRGBA 0 0 0 0+  Cairo.setOperator Cairo.OperatorSource+  Cairo.paint+  Cairo.setOperator Cairo.OperatorOver++

@@ -1,11 +1,14 @@-{-# LANGUAGE FlexibleInstances, FlexibleContexts, TypeFamilies #-}+{-# LANGUAGE FlexibleContexts #-}+{-# LANGUAGE FlexibleInstances #-}+{-# LANGUAGE TupleSections #-}+{-# LANGUAGE TypeFamilies #-}  ----------------------------------------------------------------------------- -- | -- Module      : Graphics.Hoodle.Render.Generic --- Copyright   : (c) 2011-2014 Ian-Woo Kim+-- Copyright   : (c) 2011-2015 Ian-Woo Kim ----- License     : GPL-3+-- License     : BSD3 -- Maintainer  : Ian-Woo Kim <ianwookim@gmail.com> -- Stability   : experimental -- Portability : GHC@@ -26,40 +29,45 @@ import Data.Hoodle.Simple -- from this package  import Graphics.Hoodle.Render-import Graphics.Hoodle.Render.Debug import Graphics.Hoodle.Render.Type  --  import Prelude hiding (mapM_,mapM)  -- | temporary util-passarg :: (Monad m) => (a -> m ()) -> a -> m a-passarg f a = f a >> return a+passarg :: (Monad m) => (CanvasId -> a -> m ()) -> CanvasId -> a -> m a+passarg f i a = f i a >> return a  +passarg1 :: (Monad m) => (a -> m ()) -> a -> m a+passarg1 f a = f a >> return a++const2 :: c -> a -> b -> c+const2 f _x _y = f+ -- |  class Renderable a where -  cairoRender :: RenderCache -> a -> Cairo.Render a+  cairoRender :: RenderCache -> CanvasId -> a -> Cairo.Render a                   -- |  instance Renderable (Background,Dimension) where-  cairoRender = const (passarg renderBkg) +  cairoRender = const2 (passarg1 renderBkg)   -- |  instance Renderable Stroke where -  cairoRender = const (passarg renderStrk)+  cairoRender = const2 (passarg1 renderStrk)  -- |  instance Renderable (BBoxed Stroke) where-  cairoRender =const (passarg (renderStrk . bbxed_content))+  cairoRender =const2 (passarg1 (renderStrk . bbxed_content))    -- | -instance Renderable RLayer where-  cairoRender cache = renderRLayer_InBBox cache Nothing +instance Renderable (RLayer,Dimension,Maybe Xform4Page) where+  cairoRender cache cid = renderRLayer_InBBox cache cid Nothing     -- |  class RenderOptionable a where      type RenderOption a :: *-  cairoRenderOption :: RenderOption a -> RenderCache -> a -> Cairo.Render a+  cairoRenderOption :: RenderOption a -> RenderCache -> CanvasId -> a -> Cairo.Render a  -- |  instance RenderOptionable (Background,Dimension) where@@ -78,67 +86,73 @@ instance RenderOptionable (BBoxed Stroke) where   type RenderOption (BBoxed Stroke) = StrokeBBoxOption   cairoRenderOption DrawFull = cairoRender -  cairoRenderOption DrawBoxOnly = const (passarg renderStrkBBx_BBoxOnly)+  cairoRenderOption DrawBoxOnly = error "BBoxed Stroke.cairoRenderOption: DrawBoxOnly deprecated"     -- |  instance RenderOptionable (RBackground,Dimension,Maybe Xform4Page) where    type RenderOption (RBackground,Dimension,Maybe Xform4Page) = RBkgOpt -  cairoRenderOption RBkgDrawPDF cache = renderRBkg cache-  cairoRenderOption RBkgDrawWhite cache = passarg (renderRBkg_Dummy cache)-  cairoRenderOption RBkgDrawBuffer cache = renderRBkg_Buf cache -  cairoRenderOption (RBkgDrawPDFInBBox mbbox) cache = renderRBkg_InBBox cache mbbox +  cairoRenderOption RBkgDrawPDF cache cid = renderRBkg cache cid+  cairoRenderOption RBkgDrawWhite _cache _cid = error "RBackground...cairoRenderOption: RBkgDrawWhite deprecated" +  cairoRenderOption RBkgDrawBuffer cache cid = renderRBkg_Buf cache cid +  cairoRenderOption (RBkgDrawPDFInBBox mbbox) cache cid = renderRBkg_InBBox cache cid mbbox   -- | -instance RenderOptionable RLayer where-  type RenderOption RLayer = StrokeBBoxOption -  cairoRenderOption DrawFull cache = cairoRender cache-  cairoRenderOption DrawBoxOnly cache = passarg (renderRLayer_BBoxOnly cache)+instance RenderOptionable (RLayer,Dimension,Maybe Xform4Page) where+  type RenderOption (RLayer,Dimension,Maybe Xform4Page) = StrokeBBoxOption +  cairoRenderOption DrawFull cache cid = cairoRender cache cid+  cairoRenderOption DrawBoxOnly _cache _cid = error "RLayer.cairoRenderOption: DrawBoxOnly deprecated"   -- | -instance RenderOptionable (InBBox RLayer) where-  type RenderOption (InBBox RLayer) = InBBoxOption-  cairoRenderOption (InBBoxOption mbbox) cache (InBBox lyr) = -    InBBox <$> renderRLayer_InBBoxBuf cache mbbox lyr+instance RenderOptionable (InBBox (RLayer,Dimension,Maybe Xform4Page)) where+  type RenderOption (InBBox (RLayer,Dimension,Maybe Xform4Page)) = InBBoxOption+  cairoRenderOption (InBBoxOption mbbox) cache cid (InBBox lyrinfo) = +    InBBox <$> renderRLayer_InBBoxBuf cache cid mbbox lyrinfo      -- | cairoOptionPage :: ( RenderOptionable (b,Dimension,Maybe Xform4Page)-                   , RenderOptionable a-                   , Foldable s) => -                   (RenderOption (b,Dimension,Maybe Xform4Page), RenderOption a) +                   , RenderOptionable (a,Dimension,Maybe Xform4Page)+                   , Foldable s, Functor s) => +                   ( RenderOption (b,Dimension,Maybe Xform4Page)+                   , RenderOption (a,Dimension,Maybe Xform4Page))                     -> RenderCache+                   -> CanvasId                    -> (GPage b s a, Maybe Xform4Page)                    -> Cairo.Render (GPage b s a, Maybe Xform4Page)-cairoOptionPage (optb,opta) cache (p,mx) = do -    cairoRenderOption optb cache (view gbackground p, view gdimension p,mx)-    mapM_ (cairoRenderOption opta cache) (view glayers p)+cairoOptionPage (optb,opta) cache cid (p,mx) = do +    let (bkg,dim) = (view gbackground p, view gdimension p)+    cairoRenderOption optb cache cid (bkg,dim,mx)+    mapM_ (cairoRenderOption opta cache cid) . fmap (,dim,mx) $ (view glayers p)     return (p,mx)     -- |  instance ( RenderOptionable (b,Dimension,Maybe Xform4Page)-         , RenderOptionable a-         , Foldable s) =>+         , RenderOptionable (a,Dimension,Maybe Xform4Page)+         , Foldable s, Functor s) =>          RenderOptionable (GPage b s a,Maybe Xform4Page) where-  type RenderOption (GPage b s a,Maybe Xform4Page) = (RenderOption (b,Dimension,Maybe Xform4Page), RenderOption a)+  type RenderOption (GPage b s a,Maybe Xform4Page) = (RenderOption (b,Dimension,Maybe Xform4Page), RenderOption (a,Dimension,Maybe Xform4Page))   cairoRenderOption = cairoOptionPage              -- |  instance RenderOptionable (InBBox RPage,Maybe Xform4Page) where   type RenderOption (InBBox RPage,Maybe Xform4Page) = InBBoxOption -  cairoRenderOption (InBBoxOption mbbox) cache (InBBox page,mx) = do -    cairoRenderOption (RBkgDrawPDFInBBox mbbox) cache (view gbackground page, view gdimension page, mx)+  cairoRenderOption (InBBoxOption mbbox) cache cid (InBBox page,mx) = do +    let (bkg,dim) = (view gbackground page, view gdimension page)+    cairoRenderOption (RBkgDrawPDFInBBox mbbox) cache cid (bkg,dim,mx)     let lyrs = view glayers page-    nlyrs <- mapM (liftM unInBBox . cairoRenderOption (InBBoxOption mbbox) cache . InBBox ) lyrs-    let npage = set glayers nlyrs page+    nlyrs <- mapM (liftM unInBBox . cairoRenderOption (InBBoxOption mbbox) cache cid . InBBox ) . fmap (,dim,mx) $ lyrs+    let npage = set glayers (fmap (view _1) nlyrs) page     return (InBBox npage,mx)   -- |  instance RenderOptionable (InBBoxBkgBuf RPage,Maybe Xform4Page) where   type RenderOption (InBBoxBkgBuf RPage,Maybe Xform4Page) = InBBoxOption -  cairoRenderOption (InBBoxOption mbbox) cache (InBBoxBkgBuf page,mx) = do -    cairoRenderOption (RBkgDrawPDFInBBox mbbox) cache (view gbackground page, view gdimension page, mx)+  cairoRenderOption (InBBoxOption mbbox) cache cid (InBBoxBkgBuf page,mx) = do +    let bkg = view gbackground page+        dim = view gdimension page+    cairoRenderOption (RBkgDrawPDFInBBox mbbox) cache cid (bkg,dim,mx)     let lyrs = view glayers page-    nlyrs <- mapM (renderRLayer_InBBox cache mbbox) lyrs-    let npage = set glayers nlyrs page+    nlyrs <- mapM (renderRLayer_InBBox cache cid mbbox) . fmap (,dim,mx) $ lyrs+    let npage = set glayers (fmap (view _1) nlyrs) page     return (InBBoxBkgBuf npage,mx)   

@@ -1,12 +1,14 @@-{-# LANGUAGE TypeFamilies, TypeOperators, MultiParamTypeClasses #-}+{-# LANGUAGE MultiParamTypeClasses #-} {-# LANGUAGE OverloadedStrings #-}+{-# LANGUAGE TypeFamilies #-}+{-# LANGUAGE TypeOperators #-}  ----------------------------------------------------------------------------- -- | -- Module      : Graphics.Hoodle.Render.Item --- Copyright   : (c) 2011-2014 Ian-Woo Kim+-- Copyright   : (c) 2011-2015 Ian-Woo Kim ----- License     : GPL-3+-- License     : BSD3 -- Maintainer  : Ian-Woo Kim <ianwookim@gmail.com> -- Stability   : experimental -- Portability : GHC@@ -17,22 +19,16 @@  module Graphics.Hoodle.Render.Item where -import           Control.Applicative-import           Control.Concurrent (forkIO)  import           Control.Monad import           Control.Monad.Identity import           Control.Monad.IO.Class-import           Control.Monad.Trans.Reader import qualified Data.ByteString as B import qualified Data.ByteString.Char8 as C8--- import qualified Data.ByteString.Lazy as LB import           Data.ByteString.Base64--- import           Data.UUID import           Data.UUID.V4 import           Graphics.GD.ByteString import qualified Graphics.Rendering.Cairo as Cairo import qualified Graphics.Rendering.Cairo.SVG as RSVG--- import           Graphics.UI.Gtk (postGUIAsync) import           System.Directory import           System.FilePath -- from hoodle-platform @@ -43,61 +39,12 @@ import           Graphics.Hoodle.Render.Type.Item import           Graphics.Hoodle.Render.Type.Renderer - -- | construct renderable item  cnstrctRItem :: Item -> Renderer RItem  cnstrctRItem (ItemStroke strk) = return (RItemStroke (runIdentity (makeBBoxed strk)))-cnstrctRItem (ItemImage img) = do -    (handler,_) <- ask +cnstrctRItem (ItemImage img) =      let imgbbx = runIdentity (makeBBoxed img)-        src = img_src img-    -- uuid <- liftIO $  nextRandom--    -- liftIO . forkIO $ do-    --   let embed = getByteStringIfEmbeddedPNG src -    --   msfc <- case embed of         -    --     Just bstr -> do -    --       sfc <- saveTempPNGToCreateSurface bstr -    --       return (Just sfc)-    --     Nothing -> do-    --       let filesrc = C8.unpack (img_src img)-    --           filesrcext = takeExtension filesrc -    --           imgaction -    --             | filesrcext == ".PNG" || filesrcext == ".png" = do -    --                 b <- doesFileExist filesrc -    --                 if b then Just <$> Cairo.imageSurfaceCreateFromPNG filesrc-    --                      else return Nothing -    --             | filesrcext == ".JPG" || filesrcext == ".jpg" = do -    --                 b <- doesFileExist filesrc -    --                 if b then Just <$> getJPGandCreateSurface filesrc -    --                      else return Nothing -    --             | otherwise = return Nothing -    --       imgaction-    --   maybe (return ()) (\sfc-> handler (uuid, (1.0,sfc))) msfc---    let embed = getByteStringIfEmbeddedPNG src -    msfc <- liftIO $ case embed of         -      Just bstr -> do -        sfc <- saveTempPNGToCreateSurface bstr -        return (Just sfc)-      Nothing -> do-	let filesrc = C8.unpack (img_src img)-	    filesrcext = takeExtension filesrc -	    imgaction -	      | filesrcext == ".PNG" || filesrcext == ".png" = do -		  b <- doesFileExist filesrc -		  if b then Just <$> Cairo.imageSurfaceCreateFromPNG filesrc-		       else return Nothing -	      | filesrcext == ".JPG" || filesrcext == ".jpg" = do -		  b <- doesFileExist filesrc -		  if b then Just <$> getJPGandCreateSurface filesrc -		       else return Nothing -	      | otherwise = return Nothing -	imgaction-    -- maybe (return ()) (\sfc-> handler (uuid, (1.0,sfc))) msfc--    return (RItemImage imgbbx msfc)+    in return (RItemImage imgbbx Nothing) cnstrctRItem (ItemSVG svg@(SVG _ _ bstr _ _)) = do      let str = C8.unpack bstr          svgbbx = runIdentity (makeBBoxed svg)@@ -153,5 +100,12 @@ -- |  saveTempPNGToCreateSurface :: C8.ByteString -> IO Cairo.Surface saveTempPNGToCreateSurface bstr = do -    pipeActionWith (B.writeFile "/dev/stdout" bstr) Cairo.imageSurfaceCreateFromPNG +    tdir <- getTemporaryDirectory+    tuuid <- nextRandom+    let tfile = tdir </> show tuuid <.> "png"+    B.writeFile tfile bstr+    checkPipe tfile+    sfc <- Cairo.imageSurfaceCreateFromPNG tfile+    removeFile tfile+    return sfc 

@@ -1,4 +1,3 @@- ----------------------------------------------------------------------------- -- | -- Module      : Graphics.Hoodle.Render.Primitive@@ -18,12 +17,12 @@ , drawVWStrokeCurve  ) where  -import           Control.Applicative+-- import           Control.Applicative import           Control.Monad  import           Data.Strict.Tuple hiding (fst,snd) import qualified Graphics.Rendering.Cairo as Cairo -- from hoodle-platform-import           Data.Hoodle.Predefined +-- import           Data.Hoodle.Predefined  --  -- import Prelude hiding (foldM_) @@ -47,14 +46,23 @@     Cairo.moveTo xo yo     let ((xlast,ylast,_zlast):rxs) = reverse xs      foldM_ forward (xo,yo) xs -    foldM_ backward (xlast,ylast) rxs -  where (dx,dy) = (,) <$> fst <*> snd $ predefinedPenShapeAspectXY-        dir (x,y) = x * dy - y * dx-        forward (x0,y0) (x,y,z) = do if (dir (x-x0,y-y0) > 0) -                                       then Cairo.lineTo (x+0.5*dx*z) (y+0.5*dy*z)-                                       else Cairo.lineTo (x-0.5*dx*z) (y-0.5*dy*z) -                                     return (x,y)       -        backward (x0,y0) (x,y,z) = do if (dir (x-x0,y-y0) < 0) -                                        then Cairo.lineTo (x-0.5*dx*z) (y-0.5*dy*z)-                                        else Cairo.lineTo (x+0.5*dx*z) (y+0.5*dy*z)-                                      return (x,y)+    foldM_ forward (xlast,ylast) rxs +  where turn (x,y) = (negate y,x)+        norm (x,y) = sqrt (x*x + y*y)+        (x1,y1) .-. (x0,y0) = (x1-x0 , y1-y0)+        (x1,y1) .+. (x0,y0) = (x1+x0 , y1+y0)+        z *. (x0,y0) = (z * x0 , z * y0)+        zFactor = 0.5 -- to be tuned+        forward p0 (x,y,z) = do+          let p1 = (x,y)+              dp = p1 .-. p0+              dist = norm dp+          if dist < 0.01 -- otherwise normalisation can diverge+             then return p0+             else do+               -- shift the current position perpendicularly to the+               -- direction of movement, by an amount proportional to+               -- the pressure (z).+               let shift = turn $ ((1/dist) * z * zFactor) *. dp+               Prelude.uncurry Cairo.lineTo $ shift .+. p1+               return p1

@@ -18,7 +18,7 @@ ( module Graphics.Hoodle.Render.Type.Background , module Graphics.Hoodle.Render.Type.Hoodle , module Graphics.Hoodle.Render.Type.Item -, module Graphics.Hoodle.Render.Type.RenderCache+-- , module Graphics.Hoodle.Render.Type.RenderCache , module Graphics.Hoodle.Render.Type.Renderer , module Graphics.Hoodle.Render.Type.Select ) where@@ -26,6 +26,6 @@ import Graphics.Hoodle.Render.Type.Background import Graphics.Hoodle.Render.Type.Hoodle import Graphics.Hoodle.Render.Type.Item-import Graphics.Hoodle.Render.Type.RenderCache+-- import Graphics.Hoodle.Render.Type.RenderCache import Graphics.Hoodle.Render.Type.Renderer import Graphics.Hoodle.Render.Type.Select

@@ -6,7 +6,7 @@ -- Module      : Graphics.Hoodle.Render.Type.Background  -- Copyright   : (c) 2011-2014 Ian-Woo Kim ----- License     : GPL-3+-- License     : BSD3 -- Maintainer  : Ian-Woo Kim <ianwookim@gmail.com> -- Stability   : experimental -- Portability : GHC@@ -16,13 +16,14 @@ module Graphics.Hoodle.Render.Type.Background where  import           Data.ByteString -import           Data.UUID+-- import           Data.UUID -- import qualified Graphics.Rendering.Cairo as Cairo import qualified Graphics.UI.Gtk.Poppler.Document as Poppler -- from hoodle-platform import           Data.Hoodle.BBox import           Data.Hoodle.Simple  -- from this package+import           Graphics.Hoodle.Render.Type.Renderer  --  import Prelude hiding (mapM_)@@ -40,21 +41,19 @@ data RBackground = RBkgSmpl                     { rbkg_color :: ByteString                    , rbkg_style :: ByteString-                   , rbkg_uuid :: UUID+                   , rbkg_surfaceid :: SurfaceID -- UUID                    }                  | RBkgPDF                     { rbkg_domain :: Maybe ByteString                    , rbkg_filename :: ByteString                    , rbkg_pageno :: Int                     , rbkg_popplerpage :: Maybe Poppler.Page -                   -- , rbkg_cairosurface :: Maybe Cairo.Surface -                   , rbkg_uuid :: UUID+                   , rbkg_surfaceid :: SurfaceID -- UUID                    }                   | RBkgEmbedPDF                    { rbkg_pageno :: Int                    , rbkg_popplerpage :: Maybe Poppler.Page -                   -- , rbkg_cairosurface :: Maybe Cairo.Surface -                   , rbkg_uuid :: UUID+                   , rbkg_surfaceid :: SurfaceID -- UUID                    }  instance Show (RBackground) where   show _ = "RBackground"

@@ -4,9 +4,9 @@ ----------------------------------------------------------------------------- -- | -- Module      : Graphics.Hoodle.Render.Type.Hoodle--- Copyright   : (c) 2011-2014 Ian-Woo Kim+-- Copyright   : (c) 2011-2015 Ian-Woo Kim ----- License     : GPL-3+-- License     : BSD3 -- Maintainer  : Ian-Woo Kim <ianwookim@gmail.com> -- Stability   : experimental -- Portability : GHC@@ -21,7 +21,6 @@ import Control.Lens  import Data.Foldable (toList) import qualified Data.IntMap as IM-import qualified Graphics.Rendering.Cairo as Cairo -- from hoodle-platform  import Data.Hoodle.BBox import Data.Hoodle.Generic@@ -30,22 +29,23 @@ -- from this package import Graphics.Hoodle.Render.Type.Background  import Graphics.Hoodle.Render.Type.Item+import Graphics.Hoodle.Render.Type.Renderer  ---------------------------- -- normal state rendering -- ---------------------------- -newtype LyBuf = LyBuf (Maybe Cairo.Surface)+newtype LyBuf = LyBuf { unLyBuf :: SurfaceID }    -- | normal rendering data structure for layer, R for rendering --   buffer is Surface, container for item = list  --   and StrokeBBox as contained items-type RLayer = GLayer LyBuf [] RItem -- StrokeBBox +type RLayer = GLayer LyBuf [] RItem   -- | normal rendering data structure for page  --   background is RBackground and container for layer is IntMap  --   and layer is RLayer  -type RPage = GPage RBackground ZipperSelect RLayer -- change from IntMap +type RPage = GPage RBackground ZipperSelect RLayer  -- | normal rendering data struture for hoodle  --   container for page is IntMap @@ -55,9 +55,8 @@ instance Show RHoodle where   show _ = "RHoodle" -emptyRLayer :: RLayer -emptyRLayer = GLayer (LyBuf Nothing) []-+emptyRLayer :: SurfaceID -> RLayer +emptyRLayer sfcid = GLayer (LyBuf sfcid ) []  ------- -- get simple hoodle data structure @@ -67,8 +66,6 @@ rLayer2Layer :: RLayer -> Layer rLayer2Layer = Layer <$> fmap rItem2Item . view gitems  - -- strkbbx_strk . view gstrokes- -- | project to simple Page out of RPage rPage2Page :: RPage -> Page  rPage2Page = Page <$> view gdimension @@ -80,7 +77,7 @@ rHoodle2Hoodle = Hoodle <$> view ghoodleID                         <*> view gtitle                          <*> view grevisions-                        <*> view gembeddedpdf+                        <*> fmap pdfBase64 . view gembeddedpdf                         <*> view gembeddedtext                         <*> IM.elems . fmap rPage2Page . view gpages 

@@ -1,4 +1,6 @@-{-# LANGUAGE TypeFamilies, TypeOperators, MultiParamTypeClasses #-}+{-# LANGUAGE MultiParamTypeClasses #-}+{-# LANGUAGE TypeFamilies #-}+-- {-# LANGUAGE TypeOperators #-}  ----------------------------------------------------------------------------- -- |@@ -16,7 +18,7 @@  module Graphics.Hoodle.Render.Type.Item where -import           Data.UUID+-- import           Data.UUID -- import           Data.UUID.V4 import qualified Graphics.Rendering.Cairo as Cairo import qualified Graphics.Rendering.Cairo.SVG as RSVG

@@ -1,21 +0,0 @@--------------------------------------------------------------------------------- |--- Module      : Graphics.Hoodle.Render.Type.RenderCache --- Copyright   : (c) 2014 Ian-Woo Kim------ License     : BSD3--- Maintainer  : Ian-Woo Kim <ianwookim@gmail.com>--- Stability   : experimental--- Portability : GHC-----------------------------------------------------------------------------------module Graphics.Hoodle.Render.Type.RenderCache where--import qualified Data.HashMap.Strict as HM-import           Data.UUID-import qualified Graphics.Rendering.Cairo as Cairo---- | hashmap: key = UUID, value = (original size, view size, surface)-type RenderCache = HM.HashMap UUID (Double, Cairo.Surface)-

@@ -1,5 +1,6 @@ {-# LANGUAGE BangPatterns #-} {-# LANGUAGE GADTs #-}+{-# LANGUAGE GeneralizedNewtypeDeriving #-} {-# LANGUAGE RecordWildCards #-}  -----------------------------------------------------------------------------@@ -7,7 +8,7 @@ -- Module      : Graphics.Hoodle.Render.Type.Renderer -- Copyright   : (c) 2014 Ian-Woo Kim ----- License     : GPL-3+-- License     : BSD3 -- Maintainer  : Ian-Woo Kim <ianwookim@gmail.com> -- Stability   : experimental -- Portability : GHC@@ -16,39 +17,131 @@  module Graphics.Hoodle.Render.Type.Renderer where --- import           Control.Concurrent.MVar+import           Control.Applicative import           Control.Concurrent.STM-import           Control.Monad import           Control.Monad.IO.Class import           Control.Monad.Trans.Reader import qualified Data.ByteString.Char8 as B+import           Data.Hashable (Hashable(..))+import qualified Data.HashMap.Strict as HM import           Data.Sequence hiding (null,filter)-import qualified Data.Sequence as Seq (null,filter)+import qualified Data.Sequence as Seq (filter) import           Data.UUID import           Data.UUID.V4 (nextRandom) import qualified Graphics.Rendering.Cairo as Cairo import qualified Graphics.UI.Gtk.Poppler.Document as Poppler -- import           Data.Hoodle.Simple (Dimension(..))+--+import           Graphics.Hoodle.Render.Type.Item +newtype PDFCommandID = PDFCommandID UUID deriving (Show,Eq,Ord)  data PDFCommand where-  GetDocFromFile    :: !B.ByteString -> TMVar (Maybe Poppler.Document) -> PDFCommand-  GetDocFromDataURI :: !B.ByteString -> TMVar (Maybe Poppler.Document) -> PDFCommand -  GetPageFromDoc    :: !Poppler.Document -> !Int -> TMVar (Maybe Poppler.Page) -> PDFCommand -  RenderPageScaled  :: !Poppler.Page -> !Dimension -> !Dimension -> PDFCommand +  GetDocFromFile    :: B.ByteString -> TMVar (Maybe Poppler.Document) -> PDFCommand+  GetDocFromDataURI :: B.ByteString -> TMVar (Maybe Poppler.Document) -> PDFCommand +  GetPageFromDoc    :: Poppler.Document -> !Int -> TMVar (Maybe Poppler.Page) -> PDFCommand +  GetNPages :: !Poppler.Document -> (TMVar Int) -> PDFCommand+  RenderPageScaled  :: SurfaceID -> Poppler.Page -> Dimension -> Dimension -> PDFCommand   instance Show PDFCommand where   show _ = "PDFCommand" +newtype GenCommandID = GenCommandID UUID deriving (Show,Eq,Ord) -type Renderer = ReaderT ((UUID, (Double,Cairo.Surface)) -> IO (), TVar (Seq (UUID, PDFCommand))) IO+data GenCommand where+  BkgSmplScaled :: SurfaceID -> B.ByteString -> B.ByteString -> Dimension -> Dimension -> GenCommand+  LayerInit :: SurfaceID -> [RItem] -> GenCommand+  LayerRedraw :: SurfaceID -> [RItem] -> GenCommand+  LayerScaled :: SurfaceID -> [RItem] -> Dimension -> Dimension -> GenCommand  -sendPDFCommand :: UUID -> TVar (Seq (UUID,PDFCommand)) -> PDFCommand -> STM ()-sendPDFCommand !uuid !queuevar !cmd = do++instance Show GenCommand where+  show (BkgSmplScaled sfcid _ _ _ _) = "BkgSmplScaled:"++show sfcid+  show (LayerInit sfcid _  ) = "LayerInit:"++show sfcid+  show (LayerRedraw sfcid _ ) = "LayerRedraw:"++show sfcid+  show (LayerScaled sfcid _ _ _ ) = "LayerScaled:"++show sfcid+++newtype SurfaceID = SurfaceID UUID deriving (Show,Eq,Ord,Hashable)++-- |+type CanvasId = Int ++-- | hashmap: key = UUID, value = (original size, view size, surface)+type RenderCache = HM.HashMap SurfaceID (Double, Cairo.Surface)+++-- |+data RendererEvent = SurfaceUpdate (SurfaceID, (Double,Cairo.Surface))+                   | FinishCommandFor SurfaceID++type PDFCommandQueue = TVar (Seq (PDFCommandID,PDFCommand))++type GenCommandQueue = TVar (Seq (GenCommandID,GenCommand))++data RendererState = RendererState { rendererHandler :: RendererEvent -> IO ()+                                   , rendererPDFCmdQ :: PDFCommandQueue+                                   , rendererGenCmdQ :: GenCommandQueue+                                   , rendererCache :: TVar RenderCache }++getRenderCache :: RendererState -> IO RenderCache+getRenderCache RendererState {..} = atomically (readTVar rendererCache)++type Renderer = ReaderT RendererState IO++issuePDFCommandID :: (Functor m, MonadIO m) => m PDFCommandID+issuePDFCommandID = PDFCommandID <$> liftIO nextRandom++issueGenCommandID :: (Functor m, MonadIO m) => m GenCommandID+issueGenCommandID = GenCommandID <$> liftIO nextRandom++issueSurfaceID :: (Functor m, MonadIO m) => m SurfaceID+issueSurfaceID = SurfaceID <$> liftIO nextRandom++sendPDFCommand :: PDFCommandQueue +               -> PDFCommandID+               -> PDFCommand +               -> STM ()+sendPDFCommand queuevar cmdid cmd = do     queue <- readTVar queuevar-    let queue' = Seq.filter ((/=uuid) .fst) queue -        nqueue = queue' |> (uuid,cmd)+    let queue' = Seq.filter (not . isRemoved (cmdid,cmd)) queue+        nqueue = queue' |> (cmdid,cmd)     writeTVar queuevar nqueue +isRemoved :: (PDFCommandID,PDFCommand) -> (PDFCommandID,PDFCommand) -> Bool+isRemoved (cmdid,ncmd) (ocmdid,ocmd) +  | cmdid == ocmdid = True+  | otherwise = case ncmd of+                  RenderPageScaled nsfcid _ _ _ -> +                    case ocmd of+                      RenderPageScaled osfcid _ _ _ -> nsfcid == osfcid+                      _ -> False+                  _ -> False+++sendGenCommand :: GenCommandQueue +               -> GenCommandID+               -> GenCommand +               -> STM ()+sendGenCommand queuevar cmdid cmd = do+    queue <- readTVar queuevar+    let queue' = Seq.filter (not . isRemovedGen (cmdid,cmd)) queue +        nqueue = queue' |> (cmdid,cmd)+    writeTVar queuevar nqueue++surfaceID :: GenCommand -> SurfaceID+surfaceID (BkgSmplScaled sfcid _ _ _ _) = sfcid+surfaceID (LayerInit sfcid _ ) = sfcid+surfaceID (LayerRedraw sfcid _ ) = sfcid+surfaceID (LayerScaled sfcid _ _ _ ) = sfcid+++isRemovedGen :: (GenCommandID,GenCommand) -> (GenCommandID,GenCommand) -> Bool+isRemovedGen (cmdid,ncmd) (ocmdid,ocmd) +  | cmdid == ocmdid = True+  | otherwise = case ncmd of+                  BkgSmplScaled nsfcid _ _ _ _ -> surfaceID ocmd == nsfcid+                  LayerScaled nsfcid _ _ _ -> surfaceID ocmd == nsfcid+                  _ -> False