cargo: Update dependencies

Update fontconfig
Update Cargo.lock
2022-12-04 13:58:14 +01:00 · 2022-05-02 11:21:47 +02:00 · 2022-01-16 23:16:30 +01:00 · 2022-01-15 18:40:38 +01:00 · 2022-01-14 00:39:23 +01:00 · 2022-01-14 00:38:02 +01:00
50 changed files with 6577 additions and 5459 deletions
@@ -0,0 +1,15 @@
 image: archlinux
 packages:
  - rust
  - libpulse
  - alsa-lib
  - fontconfig
 sources:
  - https://git.sr.ht/~kennylevinsen/wldash
 tasks:
  - rustfmt-check: |
      cd wldash
      cargo fmt -- --check
  - build: |
      cd wldash
      cargo build
@@ -0,0 +1,3 @@
 # These are supported funding model platforms
 liberapay: kennylevinsen
@@ -1 +1,2 @@
 /target
 **/*.rs.bk
@@ -1,40 +1,50 @@
 [package]
-name = "wldash2"
+name = "wldash"
-version = "0.1.0"
+version = "0.3.0"
 authors = ["Kenny Levinsen <kl@kl.wtf>"]
 edition = "2021"
 [profile.release]
 #debug = true
 lto = "fat"
 panic = "abort"
 opt-level = "z"
 [features]
 default = ["alsa-widget", "pulseaudio-widget", "yaml-cfg", "json-cfg"]
 damage_debug = []
 yaml-cfg = ["serde_yaml"]
 json-cfg = ["serde_json"]
 alsa-widget = ["alsa"]
 pulseaudio-widget = ["libpulse-binding"]
 [dependencies]
-wayland-client = { version = "0.30", features = ["calloop", "log"] }
+byteorder = "1.4"
-wayland-protocols = { version = "0.30", features = ["client", "unstable", "staging"] }
+bitflags = "1.3"
-wayland-protocols-wlr = { version = "0.1", features = ["client"] }
+dlib = "0.5"
-nix = "0.26" # 0.27 is breaking
+rusttype = "^0.9"
 memmap = "0.7"
 fontconfig = { version = "0.8.0", optional = true }
 rusttype = "0.9"
 # fontdue = "0.7"
 calloop = { version = "0.10" } # update breaks
 chrono = "0.4"
-
+nix = "0.26"
-walkdir = "2.4"
+memmap = "0.7"
-
+os_pipe = "1.1"
-unicode-segmentation = "1.10"
+wayland-client = { version = "0.29"}
 wayland-protocols = { version = "0.29", features = ["client", "unstable_protocols"] }
 dbus = "0.6"
 fuzzy-matcher = "0.3"
-shlex = "1.3"
+lazy_static = "1.4"
 xkbcommon = { version = "0.8", features = ["wayland"] }
 rcalc_lib = "1.0"
-
+rust-ini = "0.18"
-#alsa = { version = "0.7", optional = true }
+shlex = "1.1"
-dbus = "0.9"
+timerfd = "1.4.0"
-libpulse-binding = "2.28"
+walkdir = "2.3"
 itertools = "0.10"
 serde = { version = "1.0", features = ["derive"] }
-serde_yaml = "0.9"
+serde_json = { version = "1.0", optional = true }
-simd-json = "0.13"
+serde_yaml = { version = "0.9", optional = true }
 libpulse-binding = { version = "2.26", optional = true }
 alsa = { version = "0.7.0", optional = true }
 fontconfig = "0.6.0"
 unicode-segmentation = "1.10.0"
@@ -0,0 +1,674 @@
                    GNU GENERAL PUBLIC LICENSE
                       Version 3, 29 June 2007
 Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.
                            Preamble
  The GNU General Public License is a free, copyleft license for
 software and other kinds of works.
  The licenses for most software and other practical works are designed
 to take away your freedom to share and change the works.  By contrast,
 the GNU General Public License is intended to guarantee your freedom to
 share and change all versions of a program--to make sure it remains free
 software for all its users.  We, the Free Software Foundation, use the
 GNU General Public License for most of our software; it applies also to
 any other work released this way by its authors.  You can apply it to
 your programs, too.
  When we speak of free software, we are referring to freedom, not
 price.  Our General Public Licenses are designed to make sure that you
 have the freedom to distribute copies of free software (and charge for
 them if you wish), that you receive source code or can get it if you
 want it, that you can change the software or use pieces of it in new
 free programs, and that you know you can do these things.
  To protect your rights, we need to prevent others from denying you
 these rights or asking you to surrender the rights.  Therefore, you have
 certain responsibilities if you distribute copies of the software, or if
 you modify it: responsibilities to respect the freedom of others.
  For example, if you distribute copies of such a program, whether
 gratis or for a fee, you must pass on to the recipients the same
 freedoms that you received.  You must make sure that they, too, receive
 or can get the source code.  And you must show them these terms so they
 know their rights.
  Developers that use the GNU GPL protect your rights with two steps:
 (1) assert copyright on the software, and (2) offer you this License
 giving you legal permission to copy, distribute and/or modify it.
  For the developers' and authors' protection, the GPL clearly explains
 that there is no warranty for this free software.  For both users' and
 authors' sake, the GPL requires that modified versions be marked as
 changed, so that their problems will not be attributed erroneously to
 authors of previous versions.
  Some devices are designed to deny users access to install or run
 modified versions of the software inside them, although the manufacturer
 can do so.  This is fundamentally incompatible with the aim of
 protecting users' freedom to change the software.  The systematic
 pattern of such abuse occurs in the area of products for individuals to
 use, which is precisely where it is most unacceptable.  Therefore, we
 have designed this version of the GPL to prohibit the practice for those
 products.  If such problems arise substantially in other domains, we
 stand ready to extend this provision to those domains in future versions
 of the GPL, as needed to protect the freedom of users.
  Finally, every program is threatened constantly by software patents.
 States should not allow patents to restrict development and use of
 software on general-purpose computers, but in those that do, we wish to
 avoid the special danger that patents applied to a free program could
 make it effectively proprietary.  To prevent this, the GPL assures that
 patents cannot be used to render the program non-free.
  The precise terms and conditions for copying, distribution and
 modification follow.
                       TERMS AND CONDITIONS
  0. Definitions.
  "This License" refers to version 3 of the GNU General Public License.
  "Copyright" also means copyright-like laws that apply to other kinds of
 works, such as semiconductor masks.
  "The Program" refers to any copyrightable work licensed under this
 License.  Each licensee is addressed as "you".  "Licensees" and
 "recipients" may be individuals or organizations.
  To "modify" a work means to copy from or adapt all or part of the work
 in a fashion requiring copyright permission, other than the making of an
 exact copy.  The resulting work is called a "modified version" of the
 earlier work or a work "based on" the earlier work.
  A "covered work" means either the unmodified Program or a work based
 on the Program.
  To "propagate" a work means to do anything with it that, without
 permission, would make you directly or secondarily liable for
 infringement under applicable copyright law, except executing it on a
 computer or modifying a private copy.  Propagation includes copying,
 distribution (with or without modification), making available to the
 public, and in some countries other activities as well.
  To "convey" a work means any kind of propagation that enables other
 parties to make or receive copies.  Mere interaction with a user through
 a computer network, with no transfer of a copy, is not conveying.
  An interactive user interface displays "Appropriate Legal Notices"
 to the extent that it includes a convenient and prominently visible
 feature that (1) displays an appropriate copyright notice, and (2)
 tells the user that there is no warranty for the work (except to the
 extent that warranties are provided), that licensees may convey the
 work under this License, and how to view a copy of this License.  If
 the interface presents a list of user commands or options, such as a
 menu, a prominent item in the list meets this criterion.
  1. Source Code.
  The "source code" for a work means the preferred form of the work
 for making modifications to it.  "Object code" means any non-source
 form of a work.
  A "Standard Interface" means an interface that either is an official
 standard defined by a recognized standards body, or, in the case of
 interfaces specified for a particular programming language, one that
 is widely used among developers working in that language.
  The "System Libraries" of an executable work include anything, other
 than the work as a whole, that (a) is included in the normal form of
 packaging a Major Component, but which is not part of that Major
 Component, and (b) serves only to enable use of the work with that
 Major Component, or to implement a Standard Interface for which an
 implementation is available to the public in source code form.  A
 "Major Component", in this context, means a major essential component
 (kernel, window system, and so on) of the specific operating system
 (if any) on which the executable work runs, or a compiler used to
 produce the work, or an object code interpreter used to run it.
  The "Corresponding Source" for a work in object code form means all
 the source code needed to generate, install, and (for an executable
 work) run the object code and to modify the work, including scripts to
 control those activities.  However, it does not include the work's
 System Libraries, or general-purpose tools or generally available free
 programs which are used unmodified in performing those activities but
 which are not part of the work.  For example, Corresponding Source
 includes interface definition files associated with source files for
 the work, and the source code for shared libraries and dynamically
 linked subprograms that the work is specifically designed to require,
 such as by intimate data communication or control flow between those
 subprograms and other parts of the work.
  The Corresponding Source need not include anything that users
 can regenerate automatically from other parts of the Corresponding
 Source.
  The Corresponding Source for a work in source code form is that
 same work.
  2. Basic Permissions.
  All rights granted under this License are granted for the term of
 copyright on the Program, and are irrevocable provided the stated
 conditions are met.  This License explicitly affirms your unlimited
 permission to run the unmodified Program.  The output from running a
 covered work is covered by this License only if the output, given its
 content, constitutes a covered work.  This License acknowledges your
 rights of fair use or other equivalent, as provided by copyright law.
  You may make, run and propagate covered works that you do not
 convey, without conditions so long as your license otherwise remains
 in force.  You may convey covered works to others for the sole purpose
 of having them make modifications exclusively for you, or provide you
 with facilities for running those works, provided that you comply with
 the terms of this License in conveying all material for which you do
 not control copyright.  Those thus making or running the covered works
 for you must do so exclusively on your behalf, under your direction
 and control, on terms that prohibit them from making any copies of
 your copyrighted material outside their relationship with you.
  Conveying under any other circumstances is permitted solely under
 the conditions stated below.  Sublicensing is not allowed; section 10
 makes it unnecessary.
  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
  No covered work shall be deemed part of an effective technological
 measure under any applicable law fulfilling obligations under article
 11 of the WIPO copyright treaty adopted on 20 December 1996, or
 similar laws prohibiting or restricting circumvention of such
 measures.
  When you convey a covered work, you waive any legal power to forbid
 circumvention of technological measures to the extent such circumvention
 is effected by exercising rights under this License with respect to
 the covered work, and you disclaim any intention to limit operation or
 modification of the work as a means of enforcing, against the work's
 users, your or third parties' legal rights to forbid circumvention of
 technological measures.
  4. Conveying Verbatim Copies.
  You may convey verbatim copies of the Program's source code as you
 receive it, in any medium, provided that you conspicuously and
 appropriately publish on each copy an appropriate copyright notice;
 keep intact all notices stating that this License and any
 non-permissive terms added in accord with section 7 apply to the code;
 keep intact all notices of the absence of any warranty; and give all
 recipients a copy of this License along with the Program.
  You may charge any price or no price for each copy that you convey,
 and you may offer support or warranty protection for a fee.
  5. Conveying Modified Source Versions.
  You may convey a work based on the Program, or the modifications to
 produce it from the Program, in the form of source code under the
 terms of section 4, provided that you also meet all of these conditions:
    a) The work must carry prominent notices stating that you modified
    it, and giving a relevant date.
    b) The work must carry prominent notices stating that it is
    released under this License and any conditions added under section
    7.  This requirement modifies the requirement in section 4 to
    "keep intact all notices".
    c) You must license the entire work, as a whole, under this
    License to anyone who comes into possession of a copy.  This
    License will therefore apply, along with any applicable section 7
    additional terms, to the whole of the work, and all its parts,
    regardless of how they are packaged.  This License gives no
    permission to license the work in any other way, but it does not
    invalidate such permission if you have separately received it.
    d) If the work has interactive user interfaces, each must display
    Appropriate Legal Notices; however, if the Program has interactive
    interfaces that do not display Appropriate Legal Notices, your
    work need not make them do so.
  A compilation of a covered work with other separate and independent
 works, which are not by their nature extensions of the covered work,
 and which are not combined with it such as to form a larger program,
 in or on a volume of a storage or distribution medium, is called an
 "aggregate" if the compilation and its resulting copyright are not
 used to limit the access or legal rights of the compilation's users
 beyond what the individual works permit.  Inclusion of a covered work
 in an aggregate does not cause this License to apply to the other
 parts of the aggregate.
  6. Conveying Non-Source Forms.
  You may convey a covered work in object code form under the terms
 of sections 4 and 5, provided that you also convey the
 machine-readable Corresponding Source under the terms of this License,
 in one of these ways:
    a) Convey the object code in, or embodied in, a physical product
    (including a physical distribution medium), accompanied by the
    Corresponding Source fixed on a durable physical medium
    customarily used for software interchange.
    b) Convey the object code in, or embodied in, a physical product
    (including a physical distribution medium), accompanied by a
    written offer, valid for at least three years and valid for as
    long as you offer spare parts or customer support for that product
    model, to give anyone who possesses the object code either (1) a
    copy of the Corresponding Source for all the software in the
    product that is covered by this License, on a durable physical
    medium customarily used for software interchange, for a price no
    more than your reasonable cost of physically performing this
    conveying of source, or (2) access to copy the
    Corresponding Source from a network server at no charge.
    c) Convey individual copies of the object code with a copy of the
    written offer to provide the Corresponding Source.  This
    alternative is allowed only occasionally and noncommercially, and
    only if you received the object code with such an offer, in accord
    with subsection 6b.
    d) Convey the object code by offering access from a designated
    place (gratis or for a charge), and offer equivalent access to the
    Corresponding Source in the same way through the same place at no
    further charge.  You need not require recipients to copy the
    Corresponding Source along with the object code.  If the place to
    copy the object code is a network server, the Corresponding Source
    may be on a different server (operated by you or a third party)
    that supports equivalent copying facilities, provided you maintain
    clear directions next to the object code saying where to find the
    Corresponding Source.  Regardless of what server hosts the
    Corresponding Source, you remain obligated to ensure that it is
    available for as long as needed to satisfy these requirements.
    e) Convey the object code using peer-to-peer transmission, provided
    you inform other peers where the object code and Corresponding
    Source of the work are being offered to the general public at no
    charge under subsection 6d.
  A separable portion of the object code, whose source code is excluded
 from the Corresponding Source as a System Library, need not be
 included in conveying the object code work.
  A "User Product" is either (1) a "consumer product", which means any
 tangible personal property which is normally used for personal, family,
 or household purposes, or (2) anything designed or sold for incorporation
 into a dwelling.  In determining whether a product is a consumer product,
 doubtful cases shall be resolved in favor of coverage.  For a particular
 product received by a particular user, "normally used" refers to a
 typical or common use of that class of product, regardless of the status
 of the particular user or of the way in which the particular user
 actually uses, or expects or is expected to use, the product.  A product
 is a consumer product regardless of whether the product has substantial
 commercial, industrial or non-consumer uses, unless such uses represent
 the only significant mode of use of the product.
  "Installation Information" for a User Product means any methods,
 procedures, authorization keys, or other information required to install
 and execute modified versions of a covered work in that User Product from
 a modified version of its Corresponding Source.  The information must
 suffice to ensure that the continued functioning of the modified object
 code is in no case prevented or interfered with solely because
 modification has been made.
  If you convey an object code work under this section in, or with, or
 specifically for use in, a User Product, and the conveying occurs as
 part of a transaction in which the right of possession and use of the
 User Product is transferred to the recipient in perpetuity or for a
 fixed term (regardless of how the transaction is characterized), the
 Corresponding Source conveyed under this section must be accompanied
 by the Installation Information.  But this requirement does not apply
 if neither you nor any third party retains the ability to install
 modified object code on the User Product (for example, the work has
 been installed in ROM).
  The requirement to provide Installation Information does not include a
 requirement to continue to provide support service, warranty, or updates
 for a work that has been modified or installed by the recipient, or for
 the User Product in which it has been modified or installed.  Access to a
 network may be denied when the modification itself materially and
 adversely affects the operation of the network or violates the rules and
 protocols for communication across the network.
  Corresponding Source conveyed, and Installation Information provided,
 in accord with this section must be in a format that is publicly
 documented (and with an implementation available to the public in
 source code form), and must require no special password or key for
 unpacking, reading or copying.
  7. Additional Terms.
  "Additional permissions" are terms that supplement the terms of this
 License by making exceptions from one or more of its conditions.
 Additional permissions that are applicable to the entire Program shall
 be treated as though they were included in this License, to the extent
 that they are valid under applicable law.  If additional permissions
 apply only to part of the Program, that part may be used separately
 under those permissions, but the entire Program remains governed by
 this License without regard to the additional permissions.
  When you convey a copy of a covered work, you may at your option
 remove any additional permissions from that copy, or from any part of
 it.  (Additional permissions may be written to require their own
 removal in certain cases when you modify the work.)  You may place
 additional permissions on material, added by you to a covered work,
 for which you have or can give appropriate copyright permission.
  Notwithstanding any other provision of this License, for material you
 add to a covered work, you may (if authorized by the copyright holders of
 that material) supplement the terms of this License with terms:
    a) Disclaiming warranty or limiting liability differently from the
    terms of sections 15 and 16 of this License; or
    b) Requiring preservation of specified reasonable legal notices or
    author attributions in that material or in the Appropriate Legal
    Notices displayed by works containing it; or
    c) Prohibiting misrepresentation of the origin of that material, or
    requiring that modified versions of such material be marked in
    reasonable ways as different from the original version; or
    d) Limiting the use for publicity purposes of names of licensors or
    authors of the material; or
    e) Declining to grant rights under trademark law for use of some
    trade names, trademarks, or service marks; or
    f) Requiring indemnification of licensors and authors of that
    material by anyone who conveys the material (or modified versions of
    it) with contractual assumptions of liability to the recipient, for
    any liability that these contractual assumptions directly impose on
    those licensors and authors.
  All other non-permissive additional terms are considered "further
 restrictions" within the meaning of section 10.  If the Program as you
 received it, or any part of it, contains a notice stating that it is
 governed by this License along with a term that is a further
 restriction, you may remove that term.  If a license document contains
 a further restriction but permits relicensing or conveying under this
 License, you may add to a covered work material governed by the terms
 of that license document, provided that the further restriction does
 not survive such relicensing or conveying.
  If you add terms to a covered work in accord with this section, you
 must place, in the relevant source files, a statement of the
 additional terms that apply to those files, or a notice indicating
 where to find the applicable terms.
  Additional terms, permissive or non-permissive, may be stated in the
 form of a separately written license, or stated as exceptions;
 the above requirements apply either way.
  8. Termination.
  You may not propagate or modify a covered work except as expressly
 provided under this License.  Any attempt otherwise to propagate or
 modify it is void, and will automatically terminate your rights under
 this License (including any patent licenses granted under the third
 paragraph of section 11).
  However, if you cease all violation of this License, then your
 license from a particular copyright holder is reinstated (a)
 provisionally, unless and until the copyright holder explicitly and
 finally terminates your license, and (b) permanently, if the copyright
 holder fails to notify you of the violation by some reasonable means
 prior to 60 days after the cessation.
  Moreover, your license from a particular copyright holder is
 reinstated permanently if the copyright holder notifies you of the
 violation by some reasonable means, this is the first time you have
 received notice of violation of this License (for any work) from that
 copyright holder, and you cure the violation prior to 30 days after
 your receipt of the notice.
  Termination of your rights under this section does not terminate the
 licenses of parties who have received copies or rights from you under
 this License.  If your rights have been terminated and not permanently
 reinstated, you do not qualify to receive new licenses for the same
 material under section 10.
  9. Acceptance Not Required for Having Copies.
  You are not required to accept this License in order to receive or
 run a copy of the Program.  Ancillary propagation of a covered work
 occurring solely as a consequence of using peer-to-peer transmission
 to receive a copy likewise does not require acceptance.  However,
 nothing other than this License grants you permission to propagate or
 modify any covered work.  These actions infringe copyright if you do
 not accept this License.  Therefore, by modifying or propagating a
 covered work, you indicate your acceptance of this License to do so.
  10. Automatic Licensing of Downstream Recipients.
  Each time you convey a covered work, the recipient automatically
 receives a license from the original licensors, to run, modify and
 propagate that work, subject to this License.  You are not responsible
 for enforcing compliance by third parties with this License.
  An "entity transaction" is a transaction transferring control of an
 organization, or substantially all assets of one, or subdividing an
 organization, or merging organizations.  If propagation of a covered
 work results from an entity transaction, each party to that
 transaction who receives a copy of the work also receives whatever
 licenses to the work the party's predecessor in interest had or could
 give under the previous paragraph, plus a right to possession of the
 Corresponding Source of the work from the predecessor in interest, if
 the predecessor has it or can get it with reasonable efforts.
  You may not impose any further restrictions on the exercise of the
 rights granted or affirmed under this License.  For example, you may
 not impose a license fee, royalty, or other charge for exercise of
 rights granted under this License, and you may not initiate litigation
 (including a cross-claim or counterclaim in a lawsuit) alleging that
 any patent claim is infringed by making, using, selling, offering for
 sale, or importing the Program or any portion of it.
  11. Patents.
  A "contributor" is a copyright holder who authorizes use under this
 License of the Program or a work on which the Program is based.  The
 work thus licensed is called the contributor's "contributor version".
  A contributor's "essential patent claims" are all patent claims
 owned or controlled by the contributor, whether already acquired or
 hereafter acquired, that would be infringed by some manner, permitted
 by this License, of making, using, or selling its contributor version,
 but do not include claims that would be infringed only as a
 consequence of further modification of the contributor version.  For
 purposes of this definition, "control" includes the right to grant
 patent sublicenses in a manner consistent with the requirements of
 this License.
  Each contributor grants you a non-exclusive, worldwide, royalty-free
 patent license under the contributor's essential patent claims, to
 make, use, sell, offer for sale, import and otherwise run, modify and
 propagate the contents of its contributor version.
  In the following three paragraphs, a "patent license" is any express
 agreement or commitment, however denominated, not to enforce a patent
 (such as an express permission to practice a patent or covenant not to
 sue for patent infringement).  To "grant" such a patent license to a
 party means to make such an agreement or commitment not to enforce a
 patent against the party.
  If you convey a covered work, knowingly relying on a patent license,
 and the Corresponding Source of the work is not available for anyone
 to copy, free of charge and under the terms of this License, through a
 publicly available network server or other readily accessible means,
 then you must either (1) cause the Corresponding Source to be so
 available, or (2) arrange to deprive yourself of the benefit of the
 patent license for this particular work, or (3) arrange, in a manner
 consistent with the requirements of this License, to extend the patent
 license to downstream recipients.  "Knowingly relying" means you have
 actual knowledge that, but for the patent license, your conveying the
 covered work in a country, or your recipient's use of the covered work
 in a country, would infringe one or more identifiable patents in that
 country that you have reason to believe are valid.
  If, pursuant to or in connection with a single transaction or
 arrangement, you convey, or propagate by procuring conveyance of, a
 covered work, and grant a patent license to some of the parties
 receiving the covered work authorizing them to use, propagate, modify
 or convey a specific copy of the covered work, then the patent license
 you grant is automatically extended to all recipients of the covered
 work and works based on it.
  A patent license is "discriminatory" if it does not include within
 the scope of its coverage, prohibits the exercise of, or is
 conditioned on the non-exercise of one or more of the rights that are
 specifically granted under this License.  You may not convey a covered
 work if you are a party to an arrangement with a third party that is
 in the business of distributing software, under which you make payment
 to the third party based on the extent of your activity of conveying
 the work, and under which the third party grants, to any of the
 parties who would receive the covered work from you, a discriminatory
 patent license (a) in connection with copies of the covered work
 conveyed by you (or copies made from those copies), or (b) primarily
 for and in connection with specific products or compilations that
 contain the covered work, unless you entered into that arrangement,
 or that patent license was granted, prior to 28 March 2007.
  Nothing in this License shall be construed as excluding or limiting
 any implied license or other defenses to infringement that may
 otherwise be available to you under applicable patent law.
  12. No Surrender of Others' Freedom.
  If conditions are imposed on you (whether by court order, agreement or
 otherwise) that contradict the conditions of this License, they do not
 excuse you from the conditions of this License.  If you cannot convey a
 covered work so as to satisfy simultaneously your obligations under this
 License and any other pertinent obligations, then as a consequence you may
 not convey it at all.  For example, if you agree to terms that obligate you
 to collect a royalty for further conveying from those to whom you convey
 the Program, the only way you could satisfy both those terms and this
 License would be to refrain entirely from conveying the Program.
  13. Use with the GNU Affero General Public License.
  Notwithstanding any other provision of this License, you have
 permission to link or combine any covered work with a work licensed
 under version 3 of the GNU Affero General Public License into a single
 combined work, and to convey the resulting work.  The terms of this
 License will continue to apply to the part which is the covered work,
 but the special requirements of the GNU Affero General Public License,
 section 13, concerning interaction through a network will apply to the
 combination as such.
  14. Revised Versions of this License.
  The Free Software Foundation may publish revised and/or new versions of
 the GNU General Public License from time to time.  Such new versions will
 be similar in spirit to the present version, but may differ in detail to
 address new problems or concerns.
  Each version is given a distinguishing version number.  If the
 Program specifies that a certain numbered version of the GNU General
 Public License "or any later version" applies to it, you have the
 option of following the terms and conditions either of that numbered
 version or of any later version published by the Free Software
 Foundation.  If the Program does not specify a version number of the
 GNU General Public License, you may choose any version ever published
 by the Free Software Foundation.
  If the Program specifies that a proxy can decide which future
 versions of the GNU General Public License can be used, that proxy's
 public statement of acceptance of a version permanently authorizes you
 to choose that version for the Program.
  Later license versions may give you additional or different
 permissions.  However, no additional obligations are imposed on any
 author or copyright holder as a result of your choosing to follow a
 later version.
  15. Disclaimer of Warranty.
  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
 APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
 HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
 OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
 THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
 IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
 ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
  16. Limitation of Liability.
  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
 WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
 THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
 GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
 USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
 DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
 PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
 EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
 SUCH DAMAGES.
  17. Interpretation of Sections 15 and 16.
  If the disclaimer of warranty and limitation of liability provided
 above cannot be given local legal effect according to their terms,
 reviewing courts shall apply local law that most closely approximates
 an absolute waiver of all civil liability in connection with the
 Program, unless a warranty or assumption of liability accompanies a
 copy of the Program in return for a fee.
                     END OF TERMS AND CONDITIONS
            How to Apply These Terms to Your New Programs
  If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it
 free software which everyone can redistribute and change under these terms.
  To do so, attach the following notices to the program.  It is safest
 to attach them to the start of each source file to most effectively
 state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
    <one line to give the program's name and a brief idea of what it does.>
    Copyright (C) <year>  <name of author>
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation, either version 3 of the License, or
    (at your option) any later version.
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 Also add information on how to contact you by electronic and paper mail.
  If the program does terminal interaction, make it output a short
 notice like this when it starts in an interactive mode:
    <program>  Copyright (C) <year>  <name of author>
    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
    This is free software, and you are welcome to redistribute it
    under certain conditions; type `show c' for details.
 The hypothetical commands `show w' and `show c' should show the appropriate
 parts of the General Public License.  Of course, your program's commands
 might be different; for a GUI interface, you would use an "about box".
  You should also get your employer (if you work as a programmer) or school,
 if any, to sign a "copyright disclaimer" for the program, if necessary.
 For more information on this, and how to apply and follow the GNU GPL, see
 <https://www.gnu.org/licenses/>.
  The GNU General Public License does not permit incorporating your program
 into proprietary programs.  If your program is a subroutine library, you
 may consider it more useful to permit linking proprietary applications with
 the library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.  But first, please read
 <https://www.gnu.org/licenses/why-not-lgpl.html>.
@@ -0,0 +1,72 @@
 # wldash
 ![screenshot](https://git.sr.ht/~kennylevinsen/wldash/blob/master/assets/screenshot.jpg)
 A dashboard/launcher/control-panel thing for Wayland. Requires wlr-layer-shell-unstable-v1.
 Consider this alpha-quality: While it works, *everything* is subject to change with a moments notice. You may end up pulling in the latest changes, and *poof*, wldash suddenly turns into an artisan espresso machine.
 ## How to use
 1. Checkout: `git clone https://github.com/kennylevinsen/wldash`
 2. Build: `cargo build --release`
 3. Put somewhere: `cp target/release/wldash /usr/local/bin/wldash`
 4. Run: `wldash`
 To see the default configuration, run `wldash print-config`. To configure, place a file in `$XDG_CONFIG_HOME/wldash/config.yaml` (or if `XDG_CONFIG_HOME` is not set, `~/.config/wldash/config.yaml`). JSON is also currently supported.
 Notable settings: `outptuMode` can be `active` or `all`, `scale` can be set to `2` to half the buffer size, and the widgets (and their layout) can be configured.
 For more info, look in `src/config.rs`.
 ## System dependencies
 `dbus`. See https://github.com/diwic/dbus-rs#requirements.
 ## How to use launcher
 The launcher for wldash is built-in, based on https://github.com/kennylevinsen/dot-desktop. Pluggable systems may come back in the future.
 The environment variables `XDG_DATA_DIRS` and `XDG_DATA_HOME` are read to find the many `applications` folders that contain `desktop` files.
 ## Features
 ### Date and time
 In nice, big letters!
 ### 3 month calendar
 Scroll or click on the months to navigate.
 ### Battery level
 Over upower, only visible if upower battery is detected
 ### Audio volume
 Over pulseaudio, only visible if pulseaudio connection is successful. Scroll to adjust volume, right-click to toggle mute.
 ### Backlight control
 Using backlight sys file, only visible of backlight is detected. Scroll to adjust, right-click to toggle between the extreme values.
 ### Launcher
 Loads desktop files from the usual locations.
 The launcher also accepts prefix operators to change its mode:
 - `!`: Arbitrary command
 - `=`: Calculator based on rcalc_lib. See https://docs.rs/rcalc_lib/0.9.3/rcalc_lib/
 ## Notable missing features:
 - Scaling of any kind - all sizes are currently hardcoded in pixels
 - Configurability
 - Cleanup and reorganization
 - Proper line editor for the launcher
 ## How to discuss
 Go to #kennylevinsen @ irc.libera.chat to discuss, or use [~kennylevinsen/public-inbox@lists.sr.ht](https://lists.sr.ht/~kennylevinsen/public-inbox).
@@ -0,0 +1,55 @@
 {
 	"widget": {
 		"margin": {
 			"margins": [20,20,20,20],
 			"widget": {
 				"verticalLayout": [{
 					"horizontalLayout": [{
 						"margin": {
 							"margins": [0,88,0,32],
 							"widget": {
 								"verticalLayout": [
 									{"date": {"font_size": 64.0}},
 									{"clock": {"font_size": 256.0}}
 								]
 							}
 						}
 					},{
 						"verticalLayout": [{
 							"margin": {
 								"margins": [0,0,0,8],
 								"widget": {"battery": {"font_size": 24.0,"length": 600}}
 							}
 						},{
 							"margin": {
 								"margins": [0,0,0,8],
 								"widget": {"backlight": {"device": "intel_backlight", "font_size": 24.0,"length": 600}}
 							}
 						},{
 							"margin": {
 								"margins": [0,0,0,8],
 								"widget": {"pulseAudio": {"font_size": 24.0,"length": 600}}
 							}
 						}]
 					}
 				]},
 				{"calendar": {"font_size": 16.0,"sections": 3}},
 				{"launcher": {
 					"font_size": 32.0,
 					"length": 1200, 
 	            "app_opener": "swaymsg exec -- ",
 	            "term_opener": "foot --",
 	            "url_opener": "xdg-open "
 	         }}
 			]}
 		}
 	},
 	"outputMode": "active",
 	"scale": 1,
 	"background": {
 		"red": 0,
 		"green": 0,
 		"blue": 0,
 		"opacity": 0.9
 	}
 }
@@ -0,0 +1,50 @@
 outputMode: active
 scale: 1
 background:
  red: 0.0
  green: 0.0
  blue: 0.0
  opacity: 0.9
 widget:
  margin:
    margins: [20, 20, 20, 20]
    widget:
      verticalLayout:
        - horizontalLayout:
            - margin:
                margins: [0, 88, 0, 32]
                widget:
                  verticalLayout:
                    - date:
                        font_size: 64.0
                    - clock:
                        font_size: 256.0
            - verticalLayout:
                - margin:
                    margins: [0, 0, 0, 8]
                    widget:
                      battery:
                        font_size: 24.0
                        length: 600
                - margin:
                    margins: [0, 0, 0, 8]
                    widget:
                      backlight:
                        device: "intel_backlight"
                        font_size: 24.0
                        length: 600
                - margin:
                    margins: [0, 0, 0, 8]
                    widget:
                      pulseAudio:
                        font_size: 24.0
                        length: 600
        - calendar:
            font_size: 16.0
            sections: 3
        - launcher:
            font_size: 32.0
            length: 1200
            app_opener: "swaymsg exec --"
            term_opener: "foot --"
            url_opener: "xdg-open "
@@ -0,0 +1,600 @@
 use std::collections::VecDeque;
 use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::mpsc::Sender;
 use std::sync::{Arc, Mutex};
 use chrono::{Duration, Local, NaiveDateTime};
 use crate::keyboard::{keysyms, map_keyboard, Event as KbEvent, KeyState, ModifiersState};
 use wayland_client::protocol::{wl_compositor, wl_output, wl_pointer, wl_seat, wl_shm, wl_surface};
 use wayland_client::{Display, EventQueue, GlobalEvent, GlobalManager, Main};
 use wayland_protocols::wlr::unstable::layer_shell::v1::client::{
    zwlr_layer_shell_v1, zwlr_layer_surface_v1,
 };
 use crate::buffer::Buffer;
 use crate::color::Color;
 use crate::widget::{DrawContext, WaitContext, Widget};
 use crate::cmd::Cmd;
 use crate::doublemempool::DoubleMemPool;
 #[derive(Debug)]
 pub enum OutputMode {
    Active,
    All,
 }
 struct AppInner {
    compositor: Option<Main<wl_compositor::WlCompositor>>,
    surfaces: Vec<Main<wl_surface::WlSurface>>,
    shell_surfaces: Vec<Main<zwlr_layer_surface_v1::ZwlrLayerSurfaceV1>>,
    configured_surfaces: Arc<Mutex<usize>>,
    outputs: Vec<(u32, Main<wl_output::WlOutput>)>,
    shell: Option<Main<zwlr_layer_shell_v1::ZwlrLayerShellV1>>,
    draw_tx: Sender<Cmd>,
    output_mode: OutputMode,
    visible: bool,
    scale: u32,
 }
 impl AppInner {
    fn new(tx: Sender<Cmd>, output_mode: OutputMode, scale: u32) -> AppInner {
        AppInner {
            compositor: None,
            surfaces: Vec::new(),
            shell_surfaces: Vec::new(),
            configured_surfaces: Arc::new(Mutex::new(0)),
            outputs: Vec::new(),
            shell: None,
            draw_tx: tx,
            output_mode,
            visible: true,
            scale,
        }
    }
    fn add_shell_surface(
        compositor: &wl_compositor::WlCompositor,
        shell: &zwlr_layer_shell_v1::ZwlrLayerShellV1,
        scale: u32,
        configured_surfaces: Arc<Mutex<usize>>,
        tx: Sender<Cmd>,
        output: Option<&wl_output::WlOutput>,
    ) -> (
        Main<wl_surface::WlSurface>,
        Main<zwlr_layer_surface_v1::ZwlrLayerSurfaceV1>,
    ) {
        let surface = compositor.create_surface();
        let this_is_stupid = AtomicBool::new(false);
        let shell_surface = shell.get_layer_surface(
            &surface,
            output,
            zwlr_layer_shell_v1::Layer::Overlay,
            "".to_string(),
        );
        shell_surface.quick_assign(move |layer, event, _| match event {
            zwlr_layer_surface_v1::Event::Configure { serial, .. } => {
                if this_is_stupid
                    .compare_exchange(false, true, Ordering::SeqCst, Ordering::SeqCst)
                    .is_ok()
                {
                    *(configured_surfaces.lock().unwrap()) += 1;
                    layer.ack_configure(serial);
                    tx.send(Cmd::ForceDraw).unwrap();
                }
            }
            _ => unreachable!(),
        });
        shell_surface.set_keyboard_interactivity(zwlr_layer_surface_v1::KeyboardInteractivity::Exclusive);
        shell_surface.set_size(1, 1);
        surface.set_buffer_scale(scale as i32);
        surface.commit();
        (surface, shell_surface)
    }
    fn outputs_changed(&mut self) {
        let shell = match self.shell {
            Some(ref shell) => shell.to_owned(),
            None => return,
        };
        let compositor = match self.compositor {
            Some(ref c) => c.to_owned(),
            None => return,
        };
        for shell_surface in self.shell_surfaces.iter() {
            shell_surface.destroy();
        }
        for surface in self.surfaces.iter() {
            surface.destroy();
        }
        self.configured_surfaces = Arc::new(Mutex::new(0));
        if !self.visible {
            self.surfaces = Vec::new();
            self.shell_surfaces = Vec::new();
            return;
        }
        match self.output_mode {
            OutputMode::Active => {
                if !self.shell_surfaces.is_empty() {
                    return;
                }
                let (surface, shell_surface) = AppInner::add_shell_surface(
                    &compositor,
                    &shell,
                    self.scale,
                    self.configured_surfaces.clone(),
                    self.draw_tx.clone(),
                    None,
                );
                self.surfaces = vec![surface];
                self.shell_surfaces = vec![shell_surface];
            }
            OutputMode::All => {
                let mut surfaces = Vec::new();
                let mut shell_surfaces = Vec::new();
                for output in self.outputs.iter() {
                    let (surface, shell_surface) = AppInner::add_shell_surface(
                        &compositor,
                        &shell,
                        self.scale,
                        self.configured_surfaces.clone(),
                        self.draw_tx.clone(),
                        Some(&output.1),
                    );
                    surfaces.push(surface);
                    shell_surfaces.push(shell_surface);
                }
                self.surfaces = surfaces;
                self.shell_surfaces = shell_surfaces;
            }
        }
        self.draw_tx.send(Cmd::ForceDraw).unwrap();
    }
    fn add_output(&mut self, id: u32, output: Main<wl_output::WlOutput>) {
        self.outputs.push((id, output));
        self.outputs_changed();
    }
    fn remove_output(&mut self, id: u32) {
        let old_output = self.outputs.iter().find(|(output_id, _)| *output_id == id);
        if let Some(output) = old_output {
            let new_outputs = self
                .outputs
                .iter()
                .filter(|(output_id, _)| *output_id != id)
                .map(|(x, y)| (*x, y.clone()))
                .collect();
            if output.1.as_ref().version() >= 3 {
                output.1.release()
            }
            self.outputs = new_outputs;
            self.outputs_changed();
        }
    }
    fn set_compositor(&mut self, compositor: Option<Main<wl_compositor::WlCompositor>>) {
        self.compositor = compositor
    }
    fn set_shell(&mut self, shell: Option<Main<zwlr_layer_shell_v1::ZwlrLayerShellV1>>) {
        self.shell = shell
    }
 }
 struct AppKeyboard {
    current: Option<Cmd>,
    delay: i32,
    rate: i32,
    next: Option<NaiveDateTime>,
 }
 pub struct App<'a> {
    pools: DoubleMemPool,
    display: Display,
    event_queue: EventQueue,
    cmd_queue: Arc<Mutex<VecDeque<Cmd>>>,
    widget: Option<Box<dyn Widget + Send + 'a>>,
    bg: Color,
    inner: Arc<Mutex<AppInner>>,
    last_damage: Option<Vec<(i32, i32, i32, i32)>>,
    last_dim: (u32, u32),
    keyboard: Arc<Mutex<AppKeyboard>>,
 }
 impl<'a> App<'a> {
    pub fn redraw(&mut self, force: bool) -> Result<(), ::std::io::Error> {
        let widget = match self.widget {
            Some(ref mut widget) => widget,
            None => return Ok(()),
        };
        let inner = self.inner.lock().unwrap();
        let time = Local::now().naive_local();
        if !inner.visible
            || inner.shell_surfaces.len() != *inner.configured_surfaces.lock().unwrap()
            || inner.surfaces.is_empty()
        {
            // Not ready yet
            return Ok(());
        }
        let (last, pool) = match self.pools.pool() {
            Some((last, pool)) => (last, pool),
            None => {
                self.pools.never_mind();
                return Ok(());
            }
        };
        let size = widget.size();
        let size_changed = self.last_dim != size;
        let force = force | size_changed;
        // resize the pool if relevant
        pool.resize((4 * size.0 * size.1) as usize)
            .expect("Failed to resize the memory pool.");
        let mmap = pool.mmap();
        let mut buf = Buffer::new(mmap, size);
        // Copy old damage
        let force = match (force, &self.last_damage) {
            (false, Some(d)) => {
                let lastmmap = last.mmap();
                let last = Buffer::new(lastmmap, size);
                if cfg!(feature = "damage_debug") {
                    buf.memset(&Color::new(0.5, 0.75, 0.75, 1.0));
                }
                for d in d {
                    last.copy_to(&mut buf, d.clone());
                }
                false
            }
            _ => true,
        };
        if force {
            buf.memset(&self.bg);
        }
        let report = widget.draw(
            &mut DrawContext {
                buf: &mut buf,
                bg: &self.bg,
                time,
                force,
            },
            (0, 0),
            size,
        )?;
        mmap.flush().unwrap();
        if !force && !report.full_damage && report.damage.is_empty() {
            // Nothing to do
            self.pools.never_mind();
            return Ok(());
        }
        // get a buffer and attach it
        let new_buffer = pool.buffer(
            0,
            report.width as i32,
            report.height as i32,
            4 * size.0 as i32,
            wl_shm::Format::Argb8888,
        );
        if size_changed {
            for shell_surface in inner.shell_surfaces.iter() {
                shell_surface.set_size(size.0 / inner.scale, size.1 / inner.scale);
            }
        }
        for surface in inner.surfaces.iter() {
            surface.attach(Some(&new_buffer), 0, 0);
            if cfg!(feature = "damage_debug") || force || report.full_damage {
                surface.damage_buffer(0, 0, size.0 as i32, size.1 as i32);
            } else {
                for d in report.damage.iter() {
                    surface.damage_buffer(d.0, d.1, d.2, d.3);
                }
            }
            surface.commit();
        }
        self.last_damage = if force || report.full_damage {
            Some(vec![(0, 0, size.0 as i32, size.1 as i32)])
        } else {
            Some(report.damage)
        };
        self.last_dim = size;
        Ok(())
    }
    pub fn hide(&mut self) {
        let mut inner = self.inner.lock().unwrap();
        inner.visible = false;
        self.last_dim = (0, 0);
        inner.outputs_changed();
    }
    pub fn show(&mut self) {
        let mut inner = self.inner.lock().unwrap();
        inner.visible = true;
        self.last_dim = (0, 0);
        inner.outputs_changed();
    }
    pub fn cmd_queue(&self) -> Arc<Mutex<VecDeque<Cmd>>> {
        self.cmd_queue.clone()
    }
    pub fn flush_display(&mut self) {
        self.display.flush().expect("unable to flush display");
    }
    pub fn event_queue(&mut self) -> &mut EventQueue {
        &mut self.event_queue
    }
    pub fn get_widget(&mut self) -> &mut Box<dyn Widget + Send + 'a> {
        self.widget.as_mut().unwrap()
    }
    pub fn set_widget(&mut self, w: Box<dyn Widget + Send + 'a>) -> Result<(), ::std::io::Error> {
        self.widget = Some(w);
        self.redraw(true)
    }
    pub fn set_keyboard_repeat(&mut self, ctx: &mut WaitContext) {
        let kbd = self.keyboard.lock().unwrap();
        if let Some(t) = kbd.next {
            ctx.set_time(t);
        }
    }
    pub fn key_repeat(&mut self) -> Option<Cmd> {
        let time = Local::now().naive_local();
        let mut kbd = self.keyboard.lock().unwrap();
        if let Some(target) = kbd.next {
            if time >= target {
                let cmd = kbd.current.as_ref().unwrap().clone();
                kbd.next = Some(time + Duration::milliseconds(kbd.rate.into()));
                return Some(cmd);
            }
        }
        None
    }
    pub fn new(tx: Sender<Cmd>, output_mode: OutputMode, bg: Color, scale: u32) -> App<'a> {
        let inner = Arc::new(Mutex::new(AppInner::new(tx, output_mode, scale)));
        //
        // Set up modules
        //
        let cmd_queue = Arc::new(Mutex::new(VecDeque::new()));
        let display = Display::connect_to_env().unwrap();
        let mut event_queue = display.create_event_queue();
        let display_wrapper = (*display).clone().attach(event_queue.token());
        //
        // Set up global manager
        //
        let inner_global = inner.clone();
        let manager =
            GlobalManager::new_with_cb(&display_wrapper, move |event, registry, _| match event {
                GlobalEvent::New {
                    id,
                    ref interface,
                    version,
                } => {
                    if let "wl_output" = &interface[..] {
                        let output = registry.bind(std::cmp::min(version, 3), id);
                        inner_global.lock().unwrap().add_output(id, output);
                    }
                }
                GlobalEvent::Removed { id, ref interface } => {
                    if let "wl_output" = &interface[..] {
                        inner_global.lock().unwrap().remove_output(id);
                    }
                }
            });
        // double sync to retrieve the global list
        // and the globals metadata
        event_queue.sync_roundtrip(&mut (), |_, _, _| {}).unwrap();
        event_queue.sync_roundtrip(&mut (), |_, _, _| {}).unwrap();
        // wl_compositor
        let compositor = manager
            .instantiate_range(1, 4)
            .expect("server didn't advertise `wl_compositor`");
        inner.lock().unwrap().set_compositor(Some(compositor));
        // wl_shm
        let shm: Main<wl_shm::WlShm> = manager
            .instantiate_range(1, 1)
            .expect("server didn't advertise `wl_shm`");
        let pools = DoubleMemPool::new(shm).expect("Failed to create a memory pool !");
        //
        // Get our seat
        //
        let seat: Main<wl_seat::WlSeat> = manager.instantiate_range(1, 6).unwrap();
        event_queue.sync_roundtrip(&mut (), |_, _, _| {}).unwrap();
        //
        // Keyboard processing
        //
        let kbd_clone = cmd_queue.clone();
        let modifiers_state = Arc::new(Mutex::new(ModifiersState {
            ctrl: false,
            alt: false,
            shift: false,
            caps_lock: false,
            logo: false,
            num_lock: false,
        }));
        let keyboard = Arc::new(Mutex::new(AppKeyboard {
            current: None,
            delay: 0,
            rate: 0,
            next: None,
        }));
        let kb2 = keyboard.clone();
        map_keyboard(&seat, None, move |event: KbEvent, _, _| match event {
            KbEvent::Key {
                keysym,
                utf8,
                state,
                ..
            } => {
                if let KeyState::Pressed = state {
                    match keysym {
                        keysyms::XKB_KEY_Escape => kbd_clone.lock().unwrap().push_back(Cmd::Exit),
                        keysyms::XKB_KEY_c if modifiers_state.lock().unwrap().ctrl => {
                            kbd_clone.lock().unwrap().push_back(Cmd::Exit)
                        }
                        v => {
                            let ev = Cmd::Keyboard {
                                key: v,
                                key_state: state,
                                modifiers_state: *modifiers_state.lock().unwrap(),
                                interpreted: utf8,
                            };
                            let mut kbd = kb2.lock().unwrap();
                            kbd.current = Some(ev.clone());
                            kbd.next = if kbd.delay > 0 {
                                Some(
                                    Local::now().naive_local()
                                        + Duration::milliseconds(kbd.delay.into()),
                                )
                            } else {
                                None
                            };
                            drop(kbd);
                            kbd_clone.lock().unwrap().push_back(ev);
                        }
                    }
                } else {
                    kb2.lock().unwrap().next = None;
                }
            }
            KbEvent::Leave { .. } => {
                kb2.lock().unwrap().next = None;
            }
            KbEvent::RepeatInfo { delay, rate } => {
                let mut kbd = kb2.lock().unwrap();
                kbd.delay = delay;
                kbd.rate = rate;
            }
            KbEvent::Modifiers { modifiers } => *modifiers_state.lock().unwrap() = modifiers,
            _ => (),
        })
        .expect("could not map keyboard");
        //
        // Prepare shell so that we can create our shell surface
        //
        inner
            .lock()
            .unwrap()
            .set_shell(Some(if let Ok(layer) = manager.instantiate_exact(1) {
                layer
            } else {
                panic!("server didn't advertise `zwlr_layer_shell_v1`");
            }));
        event_queue.sync_roundtrip(&mut (), |_, _, _| {}).unwrap();
        //
        // Cursor processing
        //
        let pointer_clone = cmd_queue.clone();
        let pointer = seat.get_pointer();
        let mut pos: (u32, u32) = (0, 0);
        let mut vert_scroll: f64 = 0.0;
        let mut horiz_scroll: f64 = 0.0;
        let mut btn: u32 = 0;
        let mut btn_clicked = false;
        pointer.quick_assign(move |_, event, _| match event {
            wl_pointer::Event::Enter {
                surface_x,
                surface_y,
                ..
            } => {
                pos = (surface_x as u32, surface_y as u32);
            }
            wl_pointer::Event::Leave { .. } => {
                pos = (0, 0);
            }
            wl_pointer::Event::Motion {
                surface_x,
                surface_y,
                ..
            } => {
                pos = (surface_x as u32 * scale, surface_y as u32 * scale);
            }
            wl_pointer::Event::Axis { axis, value, .. } => {
                if axis == wl_pointer::Axis::VerticalScroll {
                    vert_scroll += value;
                }
            }
            wl_pointer::Event::Button { button, state, .. } => {
                if let wl_pointer::ButtonState::Released = state {
                    btn = button;
                    btn_clicked = true;
                }
            }
            wl_pointer::Event::Frame => {
                if vert_scroll != 0.0 || horiz_scroll != 0.0 {
                    pointer_clone.lock().unwrap().push_back(Cmd::MouseScroll {
                        scroll: (horiz_scroll, vert_scroll),
                        pos,
                    });
                    vert_scroll = 0.0;
                    horiz_scroll = 0.0;
                }
                if btn_clicked {
                    pointer_clone
                        .lock()
                        .unwrap()
                        .push_back(Cmd::MouseClick { btn, pos });
                    btn_clicked = false;
                }
            }
            _ => {}
        });
        display.flush().unwrap();
        App {
            display,
            event_queue,
            cmd_queue,
            pools,
            widget: None,
            bg,
            inner,
            last_damage: None,
            last_dim: (0, 0),
            keyboard,
        }
    }
 }
@@ -1,205 +1,22 @@
 use std::{
    ffi::CStr,
    fs::File,
    io,
    os::unix::io::{FromRawFd, RawFd},
    time::SystemTime,
    time::UNIX_EPOCH,
 };
 #[cfg(target_os = "linux")]
 use nix::sys::memfd;
 use nix::{
    errno::Errno,
    fcntl,
    sys::{mman, stat},
    unistd,
 };
 use memmap::MmapMut;
 use wayland_client::{
    protocol::{wl_buffer, wl_shm, wl_shm_pool},
    Dispatch, QueueHandle,
 };
 use crate::color::Color;
 use crate::widgets::Geometry;
-fn create_shm_fd() -> io::Result<RawFd> {
+pub struct Buffer<'a> {
-    // Only try memfd on linux
+    buf: &'a mut MmapMut,
    #[cfg(target_os = "linux")]
    loop {
        match memfd::memfd_create(
            CStr::from_bytes_with_nul(b"wldash\0").unwrap(),
            memfd::MemFdCreateFlag::MFD_CLOEXEC,
        ) {
            Ok(fd) => return Ok(fd),
            Err(Errno::EINTR) => continue,
            Err(Errno::ENOSYS) => break,
            Err(errno) => return Err(io::Error::from(errno)),
        }
    }
    // Fallback to using shm_open
    let sys_time = SystemTime::now();
    let mut mem_file_handle = format!(
        "/wldash-{}",
        sys_time.duration_since(UNIX_EPOCH).unwrap().subsec_nanos()
    );
    loop {
        match mman::shm_open(
            mem_file_handle.as_str(),
            fcntl::OFlag::O_CREAT
                | fcntl::OFlag::O_EXCL
                | fcntl::OFlag::O_RDWR
                | fcntl::OFlag::O_CLOEXEC,
            stat::Mode::S_IRUSR | stat::Mode::S_IWUSR,
        ) {
            Ok(fd) => match mman::shm_unlink(mem_file_handle.as_str()) {
                Ok(_) => return Ok(fd),
                Err(errno) => match unistd::close(fd) {
                    Ok(_) => return Err(io::Error::from(errno)),
                    Err(errno) => return Err(io::Error::from(errno)),
                },
            },
            Err(Errno::EEXIST) => {
                // If a file with that handle exists then change the handle
                mem_file_handle = format!(
                    "/wldash-{}",
                    sys_time.duration_since(UNIX_EPOCH).unwrap().subsec_nanos()
                );
                continue;
            }
            Err(Errno::EINTR) => continue,
            Err(errno) => return Err(io::Error::from(errno)),
        }
    }
 }
 pub struct ShmBuffer {
    pub file: File,
    pub mmap: MmapMut,
    pub buffer: wl_buffer::WlBuffer,
    pub refcnt: u32,
    pub id: u32,
    pub last_damage: Vec<Geometry>,
 }
 impl ShmBuffer {
    fn new<D>(
        shm: &wl_shm::WlShm,
        qh: &QueueHandle<D>,
        width: i32,
        height: i32,
        stride: i32,
        format: wl_shm::Format,
        id: u32,
    ) -> io::Result<ShmBuffer>
    where
        D: Dispatch<wl_shm_pool::WlShmPool, ()> + Dispatch<wl_buffer::WlBuffer, ()> + 'static,
    {
        let mem_fd = create_shm_fd()?;
        let file = unsafe { File::from_raw_fd(mem_fd) };
        file.set_len((height * stride) as u64)?;
        let pool = shm.create_pool(mem_fd, height * stride, &qh, ());
        let mmap = unsafe { MmapMut::map_mut(&file).unwrap() };
        let buffer = pool.create_buffer(0, width, height, stride, format, &qh, ());
        Ok(ShmBuffer {
            refcnt: 0,
            file,
            mmap,
            buffer,
            id,
            last_damage: Vec::new(),
        })
    }
    pub fn acquire(&mut self) {
        self.refcnt += 1;
    }
    pub fn release(&mut self) {
        self.refcnt -= 1;
    }
 }
 pub struct BufferManager {
    pub buffers: Vec<ShmBuffer>,
    pub next_id: u32,
 }
 impl BufferManager {
    pub fn new() -> BufferManager {
        BufferManager {
            buffers: Vec::new(),
            next_id: 0,
        }
    }
    pub fn clear_buffers(&mut self) {
        for buf in self.buffers.iter_mut() {
            buf.buffer.destroy()
        }
        self.buffers.clear()
    }
    pub fn next_buffer(&mut self) -> Option<&mut ShmBuffer> {
        for buf in self.buffers.iter_mut() {
            if buf.refcnt == 0 {
                return Some(buf);
            }
        }
        None
    }
    pub fn add_buffer<D>(
        &mut self,
        wl_shm: &wl_shm::WlShm,
        dimensions: (i32, i32),
        qh: &QueueHandle<D>,
    ) where
        D: Dispatch<wl_shm_pool::WlShmPool, ()> + Dispatch<wl_buffer::WlBuffer, ()> + 'static,
    {
        let mut buf = ShmBuffer::new(
            wl_shm,
            qh,
            dimensions.0,
            dimensions.1,
            dimensions.0 * 4,
            wl_shm::Format::Argb8888,
            self.next_id,
        )
        .expect("unable to add buffer");
        self.next_id += 1;
        BufferView::new(&mut buf.mmap, (dimensions.0 as u32, dimensions.1 as u32));
        self.buffers.push(buf);
    }
 }
 pub struct BufferView<'a> {
    view: &'a mut [u32],
    dimensions: (u32, u32),
    subdimensions: Option<(u32, u32, u32, u32)>,
 }
-impl<'a> BufferView<'a> {
+impl<'a> Buffer<'a> {
-    pub fn new(buf: &'a mut MmapMut, dimensions: (u32, u32)) -> BufferView {
+    pub fn new(buf: &'a mut MmapMut, dimensions: (u32, u32)) -> Buffer {
-        let view = unsafe {
+        Buffer {
-            std::slice::from_raw_parts_mut(
+            buf,
                buf.as_mut_ptr() as *mut u32,
                (dimensions.0 * dimensions.1) as usize,
            )
        };
        BufferView {
            view,
            dimensions,
            subdimensions: None,
        }
    }
    #[inline]
    pub fn get_bounds(&self) -> (u32, u32, u32, u32) {
        if let Some(subdim) = self.subdimensions {
            subdim
@@ -208,20 +25,68 @@ impl<'a> BufferView<'a> {
        }
    }
-    pub fn subdimensions(&mut self, subdimensions: (u32, u32, u32, u32)) -> BufferView {
+    pub fn get_signed_bounds(&self) -> (i32, i32, i32, i32) {
        if let Some(subdim) = self.subdimensions {
            (
                subdim.0 as i32,
                subdim.1 as i32,
                subdim.2 as i32,
                subdim.3 as i32,
            )
        } else {
            (0, 0, self.dimensions.0 as i32, self.dimensions.1 as i32)
        }
    }
    pub fn copy_to(&self, other: &mut Buffer, (x, y, width, height): (i32, i32, i32, i32)) {
        debug_assert!(self.dimensions == other.dimensions);
        debug_assert!(self.subdimensions.is_none() && other.subdimensions.is_none());
        if x == 0 && width as u32 == self.dimensions.0 {
            // Full-width copy
            let offset = y as isize * self.dimensions.0 as isize;
            let n = height as usize * self.dimensions.0 as usize;
            unsafe {
                std::ptr::copy(
                    (self.buf.as_ptr() as *const u32).offset(offset),
                    (other.buf.as_mut_ptr() as *mut u32).offset(offset),
                    n,
                );
            }
        } else {
            // Row-by-row copy
            for cur_y in y as isize..(y + height) as isize {
                let offset = x as isize + cur_y as isize * self.dimensions.0 as isize;
                unsafe {
                    std::ptr::copy(
                        (self.buf.as_ptr() as *const u32).offset(offset),
                        (other.buf.as_mut_ptr() as *mut u32).offset(offset),
                        width as usize,
                    );
                }
            }
        }
    }
    pub fn subdimensions(
        &mut self,
        subdimensions: (u32, u32, u32, u32),
    ) -> Result<Buffer, ::std::io::Error> {
        let bounds = self.get_bounds();
-        if cfg!(debug_assertions)
+        if subdimensions.0 + subdimensions.2 >= bounds.2
-            && (subdimensions.0 + subdimensions.2 > bounds.2
+            || subdimensions.1 + subdimensions.3 >= bounds.3
                || subdimensions.1 + subdimensions.3 > bounds.3)
        {
-            panic!(
+            return Err(::std::io::Error::new(
-                "cannot create subdimensions larger than buffer: {:?} > {:?}",
+                ::std::io::ErrorKind::Other,
-                subdimensions, bounds
+                format!(
-            );
+                    "cannot create subdimensions larger than buffer: {:?} > {:?}",
                    subdimensions, bounds
                ),
            ));
        }
-        BufferView {
+        Ok(Buffer {
-            view: self.view,
+            buf: self.buf,
            dimensions: self.dimensions,
            subdimensions: Some((
                subdimensions.0 + bounds.0,
@@ -229,24 +94,23 @@ impl<'a> BufferView<'a> {
                subdimensions.2,
                subdimensions.3,
            )),
-        }
+        })
    }
-    pub fn subgeometry(&mut self, geo: Geometry) -> BufferView {
+    pub fn offset(&mut self, offset: (u32, u32)) -> Result<Buffer, ::std::io::Error> {
        self.subdimensions((geo.x, geo.y, geo.width, geo.height))
    }
    pub fn offset(&mut self, offset: (u32, u32)) -> BufferView {
        let bounds = self.get_bounds();
-        if cfg!(debug_assertions) && (offset.0 > bounds.2 || offset.1 > bounds.3) {
+        if offset.0 > bounds.2 || offset.1 > bounds.3 {
-            panic!(
+            return Err(::std::io::Error::new(
-                "cannot create offset outside buffer: {:?} > {:?}",
+                ::std::io::ErrorKind::Other,
-                offset, bounds
+                format!(
-            );
+                    "cannot create offset outside buffer: {:?} > {:?}",
                    offset, bounds
                ),
            ));
        }
-        BufferView {
+        Ok(Buffer {
-            view: self.view,
+            buf: self.buf,
            dimensions: self.dimensions,
            subdimensions: Some((
                offset.0 + bounds.0,
@@ -254,42 +118,63 @@ impl<'a> BufferView<'a> {
                bounds.2 - offset.0,
                bounds.3 - offset.1,
            )),
-        }
+        })
    }
-    pub fn memset(&mut self, c: Color) {
+    pub fn memset(&mut self, c: &Color) {
        if let Some(subdim) = self.subdimensions {
-            for y in subdim.1..(subdim.1 + subdim.3) {
+            unsafe {
-                let start = (subdim.0 + y * self.dimensions.0) as usize;
+                let ptr = self.buf.as_mut_ptr();
-                let end = start + subdim.2 as usize;
+                for y in subdim.1..(subdim.1 + subdim.3) {
-                self.view[start..end].fill(c.0);
+                    for x in subdim.0..(subdim.0 + subdim.2) {
                        *((ptr as *mut u32).offset((x + y * self.dimensions.0) as isize)) =
                            c.as_argb8888();
                    }
                }
            }
        } else {
-            self.view.fill(c.0);
+            unsafe {
-        }
+                let ptr = self.buf.as_mut_ptr();
-    }
+                for p in 0..(self.dimensions.0 * self.dimensions.1) {
-
+                    *((ptr as *mut u32).offset(p as isize)) = c.as_argb8888();
-    pub fn clear(&mut self) {
+                }
        if let Some(subdim) = self.subdimensions {
            for y in subdim.1..(subdim.1 + subdim.3) {
                let start = (subdim.0 + y * self.dimensions.0) as usize;
                let end = start + subdim.2 as usize;
                self.view[start..end].fill(0x0);
            }
        } else {
            self.view.fill(0x0);
        }
    }
-    #[inline]
+    pub fn put(&mut self, pos: (u32, u32), c: &Color) -> Result<(), ::std::io::Error> {
-    pub fn put_raw(&mut self, pos: (u32, u32), c: Color) {
+        let true_pos = if let Some(subdim) = self.subdimensions {
-        self.view[(pos.0 + pos.1 * self.dimensions.0) as usize] = c.0
+            if pos.0 >= subdim.2 || pos.1 >= subdim.3 {
-    }
+                return Err(::std::io::Error::new(
                    ::std::io::ErrorKind::Other,
                    format!(
                        "put({:?}) is not within subdimensions of buffer ({:?})",
                        pos, subdim
                    ),
                ));
            }
            (pos.0 + subdim.0, pos.1 + subdim.1)
        } else {
            if pos.0 >= self.dimensions.0 || pos.1 >= self.dimensions.1 {
                return Err(::std::io::Error::new(
                    ::std::io::ErrorKind::Other,
                    format!(
                        "put({:?}) is not within dimensions of buffer ({:?})",
                        pos, self.dimensions
                    ),
                ));
            }
            pos
        };
-    #[inline]
+        unsafe {
-    pub fn put_line_raw(&mut self, pos: (u32, u32), len: u32, c: Color) {
+            let ptr = self
-        let start = (pos.0 + (pos.1 * self.dimensions.0)) as usize;
+                .buf
-        let len = len as usize;
+                .as_mut_ptr()
-        self.view[start..start + len].fill(c.0);
+                .offset(4 * (true_pos.0 + (true_pos.1 * self.dimensions.0)) as isize);
            *(ptr as *mut u32) = c.as_argb8888();
        };
        Ok(())
    }
 }
@@ -0,0 +1,24 @@
 use crate::keyboard::{KeyState, ModifiersState};
 #[derive(Clone)]
 pub enum Cmd {
    Exit,
    Draw,
    ForceDraw,
    ToggleVisible,
    MouseClick {
        btn: u32,
        pos: (u32, u32),
    },
    MouseScroll {
        scroll: (f64, f64),
        pos: (u32, u32),
    },
    KeyboardTest,
    Keyboard {
        key: u32,
        key_state: KeyState,
        modifiers_state: ModifiersState,
        interpreted: Option<String>,
    },
 }
@@ -1,42 +1,71 @@
-#[derive(Copy, Clone)]
+use serde::{Deserialize, Serialize};
-pub struct Color(pub u32);
+
 #[derive(Serialize, Deserialize, Debug, Clone, Copy, Default)]
 pub struct Color {
    red: f32,
    green: f32,
    blue: f32,
    opacity: f32,
 }
 impl Color {
-    pub const WHITE: Color = Color(0xFFFFFFFF);
+    pub fn new(red: f32, green: f32, blue: f32, opacity: f32) -> Color {
-    pub const GREY35: Color = Color(0xFF595959);
+        let (red, green, blue, opacity) = clamp(red, green, blue, opacity);
-    pub const GREY50: Color = Color(0xFF7F7F7F);
+        Color {
-    pub const GREY75: Color = Color(0xFFBFBFBF);
+            red,
-    pub const GREY80: Color = Color(0xFFCCCCCC);
+            green,
-    pub const RED: Color = Color(0xFFFF0000);
+            blue,
-    pub const YELLOW: Color = Color(0xFFFFFF00);
+            opacity,
    pub const LIGHTGREEN: Color = Color(0xFF7FFF7F);
    pub const LIGHTORANGE: Color = Color(0xFFFFBF00);
    pub const DARKORANGE: Color = Color(0xFFFF7F00);
    pub const BUFF: Color = Color(0xFFFFBF7F);
    #[allow(unused)]
    pub fn new(red: u8, green: u8, blue: u8, opacity: u8) -> Color {
        Color((opacity as u32) << 24 | (red as u32) << 16 | (green as u32) << 8 | (blue as u32))
    }
    fn red(self) -> u8 {
        ((self.0 >> 16) & 0xFF) as u8
    }
    fn green(self) -> u8 {
        ((self.0 >> 8) & 0xFF) as u8
    }
    fn blue(self) -> u8 {
        (self.0 & 0xFF) as u8
    }
    pub fn alpha(self, alpha: f32) -> Color {
        unsafe {
            Color(
                (255. * alpha).to_int_unchecked::<u32>() << 24
                    | (self.red() as f32 * alpha).to_int_unchecked::<u32>() << 16
                    | (self.green() as f32 * alpha).to_int_unchecked::<u32>() << 8
                    | (self.blue() as f32 * alpha).to_int_unchecked::<u32>(),
            )
        }
    }
    pub fn blend(&self, other: &Color, ratio: f32) -> Color {
        let ratio = clamp_f32(ratio, 0.0, 1.0);
        Color {
            red: blend_f32(self.red, other.red, ratio),
            green: blend_f32(self.green, other.green, ratio),
            blue: blend_f32(self.blue, other.blue, ratio),
            opacity: blend_f32(self.opacity, other.opacity, ratio),
        }
    }
    #[inline]
    pub fn as_argb8888(&self) -> u32 {
        ((255.0 * self.opacity) as u32 & 0xFF) << 24
            | ((255.0 * self.red) as u32 & 0xFF) << 16
            | ((255.0 * self.green) as u32 & 0xFF) << 8
            | ((255.0 * self.blue) as u32 & 0xFF)
    }
 }
 #[inline]
 fn clamp(r: f32, g: f32, b: f32, o: f32) -> (f32, f32, f32, f32) {
    clamp_naive(r, g, b, o)
 }
 #[inline]
 fn clamp_naive(r: f32, g: f32, b: f32, o: f32) -> (f32, f32, f32, f32) {
    (
        clamp_f32(r, 0.0, 1.0),
        clamp_f32(g, 0.0, 1.0),
        clamp_f32(b, 0.0, 1.0),
        clamp_f32(o, 0.0, 1.0),
    )
 }
 #[inline]
 fn clamp_f32(v: f32, a: f32, b: f32) -> f32 {
    if v > b {
        b
    } else if v < a {
        a
    } else {
        v
    }
 }
 #[inline]
 fn blend_f32(a: f32, b: f32, r: f32) -> f32 {
    a + ((b - a) * r)
 }
@@ -1,39 +1,29 @@
-use serde::{self, Deserialize, Serialize};
+use crate::cmd::Cmd;
-
+use crate::color::Color;
-use std::collections::HashMap;
+use crate::widget;
 use std::default::Default;
 use std::sync::{Arc, Mutex};
 use crate::{
-    event::Events,
+    fonts::{FontMap, FontRef},
-    fonts::{find_font, FontMap},
+    widgets,
    widgets::{
        Backlight, Battery, Calendar, Clock, Date, HorizontalLayout, IndexedLayout, Interface,
        InvertedHorizontalLayout, InvertedVerticalLayout, Layout, Line, Margin, PulseAudio,
        VerticalLayout, Widget as RealWidget,
    },
 };
 use chrono::NaiveDateTime;
 use serde::{Deserialize, Serialize};
 use std::default::Default;
 use std::{collections::HashMap, sync::mpsc::Sender};
 #[derive(Serialize, Deserialize, Clone, Debug)]
-#[serde(rename_all = "snake_case")]
+#[serde(rename_all = "camelCase")]
 pub enum OperationMode {
    LayerSurface((u32, u32)),
    XdgToplevel,
 }
 #[derive(Serialize, Deserialize, Clone, Debug)]
 #[serde(rename_all = "snake_case")]
 pub enum Widget {
    Margin {
        margins: (u32, u32, u32, u32),
        widget: Box<Widget>,
    },
    Fixed {
        width: u32,
        height: u32,
        widget: Box<Widget>,
    },
    HorizontalLayout(Vec<Widget>),
    InvertedHorizontalLayout(Vec<Widget>),
    VerticalLayout(Vec<Widget>),
    InvertedVerticalLayout(Vec<Widget>),
    HorizontalLine(u32),
    VerticalLine(u32),
    Clock {
        font: Option<String>,
        font_size: f32,
@@ -46,342 +36,315 @@ pub enum Widget {
        font_primary: Option<String>,
        font_secondary: Option<String>,
        font_size: f32,
-        sections_x: i32,
+        sections: u32,
        sections_y: i32,
    },
    Launcher {
        font: Option<String>,
        font_size: f32,
-        launch_cmd: Option<String>,
+        length: u32,
        #[serde(default)]
        app_opener: String,
        #[serde(default)]
        term_opener: String,
        #[serde(default)]
        url_opener: String,
    },
    Battery {
        font: Option<String>,
        font_size: f32,
        length: u32,
    },
    Backlight {
-        device: Option<String>,
+        #[serde(default)]
        device: String,
        font: Option<String>,
        font_size: f32,
        length: u32,
    },
    #[cfg(feature = "pulseaudio-widget")]
    PulseAudio {
        font: Option<String>,
        font_size: f32,
        length: u32,
    },
    #[cfg(feature = "alsa-widget")]
    AlsaSound {
        font: Option<String>,
        font_size: f32,
        length: u32,
    },
 }
 impl Default for OperationMode {
    fn default() -> OperationMode {
        OperationMode::LayerSurface((1024, 768))
    }
 }
 #[derive(Serialize, Deserialize, Clone, Debug)]
 #[serde(rename_all = "snake_case")]
 pub struct Config {
    pub font_paths: Option<HashMap<String, String>>,
    pub widget: Widget,
    pub mode: OperationMode,
    pub background: Option<u32>,
    pub server: Option<bool>,
 }
 impl Config {
    pub fn generate_v1() -> Config {
        let has_battery = Battery::detect();
        let has_backlight = Backlight::detect();
        let sans = find_font("sans");
        let monospace = find_font("monospace");
        let mut bars = Vec::new();
        if has_battery {
            bars.push(Widget::Margin {
                margins: (0, 0, 0, 8),
                widget: Box::new(Widget::Battery {
                    font: None,
                    font_size: 24.,
                }),
            });
        }
        if has_backlight {
            bars.push(Widget::Margin {
                margins: (0, 0, 0, 8),
                widget: Box::new(Widget::Backlight {
                    device: None,
                    font: None,
                    font_size: 24.,
                }),
            });
        }
        bars.push(Widget::Margin {
            margins: (0, 0, 0, 8),
            widget: Box::new(Widget::PulseAudio {
                font: None,
                font_size: 24.,
            }),
        });
        let widget = Widget::Margin {
            margins: (20, 20, 20, 20),
            widget: Box::new(Widget::VerticalLayout(vec![
                Widget::HorizontalLayout(vec![
                    Widget::VerticalLayout(vec![
                        Widget::Date {
                            font: None,
                            font_size: 48.,
                        },
                        Widget::Clock {
                            font: None,
                            font_size: 256.,
                        },
                    ]),
                    Widget::Margin {
                        margins: (88, 0, 0, 0),
                        widget: Box::new(Widget::VerticalLayout(bars)),
                    },
                ]),
                Widget::Calendar {
                    font_primary: None,
                    font_secondary: None,
                    font_size: 36.,
                    sections_x: 3,
                    sections_y: 1,
                },
                Widget::Launcher {
                    font: None,
                    font_size: 32.,
                    launch_cmd: None,
                },
            ])),
        };
        let map = HashMap::from([
            ("sans".to_string(), sans),
            ("monospace".to_string(), monospace),
        ]);
        Config {
            font_paths: Some(map),
            widget: widget,
            mode: OperationMode::LayerSurface((1024, 768)),
            background: Some(0xFAFAFAFA),
            server: None,
        }
    }
    pub fn generate_v2(clay: bool) -> Config {
        let has_battery = Battery::detect();
        let has_backlight = Backlight::detect();
        let sans = find_font("sans");
        let monospace = find_font("monospace");
        let mut bars = Vec::new();
        if has_battery {
            bars.push(Widget::Margin {
                margins: (16, 8, 8, 0),
                widget: Box::new(Widget::Battery {
                    font: None,
                    font_size: 24.,
                }),
            });
        }
        if has_backlight {
            bars.push(Widget::Margin {
                margins: (16, 8, 8, 0),
                widget: Box::new(Widget::Backlight {
                    device: None,
                    font: None,
                    font_size: 24.,
                }),
            });
        }
        bars.push(Widget::Margin {
            margins: (16, 8, 8, 0),
            widget: Box::new(Widget::PulseAudio {
                font: None,
                font_size: 24.,
            }),
        });
        let widget = Widget::VerticalLayout(vec![
            Widget::HorizontalLayout(vec![
                Widget::Margin {
                    margins: (8, 0, 0, 0),
                    widget: Box::new(Widget::Clock {
                        font: None,
                        font_size: 128.,
                    }),
                },
                Widget::Margin {
                    margins: (16, 64, 0, 0),
                    widget: Box::new(Widget::Date {
                        font: None,
                        font_size: 48.,
                    }),
                },
                Widget::VerticalLayout(bars),
            ]),
            Widget::HorizontalLine(1),
            Widget::InvertedHorizontalLayout(vec![
                Widget::Margin {
                    margins: (16, 8, 16, 0),
                    widget: Box::new(Widget::Calendar {
                        font_primary: None,
                        font_secondary: None,
                        font_size: 24.,
                        sections_x: 1,
                        sections_y: if clay { -1 } else { 3 },
                    }),
                },
                Widget::VerticalLine(1),
                Widget::Margin {
                    margins: (8, 0, 0, 0),
                    widget: Box::new(Widget::Launcher {
                        font: None,
                        font_size: 32.,
                        launch_cmd: None,
                    }),
                },
            ]),
        ]);
        let map = HashMap::from([
            ("sans".to_string(), sans),
            ("monospace".to_string(), monospace),
        ]);
        Config {
            font_paths: Some(map),
            widget: widget,
            mode: if clay {
                OperationMode::XdgToplevel
            } else {
                OperationMode::LayerSurface((1024, 1))
            },
            background: Some(0xFAFAFAFA),
            server: None,
        }
    }
 }
 fn leak_or_default(v: Option<String>, d: &'static str) -> &'static str {
    match v {
        Some(v) => Box::leak(v.into_boxed_str()),
        None => d,
    }
 }
 fn leak_or_none(v: Option<String>) -> Option<&'static str> {
    match v {
        Some(v) => Some(Box::leak(v.into_boxed_str())),
        None => None,
    }
 }
 impl Widget {
-    pub fn construct_widgets(
+    pub fn construct<'a>(
        self,
-        v: &mut Vec<Box<dyn RealWidget>>,
+        time: NaiveDateTime,
-        mut fm: &mut FontMap,
+        tx: Sender<Cmd>,
-        events: &Arc<Mutex<Events>>,
+        fonts: &'a FontMap,
-    ) {
+    ) -> Option<Box<dyn widget::Widget + Send + 'a>> {
        match self {
-            Widget::Margin { widget, .. } => widget.construct_widgets(v, fm, events),
+            Widget::Margin { margins, widget } => match widget.construct(time, tx, fonts) {
-            Widget::HorizontalLayout(widgets) => widgets
+                Some(w) => Some(widget::Margin::new(margins, w)),
-                .into_iter()
+                None => None,
-                .for_each(|w| w.construct_widgets(v, fm, events)),
+            },
-            Widget::InvertedHorizontalLayout(widgets) => widgets
+            Widget::Fixed {
-                .into_iter()
+                width,
-                .for_each(|w| w.construct_widgets(v, fm, events)),
+                height,
-            Widget::VerticalLayout(widgets) => widgets
+                widget,
-                .into_iter()
+            } => match widget.construct(time, tx, fonts) {
-                .for_each(|w| w.construct_widgets(v, fm, events)),
+                Some(w) => Some(widget::Fixed::new((width, height), w)),
-            Widget::InvertedVerticalLayout(widgets) => widgets
+                None => None,
-                .into_iter()
+            },
-                .for_each(|w| w.construct_widgets(v, fm, events)),
+            Widget::HorizontalLayout(widgets) => Some(widget::HorizontalLayout::new(
-            Widget::HorizontalLine(width) => v.push(Box::new(Line::new(width, false))),
+                widgets
-            Widget::VerticalLine(width) => v.push(Box::new(Line::new(width, true))),
+                    .into_iter()
-            Widget::Clock { font, font_size } => v.push(Box::new(Clock::new(
+                    .map(|x| x.construct(time, tx.clone(), fonts))
-                &mut fm,
+                    .filter(|x| x.is_some())
-                leak_or_default(font, "sans"),
+                    .map(|x| x.unwrap())
                    .collect(),
            )),
            Widget::VerticalLayout(widgets) => Some(widget::VerticalLayout::new(
                widgets
                    .into_iter()
                    .map(|x| x.construct(time, tx.clone(), fonts))
                    .filter(|x| x.is_some())
                    .map(|x| x.unwrap())
                    .collect(),
            )),
            Widget::Clock { font, font_size } => match widgets::clock::Clock::new(
                time,
                get_font(&font.or_else(|| Some("sans".to_string())).unwrap(), &fonts),
                font_size,
-            ))),
+            ) {
-            Widget::Date { font, font_size } => v.push(Box::new(Date::new(
+                Ok(w) => Some(w),
-                &mut fm,
+                Err(_) => None,
-                leak_or_default(font, "sans"),
+            },
            Widget::Date { font, font_size } => match widgets::date::Date::new(
                time,
                get_font(&font.or_else(|| Some("sans".to_string())).unwrap(), &fonts),
                font_size,
-            ))),
+            ) {
                Ok(w) => Some(w),
                Err(_) => None,
            },
            Widget::Calendar {
                font_primary,
                font_secondary,
                font_size,
-                sections_x,
+                sections,
-                sections_y,
+            } => Some(widgets::calendar::Calendar::new(
-            } => v.push(Box::new(Calendar::new(
+                time,
-                &mut fm,
+                get_font(
-                leak_or_default(font_primary, "monospace"),
+                    &font_primary.or_else(|| Some("sans".to_string())).unwrap(),
-                leak_or_default(font_secondary, "sans"),
+                    &fonts,
                ),
                get_font(
                    &font_secondary.or_else(|| Some("mono".to_string())).unwrap(),
                    &fonts,
                ),
                font_size,
-                sections_x,
+                sections,
-                sections_y,
+            )),
            ))),
            Widget::Launcher {
                font,
                font_size,
-                launch_cmd,
+                length,
-            } => v.push(Box::new(Interface::new(
+                app_opener,
-                events.clone(),
+                term_opener,
-                &mut fm,
+                url_opener,
-                leak_or_default(font, "sans"),
+            } => Some(widgets::launcher::Launcher::new(
                get_font(&font.or_else(|| Some("sans".to_string())).unwrap(), &fonts),
                font_size,
-                launch_cmd,
+                length,
-            ))),
+                tx,
-            Widget::Battery { font, font_size } => v.push(Box::new(Battery::new(
+                app_opener,
-                events.clone(),
+                term_opener,
-                &mut fm,
+                if url_opener.is_empty() {
-                leak_or_default(font, "sans"),
+                    "xdg_open ".to_string()
                } else {
                    url_opener
                },
            )),
            Widget::Battery {
                font,
                font_size,
-            ))),
+                length,
            } => {
                match widgets::battery::UpowerBattery::new(
                    get_font(&font.or_else(|| Some("sans".to_string())).unwrap(), &fonts),
                    font_size,
                    length,
                    tx,
                ) {
                    Ok(w) => Some(w),
                    Err(_) => None,
                }
            }
            Widget::Backlight {
                device,
                font,
                font_size,
-            } => v.push(Box::new(Backlight::new(
+                length,
-                leak_or_none(device),
+            } => {
-                &mut fm,
+                let d = if device == "" {
-                leak_or_default(font, "sans"),
+                    "intel_backlight"
                } else {
                    &device
                };
                match widgets::backlight::Backlight::new(
                    d,
                    get_font(&font.or_else(|| Some("sans".to_string())).unwrap(), &fonts),
                    font_size,
                    length,
                ) {
                    Ok(w) => Some(w),
                    Err(_) => None,
                }
            }
            #[cfg(feature = "pulseaudio-widget")]
            Widget::PulseAudio {
                font,
                font_size,
-            ))),
+                length,
-            Widget::PulseAudio { font, font_size } => v.push(Box::new(PulseAudio::new(
+            } => {
-                events.clone(),
+                match widgets::audio::PulseAudio::new(
-                &mut fm,
+                    get_font(&font.or_else(|| Some("sans".to_string())).unwrap(), &fonts),
-                Box::leak(font.unwrap_or_else(|| "sans".to_string()).into_boxed_str()),
+                    font_size,
                    length,
                    tx,
                ) {
                    Ok(w) => Some(w),
                    Err(_) => None,
                }
            }
            #[cfg(feature = "alsa-widget")]
            Widget::AlsaSound {
                font,
                font_size,
-            ))),
+                length,
-        }
+            } => {
-    }
+                match widgets::audio::Alsa::new(
-
+                    get_font(&font.or_else(|| Some("sans".to_string())).unwrap(), &fonts),
-    pub fn construct_layout(&self, idx: &mut usize) -> Box<dyn Layout> {
+                    font_size,
-        match self {
+                    length,
-            Widget::Margin { margins, widget } => {
+                ) {
-                Margin::new(widget.construct_layout(idx), *margins)
+                    Ok(w) => Some(w),
                    Err(_) => None,
                }
            }
            Widget::HorizontalLayout(widgets) => {
                HorizontalLayout::new(widgets.iter().map(|w| w.construct_layout(idx)).collect())
            }
            Widget::InvertedHorizontalLayout(widgets) => InvertedHorizontalLayout::new(
                widgets.iter().map(|w| w.construct_layout(idx)).collect(),
            ),
            Widget::VerticalLayout(widgets) => {
                VerticalLayout::new(widgets.iter().map(|w| w.construct_layout(idx)).collect())
            }
            Widget::InvertedVerticalLayout(widgets) => InvertedVerticalLayout::new(
                widgets.iter().map(|w| w.construct_layout(idx)).collect(),
            ),
            _ => IndexedLayout::new({
                let i = *idx;
                *idx += 1;
                i
            }),
        }
    }
 }
 #[derive(Serialize, Deserialize, Debug)]
 #[serde(rename_all = "camelCase")]
 pub enum OutputMode {
    All,
    Active,
 }
 impl Default for OutputMode {
    fn default() -> Self {
        OutputMode::Active
    }
 }
 fn default_fonts() -> HashMap<String, String> {
    let mut map = HashMap::with_capacity(2);
    map.insert("mono".to_string(), "mono".to_string());
    map.insert("sans".to_string(), "sans".to_string());
    map
 }
 #[derive(Serialize, Deserialize, Debug)]
 #[serde(rename_all = "camelCase")]
 pub struct Config {
    pub output_mode: OutputMode,
    pub scale: u32,
    pub background: Color,
    pub widget: Widget,
    #[serde(default = "default_fonts")]
    pub fonts: HashMap<String, String>,
 }
 impl Default for Config {
    fn default() -> Self {
        Config {
            widget: Widget::Margin {
                margins: (20, 20, 20, 20),
                widget: Box::new(Widget::VerticalLayout(vec![
                    Widget::HorizontalLayout(vec![
                        Widget::Margin {
                            margins: (0, 88, 0, 32),
                            widget: Box::new(Widget::VerticalLayout(vec![
                                Widget::Date {
                                    font: None,
                                    font_size: 64.0,
                                },
                                Widget::Clock {
                                    font: None,
                                    font_size: 256.0,
                                },
                            ])),
                        },
                        Widget::VerticalLayout(vec![
                            Widget::Margin {
                                margins: (0, 0, 0, 8),
                                widget: Box::new(Widget::Battery {
                                    font: None,
                                    font_size: 24.0,
                                    length: 0,
                                }),
                            },
                            Widget::Margin {
                                margins: (0, 0, 0, 8),
                                widget: Box::new(Widget::Backlight {
                                    device: "intel_backlight".to_string(),
                                    font: None,
                                    font_size: 24.0,
                                    length: 0,
                                }),
                            },
                            #[cfg(feature = "pulseaudio-widget")]
                            Widget::Margin {
                                margins: (0, 0, 0, 8),
                                widget: Box::new(Widget::PulseAudio {
                                    font: None,
                                    font_size: 24.0,
                                    length: 0,
                                }),
                            },
                        ]),
                    ]),
                    Widget::Calendar {
                        font_primary: None,
                        font_secondary: None,
                        font_size: 16.0,
                        sections: 3,
                    },
                    Widget::Launcher {
                        font: None,
                        font_size: 32.0,
                        length: 0,
                        app_opener: "".to_string(),
                        term_opener: "".to_string(),
                        url_opener: "".to_string(),
                    },
                ])),
            },
            output_mode: Default::default(),
            scale: 1,
            background: Color::new(0.0, 0.0, 0.0, 0.9),
            fonts: default_fonts(),
        }
    }
 }
 #[inline]
 fn get_font<'a>(name: &str, map: &'a FontMap) -> FontRef<'a> {
    match map.get(name) {
        Some(f) => f,
        None => panic!("Font {} is missing from the config", name),
    }
 }
@@ -0,0 +1,61 @@
 use serde::{de::DeserializeOwned, Serialize};
 use std::io::BufRead;
 pub enum ConfigFmt {
    #[cfg(feature = "yaml-cfg")]
    Yaml,
    #[cfg(feature = "json-cfg")]
    Json,
 }
 pub const CONFIG_NAMES: &[&str] = &[
    #[cfg(feature = "yaml-cfg")]
    "config.yaml",
    #[cfg(feature = "json-cfg")]
    "config.json",
 ];
 impl ConfigFmt {
    #[inline]
    pub fn new(ext: &str) -> Option<Self> {
        match ext {
            #[cfg(feature = "yaml-cfg")]
            "yaml" => Some(ConfigFmt::Yaml),
            #[cfg(feature = "json-cfg")]
            "json" => Some(ConfigFmt::Json),
            _ => None,
        }
    }
    #[inline]
    pub fn from_reader<B: BufRead, T: DeserializeOwned>(&self, r: B) -> T {
        match self {
            #[cfg(feature = "yaml-cfg")]
            ConfigFmt::Yaml => serde_yaml::from_reader(r).unwrap(),
            #[cfg(feature = "json-cfg")]
            ConfigFmt::Json => serde_json::from_reader(r).unwrap(),
        }
    }
    #[inline]
    pub fn to_string<T: Serialize + ?Sized>(&self, src: &T) -> String {
        match self {
            #[cfg(feature = "yaml-cfg")]
            ConfigFmt::Yaml => serde_yaml::to_string(&src).unwrap(),
            #[cfg(feature = "json-cfg")]
            ConfigFmt::Json => serde_json::to_string_pretty(&src).unwrap(),
        }
    }
 }
 impl Default for ConfigFmt {
    fn default() -> Self {
        // attributes require curly braces to work
        #[cfg(feature = "yaml-cfg")]
        {
            ConfigFmt::Yaml
        }
        #[cfg(all(feature = "json-cfg", not(feature = "yaml-cfg")))]
        {
            ConfigFmt::Json
        }
    }
 }
@@ -0,0 +1,57 @@
 use serde::{Deserialize, Serialize};
 use std::collections::HashMap;
 use std::env;
 use std::error::Error;
 use std::fs::{create_dir_all, File, OpenOptions};
 use std::path::PathBuf;
 #[derive(Debug, PartialEq, Serialize, Deserialize, Clone, Default)]
 pub struct Data {
    pub entries: HashMap<String, i64>,
 }
 impl Data {
    pub fn load() -> Result<Data, Box<dyn Error>> {
        Ok(serde_yaml::from_reader(Self::read_file()?)?)
    }
    pub fn save(&self) -> Result<(), Box<dyn Error>> {
        Ok(serde_yaml::to_writer(Self::write_file()?, self)?)
    }
    fn read_file() -> Result<File, Box<dyn Error>> {
        Ok(OpenOptions::new()
            .create(true)
            .write(true)
            .read(true)
            .open(Self::path()?)?)
    }
    fn write_file() -> Result<File, Box<dyn Error>> {
        Ok(OpenOptions::new()
            .create(true)
            .write(true)
            .truncate(true)
            .open(Self::path()?)?)
    }
    fn path() -> Result<PathBuf, Box<dyn Error>> {
        let xdg_cache = match env::var_os("XDG_CACHE_HOME") {
            Some(s) => s
                .into_string()
                .map_err(|_| "Unable to resolve $XDG_CACHE_HOME")?,
            None => format!(
                "{}/.cache",
                env::var_os("HOME")
                    .ok_or("Unable to resolve $HOME")?
                    .into_string()
                    .map_err(|_| "Unable to resolve $HOME")?
            ),
        };
        let cache_dir = PathBuf::from(xdg_cache).join("wldash");
        create_dir_all(&cache_dir)?;
        Ok(cache_dir.join("data.yaml"))
    }
 }
@@ -0,0 +1,113 @@
 extern crate ini;
 use ini::{Ini, ParseOption};
 use itertools::Itertools;
 use std::cmp::Ordering;
 use std::env;
 use std::error::Error;
 use std::io::Error as io_error;
 use std::io::ErrorKind;
 use walkdir::WalkDir;
 #[derive(Clone, Debug, Eq, Hash)]
 pub struct Desktop {
    pub entry_type: String,
    pub name: String,
    pub no_display: bool,
    pub hidden: bool,
    pub exec: Option<String>,
    pub url: Option<String>,
    pub term: bool,
    pub keywords: Vec<String>,
 }
 impl Desktop {
    fn parse(f: &str) -> Result<Desktop, Box<dyn Error>> {
        let file = Ini::load_from_file_opt(
            f,
            ParseOption {
                enabled_quote: false,
                enabled_escape: false,
            },
        )?;
        match file.section(Some("Desktop Entry")) {
            Some(desktop) => Ok(Desktop {
                entry_type: desktop.get("Type").unwrap_or(&"".to_string()).to_string(),
                name: desktop.get("Name").unwrap_or(&"".to_string()).to_string(),
                term: desktop.get("Terminal").unwrap_or(&"".to_string()) == "true",
                no_display: desktop.get("NoDisplay").unwrap_or(&"".to_string()) == "true",
                hidden: desktop.get("Hidden").unwrap_or(&"".to_string()) == "true",
                exec: desktop.get("Exec").map(|x| x.to_string()),
                url: desktop.get("URL").map(|x| x.to_string()),
                keywords: desktop
                    .get("Keywords")
                    .map(|x| {
                        x.split(';')
                            .map(|y| y.trim().to_string())
                            .filter(|z| z != "")
                            .collect()
                    })
                    .unwrap_or_else(|| vec![]),
            }),
            None => Err(Box::new(io_error::new(
                ErrorKind::NotFound,
                "no desktop entry in file",
            ))),
        }
    }
    fn parse_dir(d: &str) -> Result<Vec<Desktop>, Box<dyn Error>> {
        let mut files: Vec<Desktop> = Vec::with_capacity(16);
        for entry in WalkDir::new(d) {
            let entry = entry?;
            let path = entry.path();
            if let Ok(d) = Desktop::parse(path.to_str().unwrap()) {
                files.push(d)
            }
        }
        Ok(files)
    }
 }
 impl Ord for Desktop {
    fn cmp(&self, other: &Self) -> Ordering {
        self.name.cmp(&other.name)
    }
 }
 impl PartialOrd for Desktop {
    fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
        Some(self.cmp(other))
    }
 }
 impl PartialEq for Desktop {
    fn eq(&self, other: &Self) -> bool {
        self.name == other.name
    }
 }
 pub fn load_desktop_files() -> Vec<Desktop> {
    let home = env::var_os("HOME").unwrap().into_string().unwrap();
    let xdg_data_home = match env::var_os("XDG_DATA_HOME") {
        Some(s) => s.into_string().unwrap(),
        None => format!("{}/.local/share", home),
    };
    let xdg_data_dirs = match env::var_os("XDG_DATA_DIRS") {
        Some(s) => s.into_string().unwrap(),
        None => "/usr/local/share:/usr/share".to_string(),
    };
    std::iter::once(xdg_data_home.as_str())
        .chain(xdg_data_dirs.split(':'))
        .map(|p| Desktop::parse_dir(&format!("{}/applications", p)))
        .filter_map(Result::ok)
        .flatten()
        .filter(|d| {
            !d.hidden && !d.no_display && (d.entry_type == "Application" || d.entry_type == "Link")
        })
        .unique_by(|x| x.name.clone())
        .collect()
 }
@@ -0,0 +1,261 @@
 use std::{
    cell::RefCell,
    ffi::CStr,
    fs::File,
    io,
    os::unix::io::{FromRawFd, RawFd},
    rc::Rc,
    time::SystemTime,
    time::UNIX_EPOCH,
 };
 #[cfg(target_os = "linux")]
 use nix::sys::memfd;
 use nix::{
    errno::Errno,
    fcntl,
    sys::{mman, stat},
    unistd,
 };
 use memmap::MmapMut;
 use wayland_client::{
    protocol::{wl_buffer, wl_shm, wl_shm_pool},
    Main,
 };
 /// A wrapper handling an SHM memory pool backed by a shared memory file
 ///
 /// This wrapper handles for you the creation of the shared memory file and its synchronization
 /// with the protocol.
 ///
 /// Mempool internally tracks the release of the buffers by the compositor. As such, creating a buffer
 /// that is not commited to a surface (and then never released by the server) would cause the Mempool
 /// to be stuck believing it is still in use.
 ///
 /// Mempool will also handle the destruction of buffers and as such the `destroy()` method should not
 /// be used on buffers created from Mempool.
 ///
 /// Overwriting the contents of the memory pool before it is completely freed may cause graphical
 /// glitches due to the possible corruption of data while the compositor is reading it.
 ///
 /// Mempool requires a callback that will be called when the pool becomes free, this
 /// happens when all the pools buffers are released by the server.
 pub struct MemPool {
    file: File,
    len: usize,
    pool: Main<wl_shm_pool::WlShmPool>,
    buffer_count: Rc<RefCell<u32>>,
    mmap: MmapMut,
    callback: Rc<RefCell<dyn FnMut(wayland_client::DispatchData)>>,
 }
 impl MemPool {
    /// Create a new memory pool associated with given shm
    pub fn new<F>(shm: Main<wl_shm::WlShm>, callback: F) -> io::Result<MemPool>
    where
        F: FnMut(wayland_client::DispatchData) + 'static,
    {
        let mem_fd = create_shm_fd()?;
        let mem_file = unsafe { File::from_raw_fd(mem_fd) };
        mem_file.set_len(128)?;
        let pool = shm.create_pool(mem_fd, 128);
        let mmap = unsafe { MmapMut::map_mut(&mem_file).unwrap() };
        Ok(MemPool {
            file: mem_file,
            len: 128,
            pool,
            buffer_count: Rc::new(RefCell::new(0)),
            mmap,
            callback: Rc::new(RefCell::new(callback)),
        })
    }
    /// Resize the memory pool
    ///
    /// This affect the size as it is seen by the wayland server. Even
    /// if you extend the temporary file size by writing to it, you need to
    /// call this method otherwise the server won't see the new size.
    ///
    /// Memory pools can only be extented, as such this method will do nothing
    /// if the requested new size is smaller than the current size.
    ///
    /// This method allows you to ensure the underlying pool is large enough to
    /// hold what you want to write to it.
    pub fn resize(&mut self, newsize: usize) -> io::Result<()> {
        if newsize > self.len {
            self.file.set_len(newsize as u64)?;
            self.pool.resize(newsize as i32);
            self.len = newsize;
            self.mmap = unsafe { MmapMut::map_mut(&self.file).unwrap() };
        }
        Ok(())
    }
    /// Create a new buffer to this pool
    ///
    /// The parameters are:
    ///
    /// - `offset`: the offset (in bytes) from the beginning of the pool at which this
    ///   buffer starts
    /// - `width`: the width of this buffer (in pixels)
    /// - `height`: the height of this buffer (in pixels)
    /// - `stride`: distance (in bytes) between the beginning of a row and the next one
    /// - `format`: the encoding format of the pixels. Using a format that was not
    ///   advertised to the `wl_shm` global by the server is a protocol error and will
    ///   terminate your connection
    pub fn buffer(
        &self,
        offset: i32,
        width: i32,
        height: i32,
        stride: i32,
        format: wl_shm::Format,
    ) -> wl_buffer::WlBuffer {
        *self.buffer_count.borrow_mut() += 1;
        let my_buffer_count = self.buffer_count.clone();
        let my_callback = self.callback.clone();
        let buffer = self
            .pool
            .create_buffer(offset, width, height, stride, format);
        buffer.quick_assign(move |buffer, event, dispatch_data| match event {
            wl_buffer::Event::Release => {
                buffer.destroy();
                let new_count = {
                    // borrow the buffer_count for as short as possible, in case
                    // the user wants to create a new buffer from the callback
                    let mut my_buffer_count = my_buffer_count.borrow_mut();
                    *my_buffer_count -= 1;
                    *my_buffer_count
                };
                if new_count == 0 {
                    (&mut *my_callback.borrow_mut())(dispatch_data);
                }
            }
            _ => unreachable!(),
        });
        (*buffer).clone().detach()
    }
    /// Uses the memmap crate to map the underlying shared memory file
    pub fn mmap(&mut self) -> &mut MmapMut {
        &mut self.mmap
    }
    /// Returns true if the pool contains buffers that are currently in use by the server
    pub fn is_used(&self) -> bool {
        *self.buffer_count.borrow() != 0
    }
 }
 impl Drop for MemPool {
    fn drop(&mut self) {
        self.pool.destroy();
    }
 }
 impl io::Write for MemPool {
    fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
        io::Write::write(&mut self.file, buf)
    }
    fn flush(&mut self) -> io::Result<()> {
        io::Write::flush(&mut self.file)
    }
 }
 impl io::Seek for MemPool {
    fn seek(&mut self, pos: io::SeekFrom) -> io::Result<u64> {
        io::Seek::seek(&mut self.file, pos)
    }
 }
 fn create_shm_fd() -> io::Result<RawFd> {
    // Only try memfd on linux
    #[cfg(target_os = "linux")]
    loop {
        match memfd::memfd_create(
            CStr::from_bytes_with_nul(b"smithay-client-toolkit\0").unwrap(),
            memfd::MemFdCreateFlag::MFD_CLOEXEC,
        ) {
            Ok(fd) => return Ok(fd),
            Err(Errno::EINTR) => continue,
            Err(Errno::ENOSYS) => break,
            Err(errno) => return Err(io::Error::from(errno)),
        }
    }
    // Fallback to using shm_open
    let sys_time = SystemTime::now();
    let mut mem_file_handle = format!(
        "/smithay-client-toolkit-{}",
        sys_time.duration_since(UNIX_EPOCH).unwrap().subsec_nanos()
    );
    loop {
        match mman::shm_open(
            mem_file_handle.as_str(),
            fcntl::OFlag::O_CREAT
                | fcntl::OFlag::O_EXCL
                | fcntl::OFlag::O_RDWR
                | fcntl::OFlag::O_CLOEXEC,
            stat::Mode::S_IRUSR | stat::Mode::S_IWUSR,
        ) {
            Ok(fd) => match mman::shm_unlink(mem_file_handle.as_str()) {
                Ok(_) => return Ok(fd),
                Err(errno) => match unistd::close(fd) {
                    Ok(_) => return Err(io::Error::from(errno)),
                    Err(errno) => return Err(io::Error::from(errno)),
                },
            },
            Err(Errno::EEXIST) => {
                // If a file with that handle exists then change the handle
                mem_file_handle = format!(
                    "/smithay-client-toolkit-{}",
                    sys_time.duration_since(UNIX_EPOCH).unwrap().subsec_nanos()
                );
                continue;
            }
            Err(Errno::EINTR) => continue,
            Err(errno) => return Err(io::Error::from(errno)),
        }
    }
 }
 pub struct DoubleMemPool {
    pool1: MemPool,
    pool2: MemPool,
    switch: bool,
 }
 impl DoubleMemPool {
    pub fn new(shm: Main<wl_shm::WlShm>) -> ::std::io::Result<DoubleMemPool> {
        Ok(DoubleMemPool {
            pool1: MemPool::new(shm.clone(), move |_| {})?,
            pool2: MemPool::new(shm.clone(), move |_| {})?,
            switch: false,
        })
    }
    pub fn pool(&mut self) -> Option<(&mut MemPool, &mut MemPool)> {
        let switch = self.switch;
        self.switch = !self.switch;
        let (last, cur) = if !switch {
            (&mut self.pool2, &mut self.pool1)
        } else {
            (&mut self.pool1, &mut self.pool2)
        };
        if cur.is_used() {
            None
        } else {
            Some((last, cur))
        }
    }
    pub fn never_mind(&mut self) {
        self.switch = !self.switch;
    }
 }
@@ -1,4 +1,4 @@
-use crate::buffer::BufferView;
+use crate::buffer::Buffer;
 use crate::{color::Color, fonts::FontRef};
 use rusttype::{point, Scale};
@@ -21,6 +21,7 @@ impl CachedGlyph {
        if let Some(bounding_box) = glyph.pixel_bounding_box() {
            let origin = (bounding_box.min.x, bounding_box.min.y);
            let dimensions = (
                (bounding_box.max.x - bounding_box.min.x) as u32,
                (bounding_box.max.y - bounding_box.min.y) as u32,
@@ -46,26 +47,19 @@ impl CachedGlyph {
        }
    }
-    fn draw(&self, buf: &mut BufferView, pos: (i32, i32), c: Color) {
+    fn draw(&self, buf: &mut Buffer, pos: (i32, i32), bg: &Color, c: &Color) {
        let bounds = buf.get_bounds();
        if pos.0 as u32 + self.dimensions.0 > bounds.2 {
            return;
        }
        let offset = (bounds.0 as i32, bounds.1 as i32);
        let width = self.dimensions.0 as i32 - 1;
        let mut x = 0;
        let mut y = 0;
        for v in &self.render {
-            buf.put_raw(
+            let _ = buf.put(
                (
-                    (x + pos.0 + self.origin.0 + offset.0) as u32,
+                    (x + pos.0 + self.origin.0) as u32,
-                    (y + pos.1 + self.origin.1 + offset.1) as u32,
+                    (y + pos.1 + self.origin.1) as u32,
                ),
-                c.alpha(*v),
+                &bg.blend(&c, *v),
            );
-            if x == width {
+            if x == self.dimensions.0 as i32 - 1 {
                y += 1;
                x = 0;
            } else {
@@ -90,12 +84,6 @@ impl<'a> Font<'a> {
        }
    }
    pub fn height(&self) -> f32 {
        let scale = Scale::uniform(self.size);
        let m = self.font.v_metrics(scale);
        m.ascent - m.descent
    }
    pub fn add_str_to_cache(&mut self, s: &str) {
        for ch in s.chars() {
            if self.glyphs.get(&ch).is_none() {
@@ -107,8 +95,9 @@ impl<'a> Font<'a> {
    pub fn draw_text(
        &self,
-        buf: &mut BufferView,
+        buf: &mut Buffer,
-        c: Color,
+        bg: &Color,
        c: &Color,
        s: &str,
    ) -> Result<(u32, u32), ::std::io::Error> {
        let mut x_off = 0;
@@ -130,7 +119,7 @@ impl<'a> Font<'a> {
            }
        }
        for glyph in glyphs {
-            glyph.draw(buf, (x_off, -off), c);
+            glyph.draw(buf, (x_off, -off), bg, c);
            x_off += glyph.advance;
        }
@@ -139,8 +128,9 @@ impl<'a> Font<'a> {
    pub fn draw_text_with_cursor(
        &self,
-        buf: &mut BufferView,
+        buf: &mut Buffer,
-        c: Color,
+        bg: &Color,
        c: &Color,
        s: &str,
        cursor: usize,
    ) -> Result<(u32, u32), ::std::io::Error> {
@@ -163,12 +153,12 @@ impl<'a> Font<'a> {
            }
        }
-        let height = self.size.ceil() as u32;
+        let height = buf.get_bounds().3;
        for (i, glyph) in glyphs.iter().enumerate() {
            if i == cursor {
                self.draw_cursor(buf, c, x_off as u32, height)?;
            }
-            glyph.draw(buf, (x_off, -off), c);
+            glyph.draw(buf, (x_off, -off), bg, c);
            x_off += glyph.advance;
        }
        if cursor == glyphs.len() {
@@ -178,20 +168,16 @@ impl<'a> Font<'a> {
        Ok((x_off as u32, self.size as u32))
    }
-    fn draw_cursor(
+    pub fn draw_cursor(
        &self,
-        buf: &mut BufferView,
+        buf: &mut Buffer,
-        c: Color,
+        c: &Color,
        offset: u32,
        height: u32,
    ) -> Result<(), ::std::io::Error> {
        // draw cursor
-        let bounds = buf.get_bounds();
+        for i in 1..height {
-        if offset + 1 > bounds.2 {
+            buf.put((offset, i), c)?
            return Ok(());
        }
        for i in bounds.1 + 1..height + bounds.1 {
            buf.put_raw((bounds.0 + offset, i), c);
        }
        Ok(())
    }
@@ -219,29 +205,32 @@ impl<'a> Font<'a> {
    pub fn auto_draw_text(
        &mut self,
-        buf: &mut BufferView,
+        buf: &mut Buffer,
-        c: Color,
+        bg: &Color,
        c: &Color,
        s: &str,
    ) -> Result<(u32, u32), ::std::io::Error> {
        self.add_str_to_cache(s);
-        self.draw_text(buf, c, s)
+        self.draw_text(buf, bg, c, s)
    }
    pub fn auto_draw_text_with_cursor(
        &mut self,
-        buf: &mut BufferView,
+        buf: &mut Buffer,
-        c: Color,
+        bg: &Color,
        c: &Color,
        s: &str,
        cursor: usize,
    ) -> Result<(u32, u32), ::std::io::Error> {
        self.add_str_to_cache(s);
-        self.draw_text_with_cursor(buf, c, s, cursor)
+        self.draw_text_with_cursor(buf, bg, c, s, cursor)
    }
    pub fn draw_text_fixed_width(
        &self,
-        buf: &mut BufferView,
+        buf: &mut Buffer,
-        c: Color,
+        bg: &Color,
        c: &Color,
        distances: &[u32],
        s: &str,
    ) -> Result<(u32, u32), ::std::io::Error> {
@@ -264,7 +253,7 @@ impl<'a> Font<'a> {
            }
        }
        for (idx, glyph) in glyphs.into_iter().enumerate() {
-            glyph.draw(buf, (x_off, -off), c);
+            glyph.draw(buf, (x_off, -off), bg, c);
            x_off += distances[idx] as i32;
        }
@@ -273,7 +262,8 @@ impl<'a> Font<'a> {
    pub fn draw_text_individual_colors(
        &self,
-        buf: &mut BufferView,
+        buf: &mut Buffer,
        bg: &Color,
        color: &[Color],
        s: &str,
    ) -> Result<(u32, u32), ::std::io::Error> {
@@ -296,7 +286,7 @@ impl<'a> Font<'a> {
            }
        }
        for (idx, glyph) in glyphs.into_iter().enumerate() {
-            glyph.draw(buf, (x_off, -off), color[idx]);
+            glyph.draw(buf, (x_off, -off), bg, &color[idx]);
            x_off += glyph.advance;
        }
@@ -305,30 +295,32 @@ impl<'a> Font<'a> {
    pub fn auto_draw_text_individual_colors(
        &mut self,
-        buf: &mut BufferView,
+        buf: &mut Buffer,
        bg: &Color,
        color: &[Color],
        s: &str,
    ) -> Result<(u32, u32), ::std::io::Error> {
        self.add_str_to_cache(s);
-        self.draw_text_individual_colors(buf, color, s)
+        self.draw_text_individual_colors(buf, bg, color, s)
    }
 }
-pub fn draw_box(buf: &mut BufferView, c: Color, dim: (u32, u32)) -> Result<(), ::std::io::Error> {
+pub fn draw_box(buf: &mut Buffer, c: &Color, dim: (u32, u32)) -> Result<(), ::std::io::Error> {
-    let bounds = buf.get_bounds();
+    for x in 0..dim.0 {
-    buf.put_line_raw((bounds.0, bounds.1), dim.0, c);
+        let _ = buf.put((x, 0), c);
-    buf.put_line_raw((bounds.0, bounds.1 + dim.1 - 1), dim.0, c);
+        let _ = buf.put((x, dim.1 - 1), c);
-    for y in bounds.1..dim.1 + bounds.1 {
+    }
-        buf.put_raw((bounds.0, y), c);
+    for y in 0..dim.1 {
-        buf.put_raw((bounds.0 + dim.0 - 1, y), c);
+        buf.put((0, y), c)?;
        buf.put((dim.0 - 1, y), c)?;
    }
    Ok(())
 }
 pub fn draw_bar(
-    buf: &mut BufferView,
+    buf: &mut Buffer,
-    color: Color,
+    color: &Color,
    length: u32,
    height: u32,
    fill: f32,
@@ -337,9 +329,10 @@ pub fn draw_bar(
    if fill_pos > length {
        fill_pos = length;
    }
-    let bounds = buf.get_bounds();
+    for y in 0..height {
-    for y in bounds.1..height + bounds.1 {
+        for x in 0..fill_pos {
-        buf.put_line_raw((bounds.0, y), fill_pos, color);
+            let _ = buf.put((x, y), color);
        }
    }
    Ok(())
@@ -1,61 +0,0 @@
 use std::sync::{Arc, Mutex};
 use calloop::ping::Ping;
 use crate::keyboard::KeyEvent;
 #[derive(Copy, Clone, Debug)]
 pub enum PointerButton {
    Left,
    Right,
    Middle,
    ScrollVertical(f64),
    ScrollHorizontal(f64),
 }
 #[derive(Debug)]
 pub struct PointerEvent {
    pub button: PointerButton,
    pub pos: (u32, u32),
 }
 #[derive(Debug)]
 pub enum Event {
    NewMinute,
    PowerUpdate,
    LauncherUpdate,
    AudioUpdate,
    KeyEvent(KeyEvent),
    PointerEvent(PointerEvent),
    TokenUpdate(String),
    FocusLost,
 }
 pub struct Events {
    dirty: bool,
    events: Vec<Event>,
    ping: Ping,
 }
 impl Events {
    pub fn new(ping: Ping) -> Arc<Mutex<Events>> {
        Arc::new(Mutex::new(Events {
            dirty: false,
            events: Vec::new(),
            ping,
        }))
    }
    pub fn add_event(&mut self, ev: Event) {
        self.events.push(ev);
        if !self.dirty {
            self.dirty = true;
            self.ping.ping();
        }
    }
    pub fn flush(&mut self) -> Vec<Event> {
        self.dirty = false;
        self.events.drain(..).collect()
    }
 }
@@ -1,29 +1,30 @@
 //! Utility module for fonts
-use crate::draw;
+use fontconfig::Fontconfig as FontConfig;
 use rusttype::Font;
 use std::{
-    cell::RefCell, collections::HashMap, fs::File, hash, io::Read, mem, path::Path, rc::Rc, thread,
+    collections::HashMap,
    fs::File,
    io::Read,
    path::{Path, PathBuf},
 };
 /// FontMap is used to store different font configurations
 pub type FontMap<'a> = HashMap<String, rusttype::Font<'a>>;
 /// FontRef is used to store Fonts on widgets.
 pub type FontRef<'a> = &'a rusttype::Font<'a>;
-#[cfg(feature = "fontconfig")]
+/// FontSeeker is a marker struct that is used to look up fonts
-pub(crate) fn find_font(name: &str) -> String {
+pub(crate) struct FontSeeker;
    use fontconfig::Fontconfig as FontConfig;
    let fc = FontConfig::new().unwrap();
    fc.find(name, None)
        .unwrap()
        .path
        .to_str()
        .unwrap()
        .to_string()
 }
-#[cfg(not(feature = "fontconfig"))]
+impl FontSeeker {
-pub(crate) fn find_font(_name: &str) -> String {
+    /// Acts like fc-match.
-    panic!("fontconfig not enabled so font search not available");
+    /// Given a string, it matches it to a font file and returns its path.
    pub(crate) fn from_string(name: &str) -> PathBuf {
        let fc = FontConfig::new().unwrap();
        fc.find(name, None).unwrap().path
    }
 }
 /// FontLoader is a marker struct that is used to load files
@@ -44,116 +45,3 @@ impl FontLoader {
        Font::try_from_vec(data)
    }
 }
 #[derive(Debug, Copy, Clone)]
 struct ComparableF32(f32);
 impl ComparableF32 {
    fn key(&self) -> u64 {
        self.0.to_bits() as u64
    }
 }
 impl hash::Hash for ComparableF32 {
    fn hash<H>(&self, state: &mut H)
    where
        H: hash::Hasher,
    {
        self.key().hash(state)
    }
 }
 impl PartialEq for ComparableF32 {
    fn eq(&self, other: &ComparableF32) -> bool {
        self.key() == other.key()
    }
 }
 impl Eq for ComparableF32 {}
 pub struct FontMap {
    fonts: HashMap<(&'static str, ComparableF32), draw::Font<'static>>,
    font_paths: HashMap<&'static str, String>,
    required_fonts: HashMap<&'static str, (&'static str, Vec<(f32, &'static str)>)>,
 }
 impl FontMap {
    pub fn new() -> FontMap {
        FontMap {
            fonts: HashMap::new(),
            font_paths: HashMap::new(),
            required_fonts: HashMap::new(),
        }
    }
    pub fn queue_font(&mut self, font_name: &'static str, size: f32, preload: &'static str) {
        match self.required_fonts.get_mut(font_name) {
            Some(v) => v.1.push((size, preload)),
            None => {
                self.required_fonts
                    .insert(font_name, (font_name, vec![(size, preload)]));
            }
        }
    }
    pub fn add_font_path(&mut self, font_name: &'static str, font_path: String) {
        self.font_paths.insert(font_name, font_path);
    }
    pub fn load_fonts(&mut self) {
        for (font_name, v) in self.required_fonts.iter() {
            let path = match self.font_paths.get(font_name) {
                Some(res) => res,
                _ => {
                    let s = find_font(font_name);
                    self.font_paths.insert(font_name, s);
                    self.font_paths.get(font_name).unwrap()
                }
            };
            let fontref = Box::leak(Box::new(
                FontLoader::from_path(path).expect("unable to load font"),
            ));
            for (size, preload) in &v.1 {
                if let Some(font) = self.fonts.get_mut(&(font_name, ComparableF32(*size))) {
                    font.add_str_to_cache(preload);
                } else {
                    let mut font = draw::Font::new(fontref, *size);
                    font.add_str_to_cache(preload);
                    self.fonts.insert((font_name, ComparableF32(*size)), font);
                }
            }
        }
    }
    pub fn get_font(&mut self, font_name: &'static str, size: f32) -> &mut draw::Font<'static> {
        self.fonts
            .get_mut(&(font_name, ComparableF32(size)))
            .expect("no font at specified size")
    }
 }
 pub enum MaybeFontMap {
    Waiting(thread::JoinHandle<FontMap>),
    Ready(Rc<RefCell<FontMap>>),
    Invalid,
 }
 impl MaybeFontMap {
    pub fn unwrap(&self) -> Rc<RefCell<FontMap>> {
        match self {
            MaybeFontMap::Ready(f) => f.clone(),
            _ => panic!("fontmap not yet ready"),
        }
    }
    pub fn resolve(&mut self) {
        if matches!(self, MaybeFontMap::Waiting(_)) {
            let s = mem::replace(self, MaybeFontMap::Invalid);
            match s {
                MaybeFontMap::Waiting(handle) => {
                    *self = MaybeFontMap::Ready(Rc::new(RefCell::new(handle.join().unwrap())));
                }
                _ => unreachable!(),
            }
        }
    }
 }
@@ -0,0 +1,269 @@
 #![allow(dead_code, non_camel_case_types, clippy::identity_op)]
 #![cfg_attr(rustfmt, rustfmt_skip)]
 use std::os::raw::{c_char, c_int, c_void, c_uint};
 pub const XKB_MOD_NAME_SHIFT   : &[u8]  = b"Shift\0";
 pub const XKB_MOD_NAME_CAPS    : &[u8]  = b"Lock\0";
 pub const XKB_MOD_NAME_CTRL    : &[u8]  = b"Control\0";
 pub const XKB_MOD_NAME_ALT     : &[u8]  = b"Mod1\0";
 pub const XKB_MOD_NAME_NUM     : &[u8]  = b"Mod2\0";
 pub const XKB_MOD_NAME_LOGO    : &[u8]  = b"Mod4\0";
 pub const XKB_LED_NAME_CAPS    : &[u8]  = b"Caps Lock\0";
 pub const XKB_LED_NAME_NUM     : &[u8]  = b"Num Lock\0";
 pub const XKB_LED_NAME_SCROLL  : &[u8]  = b"Scroll Lock\0";
 pub struct xkb_context;
 pub struct xkb_keymap;
 pub struct xkb_state;
 pub struct xkb_compose_table;
 pub struct xkb_compose_state;
 pub type xkb_keycode_t = u32;
 pub type xkb_keysym_t = u32;
 pub type xkb_layout_index_t = u32;
 pub type xkb_layout_mask_t = u32;
 pub type xkb_level_index_t = u32;
 pub type xkb_mod_index_t = u32;
 pub type xkb_mod_mask_t = u32;
 pub type xkb_led_index_t = u32;
 pub type xkb_led_mask_t = u32;
 pub const XKB_KEYCODE_INVALID :u32 = 0xffff_ffff;
 pub const XKB_LAYOUT_INVALID  :u32 = 0xffff_ffff;
 pub const XKB_LEVEL_INVALID   :u32 = 0xffff_ffff;
 pub const XKB_MOD_INVALID     :u32 = 0xffff_ffff;
 pub const XKB_LED_INVALID     :u32 = 0xffff_ffff;
 pub const XKB_KEYCODE_MAX     :u32 = 0xffff_fffe;
 #[repr(C)]
 #[derive(Copy, Clone)]
 pub struct xkb_rule_names {
    pub rules:   *const c_char,
    pub model:   *const c_char ,
    pub layout:  *const c_char,
    pub variant: *const c_char,
    pub options: *const c_char,
 }
 #[repr(C)]
 #[derive(Copy, Clone, Debug, PartialEq)]
 pub enum xkb_keysym_flags {
    /** Do not apply any flags. */
    XKB_KEYSYM_NO_FLAGS = 0,
    /** Find keysym by case-insensitive search. */
    XKB_KEYSYM_CASE_INSENSITIVE = (1 << 0)
 }
 #[repr(C)]
 #[derive(Copy, Clone, Debug, PartialEq)]
 pub enum xkb_context_flags {
    /** Do not apply any context flags. */
    XKB_CONTEXT_NO_FLAGS = 0,
    /** Create this context with an empty include path. */
    XKB_CONTEXT_NO_DEFAULT_INCLUDES = (1 << 0),
    /**
     * Don't take RMLVO names from the environment.
     * @since 0.3.0
     */
    XKB_CONTEXT_NO_ENVIRONMENT_NAMES = (1 << 1)
 }
 #[repr(C)]
 #[derive(Copy, Clone, Debug, PartialEq)]
 pub enum xkb_log_level {
    /** Log critical internal errors only. */
    XKB_LOG_LEVEL_CRITICAL = 10,
    /** Log all errors. */
    XKB_LOG_LEVEL_ERROR = 20,
    /** Log warnings and errors. */
    XKB_LOG_LEVEL_WARNING = 30,
    /** Log information, warnings, and errors. */
    XKB_LOG_LEVEL_INFO = 40,
    /** Log everything. */
    XKB_LOG_LEVEL_DEBUG = 50
 }
 #[repr(C)]
 #[derive(Copy, Clone, Debug, PartialEq)]
 pub enum xkb_keymap_compile_flags {
    /** Do not apply any flags. */
    XKB_KEYMAP_COMPILE_NO_FLAGS = 0,
 }
 #[repr(C)]
 #[derive(Copy, Clone, Debug, PartialEq)]
 pub enum xkb_keymap_format {
    /** Cannot be used for creation */
    XKB_KEYMAP_USE_ORIGINAL_FORMAT = 0,
    /** The current/classic XKB text format, as generated by xkbcomp -xkb. */
    XKB_KEYMAP_FORMAT_TEXT_V1 = 1,
 }
 #[repr(C)]
 #[derive(Copy, Clone, Debug, PartialEq)]
 pub enum xkb_key_direction {
    /** The key was released. */
    XKB_KEY_UP,
    /** The key was pressed. */
    XKB_KEY_DOWN
 }
 #[repr(C)]
 #[derive(Copy, Clone, Debug, PartialEq)]
 pub enum xkb_compose_compile_flags {
    XKB_COMPOSE_COMPILE_NO_FLAGS = 0
 }
 #[repr(C)]
 #[derive(Copy, Clone, Debug, PartialEq)]
 pub enum xkb_compose_format {
    XKB_COMPOSE_FORMAT_TEXT_V1 = 1
 }
 #[repr(C)]
 #[derive(Copy, Clone, Debug, PartialEq)]
 pub enum xkb_compose_state_flags {
    XKB_COMPOSE_STATE_NO_FLAGS = 0
 }
 #[repr(C)]
 #[derive(Copy, Clone, Debug, PartialEq)]
 pub enum xkb_compose_status {
    XKB_COMPOSE_NOTHING,
    XKB_COMPOSE_COMPOSING,
    XKB_COMPOSE_COMPOSED,
    XKB_COMPOSE_CANCELLED
 }
 #[repr(C)]
 #[derive(Copy, Clone, Debug, PartialEq)]
 pub enum xkb_compose_feed_result {
    XKB_COMPOSE_FEED_IGNORED,
    XKB_COMPOSE_FEED_ACCEPTED
 }
 bitflags::bitflags!(
    pub struct xkb_state_component: u32 {
        /** Depressed modifiers, i.e. a key is physically holding them. */
        const XKB_STATE_MODS_DEPRESSED = (1 << 0);
        /** Latched modifiers, i.e. will be unset after the next non-modifier
         *  key press. */
        const XKB_STATE_MODS_LATCHED = (1 << 1);
        /** Locked modifiers, i.e. will be unset after the key provoking the
         *  lock has been pressed again. */
        const XKB_STATE_MODS_LOCKED = (1 << 2);
        /** Effective modifiers, i.e. currently active and affect key
         *  processing (derived from the other state components).
         *  Use this unless you explictly care how the state came about. */
        const XKB_STATE_MODS_EFFECTIVE = (1 << 3);
        /** Depressed layout, i.e. a key is physically holding it. */
        const XKB_STATE_LAYOUT_DEPRESSED = (1 << 4);
        /** Latched layout, i.e. will be unset after the next non-modifier
         *  key press. */
        const XKB_STATE_LAYOUT_LATCHED = (1 << 5);
        /** Locked layout, i.e. will be unset after the key provoking the lock
         *  has been pressed again. */
        const XKB_STATE_LAYOUT_LOCKED = (1 << 6);
        /** Effective layout, i.e. currently active and affects key processing
         *  (derived from the other state components).
         *  Use this unless you explictly care how the state came about. */
        const XKB_STATE_LAYOUT_EFFECTIVE = (1 << 7);
        /** LEDs (derived from the other state components). */
        const XKB_STATE_LEDS = (1 << 8);
    }
 );
 dlopen_external_library!(XkbCommon,
 functions:
    fn xkb_keysym_get_name(xkb_keysym_t, *mut c_char, usize) -> c_int,
    fn xkb_keysym_from_name(*const c_char, xkb_keysym_flags) -> xkb_keysym_t,
    fn xkb_keysym_to_utf8(xkb_keysym_t, *mut c_char, usize) -> c_int,
    fn xkb_keysym_to_utf32(xkb_keysym_t) -> u32,
    fn xkb_context_new(xkb_context_flags) -> *mut xkb_context,
    fn xkb_context_ref(*mut xkb_context) -> *mut xkb_context,
    fn xkb_context_unref(*mut xkb_context) -> (),
    fn xkb_context_set_user_data(*mut xkb_context, *mut c_void) -> (),
    fn xkb_context_get_user_data(*mut xkb_context) -> *mut c_void,
    fn xkb_context_include_path_append(*mut xkb_context, *const c_char) -> c_int,
    fn xkb_context_include_path_append_default(*mut xkb_context) -> c_int,
    fn xkb_context_include_path_reset_defaults(*mut xkb_context) -> c_int,
    fn xkb_context_include_path_clear(*mut xkb_context) -> (),
    fn xkb_context_num_include_paths(*mut xkb_context) -> c_uint,
    fn xkb_context_include_path_get(*mut xkb_context, c_uint) -> *const c_char,
    fn xkb_context_set_log_level(*mut xkb_context, xkb_log_level) -> (),
    fn xkb_context_get_log_level(*mut xkb_context) -> xkb_log_level,
    fn xkb_context_set_log_verbosity(*mut xkb_context, c_int) -> (),
    fn xkb_context_get_log_verbosity(*mut xkb_context) -> c_int,
    fn xkb_keymap_new_from_names(*mut xkb_context,
                                 *const xkb_rule_names,
                                 xkb_keymap_compile_flags
                                ) -> *mut xkb_keymap,
    fn xkb_keymap_new_from_string(*mut xkb_context,
                                  *const c_char,
                                  xkb_keymap_format,
                                  xkb_keymap_compile_flags
                                 ) -> *mut xkb_keymap,
    fn xkb_keymap_new_from_buffer(*mut xkb_context,
                                  *const c_char,
                                  usize,
                                  xkb_keymap_format,
                                  xkb_keymap_compile_flags
                                 ) -> *mut xkb_keymap,
    fn xkb_keymap_ref(*mut xkb_keymap) -> *mut xkb_keymap,
    fn xkb_keymap_unref(*mut xkb_keymap) -> (),
    fn xkb_keymap_get_as_string(*mut xkb_keymap, xkb_keymap_format) -> *const c_char,
    fn xkb_keymap_key_repeats(*mut xkb_keymap, xkb_keycode_t) -> c_int,
    fn xkb_state_new(*mut xkb_keymap) -> *mut xkb_state,
    fn xkb_state_ref(*mut xkb_state) -> *mut xkb_state,
    fn xkb_state_unref(*mut xkb_state) -> (),
    fn xkb_state_update_mask(*mut xkb_state,
                             xkb_mod_mask_t,
                             xkb_mod_mask_t,
                             xkb_mod_mask_t,
                             xkb_layout_index_t,
                             xkb_layout_index_t,
                             xkb_layout_index_t
                            ) -> xkb_state_component,
    fn xkb_state_update_key(*mut xkb_state,
                            xkb_keycode_t,
                            xkb_key_direction
                           ) -> xkb_state_component,
    fn xkb_state_key_get_syms(*mut xkb_state,
                              xkb_keycode_t,
                              *const *mut xkb_keysym_t
                             ) -> c_int,
    fn xkb_state_key_get_utf8(*mut xkb_state,
                              xkb_keycode_t,
                              *mut c_char,
                              usize
                             ) -> c_int,
    fn xkb_state_key_get_utf32(*mut xkb_state, xkb_keycode_t) -> u32,
    fn xkb_state_key_get_one_sym(*mut xkb_state, xkb_keycode_t) -> xkb_keysym_t,
    fn xkb_state_mod_name_is_active(*mut xkb_state, *const c_char, xkb_state_component) -> c_int,
    fn xkb_compose_table_new_from_locale(*mut xkb_context, *const c_char, xkb_compose_compile_flags) -> *mut xkb_compose_table,
    fn xkb_compose_table_unref(*mut xkb_compose_table) -> (),
    fn xkb_compose_state_new(*mut xkb_compose_table, xkb_compose_state_flags) -> *mut xkb_compose_state,
    fn xkb_compose_state_unref(*mut xkb_compose_state) -> (),
    fn xkb_compose_state_feed(*mut xkb_compose_state, xkb_keysym_t) -> xkb_compose_feed_result,
    fn xkb_compose_state_reset(*mut xkb_compose_state) -> (),
    fn xkb_compose_state_get_status(*mut xkb_compose_state) -> xkb_compose_status,
    fn xkb_compose_state_get_utf8(*mut xkb_compose_state, *mut c_char, usize) -> c_int,
    fn xkb_compose_state_get_one_sym(*mut xkb_compose_state) -> xkb_keysym_t,
 );
 lazy_static::lazy_static!(
    pub static ref XKBCOMMON_OPTION: Option<XkbCommon> = {
        unsafe {
            XkbCommon::open("libxkbcommon.so.0")
            .or_else(|_| XkbCommon::open("libxkbcommon.so"))
            .ok()
        }
    };
    pub static ref XKBCOMMON_HANDLE: &'static XkbCommon = {
        XKBCOMMON_OPTION.as_ref().expect("Library libxkbcommon.so could not be loaded.")
    };
 );
@@ -0,0 +1,17 @@
 #![allow(missing_docs, non_upper_case_globals, unused_parens, clippy::all)]
 pub const XKB_KEY_BackSpace: u32 = 0xff08; /* Back space, back char */
 pub const XKB_KEY_Tab: u32 = 0xff09;
 pub const XKB_KEY_Return: u32 = 0xff0d; /* Return, enter */
 pub const XKB_KEY_Escape: u32 = 0xff1b;
 pub const XKB_KEY_Delete: u32 = 0xffff; /* Delete, rubout */
 pub const XKB_KEY_Home: u32 = 0xff50;
 pub const XKB_KEY_Left: u32 = 0xff51; /* Move left, left arrow */
 pub const XKB_KEY_Right: u32 = 0xff53; /* Move right, right arrow */
 pub const XKB_KEY_End: u32 = 0xff57; /* EOL */
 pub const XKB_KEY_ISO_Left_Tab: u32 = 0xfe20;
 pub const XKB_KEY_e: u32 = 0x0065; /* U+0065 LATIN SMALL LETTER E */
 pub const XKB_KEY_a: u32 = 0x0061; /* U+0061 LATIN SMALL LETTER A */
 pub const XKB_KEY_c: u32 = 0x0063; /* U+0063 LATIN SMALL LETTER C */
 pub const XKB_KEY_u: u32 = 0x0075; /* U+0075 LATIN SMALL LETTER U */
@@ -12,149 +12,333 @@
 //! calloop event loop. Not doing so will prevent key repetition to work
 //! (but the rest of the functionnality will not be affected).
-use std::{
+use std::{cell::RefCell, os::unix::io::RawFd, rc::Rc};
-    default::Default,
+
-    os::unix::io::{AsRawFd, OwnedFd},
+use byteorder::{ByteOrder, NativeEndian};
 pub use wayland_client::protocol::wl_keyboard::KeyState;
 use wayland_client::{
    protocol::{wl_keyboard, wl_seat, wl_surface},
    Attached,
 };
-use wayland_client::{protocol::wl_keyboard, WEnum};
+mod ffi;
-use xkbcommon::xkb;
+pub mod keysyms;
 pub use xkbcommon::xkb::keysyms;
 mod repeat;
 mod state;
 pub use self::repeat::{KeyRepeatSource, RepeatMessage};
 use self::state::KbState;
-pub use self::state::ModifiersState;
+pub use self::state::{ModifiersState, RMLVO};
-#[derive(Debug, Clone)]
+#[derive(Debug)]
-pub struct KeyEvent {
+/// An error that occurred while trying to initialize a mapped keyboard
-    pub rawkey: u32,
+pub enum Error {
-    pub keysym: u32,
+    /// libxkbcommon is not available
-    pub state: WEnum<wl_keyboard::KeyState>,
+    XKBNotFound,
-    pub modifiers: ModifiersState,
+    /// Provided RMLVO specified a keymap that would not be loaded
-    pub utf8: Option<String>,
+    BadNames,
    pub repeats: bool,
 }
-pub struct KeymapDescription {
+/// Events received from a mapped keyboard
-    fd: OwnedFd,
+pub enum Event<'a> {
-    size: u32,
+    /// The keyboard focus has entered a surface
    Enter {
        /// serial number of the event
        serial: u32,
        /// surface that was entered
        surface: wl_surface::WlSurface,
        /// raw values of the currently pressed keys
        rawkeys: &'a [u32],
        /// interpreted symbols of the currently pressed keys
        keysyms: &'a [u32],
    },
    /// The keyboard focus has left a surface
    Leave {
        /// serial number of the event
        serial: u32,
        /// surface that was left
        surface: wl_surface::WlSurface,
    },
    /// The key modifiers have changed state
    Modifiers {
        /// current state of the modifiers
        modifiers: ModifiersState,
    },
    /// A key event occurred
    Key {
        /// serial number of the event
        serial: u32,
        /// time at which the keypress occurred
        time: u32,
        /// raw value of the key
        rawkey: u32,
        /// interpreted symbol of the key
        keysym: u32,
        /// new state of the key
        state: KeyState,
        /// utf8 interpretation of the entered text
        ///
        /// will always be `None` on key release events
        utf8: Option<String>,
        repeats: bool,
    },
    RepeatInfo {
        rate: i32,
        delay: i32,
    },
 }
-impl KeymapDescription {
+/// Implement a keyboard for keymap translation with key repetition
-    fn new(fd: OwnedFd, size: u32) -> KeymapDescription {
+///
-        KeymapDescription { fd: fd, size: size }
+/// This requires you to provide a callback to receive the events after they
-    }
+/// have been interpreted with the keymap.
 ///
 /// The keymap will be loaded from the provided RMLVO rules, or from the compositor
 /// provided keymap if `None`.
 ///
 /// Returns an error if xkbcommon could not be initialized, the RMLVO specification
 /// contained invalid values, or if the provided seat does not have keyboard capability.
 ///
 /// **Note:** This adapter does not handle key repetition. See `map_keyboard_repeat` for that.
 pub fn map_keyboard<F>(
    seat: &Attached<wl_seat::WlSeat>,
    rmlvo: Option<RMLVO>,
    callback: F,
 ) -> Result<wl_keyboard::WlKeyboard, Error>
 where
    F: FnMut(Event<'_>, wl_keyboard::WlKeyboard, wayland_client::DispatchData<'_>) + 'static,
 {
    let keyboard = seat.get_keyboard();
    let state = Rc::new(RefCell::new(
        rmlvo
            .map(KbState::from_rmlvo)
            .unwrap_or_else(KbState::new)?,
    ));
    let callback = Rc::new(RefCell::new(callback));
    // prepare the handler
    let mut kbd_handler = KbdHandler { callback, state };
    keyboard.quick_assign(move |keyboard, event, data| {
        kbd_handler.event(keyboard.detach(), event, data)
    });
    Ok(keyboard.detach())
 }
-impl Clone for KeymapDescription {
+/*
-    fn clone(&self) -> Self {
+ * Classic handling
-        KeymapDescription::new(self.fd.try_clone().expect("unable to clone fd"), self.size)
+ */
-    }
+
 type KbdCallback = dyn FnMut(Event<'_>, wl_keyboard::WlKeyboard, wayland_client::DispatchData<'_>);
 struct KbdHandler {
    state: Rc<RefCell<KbState>>,
    callback: Rc<RefCell<KbdCallback>>,
 }
-pub struct Keyboard {
+impl KbdHandler {
-    state: Option<KbState>,
+    fn event(
-    desc: Option<KeymapDescription>,
+        &mut self,
-}
+        kbd: wl_keyboard::WlKeyboard,
        event: wl_keyboard::Event,
        dispatch_data: wayland_client::DispatchData,
    ) {
        use wl_keyboard::Event;
-impl Keyboard {
+        match event {
-    pub fn new() -> Keyboard {
+            Event::Keymap { format, fd, size } => self.keymap(kbd, format, fd, size),
-        Keyboard {
+            Event::Enter {
-            state: None,
+                serial,
-            desc: None,
+                surface,
                keys,
            } => self.enter(kbd, serial, surface, keys, dispatch_data),
            Event::Leave { serial, surface } => self.leave(kbd, serial, surface, dispatch_data),
            Event::Key {
                serial,
                time,
                key,
                state,
            } => self.key(kbd, serial, time, key, state, dispatch_data),
            Event::Modifiers {
                mods_depressed,
                mods_latched,
                mods_locked,
                group,
                ..
            } => self.modifiers(
                kbd,
                mods_depressed,
                mods_latched,
                mods_locked,
                group,
                dispatch_data,
            ),
            Event::RepeatInfo { rate, delay } => self.repeat_info(kbd, rate, delay, dispatch_data),
            _ => {}
        }
    }
-    pub fn keymap(&mut self, format: WEnum<wl_keyboard::KeymapFormat>, fd: OwnedFd, size: u32) {
+    fn keymap(
-        match format {
+        &mut self,
-            WEnum::Value(wl_keyboard::KeymapFormat::XkbV1) => {
+        _: wl_keyboard::WlKeyboard,
-                self.desc = Some(KeymapDescription::new(fd, size));
+        format: wl_keyboard::KeymapFormat,
        fd: RawFd,
        size: u32,
    ) {
        let mut state = self.state.borrow_mut();
        if state.locked() {
            // state is locked, ignore keymap updates
            return;
        }
        if state.ready() {
            // new keymap, we first deinit to free resources
            unsafe {
                state.de_init();
            }
-            WEnum::Value(wl_keyboard::KeymapFormat::NoKeymap) => {
+        }
        match format {
            wl_keyboard::KeymapFormat::XkbV1 => unsafe {
                state.init_with_fd(fd, size as usize);
            },
            wl_keyboard::KeymapFormat::NoKeymap => {
                // TODO: how to handle this (hopefully never occuring) case?
            }
            _ => unreachable!(),
        }
    }
-    pub fn resolve(&mut self) {
+    fn enter(
-        if self.state.is_some() {
+        &mut self,
-            return;
+        object: wl_keyboard::WlKeyboard,
-        }
+        serial: u32,
-
+        surface: wl_surface::WlSurface,
-        if let Some(desc) = self.desc.take() {
+        keys: Vec<u8>,
-            self.state = Some(
+        dispatch_data: wayland_client::DispatchData,
-                KbState::new_from_fd(desc.fd, desc.size as usize).expect("unable to load keymap"),
+    ) {
-            );
+        let mut state = self.state.borrow_mut();
-        }
+        let rawkeys = keys
            .chunks_exact(4)
            .map(NativeEndian::read_u32)
            .collect::<Vec<_>>();
        let keys: Vec<u32> = rawkeys.iter().map(|k| state.get_one_sym_raw(*k)).collect();
        (&mut *self.callback.borrow_mut())(
            Event::Enter {
                serial,
                surface,
                rawkeys: &rawkeys,
                keysyms: &keys,
            },
            object,
            dispatch_data,
        );
    }
-    pub fn key(&mut self, key: u32, key_state: WEnum<wl_keyboard::KeyState>) -> KeyEvent {
+    fn leave(
-        if let Some(state) = &mut self.state {
+        &mut self,
-            let (sym, utf8, repeats) = {
+        object: wl_keyboard::WlKeyboard,
-                // Get the values to generate a key event
+        serial: u32,
-                let sym = state.get_one_sym_raw(key);
+        surface: wl_surface::WlSurface,
-                let utf8 = if key_state == WEnum::Value(wl_keyboard::KeyState::Pressed) {
+        dispatch_data: wayland_client::DispatchData,
-                    match state.compose_feed(sym) {
+    ) {
-                        Some(xkb::compose::FeedResult::Accepted) => {
+        (&mut *self.callback.borrow_mut())(Event::Leave { serial, surface }, object, dispatch_data);
-                            if let Some(status) = state.compose_status() {
+    }
-                                match status {
+
-                                    xkb::compose::Status::Composed => state.compose_get_utf8(),
+    fn key(
-                                    xkb::compose::Status::Nothing => state.get_utf8_raw(key),
+        &mut self,
-                                    _ => None,
+        object: wl_keyboard::WlKeyboard,
        serial: u32,
        time: u32,
        key: u32,
        key_state: wl_keyboard::KeyState,
        dispatch_data: wayland_client::DispatchData,
    ) {
        let (sym, utf8, repeats) = {
            let mut state = self.state.borrow_mut();
            // Get the values to generate a key event
            let sym = state.get_one_sym_raw(key);
            let utf8 = if key_state == wl_keyboard::KeyState::Pressed {
                match state.compose_feed(sym) {
                    Some(ffi::xkb_compose_feed_result::XKB_COMPOSE_FEED_ACCEPTED) => {
                        if let Some(status) = state.compose_status() {
                            match status {
                                ffi::xkb_compose_status::XKB_COMPOSE_COMPOSED => {
                                    state.compose_get_utf8()
                                }
-                            } else {
+                                ffi::xkb_compose_status::XKB_COMPOSE_NOTHING => {
-                                state.get_utf8_raw(key)
+                                    state.get_utf8_raw(key)
                                }
                                _ => None,
                            }
-                        }
+                        } else {
                        Some(_) => {
                            // XKB_COMPOSE_FEED_IGNORED
                            None
                        }
                        None => {
                            // XKB COMPOSE is not initialized
                            state.get_utf8_raw(key)
                        }
                    }
-                } else {
+                    Some(_) => {
-                    None
+                        // XKB_COMPOSE_FEED_IGNORED
-                };
+                        None
-                let repeats = state.key_repeats(xkb::Keycode::new(key + 8));
+                    }
-                (sym, utf8, repeats)
+                    None => {
                        // XKB COMPOSE is not initialized
                        state.get_utf8_raw(key)
                    }
                }
            } else {
                None
            };
-            KeyEvent {
+            let repeats = unsafe { state.key_repeats(key + 8) };
            (sym, utf8, repeats)
        };
        (&mut *self.callback.borrow_mut())(
            Event::Key {
                serial,
                time,
                rawkey: key,
                keysym: sym,
                state: key_state,
                modifiers: state.mods_state(),
                utf8,
                repeats,
-            }
+            },
-        } else {
+            object,
-            KeyEvent {
+            dispatch_data,
-                rawkey: key,
+        );
                keysym: 0,
                state: key_state,
                modifiers: Default::default(),
                utf8: None,
                repeats: false,
            }
        }
    }
-    pub fn modifiers(
+    fn modifiers(
        &mut self,
        object: wl_keyboard::WlKeyboard,
        mods_depressed: u32,
        mods_latched: u32,
        mods_locked: u32,
        group: u32,
        dispatch_data: wayland_client::DispatchData,
    ) {
-        if let Some(state) = &mut self.state {
+        {
            let mut state = self.state.borrow_mut();
            state.update_modifiers(mods_depressed, mods_latched, mods_locked, group);
            (&mut *self.callback.borrow_mut())(
                Event::Modifiers {
                    modifiers: state.mods_state(),
                },
                object,
                dispatch_data,
            );
        }
    }
    fn repeat_info(
        &mut self,
        object: wl_keyboard::WlKeyboard,
        rate: i32,
        delay: i32,
        dispatch_data: wayland_client::DispatchData,
    ) {
        (&mut *self.callback.borrow_mut())(
            Event::RepeatInfo { rate, delay },
            object,
            dispatch_data,
        );
    }
 }
@@ -1,173 +0,0 @@
 use std::time::Duration;
 use calloop::{
    channel::{self, Channel},
    timer::{TimeoutAction, Timer},
    EventSource, Poll, PostAction, Readiness, Token, TokenFactory,
 };
 use wayland_client::{protocol::wl_keyboard, WEnum};
 use super::KeyEvent;
 #[derive(Debug)]
 pub enum RepeatMessage {
    StopRepeat,
    KeyEvent(KeyEvent),
    RepeatInfo((u32, u32)),
 }
 #[derive(Debug)]
 pub struct KeyRepeatSource {
    channel: Channel<RepeatMessage>,
    timer: Timer,
    rate: Duration,
    delay: Duration,
    disabled: bool,
    key: Option<KeyEvent>,
 }
 impl KeyRepeatSource {
    pub fn new(ch: channel::Channel<RepeatMessage>) -> KeyRepeatSource {
        KeyRepeatSource {
            channel: ch,
            timer: Timer::immediate(),
            delay: Duration::ZERO,
            rate: Duration::ZERO,
            disabled: true,
            key: None,
        }
    }
 }
 impl EventSource for KeyRepeatSource {
    type Event = KeyEvent;
    type Metadata = ();
    type Ret = ();
    type Error = calloop::Error;
    fn process_events<F>(
        &mut self,
        readiness: Readiness,
        token: Token,
        mut callback: F,
    ) -> calloop::Result<PostAction>
    where
        F: FnMut(Self::Event, &mut Self::Metadata) -> Self::Ret,
    {
        let mut removed = false;
        let timer = &mut self.timer;
        let rate = &mut self.rate;
        let delay = &mut self.delay;
        let key = &mut self.key;
        let disabled = &mut self.disabled;
        let mut reregister = false;
        let now = std::time::Instant::now();
        // Check if the key repeat should stop
        let channel_pa = self
            .channel
            .process_events(readiness, token, |event, _| match event {
                channel::Event::Msg(message) => match message {
                    RepeatMessage::StopRepeat => {
                        key.take();
                    }
                    RepeatMessage::KeyEvent(event) => match event.state {
                        WEnum::Value(wl_keyboard::KeyState::Pressed) => {
                            key.replace(event);
                            reregister = true;
                            timer.set_deadline(now + *delay);
                        }
                        WEnum::Value(wl_keyboard::KeyState::Released) => match key {
                            Some(k) if k.keysym == event.keysym => {
                                key.take();
                            }
                            _ => (),
                        },
                        _ => (),
                    },
                    RepeatMessage::RepeatInfo((new_rate, new_delay)) => {
                        *rate = Duration::from_micros(1_000_000 / new_rate as u64);
                        *delay = Duration::from_millis(new_delay as u64);
                        *disabled = false;
                        if key.is_some() {
                            timer.set_deadline(now + *delay);
                        }
                    }
                },
                channel::Event::Closed => {
                    removed = true;
                }
            })
            .map_err(|err| calloop::Error::OtherError(Box::new(err)))?;
        // Keyboard was destroyed
        if removed {
            return Ok(PostAction::Remove);
        }
        // Re-register the timer to start it again
        if reregister {
            return Ok(PostAction::Reregister);
        }
        let timer_pa = timer.process_events(readiness, token, |deadline, _| {
            if self.disabled || key.is_none() {
                return TimeoutAction::Drop;
            }
            if deadline - now > std::time::Duration::from_millis(5) {
                // We have not yet reached the deadline within our tolerance
                return TimeoutAction::ToInstant(deadline);
            }
            // Invoke the event
            callback(key.as_ref().unwrap().clone(), &mut ());
            let mut next_deadline = deadline;
            if now - deadline > *rate * 2 {
                // We're way behind, let's just set a new time
                println!("KeyRepeatSource::process_events: More than two repeat cycles behind, resetting");
                next_deadline = now + *rate;
            } else {
                while next_deadline < now {
                    next_deadline += *rate;
                }
            }
            TimeoutAction::ToInstant(next_deadline)
        })?;
        // Only disable or remove if both want to, otherwise continue or re-register
        Ok(match (timer_pa, channel_pa) {
            (PostAction::Disable, PostAction::Disable) => PostAction::Disable,
            (PostAction::Remove, PostAction::Remove) => PostAction::Remove,
            (PostAction::Reregister, _) | (_, PostAction::Reregister) => PostAction::Reregister,
            _ => PostAction::Continue,
        })
    }
    fn register(
        &mut self,
        poll: &mut Poll,
        token_factory: &mut TokenFactory,
    ) -> calloop::Result<()> {
        self.channel.register(poll, token_factory)?;
        self.timer.register(poll, token_factory)
    }
    fn reregister(
        &mut self,
        poll: &mut Poll,
        token_factory: &mut TokenFactory,
    ) -> calloop::Result<()> {
        self.channel.reregister(poll, token_factory)?;
        self.timer.reregister(poll, token_factory)
    }
    fn unregister(&mut self, poll: &mut Poll) -> calloop::Result<()> {
        self.channel.unregister(poll)?;
        self.timer.unregister(poll)
    }
 }
@@ -1,14 +1,48 @@
-use std::{env, os::unix::io::OwnedFd};
+use std::{
    env,
    ffi::CString,
    fs::File,
    os::raw::c_char,
    os::unix::{
        ffi::OsStringExt,
        io::{FromRawFd, RawFd},
    },
    ptr,
 };
-use xkbcommon::xkb;
+use memmap::MmapOptions;
 use super::ffi::{self, xkb_state_component, XKBCOMMON_HANDLE as XKBH};
 use super::Error;
 pub struct KbState {
-    xkb_context: xkb::Context,
+    xkb_context: *mut ffi::xkb_context,
-    xkb_keymap: xkb::Keymap,
+    xkb_keymap: *mut ffi::xkb_keymap,
-    xkb_state: xkb::State,
+    xkb_state: *mut ffi::xkb_state,
-    xkb_compose_table: Option<xkb::compose::Table>,
+    xkb_compose_table: *mut ffi::xkb_compose_table,
-    xkb_compose_state: Option<xkb::compose::State>,
+    xkb_compose_state: *mut ffi::xkb_compose_state,
    mods_state: ModifiersState,
    locked: bool,
 }
 /// The RMLVO description of a keymap
 ///
 /// All fields are optional, and the system default
 /// will be used if set to `None`.
 pub struct RMLVO {
    /// The rules file to use
    pub rules: Option<String>,
    /// The keyboard model by which to interpret keycodes and LEDs
    pub model: Option<String>,
    /// A comma separated list of layouts (languages) to include in the keymap
    pub layout: Option<String>,
    /// A comma separated list of variants, one per layout, which may modify or
    /// augment the respective layout in various ways
    pub variant: Option<String>,
    /// A comma separated list of options, through which the user specifies
    /// non-layout related preferences, like which key combinations are
    /// used for switching layouts, or which key is the Compose key.
    pub options: Option<String>,
 }
 /// Represents the current state of the keyboard modifiers
@@ -40,19 +74,52 @@ impl ModifiersState {
        ModifiersState::default()
    }
-    fn update_with(&mut self, state: &xkb::State) {
+    fn update_with(&mut self, state: *mut ffi::xkb_state) {
-        self.ctrl = state.mod_name_is_active("Control", xkb::STATE_MODS_EFFECTIVE);
+        self.ctrl = unsafe {
-        self.alt = state.mod_name_is_active("Mod1", xkb::STATE_MODS_EFFECTIVE);
+            (XKBH.xkb_state_mod_name_is_active)(
-        self.shift = state.mod_name_is_active("Shift", xkb::STATE_MODS_EFFECTIVE);
+                state,
-        self.caps_lock = state.mod_name_is_active("Lock", xkb::STATE_MODS_EFFECTIVE);
+                ffi::XKB_MOD_NAME_CTRL.as_ptr() as *const c_char,
-        self.num_lock = state.mod_name_is_active("Mod2", xkb::STATE_MODS_EFFECTIVE);
+                xkb_state_component::XKB_STATE_MODS_EFFECTIVE,
-        self.logo = state.mod_name_is_active("Mod4", xkb::STATE_MODS_EFFECTIVE);
+            ) > 0
        };
        self.alt = unsafe {
            (XKBH.xkb_state_mod_name_is_active)(
                state,
                ffi::XKB_MOD_NAME_ALT.as_ptr() as *const c_char,
                xkb_state_component::XKB_STATE_MODS_EFFECTIVE,
            ) > 0
        };
        self.shift = unsafe {
            (XKBH.xkb_state_mod_name_is_active)(
                state,
                ffi::XKB_MOD_NAME_SHIFT.as_ptr() as *const c_char,
                xkb_state_component::XKB_STATE_MODS_EFFECTIVE,
            ) > 0
        };
        self.caps_lock = unsafe {
            (XKBH.xkb_state_mod_name_is_active)(
                state,
                ffi::XKB_MOD_NAME_CAPS.as_ptr() as *const c_char,
                xkb_state_component::XKB_STATE_MODS_EFFECTIVE,
            ) > 0
        };
        self.logo = unsafe {
            (XKBH.xkb_state_mod_name_is_active)(
                state,
                ffi::XKB_MOD_NAME_LOGO.as_ptr() as *const c_char,
                xkb_state_component::XKB_STATE_MODS_EFFECTIVE,
            ) > 0
        };
        self.num_lock = unsafe {
            (XKBH.xkb_state_mod_name_is_active)(
                state,
                ffi::XKB_MOD_NAME_NUM.as_ptr() as *const c_char,
                xkb_state_component::XKB_STATE_MODS_EFFECTIVE,
            ) > 0
        };
    }
 }
 // Safety: No.
 unsafe impl Send for KbState {}
 impl KbState {
    pub(crate) fn update_modifiers(
        &mut self,
@@ -61,74 +128,157 @@ impl KbState {
        mods_locked: u32,
        group: u32,
    ) {
-        let mask =
+        if !self.ready() {
-            self.xkb_state
+            return;
-                .update_mask(mods_depressed, mods_latched, mods_locked, 0, 0, group);
+        }
-        if (mask & xkb::STATE_MODS_EFFECTIVE) > 0 {
+        let mask = unsafe {
            (XKBH.xkb_state_update_mask)(
                self.xkb_state,
                mods_depressed,
                mods_latched,
                mods_locked,
                0,
                0,
                group,
            )
        };
        if mask.contains(xkb_state_component::XKB_STATE_MODS_EFFECTIVE) {
            // effective value of mods have changed, we need to update our state
-            self.mods_state.update_with(&self.xkb_state);
+            self.mods_state.update_with(self.xkb_state);
        }
    }
    pub(crate) fn get_one_sym_raw(&mut self, keycode: u32) -> u32 {
-        self.xkb_state
+        if !self.ready() {
-            .key_get_one_sym(xkb::Keycode::new(keycode + 8))
+            return 0;
-            .raw()
+        }
        unsafe { (XKBH.xkb_state_key_get_one_sym)(self.xkb_state, keycode + 8) }
    }
    pub(crate) fn get_utf8_raw(&mut self, keycode: u32) -> Option<String> {
-        Some(self.xkb_state.key_get_utf8(xkb::Keycode::new(keycode + 8)))
+        if !self.ready() {
            return None;
        }
        let size = unsafe {
            (XKBH.xkb_state_key_get_utf8)(self.xkb_state, keycode + 8, ptr::null_mut(), 0)
        } + 1;
        if size <= 1 {
            return None;
        };
        let mut buffer = Vec::with_capacity(size as usize);
        unsafe {
            buffer.set_len(size as usize);
            (XKBH.xkb_state_key_get_utf8)(
                self.xkb_state,
                keycode + 8,
                buffer.as_mut_ptr() as *mut _,
                size as usize,
            );
        };
        // remove the final `\0`
        buffer.pop();
        // libxkbcommon will always provide valid UTF8
        Some(unsafe { String::from_utf8_unchecked(buffer) })
    }
-    pub(crate) fn compose_feed(&mut self, keysym: u32) -> Option<xkb::compose::FeedResult> {
+    pub(crate) fn compose_feed(&mut self, keysym: u32) -> Option<ffi::xkb_compose_feed_result> {
-        match &mut self.xkb_compose_state {
+        if !self.ready() || self.xkb_compose_state.is_null() {
-            Some(compose_state) => Some(compose_state.feed(xkb::Keysym::new(keysym))),
+            return None;
            None => None,
        }
        Some(unsafe { (XKBH.xkb_compose_state_feed)(self.xkb_compose_state, keysym) })
    }
-    pub(crate) fn compose_status(&mut self) -> Option<xkb::compose::Status> {
+    pub(crate) fn compose_status(&mut self) -> Option<ffi::xkb_compose_status> {
-        match &mut self.xkb_compose_state {
+        if !self.ready() || self.xkb_compose_state.is_null() {
-            Some(compose_state) => Some(compose_state.status()),
+            return None;
            None => None,
        }
        Some(unsafe { (XKBH.xkb_compose_state_get_status)(self.xkb_compose_state) })
    }
    pub(crate) fn compose_get_utf8(&mut self) -> Option<String> {
-        match &mut self.xkb_compose_state {
+        if !self.ready() || self.xkb_compose_state.is_null() {
-            Some(compose_state) => compose_state.utf8(),
+            return None;
            None => None,
        }
        let size = unsafe {
            (XKBH.xkb_compose_state_get_utf8)(self.xkb_compose_state, ptr::null_mut(), 0)
        } + 1;
        if size <= 1 {
            return None;
        };
        let mut buffer = Vec::with_capacity(size as usize);
        unsafe {
            buffer.set_len(size as usize);
            (XKBH.xkb_compose_state_get_utf8)(
                self.xkb_compose_state,
                buffer.as_mut_ptr() as *mut _,
                size as usize,
            );
        };
        // remove the final `\0`
        buffer.pop();
        // libxkbcommon will always provide valid UTF8
        Some(unsafe { String::from_utf8_unchecked(buffer) })
    }
-    pub(crate) fn new_from_fd(fd: OwnedFd, size: usize) -> Result<KbState, std::io::Error> {
+    pub(crate) fn new() -> Result<KbState, Error> {
-        let xkb_context = xkb::Context::new(xkb::CONTEXT_NO_FLAGS);
+        let xkbh = match ffi::XKBCOMMON_OPTION.as_ref() {
-        let xkb_keymap = unsafe {
+            Some(h) => h,
-            xkb::Keymap::new_from_fd(
+            None => return Err(Error::XKBNotFound),
                &xkb_context,
                fd,
                size,
                xkb::KEYMAP_FORMAT_TEXT_V1,
                xkb::KEYMAP_COMPILE_NO_FLAGS,
            )?
            .unwrap()
        };
-        let xkb_state = xkb::State::new(&xkb_keymap);
+        let xkb_context =
            unsafe { (xkbh.xkb_context_new)(ffi::xkb_context_flags::XKB_CONTEXT_NO_FLAGS) };
        if xkb_context.is_null() {
            return Err(Error::XKBNotFound);
        }
        let mut me = KbState {
            xkb_context,
-            xkb_keymap,
+            xkb_keymap: ptr::null_mut(),
-            xkb_state,
+            xkb_state: ptr::null_mut(),
-            xkb_compose_table: None,
+            xkb_compose_table: ptr::null_mut(),
-            xkb_compose_state: None,
+            xkb_compose_state: ptr::null_mut(),
            mods_state: ModifiersState::new(),
            locked: false,
        };
-        me.init_compose();
+        unsafe {
            me.init_compose();
        }
        Ok(me)
    }
-    pub(crate) fn init_compose(&mut self) {
+    pub(crate) fn from_rmlvo(rmlvo: RMLVO) -> Result<KbState, Error> {
        fn to_cstring(s: Option<String>) -> Result<Option<CString>, Error> {
            s.map_or(Ok(None), |s| CString::new(s).map(Option::Some))
                .map_err(|_| Error::BadNames)
        }
        let mut state = KbState::new()?;
        let rules = to_cstring(rmlvo.rules)?;
        let model = to_cstring(rmlvo.model)?;
        let layout = to_cstring(rmlvo.layout)?;
        let variant = to_cstring(rmlvo.variant)?;
        let options = to_cstring(rmlvo.options)?;
        let xkb_names = ffi::xkb_rule_names {
            rules: rules.map_or(ptr::null(), |s| s.as_ptr()),
            model: model.map_or(ptr::null(), |s| s.as_ptr()),
            layout: layout.map_or(ptr::null(), |s| s.as_ptr()),
            variant: variant.map_or(ptr::null(), |s| s.as_ptr()),
            options: options.map_or(ptr::null(), |s| s.as_ptr()),
        };
        unsafe {
            state.init_with_rmlvo(xkb_names)?;
        }
        state.locked = true;
        Ok(state)
    }
    pub(crate) unsafe fn init_compose(&mut self) {
        let locale = env::var_os("LC_ALL")
            .and_then(|v| if v.is_empty() { None } else { Some(v) })
            .or_else(|| env::var_os("LC_CTYPE"))
@@ -136,24 +286,99 @@ impl KbState {
            .or_else(|| env::var_os("LANG"))
            .and_then(|v| if v.is_empty() { None } else { Some(v) })
            .unwrap_or_else(|| "C".into());
        let locale = CString::new(locale.into_vec()).unwrap();
-        let compose_table = match xkb::compose::Table::new_from_locale(
+        let compose_table = (XKBH.xkb_compose_table_new_from_locale)(
-            &self.xkb_context,
+            self.xkb_context,
-            &locale,
+            locale.as_ptr(),
-            xkb::compose::COMPILE_NO_FLAGS,
+            ffi::xkb_compose_compile_flags::XKB_COMPOSE_COMPILE_NO_FLAGS,
-        ) {
+        );
            Ok(t) => t,
            Err(_) => return,
        };
-        let compose_state = xkb::compose::State::new(&compose_table, xkb::compose::STATE_NO_FLAGS);
+        if compose_table.is_null() {
            // init of compose table failed, continue without compose
            return;
        }
-        self.xkb_compose_table = Some(compose_table);
+        let compose_state = (XKBH.xkb_compose_state_new)(
-        self.xkb_compose_state = Some(compose_state);
+            compose_table,
            ffi::xkb_compose_state_flags::XKB_COMPOSE_STATE_NO_FLAGS,
        );
        if compose_state.is_null() {
            // init of compose state failed, continue without compose
            (XKBH.xkb_compose_table_unref)(compose_table);
            return;
        }
        self.xkb_compose_table = compose_table;
        self.xkb_compose_state = compose_state;
    }
-    pub(crate) fn key_repeats(&mut self, keycode: xkb::Keycode) -> bool {
+    pub(crate) unsafe fn post_init(&mut self, xkb_keymap: *mut ffi::xkb_keymap) {
-        self.xkb_keymap.key_repeats(keycode)
+        let xkb_state = (XKBH.xkb_state_new)(xkb_keymap);
        self.xkb_keymap = xkb_keymap;
        self.xkb_state = xkb_state;
        self.mods_state.update_with(xkb_state);
    }
    pub(crate) unsafe fn de_init(&mut self) {
        (XKBH.xkb_state_unref)(self.xkb_state);
        self.xkb_state = ptr::null_mut();
        (XKBH.xkb_keymap_unref)(self.xkb_keymap);
        self.xkb_keymap = ptr::null_mut();
    }
    pub(crate) unsafe fn init_with_fd(&mut self, fd: RawFd, size: usize) {
        let map = MmapOptions::new()
            .len(size)
            .map(&File::from_raw_fd(fd))
            .unwrap();
        let xkb_keymap = (XKBH.xkb_keymap_new_from_string)(
            self.xkb_context,
            map.as_ptr() as *const _,
            ffi::xkb_keymap_format::XKB_KEYMAP_FORMAT_TEXT_V1,
            ffi::xkb_keymap_compile_flags::XKB_KEYMAP_COMPILE_NO_FLAGS,
        );
        if xkb_keymap.is_null() {
            panic!("Received invalid keymap from compositor.");
        }
        self.post_init(xkb_keymap);
    }
    pub(crate) unsafe fn init_with_rmlvo(
        &mut self,
        names: ffi::xkb_rule_names,
    ) -> Result<(), Error> {
        let xkb_keymap = (XKBH.xkb_keymap_new_from_names)(
            self.xkb_context,
            &names,
            ffi::xkb_keymap_compile_flags::XKB_KEYMAP_COMPILE_NO_FLAGS,
        );
        if xkb_keymap.is_null() {
            return Err(Error::BadNames);
        }
        self.post_init(xkb_keymap);
        Ok(())
    }
    pub(crate) unsafe fn key_repeats(&mut self, xkb_keycode_t: ffi::xkb_keycode_t) -> bool {
        (XKBH.xkb_keymap_key_repeats)(self.xkb_keymap, xkb_keycode_t) == 1
    }
    #[inline]
    pub(crate) fn ready(&self) -> bool {
        !self.xkb_state.is_null()
    }
    #[inline]
    pub(crate) fn locked(&self) -> bool {
        self.locked
    }
    #[inline]
@@ -161,3 +386,15 @@ impl KbState {
        self.mods_state
    }
 }
 impl Drop for KbState {
    fn drop(&mut self) {
        unsafe {
            (XKBH.xkb_compose_state_unref)(self.xkb_compose_state);
            (XKBH.xkb_compose_table_unref)(self.xkb_compose_table);
            (XKBH.xkb_state_unref)(self.xkb_state);
            (XKBH.xkb_keymap_unref)(self.xkb_keymap);
            (XKBH.xkb_context_unref)(self.xkb_context);
        }
    }
 }
@@ -1,353 +1,389 @@
 use std::env;
 use std::fs::File;
 use std::io::{BufRead, BufReader, Read, Write};
 use std::os::unix::io::AsRawFd;
 use std::os::unix::net::{UnixListener, UnixStream};
 use std::{collections::HashMap, sync::mpsc::channel};
 use chrono::{Duration, Local};
 use nix::poll::{poll, PollFd, PollFlags};
 use os_pipe::pipe;
 use timerfd::{SetTimeFlags, TimerFd, TimerState};
 mod app;
 mod buffer;
 mod cmd;
 mod color;
 mod config;
 mod configfmt;
 mod data;
 mod desktop;
 mod doublemempool;
 mod draw;
 mod event;
 mod fonts;
 mod keyboard;
-mod state;
+mod widget;
 mod utils;
 mod widgets;
-use wayland_client::{Connection, QueueHandle, WaylandSource};
+#[macro_use]
 extern crate dlib;
-use calloop::{
+use app::{App, OutputMode};
-    timer::{TimeoutAction, Timer},
+use cmd::Cmd;
    EventLoop,
 };
 use chrono::{Duration, Local, Timelike};
 use buffer::BufferView;
 use config::Config;
-use event::{Event, Events};
+use configfmt::ConfigFmt;
-use fonts::{FontMap, MaybeFontMap};
+use fonts::{FontLoader, FontMap, FontSeeker};
-use keyboard::{KeyRepeatSource, RepeatMessage};
+use widget::WaitContext;
 use state::State;
 use utils::{
    desktop::{load_desktop_files, write_desktop_cache},
    xdg,
 };
 use widgets::{Geometry, Widget};
-use std::{
+enum Mode {
-    env,
+    Start,
-    fs::File,
+    Daemonize,
-    io::{BufRead, BufReader, Write},
+    StartOrKill,
-    os::unix::net::{UnixListener, UnixStream},
+    ToggleVisible,
-    rc::Rc,
+    PrintConfig(ConfigFmt),
    thread,
 };
 fn print_usage() {
    println!(
        "
 usage: wldash [OPTIONS]
 OPTIONS:
  --config CONFIG_FILE                     use the specified config file
                                           (~/.config/wldash/config.yml by default)
  --write-default-config [v1|v2|toplevel]  generate and write a new config file
                                           (v2 by default)
  --desktop-refresh                        refresh desktop file cache
 "
    );
 }
 fn main() {
    let mut args = env::args();
    // Skip program name
    _ = args.next();
    let mut config_file = format!("{}/wldash/config.yml", xdg::config_folder());
    loop {
        match args.next() {
            Some(ref s) if s == "--config" => match args.next() {
                Some(ref s) => config_file = s.clone(),
                None => panic!("missing argument to --config"),
            },
            Some(ref s) if s == "--write-default-config" => {
                let config = match args.next() {
                    Some(ref s) if s == "v1" => Config::generate_v1(),
                    Some(ref s) if s == "v2" => Config::generate_v2(false),
                    Some(ref s) if s == "toplevel" => Config::generate_v2(true),
                    None => Config::generate_v2(false),
                    Some(s) => panic!("unknown argument: {}", s),
                };
                match File::create(config_file) {
                    Ok(f) => serde_yaml::to_writer(f, &config).unwrap(),
                    Err(_) => panic!("uh"),
                }
                std::process::exit(0);
            }
            Some(ref s) if s == "--desktop-refresh" => {
                let v = load_desktop_files();
                write_desktop_cache(&v).unwrap();
                std::process::exit(0);
            }
            Some(ref s) if s == "--help" => {
                print_usage();
                std::process::exit(0);
            }
            Some(_) => {
                print_usage();
                std::process::exit(1);
            }
            None => break,
        }
    }
    let conn = Connection::connect_to_env().unwrap();
    let event_queue = conn.new_event_queue();
    let qhandle: QueueHandle<State> = event_queue.handle();
    let display = conn.display();
    display.get_registry(&qhandle, ());
    display.sync(&qhandle, ());
    let (ping_sender, ping_source) = calloop::ping::make_ping().unwrap();
    let (keyrepeat_sender, keyrepeat_channel) = calloop::channel::channel::<RepeatMessage>();
    let mut event_loop: EventLoop<State> =
        EventLoop::try_new().expect("Failed to initialize the event loop!");
    let handle = event_loop.handle();
    handle
        .insert_source(
            WaylandSource::new(event_queue).expect("Could not create WaylandSource!"),
            |_event, queue, mut state| queue.dispatch_pending(&mut state),
        )
        .expect("Failed to insert event source!");
    handle
        .insert_source(ping_source, |(), &mut (), state| {
            let events = state.events.lock().unwrap().flush();
            for widget in state.widgets.iter_mut() {
                for event in events.iter() {
                    widget.event(event);
                }
            }
            state.dirty = true;
        })
        .expect("Failed to insert ping source!");
    let clock_source = Timer::from_duration(std::time::Duration::from_secs(1));
    handle
        .insert_source(clock_source, |_event, _metadata, state| {
            let now = Local::now().naive_local();
            let target = (now + Duration::seconds(60))
                .with_second(0)
                .unwrap()
                .with_nanosecond(0)
                .unwrap();
            let d = target - now;
            for widget in state.widgets.iter_mut() {
                widget.event(&Event::NewMinute);
            }
            state.dirty = true;
            // The timer event source requires us to return a TimeoutAction to
            // specify if the timer should be rescheduled. In our case we just drop it.
            TimeoutAction::ToDuration(d.to_std().unwrap())
        })
        .expect("Failed to insert event source!");
    let keyrepeat_source = KeyRepeatSource::new(keyrepeat_channel);
    handle
        .insert_source(keyrepeat_source, |event, _metadata, state| {
            let ev = Event::KeyEvent(event);
            for widget in state.widgets.iter_mut() {
                widget.event(&ev);
            }
            state.dirty = true;
        })
        .expect("Failed to insert keyrepeat source!");
    let socket_path = match env::var("XDG_RUNTIME_DIR") {
        Ok(dir) => dir + "/wldash",
        Err(_) => "/tmp/wldash".to_string(),
    };
-
+    let config_home = match env::var("XDG_CONFIG_HOME") {
-    let events = Events::new(ping_sender);
+        Ok(dir) => dir + "/wldash",
-
+        Err(_) => match env::var("HOME") {
-    let mut fm = FontMap::new();
+            Ok(home) => home + "/.config/wldash",
-
+            _ => panic!("unable to find user folder"),
-    let config: Config = match File::open(config_file) {
+        },
        Ok(f) => serde_yaml::from_reader(f).unwrap(),
        Err(_) => panic!("configuration file missing"),
    };
-    if let Some(true) = config.server {
+    // From all existing files take the first readable one and write it's extension to `ext`
-        if let Ok(mut socket) = UnixStream::connect(socket_path.clone()) {
+    let mut ext = [0x0; 8];
-            socket.write_all(b"kill\n").unwrap();
+    let file = configfmt::CONFIG_NAMES
-            return;
+        .iter()
-        };
+        .map(|name| std::path::Path::new(&config_home).join(name))
-
+        .filter_map(|path| {
-        let _ = std::fs::remove_file(socket_path.clone());
+            match File::open(&path) {
-        let _ = thread::Builder::new()
+                Ok(file) => {
-            .name("ipc_server".to_string())
+                    let e = path.extension().and_then(|e| e.to_str())?;
-            .spawn(move || {
+                    let len = e.len();
-                let listener = UnixListener::bind(socket_path.clone()).unwrap();
+                    let from = len.saturating_sub(8); // the longest possible extension
-                loop {
+                    ext[0..len - from].copy_from_slice(&e.as_bytes()[from..]);
-                    match listener.accept() {
+                    Some(file)
                        Ok((stream, _)) => {
                            let _ = thread::Builder::new().name("ipc_client".to_string()).spawn(
                                move || {
                                    let r = BufReader::new(stream);
                                    for line in r.lines() {
                                        match line {
                                            Ok(ref cmd) if cmd == "kill" => {
                                                std::process::exit(0);
                                            }
                                            _ => {}
                                        }
                                    }
                                },
                            );
                        }
                        _ => (),
                    }
                }
-            });
+                Err(_) => None,
-    }
+            }
    if let Some(font_paths) = config.font_paths {
        for (key, value) in font_paths.into_iter() {
            fm.add_font_path(Box::leak(key.into_boxed_str()), value);
        }
    }
    let layout = Rc::new(config.widget.construct_layout(&mut 0));
    let mut widgets: Vec<Box<dyn Widget>> = Vec::new();
    config
        .widget
        .construct_widgets(&mut widgets, &mut fm, &events);
    let font_thread = thread::Builder::new()
        .name("fontloader".to_string())
        .spawn(move || {
            fm.load_fonts();
            fm
        })
-        .unwrap();
+        .next();
-    let mut state = State::new(
+    let fmt = std::str::from_utf8(&ext)
-        config.mode,
+        .ok()
-        config.background,
+        .and_then(ConfigFmt::new)
-        widgets,
+        .unwrap_or_default();
        layout,
        MaybeFontMap::Waiting(font_thread),
        events,
        keyrepeat_sender,
    );
-    // Initial setup
+    let config: Config = file
-    //
+        .map(|f| fmt.from_reader(BufReader::new(f)))
-    while state.running && !state.ready {
+        .unwrap_or_default();
        event_loop
            .dispatch(None, &mut state)
            .expect("Could not dispatch event loop");
    }
    state.check_registry(&qhandle);
-    while state.running {
+    let scale = config.scale;
        event_loop
            .dispatch(None, &mut state)
            .expect("Could not dispatch event loop");
-        if !state.configured || !state.dirty || !state.ready {
+    let fonts: FontMap = {
-            continue;
+        let load_font = |font_name| {
-        }
+            let path = FontSeeker::from_string(font_name);
-
+            FontLoader::from_path(&path).expect(&format!("Loading {} failed", path.display()))
        let mut force = false;
        if state.bufmgr.buffers.len() == 0 {
            state.add_buffer(&qhandle);
            force = true;
        }
        let mut bufcnt = state.bufmgr.buffers.len();
        let buf = match state.bufmgr.next_buffer() {
            Some(b) => b,
            None => {
                if state.bufmgr.buffers.len() >= 3 {
                    continue;
                }
                state.add_buffer(&qhandle);
                bufcnt = state.bufmgr.buffers.len();
                match state.bufmgr.next_buffer() {
                    Some(b) => b,
                    None => {
                        continue;
                    }
                }
            }
        };
-        if buf.last_damage.len() == 0 {
+        config
-            for _ in 0..state.widgets.len() {
+            .fonts
-                buf.last_damage.push(Geometry::new());
+            .iter()
-            }
+            .map(|(key, val)| (key.clone(), load_font(val)))
-        }
+            .collect::<HashMap<_, _>>()
    };
-        state.dirty = false;
+    let mut args = env::args();
-        buf.acquire();
+    let _ = args.next();
-        let mut bufview = BufferView::new(
+    let mode = match args.next() {
-            &mut buf.mmap,
+        Some(arg) => match arg.as_str() {
-            (state.dimensions.0 as u32, state.dimensions.1 as u32),
+            "start" => Mode::Daemonize,
-        );
+            "start-or-kill" => Mode::StartOrKill,
-
+            "toggle-visible" => Mode::ToggleVisible,
-        let surface = state.main_surface.wl_surface.as_ref().unwrap().clone();
+            "print-config" => Mode::PrintConfig(fmt),
-        if force {
+            s => {
-            for (idx, widget) in state.widgets.iter_mut().enumerate() {
+                let p = "print-config-";
-                if force || widget.get_dirty() {
+                let l = p.len();
-                    let geo = widget.geometry();
+                let fmt = if s.starts_with(p) {
-                    let mut subview = bufview.subgeometry(geo);
+                    ConfigFmt::new(&s[l..])
-                    buf.last_damage[idx] =
+                } else {
-                        widget.draw(&mut state.fonts.unwrap().borrow_mut(), &mut subview);
+                    None
                };
                if let Some(fmt) = fmt {
                    Mode::PrintConfig(fmt)
                } else {
                    eprintln!("unsupported sub-command {}", s);
                    std::process::exit(1);
                }
            }
-            surface.damage_buffer(0, 0, 0x7FFFFFFF, 0x7FFFFFFF);
+        },
-        } else {
+        None => Mode::Start,
-            let mut drew = false;
+    };
-            for (idx, widget) in state.widgets.iter_mut().enumerate() {
+    if args.next().is_some() {
-                if bufcnt > 1 || widget.get_dirty() {
+        // total = args.count + 2 (the two we skipped + the rest)
-                    drew = true;
+        eprintln!("expected 0 or 1 arguments, got {}", args.count() + 2);
        std::process::exit(1);
    }
-                    let old_damage = buf.last_damage[idx];
+    let mut daemon = false;
                    bufview.subgeometry(old_damage).clear();
-                    let geo = widget.geometry();
+    match mode {
-                    let mut subview = bufview.subgeometry(geo);
+        Mode::ToggleVisible => {
            if let Ok(mut socket) = UnixStream::connect(socket_path) {
                socket.write_all(b"toggle_visible\n").unwrap();
                return;
            };
            eprintln!("wldash is not running");
            std::process::exit(1);
        }
        Mode::StartOrKill => {
            if let Ok(mut socket) = UnixStream::connect(socket_path.clone()) {
                socket.write_all(b"kill\n").unwrap();
                return;
            };
        }
        Mode::Start => {
            if UnixStream::connect(socket_path.clone()).is_ok() {
                eprintln!("wldash is already running");
                std::process::exit(1);
            };
        }
        Mode::Daemonize => {
            if UnixStream::connect(socket_path.clone()).is_ok() {
                eprintln!("wldash is already running");
                std::process::exit(1);
            };
            daemon = true;
        }
        Mode::PrintConfig(fmt) => {
            println!("{}", fmt.to_string(&config));
            std::process::exit(0);
        }
    }
-                    let new_damage =
+    let _ = std::fs::remove_file(socket_path.clone());
-                        widget.draw(&mut state.fonts.unwrap().borrow_mut(), &mut subview);
+    let listener = UnixListener::bind(socket_path.clone()).unwrap();
                    let combined_damage = new_damage.expand(old_damage);
                    buf.last_damage[idx] = new_damage;
-                    surface.damage_buffer(
+    let output_mode = match config.output_mode {
-                        combined_damage.x as i32,
+        config::OutputMode::All => OutputMode::All,
-                        combined_damage.y as i32,
+        config::OutputMode::Active => OutputMode::Active,
-                        combined_damage.width as i32,
+    };
-                        combined_damage.height as i32,
+
    let background = config.background;
    let (tx_draw, rx_draw) = channel();
    let tx_draw_mod = tx_draw.clone();
    // Print, write to a file, or send to an HTTP server.
    let widget = config
        .widget
        .construct(Local::now().naive_local(), tx_draw_mod, &fonts)
        .expect("no widget configured");
    let mut app = App::new(tx_draw, output_mode, background, scale);
    if daemon {
        app.hide();
    } else {
        app.show();
    }
    app.set_widget(widget).unwrap();
    let (mut rx_pipe, mut tx_pipe) = pipe().unwrap();
    let ipc_pipe = tx_pipe.try_clone().unwrap();
    let worker_queue = app.cmd_queue();
    let _ = std::thread::Builder::new()
        .name("cmd_proxy".to_string())
        .spawn(move || loop {
            let cmd = rx_draw.recv().unwrap();
            worker_queue.lock().unwrap().push_back(cmd);
            tx_pipe.write_all(&[0x1]).unwrap();
        });
    let mut timer = TimerFd::new().unwrap();
    let ev_fd = PollFd::new(
        app.event_queue().display().get_connection_fd(),
        PollFlags::POLLIN,
    );
    let rx_fd = PollFd::new(rx_pipe.as_raw_fd(), PollFlags::POLLIN);
    let tm_fd = PollFd::new(timer.as_raw_fd(), PollFlags::POLLIN);
    let ipc_fd = PollFd::new(listener.as_raw_fd(), PollFlags::POLLIN);
    app.cmd_queue().lock().unwrap().push_back(Cmd::Draw);
    let mut visible = !daemon;
    let mut wait_ctx = WaitContext {
        fds: Vec::new(),
        target_time: None,
    };
    let q = app.cmd_queue();
    loop {
        let cmd = q.lock().unwrap().pop_front();
        match cmd {
            Some(cmd) => match cmd {
                Cmd::Draw => {
                    app.redraw(false).expect("Failed to draw");
                    app.flush_display();
                }
                Cmd::KeyboardTest => {
                    if let Some(cmd) = app.key_repeat() {
                        q.lock().unwrap().push_back(cmd);
                    }
                }
                Cmd::ForceDraw => {
                    app.redraw(true).expect("Failed to draw");
                    app.flush_display();
                }
                Cmd::MouseClick { btn, pos } => {
                    app.get_widget().mouse_click(btn, pos);
                    q.lock().unwrap().push_back(Cmd::Draw);
                }
                Cmd::MouseScroll { scroll, pos } => {
                    app.get_widget().mouse_scroll(scroll, pos);
                    q.lock().unwrap().push_back(Cmd::Draw);
                }
                Cmd::Keyboard {
                    key,
                    key_state,
                    modifiers_state,
                    interpreted,
                } => {
                    app.get_widget()
                        .keyboard_input(key, modifiers_state, key_state, interpreted);
                    q.lock().unwrap().push_back(Cmd::Draw);
                }
                Cmd::ToggleVisible => {
                    visible = !visible;
                    if visible {
                        app.get_widget().enter();
                        app.show();
                    } else {
                        app.hide();
                        app.get_widget().leave();
                    }
                    app.flush_display();
                }
                Cmd::Exit => {
                    if daemon {
                        visible = false;
                        app.hide();
                        app.get_widget().leave();
                        app.flush_display();
                    } else {
                        let _ = std::fs::remove_file(socket_path);
                        return;
                    }
                }
            },
            None => {
                app.flush_display();
                wait_ctx.fds.clear();
                wait_ctx.fds.push(ev_fd);
                wait_ctx.fds.push(rx_fd);
                wait_ctx.fds.push(ipc_fd);
                wait_ctx.target_time = None;
                app.get_widget().wait(&mut wait_ctx);
                app.set_keyboard_repeat(&mut wait_ctx);
                if let Some(target_time) = wait_ctx.target_time {
                    let n = Local::now().naive_local();
                    let sleep = if target_time > n {
                        target_time - n
                    } else {
                        Duration::seconds(0)
                    };
                    timer.set_state(
                        TimerState::Oneshot(sleep.to_std().unwrap()),
                        SetTimeFlags::Default,
                    );
                    wait_ctx.fds.push(tm_fd);
                }
                poll(&mut wait_ctx.fds, -1).unwrap();
                if wait_ctx.fds[0]
                    .revents()
                    .unwrap()
                    .contains(PollFlags::POLLIN)
                {
                    if let Some(guard) = app.event_queue().prepare_read() {
                        if let Err(e) = guard.read_events() {
                            if e.kind() != ::std::io::ErrorKind::WouldBlock {
                                eprintln!(
                                    "Error while trying to read from the wayland socket: {:?}",
                                    e
                                );
                            }
                        }
                    }
                    app.event_queue()
                        .dispatch_pending(&mut (), |_, _, _| {})
                        .expect("Failed to dispatch all messages.");
                }
                if wait_ctx.fds[1]
                    .revents()
                    .unwrap()
                    .contains(PollFlags::POLLIN)
                {
                    let mut v = [0x00];
                    rx_pipe.read_exact(&mut v).unwrap();
                }
                if wait_ctx.fds[2]
                    .revents()
                    .unwrap()
                    .contains(PollFlags::POLLIN)
                {
                    if let Ok((stream, _)) = listener.accept() {
                        let client_queue = q.clone();
                        let mut client_pipe = ipc_pipe.try_clone().unwrap();
                        let _ = std::thread::Builder::new()
                            .name("ipc_client".to_string())
                            .spawn(move || {
                                let r = BufReader::new(stream);
                                for line in r.lines() {
                                    match line {
                                        Ok(v) => match v.as_str() {
                                            "kill" => {
                                                client_queue.lock().unwrap().push_back(Cmd::Exit)
                                            }
                                            "toggle_visible" => client_queue
                                                .lock()
                                                .unwrap()
                                                .push_back(Cmd::ToggleVisible),
                                            v => eprintln!("unknown command: {}", v),
                                        },
                                        Err(_) => return,
                                    }
                                    client_pipe.write_all(&[0x1]).unwrap();
                                }
                            });
                    }
                }
                if wait_ctx.target_time.is_some()
                    && wait_ctx.fds[wait_ctx.fds.len() - 1]
                        .revents()
                        .unwrap()
                        .contains(PollFlags::POLLIN)
                {
                    timer.read();
                    let mut qq = q.lock().unwrap();
                    qq.push_back(Cmd::KeyboardTest);
                    qq.push_back(Cmd::Draw);
                }
            }
            if !drew {
                buf.release();
                conn.flush().unwrap();
                continue;
            }
        }
        state.ready = false;
        surface.attach(Some(&buf.buffer), 0, 0);
        surface.frame(&qhandle, ());
        surface.commit();
        conn.flush().unwrap();
        // Now is a good as time as any to load the keymap
        state.keyboard.resolve();
    }
 }
@@ -1,865 +0,0 @@
 use std::{
    cmp::max,
    default::Default,
    env,
    rc::Rc,
    sync::{Arc, Mutex},
 };
 use wayland_client::{
    protocol::{
        wl_buffer, wl_callback, wl_compositor, wl_keyboard, wl_pointer, wl_registry, wl_seat,
        wl_shm, wl_shm_pool, wl_subcompositor, wl_subsurface, wl_surface,
    },
    Connection, Dispatch, QueueHandle, WEnum,
 };
 use wayland_protocols::{
    wp::{
        single_pixel_buffer::v1::client::wp_single_pixel_buffer_manager_v1,
        viewporter::client::{wp_viewport, wp_viewporter},
    },
    xdg::{
        activation::v1::client::{xdg_activation_token_v1, xdg_activation_v1},
        shell::client::{xdg_surface, xdg_toplevel, xdg_wm_base},
    },
 };
 use wayland_protocols_wlr::layer_shell::v1::client::{zwlr_layer_shell_v1, zwlr_layer_surface_v1};
 use crate::{
    buffer::BufferManager,
    config::OperationMode,
    event::{Event, Events, PointerButton, PointerEvent},
    fonts::{FontMap, MaybeFontMap},
    keyboard::{Keyboard, RepeatMessage},
    widgets::{Geometry, Layout, Widget, WidgetUpdater},
 };
 use calloop::channel::Sender;
 #[derive(Default)]
 pub struct MainSurface {
    pub wl_surface: Option<wl_surface::WlSurface>,
    xdg_surface: Option<(xdg_surface::XdgSurface, xdg_toplevel::XdgToplevel)>,
    layer_surface: Option<zwlr_layer_surface_v1::ZwlrLayerSurfaceV1>,
 }
 #[derive(Default)]
 pub struct BackgroundSurface {
    wl_surface: Option<wl_surface::WlSurface>,
    subsurface: Option<wl_subsurface::WlSubsurface>,
    viewport: Option<wp_viewport::WpViewport>,
 }
 #[derive(Default)]
 pub struct Protocols {
    wl_compositor: Option<wl_compositor::WlCompositor>,
    wl_subcompositor: Option<wl_subcompositor::WlSubcompositor>,
    wl_shm: Option<wl_shm::WlShm>,
    xdg_wm_base: Option<xdg_wm_base::XdgWmBase>,
    xdg_activation: Option<xdg_activation_v1::XdgActivationV1>,
    zwlr_layer_shell: Option<zwlr_layer_shell_v1::ZwlrLayerShellV1>,
    viewporter: Option<wp_viewporter::WpViewporter>,
    wp_single_pixel_buffer_manager:
        Option<wp_single_pixel_buffer_manager_v1::WpSinglePixelBufferManagerV1>,
 }
 pub struct State {
    mode: OperationMode,
    background: Option<u32>,
    pub main_surface: MainSurface,
    pub bg_surface: BackgroundSurface,
    pub protocols: Protocols,
    pub running: bool,
    pub ready: bool,
    pub dirty: bool,
    activated: bool,
    pub configured: bool,
    pub dimensions: (i32, i32),
    pub bufmgr: BufferManager,
    pub widgets: Vec<Box<dyn Widget>>,
    pub keyboard: Keyboard,
    pub keyrepeat_sender: Sender<RepeatMessage>,
    pointer: Option<(f64, f64)>,
    pub fonts: MaybeFontMap,
    pub events: Arc<Mutex<Events>>,
    layout: Rc<Box<dyn Layout>>,
 }
 impl State {
    pub fn new(
        mode: OperationMode,
        background: Option<u32>,
        widgets: Vec<Box<dyn Widget>>,
        layout: Rc<Box<dyn Layout>>,
        fonts: MaybeFontMap,
        events: Arc<Mutex<Events>>,
        keyrepeat_sender: Sender<RepeatMessage>,
    ) -> State {
        State {
            protocols: Default::default(),
            bg_surface: Default::default(),
            main_surface: Default::default(),
            running: true,
            dirty: true,
            activated: false,
            configured: false,
            dimensions: (320, 240),
            bufmgr: BufferManager::new(),
            keyboard: Keyboard::new(),
            pointer: None,
            keyrepeat_sender,
            mode,
            background,
            widgets,
            fonts,
            events,
            layout,
            ready: false,
        }
    }
    pub fn add_buffer(&mut self, qh: &QueueHandle<Self>) {
        self.bufmgr.add_buffer(
            self.protocols.wl_shm.as_ref().expect("missing wl_shm"),
            self.dimensions,
            qh,
        );
    }
    pub fn activate(&mut self, qh: &QueueHandle<Self>) {
        let key = match env::var("XDG_ACTIVATION_TOKEN") {
            Ok(token) => token,
            Err(_) => return,
        };
        match (
            &self.main_surface.wl_surface,
            &self.protocols.xdg_activation,
        ) {
            (Some(surface), Some(activation)) => {
                activation.activate(key, surface);
                let activation_token = activation.get_activation_token(qh, ());
                activation_token.commit();
                env::remove_var("XDG_ACTIVATION_TOKEN");
            }
            _ => (),
        }
    }
 }
 impl WidgetUpdater for State {
    fn geometry_update(
        &mut self,
        idx: usize,
        fonts: &mut FontMap,
        geometry: &Geometry,
    ) -> Geometry {
        self.widgets[idx].geometry_update(fonts, geometry)
    }
    fn minimum_size(&mut self, idx: usize, fonts: &mut FontMap) -> Geometry {
        self.widgets[idx].minimum_size(fonts)
    }
 }
 impl State {
    pub fn check_registry(&mut self, qh: &QueueHandle<Self>) {
        let wl_compositor = self
            .protocols
            .wl_compositor
            .as_ref()
            .expect("wl_compositor missing");
        let main_surface = wl_compositor.create_surface(qh, ());
        let bg_surface = wl_compositor.create_surface(qh, ());
        self.main_surface.wl_surface = Some(main_surface.clone());
        self.bg_surface.wl_surface = Some(bg_surface.clone());
        self.activate(qh);
        let wl_subcompositor = self
            .protocols
            .wl_subcompositor
            .as_ref()
            .expect("wl_subcompositor missing");
        let subsurface = wl_subcompositor.get_subsurface(&bg_surface, &main_surface, qh, ());
        subsurface.place_below(&main_surface);
        self.bg_surface.subsurface = Some(subsurface.clone());
        match self.mode {
            OperationMode::XdgToplevel => {
                self.fonts.resolve();
                let xdg_wm_base = self
                    .protocols
                    .xdg_wm_base
                    .as_ref()
                    .expect("xdg_wm_base missing");
                let xdg_surface = xdg_wm_base.get_xdg_surface(&main_surface, qh, ());
                let toplevel = xdg_surface.get_toplevel(qh, ());
                toplevel.set_title("wldash".into());
                main_surface.commit();
                self.main_surface.xdg_surface = Some((xdg_surface, toplevel));
            }
            OperationMode::LayerSurface(size) => {
                self.fonts.resolve();
                let layer_shell = self
                    .protocols
                    .zwlr_layer_shell
                    .as_ref()
                    .expect("zwlr_layer_shell_v1 missing");
                let layer_surface = layer_shell.get_layer_surface(
                    &main_surface,
                    None,
                    zwlr_layer_shell_v1::Layer::Overlay,
                    "launcher".to_string(),
                    qh,
                    (),
                );
                let fonts = self.fonts.unwrap();
                let layout = self.layout.clone();
                let min_size = layout.minimum_size(&mut fonts.borrow_mut(), self);
                layer_surface.set_keyboard_interactivity(
                    zwlr_layer_surface_v1::KeyboardInteractivity::Exclusive,
                );
                layer_surface.set_anchor(
                    zwlr_layer_surface_v1::Anchor::Left
                        .union(zwlr_layer_surface_v1::Anchor::Bottom)
                        .union(zwlr_layer_surface_v1::Anchor::Right)
                        .union(zwlr_layer_surface_v1::Anchor::Top),
                );
                layer_surface.set_size(max(size.0, min_size.width), max(size.1, min_size.height));
                main_surface.commit();
                self.main_surface.layer_surface = Some(layer_surface);
            }
        }
        let viewporter = self
            .protocols
            .viewporter
            .as_ref()
            .expect("wp_viewporter missing");
        let viewport = viewporter.get_viewport(&bg_surface, qh, ());
        self.bg_surface.viewport = Some(viewport);
        if let Some(background) = self.background {
            let wp_single_pixel_buffer_manager = self
                .protocols
                .wp_single_pixel_buffer_manager
                .as_ref()
                .expect("wp_single_pixel_buffer_manager_v1 missing");
            let buffer =
                wp_single_pixel_buffer_manager.create_u32_rgba_buffer(0, 0, 0, background, qh, ());
            bg_surface.attach(Some(&buffer), 0, 0);
            bg_surface.damage_buffer(0, 0, 1, 1);
        }
    }
 }
 impl Dispatch<wl_registry::WlRegistry, ()> for State {
    fn event(
        state: &mut Self,
        registry: &wl_registry::WlRegistry,
        event: wl_registry::Event,
        _: &(),
        _: &Connection,
        qh: &QueueHandle<Self>,
    ) {
        if let wl_registry::Event::Global {
            name, interface, ..
        } = event
        {
            match &interface[..] {
                "wl_compositor" => {
                    state.protocols.wl_compositor =
                        Some(registry.bind::<wl_compositor::WlCompositor, _, _>(name, 5, qh, ()));
                }
                "wl_subcompositor" => {
                    state.protocols.wl_subcompositor = Some(
                        registry.bind::<wl_subcompositor::WlSubcompositor, _, _>(name, 1, qh, ()),
                    );
                }
                "wl_shm" => {
                    state.protocols.wl_shm =
                        Some(registry.bind::<wl_shm::WlShm, _, _>(name, 1, qh, ()));
                }
                "wl_seat" => {
                    registry.bind::<wl_seat::WlSeat, _, _>(name, 8, qh, ());
                }
                "xdg_wm_base" => {
                    if let OperationMode::XdgToplevel = state.mode {
                        state.protocols.xdg_wm_base =
                            Some(registry.bind::<xdg_wm_base::XdgWmBase, _, _>(name, 2, qh, ()));
                    }
                }
                "xdg_activation_v1" => {
                    state.protocols.xdg_activation = Some(
                        registry.bind::<xdg_activation_v1::XdgActivationV1, _, _>(name, 1, qh, ()),
                    );
                }
                "zwlr_layer_shell_v1" => {
                    if let OperationMode::LayerSurface(_) = state.mode {
                        state.protocols.zwlr_layer_shell = Some(
                            registry.bind::<zwlr_layer_shell_v1::ZwlrLayerShellV1, _, _>(
                                name,
                                4,
                                qh,
                                (),
                            ),
                        );
                    }
                }
                "wp_viewporter" => {
                    state.protocols.viewporter =
                        Some(registry.bind::<wp_viewporter::WpViewporter, _, _>(name, 1, qh, ()));
                }
                "wp_single_pixel_buffer_manager_v1" => {
                    state.protocols.wp_single_pixel_buffer_manager = Some(registry.bind::<wp_single_pixel_buffer_manager_v1::WpSinglePixelBufferManagerV1, _, _>(name, 1, qh, ()));
                }
                _ => {}
            }
        }
    }
 }
 impl Dispatch<wl_callback::WlCallback, ()> for State {
    fn event(
        state: &mut Self,
        _: &wl_callback::WlCallback,
        event: wl_callback::Event,
        _: &(),
        _: &Connection,
        _: &QueueHandle<Self>,
    ) {
        match event {
            wl_callback::Event::Done { callback_data: _ } => state.ready = true,
            _ => {}
        }
    }
 }
 impl Dispatch<wl_compositor::WlCompositor, ()> for State {
    fn event(
        _: &mut Self,
        _: &wl_compositor::WlCompositor,
        _: wl_compositor::Event,
        _: &(),
        _: &Connection,
        _: &QueueHandle<Self>,
    ) {
    }
 }
 impl Dispatch<wl_subcompositor::WlSubcompositor, ()> for State {
    fn event(
        _: &mut Self,
        _: &wl_subcompositor::WlSubcompositor,
        _: wl_subcompositor::Event,
        _: &(),
        _: &Connection,
        _: &QueueHandle<Self>,
    ) {
    }
 }
 impl Dispatch<wl_surface::WlSurface, ()> for State {
    fn event(
        _: &mut Self,
        _: &wl_surface::WlSurface,
        _: wl_surface::Event,
        _: &(),
        _: &Connection,
        _: &QueueHandle<Self>,
    ) {
    }
 }
 impl Dispatch<wl_subsurface::WlSubsurface, ()> for State {
    fn event(
        _: &mut Self,
        _: &wl_subsurface::WlSubsurface,
        _: wl_subsurface::Event,
        _: &(),
        _: &Connection,
        _: &QueueHandle<Self>,
    ) {
    }
 }
 impl Dispatch<wl_shm::WlShm, ()> for State {
    fn event(
        _: &mut Self,
        _: &wl_shm::WlShm,
        _: wl_shm::Event,
        _: &(),
        _: &Connection,
        _: &QueueHandle<Self>,
    ) {
    }
 }
 impl Dispatch<wl_shm_pool::WlShmPool, ()> for State {
    fn event(
        _: &mut Self,
        _: &wl_shm_pool::WlShmPool,
        _: wl_shm_pool::Event,
        _: &(),
        _: &Connection,
        _: &QueueHandle<Self>,
    ) {
    }
 }
 impl Dispatch<wl_buffer::WlBuffer, ()> for State {
    fn event(
        state: &mut Self,
        buffer: &wl_buffer::WlBuffer,
        _: wl_buffer::Event,
        _: &(),
        _: &Connection,
        _: &QueueHandle<Self>,
    ) {
        for buf in state.bufmgr.buffers.iter_mut() {
            if &buf.buffer == buffer {
                buf.release();
            }
        }
    }
 }
 impl Dispatch<zwlr_layer_shell_v1::ZwlrLayerShellV1, ()> for State {
    fn event(
        _: &mut Self,
        _: &zwlr_layer_shell_v1::ZwlrLayerShellV1,
        _: zwlr_layer_shell_v1::Event,
        _: &(),
        _: &Connection,
        _: &QueueHandle<Self>,
    ) {
    }
 }
 impl Dispatch<zwlr_layer_surface_v1::ZwlrLayerSurfaceV1, ()> for State {
    fn event(
        state: &mut Self,
        layer_surface: &zwlr_layer_surface_v1::ZwlrLayerSurfaceV1,
        event: zwlr_layer_surface_v1::Event,
        _: &(),
        _: &Connection,
        _: &QueueHandle<Self>,
    ) {
        match event {
            zwlr_layer_surface_v1::Event::Configure {
                serial,
                mut width,
                mut height,
            } => {
                if (width, height) == (0, 0) {
                    if state.configured {
                        return;
                    }
                    (width, height) = (640, 480);
                }
                layer_surface.ack_configure(serial);
                state.configured = true;
                state.dirty = true;
                let dim = (width as i32, height as i32);
                if state.configured && state.dimensions == dim {
                    return;
                }
                state.bufmgr.clear_buffers();
                state.dimensions = dim;
                let fonts = state.fonts.unwrap();
                let layout = state.layout.clone();
                layout.geometry_update(
                    &mut fonts.borrow_mut(),
                    &Geometry {
                        x: 0,
                        y: 0,
                        width: width as u32,
                        height: height as u32,
                    },
                    state,
                );
                let surface = state
                    .bg_surface
                    .wl_surface
                    .as_ref()
                    .expect("bg surface was not ready");
                let viewport = state
                    .bg_surface
                    .viewport
                    .as_ref()
                    .expect("bg viewport was not ready");
                viewport.set_destination(dim.0, dim.1);
                surface.commit();
            }
            zwlr_layer_surface_v1::Event::Closed => {
                std::process::exit(0);
            }
            _ => (),
        }
    }
 }
 impl Dispatch<xdg_wm_base::XdgWmBase, ()> for State {
    fn event(
        _: &mut Self,
        wm_base: &xdg_wm_base::XdgWmBase,
        event: xdg_wm_base::Event,
        _: &(),
        _: &Connection,
        _: &QueueHandle<Self>,
    ) {
        if let xdg_wm_base::Event::Ping { serial } = event {
            wm_base.pong(serial);
        }
    }
 }
 impl Dispatch<xdg_surface::XdgSurface, ()> for State {
    fn event(
        state: &mut Self,
        xdg_surface: &xdg_surface::XdgSurface,
        event: xdg_surface::Event,
        _: &(),
        _: &Connection,
        _: &QueueHandle<Self>,
    ) {
        if let xdg_surface::Event::Configure { serial, .. } = event {
            xdg_surface.ack_configure(serial);
            state.configured = true;
            state.dirty = true;
        }
    }
 }
 impl Dispatch<xdg_toplevel::XdgToplevel, ()> for State {
    fn event(
        state: &mut Self,
        _: &xdg_toplevel::XdgToplevel,
        event: xdg_toplevel::Event,
        _: &(),
        _: &Connection,
        _: &QueueHandle<Self>,
    ) {
        match event {
            xdg_toplevel::Event::Configure {
                mut width,
                mut height,
                states,
                ..
            } => {
                if (width, height) == (0, 0) {
                    if state.configured {
                        return;
                    }
                    (width, height) = (1280, 720);
                }
                let activated = states
                    .iter()
                    .find(|&st| *st as u32 == xdg_toplevel::State::Activated as u32)
                    .is_some();
                if activated {
                    state.activated = true;
                } else if state.activated && !activated {
                    let ev = Event::FocusLost;
                    for widget in state.widgets.iter_mut() {
                        widget.event(&ev);
                    }
                }
                if !state.configured || state.dimensions != (width, height) {
                    let surface = state
                        .bg_surface
                        .wl_surface
                        .as_ref()
                        .expect("bg surface was not ready");
                    let viewport = state
                        .bg_surface
                        .viewport
                        .as_ref()
                        .expect("bg viewportw as not ready");
                    viewport.set_destination(width, height);
                    surface.commit();
                    state.bufmgr.clear_buffers();
                    state.dimensions = (width, height);
                    state.fonts.resolve();
                    let fonts = state.fonts.unwrap();
                    let layout = state.layout.clone();
                    layout.geometry_update(
                        &mut fonts.borrow_mut(),
                        &Geometry {
                            x: 0,
                            y: 0,
                            width: width as u32,
                            height: height as u32,
                        },
                        state,
                    );
                }
            }
            xdg_toplevel::Event::Close => {
                state.running = false;
            }
            _ => (),
        }
    }
 }
 impl Dispatch<wl_seat::WlSeat, ()> for State {
    fn event(
        _: &mut Self,
        seat: &wl_seat::WlSeat,
        event: wl_seat::Event,
        _: &(),
        _: &Connection,
        qh: &QueueHandle<Self>,
    ) {
        if let wl_seat::Event::Capabilities {
            capabilities: WEnum::Value(capabilities),
        } = event
        {
            if capabilities.contains(wl_seat::Capability::Keyboard) {
                seat.get_keyboard(qh, ());
            }
            if capabilities.contains(wl_seat::Capability::Pointer) {
                seat.get_pointer(qh, ());
            }
        }
    }
 }
 impl Dispatch<wl_keyboard::WlKeyboard, ()> for State {
    fn event(
        state: &mut Self,
        _: &wl_keyboard::WlKeyboard,
        event: wl_keyboard::Event,
        _: &(),
        _: &Connection,
        _: &QueueHandle<Self>,
    ) {
        match event {
            wl_keyboard::Event::Leave { .. } => {
                state
                    .keyrepeat_sender
                    .send(RepeatMessage::StopRepeat)
                    .unwrap();
            }
            wl_keyboard::Event::Key {
                key,
                state: kbstate,
                ..
            } => {
                if key == 1 {
                    state.running = false;
                    return;
                }
                state.keyboard.resolve();
                let k = state.keyboard.key(key, kbstate);
                let repeats = k.repeats;
                let ev = Event::KeyEvent(k);
                for widget in state.widgets.iter_mut() {
                    widget.event(&ev);
                }
                if repeats {
                    if let Event::KeyEvent(k) = ev {
                        state
                            .keyrepeat_sender
                            .send(RepeatMessage::KeyEvent(k))
                            .unwrap();
                    }
                }
                state.dirty = true;
            }
            wl_keyboard::Event::Modifiers {
                mods_depressed,
                mods_latched,
                mods_locked,
                group,
                ..
            } => {
                state
                    .keyboard
                    .modifiers(mods_depressed, mods_latched, mods_locked, group);
            }
            wl_keyboard::Event::Keymap { format, fd, size } => {
                // TODO: Keymap loading blocks xdg configure, consider delaying
                state.keyboard.keymap(format, fd, size);
            }
            wl_keyboard::Event::RepeatInfo { rate, delay } => {
                state
                    .keyrepeat_sender
                    .send(RepeatMessage::RepeatInfo((rate as u32, delay as u32)))
                    .unwrap();
            }
            _ => (),
        }
    }
 }
 // TODO: Move to dedicated pointer module
 const BTN_LEFT: u32 = 0x110;
 const BTN_RIGHT: u32 = 0x111;
 const BTN_MIDDLE: u32 = 0x112;
 impl Dispatch<wl_pointer::WlPointer, ()> for State {
    fn event(
        state: &mut Self,
        _: &wl_pointer::WlPointer,
        event: wl_pointer::Event,
        _: &(),
        _: &Connection,
        _: &QueueHandle<Self>,
    ) {
        match event {
            wl_pointer::Event::Enter {
                surface_x,
                surface_y,
                ..
            } => {
                state.pointer = Some((surface_x, surface_y));
            }
            wl_pointer::Event::Motion {
                surface_x,
                surface_y,
                ..
            } => {
                state.pointer = Some((surface_x, surface_y));
            }
            wl_pointer::Event::Leave { .. } => state.pointer = None,
            wl_pointer::Event::Axis { axis, value, .. } => match state.pointer {
                Some((x, y)) => {
                    let axis = match axis {
                        WEnum::Value(wl_pointer::Axis::VerticalScroll) => {
                            PointerButton::ScrollVertical(value)
                        }
                        WEnum::Value(wl_pointer::Axis::HorizontalScroll) => {
                            PointerButton::ScrollHorizontal(value)
                        }
                        _ => return,
                    };
                    let pos = (x as u32, y as u32);
                    for widget in state.widgets.iter_mut() {
                        let geo = widget.geometry();
                        if geo.contains(pos) {
                            let pos = (pos.0 - geo.x, pos.1 - geo.y);
                            let ev = Event::PointerEvent(PointerEvent {
                                button: axis,
                                pos: pos,
                            });
                            widget.event(&ev);
                            state.dirty = true;
                            break;
                        }
                    }
                }
                _ => (),
            },
            wl_pointer::Event::Button {
                button,
                state: button_state,
                ..
            } => match (button, button_state, state.pointer) {
                (button, WEnum::Value(wl_pointer::ButtonState::Pressed), Some((x, y))) => {
                    let button = match button {
                        BTN_LEFT => PointerButton::Left,
                        BTN_RIGHT => PointerButton::Right,
                        BTN_MIDDLE => PointerButton::Middle,
                        _ => return,
                    };
                    let pos = (x as u32, y as u32);
                    for widget in state.widgets.iter_mut() {
                        let geo = widget.geometry();
                        if geo.contains(pos) {
                            let pos = (pos.0 - geo.x, pos.1 - geo.y);
                            let ev = Event::PointerEvent(PointerEvent {
                                button: button,
                                pos: pos,
                            });
                            widget.event(&ev);
                            state.dirty = true;
                            break;
                        }
                    }
                }
                _ => (),
            },
            _ => (),
        }
    }
 }
 impl Dispatch<wp_single_pixel_buffer_manager_v1::WpSinglePixelBufferManagerV1, ()> for State {
    fn event(
        _: &mut Self,
        _: &wp_single_pixel_buffer_manager_v1::WpSinglePixelBufferManagerV1,
        _: wp_single_pixel_buffer_manager_v1::Event,
        _: &(),
        _: &Connection,
        _: &QueueHandle<Self>,
    ) {
    }
 }
 impl Dispatch<wp_viewporter::WpViewporter, ()> for State {
    fn event(
        _: &mut Self,
        _: &wp_viewporter::WpViewporter,
        _: wp_viewporter::Event,
        _: &(),
        _: &Connection,
        _: &QueueHandle<Self>,
    ) {
    }
 }
 impl Dispatch<wp_viewport::WpViewport, ()> for State {
    fn event(
        _: &mut Self,
        _: &wp_viewport::WpViewport,
        _: wp_viewport::Event,
        _: &(),
        _: &Connection,
        _: &QueueHandle<Self>,
    ) {
    }
 }
 impl Dispatch<xdg_activation_v1::XdgActivationV1, ()> for State {
    fn event(
        _: &mut Self,
        _: &xdg_activation_v1::XdgActivationV1,
        _: xdg_activation_v1::Event,
        _: &(),
        _: &Connection,
        _: &QueueHandle<Self>,
    ) {
    }
 }
 impl Dispatch<xdg_activation_token_v1::XdgActivationTokenV1, ()> for State {
    fn event(
        state: &mut Self,
        _: &xdg_activation_token_v1::XdgActivationTokenV1,
        event: xdg_activation_token_v1::Event,
        _: &(),
        _: &Connection,
        _: &QueueHandle<Self>,
    ) {
        match event {
            xdg_activation_token_v1::Event::Done { token } => {
                let ev = Event::TokenUpdate(token);
                for widget in state.widgets.iter_mut() {
                    widget.event(&ev);
                }
            }
            _ => (),
        }
    }
 }
@@ -1,117 +0,0 @@
 use std::{
    cmp::Ordering,
    collections::HashSet,
    error::Error,
    fs::{read_to_string, File},
    io::{Error as io_error, ErrorKind},
 };
 use serde::{self, Deserialize, Serialize};
 use simd_json;
 use walkdir::WalkDir;
 use crate::utils::{inish, xdg};
 #[derive(Serialize, Deserialize, Clone, Debug, Eq, Hash)]
 #[serde(rename_all = "snake_case")]
 pub struct Desktop {
    pub entry_type: String,
    pub name: String,
    pub no_display: bool,
    pub hidden: bool,
    pub exec: Option<String>,
    pub url: Option<String>,
    pub term: bool,
    pub keywords: Vec<String>,
 }
 impl Desktop {
    fn parse(f: &str) -> Result<Desktop, Box<dyn Error>> {
        let s = read_to_string(f)?;
        let config = inish::parse(&s)?;
        match config.get("Desktop Entry") {
            Some(section) => Ok(Desktop {
                entry_type: section.get("Type").unwrap_or(&"").to_string(),
                name: section.get("Name").unwrap_or(&"").to_string(),
                term: section.get("Terminal").unwrap_or(&"") == &"true",
                no_display: section.get("NoDisplay").unwrap_or(&"") == &"true",
                hidden: section.get("Hidden").unwrap_or(&"") == &"true",
                exec: section.get("Exec").map(|x| x.to_string()),
                url: section.get("URL").map(|x| x.to_string()),
                keywords: section
                    .get("Keywords")
                    .map(|x| {
                        x.split(';')
                            .map(|y| y.trim().to_string())
                            .filter(|z| z != "")
                            .collect()
                    })
                    .unwrap_or_else(|| vec![]),
            }),
            None => Err(Box::new(io_error::new(
                ErrorKind::NotFound,
                "no desktop entry in file",
            ))),
        }
    }
 }
 impl Ord for Desktop {
    fn cmp(&self, other: &Self) -> Ordering {
        self.name.cmp(&other.name)
    }
 }
 impl PartialOrd for Desktop {
    fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
        Some(self.cmp(other))
    }
 }
 impl PartialEq for Desktop {
    fn eq(&self, other: &Self) -> bool {
        self.name == other.name
    }
 }
 pub fn load_desktop_cache() -> Result<Vec<Desktop>, Box<dyn Error>> {
    match File::open(format!("{}/wldash/desktop.json", xdg::cache_folder())) {
        Ok(f) => simd_json::from_reader(f).map_err(|e| e.into()),
        Err(e) => Err(e.into()),
    }
 }
 pub fn write_desktop_cache(v: &Vec<Desktop>) -> Result<(), Box<dyn Error>> {
    match File::create(format!("{}/wldash/desktop.json", xdg::cache_folder())) {
        Ok(f) => simd_json::to_writer(f, v).map_err(|e| e.into()),
        Err(e) => Err(e.into()),
    }
 }
 pub fn load_desktop_files() -> Vec<Desktop> {
    let dirs = xdg::data_folders();
    let mut desktop: Vec<Desktop> = Vec::new();
    let mut seen: HashSet<String> = HashSet::new();
    for dir in dirs {
        for entry in WalkDir::new(format!("{}/applications", dir)) {
            if let Ok(entry) = entry {
                if let Ok(d) = Desktop::parse(entry.path().to_str().unwrap()) {
                    if d.hidden
                        || d.no_display
                        || (d.entry_type != "Application" && d.entry_type != "Link")
                    {
                        continue;
                    }
                    if !seen.contains(&d.name) {
                        seen.insert(d.name.to_string());
                        desktop.push(d);
                    }
                }
            }
        }
    }
    desktop
 }
@@ -1,134 +0,0 @@
 use std::{collections::HashMap, error::Error};
 fn parse_field<'a>(line: &'a str) -> Result<(&'a str, &'a str), Box<dyn Error>> {
    let split = match line.find('=') {
        Some(v) => v,
        None => return Err("expected equals sign on line, but found none".into()),
    };
    let (key, value) = line.split_at(split);
    let (key, value) = (key.trim(), value.trim_matches('=').trim());
    Ok((key, value))
 }
 type InishSection<'a> = HashMap<&'a str, &'a str>;
 type Inish<'a> = HashMap<&'a str, InishSection<'a>>;
 pub fn parse<'a>(s: &'a str) -> Result<Inish<'a>, Box<dyn Error>> {
    let mut sections: Inish<'a> = HashMap::new();
    let mut current_section = HashMap::new();
    let mut current_section_name = "";
    for line in s.lines() {
        let line = line.trim();
        let mut chars = line.chars();
        let start = chars.next();
        let end = chars.last();
        match (start, end) {
            (Some('#'), _) => continue,
            (Some('['), Some(']')) => {
                sections.insert(current_section_name, current_section);
                current_section = HashMap::new();
                let len = line.bytes().count();
                current_section_name = &line[1..len - 1].trim();
            }
            (Some('['), v) => {
                return Err(format!(
                    "expected Some(']') to terminate section name, but got {:?}",
                    v
                )
                .into());
            }
            _ if line.is_empty() => continue,
            _ => {
                let (key, value) = parse_field(line)?;
                current_section.insert(key, value);
            }
        }
    }
    sections.insert(current_section_name, current_section);
    Ok(sections)
 }
 #[cfg(test)]
 mod tests {
    use super::*;
    #[test]
    fn sections() {
        let config = parse(
            "
 [section_a]
 [section_b]
 ",
        )
        .expect("config didn't parse");
        if !config.contains_key("section_a") {
            panic!("named section did not exist");
        }
        if !config.contains_key("section_b") {
            panic!("named section did not exist");
        }
        if !config.contains_key("") {
            panic!("unnamed section did not exist");
        }
    }
    #[test]
    fn fields() {
        let config = parse(
            "
 field_outside = 'hello'
 [section_a]
 field_a = 1234
 ",
        )
        .expect("config didn't parse");
        let section_a = match config.get("section_a") {
            Some(v) => v,
            None => panic!("named section did not exist"),
        };
        assert_eq!(section_a.get("field_a"), Some(&"1234"));
        let section_unnamed = match config.get("") {
            Some(v) => v,
            None => panic!("unnamed section did not exist"),
        };
        assert_eq!(section_unnamed.get("field_outside"), Some(&"'hello'"));
    }
    #[test]
    fn whitespaces() {
        let config = parse(
            "
 field outside  =   'hello'
 [ section a   ]
   field a   =   1234   ",
        )
        .expect("config didn't parse");
        let section_a = match config.get("section a") {
            Some(v) => v,
            None => panic!("named section did not exist"),
        };
        assert_eq!(section_a.get("field a"), Some(&"1234"));
        let section_unnamed = match config.get("") {
            Some(v) => v,
            None => panic!("unnamed section did not exist"),
        };
        assert_eq!(section_unnamed.get("field outside"), Some(&"'hello'"));
    }
 }
@@ -1,3 +0,0 @@
 pub mod desktop;
 mod inish;
 pub mod xdg;
@@ -1,40 +0,0 @@
 use std::env;
 pub fn cache_folder() -> String {
    match env::var_os("XDG_CACHE_HOME") {
        Some(s) => s.into_string().unwrap(),
        None => {
            let home = env::var_os("HOME").unwrap().into_string().unwrap();
            format!("{}/.cache", home)
        }
    }
 }
 pub fn config_folder() -> String {
    match env::var_os("XDG_CONFIG_HOME") {
        Some(s) => s.into_string().unwrap(),
        None => {
            let home = env::var_os("HOME").unwrap().into_string().unwrap();
            format!("{}/.config", home)
        }
    }
 }
 pub fn data_folders() -> Vec<String> {
    let xdg_data_home = match env::var_os("XDG_DATA_HOME") {
        Some(s) => s.into_string().unwrap(),
        None => {
            let home = env::var_os("HOME").unwrap().into_string().unwrap();
            format!("{}/.local/share", home)
        }
    };
    let xdg_data_dirs = match env::var_os("XDG_DATA_DIRS") {
        Some(s) => s.into_string().unwrap(),
        None => "/usr/local/share:/usr/share".to_string(),
    };
    // Eww.
    std::iter::once(xdg_data_home.to_string())
        .chain(xdg_data_dirs.split(':').map(|x| x.to_string()))
        .collect()
 }
@@ -0,0 +1,458 @@
 use crate::buffer::Buffer;
 use crate::color::Color;
 pub use crate::keyboard::{KeyState, ModifiersState};
 use chrono::NaiveDateTime;
 use nix::poll::PollFd;
 pub struct DrawContext<'a> {
    pub buf: &'a mut Buffer<'a>,
    pub bg: &'a Color,
    pub time: NaiveDateTime,
    pub force: bool,
 }
 #[derive(Debug)]
 pub struct DrawReport {
    pub width: u32,
    pub height: u32,
    pub damage: Vec<(i32, i32, i32, i32)>,
    pub full_damage: bool,
 }
 impl DrawReport {
    pub fn empty(width: u32, height: u32) -> DrawReport {
        DrawReport {
            width,
            height,
            damage: Vec::new(),
            full_damage: false,
        }
    }
 }
 pub struct WaitContext {
    pub fds: Vec<PollFd>,
    pub target_time: Option<NaiveDateTime>,
 }
 impl WaitContext {
    pub fn set_time(&mut self, new_time: NaiveDateTime) {
        if let Some(ot) = self.target_time {
            if new_time < ot {
                self.target_time = Some(new_time);
            }
        } else {
            self.target_time = Some(new_time);
        }
    }
 }
 pub trait Widget {
    fn wait(&mut self, ctx: &mut WaitContext);
    fn enter(&mut self);
    fn leave(&mut self);
    fn size(&self) -> (u32, u32);
    fn draw(
        &mut self,
        ctx: &mut DrawContext,
        pos: (u32, u32),
        expansion: (u32, u32),
    ) -> Result<DrawReport, ::std::io::Error>;
    fn keyboard_input(
        &mut self,
        keysym: u32,
        modifier_state: ModifiersState,
        key_state: KeyState,
        interpreted: Option<String>,
    );
    fn mouse_click(&mut self, button: u32, pos: (u32, u32));
    fn mouse_scroll(&mut self, scroll: (f64, f64), pos: (u32, u32));
 }
 pub struct VerticalLayout<'a> {
    pub children: Vec<Box<dyn Widget + Send + 'a>>,
 }
 #[allow(dead_code)]
 impl<'a> VerticalLayout<'a> {
    pub fn new(children: Vec<Box<dyn Widget + Send + 'a>>) -> Box<VerticalLayout> {
        Box::new(VerticalLayout { children })
    }
 }
 impl<'a> Widget for VerticalLayout<'a> {
    fn wait(&mut self, ctx: &mut WaitContext) {
        for child in &mut self.children {
            child.wait(ctx);
        }
    }
    fn enter(&mut self) {
        for child in &mut self.children {
            child.enter();
        }
    }
    fn leave(&mut self) {
        for child in &mut self.children {
            child.leave();
        }
    }
    fn size(&self) -> (u32, u32) {
        let mut width = 0;
        let mut height = 0;
        for child in &self.children {
            let size = child.size();
            if size.0 > width {
                width = size.0;
            }
            height += size.1;
        }
        (width, height)
    }
    fn draw(
        &mut self,
        ctx: &mut DrawContext,
        pos: (u32, u32),
        expansion: (u32, u32),
    ) -> Result<DrawReport, ::std::io::Error> {
        let mut offset = 0;
        let mut width = 0;
        let mut damage = Vec::new();
        let mut full_damage = false;
        for child in &mut self.children {
            let mut report = child.draw(
                ctx,
                (pos.0, offset + pos.1),
                (expansion.0, expansion.1 - offset),
            )?;
            if report.width > width {
                width = report.width
            }
            offset += report.height;
            full_damage |= report.full_damage;
            damage.append(&mut report.damage);
        }
        Ok(DrawReport {
            width,
            height: offset,
            damage,
            full_damage,
        })
    }
    fn keyboard_input(
        &mut self,
        keysym: u32,
        modifier_state: ModifiersState,
        key_state: KeyState,
        interpreted: Option<String>,
    ) {
        for child in &mut self.children {
            child.keyboard_input(keysym, modifier_state, key_state, interpreted.clone());
        }
    }
    fn mouse_click(&mut self, button: u32, pos: (u32, u32)) {
        let mut height = 0;
        for child in &mut self.children {
            let size = child.size();
            if pos.1 >= height && pos.1 < height + size.1 {
                let pos = (pos.0, pos.1 - height);
                child.mouse_click(button, pos);
                return;
            }
            height += size.1;
        }
    }
    fn mouse_scroll(&mut self, scroll: (f64, f64), pos: (u32, u32)) {
        let mut height = 0;
        for child in &mut self.children {
            let size = child.size();
            if pos.1 >= height && pos.1 < height + size.1 {
                let pos = (pos.0, pos.1 - height);
                child.mouse_scroll(scroll, pos);
                return;
            }
            height += size.1;
        }
    }
 }
 pub struct HorizontalLayout<'a> {
    pub children: Vec<Box<dyn Widget + Send + 'a>>,
 }
 #[allow(dead_code)]
 impl<'a> HorizontalLayout<'a> {
    pub fn new(children: Vec<Box<dyn Widget + Send + 'a>>) -> Box<HorizontalLayout> {
        Box::new(HorizontalLayout { children })
    }
    fn height(&self) -> u32 {
        let mut height = 0;
        for child in &self.children {
            let size = child.size();
            if size.1 > height {
                height = size.1;
            }
        }
        height
    }
 }
 impl<'a> Widget for HorizontalLayout<'a> {
    fn wait(&mut self, ctx: &mut WaitContext) {
        for child in &mut self.children {
            child.wait(ctx);
        }
    }
    fn enter(&mut self) {
        for child in &mut self.children {
            child.enter();
        }
    }
    fn leave(&mut self) {
        for child in &mut self.children {
            child.leave();
        }
    }
    fn size(&self) -> (u32, u32) {
        let mut width = 0;
        let mut height = 0;
        for child in &self.children {
            let size = child.size();
            if size.1 > height {
                height = size.1;
            }
            width += size.0;
        }
        (width, height)
    }
    fn draw(
        &mut self,
        ctx: &mut DrawContext,
        pos: (u32, u32),
        expansion: (u32, u32),
    ) -> Result<DrawReport, ::std::io::Error> {
        let mut offset = 0;
        let mut height = 0;
        let mut damage = Vec::new();
        let mut full_damage = false;
        for child in &mut self.children {
            let mut report = child.draw(
                ctx,
                (offset + pos.0, pos.1),
                (expansion.0 - offset, expansion.1),
            )?;
            if report.height > height {
                height = report.height
            }
            offset += report.width;
            full_damage |= report.full_damage;
            damage.append(&mut report.damage);
        }
        Ok(DrawReport {
            width: offset,
            height,
            damage,
            full_damage,
        })
    }
    fn keyboard_input(
        &mut self,
        keysym: u32,
        modifier_state: ModifiersState,
        key_state: KeyState,
        interpreted: Option<String>,
    ) {
        for child in &mut self.children {
            child.keyboard_input(keysym, modifier_state, key_state, interpreted.clone());
        }
    }
    fn mouse_click(&mut self, button: u32, pos: (u32, u32)) {
        let mut width = 0;
        for child in &mut self.children {
            let size = child.size();
            if pos.0 >= width && pos.0 < width + size.0 {
                let pos = (pos.0 - width, pos.1);
                child.mouse_click(button, pos);
                return;
            }
            width += size.0;
        }
    }
    fn mouse_scroll(&mut self, scroll: (f64, f64), pos: (u32, u32)) {
        let mut width = 0;
        for child in &mut self.children {
            let size = child.size();
            if pos.0 >= width && pos.0 < width + size.0 {
                let pos = (pos.0 - width, pos.1);
                child.mouse_scroll(scroll, pos);
                return;
            }
            width += size.0;
        }
    }
 }
 pub struct Margin<'a> {
    pub child: Box<dyn Widget + Send + 'a>,
    pub margins: (u32, u32, u32, u32), // left, right, top, bottom
 }
 #[allow(dead_code)]
 impl<'a> Margin<'a> {
    pub fn new(margins: (u32, u32, u32, u32), child: Box<dyn Widget + Send + 'a>) -> Box<Margin> {
        Box::new(Margin { child, margins })
    }
 }
 impl<'a> Widget for Margin<'a> {
    fn wait(&mut self, ctx: &mut WaitContext) {
        self.child.wait(ctx)
    }
    fn enter(&mut self) {
        self.child.enter()
    }
    fn leave(&mut self) {
        self.child.leave()
    }
    fn size(&self) -> (u32, u32) {
        let size = self.child.size();
        (
            size.0 + self.margins.0 + self.margins.1,
            size.1 + self.margins.2 + self.margins.3,
        )
    }
    fn draw(
        &mut self,
        ctx: &mut DrawContext,
        pos: (u32, u32),
        expansion: (u32, u32),
    ) -> Result<DrawReport, ::std::io::Error> {
        let expansion = (
            expansion.0 - self.margins.0 - self.margins.1,
            expansion.1 - self.margins.2 - self.margins.3,
        );
        let report = self.child.draw(
            ctx,
            (pos.0 + self.margins.0, pos.1 + self.margins.2),
            expansion,
        )?;
        Ok(DrawReport {
            width: report.width + self.margins.0 + self.margins.1,
            height: report.height + self.margins.2 + self.margins.3,
            damage: report.damage,
            full_damage: report.full_damage,
        })
    }
    fn keyboard_input(
        &mut self,
        keysym: u32,
        modifier_state: ModifiersState,
        key_state: KeyState,
        interpreted: Option<String>,
    ) {
        self.child
            .keyboard_input(keysym, modifier_state, key_state, interpreted);
    }
    fn mouse_click(&mut self, button: u32, pos: (u32, u32)) {
        let pos = (
            pos.0.saturating_sub(self.margins.0),
            pos.1.saturating_sub(self.margins.2),
        );
        self.child.mouse_click(button, pos);
    }
    fn mouse_scroll(&mut self, scroll: (f64, f64), pos: (u32, u32)) {
        let pos = (
            pos.0.saturating_sub(self.margins.0),
            pos.1.saturating_sub(self.margins.2),
        );
        self.child.mouse_scroll(scroll, pos);
    }
 }
 pub struct Fixed<'a> {
    pub child: Box<dyn Widget + Send + 'a>,
    pub size: (u32, u32),
 }
 #[allow(dead_code)]
 impl<'a> Fixed<'a> {
    pub fn new(size: (u32, u32), child: Box<dyn Widget + Send + 'a>) -> Box<Fixed> {
        Box::new(Fixed { child, size })
    }
 }
 impl<'a> Widget for Fixed<'a> {
    fn wait(&mut self, ctx: &mut WaitContext) {
        self.child.wait(ctx)
    }
    fn enter(&mut self) {
        self.child.enter()
    }
    fn leave(&mut self) {
        self.child.leave()
    }
    fn size(&self) -> (u32, u32) {
        self.size
    }
    fn draw(
        &mut self,
        ctx: &mut DrawContext,
        pos: (u32, u32),
        expansion: (u32, u32),
    ) -> Result<DrawReport, ::std::io::Error> {
        let report = self.child.draw(ctx, pos, expansion)?;
        Ok(DrawReport {
            width: self.size.0,
            height: self.size.1,
            damage: report.damage,
            full_damage: report.full_damage,
        })
    }
    fn keyboard_input(
        &mut self,
        keysym: u32,
        modifier_state: ModifiersState,
        key_state: KeyState,
        interpreted: Option<String>,
    ) {
        self.child
            .keyboard_input(keysym, modifier_state, key_state, interpreted);
    }
    fn mouse_click(&mut self, button: u32, pos: (u32, u32)) {
        self.child.mouse_click(button, pos);
    }
    fn mouse_scroll(&mut self, scroll: (f64, f64), pos: (u32, u32)) {
        self.child.mouse_scroll(scroll, pos);
    }
 }
@@ -1,112 +0,0 @@
 use std::{
    thread,
    sync::{Arc, Mutex},
 };
 use crate::{
    color::Color,
    fonts::FontMap,
    event::{Event, Events, PointerButton},
    widgets::bar_widget::{BarWidget, BarWidgetImpl},
 };
 use alsa::mixer::{
    Mixer, Selem, SelemChannelId, SelemId,
 };
 #[inline]
 fn alsa_volume_to_f32(volume: i64, min: i64, max: i64) -> f32 {
    (volume - min) as f32 / (max - min) as f32
 }
 #[inline]
 fn f32_to_alsa_volume(volume: f32, min: i64, max: i64) -> i64 {
    min + ((max - min) as f32 * volume) as i64
 }
 fn get_master_volume(selem: &mut Selem) -> f32 {
    let (min, max) = selem.get_playback_volume_range();
    selem
        .get_playback_volume(SelemChannelId::mono())
        .map(|volume| alsa_volume_to_f32(volume, min, max))
        .unwrap()
 }
 fn get_mute(selem: &mut Selem) -> bool {
    let res = selem.get_playback_switch(SelemChannelId::FrontLeft);
    false
 }
 fn set_master_volume(selem: &mut Selem, volume: f32) {
    let (min, max) = selem.get_playback_volume_range();
    let volume = f32_to_alsa_volume(volume, min, max);
    selem.set_playback_volume_all(volume).unwrap();
 }
 fn start_monitor(inner: Arc<Mutex<Inner>>) {
    thread::Builder::new()
        .name("audiomon".to_string())
        .spawn(move || {
            let mixer = Mixer::new("default", true).unwrap();
            let id = SelemId::new("Master", 0);
            let mut selem = mixer.find_selem(&id).unwrap();
            let mut inner = inner.lock().unwrap();
            inner.volume = get_master_volume(&mut selem);
            inner.mute = get_mute(&mut selem);
        })
        .unwrap();
 }
 struct Inner {
    volume: f32,
    mute: bool,
 }
 pub struct AlsaAudio {
    inner: Arc<Mutex<Inner>>,
 }
 impl AlsaAudio {
    pub fn new(fm: &mut FontMap, font: &'static str, size: f32) -> BarWidget {
        let inner = Arc::new(Mutex::new(Inner{
            mute: false,
            volume: 0.,
        }));
        start_monitor(inner.clone());
        let dev = AlsaAudio{ inner };
        BarWidget::new(Box::new(dev), fm, font, size)
    }
 }
 impl BarWidgetImpl for AlsaAudio {
    fn name(&self) -> &'static str {
        "audio"
    }
    fn get_dirty(&self) -> bool {
        true
    }
    fn value(&mut self) -> f32 {
        let inner = self.inner.lock().unwrap();
        inner.volume
    }
    fn color(&self) -> Color {
        let inner = self.inner.lock().unwrap();
        if inner.mute {
            Color::DARKORANGE
        } else {
            Color::WHITE
        }
    }
    fn click(&mut self, pos: f32, btn: PointerButton) {
        let inner = self.inner.lock().unwrap();
        match btn {
 //            PointerButton::Left =>  inner.set_master_volume(pos),
            //PointerButton::Right => Some(Change::ToggleMute),
            //PointerButton::ScrollVertical(val) => Some(Change::VolumeInc((val / 512.) as f32)),
            //PointerButton::ScrollHorizontal(val) => Some(Change::VolumeInc((val / 100.) as f32)),
            _ => (),
        };
    }
 }
@@ -0,0 +1,115 @@
 use crate::color::Color;
 use crate::widget::WaitContext;
 use crate::{
    fonts::FontRef,
    widgets::bar_widget::{BarWidget, BarWidgetImpl},
 };
 use alsa::mixer::{Mixer, Selem, SelemChannelId, SelemId};
 const CARD_NAME: &str = "default";
 const SELEM_NAME: &str = "Master";
 const SELEM_ID: u32 = 0u32;
 #[inline]
 fn alsa_error_to_io_error(fail: &'static str, err: &alsa::Error) -> ::std::io::Error {
    let kind = ::std::io::ErrorKind::Other;
    let func = err.func();
    ::std::io::Error::new(kind, format!("{}: {}{}", fail, func, err.errno()))
 }
 #[inline]
 fn alsa_volume_to_f32(volume: i64, min: i64, max: i64) -> f32 {
    (volume - min) as f32 / (max - min) as f32
 }
 #[inline]
 fn f32_to_alsa_volume(volume: f32, min: i64, max: i64) -> i64 {
    min + ((max - min) as f32 * volume) as i64
 }
 pub struct Alsa {
    pub mixer: Mixer,
 }
 impl Alsa {
    pub fn new(font: FontRef, font_size: f32, length: u32) -> ::std::io::Result<Box<BarWidget>> {
        let mixer = Mixer::new(CARD_NAME, true)
            .map_err(|err| alsa_error_to_io_error("Failed to create ALSA mixer", &err))?;
        let mixer = Self { mixer };
        mixer.get_master_volume()?; // probing
        Ok(BarWidget::new_simple(
            font,
            font_size,
            length,
            Box::new(mixer),
        ))
    }
    #[inline]
    pub fn get_master(&self) -> ::std::io::Result<Selem> {
        let master_id = SelemId::new(SELEM_NAME, SELEM_ID);
        match self.mixer.find_selem(&master_id) {
            Some(master) => Ok(master),
            None => {
                let kind = ::std::io::ErrorKind::NotFound;
                let desc = "`Master` not found";
                Err(::std::io::Error::new(kind, desc))
            }
        }
    }
    pub fn get_master_volume(&self) -> ::std::io::Result<f32> {
        let master = self.get_master()?;
        let (min, max) = master.get_playback_volume_range();
        master
            .get_playback_volume(SelemChannelId::mono())
            .map(|volume| alsa_volume_to_f32(volume, min, max))
            .map_err(|e| alsa_error_to_io_error("Failed to get `Master` volume", &e))
    }
    pub fn set_master_volume(&self, volume: f32) -> ::std::io::Result<()> {
        let master = self.get_master()?;
        let (min, max) = master.get_playback_volume_range();
        let volume = f32_to_alsa_volume(volume, min, max);
        master
            .set_playback_volume_all(volume)
            .map_err(|e| alsa_error_to_io_error("Failed to set `Master` volume", &e))
    }
    pub fn inc_master_volume(&self, diff: f32) -> ::std::io::Result<()> {
        let master = self.get_master()?;
        let (min, max) = master.get_playback_volume_range();
        master
            .get_playback_volume(SelemChannelId::mono())
            .and_then(|volume| {
                let volume = alsa_volume_to_f32(volume, min, max);
                let volume = f32_to_alsa_volume(volume + diff, min, max);
                master.set_playback_volume_all(volume)
            })
            .map_err(|e| alsa_error_to_io_error("Failed to inc/dec `Master` volume", &e))
    }
 }
 impl BarWidgetImpl for Alsa {
    fn wait(&mut self, _: &mut WaitContext) {}
    fn name(&self) -> &str {
        "volume"
    }
    fn value(&self) -> f32 {
        match self.get_master_volume() {
            Ok(v) => v,
            Err(e) => panic!("{}", e),
        }
    }
    fn color(&self) -> Color {
        Color::new(1.0, 1.0, 1.0, 1.0)
    }
    fn inc(&mut self, diff: f32) {
        if let Err(e) = self.inc_master_volume(diff) {
            panic!("{}", e)
        }
    }
    fn set(&mut self, abs: f32) {
        if let Err(e) = self.set_master_volume(abs) {
            panic!("{}", e)
        }
    }
    fn toggle(&mut self) {}
 }
@@ -0,0 +1,9 @@
 #[cfg(feature = "alsa-widget")]
 mod alsa_sound;
 #[cfg(feature = "alsa-widget")]
 pub use alsa_sound::Alsa;
 #[cfg(feature = "pulseaudio-widget")]
 mod pulse_sound;
 #[cfg(feature = "pulseaudio-widget")]
 pub use pulse_sound::PulseAudio;
@@ -0,0 +1,544 @@
 use crate::cmd::Cmd;
 use crate::color::Color;
 use crate::widget::WaitContext;
 use crate::{
    fonts::FontRef,
    widgets::bar_widget::{BarWidget, BarWidgetImpl},
 };
 use std::cell::RefCell;
 use std::collections::HashMap;
 use std::ops::Deref;
 use std::rc::Rc;
 use std::sync::mpsc::{channel, Sender};
 use std::sync::{Arc, Mutex};
 use std::thread;
 use libpulse_binding::callbacks::ListResult;
 use libpulse_binding::context::{
    introspect::ServerInfo, introspect::SinkInfo, subscribe::Facility, subscribe::InterestMaskSet,
    subscribe::Operation as SubscribeOperation, Context, FlagSet, State as PulseState,
 };
 use libpulse_binding::mainloop::standard::IterateResult;
 use libpulse_binding::mainloop::standard::Mainloop;
 use libpulse_binding::proplist::{properties, Proplist};
 use libpulse_binding::volume::{ChannelVolumes, Volume};
 struct PulseAudioConnection {
    mainloop: Rc<RefCell<Mainloop>>,
    context: Rc<RefCell<Context>>,
 }
 #[derive(Clone)]
 struct PulseAudioSinkInfo {
    volume: ChannelVolumes,
    mute: bool,
 }
 struct PulseAudioClient {
    sender: Sender<PulseAudioClientRequest>,
    default_sink: String,
    sinks: HashMap<String, PulseAudioSinkInfo>,
 }
 enum PulseAudioClientRequest {
    GetDefaultDevice(Option<Sender<bool>>),
    GetSinkInfoByIndex(Option<Sender<bool>>, u32),
    GetSinkInfoByName(Option<Sender<bool>>, String),
    SetSinkVolumeByName(Option<Sender<bool>>, String, ChannelVolumes),
    SetSinkMuteByName(Option<Sender<bool>>, String, bool),
 }
 #[derive(Debug)]
 struct PulseAudioSoundDeviceInner {
    name: Option<String>,
    volume: Option<ChannelVolumes>,
    volume_avg: f32,
    muted: bool,
    default_sink: String,
 }
 struct PulseAudioSoundDevice {
    client: Arc<Mutex<PulseAudioClient>>,
    inner: Arc<Mutex<PulseAudioSoundDeviceInner>>,
 }
 impl PulseAudioConnection {
    fn new() -> Result<Self, ::std::io::Error> {
        let mut proplist = Proplist::new().unwrap();
        proplist
            .set_str(properties::APPLICATION_NAME, "wldash")
            .unwrap();
        let mainloop = Rc::new(RefCell::new(Mainloop::new().unwrap()));
        let context = Rc::new(RefCell::new(
            Context::new_with_proplist(mainloop.borrow().deref(), "wldash_context", &proplist)
                .unwrap(),
        ));
        context
            .borrow_mut()
            .connect(None, FlagSet::NOFLAGS, None)
            .map_err(|_e| {
                ::std::io::Error::new(
                    ::std::io::ErrorKind::Other,
                    "unable to connect to pulseaudio context",
                )
            })?;
        let mut connection = PulseAudioConnection { mainloop, context };
        // Wait for context to be ready
        loop {
            connection.iterate(false)?;
            match connection.context.borrow().get_state() {
                PulseState::Ready => {
                    break;
                }
                PulseState::Failed | PulseState::Terminated => {}
                _ => {}
            }
        }
        Ok(connection)
    }
    fn iterate(&mut self, blocking: bool) -> Result<(), ::std::io::Error> {
        match self.mainloop.borrow_mut().iterate(blocking) {
            IterateResult::Quit(_) | IterateResult::Err(_) => Err(::std::io::Error::new(
                ::std::io::ErrorKind::Other,
                "unable to iterate pulseaudio state",
            )),
            IterateResult::Success(_) => Ok(()),
        }
    }
 }
 impl PulseAudioClient {
    fn new<F>(listener: F) -> Result<Arc<Mutex<Self>>, ::std::io::Error>
    where
        F: Fn(Arc<Mutex<Self>>) -> (),
        F: Send + 'static + Clone,
    {
        let (tx, rx) = channel();
        let client = Arc::new(Mutex::new(PulseAudioClient {
            sender: tx,
            default_sink: "@DEFAULT_SINK@".to_string(),
            sinks: HashMap::new(),
        }));
        let loop_client = client.clone();
        let (tx1, rx1) = channel();
        let _ = thread::Builder::new()
            .name("pa_writer".to_string())
            .spawn(move || {
                let mut conn = match PulseAudioConnection::new() {
                    Ok(v) => {
                        tx1.send(true).unwrap();
                        v
                    }
                    Err(_) => {
                        tx1.send(false).unwrap();
                        return;
                    }
                };
                // make sure mainloop dispatched everything
                for _ in 0..10 {
                    conn.iterate(false).unwrap();
                }
                loop {
                    let cl = loop_client.clone();
                    let l = listener.clone();
                    match rx.recv() {
                        Err(_) => return,
                        Ok(req) => {
                            let mut introspector = conn.context.borrow_mut().introspect();
                            let done = Arc::new(Mutex::new(false));
                            let done_reader = done.clone();
                            let s = match req {
                                PulseAudioClientRequest::GetDefaultDevice(s) => {
                                    introspector.get_server_info(move |info| {
                                        *done.lock().unwrap() = true;
                                        PulseAudioClient::server_info_callback(
                                            cl.clone(),
                                            l.clone(),
                                            info,
                                        );
                                    });
                                    s
                                }
                                PulseAudioClientRequest::GetSinkInfoByIndex(s, index) => {
                                    introspector.get_sink_info_by_index(index, move |res| {
                                        *done.lock().unwrap() = true;
                                        PulseAudioClient::sink_info_callback(
                                            cl.clone(),
                                            l.clone(),
                                            res,
                                        );
                                    });
                                    s
                                }
                                PulseAudioClientRequest::GetSinkInfoByName(s, name) => {
                                    introspector.get_sink_info_by_name(&name, move |res| {
                                        *done.lock().unwrap() = true;
                                        PulseAudioClient::sink_info_callback(
                                            cl.clone(),
                                            l.clone(),
                                            res,
                                        );
                                    });
                                    s
                                }
                                PulseAudioClientRequest::SetSinkVolumeByName(s, name, volumes) => {
                                    introspector.set_sink_volume_by_name(
                                        &name,
                                        &volumes,
                                        Some(Box::new(move |_| {
                                            *done.lock().unwrap() = true;
                                        })),
                                    );
                                    s
                                }
                                PulseAudioClientRequest::SetSinkMuteByName(s, name, mute) => {
                                    introspector.set_sink_mute_by_name(
                                        &name,
                                        mute,
                                        Some(Box::new(move |_| {
                                            *done.lock().unwrap() = true;
                                        })),
                                    );
                                    s
                                }
                            };
                            // send request and receive response
                            loop {
                                if *done_reader.lock().unwrap() {
                                    break;
                                }
                                conn.iterate(true).unwrap();
                            }
                            if let Some(s) = s {
                                let _ = s.send(true);
                            }
                        }
                    }
                }
            });
        // subscribe
        let cl2 = client.clone();
        let (tx2, rx2) = channel();
        let _ = thread::Builder::new()
            .name("pa_reader".to_string())
            .spawn(move || {
                let conn = match PulseAudioConnection::new() {
                    Ok(v) => {
                        tx2.send(true).unwrap();
                        v
                    }
                    Err(_) => {
                        tx2.send(false).unwrap();
                        return;
                    }
                };
                // subcribe for events
                conn.context
                    .borrow_mut()
                    .set_subscribe_callback(Some(Box::new(move |facility, operation, index| {
                        cl2.lock()
                            .unwrap()
                            .subscribe_callback(facility, operation, index)
                    })));
                conn.context
                    .borrow_mut()
                    .subscribe(InterestMaskSet::SERVER | InterestMaskSet::SINK, |_| {});
                conn.mainloop.borrow_mut().run().unwrap();
            });
        let pa_writer_res = rx1.recv().unwrap();
        let pa_reader_res = rx2.recv().unwrap();
        if !pa_writer_res || !pa_reader_res {
            return Err(::std::io::Error::new(
                ::std::io::ErrorKind::Other,
                "unable to start pulseaudio thread",
            ));
        }
        Ok(client)
    }
    fn send(&self, request: PulseAudioClientRequest) -> Result<(), ::std::io::Error> {
        self.sender.send(request).map_err(|_e| {
            ::std::io::Error::new(
                ::std::io::ErrorKind::Other,
                "unable to send pulseaudio request",
            )
        })
    }
    fn server_info_callback<F>(s: Arc<Mutex<Self>>, listener: F, server_info: &ServerInfo)
    where
        F: Fn(Arc<Mutex<Self>>) -> (),
        F: Send + 'static,
    {
        match server_info.default_sink_name.clone() {
            None => {}
            Some(default_sink) => {
                (*s.lock().unwrap()).default_sink = default_sink.into();
                listener(s);
            }
        }
    }
    fn sink_info_callback<F>(s: Arc<Mutex<Self>>, listener: F, result: ListResult<&SinkInfo>)
    where
        F: Fn(Arc<Mutex<Self>>) -> (),
        F: Send + 'static,
    {
        match result {
            ListResult::End | ListResult::Error => {}
            ListResult::Item(sink_info) => match sink_info.name.clone() {
                None => {}
                Some(name) => {
                    let info = PulseAudioSinkInfo {
                        volume: sink_info.volume,
                        mute: sink_info.mute,
                    };
                    s.lock().unwrap().sinks.insert(name.into(), info);
                    listener(s);
                }
            },
        }
    }
    fn subscribe_callback(
        &self,
        facility: Option<Facility>,
        _operation: Option<SubscribeOperation>,
        index: u32,
    ) {
        match facility {
            None => {}
            Some(facility) => match facility {
                Facility::Server => {
                    let _ = self.send(PulseAudioClientRequest::GetDefaultDevice(None));
                }
                Facility::Sink => {
                    let _ = self.send(PulseAudioClientRequest::GetSinkInfoByIndex(None, index));
                }
                _ => {}
            },
        }
    }
 }
 impl PulseAudioSoundDevice {
    fn new<F>(listener: F) -> Result<Self, ::std::io::Error>
    where
        F: Fn() -> (),
        F: Send + 'static + Clone,
    {
        let inner = Arc::new(Mutex::new(PulseAudioSoundDeviceInner {
            name: None,
            volume: None,
            volume_avg: 0.0,
            muted: false,
            default_sink: "@DEFAULT_SINK@".to_string(),
        }));
        let cb_inner = inner.clone();
        let client = PulseAudioClient::new(move |client| {
            let mut inner = cb_inner.lock().unwrap();
            inner.default_sink = client.lock().unwrap().default_sink.clone();
            let name = inner
                .name
                .clone()
                .unwrap_or_else(|| inner.default_sink.clone());
            let sink_info = match client.lock().unwrap().sinks.get(&name) {
                None => return,
                Some(sink_info) => (*sink_info).clone(),
            };
            inner.volume = Some(sink_info.volume);
            inner.volume_avg = sink_info.volume.avg().0 as f32 / Volume::NORMAL.0 as f32;
            inner.muted = sink_info.mute;
            listener();
        })?;
        let cl = client.clone();
        let (tx, rx) = channel();
        {
            let cl = client.lock().unwrap();
            cl.send(PulseAudioClientRequest::GetDefaultDevice(Some(tx)))?;
        }
        rx.recv().unwrap();
        let name = {
            let cl = client.lock().unwrap();
            cl.default_sink.to_string()
        };
        (*inner.lock().unwrap()).name = Some(name.clone());
        let device = PulseAudioSoundDevice { client: cl, inner };
        let (tx, rx) = channel();
        {
            let cl = client.lock().unwrap();
            cl.send(PulseAudioClientRequest::GetSinkInfoByName(Some(tx), name))?;
        }
        rx.recv().unwrap();
        Ok(device)
    }
    fn muted(&self) -> bool {
        let inner = self.inner.lock().unwrap();
        inner.muted
    }
    fn volume(&self) -> f32 {
        let inner = self.inner.lock().unwrap();
        inner.volume_avg
    }
    fn inc_volume(&mut self, step: f32) -> Result<(), ::std::io::Error> {
        let mut inner = self.inner.lock().unwrap();
        let mut volume = match inner.volume {
            Some(volume) => volume,
            None => {
                return Err(::std::io::Error::new(
                    ::std::io::ErrorKind::Other,
                    "unable to set volume",
                ))
            }
        };
        // apply step to volumes
        let step = (step * Volume::NORMAL.0 as f32).round() as i32;
        if step > 0 {
            volume.inc_clamp(Volume(step as u32), Volume::MAX);
        } else {
            volume.decrease(Volume(-step as u32));
        }
        let name = inner
            .name
            .clone()
            .unwrap_or_else(|| inner.default_sink.clone());
        // update volumes
        inner.volume = Some(volume);
        inner.volume_avg = volume.avg().0 as f32 / Volume::NORMAL.0 as f32;
        self.client
            .lock()
            .unwrap()
            .send(PulseAudioClientRequest::SetSinkVolumeByName(
                None, name, volume,
            ))?;
        Ok(())
    }
    fn set_volume(&mut self, val: f32) -> Result<(), ::std::io::Error> {
        let mut inner = self.inner.lock().unwrap();
        let mut volume = match inner.volume {
            Some(volume) => volume,
            None => {
                return Err(::std::io::Error::new(
                    ::std::io::ErrorKind::Other,
                    "unable to set volume",
                ))
            }
        };
        // apply step to volumes
        volume.scale(Volume((val * Volume::NORMAL.0 as f32).round() as u32));
        let name = inner
            .name
            .clone()
            .unwrap_or_else(|| inner.default_sink.clone());
        // update volumes
        inner.volume = Some(volume);
        inner.volume_avg = volume.avg().0 as f32 / Volume::NORMAL.0 as f32;
        self.client
            .lock()
            .unwrap()
            .send(PulseAudioClientRequest::SetSinkVolumeByName(
                None, name, volume,
            ))?;
        Ok(())
    }
    fn toggle(&mut self) -> Result<(), ::std::io::Error> {
        let mut inner = self.inner.lock().unwrap();
        inner.muted = !inner.muted;
        self.client
            .lock()
            .unwrap()
            .send(PulseAudioClientRequest::SetSinkMuteByName(
                None,
                inner
                    .name
                    .clone()
                    .unwrap_or_else(|| inner.default_sink.clone()),
                inner.muted,
            ))?;
        Ok(())
    }
 }
 pub struct PulseAudio {
    device: PulseAudioSoundDevice,
 }
 impl PulseAudio {
    pub fn new(
        font: FontRef,
        font_size: f32,
        length: u32,
        sender: Sender<Cmd>,
    ) -> Result<Box<BarWidget>, ::std::io::Error> {
        BarWidget::new(font, font_size, length, move |dirty| {
            let device = PulseAudioSoundDevice::new(move || {
                *dirty.lock().unwrap() = true;
                sender.send(Cmd::Draw).unwrap();
            })?;
            Ok(Box::new(PulseAudio { device }))
        })
    }
 }
 impl BarWidgetImpl for PulseAudio {
    fn wait(&mut self, _: &mut WaitContext) {}
    fn name(&self) -> &str {
        "volume"
    }
    fn value(&self) -> f32 {
        self.device.volume()
    }
    fn color(&self) -> Color {
        let muted = self.device.muted();
        if muted {
            Color::new(1.0, 1.0, 0.0, 1.0)
        } else {
            Color::new(1.0, 1.0, 1.0, 1.0)
        }
    }
    fn inc(&mut self, inc: f32) {
        self.device.inc_volume(inc).unwrap();
    }
    fn set(&mut self, val: f32) {
        self.device.set_volume(val).unwrap();
    }
    fn toggle(&mut self) {
        self.device.toggle().unwrap();
    }
 }
@@ -1,18 +1,22 @@
-use std::{
+use crate::color::Color;
-    fs::{self, OpenOptions},
+use crate::widget::WaitContext;
    io::{Error, ErrorKind, Write},
    path::{Path, PathBuf},
 };
 use walkdir::WalkDir;
 use crate::{
-    color::Color,
+    fonts::FontRef,
    event::PointerButton,
    fonts::FontMap,
    widgets::bar_widget::{BarWidget, BarWidgetImpl},
 };
 use std::fs;
 use std::fs::OpenOptions;
 use std::io::Write;
 use std::io::{Error, ErrorKind};
 use std::path::{Path, PathBuf};
 pub struct Backlight {
    device_path: PathBuf,
    cur_brightness: u64,
    max_brightness: u64,
 }
 fn read_file_as_u64(path: &Path) -> Result<u64, Error> {
    let mut s = fs::read_to_string(path)?;
    s.pop();
@@ -25,81 +29,113 @@ fn write_file_as_u64(path: &Path, value: u64) -> Result<(), Error> {
    file.write_fmt(format_args!("{}", value))
 }
 pub struct Backlight {
    device_path: PathBuf,
    cur: u64,
    max: u64,
    dirty: bool,
 }
 impl Backlight {
-    fn update(&mut self) {
+    pub fn update(&mut self) -> Result<(), Error> {
-        self.cur = read_file_as_u64(self.device_path.join("brightness").as_path()).unwrap();
+        self.cur_brightness = read_file_as_u64(self.device_path.join("brightness").as_path())?;
-        self.max = read_file_as_u64(self.device_path.join("max_brightness").as_path()).unwrap();
+        self.max_brightness = read_file_as_u64(self.device_path.join("max_brightness").as_path())?;
        Ok(())
    }
-    pub fn new(path: Option<&str>, fm: &mut FontMap, font: &'static str, size: f32) -> BarWidget {
+    pub fn sync(&mut self) -> Result<(), Error> {
-        let mut device_path = None;
+        write_file_as_u64(
-        if let Some(path) = path {
+            self.device_path.join("brightness").as_path(),
-            device_path = Some(Path::new("/sys/class/backlight").to_path_buf().join(path));
+            self.cur_brightness,
-        } else {
+        )?;
-            for entry in WalkDir::new("/sys/class/backlight") {
+        self.update()?;
-                if let Ok(entry) = entry {
+        Ok(())
                    device_path = Some(entry.path().to_path_buf());
                }
            }
        }
        let mut dev = Backlight {
            device_path: device_path.expect("did not find backlight device"),
            cur: 0,
            max: 0,
            dirty: true,
        };
        dev.update();
        BarWidget::new(Box::new(dev), fm, font, size)
    }
-    pub fn detect() -> bool {
+    pub fn brightness(&self) -> f32 {
-        for entry in WalkDir::new("/sys/class/backlight") {
+        if self.cur_brightness > self.max_brightness {
            if entry.is_ok() {
                return true;
            }
        }
        return false;
    }
    pub fn set(&mut self, brightness: f32) {
        let val = (self.max as f32 * brightness) as u64;
        let _ = write_file_as_u64(self.device_path.join("brightness").as_path(), val);
        self.cur = read_file_as_u64(self.device_path.join("brightness").as_path()).unwrap();
    }
 }
 impl BarWidgetImpl for Backlight {
    fn name(&self) -> &'static str {
        "backlight"
    }
    fn get_dirty(&self) -> bool {
        self.dirty
    }
    fn value(&mut self) -> f32 {
        if self.cur > self.max {
            // what.
            return 1.0;
        }
-        self.dirty = false;
+        self.cur_brightness as f32 / self.max_brightness as f32
        self.cur as f32 / self.max as f32
    }
-    fn color(&self) -> Color {
+
-        Color::WHITE
+    pub fn set(&mut self, val: f32) -> Result<(), Error> {
        self.cur_brightness = (self.max_brightness as f32 * val) as u64;
        Ok(())
    }
-    fn click(&mut self, pos: f32, btn: PointerButton) {
+
-        self.dirty = true;
+    pub fn add(&mut self, diff: f32) -> Result<(), Error> {
-        match btn {
+        let inc = (self.max_brightness as f32 * diff) as i64;
-            PointerButton::Left => self.set(pos),
+
-            _ => (),
+        self.cur_brightness = if self.cur_brightness as i64 + inc < 1 {
            1
        } else if self.cur_brightness as i64 + inc > self.max_brightness as i64 {
            self.max_brightness
        } else {
            (self.cur_brightness as i64 + inc) as u64
        };
        Ok(())
    }
    pub fn new<'a>(
        path: &str,
        font: FontRef<'a>,
        font_size: f32,
        length: u32,
    ) -> Result<Box<BarWidget<'a>>, Error> {
        let mut dev = Backlight {
            device_path: Path::new("/sys/class/backlight").to_path_buf().join(path),
            cur_brightness: 0,
            max_brightness: 0,
        };
        dev.update()?;
        Ok(BarWidget::new_simple(
            font,
            font_size,
            length,
            Box::new(dev),
        ))
    }
 }
 impl BarWidgetImpl for Backlight {
    fn wait(&mut self, _: &mut WaitContext) {}
    fn name(&self) -> &str {
        "backlight"
    }
    fn value(&self) -> f32 {
        self.brightness()
    }
    fn color(&self) -> Color {
        Color::new(1.0, 1.0, 1.0, 1.0)
    }
    fn inc(&mut self, inc: f32) {
        self.add(inc).unwrap();
        match self.sync() {
            Ok(val) => val,
            Err(err) => {
                eprintln!("Error while trying to change brightness: {}", err);
            }
        }
    }
    fn set(&mut self, val: f32) {
        self.set(val).unwrap();
        match self.sync() {
            Ok(val) => val,
            Err(err) => {
                eprintln!("Error while trying to change brightness: {}", err);
            }
        }
    }
    fn toggle(&mut self) {
        self.cur_brightness = if self.cur_brightness == 1 {
            self.max_brightness
        } else {
            1
        };
        match self.sync() {
            Ok(val) => val,
            Err(err) => {
                eprintln!("Error while trying to change brightness: {}", err);
            }
        }
    }
 }
@@ -1,119 +1,163 @@
-use std::{cmp::min, default::Default};
+use crate::color::Color;
-
+use crate::draw::{draw_bar, draw_box, Font};
 use crate::{
-    buffer::BufferView,
+    fonts::FontRef,
-    color::Color,
+    widget::{DrawContext, DrawReport, KeyState, ModifiersState, WaitContext, Widget},
    draw::{draw_bar, draw_box},
    event::{Event, PointerButton},
    fonts::FontMap,
    widgets::{Geometry, Widget},
 };
 use std::sync::{Arc, Mutex};
 pub trait BarWidgetImpl {
-    fn get_dirty(&self) -> bool {
+    fn wait(&mut self, ctx: &mut WaitContext);
-        false
+    fn name(&self) -> &str;
-    }
+    fn value(&self) -> f32;
    fn name(&self) -> &'static str;
    fn value(&mut self) -> f32;
    fn color(&self) -> Color;
-    fn click(&mut self, _pos: f32, _btn: PointerButton) {}
+    fn inc(&mut self, inc: f32);
    fn set(&mut self, val: f32);
    fn toggle(&mut self);
 }
-pub struct BarWidget {
+pub struct BarWidget<'a> {
-    font: &'static str,
+    bar_impl: Box<dyn BarWidgetImpl + Send>,
-    size: f32,
+    font: Font<'a>,
-    geometry: Geometry,
+    font_size: u32,
-    inner_widget: Box<dyn BarWidgetImpl>,
+    length: u32,
    dirty: Arc<Mutex<bool>>,
 }
-impl BarWidget {
+impl<'a> BarWidget<'a> {
-    pub fn new(
+    pub fn new_simple(
-        inner_widget: Box<dyn BarWidgetImpl>,
+        font: FontRef,
-        fm: &mut FontMap,
+        font_size: f32,
-        font: &'static str,
+        length: u32,
-        size: f32,
+        w: Box<dyn BarWidgetImpl + Send>,
-    ) -> BarWidget {
+    ) -> Box<BarWidget> {
-        fm.queue_font(font, size, inner_widget.name());
+        let mut font = Font::new(font, font_size);
-        BarWidget {
+        font.add_str_to_cache(w.name());
-            geometry: Default::default(),
+
-            inner_widget,
+        Box::new(BarWidget {
            bar_impl: w,
            dirty: Arc::new(Mutex::new(true)),
            font,
-            size,
+            font_size: font_size as u32,
-        }
+            length,
        })
    }
    pub fn new<F>(
        font: FontRef<'a>,
        font_size: f32,
        length: u32,
        f: F,
    ) -> Result<Box<BarWidget>, ::std::io::Error>
    where
        F: FnOnce(Arc<Mutex<bool>>) -> Result<Box<dyn BarWidgetImpl + Send>, ::std::io::Error>,
        F: Send + 'a + Clone,
    {
        let dirty = Arc::new(Mutex::new(true));
        let im = f(dirty.clone())?;
        let mut font = Font::new(font, font_size);
        font.add_str_to_cache(im.name());
        Ok(Box::new(BarWidget {
            bar_impl: im,
            dirty,
            font,
            font_size: font_size as u32,
            length,
        }))
    }
 }
-impl Widget for BarWidget {
+impl<'a> Widget for BarWidget<'a> {
-    fn geometry(&self) -> Geometry {
+    fn wait(&mut self, ctx: &mut WaitContext) {
-        self.geometry
+        self.bar_impl.wait(ctx);
    }
-
+    fn enter(&mut self) {}
-    fn get_dirty(&self) -> bool {
+    fn leave(&mut self) {}
-        self.inner_widget.get_dirty()
+    fn size(&self) -> (u32, u32) {
        (self.length, self.font_size)
    }
    fn draw(
        &mut self,
        ctx: &mut DrawContext,
        pos: (u32, u32),
        expansion: (u32, u32),
    ) -> Result<DrawReport, ::std::io::Error> {
        if self.length == 0 {
            self.length = expansion.0;
        }
        let (width, height) = (self.length, self.font_size);
        {
            let mut d = self.dirty.lock().unwrap();
            if !*d && !ctx.force {
                return Ok(DrawReport::empty(width, height));
            }
            *d = false;
        }
-    fn draw(&mut self, fonts: &mut FontMap, view: &mut BufferView) -> Geometry {
+        let buf = &mut ctx.buf.subdimensions((pos.0, pos.1, width, height))?;
-        let font = fonts.get_font(self.font, self.size);
+        buf.memset(ctx.bg);
        let fg = Color::WHITE;
-        font.draw_text(view, fg, self.inner_widget.name()).unwrap();
+        let c = Color::new(1.0, 1.0, 1.0, 1.0);
-        let size = self.size.ceil() as u32;
+        self.font.draw_text(buf, ctx.bg, &c, self.bar_impl.name())?;
        let bar_offset = 4 * size;
        let val = self.inner_widget.value();
-        let c = self.inner_widget.color();
+        let c = self.bar_impl.color();
        let bar_off = 5 * self.font_size;
        let mut val = self.bar_impl.value();
        draw_bar(
-            &mut view.offset((bar_offset, 0)),
+            &mut buf.offset((bar_off, 0))?,
-            c,
+            &c,
-            self.geometry.width - bar_offset,
+            width - bar_off,
-            size,
+            self.font_size,
            val,
-        )
+        )?;
-        .unwrap();
+        let mut iter = 1.0;
-
+        while val > 1.0 {
            let c = &Color::new(0.75 / iter, 0.25 / iter, 0.25 / iter, 1.0);
            val -= 1.0;
            iter += 1.0;
            draw_bar(
                &mut buf.offset((bar_off, 0))?,
                &c,
                width - bar_off,
                self.font_size,
                val,
            )?;
        }
        draw_box(
-            &mut view.offset((bar_offset, 0)),
+            &mut buf.offset((bar_off, 0))?,
-            c,
+            &c,
-            (self.geometry.width - bar_offset, size),
+            (width - bar_off, self.font_size),
-        )
+        )?;
-        .unwrap();
+        Ok(DrawReport {
-        self.geometry
+            width,
            height,
            damage: vec![buf.get_signed_bounds()],
            full_damage: false,
        })
    }
-    fn geometry_update(&mut self, _fonts: &mut FontMap, geometry: &Geometry) -> Geometry {
+    fn keyboard_input(&mut self, _: u32, _: ModifiersState, _: KeyState, _: Option<String>) {}
-        let w = min(geometry.width, 768);
+    fn mouse_click(&mut self, button: u32, (x, _): (u32, u32)) {
-        let mut x = geometry.x;
+        *self.dirty.lock().unwrap() = true;
-        if geometry.width > w {
+        match button {
-            x += geometry.width - w;
+            272 => {
-        }
+                let offset = 5 * self.font_size;
-        self.geometry = Geometry {
+                if x > offset {
-            x: x,
+                    self.bar_impl
-            y: geometry.y,
+                        .set(((x - offset) + 1) as f32 / (self.length - offset) as f32);
            width: w,
            height: self.size.ceil() as u32,
        };
        self.geometry
    }
    fn minimum_size(&mut self, _fonts: &mut FontMap) -> Geometry {
        Geometry {
            x: 0,
            y: 0,
            width: self.size.ceil() as u32 * 6,
            height: self.size.ceil() as u32,
        }
    }
    fn event(&mut self, event: &Event) {
        match event {
            Event::PointerEvent(ev) => {
                let offset = 4 * self.size.ceil() as u32;
                if ev.pos.0 >= offset {
                    let val = (ev.pos.0 - offset) as f32 / (self.geometry.width - offset) as f32;
                    self.inner_widget.click(val, ev.button);
                }
            }
-            _ => (),
+            273 => self.bar_impl.toggle(),
            x => {
                dbg!(x);
            }
        }
    }
    fn mouse_scroll(&mut self, (_, y): (f64, f64), _: (u32, u32)) {
        *self.dirty.lock().unwrap() = true;
        self.bar_impl.inc(y as f32 / -800.0);
    }
 }
@@ -1,177 +1,240 @@
-use std::{
+use crate::cmd::Cmd;
-    error::Error,
+use crate::color::Color;
-    sync::{Arc, Mutex},
+use crate::widget::WaitContext;
    thread,
    time::Duration,
 };
 use dbus::blocking::{
    stdintf::org_freedesktop_dbus::{Properties, PropertiesPropertiesChanged},
    LocalConnection,
 };
 use crate::{
-    color::Color,
+    fonts::FontRef,
    event::{Event, Events},
    fonts::FontMap,
    widgets::bar_widget::{BarWidget, BarWidgetImpl},
 };
 use std::sync::mpsc::Sender;
 use std::sync::{Arc, Mutex};
 use nix::poll::{PollFd, PollFlags};
 fn get_upower_property(
    con: &dbus::Connection,
    device_path: &str,
    property: &str,
 ) -> Result<dbus::Message, ::std::io::Error> {
    let msg = dbus::Message::new_method_call(
        "org.freedesktop.UPower",
        device_path,
        "org.freedesktop.DBus.Properties",
        "Get",
    )
    .map_err(|_| {
        ::std::io::Error::new(
            ::std::io::ErrorKind::Other,
            "could not send make dbus method call",
        )
    })?
    .append2(
        dbus::MessageItem::Str("org.freedesktop.UPower.Device".to_string()),
        dbus::MessageItem::Str(property.to_string()),
    );
    con.send_with_reply_and_block(msg, 1000).map_err(|_| {
        ::std::io::Error::new(::std::io::ErrorKind::Other, "could not send dbus message")
    })
 }
 // The widget is created on a different thread than where it will be used, so
 // we need it to be Send. However, dbus::Connection has a void*, so it's not
 // auto-derived. So, we make a small wrapper where we make it Send.
 struct DbusConnection(dbus::Connection);
 impl std::convert::AsRef<dbus::Connection> for DbusConnection {
    fn as_ref(&self) -> &dbus::Connection {
        &self.0
    }
 }
 unsafe impl Send for DbusConnection {}
 pub struct UpowerBattery {
    device_path: String,
    sender: Sender<Cmd>,
    dirty: Arc<Mutex<bool>>,
    state: UpowerBatteryState,
    capacity: f64,
    con: DbusConnection,
    watch: dbus::Watch,
 }
 enum UpowerBatteryState {
    Unknown,
    Charging,
    Discharging,
    Empty,
-    FullyCharged,
+    Full,
-    PendingCharge,
+    NotCharging,
-    PendingDischarge,
+    Unknown,
 }
-impl UpowerBatteryState {
+impl UpowerBattery {
-    fn from_dbus(val: u64) -> UpowerBatteryState {
+    pub fn from_device(
-        match val {
+        dirty: Arc<Mutex<bool>>,
-            1 => UpowerBatteryState::Charging,
+        sender: Sender<Cmd>,
-            2 => UpowerBatteryState::Discharging,
+        device: &str,
-            3 => UpowerBatteryState::Empty,
+    ) -> Result<Self, ::std::io::Error> {
-            4 => UpowerBatteryState::FullyCharged,
+        let con = dbus::Connection::get_private(dbus::BusType::System).map_err(|_| {
-            5 => UpowerBatteryState::PendingCharge,
+            ::std::io::Error::new(::std::io::ErrorKind::Other, "unable to open dbus")
-            6 => UpowerBatteryState::PendingDischarge,
+        })?;
-            _ => UpowerBatteryState::Unknown,
+        let device_path = format!("/org/freedesktop/UPower/devices/{}", device);
        let rule = format!(
            "type='signal',\
             path='{}',\
             interface='org.freedesktop.DBus.Properties',\
             member='PropertiesChanged'",
            &device_path
        );
        con.add_match(&rule).map_err(|_| {
            ::std::io::Error::new(
                ::std::io::ErrorKind::Other,
                "unable to add match rule to dbus connection",
            )
        })?;
        let upower_type: dbus::arg::Variant<u32> =
            match get_upower_property(&con, &device_path, "Type")?.get1() {
                Some(v) => v,
                None => {
                    return Err(::std::io::Error::new(
                        ::std::io::ErrorKind::Other,
                        "no such upower device",
                    ));
                }
            };
        // https://upower.freedesktop.org/docs/Device.html#Device:Type
        if upower_type.0 != 2 {
            return Err(::std::io::Error::new(
                ::std::io::ErrorKind::Other,
                "UPower device is not a battery.",
            ));
        }
    }
 }
-struct InnerBattery {
+        let capacity: f64 = match get_upower_property(&con, &device_path, "Percentage")?
-    value: f32,
+            .get1::<dbus::arg::Variant<f64>>()
-    state: UpowerBatteryState,
+        {
-    dirty: bool,
+            Some(v) => v.0,
-}
+            None => {
-
+                return Err(::std::io::Error::new(
-fn get_battery_state() -> Result<UpowerBatteryState, Box<dyn Error>> {
+                    ::std::io::ErrorKind::Other,
-    let conn = LocalConnection::new_system()?;
+                    "no such upower device",
-    let device_path = "/org/freedesktop/UPower/devices/DisplayDevice";
+                ));
    let proxy = conn.with_proxy(
        "org.freedesktop.UPower",
        device_path,
        Duration::from_millis(500),
    );
    let state: u32 = proxy.get("org.freedesktop.UPower.Device", "State")?;
    Ok(UpowerBatteryState::from_dbus(state as u64))
 }
 fn start_monitor(inner: Arc<Mutex<InnerBattery>>, events: Arc<Mutex<Events>>) {
    thread::Builder::new()
        .name("battmon".to_string())
        .spawn(move || {
            let conn = LocalConnection::new_system().unwrap();
            let device_path = "/org/freedesktop/UPower/devices/DisplayDevice";
            let proxy = conn.with_proxy(
                "org.freedesktop.UPower",
                device_path,
                Duration::from_millis(500),
            );
            let capacity: f64 = proxy
                .get("org.freedesktop.UPower.Device", "Percentage")
                .expect("unable to get property");
            let state: u32 = proxy
                .get("org.freedesktop.UPower.Device", "State")
                .expect("unable to get state");
            {
                let mut inner = inner.lock().unwrap();
                inner.value = capacity as f32 / 100.;
                inner.state = UpowerBatteryState::from_dbus(state as u64);
            }
            proxy
                .match_signal(
                    move |c: PropertiesPropertiesChanged,
                          _: &LocalConnection,
                          _: &dbus::Message| {
                        if c.interface_name != "org.freedesktop.UPower.Device" {
                            return true;
                        }
                        let mut inner = inner.lock().unwrap();
                        for (key, value) in c.changed_properties {
                            match key.as_str() {
                                "State" => {
                                    inner.state =
                                        UpowerBatteryState::from_dbus(value.0.as_u64().unwrap());
                                    inner.dirty = true;
                                    let mut events = events.lock().unwrap();
                                    events.add_event(Event::PowerUpdate);
                                }
                                "Percentage" => {
                                    inner.value = value.0.as_f64().unwrap() as f32 / 100.;
                                    inner.dirty = true;
                                    let mut events = events.lock().unwrap();
                                    events.add_event(Event::PowerUpdate);
                                }
                                _ => (),
                            }
                        }
                        true
                    },
                )
                .unwrap();
            loop {
                conn.process(Duration::from_millis(60000)).unwrap();
            }
        })
        .unwrap();
 }
 pub struct Battery {
    inner: Arc<Mutex<InnerBattery>>,
 }
 impl Battery {
    pub fn new(
        events: Arc<Mutex<Events>>,
        fm: &mut FontMap,
        font: &'static str,
        size: f32,
    ) -> BarWidget {
        let battery = Battery {
            inner: Arc::new(Mutex::new(InnerBattery {
                value: 0.,
                state: UpowerBatteryState::Unknown,
                dirty: false,
            })),
        };
-        start_monitor(battery.inner.clone(), events);
+        let state: UpowerBatteryState = match get_upower_property(&con, &device_path, "State")?
-        BarWidget::new(Box::new(battery), fm, font, size)
+            .get1::<dbus::arg::Variant<u32>>()
        {
            Some(v) => match v.0 {
                1 => UpowerBatteryState::Charging,
                2 => UpowerBatteryState::Discharging,
                3 => UpowerBatteryState::Empty,
                4 => UpowerBatteryState::Full,
                5 => UpowerBatteryState::NotCharging,
                6 => UpowerBatteryState::Discharging,
                _ => UpowerBatteryState::Unknown,
            },
            None => {
                return Err(::std::io::Error::new(
                    ::std::io::ErrorKind::Other,
                    "no such upower device",
                ));
            }
        };
        let fds = con.watch_fds();
        if fds.len() != 1 {
            return Err(::std::io::Error::new(
                ::std::io::ErrorKind::Other,
                "expected 1 watch fd from dbus",
            ));
        }
        Ok(UpowerBattery {
            device_path,
            con: DbusConnection(con),
            dirty,
            sender,
            capacity,
            state,
            watch: fds[0],
        })
    }
-    pub fn detect() -> bool {
+    pub fn new(
-        match get_battery_state() {
+        font: FontRef,
-            Ok(_) => true,
+        font_size: f32,
-            Err(_) => false,
+        length: u32,
-        }
+        sender: Sender<Cmd>,
    ) -> Result<Box<BarWidget>, ::std::io::Error> {
        BarWidget::new(font, font_size, length, move |dirty| {
            let d = UpowerBattery::from_device(dirty, sender, "DisplayDevice")?;
            Ok(Box::new(d))
        })
    }
 }
-impl BarWidgetImpl for Battery {
+impl BarWidgetImpl for UpowerBattery {
-    fn get_dirty(&self) -> bool {
+    fn wait(&mut self, ctx: &mut WaitContext) {
-        self.inner.lock().unwrap().dirty
+        for _ in self
            .con
            .as_ref()
            .watch_handle(self.watch.fd(), dbus::WatchEvent::Readable as u32)
        {
            let capacity = get_upower_property(self.con.as_ref(), &self.device_path, "Percentage")
                .unwrap()
                .get1::<dbus::arg::Variant<f64>>()
                .unwrap()
                .0;
            let state = match get_upower_property(self.con.as_ref(), &self.device_path, "State")
                .unwrap()
                .get1::<dbus::arg::Variant<u32>>()
                .unwrap()
                .0
            {
                1 => UpowerBatteryState::Charging,
                2 => UpowerBatteryState::Discharging,
                3 => UpowerBatteryState::Empty,
                4 => UpowerBatteryState::Full,
                5 => UpowerBatteryState::NotCharging,
                6 => UpowerBatteryState::Discharging,
                _ => UpowerBatteryState::Unknown,
            };
            self.state = state;
            self.capacity = capacity;
            *self.dirty.lock().unwrap() = true;
            self.sender.send(Cmd::Draw).unwrap();
        }
        ctx.fds
            .push(PollFd::new(self.watch.fd(), PollFlags::POLLIN));
    }
-    fn name(&self) -> &'static str {
+    fn name(&self) -> &str {
        "battery"
    }
-    fn value(&mut self) -> f32 {
+    fn value(&self) -> f32 {
-        let mut inner = self.inner.lock().unwrap();
+        (self.capacity as f32) / 100.0
        inner.dirty = false;
        inner.value
    }
    fn color(&self) -> Color {
-        let inner = self.inner.lock().unwrap();
+        match self.state {
-        match inner.state {
+            UpowerBatteryState::Discharging | UpowerBatteryState::Unknown => {
-            UpowerBatteryState::Charging | UpowerBatteryState::FullyCharged => Color::LIGHTGREEN,
+                if self.capacity > 10.0 {
-            _ if inner.value > 0.25 => Color::WHITE,
+                    Color::new(1.0, 1.0, 1.0, 1.0)
-            _ if inner.value > 0.1 => Color::DARKORANGE,
+                } else {
-            _ => Color::RED,
+                    Color::new(1.0, 0.5, 0.0, 1.0)
                }
            }
            UpowerBatteryState::Charging | UpowerBatteryState::Full => {
                Color::new(0.5, 1.0, 0.5, 1.0)
            }
            UpowerBatteryState::NotCharging | UpowerBatteryState::Empty => {
                Color::new(1.0, 0.5, 0.5, 1.0)
            }
        }
    }
    fn inc(&mut self, _: f32) {}
    fn set(&mut self, _: f32) {}
    fn toggle(&mut self) {}
 }
@@ -1,114 +1,37 @@
-use std::default::Default;
+use crate::buffer::Buffer;
-
+use crate::color::Color;
 use crate::draw::Font;
 use crate::{
-    buffer::BufferView,
+    fonts::FontRef,
-    color::Color,
+    widget::{DrawContext, DrawReport, KeyState, ModifiersState, WaitContext, Widget},
    event::Event,
    fonts::FontMap,
    widgets::{Geometry, Widget},
 };
-use chrono::{Datelike, Local, NaiveDate};
+use chrono::{Datelike, NaiveDate, NaiveDateTime};
-pub struct Calendar {
+pub struct Calendar<'a> {
-    font: &'static str,
+    cur_date: NaiveDate,
    month_font: &'static str,
    sections_x: i32,
    sections_y: i32,
    shown_sections_x: u32,
    shown_sections_y: u32,
    size: f32,
    dirty: bool,
-    geometry: Geometry,
+    offset: f64,
-    year_width: u32,
+    sections: u32,
-    date_width: u32,
+    font_size: u32,
-    day_width: u32,
+    calendar_cache: Font<'a>,
    month_cache: Font<'a>,
    year_cache: Font<'a>,
    day_cache: Font<'a>,
 }
-const DAY_FACTOR: f32 = 0.6;
+impl<'a> Calendar<'a> {
 const YEAR_FACTOR: f32 = 0.75;
 const MONTH_FACTOR: f32 = 1.25;
 const DATE_FACTOR: f32 = 1.;
 const LINE_HEIGHT: f32 = 0.85;
 impl Calendar {
    pub fn new(
        fm: &mut FontMap,
        font: &'static str,
        month_font: &'static str,
        size: f32,
        sections_x: i32,
        sections_y: i32,
    ) -> Calendar {
        fm.queue_font(font, size * DAY_FACTOR, "ADEFHIMNORSTUW");
        fm.queue_font(font, size * YEAR_FACTOR, "0123456789");
        fm.queue_font(font, size * DATE_FACTOR, "0123456789");
        fm.queue_font(
            month_font,
            size * MONTH_FACTOR,
            "ADFJMNOSabcehgilmnoprstuvy",
        );
        Calendar {
            font,
            month_font,
            size,
            sections_x,
            sections_y,
            shown_sections_x: 0,
            shown_sections_y: 0,
            dirty: true,
            geometry: Default::default(),
            date_width: 0,
            day_width: 0,
            year_width: 0,
        }
    }
    fn draw_month(
-        &mut self,
+        &self,
-        fonts: &mut FontMap,
+        buf: &mut Buffer,
-        mut view: &mut BufferView,
+        background_color: &Color,
        orig: NaiveDate,
-        mut time: NaiveDate,
+        time: NaiveDate,
-    ) {
+    ) -> Result<(i32, i32, i32, i32), ::std::io::Error> {
-        let cal_width = 8 * self.date_width + 7 * (self.date_width / 2);
+        let mut time = time;
-        //
+        let mut y_off = 1;
-        // Draw the week day
+        let mut done = false;
        //
        let day_offset = (self.date_width - self.day_width) / 2;
        let date_offset = self.date_width + self.date_width / 2;
        for idx in 1..8 {
            let day_font = fonts.get_font(self.font, self.size * DAY_FACTOR);
            let (wk_chr, c) = match idx {
                1 => ("MON", Color::WHITE),
                2 => ("TUE", Color::WHITE),
                3 => ("WED", Color::WHITE),
                4 => ("THU", Color::WHITE),
                5 => ("FRI", Color::WHITE),
                6 => ("SAT", Color::GREY80),
                7 => ("SUN", Color::GREY80),
                _ => panic!("impossible value"),
            };
            day_font
                .draw_text(
                    &mut view.offset((
                        idx * date_offset + day_offset,
                        (self.size * MONTH_FACTOR).ceil() as u32
                            + (self.size * DAY_FACTOR * 0.2).ceil() as u32,
                    )),
                    c,
                    &wk_chr,
                )
                .unwrap();
        }
        //
        // Draw the month
        //
        let month_font = fonts.get_font(self.month_font, self.size * MONTH_FACTOR);
        let month_str = match time.month() {
            1 => "January",
            2 => "February",
@@ -124,228 +47,234 @@ impl Calendar {
            12 => "December",
            _ => panic!("impossible value"),
        };
        month_font
            .draw_text(&mut view, Color::WHITE, month_str)
            .unwrap();
        //
-        // Draw the year
+        // Draw the of the month
        //
        self.month_cache.draw_text(
            buf,
            background_color,
            &Color::new(1.0, 1.0, 1.0, 1.0),
            month_str,
        )?;
        if time.year() != orig.year() {
-            let year_font = fonts.get_font(self.font, self.size * YEAR_FACTOR);
+            self.year_cache.draw_text(
-            year_font
+                &mut buf.offset((self.font_size * 20, 0))?,
-                .draw_text(
+                background_color,
-                    &mut view.offset((cal_width - self.year_width, 0)),
+                &Color::new(0.8, 0.8, 0.8, 1.0),
-                    Color::GREY80,
+                &format!("{:}", time.year()),
-                    &format!("{:}", time.year()),
+            )?;
                )
                .unwrap();
        }
-        let cal_font = fonts.get_font(self.font, self.size * DATE_FACTOR);
+        //
-        'row: for y_off in 1.. {
+        // Draw the week day
        //
        for idx in 1..8 {
            let wk_chr = match idx {
                1 => "MON",
                2 => "TUE",
                3 => "WED",
                4 => "THU",
                5 => "FRI",
                6 => "SAT",
                7 => "SUN",
                _ => panic!("impossible value"),
            };
            self.day_cache.draw_text(
                &mut buf.offset((
                    idx * self.font_size * 3 + self.font_size / 5,
                    y_off * self.font_size * 2 + self.font_size * 4,
                ))?,
                background_color,
                &Color::new(1.0, 1.0, 1.0, 1.0),
                &wk_chr,
            )?;
        }
        y_off += 1;
        while !done {
            let mut x_pos = 0;
            //
            // Find the start of this week
            //
            let mut wkday = time.weekday();
            while wkday != chrono::Weekday::Mon {
                x_pos += 1;
                wkday = wkday.pred();
            }
            //
            // Draw the week number
            //
            let wk = time.iso_week();
-            cal_font
+            self.calendar_cache.draw_text(
-                .draw_text(
+                &mut buf.offset((0, y_off * self.font_size * 2 + self.font_size * 4))?,
-                    &mut view.offset((
+                background_color,
-                        0,
+                &Color::new(0.75, 0.75, 0.75, 1.0),
-                        y_off * (self.size * LINE_HEIGHT).ceil() as u32
+                &format!("{:02}", wk.week()),
-                            + (self.size * MONTH_FACTOR).ceil() as u32,
+            )?;
-                    )),
+            x_pos += 1;
                    if wk == orig.iso_week() {
                        Color::WHITE
                    } else {
                        Color::GREY75
                    },
                    &format!("{:02}", wk.week()),
                )
                .unwrap();
            //
            // Draw the dates
            //
-            let x_off = time.weekday().number_from_monday();
+            while x_pos < 8 {
            for x_pos in x_off..8 {
                let c = if time.day() == orig.day() && time.month() == orig.month() {
-                    Color::WHITE
+                    Color::new(1.0, 1.0, 1.0, 1.0)
                } else if x_pos < 6 {
                    Color::GREY50
                } else {
-                    Color::GREY35
+                    Color::new(0.5, 0.5, 0.5, 1.0)
                };
-                cal_font
+                self.calendar_cache.draw_text(
-                    .draw_text(
+                    &mut buf.offset((
-                        &mut view.offset((
+                        x_pos * self.font_size * 3,
-                            x_pos * date_offset,
+                        y_off * self.font_size * 2 + self.font_size * 4,
-                            y_off * (self.size * LINE_HEIGHT).ceil() as u32
+                    ))?,
-                                + (self.size * MONTH_FACTOR).ceil() as u32,
+                    background_color,
-                        )),
+                    &c,
-                        c,
+                    &format!("{:02}", time.day()),
-                        &format!("{:02}", time.day()),
+                )?;
                    )
                    .unwrap();
                let t = time.with_day(time.day() + 1);
                if t.is_none() {
-                    break 'row;
+                    done = true;
                    break;
                }
                time = t.unwrap();
                x_pos += 1;
            }
            y_off += 1;
        }
        Ok(buf.get_signed_bounds())
    }
 }
-impl<'a> Widget for Calendar {
+impl<'a> Calendar<'a> {
-    fn get_dirty(&self) -> bool {
+    pub fn new(
-        self.dirty
+        time: NaiveDateTime,
        font_primary: FontRef<'a>,
        font_secondary: FontRef<'a>,
        font_size: f32,
        sections: u32,
    ) -> Box<Calendar<'a>> {
        let mut calendar_cache = Font::new(font_secondary, font_size * 2.0);
        calendar_cache.add_str_to_cache("0123456789");
        let mut month_cache = Font::new(font_primary, font_size * 4.0);
        month_cache.add_str_to_cache("JanuryFebMchApilJgstSmOoNvD");
        let mut year_cache = Font::new(font_primary, font_size * 1.5);
        year_cache.add_str_to_cache("-0123456789");
        let mut day_cache = Font::new(font_primary, font_size);
        day_cache.add_str_to_cache("MONTUEWDHFRISA");
        Box::new(Calendar {
            cur_date: time.date(),
            dirty: true,
            offset: 0.0,
            sections,
            font_size: font_size as u32,
            calendar_cache,
            month_cache,
            year_cache,
            day_cache,
        })
    }
 }
 impl<'a> Widget for Calendar<'a> {
    fn wait(&mut self, _: &mut WaitContext) {}
    fn enter(&mut self) {}
    fn leave(&mut self) {}
    fn size(&self) -> (u32, u32) {
        let cal_width = 7 * self.font_size * 3 + self.font_size * 2;
        let cal_pad = self.font_size * 3;
        (
            cal_width * self.sections + cal_pad * (self.sections - 1),
            (self.font_size as f32 * 21.5) as u32,
        )
    }
-    fn geometry(&self) -> Geometry {
+    fn draw(
-        self.geometry
+        &mut self,
-    }
+        ctx: &mut DrawContext,
-
+        pos: (u32, u32),
-    fn event(&mut self, event: &Event) {
+        _expansion: (u32, u32),
-        match event {
+    ) -> Result<DrawReport, ::std::io::Error> {
-            Event::NewMinute => {
+        let (width, height) = self.size();
-                self.dirty = true;
+        if ctx.time.date() == self.cur_date && !ctx.force && !self.dirty {
-            }
+            return Ok(DrawReport::empty(width, height));
            _ => (),
        }
-    }
+        self.dirty = false;
-
+        self.cur_date = ctx.time.date();
    fn draw(&mut self, fonts: &mut FontMap, view: &mut BufferView) -> Geometry {
        if self.shown_sections_y == 0 || self.shown_sections_x == 0 {
            return Geometry {
                x: self.geometry.x,
                y: self.geometry.y,
                width: 0,
                height: 0,
            };
        }
        let time = Local::now().naive_local().date();
        let cal_height =
            (self.size * MONTH_FACTOR).ceil() as u32 + (self.size * LINE_HEIGHT * 8.).ceil() as u32;
        let cal_width = 8 * self.date_width + 7 * (self.date_width / 2);
        let cal_pad = self.date_width * 2;
        let buf = &mut ctx.buf.subdimensions((pos.0, pos.1, width, height))?;
        buf.memset(ctx.bg);
        let time = ctx.time.date();
        let mut t = time.with_day(1).unwrap();
-        let cals = self.shown_sections_y * self.shown_sections_x;
+        let o = (self.offset / 100.0) as i32;
-        if cals >= 3 {
+
        let cals = self.sections - 1;
        let pre_cals = cals / 2;
        for _ in 0..pre_cals {
            t = t.pred_opt().unwrap().with_day(1).unwrap();
        }
-        for ydx in 0..self.shown_sections_y {
+        if o != 0 {
-            for idx in 0..self.shown_sections_x {
+            let mut month = (t.month() - 1) as i32 + o;
-                self.draw_month(
+            let mut year = t.year();
-                    fonts,
+            while month > 11 {
-                    &mut view.offset(((cal_width + cal_pad) * idx, cal_height * ydx)),
+                year += 1;
-                    time,
+                month -= 12;
                    t,
                );
                t = if t.month() == 12 {
                    t.with_year(t.year() + 1).unwrap().with_month(1).unwrap()
                } else {
                    t.with_month(t.month() + 1).unwrap()
                };
            }
            while month < 0 {
                year -= 1;
                month += 12;
            }
            t = t
                .with_year(year)
                .unwrap()
                .with_month((month + 1) as u32)
                .unwrap();
        }
-        self.dirty = false;
+        let cal_pad = 7 * self.font_size * 3 + self.font_size * 5;
-        self.geometry
+        for idx in 0..self.sections {
            self.draw_month(&mut buf.offset((cal_pad * idx, 0))?, ctx.bg, time, t)?;
            t = if t.month() == 12 {
                t.with_year(t.year() + 1).unwrap().with_month(1).unwrap()
            } else {
                t.with_month(t.month() + 1).unwrap()
            };
        }
        Ok(DrawReport {
            width,
            height,
            damage: vec![buf.get_signed_bounds()],
            full_damage: false,
        })
    }
-    fn geometry_update(&mut self, fonts: &mut FontMap, geometry: &Geometry) -> Geometry {
+    fn keyboard_input(&mut self, _: u32, _: ModifiersState, _: KeyState, _: Option<String>) {}
-        let year_font = fonts.get_font(self.font, self.size * YEAR_FACTOR);
+    fn mouse_click(&mut self, _: u32, (x, _): (u32, u32)) {
-        self.year_width = year_font.auto_widest("0123456789").unwrap() * 4;
+        let cal_pad = 7 * self.font_size * 3 + self.font_size * 5;
-        let cal_font = fonts.get_font(self.font, self.size * DATE_FACTOR);
+        let cals = self.sections - 1;
-        self.date_width = cal_font.auto_widest("0123456789").unwrap() * 2;
+        let pre_cals = cals / 2;
-        let day_font = fonts.get_font(self.font, self.size * DAY_FACTOR);
+        if x < pre_cals * cal_pad {
-        self.day_width = day_font.auto_widest("ADEFHIMNORSTUW").unwrap() * 3;
+            self.offset -= 100.0;
-
+        } else if x >= (pre_cals + 1) * cal_pad {
-        let cal_width = 8 * self.date_width + 7 * (self.date_width / 2);
+            self.offset += 100.0;
-        let cal_height =
+        } else {
-            (self.size * MONTH_FACTOR).ceil() as u32 + (self.size * LINE_HEIGHT * 8.).ceil() as u32;
+            self.offset = 0.0;
        let cal_pad = self.date_width * 2;
        if geometry.width < cal_width || geometry.height < cal_height {
            self.shown_sections_x = 0;
            self.shown_sections_y = 0;
            self.geometry = Default::default();
            return self.geometry;
        }
-
+        self.dirty = true;
        let possible_sections_x = 1 + (geometry.width - cal_width) / (cal_width + cal_pad);
        let possible_sections_y = 1 + (geometry.height - cal_height) / cal_height;
        self.shown_sections_x =
            if self.sections_x > 0 && self.sections_x < possible_sections_x as i32 {
                self.sections_x as u32
            } else {
                possible_sections_x
            };
        self.shown_sections_y =
            if self.sections_y > 0 && self.sections_y < possible_sections_y as i32 {
                self.sections_y as u32
            } else {
                possible_sections_y
            };
        self.geometry = Geometry {
            x: geometry.x,
            y: geometry.y,
            width: cal_width * self.shown_sections_x as u32
                + cal_pad * (self.shown_sections_x as u32 - 1),
            height: cal_height * self.shown_sections_y as u32,
        };
        self.geometry
    }
-
+    fn mouse_scroll(&mut self, (_, y): (f64, f64), _: (u32, u32)) {
-    fn minimum_size(&mut self, fonts: &mut FontMap) -> Geometry {
+        self.offset += y;
-        let cal_font = fonts.get_font(self.font, self.size * DATE_FACTOR);
+        self.dirty = true;
        let date_width = cal_font.auto_widest("0123456789").unwrap() * 2;
        let cal_width = 8 * date_width + 7 * (date_width / 2);
        let cal_height =
            (self.size * MONTH_FACTOR).ceil() as u32 + (self.size * LINE_HEIGHT * 8.).ceil() as u32;
        let cal_pad = date_width * 2;
        let sections_x = match self.sections_x {
            -1 => 1,
            0 => {
                return Geometry {
                    x: 0,
                    y: 0,
                    width: 0,
                    height: 0,
                }
            }
            x => x,
        };
        let sections_y = match self.sections_y {
            -1 => 1,
            0 => {
                return Geometry {
                    x: 0,
                    y: 0,
                    width: 0,
                    height: 0,
                }
            }
            y => y,
        };
        let width = cal_width * sections_x as u32 + cal_pad * (sections_x as u32 - 1);
        let height = cal_height * sections_y as u32;
        Geometry {
            x: 0,
            y: 0,
            width: width,
            height: height,
        }
    }
 }
@@ -1,96 +1,92 @@
-use std::default::Default;
+use crate::color::Color;
-
+use crate::draw::Font;
 use crate::{
-    buffer::BufferView,
+    fonts::FontRef,
-    color::Color,
+    widget::{DrawContext, DrawReport, KeyState, ModifiersState, WaitContext, Widget},
    event::Event,
    fonts::FontMap,
    widgets::{Geometry, Widget},
 };
-use chrono::{Local, Timelike};
+use chrono::{Duration, NaiveDateTime, Timelike};
-pub struct Clock {
+pub struct Clock<'a> {
-    font: &'static str,
+    cur_time: NaiveDateTime,
    clock_cache: Font<'a>,
    size: f32,
-    dirty: bool,
+    digit: u32,
-    geometry: Geometry,
+    colon: u32,
    digit_width: u32,
    colon_width: u32,
 }
-impl<'a> Clock {
+impl<'a> Clock<'a> {
-    pub fn new(fm: &mut FontMap, font: &'static str, size: f32) -> Clock {
+    pub fn new(time: NaiveDateTime, font: FontRef, size: f32) -> ::std::io::Result<Box<Clock>> {
-        fm.queue_font(font, size, "0123456789: ");
+        let mut clock_cache = Font::new(font, size);
-        Clock {
+        clock_cache.add_str_to_cache("0123456789:");
-            font,
+
        let digit = clock_cache.auto_widest("123456789")?;
        let colon = clock_cache.auto_widest(":")?;
        Ok(Box::new(Clock {
            cur_time: time,
            clock_cache,
            size,
-            dirty: true,
+            digit,
-            geometry: Default::default(),
+            colon,
-            digit_width: 0,
+        }))
            colon_width: 0,
        }
    }
 }
-impl<'a> Widget for Clock {
+impl<'a> Widget for Clock<'a> {
-    fn get_dirty(&self) -> bool {
+    fn wait(&mut self, ctx: &mut WaitContext) {
-        self.dirty
+        let target = (self.cur_time + Duration::seconds(60))
            .with_second(0)
            .unwrap()
            .with_nanosecond(0)
            .unwrap();
        ctx.set_time(target);
    }
    fn enter(&mut self) {}
    fn leave(&mut self) {}
    fn size(&self) -> (u32, u32) {
        (self.digit * 4 + self.colon, self.size.ceil() as u32)
    }
-    fn geometry(&self) -> Geometry {
+    fn draw(
-        self.geometry
+        &mut self,
-    }
+        ctx: &mut DrawContext,
-
+        pos: (u32, u32),
-    fn event(&mut self, event: &Event) {
+        _expansion: (u32, u32),
-        match event {
+    ) -> Result<DrawReport, ::std::io::Error> {
-            Event::NewMinute => {
+        let (width, height) = self.size();
-                self.dirty = true;
+        if !(ctx.time.date() != self.cur_time.date()
-            }
+            || ctx.time.hour() != self.cur_time.hour()
-            _ => (),
+            || ctx.time.minute() != self.cur_time.minute()
            || ctx.force)
        {
            return Ok(DrawReport::empty(width, height));
        }
    }
-    fn draw(&mut self, fonts: &mut FontMap, view: &mut BufferView) -> Geometry {
+        self.cur_time = ctx.time;
        let time = Local::now().naive_local();
        let fg = Color::WHITE;
-        let digit = self.digit_width;
+        let buf = &mut ctx.buf.subdimensions((pos.0, pos.1, width, height))?;
-        let colon = self.colon_width;
+        buf.memset(ctx.bg);
-        let font = fonts.get_font(self.font, self.size);
+
-        font.draw_text_fixed_width(
+        let digit = self.digit;
-            view,
+        let colon = self.colon;
-            fg,
+        self.clock_cache.draw_text_fixed_width(
            buf,
            ctx.bg,
            &Color::new(1.0, 1.0, 1.0, 1.0),
            &[digit, digit, colon, digit, digit],
-            &format!("{:02}:{:02}", time.hour(), time.minute()),
+            &format!("{:02}:{:02}", ctx.time.hour(), ctx.time.minute()),
-        )
+        )?;
-        .unwrap();
+
-        self.dirty = false;
+        Ok(DrawReport {
-        self.geometry
+            width,
            height,
            damage: vec![(pos.0 as i32, pos.1 as i32, width as i32, height as i32)],
            full_damage: false,
        })
    }
-    fn geometry_update(&mut self, fonts: &mut FontMap, geometry: &Geometry) -> Geometry {
+    fn keyboard_input(&mut self, _: u32, _: ModifiersState, _: KeyState, _: Option<String>) {}
-        let font = fonts.get_font(self.font, self.size);
+    fn mouse_click(&mut self, _: u32, _: (u32, u32)) {}
-        self.digit_width = font.auto_widest("0123456789").unwrap();
+    fn mouse_scroll(&mut self, _: (f64, f64), _: (u32, u32)) {}
        self.colon_width = font.auto_widest(":").unwrap();
        self.geometry = Geometry {
            x: geometry.x,
            y: geometry.y,
            width: self.digit_width * 4 + self.colon_width,
            height: self.size.ceil() as u32,
        };
        self.geometry
    }
    fn minimum_size(&mut self, fonts: &mut FontMap) -> Geometry {
        let font = fonts.get_font(self.font, self.size);
        let digit_width = font.auto_widest("0123456789").unwrap();
        let colon_width = font.auto_widest(":").unwrap();
        Geometry {
            x: 0,
            y: 0,
            width: digit_width * 4 + colon_width,
            height: self.size.ceil() as u32,
        }
    }
 }
@@ -1,92 +1,95 @@
-use std::default::Default;
+use crate::color::Color;
-
+use crate::draw::Font;
 use crate::{
-    buffer::BufferView,
+    fonts::FontRef,
-    color::Color,
+    widget::{DrawContext, DrawReport, KeyState, ModifiersState, WaitContext, Widget},
    event::Event,
    fonts::FontMap,
    widgets::{Geometry, Widget},
 };
-use chrono::{Datelike, Local};
+use chrono::{Datelike, NaiveDateTime};
-pub struct Date {
+pub struct Date<'a> {
-    font: &'static str,
+    cur_time: NaiveDateTime,
    date_cache: Font<'a>,
    size: f32,
-    dirty: bool,
+    ch_width: u32,
-    geometry: Geometry,
+    digit_width: u32,
    spacing_width: u32,
 }
-impl Date {
+impl<'a> Date<'a> {
-    pub fn new(fm: &mut FontMap, font: &'static str, size: f32) -> Date {
+    pub fn new(time: NaiveDateTime, font: FontRef, size: f32) -> ::std::io::Result<Box<Date>> {
-        fm.queue_font(font, size, "0123456789/, adehinortuFMSTW");
+        let mut date_cache = Font::new(font, size);
-        Date {
+        let chs = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
-            font,
+        let digits = "0123456789,/ ";
        let spacings = ",/ ";
        date_cache.add_str_to_cache(chs);
        date_cache.add_str_to_cache(digits);
        date_cache.add_str_to_cache(spacings);
        let ch_width = date_cache.auto_widest(chs)?;
        let digit_width = date_cache.auto_widest(digits)?;
        let spacing_width = date_cache.auto_widest(spacings)?;
        Ok(Box::new(Date {
            cur_time: time,
            date_cache,
            size,
-            dirty: true,
+            ch_width,
-            geometry: Default::default(),
+            digit_width,
-        }
+            spacing_width,
        }))
    }
 }
-impl<'a> Widget for Date {
+impl<'a> Widget for Date<'a> {
-    fn get_dirty(&self) -> bool {
+    fn wait(&mut self, _: &mut WaitContext) {}
-        self.dirty
+    fn enter(&mut self) {}
-    }
+    fn leave(&mut self) {}
-
+    fn size(&self) -> (u32, u32) {
-    fn geometry(&self) -> Geometry {
+        (
-        self.geometry
+            (3 * self.ch_width + 8 * self.digit_width + 4 * self.spacing_width) as u32,
-    }
+            self.size.ceil() as u32,
    fn event(&mut self, event: &Event) {
        match event {
            Event::NewMinute => {
                self.dirty = true;
            }
            _ => (),
        }
    }
    fn draw(&mut self, fonts: &mut FontMap, view: &mut BufferView) -> Geometry {
        let time = Local::now().naive_local();
        let fg = Color::WHITE;
        let font = fonts.get_font(self.font, self.size);
        font.draw_text(
            view,
            fg,
            &format!(
                "{}, {:02}/{:02}/{:4}",
                time.weekday(),
                time.day(),
                time.month(),
                time.year()
            ),
        )
        .unwrap();
        self.dirty = false;
        self.geometry
    }
-    fn geometry_update(&mut self, fonts: &mut FontMap, geometry: &Geometry) -> Geometry {
+    fn draw(
-        let width = (3. + 2. + 2. + 2. + 4.) * self.size / 2.;
+        &mut self,
-        let font = fonts.get_font(self.font, self.size);
+        ctx: &mut DrawContext,
-        self.geometry = Geometry {
+        pos: (u32, u32),
-            x: geometry.x,
+        _expansion: (u32, u32),
-            y: geometry.y,
+    ) -> Result<DrawReport, ::std::io::Error> {
-            width: width.ceil() as u32,
+        let (width, height) = self.size();
            height: font.height().ceil() as u32,
        };
        self.geometry
    }
-    fn minimum_size(&mut self, fonts: &mut FontMap) -> Geometry {
+        if !(ctx.time.date() != self.cur_time.date() || ctx.force) {
-        let width = (3. + 2. + 2. + 2. + 4.) * self.size / 2.;
+            return Ok(DrawReport::empty(width, height));
        let font = fonts.get_font(self.font, self.size);
        Geometry {
            x: 0,
            y: 0,
            width: width.ceil() as u32,
            height: font.height().ceil() as u32,
        }
        self.cur_time = ctx.time;
        let buf = &mut ctx.buf.subdimensions((pos.0, pos.1, width, height))?;
        buf.memset(ctx.bg);
        self.date_cache.draw_text(
            buf,
            ctx.bg,
            &Color::new(1.0, 1.0, 1.0, 1.0),
            &format!(
                "{:?}, {:02}/{:02}/{:4}",
                ctx.time.weekday(),
                ctx.time.day(),
                ctx.time.month(),
                ctx.time.year()
            ),
        )?;
        Ok(DrawReport {
            width,
            height,
            damage: vec![(pos.0 as i32, pos.1 as i32, width as i32, height as i32)],
            full_damage: false,
        })
    }
    fn keyboard_input(&mut self, _: u32, _: ModifiersState, _: KeyState, _: Option<String>) {}
    fn mouse_click(&mut self, _: u32, _: (u32, u32)) {}
    fn mouse_scroll(&mut self, _: (f64, f64), _: (u32, u32)) {}
 }
@@ -1,283 +0,0 @@
 use std::cmp::max;
 use crate::{fonts::FontMap, state::State, widgets::Geometry};
 pub trait Layout {
    fn geometry_update(
        &self,
        fonts: &mut FontMap,
        geometry: &Geometry,
        state: &mut State,
    ) -> Geometry;
    fn minimum_size(&self, fonts: &mut FontMap, state: &mut State) -> Geometry;
 }
 pub struct HorizontalLayout {
    pub widgets: Vec<Box<dyn Layout>>,
 }
 impl HorizontalLayout {
    pub fn new(widgets: Vec<Box<dyn Layout>>) -> Box<dyn Layout> {
        Box::new(HorizontalLayout { widgets })
    }
 }
 impl Layout for HorizontalLayout {
    fn geometry_update(
        &self,
        fonts: &mut FontMap,
        geometry: &Geometry,
        state: &mut State,
    ) -> Geometry {
        let mut geo = geometry.clone();
        let mut max_width = 0;
        let mut max_height = 0;
        for w in self.widgets.iter() {
            let result = w.geometry_update(fonts, &geo, state);
            geo.x = result.x + result.width;
            geo.width -= result.width;
            max_width += result.width;
            max_height = max(result.height, max_height);
        }
        geo.width = max_width;
        geo.height = max_height;
        geo
    }
    fn minimum_size(&self, fonts: &mut FontMap, state: &mut State) -> Geometry {
        let mut max_width = 0;
        let mut max_height = 0;
        for w in self.widgets.iter() {
            let result = w.minimum_size(fonts, state);
            max_width += result.x + result.width;
            max_height = max(result.y + result.height, max_height);
        }
        Geometry {
            width: max_width,
            height: max_height,
            x: 0,
            y: 0,
        }
    }
 }
 pub struct VerticalLayout {
    pub widgets: Vec<Box<dyn Layout>>,
 }
 impl VerticalLayout {
    pub fn new(widgets: Vec<Box<dyn Layout>>) -> Box<dyn Layout> {
        Box::new(VerticalLayout { widgets })
    }
 }
 impl Layout for VerticalLayout {
    fn geometry_update(
        &self,
        fonts: &mut FontMap,
        geometry: &Geometry,
        state: &mut State,
    ) -> Geometry {
        let mut geo = geometry.clone();
        let mut max_width = 0;
        let mut max_height = 0;
        for w in self.widgets.iter() {
            let result = w.geometry_update(fonts, &geo, state);
            geo.y = result.y + result.height;
            geo.height -= result.height;
            max_width = max(result.width, max_width);
            max_height += result.height;
        }
        geo.width = max_width;
        geo.height = max_height;
        geo
    }
    fn minimum_size(&self, fonts: &mut FontMap, state: &mut State) -> Geometry {
        let mut max_width = 0;
        let mut max_height = 0;
        for w in self.widgets.iter() {
            let result = w.minimum_size(fonts, state);
            max_width = max(result.x + result.width, max_width);
            max_height += result.y + result.height;
        }
        Geometry {
            width: max_width,
            height: max_height,
            x: 0,
            y: 0,
        }
    }
 }
 pub trait WidgetUpdater {
    fn geometry_update(&mut self, idx: usize, fonts: &mut FontMap, geometry: &Geometry)
        -> Geometry;
    fn minimum_size(&mut self, idx: usize, fonts: &mut FontMap) -> Geometry;
 }
 pub struct IndexedLayout {
    pub widget_idx: usize,
 }
 impl IndexedLayout {
    pub fn new(widget_idx: usize) -> Box<dyn Layout> {
        Box::new(IndexedLayout { widget_idx })
    }
 }
 impl Layout for IndexedLayout {
    fn geometry_update(
        &self,
        fonts: &mut FontMap,
        geometry: &Geometry,
        state: &mut State,
    ) -> Geometry {
        state.geometry_update(self.widget_idx, fonts, geometry)
    }
    fn minimum_size(&self, fonts: &mut FontMap, state: &mut State) -> Geometry {
        state.minimum_size(self.widget_idx, fonts)
    }
 }
 pub struct InvertedHorizontalLayout {
    pub widgets: Vec<Box<dyn Layout>>,
 }
 impl InvertedHorizontalLayout {
    pub fn new(widgets: Vec<Box<dyn Layout>>) -> Box<dyn Layout> {
        Box::new(InvertedHorizontalLayout { widgets })
    }
 }
 impl Layout for InvertedHorizontalLayout {
    fn geometry_update(
        &self,
        fonts: &mut FontMap,
        geometry: &Geometry,
        state: &mut State,
    ) -> Geometry {
        let mut geo = geometry.clone();
        let mut max_height = 0;
        for w in self.widgets.iter() {
            let mut temp_geo = geo.clone();
            let temp_result = w.geometry_update(fonts, &temp_geo, state);
            temp_geo.x = geo.x + (geo.width - temp_result.width);
            let result = w.geometry_update(fonts, &temp_geo, state);
            geo.width -= result.width;
            max_height = max(result.height, max_height);
        }
        geo.height = max_height;
        geo
    }
    fn minimum_size(&self, fonts: &mut FontMap, state: &mut State) -> Geometry {
        let mut max_width = 0;
        let mut max_height = 0;
        for w in self.widgets.iter() {
            let result = w.minimum_size(fonts, state);
            max_width += result.x + result.width;
            max_height = max(result.y + result.height, max_height);
        }
        Geometry {
            width: max_width,
            height: max_height,
            x: 0,
            y: 0,
        }
    }
 }
 pub struct InvertedVerticalLayout {
    pub widgets: Vec<Box<dyn Layout>>,
 }
 impl InvertedVerticalLayout {
    pub fn new(widgets: Vec<Box<dyn Layout>>) -> Box<dyn Layout> {
        Box::new(InvertedVerticalLayout { widgets })
    }
 }
 impl Layout for InvertedVerticalLayout {
    fn geometry_update(
        &self,
        fonts: &mut FontMap,
        geometry: &Geometry,
        state: &mut State,
    ) -> Geometry {
        let mut geo = geometry.clone();
        let mut max_width = 0;
        for w in self.widgets.iter() {
            let mut temp_geo = geo.clone();
            let temp_result = w.geometry_update(fonts, &temp_geo, state);
            temp_geo.y = geo.y + (geo.height - temp_result.height);
            let result = w.geometry_update(fonts, &temp_geo, state);
            geo.height -= result.height;
            max_width = max(result.width, max_width);
        }
        geo.width = max_width;
        geo
    }
    fn minimum_size(&self, fonts: &mut FontMap, state: &mut State) -> Geometry {
        let mut max_width = 0;
        let mut max_height = 0;
        for w in self.widgets.iter() {
            let result = w.minimum_size(fonts, state);
            max_width = max(result.x + result.width, max_width);
            max_height += result.y + result.height;
        }
        Geometry {
            width: max_width,
            height: max_height,
            x: 0,
            y: 0,
        }
    }
 }
 pub struct Margin {
    pub widget: Box<dyn Layout>,
    pub margin: (u32, u32, u32, u32),
 }
 impl Margin {
    pub fn new(widget: Box<dyn Layout>, margin: (u32, u32, u32, u32)) -> Box<dyn Layout> {
        Box::new(Margin { widget, margin })
    }
 }
 impl Layout for Margin {
    fn geometry_update(
        &self,
        fonts: &mut FontMap,
        geometry: &Geometry,
        state: &mut State,
    ) -> Geometry {
        let geo = Geometry {
            x: geometry.x + self.margin.0,
            y: geometry.y + self.margin.1,
            width: geometry.width - self.margin.0 - self.margin.2,
            height: geometry.height - self.margin.1 - self.margin.3,
        };
        let out = self.widget.geometry_update(fonts, &geo, state);
        Geometry {
            x: out.x - self.margin.0,
            y: out.y - self.margin.1,
            width: out.width + self.margin.0 + self.margin.2,
            height: out.height + self.margin.1 + self.margin.3,
        }
    }
    fn minimum_size(&self, fonts: &mut FontMap, state: &mut State) -> Geometry {
        let size = self.widget.minimum_size(fonts, state);
        Geometry {
            width: size.x + size.width + self.margin.0 + self.margin.2,
            height: size.y + size.height + self.margin.1 + self.margin.3,
            x: 0,
            y: 0,
        }
    }
 }
@@ -1,62 +0,0 @@
 use std::default::Default;
 use crate::{
    buffer::BufferView,
    color::Color,
    fonts::FontMap,
    widgets::{Geometry, Widget},
 };
 pub struct Line {
    geometry: Geometry,
    thickness: u32,
    vertical: bool,
 }
 impl Line {
    pub fn new(thickness: u32, vertical: bool) -> Line {
        Line {
            geometry: Default::default(),
            thickness,
            vertical,
        }
    }
 }
 impl Widget for Line {
    fn geometry(&self) -> Geometry {
        self.geometry
    }
    fn draw(&mut self, _fonts: &mut FontMap, view: &mut BufferView) -> Geometry {
        view.memset(Color::WHITE);
        self.geometry
    }
    fn geometry_update(&mut self, _fonts: &mut FontMap, geometry: &Geometry) -> Geometry {
        self.geometry = Geometry {
            x: geometry.x,
            y: geometry.y,
            width: if self.vertical {
                self.thickness
            } else {
                geometry.width
            },
            height: if self.vertical {
                geometry.height
            } else {
                self.thickness
            },
        };
        self.geometry
    }
    fn minimum_size(&mut self, _fonts: &mut FontMap) -> Geometry {
        Geometry {
            x: 0,
            y: 0,
            width: if self.vertical { self.thickness } else { 1 },
            height: if self.vertical { 1 } else { self.thickness },
        }
    }
 }
@@ -1,27 +1,10 @@
-//mod alsaaudio;
+pub mod backlight;
-mod backlight;
+pub mod bar_widget;
-mod bar_widget;
+pub mod battery;
-mod battery;
+pub mod calendar;
-mod calendar;
+pub mod clock;
-mod clock;
+pub mod date;
-mod date;
+pub mod launcher;
 mod launcher;
 mod layout;
 mod line;
 mod pulseaudio;
 mod widget;
-//pub use alsaaudio::AlsaAudio;
+#[cfg(any(feature = "alsa-widget", feature = "pulseaudio-widget"))]
-pub use backlight::Backlight;
+pub mod audio;
 pub use battery::Battery;
 pub use calendar::Calendar;
 pub use clock::Clock;
 pub use date::Date;
 pub use launcher::Interface;
 pub use layout::{
    HorizontalLayout, IndexedLayout, InvertedHorizontalLayout, InvertedVerticalLayout, Layout,
    Margin, VerticalLayout, WidgetUpdater,
 };
 pub use line::Line;
 pub use pulseaudio::PulseAudio;
 pub use widget::{Geometry, Widget};
@@ -1,243 +0,0 @@
 use std::{
    cell::RefCell,
    error::Error,
    os::fd::RawFd,
    rc::Rc,
    sync::{Arc, Mutex},
    thread,
 };
 use nix::unistd::{pipe, read, write};
 use crate::{
    color::Color,
    event::{Event, Events, PointerButton},
    fonts::FontMap,
    widgets::bar_widget::{BarWidget, BarWidgetImpl},
 };
 use libpulse_binding::volume::ChannelVolumes;
 fn monitor(
    events: Arc<Mutex<Events>>,
    inner: Arc<Mutex<InnerAudio>>,
    pipe: RawFd,
 ) -> Result<(), Box<dyn Error>> {
    use libpulse_binding::{
        callbacks::ListResult,
        context::{
            subscribe::{Facility, InterestMaskSet},
            Context, FlagSet, State,
        },
        mainloop::{
            self, api::Mainloop, events::io::FlagSet as IoFlagSet, standard::IterateResult,
        },
        proplist::{properties, Proplist},
        volume::Volume,
    };
    let mut proplist = Proplist::new().unwrap();
    proplist
        .set_str(properties::APPLICATION_NAME, "wldash")
        .unwrap();
    let mut mainloop = mainloop::standard::Mainloop::new().unwrap();
    let context = Rc::new(RefCell::new(
        Context::new_with_proplist(&mainloop, "wldash_context", &proplist).unwrap(),
    ));
    context.borrow_mut().connect(None, FlagSet::NOFLAGS, None)?;
    loop {
        mainloop.iterate(false);
        match context.borrow().get_state() {
            State::Ready => break,
            State::Failed | State::Terminated => panic!("damn"),
            _ => (),
        }
    }
    let local_context = context.clone();
    let local_inner = inner.clone();
    let local_events = events.clone();
    context.borrow_mut().set_subscribe_callback(Some(Box::new(
        move |facility, _operation, index| match facility {
            Some(Facility::Sink) => {
                let introspector = local_context.borrow_mut().introspect();
                let inner = local_inner.clone();
                let events = local_events.clone();
                introspector.get_sink_info_by_index(index, move |res| match res {
                    ListResult::End | ListResult::Error => (),
                    ListResult::Item(sink_info) => {
                        if let Some(_) = &sink_info.name {
                            let avg = sink_info.volume.avg().0 as f32 / Volume::NORMAL.0 as f32;
                            let mut inner = inner.lock().unwrap();
                            inner.volume = avg;
                            inner.mute = sink_info.mute;
                            inner.dirty = true;
                            drop(inner);
                            let mut events = events.lock().unwrap();
                            events.add_event(Event::AudioUpdate);
                        }
                    }
                });
            }
            _ => (),
        },
    )));
    context
        .borrow_mut()
        .subscribe(InterestMaskSet::SINK, |_| {});
    let introspector = context.borrow_mut().introspect();
    let local_inner = inner.clone();
    introspector.get_sink_info_by_name("@DEFAULT_SINK@", move |res| match res {
        ListResult::End | ListResult::Error => (),
        ListResult::Item(sink_info) => {
            if let Some(_) = &sink_info.name {
                let avg = sink_info.volume.avg().0 as f32 / Volume::NORMAL.0 as f32;
                let mut inner = local_inner.lock().unwrap();
                inner.volume = avg;
                inner.channel_volume = Some(sink_info.volume);
                inner.mute = sink_info.mute;
                inner.dirty = true;
                drop(inner);
                let mut events = events.lock().unwrap();
                events.add_event(Event::AudioUpdate);
            }
        }
    });
    drop(introspector);
    let local_context = context.clone();
    let local_inner = inner.clone();
    let event_source = mainloop.new_io_event(
        pipe as i32,
        IoFlagSet::INPUT,
        Box::new(move |_, _, _| {
            let mut buf = [0; 8];
            _ = read(pipe, &mut buf);
            let mut inner = local_inner.lock().unwrap();
            let mut introspector = local_context.borrow_mut().introspect();
            match inner.last_click.take() {
                Some(Change::Volume(volume)) => {
                    // do something
                    let mut vol = inner.channel_volume.unwrap();
                    vol.scale(Volume((volume * Volume::NORMAL.0 as f32).round() as u32));
                    introspector.set_sink_volume_by_name("@DEFAULT_SINK@", &vol, None);
                }
                Some(Change::VolumeInc(value)) => {
                    let mut vol = inner.channel_volume.unwrap();
                    // apply step to volumes
                    let step = (value * Volume::NORMAL.0 as f32).round() as i32;
                    if step > 0 {
                        vol.inc_clamp(Volume(step as u32), Volume::NORMAL);
                    } else {
                        vol.decrease(Volume(-step as u32));
                    }
                    // HACK: It would be better to only update the volume from feedback, but axis
                    // events fire fast and require the last set volume immediately for reference.
                    inner.channel_volume = Some(vol);
                    introspector.set_sink_volume_by_name("@DEFAULT_SINK@", &vol, None);
                }
                Some(Change::ToggleMute) => {
                    introspector.set_sink_mute_by_name("@DEFAULT_SINK@", !inner.mute, None);
                }
                None => (),
            }
        }),
    );
    loop {
        match mainloop.iterate(true) {
            IterateResult::Quit(_) | IterateResult::Err(_) => break,
            _ => (),
        }
    }
    // Need to keep the event source alive
    _ = event_source;
    Ok(())
 }
 fn start_monitor(events: Arc<Mutex<Events>>, inner: Arc<Mutex<InnerAudio>>, pipe: RawFd) {
    thread::Builder::new()
        .name("audiomon".to_string())
        .spawn(move || monitor(events, inner, pipe).unwrap())
        .unwrap();
 }
 enum Change {
    Volume(f32),
    VolumeInc(f32),
    ToggleMute,
 }
 struct InnerAudio {
    volume: f32,
    channel_volume: Option<ChannelVolumes>,
    mute: bool,
    dirty: bool,
    last_click: Option<Change>,
    pipe: RawFd,
 }
 pub struct PulseAudio {
    inner: Arc<Mutex<InnerAudio>>,
 }
 impl PulseAudio {
    pub fn new(
        events: Arc<Mutex<Events>>,
        fm: &mut FontMap,
        font: &'static str,
        size: f32,
    ) -> BarWidget {
        let (a, b) = pipe().unwrap();
        let audio = PulseAudio {
            inner: Arc::new(Mutex::new(InnerAudio {
                volume: 0.0,
                channel_volume: None,
                mute: false,
                dirty: false,
                last_click: None,
                pipe: b,
            })),
        };
        start_monitor(events, audio.inner.clone(), a);
        BarWidget::new(Box::new(audio), fm, font, size)
    }
 }
 impl BarWidgetImpl for PulseAudio {
    fn get_dirty(&self) -> bool {
        self.inner.lock().unwrap().dirty
    }
    fn name(&self) -> &'static str {
        "volume"
    }
    fn value(&mut self) -> f32 {
        let mut inner = self.inner.lock().unwrap();
        inner.dirty = false;
        inner.volume
    }
    fn color(&self) -> Color {
        match self.inner.lock().unwrap().mute {
            true => Color::YELLOW,
            false => Color::WHITE,
        }
    }
    fn click(&mut self, pos: f32, btn: PointerButton) {
        let mut inner = self.inner.lock().unwrap();
        inner.last_click = match btn {
            PointerButton::Left => Some(Change::Volume(pos)),
            PointerButton::Right => Some(Change::ToggleMute),
            PointerButton::ScrollVertical(val) => Some(Change::VolumeInc((val / 512.) as f32)),
            PointerButton::ScrollHorizontal(val) => Some(Change::VolumeInc((val / 100.) as f32)),
            _ => None,
        };
        _ = write(inner.pipe, &[0]);
    }
 }
@@ -1,66 +0,0 @@
 use std::{
    cmp::{max, min},
    fmt,
 };
 use crate::{buffer::BufferView, event::Event, fonts::FontMap};
 #[derive(Debug, Default, Clone, Copy)]
 pub struct Geometry {
    pub x: u32,
    pub y: u32,
    pub width: u32,
    pub height: u32,
 }
 impl fmt::Display for Geometry {
    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
        write!(
            f,
            "(x: {}, y: {}, width: {}, height: {})",
            self.x, self.y, self.width, self.height
        )
    }
 }
 impl Geometry {
    pub fn new() -> Geometry {
        Geometry {
            x: 0,
            y: 0,
            width: 0,
            height: 0,
        }
    }
    pub fn expand(&self, other: Geometry) -> Geometry {
        let x = min(self.x, other.x);
        let y = min(self.y, other.y);
        Geometry {
            x,
            y,
            width: max(self.width + self.x, other.width + other.x) - x,
            height: max(self.height + self.y, other.height + other.height) - y,
        }
    }
    pub fn contains(&self, position: (u32, u32)) -> bool {
        position.0 >= self.x
            && position.0 < self.x + self.width
            && position.1 >= self.y
            && position.1 < self.y + self.height
    }
 }
 pub trait Widget {
    fn get_dirty(&self) -> bool {
        false
    }
    fn geometry(&self) -> Geometry;
    fn geometry_update(&mut self, fonts: &mut FontMap, geometry: &Geometry) -> Geometry;
    fn minimum_size(&mut self, _fonts: &mut FontMap) -> Geometry {
        Default::default()
    }
    fn draw(&mut self, fonts: &mut FontMap, view: &mut BufferView) -> Geometry;
    fn event(&mut self, _event: &Event) {}
 }
Author	SHA1	Message	Date
Kenny Levinsen	70e53c1246	cargo: Update dependencies	2022-12-04 13:58:14 +01:00
Kenny Levinsen	b2ae30bab4	Update fontconfig	2022-05-02 11:21:47 +02:00
Kenny Levinsen	2538e41f00	Update Cargo.lock	2022-01-16 23:16:30 +01:00
Kenny Levinsen	3eb7cddb6c	Bump version to 0.3.0	2022-01-15 18:40:38 +01:00
Kenny Levinsen	2813ae0eff	clock: Adjust to new font advance	2022-01-14 00:39:23 +01:00
Kenny Levinsen	1b1ffc4435	Update example config	2022-01-14 00:38:02 +01:00
Tadeo Kondrak	cf9fabb052	draw: Use font's horizontal advance value	2022-01-14 00:36:50 +01:00
Cyril Levis	43fe73bf09	feat: add ranking based on usage to launcher widget Signed-off-by: Cyril Levis <git@levis.name>	2022-01-02 17:08:18 +01:00
Cyril Levis	d291e36b3f	feat: allow choosing recent app with tabs	2021-12-30 22:22:01 +01:00
Cyril Levis	fe37c15f95	feat: deduplicate desktop entries We don't want duplicate entries because there are not distinguishable by Name. People will sometimes override in there HOME dir some desktop files entries in order to do some modifications. The actual reading order is good and so `unique_by` name do the job.	2021-12-30 22:10:51 +01:00
Cyril Levis	d4f62da6f5	feat: recurse deeper in applications folder max recursion 2 levels	2021-12-30 22:04:19 +01:00
Tadeo Kondrak	1edefd9cad	main: only bind up to version 3 of wl_output	2021-12-25 18:32:37 +01:00
Maxim Baz	90ffa7df27	Lex exec even when using custom opener This fixes a few bugs I found related to custom opener. Instead of sending the entire exec as a single argument, this properly splits the command, trims trailing whitespaces, and lets the receiving opener iterate over terms.	2021-12-25 17:59:45 +01:00
Kenny Levinsen	d69e941ec1	Remove old FUNDING link	2021-10-15 22:47:10 +02:00
Kenny Levinsen	5e5e8876f6	cargo fmt	2021-09-02 21:15:35 +02:00
Kenny Levinsen	886d595f91	launcher: Migrate to SkimMatcherV2	2021-09-02 21:14:08 +02:00
Kenny Levinsen	e04237b928	Use format string with panic	2021-09-02 21:13:57 +02:00
Kenny Levinsen	ef84c519a2	app: Migrate to compare_exchange	2021-09-02 21:13:33 +02:00
Kenny Levinsen	1e647c7036	readme: Update discuss section	2021-05-19 17:51:27 +02:00
Kenny Levinsen	56f6b1668d	cargo fmt	2021-03-04 00:23:09 +01:00
Kenny Levinsen	4c49407849	launcher: Ctrl-a, Ctrl-e, Home and End	2021-02-14 16:12:03 +01:00
Kenny Levinsen	07d8066d90	Bump wayland-rs to 0.28, key repeat	2021-02-14 16:12:03 +01:00
Kenny Levinsen	ee2646f091	pulseaudio: Iterate until callback is received Pipewire's pulseaudio server requires a different number of iterations to get the callback through properly. Set a flag from the callbacks, and iterate until the flag is set to ensure that the right number of iterations are made.	2021-01-28 00:56:53 +01:00
Kenny Levinsen	89eafe5bc7	Update libpulse-binding to 2.22	2021-01-28 00:56:47 +01:00
Kenny Levinsen	bd9106c5ee	Set layer-shell size to 1,1 on first commit The commit with no set_size was interpreted as having set_size of 0,0, which is no longer valid if anchors are not set. However, are just configuring our surface, not yet committing content. As workaround, specify a bogus 1,1 size to begin with. Closes: https://github.com/kennylevinsen/wldash/issues/36	2020-10-15 20:03:23 +02:00
Kenny Levinsen	2e49b98b82	date: Fix dimension calculations	2020-07-22 12:42:48 +02:00
Hilmar Gústafsson	12ea4e7f60	launcher: draw cursor for calc and shell modes	2020-07-22 01:44:06 +02:00
Hilmar Gústafsson	91fdfcd2b6	launcher: set cursor position in `self.leave`	2020-07-22 01:44:06 +02:00
Hilmar Gústafsson	2c8b27bb5a	launcher: fix bug that resets cursor on enter	2020-07-22 01:44:06 +02:00
Hilmar Gústafsson	f6cebdeba4	launcher: remove stray println	2020-07-22 01:44:06 +02:00
Hilmar Gústafsson	3b9aed089c	launcher: Handle grapheme clusters correctly	2020-07-22 01:44:06 +02:00
Hilmar Gústafsson	20e08f74ee	cargo fmt	2020-07-22 01:44:06 +02:00
Hilmar Gústafsson	89c5aeb01d	draw: render cursor correctly in position 0	2020-07-22 01:44:06 +02:00
Hilmar Gústafsson	f1811475cd	draw: Add method for drawing text with cursor	2020-07-22 01:44:06 +02:00
Hilmar Gústafsson	f25909b7f8	launcher: add cursor and basic operations	2020-07-22 01:44:06 +02:00
Hilmar Gústafsson	6690cda29f	Use tab and left tab to navigate matches	2020-07-22 01:44:06 +02:00
Kenny Levinsen	76e9d267df	ci: Add fontconfig as dependency	2020-06-14 17:10:15 +02:00
Kenny Levinsen	50ac4a89f5	app: Don't switch buffers if none was available	2020-06-14 17:01:42 +02:00
Kenny Levinsen	376a6f215b	config: Add default for font map	2020-06-14 17:01:42 +02:00
Kenny Levinsen	24ec63a178	widgets: Allow widgets to fill remaining space This is implemented by propagating the expected remaining space to all widget draw calls. It is not currently as smart as it could be, but it works well enough to let the last widget in a row/column fill things. BarWidget-type widgets and the Launcher widget now fill remaining space if their length is set to 0.	2020-06-14 17:01:42 +02:00
Kenny Levinsen	2f61da8690	clock: Use font metrics for size	2020-06-14 17:01:42 +02:00
Hilmar Gústafsson	48985c470a	Configurable font support Use fontconfig to load fonts. Fonts can be added to the `fonts` map in the config, and referenced from individual widgets' configurations for customizability. Fonts default to values "mono" and "sans" if nothing is set.	2020-06-14 17:01:42 +02:00
Hilmar Gústafsson	1a62696662	Use DisplayDevice instead of BAT0	2020-06-03 13:20:59 +02:00
Kenny Levinsen	becd676352	ci: alsa-lib dependency	2020-05-16 01:19:09 +02:00
Kenny Levinsen	f546cfa194	Create FUNDING.yml	2020-05-10 14:50:14 +02:00
Kenny Levinsen	319bcdd355	Reduce cargo clippy warnings	2020-04-22 01:31:22 +02:00
Kenny Levinsen	300711affe	Convert DateTime<Local> to NaiveDateTime Use of DateTime<Local> can lead to excessive inspection of the system timezone. Instead, propagate only a timezone-compensated NaiveDateTime throughout the widgets.	2020-04-22 00:52:08 +02:00
Kenny Levinsen	c380d20794	readme: Fix list	2020-03-28 02:23:55 +01:00
Kenny Levinsen	833f289cd0	readme: Add screenshot	2020-03-28 02:22:50 +01:00
Kenny Levinsen	0577c023b8	clock/date: Feb 29 bug in nonsensical code	2020-02-29 00:11:49 +01:00
Kenny Levinsen	460b63555a	Increase optimization level	2020-02-29 00:11:49 +01:00
Kenny Levinsen	aec80d1afd	backlight: Avoid unnecessary parens	2020-02-29 00:11:49 +01:00
Kenny Levinsen	0a5c4a386a	ci: Explicit source path	2020-01-08 11:49:19 +01:00
Kenny Levinsen	8877674f43	cargo fmt	2020-01-08 11:31:56 +01:00
Kenny Levinsen	d6b53be516	Update dependencies	2020-01-03 16:42:50 +01:00
Pedro Côrte-Real	cf37611243	Make matches unique and smarter Move the matching in the launcher to its own struct and make it so the matches are unique and we don't end up with 2 or 3 matches for the same program. Change the priorities so that they are bundled together with the fuzzy matching score and thus very good keyword matches will beat out very poor name matches.	2020-01-02 18:38:23 +00:00
Pedro Côrte-Real	5191952155	Simplify matching code in launcher	2020-01-02 17:53:37 +00:00
Pedro Côrte-Real	193f1d59fa	Prioritize name matches above keywords in launcher Keyword matches are always at a lower priority than name matches. It would probably make sense to extend this into something smarter where very good matches of keywords beat really poor matches of name.	2020-01-02 17:48:12 +00:00
Pedro Côrte-Real	809af580a9	Match on keywords in the launcher In the launcher match not only on the program name but also on the keywords specified in the desktop file.	2020-01-02 17:19:37 +00:00
Kenny Levinsen	2ba19f9e64	Allow backlight device to be specified	2020-01-01 17:18:42 +01:00
Kenny Levinsen	9233128b7c	Use global poll for ipc_server	2019-10-05 22:43:09 +02:00
Kenny Levinsen	b51fc8a1b0	Use global poll for UpowerBattery	2019-10-05 22:42:26 +02:00
Kenny Levinsen	0de3da162b	widget: Add wait support Widgets can now specify that they wish to wait on an fd or for a target time to be reached. This can be used to save a few worker threads.	2019-10-05 01:07:06 +02:00
Pedro Côrte-Real	510ad34183	Remove errant semicolon (#24 )	2019-10-03 19:03:38 +02:00
Kenny Levinsen	c676c0223b	rustfmt	2019-10-02 16:25:43 +02:00
Sergey Smirnykh	29252cbbc6	Various cleanups	2019-10-02 16:25:33 +02:00
Sergey Smirnykh	c695288d1e	config: Make YAML/JSON modular and optional (#21 )	2019-10-02 16:21:39 +02:00
Sergey Smirnykh	c02937d8b6	More efficient command-line arguments parsing	2019-10-02 16:20:10 +02:00
Sergey Smirnykh	b9ff6725cd	alsa: Use ? operator instead of and_then	2019-10-02 16:20:10 +02:00
Kenny Levinsen	3572d22ba8	Add modifier support, enter/leave events	2019-10-02 16:20:10 +02:00
Kenny Levinsen	50e2ab25a5	launcher: Increase gap to font_size/2	2019-09-25 20:34:21 +02:00
Kenny Levinsen	a1e36d9ac5	launcher: Space elements 3/8th of font-size	2019-09-25 20:27:50 +02:00
Sergey Smirnykh	1ae11bab29	Add ALSA widget (#18 ) Add initial ALSA widget, and put both ALSA and PulseAudio behind feature flags.	2019-09-18 11:19:10 +02:00
Kenny Levinsen	4e9f0e566f	launcher: Clear input buf when launching	2019-09-17 17:06:42 +02:00
Kenny Levinsen	4ca4fa307a	Fix various toggle-visible issues - Track "start" command internally as a special mode. - Ensure that DoubleMemPool is in good state if draw bails. - Ensure that Launcher does not terminate daemonized session. - Ensure that size changes cause full force redraw.	2019-09-17 16:32:51 +02:00
Kenny Levinsen	f2999fb53f	Ensure set_size is called after toggle_visibility	2019-09-17 13:16:48 +02:00
Kenny Levinsen	b94e80c346	pulseaudio: Ensure that both completion channels are read	2019-09-10 14:26:45 +02:00
Kenny Levinsen	c5cc36b7cf	README: Mention YAML/JSON	2019-09-07 15:48:24 +02:00
Kenny Levinsen	14388085cb	Add support for YAML	2019-09-07 12:26:30 +02:00
Kenny Levinsen	9908392af1	clock: Sizing error	2019-09-07 00:37:01 +02:00
Kenny Levinsen	d10883169f	Configurable background	2019-09-07 00:24:58 +02:00
Kenny Levinsen	d419946959	builds.sr.ht manifest	2019-09-06 23:23:12 +02:00
Kenny Levinsen	6679418696	rustfmt	2019-09-06 22:48:50 +02:00
Kenny Levinsen	61ad3e4d94	Remove deprecated libivy/bc features	2019-09-06 22:10:56 +02:00
Kenny Levinsen	89d96e28ac	Update README	2019-09-06 22:01:55 +02:00
Kenny Levinsen	b53a909e1c	Dynamic widget configuration and layout 1. Implement new layout API, replacing previous hard-coded layout. 2. Make the widgets (previously modules) configurable. 3. Split some widgets into smaller modules. 4. Configuration file (reluctantly JSON at time of writing). 5. More correct damage handling, copying damage to next buffer.	2019-09-06 21:54:04 +02:00
Kenny Levinsen	4053bb8973	README: Make note of dbus dependency	2019-09-03 17:33:06 +02:00
Kenny Levinsen	5555c3c787	Use XDG vars to find desktop files	2019-09-03 17:18:07 +02:00
Kenny Levinsen	3b4c9267bb	Simplify buffer positioning, introduce WLDASH_SCALE Replace most uses of Buffer::subdimensions with Buffer::offset. Introduce WLDASH_SCALE. Set to 2 to make wldash render at half size.	2019-09-03 13:24:21 +02:00
Kenny Levinsen	2bad68a8cf	Update dependencies	2019-08-29 01:30:36 +02:00
Kenny Levinsen	d41e338dfb	Integrate dot-desktop	2019-08-29 01:03:48 +02:00
Kenny Levinsen	46a1c9e701	Name threads, cargo fmt	2019-08-28 18:06:07 +02:00
Kenny Levinsen	bbfdb56d70	sound: Remove a thread	2019-08-28 18:04:31 +02:00
Kenny Levinsen	3dd09ca589	Update README.md	2019-08-28 15:23:56 +02:00
Kenny Levinsen	2d1d9d45d3	Clear buffer on forced draw	2019-08-28 15:20:17 +02:00
Kenny Levinsen	640165d8cc	launcher: Color modes	2019-08-28 14:57:47 +02:00
Kenny Levinsen	70bc9238c5	Add rcalc default calculator	2019-08-28 14:50:16 +02:00
Kenny Levinsen	fa759c304a	Add missing file	2019-08-27 19:28:12 +02:00
Kenny Levinsen	6deffa91bb	Experimental command socket support Introduces "start-or-kill" and "toggle-visible" commands. How the command socket is used will likely change soon.	2019-08-27 15:09:19 +02:00
Mel34	1cadf43d49	Update readme - bc feature mention - WLDASH_ALL_OUTPUTS=1	2019-08-26 21:42:23 +02:00
Kenny Levinsen	560f92a64e	Hide all output mode behind WLDASH_ALL_OUTPUTS=1	2019-08-26 17:53:11 +02:00
Kenny Levinsen	2f9534f75f	battery: Orange on low battery	2019-08-12 01:48:00 +02:00
Kenny Levinsen	4bc58623b7	app: Split from main	2019-08-12 01:47:50 +02:00
Kenny Levinsen	eec74ca750	modules: Move them all	2019-08-11 00:52:47 +02:00
Kenny Levinsen	2bb0a2f29f	Visible on all outputs	2019-08-10 00:01:23 +02:00
Kenny Levinsen	e9decaa594	Update libivy dependency	2019-08-09 19:20:32 +02:00
Kenny Levinsen	c10e312b51	launcher: wl-copy-based calc copy on enter	2019-08-09 12:30:04 +02:00
Kenny Levinsen	6e3bd0c4a8	launcher: Add bc calculator implementation	2019-08-09 12:29:37 +02:00
Kenny Levinsen	9c3bfb627e	calendar: Fix year location	2019-08-09 00:12:12 +02:00
Kenny Levinsen	a7011558b0	Update libivy dependency	2019-08-09 00:03:34 +02:00
Kenny Levinsen	92acc7c356	readme: Add info about launcher modes	2019-08-08 16:47:32 +02:00
Kenny Levinsen	e81a51416e	Enable fat LTO	2019-08-08 16:34:05 +02:00
Kenny Levinsen	19df29d7e0	launcher: rustfmt	2019-08-08 16:34:05 +02:00
Kenny Levinsen	461b34e5cb	sound/backlight: Invert scroll direction Fixes #3.	2019-08-08 16:33:27 +02:00
Kenny Levinsen	bb6c540441	readme: Add calculator build info	2019-08-07 14:04:00 +02:00
Kenny Levinsen	ec2cfff9c4	launcher: Add calculator feature	2019-08-07 14:02:37 +02:00
Kenny Levinsen	18c93ec538	launcher: Modes	2019-08-07 01:14:13 +02:00
Kenny Levinsen	ea2fd4b701	Sharpen up layout	2019-08-07 00:10:20 +02:00
Kenny Levinsen	37fcb7390b	Use pre-seeded font caches to avoid mut	2019-08-06 16:39:17 +02:00
Kenny Levinsen	c5d7faceba	main: Use map_keyboard_auto	2019-08-06 14:22:04 +02:00
Kenny Levinsen	ee4fe479d0	rustfmt	2019-08-06 14:21:10 +02:00
Kenny Levinsen	0896290411	draw: Ignore out of bounds writes	2019-08-06 14:09:18 +02:00
Kenny Levinsen	0d8facbb01	main: Remove unused import	2019-08-06 14:06:04 +02:00
Kenny Levinsen	a8c5c59b22	Cache all used font glyphs	2019-08-06 14:04:34 +02:00
Kenny Levinsen	b72c8e9cd9	launcher: Invert score sort	2019-08-06 09:51:14 +02:00
Kenny Levinsen	e63a28abb7	draw: lazy_static initialize fonts	2019-08-06 00:09:41 +02:00
Kenny Levinsen	11fd9a79c3	Bring down time to first draw	2019-08-05 23:45:59 +02:00
Kenny Levinsen	4e48df376b	Initialize modules in parallel with surface	2019-08-05 23:16:16 +02:00
Kenny Levinsen	fbc1f058ad	pulseaudio: Clean up locking a bit	2019-08-05 23:15:36 +02:00
Kenny Levinsen	840c8496ab	module: Make ModuleImpl Send	2019-08-05 23:15:11 +02:00
Kenny Levinsen	0b5a6f6538	calendar: Nothing to see here	2019-08-04 21:53:58 +02:00
Kenny Levinsen	7845d64313	battery: Color battery bar based on state	2019-08-04 21:52:13 +02:00
Kenny Levinsen	9329a1ebd8	launcher: Fuzzy match	2019-08-04 15:41:56 +02:00
Kenny Levinsen	b6bff9e9df	readme: Elaborate use of launcher feature	2019-08-04 14:39:46 +02:00
Kenny Levinsen	095c2c9aef	launcher: Show and return failed match strings	2019-08-04 14:39:23 +02:00
Kenny Levinsen	22893fd681	draw: Handle whitespaces better	2019-08-04 14:35:42 +02:00
Kenny Levinsen	beb6cb2f08	rustfmt	2019-08-04 14:23:49 +02:00
Kenny Levinsen	5cc4a6e740	Calculate window dimensions	2019-08-04 14:23:16 +02:00
Kenny Levinsen	a4f661ffa7	Avoid conversions to and from percent	2019-08-04 14:11:21 +02:00
Kenny Levinsen	339b069354	Add protocol notice to README.md	2019-08-04 14:11:05 +02:00
Kenny Levinsen	ca0e646564	launcher: Use draw_text_individual_colors	2019-08-03 10:39:48 +02:00
Kenny Levinsen	9116399ddd	draw: Add ability to set individual char color	2019-08-03 10:39:33 +02:00
Kenny Levinsen	c135f37b45	calendar: Slow down scroll, add click navigation	2019-08-03 01:14:57 +02:00
Kenny Levinsen	f6bc4c6bbb	Space layout a bit more	2019-08-03 01:04:14 +02:00
Kenny Levinsen	14ca00a866	launcher: Highlight 'Run' a bit more	2019-08-03 01:03:57 +02:00
Kenny Levinsen	f33bc883e3	launcher: Remove out-commented code	2019-08-03 01:03:41 +02:00
Kenny Levinsen	cee182df50	launcher: Better sorting of results	2019-08-02 19:11:39 +02:00
Kenny Levinsen	354558e592	launcher: Better substring search	2019-08-02 19:03:40 +02:00
Kenny Levinsen	9ea990d3c6	Update README.md	2019-08-02 17:30:18 +02:00
Kenny Levinsen	fa9716bc64	Update README.md	2019-08-02 17:21:03 +02:00
Kenny Levinsen	6f474a9a77	launcher: Case-insensitivity	2019-08-02 17:09:48 +02:00
Kenny Levinsen	e84ebf36dc	launcher: Capitalize 'run'	2019-08-02 16:06:51 +02:00
Kenny Levinsen	f351d183d3	calendar: Avoid overlap with launcher	2019-08-02 16:03:01 +02:00
Kenny Levinsen	52f4ae3cbf	Add README	2019-08-02 15:59:52 +02:00
Kenny Levinsen	a2bc6190ce	Add initial launcher implementation	2019-08-02 15:59:52 +02:00
Alex McGrath	a52bc3f126	Log error when brightness change fails Currently panics and closes the program, for example if there is an permissions error (where i encountered it)	2019-08-02 14:52:44 +02:00
Kenny Levinsen	1b8c041151	Add LICENSE	2019-08-02 14:50:58 +02:00
Kenny Levinsen	331cc930ca	Make room for container around bars	2019-08-02 12:59:08 +02:00
Kenny Levinsen	a5a7a6937c	battery: Add Upower-based battery monitor	2019-08-02 12:56:26 +02:00
Kenny Levinsen	a1b1bb01ff	backlight: Draw container box around bar	2019-08-02 12:56:10 +02:00
Kenny Levinsen	7e74b2e3ac	buffer: Remove unused highlight_bounds	2019-08-02 11:23:04 +02:00
Kenny Levinsen	5c50e294ff	main: Remove unused 'use'	2019-08-02 11:22:39 +02:00
Kenny Levinsen	7bfd708399	PulseAudio: Do not set dirty on input	2019-08-02 11:22:01 +02:00
Kenny Levinsen	bdcf83d1c2	Fix empty damage handling	2019-08-02 11:19:09 +02:00
Kenny Levinsen	bc16514f05	Invert scroll direction	2019-08-02 10:58:34 +02:00
Kenny Levinsen	734a7bf04a	Remove debug print	2019-08-02 10:58:27 +02:00
Kenny Levinsen	a3d4709472	PulseAudio improvements	2019-08-02 10:57:22 +02:00
Kenny Levinsen	0cee090fa2	PulseAudio module	2019-08-02 01:26:23 +02:00
Kenny Levinsen	9ac29b2a94	Slight cleanup	2019-08-01 11:07:33 +02:00
Kenny Levinsen	14a1611e9e	Draw bar for backlight	2019-08-01 00:09:51 +02:00
Kenny Levinsen	e426e1f884	Create seat before shell surface	2019-07-31 23:59:19 +02:00
Kenny Levinsen	b87bcd8cc9	Remove unused feature	2019-07-31 21:20:03 +02:00
Kenny Levinsen	a293b5914a	Fix input offsets	2019-07-31 17:37:15 +02:00
Kenny Levinsen	247a56edf5	Implement layer_shell, remove most sctk use	2019-07-31 16:44:13 +02:00
Kenny Levinsen	bf0a3617a6	Fix all the things	2019-07-31 10:26:12 +02:00
Kenny Levinsen	dea9378d8d	calendar: Allow scrolling	2019-07-31 01:03:22 +02:00
Kenny Levinsen	0a4e0829b9	Add module system, backlight control	2019-07-31 00:42:03 +02:00
Kenny Levinsen	9d2dd4ec37	Fix all the things	2019-07-30 16:31:42 +02:00
Kenny Levinsen	247286fc5e	Initial commit	2019-07-30 00:42:05 +02:00
		`@@ -0,0 +1,3 @@`
							`# These are supported funding model platforms`

							`liberapay: kennylevinsen`