Update README

Includes refactoring to use GMenuModel and GtkEventController

.reuse/dep5

@@ -0,0 +1,29 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: wdisplays
+Upstream-Contact: Jason Francis <jason@cycles.network>
+Source: <https://cyclopsian.github.io/wdisplays>
+
+Files: README.md .gitignore
+Copyright: 2020 Jason Francis <jason@cycles.network>
+License: CC0-1.0
+
+Files: resources/style.css resources/wdisplays.desktop.in resources/*.ui
+       resources/resources.xml.in
+Copyright: 2020 Jason Francis <jason@cycles.network>
+License: GPL-3.0-or-later
+
+Files: wdisplays.png resources/wdisplays.svg
+Copyright: 2020 Jason Francis <jason@cycles.network>
+License: CC-BY-SA-4.0
+
+Files: protocol/wlr-layer-shell-unstable-v1.xml
+Copyright: 2017 Drew DeVault
+License: MIT
+
+Files: protocol/wlr-output-management-unstable-v1.xml
+Copyright: 2019 Purism SPC
+License: MIT
+
+Files: protocol/wlr-screencopy-unstable-v1.xml
+Copyright: 2018 Simon Ser
+License: MIT

COPYING

@@ -0,0 +1 @@
+LICENSES/GPL-3.0-or-later.txt

LICENSE

@@ -1,20 +0,0 @@
-Copyright (C) 2019 cyclopsian
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE X CONSORTIUM BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

LICENSES/CC-BY-SA-4.0.txt

@@ -0,0 +1,350 @@
+Creative Commons Attribution-ShareAlike 4.0 International Creative Commons
+Corporation ("Creative Commons") is not a law firm and does not provide legal
+services or legal advice. Distribution of Creative Commons public licenses
+does not create a lawyer-client or other relationship. Creative Commons makes
+its licenses and related information available on an "as-is" basis. Creative
+Commons gives no warranties regarding its licenses, any material licensed
+under their terms and conditions, or any related information. Creative Commons
+disclaims all liability for damages resulting from their use to the fullest
+extent possible.
+
+Using Creative Commons Public Licenses
+
+Creative Commons public licenses provide a standard set of terms and conditions
+that creators and other rights holders may use to share original works of
+authorship and other material subject to copyright and certain other rights
+specified in the public license below. The following considerations are for
+informational purposes only, are not exhaustive, and do not form part of our
+licenses.
+
+Considerations for licensors: Our public licenses are intended for use by
+those authorized to give the public permission to use material in ways otherwise
+restricted by copyright and certain other rights. Our licenses are irrevocable.
+Licensors should read and understand the terms and conditions of the license
+they choose before applying it. Licensors should also secure all rights necessary
+before applying our licenses so that the public can reuse the material as
+expected. Licensors should clearly mark any material not subject to the license.
+This includes other CC-licensed material, or material used under an exception
+or limitation to copyright. More considerations for licensors : wiki.creativecommons.org/Considerations_for_licensors
+
+Considerations for the public: By using one of our public licenses, a licensor
+grants the public permission to use the licensed material under specified
+terms and conditions. If the licensor's permission is not necessary for any
+reason–for example, because of any applicable exception or limitation to copyright–then
+that use is not regulated by the license. Our licenses grant only permissions
+under copyright and certain other rights that a licensor has authority to
+grant. Use of the licensed material may still be restricted for other reasons,
+including because others have copyright or other rights in the material. A
+licensor may make special requests, such as asking that all changes be marked
+or described.
+
+Although not required by our licenses, you are encouraged to respect those
+requests where reasonable. More considerations for the public : wiki.creativecommons.org/Considerations_for_licensees
+
+Creative Commons Attribution-ShareAlike 4.0 International Public License
+
+By exercising the Licensed Rights (defined below), You accept and agree to
+be bound by the terms and conditions of this Creative Commons Attribution-ShareAlike
+4.0 International Public License ("Public License"). To the extent this Public
+License may be interpreted as a contract, You are granted the Licensed Rights
+in consideration of Your acceptance of these terms and conditions, and the
+Licensor grants You such rights in consideration of benefits the Licensor
+receives from making the Licensed Material available under these terms and
+conditions.
+
+Section 1 – Definitions.
+
+a. Adapted Material means material subject to Copyright and Similar Rights
+that is derived from or based upon the Licensed Material and in which the
+Licensed Material is translated, altered, arranged, transformed, or otherwise
+modified in a manner requiring permission under the Copyright and Similar
+Rights held by the Licensor. For purposes of this Public License, where the
+Licensed Material is a musical work, performance, or sound recording, Adapted
+Material is always produced where the Licensed Material is synched in timed
+relation with a moving image.
+
+b. Adapter's License means the license You apply to Your Copyright and Similar
+Rights in Your contributions to Adapted Material in accordance with the terms
+and conditions of this Public License.
+
+c. BY-SA Compatible License means a license listed at creativecommons.org/compatiblelicenses,
+approved by Creative Commons as essentially the equivalent of this Public
+License.
+
+d. Copyright and Similar Rights means copyright and/or similar rights closely
+related to copyright including, without limitation, performance, broadcast,
+sound recording, and Sui Generis Database Rights, without regard to how the
+rights are labeled or categorized. For purposes of this Public License, the
+rights specified in Section 2(b)(1)-(2) are not Copyright and Similar Rights.
+
+e. Effective Technological Measures means those measures that, in the absence
+of proper authority, may not be circumvented under laws fulfilling obligations
+under Article 11 of the WIPO Copyright Treaty adopted on December 20, 1996,
+and/or similar international agreements.
+
+f. Exceptions and Limitations means fair use, fair dealing, and/or any other
+exception or limitation to Copyright and Similar Rights that applies to Your
+use of the Licensed Material.
+
+g. License Elements means the license attributes listed in the name of a Creative
+Commons Public License. The License Elements of this Public License are Attribution
+and ShareAlike.
+
+h. Licensed Material means the artistic or literary work, database, or other
+material to which the Licensor applied this Public License.
+
+i. Licensed Rights means the rights granted to You subject to the terms and
+conditions of this Public License, which are limited to all Copyright and
+Similar Rights that apply to Your use of the Licensed Material and that the
+Licensor has authority to license.
+
+j. Licensor means the individual(s) or entity(ies) granting rights under this
+Public License.
+
+k. Share means to provide material to the public by any means or process that
+requires permission under the Licensed Rights, such as reproduction, public
+display, public performance, distribution, dissemination, communication, or
+importation, and to make material available to the public including in ways
+that members of the public may access the material from a place and at a time
+individually chosen by them.
+
+l. Sui Generis Database Rights means rights other than copyright resulting
+from Directive 96/9/EC of the European Parliament and of the Council of 11
+March 1996 on the legal protection of databases, as amended and/or succeeded,
+as well as other essentially equivalent rights anywhere in the world.
+
+m. You means the individual or entity exercising the Licensed Rights under
+this Public License. Your has a corresponding meaning.
+
+Section 2 – Scope.
+
+   a. License grant.
+
+1. Subject to the terms and conditions of this Public License, the Licensor
+hereby grants You a worldwide, royalty-free, non-sublicensable, non-exclusive,
+irrevocable license to exercise the Licensed Rights in the Licensed Material
+to:
+
+         A. reproduce and Share the Licensed Material, in whole or in part; and
+
+         B. produce, reproduce, and Share Adapted Material.
+
+2. Exceptions and Limitations. For the avoidance of doubt, where Exceptions
+and Limitations apply to Your use, this Public License does not apply, and
+You do not need to comply with its terms and conditions.
+
+      3. Term. The term of this Public License is specified in Section 6(a).
+
+4. Media and formats; technical modifications allowed. The Licensor authorizes
+You to exercise the Licensed Rights in all media and formats whether now known
+or hereafter created, and to make technical modifications necessary to do
+so. The Licensor waives and/or agrees not to assert any right or authority
+to forbid You from making technical modifications necessary to exercise the
+Licensed Rights, including technical modifications necessary to circumvent
+Effective Technological Measures. For purposes of this Public License, simply
+making modifications authorized by this Section 2(a)(4) never produces Adapted
+Material.
+
+      5. Downstream recipients.
+
+A. Offer from the Licensor – Licensed Material. Every recipient of the Licensed
+Material automatically receives an offer from the Licensor to exercise the
+Licensed Rights under the terms and conditions of this Public License.
+
+B. Additional offer from the Licensor – Adapted Material. Every recipient
+of Adapted Material from You automatically receives an offer from the Licensor
+to exercise the Licensed Rights in the Adapted Material under the conditions
+of the Adapter's License You apply.
+
+C. No downstream restrictions. You may not offer or impose any additional
+or different terms or conditions on, or apply any Effective Technological
+Measures to, the Licensed Material if doing so restricts exercise of the Licensed
+Rights by any recipient of the Licensed Material.
+
+6. No endorsement. Nothing in this Public License constitutes or may be construed
+as permission to assert or imply that You are, or that Your use of the Licensed
+Material is, connected with, or sponsored, endorsed, or granted official status
+by, the Licensor or others designated to receive attribution as provided in
+Section 3(a)(1)(A)(i).
+
+   b. Other rights.
+
+1. Moral rights, such as the right of integrity, are not licensed under this
+Public License, nor are publicity, privacy, and/or other similar personality
+rights; however, to the extent possible, the Licensor waives and/or agrees
+not to assert any such rights held by the Licensor to the limited extent necessary
+to allow You to exercise the Licensed Rights, but not otherwise.
+
+2. Patent and trademark rights are not licensed under this Public License.
+
+3. To the extent possible, the Licensor waives any right to collect royalties
+from You for the exercise of the Licensed Rights, whether directly or through
+a collecting society under any voluntary or waivable statutory or compulsory
+licensing scheme. In all other cases the Licensor expressly reserves any right
+to collect such royalties.
+
+Section 3 – License Conditions.
+
+Your exercise of the Licensed Rights is expressly made subject to the following
+conditions.
+
+   a. Attribution.
+
+1. If You Share the Licensed Material (including in modified form), You must:
+
+A. retain the following if it is supplied by the Licensor with the Licensed
+Material:
+
+i. identification of the creator(s) of the Licensed Material and any others
+designated to receive attribution, in any reasonable manner requested by the
+Licensor (including by pseudonym if designated);
+
+            ii. a copyright notice;
+
+            iii. a notice that refers to this Public License;
+
+            iv. a notice that refers to the disclaimer of warranties;
+
+v. a URI or hyperlink to the Licensed Material to the extent reasonably practicable;
+
+B. indicate if You modified the Licensed Material and retain an indication
+of any previous modifications; and
+
+C. indicate the Licensed Material is licensed under this Public License, and
+include the text of, or the URI or hyperlink to, this Public License.
+
+2. You may satisfy the conditions in Section 3(a)(1) in any reasonable manner
+based on the medium, means, and context in which You Share the Licensed Material.
+For example, it may be reasonable to satisfy the conditions by providing a
+URI or hyperlink to a resource that includes the required information.
+
+3. If requested by the Licensor, You must remove any of the information required
+by Section 3(a)(1)(A) to the extent reasonably practicable.
+
+b. ShareAlike.In addition to the conditions in Section 3(a), if You Share
+Adapted Material You produce, the following conditions also apply.
+
+1. The Adapter's License You apply must be a Creative Commons license with
+the same License Elements, this version or later, or a BY-SA Compatible License.
+
+2. You must include the text of, or the URI or hyperlink to, the Adapter's
+License You apply. You may satisfy this condition in any reasonable manner
+based on the medium, means, and context in which You Share Adapted Material.
+
+3. You may not offer or impose any additional or different terms or conditions
+on, or apply any Effective Technological Measures to, Adapted Material that
+restrict exercise of the rights granted under the Adapter's License You apply.
+
+Section 4 – Sui Generis Database Rights.
+
+Where the Licensed Rights include Sui Generis Database Rights that apply to
+Your use of the Licensed Material:
+
+a. for the avoidance of doubt, Section 2(a)(1) grants You the right to extract,
+reuse, reproduce, and Share all or a substantial portion of the contents of
+the database;
+
+b. if You include all or a substantial portion of the database contents in
+a database in which You have Sui Generis Database Rights, then the database
+in which You have Sui Generis Database Rights (but not its individual contents)
+is Adapted Material, including for purposes of Section 3(b); and
+
+c. You must comply with the conditions in Section 3(a) if You Share all or
+a substantial portion of the contents of the database.
+
+For the avoidance of doubt, this Section 4 supplements and does not replace
+Your obligations under this Public License where the Licensed Rights include
+other Copyright and Similar Rights.
+
+Section 5 – Disclaimer of Warranties and Limitation of Liability.
+
+a. Unless otherwise separately undertaken by the Licensor, to the extent possible,
+the Licensor offers the Licensed Material as-is and as-available, and makes
+no representations or warranties of any kind concerning the Licensed Material,
+whether express, implied, statutory, or other. This includes, without limitation,
+warranties of title, merchantability, fitness for a particular purpose, non-infringement,
+absence of latent or other defects, accuracy, or the presence or absence of
+errors, whether or not known or discoverable. Where disclaimers of warranties
+are not allowed in full or in part, this disclaimer may not apply to You.
+
+b. To the extent possible, in no event will the Licensor be liable to You
+on any legal theory (including, without limitation, negligence) or otherwise
+for any direct, special, indirect, incidental, consequential, punitive, exemplary,
+or other losses, costs, expenses, or damages arising out of this Public License
+or use of the Licensed Material, even if the Licensor has been advised of
+the possibility of such losses, costs, expenses, or damages. Where a limitation
+of liability is not allowed in full or in part, this limitation may not apply
+to You.
+
+c. The disclaimer of warranties and limitation of liability provided above
+shall be interpreted in a manner that, to the extent possible, most closely
+approximates an absolute disclaimer and waiver of all liability.
+
+Section 6 – Term and Termination.
+
+a. This Public License applies for the term of the Copyright and Similar Rights
+licensed here. However, if You fail to comply with this Public License, then
+Your rights under this Public License terminate automatically.
+
+b. Where Your right to use the Licensed Material has terminated under Section
+6(a), it reinstates:
+
+1. automatically as of the date the violation is cured, provided it is cured
+within 30 days of Your discovery of the violation; or
+
+      2. upon express reinstatement by the Licensor.
+
+c. For the avoidance of doubt, this Section 6(b) does not affect any right
+the Licensor may have to seek remedies for Your violations of this Public
+License.
+
+d. For the avoidance of doubt, the Licensor may also offer the Licensed Material
+under separate terms or conditions or stop distributing the Licensed Material
+at any time; however, doing so will not terminate this Public License.
+
+   e. Sections 1, 5, 6, 7, and 8 survive termination of this Public License.
+
+Section 7 – Other Terms and Conditions.
+
+a. The Licensor shall not be bound by any additional or different terms or
+conditions communicated by You unless expressly agreed.
+
+b. Any arrangements, understandings, or agreements regarding the Licensed
+Material not stated herein are separate from and independent of the terms
+and conditions of this Public License.
+
+Section 8 – Interpretation.
+
+a. For the avoidance of doubt, this Public License does not, and shall not
+be interpreted to, reduce, limit, restrict, or impose conditions on any use
+of the Licensed Material that could lawfully be made without permission under
+this Public License.
+
+b. To the extent possible, if any provision of this Public License is deemed
+unenforceable, it shall be automatically reformed to the minimum extent necessary
+to make it enforceable. If the provision cannot be reformed, it shall be severed
+from this Public License without affecting the enforceability of the remaining
+terms and conditions.
+
+c. No term or condition of this Public License will be waived and no failure
+to comply consented to unless expressly agreed to by the Licensor.
+
+d. Nothing in this Public License constitutes or may be interpreted as a limitation
+upon, or waiver of, any privileges and immunities that apply to the Licensor
+or You, including from the legal processes of any jurisdiction or authority.
+
+Creative Commons is not a party to its public licenses. Notwithstanding, Creative
+Commons may elect to apply one of its public licenses to material it publishes
+and in those instances will be considered the "Licensor." The text of the
+Creative Commons public licenses is dedicated to the public domain under the
+CC0 Public Domain Dedication. Except for the limited purpose of indicating
+that material is shared under a Creative Commons public license or as otherwise
+permitted by the Creative Commons policies published at creativecommons.org/policies,
+Creative Commons does not authorize the use of the trademark "Creative Commons"
+or any other trademark or logo of Creative Commons without its prior written
+consent including, without limitation, in connection with any unauthorized
+modifications to any of its public licenses or any other arrangements, understandings,
+or agreements concerning use of licensed material. For the avoidance of doubt,
+this paragraph does not form part of the public licenses.
+
+Creative Commons may be contacted at creativecommons.org.

LICENSES/CC0-1.0.txt

@@ -0,0 +1,119 @@
+Creative Commons Legal Code
+
+CC0 1.0 Universal CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES
+NOT PROVIDE LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE
+AN ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS INFORMATION
+ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES REGARDING THE USE
+OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED HEREUNDER, AND DISCLAIMS
+LIABILITY FOR DAMAGES RESULTING FROM THE USE OF THIS DOCUMENT OR THE INFORMATION
+OR WORKS PROVIDED HEREUNDER.
+
+Statement of Purpose
+
+The laws of most jurisdictions throughout the world automatically confer exclusive
+Copyright and Related Rights (defined below) upon the creator and subsequent
+owner(s) (each and all, an "owner") of an original work of authorship and/or
+a database (each, a "Work").
+
+Certain owners wish to permanently relinquish those rights to a Work for the
+purpose of contributing to a commons of creative, cultural and scientific
+works ("Commons") that the public can reliably and without fear of later claims
+of infringement build upon, modify, incorporate in other works, reuse and
+redistribute as freely as possible in any form whatsoever and for any purposes,
+including without limitation commercial purposes. These owners may contribute
+to the Commons to promote the ideal of a free culture and the further production
+of creative, cultural and scientific works, or to gain reputation or greater
+distribution for their Work in part through the use and efforts of others.
+
+For these and/or other purposes and motivations, and without any expectation
+of additional consideration or compensation, the person associating CC0 with
+a Work (the "Affirmer"), to the extent that he or she is an owner of Copyright
+and Related Rights in the Work, voluntarily elects to apply CC0 to the Work
+and publicly distribute the Work under its terms, with knowledge of his or
+her Copyright and Related Rights in the Work and the meaning and intended
+legal effect of CC0 on those rights.
+
+1. Copyright and Related Rights. A Work made available under CC0 may be protected
+by copyright and related or neighboring rights ("Copyright and Related Rights").
+Copyright and Related Rights include, but are not limited to, the following:
+
+i. the right to reproduce, adapt, distribute, perform, display, communicate,
+and translate a Work;
+
+      ii. moral rights retained by the original author(s) and/or performer(s);
+
+iii. publicity and privacy rights pertaining to a person's image or likeness
+depicted in a Work;
+
+iv. rights protecting against unfair competition in regards to a Work, subject
+to the limitations in paragraph 4(a), below;
+
+v. rights protecting the extraction, dissemination, use and reuse of data
+in a Work;
+
+vi. database rights (such as those arising under Directive 96/9/EC of the
+European Parliament and of the Council of 11 March 1996 on the legal protection
+of databases, and under any national implementation thereof, including any
+amended or successor version of such directive); and
+
+vii. other similar, equivalent or corresponding rights throughout the world
+based on applicable law or treaty, and any national implementations thereof.
+
+2. Waiver. To the greatest extent permitted by, but not in contravention of,
+applicable law, Affirmer hereby overtly, fully, permanently, irrevocably and
+unconditionally waives, abandons, and surrenders all of Affirmer's Copyright
+and Related Rights and associated claims and causes of action, whether now
+known or unknown (including existing as well as future claims and causes of
+action), in the Work (i) in all territories worldwide, (ii) for the maximum
+duration provided by applicable law or treaty (including future time extensions),
+(iii) in any current or future medium and for any number of copies, and (iv)
+for any purpose whatsoever, including without limitation commercial, advertising
+or promotional purposes (the "Waiver"). Affirmer makes the Waiver for the
+benefit of each member of the public at large and to the detriment of Affirmer's
+heirs and successors, fully intending that such Waiver shall not be subject
+to revocation, rescission, cancellation, termination, or any other legal or
+equitable action to disrupt the quiet enjoyment of the Work by the public
+as contemplated by Affirmer's express Statement of Purpose.
+
+3. Public License Fallback. Should any part of the Waiver for any reason be
+judged legally invalid or ineffective under applicable law, then the Waiver
+shall be preserved to the maximum extent permitted taking into account Affirmer's
+express Statement of Purpose. In addition, to the extent the Waiver is so
+judged Affirmer hereby grants to each affected person a royalty-free, non
+transferable, non sublicensable, non exclusive, irrevocable and unconditional
+license to exercise Affirmer's Copyright and Related Rights in the Work (i)
+in all territories worldwide, (ii) for the maximum duration provided by applicable
+law or treaty (including future time extensions), (iii) in any current or
+future medium and for any number of copies, and (iv) for any purpose whatsoever,
+including without limitation commercial, advertising or promotional purposes
+(the "License"). The License shall be deemed effective as of the date CC0
+was applied by Affirmer to the Work. Should any part of the License for any
+reason be judged legally invalid or ineffective under applicable law, such
+partial invalidity or ineffectiveness shall not invalidate the remainder of
+the License, and in such case Affirmer hereby affirms that he or she will
+not (i) exercise any of his or her remaining Copyright and Related Rights
+in the Work or (ii) assert any associated claims and causes of action with
+respect to the Work, in either case contrary to Affirmer's express Statement
+of Purpose.
+
+   4. Limitations and Disclaimers.
+
+a. No trademark or patent rights held by Affirmer are waived, abandoned, surrendered,
+licensed or otherwise affected by this document.
+
+b. Affirmer offers the Work as-is and makes no representations or warranties
+of any kind concerning the Work, express, implied, statutory or otherwise,
+including without limitation warranties of title, merchantability, fitness
+for a particular purpose, non infringement, or the absence of latent or other
+defects, accuracy, or the present or absence of errors, whether or not discoverable,
+all to the greatest extent permissible under applicable law.
+
+c. Affirmer disclaims responsibility for clearing rights of other persons
+that may apply to the Work or any use thereof, including without limitation
+any person's Copyright and Related Rights in the Work. Further, Affirmer disclaims
+responsibility for obtaining any necessary consents, permissions or other
+rights required for any use of the Work.
+
+d. Affirmer understands and acknowledges that Creative Commons is not a party
+to this document and has no duty or obligation with respect to this CC0 or
+use of the Work.

LICENSES/GPL-3.0-or-later.txt

@@ -0,0 +1,625 @@
+GNU GENERAL PUBLIC LICENSE
+
+Version 3, 29 June 2007
+
+Copyright © 2007 Free Software Foundation, Inc. <https://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 <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program does terminal interaction, make it output a short notice like
+this when it starts in an interactive mode:
+
+<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.
+
+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".
+
+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 <https://www.gnu.org/licenses/>.
+
+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 <https://www.gnu.org/
+licenses /why-not-lgpl.html>.

LICENSES/MIT.txt

@@ -0,0 +1,19 @@
+MIT License Copyright (c) <year> <copyright holders>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is furnished
+to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice (including the next
+paragraph) shall be included in all copies or substantial portions of the
+Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS
+OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
+OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

README.md

@@ -1,16 +1,30 @@
 # wdisplays
 
-[![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](https://spdx.org/licenses/MIT.html)
+[![License: GPL 3.0 or later][license-img]][license-spdx]
 
 wdisplays is a graphical application for configuring displays in Wayland
 compositors. It borrows some code from [kanshi]. It should work in any
-compositor that implements the wlr-output-management-unstable-v1 protocol,
+compositor that implements the wlr-output-management-unstable-v1 protocol.
-including [sway]. The goal of this project is to allow precise adjustment of
+Compositors that are known to support the protocol are [Sway] and [Wayfire].
-display settings in kiosks, digital signage, and other elaborate multi-monitor
+The goal of this project is to allow precise adjustment of display settings in
-setups.
+kiosks, digital signage, and other elaborate multi-monitor setups.
 
 ![Screenshot](wdisplays.png)
 
+# Installation
+
+[![Repology][repology-img]][repology-pkg]
+
+Check your distro for a `wdisplays` package. Known distro packages:
+
+- [Alpine](https://pkgs.alpinelinux.org/package/edge/testing/x86_64/wdisplays)
+- [Arch](https://aur.archlinux.org/packages/wdisplays-git/)
+- [Debian](https://packages.debian.org/sid/wdisplays)
+- [Fedora](https://copr.fedorainfracloud.org/coprs/wef/wdisplays/)
+- [FreeBSD](https://svnweb.freebsd.org/ports/head/x11/wdisplays/)
+- [Nix](https://github.com/NixOS/nixpkgs/tree/master/pkgs/tools/graphics/wdisplays)
+- [OpenSUSE](https://build.opensuse.org/package/show/home%3AMWh3/wdisplays)
+
 # Building
 
 Build requirements are:
@@ -26,9 +40,6 @@ ninja -C build
 sudo ninja -C build install
 ```
 
-Binaries are not available. Only building from source is supported, and only
-if you're using wlroots compiled from master.
-
 # Usage
 
 Displays can be moved around the virtual screen space by clicking and dragging
@@ -48,23 +59,32 @@ There are some options available by clicking the menu button on the top left:
 - Overlay Screen Names: Shows big names in the corner of all screens for easy
   identification. Disable if they get in the way.
 
-# FAQ (Fervently Anticpiated Quandaries)
+# FAQ
 
 ### What is this?
 
 It's intended to be the Wayland equivalent of an xrandr GUI, like [ARandR].
 
-### Help, I get errors and/or crashes!
-
-Make sure your wlroots is at version 0.7.0 or later.
-
 ### I'm using Sway, why aren't my display settings saved when I log out?
 
 Sway, like i3, doesn't save any settings unless you put them in the config
 file. See man `sway-output`. If you want to have multiple configurations
 depending on the monitors connected, you'll need to use an external program
-like [kanshi].
+like [kanshi]. Integration with that and other external daemons is planned.
+
+### How do I add support to my compositor?
+
+A minimal amount of code (approximately 150-200 LOC) is currently required to
+get support for this in wlroots compositors. See the diff here for a sample
+implementation on top of tinywl: [tinywl-output-management].
 
 [kanshi]: https://github.com/emersion/kanshi
-[sway]: https://github.com/swaywm/sway
+[Sway]: https://swaywm.org
+[Wayfire]: https://wayfire.org
 [ARandR]: https://christian.amsuess.com/tools/arandr/
+[tinywl-output-management]: https://git.sr.ht/~jf/tinywl-output-management/commit/87a45d89ae0e7975e2a59f84e960380dd2f5ac08
+
+[license-img]:  https://img.shields.io/badge/License-GPL%203.0%20or%20later-blue.svg?logo=gnu
+[license-spdx]: https://spdx.org/licenses/GPL-3.0-or-later.html
+[repology-img]: https://repology.org/badge/tiny-repos/wdisplays.svg
+[repology-pkg]: https://repology.org/project/wdisplays/versions

meson.build

@@ -1,8 +1,13 @@
-project('com.github.cyclopsian.wdisplays', 'c', license: 'MIT', version: '0.9')
+# SPDX-FileCopyrightText: 2020 Jason Francis <jason@cycles.network>
+# SPDX-License-Identifier: CC0-1.0
 
-conf = configuration_data()
+project('network.cycles.wdisplays', 'c', license: 'MIT', version: '1.0')
-conf.set('app_id', meson.project_name())
+
-conf.set('version', meson.project_version())
+conf = configuration_data({
+  'app_id': meson.project_name(),
+  'version': meson.project_version(),
+  'resource_prefix': '/' / '/'.join(meson.project_name().split('.')),
+})
 
 subdir('protocol')
 subdir('resources')

protocol/meson.build

@@ -1,3 +1,6 @@
+# SPDX-FileCopyrightText: 2020 Jason Francis <jason@cycles.network>
+# SPDX-License-Identifier: CC0-1.0
+
 wayland_scanner = find_program('wayland-scanner')
 wayland_client = dependency('wayland-client')
 wayland_protos = dependency('wayland-protocols', version: '>=1.17')

resources/head.ui

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.0 -->
+<!-- Generated with glade 3.22.2 -->
 <interface>
   <requires lib="gtk+" version="3.22"/>
   <object class="GtkAdjustment" id="height_adjustment">
@@ -7,23 +7,6 @@
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
   </object>
-  <object class="GtkPopover" id="modes">
-    <property name="can_focus">False</property>
-    <child>
-      <object class="GtkBox" id="mode_box">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="margin_start">10</property>
-        <property name="margin_end">10</property>
-        <property name="margin_top">10</property>
-        <property name="margin_bottom">10</property>
-        <property name="orientation">vertical</property>
-        <child>
-          <placeholder/>
-        </child>
-      </object>
-    </child>
-  </object>
   <object class="GtkAdjustment" id="pos_x_adjustment">
     <property name="upper">16383</property>
     <property name="step_increment">1</property>
@@ -50,7 +33,7 @@
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
   </object>
-  <object class="GtkGrid" id="form">
+  <template class="WdHeadForm" parent="GtkGrid">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="margin_start">8</property>
@@ -69,7 +52,7 @@
         <property name="halign">start</property>
         <property name="use_underline">True</property>
         <property name="draw_indicator">True</property>
-        <signal name="toggled" handler="enabled" swapped="no"/>
+        <signal name="toggled" handler="enabled_toggled" swapped="no"/>
       </object>
       <packing>
         <property name="left_attach">1</property>
@@ -99,7 +82,7 @@
         <property name="adjustment">scale_adjustment</property>
         <property name="digits">2</property>
         <property name="value">1</property>
-        <signal name="change-value" handler="scale" swapped="no"/>
+        <signal name="value-changed" handler="position_spin_changed" swapped="no"/>
       </object>
       <packing>
         <property name="left_attach">1</property>
@@ -194,6 +177,7 @@
         <property name="spacing">8</property>
         <child>
           <object class="GtkSpinButton" id="refresh">
+            <property name="name">refresh</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="width_chars">9</property>
@@ -202,6 +186,7 @@
             <property name="digits">3</property>
             <property name="numeric">True</property>
             <property name="update_policy">if-valid</property>
+            <signal name="value-changed" handler="mode_spin_changed" swapped="no"/>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -245,7 +230,6 @@
         <property name="visible">True</property>
         <property name="can_focus">True</property>
         <property name="receives_default">True</property>
-        <property name="popover">transforms</property>
         <child>
           <placeholder/>
         </child>
@@ -277,7 +261,7 @@
         <property name="halign">start</property>
         <property name="use_underline">True</property>
         <property name="draw_indicator">True</property>
-        <signal name="toggled" handler="flipped" swapped="no"/>
+        <signal name="toggled" handler="flipped_toggled" swapped="no"/>
       </object>
       <packing>
         <property name="left_attach">1</property>
@@ -299,6 +283,7 @@
             <property name="adjustment">pos_x_adjustment</property>
             <property name="numeric">True</property>
             <property name="update_policy">if-valid</property>
+            <signal name="value-changed" handler="position_spin_changed" swapped="no"/>
           </object>
           <packing>
             <property name="left_attach">0</property>
@@ -315,6 +300,7 @@
             <property name="adjustment">pos_y_adjustment</property>
             <property name="numeric">True</property>
             <property name="update_policy">if-valid</property>
+            <signal name="value-changed" handler="position_spin_changed" swapped="no"/>
           </object>
           <packing>
             <property name="left_attach">2</property>
@@ -323,6 +309,7 @@
         </child>
         <child>
           <object class="GtkSpinButton" id="width">
+            <property name="name">width</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="width_chars">4</property>
@@ -331,6 +318,7 @@
             <property name="adjustment">width_adjustment</property>
             <property name="numeric">True</property>
             <property name="update_policy">if-valid</property>
+            <signal name="value-changed" handler="mode_spin_changed" swapped="no"/>
           </object>
           <packing>
             <property name="left_attach">0</property>
@@ -351,6 +339,7 @@
         </child>
         <child>
           <object class="GtkSpinButton" id="height">
+            <property name="name">height</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="width_chars">4</property>
@@ -359,6 +348,7 @@
             <property name="adjustment">height_adjustment</property>
             <property name="numeric">True</property>
             <property name="update_policy">if-valid</property>
+            <signal name="value-changed" handler="mode_spin_changed" swapped="no"/>
           </object>
           <packing>
             <property name="left_attach">2</property>
@@ -371,9 +361,7 @@
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
             <property name="tooltip_text" translatable="yes">Select Mode Preset</property>
-            <property name="margin_left">8</property>
             <property name="margin_start">8</property>
-            <property name="popover">modes</property>
             <child>
               <object class="GtkImage">
                 <property name="visible">True</property>
@@ -406,76 +394,5 @@
     <child>
       <placeholder/>
     </child>
-  </object>
+  </template>
-  <object class="GtkPopover" id="transforms">
-    <property name="can_focus">False</property>
-    <property name="relative_to">rotate_button</property>
-    <child>
-      <object class="GtkBox">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="margin_start">10</property>
-        <property name="margin_end">10</property>
-        <property name="margin_top">10</property>
-        <property name="margin_bottom">10</property>
-        <property name="orientation">vertical</property>
-        <child>
-          <object class="GtkModelButton" id="rotate_0">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
-            <property name="action_name">transform.rotate_0</property>
-            <property name="text" translatable="yes">Don't Rotate</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkModelButton" id="rotate_90">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
-            <property name="action_name">transform.rotate_90</property>
-            <property name="text" translatable="yes">Rotate 90°</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkModelButton" id="rotate_180">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
-            <property name="action_name">transform.rotate_180</property>
-            <property name="text" translatable="yes">Rotate 180°</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">2</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkModelButton" id="rotate_270">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
-            <property name="action_name">transform.rotate_270</property>
-            <property name="text" translatable="yes">Rotate 270°</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">3</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-  </object>
 </interface>

resources/meson.build

@@ -1,9 +1,17 @@
+# SPDX-FileCopyrightText: 2020 Jason Francis <jason@cycles.network>
+# SPDX-License-Identifier: CC0-1.0
+
+resources_xml = configure_file(
+  input: 'resources.xml.in',
+  output: 'resources.xml',
+  configuration: conf
+)
 
 gnome = import('gnome')
 resources = gnome.compile_resources(
-  'waydisplay-resources', 'resources.xml',
+  'wdisplays-resources', resources_xml,
   source_dir : '.',
-  c_name : 'waydisplay_resources')
+  c_name : 'wdisplays_resources')
 
 scour = find_program('scour', required: false)
 

resources/resources.xml.in

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
-  <gresource prefix="/">
+  <gresource prefix="@resource_prefix@">
     <file compressed="true" preprocess="xml-stripblanks">wdisplays.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">head.ui</file>
     <file compressed="true">style.css</file>

resources/wdisplays.ui

@@ -11,62 +11,6 @@
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
   </object>
-  <object class="GtkPopover" id="main_menu">
-    <property name="can_focus">False</property>
-    <child>
-      <object class="GtkBox">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="margin_start">10</property>
-        <property name="margin_end">10</property>
-        <property name="margin_top">10</property>
-        <property name="margin_bottom">10</property>
-        <property name="orientation">vertical</property>
-        <child>
-          <object class="GtkModelButton">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
-            <property name="action_name">app.auto-apply</property>
-            <property name="text" translatable="yes">_Automatically Apply Changes</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkModelButton">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
-            <property name="action_name">app.capture-screens</property>
-            <property name="text" translatable="yes">Show Screen Contents</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkModelButton">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
-            <property name="action_name">app.show-overlay</property>
-            <property name="text" translatable="yes">Overlay Screen Names</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">2</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-  </object>
   <object class="GtkWindow" id="heads_window">
     <property name="can_focus">False</property>
     <property name="title" translatable="yes">wdisplays</property>
@@ -171,8 +115,6 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="halign">center</property>
-                        <property name="margin_left">8</property>
-                        <property name="margin_right">8</property>
                         <property name="margin_start">8</property>
                         <property name="margin_end">8</property>
                         <property name="margin_top">8</property>
@@ -248,14 +190,14 @@
               <object class="GtkButtonBox" id="zoom_box">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="layout_style">expand</property>
                 <child>
                   <object class="GtkButton" id="zoom_out">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="tooltip_text" translatable="yes">Zoom Out</property>
-                    <signal name="clicked" handler="zoom_out" swapped="yes"/>
+                    <property name="action_name">app.zoom-out</property>
+                    <accelerator key="minus" signal="clicked" modifiers="GDK_CONTROL_MASK"/>
                     <child>
                       <object class="GtkImage">
                         <property name="visible">True</property>
@@ -263,7 +205,6 @@
                         <property name="icon_name">zoom-out-symbolic</property>
                       </object>
                     </child>
-                    <accelerator key="minus" signal="clicked" modifiers="GDK_CONTROL_MASK"/>
                   </object>
                   <packing>
                     <property name="expand">True</property>
@@ -278,7 +219,7 @@
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="tooltip_text" translatable="yes">Zoom Reset</property>
-                    <signal name="clicked" handler="zoom_reset" swapped="yes"/>
+                    <property name="action_name">app.zoom-reset</property>
                     <accelerator key="0" signal="clicked" modifiers="GDK_CONTROL_MASK"/>
                   </object>
                   <packing>
@@ -294,7 +235,8 @@
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="tooltip_text" translatable="yes">Zoom In</property>
-                    <signal name="clicked" handler="zoom_in" swapped="yes"/>
+                    <property name="action_name">app.zoom-in</property>
+                    <accelerator key="equal" signal="clicked" modifiers="GDK_CONTROL_MASK"/>
                     <child>
                       <object class="GtkImage">
                         <property name="visible">True</property>
@@ -302,7 +244,6 @@
                         <property name="icon_name">zoom-in-symbolic</property>
                       </object>
                     </child>
-                    <accelerator key="equal" signal="clicked" modifiers="GDK_CONTROL_MASK"/>
                   </object>
                   <packing>
                     <property name="expand">True</property>
@@ -311,6 +252,9 @@
                     <property name="non_homogeneous">True</property>
                   </packing>
                 </child>
+                <style>
+                  <class name="linked"/>
+                </style>
               </object>
             </child>
             <child>
@@ -318,7 +262,6 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="popover">main_menu</property>
                 <child>
                   <object class="GtkImage">
                     <property name="visible">True</property>
@@ -355,7 +298,7 @@
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="use_underline">True</property>
-                <signal name="clicked" handler="apply_changes" swapped="no"/>
+                <property name="action_name">app.apply-changes</property>
                 <style>
                   <class name="suggested-action"/>
                 </style>
@@ -371,7 +314,7 @@
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="use_underline">True</property>
-                <signal name="clicked" handler="cancel_changes" swapped="no"/>
+                <property name="action_name">app.cancel-changes</property>
               </object>
               <packing>
                 <property name="position">1</property>

src/config.h.in

@@ -1,10 +1,11 @@
-/* SPDX-License-Identifier: MIT */
+/* SPDX-FileCopyrightText: 2020 Jason Francis <jason@cycles.network>
-/* Copyright (C) 2019 cyclopsian */
+ * SPDX-License-Identifier: GPL-3.0-or-later */
 
 #ifndef WDISPLAY_CONFIG_H
 #define WDISPLAY_CONFIG_H
 
 #define WDISPLAYS_APP_ID "@app_id@"
 #define WDISPLAYS_VERSION "@version@"
+#define WDISPLAYS_RESOURCE_PREFIX "@resource_prefix@"
 
 #endif

src/glviewport.c

@@ -1,5 +1,5 @@
-/* SPDX-License-Identifier: MIT */
+/* SPDX-FileCopyrightText: 2020 Jason Francis <jason@cycles.network>
-/* Copyright (C) 2019 cyclopsian */
+ * SPDX-License-Identifier: GPL-3.0-or-later */
 
 #include "glviewport.h"
 

src/glviewport.h

@@ -1,5 +1,5 @@
-/* SPDX-License-Identifier: MIT */
+/* SPDX-FileCopyrightText: 2020 Jason Francis <jason@cycles.network>
-/* Copyright (C) 2019 cyclopsian */
+ * SPDX-License-Identifier: GPL-3.0-or-later */
 
 #ifndef WDISPLAY_GLVIEWPORT_H
 #define WDISPLAY_GLVIEWPORT_H

src/headform.c

@@ -0,0 +1,393 @@
+/* SPDX-FileCopyrightText: 2020 Jason Francis <jason@cycles.network>
+ * SPDX-License-Identifier: GPL-3.0-or-later */
+
+#include "headform.h"
+#include "wdisplays.h"
+
+typedef struct _WdHeadFormPrivate {
+  GtkWidget *enabled;
+  GtkWidget *description;
+  GtkWidget *physical_size;
+  GtkWidget *scale;
+  GtkWidget *pos_x;
+  GtkWidget *pos_y;
+  GtkWidget *width;
+  GtkWidget *height;
+  GtkWidget *refresh;
+  GtkWidget *mode_button;
+  GtkWidget *rotate_button;
+  GtkWidget *flipped;
+
+  GAction *mode_action;
+  GAction *rotate_action;
+} WdHeadFormPrivate;
+
+enum {
+  CHANGED,
+  LAST_SIGNAL
+};
+
+static guint signals[LAST_SIGNAL];
+
+G_DEFINE_TYPE_WITH_CODE(WdHeadForm, wd_head_form, GTK_TYPE_GRID,
+    G_ADD_PRIVATE(WdHeadForm))
+
+static const char *HEAD_PREFIX = "head";
+static const char *MODE_PREFIX = "mode";
+static const char *ROTATE_PREFIX = "rotate";
+
+static void head_form_update_sensitivity(WdHeadForm *form) {
+  WdHeadFormPrivate *priv = wd_head_form_get_instance_private(form);
+
+  bool enabled_toggled = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(priv->enabled));
+
+  g_autoptr(GList) children = gtk_container_get_children(GTK_CONTAINER(form));
+  for (GList *child = children; child != NULL; child = child->next) {
+    GtkWidget *widget = GTK_WIDGET(child->data);
+    if (widget != priv->enabled) {
+      gtk_widget_set_sensitive(widget, enabled_toggled);
+    }
+  }
+}
+
+static GVariant *create_mode_variant(int32_t w, int32_t h, int32_t r) {
+  GVariant * const children[] = {
+    g_variant_new_int32(w),
+    g_variant_new_int32(h),
+    g_variant_new_int32(r),
+  };
+  return g_variant_new_tuple(children, G_N_ELEMENTS(children));
+}
+
+struct vid_mode {
+  int32_t width;
+  int32_t height;
+  int32_t refresh;
+};
+
+static void unpack_mode_variant(GVariant *value, struct vid_mode *mode) {
+  g_autoptr(GVariant) width = g_variant_get_child_value(value, 0);
+  mode->width = g_variant_get_int32(width);
+  g_autoptr(GVariant) height = g_variant_get_child_value(value, 1);
+  mode->height = g_variant_get_int32(height);
+  g_autoptr(GVariant) refresh = g_variant_get_child_value(value, 2);
+  mode->refresh = g_variant_get_int32(refresh);
+}
+
+static void enabled_toggled(GtkToggleButton *toggle, gpointer data) {
+  WdHeadForm *form = WD_HEAD_FORM(data);
+  head_form_update_sensitivity(form);
+  g_signal_emit(form, signals[CHANGED], 0, WD_FIELD_ENABLED);
+}
+
+static void mode_spin_changed(GtkSpinButton *spin_button, gpointer data) {
+  WdHeadForm *form = WD_HEAD_FORM(data);
+  WdHeadFormPrivate *priv = wd_head_form_get_instance_private(form);
+  struct vid_mode mode;
+  GVariant *value = g_action_get_state(priv->mode_action);
+  unpack_mode_variant(value, &mode);
+  if (strcmp(gtk_widget_get_name(GTK_WIDGET(spin_button)), "width") == 0) {
+    mode.width = gtk_spin_button_get_value(spin_button);
+  } else if (strcmp(gtk_widget_get_name(GTK_WIDGET(spin_button)), "height") == 0) {
+    mode.height = gtk_spin_button_get_value(spin_button);
+  } else if (strcmp(gtk_widget_get_name(GTK_WIDGET(spin_button)), "refresh") == 0) {
+    mode.refresh = gtk_spin_button_get_value(spin_button) * 1000.;
+  }
+  g_action_activate(priv->mode_action, create_mode_variant(mode.width, mode.height, mode.refresh));
+  g_signal_emit(form, signals[CHANGED], 0, WD_FIELD_MODE);
+}
+
+static void position_spin_changed(GtkSpinButton *spin_button, gpointer data) {
+  WdHeadForm *form = WD_HEAD_FORM(data);
+  g_signal_emit(form, signals[CHANGED], 0, WD_FIELD_POSITION);
+}
+
+static void flipped_toggled(GtkToggleButton *toggle, gpointer data) {
+  WdHeadForm *form = WD_HEAD_FORM(data);
+  g_signal_emit(form, signals[CHANGED], 0, WD_FIELD_TRANSFORM);
+}
+
+static void wd_head_form_class_init(WdHeadFormClass *class) {
+  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS(class);
+
+  signals[CHANGED] = g_signal_new("changed",
+      G_OBJECT_CLASS_TYPE(class),
+      G_SIGNAL_RUN_LAST,
+      G_STRUCT_OFFSET(WdHeadFormClass, changed),
+      NULL, NULL, NULL,
+      G_TYPE_NONE, 1, G_TYPE_INT);
+
+  gtk_widget_class_set_template_from_resource(widget_class,
+     WDISPLAYS_RESOURCE_PREFIX "/head.ui");
+
+  gtk_widget_class_bind_template_callback(widget_class, enabled_toggled);
+  gtk_widget_class_bind_template_callback(widget_class, mode_spin_changed);
+  gtk_widget_class_bind_template_callback(widget_class, position_spin_changed);
+  gtk_widget_class_bind_template_callback(widget_class, flipped_toggled);
+
+  gtk_widget_class_bind_template_child_private(widget_class, WdHeadForm, enabled);
+  gtk_widget_class_bind_template_child_private(widget_class, WdHeadForm, description);
+  gtk_widget_class_bind_template_child_private(widget_class, WdHeadForm, physical_size);
+  gtk_widget_class_bind_template_child_private(widget_class, WdHeadForm, scale);
+  gtk_widget_class_bind_template_child_private(widget_class, WdHeadForm, pos_x);
+  gtk_widget_class_bind_template_child_private(widget_class, WdHeadForm, pos_y);
+  gtk_widget_class_bind_template_child_private(widget_class, WdHeadForm, width);
+  gtk_widget_class_bind_template_child_private(widget_class, WdHeadForm, height);
+  gtk_widget_class_bind_template_child_private(widget_class, WdHeadForm, refresh);
+  gtk_widget_class_bind_template_child_private(widget_class, WdHeadForm, mode_button);
+  gtk_widget_class_bind_template_child_private(widget_class, WdHeadForm, rotate_button);
+  gtk_widget_class_bind_template_child_private(widget_class, WdHeadForm, flipped);
+  gtk_widget_class_set_css_name(widget_class, "wd-head-form");
+}
+
+static int32_t get_rotate_value(enum wl_output_transform transform) {
+  if (transform == WL_OUTPUT_TRANSFORM_90 || transform == WL_OUTPUT_TRANSFORM_FLIPPED_90) {
+    return 90;
+  } else if (transform == WL_OUTPUT_TRANSFORM_180 || transform == WL_OUTPUT_TRANSFORM_FLIPPED_180) {
+    return 180;
+  } else if (transform == WL_OUTPUT_TRANSFORM_270 || transform == WL_OUTPUT_TRANSFORM_FLIPPED_270) {
+    return 270;
+  }
+  return 0;
+}
+
+static void rotate_selected(GSimpleAction *action, GVariant *param, gpointer data) {
+  WdHeadForm *form = data;
+  WdHeadFormPrivate *priv = wd_head_form_get_instance_private(form);
+  GMenuModel *menu = gtk_menu_button_get_menu_model(GTK_MENU_BUTTON(priv->rotate_button));
+  int items = g_menu_model_get_n_items(menu);
+  for (int i = 0; i < items; i++) {
+    g_autoptr(GVariant) target = g_menu_model_get_item_attribute_value(menu, i, G_MENU_ATTRIBUTE_TARGET, NULL);
+    g_autoptr(GVariant) label = g_menu_model_get_item_attribute_value(menu, i, G_MENU_ATTRIBUTE_LABEL, NULL);
+    if (g_variant_get_int32(target) == g_variant_get_int32(param)) {
+      gtk_button_set_label(GTK_BUTTON(priv->rotate_button), g_variant_get_string(label, NULL));
+      break;
+    }
+  }
+  g_simple_action_set_state(action, param);
+  g_signal_emit(form, signals[CHANGED], 0, WD_FIELD_TRANSFORM);
+}
+
+static void mode_selected(GSimpleAction *action, GVariant *param, gpointer data) {
+  WdHeadForm *form = data;
+  WdHeadFormPrivate *priv = wd_head_form_get_instance_private(form);
+  struct vid_mode mode;
+  unpack_mode_variant(param, &mode);
+
+  g_simple_action_set_state(action, param);
+  gtk_spin_button_set_value(GTK_SPIN_BUTTON(priv->width), mode.width);
+  gtk_spin_button_set_value(GTK_SPIN_BUTTON(priv->height), mode.height);
+  gtk_spin_button_set_value(GTK_SPIN_BUTTON(priv->refresh), mode.refresh / 1000.);
+  g_signal_emit(form, signals[CHANGED], 0, WD_FIELD_MODE);
+}
+
+static void wd_head_form_init(WdHeadForm *form) {
+  gtk_widget_init_template(GTK_WIDGET(form));
+  WdHeadFormPrivate *priv = wd_head_form_get_instance_private(form);
+
+  GSimpleActionGroup *head_actions = g_simple_action_group_new();
+  gtk_widget_insert_action_group(priv->mode_button, HEAD_PREFIX, G_ACTION_GROUP(head_actions));
+  gtk_widget_insert_action_group(priv->rotate_button, HEAD_PREFIX, G_ACTION_GROUP(head_actions));
+
+  GMenu *rotate_menu = g_menu_new();
+  g_menu_append(rotate_menu, "Don't Rotate", "head.rotate(0)");
+  g_menu_append(rotate_menu, "Rotate 90°", "head.rotate(90)");
+  g_menu_append(rotate_menu, "Rotate 180°", "head.rotate(180)");
+  g_menu_append(rotate_menu, "Rotate 270°", "head.rotate(270)");
+  gtk_menu_button_set_menu_model(GTK_MENU_BUTTON(priv->rotate_button), G_MENU_MODEL(rotate_menu));
+
+  static const GVariantType * const mode_types[] = {
+    G_VARIANT_TYPE_INT32,
+    G_VARIANT_TYPE_INT32,
+    G_VARIANT_TYPE_INT32
+  };
+  GSimpleAction *action = g_simple_action_new_stateful("mode",
+      g_variant_type_new_tuple(mode_types, G_N_ELEMENTS(mode_types)),
+      create_mode_variant(0, 0, 0));
+  g_action_map_add_action(G_ACTION_MAP(head_actions), G_ACTION(action));
+  g_signal_connect(action, "change-state", G_CALLBACK(mode_selected), form);
+  g_object_unref(action);
+  priv->mode_action = G_ACTION(action);
+
+  action = g_simple_action_new_stateful(ROTATE_PREFIX, G_VARIANT_TYPE_INT32,
+      g_variant_new_int32(0));
+  g_action_map_add_action(G_ACTION_MAP(head_actions), G_ACTION(action));
+  g_signal_connect(action, "change-state", G_CALLBACK(rotate_selected), form);
+  g_object_unref(action);
+  priv->rotate_action = G_ACTION(action);
+
+  g_object_unref(head_actions);
+}
+
+void wd_head_form_update(WdHeadForm *form, const struct wd_head *head,
+    enum wd_head_fields fields) {
+  g_return_if_fail(form);
+  g_return_if_fail(head);
+
+  WdHeadFormPrivate *priv = wd_head_form_get_instance_private(form);
+  if (!fields)
+    return;
+
+  if (fields & WD_FIELD_DESCRIPTION)
+    gtk_label_set_text(GTK_LABEL(priv->description), head->description);
+  if (fields & WD_FIELD_PHYSICAL_SIZE) {
+    g_autofree gchar *physical_str = g_strdup_printf("%dmm × %dmm", head->phys_width, head->phys_height);
+    gtk_label_set_text(GTK_LABEL(priv->physical_size), physical_str);
+  }
+  if (fields & WD_FIELD_ENABLED)
+    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(priv->enabled), head->enabled);
+  if (fields & WD_FIELD_SCALE)
+    gtk_spin_button_set_value(GTK_SPIN_BUTTON(priv->scale), head->scale);
+  if (fields & WD_FIELD_POSITION) {
+    gtk_spin_button_set_value(GTK_SPIN_BUTTON(priv->pos_x), head->x);
+    gtk_spin_button_set_value(GTK_SPIN_BUTTON(priv->pos_y), head->y);
+  }
+
+  if (fields & WD_FIELD_MODE) {
+    GMenu *mode_menu = g_menu_new();
+    struct wd_mode *mode;
+    g_autofree gchar *action = g_strdup_printf("%s.%s", HEAD_PREFIX, MODE_PREFIX);
+    wl_list_for_each(mode, &head->modes, link) {
+      g_autofree gchar *name = g_strdup_printf("%d×%d@%0.3fHz", mode->width, mode->height, mode->refresh / 1000.);
+      GMenuItem *item = g_menu_item_new(name, action);
+      g_menu_item_set_attribute_value(item, G_MENU_ATTRIBUTE_TARGET,
+          create_mode_variant(mode->width, mode->height, mode->refresh));
+      g_menu_append_item(mode_menu, item);
+    }
+    gtk_menu_button_set_menu_model(GTK_MENU_BUTTON(priv->mode_button), G_MENU_MODEL(mode_menu));
+    // Mode entries
+    int w = head->custom_mode.width;
+    int h = head->custom_mode.height;
+    int r = head->custom_mode.refresh;
+    if (head->enabled && head->mode != NULL) {
+      w = head->mode->width;
+      h = head->mode->height;
+      r = head->mode->refresh;
+    } else if (!head->enabled && w == 0 && h == 0) {
+      struct wd_mode *mode;
+      wl_list_for_each(mode, &head->modes, link) {
+        if (mode->preferred) {
+          w = mode->width;
+          h = mode->height;
+          r = mode->refresh;
+          break;
+        }
+      }
+    }
+
+    g_action_change_state(priv->mode_action, create_mode_variant(w, h, r));
+  }
+
+  if (fields & WD_FIELD_TRANSFORM) {
+    int active_rotate = get_rotate_value(head->transform);
+    g_action_change_state(priv->rotate_action, g_variant_new_int32(active_rotate));
+
+    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(priv->flipped),
+        head->transform == WL_OUTPUT_TRANSFORM_FLIPPED
+        || head->transform == WL_OUTPUT_TRANSFORM_FLIPPED_90
+        || head->transform == WL_OUTPUT_TRANSFORM_FLIPPED_180
+        || head->transform == WL_OUTPUT_TRANSFORM_FLIPPED_270);
+  }
+
+  // Sync state
+  if (fields & WD_FIELD_ENABLED) {
+    head_form_update_sensitivity(form);
+  }
+  g_signal_emit(form, signals[CHANGED], 0);
+}
+
+GtkWidget *wd_head_form_new(void) {
+  return gtk_widget_new(WD_TYPE_HEAD_FORM, NULL);
+}
+
+gboolean wd_head_form_get_enabled(WdHeadForm *form) {
+  WdHeadFormPrivate *priv = wd_head_form_get_instance_private(form);
+  return gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(priv->enabled));
+}
+
+gboolean wd_head_form_has_changes(WdHeadForm *form, const struct wd_head *head) {
+  g_return_val_if_fail(form, FALSE);
+
+  WdHeadFormPrivate *priv = wd_head_form_get_instance_private(form);
+  if (head->enabled != gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(priv->enabled))) {
+    return TRUE;
+  }
+  double old_scale = round(head->scale * 100.) / 100.;
+  double new_scale = round(gtk_spin_button_get_value(GTK_SPIN_BUTTON(priv->scale)) * 100.) / 100.;
+  if (old_scale != new_scale) {
+    return TRUE;
+  }
+  if (head->x != gtk_spin_button_get_value(GTK_SPIN_BUTTON(priv->pos_x))) {
+    return TRUE;
+  }
+  if (head->y != gtk_spin_button_get_value(GTK_SPIN_BUTTON(priv->pos_y))) {
+    return TRUE;
+  }
+  int w = head->mode != NULL ? head->mode->width : head->custom_mode.width;
+  if (w != gtk_spin_button_get_value(GTK_SPIN_BUTTON(priv->width))) {
+    return TRUE;
+  }
+  int h = head->mode != NULL ? head->mode->height : head->custom_mode.height;
+  if (h != gtk_spin_button_get_value(GTK_SPIN_BUTTON(priv->height))) {
+    return TRUE;
+  }
+  int r = head->mode != NULL ? head->mode->refresh : head->custom_mode.refresh;
+  if (r / 1000. != gtk_spin_button_get_value(GTK_SPIN_BUTTON(priv->refresh))) {
+    return TRUE;
+  }
+  if (g_variant_get_int32(g_action_get_state(priv->rotate_action)) != get_rotate_value(head->transform)) {
+    return TRUE;
+  }
+  bool flipped = head->transform == WL_OUTPUT_TRANSFORM_FLIPPED
+    || head->transform == WL_OUTPUT_TRANSFORM_FLIPPED_90
+    || head->transform == WL_OUTPUT_TRANSFORM_FLIPPED_180
+    || head->transform == WL_OUTPUT_TRANSFORM_FLIPPED_270;
+  if (flipped != gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(priv->flipped))) {
+    return TRUE;
+  }
+  return FALSE;
+}
+
+void wd_head_form_fill_config(WdHeadForm *form, struct wd_head_config *output) {
+  g_return_if_fail(form);
+  g_return_if_fail(output);
+
+  WdHeadFormPrivate *priv = wd_head_form_get_instance_private(form);
+  output->enabled = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(priv->enabled));
+  output->scale = gtk_spin_button_get_value(GTK_SPIN_BUTTON(priv->scale));
+  output->x = gtk_spin_button_get_value(GTK_SPIN_BUTTON(priv->pos_x));
+  output->y = gtk_spin_button_get_value(GTK_SPIN_BUTTON(priv->pos_y));
+  output->width = gtk_spin_button_get_value(GTK_SPIN_BUTTON(priv->width));
+  output->height = gtk_spin_button_get_value(GTK_SPIN_BUTTON(priv->height));
+  output->refresh = gtk_spin_button_get_value(GTK_SPIN_BUTTON(priv->refresh)) * 1000.;
+  int32_t rotate = g_variant_get_int32(g_action_get_state(priv->rotate_action));
+  gboolean flipped = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(priv->flipped));
+  switch (rotate) {
+    case 0: output->transform = flipped ? WL_OUTPUT_TRANSFORM_FLIPPED : WL_OUTPUT_TRANSFORM_NORMAL; break;
+    case 90: output->transform = flipped ? WL_OUTPUT_TRANSFORM_FLIPPED_90 : WL_OUTPUT_TRANSFORM_90; break;
+    case 180: output->transform = flipped ? WL_OUTPUT_TRANSFORM_FLIPPED_180 : WL_OUTPUT_TRANSFORM_180; break;
+    case 270: output->transform = flipped ? WL_OUTPUT_TRANSFORM_FLIPPED_270 : WL_OUTPUT_TRANSFORM_270; break;
+  }
+}
+
+void wd_head_form_get_dimensions(WdHeadForm *form, WdHeadDimensions *dimensions) {
+  g_return_if_fail(form);
+  g_return_if_fail(dimensions);
+
+  WdHeadFormPrivate *priv = wd_head_form_get_instance_private(form);
+
+  dimensions->x = gtk_spin_button_get_value(GTK_SPIN_BUTTON(priv->pos_x));
+  dimensions->y = gtk_spin_button_get_value(GTK_SPIN_BUTTON(priv->pos_y));
+  dimensions->w = gtk_spin_button_get_value(GTK_SPIN_BUTTON(priv->width));
+  dimensions->h = gtk_spin_button_get_value(GTK_SPIN_BUTTON(priv->height));
+  dimensions->scale = gtk_spin_button_get_value(GTK_SPIN_BUTTON(priv->scale));
+  dimensions->rotation_id = g_variant_get_int32(g_action_get_state(priv->rotate_action)) / 90;
+  dimensions->flipped = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(priv->flipped));
+}
+
+void wd_head_form_set_position(WdHeadForm *form, double x, double y) {
+  g_return_if_fail(form);
+  WdHeadFormPrivate *priv = wd_head_form_get_instance_private(form);
+  gtk_spin_button_set_value(GTK_SPIN_BUTTON(priv->pos_x), x);
+  gtk_spin_button_set_value(GTK_SPIN_BUTTON(priv->pos_y), y);
+}

src/headform.h

@@ -0,0 +1,59 @@
+/* SPDX-FileCopyrightText: 2020 Jason Francis <jason@cycles.network>
+ * SPDX-License-Identifier: GPL-3.0-or-later */
+
+#ifndef WDISPLAY_HEADFORM_H
+#define WDISPLAY_HEADFORM_H
+
+#include <gtk/gtk.h>
+
+G_BEGIN_DECLS
+
+enum wd_head_fields {
+  WD_FIELD_NAME           = 1 << 0,
+  WD_FIELD_ENABLED        = 1 << 1,
+  WD_FIELD_DESCRIPTION    = 1 << 2,
+  WD_FIELD_PHYSICAL_SIZE  = 1 << 3,
+  WD_FIELD_SCALE          = 1 << 4,
+  WD_FIELD_POSITION       = 1 << 5,
+  WD_FIELD_MODE           = 1 << 6,
+  WD_FIELD_TRANSFORM      = 1 << 7,
+  WD_FIELDS_ALL           = (1 << 8) - 1
+};
+
+#define WD_TYPE_HEAD_FORM (wd_head_form_get_type())
+G_DECLARE_DERIVABLE_TYPE(
+    WdHeadForm, wd_head_form, WD, HEAD_FORM, GtkGrid)
+
+struct _WdHeadFormClass {
+  GtkGridClass parent_class;
+
+  void (*changed)(WdHeadForm *form, enum wd_head_fields fields);
+};
+
+struct wd_head;
+struct wd_head_config;
+
+typedef struct _WdHeadDimensions {
+  gdouble x;
+  gdouble y;
+  gdouble w;
+  gdouble h;
+  gdouble scale;
+  int rotation_id;
+  gboolean flipped;
+} WdHeadDimensions;
+
+GtkWidget *wd_head_form_new(void);
+
+gboolean wd_head_form_get_enabled(WdHeadForm *form);
+gboolean wd_head_form_has_changes(WdHeadForm *form, const struct wd_head *head);
+void wd_head_form_update(WdHeadForm *form, const struct wd_head *head,
+    enum wd_head_fields fields);
+void wd_head_form_fill_config(WdHeadForm *form, struct wd_head_config *output);
+void wd_head_form_get_dimensions(WdHeadForm *form, WdHeadDimensions *dimensions);
+void wd_head_form_set_position(WdHeadForm *form, double x, double y);
+
+G_END_DECLS
+
+#endif
+

src/meson.build

@@ -1,9 +1,11 @@
+# SPDX-FileCopyrightText: 2020 Jason Francis <jason@cycles.network>
+# SPDX-License-Identifier: CC0-1.0
 
 cc = meson.get_compiler('c')
 m_dep = cc.find_library('m', required : false)
 rt_dep = cc.find_library('rt', required : false)
-gdk = dependency('gdk-3.0')
+gdk = dependency('gdk-3.0', version: '>= 3.24')
-gtk = dependency('gtk+-3.0')
+gtk = dependency('gtk+-3.0', version: '>= 3.24')
 assert(gdk.get_pkgconfig_variable('targets').split().contains('wayland'), 'Wayland GDK backend not present')
 epoxy = dependency('epoxy')
 
@@ -13,10 +15,11 @@ executable(
   'wdisplays',
   [
     'main.c',
-    'outputs.c',
-    'render.c',
     'glviewport.c',
+    'headform.c',
+    'outputs.c',
     'overlay.c',
+    'render.c',
     resources,
   ],
   dependencies : [

src/outputs.c

@@ -1,6 +1,7 @@
-/* SPDX-License-Identifier: MIT */
+/* SPDX-FileCopyrightText: 2019 Jason Francis <jason@cycles.network>
-/* Copyright (C) 2019 cyclopsian
+ * SPDX-License-Identifier: GPL-3.0-or-later */
- * Copyright (C) 2017-2019 emersion */
+/* SPDX-FileCopyrightText: 2017-2019 Simon Ser
+ * SPDX-License-Identifier: MIT */
 
 /*
  * Parts of this file are taken from emersion/kanshi:

src/overlay.c

@@ -1,5 +1,5 @@
-/* SPDX-License-Identifier: MIT */
+/* SPDX-FileCopyrightText: 2020 Jason Francis <jason@cycles.network>
-/* Copyright (C) 2019 cyclopsian */
+ * SPDX-License-Identifier: GPL-3.0-or-later */
 
 #define _GNU_SOURCE
 #include <string.h>

src/render.c

@@ -1,5 +1,5 @@
-/* SPDX-License-Identifier: MIT */
+/* SPDX-FileCopyrightText: 2020 Jason Francis <jason@cycles.network>
-/* Copyright (C) 2019 cyclopsian */
+ * SPDX-License-Identifier: GPL-3.0-or-later */
 
 #include "wdisplays.h"
 

src/wdisplays.h

@@ -1,6 +1,7 @@
-/* SPDX-License-Identifier: MIT */
+/* SPDX-FileCopyrightText: 2019 Jason Francis <jason@cycles.network>
-/* Copyright (C) 2019 cyclopsian
+ * SPDX-License-Identifier: GPL-3.0-or-later */
- * Copyright (C) 2017-2019 emersion */
+/* SPDX-FileCopyrightText: 2017-2019 Simon Ser
+ * SPDX-License-Identifier: MIT */
 
 /*
  * Parts of this file are taken from emersion/kanshi:
@@ -19,6 +20,8 @@
 #include <stdbool.h>
 #include <wayland-client.h>
 
+#include "headform.h"
+
 struct zxdg_output_v1;
 struct zxdg_output_manager_v1;
 struct zwlr_output_mode_v1;
@@ -38,18 +41,6 @@ typedef struct _GdkCursor GdkCursor;
 struct _cairo_surface;
 typedef struct _cairo_surface cairo_surface_t;
 
-enum wd_head_fields {
-  WD_FIELD_NAME           = 1 << 0,
-  WD_FIELD_ENABLED        = 1 << 1,
-  WD_FIELD_DESCRIPTION    = 1 << 2,
-  WD_FIELD_PHYSICAL_SIZE  = 1 << 3,
-  WD_FIELD_SCALE          = 1 << 4,
-  WD_FIELD_POSITION       = 1 << 5,
-  WD_FIELD_MODE           = 1 << 6,
-  WD_FIELD_TRANSFORM      = 1 << 7,
-  WD_FIELDS_ALL           = (1 << 8) - 1
-};
-
 struct wd_output {
   struct wd_state *state;
   struct zxdg_output_v1 *xdg_output;
@@ -204,10 +195,10 @@ struct wd_state {
   unsigned int reset_idle;
 
   struct wd_render_head_data *clicked;
-  /* top left, bottom right */
+  struct wd_point drag_start;
-  struct wd_point click_offset;
+  struct wd_point head_drag_start; /* 0-1 range in head rect */
   bool panning;
-  struct wd_point pan_last;
+  struct wd_point pan_start;
 
   GtkWidget *main_box;
   GtkWidget *header_stack;
@@ -300,7 +291,7 @@ void wd_ui_reset_heads(struct wd_state *state);
  * Updates the UI form for a single head. Useful for when the compositor
  * notifies us of updated configuration caused by another program.
  */
-void wd_ui_reset_head(const struct wd_head *head, unsigned int fields);
+void wd_ui_reset_head(const struct wd_head *head, enum wd_head_fields fields);
 
 /*
  * Updates the stack and all forms to the last known server state.