From 04315afbfe16ecd55291ddb3d7308cf54b45917f Mon Sep 17 00:00:00 2001 From: kolunmi Date: Mon, 6 Feb 2023 14:46:53 -0700 Subject: [PATCH] initial commit --- .gitignore | 8 + LICENSE | 773 +++++++++++++++++++ Makefile | 56 ++ README.md | 23 + dwlb.c | 888 ++++++++++++++++++++++ protocols/wlr-layer-shell-unstable-v1.xml | 390 ++++++++++ screenshot.png | Bin 0 -> 17632 bytes utf8.h | 55 ++ 8 files changed, 2193 insertions(+) create mode 100644 .gitignore create mode 100644 LICENSE create mode 100644 Makefile create mode 100644 README.md create mode 100644 dwlb.c create mode 100644 protocols/wlr-layer-shell-unstable-v1.xml create mode 100644 screenshot.png create mode 100644 utf8.h diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..00ca3ac --- /dev/null +++ b/.gitignore @@ -0,0 +1,8 @@ +dwlb +*.o +wlr-layer-shell-unstable-v1-protocol.c +wlr-layer-shell-unstable-v1-protocol.h +xdg-shell-protocol.c +xdg-shell-protocol.h +xdg-output-protocol.c +xdg-output-protocol.h diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..1ab54b3 --- /dev/null +++ b/LICENSE @@ -0,0 +1,773 @@ +dwlb - bar for dwl + +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. + +---- + +Portions of the code labeled [dzen] are derived from the original dzen2 and +used under the following license: + +MIT/X Consortium License + +(C)opyright MMVII Robert Manea + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the "Software"), +to deal in the Software without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +DEALINGS IN THE SOFTWARE. + +---- + +Portions of the code labeled [wlroots] are derived from wlroots and used under +the following license: + +Copyright (c) 2017, 2018 Drew DeVault +Copyright (c) 2014 Jari Vetoniemi + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies +of the Software, and to permit persons to whom the Software is furnished to do +so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. + +---- + +Portions of the code labeled [swaywm] are derived from sway and are used under +the following license: + +Copyright (c) 2016-2017 Drew DeVault + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies +of the Software, and to permit persons to whom the Software is furnished to do +so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. + +---- + +Portions of the code labeled [wayland-book] are derived from example code found +in The Wayland Protocol by Drew DeVault (https://wayland-book.com/). The book +is available under CC-BY-SA 4.0, and the author indicates that code examples may +be used under CC0. + +---- + + 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/Makefile b/Makefile new file mode 100644 index 0000000..a6de8c8 --- /dev/null +++ b/Makefile @@ -0,0 +1,56 @@ +BINS = dwlb + +PREFIX ?= /usr/local +CFLAGS += -Wall -Wextra -Wno-unused-parameter -Wno-format-truncation -g + +all: $(BINS) + +clean: + $(RM) $(BINS) $(addsuffix .o,$(BINS)) + +install: all + install -D -t $(PREFIX)/bin $(BINS) + +WAYLAND_PROTOCOLS=$(shell pkg-config --variable=pkgdatadir wayland-protocols) +WAYLAND_SCANNER=$(shell pkg-config --variable=wayland_scanner wayland-scanner) + +xdg-shell-protocol.h: + $(WAYLAND_SCANNER) client-header \ + $(WAYLAND_PROTOCOLS)/stable/xdg-shell/xdg-shell.xml $@ + +xdg-shell-protocol.c: + $(WAYLAND_SCANNER) private-code \ + $(WAYLAND_PROTOCOLS)/stable/xdg-shell/xdg-shell.xml $@ + +xdg-shell-protocol.o: xdg-shell-protocol.h + +xdg-output-protocol.h: + $(WAYLAND_SCANNER) client-header \ + $(WAYLAND_PROTOCOLS)/unstable/xdg-output/xdg-output-unstable-v1.xml $@ + +xdg-output-protocol.c: + $(WAYLAND_SCANNER) private-code \ + $(WAYLAND_PROTOCOLS)/unstable/xdg-output/xdg-output-unstable-v1.xml $@ + +xdg-output-protocol.o: xdg-output-protocol.h + +wlr-layer-shell-unstable-v1-protocol.h: + $(WAYLAND_SCANNER) client-header \ + protocols/wlr-layer-shell-unstable-v1.xml $@ + +wlr-layer-shell-unstable-v1-protocol.c: + $(WAYLAND_SCANNER) private-code \ + protocols/wlr-layer-shell-unstable-v1.xml $@ + +wlr-layer-shell-unstable-v1-protocol.o: wlr-layer-shell-unstable-v1-protocol.h + +dwlb.o: utf8.h xdg-shell-protocol.h xdg-output-protocol.h wlr-layer-shell-unstable-v1-protocol.h + +# Protocol dependencies +dwlb: xdg-shell-protocol.o xdg-output-protocol.o wlr-layer-shell-unstable-v1-protocol.o + +# Library dependencies +dwlb: CFLAGS+=$(shell pkg-config --cflags wayland-client fcft pixman-1) +dwlb: LDLIBS+=$(shell pkg-config --libs wayland-client fcft pixman-1) -lrt + +.PHONY: all clean install diff --git a/README.md b/README.md new file mode 100644 index 0000000..7e00f2c --- /dev/null +++ b/README.md @@ -0,0 +1,23 @@ +# dwlb + +![screenshot](/screenshot.png "screenshot") + +dwlb is a simple bar for [dwl](https://github.com/djpohly/dwl). It is a modified version of [dtao](https://github.com/djpohly/dtao). + +## Installation +```bash +git clone https://github.com/kolunmi/dwlb +cd dwlb +make install +``` + +## Usage +```bash +dwl -s dwlb +``` + +## Status Text +The `-status` option sends status text to existing instances of dwlb. This takes two arguments: a zxdg_output_v1 name (alternatively "all" to affect all outputs or "selected" for the current output) and the text itself. + +## Other Options +Run `dwlb -h` for a full list of options. diff --git a/dwlb.c b/dwlb.c new file mode 100644 index 0000000..43817d1 --- /dev/null +++ b/dwlb.c @@ -0,0 +1,888 @@ +#define _GNU_SOURCE +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "utf8.h" +#include "wlr-layer-shell-unstable-v1-protocol.h" +#include "xdg-shell-protocol.h" +#include "xdg-output-protocol.h" + +#define DIE(fmt, ...) \ + do { \ + fprintf(stderr, fmt "\n", ##__VA_ARGS__); \ + exit(1); \ + } while (0) + +#define EDIE(fmt, ...) \ + DIE(fmt ": %s", ##__VA_ARGS__, strerror(errno)); + +#define CLEANUP_DIE(why) \ + do { \ + cleanup(); \ + DIE(why); \ + } while(0) + +#define CLEANUP_EDIE(why) \ + do { \ + cleanup(); \ + EDIE(why); \ + } while(0) + +#define MIN(a, b) \ + ((a) < (b) ? (a) : (b)) +#define MAX(a, b) \ + ((a) > (b) ? (a) : (b)) + +#define PROGRAM "dwlb" +#define VERSION "0.1" +#define USAGE \ + "usage: dwlb [OPTIONS]\n" \ + " -status [OUTPUT] [TEXT] send status text to dwlb\n" \ + " -hide-vacant-tags do not display empty and inactive tags\n" \ + " -font [FONT] specify a font\n" \ + " -text-color [COLOR] specify text color\n" \ + " -active-color [COLOR] specify color to indicate active tags or monitors\n" \ + " -inactive-color [COLOR] specify color to indicate inactive tags or monitors\n" \ + " -urg-text-color [COLOR] specify text color on urgent tags\n" \ + " -urg-bg-color [COLOR] specify color of urgent tags\n" \ + " -v get version information\n" \ + " -h view this help text\n" + +typedef struct Bar Bar; +struct Bar { + struct zxdg_output_v1 *xdg_output; + struct wl_output *wl_output; + struct wl_surface *wl_surface; + struct zwlr_layer_surface_v1 *layer_surface; + + uint32_t registry_name; + char *xdg_output_name; + + uint32_t width; + uint32_t height; + uint32_t textpadding; + uint32_t stride; + uint32_t bufsize; + + uint32_t mtags; + uint32_t ctags; + uint32_t urg; + int selmon; + char *layout; + char *title; + char status[256]; + + bool redraw; + + Bar *prev, *next; +}; + +static int sock_fd; +static char socketdir[256]; +static char *socketpath = NULL; +static char sockbuf[512]; +static char stdinbuf[BUFSIZ]; + +static struct wl_display *display; +static struct wl_compositor *compositor; +static struct wl_shm *shm; +static struct zwlr_layer_shell_v1 *layer_shell; +static struct zxdg_output_manager_v1 *output_manager; + +static uint32_t height; +static uint32_t textpadding; + +static bool run_display = true; +static bool ready = false; +static bool hide_vacant = false; +static Bar *bars = NULL; + +static char *tags[9] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" }; +static struct fcft_font *font; +static pixman_color_t activecolor = { .red = 0x0000, .green = 0x5555, .blue = 0x7777, .alpha = 0xffff, }; +static pixman_color_t inactivecolor = { .red = 0x2222, .green = 0x2222, .blue = 0x2222, .alpha = 0xffff, }; +static pixman_color_t textcolor = { .red = 0xeeee, .green = 0xeeee, .blue = 0xeeee, .alpha = 0xffff, }; +static pixman_color_t urgbgcolor = { .red = 0xeeee, .green = 0xeeee, .blue = 0xeeee, .alpha = 0xffff, }; +static pixman_color_t urgtextcolor = { .red = 2222, .green = 0x2222, .blue = 0x2222, .alpha = 0xffff, }; + +static void +wl_buffer_release(void *data, struct wl_buffer *wl_buffer) +{ + /* Sent by the compositor when it's no longer using this buffer */ + wl_buffer_destroy(wl_buffer); +} + +static const struct wl_buffer_listener wl_buffer_listener = { + .release = wl_buffer_release, +}; + +/* Shared memory support function adapted from [wayland-book] */ +static int +allocate_shm_file(size_t size) +{ + int fd = memfd_create("surface", MFD_CLOEXEC); + if (fd < 0) + return -1; + int ret; + do { + ret = ftruncate(fd, size); + } while (ret < 0 && errno == EINTR); + if (ret < 0) { + close(fd); + return -1; + } + return fd; +} + +static uint32_t +draw_text(char *text, + uint32_t xpos, + uint32_t ypos, + pixman_image_t *foreground, + pixman_image_t *background, + pixman_color_t *fgcolor, + pixman_color_t *bgcolor, + uint32_t height, + uint32_t padding) +{ + uint32_t codepoint; + uint32_t state = UTF8_ACCEPT; + uint32_t ixpos = xpos; + uint32_t lastcp = 0; + pixman_image_t *fgfill = pixman_image_create_solid_fill(fgcolor); + + if (!*text) + return 0; + + xpos += padding; + + for (char *p = text; *p; p++) { + /* Returns nonzero if more bytes are needed */ + if (utf8decode(&state, &codepoint, *p)) + continue; + + /* Turn off subpixel rendering, which complicates things when + * mixed with alpha channels */ + const struct fcft_glyph *glyph = fcft_rasterize_char_utf32(font, codepoint, FCFT_SUBPIXEL_NONE); + if (!glyph) + continue; + + /* Adjust x position based on kerning with previous glyph */ + long x_kern = 0; + if (lastcp) + fcft_kerning(font, lastcp, codepoint, &x_kern, NULL); + xpos += x_kern; + lastcp = codepoint; + + /* Detect and handle pre-rendered glyphs (e.g. emoji) */ + if (pixman_image_get_format(glyph->pix) == PIXMAN_a8r8g8b8) { + /* Only the alpha channel of the mask is used, so we can + * use fgfill here to blend prerendered glyphs with the + * same opacity */ + pixman_image_composite32( + PIXMAN_OP_OVER, glyph->pix, fgfill, foreground, 0, 0, 0, 0, + xpos + glyph->x, ypos - glyph->y, glyph->width, glyph->height); + } else { + /* Applying the foreground color here would mess up + * component alphas for subpixel-rendered text, so we + * apply it when blending. */ + pixman_image_composite32( + PIXMAN_OP_OVER, fgfill, glyph->pix, foreground, 0, 0, 0, 0, + xpos + glyph->x, ypos - glyph->y, glyph->width, glyph->height); + } + + /* increment pen position */ + xpos += glyph->advance.x; + ypos += glyph->advance.y; + } + + if (state != UTF8_ACCEPT) + fprintf(stderr, "malformed UTF-8 sequence\n"); + + xpos += padding; + + if (background && bgcolor) + pixman_image_fill_boxes(PIXMAN_OP_OVER, background, + bgcolor, 1, &(pixman_box32_t){ + .x1 = ixpos, + .x2 = xpos, + .y1 = 0, + .y2 = height + }); + + pixman_image_unref(fgfill); + + return xpos; +} + +static int +draw_frame(Bar *b) +{ + /* Allocate buffer to be attached to the surface */ + int fd = allocate_shm_file(b->bufsize); + if (fd == -1) + return -1; + + uint32_t *data = mmap(NULL, b->bufsize, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0); + if (data == MAP_FAILED) { + close(fd); + return -1; + } + + struct wl_shm_pool *pool = wl_shm_create_pool(shm, fd, b->bufsize); + struct wl_buffer *buffer = wl_shm_pool_create_buffer(pool, 0, b->width, b->height, b->stride, WL_SHM_FORMAT_ARGB8888); + wl_buffer_add_listener(buffer, &wl_buffer_listener, NULL); + wl_shm_pool_destroy(pool); + close(fd); + + /* Pixman image corresponding to main buffer */ + pixman_image_t *bar = pixman_image_create_bits(PIXMAN_a8r8g8b8, b->width, b->height, data, b->width * 4); + + /* Fill bar with background color */ + pixman_image_fill_boxes(PIXMAN_OP_SRC, bar, b->selmon ? &activecolor : &inactivecolor, 1, + &(pixman_box32_t) {.x1 = 0, .x2 = b->width, .y1 = 0, .y2 = b->height}); + + /* Text background and foreground layers */ + pixman_image_t *background_left = pixman_image_create_bits(PIXMAN_a8r8g8b8, b->width, b->height, NULL, b->width * 4); + pixman_image_t *foreground_left = pixman_image_create_bits(PIXMAN_a8r8g8b8, b->width, b->height, NULL, b->width * 4); + pixman_image_t *background_right = pixman_image_create_bits(PIXMAN_a8r8g8b8, b->width, b->height, NULL, b->width * 4); + pixman_image_t *foreground_right = pixman_image_create_bits(PIXMAN_a8r8g8b8, b->width, b->height, NULL, b->width * 4); + pixman_image_t *foreground_title = pixman_image_create_bits(PIXMAN_a8r8g8b8, b->width, b->height, NULL, b->width * 4); + + /* Draw on images */ + uint32_t xpos_left = 0; + uint32_t xpos_right; + uint32_t ypos = (b->height + font->ascent - font->descent) / 2; + + uint32_t boxs = font->height / 9; + uint32_t boxw = font->height / 6 + 2; + + for (uint32_t i = 0; i < 9; i++) { + bool active = b->mtags & 1 << i; + bool occupied = b->ctags & 1 << i; + bool urgent = b->urg & 1 << i; + + if (hide_vacant && !active && !occupied && !urgent) + continue; + + if (!hide_vacant && occupied) + pixman_image_fill_boxes(PIXMAN_OP_SRC, foreground_left, + &textcolor, 1, &(pixman_box32_t){ + .x1 = xpos_left + boxs, + .x2 = xpos_left + boxs + boxw, + .y1 = boxs, + .y2 = boxs + boxw + }); + + if (urgent) + xpos_left = draw_text(tags[i], xpos_left, ypos, foreground_left, background_left, + &urgtextcolor, &urgbgcolor, b->height, b->textpadding); + else + xpos_left = draw_text(tags[i], xpos_left, ypos, foreground_left, background_left, + &textcolor, active ? &activecolor : &inactivecolor, b->height, b->textpadding); + } + xpos_left = draw_text(b->layout, xpos_left, ypos, foreground_left, background_left, + &textcolor, &inactivecolor, b->height, b->textpadding); + + xpos_right = draw_text(b->status, 0, ypos, foreground_right, background_right, + &textcolor, &inactivecolor, b->height, b->textpadding); + if (xpos_right > b->width) + xpos_right = b->width; + + draw_text(b->title, 0, ypos, foreground_title, NULL, + &textcolor, NULL, b->height, b->textpadding); + + /* Draw background and foreground on bar */ + pixman_image_composite32(PIXMAN_OP_OVER, foreground_title, NULL, bar, 0, 0, 0, 0, xpos_left, 0, b->width, b->height); + pixman_image_composite32(PIXMAN_OP_OVER, background_right, NULL, bar, 0, 0, 0, 0, b->width - xpos_right, 0, b->width, b->height); + pixman_image_composite32(PIXMAN_OP_OVER, foreground_right, NULL, bar, 0, 0, 0, 0, b->width - xpos_right, 0, b->width, b->height); + pixman_image_composite32(PIXMAN_OP_OVER, background_left, NULL, bar, 0, 0, 0, 0, 0, 0, b->width, b->height); + pixman_image_composite32(PIXMAN_OP_OVER, foreground_left, NULL, bar, 0, 0, 0, 0, 0, 0, b->width, b->height); + + pixman_image_unref(foreground_left); + pixman_image_unref(background_left); + pixman_image_unref(foreground_right); + pixman_image_unref(background_right); + pixman_image_unref(foreground_title); + pixman_image_unref(bar); + + munmap(data, b->bufsize); + + wl_surface_attach(b->wl_surface, buffer, 0, 0); + wl_surface_damage_buffer(b->wl_surface, 0, 0, b->width, b->height); + wl_surface_commit(b->wl_surface); + + return 0; +} + +/* Layer-surface setup adapted from layer-shell example in [wlroots] */ +static void +layer_surface_configure(void *data, struct zwlr_layer_surface_v1 *surface, + uint32_t serial, uint32_t w, uint32_t h) +{ + Bar *b = (Bar *)data; + + b->width = w; + b->height = h; + b->stride = b->width * 4; + b->bufsize = b->stride * b->height; + + zwlr_layer_surface_v1_set_exclusive_zone(b->layer_surface, b->height); + zwlr_layer_surface_v1_ack_configure(surface, serial); + + draw_frame(b); +} + +static void +layer_surface_closed(void *data, struct zwlr_layer_surface_v1 *surface) +{ + Bar *b = (Bar *)data; + + zwlr_layer_surface_v1_destroy(surface); + wl_surface_destroy(b->wl_surface); + run_display = false; +} + +static void +cleanup(void) +{ + if (socketpath) + unlink(socketpath); +} + +static struct zwlr_layer_surface_v1_listener layer_surface_listener = { + .configure = layer_surface_configure, + .closed = layer_surface_closed, +}; + +static void +output_name(void *data, struct zxdg_output_v1 *xdg_output, const char *name) +{ + Bar *b = (Bar *)data; + + /* Is this necessary? */ + if (b->xdg_output_name) + free(b->xdg_output_name); + if (!(b->xdg_output_name = strdup(name))) + CLEANUP_EDIE("strdup"); +} + +static void +output_logical_position(void *data, struct zxdg_output_v1 *xdg_output, + int32_t x, int32_t y) +{ +} + +static void +output_logical_size(void *data, struct zxdg_output_v1 *xdg_output, + int32_t width, int32_t height) +{ +} + +static void +output_done(void *data, struct zxdg_output_v1 *xdg_output) +{ +} + +static void +output_description(void *data, struct zxdg_output_v1 *xdg_output, + const char *description) +{ +} + +static struct zxdg_output_v1_listener output_listener = { + .name = output_name, + .description = output_description, + .done = output_done, + .logical_position = output_logical_position, + .logical_size = output_logical_size +}; + +static void +setup_bar(Bar *b) +{ + b->height = height; + b->textpadding = textpadding; + + b->layout = "[]="; + b->title = ""; + + b->xdg_output = zxdg_output_manager_v1_get_xdg_output(output_manager, b->wl_output); + if (!b->xdg_output) + CLEANUP_DIE("Could not create xdg_output"); + zxdg_output_v1_add_listener(b->xdg_output, &output_listener, b); + + b->wl_surface = wl_compositor_create_surface(compositor); + if (!b->wl_surface) + CLEANUP_DIE("Could not create wl_surface"); + + b->layer_surface = zwlr_layer_shell_v1_get_layer_surface(layer_shell, b->wl_surface, b->wl_output, + ZWLR_LAYER_SHELL_V1_LAYER_BOTTOM, PROGRAM); + if (!b->layer_surface) + CLEANUP_DIE("Could not create layer_surface"); + zwlr_layer_surface_v1_add_listener(b->layer_surface, &layer_surface_listener, b); + + zwlr_layer_surface_v1_set_size(b->layer_surface, 0, b->height); + zwlr_layer_surface_v1_set_anchor(b->layer_surface, + ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP + | ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT + | ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT); + wl_surface_commit(b->wl_surface); +} + +static void +handle_global(void *data, struct wl_registry *registry, + uint32_t name, const char *interface, uint32_t version) +{ + if (strcmp(interface, wl_compositor_interface.name) == 0) { + compositor = wl_registry_bind(registry, name, &wl_compositor_interface, 4); + } else if (strcmp(interface, wl_shm_interface.name) == 0) { + shm = wl_registry_bind(registry, name, &wl_shm_interface, 1); + } else if (strcmp(interface, wl_output_interface.name) == 0) { + Bar *b = malloc(sizeof(Bar)); + if (!b) + CLEANUP_EDIE("malloc"); + memset(b, 0, sizeof(Bar)); + b->registry_name = name; + b->wl_output = wl_registry_bind(registry, name, &wl_output_interface, 1); + DL_APPEND(bars, b); + if (ready) + setup_bar(b); + } else if (strcmp(interface, zwlr_layer_shell_v1_interface.name) == 0) { + layer_shell = wl_registry_bind(registry, name, &zwlr_layer_shell_v1_interface, 1); + } else if (strcmp(interface, zxdg_output_manager_v1_interface.name) == 0) { + output_manager = wl_registry_bind(registry, name, &zxdg_output_manager_v1_interface, 2); + } +} + +static void +teardown_bar(Bar *b) +{ + zxdg_output_v1_destroy(b->xdg_output); + wl_surface_destroy(b->wl_surface); + zwlr_layer_surface_v1_destroy(b->layer_surface); + if (b->xdg_output_name) + free(b->xdg_output_name); + free(b); +} + +static void +handle_global_remove(void *data, struct wl_registry *registry, uint32_t name) +{ + Bar *b; + DL_FOREACH(bars, b) + if (b->registry_name == name) + break; + + if (!b) + return; + + DL_DELETE(bars, b); + teardown_bar(b); +} + + +static const struct wl_registry_listener registry_listener = { + .global = handle_global, + .global_remove = handle_global_remove +}; + +static int +advance_word(char **beg, char **end) +{ + for (*beg = *end; **beg == ' '; (*beg)++); + for (*end = *beg; **end && **end != ' '; (*end)++); + if (!**end) + /* last word */ + return -1; + **end = '\0'; + (*end)++; + return 0; +} + +#define ADVANCE() advance_word(&wordbeg, &wordend) +#define ADVANCE_IF_LAST_CONT() if (ADVANCE() == -1) continue +#define ADVANCE_IF_LAST_BREAK() if (ADVANCE() == -1) break + +static void +read_stdin(void) +{ + ssize_t len = read(STDIN_FILENO, stdinbuf, sizeof stdinbuf); + if (len == -1) + CLEANUP_EDIE("read"); + if (len == 0) { + run_display = 0; + return; + } + + char *end = (char *)&stdinbuf + len; + char *linebeg, *lineend; + char *wordbeg, *wordend; + + for (linebeg = (char *)&stdinbuf; + (lineend = memchr(linebeg, '\n', end - linebeg)); + linebeg = lineend) { + *lineend++ = '\0'; + wordend = linebeg; + + ADVANCE_IF_LAST_CONT(); + + Bar *b; + DL_FOREACH(bars, b) + if (b->xdg_output_name) + if (!strcmp(wordbeg, b->xdg_output_name)) + break; + if (!b) + continue; + + ADVANCE_IF_LAST_CONT(); + + if (!strcmp(wordbeg, "tags")) { + ADVANCE_IF_LAST_CONT(); + b->ctags = atoi(wordbeg); + ADVANCE_IF_LAST_CONT(); + b->mtags = atoi(wordbeg); + ADVANCE_IF_LAST_CONT(); + /* skip sel */ + ADVANCE(); + b->urg = atoi(wordbeg); + b->redraw = true; + } else if (!strcmp(wordbeg, "layout")) { + b->layout = wordend; + b->redraw = true; + } else if (!strcmp(wordbeg, "title")) { + b->title = wordend; + b->redraw = true; + } else if (!strcmp(wordbeg, "selmon")) { + ADVANCE(); + b->selmon = atoi(wordbeg); + b->redraw = true; + } + } +} + +static void +read_socket(void) +{ + int cli_fd; + if ((cli_fd = accept(sock_fd, NULL, 0)) == -1) + CLEANUP_EDIE("accept"); + ssize_t len = recv(cli_fd, sockbuf, sizeof sockbuf - 1, 0); + if (len == -1) + CLEANUP_EDIE("recv"); + close(cli_fd); + if (len == 0) + return; + sockbuf[len] = '\0'; + + do { + char *wordbeg, *wordend; + wordend = (char *)&sockbuf; + + ADVANCE_IF_LAST_BREAK(); + + Bar *b; + bool all = false; + + if (!strcmp(wordbeg, "all")) { + all = true; + } else if (!strcmp(wordbeg, "selected")) { + DL_FOREACH(bars, b) + if (b->selmon) + break; + } else { + DL_FOREACH(bars, b) + if (b->xdg_output_name) + if (!strcmp(wordbeg, b->xdg_output_name)) + break; + } + + if (!all && !b) + break; + + ADVANCE_IF_LAST_BREAK(); + + if (!strcmp(wordbeg, "status")) { + if (all) { + DL_FOREACH(bars, b) { + snprintf(b->status, sizeof b->status, "%s", wordend); + b->redraw = true; + } + } else { + snprintf(b->status, sizeof b->status, "%s", wordend); + b->redraw = true; + } + } + } while (0); +} + +static void +event_loop(void) +{ + int wl_fd = wl_display_get_fd(display); + + while (run_display) { + fd_set rfds; + FD_ZERO(&rfds); + FD_SET(STDIN_FILENO, &rfds); + FD_SET(sock_fd, &rfds); + FD_SET(wl_fd, &rfds); + + /* Does this need to be inside the loop? */ + wl_display_flush(display); + + if (select(MAX(sock_fd, wl_fd) + 1, &rfds, NULL, NULL, NULL) == -1) + continue; + + if (FD_ISSET(STDIN_FILENO, &rfds)) + read_stdin(); + + if (FD_ISSET(sock_fd, &rfds)) + read_socket(); + + if (FD_ISSET(wl_fd, &rfds)) + if (wl_display_dispatch(display) == -1) + break; + + Bar *b; + DL_FOREACH(bars, b) { + if (b->redraw) { + draw_frame(b); + b->redraw = false; + } + } + } +} + +static void +client_send_command(struct sockaddr_un *sock_address, + const char *output, + const char *cmd, + const char *data) +{ + DIR *dir; + if (!(dir = opendir(socketdir))) + EDIE("Could not open directory '%s'", socketdir); + + if (data) + snprintf(sockbuf, sizeof sockbuf, "%s %s %s", output, cmd, data); + else + snprintf(sockbuf, sizeof sockbuf, "%s %s", output, cmd); + + size_t len = strlen(sockbuf); + + struct dirent *de; + bool newfd = true; + while ((de = readdir(dir))) { + if (!strncmp(de->d_name, "dwlb-", 5)) { + if (newfd) + if ((sock_fd = socket(AF_UNIX, SOCK_STREAM, 1)) == -1) + EDIE("socket"); + snprintf(sock_address->sun_path, sizeof sock_address->sun_path, "%s/%s", socketdir, de->d_name); + if (connect(sock_fd, (struct sockaddr *) sock_address, sizeof(*sock_address)) == -1) { + newfd = false; + continue; + } + + if (send(sock_fd, sockbuf, len, 0) == -1) + fprintf(stderr, "Could not send status data to '%s'\n", sock_address->sun_path); + close(sock_fd); + newfd = true; + } + } + + closedir(dir); +} + +/* Color parsing logic adapted from [sway] */ +static int +parse_color(const char *str, pixman_color_t *clr) +{ + if (*str == '#') + str++; + int len = strlen(str); + + // Disallows "0x" prefix that strtoul would ignore + if ((len != 6 && len != 8) || !isxdigit(str[0]) || !isxdigit(str[1])) + return -1; + + char *ptr; + uint32_t parsed = strtoul(str, &ptr, 16); + if (*ptr) + return -1; + + if (len == 8) { + clr->alpha = (parsed & 0xff) * 0x101; + parsed >>= 8; + } else { + clr->alpha = 0xffff; + } + clr->red = ((parsed >> 16) & 0xff) * 0x101; + clr->green = ((parsed >> 8) & 0xff) * 0x101; + clr->blue = ((parsed >> 0) & 0xff) * 0x101; + return 0; +} + +void +sig_handler(int sig) +{ + if (sig == SIGINT || sig == SIGHUP || sig == SIGTERM) + run_display = false; +} + +int +main(int argc, char **argv) +{ + char *fontstr = ""; + char *xdgruntimedir; + struct sockaddr_un sock_address; + + /* Establish socket directory */ + if (!(xdgruntimedir = getenv("XDG_RUNTIME_DIR"))) + DIE("Could not retrieve XDG_RUNTIME_DIR"); + snprintf(socketdir, sizeof socketdir, "%s/dwlb", xdgruntimedir); + if (mkdir(socketdir, S_IRWXU) == -1) + if (errno != EEXIST) + EDIE("Could not create directory '%s'", socketdir); + sock_address.sun_family = AF_UNIX; + + /* Parse options */ + for (int i = 1; i < argc; i++) { + if (!strcmp(argv[i], "-status")) { + if (++i + 1 >= argc) + DIE("Option -status requires two arguments"); + client_send_command(&sock_address, argv[i], "status", argv[i + 1]); + return 0; + } else if (!strcmp(argv[i], "-hide-vacant-tags")) { + hide_vacant = true; + } else if (!strcmp(argv[i], "-font")) { + if (++i >= argc) + DIE("Option -font requires an argument"); + fontstr = argv[i]; + } else if (!strcmp(argv[i], "-text-color")) { + if (++i >= argc) + DIE("Option -text-color requires an argument"); + if (parse_color(argv[i], &textcolor) == -1) + DIE("malformed color string"); + } else if (!strcmp(argv[i], "-active-color")) { + if (++i >= argc) + DIE("Option -active-color requires an argument"); + if (parse_color(argv[i], &activecolor) == -1) + DIE("malformed color string"); + } else if (!strcmp(argv[i], "-inactive-color")) { + if (++i >= argc) + DIE("Option -inactive-color requires an argument"); + if (parse_color(argv[i], &inactivecolor) == -1) + DIE("malformed color string"); + } else if (!strcmp(argv[i], "-urg-text-color")) { + if (++i >= argc) + DIE("Option -urg-text-color requires an argument"); + if (parse_color(argv[i], &urgtextcolor) == -1) + DIE("malformed color string"); + } else if (!strcmp(argv[i], "-urg-bg-color")) { + if (++i >= argc) + DIE("Option -urg-bg-color requires an argument"); + if (parse_color(argv[i], &urgbgcolor) == -1) + DIE("malformed color string"); + } else if (!strcmp(argv[i], "-v")) { + fprintf(stderr, PROGRAM " " VERSION "\n"); + return 0; + } else if (!strcmp(argv[i], "-h")) { + fprintf(stderr, USAGE); + return 0; + } else { + DIE("Option '%s' not recognized\n" USAGE, argv[i]); + } + } + + /* Set up display and protocols */ + display = wl_display_connect(NULL); + if (!display) + DIE("Failed to create display"); + + struct wl_registry *registry = wl_display_get_registry(display); + wl_registry_add_listener(registry, ®istry_listener, NULL); + wl_display_roundtrip(display); + if (!compositor || !shm || !layer_shell || !output_manager) + DIE("Compositor does not support all needed protocols"); + + /* Load selected font */ + fcft_init(FCFT_LOG_COLORIZE_AUTO, 0, FCFT_LOG_CLASS_ERROR); + fcft_set_scaling_filter(FCFT_SCALING_FILTER_LANCZOS3); + font = fcft_from_name(1, (const char *[]) {fontstr}, NULL); + if (!font) + DIE("Could not load font"); + textpadding = font->height / 2; + height = font->ascent + font->descent; + + /* Setup bars */ + Bar *b; + DL_FOREACH(bars, b) + setup_bar(b); + wl_display_roundtrip(display); + + /* Set up socket */ + for (uint32_t i = 0;; i++) { + if ((sock_fd = socket(AF_UNIX, SOCK_STREAM, 1)) == -1) + DIE("socket"); + snprintf(sock_address.sun_path, sizeof sock_address.sun_path, "%s/dwlb-%i", socketdir, i); + if (connect(sock_fd, (struct sockaddr *) &sock_address, sizeof sock_address) == -1) + break; + close(sock_fd); + } + + socketpath = (char *)&sock_address.sun_path; + unlink(socketpath); + if (bind(sock_fd, (struct sockaddr *) &sock_address, sizeof sock_address) == -1) + CLEANUP_EDIE("bind"); + if (listen(sock_fd, SOMAXCONN) == -1) + CLEANUP_EDIE("listen"); + fcntl(sock_fd, F_SETFD, FD_CLOEXEC | fcntl(sock_fd, F_GETFD)); + + /* Set up signals */ + signal(SIGINT, sig_handler); + signal(SIGHUP, sig_handler); + signal(SIGTERM, sig_handler); + signal(SIGPIPE, SIG_IGN); + + /* Run */ + ready = true; + event_loop(); + + /* Clean everything up */ + close(sock_fd); + unlink(socketpath); + + zwlr_layer_shell_v1_destroy(layer_shell); + zxdg_output_manager_v1_destroy(output_manager); + + Bar *t; + DL_FOREACH_SAFE(bars, b, t) + teardown_bar(b); + + fcft_destroy(font); + fcft_fini(); + + wl_shm_destroy(shm); + wl_compositor_destroy(compositor); + wl_registry_destroy(registry); + wl_display_disconnect(display); + + return 0; +} diff --git a/protocols/wlr-layer-shell-unstable-v1.xml b/protocols/wlr-layer-shell-unstable-v1.xml new file mode 100644 index 0000000..d62fd51 --- /dev/null +++ b/protocols/wlr-layer-shell-unstable-v1.xml @@ -0,0 +1,390 @@ + + + + Copyright © 2017 Drew DeVault + + Permission to use, copy, modify, distribute, and sell this + software and its documentation for any purpose is hereby granted + without fee, provided that the above copyright notice appear in + all copies and that both that copyright notice and this permission + notice appear in supporting documentation, and that the name of + the copyright holders not be used in advertising or publicity + pertaining to distribution of the software without specific, + written prior permission. The copyright holders make no + representations about the suitability of this software for any + purpose. It is provided "as is" without express or implied + warranty. + + THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS + SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND + FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY + SPECIAL, 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. + + + + + Clients can use this interface to assign the surface_layer role to + wl_surfaces. Such surfaces are assigned to a "layer" of the output and + rendered with a defined z-depth respective to each other. They may also be + anchored to the edges and corners of a screen and specify input handling + semantics. This interface should be suitable for the implementation of + many desktop shell components, and a broad number of other applications + that interact with the desktop. + + + + + Create a layer surface for an existing surface. This assigns the role of + layer_surface, or raises a protocol error if another role is already + assigned. + + Creating a layer surface from a wl_surface which has a buffer attached + or committed is a client error, and any attempts by a client to attach + or manipulate a buffer prior to the first layer_surface.configure call + must also be treated as errors. + + After creating a layer_surface object and setting it up, the client + must perform an initial commit without any buffer attached. + The compositor will reply with a layer_surface.configure event. + The client must acknowledge it and is then allowed to attach a buffer + to map the surface. + + You may pass NULL for output to allow the compositor to decide which + output to use. Generally this will be the one that the user most + recently interacted with. + + Clients can specify a namespace that defines the purpose of the layer + surface. + + + + + + + + + + + + + + + + + These values indicate which layers a surface can be rendered in. They + are ordered by z depth, bottom-most first. Traditional shell surfaces + will typically be rendered between the bottom and top layers. + Fullscreen shell surfaces are typically rendered at the top layer. + Multiple surfaces can share a single layer, and ordering within a + single layer is undefined. + + + + + + + + + + + + + This request indicates that the client will not use the layer_shell + object any more. Objects that have been created through this instance + are not affected. + + + + + + + An interface that may be implemented by a wl_surface, for surfaces that + are designed to be rendered as a layer of a stacked desktop-like + environment. + + Layer surface state (layer, size, anchor, exclusive zone, + margin, interactivity) is double-buffered, and will be applied at the + time wl_surface.commit of the corresponding wl_surface is called. + + Attaching a null buffer to a layer surface unmaps it. + + Unmapping a layer_surface means that the surface cannot be shown by the + compositor until it is explicitly mapped again. The layer_surface + returns to the state it had right after layer_shell.get_layer_surface. + The client can re-map the surface by performing a commit without any + buffer attached, waiting for a configure event and handling it as usual. + + + + + Sets the size of the surface in surface-local coordinates. The + compositor will display the surface centered with respect to its + anchors. + + If you pass 0 for either value, the compositor will assign it and + inform you of the assignment in the configure event. You must set your + anchor to opposite edges in the dimensions you omit; not doing so is a + protocol error. Both values are 0 by default. + + Size is double-buffered, see wl_surface.commit. + + + + + + + + Requests that the compositor anchor the surface to the specified edges + and corners. If two orthogonal edges are specified (e.g. 'top' and + 'left'), then the anchor point will be the intersection of the edges + (e.g. the top left corner of the output); otherwise the anchor point + will be centered on that edge, or in the center if none is specified. + + Anchor is double-buffered, see wl_surface.commit. + + + + + + + Requests that the compositor avoids occluding an area with other + surfaces. The compositor's use of this information is + implementation-dependent - do not assume that this region will not + actually be occluded. + + A positive value is only meaningful if the surface is anchored to one + edge or an edge and both perpendicular edges. If the surface is not + anchored, anchored to only two perpendicular edges (a corner), anchored + to only two parallel edges or anchored to all edges, a positive value + will be treated the same as zero. + + A positive zone is the distance from the edge in surface-local + coordinates to consider exclusive. + + Surfaces that do not wish to have an exclusive zone may instead specify + how they should interact with surfaces that do. If set to zero, the + surface indicates that it would like to be moved to avoid occluding + surfaces with a positive exclusive zone. If set to -1, the surface + indicates that it would not like to be moved to accommodate for other + surfaces, and the compositor should extend it all the way to the edges + it is anchored to. + + For example, a panel might set its exclusive zone to 10, so that + maximized shell surfaces are not shown on top of it. A notification + might set its exclusive zone to 0, so that it is moved to avoid + occluding the panel, but shell surfaces are shown underneath it. A + wallpaper or lock screen might set their exclusive zone to -1, so that + they stretch below or over the panel. + + The default value is 0. + + Exclusive zone is double-buffered, see wl_surface.commit. + + + + + + + Requests that the surface be placed some distance away from the anchor + point on the output, in surface-local coordinates. Setting this value + for edges you are not anchored to has no effect. + + The exclusive zone includes the margin. + + Margin is double-buffered, see wl_surface.commit. + + + + + + + + + + Types of keyboard interaction possible for layer shell surfaces. The + rationale for this is twofold: (1) some applications are not interested + in keyboard events and not allowing them to be focused can improve the + desktop experience; (2) some applications will want to take exclusive + keyboard focus. + + + + + This value indicates that this surface is not interested in keyboard + events and the compositor should never assign it the keyboard focus. + + This is the default value, set for newly created layer shell surfaces. + + This is useful for e.g. desktop widgets that display information or + only have interaction with non-keyboard input devices. + + + + + Request exclusive keyboard focus if this surface is above the shell surface layer. + + For the top and overlay layers, the seat will always give + exclusive keyboard focus to the top-most layer which has keyboard + interactivity set to exclusive. If this layer contains multiple + surfaces with keyboard interactivity set to exclusive, the compositor + determines the one receiving keyboard events in an implementation- + defined manner. In this case, no guarantee is made when this surface + will receive keyboard focus (if ever). + + For the bottom and background layers, the compositor is allowed to use + normal focus semantics. + + This setting is mainly intended for applications that need to ensure + they receive all keyboard events, such as a lock screen or a password + prompt. + + + + + This requests the compositor to allow this surface to be focused and + unfocused by the user in an implementation-defined manner. The user + should be able to unfocus this surface even regardless of the layer + it is on. + + Typically, the compositor will want to use its normal mechanism to + manage keyboard focus between layer shell surfaces with this setting + and regular toplevels on the desktop layer (e.g. click to focus). + Nevertheless, it is possible for a compositor to require a special + interaction to focus or unfocus layer shell surfaces (e.g. requiring + a click even if focus follows the mouse normally, or providing a + keybinding to switch focus between layers). + + This setting is mainly intended for desktop shell components (e.g. + panels) that allow keyboard interaction. Using this option can allow + implementing a desktop shell that can be fully usable without the + mouse. + + + + + + + Set how keyboard events are delivered to this surface. By default, + layer shell surfaces do not receive keyboard events; this request can + be used to change this. + + This setting is inherited by child surfaces set by the get_popup + request. + + Layer surfaces receive pointer, touch, and tablet events normally. If + you do not want to receive them, set the input region on your surface + to an empty region. + + Keyboard interactivity is double-buffered, see wl_surface.commit. + + + + + + + This assigns an xdg_popup's parent to this layer_surface. This popup + should have been created via xdg_surface::get_popup with the parent set + to NULL, and this request must be invoked before committing the popup's + initial state. + + See the documentation of xdg_popup for more details about what an + xdg_popup is and how it is used. + + + + + + + When a configure event is received, if a client commits the + surface in response to the configure event, then the client + must make an ack_configure request sometime before the commit + request, passing along the serial of the configure event. + + If the client receives multiple configure events before it + can respond to one, it only has to ack the last configure event. + + A client is not required to commit immediately after sending + an ack_configure request - it may even ack_configure several times + before its next surface commit. + + A client may send multiple ack_configure requests before committing, but + only the last request sent before a commit indicates which configure + event the client really is responding to. + + + + + + + This request destroys the layer surface. + + + + + + The configure event asks the client to resize its surface. + + Clients should arrange their surface for the new states, and then send + an ack_configure request with the serial sent in this configure event at + some point before committing the new surface. + + The client is free to dismiss all but the last configure event it + received. + + The width and height arguments specify the size of the window in + surface-local coordinates. + + The size is a hint, in the sense that the client is free to ignore it if + it doesn't resize, pick a smaller size (to satisfy aspect ratio or + resize in steps of NxM pixels). If the client picks a smaller size and + is anchored to two opposite anchors (e.g. 'top' and 'bottom'), the + surface will be centered on this axis. + + If the width or height arguments are zero, it means the client should + decide its own window dimension. + + + + + + + + + The closed event is sent by the compositor when the surface will no + longer be shown. The output may have been destroyed or the user may + have asked for it to be removed. Further changes to the surface will be + ignored. The client should destroy the resource after receiving this + event, and create a new surface if they so choose. + + + + + + + + + + + + + + + + + + + + + + Change the layer that the surface is rendered on. + + Layer is double-buffered, see wl_surface.commit. + + + + + diff --git a/screenshot.png b/screenshot.png new file mode 100644 index 0000000000000000000000000000000000000000..6e1b7613eab47ad4f2836dce772545f21eae12f6 GIT binary patch literal 17632 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 WKP%lp55J8-kr0s;&VBOi)&B>m8^O^4 literal 0 HcmV?d00001 diff --git a/utf8.h b/utf8.h new file mode 100644 index 0000000..c7db188 --- /dev/null +++ b/utf8.h @@ -0,0 +1,55 @@ +// Copyright (c) 2008-2009 Bjoern Hoehrmann +// See http://bjoern.hoehrmann.de/utf-8/decoder/dfa/ for details. + +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: + +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. + +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +// SOFTWARE. + +#include + +#define UTF8_ACCEPT 0 +#define UTF8_REJECT 1 + +static const uint8_t utf8d[] = { + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 00..1f + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 20..3f + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 40..5f + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 60..7f + 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9, // 80..9f + 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7, // a0..bf + 8,8,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, // c0..df + 0xa,0x3,0x3,0x3,0x3,0x3,0x3,0x3,0x3,0x3,0x3,0x3,0x3,0x4,0x3,0x3, // e0..ef + 0xb,0x6,0x6,0x6,0x5,0x8,0x8,0x8,0x8,0x8,0x8,0x8,0x8,0x8,0x8,0x8, // f0..ff + 0x0,0x1,0x2,0x3,0x5,0x8,0x7,0x1,0x1,0x1,0x4,0x6,0x1,0x1,0x1,0x1, // s0..s0 + 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,1,1,1,1,1,0,1,0,1,1,1,1,1,1, // s1..s2 + 1,2,1,1,1,1,1,2,1,2,1,1,1,1,1,1,1,1,1,1,1,1,1,2,1,1,1,1,1,1,1,1, // s3..s4 + 1,2,1,1,1,1,1,1,1,2,1,1,1,1,1,1,1,1,1,1,1,1,1,3,1,3,1,1,1,1,1,1, // s5..s6 + 1,3,1,1,1,1,1,3,1,3,1,1,1,1,1,1,1,3,1,1,1,1,1,1,1,1,1,1,1,1,1,1, // s7..s8 +}; + +static inline uint32_t +utf8decode(uint32_t *state, uint32_t *codep, uint8_t byte) +{ + uint32_t type = utf8d[byte]; + + *codep = (*state != UTF8_ACCEPT) ? + (byte & 0x3fu) | (*codep << 6) : + (0xff >> type) & (byte); + + *state = utf8d[256 + *state*16 + type]; + return *state; +}