diff --git a/.gitignore b/.gitignore index 08ec5e58..c3e41af0 100644 --- a/.gitignore +++ b/.gitignore @@ -7,4 +7,3 @@ target/ **/*.rs.bk .gdb_history *.log - diff --git a/COPYING b/COPYING new file mode 100644 index 00000000..94a9ed02 --- /dev/null +++ b/COPYING @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/Cargo.toml b/Cargo.toml index 9dee76dc..d5eea162 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,6 +6,8 @@ authors = ["Manos Pitsidianakis "] [dependencies] mailparse = "0.5.1" maildir = "0.1.1" +chrono = "0.4" + [dependencies.ncurses] features = ["wide"] optional = false diff --git a/src/mailbox/mod.rs b/src/mailbox/mod.rs new file mode 100644 index 00000000..5806bfc7 --- /dev/null +++ b/src/mailbox/mod.rs @@ -0,0 +1,391 @@ +/* + * meli - mailbox module. + * + * Copyright 2017 Manos Pitsidianakis + * + * This file is part of meli. + * + * meli 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. + * + * meli 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 meli. If not, see . + */ + +extern crate maildir; +extern crate mailparse; +use self::mailparse::*; +use std::cmp::Ordering; +use std::option::Option; +use std::collections::HashMap; +use std; + +type UnixTimestamp = i64; + +pub struct Mail { + entry: maildir::MailEntry, + subject: std::string::String, + pub message_id: std::string::String, + pub references: Vec, + date: UnixTimestamp, + thread: usize, +} + +/*a Mailbox represents a folder of mail. Currently only Maildir is supported.*/ +pub struct Mailbox{ + pub collection: Box>, + pub threaded_collection: Vec, + threads: Vec, + length: usize, +} + +/* a Thread struct is needed to describe the Thread tree forest during creation + * of threads. Because of Rust's memory model, we store indexes of other node + * instead of references and every reference is passed through the Thread owner + * (a Vec). + * + * message refers to a Mail entry in a Vec. If it's empty, the Thread is + * nonexistent in our Mailbox but we know it exists (for example we have a copy + * of a reply to a mail but we don't have its copy. + */ +#[derive(Clone,Copy,Debug)] +pub struct Thread { + id: usize, + message: Option, + parent: Option, + first_child: Option, + next_sibling: Option, + date: UnixTimestamp, + indentation: usize, +} + +impl Thread { + pub fn get_message(&self) -> Option { + self.message + } + pub fn get_parent(&self) -> Option { + self.parent + } + pub fn get_first_child(&self) -> Option { + self.first_child + } + pub fn get_next_sibling(&self) -> Option { + self.next_sibling + } + pub fn has_children(&self) -> bool { + self.first_child.is_some() + } + pub fn has_sibling(&self) -> bool { + self.next_sibling.is_some() + } + pub fn has_message(&self) -> bool { + self.message.is_some() + } + pub fn set_indentation(&mut self, i: usize) { + self.indentation = i; + } + pub fn get_indentation(&self) -> usize { + self.indentation + } + pub fn is_descendant(&self, threads: &Vec, other: Thread) -> bool { + match self.first_child { + Some(v) => { + if threads[v] == other { + return true; + } + if threads[v].clone().is_descendant(&threads, other) { + return true; + } + }, + None => {} + } + match self.next_sibling { + Some(v) => { + if threads[v] == other { + return true; + } + if threads[v].clone().is_descendant(threads, other) { + return true; + } + }, + None => {} + } + + return false; + + + } +} + +impl PartialEq for Thread { + fn eq(&self, other: &Thread) -> bool { + self.id == other.id + } +} + +impl Mailbox { + pub fn new(path: &str) -> Mailbox { + let maildir = maildir::Maildir::from(path); + let iter = maildir.list_cur(); + let mut collection: Box> = Box::new(Vec::new()); + let mut threads: Vec = Vec::new(); + let mut id_table: HashMap = HashMap::new(); + let mut idx = 0; + for x in iter { + let mut e = x.unwrap(); + let d = e.headers().unwrap().get_first_value("Date").unwrap(); + + let m_id = match e.headers().unwrap().get_first_value("Message-Id") { + Ok(v) => { + match v { + Some(v) => { + v + }, + None => idx.to_string() + } + } + Err(_) => { + idx.to_string() + } + }; + let mut references: Vec = Vec::new(); + match e.headers().unwrap().get_first_value("References") { + Ok(v) => { + match v { + Some(v) => { + references.append(&mut v.split_whitespace().map(|x| x.to_string()).collect()); + } + None => {} + } + } + Err(_) => { + } + }; + match e.headers().unwrap().get_first_value("In-Reply-To:") { + Ok(v) => { + match v { + Some(v) => { + references.push(v); + } + None => {} + } + } + Err(_) => { + } + }; + let subject = match e.headers().unwrap().get_first_value("Subject") { + Ok(v) => { + match v + { + Some(v) => v.clone(), + None => std::string::String::from("") + } + }, + Err(x) => panic!(x) + }; + collection.push( + Mail { + entry: e, + subject: subject, + references: references, + message_id: m_id, + date: dateparse(&d.unwrap()).unwrap(), + thread: 0, + }); + idx += 1; + } + idx = 0; + + collection.sort_by(|a, b| b.date.cmp(&a.date)); + for (i, x) in collection.iter_mut().enumerate() { + let x_index; + let m_id = x.message_id.clone(); + if id_table.contains_key(&m_id) { + let c = id_table.get(&m_id).unwrap(); + /* the already existing Thread should be empty, since we're + * seeing this message for the first time + * Store this message in the Thread's message slot. */ + threads[*c].message = Some(i); + threads[*c].date = x.date; + x.thread = *c; + x_index = *c; + } else { + /* Create a new Thread object holding this message */ + threads.push( + Thread { + message: Some(i), + id: idx, + parent: None, + first_child: None, + next_sibling: None, + date: x.date, + indentation: 0, + }); + x_index = idx; + x.thread = idx; + id_table.insert(m_id, x_index); + idx += 1; + } + /* For each element in the message's References field: + * + * Find a Thread object for the given Message-ID: + * If there's one in id_table use that; + * Otherwise, make (and index) one with a null Message. + * + * Link the References field's Threads together in the order implied by the References header. + * If they are already linked, don't change the existing links. + * Do not add a link if adding that link would introduce a loop: that is, before asserting A->B, search down the children of B to see if A is reachable, and also search down the children of A to see if B is reachable. If either is already reachable as a child of the other, don't add the link. + */ + if x.references.len() == 0 { + continue; + } + let r_to = x.references[x.references.len() - 1].clone(); + let parent_id = + if id_table.contains_key(&r_to) { + + let p = id_table.get(&r_to).unwrap(); + if threads[*p].is_descendant(&threads, threads[x_index]) || + threads[x_index].is_descendant(&threads, threads[*p]) { + continue; + } + if threads[*p].first_child.is_none() { + threads[*p].first_child = Some(x_index); + } else { + let mut fc = threads[*p].first_child.unwrap(); + while threads[fc].next_sibling.is_some() { + fc = threads[fc].next_sibling.unwrap(); + } + threads[fc].next_sibling = Some(x_index); + threads[fc].parent = Some(*p); + } + *p + } else { + threads.push( + Thread { + message: None, + id: idx, + parent: None, + first_child: Some(x_index), + next_sibling: None, + date: x.date, + indentation: 0, + }); + id_table.insert(r_to.clone(), idx); + idx += 1; + idx-1 + }; + /* update thread date */ + let mut parent_iter = parent_id; + loop { + let mut p = &mut threads[parent_iter]; + p.date = x.date; + if p.parent.is_none() { + break; + } else { + parent_iter = p.get_parent().unwrap(); + } + } + threads[x_index].parent = Some(parent_id); + } + /* Walk over the elements of id_table, and gather a list of the Thread objects that have + * no parents. */ + let mut root_set = Vec::new(); + for (_,v) in id_table.iter() { + if threads[*v].parent.is_none() { + root_set.push(*v); + } + } + root_set.sort_by(|a, b| threads[*b].date.cmp(&threads[*a].date)); + + let mut threaded_collection: Vec = Vec::new(); + fn build_threaded(threads: &mut Vec, indentation: usize, threaded: &mut Vec, index: usize) { + + let thread = threads[index]; + + if thread.has_message() { + threads[index].set_indentation(indentation); + if !threaded.contains(&index) { + threaded.push(index); + } + } + if thread.has_children() { + let mut fc = thread.get_first_child().unwrap(); + loop { + build_threaded(threads, indentation + 1, threaded, fc); + let thread_ = threads[fc]; + if !thread_.has_sibling() { + break; + } + fc = thread_.get_next_sibling().unwrap(); + } + } + } + for i in &root_set { + build_threaded(&mut threads, 0, &mut threaded_collection, *i); + } + + let length = collection.len(); + Mailbox { + collection: collection, + threads: threads, + length: length, + threaded_collection: threaded_collection, + } + } + pub fn get_length(&self) -> usize { + self.length + } + pub fn get_threaded_mail(&self, i: usize) -> usize { + let thread = self.threads[self.threaded_collection[i]]; + thread.get_message().unwrap() + } + pub fn get_mail_and_thread(&mut self, i: usize) -> (&mut Mail, Thread) { + + let ref mut x = self.collection.as_mut_slice()[i]; + let thread = self.threads[x.get_thread()].clone(); + (x, thread) + } + pub fn get_thread(&self, i: usize) -> Thread { + self.threads[i].clone() + } +} + +impl Mail { + pub fn get_entry(&mut self) -> &mut maildir::MailEntry { + &mut self.entry + } + pub fn get_date(&self) -> i64 { + self.date + } + pub fn get_subject(&self) -> &str { + &self.subject + } + pub fn get_thread(&self) -> usize { + self.thread + } +} + +impl Eq for Mail {} +impl Ord for Mail { + fn cmp(&self, other: &Mail) -> Ordering { + self.date.cmp(&other.date) + } +} +impl PartialOrd for Mail { + fn partial_cmp(&self, other: &Mail) -> Option { + Some(self.cmp(other)) + } +} + +impl PartialEq for Mail { + fn eq(&self, other: &Mail) -> bool { + self.date == other.date + } +} diff --git a/src/main.rs b/src/main.rs index 3a23353d..6f700875 100644 --- a/src/main.rs +++ b/src/main.rs @@ -10,9 +10,8 @@ fn main() { let locale_conf = ncurses::LcCategory::all; ncurses::setlocale(locale_conf, "en_US.UTF-8"); ui::initialize(); - let maildir = maildir::Maildir::from("./Inbox"); - let iter = maildir.list_cur(); - let mut index = Index::new(iter); + let mailbox = Mailbox::new("PATH"); + let mut index = Index::new(mailbox); ncurses::refresh(); index.draw(); diff --git a/src/ui/index.rs b/src/ui/index.rs index e1ea6551..f8e9c4f6 100644 --- a/src/ui/index.rs +++ b/src/ui/index.rs @@ -1,26 +1,46 @@ +/* + * meli - ui module. + * + * Copyright 2017 Manos Pitsidianakis + * + * This file is part of meli. + * + * meli 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. + * + * meli 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 meli. If not, see . + */ extern crate ncurses; extern crate maildir; extern crate mailparse; -use mailparse::*; +extern crate chrono; +use mailbox::*; +use self::chrono::NaiveDateTime; + +/* Index represents a UI list of mails */ pub struct Index { - mailbox: Vec<(usize, maildir::MailEntry)>, - length: usize, + mailbox: Mailbox, win: ncurses::WINDOW, pad: ncurses::WINDOW, screen_width: i32, screen_height: i32, + threaded: bool, + cursor_idx: usize, } impl Index { - pub fn new(iter: maildir::MailEntries) -> Index { - let mut collection: Vec<(usize, maildir::MailEntry)> = Vec::new(); - for (i, x) in iter.enumerate() { - collection.push((i, x.unwrap())); - } - let length = collection.len(); + pub fn new(mailbox: Mailbox) -> Index { let mut screen_height = 0; let mut screen_width = 0; /* Get the screen bounds. */ @@ -28,20 +48,20 @@ impl Index { // let win = ncurses::newwin( ncurses::LINES(), ncurses::COLS()-30, 0, 30); let win = ncurses::newwin(0, 0, 0, 0); ncurses::getmaxyx(win, &mut screen_height, &mut screen_width); + //eprintln!("length is {}\n", length); + let pad = ncurses::newpad(mailbox.get_length() as i32, screen_width); ncurses::wbkgd( - win, + pad, ' ' as ncurses::chtype | ncurses::COLOR_PAIR(super::COLOR_PAIR_DEFAULT) as ncurses::chtype, ); - //eprintln!("length is {}\n", length); - let pad = ncurses::newpad(length as i32, screen_width); Index { - mailbox: collection, - length: length, + mailbox: mailbox, win: win, pad: pad, screen_width: 0, screen_height: 0, + threaded: true, cursor_idx: 0, } } @@ -53,13 +73,30 @@ impl Index { ncurses::wclear(self.pad); - for &mut (i, ref mut x) in self.mailbox.as_mut_slice() { - if i == self.cursor_idx { - ncurses::wattron(self.pad, ncurses::COLOR_PAIR(super::COLOR_PAIR_CURSOR)); + let mut idx = 0; + if self.threaded { + /* Draw threaded view. */ + for i in self.mailbox.threaded_collection.iter() { + let container = self.mailbox.get_thread(*i); + + assert!(container.has_message(), true); + let x = &self.mailbox.collection[container.get_message().unwrap()]; + if idx == self.cursor_idx { + Index::draw_entry(self.pad, x, idx, container.get_indentation(), false, true); + } else { + Index::draw_entry(self.pad, x, idx, container.get_indentation(), false, false); + } + idx += 1; + } - Index::draw_entry(self.pad, x, i); - if i == self.cursor_idx { - ncurses::wattroff(self.pad, ncurses::COLOR_PAIR(super::COLOR_PAIR_CURSOR)); + } else { + for x in self.mailbox.collection.as_mut_slice() { + if idx == self.cursor_idx { + Index::draw_entry(self.pad, x, idx, 0, false, true); + } else { + Index::draw_entry(self.pad, x, idx, 0, false, false); + } + idx += 1; } } ncurses::getmaxyx(self.win, &mut self.screen_height, &mut self.screen_width); @@ -94,7 +131,7 @@ impl Index { } } ncurses::KEY_DOWN => { - if self.cursor_idx < self.length - 1 { + if self.cursor_idx < self.mailbox.get_length() - 1 { self.cursor_idx += 1; } else { return; @@ -109,16 +146,26 @@ impl Index { ncurses::wmove(self.pad, self.cursor_idx as i32, 0); /* Borrow x from self.mailbox in separate scopes or else borrow checker complains */ { - let (_, ref mut x) = self.mailbox.as_mut_slice()[self.cursor_idx]; - ncurses::wattron(self.pad, ncurses::COLOR_PAIR(super::COLOR_PAIR_CURSOR)); - Index::draw_entry(self.pad, x, self.cursor_idx); - ncurses::wattroff(self.pad, ncurses::COLOR_PAIR(super::COLOR_PAIR_CURSOR)); + let i: usize = + if self.threaded { + self.mailbox.get_threaded_mail(self.cursor_idx) + } else { + self.cursor_idx + }; + let (ref mut x, thread) = self.mailbox.get_mail_and_thread(i); + Index::draw_entry(self.pad, x, self.cursor_idx, thread.get_indentation(), false, true); } /* Draw previous highlighted entry normally */ ncurses::wmove(self.pad, prev_idx as i32, 0); { - let (_, ref mut x) = self.mailbox.as_mut_slice()[prev_idx]; - Index::draw_entry(self.pad, x, prev_idx); + let i: usize = + if self.threaded { + self.mailbox.get_threaded_mail(prev_idx) + } else { + prev_idx + }; + let (ref mut x, thread) = self.mailbox.get_mail_and_thread(i); + Index::draw_entry(self.pad, x, prev_idx, thread.get_indentation(), false, false); } /* Calculate the pad row of the first entry to be displayed in the window */ @@ -134,14 +181,16 @@ impl Index { * ┌- i * │ i+1 * │ i+2 - * r ┥ ... + * r ┤ ... * │ n * │ .. ┐ - * │ i-2 ├ 'dead' entries (must be empty) + * │ i-2 ├ 'dead' entries (must be cleared) * └ i-1 ┘ */ - if pminrow != pminrow_prev && pminrow + self.screen_height > self.length as i32 { - /* touch Index window (tell ncurses to redraw the entire window in next refresh */ + if pminrow != pminrow_prev && + pminrow + self.screen_height > self.mailbox.get_length() as i32 { + /* touch Index window (tell ncurses to redraw the entire window in + * next refresh) */ ncurses::touchwin(self.win); ncurses::wrefresh(self.win); } @@ -155,29 +204,54 @@ impl Index { self.screen_width - 1, ); } - fn draw_entry(win: ncurses::WINDOW, entry: &mut maildir::MailEntry, i: usize) { + fn draw_entry(win: ncurses::WINDOW, mail: &Mail, i: usize, indent: usize, + has_sibling: bool, highlight: bool) { + if highlight { + ncurses::wattron(win, + ncurses::COLOR_PAIR(super::COLOR_PAIR_CURSOR)); + } ncurses::waddstr(win, &format!("{}\t", i)); - let d = entry.headers().unwrap().get_first_value("Date").unwrap(); - match d { - Some(t) => { - ncurses::waddstr(win, &t.to_string()); - } - _ => {} + let dt = NaiveDateTime::from_timestamp(mail.get_date(), 0); + ncurses::waddstr(win, &dt.format("%Y-%m-%d %H:%M:%S").to_string()); + ncurses::waddch(win, '\t' as u64); + for _ in 0..indent { + ncurses::waddch(win, ' ' as u64); } - ncurses::waddch(win, ' ' as u64); - let c = entry.headers().unwrap().get_first_value("Subject").unwrap(); - match c { - Some(t) => { - ncurses::waddstr(win, &t.to_string()); + if indent > 0 { + ncurses::wattron(win, + ncurses::COLOR_PAIR(super::COLOR_PAIR_THREAD_INDENT)); + if has_sibling { + ncurses::waddstr(win, "│"); + } else { + ncurses::waddstr(win, "└"); } - _ => {} + ncurses::waddstr(win, "->"); + ncurses::wattroff(win, + ncurses::COLOR_PAIR(super::COLOR_PAIR_THREAD_INDENT)); } - ncurses::wprintw(win, "\n"); + if highlight { + ncurses::wattron(win, + ncurses::COLOR_PAIR(super::COLOR_PAIR_CURSOR)); + } + ncurses::waddstr(win, &format!("{:.85}",mail.get_subject())); + if highlight { + ncurses::wattroff(win, + ncurses::COLOR_PAIR(super::COLOR_PAIR_CURSOR)); + } + ncurses::waddstr(win, "\n"); } pub fn show_pager(&mut self) { - ncurses::getmaxyx(self.win, &mut self.screen_height, &mut self.screen_width); - let (_, ref mut mail) = self.mailbox[self.cursor_idx]; - let mut pager = super::pager::Pager::new(self.win, mail); + ncurses::getmaxyx(self.win, + &mut self.screen_height, &mut self.screen_width); + let x: &mut Mail; + + if self.threaded { + let i = self.mailbox.get_threaded_mail(self.cursor_idx); + x = &mut self.mailbox.collection[i]; + } else { + x = &mut self.mailbox.collection[self.cursor_idx]; + } + let mut pager = super::pager::Pager::new(self.win, &mut x.get_entry()); pager.scroll(ncurses::KEY_DOWN); pager.scroll(ncurses::KEY_UP); let mut ch = ncurses::getch(); @@ -191,19 +265,14 @@ impl Index { } _ => {} } - // ncurses::wprintw(pager, "test\n"); - //ncurses::wrefresh(pager); ch = ncurses::getch(); } - drop(pager); + drop(pager); // drop pager before next refresh ncurses::wrefresh(self.win); } } -impl Drop for Index { +impl Drop for Index { fn drop(&mut self) { - /* Final prompt before closing. */ - //ncurses::mv(self.screen_height - 1, 0); - //prompt(); ncurses::delwin(self.win); ncurses::delwin(self.pad); ncurses::endwin(); diff --git a/src/ui/mod.rs b/src/ui/mod.rs index 0617cd33..e302bcd9 100644 --- a/src/ui/mod.rs +++ b/src/ui/mod.rs @@ -1,3 +1,23 @@ +/* + * meli - ui module. + * + * Copyright 2017 Manos Pitsidianakis + * + * This file is part of meli. + * + * meli 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. + * + * meli 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 meli. If not, see . + */ extern crate ncurses; pub mod index; pub mod pager; @@ -5,6 +25,7 @@ pub mod pager; pub static COLOR_PAIR_DEFAULT: i16 = 1; pub static COLOR_PAIR_CURSOR: i16 = 2; pub static COLOR_PAIR_HEADERS: i16 = 3; +pub static COLOR_PAIR_THREAD_INDENT: i16 = 4; pub fn initialize() { /* start ncurses */ ncurses::initscr(); @@ -18,6 +39,7 @@ pub fn initialize() { ncurses::init_pair(COLOR_PAIR_DEFAULT, 15, 0); ncurses::init_pair(COLOR_PAIR_CURSOR, 251, 235); ncurses::init_pair(COLOR_PAIR_HEADERS, 33, 0); + ncurses::init_pair(COLOR_PAIR_THREAD_INDENT, 5, 0); /* Set the window's background color. */ ncurses::bkgd( diff --git a/src/ui/pager.rs b/src/ui/pager.rs index de9134d0..e5bf57e5 100644 --- a/src/ui/pager.rs +++ b/src/ui/pager.rs @@ -1,7 +1,30 @@ +/* + * meli - ui module. + * + * Copyright 2017 Manos Pitsidianakis + * + * This file is part of meli. + * + * meli 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. + * + * meli 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 meli. If not, see . + */ extern crate ncurses; extern crate maildir; extern crate mailparse; -use mailparse::*; +use self::mailparse::*; + +/* Pager represents the part of the UI that shows the mail headers and body for + * viewing */ pub struct Pager { win: ncurses::WINDOW, pad: ncurses::WINDOW, @@ -12,8 +35,8 @@ pub struct Pager { } impl Pager { - pub fn new(parent: ncurses::WINDOW, entry: &mut maildir::MailEntry) -> Pager { - + pub fn new(parent: ncurses::WINDOW, + entry: &mut maildir::MailEntry) -> Pager { let mut screen_height = 0; let mut screen_width = 0; ncurses::getmaxyx(parent, &mut screen_height, &mut screen_width); @@ -32,11 +55,15 @@ impl Pager { for _ in 1..screen_width + 1 { ncurses::waddstr(win, "─"); } - //ncurses::wprintw(win, "\n"); - let (mail_pad, rows, header_height) = Pager::print_entry(win, entry); + let (pad, rows, header_height) = Pager::print_entry(win, entry); + ncurses::wbkgd( + pad, + ' ' as ncurses::chtype | + ncurses::COLOR_PAIR(super::COLOR_PAIR_DEFAULT) as ncurses::chtype, + ); ncurses::wrefresh(win); Pager { - pad: mail_pad, + pad: pad, win: win, rows: rows, header_height: header_height, @@ -163,8 +190,7 @@ impl Pager { fn print_entry_content( win: ncurses::WINDOW, mail: &mut maildir::MailEntry, - height: i32, - ) -> (ncurses::WINDOW, i32, i32) { + height: i32) -> (ncurses::WINDOW, i32, i32) { let mut h = 0; let mut w = 0; /* height and width of self.win, the pager window */ @@ -210,17 +236,15 @@ impl Pager { } fn print_entry( win: ncurses::WINDOW, - mail: &mut maildir::MailEntry, - ) -> (ncurses::WINDOW, i32, i32) { + mail: &mut maildir::MailEntry) -> (ncurses::WINDOW, i32, i32) { let header_height = Pager::print_entry_headers(win, mail); Pager::print_entry_content(win, mail, header_height + 2) } } - impl Drop for Pager { fn drop(&mut self) { - //ncurses::touchwin(self.win); + ncurses::wclear(self.win); ncurses::delwin(self.win); ncurses::delwin(self.pad); }