arti/wdisplays_github
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: arti:export-dmabuf
Branches Tags
arti:master arti:export-dmabuf arti:debian arti:gh-pages arti:gtk4 arti:kanshi
arti:1.0
..
compare: arti:gtk4
Branches Tags
arti:export-dmabuf arti:master arti:debian arti:gh-pages arti:gtk4 arti:kanshi
arti:1.0

1 Commits
export-dma ... gtk4

Author SHA1 Message Date
Jason Francis
58dec1391f Port to GTK4 (WIP) 2020-03-12 18:29:30 -04:00
26 changed files with 955 additions and 2997 deletions
Expand all files Collapse all files

29
.reuse/dep5
View File

@ -1,29 +0,0 @@
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

1
COPYING
View File

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

20
LICENSE Normal file
View File

@ -0,0 +1,20 @@
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.

350
LICENSES/CC-BY-SA-4.0.txt
View File

@ -1,350 +0,0 @@
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.

119
LICENSES/CC0-1.0.txt
View File

@ -1,119 +0,0 @@
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.

625
LICENSES/GPL-3.0-or-later.txt
View File

@ -1,625 +0,0 @@
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>.

19
LICENSES/MIT.txt
View File

@ -1,19 +0,0 @@
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.

53
README.md
View File

@ -1,37 +1,22 @@
# wdisplays # wdisplays
[![License: GPL 3.0 or later][license-img]][license-spdx] [![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](https://spdx.org/licenses/MIT.html)
wdisplays is a graphical application for configuring displays in Wayland wdisplays is a graphical application for configuring displays in Wayland
compositors. It borrows some code from [kanshi]. It should work in any 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,
Compositors that are known to support the protocol are [Sway] and [Wayfire]. including [sway]. The goal of this project is to allow precise adjustment of
The goal of this project is to allow precise adjustment of display settings in display settings in kiosks, digital signage, and other elaborate multi-monitor
kiosks, digital signage, and other elaborate multi-monitor setups. setups.
![Screenshot](wdisplays.png) ![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 # Building
Build requirements are: Build requirements are:
- meson - meson
- GTK+3 - GTK4
- libdrm
- epoxy - epoxy
- wayland-client - wayland-client
@ -41,6 +26,9 @@ ninja -C build
sudo ninja -C build install 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 # Usage
Displays can be moved around the virtual screen space by clicking and dragging Displays can be moved around the virtual screen space by clicking and dragging
@ -60,32 +48,23 @@ 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 - Overlay Screen Names: Shows big names in the corner of all screens for easy
identification. Disable if they get in the way. identification. Disable if they get in the way.
# FAQ # FAQ (Fervently Anticpiated Quandaries)
### What is this? ### What is this?
It's intended to be the Wayland equivalent of an xrandr GUI, like [ARandR]. 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? ### 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 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 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 depending on the monitors connected, you'll need to use an external program
like [kanshi]. Integration with that and other external daemons is planned. like [kanshi].
### 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 [kanshi]: https://github.com/emersion/kanshi
[Sway]: https://swaywm.org [sway]: https://github.com/swaywm/sway
[Wayfire]: https://wayfire.org
[ARandR]: https://christian.amsuess.com/tools/arandr/ [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

13
meson.build
View File

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

5
protocol/meson.build
View File

@ -1,6 +1,3 @@
# SPDX-FileCopyrightText: 2020 Jason Francis <jason@cycles.network>
# SPDX-License-Identifier: CC0-1.0
wayland_scanner = find_program('wayland-scanner') wayland_scanner = find_program('wayland-scanner')
wayland_client = dependency('wayland-client') wayland_client = dependency('wayland-client')
wayland_protos = dependency('wayland-protocols', version: '>=1.17') wayland_protos = dependency('wayland-protocols', version: '>=1.17')
@ -21,11 +18,9 @@ wayland_scanner_client = generator(
client_protocols = [ client_protocols = [
[wl_protocol_dir, 'unstable/xdg-output/xdg-output-unstable-v1.xml'], [wl_protocol_dir, 'unstable/xdg-output/xdg-output-unstable-v1.xml'],
[wl_protocol_dir, 'unstable/linux-dmabuf/linux-dmabuf-unstable-v1.xml'],
[wl_protocol_dir, 'stable/xdg-shell/xdg-shell.xml'], [wl_protocol_dir, 'stable/xdg-shell/xdg-shell.xml'],
['wlr-output-management-unstable-v1.xml'], ['wlr-output-management-unstable-v1.xml'],
['wlr-screencopy-unstable-v1.xml'], ['wlr-screencopy-unstable-v1.xml'],
['wlr-export-dmabuf-unstable-v1.xml'],
['wlr-layer-shell-unstable-v1.xml'] ['wlr-layer-shell-unstable-v1.xml']
] ]

203
protocol/wlr-export-dmabuf-unstable-v1.xml
View File

@ -1,203 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<protocol name="wlr_export_dmabuf_unstable_v1">
<copyright>
Copyright © 2018 Rostislav Pehlivanov
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.
</copyright>
<description summary="a protocol for low overhead screen content capturing">
An interface to capture surfaces in an efficient way by exporting DMA-BUFs.
Warning! The protocol described in this file is experimental and
backward incompatible changes may be made. Backward compatible changes
may be added together with the corresponding interface version bump.
Backward incompatible changes are done by bumping the version number in
the protocol and interface names and resetting the interface version.
Once the protocol is to be declared stable, the 'z' prefix and the
version number in the protocol and interface names are removed and the
interface version number is reset.
</description>
<interface name="zwlr_export_dmabuf_manager_v1" version="1">
<description summary="manager to inform clients and begin capturing">
This object is a manager with which to start capturing from sources.
</description>
<request name="capture_output">
<description summary="capture a frame from an output">
Capture the next frame of a an entire output.
</description>
<arg name="frame" type="new_id" interface="zwlr_export_dmabuf_frame_v1"/>
<arg name="overlay_cursor" type="int"
summary="include custom client hardware cursor on top of the frame"/>
<arg name="output" type="object" interface="wl_output"/>
</request>
<request name="destroy" type="destructor">
<description summary="destroy the manager">
All objects created by the manager will still remain valid, until their
appropriate destroy request has been called.
</description>
</request>
</interface>
<interface name="zwlr_export_dmabuf_frame_v1" version="1">
<description summary="a DMA-BUF frame">
This object represents a single DMA-BUF frame.
If the capture is successful, the compositor will first send a "frame"
event, followed by one or several "object". When the frame is available
for readout, the "ready" event is sent.
If the capture failed, the "cancel" event is sent. This can happen anytime
before the "ready" event.
Once either a "ready" or a "cancel" event is received, the client should
destroy the frame. Once an "object" event is received, the client is
responsible for closing the associated file descriptor.
All frames are read-only and may not be written into or altered.
</description>
<enum name="flags">
<description summary="frame flags">
Special flags that should be respected by the client.
</description>
<entry name="transient" value="0x1"
summary="clients should copy frame before processing"/>
</enum>
<event name="frame">
<description summary="a frame description">
Main event supplying the client with information about the frame. If the
capture didn't fail, this event is always emitted first before any other
events.
This event is followed by a number of "object" as specified by the
"num_objects" argument.
</description>
<arg name="width" type="uint"
summary="frame width in pixels"/>
<arg name="height" type="uint"
summary="frame height in pixels"/>
<arg name="offset_x" type="uint"
summary="crop offset for the x axis"/>
<arg name="offset_y" type="uint"
summary="crop offset for the y axis"/>
<arg name="buffer_flags" type="uint"
summary="flags which indicate properties (invert, interlacing),
has the same values as zwp_linux_buffer_params_v1:flags"/>
<arg name="flags" type="uint" enum="flags"
summary="indicates special frame features"/>
<arg name="format" type="uint"
summary="format of the frame (DRM_FORMAT_*)"/>
<arg name="mod_high" type="uint"
summary="drm format modifier, high"/>
<arg name="mod_low" type="uint"
summary="drm format modifier, low"/>
<arg name="num_objects" type="uint"
summary="indicates how many objects (FDs) the frame has (max 4)"/>
</event>
<event name="object">
<description summary="an object description">
Event which serves to supply the client with the file descriptors
containing the data for each object.
After receiving this event, the client must always close the file
descriptor as soon as they're done with it and even if the frame fails.
</description>
<arg name="index" type="uint"
summary="index of the current object"/>
<arg name="fd" type="fd"
summary="fd of the current object"/>
<arg name="size" type="uint"
summary="size in bytes for the current object"/>
<arg name="offset" type="uint"
summary="starting point for the data in the object's fd"/>
<arg name="stride" type="uint"
summary="line size in bytes"/>
<arg name="plane_index" type="uint"
summary="index of the the plane the data in the object applies to"/>
</event>
<event name="ready">
<description summary="indicates frame is available for reading">
This event is sent as soon as the frame is presented, indicating it is
available for reading. This event includes the time at which
presentation happened at.
The timestamp is expressed as tv_sec_hi, tv_sec_lo, tv_nsec triples,
each component being an unsigned 32-bit value. Whole seconds are in
tv_sec which is a 64-bit value combined from tv_sec_hi and tv_sec_lo,
and the additional fractional part in tv_nsec as nanoseconds. Hence,
for valid timestamps tv_nsec must be in [0, 999999999]. The seconds part
may have an arbitrary offset at start.
After receiving this event, the client should destroy this object.
</description>
<arg name="tv_sec_hi" type="uint"
summary="high 32 bits of the seconds part of the timestamp"/>
<arg name="tv_sec_lo" type="uint"
summary="low 32 bits of the seconds part of the timestamp"/>
<arg name="tv_nsec" type="uint"
summary="nanoseconds part of the timestamp"/>
</event>
<enum name="cancel_reason">
<description summary="cancel reason">
Indicates reason for cancelling the frame.
</description>
<entry name="temporary" value="0"
summary="temporary error, source will produce more frames"/>
<entry name="permanent" value="1"
summary="fatal error, source will not produce frames"/>
<entry name="resizing" value="2"
summary="temporary error, source will produce more frames"/>
</enum>
<event name="cancel">
<description summary="indicates the frame is no longer valid">
If the capture failed or if the frame is no longer valid after the
"frame" event has been emitted, this event will be used to inform the
client to scrap the frame.
If the failure is temporary, the client may capture again the same
source. If the failure is permanent, any further attempts to capture the
same source will fail again.
After receiving this event, the client should destroy this object.
</description>
<arg name="reason" type="uint" enum="cancel_reason"
summary="indicates a reason for cancelling this frame capture"/>
</event>
<request name="destroy" type="destructor">
<description summary="delete this object, used or not">
Unreferences the frame. This request must be called as soon as its no
longer used.
It can be called at any time by the client. The client will still have
to close any FDs it has been given.
</description>
</request>
</interface>
</protocol>

273
resources/head.ui
View File

@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.22.2 -->
<interface> <interface>
<requires lib="gtk+" version="3.22"/> <requires lib="gtk+" version="3.22"/>
<object class="GtkAdjustment" id="height_adjustment"> <object class="GtkAdjustment" id="height_adjustment">
@ -33,366 +32,280 @@
<property name="step_increment">1</property> <property name="step_increment">1</property>
<property name="page_increment">10</property> <property name="page_increment">10</property>
</object> </object>
<template class="WdHeadForm" parent="GtkGrid"> <object class="GtkGrid" id="form">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_start">8</property> <property name="margin_start">8</property>
<property name="margin_end">8</property> <property name="margin_end">8</property>
<property name="margin_top">8</property> <property name="margin_top">8</property>
<property name="margin_bottom">8</property> <property name="margin_bottom">8</property>
<property name="row_spacing">8</property> <property name="row_spacing">8</property>
<property name="column_spacing">16</property> <property name="column_spacing">16</property>
<property name="row_homogeneous">True</property> <property name="row_homogeneous">1</property>
<child> <child>
<object class="GtkCheckButton" id="enabled"> <object class="GtkCheckButton" id="enabled">
<property name="label" translatable="yes">_Enabled</property> <property name="label" translatable="yes">_Enabled</property>
<property name="visible">True</property> <property name="can_focus">1</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="halign">start</property> <property name="halign">start</property>
<property name="use_underline">True</property> <property name="use_underline">1</property>
<property name="draw_indicator">True</property> <layout>
<signal name="toggled" handler="enabled_toggled" swapped="no"/>
</object>
<packing>
<property name="left_attach">1</property> <property name="left_attach">1</property>
<property name="top_attach">0</property> <property name="top_attach">0</property>
</packing> </layout>
</object>
</child> </child>
<child> <child>
<object class="GtkLabel" id="description"> <object class="GtkLabel" id="description">
<property name="visible">True</property> <property name="wrap">1</property>
<property name="can_focus">False</property>
<property name="wrap">True</property>
<property name="wrap_mode">word-char</property> <property name="wrap_mode">word-char</property>
<property name="ellipsize">end</property> <property name="ellipsize">end</property>
<property name="xalign">0</property> <property name="xalign">0</property>
</object> <layout>
<packing>
<property name="left_attach">1</property> <property name="left_attach">1</property>
<property name="top_attach">1</property> <property name="top_attach">1</property>
</packing> </layout>
</object>
</child> </child>
<child> <child>
<object class="GtkSpinButton" id="scale"> <object class="GtkSpinButton" id="scale">
<property name="visible">True</property> <property name="can_focus">1</property>
<property name="can_focus">True</property>
<property name="halign">start</property> <property name="halign">start</property>
<property name="width_chars">9</property> <property name="width_chars">9</property>
<property name="adjustment">scale_adjustment</property> <property name="adjustment">scale_adjustment</property>
<property name="digits">2</property> <property name="digits">2</property>
<property name="value">1</property> <property name="value">1</property>
<signal name="value-changed" handler="position_spin_changed" swapped="no"/> <layout>
</object>
<packing>
<property name="left_attach">1</property> <property name="left_attach">1</property>
<property name="top_attach">3</property> <property name="top_attach">3</property>
</packing> </layout>
</object>
</child> </child>
<child> <child>
<object class="GtkLabel"> <object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">DPI _Scale</property> <property name="label" translatable="yes">DPI _Scale</property>
<property name="use_underline">True</property> <property name="use_underline">1</property>
<property name="mnemonic_widget">scale</property> <property name="mnemonic_widget">scale</property>
<property name="xalign">1</property> <property name="xalign">1</property>
</object> <layout>
<packing>
<property name="left_attach">0</property> <property name="left_attach">0</property>
<property name="top_attach">3</property> <property name="top_attach">3</property>
</packing> </layout>
</object>
</child> </child>
<child> <child>
<object class="GtkLabel"> <object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">_Position</property> <property name="label" translatable="yes">_Position</property>
<property name="use_underline">True</property> <property name="use_underline">1</property>
<property name="mnemonic_widget">pos_x</property> <property name="mnemonic_widget">pos_x</property>
<property name="xalign">1</property> <property name="xalign">1</property>
</object> <layout>
<packing>
<property name="left_attach">0</property> <property name="left_attach">0</property>
<property name="top_attach">4</property> <property name="top_attach">4</property>
</packing> </layout>
</object>
</child> </child>
<child> <child>
<object class="GtkLabel"> <object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Description</property> <property name="label" translatable="yes">Description</property>
<property name="xalign">1</property> <property name="xalign">1</property>
</object> <layout>
<packing>
<property name="left_attach">0</property> <property name="left_attach">0</property>
<property name="top_attach">1</property> <property name="top_attach">1</property>
</packing> </layout>
</object>
</child> </child>
<child> <child>
<object class="GtkLabel" id="physical_size"> <object class="GtkLabel" id="physical_size">
<property name="visible">True</property> <property name="wrap">1</property>
<property name="can_focus">False</property>
<property name="wrap">True</property>
<property name="wrap_mode">word-char</property> <property name="wrap_mode">word-char</property>
<property name="ellipsize">end</property> <property name="ellipsize">end</property>
<property name="xalign">0</property> <property name="xalign">0</property>
</object> <layout>
<packing>
<property name="left_attach">1</property> <property name="left_attach">1</property>
<property name="top_attach">2</property> <property name="top_attach">2</property>
</packing> </layout>
</object>
</child> </child>
<child> <child>
<object class="GtkLabel"> <object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Physical Size</property> <property name="label" translatable="yes">Physical Size</property>
<property name="xalign">1</property> <property name="xalign">1</property>
</object> <layout>
<packing>
<property name="left_attach">0</property> <property name="left_attach">0</property>
<property name="top_attach">2</property> <property name="top_attach">2</property>
</packing> </layout>
</object>
</child> </child>
<child> <child>
<object class="GtkLabel"> <object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Si_ze</property> <property name="label" translatable="yes">Si_ze</property>
<property name="use_underline">True</property> <property name="use_underline">1</property>
<property name="mnemonic_widget">width</property> <property name="mnemonic_widget">width</property>
<property name="xalign">1</property> <property name="xalign">1</property>
</object> <layout>
<packing>
<property name="left_attach">0</property> <property name="left_attach">0</property>
<property name="top_attach">5</property> <property name="top_attach">5</property>
</packing> </layout>
</object>
</child> </child>
<child> <child>
<object class="GtkBox"> <object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property> <property name="halign">start</property>
<property name="spacing">8</property> <property name="spacing">8</property>
<child> <child>
<object class="GtkSpinButton" id="refresh"> <object class="GtkSpinButton" id="refresh">
<property name="name">refresh</property> <property name="name">refresh</property>
<property name="visible">True</property> <property name="can_focus">1</property>
<property name="can_focus">True</property>
<property name="width_chars">9</property> <property name="width_chars">9</property>
<property name="input_purpose">number</property>
<property name="adjustment">refresh_adjustment</property> <property name="adjustment">refresh_adjustment</property>
<property name="digits">3</property> <property name="digits">3</property>
<property name="numeric">True</property> <property name="numeric">1</property>
<property name="update_policy">if-valid</property> <property name="update_policy">if-valid</property>
<signal name="value-changed" handler="mode_spin_changed" swapped="no"/>
</object> </object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child> </child>
<child> <child>
<object class="GtkLabel"> <object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Hz</property> <property name="label" translatable="yes">Hz</property>
</object> </object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child> </child>
</object> <layout>
<packing>
<property name="left_attach">1</property> <property name="left_attach">1</property>
<property name="top_attach">6</property> <property name="top_attach">6</property>
</packing> </layout>
</object>
</child> </child>
<child> <child>
<object class="GtkLabel"> <object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">_Refresh Rate</property> <property name="label" translatable="yes">_Refresh Rate</property>
<property name="use_underline">True</property> <property name="use_underline">1</property>
<property name="xalign">1</property> <property name="xalign">1</property>
</object> <layout>
<packing>
<property name="left_attach">0</property> <property name="left_attach">0</property>
<property name="top_attach">6</property> <property name="top_attach">6</property>
</packing> </layout>
</object>
</child> </child>
<child> <child>
<object class="GtkMenuButton" id="rotate_button"> <object class="GtkMenuButton" id="rotate_button">
<property name="visible">True</property> <property name="can_focus">1</property>
<property name="can_focus">True</property> <property name="receives_default">1</property>
<property name="receives_default">True</property> <layout>
<child>
<placeholder/>
</child>
</object>
<packing>
<property name="left_attach">1</property> <property name="left_attach">1</property>
<property name="top_attach">7</property> <property name="top_attach">7</property>
</packing> </layout>
</object>
</child> </child>
<child> <child>
<object class="GtkLabel"> <object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">_Transform</property> <property name="label" translatable="yes">_Transform</property>
<property name="use_underline">True</property> <property name="use_underline">1</property>
<property name="xalign">1</property> <property name="xalign">1</property>
</object> <layout>
<packing>
<property name="left_attach">0</property> <property name="left_attach">0</property>
<property name="top_attach">7</property> <property name="top_attach">7</property>
</packing> </layout>
</object>
</child> </child>
<child> <child>
<object class="GtkCheckButton" id="flipped"> <object class="GtkCheckButton" id="flipped">
<property name="label" translatable="yes">_Flipped</property> <property name="label" translatable="yes">_Flipped</property>
<property name="visible">True</property> <property name="can_focus">1</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="halign">start</property> <property name="halign">start</property>
<property name="use_underline">True</property> <property name="use_underline">1</property>
<property name="draw_indicator">True</property> <layout>
<signal name="toggled" handler="flipped_toggled" swapped="no"/>
</object>
<packing>
<property name="left_attach">1</property> <property name="left_attach">1</property>
<property name="top_attach">8</property> <property name="top_attach">8</property>
</packing> </layout>
</object>
</child> </child>
<child> <child>
<object class="GtkGrid"> <object class="GtkGrid">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="row_spacing">8</property> <property name="row_spacing">8</property>
<child> <child>
<object class="GtkSpinButton" id="pos_x"> <object class="GtkSpinButton" id="pos_x">
<property name="visible">True</property> <property name="can_focus">1</property>
<property name="can_focus">True</property>
<property name="width_chars">6</property> <property name="width_chars">6</property>
<property name="text" translatable="yes">0</property> <property name="text" translatable="yes">0</property>
<property name="input_purpose">number</property>
<property name="adjustment">pos_x_adjustment</property> <property name="adjustment">pos_x_adjustment</property>
<property name="numeric">True</property> <property name="numeric">1</property>
<property name="update_policy">if-valid</property> <property name="update_policy">if-valid</property>
<signal name="value-changed" handler="position_spin_changed" swapped="no"/> <layout>
</object>
<packing>
<property name="left_attach">0</property> <property name="left_attach">0</property>
<property name="top_attach">0</property> <property name="top_attach">0</property>
</packing> </layout>
</object>
</child> </child>
<child> <child>
<object class="GtkSpinButton" id="pos_y"> <object class="GtkSpinButton" id="pos_y">
<property name="visible">True</property> <property name="can_focus">1</property>
<property name="can_focus">True</property>
<property name="width_chars">6</property> <property name="width_chars">6</property>
<property name="text" translatable="yes">0</property> <property name="text" translatable="yes">0</property>
<property name="input_purpose">number</property>
<property name="adjustment">pos_y_adjustment</property> <property name="adjustment">pos_y_adjustment</property>
<property name="numeric">True</property> <property name="numeric">1</property>
<property name="update_policy">if-valid</property> <property name="update_policy">if-valid</property>
<signal name="value-changed" handler="position_spin_changed" swapped="no"/> <layout>
</object>
<packing>
<property name="left_attach">2</property> <property name="left_attach">2</property>
<property name="top_attach">0</property> <property name="top_attach">0</property>
</packing> </layout>
</object>
</child> </child>
<child> <child>
<object class="GtkSpinButton" id="width"> <object class="GtkSpinButton" id="width">
<property name="name">width</property> <property name="name">width</property>
<property name="visible">True</property> <property name="can_focus">1</property>
<property name="can_focus">True</property>
<property name="width_chars">4</property> <property name="width_chars">4</property>
<property name="text" translatable="yes">0</property> <property name="text" translatable="yes">0</property>
<property name="input_purpose">number</property>
<property name="adjustment">width_adjustment</property> <property name="adjustment">width_adjustment</property>
<property name="numeric">True</property> <property name="numeric">1</property>
<property name="update_policy">if-valid</property> <property name="update_policy">if-valid</property>
<signal name="value-changed" handler="mode_spin_changed" swapped="no"/> <layout>
</object>
<packing>
<property name="left_attach">0</property> <property name="left_attach">0</property>
<property name="top_attach">1</property> <property name="top_attach">1</property>
</packing> </layout>
</object>
</child> </child>
<child> <child>
<object class="GtkLabel"> <object class="GtkLabel">
<property name="width_request">20</property> <property name="width_request">20</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">×</property> <property name="label" translatable="yes">×</property>
</object> <layout>
<packing>
<property name="left_attach">1</property> <property name="left_attach">1</property>
<property name="top_attach">1</property> <property name="top_attach">1</property>
</packing> </layout>
</object>
</child> </child>
<child> <child>
<object class="GtkSpinButton" id="height"> <object class="GtkSpinButton" id="height">
<property name="name">height</property> <property name="name">height</property>
<property name="visible">True</property> <property name="can_focus">1</property>
<property name="can_focus">True</property>
<property name="width_chars">4</property> <property name="width_chars">4</property>
<property name="text" translatable="yes">0</property> <property name="text" translatable="yes">0</property>
<property name="input_purpose">number</property>
<property name="adjustment">height_adjustment</property> <property name="adjustment">height_adjustment</property>
<property name="numeric">True</property> <property name="numeric">1</property>
<property name="update_policy">if-valid</property> <property name="update_policy">if-valid</property>
<signal name="value-changed" handler="mode_spin_changed" swapped="no"/> <layout>
</object>
<packing>
<property name="left_attach">2</property> <property name="left_attach">2</property>
<property name="top_attach">1</property> <property name="top_attach">1</property>
</packing> </layout>
</object>
</child> </child>
<child> <child>
<object class="GtkMenuButton" id="mode_button"> <object class="GtkMenuButton" id="mode_button">
<property name="visible">True</property> <property name="can_focus">1</property>
<property name="can_focus">True</property> <property name="receives_default">1</property>
<property name="receives_default">True</property>
<property name="tooltip_text" translatable="yes">Select Mode Preset</property> <property name="tooltip_text" translatable="yes">Select Mode Preset</property>
<property name="margin_start">8</property> <property name="margin_start">8</property>
<child>
<object class="GtkImage">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="icon_name">view-more-symbolic</property> <property name="icon_name">view-more-symbolic</property>
</object> <layout>
</child>
</object>
<packing>
<property name="left_attach">3</property> <property name="left_attach">3</property>
<property name="top_attach">1</property> <property name="top_attach">1</property>
</packing> </layout>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
</object> </object>
<packing> </child>
<layout>
<property name="left_attach">1</property> <property name="left_attach">1</property>
<property name="top_attach">4</property> <property name="top_attach">4</property>
<property name="height">2</property> <property name="row_span">2</property>
</packing> </layout>
</object>
</child> </child>
<child> </object>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
</template>
</interface> </interface>

10
resources/meson.build
View File

@ -1,15 +1,7 @@
# 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') gnome = import('gnome')
resources = gnome.compile_resources( resources = gnome.compile_resources(
'wdisplays-resources', resources_xml, 'wdisplays-resources', 'resources.xml',
source_dir : '.', source_dir : '.',
c_name : 'wdisplays_resources') c_name : 'wdisplays_resources')

2
resources/resources.xml.in → resources/resources.xml
View File

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

232
resources/wdisplays.ui
View File

@ -1,8 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.22.0 -->
<interface> <interface>
<requires lib="gtk+" version="3.22"/> <requires lib="gtk+" version="3.22"/>
<!-- interface-css-provider-path style.css -->
<object class="GtkAdjustment" id="canvas_horiz"> <object class="GtkAdjustment" id="canvas_horiz">
<property name="step_increment">1</property> <property name="step_increment">1</property>
<property name="page_increment">10</property> <property name="page_increment">10</property>
@ -12,319 +10,193 @@
<property name="page_increment">10</property> <property name="page_increment">10</property>
</object> </object>
<object class="GtkWindow" id="heads_window"> <object class="GtkWindow" id="heads_window">
<property name="can_focus">False</property>
<property name="title" translatable="yes">wdisplays</property> <property name="title" translatable="yes">wdisplays</property>
<signal name="destroy" handler="destroy" swapped="no"/>
<child> <child>
<object class="GtkOverlay" id="overlay"> <object class="GtkOverlay" id="overlay">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child> <child>
<object class="GtkBox" id="main_box"> <object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
<child> <child>
<object class="GtkInfoBar" id="heads_info"> <object class="GtkInfoBar" id="heads_info">
<property name="can_focus">False</property> <property name="visible">0</property>
<property name="no_show_all">True</property>
<property name="valign">start</property> <property name="valign">start</property>
<property name="message_type">error</property> <property name="message_type">error</property>
<property name="show_close_button">True</property> <property name="show_close_button">1</property>
<property name="revealed">False</property> <property name="revealed">0</property>
<signal name="response" handler="info_response" swapped="no"/> <child type="action">
<child internal-child="action_area"> <object class="GtkBox">
<object class="GtkButtonBox">
<property name="can_focus">False</property>
<property name="spacing">6</property> <property name="spacing">6</property>
<property name="layout_style">end</property>
<child> <child>
<placeholder/> <placeholder/>
</child> </child>
</object> </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child> </child>
<child internal-child="content_area"> <child>
<object class="GtkBox"> <object class="GtkBox">
<property name="can_focus">False</property> <property name="visible">0</property>
<property name="spacing">16</property> <property name="spacing">16</property>
<child> <child>
<object class="GtkLabel" id="heads_info_label"> <object class="GtkLabel" id="heads_info_label">
<property name="visible">True</property> <property name="wrap">1</property>
<property name="can_focus">False</property>
<property name="wrap">True</property>
<property name="xalign">0</property> <property name="xalign">0</property>
</object> </object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
</child> </child>
</object> </object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child> </child>
<child> <child>
<placeholder/> <placeholder/>
</child> </child>
</object> </object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child> </child>
<child> <child>
<object class="GtkPaned"> <object class="GtkPaned" id="paned">
<property name="visible">True</property> <property name="resize_child2">0</property>
<property name="can_focus">True</property> <property name="shrink_child1">0</property>
<property name="shrink_child2">0</property>
<property name="can_focus">1</property>
<property name="position">400</property> <property name="position">400</property>
<property name="position_set">True</property> <property name="position_set">1</property>
<child> <child>
<object class="GtkScrolledWindow" id="heads_scroll"> <object class="GtkScrolledWindow" id="heads_scroll">
<property name="visible">True</property> <property name="can_focus">1</property>
<property name="can_focus">True</property>
<property name="hadjustment">canvas_horiz</property> <property name="hadjustment">canvas_horiz</property>
<property name="vadjustment">canvas_vert</property> <property name="vadjustment">canvas_vert</property>
<property name="min_content_width">100</property> <property name="min_content_width">400</property>
<property name="min_content_height">300</property> <property name="min_content_height">300</property>
<child> <child>
<placeholder/> <placeholder/>
</child> </child>
</object> </object>
<packing>
<property name="resize">True</property>
<property name="shrink">False</property>
</packing>
</child> </child>
<child> <child>
<object class="GtkBox"> <object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
<child> <child>
<object class="GtkStackSwitcher" id="heads_stack_switcher"> <object class="GtkStackSwitcher" id="heads_stack_switcher">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">center</property> <property name="halign">center</property>
<property name="margin_start">8</property> <property name="margin_start">8</property>
<property name="margin_end">8</property> <property name="margin_end">8</property>
<property name="margin_top">8</property> <property name="margin_top">8</property>
<property name="hexpand">True</property> <property name="hexpand">1</property>
<property name="stack">heads_stack</property> <property name="stack">heads_stack</property>
</object> </object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child> </child>
<child> <child>
<object class="GtkStack" id="heads_stack"> <object class="GtkStack" id="heads_stack">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="transition_type">crossfade</property> <property name="transition_type">crossfade</property>
<child> <child>
<placeholder/> <placeholder/>
</child> </child>
</object> </object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child> </child>
</object> </object>
<packing>
<property name="resize">False</property>
<property name="shrink">False</property>
</packing>
</child> </child>
</object> </object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child> </child>
</object> </object>
<packing>
<property name="index">-1</property>
</packing>
</child> </child>
<child type="overlay"> <child type="overlay">
<object class="GtkSpinner" id="spinner"> <object class="GtkSpinner" id="spinner">
<property name="visible">True</property> <property name="visible">0</property>
<property name="can_focus">False</property> <property name="hexpand">1</property>
<property name="no_show_all">True</property> <property name="vexpand">1</property>
<property name="hexpand">True</property> <property name="can_target">0</property>
<property name="vexpand">True</property>
</object> </object>
<packing>
<property name="pass_through">True</property>
</packing>
</child> </child>
</object> </object>
</child> </child>
<child type="titlebar"> <child type="titlebar">
<object class="GtkStack" id="header_stack"> <object class="GtkStack" id="header_stack">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="transition_type">crossfade</property> <property name="transition_type">crossfade</property>
<child> <child>
<object class="GtkStackPage">
<property name="name">title</property>
<property name="child">
<object class="GtkHeaderBar"> <object class="GtkHeaderBar">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="title" translatable="yes">wdisplays</property> <property name="title" translatable="yes">wdisplays</property>
<property name="has_subtitle">False</property> <property name="has_subtitle">0</property>
<property name="show_close_button">True</property> <property name="show_title_buttons">1</property>
<child> <child>
<object class="GtkButtonBox" id="zoom_box"> <object class="GtkBox" id="zoom_box">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child> <child>
<object class="GtkButton" id="zoom_out"> <object class="GtkButton" id="zoom_out">
<property name="visible">True</property> <property name="can_focus">1</property>
<property name="can_focus">True</property> <property name="receives_default">1</property>
<property name="receives_default">True</property>
<property name="tooltip_text" translatable="yes">Zoom Out</property> <property name="tooltip_text" translatable="yes">Zoom Out</property>
<property name="action_name">app.zoom-out</property> <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>
<property name="can_focus">False</property>
<property name="icon_name">zoom-out-symbolic</property> <property name="icon_name">zoom-out-symbolic</property>
<accelerator key="minus" signal="clicked" modifiers="GDK_CONTROL_MASK"/>
</object> </object>
</child> </child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">0</property>
<property name="non_homogeneous">True</property>
</packing>
</child>
<child> <child>
<object class="GtkButton" id="zoom_reset"> <object class="GtkButton" id="zoom_reset">
<property name="visible">True</property> <property name="can_focus">1</property>
<property name="can_focus">True</property> <property name="receives_default">1</property>
<property name="receives_default">True</property>
<property name="tooltip_text" translatable="yes">Zoom Reset</property> <property name="tooltip_text" translatable="yes">Zoom Reset</property>
<property name="action_name">app.zoom-reset</property> <property name="action_name">app.zoom-reset</property>
<accelerator key="0" signal="clicked" modifiers="GDK_CONTROL_MASK"/> <accelerator key="0" signal="clicked" modifiers="GDK_CONTROL_MASK"/>
</object> </object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
<property name="non_homogeneous">True</property>
</packing>
</child> </child>
<child> <child>
<object class="GtkButton" id="zoom_in"> <object class="GtkButton" id="zoom_in">
<property name="visible">True</property> <property name="can_focus">1</property>
<property name="can_focus">True</property> <property name="receives_default">1</property>
<property name="receives_default">True</property>
<property name="tooltip_text" translatable="yes">Zoom In</property> <property name="tooltip_text" translatable="yes">Zoom In</property>
<property name="action_name">app.zoom-in</property> <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>
<property name="can_focus">False</property>
<property name="icon_name">zoom-in-symbolic</property> <property name="icon_name">zoom-in-symbolic</property>
<accelerator key="equal" signal="clicked" modifiers="GDK_CONTROL_MASK"/>
</object> </object>
</child> </child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">2</property>
<property name="non_homogeneous">True</property>
</packing>
</child>
<style> <style>
<class name="linked"/> <class name="linked"/>
</style> </style>
</object> </object>
</child> </child>
<child> <child type="end">
<object class="GtkMenuButton" id="menu_button"> <object class="GtkMenuButton" id="menu_button">
<property name="visible">True</property> <property name="can_focus">1</property>
<property name="can_focus">True</property> <property name="receives_default">1</property>
<property name="receives_default">True</property>
<child>
<object class="GtkImage">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="icon_name">open-menu-symbolic</property> <property name="icon_name">open-menu-symbolic</property>
</object> </object>
</child> </child>
</object> </object>
<packing> </property>
<property name="pack_type">end</property>
<property name="position">1</property>
</packing>
</child>
</object> </object>
<packing>
<property name="name">title</property>
</packing>
</child> </child>
<child> <child>
<object class="GtkStackPage">
<property name="name">apply</property>
<property name="child">
<object class="GtkHeaderBar"> <object class="GtkHeaderBar">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child type="title"> <child type="title">
<object class="GtkLabel"> <object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Apply Changes?</property> <property name="label" translatable="yes">Apply Changes?</property>
</object> </object>
</child> </child>
<child> <child>
<object class="GtkButton"> <object class="GtkButton">
<property name="label" translatable="yes">_Apply</property> <property name="label" translatable="yes">_Apply</property>
<property name="visible">True</property> <property name="can_focus">1</property>
<property name="can_focus">True</property> <property name="receives_default">1</property>
<property name="receives_default">True</property> <property name="use_underline">1</property>
<property name="use_underline">True</property>
<property name="action_name">app.apply-changes</property> <property name="action_name">app.apply-changes</property>
<style> <style>
<class name="suggested-action"/> <class name="suggested-action"/>
</style> </style>
</object> </object>
<packing>
<property name="pack_type">end</property>
</packing>
</child> </child>
<child> <child type="end">
<object class="GtkButton"> <object class="GtkButton">
<property name="label" translatable="yes">_Cancel</property> <property name="label" translatable="yes">_Cancel</property>
<property name="visible">True</property> <property name="can_focus">1</property>
<property name="can_focus">True</property> <property name="receives_default">1</property>
<property name="receives_default">True</property> <property name="use_underline">1</property>
<property name="use_underline">True</property>
<property name="action_name">app.cancel-changes</property> <property name="action_name">app.cancel-changes</property>
</object> </object>
<packing>
<property name="position">1</property>
</packing>
</child> </child>
</object> </object>
<packing> </property>
<property name="name">apply</property> </object>
<property name="position">1</property>
</packing>
</child> </child>
</object> </object>
</child> </child>

5
src/config.h.in
View File

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

4
src/glviewport.c
View File

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

4
src/glviewport.h
View File

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

393
src/headform.c
View File

@ -1,393 +0,0 @@
/* 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);
}

59
src/headform.h
View File

@ -1,59 +0,0 @@
/* 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

674
src/main.c
View File

@ -1,15 +1,11 @@
/* SPDX-FileCopyrightText: 2020 Jason Francis <jason@cycles.network> /* SPDX-License-Identifier: MIT */
* SPDX-License-Identifier: GPL-3.0-or-later */ /* Copyright (C) 2019 cyclopsian */
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include <gdk/gdkwayland.h> #include <gdk/wayland/gdkwayland.h>
#include <drm_fourcc.h>
#include "wdisplays.h" #include "wdisplays.h"
#include "glviewport.h" #include "glviewport.h"
#include "headform.h"
#include "linux-dmabuf-unstable-v1-client-protocol.h"
__attribute__((noreturn)) void wd_fatal_error(int status, const char *message) { __attribute__((noreturn)) void wd_fatal_error(int status, const char *message) {
GtkWindow *parent = gtk_application_get_active_window(GTK_APPLICATION(g_application_get_default())); GtkWindow *parent = gtk_application_get_active_window(GTK_APPLICATION(g_application_get_default()));
@ -24,16 +20,86 @@ __attribute__((noreturn)) void wd_fatal_error(int status, const char *message) {
#define MAX_ZOOM 1000. #define MAX_ZOOM 1000.
#define CANVAS_MARGIN 40 #define CANVAS_MARGIN 40
static const char *HEAD_PREFIX = "head";
static const char *MODE_PREFIX = "mode";
static const char *ROTATE_PREFIX = "rotate";
static const char *APP_PREFIX = "app"; static const char *APP_PREFIX = "app";
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 bool has_changes(const struct wd_state *state) { static bool has_changes(const struct wd_state *state) {
g_autoptr(GList) forms = gtk_container_get_children(GTK_CONTAINER(state->stack)); g_autoptr(GList) forms = gtk_container_get_children(GTK_CONTAINER(state->stack));
for (GList *form_iter = forms; form_iter != NULL; form_iter = form_iter->next) { for (GList *form_iter = forms; form_iter != NULL; form_iter = form_iter->next) {
if (wd_head_form_has_changes(WD_HEAD_FORM(form_iter->data), GtkBuilder *builder = GTK_BUILDER(g_object_get_data(G_OBJECT(form_iter->data), "builder"));
g_object_get_data(G_OBJECT(form_iter->data), "head"))) const struct wd_head *head = g_object_get_data(G_OBJECT(form_iter->data), "head");
return true; GAction *rotate_action = G_ACTION(g_object_get_data(G_OBJECT(form_iter->data), "rotate_action"));
if (head->enabled != gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "enabled")))) {
return TRUE;
}
double old_scale = round(head->scale * 100.) / 100.;
double new_scale = round(gtk_spin_button_get_value(GTK_SPIN_BUTTON(gtk_builder_get_object(builder, "scale"))) * 100.) / 100.;
if (old_scale != new_scale) {
return TRUE;
}
if (head->x != gtk_spin_button_get_value(GTK_SPIN_BUTTON(gtk_builder_get_object(builder, "pos_x")))) {
return TRUE;
}
if (head->y != gtk_spin_button_get_value(GTK_SPIN_BUTTON(gtk_builder_get_object(builder, "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(gtk_builder_get_object(builder, "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(gtk_builder_get_object(builder, "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(gtk_builder_get_object(builder, "refresh")))) {
return TRUE;
}
if (g_variant_get_int32(g_action_get_state(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(gtk_builder_get_object(builder, "flipped")))) {
return TRUE;
}
}
return FALSE;
}
void fill_output_from_form(struct wd_head_config *output, GtkWidget *form) {
GtkBuilder *builder = GTK_BUILDER(g_object_get_data(G_OBJECT(form), "builder"));
output->head = g_object_get_data(G_OBJECT(form), "head");
output->enabled = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "enabled")));
output->scale = gtk_spin_button_get_value(GTK_SPIN_BUTTON(gtk_builder_get_object(builder, "scale")));
output->x = gtk_spin_button_get_value(GTK_SPIN_BUTTON(gtk_builder_get_object(builder, "pos_x")));
output->y = gtk_spin_button_get_value(GTK_SPIN_BUTTON(gtk_builder_get_object(builder, "pos_y")));
output->width = gtk_spin_button_get_value(GTK_SPIN_BUTTON(gtk_builder_get_object(builder, "width")));
output->height = gtk_spin_button_get_value(GTK_SPIN_BUTTON(gtk_builder_get_object(builder, "height")));
output->refresh = gtk_spin_button_get_value(GTK_SPIN_BUTTON(gtk_builder_get_object(builder, "refresh"))) * 1000.;
int32_t rotate = g_variant_get_int32(g_action_get_state(G_ACTION(g_object_get_data(G_OBJECT(form), "rotate_action"))));
gboolean flipped = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "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;
} }
return false;
} }
static gboolean send_apply(gpointer data) { static gboolean send_apply(gpointer data) {
@ -45,11 +111,10 @@ static gboolean send_apply(gpointer data) {
for (GList *form_iter = forms; form_iter != NULL; form_iter = form_iter->next) { for (GList *form_iter = forms; form_iter != NULL; form_iter = form_iter->next) {
struct wd_head_config *output = calloc(1, sizeof(*output)); struct wd_head_config *output = calloc(1, sizeof(*output));
wl_list_insert(outputs, &output->link); wl_list_insert(outputs, &output->link);
output->head = g_object_get_data(G_OBJECT(form_iter->data), "head"); fill_output_from_form(output, GTK_WIDGET(form_iter->data));
wd_head_form_fill_config(WD_HEAD_FORM(form_iter->data), output);
} }
GdkWindow *window = gtk_widget_get_window(state->stack); GdkSurface *surface = gtk_native_get_surface(gtk_widget_get_native(state->stack));
GdkDisplay *display = gdk_window_get_display(window); GdkDisplay *display = gdk_surface_get_display(surface);
struct wl_display *wl_display = gdk_wayland_display_get_wl_display(display); struct wl_display *wl_display = gdk_wayland_display_get_wl_display(display);
wd_apply_state(state, outputs, wl_display); wd_apply_state(state, outputs, wl_display);
state->apply_pending = FALSE; state->apply_pending = FALSE;
@ -60,7 +125,7 @@ static void apply_state(struct wd_state *state) {
gtk_stack_set_visible_child_name(GTK_STACK(state->header_stack), "title"); gtk_stack_set_visible_child_name(GTK_STACK(state->header_stack), "title");
if (!state->autoapply) { if (!state->autoapply) {
gtk_style_context_add_class(gtk_widget_get_style_context(state->spinner), "visible"); gtk_style_context_add_class(gtk_widget_get_style_context(state->spinner), "visible");
gtk_overlay_set_overlay_pass_through(GTK_OVERLAY(state->overlay), state->spinner, FALSE); gtk_widget_set_can_target(state->spinner, TRUE);
gtk_spinner_start(GTK_SPINNER(state->spinner)); gtk_spinner_start(GTK_SPINNER(state->spinner));
gtk_widget_set_sensitive(state->stack_switcher, FALSE); gtk_widget_set_sensitive(state->stack_switcher, FALSE);
@ -119,21 +184,23 @@ static void update_canvas_size(struct wd_state *state) {
g_autoptr(GList) forms = gtk_container_get_children(GTK_CONTAINER(state->stack)); g_autoptr(GList) forms = gtk_container_get_children(GTK_CONTAINER(state->stack));
for (GList *form_iter = forms; form_iter != NULL; form_iter = form_iter->next) { for (GList *form_iter = forms; form_iter != NULL; form_iter = form_iter->next) {
WdHeadForm *form = WD_HEAD_FORM(form_iter->data); GtkBuilder *builder = GTK_BUILDER(g_object_get_data(G_OBJECT(form_iter->data), "builder"));
if (wd_head_form_get_enabled(form)) { gboolean enabled = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "enabled")));
WdHeadDimensions dim; if (enabled) {
wd_head_form_get_dimensions(form, &dim); int x1 = gtk_spin_button_get_value(GTK_SPIN_BUTTON(gtk_builder_get_object(builder, "pos_x")));
int h = dim.h; int y1 = gtk_spin_button_get_value(GTK_SPIN_BUTTON(gtk_builder_get_object(builder, "pos_y")));
int w = dim.w; int w = gtk_spin_button_get_value(GTK_SPIN_BUTTON(gtk_builder_get_object(builder, "width")));
int x2 = dim.x + w; int h = gtk_spin_button_get_value(GTK_SPIN_BUTTON(gtk_builder_get_object(builder, "height")));
int y2 = dim.x + h; int x2 = x1 + w;
if (dim.scale > 0.) { int y2 = y1 + w;
w /= dim.scale; double scale = gtk_spin_button_get_value(GTK_SPIN_BUTTON(gtk_builder_get_object(builder, "scale")));
h /= dim.scale; if (scale > 0.) {
w /= scale;
h /= scale;
} }
xmin = MIN(xmin, dim.x); xmin = MIN(xmin, x1);
xmax = MAX(xmax, x2); xmax = MAX(xmax, x2);
ymin = MIN(ymin, dim.y); ymin = MIN(ymin, y1);
ymax = MAX(ymax, y2); ymax = MAX(ymax, y2);
} }
} }
@ -188,15 +255,15 @@ static void update_cursor(struct wd_state *state) {
break; break;
} }
} }
GdkWindow *window = gtk_widget_get_window(state->canvas); GdkSurface *surface = gtk_native_get_surface(gtk_widget_get_native(state->canvas));
if (any_hovered) { if (any_hovered) {
gdk_window_set_cursor(window, state->grab_cursor); gdk_surface_set_cursor(surface, state->grab_cursor);
} else if (state->clicked != NULL) { } else if (state->clicked != NULL) {
gdk_window_set_cursor(window, state->grabbing_cursor); gdk_surface_set_cursor(surface, state->grabbing_cursor);
} else if (state->panning) { } else if (state->panning) {
gdk_window_set_cursor(window, state->move_cursor); gdk_surface_set_cursor(surface, state->move_cursor);
} else { } else {
gdk_window_set_cursor(window, NULL); gdk_surface_set_cursor(surface, NULL);
} }
} }
@ -252,6 +319,11 @@ static inline void color_to_float_array(GtkStyleContext *ctx,
out[3] = color.alpha; out[3] = color.alpha;
} }
static unsigned form_get_rotation(GtkWidget *form) {
int32_t rotate = g_variant_get_int32(g_action_get_state(G_ACTION(g_object_get_data(G_OBJECT(form), "rotate_action"))));
return rotate / 90;
}
#define SWAP(_type, _a, _b) { _type _tmp = (_a); (_a) = (_b); (_b) = _tmp; } #define SWAP(_type, _a, _b) { _type _tmp = (_a); (_a) = (_b); (_b) = _tmp; }
static void queue_canvas_draw(struct wd_state *state) { static void queue_canvas_draw(struct wd_state *state) {
@ -269,13 +341,14 @@ static void queue_canvas_draw(struct wd_state *state) {
g_autoptr(GList) forms = gtk_container_get_children(GTK_CONTAINER(state->stack)); g_autoptr(GList) forms = gtk_container_get_children(GTK_CONTAINER(state->stack));
for (GList *form_iter = forms; form_iter != NULL; form_iter = form_iter->next) { for (GList *form_iter = forms; form_iter != NULL; form_iter = form_iter->next) {
WdHeadForm *form = WD_HEAD_FORM(form_iter->data); GtkBuilder *builder = GTK_BUILDER(g_object_get_data(G_OBJECT(form_iter->data), "builder"));
if (wd_head_form_get_enabled(form)) { gboolean enabled = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "enabled")));
WdHeadDimensions dim; if (enabled) {
wd_head_form_get_dimensions(form, &dim); int x = gtk_spin_button_get_value(GTK_SPIN_BUTTON(gtk_builder_get_object(builder, "pos_x")));
double w = dim.w; int y = gtk_spin_button_get_value(GTK_SPIN_BUTTON(gtk_builder_get_object(builder, "pos_y")));
double h = dim.h; int w = gtk_spin_button_get_value(GTK_SPIN_BUTTON(gtk_builder_get_object(builder, "width")));
double scale = dim.scale; int h = gtk_spin_button_get_value(GTK_SPIN_BUTTON(gtk_builder_get_object(builder, "height")));
double scale = gtk_spin_button_get_value(GTK_SPIN_BUTTON(gtk_builder_get_object(builder, "scale")));
if (scale <= 0.) if (scale <= 0.)
scale = 1.; scale = 1.;
@ -285,13 +358,13 @@ static void queue_canvas_draw(struct wd_state *state) {
wl_list_insert(&state->render.heads, &head->render->link); wl_list_insert(&state->render.heads, &head->render->link);
} }
struct wd_render_head_data *render = head->render; struct wd_render_head_data *render = head->render;
render->queued.rotation = dim.rotation_id; render->queued.rotation = form_get_rotation(GTK_WIDGET(form_iter->data));
if (render->queued.rotation & 1) { if (render->queued.rotation & 1) {
SWAP(int, w, h); SWAP(int, w, h);
} }
render->queued.x_invert = dim.flipped; render->queued.x_invert = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "flipped")));
render->x1 = floor(dim.x * state->zoom - state->render.scroll_x - state->render.x_origin); render->x1 = floor(x * state->zoom - state->render.scroll_x - state->render.x_origin);
render->y1 = floor(dim.y * state->zoom - state->render.scroll_y - state->render.y_origin); render->y1 = floor(y * state->zoom - state->render.scroll_y - state->render.y_origin);
render->x2 = floor(render->x1 + w * state->zoom / scale); render->x2 = floor(render->x1 + w * state->zoom / scale);
render->y2 = floor(render->y1 + h * state->zoom / scale); render->y2 = floor(render->y1 + h * state->zoom / scale);
} }
@ -299,6 +372,7 @@ static void queue_canvas_draw(struct wd_state *state) {
gtk_gl_area_queue_render(GTK_GL_AREA(state->canvas)); gtk_gl_area_queue_render(GTK_GL_AREA(state->canvas));
} }
// BEGIN FORM CALLBACKS
static void show_apply(struct wd_state *state) { static void show_apply(struct wd_state *state) {
const gchar *page = "title"; const gchar *page = "title";
if (has_changes(state)) { if (has_changes(state)) {
@ -311,14 +385,189 @@ static void show_apply(struct wd_state *state) {
gtk_stack_set_visible_child_name(GTK_STACK(state->header_stack), page); gtk_stack_set_visible_child_name(GTK_STACK(state->header_stack), page);
} }
static void update_ui(WdHeadForm *form, enum wd_head_fields fields, static void update_ui(struct wd_state *state) {
gpointer data) {
struct wd_state *state = data;
show_apply(state); show_apply(state);
update_canvas_size(state); update_canvas_size(state);
queue_canvas_draw(state); queue_canvas_draw(state);
} }
static void update_sensitivity(GtkWidget *form) {
GtkBuilder *builder = GTK_BUILDER(g_object_get_data(G_OBJECT(form), "builder"));
GtkWidget *enabled = GTK_WIDGET(gtk_builder_get_object(builder, "enabled"));
bool enabled_toggled = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(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 != enabled) {
gtk_widget_set_sensitive(widget, enabled_toggled);
}
}
}
static void rotate_selected(GSimpleAction *action, GVariant *param, gpointer data) {
const struct wd_head *head = g_object_get_data(G_OBJECT(data), "head");
GtkBuilder *builder = GTK_BUILDER(g_object_get_data(data, "builder"));
GtkWidget *rotate_button = GTK_WIDGET(gtk_builder_get_object(builder, "rotate_button"));
GMenuModel *menu = gtk_menu_button_get_menu_model(GTK_MENU_BUTTON(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_menu_button_set_label(GTK_MENU_BUTTON(rotate_button), g_variant_get_string(label, NULL));
break;
}
}
g_simple_action_set_state(action, param);
update_ui(head->state);
}
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 mode_spin_changed(GtkSpinButton *spin_button, gpointer data) {
GtkWidget *form = data;
const struct wd_head *head = g_object_get_data(G_OBJECT(form), "head");
struct vid_mode mode;
GAction *mode_action = G_ACTION(g_object_get_data(G_OBJECT(form), "mode_action"));
GVariant *value = g_action_get_state(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(mode_action, create_mode_variant(mode.width, mode.height, mode.refresh));
update_ui(head->state);
}
static void mode_selected(GSimpleAction *action, GVariant *param, gpointer data) {
GtkWidget *form = data;
const struct wd_head *head = g_object_get_data(G_OBJECT(form), "head");
GtkBuilder *builder = GTK_BUILDER(g_object_get_data(G_OBJECT(form), "builder"));
struct vid_mode mode;
unpack_mode_variant(param, &mode);
g_simple_action_set_state(action, param);
gtk_spin_button_set_value(GTK_SPIN_BUTTON(gtk_builder_get_object(builder, "width")), mode.width);
gtk_spin_button_set_value(GTK_SPIN_BUTTON(gtk_builder_get_object(builder, "height")), mode.height);
gtk_spin_button_set_value(GTK_SPIN_BUTTON(gtk_builder_get_object(builder, "refresh")), mode.refresh / 1000.);
update_ui(head->state);
}
// END FORM CALLBACKS
static void update_head_form(GtkWidget *form, unsigned int fields) {
GtkBuilder *builder = GTK_BUILDER(g_object_get_data(G_OBJECT(form), "builder"));
GtkWidget *description = GTK_WIDGET(gtk_builder_get_object(builder, "description"));
GtkWidget *physical_size = GTK_WIDGET(gtk_builder_get_object(builder, "physical_size"));
GtkWidget *enabled = GTK_WIDGET(gtk_builder_get_object(builder, "enabled"));
GtkWidget *scale = GTK_WIDGET(gtk_builder_get_object(builder, "scale"));
GtkWidget *pos_x = GTK_WIDGET(gtk_builder_get_object(builder, "pos_x"));
GtkWidget *pos_y = GTK_WIDGET(gtk_builder_get_object(builder, "pos_y"));
GtkWidget *mode_button = GTK_WIDGET(gtk_builder_get_object(builder, "mode_button"));
GtkWidget *flipped = GTK_WIDGET(gtk_builder_get_object(builder, "flipped"));
const struct wd_head *head = g_object_get_data(G_OBJECT(form), "head");
GAction *mode_action = G_ACTION(g_object_get_data(G_OBJECT(form), "mode_action"));
GAction *rotate_action = G_ACTION(g_object_get_data(G_OBJECT(form), "rotate_action"));
if (fields & WD_FIELD_NAME) {
g_object_set(gtk_stack_get_page(GTK_STACK(head->state->stack), form), "title", head->name, NULL);
}
if (fields & WD_FIELD_DESCRIPTION) {
gtk_label_set_text(GTK_LABEL(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(physical_size), physical_str);
}
if (fields & WD_FIELD_ENABLED) {
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(enabled), head->enabled);
}
if (fields & WD_FIELD_SCALE) {
gtk_spin_button_set_value(GTK_SPIN_BUTTON(scale), head->scale);
}
if (fields & WD_FIELD_POSITION) {
gtk_spin_button_set_value(GTK_SPIN_BUTTON(pos_x), head->x);
gtk_spin_button_set_value(GTK_SPIN_BUTTON(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(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(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(rotate_action, g_variant_new_int32(active_rotate));
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(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) {
update_sensitivity(form);
}
update_ui(head->state);
}
void wd_ui_reset_heads(struct wd_state *state) { void wd_ui_reset_heads(struct wd_state *state) {
if (state->stack == NULL) { if (state->stack == NULL) {
return; return;
@ -329,19 +578,68 @@ void wd_ui_reset_heads(struct wd_state *state) {
struct wd_head *head; struct wd_head *head;
int i = 0; int i = 0;
wl_list_for_each(head, &state->heads, link) { wl_list_for_each(head, &state->heads, link) {
GtkBuilder *builder;
GtkWidget *form;
if (form_iter == NULL) { if (form_iter == NULL) {
GtkWidget *form = wd_head_form_new();; builder = gtk_builder_new_from_resource("/head.ui");
form = GTK_WIDGET(gtk_builder_get_object(builder, "form"));
g_object_set_data(G_OBJECT(form), "builder", builder);
g_object_set_data(G_OBJECT(form), "head", head); g_object_set_data(G_OBJECT(form), "head", head);
g_signal_connect(form, "changed", G_CALLBACK(update_ui), state);
g_autofree gchar *page_name = g_strdup_printf("%d", i); g_autofree gchar *page_name = g_strdup_printf("%d", i);
gtk_stack_add_titled(GTK_STACK(state->stack), form, page_name, head->name); gtk_stack_add_titled(GTK_STACK(state->stack), form, page_name, head->name);
wd_head_form_update(WD_HEAD_FORM(form), head, WD_FIELDS_ALL);
GtkWidget *mode_button = GTK_WIDGET(gtk_builder_get_object(builder, "mode_button"));
GtkWidget *rotate_button = GTK_WIDGET(gtk_builder_get_object(builder, "rotate_button"));
GSimpleActionGroup *head_actions = g_simple_action_group_new();
gtk_widget_insert_action_group(mode_button, HEAD_PREFIX, G_ACTION_GROUP(head_actions));
gtk_widget_insert_action_group(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(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_set_data(G_OBJECT(form), "mode_action", action);
g_object_unref(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_set_data(G_OBJECT(form), "rotate_action", action);
g_object_unref(action);
g_object_unref(head_actions);
update_head_form(form, WD_FIELDS_ALL);
g_signal_connect_swapped(gtk_builder_get_object(builder, "enabled"), "toggled", G_CALLBACK(update_sensitivity), form);
g_signal_connect(gtk_builder_get_object(builder, "width"), "value-changed", G_CALLBACK(mode_spin_changed), form);
g_signal_connect(gtk_builder_get_object(builder, "height"), "value-changed", G_CALLBACK(mode_spin_changed), form);
g_signal_connect(gtk_builder_get_object(builder, "refresh"), "value-changed", G_CALLBACK(mode_spin_changed), form);
g_signal_connect_swapped(gtk_builder_get_object(builder, "enabled"), "toggled", G_CALLBACK(update_ui), state);
g_signal_connect_swapped(gtk_builder_get_object(builder, "scale"), "value-changed", G_CALLBACK(update_ui), state);
g_signal_connect_swapped(gtk_builder_get_object(builder, "pos_x"), "value-changed", G_CALLBACK(update_ui), state);
g_signal_connect_swapped(gtk_builder_get_object(builder, "pos_y"), "value-changed", G_CALLBACK(update_ui), state);
g_signal_connect_swapped(gtk_builder_get_object(builder, "flipped"), "toggled", G_CALLBACK(update_ui), state);
} else { } else {
GtkWidget *form = GTK_WIDGET(form_iter->data); form = form_iter->data;
if (head != g_object_get_data(G_OBJECT(form), "head")) { if (head != g_object_get_data(G_OBJECT(form), "head")) {
g_object_set_data(G_OBJECT(form), "head", head); g_object_set_data(G_OBJECT(form), "head", head);
gtk_container_child_set(GTK_CONTAINER(state->stack), form, "title", head->name, NULL); update_head_form(form, WD_FIELDS_ALL);
wd_head_form_update(WD_HEAD_FORM(form), head, WD_FIELDS_ALL);
} }
form_iter = form_iter->next; form_iter = form_iter->next;
} }
@ -349,24 +647,23 @@ void wd_ui_reset_heads(struct wd_state *state) {
} }
// remove everything else // remove everything else
for (; form_iter != NULL; form_iter = form_iter->next) { for (; form_iter != NULL; form_iter = form_iter->next) {
GtkBuilder *builder = GTK_BUILDER(g_object_get_data(G_OBJECT(form_iter->data), "builder"));
g_object_unref(builder);
gtk_container_remove(GTK_CONTAINER(state->stack), GTK_WIDGET(form_iter->data)); gtk_container_remove(GTK_CONTAINER(state->stack), GTK_WIDGET(form_iter->data));
} }
update_canvas_size(state); update_canvas_size(state);
queue_canvas_draw(state); queue_canvas_draw(state);
} }
void wd_ui_reset_head(const struct wd_head *head, enum wd_head_fields fields) { void wd_ui_reset_head(const struct wd_head *head, unsigned int fields) {
if (head->state->stack == NULL) { if (head->state->stack == NULL) {
return; return;
} }
g_autoptr(GList) forms = gtk_container_get_children(GTK_CONTAINER(head->state->stack)); g_autoptr(GList) forms = gtk_container_get_children(GTK_CONTAINER(head->state->stack));
for (GList *form_iter = forms; form_iter != NULL; form_iter = form_iter->next) { for (GList *form_iter = forms; form_iter != NULL; form_iter = form_iter->next) {
GtkWidget *form = GTK_WIDGET(form_iter->data); const struct wd_head *other = g_object_get_data(G_OBJECT(form_iter->data), "head");
const struct wd_head *other = g_object_get_data(G_OBJECT(form), "head");
if (head == other) { if (head == other) {
if (fields & WD_FIELD_NAME) update_head_form(GTK_WIDGET(form_iter->data), fields);
gtk_container_child_set(GTK_CONTAINER(head->state->stack), form, "title", head->name, NULL);
wd_head_form_update(WD_HEAD_FORM(form), head, fields);
break; break;
} }
} }
@ -378,10 +675,7 @@ void wd_ui_reset_all(struct wd_state *state) {
wd_ui_reset_heads(state); wd_ui_reset_heads(state);
g_autoptr(GList) forms = gtk_container_get_children(GTK_CONTAINER(state->stack)); g_autoptr(GList) forms = gtk_container_get_children(GTK_CONTAINER(state->stack));
for (GList *form_iter = forms; form_iter != NULL; form_iter = form_iter->next) { for (GList *form_iter = forms; form_iter != NULL; form_iter = form_iter->next) {
GtkWidget *form = GTK_WIDGET(form_iter->data); update_head_form(GTK_WIDGET(form_iter->data), WD_FIELDS_ALL);
struct wd_head *head = g_object_get_data(G_OBJECT(form), "head");
gtk_container_child_set(GTK_CONTAINER(state->stack), form, "title", head->name, NULL);
wd_head_form_update(WD_HEAD_FORM(form_iter->data), head, WD_FIELDS_ALL);
} }
update_canvas_size(state); update_canvas_size(state);
queue_canvas_draw(state); queue_canvas_draw(state);
@ -389,7 +683,7 @@ void wd_ui_reset_all(struct wd_state *state) {
void wd_ui_apply_done(struct wd_state *state, struct wl_list *outputs) { void wd_ui_apply_done(struct wd_state *state, struct wl_list *outputs) {
gtk_style_context_remove_class(gtk_widget_get_style_context(state->spinner), "visible"); gtk_style_context_remove_class(gtk_widget_get_style_context(state->spinner), "visible");
gtk_overlay_set_overlay_pass_through(GTK_OVERLAY(state->overlay), state->spinner, TRUE); gtk_widget_set_can_target(state->spinner, FALSE);
gtk_spinner_stop(GTK_SPINNER(state->spinner)); gtk_spinner_stop(GTK_SPINNER(state->spinner));
gtk_widget_set_sensitive(state->stack_switcher, TRUE); gtk_widget_set_sensitive(state->stack_switcher, TRUE);
@ -441,11 +735,7 @@ static void canvas_realize(GtkWidget *widget, gpointer data) {
} }
struct wd_state *state = data; struct wd_state *state = data;
state->gl_data = wd_gl_setup();
GdkWindow *window = gtk_widget_get_window(widget);
GdkDisplay *display = gdk_window_get_display(window);
struct wl_display *wl_display = gdk_wayland_display_get_wl_display(display);
state->gl_data = wd_gl_setup(wl_display);
} }
static inline bool size_changed(const struct wd_render_head_data *render) { static inline bool size_changed(const struct wd_render_head_data *render) {
@ -531,7 +821,6 @@ static void canvas_render(GtkGLArea *area, GdkGLContext *context, gpointer data)
uint64_t tick = gdk_frame_clock_get_frame_time(clock); uint64_t tick = gdk_frame_clock_get_frame_time(clock);
wd_capture_frame(state); wd_capture_frame(state);
state->render.external_images = state->export_manager != NULL;
struct wd_head *head; struct wd_head *head;
wl_list_for_each(head, &state->heads, link) { wl_list_for_each(head, &state->heads, link) {
@ -542,28 +831,16 @@ static void canvas_render(GtkGLArea *area, GdkGLContext *context, gpointer data)
frame = wl_container_of(output->frames.prev, frame, link); frame = wl_container_of(output->frames.prev, frame, link);
} }
if (render != NULL) { if (render != NULL) {
if (state->capture && frame != NULL && frame->ready) { if (state->capture && frame != NULL && frame->pixels != NULL) {
if (frame->tick > render->updated_at) { if (frame->tick > render->updated_at) {
render->tex_stride = frame->stride;
render->tex_width = frame->width; render->tex_width = frame->width;
render->tex_height = frame->height; render->tex_height = frame->height;
if (state->render.external_images) {
render->pixels = NULL;
render->image = wd_gl_create_dmabuf_texture(state->gl_data, frame);
render->has_alpha = TRUE;
render->swap_rgb = TRUE;
} else {
render->pixels = frame->pixels; render->pixels = frame->pixels;
render->image = NULL;
render->tex_stride = frame->strides[0];
render->swap_rgb = frame->format == WL_SHM_FORMAT_ABGR8888
|| frame->format == WL_SHM_FORMAT_XBGR8888;
render->has_alpha = frame->format == WL_SHM_FORMAT_ARGB8888
|| frame->format == WL_SHM_FORMAT_ABGR8888;
}
render->y_invert = frame->flags &
ZWP_LINUX_BUFFER_PARAMS_V1_FLAGS_Y_INVERT;
render->preview = TRUE; render->preview = TRUE;
render->updated_at = tick; render->updated_at = tick;
render->y_invert = frame->y_invert;
render->swap_rgb = frame->swap_rgb;
} }
if (render->preview) { if (render->preview) {
render->active.rotation = render->queued.rotation; render->active.rotation = render->queued.rotation;
@ -580,12 +857,10 @@ static void canvas_render(GtkGLArea *area, GdkGLContext *context, gpointer data)
head->surface = draw_head(pango, &state->render, head->name, head->surface = draw_head(pango, &state->render, head->name,
render->tex_width, render->tex_height); render->tex_width, render->tex_height);
render->pixels = cairo_image_surface_get_data(head->surface); render->pixels = cairo_image_surface_get_data(head->surface);
render->image = NULL;
render->tex_stride = cairo_image_surface_get_stride(head->surface); render->tex_stride = cairo_image_surface_get_stride(head->surface);
render->updated_at = tick; render->updated_at = tick;
render->active.rotation = 0; render->active.rotation = 0;
render->active.x_invert = FALSE; render->active.x_invert = FALSE;
render->has_alpha = FALSE;
render->y_invert = FALSE; render->y_invert = FALSE;
render->swap_rgb = FALSE; render->swap_rgb = FALSE;
} }
@ -629,20 +904,20 @@ static void set_clicked_head(struct wd_state *state,
state->clicked = clicked; state->clicked = clicked;
} }
static void canvas_drag1_begin(GtkGestureDrag *drag, static void canvas_drag_begin(GtkGestureDrag *drag,
gdouble mouse_x, gdouble mouse_y, gpointer data) { gdouble mouse_x, gdouble mouse_y, gpointer data) {
struct wd_state *state = data; struct wd_state *state = data;
guint button = gtk_gesture_single_get_current_button(GTK_GESTURE_SINGLE(drag));
if (button == 1) {
struct wd_render_head_data *render; struct wd_render_head_data *render;
state->clicked = NULL; state->clicked = NULL;
wl_list_for_each(render, &state->render.heads, link) { wl_list_for_each(render, &state->render.heads, link) {
if (mouse_x >= render->x1 && mouse_x < render->x2 && if (mouse_x >= render->x1 && mouse_x < render->x2 &&
mouse_y >= render->y1 && mouse_y < render->y2) { mouse_y >= render->y1 && mouse_y < render->y2) {
set_clicked_head(state, render); set_clicked_head(state, render);
state->drag_start.x = mouse_x; state->click_offset.x = mouse_x - render->x1;
state->drag_start.y = mouse_y; state->click_offset.y = mouse_y - render->y1;
state->head_drag_start.x = (mouse_x - render->x1) / (render->x2 - render->x1);
state->head_drag_start.y = (mouse_y - render->y1) / (render->y2 - render->y1);
break; break;
} }
} }
@ -665,45 +940,63 @@ static void canvas_drag1_begin(GtkGestureDrag *drag,
} }
} }
} }
} else if (button == 2) {
state->panning = TRUE;
state->pan_last.x = mouse_x;
state->pan_last.y = mouse_y;
}
} }
#define SNAP_DIST 6. #define SNAP_DIST 6.
static void canvas_drag1_update(GtkGestureDrag *drag, static void canvas_drag_update(GtkGestureDrag *drag,
gdouble delta_x, gdouble delta_y, gpointer data) { gdouble mouse_x, gdouble mouse_y, gpointer data) {
struct wd_state *state = data; struct wd_state *state = data;
guint button = gtk_gesture_single_get_current_button(GTK_GESTURE_SINGLE(drag));
if (state->clicked == NULL) if (button == 2) {
return; GtkAdjustment *xadj = gtk_scrolled_window_get_hadjustment(GTK_SCROLLED_WINDOW(state->scroller));
WdHeadForm *form = NULL; GtkAdjustment *yadj = gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(state->scroller));
double delta_x = mouse_x - state->pan_last.x;
double delta_y = mouse_y - state->pan_last.y;
gtk_adjustment_set_value(xadj, gtk_adjustment_get_value(xadj) + delta_x);
gtk_adjustment_set_value(yadj, gtk_adjustment_get_value(yadj) + delta_y);
state->pan_last.x = mouse_x;
state->pan_last.y = mouse_y;
queue_canvas_draw(state);
}
if (button == 1 && state->clicked != NULL) {
GtkWidget *form = NULL;
g_autoptr(GList) forms = gtk_container_get_children(GTK_CONTAINER(state->stack)); g_autoptr(GList) forms = gtk_container_get_children(GTK_CONTAINER(state->stack));
for (GList *form_iter = forms; form_iter != NULL; form_iter = form_iter->next) { for (GList *form_iter = forms; form_iter != NULL; form_iter = form_iter->next) {
const struct wd_head *other = g_object_get_data(G_OBJECT(form_iter->data), "head"); const struct wd_head *other = g_object_get_data(G_OBJECT(form_iter->data), "head");
if (state->clicked == other->render) { if (state->clicked == other->render) {
form = WD_HEAD_FORM(form_iter->data); form = form_iter->data;
break; break;
} }
} }
if (!form) if (form != NULL) {
return; GtkBuilder *builder = GTK_BUILDER(g_object_get_data(G_OBJECT(form), "builder"));
WdHeadDimensions dim; struct wd_point size = {
wd_head_form_get_dimensions(form, &dim); .x = gtk_spin_button_get_value(GTK_SPIN_BUTTON(gtk_builder_get_object(builder, "width"))),
struct wd_point size = { .x = dim.w, .y = dim.h }; .y = gtk_spin_button_get_value(GTK_SPIN_BUTTON(gtk_builder_get_object(builder, "height"))),
if (dim.scale > 0.) { };
size.x /= dim.scale; double scale = gtk_spin_button_get_value(GTK_SPIN_BUTTON(gtk_builder_get_object(builder, "scale")));
size.y /= dim.scale; if (scale > 0.) {
size.x /= scale;
size.y /= scale;
} }
if (dim.rotation_id & 1) { unsigned rot = form_get_rotation(form);
if (rot & 1) {
SWAP(int, size.x, size.y); SWAP(int, size.x, size.y);
} }
struct wd_point tl = { /* top left */ struct wd_point tl = {
.x = (state->drag_start.x + delta_x - state->head_drag_start.x * size.x * state->zoom .x = (mouse_x - state->click_offset.x
+ state->render.x_origin + state->render.scroll_x) / state->zoom, + state->render.x_origin + state->render.scroll_x) / state->zoom,
.y = (state->drag_start.y + delta_y - state->head_drag_start.y * size.y * state->zoom .y = (mouse_y - state->click_offset.y
+ state->render.y_origin + state->render.scroll_y) / state->zoom + state->render.y_origin + state->render.scroll_y) / state->zoom
}; };
const struct wd_point br = {
const struct wd_point br = { /* bottom right */
.x = tl.x + size.x, .x = tl.x + size.x,
.y = tl.y + size.y .y = tl.y + size.y
}; };
@ -711,24 +1004,23 @@ static void canvas_drag1_update(GtkGestureDrag *drag,
float snap = SNAP_DIST / state->zoom; float snap = SNAP_DIST / state->zoom;
GdkEvent *event = gtk_get_current_event(); GdkEvent *event = gtk_get_current_event();
GdkModifierType mod_state = event->motion.state; GdkModifierType mod_state = gdk_event_get_modifier_state(event);
/* snapping */
for (GList *form_iter = forms; form_iter != NULL; form_iter = form_iter->next) { for (GList *form_iter = forms; form_iter != NULL; form_iter = form_iter->next) {
WdHeadForm *other_form = WD_HEAD_FORM(form_iter->data); const struct wd_head *other = g_object_get_data(G_OBJECT(form_iter->data), "head");
const struct wd_head *other = g_object_get_data(G_OBJECT(other_form), "head");
if (other->render != state->clicked && !(mod_state & GDK_SHIFT_MASK)) { if (other->render != state->clicked && !(mod_state & GDK_SHIFT_MASK)) {
WdHeadDimensions other_dim; GtkBuilder *other_builder = GTK_BUILDER(g_object_get_data(G_OBJECT(form_iter->data), "builder"));
wd_head_form_get_dimensions(other_form, &other_dim); double x1 = gtk_spin_button_get_value(GTK_SPIN_BUTTON(gtk_builder_get_object(other_builder, "pos_x")));
double x1 = other_dim.x; double y1 = gtk_spin_button_get_value(GTK_SPIN_BUTTON(gtk_builder_get_object(other_builder, "pos_y")));
double y1 = other_dim.y; double w = gtk_spin_button_get_value(GTK_SPIN_BUTTON(gtk_builder_get_object(other_builder, "width")));
double w = other_dim.w; double h = gtk_spin_button_get_value(GTK_SPIN_BUTTON(gtk_builder_get_object(other_builder, "height")));
double h = other_dim.h; scale = gtk_spin_button_get_value(GTK_SPIN_BUTTON(gtk_builder_get_object(other_builder, "scale")));
if (other_dim.scale > 0.) { if (scale > 0.) {
w /= other_dim.scale; w /= scale;
h /= other_dim.scale; h /= scale;
} }
if (other_dim.rotation_id & 1) { rot = form_get_rotation(GTK_WIDGET(form_iter->data));
if (rot & 1) {
SWAP(int, w, h); SWAP(int, w, h);
} }
double x2 = x1 + w; double x2 = x1 + w;
@ -760,40 +1052,24 @@ static void canvas_drag1_update(GtkGestureDrag *drag,
new_pos.y = y2; new_pos.y = y2;
} }
} }
wd_head_form_set_position(form, new_pos.x, new_pos.y); GtkWidget *pos_x = GTK_WIDGET(gtk_builder_get_object(builder, "pos_x"));
GtkWidget *pos_y = GTK_WIDGET(gtk_builder_get_object(builder, "pos_y"));
gtk_spin_button_set_value(GTK_SPIN_BUTTON(pos_x), new_pos.x);
gtk_spin_button_set_value(GTK_SPIN_BUTTON(pos_y), new_pos.y);
}
}
} }
static void canvas_drag1_end(GtkGestureDrag *drag, static void canvas_drag_end(GtkGestureDrag *drag,
gdouble mouse_x, gdouble mouse_y, gpointer data) { gdouble mouse_x, gdouble mouse_y, gpointer data) {
struct wd_state *state = data; struct wd_state *state = data;
guint button = gtk_gesture_single_get_current_button(GTK_GESTURE_SINGLE(drag));
if (button == 1) {
set_clicked_head(state, NULL); set_clicked_head(state, NULL);
update_cursor(state); }
} if (button == 2) {
static void canvas_drag2_begin(GtkGestureDrag *drag,
gdouble mouse_x, gdouble mouse_y, gpointer data) {
struct wd_state *state = data;
state->panning = TRUE;
GtkAdjustment *xadj = gtk_scrolled_window_get_hadjustment(GTK_SCROLLED_WINDOW(state->scroller));
GtkAdjustment *yadj = gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(state->scroller));
state->pan_start.x = gtk_adjustment_get_value(xadj);
state->pan_start.y = gtk_adjustment_get_value(yadj);
}
static void canvas_drag2_update(GtkGestureDrag *drag,
gdouble delta_x, gdouble delta_y, gpointer data) {
struct wd_state *state = data;
GtkAdjustment *xadj = gtk_scrolled_window_get_hadjustment(GTK_SCROLLED_WINDOW(state->scroller));
GtkAdjustment *yadj = gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(state->scroller));
gtk_adjustment_set_value(xadj, state->pan_start.x + delta_x);
gtk_adjustment_set_value(yadj, state->pan_start.y + delta_y);
queue_canvas_draw(state);
}
static void canvas_drag2_end(GtkGestureDrag *drag,
gdouble mouse_x, gdouble mouse_y, gpointer data) {
struct wd_state *state = data;
state->panning = FALSE; state->panning = FALSE;
}
update_cursor(state); update_cursor(state);
} }
@ -804,10 +1080,10 @@ static void canvas_motion(GtkEventControllerMotion *controller,
} }
static void canvas_enter(GtkEventControllerMotion *controller, static void canvas_enter(GtkEventControllerMotion *controller,
gdouble x, gdouble y, gpointer data) { gdouble x, gdouble y, GdkCrossingMode crossing_mode, gpointer data) {
struct wd_state *state = data; struct wd_state *state = data;
GdkEvent *event = gtk_get_current_event(); GdkEvent *event = gtk_get_current_event();
GdkModifierType mod_state = event->crossing.state; GdkModifierType mod_state = gdk_event_get_modifier_state(event);
if (!(mod_state & GDK_BUTTON1_MASK)) { if (!(mod_state & GDK_BUTTON1_MASK)) {
set_clicked_head(state, NULL); set_clicked_head(state, NULL);
@ -819,7 +1095,7 @@ static void canvas_enter(GtkEventControllerMotion *controller,
} }
static void canvas_leave(GtkEventControllerMotion *controller, static void canvas_leave(GtkEventControllerMotion *controller,
gpointer data) { GdkCrossingMode crossing_mode, gpointer data) {
struct wd_state *state = data; struct wd_state *state = data;
struct wd_render_head_data *render; struct wd_render_head_data *render;
wl_list_for_each(render, &state->render.heads, link) { wl_list_for_each(render, &state->render.heads, link) {
@ -832,7 +1108,7 @@ static gboolean canvas_scroll(GtkEventControllerScroll *controller,
gdouble delta_x, gdouble delta_y, gpointer data) { gdouble delta_x, gdouble delta_y, gpointer data) {
struct wd_state *state = data; struct wd_state *state = data;
GdkEvent *event = gtk_get_current_event(); GdkEvent *event = gtk_get_current_event();
GdkModifierType mod_state = event->scroll.state; GdkModifierType mod_state = gdk_event_get_modifier_state(event);
if (mod_state & GDK_CONTROL_MASK) { if (mod_state & GDK_CONTROL_MASK) {
if (delta_y) if (delta_y)
@ -850,8 +1126,8 @@ static gboolean canvas_scroll(GtkEventControllerScroll *controller,
return TRUE; return TRUE;
} }
static void canvas_resize(GtkWidget *widget, GdkRectangle *allocation, static void canvas_resize(GtkWidget *widget, gint width, gint height,
gpointer data) { gint baseline, gpointer data) {
struct wd_state *state = data; struct wd_state *state = data;
update_scroll_size(state); update_scroll_size(state);
} }
@ -916,25 +1192,6 @@ static void overlay_selected(GSimpleAction *action, GVariant *param, gpointer da
} }
} }
static void window_state_changed(GtkWidget *window, GdkEventWindowState *event,
gpointer data) {
struct wd_state *state = data;
if (event->changed_mask & GDK_WINDOW_STATE_FULLSCREEN) {
g_object_ref(state->header_stack);
GtkWidget *container = gtk_widget_get_parent(state->header_stack);
gtk_container_remove(GTK_CONTAINER(container), state->header_stack);
if (event->new_window_state & GDK_WINDOW_STATE_FULLSCREEN) {
gtk_container_add(GTK_CONTAINER(state->main_box), state->header_stack);
gtk_box_reorder_child(GTK_BOX(state->main_box), state->header_stack, 0);
} else {
gtk_widget_unrealize(window);
gtk_window_set_titlebar(GTK_WINDOW(window), state->header_stack);
gtk_widget_map(window);
}
g_object_unref(state->header_stack);
}
}
static void activate(GtkApplication* app, gpointer user_data) { static void activate(GtkApplication* app, gpointer user_data) {
GdkDisplay *gdk_display = gdk_display_get_default(); GdkDisplay *gdk_display = gdk_display_get_default();
if (!GDK_IS_WAYLAND_DISPLAY(gdk_display)) { if (!GDK_IS_WAYLAND_DISPLAY(gdk_display)) {
@ -948,19 +1205,19 @@ static void activate(GtkApplication* app, gpointer user_data) {
state->reset_idle = -1; state->reset_idle = -1;
GtkCssProvider *css_provider = gtk_css_provider_new(); GtkCssProvider *css_provider = gtk_css_provider_new();
gtk_css_provider_load_from_resource(css_provider, gtk_css_provider_load_from_resource(css_provider, "/style.css");
WDISPLAYS_RESOURCE_PREFIX "/style.css"); gtk_style_context_add_provider_for_display(gdk_display, GTK_STYLE_PROVIDER(css_provider),
gtk_style_context_add_provider_for_screen(gdk_screen_get_default(), GTK_STYLE_PROVIDER(css_provider),
GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
state->grab_cursor = gdk_cursor_new_from_name(gdk_display, "grab"); GdkCursor *default_cursor = gdk_cursor_new_from_name("default", NULL);
state->grabbing_cursor = gdk_cursor_new_from_name(gdk_display, "grabbing"); state->grab_cursor = gdk_cursor_new_from_name("grab", default_cursor);
state->move_cursor = gdk_cursor_new_from_name(gdk_display, "move"); state->grabbing_cursor = gdk_cursor_new_from_name("grabbing", default_cursor);
state->move_cursor = gdk_cursor_new_from_name("move", default_cursor);
g_object_unref(default_cursor);
GtkBuilder *builder = gtk_builder_new_from_resource( GtkBuilder *builder = gtk_builder_new_from_resource("/wdisplays.ui");
WDISPLAYS_RESOURCE_PREFIX "/wdisplays.ui");
GtkWidget *window = GTK_WIDGET(gtk_builder_get_object(builder, "heads_window")); GtkWidget *window = GTK_WIDGET(gtk_builder_get_object(builder, "heads_window"));
state->main_box = GTK_WIDGET(gtk_builder_get_object(builder, "main_box")); GtkWidget *paned = GTK_WIDGET(gtk_builder_get_object(builder, "paned"));
state->header_stack = GTK_WIDGET(gtk_builder_get_object(builder, "header_stack")); state->header_stack = GTK_WIDGET(gtk_builder_get_object(builder, "header_stack"));
state->stack_switcher = GTK_WIDGET(gtk_builder_get_object(builder, "heads_stack_switcher")); state->stack_switcher = GTK_WIDGET(gtk_builder_get_object(builder, "heads_stack_switcher"));
state->stack = GTK_WIDGET(gtk_builder_get_object(builder, "heads_stack")); state->stack = GTK_WIDGET(gtk_builder_get_object(builder, "heads_stack"));
@ -974,35 +1231,30 @@ static void activate(GtkApplication* app, gpointer user_data) {
state->info_label = GTK_WIDGET(gtk_builder_get_object(builder, "heads_info_label")); state->info_label = GTK_WIDGET(gtk_builder_get_object(builder, "heads_info_label"));
state->menu_button = GTK_WIDGET(gtk_builder_get_object(builder, "menu_button")); state->menu_button = GTK_WIDGET(gtk_builder_get_object(builder, "menu_button"));
g_signal_connect(window, "window-state-event", G_CALLBACK(window_state_changed), state);
g_signal_connect(window, "destroy", G_CALLBACK(cleanup), state); g_signal_connect(window, "destroy", G_CALLBACK(cleanup), state);
g_object_set(paned, "shrink-child1", FALSE, "shrink-child2", FALSE, NULL);
state->canvas = wd_gl_viewport_new(); state->canvas = wd_gl_viewport_new();
gtk_widget_add_events(state->canvas, GDK_POINTER_MOTION_MASK gtk_widget_set_hexpand(state->canvas, TRUE);
| GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_SCROLL_MASK gtk_widget_set_vexpand(state->canvas, TRUE);
| GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK);
g_signal_connect(state->canvas, "realize", G_CALLBACK(canvas_realize), state); g_signal_connect(state->canvas, "realize", G_CALLBACK(canvas_realize), state);
g_signal_connect(state->canvas, "render", G_CALLBACK(canvas_render), state); g_signal_connect(state->canvas, "render", G_CALLBACK(canvas_render), state);
g_signal_connect(state->canvas, "unrealize", G_CALLBACK(canvas_unrealize), state); g_signal_connect(state->canvas, "unrealize", G_CALLBACK(canvas_unrealize), state);
g_signal_connect(state->canvas, "size-allocate", G_CALLBACK(canvas_resize), state); g_signal_connect(state->canvas, "size-allocate", G_CALLBACK(canvas_resize), state);
gtk_gl_area_set_required_version(GTK_GL_AREA(state->canvas), 2, 0); gtk_gl_area_set_required_version(GTK_GL_AREA(state->canvas), 2, 0);
gtk_gl_area_set_use_es(GTK_GL_AREA(state->canvas), TRUE); gtk_gl_area_set_use_es(GTK_GL_AREA(state->canvas), TRUE);
gtk_gl_area_set_has_alpha(GTK_GL_AREA(state->canvas), TRUE);
gtk_gl_area_set_auto_render(GTK_GL_AREA(state->canvas), state->capture); gtk_gl_area_set_auto_render(GTK_GL_AREA(state->canvas), state->capture);
GtkGesture *canvas_drag1_controller = gtk_gesture_drag_new(state->canvas); GtkGesture *canvas_drag_controller = gtk_gesture_drag_new();
GtkGesture *canvas_drag2_controller = gtk_gesture_drag_new(state->canvas); gtk_widget_add_controller(state->canvas, GTK_EVENT_CONTROLLER(canvas_drag_controller));
gtk_gesture_single_set_button(GTK_GESTURE_SINGLE(canvas_drag2_controller), 2); GtkEventController *canvas_motion_controller = gtk_event_controller_motion_new();
GtkEventController *canvas_motion_controller = gtk_event_controller_motion_new(state->canvas); gtk_widget_add_controller(state->canvas, canvas_motion_controller);
gtk_event_controller_set_propagation_phase(canvas_motion_controller, GTK_PHASE_CAPTURE); GtkEventController *canvas_scroll_controller = gtk_event_controller_scroll_new(GTK_EVENT_CONTROLLER_SCROLL_BOTH_AXES);
GtkEventController *canvas_scroll_controller = gtk_event_controller_scroll_new(state->canvas, GTK_EVENT_CONTROLLER_SCROLL_BOTH_AXES); gtk_widget_add_controller(state->canvas, canvas_scroll_controller);
gtk_event_controller_set_propagation_phase(canvas_scroll_controller, GTK_PHASE_CAPTURE); g_signal_connect(canvas_drag_controller, "drag-begin", G_CALLBACK(canvas_drag_begin), state);
g_signal_connect(canvas_drag1_controller, "drag-begin", G_CALLBACK(canvas_drag1_begin), state); g_signal_connect(canvas_drag_controller, "drag-update", G_CALLBACK(canvas_drag_update), state);
g_signal_connect(canvas_drag1_controller, "drag-update", G_CALLBACK(canvas_drag1_update), state); g_signal_connect(canvas_drag_controller, "drag-end", G_CALLBACK(canvas_drag_end), state);
g_signal_connect(canvas_drag1_controller, "drag-end", G_CALLBACK(canvas_drag1_end), state);
g_signal_connect(canvas_drag2_controller, "drag-begin", G_CALLBACK(canvas_drag2_begin), state);
g_signal_connect(canvas_drag2_controller, "drag-update", G_CALLBACK(canvas_drag2_update), state);
g_signal_connect(canvas_drag2_controller, "drag-end", G_CALLBACK(canvas_drag2_end), state);
g_signal_connect(canvas_motion_controller, "enter", G_CALLBACK(canvas_enter), state); g_signal_connect(canvas_motion_controller, "enter", G_CALLBACK(canvas_enter), state);
g_signal_connect(canvas_motion_controller, "leave", G_CALLBACK(canvas_leave), state); g_signal_connect(canvas_motion_controller, "leave", G_CALLBACK(canvas_leave), state);
g_signal_connect(canvas_motion_controller, "motion", G_CALLBACK(canvas_motion), state); g_signal_connect(canvas_motion_controller, "motion", G_CALLBACK(canvas_motion), state);
@ -1076,7 +1328,7 @@ static void activate(GtkApplication* app, gpointer user_data) {
if (state->xdg_output_manager == NULL) { if (state->xdg_output_manager == NULL) {
wd_fatal_error(1, "Compositor doesn't support xdg-output-unstable-v1"); wd_fatal_error(1, "Compositor doesn't support xdg-output-unstable-v1");
} }
if (state->copy_manager == NULL && state->export_manager == NULL) { if (state->copy_manager == NULL) {
state->capture = FALSE; state->capture = FALSE;
g_simple_action_set_state(capture_action, g_variant_new_boolean(state->capture)); g_simple_action_set_state(capture_action, g_variant_new_boolean(state->capture));
g_simple_action_set_enabled(capture_action, FALSE); g_simple_action_set_enabled(capture_action, FALSE);
@ -1097,14 +1349,14 @@ static void activate(GtkApplication* app, gpointer user_data) {
g_signal_connect(gdk_display, "monitor-removed", G_CALLBACK(monitor_removed), state); g_signal_connect(gdk_display, "monitor-removed", G_CALLBACK(monitor_removed), state);
gtk_application_add_window(app, GTK_WINDOW(window)); gtk_application_add_window(app, GTK_WINDOW(window));
gtk_widget_show_all(window);
g_object_unref(builder); g_object_unref(builder);
update_tick_callback(state); update_tick_callback(state);
gtk_window_present(GTK_WINDOW(window));
} }
// END GLOBAL CALLBACKS // END GLOBAL CALLBACKS
int main(int argc, char *argv[]) { int main(int argc, char *argv[]) {
g_setenv("GDK_GL", "gles", FALSE);
GtkApplication *app = gtk_application_new(WDISPLAYS_APP_ID, G_APPLICATION_FLAGS_NONE); GtkApplication *app = gtk_application_new(WDISPLAYS_APP_ID, G_APPLICATION_FLAGS_NONE);
g_signal_connect(app, "activate", G_CALLBACK(activate), NULL); g_signal_connect(app, "activate", G_CALLBACK(activate), NULL);
int status = g_application_run(G_APPLICATION(app), argc, argv); int status = g_application_run(G_APPLICATION(app), argc, argv);

19
src/meson.build
View File

@ -1,14 +1,11 @@
# SPDX-FileCopyrightText: 2020 Jason Francis <jason@cycles.network>
# SPDX-License-Identifier: CC0-1.0
cc = meson.get_compiler('c') cc = meson.get_compiler('c')
m_dep = cc.find_library('m', required : false) m_dep = cc.find_library('m', required : false)
rt_dep = cc.find_library('rt', required : false) rt_dep = cc.find_library('rt', required : false)
gdk = dependency('gdk-3.0', version: '>= 3.24') gtk = dependency('gtk4')
gtk = dependency('gtk+-3.0', version: '>= 3.24') assert(gtk.get_pkgconfig_variable('targets').split().contains('wayland'), 'Wayland GDK backend not present')
assert(gdk.get_pkgconfig_variable('targets').split().contains('wayland'), 'Wayland GDK backend not present')
epoxy = dependency('epoxy') epoxy = dependency('epoxy')
libdrm = dependency('libdrm') gmodule_export = dependency('gmodule-export-2.0')
configure_file(input: 'config.h.in', output: 'config.h', configuration: conf) configure_file(input: 'config.h.in', output: 'config.h', configuration: conf)
@ -16,11 +13,10 @@ executable(
'wdisplays', 'wdisplays',
[ [
'main.c', 'main.c',
'glviewport.c',
'headform.c',
'outputs.c', 'outputs.c',
'overlay.c',
'render.c', 'render.c',
'glviewport.c',
#'overlay.c',
resources, resources,
], ],
dependencies : [ dependencies : [
@ -29,8 +25,9 @@ executable(
wayland_client, wayland_client,
client_protos, client_protos,
epoxy, epoxy,
libdrm, gtk,
gtk gmodule_export
], ],
c_args: ['-DGDK_DISABLE_DEPRECATED', '-DGTK_DISABLE_DEPRECATED'],
install: true install: true
) )

195
src/outputs.c
View File

@ -1,7 +1,6 @@
/* SPDX-FileCopyrightText: 2019 Jason Francis <jason@cycles.network> /* SPDX-License-Identifier: MIT */
* SPDX-License-Identifier: GPL-3.0-or-later */ /* Copyright (C) 2019 cyclopsian
/* SPDX-FileCopyrightText: 2017-2019 Simon Ser * Copyright (C) 2017-2019 emersion */
* SPDX-License-Identifier: MIT */
/* /*
* Parts of this file are taken from emersion/kanshi: * Parts of this file are taken from emersion/kanshi:
@ -25,8 +24,6 @@
#include "wlr-output-management-unstable-v1-client-protocol.h" #include "wlr-output-management-unstable-v1-client-protocol.h"
#include "xdg-output-unstable-v1-client-protocol.h" #include "xdg-output-unstable-v1-client-protocol.h"
#include "linux-dmabuf-unstable-v1-client-protocol.h"
#include "wlr-export-dmabuf-unstable-v1-client-protocol.h"
#include "wlr-screencopy-unstable-v1-client-protocol.h" #include "wlr-screencopy-unstable-v1-client-protocol.h"
#include "wlr-layer-shell-unstable-v1-client-protocol.h" #include "wlr-layer-shell-unstable-v1-client-protocol.h"
@ -145,18 +142,15 @@ void wd_apply_state(struct wd_state *state, struct wl_list *new_outputs,
static void wd_frame_destroy(struct wd_frame *frame) { static void wd_frame_destroy(struct wd_frame *frame) {
if (frame->pixels != NULL) if (frame->pixels != NULL)
munmap(frame->pixels, frame->height * frame->strides[0]); munmap(frame->pixels, frame->height * frame->stride);
if (frame->buffer != NULL) if (frame->buffer != NULL)
wl_buffer_destroy(frame->buffer); wl_buffer_destroy(frame->buffer);
if (frame->pool != NULL) if (frame->pool != NULL)
wl_shm_pool_destroy(frame->pool); wl_shm_pool_destroy(frame->pool);
for (int i = 0; i < frame->n_planes; i++) if (frame->capture_fd != -1)
if (frame->fds[i]) close(frame->capture_fd);
close(frame->fds[i]); if (frame->wlr_frame != NULL)
if (frame->copy_frame != NULL) zwlr_screencopy_frame_v1_destroy(frame->wlr_frame);
zwlr_screencopy_frame_v1_destroy(frame->copy_frame);
if (frame->export_frame != NULL)
zwlr_export_dmabuf_frame_v1_destroy(frame->export_frame);
wl_list_remove(&frame->link); wl_list_remove(&frame->link);
free(frame); free(frame);
@ -194,112 +188,6 @@ static int create_shm_file(size_t size, const char *fmt, ...) {
return fd; return fd;
} }
static void make_frame_current(struct wd_frame *frame,
uint32_t tv_sec_hi, uint32_t tv_sec_lo, uint32_t tv_nsec) {
uint64_t tv_sec = (uint64_t) tv_sec_hi << 32 | tv_sec_lo;
frame->tick = (tv_sec * 1000000) + (tv_nsec / 1000);
struct wd_frame *frame_iter, *frame_tmp;
wl_list_for_each_safe(frame_iter, frame_tmp, &frame->output->frames, link) {
if (frame != frame_iter) {
wd_frame_destroy(frame_iter);
}
}
}
#define WD_FRAME_COPY 0x100
static void export_frame(void *data,
struct zwlr_export_dmabuf_frame_v1 *wlr_frame,
uint32_t width, uint32_t height, uint32_t offset_x, uint32_t offset_y,
uint32_t buffer_flags, uint32_t flags, uint32_t format,
uint32_t mod_high, uint32_t mod_low, uint32_t num_objects) {
struct wd_frame *frame = data;
frame->width = width;
frame->height = height;
frame->format = format;
frame->flags = buffer_flags;
/*
if (flags & ZWLR_EXPORT_DMABUF_FRAME_V1_FLAGS_TRANSIENT) {
frame->flags |= WD_FRAME_COPY;
}
*/
frame->modifier = ((uint64_t) mod_high << 32) | mod_low;
frame->n_planes = num_objects;
}
static void export_object(void *data,
struct zwlr_export_dmabuf_frame_v1 *wlr_frame,
uint32_t index, int32_t fd, uint32_t size, uint32_t offset,
uint32_t stride, uint32_t plane_index) {
struct wd_frame *frame = data;
if (frame->flags & WD_FRAME_COPY) {
void *src = NULL;
void *dest = NULL;
int wfd = create_shm_file(size, "/wd-%s", frame->output->name);
if (wfd == -1) {
goto done;
}
src = mmap(NULL, size, PROT_READ, MAP_PRIVATE, fd, offset);
if (src == MAP_FAILED) {
fprintf(stderr, "mmap: %d: %s\n", fd, strerror(errno));
close(wfd);
wfd = -1;
goto done;
}
dest = mmap(NULL, size - offset, PROT_READ | PROT_WRITE,
MAP_PRIVATE, wfd, 0);
if (dest == MAP_FAILED) {
fprintf(stderr, "mmap: %d: %s\n", wfd, strerror(errno));
close(wfd);
wfd = -1;
goto done;
}
memcpy(dest, src, size - offset);
done:
if (src)
munmap(src, size);
if (dest)
munmap(dest, size - offset);
close(fd);
frame->fds[plane_index] = wfd;
} else {
frame->fds[plane_index] = fd;
frame->offsets[plane_index] = offset;
}
frame->strides[plane_index] = stride;
}
static void export_ready(void *data,
struct zwlr_export_dmabuf_frame_v1 *wlr_frame,
uint32_t tv_sec_hi, uint32_t tv_sec_lo, uint32_t tv_nsec) {
struct wd_frame *frame = data;
make_frame_current(frame, tv_sec_hi, tv_sec_lo, tv_nsec);
if (frame->flags & WD_FRAME_COPY) {
frame->flags ^= WD_FRAME_COPY;
zwlr_export_dmabuf_frame_v1_destroy(frame->export_frame);
frame->export_frame = NULL;
}
frame->ready = true;
}
static void export_cancel(void *data,
struct zwlr_export_dmabuf_frame_v1 *wlr_frame,
uint32_t reason) {
struct wd_frame *frame = data;
wd_frame_destroy(frame);
}
static struct zwlr_export_dmabuf_frame_v1_listener export_listener = {
.frame = export_frame,
.object = export_object,
.ready = export_ready,
.cancel = export_cancel
};
static void capture_buffer(void *data, static void capture_buffer(void *data,
struct zwlr_screencopy_frame_v1 *copy_frame, struct zwlr_screencopy_frame_v1 *copy_frame,
uint32_t format, uint32_t width, uint32_t height, uint32_t stride) { uint32_t format, uint32_t width, uint32_t height, uint32_t stride) {
@ -310,23 +198,22 @@ static void capture_buffer(void *data,
goto err; goto err;
} }
frame->n_planes = 1;
size_t size = stride * height; size_t size = stride * height;
frame->fds[0] = create_shm_file(size, "/wd-%s", frame->output->name); frame->capture_fd = create_shm_file(size, "/wd-%s", frame->output->name);
if (frame->fds[0] == -1) { if (frame->capture_fd == -1) {
goto err; goto err;
} }
frame->pool = wl_shm_create_pool(frame->output->state->shm, frame->pool = wl_shm_create_pool(frame->output->state->shm,
frame->fds[0], size); frame->capture_fd, size);
frame->buffer = wl_shm_pool_create_buffer(frame->pool, 0, frame->buffer = wl_shm_pool_create_buffer(frame->pool, 0,
width, height, stride, format); width, height, stride, format);
zwlr_screencopy_frame_v1_copy(copy_frame, frame->buffer); zwlr_screencopy_frame_v1_copy(copy_frame, frame->buffer);
frame->offsets[0] = 0; frame->stride = stride;
frame->strides[0] = stride;
frame->width = width; frame->width = width;
frame->height = height; frame->height = height;
frame->format = format; frame->swap_rgb = format == WL_SHM_FORMAT_ABGR8888
|| format == WL_SHM_FORMAT_XBGR8888;
return; return;
err: err:
@ -337,9 +224,7 @@ static void capture_flags(void *data,
struct zwlr_screencopy_frame_v1 *wlr_frame, struct zwlr_screencopy_frame_v1 *wlr_frame,
uint32_t flags) { uint32_t flags) {
struct wd_frame *frame = data; struct wd_frame *frame = data;
if (flags & ZWLR_SCREENCOPY_FRAME_V1_FLAGS_Y_INVERT) { frame->y_invert = !!(flags & ZWLR_SCREENCOPY_FRAME_V1_FLAGS_Y_INVERT);
frame->flags |= ZWP_LINUX_BUFFER_PARAMS_V1_FLAGS_Y_INVERT;
}
} }
static void capture_ready(void *data, static void capture_ready(void *data,
@ -347,20 +232,27 @@ static void capture_ready(void *data,
uint32_t tv_sec_hi, uint32_t tv_sec_lo, uint32_t tv_nsec) { uint32_t tv_sec_hi, uint32_t tv_sec_lo, uint32_t tv_nsec) {
struct wd_frame *frame = data; struct wd_frame *frame = data;
frame->pixels = mmap(NULL, frame->strides[0] * frame->height, frame->pixels = mmap(NULL, frame->stride * frame->height,
PROT_READ, MAP_SHARED, frame->fds[0], 0); PROT_READ, MAP_SHARED, frame->capture_fd, 0);
if (frame->pixels == MAP_FAILED) { if (frame->pixels == MAP_FAILED) {
frame->pixels = NULL; frame->pixels = NULL;
fprintf(stderr, "mmap: %d: %s\n", frame->fds[0], strerror(errno)); fprintf(stderr, "mmap: %d: %s\n", frame->capture_fd, strerror(errno));
wd_frame_destroy(frame); wd_frame_destroy(frame);
return; return;
} else {
uint64_t tv_sec = (uint64_t) tv_sec_hi << 32 | tv_sec_lo;
frame->tick = (tv_sec * 1000000) + (tv_nsec / 1000);
} }
make_frame_current(frame, tv_sec_hi, tv_sec_lo, tv_nsec); zwlr_screencopy_frame_v1_destroy(frame->wlr_frame);
frame->wlr_frame = NULL;
zwlr_screencopy_frame_v1_destroy(frame->copy_frame); struct wd_frame *frame_iter, *frame_tmp;
frame->copy_frame = NULL; wl_list_for_each_safe(frame_iter, frame_tmp, &frame->output->frames, link) {
frame->ready = true; if (frame != frame_iter) {
wd_frame_destroy(frame_iter);
}
}
} }
static void capture_failed(void *data, static void capture_failed(void *data,
@ -381,7 +273,7 @@ static bool has_pending_captures(struct wd_state *state) {
wl_list_for_each(output, &state->outputs, link) { wl_list_for_each(output, &state->outputs, link) {
struct wd_frame *frame; struct wd_frame *frame;
wl_list_for_each(frame, &output->frames, link) { wl_list_for_each(frame, &output->frames, link) {
if (!frame->ready) { if (frame->pixels == NULL) {
return true; return true;
} }
} }
@ -390,8 +282,8 @@ static bool has_pending_captures(struct wd_state *state) {
} }
void wd_capture_frame(struct wd_state *state) { void wd_capture_frame(struct wd_state *state) {
if ((state->export_manager == NULL && state->copy_manager == NULL) if (state->copy_manager == NULL || has_pending_captures(state)
|| has_pending_captures(state) || !state->capture) { || !state->capture) {
return; return;
} }
@ -399,21 +291,12 @@ void wd_capture_frame(struct wd_state *state) {
wl_list_for_each(output, &state->outputs, link) { wl_list_for_each(output, &state->outputs, link) {
struct wd_frame *frame = calloc(1, sizeof(*frame)); struct wd_frame *frame = calloc(1, sizeof(*frame));
frame->output = output; frame->output = output;
for (int i = 0; i < WD_MAX_PLANES; i++) frame->capture_fd = -1;
frame->fds[i] = -1; frame->wlr_frame =
if (state->export_manager) {
frame->export_frame =
zwlr_export_dmabuf_manager_v1_capture_output(state->export_manager, 1,
output->wl_output);
zwlr_export_dmabuf_frame_v1_add_listener(frame->export_frame,
&export_listener, frame);
} else if (state->copy_manager) {
frame->copy_frame =
zwlr_screencopy_manager_v1_capture_output(state->copy_manager, 1, zwlr_screencopy_manager_v1_capture_output(state->copy_manager, 1,
output->wl_output); output->wl_output);
zwlr_screencopy_frame_v1_add_listener(frame->copy_frame, zwlr_screencopy_frame_v1_add_listener(frame->wlr_frame, &capture_listener,
&capture_listener, frame); frame);
}
wl_list_insert(&output->frames, &frame->link); wl_list_insert(&output->frames, &frame->link);
} }
} }
@ -656,9 +539,6 @@ static void registry_handle_global(void *data, struct wl_registry *registry,
} else if (strcmp(interface, zxdg_output_manager_v1_interface.name) == 0) { } else if (strcmp(interface, zxdg_output_manager_v1_interface.name) == 0) {
state->xdg_output_manager = wl_registry_bind(registry, name, state->xdg_output_manager = wl_registry_bind(registry, name,
&zxdg_output_manager_v1_interface, version); &zxdg_output_manager_v1_interface, version);
} else if(strcmp(interface, zwlr_export_dmabuf_manager_v1_interface.name) == 0) {
state->export_manager = wl_registry_bind(registry, name,
&zwlr_export_dmabuf_manager_v1_interface, version);
} else if(strcmp(interface, zwlr_screencopy_manager_v1_interface.name) == 0) { } else if(strcmp(interface, zwlr_screencopy_manager_v1_interface.name) == 0) {
state->copy_manager = wl_registry_bind(registry, name, state->copy_manager = wl_registry_bind(registry, name,
&zwlr_screencopy_manager_v1_interface, version); &zwlr_screencopy_manager_v1_interface, version);
@ -808,9 +688,6 @@ void wd_state_destroy(struct wd_state *state) {
if (state->layer_shell != NULL) { if (state->layer_shell != NULL) {
zwlr_layer_shell_v1_destroy(state->layer_shell); zwlr_layer_shell_v1_destroy(state->layer_shell);
} }
if (state->export_manager != NULL) {
zwlr_export_dmabuf_manager_v1_destroy(state->export_manager);
}
if (state->copy_manager != NULL) { if (state->copy_manager != NULL) {
zwlr_screencopy_manager_v1_destroy(state->copy_manager); zwlr_screencopy_manager_v1_destroy(state->copy_manager);
} }

41
src/overlay.c
View File

@ -1,5 +1,5 @@
/* SPDX-FileCopyrightText: 2020 Jason Francis <jason@cycles.network> /* SPDX-License-Identifier: MIT */
* SPDX-License-Identifier: GPL-3.0-or-later */ /* Copyright (C) 2019 cyclopsian */
#define _GNU_SOURCE #define _GNU_SOURCE
#include <string.h> #include <string.h>
@ -7,7 +7,7 @@
#include <errno.h> #include <errno.h>
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include <gdk/gdkwayland.h> #include <gdk/wayland/gdkwayland.h>
#include "wdisplays.h" #include "wdisplays.h"
@ -39,8 +39,8 @@ static inline int min(int a, int b) {
static PangoLayout *create_text_layout(struct wd_head *head, static PangoLayout *create_text_layout(struct wd_head *head,
PangoContext *pango, GtkStyleContext *style) { PangoContext *pango, GtkStyleContext *style) {
GtkStyleContext *desc_style = gtk_style_context_new(); GtkStyleContext *desc_style = gtk_style_context_new();
gtk_style_context_set_screen(desc_style, gtk_style_context_set_display(desc_style,
gtk_style_context_get_screen(style)); gtk_style_context_get_display(style));
GtkWidgetPath *desc_path = gtk_widget_path_copy( GtkWidgetPath *desc_path = gtk_widget_path_copy(
gtk_style_context_get_path(style)); gtk_style_context_get_path(style));
gtk_widget_path_append_type(desc_path, G_TYPE_NONE); gtk_widget_path_append_type(desc_path, G_TYPE_NONE);
@ -48,8 +48,7 @@ static PangoLayout *create_text_layout(struct wd_head *head,
gtk_style_context_add_class(desc_style, "description"); gtk_style_context_add_class(desc_style, "description");
double desc_font_size = 16.; double desc_font_size = 16.;
gtk_style_context_get(desc_style, GTK_STATE_FLAG_NORMAL, gtk_style_context_get(desc_style, "font-size", &desc_font_size, NULL);
"font-size", &desc_font_size, NULL);
g_autofree gchar *str = g_strdup_printf("%s\n<span size=\"%d\">%s</span>", g_autofree gchar *str = g_strdup_printf("%s\n<span size=\"%d\">%s</span>",
head->name, (int) (desc_font_size * PANGO_SCALE), head->description); head->name, (int) (desc_font_size * PANGO_SCALE), head->description);
@ -70,7 +69,7 @@ static void resize(struct wd_output *output) {
} }
uint32_t margin = min(screen_width, screen_height) * SCREEN_MARGIN_PERCENT; uint32_t margin = min(screen_width, screen_height) * SCREEN_MARGIN_PERCENT;
GdkWindow *window = gtk_widget_get_window(output->overlay_window); GdkSurface *surface = gtk_widget_get_surface(output->overlay_window);
PangoContext *pango = gtk_widget_get_pango_context(output->overlay_window); PangoContext *pango = gtk_widget_get_pango_context(output->overlay_window);
GtkStyleContext *style_ctx = gtk_widget_get_style_context( GtkStyleContext *style_ctx = gtk_widget_get_style_context(
output->overlay_window); output->overlay_window);
@ -83,7 +82,7 @@ static void resize(struct wd_output *output) {
GtkBorder padding; GtkBorder padding;
gtk_style_context_get_padding(style_ctx, GTK_STATE_FLAG_NORMAL, &padding); gtk_style_context_get_padding(style_ctx, &padding);
width = min(width, screen_width - margin * 2) width = min(width, screen_width - margin * 2)
+ padding.left + padding.right; + padding.left + padding.right;
@ -95,10 +94,10 @@ static void resize(struct wd_output *output) {
zwlr_layer_surface_v1_set_size(output->overlay_layer_surface, zwlr_layer_surface_v1_set_size(output->overlay_layer_surface,
width, height); width, height);
struct wl_surface *surface = gdk_wayland_window_get_wl_surface(window); struct wl_surface *wl_surface = gdk_wayland_surface_get_wl_surface(surface);
wl_surface_commit(surface); wl_surface_commit(wl_surface);
GdkDisplay *display = gdk_window_get_display(window); GdkDisplay *display = gdk_surface_get_display(surface);
wl_display_roundtrip(gdk_wayland_display_get_wl_display(display)); wl_display_roundtrip(gdk_wayland_display_get_wl_display(display));
} }
@ -110,22 +109,23 @@ void wd_redraw_overlay(struct wd_output *output) {
} }
void window_realize(GtkWidget *widget, gpointer data) { void window_realize(GtkWidget *widget, gpointer data) {
GdkWindow *window = gtk_widget_get_window(widget); //FIXME - custom surfaces in GTK4 wayland?
gdk_wayland_window_set_use_custom_surface(window); GdkSurface *surface = gtk_widget_get_surface(widget);
gdk_wayland_surface_set_use_custom_surface(surface);
} }
void window_map(GtkWidget *widget, gpointer data) { void window_map(GtkWidget *widget, gpointer data) {
struct wd_output *output = data; struct wd_output *output = data;
GdkWindow *window = gtk_widget_get_window(widget); GdkSurface *surface = gtk_widget_get_surface(widget);
cairo_region_t *region = cairo_region_create(); cairo_region_t *region = cairo_region_create();
gdk_window_input_shape_combine_region(window, region, 0, 0); gdk_surface_input_shape_combine_region(surface, region, 0, 0);
cairo_region_destroy(region); cairo_region_destroy(region);
struct wl_surface *surface = gdk_wayland_window_get_wl_surface(window); struct wl_surface *wl_surface = gdk_wayland_surface_get_wl_surface(surface);
output->overlay_layer_surface = zwlr_layer_shell_v1_get_layer_surface( output->overlay_layer_surface = zwlr_layer_shell_v1_get_layer_surface(
output->state->layer_shell, surface, output->wl_output, output->state->layer_shell, wl_surface, output->wl_output,
ZWLR_LAYER_SHELL_V1_LAYER_TOP, "output-overlay"); ZWLR_LAYER_SHELL_V1_LAYER_TOP, "output-overlay");
zwlr_layer_surface_v1_add_listener(output->overlay_layer_surface, zwlr_layer_surface_v1_add_listener(output->overlay_layer_surface,
@ -149,14 +149,14 @@ gboolean window_draw(GtkWidget *widget, cairo_t *cr, gpointer data) {
GtkStyleContext *style_ctx = gtk_widget_get_style_context(widget); GtkStyleContext *style_ctx = gtk_widget_get_style_context(widget);
GdkRGBA fg; GdkRGBA fg;
gtk_style_context_get_color(style_ctx, GTK_STATE_FLAG_NORMAL, &fg); gtk_style_context_get_color(style_ctx, &fg);
int width = gtk_widget_get_allocated_width(widget); int width = gtk_widget_get_allocated_width(widget);
int height = gtk_widget_get_allocated_height(widget); int height = gtk_widget_get_allocated_height(widget);
gtk_render_background(style_ctx, cr, 0, 0, width, height); gtk_render_background(style_ctx, cr, 0, 0, width, height);
GtkBorder padding; GtkBorder padding;
gtk_style_context_get_padding(style_ctx, GTK_STATE_FLAG_NORMAL, &padding); gtk_style_context_get_padding(style_ctx, &padding);
PangoContext *pango = gtk_widget_get_pango_context(widget); PangoContext *pango = gtk_widget_get_pango_context(widget);
PangoLayout *layout = create_text_layout(head, pango, style_ctx); PangoLayout *layout = create_text_layout(head, pango, style_ctx);
@ -171,7 +171,6 @@ void wd_create_overlay(struct wd_output *output) {
output->overlay_window = gtk_window_new(GTK_WINDOW_TOPLEVEL); output->overlay_window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_window_set_decorated(GTK_WINDOW(output->overlay_window), FALSE); gtk_window_set_decorated(GTK_WINDOW(output->overlay_window), FALSE);
gtk_window_set_resizable(GTK_WINDOW(output->overlay_window), FALSE); gtk_window_set_resizable(GTK_WINDOW(output->overlay_window), FALSE);
gtk_widget_add_events(output->overlay_window, GDK_STRUCTURE_MASK);
g_signal_connect(output->overlay_window, "realize", g_signal_connect(output->overlay_window, "realize",
G_CALLBACK(window_realize), output); G_CALLBACK(window_realize), output);

227
src/render.c
View File

@ -1,24 +1,13 @@
/* SPDX-FileCopyrightText: 2020 Jason Francis <jason@cycles.network> /* SPDX-License-Identifier: MIT */
* SPDX-License-Identifier: GPL-3.0-or-later */ /* Copyright (C) 2019 cyclopsian */
/* SPDX-FileCopyrightText: 2018 Simon Ser
* SPDX-FileCopyrightText: 2018 Guido Günther
* SPDX-License-Identifier: MIT */
/* Parts of this file are taken from swaywm/wlroots:
* https://github.com/swaywm/wlroots/blob/e97c2c3639119831ced4f6b9f704b096c2075973/render/egl.c
*/
#include "wdisplays.h" #include "wdisplays.h"
#define WL_EGL_PLATFORM 1
#include <assert.h>
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include <math.h> #include <math.h>
#include <wayland-util.h>
#include <epoxy/gl.h> #include <epoxy/gl.h>
#include <epoxy/egl.h> #include <wayland-util.h>
#include <drm_fourcc.h>
#define BT_UV_VERT_SIZE (2 + 2) #define BT_UV_VERT_SIZE (2 + 2)
#define BT_UV_QUAD_SIZE (6 * BT_UV_VERT_SIZE) #define BT_UV_QUAD_SIZE (6 * BT_UV_VERT_SIZE)
@ -40,25 +29,22 @@ enum gl_buffers {
NUM_BUFFERS NUM_BUFFERS
}; };
struct wd_gl_texture_program {
GLuint id;
GLuint position_attribute;
GLuint uv_attribute;
GLuint screen_size_uniform;
GLuint texture_uniform;
GLuint color_transform_uniform;
GLuint color_add_uniform;
};
struct wd_gl_data { struct wd_gl_data {
EGLDisplay display;
GLuint color_program; GLuint color_program;
GLuint color_vertex_shader;
GLuint color_fragment_shader;
GLuint color_position_attribute; GLuint color_position_attribute;
GLuint color_color_attribute; GLuint color_color_attribute;
GLuint color_screen_size_uniform; GLuint color_screen_size_uniform;
struct wd_gl_texture_program rgb; GLuint texture_program;
GLuint texture_vertex_shader;
GLuint texture_fragment_shader;
GLuint texture_position_attribute;
GLuint texture_uv_attribute;
GLuint texture_screen_size_uniform;
GLuint texture_texture_uniform;
GLuint texture_color_transform_uniform;
GLuint buffers[NUM_BUFFERS]; GLuint buffers[NUM_BUFFERS];
@ -104,9 +90,8 @@ precision mediump float;\n\
varying vec2 uv_out;\n\ varying vec2 uv_out;\n\
uniform sampler2D texture;\n\ uniform sampler2D texture;\n\
uniform mat4 color_transform;\n\ uniform mat4 color_transform;\n\
uniform vec4 color_add;\n\
void main(void) {\n\ void main(void) {\n\
gl_FragColor = texture2D(texture, uv_out) * color_transform + color_add;\n\ gl_FragColor = texture2D(texture, uv_out) * color_transform;\n\
}"; }";
static GLuint gl_make_shader(GLenum type, const char *src) { static GLuint gl_make_shader(GLenum type, const char *src) {
@ -157,62 +142,18 @@ static void gl_link_and_validate(GLint program) {
} }
} }
static void setup_texture_program(struct wd_gl_texture_program *prog, struct wd_gl_data *wd_gl_setup(void) {
const char *fragment_src) {
prog->id = glCreateProgram();
GLuint vertex_shader = gl_make_shader(GL_VERTEX_SHADER,
texture_vertex_shader_src);
glAttachShader(prog->id, vertex_shader);
GLuint fragment_shader = gl_make_shader(GL_FRAGMENT_SHADER, fragment_src);
glAttachShader(prog->id, fragment_shader);
gl_link_and_validate(prog->id);
glDeleteShader(fragment_shader);
glDeleteShader(vertex_shader);
prog->position_attribute = glGetAttribLocation(prog->id, "position");
prog->uv_attribute = glGetAttribLocation(prog->id, "uv");
prog->screen_size_uniform = glGetUniformLocation(prog->id, "screen_size");
prog->texture_uniform = glGetUniformLocation(prog->id, "texture");
prog->color_transform_uniform = glGetUniformLocation(prog->id,
"color_transform");
prog->color_add_uniform = glGetUniformLocation(prog->id, "color_add");
}
#define assert_ext(_name, _expr) do { \
static bool _tested_##_name = false; \
if (!_tested_##_name) { \
_tested_##_name = true; \
if (!(_expr)) \
wd_fatal_error(1, "Extension " #_name " not found\n"); \
} \
} while (0)
#define assert_gl_ext(_name) \
assert_ext(_name, epoxy_has_gl_extension(#_name))
#define assert_egl_ext(_res, _name) \
assert_ext(_name, epoxy_has_egl_extension((_res)->display, #_name))
struct wd_gl_data *wd_gl_setup(struct wl_display *display) {
struct wd_gl_data *res = calloc(1, sizeof(struct wd_gl_data)); struct wd_gl_data *res = calloc(1, sizeof(struct wd_gl_data));
res->display = eglGetDisplay(display);
res->color_program = glCreateProgram(); res->color_program = glCreateProgram();
GLuint vertex_shader = gl_make_shader(GL_VERTEX_SHADER, res->color_vertex_shader = gl_make_shader(GL_VERTEX_SHADER,
color_vertex_shader_src); color_vertex_shader_src);
glAttachShader(res->color_program, vertex_shader); glAttachShader(res->color_program, res->color_vertex_shader);
GLuint fragment_shader = gl_make_shader(GL_FRAGMENT_SHADER, res->color_fragment_shader = gl_make_shader(GL_FRAGMENT_SHADER,
color_fragment_shader_src); color_fragment_shader_src);
glAttachShader(res->color_program, fragment_shader); glAttachShader(res->color_program, res->color_fragment_shader);
gl_link_and_validate(res->color_program); gl_link_and_validate(res->color_program);
glDeleteShader(fragment_shader);
glDeleteShader(vertex_shader);
setup_texture_program(&res->rgb, texture_fragment_shader_src);
res->color_position_attribute = glGetAttribLocation(res->color_program, res->color_position_attribute = glGetAttribLocation(res->color_program,
"position"); "position");
res->color_color_attribute = glGetAttribLocation(res->color_program, res->color_color_attribute = glGetAttribLocation(res->color_program,
@ -220,6 +161,27 @@ struct wd_gl_data *wd_gl_setup(struct wl_display *display) {
res->color_screen_size_uniform = glGetUniformLocation(res->color_program, res->color_screen_size_uniform = glGetUniformLocation(res->color_program,
"screen_size"); "screen_size");
res->texture_program = glCreateProgram();
res->texture_vertex_shader = gl_make_shader(GL_VERTEX_SHADER,
texture_vertex_shader_src);
glAttachShader(res->texture_program, res->texture_vertex_shader);
res->texture_fragment_shader = gl_make_shader(GL_FRAGMENT_SHADER,
texture_fragment_shader_src);
glAttachShader(res->texture_program, res->texture_fragment_shader);
gl_link_and_validate(res->texture_program);
res->texture_position_attribute = glGetAttribLocation(res->texture_program,
"position");
res->texture_uv_attribute = glGetAttribLocation(res->texture_program,
"uv");
res->texture_screen_size_uniform = glGetUniformLocation(res->texture_program,
"screen_size");
res->texture_texture_uniform = glGetUniformLocation(res->texture_program,
"texture");
res->texture_color_transform_uniform = glGetUniformLocation(
res->texture_program, "color_transform");
glGenBuffers(NUM_BUFFERS, res->buffers); glGenBuffers(NUM_BUFFERS, res->buffers);
glBindBuffer(GL_ARRAY_BUFFER, res->buffers[TEXTURE_BUFFER]); glBindBuffer(GL_ARRAY_BUFFER, res->buffers[TEXTURE_BUFFER]);
glBufferData(GL_ARRAY_BUFFER, BT_UV_MAX * sizeof(float), glBufferData(GL_ARRAY_BUFFER, BT_UV_MAX * sizeof(float),
@ -236,83 +198,6 @@ struct wd_gl_data *wd_gl_setup(struct wl_display *display) {
return res; return res;
} }
EGLImageKHR wd_gl_create_dmabuf_texture(struct wd_gl_data *res,
struct wd_frame *frame) {
assert(!frame->pixels);
assert_egl_ext(res, EGL_KHR_image_base);
assert_egl_ext(res, EGL_EXT_image_dma_buf_import);
bool has_modifier = frame->modifier != DRM_FORMAT_MOD_INVALID
&& frame->modifier != DRM_FORMAT_MOD_LINEAR;
if (has_modifier) {
assert_egl_ext(res, EGL_EXT_image_dma_buf_import_modifiers);
}
unsigned int atti = 0;
EGLint attribs[50];
attribs[atti++] = EGL_WIDTH;
attribs[atti++] = frame->width;
attribs[atti++] = EGL_HEIGHT;
attribs[atti++] = frame->height;
attribs[atti++] = EGL_LINUX_DRM_FOURCC_EXT;
attribs[atti++] = frame->format;
struct {
EGLint fd;
EGLint offset;
EGLint pitch;
EGLint mod_lo;
EGLint mod_hi;
} attr_names[WD_MAX_PLANES] = {
{
EGL_DMA_BUF_PLANE0_FD_EXT,
EGL_DMA_BUF_PLANE0_OFFSET_EXT,
EGL_DMA_BUF_PLANE0_PITCH_EXT,
EGL_DMA_BUF_PLANE0_MODIFIER_LO_EXT,
EGL_DMA_BUF_PLANE0_MODIFIER_HI_EXT
}, {
EGL_DMA_BUF_PLANE1_FD_EXT,
EGL_DMA_BUF_PLANE1_OFFSET_EXT,
EGL_DMA_BUF_PLANE1_PITCH_EXT,
EGL_DMA_BUF_PLANE1_MODIFIER_LO_EXT,
EGL_DMA_BUF_PLANE1_MODIFIER_HI_EXT
}, {
EGL_DMA_BUF_PLANE2_FD_EXT,
EGL_DMA_BUF_PLANE2_OFFSET_EXT,
EGL_DMA_BUF_PLANE2_PITCH_EXT,
EGL_DMA_BUF_PLANE2_MODIFIER_LO_EXT,
EGL_DMA_BUF_PLANE2_MODIFIER_HI_EXT
}, {
EGL_DMA_BUF_PLANE3_FD_EXT,
EGL_DMA_BUF_PLANE3_OFFSET_EXT,
EGL_DMA_BUF_PLANE3_PITCH_EXT,
EGL_DMA_BUF_PLANE3_MODIFIER_LO_EXT,
EGL_DMA_BUF_PLANE3_MODIFIER_HI_EXT
}
};
for (int i=0; i < frame->n_planes; i++) {
attribs[atti++] = attr_names[i].fd;
attribs[atti++] = frame->fds[i];
attribs[atti++] = attr_names[i].offset;
attribs[atti++] = frame->offsets[i];
attribs[atti++] = attr_names[i].pitch;
attribs[atti++] = frame->strides[i];
if (has_modifier) {
attribs[atti++] = attr_names[i].mod_lo;
attribs[atti++] = frame->modifier & 0xFFFFFFFF;
attribs[atti++] = attr_names[i].mod_hi;
attribs[atti++] = frame->modifier >> 32;
}
}
attribs[atti++] = EGL_NONE;
assert(atti < sizeof(attribs)/sizeof(attribs[0]));
return eglCreateImageKHR(res->display, EGL_NO_CONTEXT,
EGL_LINUX_DMA_BUF_EXT, NULL, attribs);
}
static const GLfloat TRANSFORM_RGB[16] = { static const GLfloat TRANSFORM_RGB[16] = {
1, 0, 0, 0, 1, 0, 0, 0,
0, 1, 0, 0, 0, 1, 0, 0,
@ -435,42 +320,34 @@ void wd_gl_render(struct wd_gl_data *res, struct wd_render_data *info,
float screen_size[2] = { info->viewport_width, info->viewport_height }; float screen_size[2] = { info->viewport_width, info->viewport_height };
if (tri_verts > 0) { if (tri_verts > 0) {
glUseProgram(res->rgb.id); glUseProgram(res->texture_program);
glBindBuffer(GL_ARRAY_BUFFER, res->buffers[TEXTURE_BUFFER]); glBindBuffer(GL_ARRAY_BUFFER, res->buffers[TEXTURE_BUFFER]);
glBufferSubData(GL_ARRAY_BUFFER, 0, glBufferSubData(GL_ARRAY_BUFFER, 0,
tri_verts * BT_UV_VERT_SIZE * sizeof(float), res->verts); tri_verts * BT_UV_VERT_SIZE * sizeof(float), res->verts);
glEnableVertexAttribArray(res->rgb.position_attribute); glEnableVertexAttribArray(res->texture_position_attribute);
glEnableVertexAttribArray(res->rgb.uv_attribute); glEnableVertexAttribArray(res->texture_uv_attribute);
glVertexAttribPointer(res->rgb.position_attribute, glVertexAttribPointer(res->texture_position_attribute,
2, GL_FLOAT, GL_FALSE, 2, GL_FLOAT, GL_FALSE,
BT_UV_VERT_SIZE * sizeof(float), (void *) (0 * sizeof(float))); BT_UV_VERT_SIZE * sizeof(float), (void *) (0 * sizeof(float)));
glVertexAttribPointer(res->rgb.uv_attribute, 2, GL_FLOAT, GL_FALSE, glVertexAttribPointer(res->texture_uv_attribute, 2, GL_FLOAT, GL_FALSE,
BT_UV_VERT_SIZE * sizeof(float), (void *) (2 * sizeof(float))); BT_UV_VERT_SIZE * sizeof(float), (void *) (2 * sizeof(float)));
glUniform2fv(res->rgb.screen_size_uniform, 1, screen_size); glUniform2fv(res->texture_screen_size_uniform, 1, screen_size);
glUniform1i(res->rgb.texture_uniform, 0); glUniform1i(res->texture_texture_uniform, 0);
glActiveTexture(GL_TEXTURE0); glActiveTexture(GL_TEXTURE0);
i = 0; i = 0;
wl_list_for_each_reverse(head, &info->heads, link) { wl_list_for_each_reverse(head, &info->heads, link) {
glBindTexture(GL_TEXTURE_2D, res->textures[i]); glBindTexture(GL_TEXTURE_2D, res->textures[i]);
if (head->updated_at == tick) { if (head->updated_at == tick) {
if (head->image) {
assert_gl_ext(GL_OES_EGL_image);
glEGLImageTargetTexture2DOES(GL_TEXTURE_2D, head->image);
} else if (head->pixels) {
assert_gl_ext(GL_EXT_unpack_subimage);
glPixelStorei(GL_UNPACK_ROW_LENGTH_EXT, head->tex_stride / 4); glPixelStorei(GL_UNPACK_ROW_LENGTH_EXT, head->tex_stride / 4);
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA,
head->tex_width, head->tex_height, head->tex_width, head->tex_height,
0, GL_RGBA, GL_UNSIGNED_BYTE, head->pixels); 0, GL_RGBA, GL_UNSIGNED_BYTE, head->pixels);
glPixelStorei(GL_UNPACK_ROW_LENGTH_EXT, 0); glPixelStorei(GL_UNPACK_ROW_LENGTH_EXT, 0);
}
glGenerateMipmap(GL_TEXTURE_2D); glGenerateMipmap(GL_TEXTURE_2D);
} }
glUniformMatrix4fv(res->rgb.color_transform_uniform, 1, GL_FALSE, glUniformMatrix4fv(res->texture_color_transform_uniform, 1, GL_FALSE,
head->swap_rgb ? TRANSFORM_RGB : TRANSFORM_BGR); head->swap_rgb ? TRANSFORM_RGB : TRANSFORM_BGR);
float color_add[4] = { 0.f, 0.f, 0.f, head->has_alpha ? 0.f : 1.f };
glUniform4fv(res->rgb.color_add_uniform, 1, color_add);
glDrawArrays(GL_TRIANGLES, i * 6, 6); glDrawArrays(GL_TRIANGLES, i * 6, 6);
i++; i++;
if (i >= HEADS_MAX) if (i >= HEADS_MAX)
@ -637,9 +514,13 @@ void wd_gl_render(struct wd_gl_data *res, struct wd_render_data *info,
void wd_gl_cleanup(struct wd_gl_data *res) { void wd_gl_cleanup(struct wd_gl_data *res) {
glDeleteBuffers(NUM_BUFFERS, res->buffers); glDeleteBuffers(NUM_BUFFERS, res->buffers);
glDeleteProgram(res->color_program); glDeleteShader(res->texture_fragment_shader);
glDeleteShader(res->texture_vertex_shader);
glDeleteProgram(res->texture_program);
glDeleteProgram(res->rgb.id); glDeleteShader(res->color_fragment_shader);
glDeleteShader(res->color_vertex_shader);
glDeleteProgram(res->color_program);
free(res); free(res);
} }

81
src/wdisplays.h
View File

@ -1,7 +1,6 @@
/* SPDX-FileCopyrightText: 2019 Jason Francis <jason@cycles.network> /* SPDX-License-Identifier: MIT */
* SPDX-License-Identifier: GPL-3.0-or-later */ /* Copyright (C) 2019 cyclopsian
/* SPDX-FileCopyrightText: 2017-2019 Simon Ser * Copyright (C) 2017-2019 emersion */
* SPDX-License-Identifier: MIT */
/* /*
* Parts of this file are taken from emersion/kanshi: * Parts of this file are taken from emersion/kanshi:
@ -20,15 +19,11 @@
#include <stdbool.h> #include <stdbool.h>
#include <wayland-client.h> #include <wayland-client.h>
#include "headform.h"
struct zxdg_output_v1; struct zxdg_output_v1;
struct zxdg_output_manager_v1; struct zxdg_output_manager_v1;
struct zwlr_output_mode_v1; struct zwlr_output_mode_v1;
struct zwlr_output_head_v1; struct zwlr_output_head_v1;
struct zwlr_output_manager_v1; struct zwlr_output_manager_v1;
struct zwlr_export_dmabuf_manager_v1;
struct zwlr_export_dmabuf_frame_v1;
struct zwlr_screencopy_manager_v1; struct zwlr_screencopy_manager_v1;
struct zwlr_screencopy_frame_v1; struct zwlr_screencopy_frame_v1;
struct zwlr_layer_shell_v1; struct zwlr_layer_shell_v1;
@ -43,7 +38,17 @@ typedef struct _GdkCursor GdkCursor;
struct _cairo_surface; struct _cairo_surface;
typedef struct _cairo_surface cairo_surface_t; typedef struct _cairo_surface cairo_surface_t;
typedef void *EGLImageKHR; 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_output {
struct wd_state *state; struct wd_state *state;
@ -57,30 +62,21 @@ struct wd_output {
struct zwlr_layer_surface_v1 *overlay_layer_surface; struct zwlr_layer_surface_v1 *overlay_layer_surface;
}; };
#define WD_MAX_PLANES 4
struct wd_frame { struct wd_frame {
struct wd_output *output; struct wd_output *output;
struct zwlr_export_dmabuf_frame_v1 *export_frame; struct zwlr_screencopy_frame_v1 *wlr_frame;
struct zwlr_screencopy_frame_v1 *copy_frame;
struct wl_list link; struct wl_list link;
int capture_fd;
unsigned stride;
unsigned width; unsigned width;
unsigned height; unsigned height;
uint64_t tick;
uint32_t format;
uint32_t flags;
uint64_t modifier;
uint32_t n_planes;
int fds[WD_MAX_PLANES];
uint32_t offsets[WD_MAX_PLANES];
uint32_t strides[WD_MAX_PLANES];
struct wl_shm_pool *pool; struct wl_shm_pool *pool;
struct wl_buffer *buffer; struct wl_buffer *buffer;
uint8_t *pixels; uint8_t *pixels;
bool ready; uint64_t tick;
bool y_invert;
bool swap_rgb;
}; };
struct wd_head_config { struct wd_head_config {
@ -154,17 +150,15 @@ struct wd_render_head_data {
struct wd_render_head_flags active; struct wd_render_head_flags active;
uint8_t *pixels; uint8_t *pixels;
EGLImageKHR image;
unsigned tex_stride; unsigned tex_stride;
unsigned tex_width; unsigned tex_width;
unsigned tex_height; unsigned tex_height;
uint32_t preview : 1, bool preview;
y_invert : 1, bool y_invert;
swap_rgb : 1, bool swap_rgb;
has_alpha : 1, bool hovered;
hovered : 1, bool clicked;
clicked : 1;
}; };
struct wd_render_data { struct wd_render_data {
@ -181,7 +175,6 @@ struct wd_render_data {
int x_origin; int x_origin;
int y_origin; int y_origin;
uint64_t updated_at; uint64_t updated_at;
bool external_images;
struct wl_list heads; struct wl_list heads;
}; };
@ -194,7 +187,6 @@ struct wd_point {
struct wd_state { struct wd_state {
struct zxdg_output_manager_v1 *xdg_output_manager; struct zxdg_output_manager_v1 *xdg_output_manager;
struct zwlr_output_manager_v1 *output_manager; struct zwlr_output_manager_v1 *output_manager;
struct zwlr_export_dmabuf_manager_v1 *export_manager;
struct zwlr_screencopy_manager_v1 *copy_manager; struct zwlr_screencopy_manager_v1 *copy_manager;
struct zwlr_layer_shell_v1 *layer_shell; struct zwlr_layer_shell_v1 *layer_shell;
struct wl_shm *shm; struct wl_shm *shm;
@ -212,12 +204,11 @@ struct wd_state {
unsigned int reset_idle; unsigned int reset_idle;
struct wd_render_head_data *clicked; struct wd_render_head_data *clicked;
struct wd_point drag_start; /* top left, bottom right */
struct wd_point head_drag_start; /* 0-1 range in head rect */ struct wd_point click_offset;
bool panning; bool panning;
struct wd_point pan_start; struct wd_point pan_last;
GtkWidget *main_box;
GtkWidget *header_stack; GtkWidget *header_stack;
GtkWidget *stack_switcher; GtkWidget *stack_switcher;
GtkWidget *stack; GtkWidget *stack;
@ -308,7 +299,7 @@ void wd_ui_reset_heads(struct wd_state *state);
* Updates the UI form for a single head. Useful for when the compositor * Updates the UI form for a single head. Useful for when the compositor
* notifies us of updated configuration caused by another program. * notifies us of updated configuration caused by another program.
*/ */
void wd_ui_reset_head(const struct wd_head *head, enum wd_head_fields fields); void wd_ui_reset_head(const struct wd_head *head, unsigned int fields);
/* /*
* Updates the stack and all forms to the last known server state. * Updates the stack and all forms to the last known server state.
@ -328,14 +319,8 @@ void wd_ui_show_error(struct wd_state *state, const char *message);
/* /*
* Compiles the GL shaders. * Compiles the GL shaders.
*/ */
struct wd_gl_data *wd_gl_setup(struct wl_display *display); struct wd_gl_data *wd_gl_setup(void);
/*
* Creates an EGLImage from a given output frame. The frame must have a dmabuf
* received from a wlr_export_dmabuf_frame.
*/
EGLImageKHR wd_gl_create_dmabuf_texture(struct wd_gl_data *res,
struct wd_frame *frame);
/* /*
* Renders the GL scene. * Renders the GL scene.
*/ */
@ -350,16 +335,16 @@ void wd_gl_cleanup(struct wd_gl_data *res);
* Create an overlay on the screen that contains a textual description of the * Create an overlay on the screen that contains a textual description of the
* output. This is to help the user identify the outputs visually. * output. This is to help the user identify the outputs visually.
*/ */
void wd_create_overlay(struct wd_output *output); static inline void wd_create_overlay(struct wd_output *output) {}
/* /*
* Forces redrawing of the screen overlay on the given output. * Forces redrawing of the screen overlay on the given output.
*/ */
void wd_redraw_overlay(struct wd_output *output); static inline void wd_redraw_overlay(struct wd_output *output) {}
/* /*
* Destroys the screen overlay on the given output. * Destroys the screen overlay on the given output.
*/ */
void wd_destroy_overlay(struct wd_output *output); static inline void wd_destroy_overlay(struct wd_output *output) {}
#endif #endif