From 29b1060c6fc2614dcbfe6edc177944a31f4decd6 Mon Sep 17 00:00:00 2001 From: kotontrion Date: Sun, 9 Jun 2024 20:27:00 +0200 Subject: initial commit --- .gitignore | 3 + LICENSE | 675 +++++++++++++++++++++++++++++++++ README.md | 30 ++ include/meson.build | 6 + include/river-private.h | 20 + include/river.h | 63 +++ include/wayland-source.h | 14 + meson.build | 23 ++ meson_options.txt | 2 + protocols/meson.build | 22 ++ protocols/river-status-unstable-v1.xml | 149 ++++++++ src/astal-river.c | 50 +++ src/meson.build | 70 ++++ src/river-output.c | 329 ++++++++++++++++ src/river.c | 414 ++++++++++++++++++++ src/wayland-source.c | 114 ++++++ version | 1 + 17 files changed, 1985 insertions(+) create mode 100644 .gitignore create mode 100644 LICENSE create mode 100644 README.md create mode 100644 include/meson.build create mode 100644 include/river-private.h create mode 100644 include/river.h create mode 100644 include/wayland-source.h create mode 100644 meson.build create mode 100644 meson_options.txt create mode 100644 protocols/meson.build create mode 100644 protocols/river-status-unstable-v1.xml create mode 100644 src/astal-river.c create mode 100644 src/meson.build create mode 100644 src/river-output.c create mode 100644 src/river.c create mode 100644 src/wayland-source.c create mode 100644 version diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..6bf41b5 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +build/ +result/ +.cache/ diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..c94d07f --- /dev/null +++ b/LICENSE @@ -0,0 +1,675 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + 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. + + + Copyright (C) + + 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 . + +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: + + Copyright (C) + 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 +. + + 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 +. + diff --git a/README.md b/README.md new file mode 100644 index 0000000..3285628 --- /dev/null +++ b/README.md @@ -0,0 +1,30 @@ +# astal-river + +a library and cli tool for getting status information of the river wayland compositor. + +## Build from source +### Dependencies + +- meson +- glib +- gobject-introspection +- json-glib +- libwayland + +```sh +# Clone the repository +git clone https://github.com/astal-sh/river +cd river + +# Setup and build +meson setup build +meson compile -C build + +# Install +meson install -C build +``` + +## Todo +- docs + + diff --git a/include/meson.build b/include/meson.build new file mode 100644 index 0000000..a835e6b --- /dev/null +++ b/include/meson.build @@ -0,0 +1,6 @@ +astal_river_inc = include_directories('.') +astal_river_headers = files( + 'river.h', +) + +install_headers('river.h', subdir : 'astal') diff --git a/include/river-private.h b/include/river-private.h new file mode 100644 index 0000000..1b94495 --- /dev/null +++ b/include/river-private.h @@ -0,0 +1,20 @@ +#ifndef ASTAL_RIVER_OUTPUT_PRIVATE_H +#define ASTAL_RIVER_OUTPUT_PRIVATE_H + +#include "river.h" +#include "river-status-unstable-v1-client.h" +#include + +G_BEGIN_DECLS + +AstalRiverOutput *astal_river_output_new(guint id, + struct wl_output *wl_output, + struct zriver_status_manager_v1 *status_manager, + struct wl_display *wl_display); + +struct wl_output* astal_river_output_get_wl_output(AstalRiverOutput *self); +void astal_river_output_set_focused_view(AstalRiverOutput *self, gchar* focused_view); + +G_END_DECLS + +#endif // !ASTAL_RIVER_OUTPUT_PRIVATE_H diff --git a/include/river.h b/include/river.h new file mode 100644 index 0000000..d4d33c2 --- /dev/null +++ b/include/river.h @@ -0,0 +1,63 @@ +#ifndef ASTAL_RIVER_H +#define ASTAL_RIVER_H + +#include + +G_BEGIN_DECLS + +#define ASTAL_RIVER_TYPE_OUTPUT (astal_river_output_get_type()) + +G_DECLARE_FINAL_TYPE (AstalRiverOutput, astal_river_output, ASTAL_RIVER, OUTPUT, GObject) + +guint astal_river_output_get_id(AstalRiverOutput *self); +/** + * astal_river_output_get_name + * @self: the AstalRiverOutput object + * + * Returns: (transfer none) (nullable): the name of the output + */ +gchar* astal_river_output_get_name(AstalRiverOutput *self); +gchar* astal_river_output_get_layout_name(AstalRiverOutput *self); +gchar* astal_river_output_get_focused_view(AstalRiverOutput *self); +guint astal_river_output_get_focused_tags(AstalRiverOutput *self); +guint astal_river_output_get_urgent_tags(AstalRiverOutput *self); +guint astal_river_output_get_occupied_tags(AstalRiverOutput *self); + + + +#define ASTAL_RIVER_TYPE_RIVER (astal_river_river_get_type()) + +G_DECLARE_FINAL_TYPE (AstalRiverRiver, astal_river_river, ASTAL_RIVER, RIVER, GObject) + +AstalRiverRiver *astal_river_river_new(); + +/** + * astal_river_river_get_outputs + * @self: the AstalRiverRiver object + * + * Returns: (transfer none) (element-type AstalRiver.Output): a list of all outputs + * + */ +GList* astal_river_river_get_outputs(AstalRiverRiver *self); + +/** + * astal_river_river_get_output + * @self: the AstalRiverRiver object + * @name: the name of the output + * + * Returns: (transfer none) (nullable): the output with the given name or null + */ +AstalRiverOutput* astal_river_river_get_output(AstalRiverRiver *self, gchar* name); + + +gchar* astal_river_river_get_focused_view(AstalRiverRiver *self); +gchar* astal_river_river_get_focused_output(AstalRiverRiver *self); +gchar* astal_river_river_get_mode(AstalRiverRiver *self); + + + + + +G_END_DECLS + +#endif // !ASTAL_RIVER_H diff --git a/include/wayland-source.h b/include/wayland-source.h new file mode 100644 index 0000000..ad6ed8c --- /dev/null +++ b/include/wayland-source.h @@ -0,0 +1,14 @@ +#ifndef __WAYLAND_SOURCE_H__ +#define __WAYLAND_SOURCE_H__ + +G_BEGIN_DECLS + +typedef struct _WLSource WLSource; + +WLSource* wl_source_new(); +void wl_source_free(WLSource *self); +struct wl_display* wl_source_get_display(WLSource *source); + +G_END_DECLS + +#endif /* __WAYLAND_SOURCE_H__ */ diff --git a/meson.build b/meson.build new file mode 100644 index 0000000..923d06c --- /dev/null +++ b/meson.build @@ -0,0 +1,23 @@ +project('astal_river', + 'c', + version : '0.1.0', + default_options : [ + 'c_std=gnu11', + 'warning_level=3', + 'prefix=/usr' + ] +) + +add_project_arguments( + ['-Wno-pedantic'], + language : 'c') + +version_split = meson.project_version().split('.') +lib_so_version = version_split[0] + '.' + version_split[1] + +pkg_config = import('pkgconfig') +gnome = import('gnome') + +subdir('protocols') +subdir('include') +subdir('src') diff --git a/meson_options.txt b/meson_options.txt new file mode 100644 index 0000000..d585854 --- /dev/null +++ b/meson_options.txt @@ -0,0 +1,2 @@ +option('introspection', type : 'boolean', value : true, description : 'Build gobject-introspection data') +option('vapi', type : 'boolean', value : true, description : 'Generate vapi data (needs vapigen & introspection option)') diff --git a/protocols/meson.build b/protocols/meson.build new file mode 100644 index 0000000..f936e37 --- /dev/null +++ b/protocols/meson.build @@ -0,0 +1,22 @@ + +wayland_scanner = find_program('wayland-scanner') + +protocols = [ + 'river-status-unstable-v1.xml', +] + +gen_client_header = generator(wayland_scanner, + output: ['@BASENAME@-client.h'], + arguments: ['-c', 'client-header', '@INPUT@', '@BUILD_DIR@/@BASENAME@-client.h']) + +gen_private_code = generator(wayland_scanner, + output: ['@BASENAME@.c'], + arguments: ['-c', 'private-code', '@INPUT@', '@BUILD_DIR@/@BASENAME@.c']) + +client_protocol_srcs = [] + +foreach protocol : protocols + client_header = gen_client_header.process(protocol) + code = gen_private_code.process(protocol) + client_protocol_srcs += [client_header, code] +endforeach \ No newline at end of file diff --git a/protocols/river-status-unstable-v1.xml b/protocols/river-status-unstable-v1.xml new file mode 100644 index 0000000..09c52c1 --- /dev/null +++ b/protocols/river-status-unstable-v1.xml @@ -0,0 +1,149 @@ + + + + Copyright 2020 The River Developers + + Permission to use, copy, modify, and/or distribute this software for any + purpose with or without fee is hereby granted, provided that the above + copyright notice and this permission notice appear in all copies. + + THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + + + + + A global factory for objects that receive status information specific + to river. It could be used to implement, for example, a status bar. + + + + + This request indicates that the client will not use the + river_status_manager object any more. Objects that have been created + through this instance are not affected. + + + + + + This creates a new river_output_status object for the given wl_output. + + + + + + + + This creates a new river_seat_status object for the given wl_seat. + + + + + + + + + This interface allows clients to receive information about the current + windowing state of an output. + + + + + This request indicates that the client will not use the + river_output_status object any more. + + + + + + Sent once binding the interface and again whenever the tag focus of + the output changes. + + + + + + + Sent once on binding the interface and again whenever the tag state + of the output changes. + + + + + + + Sent once on binding the interface and again whenever the set of + tags with at least one urgent view changes. + + + + + + + Sent once on binding the interface should a layout name exist and again + whenever the name changes. + + + + + + + Sent when the current layout name has been removed without a new one + being set, for example when the active layout generator disconnects. + + + + + + + This interface allows clients to receive information about the current + focus of a seat. Note that (un)focused_output events will only be sent + if the client has bound the relevant wl_output globals. + + + + + This request indicates that the client will not use the + river_seat_status object any more. + + + + + + Sent on binding the interface and again whenever an output gains focus. + + + + + + + Sent whenever an output loses focus. + + + + + + + Sent once on binding the interface and again whenever the focused + view or a property thereof changes. The title may be an empty string + if no view is focused or the focused view did not set a title. + + + + + + + Sent once on binding the interface and again whenever a new mode + is entered (e.g. with riverctl enter-mode foobar). + + + + + + diff --git a/src/astal-river.c b/src/astal-river.c new file mode 100644 index 0000000..6596eb4 --- /dev/null +++ b/src/astal-river.c @@ -0,0 +1,50 @@ +#include "river.h" +#include "gio/gio.h" +#include +#include + +GMainLoop *loop; + +void print_json(AstalRiverRiver *river) { + JsonNode *json = json_gobject_serialize (G_OBJECT(river)); + + gchar* json_str = json_to_string (json, FALSE); + g_print("%s\n", json_str); + g_free(json); +} + +int main(int argc, char **argv) { + + gboolean daemon = FALSE; + + int opt; + const char *optstring = "d"; + + static struct option long_options[] = { + {"daemon", no_argument, NULL, 'd'}, + {NULL, 0, NULL, 0} + }; + + while ((opt = getopt_long(argc, argv, optstring, long_options, NULL)) != -1) { + switch (opt) { + case 'd': + daemon = TRUE; + break; + default: + g_print("Usage: %s [-d]\n", argv[0]); + exit(EXIT_FAILURE); + } + } + + AstalRiverRiver *river = astal_river_river_new (); + if(daemon) { + loop = g_main_loop_new (NULL, FALSE); + g_signal_connect(river, "changed", G_CALLBACK(print_json), NULL); + g_main_loop_run (loop); + } + else { + print_json (river); + g_object_unref(river); + } + +} diff --git a/src/meson.build b/src/meson.build new file mode 100644 index 0000000..2e48e77 --- /dev/null +++ b/src/meson.build @@ -0,0 +1,70 @@ +srcs = files( + 'river.c', + 'river-output.c', + 'wayland-source.c', +) + +deps = [ + dependency('gobject-2.0'), + dependency('gio-2.0'), + dependency('wayland-client'), + dependency('json-glib-1.0'), +] + +astal_river_lib = library( + 'astal-river', + sources : srcs + client_protocol_srcs, + include_directories : astal_river_inc, + dependencies : deps, + version : meson.project_version(), + install : true +) + +libastal_river = declare_dependency( + link_with : astal_river_lib, + include_directories : astal_river_inc) + +astal_river_executable = executable( + 'astal-river', + files('astal-river.c'), + dependencies : [ + dependency('gobject-2.0'), + dependency('gio-2.0'), + dependency('json-glib-1.0'), + libastal_river + ], + install : true) + +pkg_config_name = 'astal-river-' + lib_so_version + +if get_option('introspection') + gir = gnome.generate_gir( + astal_river_lib, + sources : srcs + astal_river_headers, + nsversion : '0.1', + namespace : 'AstalRiver', + symbol_prefix : 'astal_river', + identifier_prefix : 'AstalRiver', + includes : ['GObject-2.0', 'Gio-2.0'], + header : 'astal/river.h', + export_packages : pkg_config_name, + install : true + ) + + if get_option('vapi') + gnome.generate_vapi( + pkg_config_name, + sources : [gir[0]], + packages : ['gobject-2.0', 'gio-2.0'], + install : true) + endif +endif + +pkg_config.generate( + name : 'astal-river', + version : meson.project_version(), + libraries : [astal_river_lib], + filebase : pkg_config_name, + subdirs : 'astal', + description : 'astal riverentication module', + url : 'https://github.com/astal-sh/river') diff --git a/src/river-output.c b/src/river-output.c new file mode 100644 index 0000000..4a7398e --- /dev/null +++ b/src/river-output.c @@ -0,0 +1,329 @@ + +#include "river-private.h" +#include +#include "river-status-unstable-v1-client.h" + +struct _AstalRiverOutput { + GObject parent_instance; + guint focused_tags; + guint occupied_tags; + guint urgent_tags; + gchar *layout_name; + gchar *focused_view; + guint id; + gchar* name; +}; + +typedef struct { + struct zriver_status_manager_v1 *river_status_manager; + struct zriver_output_status_v1 *river_output_status; + struct wl_display *wl_display; + struct wl_output *wl_output; +} AstalRiverOutputPrivate; + +G_DEFINE_FINAL_TYPE_WITH_PRIVATE(AstalRiverOutput, astal_river_output, G_TYPE_OBJECT); + +typedef enum { + ASTAL_RIVER_OUTPUT_PROP_FOCUSED_TAGS = 1, + ASTAL_RIVER_OUTPUT_PROP_OCCUPIED_TAGS, + ASTAL_RIVER_OUTPUT_PROP_URGENT_TAGS, + ASTAL_RIVER_OUTPUT_PROP_LAYOUT_NAME, + ASTAL_RIVER_OUTPUT_PROP_NAME, + ASTAL_RIVER_OUTPUT_PROP_FOCUSED_VIEW, + ASTAL_RIVER_OUTPUT_PROP_ID, + ASTAL_RIVER_OUTPUT_N_PROPERTIES +} AstalRiverOutputProperties; + +typedef enum { + ASTAL_RIVER_OUTPUT_SIGNAL_CHANGED, + ASTAL_RIVER_OUTPUT_N_SIGNALS +} AstalRiverOutputSignals; + +static guint astal_river_output_signals[ASTAL_RIVER_OUTPUT_N_SIGNALS] = {0,}; +static GParamSpec *astal_river_output_properties[ASTAL_RIVER_OUTPUT_N_PROPERTIES] = {NULL,}; + +guint astal_river_output_get_id(AstalRiverOutput *self) { + return self->id; +} + +gchar* astal_river_output_get_name(AstalRiverOutput *self) { + return self->name; +} + +gchar* astal_river_output_get_layout_name(AstalRiverOutput *self) { + return self->layout_name; +} + +gchar* astal_river_output_get_focused_view(AstalRiverOutput *self) { + return self->focused_view; +} + +void astal_river_output_set_focused_view(AstalRiverOutput *self, gchar* focused_view) { + g_free(self->focused_view); + self->focused_view = g_strdup(focused_view); + g_object_notify (G_OBJECT(self), "focused-view"); + g_signal_emit (self, astal_river_output_signals[ASTAL_RIVER_OUTPUT_SIGNAL_CHANGED], 0); +} + +guint astal_river_output_get_focused_tags(AstalRiverOutput *self) { + return self->focused_tags; +} + +guint astal_river_output_get_urgent_tags(AstalRiverOutput *self) { + return self->urgent_tags; +} + +guint astal_river_output_get_occupied_tags(AstalRiverOutput *self) { + return self->occupied_tags; +} + + +struct wl_output* astal_river_output_get_wl_output(AstalRiverOutput *self) { + AstalRiverOutputPrivate *priv = astal_river_output_get_instance_private(self); + return priv->wl_output; +} + +static void astal_river_output_get_property(GObject *object, guint property_id, GValue *value, GParamSpec *pspec) { + AstalRiverOutput *self = ASTAL_RIVER_OUTPUT(object); + + switch (property_id) { + case ASTAL_RIVER_OUTPUT_PROP_FOCUSED_TAGS: + g_value_set_uint (value, self->focused_tags); + break; + case ASTAL_RIVER_OUTPUT_PROP_OCCUPIED_TAGS: + g_value_set_uint (value, self->occupied_tags); + break; + case ASTAL_RIVER_OUTPUT_PROP_URGENT_TAGS: + g_value_set_uint (value, self->urgent_tags); + break; + case ASTAL_RIVER_OUTPUT_PROP_ID: + g_value_set_uint (value, self->id); + break; + case ASTAL_RIVER_OUTPUT_PROP_NAME: + g_value_set_string (value, self->name); + break; + case ASTAL_RIVER_OUTPUT_PROP_LAYOUT_NAME: + g_value_set_string (value, self->layout_name); + break; + case ASTAL_RIVER_OUTPUT_PROP_FOCUSED_VIEW: + g_value_set_string (value, self->focused_view); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); + break; + } +} + +static void astal_river_output_set_property(GObject *object, guint property_id, const GValue *value, GParamSpec *pspec) { + AstalRiverOutput *self = ASTAL_RIVER_OUTPUT(object); + + switch (property_id) { + case ASTAL_RIVER_OUTPUT_PROP_ID: + self->id = g_value_get_uint (value); + g_object_notify(G_OBJECT(self), "id"); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); + break; + } + g_signal_emit (self, astal_river_output_signals[ASTAL_RIVER_OUTPUT_SIGNAL_CHANGED], 0); +} + +static void noop() {} + +static void astal_river_handle_focused_tags(void *data, + struct zriver_output_status_v1 *status, + uint32_t tags) { + AstalRiverOutput *self = ASTAL_RIVER_OUTPUT (data); + self->focused_tags = tags; + g_object_notify (G_OBJECT(self), "focused-tags"); + g_signal_emit (self, astal_river_output_signals[ASTAL_RIVER_OUTPUT_SIGNAL_CHANGED], 0); +} + +static void astal_river_handle_urgent_tags(void *data, + struct zriver_output_status_v1 *status, + uint32_t tags) { + AstalRiverOutput *self = ASTAL_RIVER_OUTPUT (data); + self->urgent_tags = tags; + g_object_notify (G_OBJECT(self), "urgent-tags"); + g_signal_emit (self, astal_river_output_signals[ASTAL_RIVER_OUTPUT_SIGNAL_CHANGED], 0); +} + +static void astal_river_handle_occupied_tags(void *data, + struct zriver_output_status_v1 *status, + struct wl_array *view_tags) { + AstalRiverOutput *self = ASTAL_RIVER_OUTPUT (data); + guint tags = 0; + guint *view; + wl_array_for_each (view, view_tags) { + tags |= *view; + } + + self->occupied_tags = tags; + g_object_notify (G_OBJECT(self), "occupied-tags"); + g_signal_emit (self, astal_river_output_signals[ASTAL_RIVER_OUTPUT_SIGNAL_CHANGED], 0); +} + +static void astal_river_handle_layout_name(void *data, + struct zriver_output_status_v1 *status, + const char* name) { + AstalRiverOutput *self = ASTAL_RIVER_OUTPUT (data); + g_free(self->layout_name); + self->layout_name = g_strdup (name); + g_object_notify (G_OBJECT(self), "layout-name"); + g_signal_emit (self, astal_river_output_signals[ASTAL_RIVER_OUTPUT_SIGNAL_CHANGED], 0); +} + +static void astal_river_handle_layout_name_clear(void *data, + struct zriver_output_status_v1 *status) { + AstalRiverOutput *self = ASTAL_RIVER_OUTPUT (data); + g_free(self->layout_name); + g_object_notify (G_OBJECT(self), "layout-name"); + g_signal_emit (self, astal_river_output_signals[ASTAL_RIVER_OUTPUT_SIGNAL_CHANGED], 0); +} + +static void astal_river_wl_output_handle_name(void *data, + struct wl_output *output, + const char* name) { + AstalRiverOutput *self = ASTAL_RIVER_OUTPUT (data); + g_free(self->name); + self->name = g_strdup(name); + g_object_notify (G_OBJECT(self), "name"); + g_signal_emit (self, astal_river_output_signals[ASTAL_RIVER_OUTPUT_SIGNAL_CHANGED], 0); +} + +static const struct zriver_output_status_v1_listener output_status_listener = { + .focused_tags = astal_river_handle_focused_tags, + .view_tags = astal_river_handle_occupied_tags, + .urgent_tags = astal_river_handle_urgent_tags, + .layout_name = astal_river_handle_layout_name, + .layout_name_clear = astal_river_handle_layout_name_clear, +}; + +static const struct wl_output_listener wl_output_listener = { + .name = astal_river_wl_output_handle_name, + .geometry = noop, + .mode = noop, + .scale = noop, + .description = noop, + .done = noop, +}; + +static void astal_river_output_finalize(GObject *object) { + + AstalRiverOutput *self = ASTAL_RIVER_OUTPUT(object); + AstalRiverOutputPrivate *priv = astal_river_output_get_instance_private (self); + + zriver_output_status_v1_destroy (priv->river_output_status); + wl_output_destroy (priv->wl_output); + + wl_display_roundtrip (priv->wl_display); + + g_free(self->layout_name); + g_free(self->name); + + G_OBJECT_CLASS (astal_river_output_parent_class)->finalize(object); +} + +static void astal_river_output_init(AstalRiverOutput *self) { +} + +AstalRiverOutput *astal_river_output_new(guint id, + struct wl_output *wl_output, + struct zriver_status_manager_v1 *status_manager, + struct wl_display *wl_display) { + + AstalRiverOutput *self = g_object_new (ASTAL_RIVER_TYPE_OUTPUT, NULL); + AstalRiverOutputPrivate *priv = astal_river_output_get_instance_private (self); + + self->id = id; + priv->wl_display = wl_display; + priv->wl_output = wl_output; + priv->river_status_manager = status_manager; + + priv->river_output_status = zriver_status_manager_v1_get_river_output_status( + priv->river_status_manager, wl_output); + + zriver_output_status_v1_add_listener( + priv->river_output_status, &output_status_listener, self); + + wl_output_add_listener (wl_output, &wl_output_listener, self); + + wl_display_roundtrip(priv->wl_display); + + return self; +} + +static void astal_river_output_class_init(AstalRiverOutputClass *class) { + + GObjectClass *object_class = G_OBJECT_CLASS (class); + object_class->get_property = astal_river_output_get_property; + object_class->set_property = astal_river_output_set_property; + object_class->finalize = astal_river_output_finalize; + + + astal_river_output_properties[ASTAL_RIVER_OUTPUT_PROP_FOCUSED_TAGS] = + g_param_spec_uint("focused-tags", + "focused-tags", + "currently focused tags", + 0, + INT_MAX, + 0, + G_PARAM_READABLE); + astal_river_output_properties[ASTAL_RIVER_OUTPUT_PROP_OCCUPIED_TAGS] = + g_param_spec_uint("occupied-tags", + "occupied-tags", + "currently occupied tags", + 0, + INT_MAX, + 0, + G_PARAM_READABLE); + astal_river_output_properties[ASTAL_RIVER_OUTPUT_PROP_URGENT_TAGS] = + g_param_spec_uint("urgent-tags", + "urgent-tags", + "currently urgent tags", + 0, + INT_MAX, + 0, + G_PARAM_READABLE); + astal_river_output_properties[ASTAL_RIVER_OUTPUT_PROP_ID] = + g_param_spec_uint("id", + "id", + "id of the output object", + 0, + INT_MAX, + 0, + G_PARAM_READABLE); + astal_river_output_properties[ASTAL_RIVER_OUTPUT_PROP_LAYOUT_NAME] = + g_param_spec_string("layout-name", + "layout-name", + "name of the current layout", + NULL, + G_PARAM_READABLE); + astal_river_output_properties[ASTAL_RIVER_OUTPUT_PROP_NAME] = + g_param_spec_string("name", + "name", + "name of the output", + NULL, + G_PARAM_READABLE); + astal_river_output_properties[ASTAL_RIVER_OUTPUT_PROP_FOCUSED_VIEW] = + g_param_spec_string("focused-view", + "focused-view", + "name of last focused view on this output", + NULL, + G_PARAM_READABLE); + + g_object_class_install_properties(object_class, + ASTAL_RIVER_OUTPUT_N_PROPERTIES, + astal_river_output_properties); + astal_river_output_signals[ASTAL_RIVER_OUTPUT_SIGNAL_CHANGED] = + g_signal_new("changed", + G_TYPE_FROM_CLASS(class), + G_SIGNAL_RUN_FIRST, + 0, + NULL, + NULL, + NULL, + G_TYPE_NONE, + 0); +} diff --git a/src/river.c b/src/river.c new file mode 100644 index 0000000..44225a6 --- /dev/null +++ b/src/river.c @@ -0,0 +1,414 @@ + + +#include "river-private.h" +#include +#include +#include +#include "river-status-unstable-v1-client.h" +#include "wayland-source.h" +#include + + +struct _AstalRiverRiver { + GObject parent_instance; + GList *outputs; + gchar *focused_output; + gchar *focused_view; + gchar *mode; +}; + +typedef struct { + GHashTable *signal_ids; + + struct wl_registry *wl_registry; + struct wl_seat *seat; + struct wl_display *display; + WLSource *wl_source; + struct zriver_status_manager_v1 *river_status_manager; + struct zriver_seat_status_v1 *river_seat_status; +} AstalRiverRiverPrivate; + +static JsonSerializableIface *serializable_iface = NULL; +static void astal_river_river_initable_iface_init (GInitableIface *iface); +static void astal_river_river_json_serializable_iface_init(JsonSerializableIface *g_iface); + +G_DEFINE_TYPE_WITH_CODE (AstalRiverRiver, astal_river_river, G_TYPE_OBJECT, + G_ADD_PRIVATE (AstalRiverRiver) + G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE, astal_river_river_initable_iface_init) + G_IMPLEMENT_INTERFACE (JSON_TYPE_SERIALIZABLE, astal_river_river_json_serializable_iface_init)) + +typedef enum { + ASTAL_RIVER_RIVER_PROP_FOCUSED_OUTPUT = 1, + ASTAL_RIVER_RIVER_PROP_FOCUSED_VIEW, + ASTAL_RIVER_RIVER_PROP_MODE, + ASTAL_RIVER_RIVER_PROP_OUTPUTS, + ASTAL_RIVER_RIVER_N_PROPERTIES +} AstalRiverOutputProperties; + +typedef enum { + ASTAL_RIVER_RIVER_SIGNAL_CHANGED, + ASTAL_RIVER_RIVER_SIGNAL_OUTPUT_ADDED, + ASTAL_RIVER_RIVER_SIGNAL_OUTPUT_REMOVED, + ASTAL_RIVER_RIVER_N_SIGNALS +} AstalRiverOutputSignals; + +static guint astal_river_river_signals[ASTAL_RIVER_RIVER_N_SIGNALS] = {0,}; +static GParamSpec *astal_river_river_properties[ASTAL_RIVER_RIVER_N_PROPERTIES] = {NULL,}; + +static void reemit_changed(AstalRiverOutput *output, AstalRiverRiver *self) { + g_signal_emit (self, astal_river_river_signals[ASTAL_RIVER_RIVER_SIGNAL_CHANGED], 0); +} + +static AstalRiverOutput *find_output_by_id (AstalRiverRiver *self, uint32_t id) { + GList *output = self->outputs; + while(output != NULL) { + AstalRiverOutput *river_output = output->data; + if(astal_river_output_get_id (river_output) == id) return river_output; + output = output->next; + } + return NULL; +} + +static AstalRiverOutput *find_output_by_output (AstalRiverRiver *self, struct wl_output *wl_output) { + GList *output = self->outputs; + while(output != NULL) { + AstalRiverOutput *river_output = output->data; + if(astal_river_output_get_wl_output (river_output) == wl_output) return river_output; + output = output->next; + } + return NULL; +} + +static AstalRiverOutput *find_output_by_name (AstalRiverRiver *self, gchar* name) { + GList *output = self->outputs; + while(output != NULL) { + AstalRiverOutput *river_output = output->data; + if(strcmp(astal_river_output_get_name (river_output), name) == 0) return river_output; + output = output->next; + } + return NULL; +} + +GList* astal_river_river_get_outputs(AstalRiverRiver *self){ + return self->outputs; +} + +AstalRiverOutput* astal_river_river_get_output(AstalRiverRiver *self, gchar* name) { + return find_output_by_name(self, name); +} + +gchar* astal_river_river_get_focused_view(AstalRiverRiver *self) { + return self->focused_view; +} + +gchar* astal_river_river_get_focused_output(AstalRiverRiver *self) { + return self->focused_output; +} + +gchar* astal_river_river_get_mode(AstalRiverRiver *self) { + return self->mode; +} + +static void astal_river_river_get_property(GObject *object, guint property_id, GValue *value, GParamSpec *pspec) { + AstalRiverRiver *self = ASTAL_RIVER_RIVER(object); + + switch (property_id) { + case ASTAL_RIVER_RIVER_PROP_MODE: + g_value_set_string (value, self->mode); + break; + case ASTAL_RIVER_RIVER_PROP_FOCUSED_VIEW: + g_value_set_string (value, self->focused_view); + break; + case ASTAL_RIVER_RIVER_PROP_FOCUSED_OUTPUT: + g_value_set_string (value, self->focused_output); + break; + case ASTAL_RIVER_RIVER_PROP_OUTPUTS: + g_value_set_pointer(value, self->outputs); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); + break; + } +} + +static JsonNode* astal_river_river_serialize_property(JsonSerializable *serializable, + const gchar *name, + const GValue *value, + GParamSpec *pspec) { + JsonNode *retval = NULL; + if (strcmp (name, "outputs") == 0) { + JsonArray *outputs = json_array_new (); + retval = json_node_new (JSON_NODE_ARRAY); + GList *output = g_value_get_pointer (value); + while(output != NULL) { + AstalRiverOutput *river_output = output->data; + json_array_add_element (outputs, json_gobject_serialize (G_OBJECT(river_output))); + output = output->next; + } + json_node_take_array (retval, outputs); + } + else + retval = serializable_iface->serialize_property(serializable, name, value, pspec); + + return retval; +} + +static void noop(){} + +static void river_seat_status_handle_focused_output(void* data, + struct zriver_seat_status_v1* seat_status, + struct wl_output* focused_output) { + + AstalRiverRiver *self = ASTAL_RIVER_RIVER(data); + g_free(self->focused_output); + AstalRiverOutput *output = find_output_by_output(self, focused_output); + if(output == NULL) return; + self->focused_output = g_strdup(astal_river_output_get_name(output)); + g_object_notify(G_OBJECT(self), "focused-output"); + g_signal_emit (self, astal_river_river_signals[ASTAL_RIVER_RIVER_SIGNAL_CHANGED], 0); +} + +static void river_seat_status_handle_focused_view(void* data, + struct zriver_seat_status_v1* seat_status, + const char* focused_view) { + + AstalRiverRiver *self = ASTAL_RIVER_RIVER(data); + g_free(self->focused_view); + self->focused_view = g_strdup(focused_view); + AstalRiverOutput *output = find_output_by_name(self, self->focused_output); + astal_river_output_set_focused_view (output, focused_view); + g_object_notify(G_OBJECT(self), "focused-view"); + g_signal_emit (self, astal_river_river_signals[ASTAL_RIVER_RIVER_SIGNAL_CHANGED], 0); +} + +static void river_seat_status_handle_mode(void* data, + struct zriver_seat_status_v1* seat_status, + const char* mode) { + + AstalRiverRiver *self = ASTAL_RIVER_RIVER(data); + g_free(self->mode); + self->mode = g_strdup(mode); + g_object_notify(G_OBJECT(self), "mode"); + g_signal_emit (self, astal_river_river_signals[ASTAL_RIVER_RIVER_SIGNAL_CHANGED], 0); +} + +static const struct zriver_seat_status_v1_listener river_seat_status_listener = { + .focused_output = river_seat_status_handle_focused_output, + .unfocused_output = noop, + .focused_view = river_seat_status_handle_focused_view, + .mode = river_seat_status_handle_mode, +}; + +static void global_registry_handler(void* data, + struct wl_registry* registry, + uint32_t id, + const char* interface, + uint32_t version) { + AstalRiverRiver *self = ASTAL_RIVER_RIVER(data); + AstalRiverRiverPrivate *priv = astal_river_river_get_instance_private (self); + if (strcmp(interface, wl_output_interface.name) == 0) { + struct wl_output *wl_out = wl_registry_bind(registry, id, &wl_output_interface, 4); + AstalRiverOutput *output = astal_river_output_new(id, wl_out, priv->river_status_manager, priv->display); + + self->outputs = g_list_append (self->outputs, output); + g_object_notify (G_OBJECT(self), "outputs"); + g_signal_emit(G_OBJECT(self), + astal_river_river_signals[ASTAL_RIVER_RIVER_SIGNAL_OUTPUT_ADDED], 0, + astal_river_output_get_name(output)); + g_signal_emit (self, astal_river_river_signals[ASTAL_RIVER_RIVER_SIGNAL_CHANGED], 0); + guint signal_id = g_signal_connect(output, "changed", G_CALLBACK(reemit_changed), self); + g_hash_table_insert (priv->signal_ids, GUINT_TO_POINTER (id), GUINT_TO_POINTER (signal_id)); + } else if (strcmp(interface, wl_seat_interface.name) == 0) { + priv->seat = wl_registry_bind(registry, id, &wl_seat_interface, 4); + } else if (strcmp(interface, zriver_status_manager_v1_interface.name) == 0) { + priv->river_status_manager = wl_registry_bind( + registry, id, &zriver_status_manager_v1_interface, 4); + } +} + +static void global_registry_remover(void* data, struct wl_registry* registry, uint32_t id) { + AstalRiverRiver *self = ASTAL_RIVER_RIVER (data); + AstalRiverRiverPrivate *priv = astal_river_river_get_instance_private (self); + AstalRiverOutput *output = find_output_by_id(self, id); + if ( output != NULL ) { + guint signal_id = GPOINTER_TO_UINT (g_hash_table_lookup (priv->signal_ids, GUINT_TO_POINTER (id))); + g_hash_table_remove (priv->signal_ids, GUINT_TO_POINTER(id)); + g_signal_handler_disconnect (output, signal_id); + g_signal_emit(G_OBJECT(self), + astal_river_river_signals[ASTAL_RIVER_RIVER_SIGNAL_OUTPUT_ADDED], 0, + astal_river_output_get_name(output)); + self->outputs = g_list_remove (self->outputs, output); + g_object_notify (G_OBJECT(self), "outputs"); + g_object_unref(output); + return; + } + g_signal_emit (self, astal_river_river_signals[ASTAL_RIVER_RIVER_SIGNAL_CHANGED], 0); +} + + +static const struct wl_registry_listener registry_listener = { + global_registry_handler, + global_registry_remover +}; + +static void astal_river_river_json_serializable_iface_init(JsonSerializableIface *iface){ + iface->serialize_property = astal_river_river_serialize_property; + serializable_iface = g_type_default_interface_peek (JSON_TYPE_SERIALIZABLE); +} + +static gboolean astal_river_river_initable_init (GInitable *initable, GCancellable *cancellable, GError **error) { + AstalRiverRiver *self = ASTAL_RIVER_RIVER (initable); + AstalRiverRiverPrivate *priv = astal_river_river_get_instance_private (self); + + priv->seat = NULL; + priv->display = NULL; + priv->river_status_manager = NULL; + priv->signal_ids = g_hash_table_new (g_direct_hash, g_direct_equal); + + priv->wl_source = wl_source_new(NULL, NULL); + + if (priv->wl_source == NULL) { + g_set_error_literal(error, G_IO_ERROR, G_IO_ERROR_FAILED, "Can not connect to wayland display"); + return FALSE; + } + + priv->display = wl_source_get_display(priv->wl_source); + + priv->wl_registry = wl_display_get_registry(priv->display); + wl_registry_add_listener(priv->wl_registry, ®istry_listener, self); + + wl_display_roundtrip(priv->display); + + if (priv->river_status_manager == NULL) { + g_set_error_literal(error, G_IO_ERROR, G_IO_ERROR_FAILED, "Can not connect river status protocol"); + return FALSE; + } + + priv->river_seat_status = zriver_status_manager_v1_get_river_seat_status( + priv->river_status_manager, priv->seat); + zriver_seat_status_v1_add_listener( + priv->river_seat_status, &river_seat_status_listener, self); + + wl_display_roundtrip(priv->display); + + return TRUE; +} + +static void astal_river_river_initable_iface_init (GInitableIface *iface) { + iface->init = astal_river_river_initable_init; +} + +static void astal_river_river_init(AstalRiverRiver *self) { + self->outputs = NULL; +} + +AstalRiverRiver *astal_river_river_new() { + return g_initable_new(ASTAL_RIVER_TYPE_RIVER, NULL, NULL, NULL); +} + +static void disconnect_signal (gpointer key, gpointer value, gpointer user_data) { + AstalRiverRiver *self = ASTAL_RIVER_RIVER(user_data); + AstalRiverRiverPrivate *priv = astal_river_river_get_instance_private (self); + + AstalRiverOutput *output = find_output_by_id (self, GPOINTER_TO_UINT(key)); + g_signal_handler_disconnect (output, GPOINTER_TO_UINT(value)); +} + +static void astal_river_river_finalize(GObject *object) { + + AstalRiverRiver *self = ASTAL_RIVER_RIVER(object); + AstalRiverRiverPrivate *priv = astal_river_river_get_instance_private(self); + + g_hash_table_foreach (priv->signal_ids, disconnect_signal, self); + g_hash_table_destroy (priv->signal_ids); + + wl_display_roundtrip (priv->display); + + g_clear_list(&self->outputs, g_object_unref); + self->outputs = NULL; + + wl_registry_destroy(priv->wl_registry); + zriver_status_manager_v1_destroy(priv->river_status_manager); + zriver_seat_status_v1_destroy(priv->river_seat_status); + wl_seat_destroy(priv->seat); + wl_display_flush(priv->display); + + wl_source_free(priv->wl_source); + + g_free(self->focused_view); + g_free(self->focused_output); + g_free(self->mode); + + + G_OBJECT_CLASS (astal_river_river_parent_class)->finalize(object); +} + +static void astal_river_river_class_init(AstalRiverRiverClass *class) { + + GObjectClass *object_class = G_OBJECT_CLASS (class); + object_class->get_property = astal_river_river_get_property; + object_class->finalize = astal_river_river_finalize; + + astal_river_river_properties[ASTAL_RIVER_RIVER_PROP_MODE] = + g_param_spec_string("mode", + "mode", + "currently active mode", + NULL, + G_PARAM_READABLE); + astal_river_river_properties[ASTAL_RIVER_RIVER_PROP_FOCUSED_VIEW] = + g_param_spec_string("focused-view", + "focused-view", + "currently focused view", + NULL, + G_PARAM_READABLE); + astal_river_river_properties[ASTAL_RIVER_RIVER_PROP_FOCUSED_OUTPUT] = + g_param_spec_string("focused-output", + "focused-output", + "currently focused-output", + NULL, + G_PARAM_READABLE); + astal_river_river_properties[ASTAL_RIVER_RIVER_PROP_OUTPUTS] = + g_param_spec_pointer("outputs", + "outputs", + "a list of all outputs", + G_PARAM_READABLE); + + g_object_class_install_properties(object_class, + ASTAL_RIVER_RIVER_N_PROPERTIES, + astal_river_river_properties); + + + astal_river_river_signals[ASTAL_RIVER_RIVER_SIGNAL_OUTPUT_ADDED] = + g_signal_new("output-added", + G_TYPE_FROM_CLASS(class), + G_SIGNAL_RUN_FIRST, + 0, + NULL, + NULL, + NULL, + G_TYPE_NONE, + 1, + G_TYPE_STRING); + + astal_river_river_signals[ASTAL_RIVER_RIVER_SIGNAL_OUTPUT_REMOVED] = + g_signal_new("output-removed", + G_TYPE_FROM_CLASS(class), + G_SIGNAL_RUN_FIRST, + 0, + NULL, + NULL, + NULL, + G_TYPE_NONE, + 1, + G_TYPE_STRING); + astal_river_river_signals[ASTAL_RIVER_RIVER_SIGNAL_CHANGED] = + g_signal_new("changed", + G_TYPE_FROM_CLASS(class), + G_SIGNAL_RUN_FIRST, + 0, + NULL, + NULL, + NULL, + G_TYPE_NONE, + 0); +} diff --git a/src/wayland-source.c b/src/wayland-source.c new file mode 100644 index 0000000..d984c2e --- /dev/null +++ b/src/wayland-source.c @@ -0,0 +1,114 @@ + +#include +#include +#include +#include "wayland-source.h" + +struct _WLSource { + GSource source; + struct wl_display *display; + gpointer fd; + int error; +}; + +static gboolean wl_source_prepare(GSource *source, + gint *timeout) { + WLSource *self = (WLSource *)source; + + *timeout = 0; + if (wl_display_prepare_read(self->display) != 0) + return TRUE; + else if (wl_display_flush(self->display) < 0) { + self->error = errno; + return TRUE; + } + *timeout = -1; + return FALSE; +} + +static gboolean wl_source_check(GSource *source) { + WLSource *self = (WLSource *)source; + + if (self->error > 0) + return TRUE; + + GIOCondition revents; + revents = g_source_query_unix_fd(source, self->fd); + + if (revents & G_IO_IN) { + if (wl_display_read_events(self->display) < 0) + self->error = errno; + } + else + wl_display_cancel_read(self->display); + + return revents > 0; +} + +static gboolean wl_source_dispatch(GSource *source, + GSourceFunc callback, + gpointer user_data) { + WLSource *self = (WLSource *)source; + GIOCondition revents; + + revents = g_source_query_unix_fd(source, self->fd); + if ((self->error > 0) || (revents & (G_IO_ERR | G_IO_HUP))) { + errno = self->error; + self->error = 0; + if ( callback != NULL ) + return callback(user_data); + return G_SOURCE_REMOVE; + } + + if (wl_display_dispatch_pending(self->display) < 0) { + if ( callback != NULL ) + return callback(user_data); + return G_SOURCE_REMOVE; + } + + return G_SOURCE_CONTINUE; +} + +static void wl_source_finalize(GSource *source) { + WLSource *self = (WLSource *)source; + wl_display_disconnect(self->display); +} + +static GSourceFuncs wl_source_funcs = { + .prepare = wl_source_prepare, + .check = wl_source_check, + .dispatch = wl_source_dispatch, + .finalize = wl_source_finalize, +}; + +WLSource* wl_source_new() { + struct wl_display *display; + WLSource *self; + GSource *source; + + display = wl_display_connect(NULL); + if (display == NULL) + return NULL; + + source = g_source_new(&wl_source_funcs, sizeof(WLSource)); + self = (WLSource *)source; + self->display = display; + + self->fd = g_source_add_unix_fd(source, + wl_display_get_fd(self->display), + G_IO_IN | G_IO_ERR | G_IO_HUP); + + g_source_attach(source, NULL); + + return self; +} + +void wl_source_free(WLSource *self) { + GSource * source = (GSource *)self; + g_source_destroy(source); + g_source_unref(source); +} + +struct wl_display* wl_source_get_display(WLSource *self) { + return self->display; +} diff --git a/version b/version new file mode 100644 index 0000000..6e8bf73 --- /dev/null +++ b/version @@ -0,0 +1 @@ +0.1.0 -- cgit v1.2.3 From b6ba3c7df2d08a338c4a841417c4a66cd3b39da7 Mon Sep 17 00:00:00 2001 From: kotontrion Date: Mon, 10 Jun 2024 08:34:38 +0200 Subject: fix introspection data --- include/river.h | 72 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) diff --git a/include/river.h b/include/river.h index d4d33c2..f1f8128 100644 --- a/include/river.h +++ b/include/river.h @@ -9,7 +9,14 @@ G_BEGIN_DECLS G_DECLARE_FINAL_TYPE (AstalRiverOutput, astal_river_output, ASTAL_RIVER, OUTPUT, GObject) +/** + * astal_river_output_get_nid + * @self: the AstalRiverOutput object + * + * Returns: the id of the output + */ guint astal_river_output_get_id(AstalRiverOutput *self); + /** * astal_river_output_get_name * @self: the AstalRiverOutput object @@ -17,10 +24,46 @@ guint astal_river_output_get_id(AstalRiverOutput *self); * Returns: (transfer none) (nullable): the name of the output */ gchar* astal_river_output_get_name(AstalRiverOutput *self); + +/** + * astal_river_output_get_layout_name + * @self: the AstalRiverOutput object + * + * Returns: (transfer none) (nullable): the currently used layout name of the output + */ gchar* astal_river_output_get_layout_name(AstalRiverOutput *self); + +/** + * astal_river_output_get_focused_view + * @self: the AstalRiverOutput object + * + * Returns: (transfer none) (nullable): the focused view on the output + */ gchar* astal_river_output_get_focused_view(AstalRiverOutput *self); + +/** + * astal_river_output_get_focused_tags + * @self: the AstalRiverOutput object + * + * Returns: the focused tags of the output + */ guint astal_river_output_get_focused_tags(AstalRiverOutput *self); + +/** + * astal_river_output_get_urgent_tags + * @self: the AstalRiverOutput object + * + * Returns: the urgent tags of the output + */ guint astal_river_output_get_urgent_tags(AstalRiverOutput *self); + + +/** + * astal_river_output_get_occupied_tags + * @self: the AstalRiverOutput object + * + * Returns: the occupied tags of the output + */ guint astal_river_output_get_occupied_tags(AstalRiverOutput *self); @@ -29,6 +72,14 @@ guint astal_river_output_get_occupied_tags(AstalRiverOutput *self); G_DECLARE_FINAL_TYPE (AstalRiverRiver, astal_river_river, ASTAL_RIVER, RIVER, GObject) + + +/** + * astal_river_river_new + * + * Returns: (nullable): a newly created connection to river + */ + AstalRiverRiver *astal_river_river_new(); /** @@ -50,8 +101,29 @@ GList* astal_river_river_get_outputs(AstalRiverRiver *self); AstalRiverOutput* astal_river_river_get_output(AstalRiverRiver *self, gchar* name); +/** + * astal_river_river_get_focused_view + * @self: the AstalRiverOutput object + * + * Returns: (transfer none) (nullable): the currently focused view + */ gchar* astal_river_river_get_focused_view(AstalRiverRiver *self); + +/** + * astal_river_river_get_focused_output + * @self: the AstalRiverOutput object + * + * Returns: (transfer none) (nullable): the name of the currently focused output + */ gchar* astal_river_river_get_focused_output(AstalRiverRiver *self); + + +/** + * astal_river_river_get_mode + * @self: the AstalRiverOutput object + * + * Returns: (transfer none) (nullable): the currently active mode + */ gchar* astal_river_river_get_mode(AstalRiverRiver *self); -- cgit v1.2.3 From 60730faf1d4c264312903cefef6a3d1c377badcb Mon Sep 17 00:00:00 2001 From: kotontrion Date: Fri, 14 Jun 2024 11:45:02 +0200 Subject: fix: layout_name use after free --- src/river-output.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/river-output.c b/src/river-output.c index 4a7398e..297a290 100644 --- a/src/river-output.c +++ b/src/river-output.c @@ -178,6 +178,7 @@ static void astal_river_handle_layout_name_clear(void *data, struct zriver_output_status_v1 *status) { AstalRiverOutput *self = ASTAL_RIVER_OUTPUT (data); g_free(self->layout_name); + self->layout_name = NULL; g_object_notify (G_OBJECT(self), "layout-name"); g_signal_emit (self, astal_river_output_signals[ASTAL_RIVER_OUTPUT_SIGNAL_CHANGED], 0); } -- cgit v1.2.3 From 23b9314788d9f2c9f16a0daf1517bfd899243f54 Mon Sep 17 00:00:00 2001 From: kotontrion Date: Fri, 14 Jun 2024 14:15:26 +0200 Subject: Add get_default method to obtain the singleton instance --- include/river.h | 7 ++++++- src/river.c | 14 ++++++++++++-- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/include/river.h b/include/river.h index f1f8128..881ca75 100644 --- a/include/river.h +++ b/include/river.h @@ -79,9 +79,14 @@ G_DECLARE_FINAL_TYPE (AstalRiverRiver, astal_river_river, ASTAL_RIVER, RIVER, GO * * Returns: (nullable): a newly created connection to river */ - AstalRiverRiver *astal_river_river_new(); +/** + * astal_river_river_get_default + * + * Returns: (nullable) (transfer none): gets the default River object. + */ +AstalRiverRiver* astal_river_river_get_default(); /** * astal_river_river_get_outputs * @self: the AstalRiverRiver object diff --git a/src/river.c b/src/river.c index 44225a6..61c5c9d 100644 --- a/src/river.c +++ b/src/river.c @@ -1,5 +1,6 @@ +#include "river.h" #include "river-private.h" #include #include @@ -295,7 +296,7 @@ static gboolean astal_river_river_initable_init (GInitable *initable, GCancellab } static void astal_river_river_initable_iface_init (GInitableIface *iface) { - iface->init = astal_river_river_initable_init; + iface->init = astal_river_river_initable_init; } static void astal_river_river_init(AstalRiverRiver *self) { @@ -303,7 +304,7 @@ static void astal_river_river_init(AstalRiverRiver *self) { } AstalRiverRiver *astal_river_river_new() { - return g_initable_new(ASTAL_RIVER_TYPE_RIVER, NULL, NULL, NULL); + return g_initable_new(ASTAL_RIVER_TYPE_RIVER, NULL, NULL, NULL); } static void disconnect_signal (gpointer key, gpointer value, gpointer user_data) { @@ -314,6 +315,15 @@ static void disconnect_signal (gpointer key, gpointer value, gpointer user_data) g_signal_handler_disconnect (output, GPOINTER_TO_UINT(value)); } +AstalRiverRiver* astal_river_river_get_default() { + static AstalRiverRiver *self = NULL; + + if (self == NULL) + self = astal_river_river_new(); + + return self; +} + static void astal_river_river_finalize(GObject *object) { AstalRiverRiver *self = ASTAL_RIVER_RIVER(object); -- cgit v1.2.3 From 637875607f230ab7bd45d05db685323f568900f9 Mon Sep 17 00:00:00 2001 From: kotontrion Date: Sat, 15 Jun 2024 13:17:54 +0200 Subject: add river-control-unstable-v1 support --- include/river.h | 19 ++++++++ protocols/meson.build | 3 +- protocols/river-control-unstable-v1.xml | 86 +++++++++++++++++++++++++++++++++ src/river.c | 38 ++++++++++++++- 4 files changed, 144 insertions(+), 2 deletions(-) create mode 100644 protocols/river-control-unstable-v1.xml diff --git a/include/river.h b/include/river.h index 881ca75..7e2bd59 100644 --- a/include/river.h +++ b/include/river.h @@ -132,6 +132,25 @@ gchar* astal_river_river_get_focused_output(AstalRiverRiver *self); gchar* astal_river_river_get_mode(AstalRiverRiver *self); +/** + * AstalRiverCommandCallback: + * @success: a #gboolean. + * @msg: a string. + * + * A callback function that gets a #GObject, a #gboolean, and a string. + */ +typedef void (*AstalRiverCommandCallback)(gboolean success, const gchar *msg); + +/** + * astal_river_river_run_command_async: + * @self: the AstalRiverRiver object + * @length: the length of the cmd array + * @cmd: (array length=length): the command to execute + * @callback: (scope async) (nullable): the callback to invoke. + * + * Calls the given callback with the provided parameters. + */ +void astal_river_river_run_command_async(AstalRiverRiver *self, gint length, const gchar **cmd, AstalRiverCommandCallback callback); diff --git a/protocols/meson.build b/protocols/meson.build index f936e37..69f01bb 100644 --- a/protocols/meson.build +++ b/protocols/meson.build @@ -3,6 +3,7 @@ wayland_scanner = find_program('wayland-scanner') protocols = [ 'river-status-unstable-v1.xml', + 'river-control-unstable-v1.xml' ] gen_client_header = generator(wayland_scanner, @@ -19,4 +20,4 @@ foreach protocol : protocols client_header = gen_client_header.process(protocol) code = gen_private_code.process(protocol) client_protocol_srcs += [client_header, code] -endforeach \ No newline at end of file +endforeach diff --git a/protocols/river-control-unstable-v1.xml b/protocols/river-control-unstable-v1.xml new file mode 100644 index 0000000..c431901 --- /dev/null +++ b/protocols/river-control-unstable-v1.xml @@ -0,0 +1,86 @@ + + + + Copyright 2020 The River Developers + + Permission to use, copy, modify, and/or distribute this software for any + purpose with or without fee is hereby granted, provided that the above + copyright notice and this permission notice appear in all copies. + + THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + + + + + This interface allows clients to run compositor commands and receive a + success/failure response with output or a failure message respectively. + + Each command is built up in a series of add_argument requests and + executed with a run_command request. The first argument is the command + to be run. + + A complete list of commands should be made available in the man page of + the compositor. + + + + + This request indicates that the client will not use the + river_control object any more. Objects that have been created + through this instance are not affected. + + + + + + Arguments are stored by the server in the order they were sent until + the run_command request is made. + + + + + + + Execute the command built up using the add_argument request for the + given seat. + + + + + + + + + This object is created by the run_command request. Exactly one of the + success or failure events will be sent. This object will be destroyed + by the compositor after one of the events is sent. + + + + + Sent when the command has been successfully received and executed by + the compositor. Some commands may produce output, in which case the + output argument will be a non-empty string. + + + + + + + Sent when the command could not be carried out. This could be due to + sending a non-existent command, no command, not enough arguments, too + many arguments, invalid arguments, etc. + + + + + + diff --git a/src/river.c b/src/river.c index 61c5c9d..e6fc26c 100644 --- a/src/river.c +++ b/src/river.c @@ -6,6 +6,7 @@ #include #include #include "river-status-unstable-v1-client.h" +#include "river-control-unstable-v1-client.h" #include "wayland-source.h" #include @@ -26,6 +27,7 @@ typedef struct { struct wl_display *display; WLSource *wl_source; struct zriver_status_manager_v1 *river_status_manager; + struct zriver_control_v1 *river_control;; struct zriver_seat_status_v1 *river_seat_status; } AstalRiverRiverPrivate; @@ -224,14 +226,48 @@ static void global_registry_handler(void* data, } else if (strcmp(interface, zriver_status_manager_v1_interface.name) == 0) { priv->river_status_manager = wl_registry_bind( registry, id, &zriver_status_manager_v1_interface, 4); + } else if (strcmp(interface, zriver_control_v1_interface.name) == 0) { + priv->river_control = wl_registry_bind( + registry, id, &zriver_control_v1_interface, 1); } } +static void astal_river_river_callback_success(void *data, + struct zriver_command_callback_v1 *cb, + const char *msg) { + AstalRiverCommandCallback callback = (AstalRiverCommandCallback)(data); + callback(TRUE, msg); +} + +static void astal_river_river_callback_failure(void *data, + struct zriver_command_callback_v1 *cb, + const char *msg) { + AstalRiverCommandCallback callback = (AstalRiverCommandCallback)(data); + callback(FALSE, msg); +} + +const struct zriver_command_callback_v1_listener cb_listener = { + .success = astal_river_river_callback_success, + .failure = astal_river_river_callback_failure +}; + +void astal_river_river_run_command_async(AstalRiverRiver *self, gint length, const gchar **cmd, AstalRiverCommandCallback callback) { + AstalRiverRiverPrivate *priv = astal_river_river_get_instance_private(self); + + for(gint i = 0; i < length; ++i) { + zriver_control_v1_add_argument(priv->river_control, cmd[i]); + } + + struct zriver_command_callback_v1 *cb = zriver_control_v1_run_command(priv->river_control, priv->seat); + if(callback != NULL) + zriver_command_callback_v1_add_listener(cb, &cb_listener, callback); +} + static void global_registry_remover(void* data, struct wl_registry* registry, uint32_t id) { AstalRiverRiver *self = ASTAL_RIVER_RIVER (data); AstalRiverRiverPrivate *priv = astal_river_river_get_instance_private (self); AstalRiverOutput *output = find_output_by_id(self, id); - if ( output != NULL ) { + if ( output != NULL ) { guint signal_id = GPOINTER_TO_UINT (g_hash_table_lookup (priv->signal_ids, GUINT_TO_POINTER (id))); g_hash_table_remove (priv->signal_ids, GUINT_TO_POINTER(id)); g_signal_handler_disconnect (output, signal_id); -- cgit v1.2.3 From 36ce3262ac1f137866bf7f94a2ffea8c6c6fcee6 Mon Sep 17 00:00:00 2001 From: kotontrion Date: Sun, 16 Jun 2024 18:37:04 +0200 Subject: fix code style --- include/river-private.h | 14 +- include/river.h | 37 ++--- include/wayland-source.h | 4 +- meson.build | 2 +- src/astal-river.c | 37 ++--- src/river-output.c | 282 +++++++++++++------------------- src/river.c | 415 ++++++++++++++++++++--------------------------- src/wayland-source.c | 43 ++--- 8 files changed, 341 insertions(+), 493 deletions(-) diff --git a/include/river-private.h b/include/river-private.h index 1b94495..d32e074 100644 --- a/include/river-private.h +++ b/include/river-private.h @@ -1,20 +1,20 @@ #ifndef ASTAL_RIVER_OUTPUT_PRIVATE_H #define ASTAL_RIVER_OUTPUT_PRIVATE_H -#include "river.h" -#include "river-status-unstable-v1-client.h" #include +#include "river-status-unstable-v1-client.h" +#include "river.h" + G_BEGIN_DECLS -AstalRiverOutput *astal_river_output_new(guint id, - struct wl_output *wl_output, +AstalRiverOutput *astal_river_output_new(guint id, struct wl_output *wl_output, struct zriver_status_manager_v1 *status_manager, struct wl_display *wl_display); -struct wl_output* astal_river_output_get_wl_output(AstalRiverOutput *self); -void astal_river_output_set_focused_view(AstalRiverOutput *self, gchar* focused_view); +struct wl_output *astal_river_output_get_wl_output(AstalRiverOutput *self); +void astal_river_output_set_focused_view(AstalRiverOutput *self, gchar *focused_view); G_END_DECLS -#endif // !ASTAL_RIVER_OUTPUT_PRIVATE_H +#endif // !ASTAL_RIVER_OUTPUT_PRIVATE_H diff --git a/include/river.h b/include/river.h index 7e2bd59..e8576a3 100644 --- a/include/river.h +++ b/include/river.h @@ -7,7 +7,7 @@ G_BEGIN_DECLS #define ASTAL_RIVER_TYPE_OUTPUT (astal_river_output_get_type()) -G_DECLARE_FINAL_TYPE (AstalRiverOutput, astal_river_output, ASTAL_RIVER, OUTPUT, GObject) +G_DECLARE_FINAL_TYPE(AstalRiverOutput, astal_river_output, ASTAL_RIVER, OUTPUT, GObject) /** * astal_river_output_get_nid @@ -23,7 +23,7 @@ guint astal_river_output_get_id(AstalRiverOutput *self); * * Returns: (transfer none) (nullable): the name of the output */ -gchar* astal_river_output_get_name(AstalRiverOutput *self); +gchar *astal_river_output_get_name(AstalRiverOutput *self); /** * astal_river_output_get_layout_name @@ -31,7 +31,7 @@ gchar* astal_river_output_get_name(AstalRiverOutput *self); * * Returns: (transfer none) (nullable): the currently used layout name of the output */ -gchar* astal_river_output_get_layout_name(AstalRiverOutput *self); +gchar *astal_river_output_get_layout_name(AstalRiverOutput *self); /** * astal_river_output_get_focused_view @@ -39,7 +39,7 @@ gchar* astal_river_output_get_layout_name(AstalRiverOutput *self); * * Returns: (transfer none) (nullable): the focused view on the output */ -gchar* astal_river_output_get_focused_view(AstalRiverOutput *self); +gchar *astal_river_output_get_focused_view(AstalRiverOutput *self); /** * astal_river_output_get_focused_tags @@ -57,7 +57,6 @@ guint astal_river_output_get_focused_tags(AstalRiverOutput *self); */ guint astal_river_output_get_urgent_tags(AstalRiverOutput *self); - /** * astal_river_output_get_occupied_tags * @self: the AstalRiverOutput object @@ -66,13 +65,9 @@ guint astal_river_output_get_urgent_tags(AstalRiverOutput *self); */ guint astal_river_output_get_occupied_tags(AstalRiverOutput *self); - - #define ASTAL_RIVER_TYPE_RIVER (astal_river_river_get_type()) -G_DECLARE_FINAL_TYPE (AstalRiverRiver, astal_river_river, ASTAL_RIVER, RIVER, GObject) - - +G_DECLARE_FINAL_TYPE(AstalRiverRiver, astal_river_river, ASTAL_RIVER, RIVER, GObject) /** * astal_river_river_new @@ -86,7 +81,7 @@ AstalRiverRiver *astal_river_river_new(); * * Returns: (nullable) (transfer none): gets the default River object. */ -AstalRiverRiver* astal_river_river_get_default(); +AstalRiverRiver *astal_river_river_get_default(); /** * astal_river_river_get_outputs * @self: the AstalRiverRiver object @@ -94,7 +89,7 @@ AstalRiverRiver* astal_river_river_get_default(); * Returns: (transfer none) (element-type AstalRiver.Output): a list of all outputs * */ -GList* astal_river_river_get_outputs(AstalRiverRiver *self); +GList *astal_river_river_get_outputs(AstalRiverRiver *self); /** * astal_river_river_get_output @@ -103,8 +98,7 @@ GList* astal_river_river_get_outputs(AstalRiverRiver *self); * * Returns: (transfer none) (nullable): the output with the given name or null */ -AstalRiverOutput* astal_river_river_get_output(AstalRiverRiver *self, gchar* name); - +AstalRiverOutput *astal_river_river_get_output(AstalRiverRiver *self, gchar *name); /** * astal_river_river_get_focused_view @@ -112,7 +106,7 @@ AstalRiverOutput* astal_river_river_get_output(AstalRiverRiver *self, gchar* nam * * Returns: (transfer none) (nullable): the currently focused view */ -gchar* astal_river_river_get_focused_view(AstalRiverRiver *self); +gchar *astal_river_river_get_focused_view(AstalRiverRiver *self); /** * astal_river_river_get_focused_output @@ -120,8 +114,7 @@ gchar* astal_river_river_get_focused_view(AstalRiverRiver *self); * * Returns: (transfer none) (nullable): the name of the currently focused output */ -gchar* astal_river_river_get_focused_output(AstalRiverRiver *self); - +gchar *astal_river_river_get_focused_output(AstalRiverRiver *self); /** * astal_river_river_get_mode @@ -129,8 +122,7 @@ gchar* astal_river_river_get_focused_output(AstalRiverRiver *self); * * Returns: (transfer none) (nullable): the currently active mode */ -gchar* astal_river_river_get_mode(AstalRiverRiver *self); - +gchar *astal_river_river_get_mode(AstalRiverRiver *self); /** * AstalRiverCommandCallback: @@ -150,10 +142,9 @@ typedef void (*AstalRiverCommandCallback)(gboolean success, const gchar *msg); * * Calls the given callback with the provided parameters. */ -void astal_river_river_run_command_async(AstalRiverRiver *self, gint length, const gchar **cmd, AstalRiverCommandCallback callback); - - +void astal_river_river_run_command_async(AstalRiverRiver *self, gint length, const gchar **cmd, + AstalRiverCommandCallback callback); G_END_DECLS -#endif // !ASTAL_RIVER_H +#endif // !ASTAL_RIVER_H diff --git a/include/wayland-source.h b/include/wayland-source.h index ad6ed8c..342d82b 100644 --- a/include/wayland-source.h +++ b/include/wayland-source.h @@ -6,8 +6,8 @@ G_BEGIN_DECLS typedef struct _WLSource WLSource; WLSource* wl_source_new(); -void wl_source_free(WLSource *self); -struct wl_display* wl_source_get_display(WLSource *source); +void wl_source_free(WLSource* self); +struct wl_display* wl_source_get_display(WLSource* source); G_END_DECLS diff --git a/meson.build b/meson.build index 923d06c..0cee54d 100644 --- a/meson.build +++ b/meson.build @@ -9,7 +9,7 @@ project('astal_river', ) add_project_arguments( - ['-Wno-pedantic'], + ['-Wno-pedantic', '-Wno-unused-parameter'], language : 'c') version_split = meson.project_version().split('.') diff --git a/src/astal-river.c b/src/astal-river.c index 6596eb4..cb04d45 100644 --- a/src/astal-river.c +++ b/src/astal-river.c @@ -1,29 +1,26 @@ -#include "river.h" -#include "gio/gio.h" #include #include -GMainLoop *loop; +#include "gio/gio.h" +#include "river.h" + +GMainLoop* loop; -void print_json(AstalRiverRiver *river) { - JsonNode *json = json_gobject_serialize (G_OBJECT(river)); +void print_json(AstalRiverRiver* river) { + JsonNode* json = json_gobject_serialize(G_OBJECT(river)); - gchar* json_str = json_to_string (json, FALSE); + gchar* json_str = json_to_string(json, FALSE); g_print("%s\n", json_str); g_free(json); } -int main(int argc, char **argv) { - +int main(int argc, char** argv) { gboolean daemon = FALSE; int opt; - const char *optstring = "d"; + const char* optstring = "d"; - static struct option long_options[] = { - {"daemon", no_argument, NULL, 'd'}, - {NULL, 0, NULL, 0} - }; + static struct option long_options[] = {{"daemon", no_argument, NULL, 'd'}, {NULL, 0, NULL, 0}}; while ((opt = getopt_long(argc, argv, optstring, long_options, NULL)) != -1) { switch (opt) { @@ -36,15 +33,13 @@ int main(int argc, char **argv) { } } - AstalRiverRiver *river = astal_river_river_new (); - if(daemon) { - loop = g_main_loop_new (NULL, FALSE); + AstalRiverRiver* river = astal_river_river_new(); + if (daemon) { + loop = g_main_loop_new(NULL, FALSE); g_signal_connect(river, "changed", G_CALLBACK(print_json), NULL); - g_main_loop_run (loop); - } - else { - print_json (river); + g_main_loop_run(loop); + } else { + print_json(river); g_object_unref(river); } - } diff --git a/src/river-output.c b/src/river-output.c index 297a290..a431cf4 100644 --- a/src/river-output.c +++ b/src/river-output.c @@ -1,6 +1,6 @@ +#include #include "river-private.h" -#include #include "river-status-unstable-v1-client.h" struct _AstalRiverOutput { @@ -8,17 +8,17 @@ struct _AstalRiverOutput { guint focused_tags; guint occupied_tags; guint urgent_tags; - gchar *layout_name; - gchar *focused_view; + gchar* layout_name; + gchar* focused_view; guint id; gchar* name; }; typedef struct { - struct zriver_status_manager_v1 *river_status_manager; - struct zriver_output_status_v1 *river_output_status; - struct wl_display *wl_display; - struct wl_output *wl_output; + struct zriver_status_manager_v1* river_status_manager; + struct zriver_output_status_v1* river_output_status; + struct wl_display* wl_display; + struct wl_output* wl_output; } AstalRiverOutputPrivate; G_DEFINE_FINAL_TYPE_WITH_PRIVATE(AstalRiverOutput, astal_river_output, G_TYPE_OBJECT); @@ -39,158 +39,143 @@ typedef enum { ASTAL_RIVER_OUTPUT_N_SIGNALS } AstalRiverOutputSignals; -static guint astal_river_output_signals[ASTAL_RIVER_OUTPUT_N_SIGNALS] = {0,}; -static GParamSpec *astal_river_output_properties[ASTAL_RIVER_OUTPUT_N_PROPERTIES] = {NULL,}; +static guint astal_river_output_signals[ASTAL_RIVER_OUTPUT_N_SIGNALS] = { + 0, +}; -guint astal_river_output_get_id(AstalRiverOutput *self) { - return self->id; -} +static GParamSpec* astal_river_output_properties[ASTAL_RIVER_OUTPUT_N_PROPERTIES] = { + NULL, +}; -gchar* astal_river_output_get_name(AstalRiverOutput *self) { - return self->name; -} +guint astal_river_output_get_id(AstalRiverOutput* self) { return self->id; } -gchar* astal_river_output_get_layout_name(AstalRiverOutput *self) { - return self->layout_name; -} +gchar* astal_river_output_get_name(AstalRiverOutput* self) { return self->name; } -gchar* astal_river_output_get_focused_view(AstalRiverOutput *self) { - return self->focused_view; -} +gchar* astal_river_output_get_layout_name(AstalRiverOutput* self) { return self->layout_name; } + +gchar* astal_river_output_get_focused_view(AstalRiverOutput* self) { return self->focused_view; } -void astal_river_output_set_focused_view(AstalRiverOutput *self, gchar* focused_view) { +void astal_river_output_set_focused_view(AstalRiverOutput* self, gchar* focused_view) { g_free(self->focused_view); self->focused_view = g_strdup(focused_view); - g_object_notify (G_OBJECT(self), "focused-view"); - g_signal_emit (self, astal_river_output_signals[ASTAL_RIVER_OUTPUT_SIGNAL_CHANGED], 0); + g_object_notify(G_OBJECT(self), "focused-view"); + g_signal_emit(self, astal_river_output_signals[ASTAL_RIVER_OUTPUT_SIGNAL_CHANGED], 0); } -guint astal_river_output_get_focused_tags(AstalRiverOutput *self) { - return self->focused_tags; -} +guint astal_river_output_get_focused_tags(AstalRiverOutput* self) { return self->focused_tags; } -guint astal_river_output_get_urgent_tags(AstalRiverOutput *self) { - return self->urgent_tags; -} - -guint astal_river_output_get_occupied_tags(AstalRiverOutput *self) { - return self->occupied_tags; -} +guint astal_river_output_get_urgent_tags(AstalRiverOutput* self) { return self->urgent_tags; } +guint astal_river_output_get_occupied_tags(AstalRiverOutput* self) { return self->occupied_tags; } -struct wl_output* astal_river_output_get_wl_output(AstalRiverOutput *self) { - AstalRiverOutputPrivate *priv = astal_river_output_get_instance_private(self); - return priv->wl_output; +struct wl_output* astal_river_output_get_wl_output(AstalRiverOutput* self) { + AstalRiverOutputPrivate* priv = astal_river_output_get_instance_private(self); + return priv->wl_output; } -static void astal_river_output_get_property(GObject *object, guint property_id, GValue *value, GParamSpec *pspec) { - AstalRiverOutput *self = ASTAL_RIVER_OUTPUT(object); +static void astal_river_output_get_property(GObject* object, guint property_id, GValue* value, + GParamSpec* pspec) { + AstalRiverOutput* self = ASTAL_RIVER_OUTPUT(object); switch (property_id) { case ASTAL_RIVER_OUTPUT_PROP_FOCUSED_TAGS: - g_value_set_uint (value, self->focused_tags); + g_value_set_uint(value, self->focused_tags); break; case ASTAL_RIVER_OUTPUT_PROP_OCCUPIED_TAGS: - g_value_set_uint (value, self->occupied_tags); + g_value_set_uint(value, self->occupied_tags); break; case ASTAL_RIVER_OUTPUT_PROP_URGENT_TAGS: - g_value_set_uint (value, self->urgent_tags); + g_value_set_uint(value, self->urgent_tags); break; case ASTAL_RIVER_OUTPUT_PROP_ID: - g_value_set_uint (value, self->id); + g_value_set_uint(value, self->id); break; case ASTAL_RIVER_OUTPUT_PROP_NAME: - g_value_set_string (value, self->name); + g_value_set_string(value, self->name); break; case ASTAL_RIVER_OUTPUT_PROP_LAYOUT_NAME: - g_value_set_string (value, self->layout_name); + g_value_set_string(value, self->layout_name); break; case ASTAL_RIVER_OUTPUT_PROP_FOCUSED_VIEW: - g_value_set_string (value, self->focused_view); + g_value_set_string(value, self->focused_view); break; default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); + G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec); break; } } -static void astal_river_output_set_property(GObject *object, guint property_id, const GValue *value, GParamSpec *pspec) { - AstalRiverOutput *self = ASTAL_RIVER_OUTPUT(object); +static void astal_river_output_set_property(GObject* object, guint property_id, const GValue* value, + GParamSpec* pspec) { + AstalRiverOutput* self = ASTAL_RIVER_OUTPUT(object); switch (property_id) { case ASTAL_RIVER_OUTPUT_PROP_ID: - self->id = g_value_get_uint (value); + self->id = g_value_get_uint(value); g_object_notify(G_OBJECT(self), "id"); break; default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); + G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec); break; } - g_signal_emit (self, astal_river_output_signals[ASTAL_RIVER_OUTPUT_SIGNAL_CHANGED], 0); + g_signal_emit(self, astal_river_output_signals[ASTAL_RIVER_OUTPUT_SIGNAL_CHANGED], 0); } static void noop() {} -static void astal_river_handle_focused_tags(void *data, - struct zriver_output_status_v1 *status, +static void astal_river_handle_focused_tags(void* data, struct zriver_output_status_v1* status, uint32_t tags) { - AstalRiverOutput *self = ASTAL_RIVER_OUTPUT (data); + AstalRiverOutput* self = ASTAL_RIVER_OUTPUT(data); self->focused_tags = tags; - g_object_notify (G_OBJECT(self), "focused-tags"); - g_signal_emit (self, astal_river_output_signals[ASTAL_RIVER_OUTPUT_SIGNAL_CHANGED], 0); + g_object_notify(G_OBJECT(self), "focused-tags"); + g_signal_emit(self, astal_river_output_signals[ASTAL_RIVER_OUTPUT_SIGNAL_CHANGED], 0); } -static void astal_river_handle_urgent_tags(void *data, - struct zriver_output_status_v1 *status, +static void astal_river_handle_urgent_tags(void* data, struct zriver_output_status_v1* status, uint32_t tags) { - AstalRiverOutput *self = ASTAL_RIVER_OUTPUT (data); + AstalRiverOutput* self = ASTAL_RIVER_OUTPUT(data); self->urgent_tags = tags; - g_object_notify (G_OBJECT(self), "urgent-tags"); - g_signal_emit (self, astal_river_output_signals[ASTAL_RIVER_OUTPUT_SIGNAL_CHANGED], 0); + g_object_notify(G_OBJECT(self), "urgent-tags"); + g_signal_emit(self, astal_river_output_signals[ASTAL_RIVER_OUTPUT_SIGNAL_CHANGED], 0); } -static void astal_river_handle_occupied_tags(void *data, - struct zriver_output_status_v1 *status, - struct wl_array *view_tags) { - AstalRiverOutput *self = ASTAL_RIVER_OUTPUT (data); +static void astal_river_handle_occupied_tags(void* data, struct zriver_output_status_v1* status, + struct wl_array* view_tags) { + AstalRiverOutput* self = ASTAL_RIVER_OUTPUT(data); guint tags = 0; - guint *view; - wl_array_for_each (view, view_tags) { - tags |= *view; - } + guint* view; + wl_array_for_each(view, view_tags) { tags |= *view; } self->occupied_tags = tags; - g_object_notify (G_OBJECT(self), "occupied-tags"); - g_signal_emit (self, astal_river_output_signals[ASTAL_RIVER_OUTPUT_SIGNAL_CHANGED], 0); + g_object_notify(G_OBJECT(self), "occupied-tags"); + g_signal_emit(self, astal_river_output_signals[ASTAL_RIVER_OUTPUT_SIGNAL_CHANGED], 0); } -static void astal_river_handle_layout_name(void *data, - struct zriver_output_status_v1 *status, +static void astal_river_handle_layout_name(void* data, struct zriver_output_status_v1* status, const char* name) { - AstalRiverOutput *self = ASTAL_RIVER_OUTPUT (data); + AstalRiverOutput* self = ASTAL_RIVER_OUTPUT(data); g_free(self->layout_name); - self->layout_name = g_strdup (name); - g_object_notify (G_OBJECT(self), "layout-name"); - g_signal_emit (self, astal_river_output_signals[ASTAL_RIVER_OUTPUT_SIGNAL_CHANGED], 0); + self->layout_name = g_strdup(name); + g_object_notify(G_OBJECT(self), "layout-name"); + g_signal_emit(self, astal_river_output_signals[ASTAL_RIVER_OUTPUT_SIGNAL_CHANGED], 0); } -static void astal_river_handle_layout_name_clear(void *data, - struct zriver_output_status_v1 *status) { - AstalRiverOutput *self = ASTAL_RIVER_OUTPUT (data); +static void astal_river_handle_layout_name_clear(void* data, + struct zriver_output_status_v1* status) { + AstalRiverOutput* self = ASTAL_RIVER_OUTPUT(data); g_free(self->layout_name); - self->layout_name = NULL; - g_object_notify (G_OBJECT(self), "layout-name"); - g_signal_emit (self, astal_river_output_signals[ASTAL_RIVER_OUTPUT_SIGNAL_CHANGED], 0); + self->layout_name = NULL; + g_object_notify(G_OBJECT(self), "layout-name"); + g_signal_emit(self, astal_river_output_signals[ASTAL_RIVER_OUTPUT_SIGNAL_CHANGED], 0); } -static void astal_river_wl_output_handle_name(void *data, - struct wl_output *output, +static void astal_river_wl_output_handle_name(void* data, struct wl_output* output, const char* name) { - AstalRiverOutput *self = ASTAL_RIVER_OUTPUT (data); + AstalRiverOutput* self = ASTAL_RIVER_OUTPUT(data); g_free(self->name); self->name = g_strdup(name); - g_object_notify (G_OBJECT(self), "name"); - g_signal_emit (self, astal_river_output_signals[ASTAL_RIVER_OUTPUT_SIGNAL_CHANGED], 0); + g_object_notify(G_OBJECT(self), "name"); + g_signal_emit(self, astal_river_output_signals[ASTAL_RIVER_OUTPUT_SIGNAL_CHANGED], 0); } static const struct zriver_output_status_v1_listener output_status_listener = { @@ -210,121 +195,72 @@ static const struct wl_output_listener wl_output_listener = { .done = noop, }; -static void astal_river_output_finalize(GObject *object) { +static void astal_river_output_finalize(GObject* object) { + AstalRiverOutput* self = ASTAL_RIVER_OUTPUT(object); + AstalRiverOutputPrivate* priv = astal_river_output_get_instance_private(self); - AstalRiverOutput *self = ASTAL_RIVER_OUTPUT(object); - AstalRiverOutputPrivate *priv = astal_river_output_get_instance_private (self); + zriver_output_status_v1_destroy(priv->river_output_status); + wl_output_destroy(priv->wl_output); - zriver_output_status_v1_destroy (priv->river_output_status); - wl_output_destroy (priv->wl_output); - - wl_display_roundtrip (priv->wl_display); + wl_display_roundtrip(priv->wl_display); g_free(self->layout_name); g_free(self->name); - G_OBJECT_CLASS (astal_river_output_parent_class)->finalize(object); + G_OBJECT_CLASS(astal_river_output_parent_class)->finalize(object); } -static void astal_river_output_init(AstalRiverOutput *self) { -} - -AstalRiverOutput *astal_river_output_new(guint id, - struct wl_output *wl_output, - struct zriver_status_manager_v1 *status_manager, - struct wl_display *wl_display) { +static void astal_river_output_init(AstalRiverOutput* self) {} - AstalRiverOutput *self = g_object_new (ASTAL_RIVER_TYPE_OUTPUT, NULL); - AstalRiverOutputPrivate *priv = astal_river_output_get_instance_private (self); +AstalRiverOutput* astal_river_output_new(guint id, struct wl_output* wl_output, + struct zriver_status_manager_v1* status_manager, + struct wl_display* wl_display) { + AstalRiverOutput* self = g_object_new(ASTAL_RIVER_TYPE_OUTPUT, NULL); + AstalRiverOutputPrivate* priv = astal_river_output_get_instance_private(self); self->id = id; priv->wl_display = wl_display; priv->wl_output = wl_output; priv->river_status_manager = status_manager; - priv->river_output_status = zriver_status_manager_v1_get_river_output_status( - priv->river_status_manager, wl_output); + priv->river_output_status = + zriver_status_manager_v1_get_river_output_status(priv->river_status_manager, wl_output); - zriver_output_status_v1_add_listener( - priv->river_output_status, &output_status_listener, self); + zriver_output_status_v1_add_listener(priv->river_output_status, &output_status_listener, self); - wl_output_add_listener (wl_output, &wl_output_listener, self); + wl_output_add_listener(wl_output, &wl_output_listener, self); wl_display_roundtrip(priv->wl_display); return self; } -static void astal_river_output_class_init(AstalRiverOutputClass *class) { - - GObjectClass *object_class = G_OBJECT_CLASS (class); +static void astal_river_output_class_init(AstalRiverOutputClass* class) { + GObjectClass* object_class = G_OBJECT_CLASS(class); object_class->get_property = astal_river_output_get_property; object_class->set_property = astal_river_output_set_property; object_class->finalize = astal_river_output_finalize; - - astal_river_output_properties[ASTAL_RIVER_OUTPUT_PROP_FOCUSED_TAGS] = - g_param_spec_uint("focused-tags", - "focused-tags", - "currently focused tags", - 0, - INT_MAX, - 0, - G_PARAM_READABLE); + astal_river_output_properties[ASTAL_RIVER_OUTPUT_PROP_FOCUSED_TAGS] = g_param_spec_uint( + "focused-tags", "focused-tags", "currently focused tags", 0, INT_MAX, 0, G_PARAM_READABLE); astal_river_output_properties[ASTAL_RIVER_OUTPUT_PROP_OCCUPIED_TAGS] = - g_param_spec_uint("occupied-tags", - "occupied-tags", - "currently occupied tags", - 0, - INT_MAX, - 0, - G_PARAM_READABLE); - astal_river_output_properties[ASTAL_RIVER_OUTPUT_PROP_URGENT_TAGS] = - g_param_spec_uint("urgent-tags", - "urgent-tags", - "currently urgent tags", - 0, - INT_MAX, - 0, - G_PARAM_READABLE); + g_param_spec_uint("occupied-tags", "occupied-tags", "currently occupied tags", 0, INT_MAX, + 0, G_PARAM_READABLE); + astal_river_output_properties[ASTAL_RIVER_OUTPUT_PROP_URGENT_TAGS] = g_param_spec_uint( + "urgent-tags", "urgent-tags", "currently urgent tags", 0, INT_MAX, 0, G_PARAM_READABLE); astal_river_output_properties[ASTAL_RIVER_OUTPUT_PROP_ID] = - g_param_spec_uint("id", - "id", - "id of the output object", - 0, - INT_MAX, - 0, - G_PARAM_READABLE); - astal_river_output_properties[ASTAL_RIVER_OUTPUT_PROP_LAYOUT_NAME] = - g_param_spec_string("layout-name", - "layout-name", - "name of the current layout", - NULL, - G_PARAM_READABLE); + g_param_spec_uint("id", "id", "id of the output object", 0, INT_MAX, 0, G_PARAM_READABLE); + astal_river_output_properties[ASTAL_RIVER_OUTPUT_PROP_LAYOUT_NAME] = g_param_spec_string( + "layout-name", "layout-name", "name of the current layout", NULL, G_PARAM_READABLE); astal_river_output_properties[ASTAL_RIVER_OUTPUT_PROP_NAME] = - g_param_spec_string("name", - "name", - "name of the output", - NULL, - G_PARAM_READABLE); + g_param_spec_string("name", "name", "name of the output", NULL, G_PARAM_READABLE); astal_river_output_properties[ASTAL_RIVER_OUTPUT_PROP_FOCUSED_VIEW] = - g_param_spec_string("focused-view", - "focused-view", - "name of last focused view on this output", - NULL, - G_PARAM_READABLE); - - g_object_class_install_properties(object_class, - ASTAL_RIVER_OUTPUT_N_PROPERTIES, + g_param_spec_string("focused-view", "focused-view", + "name of last focused view on this output", NULL, G_PARAM_READABLE); + + g_object_class_install_properties(object_class, ASTAL_RIVER_OUTPUT_N_PROPERTIES, astal_river_output_properties); astal_river_output_signals[ASTAL_RIVER_OUTPUT_SIGNAL_CHANGED] = - g_signal_new("changed", - G_TYPE_FROM_CLASS(class), - G_SIGNAL_RUN_FIRST, - 0, - NULL, - NULL, - NULL, - G_TYPE_NONE, - 0); + g_signal_new("changed", G_TYPE_FROM_CLASS(class), G_SIGNAL_RUN_FIRST, 0, NULL, NULL, NULL, + G_TYPE_NONE, 0); } diff --git a/src/river.c b/src/river.c index e6fc26c..16e9e05 100644 --- a/src/river.c +++ b/src/river.c @@ -1,44 +1,42 @@ - - -#include "river.h" -#include "river-private.h" #include +#include #include #include -#include "river-status-unstable-v1-client.h" + #include "river-control-unstable-v1-client.h" +#include "river-private.h" +#include "river-status-unstable-v1-client.h" #include "wayland-source.h" -#include - struct _AstalRiverRiver { GObject parent_instance; - GList *outputs; - gchar *focused_output; - gchar *focused_view; - gchar *mode; + GList* outputs; + gchar* focused_output; + gchar* focused_view; + gchar* mode; }; typedef struct { - GHashTable *signal_ids; - - struct wl_registry *wl_registry; - struct wl_seat *seat; - struct wl_display *display; - WLSource *wl_source; - struct zriver_status_manager_v1 *river_status_manager; - struct zriver_control_v1 *river_control;; - struct zriver_seat_status_v1 *river_seat_status; + GHashTable* signal_ids; + + struct wl_registry* wl_registry; + struct wl_seat* seat; + struct wl_display* display; + WLSource* wl_source; + struct zriver_status_manager_v1* river_status_manager; + struct zriver_control_v1* river_control; + struct zriver_seat_status_v1* river_seat_status; } AstalRiverRiverPrivate; -static JsonSerializableIface *serializable_iface = NULL; -static void astal_river_river_initable_iface_init (GInitableIface *iface); -static void astal_river_river_json_serializable_iface_init(JsonSerializableIface *g_iface); +static JsonSerializableIface* serializable_iface = NULL; +static void astal_river_river_initable_iface_init(GInitableIface* iface); +static void astal_river_river_json_serializable_iface_init(JsonSerializableIface* g_iface); -G_DEFINE_TYPE_WITH_CODE (AstalRiverRiver, astal_river_river, G_TYPE_OBJECT, - G_ADD_PRIVATE (AstalRiverRiver) - G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE, astal_river_river_initable_iface_init) - G_IMPLEMENT_INTERFACE (JSON_TYPE_SERIALIZABLE, astal_river_river_json_serializable_iface_init)) +G_DEFINE_TYPE_WITH_CODE(AstalRiverRiver, astal_river_river, G_TYPE_OBJECT, + G_ADD_PRIVATE(AstalRiverRiver) G_IMPLEMENT_INTERFACE( + G_TYPE_INITABLE, astal_river_river_initable_iface_init) + G_IMPLEMENT_INTERFACE(JSON_TYPE_SERIALIZABLE, + astal_river_river_json_serializable_iface_init)) typedef enum { ASTAL_RIVER_RIVER_PROP_FOCUSED_OUTPUT = 1, @@ -55,144 +53,135 @@ typedef enum { ASTAL_RIVER_RIVER_N_SIGNALS } AstalRiverOutputSignals; -static guint astal_river_river_signals[ASTAL_RIVER_RIVER_N_SIGNALS] = {0,}; -static GParamSpec *astal_river_river_properties[ASTAL_RIVER_RIVER_N_PROPERTIES] = {NULL,}; +static guint astal_river_river_signals[ASTAL_RIVER_RIVER_N_SIGNALS] = { + 0, +}; +static GParamSpec* astal_river_river_properties[ASTAL_RIVER_RIVER_N_PROPERTIES] = { + NULL, +}; -static void reemit_changed(AstalRiverOutput *output, AstalRiverRiver *self) { - g_signal_emit (self, astal_river_river_signals[ASTAL_RIVER_RIVER_SIGNAL_CHANGED], 0); +static void reemit_changed(AstalRiverOutput* output, AstalRiverRiver* self) { + g_signal_emit(self, astal_river_river_signals[ASTAL_RIVER_RIVER_SIGNAL_CHANGED], 0); } -static AstalRiverOutput *find_output_by_id (AstalRiverRiver *self, uint32_t id) { - GList *output = self->outputs; - while(output != NULL) { - AstalRiverOutput *river_output = output->data; - if(astal_river_output_get_id (river_output) == id) return river_output; +static AstalRiverOutput* find_output_by_id(AstalRiverRiver* self, uint32_t id) { + GList* output = self->outputs; + while (output != NULL) { + AstalRiverOutput* river_output = output->data; + if (astal_river_output_get_id(river_output) == id) return river_output; output = output->next; } return NULL; } -static AstalRiverOutput *find_output_by_output (AstalRiverRiver *self, struct wl_output *wl_output) { - GList *output = self->outputs; - while(output != NULL) { - AstalRiverOutput *river_output = output->data; - if(astal_river_output_get_wl_output (river_output) == wl_output) return river_output; +static AstalRiverOutput* find_output_by_output(AstalRiverRiver* self, struct wl_output* wl_output) { + GList* output = self->outputs; + while (output != NULL) { + AstalRiverOutput* river_output = output->data; + if (astal_river_output_get_wl_output(river_output) == wl_output) return river_output; output = output->next; } return NULL; } -static AstalRiverOutput *find_output_by_name (AstalRiverRiver *self, gchar* name) { - GList *output = self->outputs; - while(output != NULL) { - AstalRiverOutput *river_output = output->data; - if(strcmp(astal_river_output_get_name (river_output), name) == 0) return river_output; +static AstalRiverOutput* find_output_by_name(AstalRiverRiver* self, gchar* name) { + GList* output = self->outputs; + while (output != NULL) { + AstalRiverOutput* river_output = output->data; + if (strcmp(astal_river_output_get_name(river_output), name) == 0) return river_output; output = output->next; } return NULL; } -GList* astal_river_river_get_outputs(AstalRiverRiver *self){ - return self->outputs; -} +GList* astal_river_river_get_outputs(AstalRiverRiver* self) { return self->outputs; } -AstalRiverOutput* astal_river_river_get_output(AstalRiverRiver *self, gchar* name) { - return find_output_by_name(self, name); +AstalRiverOutput* astal_river_river_get_output(AstalRiverRiver* self, gchar* name) { + return find_output_by_name(self, name); } -gchar* astal_river_river_get_focused_view(AstalRiverRiver *self) { - return self->focused_view; -} +gchar* astal_river_river_get_focused_view(AstalRiverRiver* self) { return self->focused_view; } -gchar* astal_river_river_get_focused_output(AstalRiverRiver *self) { - return self->focused_output; -} +gchar* astal_river_river_get_focused_output(AstalRiverRiver* self) { return self->focused_output; } -gchar* astal_river_river_get_mode(AstalRiverRiver *self) { - return self->mode; -} +gchar* astal_river_river_get_mode(AstalRiverRiver* self) { return self->mode; } -static void astal_river_river_get_property(GObject *object, guint property_id, GValue *value, GParamSpec *pspec) { - AstalRiverRiver *self = ASTAL_RIVER_RIVER(object); +static void astal_river_river_get_property(GObject* object, guint property_id, GValue* value, + GParamSpec* pspec) { + AstalRiverRiver* self = ASTAL_RIVER_RIVER(object); switch (property_id) { case ASTAL_RIVER_RIVER_PROP_MODE: - g_value_set_string (value, self->mode); + g_value_set_string(value, self->mode); break; case ASTAL_RIVER_RIVER_PROP_FOCUSED_VIEW: - g_value_set_string (value, self->focused_view); + g_value_set_string(value, self->focused_view); break; case ASTAL_RIVER_RIVER_PROP_FOCUSED_OUTPUT: - g_value_set_string (value, self->focused_output); + g_value_set_string(value, self->focused_output); break; case ASTAL_RIVER_RIVER_PROP_OUTPUTS: g_value_set_pointer(value, self->outputs); break; default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); + G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec); break; } } -static JsonNode* astal_river_river_serialize_property(JsonSerializable *serializable, - const gchar *name, - const GValue *value, - GParamSpec *pspec) { - JsonNode *retval = NULL; - if (strcmp (name, "outputs") == 0) { - JsonArray *outputs = json_array_new (); - retval = json_node_new (JSON_NODE_ARRAY); - GList *output = g_value_get_pointer (value); - while(output != NULL) { - AstalRiverOutput *river_output = output->data; - json_array_add_element (outputs, json_gobject_serialize (G_OBJECT(river_output))); +static JsonNode* astal_river_river_serialize_property(JsonSerializable* serializable, + const gchar* name, const GValue* value, + GParamSpec* pspec) { + JsonNode* retval = NULL; + if (strcmp(name, "outputs") == 0) { + JsonArray* outputs = json_array_new(); + retval = json_node_new(JSON_NODE_ARRAY); + GList* output = g_value_get_pointer(value); + while (output != NULL) { + AstalRiverOutput* river_output = output->data; + json_array_add_element(outputs, json_gobject_serialize(G_OBJECT(river_output))); output = output->next; } - json_node_take_array (retval, outputs); - } - else + json_node_take_array(retval, outputs); + } else retval = serializable_iface->serialize_property(serializable, name, value, pspec); return retval; } -static void noop(){} +static void noop() {} static void river_seat_status_handle_focused_output(void* data, struct zriver_seat_status_v1* seat_status, struct wl_output* focused_output) { - - AstalRiverRiver *self = ASTAL_RIVER_RIVER(data); + AstalRiverRiver* self = ASTAL_RIVER_RIVER(data); g_free(self->focused_output); - AstalRiverOutput *output = find_output_by_output(self, focused_output); - if(output == NULL) return; + AstalRiverOutput* output = find_output_by_output(self, focused_output); + if (output == NULL) return; self->focused_output = g_strdup(astal_river_output_get_name(output)); g_object_notify(G_OBJECT(self), "focused-output"); - g_signal_emit (self, astal_river_river_signals[ASTAL_RIVER_RIVER_SIGNAL_CHANGED], 0); + g_signal_emit(self, astal_river_river_signals[ASTAL_RIVER_RIVER_SIGNAL_CHANGED], 0); } static void river_seat_status_handle_focused_view(void* data, struct zriver_seat_status_v1* seat_status, const char* focused_view) { - - AstalRiverRiver *self = ASTAL_RIVER_RIVER(data); + AstalRiverRiver* self = ASTAL_RIVER_RIVER(data); g_free(self->focused_view); self->focused_view = g_strdup(focused_view); - AstalRiverOutput *output = find_output_by_name(self, self->focused_output); - astal_river_output_set_focused_view (output, focused_view); + AstalRiverOutput* output = find_output_by_name(self, self->focused_output); + astal_river_output_set_focused_view(output, focused_view); g_object_notify(G_OBJECT(self), "focused-view"); - g_signal_emit (self, astal_river_river_signals[ASTAL_RIVER_RIVER_SIGNAL_CHANGED], 0); + g_signal_emit(self, astal_river_river_signals[ASTAL_RIVER_RIVER_SIGNAL_CHANGED], 0); } -static void river_seat_status_handle_mode(void* data, - struct zriver_seat_status_v1* seat_status, +static void river_seat_status_handle_mode(void* data, struct zriver_seat_status_v1* seat_status, const char* mode) { - - AstalRiverRiver *self = ASTAL_RIVER_RIVER(data); + AstalRiverRiver* self = ASTAL_RIVER_RIVER(data); g_free(self->mode); self->mode = g_strdup(mode); g_object_notify(G_OBJECT(self), "mode"); - g_signal_emit (self, astal_river_river_signals[ASTAL_RIVER_RIVER_SIGNAL_CHANGED], 0); + g_signal_emit(self, astal_river_river_signals[ASTAL_RIVER_RIVER_SIGNAL_CHANGED], 0); } static const struct zriver_seat_status_v1_listener river_seat_status_listener = { @@ -202,110 +191,105 @@ static const struct zriver_seat_status_v1_listener river_seat_status_listener = .mode = river_seat_status_handle_mode, }; -static void global_registry_handler(void* data, - struct wl_registry* registry, - uint32_t id, - const char* interface, - uint32_t version) { - AstalRiverRiver *self = ASTAL_RIVER_RIVER(data); - AstalRiverRiverPrivate *priv = astal_river_river_get_instance_private (self); +static void global_registry_handler(void* data, struct wl_registry* registry, uint32_t id, + const char* interface, uint32_t version) { + AstalRiverRiver* self = ASTAL_RIVER_RIVER(data); + AstalRiverRiverPrivate* priv = astal_river_river_get_instance_private(self); if (strcmp(interface, wl_output_interface.name) == 0) { - struct wl_output *wl_out = wl_registry_bind(registry, id, &wl_output_interface, 4); - AstalRiverOutput *output = astal_river_output_new(id, wl_out, priv->river_status_manager, priv->display); + struct wl_output* wl_out = wl_registry_bind(registry, id, &wl_output_interface, 4); + AstalRiverOutput* output = + astal_river_output_new(id, wl_out, priv->river_status_manager, priv->display); - self->outputs = g_list_append (self->outputs, output); - g_object_notify (G_OBJECT(self), "outputs"); + self->outputs = g_list_append(self->outputs, output); + g_object_notify(G_OBJECT(self), "outputs"); g_signal_emit(G_OBJECT(self), astal_river_river_signals[ASTAL_RIVER_RIVER_SIGNAL_OUTPUT_ADDED], 0, astal_river_output_get_name(output)); - g_signal_emit (self, astal_river_river_signals[ASTAL_RIVER_RIVER_SIGNAL_CHANGED], 0); + g_signal_emit(self, astal_river_river_signals[ASTAL_RIVER_RIVER_SIGNAL_CHANGED], 0); + guint signal_id = g_signal_connect(output, "changed", G_CALLBACK(reemit_changed), self); - g_hash_table_insert (priv->signal_ids, GUINT_TO_POINTER (id), GUINT_TO_POINTER (signal_id)); + g_hash_table_insert(priv->signal_ids, GUINT_TO_POINTER(id), GUINT_TO_POINTER(signal_id)); } else if (strcmp(interface, wl_seat_interface.name) == 0) { priv->seat = wl_registry_bind(registry, id, &wl_seat_interface, 4); } else if (strcmp(interface, zriver_status_manager_v1_interface.name) == 0) { - priv->river_status_manager = wl_registry_bind( - registry, id, &zriver_status_manager_v1_interface, 4); + priv->river_status_manager = + wl_registry_bind(registry, id, &zriver_status_manager_v1_interface, 4); } else if (strcmp(interface, zriver_control_v1_interface.name) == 0) { - priv->river_control = wl_registry_bind( - registry, id, &zriver_control_v1_interface, 1); + priv->river_control = wl_registry_bind(registry, id, &zriver_control_v1_interface, 1); } } -static void astal_river_river_callback_success(void *data, - struct zriver_command_callback_v1 *cb, - const char *msg) { +static void astal_river_river_callback_success(void* data, struct zriver_command_callback_v1* cb, + const char* msg) { AstalRiverCommandCallback callback = (AstalRiverCommandCallback)(data); callback(TRUE, msg); } -static void astal_river_river_callback_failure(void *data, - struct zriver_command_callback_v1 *cb, - const char *msg) { +static void astal_river_river_callback_failure(void* data, struct zriver_command_callback_v1* cb, + const char* msg) { AstalRiverCommandCallback callback = (AstalRiverCommandCallback)(data); callback(FALSE, msg); } const struct zriver_command_callback_v1_listener cb_listener = { - .success = astal_river_river_callback_success, - .failure = astal_river_river_callback_failure -}; + .success = astal_river_river_callback_success, .failure = astal_river_river_callback_failure}; -void astal_river_river_run_command_async(AstalRiverRiver *self, gint length, const gchar **cmd, AstalRiverCommandCallback callback) { - AstalRiverRiverPrivate *priv = astal_river_river_get_instance_private(self); - - for(gint i = 0; i < length; ++i) { +void astal_river_river_run_command_async(AstalRiverRiver* self, gint length, const gchar** cmd, + AstalRiverCommandCallback callback) { + AstalRiverRiverPrivate* priv = astal_river_river_get_instance_private(self); + + for (gint i = 0; i < length; ++i) { zriver_control_v1_add_argument(priv->river_control, cmd[i]); } - - struct zriver_command_callback_v1 *cb = zriver_control_v1_run_command(priv->river_control, priv->seat); - if(callback != NULL) - zriver_command_callback_v1_add_listener(cb, &cb_listener, callback); + + struct zriver_command_callback_v1* cb = + zriver_control_v1_run_command(priv->river_control, priv->seat); + if (callback != NULL) zriver_command_callback_v1_add_listener(cb, &cb_listener, callback); } static void global_registry_remover(void* data, struct wl_registry* registry, uint32_t id) { - AstalRiverRiver *self = ASTAL_RIVER_RIVER (data); - AstalRiverRiverPrivate *priv = astal_river_river_get_instance_private (self); - AstalRiverOutput *output = find_output_by_id(self, id); - if ( output != NULL ) { - guint signal_id = GPOINTER_TO_UINT (g_hash_table_lookup (priv->signal_ids, GUINT_TO_POINTER (id))); - g_hash_table_remove (priv->signal_ids, GUINT_TO_POINTER(id)); - g_signal_handler_disconnect (output, signal_id); + AstalRiverRiver* self = ASTAL_RIVER_RIVER(data); + AstalRiverRiverPrivate* priv = astal_river_river_get_instance_private(self); + AstalRiverOutput* output = find_output_by_id(self, id); + if (output != NULL) { + guint signal_id = + GPOINTER_TO_UINT(g_hash_table_lookup(priv->signal_ids, GUINT_TO_POINTER(id))); + g_hash_table_remove(priv->signal_ids, GUINT_TO_POINTER(id)); + g_signal_handler_disconnect(output, signal_id); g_signal_emit(G_OBJECT(self), astal_river_river_signals[ASTAL_RIVER_RIVER_SIGNAL_OUTPUT_ADDED], 0, astal_river_output_get_name(output)); - self->outputs = g_list_remove (self->outputs, output); - g_object_notify (G_OBJECT(self), "outputs"); + self->outputs = g_list_remove(self->outputs, output); + g_object_notify(G_OBJECT(self), "outputs"); g_object_unref(output); - return; - } - g_signal_emit (self, astal_river_river_signals[ASTAL_RIVER_RIVER_SIGNAL_CHANGED], 0); + return; + } + g_signal_emit(self, astal_river_river_signals[ASTAL_RIVER_RIVER_SIGNAL_CHANGED], 0); } +static const struct wl_registry_listener registry_listener = {global_registry_handler, + global_registry_remover}; -static const struct wl_registry_listener registry_listener = { - global_registry_handler, - global_registry_remover -}; - -static void astal_river_river_json_serializable_iface_init(JsonSerializableIface *iface){ +static void astal_river_river_json_serializable_iface_init(JsonSerializableIface* iface) { iface->serialize_property = astal_river_river_serialize_property; - serializable_iface = g_type_default_interface_peek (JSON_TYPE_SERIALIZABLE); + serializable_iface = g_type_default_interface_peek(JSON_TYPE_SERIALIZABLE); } -static gboolean astal_river_river_initable_init (GInitable *initable, GCancellable *cancellable, GError **error) { - AstalRiverRiver *self = ASTAL_RIVER_RIVER (initable); - AstalRiverRiverPrivate *priv = astal_river_river_get_instance_private (self); +static gboolean astal_river_river_initable_init(GInitable* initable, GCancellable* cancellable, + GError** error) { + AstalRiverRiver* self = ASTAL_RIVER_RIVER(initable); + AstalRiverRiverPrivate* priv = astal_river_river_get_instance_private(self); priv->seat = NULL; priv->display = NULL; priv->river_status_manager = NULL; - priv->signal_ids = g_hash_table_new (g_direct_hash, g_direct_equal); + priv->signal_ids = g_hash_table_new(g_direct_hash, g_direct_equal); priv->wl_source = wl_source_new(NULL, NULL); if (priv->wl_source == NULL) { - g_set_error_literal(error, G_IO_ERROR, G_IO_ERROR_FAILED, "Can not connect to wayland display"); + g_set_error_literal(error, G_IO_ERROR, G_IO_ERROR_FAILED, + "Can not connect to wayland display"); return FALSE; } @@ -317,58 +301,53 @@ static gboolean astal_river_river_initable_init (GInitable *initable, GCancellab wl_display_roundtrip(priv->display); if (priv->river_status_manager == NULL) { - g_set_error_literal(error, G_IO_ERROR, G_IO_ERROR_FAILED, "Can not connect river status protocol"); + g_set_error_literal(error, G_IO_ERROR, G_IO_ERROR_FAILED, + "Can not connect river status protocol"); return FALSE; } - priv->river_seat_status = zriver_status_manager_v1_get_river_seat_status( - priv->river_status_manager, priv->seat); - zriver_seat_status_v1_add_listener( - priv->river_seat_status, &river_seat_status_listener, self); + priv->river_seat_status = + zriver_status_manager_v1_get_river_seat_status(priv->river_status_manager, priv->seat); + zriver_seat_status_v1_add_listener(priv->river_seat_status, &river_seat_status_listener, self); wl_display_roundtrip(priv->display); return TRUE; } -static void astal_river_river_initable_iface_init (GInitableIface *iface) { +static void astal_river_river_initable_iface_init(GInitableIface* iface) { iface->init = astal_river_river_initable_init; } -static void astal_river_river_init(AstalRiverRiver *self) { - self->outputs = NULL; -} +static void astal_river_river_init(AstalRiverRiver* self) { self->outputs = NULL; } -AstalRiverRiver *astal_river_river_new() { +AstalRiverRiver* astal_river_river_new() { return g_initable_new(ASTAL_RIVER_TYPE_RIVER, NULL, NULL, NULL); } -static void disconnect_signal (gpointer key, gpointer value, gpointer user_data) { - AstalRiverRiver *self = ASTAL_RIVER_RIVER(user_data); - AstalRiverRiverPrivate *priv = astal_river_river_get_instance_private (self); +static void disconnect_signal(gpointer key, gpointer value, gpointer user_data) { + AstalRiverRiver* self = ASTAL_RIVER_RIVER(user_data); - AstalRiverOutput *output = find_output_by_id (self, GPOINTER_TO_UINT(key)); - g_signal_handler_disconnect (output, GPOINTER_TO_UINT(value)); + AstalRiverOutput* output = find_output_by_id(self, GPOINTER_TO_UINT(key)); + g_signal_handler_disconnect(output, GPOINTER_TO_UINT(value)); } AstalRiverRiver* astal_river_river_get_default() { - static AstalRiverRiver *self = NULL; + static AstalRiverRiver* self = NULL; - if (self == NULL) - self = astal_river_river_new(); + if (self == NULL) self = astal_river_river_new(); - return self; + return self; } -static void astal_river_river_finalize(GObject *object) { - - AstalRiverRiver *self = ASTAL_RIVER_RIVER(object); - AstalRiverRiverPrivate *priv = astal_river_river_get_instance_private(self); +static void astal_river_river_finalize(GObject* object) { + AstalRiverRiver* self = ASTAL_RIVER_RIVER(object); + AstalRiverRiverPrivate* priv = astal_river_river_get_instance_private(self); - g_hash_table_foreach (priv->signal_ids, disconnect_signal, self); - g_hash_table_destroy (priv->signal_ids); + g_hash_table_foreach(priv->signal_ids, disconnect_signal, self); + g_hash_table_destroy(priv->signal_ids); - wl_display_roundtrip (priv->display); + wl_display_roundtrip(priv->display); g_clear_list(&self->outputs, g_object_unref); self->outputs = NULL; @@ -385,76 +364,34 @@ static void astal_river_river_finalize(GObject *object) { g_free(self->focused_output); g_free(self->mode); - - G_OBJECT_CLASS (astal_river_river_parent_class)->finalize(object); + G_OBJECT_CLASS(astal_river_river_parent_class)->finalize(object); } -static void astal_river_river_class_init(AstalRiverRiverClass *class) { - - GObjectClass *object_class = G_OBJECT_CLASS (class); +static void astal_river_river_class_init(AstalRiverRiverClass* class) { + GObjectClass* object_class = G_OBJECT_CLASS(class); object_class->get_property = astal_river_river_get_property; object_class->finalize = astal_river_river_finalize; astal_river_river_properties[ASTAL_RIVER_RIVER_PROP_MODE] = - g_param_spec_string("mode", - "mode", - "currently active mode", - NULL, - G_PARAM_READABLE); - astal_river_river_properties[ASTAL_RIVER_RIVER_PROP_FOCUSED_VIEW] = - g_param_spec_string("focused-view", - "focused-view", - "currently focused view", - NULL, - G_PARAM_READABLE); - astal_river_river_properties[ASTAL_RIVER_RIVER_PROP_FOCUSED_OUTPUT] = - g_param_spec_string("focused-output", - "focused-output", - "currently focused-output", - NULL, - G_PARAM_READABLE); + g_param_spec_string("mode", "mode", "currently active mode", NULL, G_PARAM_READABLE); + astal_river_river_properties[ASTAL_RIVER_RIVER_PROP_FOCUSED_VIEW] = g_param_spec_string( + "focused-view", "focused-view", "currently focused view", NULL, G_PARAM_READABLE); + astal_river_river_properties[ASTAL_RIVER_RIVER_PROP_FOCUSED_OUTPUT] = g_param_spec_string( + "focused-output", "focused-output", "currently focused-output", NULL, G_PARAM_READABLE); astal_river_river_properties[ASTAL_RIVER_RIVER_PROP_OUTPUTS] = - g_param_spec_pointer("outputs", - "outputs", - "a list of all outputs", - G_PARAM_READABLE); + g_param_spec_pointer("outputs", "outputs", "a list of all outputs", G_PARAM_READABLE); - g_object_class_install_properties(object_class, - ASTAL_RIVER_RIVER_N_PROPERTIES, + g_object_class_install_properties(object_class, ASTAL_RIVER_RIVER_N_PROPERTIES, astal_river_river_properties); - astal_river_river_signals[ASTAL_RIVER_RIVER_SIGNAL_OUTPUT_ADDED] = - g_signal_new("output-added", - G_TYPE_FROM_CLASS(class), - G_SIGNAL_RUN_FIRST, - 0, - NULL, - NULL, - NULL, - G_TYPE_NONE, - 1, - G_TYPE_STRING); + g_signal_new("output-added", G_TYPE_FROM_CLASS(class), G_SIGNAL_RUN_FIRST, 0, NULL, NULL, + NULL, G_TYPE_NONE, 1, G_TYPE_STRING); astal_river_river_signals[ASTAL_RIVER_RIVER_SIGNAL_OUTPUT_REMOVED] = - g_signal_new("output-removed", - G_TYPE_FROM_CLASS(class), - G_SIGNAL_RUN_FIRST, - 0, - NULL, - NULL, - NULL, - G_TYPE_NONE, - 1, - G_TYPE_STRING); + g_signal_new("output-removed", G_TYPE_FROM_CLASS(class), G_SIGNAL_RUN_FIRST, 0, NULL, NULL, + NULL, G_TYPE_NONE, 1, G_TYPE_STRING); astal_river_river_signals[ASTAL_RIVER_RIVER_SIGNAL_CHANGED] = - g_signal_new("changed", - G_TYPE_FROM_CLASS(class), - G_SIGNAL_RUN_FIRST, - 0, - NULL, - NULL, - NULL, - G_TYPE_NONE, - 0); + g_signal_new("changed", G_TYPE_FROM_CLASS(class), G_SIGNAL_RUN_FIRST, 0, NULL, NULL, NULL, + G_TYPE_NONE, 0); } diff --git a/src/wayland-source.c b/src/wayland-source.c index d984c2e..516fc0c 100644 --- a/src/wayland-source.c +++ b/src/wayland-source.c @@ -1,8 +1,9 @@ +#include "wayland-source.h" + #include #include #include -#include "wayland-source.h" struct _WLSource { GSource source; @@ -11,8 +12,7 @@ struct _WLSource { int error; }; -static gboolean wl_source_prepare(GSource *source, - gint *timeout) { +static gboolean wl_source_prepare(GSource *source, gint *timeout) { WLSource *self = (WLSource *)source; *timeout = 0; @@ -29,25 +29,20 @@ static gboolean wl_source_prepare(GSource *source, static gboolean wl_source_check(GSource *source) { WLSource *self = (WLSource *)source; - if (self->error > 0) - return TRUE; + if (self->error > 0) return TRUE; GIOCondition revents; revents = g_source_query_unix_fd(source, self->fd); if (revents & G_IO_IN) { - if (wl_display_read_events(self->display) < 0) - self->error = errno; - } - else + if (wl_display_read_events(self->display) < 0) self->error = errno; + } else wl_display_cancel_read(self->display); return revents > 0; } -static gboolean wl_source_dispatch(GSource *source, - GSourceFunc callback, - gpointer user_data) { +static gboolean wl_source_dispatch(GSource *source, GSourceFunc callback, gpointer user_data) { WLSource *self = (WLSource *)source; GIOCondition revents; @@ -55,14 +50,12 @@ static gboolean wl_source_dispatch(GSource *source, if ((self->error > 0) || (revents & (G_IO_ERR | G_IO_HUP))) { errno = self->error; self->error = 0; - if ( callback != NULL ) - return callback(user_data); + if (callback != NULL) return callback(user_data); return G_SOURCE_REMOVE; } if (wl_display_dispatch_pending(self->display) < 0) { - if ( callback != NULL ) - return callback(user_data); + if (callback != NULL) return callback(user_data); return G_SOURCE_REMOVE; } @@ -75,27 +68,25 @@ static void wl_source_finalize(GSource *source) { } static GSourceFuncs wl_source_funcs = { - .prepare = wl_source_prepare, - .check = wl_source_check, + .prepare = wl_source_prepare, + .check = wl_source_check, .dispatch = wl_source_dispatch, .finalize = wl_source_finalize, }; -WLSource* wl_source_new() { +WLSource *wl_source_new() { struct wl_display *display; WLSource *self; GSource *source; display = wl_display_connect(NULL); - if (display == NULL) - return NULL; + if (display == NULL) return NULL; source = g_source_new(&wl_source_funcs, sizeof(WLSource)); self = (WLSource *)source; self->display = display; - self->fd = g_source_add_unix_fd(source, - wl_display_get_fd(self->display), + self->fd = g_source_add_unix_fd(source, wl_display_get_fd(self->display), G_IO_IN | G_IO_ERR | G_IO_HUP); g_source_attach(source, NULL); @@ -104,11 +95,9 @@ WLSource* wl_source_new() { } void wl_source_free(WLSource *self) { - GSource * source = (GSource *)self; + GSource *source = (GSource *)self; g_source_destroy(source); g_source_unref(source); } -struct wl_display* wl_source_get_display(WLSource *self) { - return self->display; -} +struct wl_display *wl_source_get_display(WLSource *self) { return self->display; } -- cgit v1.2.3 From faf40c60dc60683fa3698d15bb6955f1f5ea6185 Mon Sep 17 00:00:00 2001 From: kotontrion Date: Thu, 20 Jun 2024 17:01:25 +0200 Subject: automatically init object on creation fix object finalize --- include/wayland-source.h | 2 ++ src/astal-river.c | 8 +++++++- src/river.c | 45 +++++++++++++++++++++++++++++++-------------- src/wayland-source.c | 1 + 4 files changed, 41 insertions(+), 15 deletions(-) diff --git a/include/wayland-source.h b/include/wayland-source.h index 342d82b..b219589 100644 --- a/include/wayland-source.h +++ b/include/wayland-source.h @@ -1,6 +1,8 @@ #ifndef __WAYLAND_SOURCE_H__ #define __WAYLAND_SOURCE_H__ +#include + G_BEGIN_DECLS typedef struct _WLSource WLSource; diff --git a/src/astal-river.c b/src/astal-river.c index cb04d45..000f26c 100644 --- a/src/astal-river.c +++ b/src/astal-river.c @@ -1,5 +1,6 @@ #include #include +#include #include "gio/gio.h" #include "river.h" @@ -33,7 +34,12 @@ int main(int argc, char** argv) { } } - AstalRiverRiver* river = astal_river_river_new(); + GError *error = NULL; + AstalRiverRiver* river = g_initable_new(ASTAL_RIVER_TYPE_RIVER, NULL, &error, NULL); + if(error) { + g_critical("%s\n", error->message); + exit(EXIT_FAILURE); + } if (daemon) { loop = g_main_loop_new(NULL, FALSE); g_signal_connect(river, "changed", G_CALLBACK(print_json), NULL); diff --git a/src/river.c b/src/river.c index 16e9e05..c00a8c7 100644 --- a/src/river.c +++ b/src/river.c @@ -18,7 +18,7 @@ struct _AstalRiverRiver { typedef struct { GHashTable* signal_ids; - + gboolean init; struct wl_registry* wl_registry; struct wl_seat* seat; struct wl_display* display; @@ -196,6 +196,7 @@ static void global_registry_handler(void* data, struct wl_registry* registry, ui AstalRiverRiver* self = ASTAL_RIVER_RIVER(data); AstalRiverRiverPrivate* priv = astal_river_river_get_instance_private(self); if (strcmp(interface, wl_output_interface.name) == 0) { + if(priv->river_status_manager == NULL) return; struct wl_output* wl_out = wl_registry_bind(registry, id, &wl_output_interface, 4); AstalRiverOutput* output = astal_river_output_new(id, wl_out, priv->river_status_manager, priv->display); @@ -279,11 +280,8 @@ static gboolean astal_river_river_initable_init(GInitable* initable, GCancellabl GError** error) { AstalRiverRiver* self = ASTAL_RIVER_RIVER(initable); AstalRiverRiverPrivate* priv = astal_river_river_get_instance_private(self); - - priv->seat = NULL; - priv->display = NULL; - priv->river_status_manager = NULL; - priv->signal_ids = g_hash_table_new(g_direct_hash, g_direct_equal); + + if(priv->init) return TRUE; priv->wl_source = wl_source_new(NULL, NULL); @@ -312,14 +310,32 @@ static gboolean astal_river_river_initable_init(GInitable* initable, GCancellabl wl_display_roundtrip(priv->display); + priv->init = TRUE; return TRUE; } +static void astal_river_river_constructed(GObject* object) { + astal_river_river_initable_init(G_INITABLE(object), NULL, NULL); +} + static void astal_river_river_initable_iface_init(GInitableIface* iface) { iface->init = astal_river_river_initable_init; } -static void astal_river_river_init(AstalRiverRiver* self) { self->outputs = NULL; } +static void astal_river_river_init(AstalRiverRiver* self) { + + AstalRiverRiverPrivate* priv = astal_river_river_get_instance_private(self); + + self->outputs = NULL; + + priv->init = FALSE; + priv->seat = NULL; + priv->display = NULL; + priv->river_status_manager = NULL; + priv->signal_ids = g_hash_table_new(g_direct_hash, g_direct_equal); + + +} AstalRiverRiver* astal_river_river_new() { return g_initable_new(ASTAL_RIVER_TYPE_RIVER, NULL, NULL, NULL); @@ -347,18 +363,18 @@ static void astal_river_river_finalize(GObject* object) { g_hash_table_foreach(priv->signal_ids, disconnect_signal, self); g_hash_table_destroy(priv->signal_ids); - wl_display_roundtrip(priv->display); + if (priv->display != NULL) wl_display_roundtrip(priv->display); g_clear_list(&self->outputs, g_object_unref); self->outputs = NULL; - wl_registry_destroy(priv->wl_registry); - zriver_status_manager_v1_destroy(priv->river_status_manager); - zriver_seat_status_v1_destroy(priv->river_seat_status); - wl_seat_destroy(priv->seat); - wl_display_flush(priv->display); + if (priv->wl_registry != NULL) wl_registry_destroy(priv->wl_registry); + if (priv->river_status_manager != NULL) zriver_status_manager_v1_destroy(priv->river_status_manager); + if (priv->river_seat_status != NULL) zriver_seat_status_v1_destroy(priv->river_seat_status); + if (priv->seat != NULL) wl_seat_destroy(priv->seat); + if (priv->display != NULL) wl_display_flush(priv->display); - wl_source_free(priv->wl_source); + if (priv->wl_source != NULL) wl_source_free(priv->wl_source); g_free(self->focused_view); g_free(self->focused_output); @@ -371,6 +387,7 @@ static void astal_river_river_class_init(AstalRiverRiverClass* class) { GObjectClass* object_class = G_OBJECT_CLASS(class); object_class->get_property = astal_river_river_get_property; object_class->finalize = astal_river_river_finalize; + object_class->constructed = astal_river_river_constructed; astal_river_river_properties[ASTAL_RIVER_RIVER_PROP_MODE] = g_param_spec_string("mode", "mode", "currently active mode", NULL, G_PARAM_READABLE); diff --git a/src/wayland-source.c b/src/wayland-source.c index 516fc0c..875c32c 100644 --- a/src/wayland-source.c +++ b/src/wayland-source.c @@ -96,6 +96,7 @@ WLSource *wl_source_new() { void wl_source_free(WLSource *self) { GSource *source = (GSource *)self; + g_return_if_fail(source != NULL); g_source_destroy(source); g_source_unref(source); } -- cgit v1.2.3 From 1296dc824446984038c08a2278ebeea1c537ebf7 Mon Sep 17 00:00:00 2001 From: Zoe Roux Date: Sat, 13 Jul 2024 18:03:57 +0700 Subject: Add flake (#1) --- flake.lock | 27 +++++++++++++++++++++++++++ flake.nix | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 81 insertions(+) create mode 100644 flake.lock create mode 100644 flake.nix diff --git a/flake.lock b/flake.lock new file mode 100644 index 0000000..ed5e17d --- /dev/null +++ b/flake.lock @@ -0,0 +1,27 @@ +{ + "nodes": { + "nixpkgs": { + "locked": { + "lastModified": 1720031269, + "narHash": "sha256-rwz8NJZV+387rnWpTYcXaRNvzUSnnF9aHONoJIYmiUQ=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "9f4128e00b0ae8ec65918efeba59db998750ead6", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "nixpkgs": "nixpkgs" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/flake.nix b/flake.nix new file mode 100644 index 0000000..766263f --- /dev/null +++ b/flake.nix @@ -0,0 +1,54 @@ +{ + description = "Library and cli tool for querying river"; + + inputs.nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + + outputs = { + self, + nixpkgs, + }: let + version = builtins.replaceStrings ["\n"] [""] (builtins.readFile ./version); + system = "x86_64-linux"; + pkgs = import nixpkgs {inherit system;}; + + nativeBuildInputs = with pkgs; [ + gobject-introspection + meson + pkg-config + ninja + vala + wayland + ]; + + buildInputs = with pkgs; [ + glib + json-glib + ]; + in { + packages.${system} = rec { + default = river; + river = pkgs.stdenv.mkDerivation { + inherit nativeBuildInputs buildInputs; + pname = "astal-river"; + version = version; + src = ./.; + outputs = ["out" "dev"]; + }; + }; + + devShells.${system} = { + default = pkgs.mkShell { + inherit nativeBuildInputs buildInputs; + }; + river = pkgs.mkShell { + inherit nativeBuildInputs; + buildInputs = + buildInputs + ++ [ + pkgs.gjs + self.packages.${system}.default + ]; + }; + }; + }; +} -- cgit v1.2.3 From edc4848b11753f67657b633363c9524bc833954f Mon Sep 17 00:00:00 2001 From: kotontrion Date: Wed, 17 Jul 2024 08:26:14 +0200 Subject: move header to astal-river.h --- include/astal-river.h | 150 ++++++++++++++++++++++++++++++++++++++++++++++++ include/meson.build | 4 +- include/river-private.h | 2 +- include/river.h | 150 ------------------------------------------------ src/astal-river.c | 10 ++-- src/river.c | 24 ++++---- 6 files changed, 168 insertions(+), 172 deletions(-) create mode 100644 include/astal-river.h delete mode 100644 include/river.h diff --git a/include/astal-river.h b/include/astal-river.h new file mode 100644 index 0000000..e8576a3 --- /dev/null +++ b/include/astal-river.h @@ -0,0 +1,150 @@ +#ifndef ASTAL_RIVER_H +#define ASTAL_RIVER_H + +#include + +G_BEGIN_DECLS + +#define ASTAL_RIVER_TYPE_OUTPUT (astal_river_output_get_type()) + +G_DECLARE_FINAL_TYPE(AstalRiverOutput, astal_river_output, ASTAL_RIVER, OUTPUT, GObject) + +/** + * astal_river_output_get_nid + * @self: the AstalRiverOutput object + * + * Returns: the id of the output + */ +guint astal_river_output_get_id(AstalRiverOutput *self); + +/** + * astal_river_output_get_name + * @self: the AstalRiverOutput object + * + * Returns: (transfer none) (nullable): the name of the output + */ +gchar *astal_river_output_get_name(AstalRiverOutput *self); + +/** + * astal_river_output_get_layout_name + * @self: the AstalRiverOutput object + * + * Returns: (transfer none) (nullable): the currently used layout name of the output + */ +gchar *astal_river_output_get_layout_name(AstalRiverOutput *self); + +/** + * astal_river_output_get_focused_view + * @self: the AstalRiverOutput object + * + * Returns: (transfer none) (nullable): the focused view on the output + */ +gchar *astal_river_output_get_focused_view(AstalRiverOutput *self); + +/** + * astal_river_output_get_focused_tags + * @self: the AstalRiverOutput object + * + * Returns: the focused tags of the output + */ +guint astal_river_output_get_focused_tags(AstalRiverOutput *self); + +/** + * astal_river_output_get_urgent_tags + * @self: the AstalRiverOutput object + * + * Returns: the urgent tags of the output + */ +guint astal_river_output_get_urgent_tags(AstalRiverOutput *self); + +/** + * astal_river_output_get_occupied_tags + * @self: the AstalRiverOutput object + * + * Returns: the occupied tags of the output + */ +guint astal_river_output_get_occupied_tags(AstalRiverOutput *self); + +#define ASTAL_RIVER_TYPE_RIVER (astal_river_river_get_type()) + +G_DECLARE_FINAL_TYPE(AstalRiverRiver, astal_river_river, ASTAL_RIVER, RIVER, GObject) + +/** + * astal_river_river_new + * + * Returns: (nullable): a newly created connection to river + */ +AstalRiverRiver *astal_river_river_new(); + +/** + * astal_river_river_get_default + * + * Returns: (nullable) (transfer none): gets the default River object. + */ +AstalRiverRiver *astal_river_river_get_default(); +/** + * astal_river_river_get_outputs + * @self: the AstalRiverRiver object + * + * Returns: (transfer none) (element-type AstalRiver.Output): a list of all outputs + * + */ +GList *astal_river_river_get_outputs(AstalRiverRiver *self); + +/** + * astal_river_river_get_output + * @self: the AstalRiverRiver object + * @name: the name of the output + * + * Returns: (transfer none) (nullable): the output with the given name or null + */ +AstalRiverOutput *astal_river_river_get_output(AstalRiverRiver *self, gchar *name); + +/** + * astal_river_river_get_focused_view + * @self: the AstalRiverOutput object + * + * Returns: (transfer none) (nullable): the currently focused view + */ +gchar *astal_river_river_get_focused_view(AstalRiverRiver *self); + +/** + * astal_river_river_get_focused_output + * @self: the AstalRiverOutput object + * + * Returns: (transfer none) (nullable): the name of the currently focused output + */ +gchar *astal_river_river_get_focused_output(AstalRiverRiver *self); + +/** + * astal_river_river_get_mode + * @self: the AstalRiverOutput object + * + * Returns: (transfer none) (nullable): the currently active mode + */ +gchar *astal_river_river_get_mode(AstalRiverRiver *self); + +/** + * AstalRiverCommandCallback: + * @success: a #gboolean. + * @msg: a string. + * + * A callback function that gets a #GObject, a #gboolean, and a string. + */ +typedef void (*AstalRiverCommandCallback)(gboolean success, const gchar *msg); + +/** + * astal_river_river_run_command_async: + * @self: the AstalRiverRiver object + * @length: the length of the cmd array + * @cmd: (array length=length): the command to execute + * @callback: (scope async) (nullable): the callback to invoke. + * + * Calls the given callback with the provided parameters. + */ +void astal_river_river_run_command_async(AstalRiverRiver *self, gint length, const gchar **cmd, + AstalRiverCommandCallback callback); + +G_END_DECLS + +#endif // !ASTAL_RIVER_H diff --git a/include/meson.build b/include/meson.build index a835e6b..28a51f6 100644 --- a/include/meson.build +++ b/include/meson.build @@ -1,6 +1,6 @@ astal_river_inc = include_directories('.') astal_river_headers = files( - 'river.h', + 'astal-river.h', ) -install_headers('river.h', subdir : 'astal') +install_headers('astal-river.h') diff --git a/include/river-private.h b/include/river-private.h index d32e074..dae36be 100644 --- a/include/river-private.h +++ b/include/river-private.h @@ -4,7 +4,7 @@ #include #include "river-status-unstable-v1-client.h" -#include "river.h" +#include "astal-river.h" G_BEGIN_DECLS diff --git a/include/river.h b/include/river.h deleted file mode 100644 index e8576a3..0000000 --- a/include/river.h +++ /dev/null @@ -1,150 +0,0 @@ -#ifndef ASTAL_RIVER_H -#define ASTAL_RIVER_H - -#include - -G_BEGIN_DECLS - -#define ASTAL_RIVER_TYPE_OUTPUT (astal_river_output_get_type()) - -G_DECLARE_FINAL_TYPE(AstalRiverOutput, astal_river_output, ASTAL_RIVER, OUTPUT, GObject) - -/** - * astal_river_output_get_nid - * @self: the AstalRiverOutput object - * - * Returns: the id of the output - */ -guint astal_river_output_get_id(AstalRiverOutput *self); - -/** - * astal_river_output_get_name - * @self: the AstalRiverOutput object - * - * Returns: (transfer none) (nullable): the name of the output - */ -gchar *astal_river_output_get_name(AstalRiverOutput *self); - -/** - * astal_river_output_get_layout_name - * @self: the AstalRiverOutput object - * - * Returns: (transfer none) (nullable): the currently used layout name of the output - */ -gchar *astal_river_output_get_layout_name(AstalRiverOutput *self); - -/** - * astal_river_output_get_focused_view - * @self: the AstalRiverOutput object - * - * Returns: (transfer none) (nullable): the focused view on the output - */ -gchar *astal_river_output_get_focused_view(AstalRiverOutput *self); - -/** - * astal_river_output_get_focused_tags - * @self: the AstalRiverOutput object - * - * Returns: the focused tags of the output - */ -guint astal_river_output_get_focused_tags(AstalRiverOutput *self); - -/** - * astal_river_output_get_urgent_tags - * @self: the AstalRiverOutput object - * - * Returns: the urgent tags of the output - */ -guint astal_river_output_get_urgent_tags(AstalRiverOutput *self); - -/** - * astal_river_output_get_occupied_tags - * @self: the AstalRiverOutput object - * - * Returns: the occupied tags of the output - */ -guint astal_river_output_get_occupied_tags(AstalRiverOutput *self); - -#define ASTAL_RIVER_TYPE_RIVER (astal_river_river_get_type()) - -G_DECLARE_FINAL_TYPE(AstalRiverRiver, astal_river_river, ASTAL_RIVER, RIVER, GObject) - -/** - * astal_river_river_new - * - * Returns: (nullable): a newly created connection to river - */ -AstalRiverRiver *astal_river_river_new(); - -/** - * astal_river_river_get_default - * - * Returns: (nullable) (transfer none): gets the default River object. - */ -AstalRiverRiver *astal_river_river_get_default(); -/** - * astal_river_river_get_outputs - * @self: the AstalRiverRiver object - * - * Returns: (transfer none) (element-type AstalRiver.Output): a list of all outputs - * - */ -GList *astal_river_river_get_outputs(AstalRiverRiver *self); - -/** - * astal_river_river_get_output - * @self: the AstalRiverRiver object - * @name: the name of the output - * - * Returns: (transfer none) (nullable): the output with the given name or null - */ -AstalRiverOutput *astal_river_river_get_output(AstalRiverRiver *self, gchar *name); - -/** - * astal_river_river_get_focused_view - * @self: the AstalRiverOutput object - * - * Returns: (transfer none) (nullable): the currently focused view - */ -gchar *astal_river_river_get_focused_view(AstalRiverRiver *self); - -/** - * astal_river_river_get_focused_output - * @self: the AstalRiverOutput object - * - * Returns: (transfer none) (nullable): the name of the currently focused output - */ -gchar *astal_river_river_get_focused_output(AstalRiverRiver *self); - -/** - * astal_river_river_get_mode - * @self: the AstalRiverOutput object - * - * Returns: (transfer none) (nullable): the currently active mode - */ -gchar *astal_river_river_get_mode(AstalRiverRiver *self); - -/** - * AstalRiverCommandCallback: - * @success: a #gboolean. - * @msg: a string. - * - * A callback function that gets a #GObject, a #gboolean, and a string. - */ -typedef void (*AstalRiverCommandCallback)(gboolean success, const gchar *msg); - -/** - * astal_river_river_run_command_async: - * @self: the AstalRiverRiver object - * @length: the length of the cmd array - * @cmd: (array length=length): the command to execute - * @callback: (scope async) (nullable): the callback to invoke. - * - * Calls the given callback with the provided parameters. - */ -void astal_river_river_run_command_async(AstalRiverRiver *self, gint length, const gchar **cmd, - AstalRiverCommandCallback callback); - -G_END_DECLS - -#endif // !ASTAL_RIVER_H diff --git a/src/astal-river.c b/src/astal-river.c index 000f26c..37f34d5 100644 --- a/src/astal-river.c +++ b/src/astal-river.c @@ -3,7 +3,7 @@ #include #include "gio/gio.h" -#include "river.h" +#include "astal-river.h" GMainLoop* loop; @@ -34,11 +34,11 @@ int main(int argc, char** argv) { } } - GError *error = NULL; + GError* error = NULL; AstalRiverRiver* river = g_initable_new(ASTAL_RIVER_TYPE_RIVER, NULL, &error, NULL); - if(error) { - g_critical("%s\n", error->message); - exit(EXIT_FAILURE); + if (error) { + g_critical("%s\n", error->message); + exit(EXIT_FAILURE); } if (daemon) { loop = g_main_loop_new(NULL, FALSE); diff --git a/src/river.c b/src/river.c index c00a8c7..feb5e49 100644 --- a/src/river.c +++ b/src/river.c @@ -44,14 +44,14 @@ typedef enum { ASTAL_RIVER_RIVER_PROP_MODE, ASTAL_RIVER_RIVER_PROP_OUTPUTS, ASTAL_RIVER_RIVER_N_PROPERTIES -} AstalRiverOutputProperties; +} AstalRiverRiverProperties; typedef enum { ASTAL_RIVER_RIVER_SIGNAL_CHANGED, ASTAL_RIVER_RIVER_SIGNAL_OUTPUT_ADDED, ASTAL_RIVER_RIVER_SIGNAL_OUTPUT_REMOVED, ASTAL_RIVER_RIVER_N_SIGNALS -} AstalRiverOutputSignals; +} AstalRiverRiverSignals; static guint astal_river_river_signals[ASTAL_RIVER_RIVER_N_SIGNALS] = { 0, @@ -196,7 +196,7 @@ static void global_registry_handler(void* data, struct wl_registry* registry, ui AstalRiverRiver* self = ASTAL_RIVER_RIVER(data); AstalRiverRiverPrivate* priv = astal_river_river_get_instance_private(self); if (strcmp(interface, wl_output_interface.name) == 0) { - if(priv->river_status_manager == NULL) return; + if (priv->river_status_manager == NULL) return; struct wl_output* wl_out = wl_registry_bind(registry, id, &wl_output_interface, 4); AstalRiverOutput* output = astal_river_output_new(id, wl_out, priv->river_status_manager, priv->display); @@ -280,8 +280,8 @@ static gboolean astal_river_river_initable_init(GInitable* initable, GCancellabl GError** error) { AstalRiverRiver* self = ASTAL_RIVER_RIVER(initable); AstalRiverRiverPrivate* priv = astal_river_river_get_instance_private(self); - - if(priv->init) return TRUE; + + if (priv->init) return TRUE; priv->wl_source = wl_source_new(NULL, NULL); @@ -322,19 +322,14 @@ static void astal_river_river_initable_iface_init(GInitableIface* iface) { iface->init = astal_river_river_initable_init; } -static void astal_river_river_init(AstalRiverRiver* self) { - +static void astal_river_river_init(AstalRiverRiver* self) { AstalRiverRiverPrivate* priv = astal_river_river_get_instance_private(self); - - self->outputs = NULL; - + self->outputs = NULL; priv->init = FALSE; priv->seat = NULL; priv->display = NULL; priv->river_status_manager = NULL; priv->signal_ids = g_hash_table_new(g_direct_hash, g_direct_equal); - - } AstalRiverRiver* astal_river_river_new() { @@ -368,8 +363,9 @@ static void astal_river_river_finalize(GObject* object) { g_clear_list(&self->outputs, g_object_unref); self->outputs = NULL; - if (priv->wl_registry != NULL) wl_registry_destroy(priv->wl_registry); - if (priv->river_status_manager != NULL) zriver_status_manager_v1_destroy(priv->river_status_manager); + if (priv->wl_registry != NULL) wl_registry_destroy(priv->wl_registry); + if (priv->river_status_manager != NULL) + zriver_status_manager_v1_destroy(priv->river_status_manager); if (priv->river_seat_status != NULL) zriver_seat_status_v1_destroy(priv->river_seat_status); if (priv->seat != NULL) wl_seat_destroy(priv->seat); if (priv->display != NULL) wl_display_flush(priv->display); -- cgit v1.2.3 From 8ed44bdd982b3d9bb33ea144ba7766052a6cad16 Mon Sep 17 00:00:00 2001 From: kotontrion Date: Wed, 17 Jul 2024 08:35:15 +0200 Subject: fix header location in gir file --- src/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/meson.build b/src/meson.build index 2e48e77..647cc87 100644 --- a/src/meson.build +++ b/src/meson.build @@ -46,7 +46,7 @@ if get_option('introspection') symbol_prefix : 'astal_river', identifier_prefix : 'AstalRiver', includes : ['GObject-2.0', 'Gio-2.0'], - header : 'astal/river.h', + header : 'astal-river.h', export_packages : pkg_config_name, install : true ) -- cgit v1.2.3 From fea47f78b9fcad82544a43ddb81f63d8e477ecc0 Mon Sep 17 00:00:00 2001 From: kotontrion Date: Wed, 17 Jul 2024 16:57:19 +0200 Subject: improve docs --- include/astal-river.h | 101 +++--------------------------------------------- include/river-private.h | 4 +- src/river-output.c | 81 +++++++++++++++++++++++++++++++++++++- src/river.c | 98 +++++++++++++++++++++++++++++++++++++++++++++- 4 files changed, 182 insertions(+), 102 deletions(-) diff --git a/include/astal-river.h b/include/astal-river.h index e8576a3..6bedd94 100644 --- a/include/astal-river.h +++ b/include/astal-river.h @@ -9,139 +9,48 @@ G_BEGIN_DECLS G_DECLARE_FINAL_TYPE(AstalRiverOutput, astal_river_output, ASTAL_RIVER, OUTPUT, GObject) -/** - * astal_river_output_get_nid - * @self: the AstalRiverOutput object - * - * Returns: the id of the output - */ guint astal_river_output_get_id(AstalRiverOutput *self); -/** - * astal_river_output_get_name - * @self: the AstalRiverOutput object - * - * Returns: (transfer none) (nullable): the name of the output - */ gchar *astal_river_output_get_name(AstalRiverOutput *self); -/** - * astal_river_output_get_layout_name - * @self: the AstalRiverOutput object - * - * Returns: (transfer none) (nullable): the currently used layout name of the output - */ gchar *astal_river_output_get_layout_name(AstalRiverOutput *self); -/** - * astal_river_output_get_focused_view - * @self: the AstalRiverOutput object - * - * Returns: (transfer none) (nullable): the focused view on the output - */ gchar *astal_river_output_get_focused_view(AstalRiverOutput *self); -/** - * astal_river_output_get_focused_tags - * @self: the AstalRiverOutput object - * - * Returns: the focused tags of the output - */ guint astal_river_output_get_focused_tags(AstalRiverOutput *self); -/** - * astal_river_output_get_urgent_tags - * @self: the AstalRiverOutput object - * - * Returns: the urgent tags of the output - */ guint astal_river_output_get_urgent_tags(AstalRiverOutput *self); -/** - * astal_river_output_get_occupied_tags - * @self: the AstalRiverOutput object - * - * Returns: the occupied tags of the output - */ guint astal_river_output_get_occupied_tags(AstalRiverOutput *self); #define ASTAL_RIVER_TYPE_RIVER (astal_river_river_get_type()) G_DECLARE_FINAL_TYPE(AstalRiverRiver, astal_river_river, ASTAL_RIVER, RIVER, GObject) -/** - * astal_river_river_new - * - * Returns: (nullable): a newly created connection to river - */ AstalRiverRiver *astal_river_river_new(); -/** - * astal_river_river_get_default - * - * Returns: (nullable) (transfer none): gets the default River object. - */ AstalRiverRiver *astal_river_river_get_default(); -/** - * astal_river_river_get_outputs - * @self: the AstalRiverRiver object - * - * Returns: (transfer none) (element-type AstalRiver.Output): a list of all outputs - * - */ +AstalRiverRiver *astal_river_get_default(); + GList *astal_river_river_get_outputs(AstalRiverRiver *self); -/** - * astal_river_river_get_output - * @self: the AstalRiverRiver object - * @name: the name of the output - * - * Returns: (transfer none) (nullable): the output with the given name or null - */ AstalRiverOutput *astal_river_river_get_output(AstalRiverRiver *self, gchar *name); -/** - * astal_river_river_get_focused_view - * @self: the AstalRiverOutput object - * - * Returns: (transfer none) (nullable): the currently focused view - */ gchar *astal_river_river_get_focused_view(AstalRiverRiver *self); -/** - * astal_river_river_get_focused_output - * @self: the AstalRiverOutput object - * - * Returns: (transfer none) (nullable): the name of the currently focused output - */ gchar *astal_river_river_get_focused_output(AstalRiverRiver *self); -/** - * astal_river_river_get_mode - * @self: the AstalRiverOutput object - * - * Returns: (transfer none) (nullable): the currently active mode - */ gchar *astal_river_river_get_mode(AstalRiverRiver *self); /** * AstalRiverCommandCallback: - * @success: a #gboolean. - * @msg: a string. + * @success: a #gboolean indicating whether the command was executed successfully + * @msg: a string containing the result of the command * - * A callback function that gets a #GObject, a #gboolean, and a string. + * A callback function that is called after a river command is run. */ typedef void (*AstalRiverCommandCallback)(gboolean success, const gchar *msg); -/** - * astal_river_river_run_command_async: - * @self: the AstalRiverRiver object - * @length: the length of the cmd array - * @cmd: (array length=length): the command to execute - * @callback: (scope async) (nullable): the callback to invoke. - * - * Calls the given callback with the provided parameters. - */ void astal_river_river_run_command_async(AstalRiverRiver *self, gint length, const gchar **cmd, AstalRiverCommandCallback callback); diff --git a/include/river-private.h b/include/river-private.h index dae36be..14cd1c5 100644 --- a/include/river-private.h +++ b/include/river-private.h @@ -3,8 +3,8 @@ #include -#include "river-status-unstable-v1-client.h" #include "astal-river.h" +#include "river-status-unstable-v1-client.h" G_BEGIN_DECLS @@ -13,7 +13,7 @@ AstalRiverOutput *astal_river_output_new(guint id, struct wl_output *wl_output, struct wl_display *wl_display); struct wl_output *astal_river_output_get_wl_output(AstalRiverOutput *self); -void astal_river_output_set_focused_view(AstalRiverOutput *self, gchar *focused_view); +void astal_river_output_set_focused_view(AstalRiverOutput *self, const gchar *focused_view); G_END_DECLS diff --git a/src/river-output.c b/src/river-output.c index a431cf4..6317db1 100644 --- a/src/river-output.c +++ b/src/river-output.c @@ -47,25 +47,67 @@ static GParamSpec* astal_river_output_properties[ASTAL_RIVER_OUTPUT_N_PROPERTIES NULL, }; +/** + * astal_river_output_get_nid + * @self: the AstalRiverOutput object + * + * Returns: the id of the underlying wl_output object + */ guint astal_river_output_get_id(AstalRiverOutput* self) { return self->id; } +/** + * astal_river_output_get_name + * @self: the AstalRiverOutput object + * + * Returns: (transfer none) (nullable): the name of the output + */ gchar* astal_river_output_get_name(AstalRiverOutput* self) { return self->name; } +/** + * astal_river_output_get_layout_name + * @self: the AstalRiverOutput object + * + * Returns: (transfer none) (nullable): the currently used layout name of the output + */ gchar* astal_river_output_get_layout_name(AstalRiverOutput* self) { return self->layout_name; } +/** + * astal_river_output_get_focused_view + * @self: the AstalRiverOutput object + * + * Returns: (transfer none) (nullable): the focused view on the output + */ gchar* astal_river_output_get_focused_view(AstalRiverOutput* self) { return self->focused_view; } -void astal_river_output_set_focused_view(AstalRiverOutput* self, gchar* focused_view) { +void astal_river_output_set_focused_view(AstalRiverOutput* self, const gchar* focused_view) { g_free(self->focused_view); self->focused_view = g_strdup(focused_view); g_object_notify(G_OBJECT(self), "focused-view"); g_signal_emit(self, astal_river_output_signals[ASTAL_RIVER_OUTPUT_SIGNAL_CHANGED], 0); } +/** + * astal_river_output_get_focused_tags + * @self: the AstalRiverOutput object + * + * Returns: the focused tags of the output + */ guint astal_river_output_get_focused_tags(AstalRiverOutput* self) { return self->focused_tags; } +/** + * astal_river_output_get_urgent_tags + * @self: the AstalRiverOutput object + * + * Returns: the urgent tags of the output + */ guint astal_river_output_get_urgent_tags(AstalRiverOutput* self) { return self->urgent_tags; } +/** + * astal_river_output_get_occupied_tags + * @self: the AstalRiverOutput object + * + * Returns: the occupied tags of the output + */ guint astal_river_output_get_occupied_tags(AstalRiverOutput* self) { return self->occupied_tags; } struct wl_output* astal_river_output_get_wl_output(AstalRiverOutput* self) { @@ -240,26 +282,61 @@ static void astal_river_output_class_init(AstalRiverOutputClass* class) { object_class->get_property = astal_river_output_get_property; object_class->set_property = astal_river_output_set_property; object_class->finalize = astal_river_output_finalize; - + /** + * AstalRiverOutput:focused-tags: + * + * The currently focused tags + */ astal_river_output_properties[ASTAL_RIVER_OUTPUT_PROP_FOCUSED_TAGS] = g_param_spec_uint( "focused-tags", "focused-tags", "currently focused tags", 0, INT_MAX, 0, G_PARAM_READABLE); + /** + * AstalRiverOutput:occupied-tags: + * + * The currently occupied tags + */ astal_river_output_properties[ASTAL_RIVER_OUTPUT_PROP_OCCUPIED_TAGS] = g_param_spec_uint("occupied-tags", "occupied-tags", "currently occupied tags", 0, INT_MAX, 0, G_PARAM_READABLE); + /** + * AstalRiverOutput:urgent-tags: + * + * The currently tags marked as urgent + */ astal_river_output_properties[ASTAL_RIVER_OUTPUT_PROP_URGENT_TAGS] = g_param_spec_uint( "urgent-tags", "urgent-tags", "currently urgent tags", 0, INT_MAX, 0, G_PARAM_READABLE); + /** + * AstalRiverOutput:id: + * + * The id of the underlying wl_output object + */ astal_river_output_properties[ASTAL_RIVER_OUTPUT_PROP_ID] = g_param_spec_uint("id", "id", "id of the output object", 0, INT_MAX, 0, G_PARAM_READABLE); + /** + * AstalRiverOutput:layout-name: + * + * The name of active layout + */ astal_river_output_properties[ASTAL_RIVER_OUTPUT_PROP_LAYOUT_NAME] = g_param_spec_string( "layout-name", "layout-name", "name of the current layout", NULL, G_PARAM_READABLE); + /** + * AstalRiverOutput:name: + * + * The name of this output + */ astal_river_output_properties[ASTAL_RIVER_OUTPUT_PROP_NAME] = g_param_spec_string("name", "name", "name of the output", NULL, G_PARAM_READABLE); + /** + * AstalRiverOutput:focused-view: + * + * The name of currently focused view + */ astal_river_output_properties[ASTAL_RIVER_OUTPUT_PROP_FOCUSED_VIEW] = g_param_spec_string("focused-view", "focused-view", "name of last focused view on this output", NULL, G_PARAM_READABLE); g_object_class_install_properties(object_class, ASTAL_RIVER_OUTPUT_N_PROPERTIES, astal_river_output_properties); + astal_river_output_signals[ASTAL_RIVER_OUTPUT_SIGNAL_CHANGED] = g_signal_new("changed", G_TYPE_FROM_CLASS(class), G_SIGNAL_RUN_FIRST, 0, NULL, NULL, NULL, G_TYPE_NONE, 0); diff --git a/src/river.c b/src/river.c index feb5e49..a735898 100644 --- a/src/river.c +++ b/src/river.c @@ -94,16 +94,48 @@ static AstalRiverOutput* find_output_by_name(AstalRiverRiver* self, gchar* name) return NULL; } +/** + * astal_river_river_get_outputs + * @self: the AstalRiverRiver object + * + * Returns: (transfer none) (element-type AstalRiver.Output): a list of all outputs + * + */ GList* astal_river_river_get_outputs(AstalRiverRiver* self) { return self->outputs; } +/** + * astal_river_river_get_output + * @self: the AstalRiverRiver object + * @name: the name of the output + * + * Returns: (transfer none) (nullable): the output with the given name or null + */ AstalRiverOutput* astal_river_river_get_output(AstalRiverRiver* self, gchar* name) { return find_output_by_name(self, name); } +/** + * astal_river_river_get_focused_view + * @self: the AstalRiverOutput object + * + * Returns: (transfer none) (nullable): the currently focused view + */ gchar* astal_river_river_get_focused_view(AstalRiverRiver* self) { return self->focused_view; } +/** + * astal_river_river_get_focused_output + * @self: the AstalRiverOutput object + * + * Returns: (transfer none) (nullable): the name of the currently focused output + */ gchar* astal_river_river_get_focused_output(AstalRiverRiver* self) { return self->focused_output; } +/** + * astal_river_river_get_mode + * @self: the AstalRiverOutput object + * + * Returns: (transfer none) (nullable): the currently active mode + */ gchar* astal_river_river_get_mode(AstalRiverRiver* self) { return self->mode; } static void astal_river_river_get_property(GObject* object, guint property_id, GValue* value, @@ -235,6 +267,15 @@ static void astal_river_river_callback_failure(void* data, struct zriver_command const struct zriver_command_callback_v1_listener cb_listener = { .success = astal_river_river_callback_success, .failure = astal_river_river_callback_failure}; +/** + * astal_river_river_run_command_async: + * @self: the AstalRiverRiver object + * @length: the length of the cmd array + * @cmd: (array length=length): the command to execute + * @callback: (scope async) (nullable): the callback to invoke. + * + * Calls the given callback with the provided parameters. + */ void astal_river_river_run_command_async(AstalRiverRiver* self, gint length, const gchar** cmd, AstalRiverCommandCallback callback) { AstalRiverRiverPrivate* priv = astal_river_river_get_instance_private(self); @@ -332,6 +373,14 @@ static void astal_river_river_init(AstalRiverRiver* self) { priv->signal_ids = g_hash_table_new(g_direct_hash, g_direct_equal); } +/** + * astal_river_river_new + * + * creates a new River object. It is recommended to use the get_default() method + * instead of this method. + * + * Returns: (nullable): a newly created connection to river + */ AstalRiverRiver* astal_river_river_new() { return g_initable_new(ASTAL_RIVER_TYPE_RIVER, NULL, NULL, NULL); } @@ -343,6 +392,11 @@ static void disconnect_signal(gpointer key, gpointer value, gpointer user_data) g_signal_handler_disconnect(output, GPOINTER_TO_UINT(value)); } +/** + * astal_river_river_get_default + * + * Returns: (nullable) (transfer none): gets the default River object. + */ AstalRiverRiver* astal_river_river_get_default() { static AstalRiverRiver* self = NULL; @@ -351,6 +405,13 @@ AstalRiverRiver* astal_river_river_get_default() { return self; } +/** + * astal_river_get_default + * + * Returns: (nullable) (transfer none): gets the default River object. + */ +AstalRiverRiver* astal_river_get_default() { return astal_river_river_get_default(); } + static void astal_river_river_finalize(GObject* object) { AstalRiverRiver* self = ASTAL_RIVER_RIVER(object); AstalRiverRiverPrivate* priv = astal_river_river_get_instance_private(self); @@ -385,25 +446,58 @@ static void astal_river_river_class_init(AstalRiverRiverClass* class) { object_class->finalize = astal_river_river_finalize; object_class->constructed = astal_river_river_constructed; + /** + * AstalRiverRiver:mode: + * + * The currently active mode + */ astal_river_river_properties[ASTAL_RIVER_RIVER_PROP_MODE] = g_param_spec_string("mode", "mode", "currently active mode", NULL, G_PARAM_READABLE); + /** + * AstalRiverRiver:focused-view: + * + * The name of the currently focused view + */ astal_river_river_properties[ASTAL_RIVER_RIVER_PROP_FOCUSED_VIEW] = g_param_spec_string( "focused-view", "focused-view", "currently focused view", NULL, G_PARAM_READABLE); + /** + * AstalRiverRiver:focused-output: + * + * The name of the currently focused output + */ astal_river_river_properties[ASTAL_RIVER_RIVER_PROP_FOCUSED_OUTPUT] = g_param_spec_string( "focused-output", "focused-output", "currently focused-output", NULL, G_PARAM_READABLE); + /** + * AstalRiverRiver:outputs: (type GList(AstalRiverOutput)) + * + * A list of AstalRiverOutput objects + */ astal_river_river_properties[ASTAL_RIVER_RIVER_PROP_OUTPUTS] = g_param_spec_pointer("outputs", "outputs", "a list of all outputs", G_PARAM_READABLE); g_object_class_install_properties(object_class, ASTAL_RIVER_RIVER_N_PROPERTIES, astal_river_river_properties); - + /** + * AstalRiverRiver::output-added: + * @river: the object which received the signal. + * @output: the name of the added output + * + * This signal is emitted when a new output was connected + */ astal_river_river_signals[ASTAL_RIVER_RIVER_SIGNAL_OUTPUT_ADDED] = g_signal_new("output-added", G_TYPE_FROM_CLASS(class), G_SIGNAL_RUN_FIRST, 0, NULL, NULL, NULL, G_TYPE_NONE, 1, G_TYPE_STRING); - + /** + * AstalRiverRiver::output-removed: + * @river: the object which received the signal. + * @output: the name of the removed output + * + * This signal is emitted when a new output was disconnected + */ astal_river_river_signals[ASTAL_RIVER_RIVER_SIGNAL_OUTPUT_REMOVED] = g_signal_new("output-removed", G_TYPE_FROM_CLASS(class), G_SIGNAL_RUN_FIRST, 0, NULL, NULL, NULL, G_TYPE_NONE, 1, G_TYPE_STRING); + astal_river_river_signals[ASTAL_RIVER_RIVER_SIGNAL_CHANGED] = g_signal_new("changed", G_TYPE_FROM_CLASS(class), G_SIGNAL_RUN_FIRST, 0, NULL, NULL, NULL, G_TYPE_NONE, 0); -- cgit v1.2.3 From 0a8a39d18bb1c2e36923aa034d03bfd33869dfe8 Mon Sep 17 00:00:00 2001 From: Aylur Date: Fri, 26 Jul 2024 15:10:04 +0200 Subject: switch to LGPLv2.1 --- LICENSE | 1131 +++++++++++++++++++++++++++------------------------------------ 1 file changed, 480 insertions(+), 651 deletions(-) diff --git a/LICENSE b/LICENSE index c94d07f..4ef65b3 100644 --- a/LICENSE +++ b/LICENSE @@ -1,675 +1,504 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 - Copyright (C) 2007 Free Software Foundation, Inc. + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + 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 licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations below. + + When we speak of free software, we are referring to freedom of use, +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 this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. 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 +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also combine or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + d) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + e) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be distributed need not include anything that is +normally distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties with 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 + + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +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. +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Lesser 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 Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "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 +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY 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 +LIBRARY (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 LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Libraries - How to Apply These Terms to Your New Programs + If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms of the +ordinary General Public License). - 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 apply these terms, attach the following notices to the library. It is +safest to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least the +"copyright" line and a pointer to where the full notice is found. - 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. - - + Copyright (C) - 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 library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + This library 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. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser 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 . + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA 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: - - Copyright (C) - 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 -. - - 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 -. +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the library, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + library `Frob' (a library for tweaking knobs) written by James Random Hacker. + + , 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! + -- cgit v1.2.3 From 247ac06b867a20b4c30f3f374a88ebfd40165753 Mon Sep 17 00:00:00 2001 From: Aylur Date: Sun, 1 Sep 2024 03:23:02 +0200 Subject: move to monorepo --- .gitignore | 3 - LICENSE | 504 -------------------------- README.md | 30 -- flake.lock | 27 -- flake.nix | 54 --- include/astal-river.h | 59 --- include/meson.build | 6 - include/river-private.h | 20 - include/wayland-source.h | 16 - meson.build | 23 -- meson_options.txt | 2 - protocols/meson.build | 23 -- protocols/river-control-unstable-v1.xml | 86 ----- protocols/river-status-unstable-v1.xml | 149 -------- river/.gitignore | 3 + river/LICENSE | 504 ++++++++++++++++++++++++++ river/README.md | 30 ++ river/flake.lock | 27 ++ river/flake.nix | 54 +++ river/include/astal-river.h | 59 +++ river/include/meson.build | 6 + river/include/river-private.h | 20 + river/include/wayland-source.h | 16 + river/meson.build | 23 ++ river/meson_options.txt | 2 + river/protocols/meson.build | 23 ++ river/protocols/river-control-unstable-v1.xml | 86 +++++ river/protocols/river-status-unstable-v1.xml | 149 ++++++++ river/src/astal-river.c | 51 +++ river/src/meson.build | 70 ++++ river/src/river-output.c | 343 ++++++++++++++++++ river/src/river.c | 504 ++++++++++++++++++++++++++ river/src/wayland-source.c | 104 ++++++ river/version | 1 + src/astal-river.c | 51 --- src/meson.build | 70 ---- src/river-output.c | 343 ------------------ src/river.c | 504 -------------------------- src/wayland-source.c | 104 ------ version | 1 - 40 files changed, 2075 insertions(+), 2075 deletions(-) delete mode 100644 .gitignore delete mode 100644 LICENSE delete mode 100644 README.md delete mode 100644 flake.lock delete mode 100644 flake.nix delete mode 100644 include/astal-river.h delete mode 100644 include/meson.build delete mode 100644 include/river-private.h delete mode 100644 include/wayland-source.h delete mode 100644 meson.build delete mode 100644 meson_options.txt delete mode 100644 protocols/meson.build delete mode 100644 protocols/river-control-unstable-v1.xml delete mode 100644 protocols/river-status-unstable-v1.xml create mode 100644 river/.gitignore create mode 100644 river/LICENSE create mode 100644 river/README.md create mode 100644 river/flake.lock create mode 100644 river/flake.nix create mode 100644 river/include/astal-river.h create mode 100644 river/include/meson.build create mode 100644 river/include/river-private.h create mode 100644 river/include/wayland-source.h create mode 100644 river/meson.build create mode 100644 river/meson_options.txt create mode 100644 river/protocols/meson.build create mode 100644 river/protocols/river-control-unstable-v1.xml create mode 100644 river/protocols/river-status-unstable-v1.xml create mode 100644 river/src/astal-river.c create mode 100644 river/src/meson.build create mode 100644 river/src/river-output.c create mode 100644 river/src/river.c create mode 100644 river/src/wayland-source.c create mode 100644 river/version delete mode 100644 src/astal-river.c delete mode 100644 src/meson.build delete mode 100644 src/river-output.c delete mode 100644 src/river.c delete mode 100644 src/wayland-source.c delete mode 100644 version diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 6bf41b5..0000000 --- a/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -build/ -result/ -.cache/ diff --git a/LICENSE b/LICENSE deleted file mode 100644 index 4ef65b3..0000000 --- a/LICENSE +++ /dev/null @@ -1,504 +0,0 @@ - GNU LESSER GENERAL PUBLIC LICENSE - Version 2.1, February 1999 - - Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -[This is the first released version of the Lesser GPL. It also counts - as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.] - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Lesser General Public License, applies to some -specially designated software packages--typically libraries--of the -Free Software Foundation and other authors who decide to use it. You -can use it too, but we suggest you first think carefully about whether -this license or the ordinary General Public License is the better -strategy to use in any particular case, based on the explanations below. - - When we speak of free software, we are referring to freedom of use, -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 this service if you wish); that you receive source code or can get -it if you want it; that you can change the software and use pieces of -it in new free programs; and that you are informed that you can do -these things. - - To protect your rights, we need to make restrictions that forbid -distributors to deny you these rights or to ask you to surrender these -rights. These restrictions translate to certain responsibilities for -you if you distribute copies of the library or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link other code with the library, you must provide -complete object files to the recipients, so that they can relink them -with the library after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - We protect your rights with a two-step method: (1) we copyright the -library, and (2) we offer you this license, which gives you legal -permission to copy, distribute and/or modify the library. - - To protect each distributor, we want to make it very clear that -there is no warranty for the free library. Also, if the library is -modified by someone else and passed on, the recipients should know -that what they have is not the original version, so that the original -author's reputation will not be affected by problems that might be -introduced by others. - - Finally, software patents pose a constant threat to the existence of -any free program. We wish to make sure that a company cannot -effectively restrict the users of a free program by obtaining a -restrictive license from a patent holder. Therefore, we insist that -any patent license obtained for a version of the library must be -consistent with the full freedom of use specified in this license. - - Most GNU software, including some libraries, is covered by the -ordinary GNU General Public License. This license, the GNU Lesser -General Public License, applies to certain designated libraries, and -is quite different from the ordinary General Public License. We use -this license for certain libraries in order to permit linking those -libraries into non-free programs. - - When a program is linked with a library, whether statically or using -a shared library, the combination of the two is legally speaking a -combined work, a derivative of the original library. The ordinary -General Public License therefore permits such linking only if the -entire combination fits its criteria of freedom. The Lesser General -Public License permits more lax criteria for linking other code with -the library. - - We call this license the "Lesser" General Public License because it -does Less to protect the user's freedom than the ordinary General -Public License. It also provides other free software developers Less -of an advantage over competing non-free programs. These disadvantages -are the reason we use the ordinary General Public License for many -libraries. However, the Lesser license provides advantages in certain -special circumstances. - - For example, on rare occasions, there may be a special need to -encourage the widest possible use of a certain library, so that it becomes -a de-facto standard. To achieve this, non-free programs must be -allowed to use the library. A more frequent case is that a free -library does the same job as widely used non-free libraries. In this -case, there is little to gain by limiting the free library to free -software only, so we use the Lesser General Public License. - - In other cases, permission to use a particular library in non-free -programs enables a greater number of people to use a large body of -free software. For example, permission to use the GNU C Library in -non-free programs enables many more people to use the whole GNU -operating system, as well as its variant, the GNU/Linux operating -system. - - Although the Lesser General Public License is Less protective of the -users' freedom, it does ensure that the user of a program that is -linked with the Library has the freedom and the wherewithal to run -that program using a modified version of the Library. - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, whereas the latter must -be combined with the library in order to run. - - GNU LESSER GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library or other -program which contains a notice placed by the copyright holder or -other authorized party saying it may be distributed under the terms of -this Lesser General Public License (also called "this License"). -Each licensee is addressed as "you". - - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control compilation -and installation of the library. - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the -Library. - - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. - - 2. You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Library, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote -it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. - - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you accompany -it with the complete corresponding machine-readable source code, which -must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the -source code from the same place satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. - - 6. As an exception to the Sections above, you may also combine or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (1) uses at run time a - copy of the library already present on the user's computer system, - rather than copying library functions into the executable, and (2) - will operate properly with a modified version of the library, if - the user installs one, as long as the modified version is - interface-compatible with the version that the work was made with. - - c) Accompany the work with a written offer, valid for at - least three years, to give the same user the materials - specified in Subsection 6a, above, for a charge no more - than the cost of performing this distribution. - - d) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - e) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the materials to be distributed need not include anything that is -normally distributed (in either source or binary form) with the major -components (compiler, kernel, and so on) of the operating system on -which the executable runs, unless that component itself accompanies -the executable. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. - - 7. You may place library facilities that are a work based on the -Library side-by-side in a single library together with other library -facilities not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library is void, and will automatically terminate your -rights under this License. However, parties who have received copies, -or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. - - 9. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties with -this License. - - 11. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -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 -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply, -and the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License may add -an explicit geographical distribution limitation excluding those countries, -so that distribution is permitted only in or among countries not thus -excluded. In such case, this License incorporates the limitation as if -written in the body of this License. - - 13. The Free Software Foundation may publish revised and/or new -versions of the Lesser 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 Library -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. - - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. - - NO WARRANTY - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "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 -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE LIBRARY 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 -LIBRARY (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 LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Libraries - - If you develop a new library, and you want it to be of the greatest -possible use to the public, we recommend making it free software that -everyone can redistribute and change. You can do so by permitting -redistribution under these terms (or, alternatively, under the terms of the -ordinary General Public License). - - To apply these terms, attach the following notices to the library. It is -safest to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least the -"copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - -Also add information on how to contact you by electronic and paper mail. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the library, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the - library `Frob' (a library for tweaking knobs) written by James Random Hacker. - - , 1 April 1990 - Ty Coon, President of Vice - -That's all there is to it! - - diff --git a/README.md b/README.md deleted file mode 100644 index 3285628..0000000 --- a/README.md +++ /dev/null @@ -1,30 +0,0 @@ -# astal-river - -a library and cli tool for getting status information of the river wayland compositor. - -## Build from source -### Dependencies - -- meson -- glib -- gobject-introspection -- json-glib -- libwayland - -```sh -# Clone the repository -git clone https://github.com/astal-sh/river -cd river - -# Setup and build -meson setup build -meson compile -C build - -# Install -meson install -C build -``` - -## Todo -- docs - - diff --git a/flake.lock b/flake.lock deleted file mode 100644 index ed5e17d..0000000 --- a/flake.lock +++ /dev/null @@ -1,27 +0,0 @@ -{ - "nodes": { - "nixpkgs": { - "locked": { - "lastModified": 1720031269, - "narHash": "sha256-rwz8NJZV+387rnWpTYcXaRNvzUSnnF9aHONoJIYmiUQ=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "9f4128e00b0ae8ec65918efeba59db998750ead6", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "root": { - "inputs": { - "nixpkgs": "nixpkgs" - } - } - }, - "root": "root", - "version": 7 -} diff --git a/flake.nix b/flake.nix deleted file mode 100644 index 766263f..0000000 --- a/flake.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ - description = "Library and cli tool for querying river"; - - inputs.nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; - - outputs = { - self, - nixpkgs, - }: let - version = builtins.replaceStrings ["\n"] [""] (builtins.readFile ./version); - system = "x86_64-linux"; - pkgs = import nixpkgs {inherit system;}; - - nativeBuildInputs = with pkgs; [ - gobject-introspection - meson - pkg-config - ninja - vala - wayland - ]; - - buildInputs = with pkgs; [ - glib - json-glib - ]; - in { - packages.${system} = rec { - default = river; - river = pkgs.stdenv.mkDerivation { - inherit nativeBuildInputs buildInputs; - pname = "astal-river"; - version = version; - src = ./.; - outputs = ["out" "dev"]; - }; - }; - - devShells.${system} = { - default = pkgs.mkShell { - inherit nativeBuildInputs buildInputs; - }; - river = pkgs.mkShell { - inherit nativeBuildInputs; - buildInputs = - buildInputs - ++ [ - pkgs.gjs - self.packages.${system}.default - ]; - }; - }; - }; -} diff --git a/include/astal-river.h b/include/astal-river.h deleted file mode 100644 index 6bedd94..0000000 --- a/include/astal-river.h +++ /dev/null @@ -1,59 +0,0 @@ -#ifndef ASTAL_RIVER_H -#define ASTAL_RIVER_H - -#include - -G_BEGIN_DECLS - -#define ASTAL_RIVER_TYPE_OUTPUT (astal_river_output_get_type()) - -G_DECLARE_FINAL_TYPE(AstalRiverOutput, astal_river_output, ASTAL_RIVER, OUTPUT, GObject) - -guint astal_river_output_get_id(AstalRiverOutput *self); - -gchar *astal_river_output_get_name(AstalRiverOutput *self); - -gchar *astal_river_output_get_layout_name(AstalRiverOutput *self); - -gchar *astal_river_output_get_focused_view(AstalRiverOutput *self); - -guint astal_river_output_get_focused_tags(AstalRiverOutput *self); - -guint astal_river_output_get_urgent_tags(AstalRiverOutput *self); - -guint astal_river_output_get_occupied_tags(AstalRiverOutput *self); - -#define ASTAL_RIVER_TYPE_RIVER (astal_river_river_get_type()) - -G_DECLARE_FINAL_TYPE(AstalRiverRiver, astal_river_river, ASTAL_RIVER, RIVER, GObject) - -AstalRiverRiver *astal_river_river_new(); - -AstalRiverRiver *astal_river_river_get_default(); -AstalRiverRiver *astal_river_get_default(); - -GList *astal_river_river_get_outputs(AstalRiverRiver *self); - -AstalRiverOutput *astal_river_river_get_output(AstalRiverRiver *self, gchar *name); - -gchar *astal_river_river_get_focused_view(AstalRiverRiver *self); - -gchar *astal_river_river_get_focused_output(AstalRiverRiver *self); - -gchar *astal_river_river_get_mode(AstalRiverRiver *self); - -/** - * AstalRiverCommandCallback: - * @success: a #gboolean indicating whether the command was executed successfully - * @msg: a string containing the result of the command - * - * A callback function that is called after a river command is run. - */ -typedef void (*AstalRiverCommandCallback)(gboolean success, const gchar *msg); - -void astal_river_river_run_command_async(AstalRiverRiver *self, gint length, const gchar **cmd, - AstalRiverCommandCallback callback); - -G_END_DECLS - -#endif // !ASTAL_RIVER_H diff --git a/include/meson.build b/include/meson.build deleted file mode 100644 index 28a51f6..0000000 --- a/include/meson.build +++ /dev/null @@ -1,6 +0,0 @@ -astal_river_inc = include_directories('.') -astal_river_headers = files( - 'astal-river.h', -) - -install_headers('astal-river.h') diff --git a/include/river-private.h b/include/river-private.h deleted file mode 100644 index 14cd1c5..0000000 --- a/include/river-private.h +++ /dev/null @@ -1,20 +0,0 @@ -#ifndef ASTAL_RIVER_OUTPUT_PRIVATE_H -#define ASTAL_RIVER_OUTPUT_PRIVATE_H - -#include - -#include "astal-river.h" -#include "river-status-unstable-v1-client.h" - -G_BEGIN_DECLS - -AstalRiverOutput *astal_river_output_new(guint id, struct wl_output *wl_output, - struct zriver_status_manager_v1 *status_manager, - struct wl_display *wl_display); - -struct wl_output *astal_river_output_get_wl_output(AstalRiverOutput *self); -void astal_river_output_set_focused_view(AstalRiverOutput *self, const gchar *focused_view); - -G_END_DECLS - -#endif // !ASTAL_RIVER_OUTPUT_PRIVATE_H diff --git a/include/wayland-source.h b/include/wayland-source.h deleted file mode 100644 index b219589..0000000 --- a/include/wayland-source.h +++ /dev/null @@ -1,16 +0,0 @@ -#ifndef __WAYLAND_SOURCE_H__ -#define __WAYLAND_SOURCE_H__ - -#include - -G_BEGIN_DECLS - -typedef struct _WLSource WLSource; - -WLSource* wl_source_new(); -void wl_source_free(WLSource* self); -struct wl_display* wl_source_get_display(WLSource* source); - -G_END_DECLS - -#endif /* __WAYLAND_SOURCE_H__ */ diff --git a/meson.build b/meson.build deleted file mode 100644 index 0cee54d..0000000 --- a/meson.build +++ /dev/null @@ -1,23 +0,0 @@ -project('astal_river', - 'c', - version : '0.1.0', - default_options : [ - 'c_std=gnu11', - 'warning_level=3', - 'prefix=/usr' - ] -) - -add_project_arguments( - ['-Wno-pedantic', '-Wno-unused-parameter'], - language : 'c') - -version_split = meson.project_version().split('.') -lib_so_version = version_split[0] + '.' + version_split[1] - -pkg_config = import('pkgconfig') -gnome = import('gnome') - -subdir('protocols') -subdir('include') -subdir('src') diff --git a/meson_options.txt b/meson_options.txt deleted file mode 100644 index d585854..0000000 --- a/meson_options.txt +++ /dev/null @@ -1,2 +0,0 @@ -option('introspection', type : 'boolean', value : true, description : 'Build gobject-introspection data') -option('vapi', type : 'boolean', value : true, description : 'Generate vapi data (needs vapigen & introspection option)') diff --git a/protocols/meson.build b/protocols/meson.build deleted file mode 100644 index 69f01bb..0000000 --- a/protocols/meson.build +++ /dev/null @@ -1,23 +0,0 @@ - -wayland_scanner = find_program('wayland-scanner') - -protocols = [ - 'river-status-unstable-v1.xml', - 'river-control-unstable-v1.xml' -] - -gen_client_header = generator(wayland_scanner, - output: ['@BASENAME@-client.h'], - arguments: ['-c', 'client-header', '@INPUT@', '@BUILD_DIR@/@BASENAME@-client.h']) - -gen_private_code = generator(wayland_scanner, - output: ['@BASENAME@.c'], - arguments: ['-c', 'private-code', '@INPUT@', '@BUILD_DIR@/@BASENAME@.c']) - -client_protocol_srcs = [] - -foreach protocol : protocols - client_header = gen_client_header.process(protocol) - code = gen_private_code.process(protocol) - client_protocol_srcs += [client_header, code] -endforeach diff --git a/protocols/river-control-unstable-v1.xml b/protocols/river-control-unstable-v1.xml deleted file mode 100644 index c431901..0000000 --- a/protocols/river-control-unstable-v1.xml +++ /dev/null @@ -1,86 +0,0 @@ - - - - Copyright 2020 The River Developers - - Permission to use, copy, modify, and/or distribute this software for any - purpose with or without fee is hereby granted, provided that the above - copyright notice and this permission notice appear in all copies. - - THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - - - - - This interface allows clients to run compositor commands and receive a - success/failure response with output or a failure message respectively. - - Each command is built up in a series of add_argument requests and - executed with a run_command request. The first argument is the command - to be run. - - A complete list of commands should be made available in the man page of - the compositor. - - - - - This request indicates that the client will not use the - river_control object any more. Objects that have been created - through this instance are not affected. - - - - - - Arguments are stored by the server in the order they were sent until - the run_command request is made. - - - - - - - Execute the command built up using the add_argument request for the - given seat. - - - - - - - - - This object is created by the run_command request. Exactly one of the - success or failure events will be sent. This object will be destroyed - by the compositor after one of the events is sent. - - - - - Sent when the command has been successfully received and executed by - the compositor. Some commands may produce output, in which case the - output argument will be a non-empty string. - - - - - - - Sent when the command could not be carried out. This could be due to - sending a non-existent command, no command, not enough arguments, too - many arguments, invalid arguments, etc. - - - - - - diff --git a/protocols/river-status-unstable-v1.xml b/protocols/river-status-unstable-v1.xml deleted file mode 100644 index 09c52c1..0000000 --- a/protocols/river-status-unstable-v1.xml +++ /dev/null @@ -1,149 +0,0 @@ - - - - Copyright 2020 The River Developers - - Permission to use, copy, modify, and/or distribute this software for any - purpose with or without fee is hereby granted, provided that the above - copyright notice and this permission notice appear in all copies. - - THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - - - - - A global factory for objects that receive status information specific - to river. It could be used to implement, for example, a status bar. - - - - - This request indicates that the client will not use the - river_status_manager object any more. Objects that have been created - through this instance are not affected. - - - - - - This creates a new river_output_status object for the given wl_output. - - - - - - - - This creates a new river_seat_status object for the given wl_seat. - - - - - - - - - This interface allows clients to receive information about the current - windowing state of an output. - - - - - This request indicates that the client will not use the - river_output_status object any more. - - - - - - Sent once binding the interface and again whenever the tag focus of - the output changes. - - - - - - - Sent once on binding the interface and again whenever the tag state - of the output changes. - - - - - - - Sent once on binding the interface and again whenever the set of - tags with at least one urgent view changes. - - - - - - - Sent once on binding the interface should a layout name exist and again - whenever the name changes. - - - - - - - Sent when the current layout name has been removed without a new one - being set, for example when the active layout generator disconnects. - - - - - - - This interface allows clients to receive information about the current - focus of a seat. Note that (un)focused_output events will only be sent - if the client has bound the relevant wl_output globals. - - - - - This request indicates that the client will not use the - river_seat_status object any more. - - - - - - Sent on binding the interface and again whenever an output gains focus. - - - - - - - Sent whenever an output loses focus. - - - - - - - Sent once on binding the interface and again whenever the focused - view or a property thereof changes. The title may be an empty string - if no view is focused or the focused view did not set a title. - - - - - - - Sent once on binding the interface and again whenever a new mode - is entered (e.g. with riverctl enter-mode foobar). - - - - - - diff --git a/river/.gitignore b/river/.gitignore new file mode 100644 index 0000000..6bf41b5 --- /dev/null +++ b/river/.gitignore @@ -0,0 +1,3 @@ +build/ +result/ +.cache/ diff --git a/river/LICENSE b/river/LICENSE new file mode 100644 index 0000000..4ef65b3 --- /dev/null +++ b/river/LICENSE @@ -0,0 +1,504 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations below. + + When we speak of free software, we are referring to freedom of use, +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 this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also combine or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + d) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + e) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be distributed need not include anything that is +normally distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties with +this License. + + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +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 +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Lesser 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 Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "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 +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY 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 +LIBRARY (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 LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Libraries + + If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms of the +ordinary General Public License). + + To apply these terms, attach the following notices to the library. It is +safest to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least the +"copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the library, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + library `Frob' (a library for tweaking knobs) written by James Random Hacker. + + , 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! + + diff --git a/river/README.md b/river/README.md new file mode 100644 index 0000000..3285628 --- /dev/null +++ b/river/README.md @@ -0,0 +1,30 @@ +# astal-river + +a library and cli tool for getting status information of the river wayland compositor. + +## Build from source +### Dependencies + +- meson +- glib +- gobject-introspection +- json-glib +- libwayland + +```sh +# Clone the repository +git clone https://github.com/astal-sh/river +cd river + +# Setup and build +meson setup build +meson compile -C build + +# Install +meson install -C build +``` + +## Todo +- docs + + diff --git a/river/flake.lock b/river/flake.lock new file mode 100644 index 0000000..ed5e17d --- /dev/null +++ b/river/flake.lock @@ -0,0 +1,27 @@ +{ + "nodes": { + "nixpkgs": { + "locked": { + "lastModified": 1720031269, + "narHash": "sha256-rwz8NJZV+387rnWpTYcXaRNvzUSnnF9aHONoJIYmiUQ=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "9f4128e00b0ae8ec65918efeba59db998750ead6", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "nixpkgs": "nixpkgs" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/river/flake.nix b/river/flake.nix new file mode 100644 index 0000000..766263f --- /dev/null +++ b/river/flake.nix @@ -0,0 +1,54 @@ +{ + description = "Library and cli tool for querying river"; + + inputs.nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + + outputs = { + self, + nixpkgs, + }: let + version = builtins.replaceStrings ["\n"] [""] (builtins.readFile ./version); + system = "x86_64-linux"; + pkgs = import nixpkgs {inherit system;}; + + nativeBuildInputs = with pkgs; [ + gobject-introspection + meson + pkg-config + ninja + vala + wayland + ]; + + buildInputs = with pkgs; [ + glib + json-glib + ]; + in { + packages.${system} = rec { + default = river; + river = pkgs.stdenv.mkDerivation { + inherit nativeBuildInputs buildInputs; + pname = "astal-river"; + version = version; + src = ./.; + outputs = ["out" "dev"]; + }; + }; + + devShells.${system} = { + default = pkgs.mkShell { + inherit nativeBuildInputs buildInputs; + }; + river = pkgs.mkShell { + inherit nativeBuildInputs; + buildInputs = + buildInputs + ++ [ + pkgs.gjs + self.packages.${system}.default + ]; + }; + }; + }; +} diff --git a/river/include/astal-river.h b/river/include/astal-river.h new file mode 100644 index 0000000..6bedd94 --- /dev/null +++ b/river/include/astal-river.h @@ -0,0 +1,59 @@ +#ifndef ASTAL_RIVER_H +#define ASTAL_RIVER_H + +#include + +G_BEGIN_DECLS + +#define ASTAL_RIVER_TYPE_OUTPUT (astal_river_output_get_type()) + +G_DECLARE_FINAL_TYPE(AstalRiverOutput, astal_river_output, ASTAL_RIVER, OUTPUT, GObject) + +guint astal_river_output_get_id(AstalRiverOutput *self); + +gchar *astal_river_output_get_name(AstalRiverOutput *self); + +gchar *astal_river_output_get_layout_name(AstalRiverOutput *self); + +gchar *astal_river_output_get_focused_view(AstalRiverOutput *self); + +guint astal_river_output_get_focused_tags(AstalRiverOutput *self); + +guint astal_river_output_get_urgent_tags(AstalRiverOutput *self); + +guint astal_river_output_get_occupied_tags(AstalRiverOutput *self); + +#define ASTAL_RIVER_TYPE_RIVER (astal_river_river_get_type()) + +G_DECLARE_FINAL_TYPE(AstalRiverRiver, astal_river_river, ASTAL_RIVER, RIVER, GObject) + +AstalRiverRiver *astal_river_river_new(); + +AstalRiverRiver *astal_river_river_get_default(); +AstalRiverRiver *astal_river_get_default(); + +GList *astal_river_river_get_outputs(AstalRiverRiver *self); + +AstalRiverOutput *astal_river_river_get_output(AstalRiverRiver *self, gchar *name); + +gchar *astal_river_river_get_focused_view(AstalRiverRiver *self); + +gchar *astal_river_river_get_focused_output(AstalRiverRiver *self); + +gchar *astal_river_river_get_mode(AstalRiverRiver *self); + +/** + * AstalRiverCommandCallback: + * @success: a #gboolean indicating whether the command was executed successfully + * @msg: a string containing the result of the command + * + * A callback function that is called after a river command is run. + */ +typedef void (*AstalRiverCommandCallback)(gboolean success, const gchar *msg); + +void astal_river_river_run_command_async(AstalRiverRiver *self, gint length, const gchar **cmd, + AstalRiverCommandCallback callback); + +G_END_DECLS + +#endif // !ASTAL_RIVER_H diff --git a/river/include/meson.build b/river/include/meson.build new file mode 100644 index 0000000..28a51f6 --- /dev/null +++ b/river/include/meson.build @@ -0,0 +1,6 @@ +astal_river_inc = include_directories('.') +astal_river_headers = files( + 'astal-river.h', +) + +install_headers('astal-river.h') diff --git a/river/include/river-private.h b/river/include/river-private.h new file mode 100644 index 0000000..14cd1c5 --- /dev/null +++ b/river/include/river-private.h @@ -0,0 +1,20 @@ +#ifndef ASTAL_RIVER_OUTPUT_PRIVATE_H +#define ASTAL_RIVER_OUTPUT_PRIVATE_H + +#include + +#include "astal-river.h" +#include "river-status-unstable-v1-client.h" + +G_BEGIN_DECLS + +AstalRiverOutput *astal_river_output_new(guint id, struct wl_output *wl_output, + struct zriver_status_manager_v1 *status_manager, + struct wl_display *wl_display); + +struct wl_output *astal_river_output_get_wl_output(AstalRiverOutput *self); +void astal_river_output_set_focused_view(AstalRiverOutput *self, const gchar *focused_view); + +G_END_DECLS + +#endif // !ASTAL_RIVER_OUTPUT_PRIVATE_H diff --git a/river/include/wayland-source.h b/river/include/wayland-source.h new file mode 100644 index 0000000..b219589 --- /dev/null +++ b/river/include/wayland-source.h @@ -0,0 +1,16 @@ +#ifndef __WAYLAND_SOURCE_H__ +#define __WAYLAND_SOURCE_H__ + +#include + +G_BEGIN_DECLS + +typedef struct _WLSource WLSource; + +WLSource* wl_source_new(); +void wl_source_free(WLSource* self); +struct wl_display* wl_source_get_display(WLSource* source); + +G_END_DECLS + +#endif /* __WAYLAND_SOURCE_H__ */ diff --git a/river/meson.build b/river/meson.build new file mode 100644 index 0000000..0cee54d --- /dev/null +++ b/river/meson.build @@ -0,0 +1,23 @@ +project('astal_river', + 'c', + version : '0.1.0', + default_options : [ + 'c_std=gnu11', + 'warning_level=3', + 'prefix=/usr' + ] +) + +add_project_arguments( + ['-Wno-pedantic', '-Wno-unused-parameter'], + language : 'c') + +version_split = meson.project_version().split('.') +lib_so_version = version_split[0] + '.' + version_split[1] + +pkg_config = import('pkgconfig') +gnome = import('gnome') + +subdir('protocols') +subdir('include') +subdir('src') diff --git a/river/meson_options.txt b/river/meson_options.txt new file mode 100644 index 0000000..d585854 --- /dev/null +++ b/river/meson_options.txt @@ -0,0 +1,2 @@ +option('introspection', type : 'boolean', value : true, description : 'Build gobject-introspection data') +option('vapi', type : 'boolean', value : true, description : 'Generate vapi data (needs vapigen & introspection option)') diff --git a/river/protocols/meson.build b/river/protocols/meson.build new file mode 100644 index 0000000..69f01bb --- /dev/null +++ b/river/protocols/meson.build @@ -0,0 +1,23 @@ + +wayland_scanner = find_program('wayland-scanner') + +protocols = [ + 'river-status-unstable-v1.xml', + 'river-control-unstable-v1.xml' +] + +gen_client_header = generator(wayland_scanner, + output: ['@BASENAME@-client.h'], + arguments: ['-c', 'client-header', '@INPUT@', '@BUILD_DIR@/@BASENAME@-client.h']) + +gen_private_code = generator(wayland_scanner, + output: ['@BASENAME@.c'], + arguments: ['-c', 'private-code', '@INPUT@', '@BUILD_DIR@/@BASENAME@.c']) + +client_protocol_srcs = [] + +foreach protocol : protocols + client_header = gen_client_header.process(protocol) + code = gen_private_code.process(protocol) + client_protocol_srcs += [client_header, code] +endforeach diff --git a/river/protocols/river-control-unstable-v1.xml b/river/protocols/river-control-unstable-v1.xml new file mode 100644 index 0000000..c431901 --- /dev/null +++ b/river/protocols/river-control-unstable-v1.xml @@ -0,0 +1,86 @@ + + + + Copyright 2020 The River Developers + + Permission to use, copy, modify, and/or distribute this software for any + purpose with or without fee is hereby granted, provided that the above + copyright notice and this permission notice appear in all copies. + + THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + + + + + This interface allows clients to run compositor commands and receive a + success/failure response with output or a failure message respectively. + + Each command is built up in a series of add_argument requests and + executed with a run_command request. The first argument is the command + to be run. + + A complete list of commands should be made available in the man page of + the compositor. + + + + + This request indicates that the client will not use the + river_control object any more. Objects that have been created + through this instance are not affected. + + + + + + Arguments are stored by the server in the order they were sent until + the run_command request is made. + + + + + + + Execute the command built up using the add_argument request for the + given seat. + + + + + + + + + This object is created by the run_command request. Exactly one of the + success or failure events will be sent. This object will be destroyed + by the compositor after one of the events is sent. + + + + + Sent when the command has been successfully received and executed by + the compositor. Some commands may produce output, in which case the + output argument will be a non-empty string. + + + + + + + Sent when the command could not be carried out. This could be due to + sending a non-existent command, no command, not enough arguments, too + many arguments, invalid arguments, etc. + + + + + + diff --git a/river/protocols/river-status-unstable-v1.xml b/river/protocols/river-status-unstable-v1.xml new file mode 100644 index 0000000..09c52c1 --- /dev/null +++ b/river/protocols/river-status-unstable-v1.xml @@ -0,0 +1,149 @@ + + + + Copyright 2020 The River Developers + + Permission to use, copy, modify, and/or distribute this software for any + purpose with or without fee is hereby granted, provided that the above + copyright notice and this permission notice appear in all copies. + + THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + + + + + A global factory for objects that receive status information specific + to river. It could be used to implement, for example, a status bar. + + + + + This request indicates that the client will not use the + river_status_manager object any more. Objects that have been created + through this instance are not affected. + + + + + + This creates a new river_output_status object for the given wl_output. + + + + + + + + This creates a new river_seat_status object for the given wl_seat. + + + + + + + + + This interface allows clients to receive information about the current + windowing state of an output. + + + + + This request indicates that the client will not use the + river_output_status object any more. + + + + + + Sent once binding the interface and again whenever the tag focus of + the output changes. + + + + + + + Sent once on binding the interface and again whenever the tag state + of the output changes. + + + + + + + Sent once on binding the interface and again whenever the set of + tags with at least one urgent view changes. + + + + + + + Sent once on binding the interface should a layout name exist and again + whenever the name changes. + + + + + + + Sent when the current layout name has been removed without a new one + being set, for example when the active layout generator disconnects. + + + + + + + This interface allows clients to receive information about the current + focus of a seat. Note that (un)focused_output events will only be sent + if the client has bound the relevant wl_output globals. + + + + + This request indicates that the client will not use the + river_seat_status object any more. + + + + + + Sent on binding the interface and again whenever an output gains focus. + + + + + + + Sent whenever an output loses focus. + + + + + + + Sent once on binding the interface and again whenever the focused + view or a property thereof changes. The title may be an empty string + if no view is focused or the focused view did not set a title. + + + + + + + Sent once on binding the interface and again whenever a new mode + is entered (e.g. with riverctl enter-mode foobar). + + + + + + diff --git a/river/src/astal-river.c b/river/src/astal-river.c new file mode 100644 index 0000000..37f34d5 --- /dev/null +++ b/river/src/astal-river.c @@ -0,0 +1,51 @@ +#include +#include +#include + +#include "gio/gio.h" +#include "astal-river.h" + +GMainLoop* loop; + +void print_json(AstalRiverRiver* river) { + JsonNode* json = json_gobject_serialize(G_OBJECT(river)); + + gchar* json_str = json_to_string(json, FALSE); + g_print("%s\n", json_str); + g_free(json); +} + +int main(int argc, char** argv) { + gboolean daemon = FALSE; + + int opt; + const char* optstring = "d"; + + static struct option long_options[] = {{"daemon", no_argument, NULL, 'd'}, {NULL, 0, NULL, 0}}; + + while ((opt = getopt_long(argc, argv, optstring, long_options, NULL)) != -1) { + switch (opt) { + case 'd': + daemon = TRUE; + break; + default: + g_print("Usage: %s [-d]\n", argv[0]); + exit(EXIT_FAILURE); + } + } + + GError* error = NULL; + AstalRiverRiver* river = g_initable_new(ASTAL_RIVER_TYPE_RIVER, NULL, &error, NULL); + if (error) { + g_critical("%s\n", error->message); + exit(EXIT_FAILURE); + } + if (daemon) { + loop = g_main_loop_new(NULL, FALSE); + g_signal_connect(river, "changed", G_CALLBACK(print_json), NULL); + g_main_loop_run(loop); + } else { + print_json(river); + g_object_unref(river); + } +} diff --git a/river/src/meson.build b/river/src/meson.build new file mode 100644 index 0000000..647cc87 --- /dev/null +++ b/river/src/meson.build @@ -0,0 +1,70 @@ +srcs = files( + 'river.c', + 'river-output.c', + 'wayland-source.c', +) + +deps = [ + dependency('gobject-2.0'), + dependency('gio-2.0'), + dependency('wayland-client'), + dependency('json-glib-1.0'), +] + +astal_river_lib = library( + 'astal-river', + sources : srcs + client_protocol_srcs, + include_directories : astal_river_inc, + dependencies : deps, + version : meson.project_version(), + install : true +) + +libastal_river = declare_dependency( + link_with : astal_river_lib, + include_directories : astal_river_inc) + +astal_river_executable = executable( + 'astal-river', + files('astal-river.c'), + dependencies : [ + dependency('gobject-2.0'), + dependency('gio-2.0'), + dependency('json-glib-1.0'), + libastal_river + ], + install : true) + +pkg_config_name = 'astal-river-' + lib_so_version + +if get_option('introspection') + gir = gnome.generate_gir( + astal_river_lib, + sources : srcs + astal_river_headers, + nsversion : '0.1', + namespace : 'AstalRiver', + symbol_prefix : 'astal_river', + identifier_prefix : 'AstalRiver', + includes : ['GObject-2.0', 'Gio-2.0'], + header : 'astal-river.h', + export_packages : pkg_config_name, + install : true + ) + + if get_option('vapi') + gnome.generate_vapi( + pkg_config_name, + sources : [gir[0]], + packages : ['gobject-2.0', 'gio-2.0'], + install : true) + endif +endif + +pkg_config.generate( + name : 'astal-river', + version : meson.project_version(), + libraries : [astal_river_lib], + filebase : pkg_config_name, + subdirs : 'astal', + description : 'astal riverentication module', + url : 'https://github.com/astal-sh/river') diff --git a/river/src/river-output.c b/river/src/river-output.c new file mode 100644 index 0000000..6317db1 --- /dev/null +++ b/river/src/river-output.c @@ -0,0 +1,343 @@ +#include + +#include "river-private.h" +#include "river-status-unstable-v1-client.h" + +struct _AstalRiverOutput { + GObject parent_instance; + guint focused_tags; + guint occupied_tags; + guint urgent_tags; + gchar* layout_name; + gchar* focused_view; + guint id; + gchar* name; +}; + +typedef struct { + struct zriver_status_manager_v1* river_status_manager; + struct zriver_output_status_v1* river_output_status; + struct wl_display* wl_display; + struct wl_output* wl_output; +} AstalRiverOutputPrivate; + +G_DEFINE_FINAL_TYPE_WITH_PRIVATE(AstalRiverOutput, astal_river_output, G_TYPE_OBJECT); + +typedef enum { + ASTAL_RIVER_OUTPUT_PROP_FOCUSED_TAGS = 1, + ASTAL_RIVER_OUTPUT_PROP_OCCUPIED_TAGS, + ASTAL_RIVER_OUTPUT_PROP_URGENT_TAGS, + ASTAL_RIVER_OUTPUT_PROP_LAYOUT_NAME, + ASTAL_RIVER_OUTPUT_PROP_NAME, + ASTAL_RIVER_OUTPUT_PROP_FOCUSED_VIEW, + ASTAL_RIVER_OUTPUT_PROP_ID, + ASTAL_RIVER_OUTPUT_N_PROPERTIES +} AstalRiverOutputProperties; + +typedef enum { + ASTAL_RIVER_OUTPUT_SIGNAL_CHANGED, + ASTAL_RIVER_OUTPUT_N_SIGNALS +} AstalRiverOutputSignals; + +static guint astal_river_output_signals[ASTAL_RIVER_OUTPUT_N_SIGNALS] = { + 0, +}; + +static GParamSpec* astal_river_output_properties[ASTAL_RIVER_OUTPUT_N_PROPERTIES] = { + NULL, +}; + +/** + * astal_river_output_get_nid + * @self: the AstalRiverOutput object + * + * Returns: the id of the underlying wl_output object + */ +guint astal_river_output_get_id(AstalRiverOutput* self) { return self->id; } + +/** + * astal_river_output_get_name + * @self: the AstalRiverOutput object + * + * Returns: (transfer none) (nullable): the name of the output + */ +gchar* astal_river_output_get_name(AstalRiverOutput* self) { return self->name; } + +/** + * astal_river_output_get_layout_name + * @self: the AstalRiverOutput object + * + * Returns: (transfer none) (nullable): the currently used layout name of the output + */ +gchar* astal_river_output_get_layout_name(AstalRiverOutput* self) { return self->layout_name; } + +/** + * astal_river_output_get_focused_view + * @self: the AstalRiverOutput object + * + * Returns: (transfer none) (nullable): the focused view on the output + */ +gchar* astal_river_output_get_focused_view(AstalRiverOutput* self) { return self->focused_view; } + +void astal_river_output_set_focused_view(AstalRiverOutput* self, const gchar* focused_view) { + g_free(self->focused_view); + self->focused_view = g_strdup(focused_view); + g_object_notify(G_OBJECT(self), "focused-view"); + g_signal_emit(self, astal_river_output_signals[ASTAL_RIVER_OUTPUT_SIGNAL_CHANGED], 0); +} + +/** + * astal_river_output_get_focused_tags + * @self: the AstalRiverOutput object + * + * Returns: the focused tags of the output + */ +guint astal_river_output_get_focused_tags(AstalRiverOutput* self) { return self->focused_tags; } + +/** + * astal_river_output_get_urgent_tags + * @self: the AstalRiverOutput object + * + * Returns: the urgent tags of the output + */ +guint astal_river_output_get_urgent_tags(AstalRiverOutput* self) { return self->urgent_tags; } + +/** + * astal_river_output_get_occupied_tags + * @self: the AstalRiverOutput object + * + * Returns: the occupied tags of the output + */ +guint astal_river_output_get_occupied_tags(AstalRiverOutput* self) { return self->occupied_tags; } + +struct wl_output* astal_river_output_get_wl_output(AstalRiverOutput* self) { + AstalRiverOutputPrivate* priv = astal_river_output_get_instance_private(self); + return priv->wl_output; +} + +static void astal_river_output_get_property(GObject* object, guint property_id, GValue* value, + GParamSpec* pspec) { + AstalRiverOutput* self = ASTAL_RIVER_OUTPUT(object); + + switch (property_id) { + case ASTAL_RIVER_OUTPUT_PROP_FOCUSED_TAGS: + g_value_set_uint(value, self->focused_tags); + break; + case ASTAL_RIVER_OUTPUT_PROP_OCCUPIED_TAGS: + g_value_set_uint(value, self->occupied_tags); + break; + case ASTAL_RIVER_OUTPUT_PROP_URGENT_TAGS: + g_value_set_uint(value, self->urgent_tags); + break; + case ASTAL_RIVER_OUTPUT_PROP_ID: + g_value_set_uint(value, self->id); + break; + case ASTAL_RIVER_OUTPUT_PROP_NAME: + g_value_set_string(value, self->name); + break; + case ASTAL_RIVER_OUTPUT_PROP_LAYOUT_NAME: + g_value_set_string(value, self->layout_name); + break; + case ASTAL_RIVER_OUTPUT_PROP_FOCUSED_VIEW: + g_value_set_string(value, self->focused_view); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec); + break; + } +} + +static void astal_river_output_set_property(GObject* object, guint property_id, const GValue* value, + GParamSpec* pspec) { + AstalRiverOutput* self = ASTAL_RIVER_OUTPUT(object); + + switch (property_id) { + case ASTAL_RIVER_OUTPUT_PROP_ID: + self->id = g_value_get_uint(value); + g_object_notify(G_OBJECT(self), "id"); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec); + break; + } + g_signal_emit(self, astal_river_output_signals[ASTAL_RIVER_OUTPUT_SIGNAL_CHANGED], 0); +} + +static void noop() {} + +static void astal_river_handle_focused_tags(void* data, struct zriver_output_status_v1* status, + uint32_t tags) { + AstalRiverOutput* self = ASTAL_RIVER_OUTPUT(data); + self->focused_tags = tags; + g_object_notify(G_OBJECT(self), "focused-tags"); + g_signal_emit(self, astal_river_output_signals[ASTAL_RIVER_OUTPUT_SIGNAL_CHANGED], 0); +} + +static void astal_river_handle_urgent_tags(void* data, struct zriver_output_status_v1* status, + uint32_t tags) { + AstalRiverOutput* self = ASTAL_RIVER_OUTPUT(data); + self->urgent_tags = tags; + g_object_notify(G_OBJECT(self), "urgent-tags"); + g_signal_emit(self, astal_river_output_signals[ASTAL_RIVER_OUTPUT_SIGNAL_CHANGED], 0); +} + +static void astal_river_handle_occupied_tags(void* data, struct zriver_output_status_v1* status, + struct wl_array* view_tags) { + AstalRiverOutput* self = ASTAL_RIVER_OUTPUT(data); + guint tags = 0; + guint* view; + wl_array_for_each(view, view_tags) { tags |= *view; } + + self->occupied_tags = tags; + g_object_notify(G_OBJECT(self), "occupied-tags"); + g_signal_emit(self, astal_river_output_signals[ASTAL_RIVER_OUTPUT_SIGNAL_CHANGED], 0); +} + +static void astal_river_handle_layout_name(void* data, struct zriver_output_status_v1* status, + const char* name) { + AstalRiverOutput* self = ASTAL_RIVER_OUTPUT(data); + g_free(self->layout_name); + self->layout_name = g_strdup(name); + g_object_notify(G_OBJECT(self), "layout-name"); + g_signal_emit(self, astal_river_output_signals[ASTAL_RIVER_OUTPUT_SIGNAL_CHANGED], 0); +} + +static void astal_river_handle_layout_name_clear(void* data, + struct zriver_output_status_v1* status) { + AstalRiverOutput* self = ASTAL_RIVER_OUTPUT(data); + g_free(self->layout_name); + self->layout_name = NULL; + g_object_notify(G_OBJECT(self), "layout-name"); + g_signal_emit(self, astal_river_output_signals[ASTAL_RIVER_OUTPUT_SIGNAL_CHANGED], 0); +} + +static void astal_river_wl_output_handle_name(void* data, struct wl_output* output, + const char* name) { + AstalRiverOutput* self = ASTAL_RIVER_OUTPUT(data); + g_free(self->name); + self->name = g_strdup(name); + g_object_notify(G_OBJECT(self), "name"); + g_signal_emit(self, astal_river_output_signals[ASTAL_RIVER_OUTPUT_SIGNAL_CHANGED], 0); +} + +static const struct zriver_output_status_v1_listener output_status_listener = { + .focused_tags = astal_river_handle_focused_tags, + .view_tags = astal_river_handle_occupied_tags, + .urgent_tags = astal_river_handle_urgent_tags, + .layout_name = astal_river_handle_layout_name, + .layout_name_clear = astal_river_handle_layout_name_clear, +}; + +static const struct wl_output_listener wl_output_listener = { + .name = astal_river_wl_output_handle_name, + .geometry = noop, + .mode = noop, + .scale = noop, + .description = noop, + .done = noop, +}; + +static void astal_river_output_finalize(GObject* object) { + AstalRiverOutput* self = ASTAL_RIVER_OUTPUT(object); + AstalRiverOutputPrivate* priv = astal_river_output_get_instance_private(self); + + zriver_output_status_v1_destroy(priv->river_output_status); + wl_output_destroy(priv->wl_output); + + wl_display_roundtrip(priv->wl_display); + + g_free(self->layout_name); + g_free(self->name); + + G_OBJECT_CLASS(astal_river_output_parent_class)->finalize(object); +} + +static void astal_river_output_init(AstalRiverOutput* self) {} + +AstalRiverOutput* astal_river_output_new(guint id, struct wl_output* wl_output, + struct zriver_status_manager_v1* status_manager, + struct wl_display* wl_display) { + AstalRiverOutput* self = g_object_new(ASTAL_RIVER_TYPE_OUTPUT, NULL); + AstalRiverOutputPrivate* priv = astal_river_output_get_instance_private(self); + + self->id = id; + priv->wl_display = wl_display; + priv->wl_output = wl_output; + priv->river_status_manager = status_manager; + + priv->river_output_status = + zriver_status_manager_v1_get_river_output_status(priv->river_status_manager, wl_output); + + zriver_output_status_v1_add_listener(priv->river_output_status, &output_status_listener, self); + + wl_output_add_listener(wl_output, &wl_output_listener, self); + + wl_display_roundtrip(priv->wl_display); + + return self; +} + +static void astal_river_output_class_init(AstalRiverOutputClass* class) { + GObjectClass* object_class = G_OBJECT_CLASS(class); + object_class->get_property = astal_river_output_get_property; + object_class->set_property = astal_river_output_set_property; + object_class->finalize = astal_river_output_finalize; + /** + * AstalRiverOutput:focused-tags: + * + * The currently focused tags + */ + astal_river_output_properties[ASTAL_RIVER_OUTPUT_PROP_FOCUSED_TAGS] = g_param_spec_uint( + "focused-tags", "focused-tags", "currently focused tags", 0, INT_MAX, 0, G_PARAM_READABLE); + /** + * AstalRiverOutput:occupied-tags: + * + * The currently occupied tags + */ + astal_river_output_properties[ASTAL_RIVER_OUTPUT_PROP_OCCUPIED_TAGS] = + g_param_spec_uint("occupied-tags", "occupied-tags", "currently occupied tags", 0, INT_MAX, + 0, G_PARAM_READABLE); + /** + * AstalRiverOutput:urgent-tags: + * + * The currently tags marked as urgent + */ + astal_river_output_properties[ASTAL_RIVER_OUTPUT_PROP_URGENT_TAGS] = g_param_spec_uint( + "urgent-tags", "urgent-tags", "currently urgent tags", 0, INT_MAX, 0, G_PARAM_READABLE); + /** + * AstalRiverOutput:id: + * + * The id of the underlying wl_output object + */ + astal_river_output_properties[ASTAL_RIVER_OUTPUT_PROP_ID] = + g_param_spec_uint("id", "id", "id of the output object", 0, INT_MAX, 0, G_PARAM_READABLE); + /** + * AstalRiverOutput:layout-name: + * + * The name of active layout + */ + astal_river_output_properties[ASTAL_RIVER_OUTPUT_PROP_LAYOUT_NAME] = g_param_spec_string( + "layout-name", "layout-name", "name of the current layout", NULL, G_PARAM_READABLE); + /** + * AstalRiverOutput:name: + * + * The name of this output + */ + astal_river_output_properties[ASTAL_RIVER_OUTPUT_PROP_NAME] = + g_param_spec_string("name", "name", "name of the output", NULL, G_PARAM_READABLE); + /** + * AstalRiverOutput:focused-view: + * + * The name of currently focused view + */ + astal_river_output_properties[ASTAL_RIVER_OUTPUT_PROP_FOCUSED_VIEW] = + g_param_spec_string("focused-view", "focused-view", + "name of last focused view on this output", NULL, G_PARAM_READABLE); + + g_object_class_install_properties(object_class, ASTAL_RIVER_OUTPUT_N_PROPERTIES, + astal_river_output_properties); + + astal_river_output_signals[ASTAL_RIVER_OUTPUT_SIGNAL_CHANGED] = + g_signal_new("changed", G_TYPE_FROM_CLASS(class), G_SIGNAL_RUN_FIRST, 0, NULL, NULL, NULL, + G_TYPE_NONE, 0); +} diff --git a/river/src/river.c b/river/src/river.c new file mode 100644 index 0000000..a735898 --- /dev/null +++ b/river/src/river.c @@ -0,0 +1,504 @@ +#include +#include +#include +#include + +#include "river-control-unstable-v1-client.h" +#include "river-private.h" +#include "river-status-unstable-v1-client.h" +#include "wayland-source.h" + +struct _AstalRiverRiver { + GObject parent_instance; + GList* outputs; + gchar* focused_output; + gchar* focused_view; + gchar* mode; +}; + +typedef struct { + GHashTable* signal_ids; + gboolean init; + struct wl_registry* wl_registry; + struct wl_seat* seat; + struct wl_display* display; + WLSource* wl_source; + struct zriver_status_manager_v1* river_status_manager; + struct zriver_control_v1* river_control; + struct zriver_seat_status_v1* river_seat_status; +} AstalRiverRiverPrivate; + +static JsonSerializableIface* serializable_iface = NULL; +static void astal_river_river_initable_iface_init(GInitableIface* iface); +static void astal_river_river_json_serializable_iface_init(JsonSerializableIface* g_iface); + +G_DEFINE_TYPE_WITH_CODE(AstalRiverRiver, astal_river_river, G_TYPE_OBJECT, + G_ADD_PRIVATE(AstalRiverRiver) G_IMPLEMENT_INTERFACE( + G_TYPE_INITABLE, astal_river_river_initable_iface_init) + G_IMPLEMENT_INTERFACE(JSON_TYPE_SERIALIZABLE, + astal_river_river_json_serializable_iface_init)) + +typedef enum { + ASTAL_RIVER_RIVER_PROP_FOCUSED_OUTPUT = 1, + ASTAL_RIVER_RIVER_PROP_FOCUSED_VIEW, + ASTAL_RIVER_RIVER_PROP_MODE, + ASTAL_RIVER_RIVER_PROP_OUTPUTS, + ASTAL_RIVER_RIVER_N_PROPERTIES +} AstalRiverRiverProperties; + +typedef enum { + ASTAL_RIVER_RIVER_SIGNAL_CHANGED, + ASTAL_RIVER_RIVER_SIGNAL_OUTPUT_ADDED, + ASTAL_RIVER_RIVER_SIGNAL_OUTPUT_REMOVED, + ASTAL_RIVER_RIVER_N_SIGNALS +} AstalRiverRiverSignals; + +static guint astal_river_river_signals[ASTAL_RIVER_RIVER_N_SIGNALS] = { + 0, +}; +static GParamSpec* astal_river_river_properties[ASTAL_RIVER_RIVER_N_PROPERTIES] = { + NULL, +}; + +static void reemit_changed(AstalRiverOutput* output, AstalRiverRiver* self) { + g_signal_emit(self, astal_river_river_signals[ASTAL_RIVER_RIVER_SIGNAL_CHANGED], 0); +} + +static AstalRiverOutput* find_output_by_id(AstalRiverRiver* self, uint32_t id) { + GList* output = self->outputs; + while (output != NULL) { + AstalRiverOutput* river_output = output->data; + if (astal_river_output_get_id(river_output) == id) return river_output; + output = output->next; + } + return NULL; +} + +static AstalRiverOutput* find_output_by_output(AstalRiverRiver* self, struct wl_output* wl_output) { + GList* output = self->outputs; + while (output != NULL) { + AstalRiverOutput* river_output = output->data; + if (astal_river_output_get_wl_output(river_output) == wl_output) return river_output; + output = output->next; + } + return NULL; +} + +static AstalRiverOutput* find_output_by_name(AstalRiverRiver* self, gchar* name) { + GList* output = self->outputs; + while (output != NULL) { + AstalRiverOutput* river_output = output->data; + if (strcmp(astal_river_output_get_name(river_output), name) == 0) return river_output; + output = output->next; + } + return NULL; +} + +/** + * astal_river_river_get_outputs + * @self: the AstalRiverRiver object + * + * Returns: (transfer none) (element-type AstalRiver.Output): a list of all outputs + * + */ +GList* astal_river_river_get_outputs(AstalRiverRiver* self) { return self->outputs; } + +/** + * astal_river_river_get_output + * @self: the AstalRiverRiver object + * @name: the name of the output + * + * Returns: (transfer none) (nullable): the output with the given name or null + */ +AstalRiverOutput* astal_river_river_get_output(AstalRiverRiver* self, gchar* name) { + return find_output_by_name(self, name); +} + +/** + * astal_river_river_get_focused_view + * @self: the AstalRiverOutput object + * + * Returns: (transfer none) (nullable): the currently focused view + */ +gchar* astal_river_river_get_focused_view(AstalRiverRiver* self) { return self->focused_view; } + +/** + * astal_river_river_get_focused_output + * @self: the AstalRiverOutput object + * + * Returns: (transfer none) (nullable): the name of the currently focused output + */ +gchar* astal_river_river_get_focused_output(AstalRiverRiver* self) { return self->focused_output; } + +/** + * astal_river_river_get_mode + * @self: the AstalRiverOutput object + * + * Returns: (transfer none) (nullable): the currently active mode + */ +gchar* astal_river_river_get_mode(AstalRiverRiver* self) { return self->mode; } + +static void astal_river_river_get_property(GObject* object, guint property_id, GValue* value, + GParamSpec* pspec) { + AstalRiverRiver* self = ASTAL_RIVER_RIVER(object); + + switch (property_id) { + case ASTAL_RIVER_RIVER_PROP_MODE: + g_value_set_string(value, self->mode); + break; + case ASTAL_RIVER_RIVER_PROP_FOCUSED_VIEW: + g_value_set_string(value, self->focused_view); + break; + case ASTAL_RIVER_RIVER_PROP_FOCUSED_OUTPUT: + g_value_set_string(value, self->focused_output); + break; + case ASTAL_RIVER_RIVER_PROP_OUTPUTS: + g_value_set_pointer(value, self->outputs); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec); + break; + } +} + +static JsonNode* astal_river_river_serialize_property(JsonSerializable* serializable, + const gchar* name, const GValue* value, + GParamSpec* pspec) { + JsonNode* retval = NULL; + if (strcmp(name, "outputs") == 0) { + JsonArray* outputs = json_array_new(); + retval = json_node_new(JSON_NODE_ARRAY); + GList* output = g_value_get_pointer(value); + while (output != NULL) { + AstalRiverOutput* river_output = output->data; + json_array_add_element(outputs, json_gobject_serialize(G_OBJECT(river_output))); + output = output->next; + } + json_node_take_array(retval, outputs); + } else + retval = serializable_iface->serialize_property(serializable, name, value, pspec); + + return retval; +} + +static void noop() {} + +static void river_seat_status_handle_focused_output(void* data, + struct zriver_seat_status_v1* seat_status, + struct wl_output* focused_output) { + AstalRiverRiver* self = ASTAL_RIVER_RIVER(data); + g_free(self->focused_output); + AstalRiverOutput* output = find_output_by_output(self, focused_output); + if (output == NULL) return; + self->focused_output = g_strdup(astal_river_output_get_name(output)); + g_object_notify(G_OBJECT(self), "focused-output"); + g_signal_emit(self, astal_river_river_signals[ASTAL_RIVER_RIVER_SIGNAL_CHANGED], 0); +} + +static void river_seat_status_handle_focused_view(void* data, + struct zriver_seat_status_v1* seat_status, + const char* focused_view) { + AstalRiverRiver* self = ASTAL_RIVER_RIVER(data); + g_free(self->focused_view); + self->focused_view = g_strdup(focused_view); + AstalRiverOutput* output = find_output_by_name(self, self->focused_output); + astal_river_output_set_focused_view(output, focused_view); + g_object_notify(G_OBJECT(self), "focused-view"); + g_signal_emit(self, astal_river_river_signals[ASTAL_RIVER_RIVER_SIGNAL_CHANGED], 0); +} + +static void river_seat_status_handle_mode(void* data, struct zriver_seat_status_v1* seat_status, + const char* mode) { + AstalRiverRiver* self = ASTAL_RIVER_RIVER(data); + g_free(self->mode); + self->mode = g_strdup(mode); + g_object_notify(G_OBJECT(self), "mode"); + g_signal_emit(self, astal_river_river_signals[ASTAL_RIVER_RIVER_SIGNAL_CHANGED], 0); +} + +static const struct zriver_seat_status_v1_listener river_seat_status_listener = { + .focused_output = river_seat_status_handle_focused_output, + .unfocused_output = noop, + .focused_view = river_seat_status_handle_focused_view, + .mode = river_seat_status_handle_mode, +}; + +static void global_registry_handler(void* data, struct wl_registry* registry, uint32_t id, + const char* interface, uint32_t version) { + AstalRiverRiver* self = ASTAL_RIVER_RIVER(data); + AstalRiverRiverPrivate* priv = astal_river_river_get_instance_private(self); + if (strcmp(interface, wl_output_interface.name) == 0) { + if (priv->river_status_manager == NULL) return; + struct wl_output* wl_out = wl_registry_bind(registry, id, &wl_output_interface, 4); + AstalRiverOutput* output = + astal_river_output_new(id, wl_out, priv->river_status_manager, priv->display); + + self->outputs = g_list_append(self->outputs, output); + g_object_notify(G_OBJECT(self), "outputs"); + g_signal_emit(G_OBJECT(self), + astal_river_river_signals[ASTAL_RIVER_RIVER_SIGNAL_OUTPUT_ADDED], 0, + astal_river_output_get_name(output)); + g_signal_emit(self, astal_river_river_signals[ASTAL_RIVER_RIVER_SIGNAL_CHANGED], 0); + + guint signal_id = g_signal_connect(output, "changed", G_CALLBACK(reemit_changed), self); + g_hash_table_insert(priv->signal_ids, GUINT_TO_POINTER(id), GUINT_TO_POINTER(signal_id)); + } else if (strcmp(interface, wl_seat_interface.name) == 0) { + priv->seat = wl_registry_bind(registry, id, &wl_seat_interface, 4); + } else if (strcmp(interface, zriver_status_manager_v1_interface.name) == 0) { + priv->river_status_manager = + wl_registry_bind(registry, id, &zriver_status_manager_v1_interface, 4); + } else if (strcmp(interface, zriver_control_v1_interface.name) == 0) { + priv->river_control = wl_registry_bind(registry, id, &zriver_control_v1_interface, 1); + } +} + +static void astal_river_river_callback_success(void* data, struct zriver_command_callback_v1* cb, + const char* msg) { + AstalRiverCommandCallback callback = (AstalRiverCommandCallback)(data); + callback(TRUE, msg); +} + +static void astal_river_river_callback_failure(void* data, struct zriver_command_callback_v1* cb, + const char* msg) { + AstalRiverCommandCallback callback = (AstalRiverCommandCallback)(data); + callback(FALSE, msg); +} + +const struct zriver_command_callback_v1_listener cb_listener = { + .success = astal_river_river_callback_success, .failure = astal_river_river_callback_failure}; + +/** + * astal_river_river_run_command_async: + * @self: the AstalRiverRiver object + * @length: the length of the cmd array + * @cmd: (array length=length): the command to execute + * @callback: (scope async) (nullable): the callback to invoke. + * + * Calls the given callback with the provided parameters. + */ +void astal_river_river_run_command_async(AstalRiverRiver* self, gint length, const gchar** cmd, + AstalRiverCommandCallback callback) { + AstalRiverRiverPrivate* priv = astal_river_river_get_instance_private(self); + + for (gint i = 0; i < length; ++i) { + zriver_control_v1_add_argument(priv->river_control, cmd[i]); + } + + struct zriver_command_callback_v1* cb = + zriver_control_v1_run_command(priv->river_control, priv->seat); + if (callback != NULL) zriver_command_callback_v1_add_listener(cb, &cb_listener, callback); +} + +static void global_registry_remover(void* data, struct wl_registry* registry, uint32_t id) { + AstalRiverRiver* self = ASTAL_RIVER_RIVER(data); + AstalRiverRiverPrivate* priv = astal_river_river_get_instance_private(self); + AstalRiverOutput* output = find_output_by_id(self, id); + if (output != NULL) { + guint signal_id = + GPOINTER_TO_UINT(g_hash_table_lookup(priv->signal_ids, GUINT_TO_POINTER(id))); + g_hash_table_remove(priv->signal_ids, GUINT_TO_POINTER(id)); + g_signal_handler_disconnect(output, signal_id); + g_signal_emit(G_OBJECT(self), + astal_river_river_signals[ASTAL_RIVER_RIVER_SIGNAL_OUTPUT_ADDED], 0, + astal_river_output_get_name(output)); + self->outputs = g_list_remove(self->outputs, output); + g_object_notify(G_OBJECT(self), "outputs"); + g_object_unref(output); + return; + } + g_signal_emit(self, astal_river_river_signals[ASTAL_RIVER_RIVER_SIGNAL_CHANGED], 0); +} + +static const struct wl_registry_listener registry_listener = {global_registry_handler, + global_registry_remover}; + +static void astal_river_river_json_serializable_iface_init(JsonSerializableIface* iface) { + iface->serialize_property = astal_river_river_serialize_property; + serializable_iface = g_type_default_interface_peek(JSON_TYPE_SERIALIZABLE); +} + +static gboolean astal_river_river_initable_init(GInitable* initable, GCancellable* cancellable, + GError** error) { + AstalRiverRiver* self = ASTAL_RIVER_RIVER(initable); + AstalRiverRiverPrivate* priv = astal_river_river_get_instance_private(self); + + if (priv->init) return TRUE; + + priv->wl_source = wl_source_new(NULL, NULL); + + if (priv->wl_source == NULL) { + g_set_error_literal(error, G_IO_ERROR, G_IO_ERROR_FAILED, + "Can not connect to wayland display"); + return FALSE; + } + + priv->display = wl_source_get_display(priv->wl_source); + + priv->wl_registry = wl_display_get_registry(priv->display); + wl_registry_add_listener(priv->wl_registry, ®istry_listener, self); + + wl_display_roundtrip(priv->display); + + if (priv->river_status_manager == NULL) { + g_set_error_literal(error, G_IO_ERROR, G_IO_ERROR_FAILED, + "Can not connect river status protocol"); + return FALSE; + } + + priv->river_seat_status = + zriver_status_manager_v1_get_river_seat_status(priv->river_status_manager, priv->seat); + zriver_seat_status_v1_add_listener(priv->river_seat_status, &river_seat_status_listener, self); + + wl_display_roundtrip(priv->display); + + priv->init = TRUE; + return TRUE; +} + +static void astal_river_river_constructed(GObject* object) { + astal_river_river_initable_init(G_INITABLE(object), NULL, NULL); +} + +static void astal_river_river_initable_iface_init(GInitableIface* iface) { + iface->init = astal_river_river_initable_init; +} + +static void astal_river_river_init(AstalRiverRiver* self) { + AstalRiverRiverPrivate* priv = astal_river_river_get_instance_private(self); + self->outputs = NULL; + priv->init = FALSE; + priv->seat = NULL; + priv->display = NULL; + priv->river_status_manager = NULL; + priv->signal_ids = g_hash_table_new(g_direct_hash, g_direct_equal); +} + +/** + * astal_river_river_new + * + * creates a new River object. It is recommended to use the get_default() method + * instead of this method. + * + * Returns: (nullable): a newly created connection to river + */ +AstalRiverRiver* astal_river_river_new() { + return g_initable_new(ASTAL_RIVER_TYPE_RIVER, NULL, NULL, NULL); +} + +static void disconnect_signal(gpointer key, gpointer value, gpointer user_data) { + AstalRiverRiver* self = ASTAL_RIVER_RIVER(user_data); + + AstalRiverOutput* output = find_output_by_id(self, GPOINTER_TO_UINT(key)); + g_signal_handler_disconnect(output, GPOINTER_TO_UINT(value)); +} + +/** + * astal_river_river_get_default + * + * Returns: (nullable) (transfer none): gets the default River object. + */ +AstalRiverRiver* astal_river_river_get_default() { + static AstalRiverRiver* self = NULL; + + if (self == NULL) self = astal_river_river_new(); + + return self; +} + +/** + * astal_river_get_default + * + * Returns: (nullable) (transfer none): gets the default River object. + */ +AstalRiverRiver* astal_river_get_default() { return astal_river_river_get_default(); } + +static void astal_river_river_finalize(GObject* object) { + AstalRiverRiver* self = ASTAL_RIVER_RIVER(object); + AstalRiverRiverPrivate* priv = astal_river_river_get_instance_private(self); + + g_hash_table_foreach(priv->signal_ids, disconnect_signal, self); + g_hash_table_destroy(priv->signal_ids); + + if (priv->display != NULL) wl_display_roundtrip(priv->display); + + g_clear_list(&self->outputs, g_object_unref); + self->outputs = NULL; + + if (priv->wl_registry != NULL) wl_registry_destroy(priv->wl_registry); + if (priv->river_status_manager != NULL) + zriver_status_manager_v1_destroy(priv->river_status_manager); + if (priv->river_seat_status != NULL) zriver_seat_status_v1_destroy(priv->river_seat_status); + if (priv->seat != NULL) wl_seat_destroy(priv->seat); + if (priv->display != NULL) wl_display_flush(priv->display); + + if (priv->wl_source != NULL) wl_source_free(priv->wl_source); + + g_free(self->focused_view); + g_free(self->focused_output); + g_free(self->mode); + + G_OBJECT_CLASS(astal_river_river_parent_class)->finalize(object); +} + +static void astal_river_river_class_init(AstalRiverRiverClass* class) { + GObjectClass* object_class = G_OBJECT_CLASS(class); + object_class->get_property = astal_river_river_get_property; + object_class->finalize = astal_river_river_finalize; + object_class->constructed = astal_river_river_constructed; + + /** + * AstalRiverRiver:mode: + * + * The currently active mode + */ + astal_river_river_properties[ASTAL_RIVER_RIVER_PROP_MODE] = + g_param_spec_string("mode", "mode", "currently active mode", NULL, G_PARAM_READABLE); + /** + * AstalRiverRiver:focused-view: + * + * The name of the currently focused view + */ + astal_river_river_properties[ASTAL_RIVER_RIVER_PROP_FOCUSED_VIEW] = g_param_spec_string( + "focused-view", "focused-view", "currently focused view", NULL, G_PARAM_READABLE); + /** + * AstalRiverRiver:focused-output: + * + * The name of the currently focused output + */ + astal_river_river_properties[ASTAL_RIVER_RIVER_PROP_FOCUSED_OUTPUT] = g_param_spec_string( + "focused-output", "focused-output", "currently focused-output", NULL, G_PARAM_READABLE); + /** + * AstalRiverRiver:outputs: (type GList(AstalRiverOutput)) + * + * A list of AstalRiverOutput objects + */ + astal_river_river_properties[ASTAL_RIVER_RIVER_PROP_OUTPUTS] = + g_param_spec_pointer("outputs", "outputs", "a list of all outputs", G_PARAM_READABLE); + + g_object_class_install_properties(object_class, ASTAL_RIVER_RIVER_N_PROPERTIES, + astal_river_river_properties); + /** + * AstalRiverRiver::output-added: + * @river: the object which received the signal. + * @output: the name of the added output + * + * This signal is emitted when a new output was connected + */ + astal_river_river_signals[ASTAL_RIVER_RIVER_SIGNAL_OUTPUT_ADDED] = + g_signal_new("output-added", G_TYPE_FROM_CLASS(class), G_SIGNAL_RUN_FIRST, 0, NULL, NULL, + NULL, G_TYPE_NONE, 1, G_TYPE_STRING); + /** + * AstalRiverRiver::output-removed: + * @river: the object which received the signal. + * @output: the name of the removed output + * + * This signal is emitted when a new output was disconnected + */ + astal_river_river_signals[ASTAL_RIVER_RIVER_SIGNAL_OUTPUT_REMOVED] = + g_signal_new("output-removed", G_TYPE_FROM_CLASS(class), G_SIGNAL_RUN_FIRST, 0, NULL, NULL, + NULL, G_TYPE_NONE, 1, G_TYPE_STRING); + + astal_river_river_signals[ASTAL_RIVER_RIVER_SIGNAL_CHANGED] = + g_signal_new("changed", G_TYPE_FROM_CLASS(class), G_SIGNAL_RUN_FIRST, 0, NULL, NULL, NULL, + G_TYPE_NONE, 0); +} diff --git a/river/src/wayland-source.c b/river/src/wayland-source.c new file mode 100644 index 0000000..875c32c --- /dev/null +++ b/river/src/wayland-source.c @@ -0,0 +1,104 @@ + +#include "wayland-source.h" + +#include +#include +#include + +struct _WLSource { + GSource source; + struct wl_display *display; + gpointer fd; + int error; +}; + +static gboolean wl_source_prepare(GSource *source, gint *timeout) { + WLSource *self = (WLSource *)source; + + *timeout = 0; + if (wl_display_prepare_read(self->display) != 0) + return TRUE; + else if (wl_display_flush(self->display) < 0) { + self->error = errno; + return TRUE; + } + *timeout = -1; + return FALSE; +} + +static gboolean wl_source_check(GSource *source) { + WLSource *self = (WLSource *)source; + + if (self->error > 0) return TRUE; + + GIOCondition revents; + revents = g_source_query_unix_fd(source, self->fd); + + if (revents & G_IO_IN) { + if (wl_display_read_events(self->display) < 0) self->error = errno; + } else + wl_display_cancel_read(self->display); + + return revents > 0; +} + +static gboolean wl_source_dispatch(GSource *source, GSourceFunc callback, gpointer user_data) { + WLSource *self = (WLSource *)source; + GIOCondition revents; + + revents = g_source_query_unix_fd(source, self->fd); + if ((self->error > 0) || (revents & (G_IO_ERR | G_IO_HUP))) { + errno = self->error; + self->error = 0; + if (callback != NULL) return callback(user_data); + return G_SOURCE_REMOVE; + } + + if (wl_display_dispatch_pending(self->display) < 0) { + if (callback != NULL) return callback(user_data); + return G_SOURCE_REMOVE; + } + + return G_SOURCE_CONTINUE; +} + +static void wl_source_finalize(GSource *source) { + WLSource *self = (WLSource *)source; + wl_display_disconnect(self->display); +} + +static GSourceFuncs wl_source_funcs = { + .prepare = wl_source_prepare, + .check = wl_source_check, + .dispatch = wl_source_dispatch, + .finalize = wl_source_finalize, +}; + +WLSource *wl_source_new() { + struct wl_display *display; + WLSource *self; + GSource *source; + + display = wl_display_connect(NULL); + if (display == NULL) return NULL; + + source = g_source_new(&wl_source_funcs, sizeof(WLSource)); + self = (WLSource *)source; + self->display = display; + + self->fd = g_source_add_unix_fd(source, wl_display_get_fd(self->display), + G_IO_IN | G_IO_ERR | G_IO_HUP); + + g_source_attach(source, NULL); + + return self; +} + +void wl_source_free(WLSource *self) { + GSource *source = (GSource *)self; + g_return_if_fail(source != NULL); + g_source_destroy(source); + g_source_unref(source); +} + +struct wl_display *wl_source_get_display(WLSource *self) { return self->display; } diff --git a/river/version b/river/version new file mode 100644 index 0000000..6e8bf73 --- /dev/null +++ b/river/version @@ -0,0 +1 @@ +0.1.0 diff --git a/src/astal-river.c b/src/astal-river.c deleted file mode 100644 index 37f34d5..0000000 --- a/src/astal-river.c +++ /dev/null @@ -1,51 +0,0 @@ -#include -#include -#include - -#include "gio/gio.h" -#include "astal-river.h" - -GMainLoop* loop; - -void print_json(AstalRiverRiver* river) { - JsonNode* json = json_gobject_serialize(G_OBJECT(river)); - - gchar* json_str = json_to_string(json, FALSE); - g_print("%s\n", json_str); - g_free(json); -} - -int main(int argc, char** argv) { - gboolean daemon = FALSE; - - int opt; - const char* optstring = "d"; - - static struct option long_options[] = {{"daemon", no_argument, NULL, 'd'}, {NULL, 0, NULL, 0}}; - - while ((opt = getopt_long(argc, argv, optstring, long_options, NULL)) != -1) { - switch (opt) { - case 'd': - daemon = TRUE; - break; - default: - g_print("Usage: %s [-d]\n", argv[0]); - exit(EXIT_FAILURE); - } - } - - GError* error = NULL; - AstalRiverRiver* river = g_initable_new(ASTAL_RIVER_TYPE_RIVER, NULL, &error, NULL); - if (error) { - g_critical("%s\n", error->message); - exit(EXIT_FAILURE); - } - if (daemon) { - loop = g_main_loop_new(NULL, FALSE); - g_signal_connect(river, "changed", G_CALLBACK(print_json), NULL); - g_main_loop_run(loop); - } else { - print_json(river); - g_object_unref(river); - } -} diff --git a/src/meson.build b/src/meson.build deleted file mode 100644 index 647cc87..0000000 --- a/src/meson.build +++ /dev/null @@ -1,70 +0,0 @@ -srcs = files( - 'river.c', - 'river-output.c', - 'wayland-source.c', -) - -deps = [ - dependency('gobject-2.0'), - dependency('gio-2.0'), - dependency('wayland-client'), - dependency('json-glib-1.0'), -] - -astal_river_lib = library( - 'astal-river', - sources : srcs + client_protocol_srcs, - include_directories : astal_river_inc, - dependencies : deps, - version : meson.project_version(), - install : true -) - -libastal_river = declare_dependency( - link_with : astal_river_lib, - include_directories : astal_river_inc) - -astal_river_executable = executable( - 'astal-river', - files('astal-river.c'), - dependencies : [ - dependency('gobject-2.0'), - dependency('gio-2.0'), - dependency('json-glib-1.0'), - libastal_river - ], - install : true) - -pkg_config_name = 'astal-river-' + lib_so_version - -if get_option('introspection') - gir = gnome.generate_gir( - astal_river_lib, - sources : srcs + astal_river_headers, - nsversion : '0.1', - namespace : 'AstalRiver', - symbol_prefix : 'astal_river', - identifier_prefix : 'AstalRiver', - includes : ['GObject-2.0', 'Gio-2.0'], - header : 'astal-river.h', - export_packages : pkg_config_name, - install : true - ) - - if get_option('vapi') - gnome.generate_vapi( - pkg_config_name, - sources : [gir[0]], - packages : ['gobject-2.0', 'gio-2.0'], - install : true) - endif -endif - -pkg_config.generate( - name : 'astal-river', - version : meson.project_version(), - libraries : [astal_river_lib], - filebase : pkg_config_name, - subdirs : 'astal', - description : 'astal riverentication module', - url : 'https://github.com/astal-sh/river') diff --git a/src/river-output.c b/src/river-output.c deleted file mode 100644 index 6317db1..0000000 --- a/src/river-output.c +++ /dev/null @@ -1,343 +0,0 @@ -#include - -#include "river-private.h" -#include "river-status-unstable-v1-client.h" - -struct _AstalRiverOutput { - GObject parent_instance; - guint focused_tags; - guint occupied_tags; - guint urgent_tags; - gchar* layout_name; - gchar* focused_view; - guint id; - gchar* name; -}; - -typedef struct { - struct zriver_status_manager_v1* river_status_manager; - struct zriver_output_status_v1* river_output_status; - struct wl_display* wl_display; - struct wl_output* wl_output; -} AstalRiverOutputPrivate; - -G_DEFINE_FINAL_TYPE_WITH_PRIVATE(AstalRiverOutput, astal_river_output, G_TYPE_OBJECT); - -typedef enum { - ASTAL_RIVER_OUTPUT_PROP_FOCUSED_TAGS = 1, - ASTAL_RIVER_OUTPUT_PROP_OCCUPIED_TAGS, - ASTAL_RIVER_OUTPUT_PROP_URGENT_TAGS, - ASTAL_RIVER_OUTPUT_PROP_LAYOUT_NAME, - ASTAL_RIVER_OUTPUT_PROP_NAME, - ASTAL_RIVER_OUTPUT_PROP_FOCUSED_VIEW, - ASTAL_RIVER_OUTPUT_PROP_ID, - ASTAL_RIVER_OUTPUT_N_PROPERTIES -} AstalRiverOutputProperties; - -typedef enum { - ASTAL_RIVER_OUTPUT_SIGNAL_CHANGED, - ASTAL_RIVER_OUTPUT_N_SIGNALS -} AstalRiverOutputSignals; - -static guint astal_river_output_signals[ASTAL_RIVER_OUTPUT_N_SIGNALS] = { - 0, -}; - -static GParamSpec* astal_river_output_properties[ASTAL_RIVER_OUTPUT_N_PROPERTIES] = { - NULL, -}; - -/** - * astal_river_output_get_nid - * @self: the AstalRiverOutput object - * - * Returns: the id of the underlying wl_output object - */ -guint astal_river_output_get_id(AstalRiverOutput* self) { return self->id; } - -/** - * astal_river_output_get_name - * @self: the AstalRiverOutput object - * - * Returns: (transfer none) (nullable): the name of the output - */ -gchar* astal_river_output_get_name(AstalRiverOutput* self) { return self->name; } - -/** - * astal_river_output_get_layout_name - * @self: the AstalRiverOutput object - * - * Returns: (transfer none) (nullable): the currently used layout name of the output - */ -gchar* astal_river_output_get_layout_name(AstalRiverOutput* self) { return self->layout_name; } - -/** - * astal_river_output_get_focused_view - * @self: the AstalRiverOutput object - * - * Returns: (transfer none) (nullable): the focused view on the output - */ -gchar* astal_river_output_get_focused_view(AstalRiverOutput* self) { return self->focused_view; } - -void astal_river_output_set_focused_view(AstalRiverOutput* self, const gchar* focused_view) { - g_free(self->focused_view); - self->focused_view = g_strdup(focused_view); - g_object_notify(G_OBJECT(self), "focused-view"); - g_signal_emit(self, astal_river_output_signals[ASTAL_RIVER_OUTPUT_SIGNAL_CHANGED], 0); -} - -/** - * astal_river_output_get_focused_tags - * @self: the AstalRiverOutput object - * - * Returns: the focused tags of the output - */ -guint astal_river_output_get_focused_tags(AstalRiverOutput* self) { return self->focused_tags; } - -/** - * astal_river_output_get_urgent_tags - * @self: the AstalRiverOutput object - * - * Returns: the urgent tags of the output - */ -guint astal_river_output_get_urgent_tags(AstalRiverOutput* self) { return self->urgent_tags; } - -/** - * astal_river_output_get_occupied_tags - * @self: the AstalRiverOutput object - * - * Returns: the occupied tags of the output - */ -guint astal_river_output_get_occupied_tags(AstalRiverOutput* self) { return self->occupied_tags; } - -struct wl_output* astal_river_output_get_wl_output(AstalRiverOutput* self) { - AstalRiverOutputPrivate* priv = astal_river_output_get_instance_private(self); - return priv->wl_output; -} - -static void astal_river_output_get_property(GObject* object, guint property_id, GValue* value, - GParamSpec* pspec) { - AstalRiverOutput* self = ASTAL_RIVER_OUTPUT(object); - - switch (property_id) { - case ASTAL_RIVER_OUTPUT_PROP_FOCUSED_TAGS: - g_value_set_uint(value, self->focused_tags); - break; - case ASTAL_RIVER_OUTPUT_PROP_OCCUPIED_TAGS: - g_value_set_uint(value, self->occupied_tags); - break; - case ASTAL_RIVER_OUTPUT_PROP_URGENT_TAGS: - g_value_set_uint(value, self->urgent_tags); - break; - case ASTAL_RIVER_OUTPUT_PROP_ID: - g_value_set_uint(value, self->id); - break; - case ASTAL_RIVER_OUTPUT_PROP_NAME: - g_value_set_string(value, self->name); - break; - case ASTAL_RIVER_OUTPUT_PROP_LAYOUT_NAME: - g_value_set_string(value, self->layout_name); - break; - case ASTAL_RIVER_OUTPUT_PROP_FOCUSED_VIEW: - g_value_set_string(value, self->focused_view); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec); - break; - } -} - -static void astal_river_output_set_property(GObject* object, guint property_id, const GValue* value, - GParamSpec* pspec) { - AstalRiverOutput* self = ASTAL_RIVER_OUTPUT(object); - - switch (property_id) { - case ASTAL_RIVER_OUTPUT_PROP_ID: - self->id = g_value_get_uint(value); - g_object_notify(G_OBJECT(self), "id"); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec); - break; - } - g_signal_emit(self, astal_river_output_signals[ASTAL_RIVER_OUTPUT_SIGNAL_CHANGED], 0); -} - -static void noop() {} - -static void astal_river_handle_focused_tags(void* data, struct zriver_output_status_v1* status, - uint32_t tags) { - AstalRiverOutput* self = ASTAL_RIVER_OUTPUT(data); - self->focused_tags = tags; - g_object_notify(G_OBJECT(self), "focused-tags"); - g_signal_emit(self, astal_river_output_signals[ASTAL_RIVER_OUTPUT_SIGNAL_CHANGED], 0); -} - -static void astal_river_handle_urgent_tags(void* data, struct zriver_output_status_v1* status, - uint32_t tags) { - AstalRiverOutput* self = ASTAL_RIVER_OUTPUT(data); - self->urgent_tags = tags; - g_object_notify(G_OBJECT(self), "urgent-tags"); - g_signal_emit(self, astal_river_output_signals[ASTAL_RIVER_OUTPUT_SIGNAL_CHANGED], 0); -} - -static void astal_river_handle_occupied_tags(void* data, struct zriver_output_status_v1* status, - struct wl_array* view_tags) { - AstalRiverOutput* self = ASTAL_RIVER_OUTPUT(data); - guint tags = 0; - guint* view; - wl_array_for_each(view, view_tags) { tags |= *view; } - - self->occupied_tags = tags; - g_object_notify(G_OBJECT(self), "occupied-tags"); - g_signal_emit(self, astal_river_output_signals[ASTAL_RIVER_OUTPUT_SIGNAL_CHANGED], 0); -} - -static void astal_river_handle_layout_name(void* data, struct zriver_output_status_v1* status, - const char* name) { - AstalRiverOutput* self = ASTAL_RIVER_OUTPUT(data); - g_free(self->layout_name); - self->layout_name = g_strdup(name); - g_object_notify(G_OBJECT(self), "layout-name"); - g_signal_emit(self, astal_river_output_signals[ASTAL_RIVER_OUTPUT_SIGNAL_CHANGED], 0); -} - -static void astal_river_handle_layout_name_clear(void* data, - struct zriver_output_status_v1* status) { - AstalRiverOutput* self = ASTAL_RIVER_OUTPUT(data); - g_free(self->layout_name); - self->layout_name = NULL; - g_object_notify(G_OBJECT(self), "layout-name"); - g_signal_emit(self, astal_river_output_signals[ASTAL_RIVER_OUTPUT_SIGNAL_CHANGED], 0); -} - -static void astal_river_wl_output_handle_name(void* data, struct wl_output* output, - const char* name) { - AstalRiverOutput* self = ASTAL_RIVER_OUTPUT(data); - g_free(self->name); - self->name = g_strdup(name); - g_object_notify(G_OBJECT(self), "name"); - g_signal_emit(self, astal_river_output_signals[ASTAL_RIVER_OUTPUT_SIGNAL_CHANGED], 0); -} - -static const struct zriver_output_status_v1_listener output_status_listener = { - .focused_tags = astal_river_handle_focused_tags, - .view_tags = astal_river_handle_occupied_tags, - .urgent_tags = astal_river_handle_urgent_tags, - .layout_name = astal_river_handle_layout_name, - .layout_name_clear = astal_river_handle_layout_name_clear, -}; - -static const struct wl_output_listener wl_output_listener = { - .name = astal_river_wl_output_handle_name, - .geometry = noop, - .mode = noop, - .scale = noop, - .description = noop, - .done = noop, -}; - -static void astal_river_output_finalize(GObject* object) { - AstalRiverOutput* self = ASTAL_RIVER_OUTPUT(object); - AstalRiverOutputPrivate* priv = astal_river_output_get_instance_private(self); - - zriver_output_status_v1_destroy(priv->river_output_status); - wl_output_destroy(priv->wl_output); - - wl_display_roundtrip(priv->wl_display); - - g_free(self->layout_name); - g_free(self->name); - - G_OBJECT_CLASS(astal_river_output_parent_class)->finalize(object); -} - -static void astal_river_output_init(AstalRiverOutput* self) {} - -AstalRiverOutput* astal_river_output_new(guint id, struct wl_output* wl_output, - struct zriver_status_manager_v1* status_manager, - struct wl_display* wl_display) { - AstalRiverOutput* self = g_object_new(ASTAL_RIVER_TYPE_OUTPUT, NULL); - AstalRiverOutputPrivate* priv = astal_river_output_get_instance_private(self); - - self->id = id; - priv->wl_display = wl_display; - priv->wl_output = wl_output; - priv->river_status_manager = status_manager; - - priv->river_output_status = - zriver_status_manager_v1_get_river_output_status(priv->river_status_manager, wl_output); - - zriver_output_status_v1_add_listener(priv->river_output_status, &output_status_listener, self); - - wl_output_add_listener(wl_output, &wl_output_listener, self); - - wl_display_roundtrip(priv->wl_display); - - return self; -} - -static void astal_river_output_class_init(AstalRiverOutputClass* class) { - GObjectClass* object_class = G_OBJECT_CLASS(class); - object_class->get_property = astal_river_output_get_property; - object_class->set_property = astal_river_output_set_property; - object_class->finalize = astal_river_output_finalize; - /** - * AstalRiverOutput:focused-tags: - * - * The currently focused tags - */ - astal_river_output_properties[ASTAL_RIVER_OUTPUT_PROP_FOCUSED_TAGS] = g_param_spec_uint( - "focused-tags", "focused-tags", "currently focused tags", 0, INT_MAX, 0, G_PARAM_READABLE); - /** - * AstalRiverOutput:occupied-tags: - * - * The currently occupied tags - */ - astal_river_output_properties[ASTAL_RIVER_OUTPUT_PROP_OCCUPIED_TAGS] = - g_param_spec_uint("occupied-tags", "occupied-tags", "currently occupied tags", 0, INT_MAX, - 0, G_PARAM_READABLE); - /** - * AstalRiverOutput:urgent-tags: - * - * The currently tags marked as urgent - */ - astal_river_output_properties[ASTAL_RIVER_OUTPUT_PROP_URGENT_TAGS] = g_param_spec_uint( - "urgent-tags", "urgent-tags", "currently urgent tags", 0, INT_MAX, 0, G_PARAM_READABLE); - /** - * AstalRiverOutput:id: - * - * The id of the underlying wl_output object - */ - astal_river_output_properties[ASTAL_RIVER_OUTPUT_PROP_ID] = - g_param_spec_uint("id", "id", "id of the output object", 0, INT_MAX, 0, G_PARAM_READABLE); - /** - * AstalRiverOutput:layout-name: - * - * The name of active layout - */ - astal_river_output_properties[ASTAL_RIVER_OUTPUT_PROP_LAYOUT_NAME] = g_param_spec_string( - "layout-name", "layout-name", "name of the current layout", NULL, G_PARAM_READABLE); - /** - * AstalRiverOutput:name: - * - * The name of this output - */ - astal_river_output_properties[ASTAL_RIVER_OUTPUT_PROP_NAME] = - g_param_spec_string("name", "name", "name of the output", NULL, G_PARAM_READABLE); - /** - * AstalRiverOutput:focused-view: - * - * The name of currently focused view - */ - astal_river_output_properties[ASTAL_RIVER_OUTPUT_PROP_FOCUSED_VIEW] = - g_param_spec_string("focused-view", "focused-view", - "name of last focused view on this output", NULL, G_PARAM_READABLE); - - g_object_class_install_properties(object_class, ASTAL_RIVER_OUTPUT_N_PROPERTIES, - astal_river_output_properties); - - astal_river_output_signals[ASTAL_RIVER_OUTPUT_SIGNAL_CHANGED] = - g_signal_new("changed", G_TYPE_FROM_CLASS(class), G_SIGNAL_RUN_FIRST, 0, NULL, NULL, NULL, - G_TYPE_NONE, 0); -} diff --git a/src/river.c b/src/river.c deleted file mode 100644 index a735898..0000000 --- a/src/river.c +++ /dev/null @@ -1,504 +0,0 @@ -#include -#include -#include -#include - -#include "river-control-unstable-v1-client.h" -#include "river-private.h" -#include "river-status-unstable-v1-client.h" -#include "wayland-source.h" - -struct _AstalRiverRiver { - GObject parent_instance; - GList* outputs; - gchar* focused_output; - gchar* focused_view; - gchar* mode; -}; - -typedef struct { - GHashTable* signal_ids; - gboolean init; - struct wl_registry* wl_registry; - struct wl_seat* seat; - struct wl_display* display; - WLSource* wl_source; - struct zriver_status_manager_v1* river_status_manager; - struct zriver_control_v1* river_control; - struct zriver_seat_status_v1* river_seat_status; -} AstalRiverRiverPrivate; - -static JsonSerializableIface* serializable_iface = NULL; -static void astal_river_river_initable_iface_init(GInitableIface* iface); -static void astal_river_river_json_serializable_iface_init(JsonSerializableIface* g_iface); - -G_DEFINE_TYPE_WITH_CODE(AstalRiverRiver, astal_river_river, G_TYPE_OBJECT, - G_ADD_PRIVATE(AstalRiverRiver) G_IMPLEMENT_INTERFACE( - G_TYPE_INITABLE, astal_river_river_initable_iface_init) - G_IMPLEMENT_INTERFACE(JSON_TYPE_SERIALIZABLE, - astal_river_river_json_serializable_iface_init)) - -typedef enum { - ASTAL_RIVER_RIVER_PROP_FOCUSED_OUTPUT = 1, - ASTAL_RIVER_RIVER_PROP_FOCUSED_VIEW, - ASTAL_RIVER_RIVER_PROP_MODE, - ASTAL_RIVER_RIVER_PROP_OUTPUTS, - ASTAL_RIVER_RIVER_N_PROPERTIES -} AstalRiverRiverProperties; - -typedef enum { - ASTAL_RIVER_RIVER_SIGNAL_CHANGED, - ASTAL_RIVER_RIVER_SIGNAL_OUTPUT_ADDED, - ASTAL_RIVER_RIVER_SIGNAL_OUTPUT_REMOVED, - ASTAL_RIVER_RIVER_N_SIGNALS -} AstalRiverRiverSignals; - -static guint astal_river_river_signals[ASTAL_RIVER_RIVER_N_SIGNALS] = { - 0, -}; -static GParamSpec* astal_river_river_properties[ASTAL_RIVER_RIVER_N_PROPERTIES] = { - NULL, -}; - -static void reemit_changed(AstalRiverOutput* output, AstalRiverRiver* self) { - g_signal_emit(self, astal_river_river_signals[ASTAL_RIVER_RIVER_SIGNAL_CHANGED], 0); -} - -static AstalRiverOutput* find_output_by_id(AstalRiverRiver* self, uint32_t id) { - GList* output = self->outputs; - while (output != NULL) { - AstalRiverOutput* river_output = output->data; - if (astal_river_output_get_id(river_output) == id) return river_output; - output = output->next; - } - return NULL; -} - -static AstalRiverOutput* find_output_by_output(AstalRiverRiver* self, struct wl_output* wl_output) { - GList* output = self->outputs; - while (output != NULL) { - AstalRiverOutput* river_output = output->data; - if (astal_river_output_get_wl_output(river_output) == wl_output) return river_output; - output = output->next; - } - return NULL; -} - -static AstalRiverOutput* find_output_by_name(AstalRiverRiver* self, gchar* name) { - GList* output = self->outputs; - while (output != NULL) { - AstalRiverOutput* river_output = output->data; - if (strcmp(astal_river_output_get_name(river_output), name) == 0) return river_output; - output = output->next; - } - return NULL; -} - -/** - * astal_river_river_get_outputs - * @self: the AstalRiverRiver object - * - * Returns: (transfer none) (element-type AstalRiver.Output): a list of all outputs - * - */ -GList* astal_river_river_get_outputs(AstalRiverRiver* self) { return self->outputs; } - -/** - * astal_river_river_get_output - * @self: the AstalRiverRiver object - * @name: the name of the output - * - * Returns: (transfer none) (nullable): the output with the given name or null - */ -AstalRiverOutput* astal_river_river_get_output(AstalRiverRiver* self, gchar* name) { - return find_output_by_name(self, name); -} - -/** - * astal_river_river_get_focused_view - * @self: the AstalRiverOutput object - * - * Returns: (transfer none) (nullable): the currently focused view - */ -gchar* astal_river_river_get_focused_view(AstalRiverRiver* self) { return self->focused_view; } - -/** - * astal_river_river_get_focused_output - * @self: the AstalRiverOutput object - * - * Returns: (transfer none) (nullable): the name of the currently focused output - */ -gchar* astal_river_river_get_focused_output(AstalRiverRiver* self) { return self->focused_output; } - -/** - * astal_river_river_get_mode - * @self: the AstalRiverOutput object - * - * Returns: (transfer none) (nullable): the currently active mode - */ -gchar* astal_river_river_get_mode(AstalRiverRiver* self) { return self->mode; } - -static void astal_river_river_get_property(GObject* object, guint property_id, GValue* value, - GParamSpec* pspec) { - AstalRiverRiver* self = ASTAL_RIVER_RIVER(object); - - switch (property_id) { - case ASTAL_RIVER_RIVER_PROP_MODE: - g_value_set_string(value, self->mode); - break; - case ASTAL_RIVER_RIVER_PROP_FOCUSED_VIEW: - g_value_set_string(value, self->focused_view); - break; - case ASTAL_RIVER_RIVER_PROP_FOCUSED_OUTPUT: - g_value_set_string(value, self->focused_output); - break; - case ASTAL_RIVER_RIVER_PROP_OUTPUTS: - g_value_set_pointer(value, self->outputs); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec); - break; - } -} - -static JsonNode* astal_river_river_serialize_property(JsonSerializable* serializable, - const gchar* name, const GValue* value, - GParamSpec* pspec) { - JsonNode* retval = NULL; - if (strcmp(name, "outputs") == 0) { - JsonArray* outputs = json_array_new(); - retval = json_node_new(JSON_NODE_ARRAY); - GList* output = g_value_get_pointer(value); - while (output != NULL) { - AstalRiverOutput* river_output = output->data; - json_array_add_element(outputs, json_gobject_serialize(G_OBJECT(river_output))); - output = output->next; - } - json_node_take_array(retval, outputs); - } else - retval = serializable_iface->serialize_property(serializable, name, value, pspec); - - return retval; -} - -static void noop() {} - -static void river_seat_status_handle_focused_output(void* data, - struct zriver_seat_status_v1* seat_status, - struct wl_output* focused_output) { - AstalRiverRiver* self = ASTAL_RIVER_RIVER(data); - g_free(self->focused_output); - AstalRiverOutput* output = find_output_by_output(self, focused_output); - if (output == NULL) return; - self->focused_output = g_strdup(astal_river_output_get_name(output)); - g_object_notify(G_OBJECT(self), "focused-output"); - g_signal_emit(self, astal_river_river_signals[ASTAL_RIVER_RIVER_SIGNAL_CHANGED], 0); -} - -static void river_seat_status_handle_focused_view(void* data, - struct zriver_seat_status_v1* seat_status, - const char* focused_view) { - AstalRiverRiver* self = ASTAL_RIVER_RIVER(data); - g_free(self->focused_view); - self->focused_view = g_strdup(focused_view); - AstalRiverOutput* output = find_output_by_name(self, self->focused_output); - astal_river_output_set_focused_view(output, focused_view); - g_object_notify(G_OBJECT(self), "focused-view"); - g_signal_emit(self, astal_river_river_signals[ASTAL_RIVER_RIVER_SIGNAL_CHANGED], 0); -} - -static void river_seat_status_handle_mode(void* data, struct zriver_seat_status_v1* seat_status, - const char* mode) { - AstalRiverRiver* self = ASTAL_RIVER_RIVER(data); - g_free(self->mode); - self->mode = g_strdup(mode); - g_object_notify(G_OBJECT(self), "mode"); - g_signal_emit(self, astal_river_river_signals[ASTAL_RIVER_RIVER_SIGNAL_CHANGED], 0); -} - -static const struct zriver_seat_status_v1_listener river_seat_status_listener = { - .focused_output = river_seat_status_handle_focused_output, - .unfocused_output = noop, - .focused_view = river_seat_status_handle_focused_view, - .mode = river_seat_status_handle_mode, -}; - -static void global_registry_handler(void* data, struct wl_registry* registry, uint32_t id, - const char* interface, uint32_t version) { - AstalRiverRiver* self = ASTAL_RIVER_RIVER(data); - AstalRiverRiverPrivate* priv = astal_river_river_get_instance_private(self); - if (strcmp(interface, wl_output_interface.name) == 0) { - if (priv->river_status_manager == NULL) return; - struct wl_output* wl_out = wl_registry_bind(registry, id, &wl_output_interface, 4); - AstalRiverOutput* output = - astal_river_output_new(id, wl_out, priv->river_status_manager, priv->display); - - self->outputs = g_list_append(self->outputs, output); - g_object_notify(G_OBJECT(self), "outputs"); - g_signal_emit(G_OBJECT(self), - astal_river_river_signals[ASTAL_RIVER_RIVER_SIGNAL_OUTPUT_ADDED], 0, - astal_river_output_get_name(output)); - g_signal_emit(self, astal_river_river_signals[ASTAL_RIVER_RIVER_SIGNAL_CHANGED], 0); - - guint signal_id = g_signal_connect(output, "changed", G_CALLBACK(reemit_changed), self); - g_hash_table_insert(priv->signal_ids, GUINT_TO_POINTER(id), GUINT_TO_POINTER(signal_id)); - } else if (strcmp(interface, wl_seat_interface.name) == 0) { - priv->seat = wl_registry_bind(registry, id, &wl_seat_interface, 4); - } else if (strcmp(interface, zriver_status_manager_v1_interface.name) == 0) { - priv->river_status_manager = - wl_registry_bind(registry, id, &zriver_status_manager_v1_interface, 4); - } else if (strcmp(interface, zriver_control_v1_interface.name) == 0) { - priv->river_control = wl_registry_bind(registry, id, &zriver_control_v1_interface, 1); - } -} - -static void astal_river_river_callback_success(void* data, struct zriver_command_callback_v1* cb, - const char* msg) { - AstalRiverCommandCallback callback = (AstalRiverCommandCallback)(data); - callback(TRUE, msg); -} - -static void astal_river_river_callback_failure(void* data, struct zriver_command_callback_v1* cb, - const char* msg) { - AstalRiverCommandCallback callback = (AstalRiverCommandCallback)(data); - callback(FALSE, msg); -} - -const struct zriver_command_callback_v1_listener cb_listener = { - .success = astal_river_river_callback_success, .failure = astal_river_river_callback_failure}; - -/** - * astal_river_river_run_command_async: - * @self: the AstalRiverRiver object - * @length: the length of the cmd array - * @cmd: (array length=length): the command to execute - * @callback: (scope async) (nullable): the callback to invoke. - * - * Calls the given callback with the provided parameters. - */ -void astal_river_river_run_command_async(AstalRiverRiver* self, gint length, const gchar** cmd, - AstalRiverCommandCallback callback) { - AstalRiverRiverPrivate* priv = astal_river_river_get_instance_private(self); - - for (gint i = 0; i < length; ++i) { - zriver_control_v1_add_argument(priv->river_control, cmd[i]); - } - - struct zriver_command_callback_v1* cb = - zriver_control_v1_run_command(priv->river_control, priv->seat); - if (callback != NULL) zriver_command_callback_v1_add_listener(cb, &cb_listener, callback); -} - -static void global_registry_remover(void* data, struct wl_registry* registry, uint32_t id) { - AstalRiverRiver* self = ASTAL_RIVER_RIVER(data); - AstalRiverRiverPrivate* priv = astal_river_river_get_instance_private(self); - AstalRiverOutput* output = find_output_by_id(self, id); - if (output != NULL) { - guint signal_id = - GPOINTER_TO_UINT(g_hash_table_lookup(priv->signal_ids, GUINT_TO_POINTER(id))); - g_hash_table_remove(priv->signal_ids, GUINT_TO_POINTER(id)); - g_signal_handler_disconnect(output, signal_id); - g_signal_emit(G_OBJECT(self), - astal_river_river_signals[ASTAL_RIVER_RIVER_SIGNAL_OUTPUT_ADDED], 0, - astal_river_output_get_name(output)); - self->outputs = g_list_remove(self->outputs, output); - g_object_notify(G_OBJECT(self), "outputs"); - g_object_unref(output); - return; - } - g_signal_emit(self, astal_river_river_signals[ASTAL_RIVER_RIVER_SIGNAL_CHANGED], 0); -} - -static const struct wl_registry_listener registry_listener = {global_registry_handler, - global_registry_remover}; - -static void astal_river_river_json_serializable_iface_init(JsonSerializableIface* iface) { - iface->serialize_property = astal_river_river_serialize_property; - serializable_iface = g_type_default_interface_peek(JSON_TYPE_SERIALIZABLE); -} - -static gboolean astal_river_river_initable_init(GInitable* initable, GCancellable* cancellable, - GError** error) { - AstalRiverRiver* self = ASTAL_RIVER_RIVER(initable); - AstalRiverRiverPrivate* priv = astal_river_river_get_instance_private(self); - - if (priv->init) return TRUE; - - priv->wl_source = wl_source_new(NULL, NULL); - - if (priv->wl_source == NULL) { - g_set_error_literal(error, G_IO_ERROR, G_IO_ERROR_FAILED, - "Can not connect to wayland display"); - return FALSE; - } - - priv->display = wl_source_get_display(priv->wl_source); - - priv->wl_registry = wl_display_get_registry(priv->display); - wl_registry_add_listener(priv->wl_registry, ®istry_listener, self); - - wl_display_roundtrip(priv->display); - - if (priv->river_status_manager == NULL) { - g_set_error_literal(error, G_IO_ERROR, G_IO_ERROR_FAILED, - "Can not connect river status protocol"); - return FALSE; - } - - priv->river_seat_status = - zriver_status_manager_v1_get_river_seat_status(priv->river_status_manager, priv->seat); - zriver_seat_status_v1_add_listener(priv->river_seat_status, &river_seat_status_listener, self); - - wl_display_roundtrip(priv->display); - - priv->init = TRUE; - return TRUE; -} - -static void astal_river_river_constructed(GObject* object) { - astal_river_river_initable_init(G_INITABLE(object), NULL, NULL); -} - -static void astal_river_river_initable_iface_init(GInitableIface* iface) { - iface->init = astal_river_river_initable_init; -} - -static void astal_river_river_init(AstalRiverRiver* self) { - AstalRiverRiverPrivate* priv = astal_river_river_get_instance_private(self); - self->outputs = NULL; - priv->init = FALSE; - priv->seat = NULL; - priv->display = NULL; - priv->river_status_manager = NULL; - priv->signal_ids = g_hash_table_new(g_direct_hash, g_direct_equal); -} - -/** - * astal_river_river_new - * - * creates a new River object. It is recommended to use the get_default() method - * instead of this method. - * - * Returns: (nullable): a newly created connection to river - */ -AstalRiverRiver* astal_river_river_new() { - return g_initable_new(ASTAL_RIVER_TYPE_RIVER, NULL, NULL, NULL); -} - -static void disconnect_signal(gpointer key, gpointer value, gpointer user_data) { - AstalRiverRiver* self = ASTAL_RIVER_RIVER(user_data); - - AstalRiverOutput* output = find_output_by_id(self, GPOINTER_TO_UINT(key)); - g_signal_handler_disconnect(output, GPOINTER_TO_UINT(value)); -} - -/** - * astal_river_river_get_default - * - * Returns: (nullable) (transfer none): gets the default River object. - */ -AstalRiverRiver* astal_river_river_get_default() { - static AstalRiverRiver* self = NULL; - - if (self == NULL) self = astal_river_river_new(); - - return self; -} - -/** - * astal_river_get_default - * - * Returns: (nullable) (transfer none): gets the default River object. - */ -AstalRiverRiver* astal_river_get_default() { return astal_river_river_get_default(); } - -static void astal_river_river_finalize(GObject* object) { - AstalRiverRiver* self = ASTAL_RIVER_RIVER(object); - AstalRiverRiverPrivate* priv = astal_river_river_get_instance_private(self); - - g_hash_table_foreach(priv->signal_ids, disconnect_signal, self); - g_hash_table_destroy(priv->signal_ids); - - if (priv->display != NULL) wl_display_roundtrip(priv->display); - - g_clear_list(&self->outputs, g_object_unref); - self->outputs = NULL; - - if (priv->wl_registry != NULL) wl_registry_destroy(priv->wl_registry); - if (priv->river_status_manager != NULL) - zriver_status_manager_v1_destroy(priv->river_status_manager); - if (priv->river_seat_status != NULL) zriver_seat_status_v1_destroy(priv->river_seat_status); - if (priv->seat != NULL) wl_seat_destroy(priv->seat); - if (priv->display != NULL) wl_display_flush(priv->display); - - if (priv->wl_source != NULL) wl_source_free(priv->wl_source); - - g_free(self->focused_view); - g_free(self->focused_output); - g_free(self->mode); - - G_OBJECT_CLASS(astal_river_river_parent_class)->finalize(object); -} - -static void astal_river_river_class_init(AstalRiverRiverClass* class) { - GObjectClass* object_class = G_OBJECT_CLASS(class); - object_class->get_property = astal_river_river_get_property; - object_class->finalize = astal_river_river_finalize; - object_class->constructed = astal_river_river_constructed; - - /** - * AstalRiverRiver:mode: - * - * The currently active mode - */ - astal_river_river_properties[ASTAL_RIVER_RIVER_PROP_MODE] = - g_param_spec_string("mode", "mode", "currently active mode", NULL, G_PARAM_READABLE); - /** - * AstalRiverRiver:focused-view: - * - * The name of the currently focused view - */ - astal_river_river_properties[ASTAL_RIVER_RIVER_PROP_FOCUSED_VIEW] = g_param_spec_string( - "focused-view", "focused-view", "currently focused view", NULL, G_PARAM_READABLE); - /** - * AstalRiverRiver:focused-output: - * - * The name of the currently focused output - */ - astal_river_river_properties[ASTAL_RIVER_RIVER_PROP_FOCUSED_OUTPUT] = g_param_spec_string( - "focused-output", "focused-output", "currently focused-output", NULL, G_PARAM_READABLE); - /** - * AstalRiverRiver:outputs: (type GList(AstalRiverOutput)) - * - * A list of AstalRiverOutput objects - */ - astal_river_river_properties[ASTAL_RIVER_RIVER_PROP_OUTPUTS] = - g_param_spec_pointer("outputs", "outputs", "a list of all outputs", G_PARAM_READABLE); - - g_object_class_install_properties(object_class, ASTAL_RIVER_RIVER_N_PROPERTIES, - astal_river_river_properties); - /** - * AstalRiverRiver::output-added: - * @river: the object which received the signal. - * @output: the name of the added output - * - * This signal is emitted when a new output was connected - */ - astal_river_river_signals[ASTAL_RIVER_RIVER_SIGNAL_OUTPUT_ADDED] = - g_signal_new("output-added", G_TYPE_FROM_CLASS(class), G_SIGNAL_RUN_FIRST, 0, NULL, NULL, - NULL, G_TYPE_NONE, 1, G_TYPE_STRING); - /** - * AstalRiverRiver::output-removed: - * @river: the object which received the signal. - * @output: the name of the removed output - * - * This signal is emitted when a new output was disconnected - */ - astal_river_river_signals[ASTAL_RIVER_RIVER_SIGNAL_OUTPUT_REMOVED] = - g_signal_new("output-removed", G_TYPE_FROM_CLASS(class), G_SIGNAL_RUN_FIRST, 0, NULL, NULL, - NULL, G_TYPE_NONE, 1, G_TYPE_STRING); - - astal_river_river_signals[ASTAL_RIVER_RIVER_SIGNAL_CHANGED] = - g_signal_new("changed", G_TYPE_FROM_CLASS(class), G_SIGNAL_RUN_FIRST, 0, NULL, NULL, NULL, - G_TYPE_NONE, 0); -} diff --git a/src/wayland-source.c b/src/wayland-source.c deleted file mode 100644 index 875c32c..0000000 --- a/src/wayland-source.c +++ /dev/null @@ -1,104 +0,0 @@ - -#include "wayland-source.h" - -#include -#include -#include - -struct _WLSource { - GSource source; - struct wl_display *display; - gpointer fd; - int error; -}; - -static gboolean wl_source_prepare(GSource *source, gint *timeout) { - WLSource *self = (WLSource *)source; - - *timeout = 0; - if (wl_display_prepare_read(self->display) != 0) - return TRUE; - else if (wl_display_flush(self->display) < 0) { - self->error = errno; - return TRUE; - } - *timeout = -1; - return FALSE; -} - -static gboolean wl_source_check(GSource *source) { - WLSource *self = (WLSource *)source; - - if (self->error > 0) return TRUE; - - GIOCondition revents; - revents = g_source_query_unix_fd(source, self->fd); - - if (revents & G_IO_IN) { - if (wl_display_read_events(self->display) < 0) self->error = errno; - } else - wl_display_cancel_read(self->display); - - return revents > 0; -} - -static gboolean wl_source_dispatch(GSource *source, GSourceFunc callback, gpointer user_data) { - WLSource *self = (WLSource *)source; - GIOCondition revents; - - revents = g_source_query_unix_fd(source, self->fd); - if ((self->error > 0) || (revents & (G_IO_ERR | G_IO_HUP))) { - errno = self->error; - self->error = 0; - if (callback != NULL) return callback(user_data); - return G_SOURCE_REMOVE; - } - - if (wl_display_dispatch_pending(self->display) < 0) { - if (callback != NULL) return callback(user_data); - return G_SOURCE_REMOVE; - } - - return G_SOURCE_CONTINUE; -} - -static void wl_source_finalize(GSource *source) { - WLSource *self = (WLSource *)source; - wl_display_disconnect(self->display); -} - -static GSourceFuncs wl_source_funcs = { - .prepare = wl_source_prepare, - .check = wl_source_check, - .dispatch = wl_source_dispatch, - .finalize = wl_source_finalize, -}; - -WLSource *wl_source_new() { - struct wl_display *display; - WLSource *self; - GSource *source; - - display = wl_display_connect(NULL); - if (display == NULL) return NULL; - - source = g_source_new(&wl_source_funcs, sizeof(WLSource)); - self = (WLSource *)source; - self->display = display; - - self->fd = g_source_add_unix_fd(source, wl_display_get_fd(self->display), - G_IO_IN | G_IO_ERR | G_IO_HUP); - - g_source_attach(source, NULL); - - return self; -} - -void wl_source_free(WLSource *self) { - GSource *source = (GSource *)self; - g_return_if_fail(source != NULL); - g_source_destroy(source); - g_source_unref(source); -} - -struct wl_display *wl_source_get_display(WLSource *self) { return self->display; } diff --git a/version b/version deleted file mode 100644 index 6e8bf73..0000000 --- a/version +++ /dev/null @@ -1 +0,0 @@ -0.1.0 -- cgit v1.2.3