diff --git a/LICENSE~ b/LICENSE~ deleted file mode 100755 index 20d40b6..0000000 --- a/LICENSE~ +++ /dev/null @@ -1,674 +0,0 @@ - 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 -. \ No newline at end of file diff --git a/README~ b/README~ deleted file mode 100644 index 1bbba56..0000000 --- a/README~ +++ /dev/null @@ -1,13 +0,0 @@ -NOTE: to compile the C daemon you must have a working AOSP source tree, and copy it to external folder. -Do something like: - -$AOSP_SRC=/path/to/aosp -$VNC_DAEMON=/path_to_vnc/droidvncdaemon - -cp -fr $VNC_DAEMON/droidvncdaemon $AOSP_SRC -cd $AOSP_SRC -. build/envsetup.sh -# lunch -mmm external/droidvncdaemon - -Thats it. You will have androidvncserver_froyo (for 2.2 down) and androidvncserver_ginger (for 2.3+) in $AOSP_SRC/out/target/product/generic/system/bin/ diff --git a/droidvncdaemon/vnc/Android.mk~ b/droidvncdaemon/vnc/Android.mk~ deleted file mode 100755 index d694860..0000000 --- a/droidvncdaemon/vnc/Android.mk~ +++ /dev/null @@ -1,94 +0,0 @@ - - -LOCAL_PATH:= $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_ARM_MODE := arm - -local_c_flags += -Wall -O3 -DLIBVNCSERVER_WITH_WEBSOCKETS -DLIBVNCSERVER_HAVE_LIBPNG - -local_src_files:= \ - input.c \ - gui.c \ - adb_method.c \ - framebuffer_method.c \ - suinput.c \ - droidvncserver.c \ - gralloc_method.c \ - libvncserver-kanaka/libvncserver/scale.c \ - libvncserver-kanaka/libvncserver/main.c \ - libvncserver-kanaka/libvncserver/rfbserver.c \ - libvncserver-kanaka/libvncserver/rfbregion.c \ - libvncserver-kanaka/libvncserver/auth.c \ - libvncserver-kanaka/libvncserver/sockets.c \ - libvncserver-kanaka/libvncserver/stats.c \ - libvncserver-kanaka/libvncserver/corre.c \ - libvncserver-kanaka/libvncserver/hextile.c \ - libvncserver-kanaka/libvncserver/rre.c \ - libvncserver-kanaka/libvncserver/translate.c \ - libvncserver-kanaka/libvncserver/cutpaste.c \ - libvncserver-kanaka/libvncserver/httpd.c \ - libvncserver-kanaka/libvncserver/cursor.c \ - libvncserver-kanaka/libvncserver/font.c \ - libvncserver-kanaka/libvncserver/draw.c \ - libvncserver-kanaka/libvncserver/selbox.c \ - libvncserver-kanaka/libvncserver/minilzo.c \ - libvncserver-kanaka/libvncserver/vncauth.c \ - libvncserver-kanaka/libvncserver/d3des.c \ - libvncserver-kanaka/libvncserver/md5.c \ - libvncserver-kanaka/libvncserver/cargs.c \ - libvncserver-kanaka/libvncserver/ultra.c \ - libvncserver-kanaka/libvncserver/zlib.c \ - libvncserver-kanaka/libvncserver/zrle.c \ - libvncserver-kanaka/libvncserver/zrleoutstream.c \ - libvncserver-kanaka/libvncserver/zrlepalettehelper.c \ - libvncserver-kanaka/libvncserver/tight.c \ - libvncserver-kanaka/libvncserver/zywrletemplate.c \ - libvncserver-kanaka/libvncserver/websockets.c - -ginger_up := displaybinder.cpp - - -local_c_includes := \ - $(LOCAL_PATH) \ - $(LOCAL_PATH)/libvncserver-kanaka/libvncserver \ - $(LOCAL_PATH)/libvncserver-kanaka \ - $(LOCAL_PATH)/libvncserver-kanaka/common \ - $(LOCAL_PATH)/../../zlib \ - $(LOCAL_PATH)/../../jpeg \ - $(LOCAL_PATH)/../../openssl/include \ - $(LOCAL_PATH)/../../libpng \ - -####################################### - -# target -include $(CLEAR_VARS) -LOCAL_SRC_FILES += $(local_src_files) -LOCAL_CFLAGS += $(local_c_flags) -DANDROID_FROYO -LOCAL_C_INCLUDES += $(local_c_includes) - - -LOCAL_MODULE:= androidvncserver_froyo -LOCAL_MODULE_TAGS:= optional - -LOCAL_STATIC_LIBRARIES := libcutils libz libpng jpeg -LOCAL_SHARED_LIBRARIES := libcrypto libssl libhardware - -include $(BUILD_EXECUTABLE) - -####################################### - -# target -include $(CLEAR_VARS) -LOCAL_SRC_FILES += $(local_src_files) $(ginger_up) -LOCAL_CFLAGS += $(local_c_flags) -LOCAL_C_INCLUDES += $(local_c_includes) - - -LOCAL_MODULE:= androidvncserver_gingerup -LOCAL_MODULE_TAGS:= optional - -LOCAL_STATIC_LIBRARIES := libcutils libz libpng jpeg -LOCAL_SHARED_LIBRARIES := libcrypto libssl libhardware libsurfaceflinger_client libui - -include $(BUILD_EXECUTABLE) diff --git a/droidvncdaemon/vnc/adb_method.c~ b/droidvncdaemon/vnc/adb_method.c~ deleted file mode 100755 index 228e4c7..0000000 --- a/droidvncdaemon/vnc/adb_method.c~ +++ /dev/null @@ -1,284 +0,0 @@ -/* -droid vnc server - Android VNC server -Copyright (C) 2009 Jose Pereira - -This library is free software; you can redistribute it and/or -modify it under the terms of the GNU Lesser General Public -License as published by the Free Software Foundation; either -version 3 of the License, or (at your option) any later version. - -This library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Lesser General Public License for more details. - -You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -*/ - -#include "adb_method.h" - -#include -#include -#include -#include -#include -#include -#include -#include - -#include - -//#include "common.h" - - - -#define A_CNXN 0x4e584e43 -#define A_OKAY 0x59414b4f -#define A_CLSE 0x45534c43 -#define A_WRTE 0x45545257 - - -#define DDMS_RAWIMAGE_VERSION 1 - -char connect_string[] = { -0x43, 0x4e, 0x58, 0x4e, 0x00, 0x00, 0x00, 0x01, -0x00, 0x10, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, -0x32, 0x02, 0x00, 0x00, 0xbc, 0xb1, 0xa7, 0xb1, -0x68, 0x6f, 0x73, 0x74, 0x3a, 0x3a, 0x00 }; - -char framebuffer_string[] = { -0x4f, 0x50, 0x45, 0x4e, 0x01, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x00, 0x0d, 0x00, 0x00, 0x00, -0xbf, 0x04, 0x00, 0x00, 0xb0, 0xaf, 0xba, 0xb1, -0x66, 0x72, 0x61, 0x6d, 0x65, 0x62, 0x75, 0x66, -0x66, 0x65, 0x72, 0x3a, 0x00 }; - -char okay_string[24]; - -struct fbinfo *fb_info; -struct _message *message,*okay_message; -int sockfd; - -ssize_t write_socket(int fd, const void *buf, size_t count) -{ -// L("--Writing %d \n",count); - - int n = write(fd,buf,count); - - if (n < 0) - perror("ERROR writing to socket"); - - return n; -} - - -void read_socket(int fd, void *buf, size_t count) -{ - int n=0; - - while (count>0) - { - n=read(fd,buf,count); - - if (n < 0) - L("ERROR reading from socket\n"); - - - count-=n; - } - return; -} - -void send_connect_string() -{ - write_socket(sockfd,connect_string,sizeof(connect_string)); - - read_socket(sockfd,message,sizeof(struct _message)); - - if (message->command!=A_CNXN) - L("bad A_CNXN response\n"); - - //lets read, i don't want this - read_socket(sockfd,message,message->data_length); -} - -void send_framebuffer_string(); - -int initADB() -{ - L("--Initializing adb access method--\n"); - int portno; - struct sockaddr_in serv_addr; - struct hostent *server; - adbbuf=NULL; - - property_set("service.adb.tcp.port", "5555"); - system("setprop service.adb.tcp.port 5555"); - system("adbd"); - - message=malloc(sizeof(struct _message)); - okay_message=malloc(sizeof(struct _message)); - - -// L("1\n"); - - portno = 5555; - sockfd = socket(AF_INET, SOCK_STREAM, 0); - if (sockfd < 0) - { - L("adb ERROR opening socket\n"); - return -1; - } -#ifdef ANDROID - server = gethostbyname("127.0.0.1"); -#else - server = gethostbyname("192.168.10.6"); -#endif - if (server == NULL) { - L("adb ERROR, no such host\n"); - return -1; - } - -// L("2\n"); - - bzero((char *) &serv_addr, sizeof(serv_addr)); - serv_addr.sin_family = AF_INET; - bcopy((char *)server->h_addr, - (char *)&serv_addr.sin_addr.s_addr, - server->h_length); - serv_addr.sin_port = htons(portno); - if (connect(sockfd,(struct sockaddr *) &serv_addr,sizeof(serv_addr)) < 0) - { - L("adb ERROR connecting\n"); - return -1; - } - -// L("3\n"); - send_connect_string(); -// L("4\n"); -return 0; - } - - - -void send_framebuffer_string()//returns the fb struct size from adb -{ - int n; - char *buffer=NULL; - write_socket(sockfd,framebuffer_string,sizeof(framebuffer_string)); - read_socket(sockfd,okay_message,sizeof(struct _message)); - - if (okay_message->command!=A_OKAY) - { - L("---\ncommand=%32X\narg0=%32X\narg1=%32X\ndata_len=%d\n---\n",message->command,message->arg0,message->arg1,message->data_length); - L("bad OKAY response on send_framebuffer_string\n"); - - } - - n=okay_message->arg0; - okay_message->arg0=okay_message->arg1; - okay_message->arg1=n; - - -// L("arg0=%08X\narg1=%08X\n",okay_message->arg0,okay_message->arg1); - //we now have our okay message - - //lets receive fb info... - read_socket(sockfd,message,sizeof(struct _message)); - - - if (message->command!=A_WRTE) - L("bad WRTE response\n"); - -// L("---\ncommand=%32X\narg0=%32X\narg1=%32X\ndata_len=%d\n---\n",message->command,message->arg0,message->arg1,message->data_length); - -// if (message->data_length!=sizeof(struct _message)) -// error("Size should match..."); - - buffer=(char*)malloc(sizeof(char)*message->data_length); - - read_socket(sockfd,&displayInfo,sizeof(struct fbinfo)); - -// L("sizeof(struct fbinfo)=%d\n",sizeof(struct fbinfo)); - -// L("ADB framebuffer method:\nversion=%d\nbpp=%d\nsize=%d bytes\nwidth=%dpx\nheight=%dpx\nsize=%d\n", -// displayInfo.version,displayInfo.bpp,displayInfo.size,displayInfo.width,displayInfo.height,displayInfo.size); - -// L("sizeof(struct _message)=%d\n",sizeof(struct _message)); - write_socket(sockfd,okay_message,sizeof(struct _message)); - if (adbbuf==NULL) - adbbuf=(unsigned int*)malloc(displayInfo.size); - -} - -void updateADBFrame() - { - int n=0; - int count=0; - - send_framebuffer_string(); - -// L("1\n"); - - while (message->command!=A_CLSE) - { - read_socket(sockfd,message,sizeof(struct _message)); - -// L("---\ncommand=%32X\narg0=%32X\narg1=%32X\ndata_len=%d\n---\n",message->command,message->arg0,message->arg1,message->data_length); - - if (message->command==A_CLSE) - break; - else if (message->command!=A_WRTE) - { - L("Weird command received... %08X\n",message->command); - L("---\ncommand=%32X\narg0=%32X\narg1=%32X\ndata_len=%d\n---\n",message->command,message->arg0,message->arg1,message->data_length); - } - - - char * s=(char*)adbbuf+count; - read_socket(sockfd,s,message->data_length); - count+=message->data_length; - -// L("ahah %d %d\n",message->data_length,n); - - n=write_socket(sockfd,okay_message,sizeof(struct _message)); - if (n<0) - break; - } - -// L("Exit updating...\n"); -// L("Received %d bytes\n",count); - -// if (resp!=A_OKAY) -// error("bad OKAY response"); - - } - -#ifndef ANDROID - void main() -{ - connect_to_adb(); - L("up\n"); - update_frame(); - L("up\n"); - update_frame(); -} - -#endif -// int main(int argc, char *argv[]) -// { -// message=(struct _message*)malloc(sizeof(struct _message)); -// okay_message=(struct _message*)malloc(sizeof(struct _message)); -// -// connect_to_adb(); -// -// // adbbuf=calloc(fb_info->size,1); -// -// update_frame(); -// -// -// close(sockfd); -// return 0; -// } diff --git a/droidvncdaemon/vnc/adb_method.h~ b/droidvncdaemon/vnc/adb_method.h~ deleted file mode 100755 index ce4c247..0000000 --- a/droidvncdaemon/vnc/adb_method.h~ +++ /dev/null @@ -1,66 +0,0 @@ -/* -droid vnc server - Android VNC server -Copyright (C) 2009 Jose Pereira - -This library is free software; you can redistribute it and/or -modify it under the terms of the GNU Lesser General Public -License as published by the Free Software Foundation; either -version 3 of the License, or (at your option) any later version. - -This library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Lesser General Public License for more details. - -You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -*/ - -#ifndef ADB_CONNECT_METHOD -#define ADB_CONNECT_METHOD - -#include -#include -#include -#include -#include -#include -#include -#include -// #include - -#include "common.h" - - - -#define A_CNXN 0x4e584e43 -#define A_OKAY 0x59414b4f -#define A_CLSE 0x45534c43 -#define A_WRTE 0x45545257 - - -#define DDMS_RAWIMAGE_VERSION 1 - -struct _message { - unsigned int command; /* command identifier constant */ - unsigned int arg0; /* first argument */ - unsigned int arg1; /* second argument */ - unsigned int data_length; /* length of payload (0 is allowed) */ - unsigned int data_crc32; /* crc32 of data payload */ - unsigned int magic; /* command ^ 0xffffffff */ -} __attribute__((packed)); - - - -// void error(const char *msg); -// ssize_t write_socket(int fd, const void *buf, size_t count); -// ssize_t read_socket(int fd, void *buf, size_t count); -// void send_connect_string(); - -int initADB(); -void update_frame(); - -unsigned int *adbbuf; - -#endif diff --git a/droidvncdaemon/vnc/displaybinder.cpp~ b/droidvncdaemon/vnc/displaybinder.cpp~ deleted file mode 100755 index 2d03492..0000000 --- a/droidvncdaemon/vnc/displaybinder.cpp~ +++ /dev/null @@ -1,74 +0,0 @@ -/* -droid vnc server - Android VNC server -Copyright (C) 2009 Jose Pereira - -This library is free software; you can redistribute it and/or -modify it under the terms of the GNU Lesser General Public -License as published by the Free Software Foundation; either -version 3 of the License, or (at your option) any later version. - -This library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Lesser General Public License for more details. - -You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -*/ - -#include "displaybinder.h" -#include "common.h" - -#include -#include -#include - -#include -#include -#include - -using namespace android; - -ScreenshotClient *screenshotclient; - -extern "C" int initGingerbreadMethod() -{ - - L("--Initializing gingerbread access method--\n"); - - screenshotclient=new ScreenshotClient(); - int err=screenshotclient->update(); - if (err != NO_ERROR) { - L("screen capture failed: %s\n", strerror(-err)); - //mandar msg incompatible - return -1; - } - - PixelFormat f=screenshotclient->getFormat(); - - PixelFormatInfo pf; - getPixelFormatInfo(f,&pf); - - - displayInfo.bpp = pf.bitsPerPixel; - displayInfo.width = screenshotclient->getWidth(); - displayInfo.height = screenshotclient->getHeight();; - displayInfo.size = pf.bitsPerPixel*displayInfo.width*displayInfo.height/CHAR_BIT; - displayInfo.red_offset = pf.l_red; - displayInfo.red_length = pf.h_red; - displayInfo.green_offset = pf.l_green; - displayInfo.green_length = pf.h_green-pf.h_red; - displayInfo.blue_offset = pf.l_blue; - displayInfo.blue_length = pf.h_blue-pf.h_green; - displayInfo.alpha_offset = pf.l_alpha; - displayInfo.alpha_length = pf.h_alpha-pf.h_blue; - - } - -extern "C" void updateScreen() -{ - screenshotclient->update(); - gingerbuf=(unsigned int*)screenshotclient->getPixels(); -} - diff --git a/droidvncdaemon/vnc/displaybinder.h~ b/droidvncdaemon/vnc/displaybinder.h~ deleted file mode 100755 index 07a5c4b..0000000 --- a/droidvncdaemon/vnc/displaybinder.h~ +++ /dev/null @@ -1,42 +0,0 @@ -/* -droid vnc server - Android VNC server -Copyright (C) 2009 Jose Pereira - -This library is free software; you can redistribute it and/or -modify it under the terms of the GNU Lesser General Public -License as published by the Free Software Foundation; either -version 3 of the License, or (at your option) any later version. - -This library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Lesser General Public License for more details. - -You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -*/ - -#ifndef DISPLAY_BINDER -#define DISPLAY_BINDER - - -unsigned int *gingerbuf; - -#ifdef __cplusplus -#define L(...) __android_log_print(ANDROID_LOG_INFO,"VNCserver",__VA_ARGS__);printf(__VA_ARGS__); - - -extern "C" { -#endif -void updateScreen(); -void initGingerbreadMethod(); - -#ifdef __cplusplus -} - -#endif - - - -#endif \ No newline at end of file diff --git a/droidvncdaemon/vnc/droidvncserver.c~ b/droidvncdaemon/vnc/droidvncserver.c~ deleted file mode 100755 index b28b132..0000000 --- a/droidvncdaemon/vnc/droidvncserver.c~ +++ /dev/null @@ -1,511 +0,0 @@ -/* -droid vnc server - Android VNC server -Copyright (C) 2009 Jose Pereira - -This library is free software; you can redistribute it and/or -modify it under the terms of the GNU Lesser General Public -License as published by the Free Software Foundation; either -version 3 of the License, or (at your option) any later version. - -This library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Lesser General Public License for more details. - -You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -*/ - -#include "common.h" -#include "framebuffer_method.h" -#include "gralloc_method.h" -#include "adb_method.h" - -#include "gui.h" -#include "input.h" -#include "displaybinder.h" - - -#define CONCAT2(a,b) a##b -#define CONCAT2E(a,b) CONCAT2(a,b) -#define CONCAT3(a,b,c) a##b##c -#define CONCAT3E(a,b,c) CONCAT3(a,b,c) - - -char VNC_PASSWORD[256] = ""; -int VNC_PORT=5901; -/* Android already has 5900 bound natively in some devices. */ - - -unsigned int *cmpbuf; -unsigned int *vncbuf; - -static rfbScreenInfoPtr vncscr; - -int idle=0,standby=0, rotation=0,scaling=100; -char *rhost=NULL; -int rport=5500; -void (*update_screen)(void)=NULL; - -enum method_type {AUTO,FRAMEBUFFER,ADB,GRALLOC -#ifndef ANDROID_FROYO -,GINGERBREAD}; -#else -}; -#endif - -enum method_type method=AUTO; - -#define PIXEL_TO_VIRTUALPIXEL_FB(i,j) ((j+scrinfo.yoffset)*scrinfo.xres_virtual+i+scrinfo.xoffset) -#define PIXEL_TO_VIRTUALPIXEL(i,j) ((j*displayInfo.width)+i) - -#define OUT 8 -#include "update_screen.c" -#undef OUT - -#define OUT 16 -#include "update_screen.c" -#undef OUT - -// #define OUT 24 -// #include "update_screen.c" -// #undef OUT - -#define OUT 32 -#include "update_screen.c" -#undef OUT - -inline int getCurrentRotation() -{ - return rotation; -} - -inline int isIdle() -{ - return idle; -} - -void setIdle(int i) -{ - idle=i; -} - -ClientGoneHookPtr clientGone(rfbClientPtr cl) -{ - sendMsgToGui("~DISCONNECTED|\n"); - return 0; -} - -rfbNewClientHookPtr clientHook(rfbClientPtr cl) -{ - if (scaling!=100) - { - rfbScalingSetup(cl, vncscr->width*scaling/100.0, vncscr->height*scaling/100.0); - L("Scaling to w=%d h=%d\n",(int)(vncscr->width*scaling/100.0), (int)(vncscr->height*scaling/100.0)); -// rfbSendNewScaleSize(cl); - } - - cl->clientGoneHook=(ClientGoneHookPtr)clientGone; - - char *header="~CONNECTED|"; - char *msg=malloc(sizeof(char)*((strlen(cl->host)) + strlen(header)+1)); - msg[0]='\0'; - strcat(msg,header); - strcat(msg,cl->host); - strcat(msg,"\n"); - sendMsgToGui(msg); - free (msg); - - return RFB_CLIENT_ACCEPT; -} - - -void CutText(char* str,int len, struct _rfbClientRec* cl) -{ - str[len]='\0'; - char *header="~CLIP|\n"; - char *msg=malloc(sizeof(char)*(strlen(str) + strlen(header)+1)); - msg[0]='\0'; - strcat(msg,header); - strcat(msg,str); - strcat(msg,"\n"); - sendMsgToGui(msg); - free(msg); -} - -void sendServerStarted(){ - sendMsgToGui("~SERVERSTARTED|\n"); -} - -void sendServerStopped() -{ - sendMsgToGui("~SERVERSTOPPED|\n"); -} - -void initVncServer(int argc, char **argv) -{ - - vncbuf = calloc(displayInfo.width * displayInfo.height, displayInfo.bpp/CHAR_BIT); - cmpbuf = calloc(displayInfo.width * displayInfo.height, displayInfo.bpp/CHAR_BIT); - - - assert(vncbuf != NULL); - assert(cmpbuf != NULL); - - - if (rotation==0 || rotation==180) - vncscr = rfbGetScreen(&argc, argv, displayInfo.width , displayInfo.height, 0 /* not used */ , 3, displayInfo.bpp/CHAR_BIT); - else - vncscr = rfbGetScreen(&argc, argv, displayInfo.height, displayInfo.width, 0 /* not used */ , 3, displayInfo.bpp/CHAR_BIT); - - assert(vncscr != NULL); - - vncscr->desktopName = "Android"; - - - vncscr->frameBuffer =(char *)vncbuf; - - - vncscr->port = VNC_PORT; - - vncscr->kbdAddEvent = keyEvent; - vncscr->ptrAddEvent = ptrEvent; - vncscr->newClientHook = (rfbNewClientHookPtr)clientHook; - - vncscr->setXCutText = CutText; - - if (strcmp(VNC_PASSWORD,"")!=0) - { - char **passwords = (char **)malloc(2 * sizeof(char **)); - passwords[0] = VNC_PASSWORD; - passwords[1] = NULL; - vncscr->authPasswdData = passwords; - vncscr->passwordCheck = rfbCheckPasswordByList; - } - - - vncscr->httpDir="/data/data/org.onaips.vnc/files/"; - vncscr->sslcertfile="self.pem"; - - vncscr->serverFormat.redShift=displayInfo.red_offset; - vncscr->serverFormat.greenShift=displayInfo.green_offset; - vncscr->serverFormat.blueShift=displayInfo.blue_offset; - - vncscr->serverFormat.redMax=((1<serverFormat.greenMax=((1<serverFormat.blueMax=((1<serverFormat.bitsPerPixel=displayInfo.bpp; - - vncscr->alwaysShared = TRUE; - vncscr->handleEventsEagerly = TRUE; - vncscr->deferUpdateTime = 5; - - rfbInitServer(vncscr); - - //assign update_screen depending on bpp - - if (vncscr->serverFormat.bitsPerPixel == 32) - update_screen=&CONCAT2E(update_screen_,32); -// else if (vncscr->serverFormat.bitsPerPixel == 24) -// update_screen=&CONCAT2E(update_screen_,24); - else if (vncscr->serverFormat.bitsPerPixel == 16) - update_screen=&CONCAT2E(update_screen_,16); - else if (vncscr->serverFormat.bitsPerPixel == 8) - update_screen=&CONCAT2E(update_screen_,8); - else { - L("Unsupported pixel depth: %d\n", - vncscr->serverFormat.bitsPerPixel); - - sendMsgToGui("~SHOW|Unsupported pixel depth, please send bug report.\n"); - return; - } - - - /* Mark as dirty since we haven't sent any updates at all yet. */ - - rfbMarkRectAsModified(vncscr, 0, 0, vncscr->width, vncscr->height); -} - - - -void rotate(int value) -{ - - L("rotate()"); - - - if (value==-1 || - ((value==90 || value==270) && (rotation==0 || rotation==180)) || - ((value==0 || value==180) && (rotation==90 || rotation==270))) - { - int h=vncscr->height; - int w=vncscr->width; - - vncscr->width = h; - vncscr->paddedWidthInBytes = h * displayInfo.bpp / CHAR_BIT; - vncscr->height = w; - - { - rfbClientIteratorPtr iterator; - rfbClientPtr cl; - iterator = rfbGetClientIterator(vncscr); - while ((cl = rfbClientIteratorNext(iterator)) != NULL) - cl->newFBSizePending = 1; - } - } - - if (value==-1) - { - rotation+=90; - rotation=rotation%360; - } - else - { - rotation=value; - } - - rfbMarkRectAsModified(vncscr, 0, 0, vncscr->width, vncscr->height); - -} - - -void close_app() -{ - L("Cleaning up...\n"); - cleanupFramebuffer(); - cleanupInput(); - sendServerStopped(); - unbindIPCserver(); - exit(0); /* normal exit status */ -} - - -void extractReverseHostPort(char *str) -{ - int len=strlen(str); - char *p; - /* copy in to host */ - rhost = (char *) malloc(len+1); - if (! rhost) { - L("reverse_connect: could not malloc string %d\n", len); - exit(-1); - } - strncpy(rhost, str, len); - rhost[len] = '\0'; - - /* extract port, if any */ - if ((p = strrchr(rhost, ':')) != NULL) { - rport = atoi(p+1); - if (rport < 0) { - rport = -rport; - } else if (rport < 20) { - rport = 5500 + rport; - } - *p = '\0'; - } -} - -void printUsage(char **argv) -{ - L("\nandroidvncserver [parameters]\n" - "-f \t- Framebuffer device (only with -m fb, default is /dev/graphics/fb0)\n" - "-h\t\t- Print this help\n" - "-m \t- Display grabber method\n\tfb: framebuffer\n\tgb: gingerbread+ devices\n\tadb: slower, but should be compatible with all devices\n" - "-p \t- Password to access server\n" - "-r \t- Screen rotation (degrees) (0,90,180,270)\n" - "-R \t- Host for reverse connection\n" - "-s \t- Scale percentage (20,30,50,100,150)\n\n" ); -} - - -int main(int argc, char **argv) -{ - signal(SIGINT, close_app);//pipe signals - signal(SIGKILL, close_app); - signal(SIGILL, close_app); - - if(argc > 1) - { - int i=1; - int r; - while(i < argc) - { - if(*argv[i] == '-') - { - switch(*(argv[i] + 1)) - { - case 'h': - printUsage(argv); - exit(0); - break; - case 'p': - i++; - strcpy(VNC_PASSWORD,argv[i]); - break; - case 'f': - i++; - setFramebufferDevice(argv[i]); - break; - case 'P': - i++; - VNC_PORT=atoi(argv[i]); - break; - case 'r': - i++; - r=atoi(argv[i]); - if (r==0 || r==90 || r==180 || r==270) - rotation=r; - L("rotating to %d degrees\n",rotation); - break; - case 's': - i++; - r=atoi(argv[i]); - if (r>=1 && r <= 150) - scaling=r; - else - scaling=100; - L("scaling to %d percent\n",scaling); - break; - case 'm': - i++; - if (strcmp(argv[i],"adb")==0) - { - method=ADB; - L("ADB display grabber selected\n"); - } - else if (strcmp(argv[i],"fb")==0) - { - method=FRAMEBUFFER; - L("Framebuffer display grabber selected\n"); - } - else if (strcmp(argv[i],"gralloc")==0) - { - method=GRALLOC; - L("Gralloc display grabber selected\n"); - } - #ifndef ANDROID_FROYO - else if (strcmp(argv[i],"gingerbread")==0) - { - method=GINGERBREAD; - L("Gingerbread display grabber selected\n"); - } - #endif - else - { - L("Grab method \"%s\" not found, reverting to default.\n",argv[i]); - } - break; - case 'R': - i++; - extractReverseHostPort(argv[i]); - break; - } - } - i++; - } - } - - L("Initializing grabber method...\n"); - - if (method==AUTO) - { - L("No grabber method selected, auto-detecting..."); - do - { - if (init_gralloc()!=-1) - method=GRALLOC; - #ifndef ANDROID_FROYO - else if (initGingerbreadMethod()!=-1) - method=GINGERBREAD; - #endif - else if (initFramebuffer()!=-1) - method=FRAMEBUFFER; - else if (initADB()!=-1) - { - method=ADB; - updateADBFrame(); - } - break; - } - while (0); - } - else if (method==FRAMEBUFFER) - initFramebuffer(); - else if (method==ADB) - { - initADB(); - updateADBFrame(); - } - else if (method==GRALLOC) - init_gralloc(); - #ifndef ANDROID_FROYO - else if (method==GINGERBREAD) - initGingerbreadMethod(); - #endif - - L("Initializing virtual keyboard and touch device...\n"); - initInput(); - - L("Initializing VNC server:\n"); - L(" width: %d\n", (int)displayInfo.width); - L(" height: %d\n", (int)displayInfo.height); - L(" bpp: %d\n", (int)displayInfo.bpp); - L(" port: %d\n", (int)VNC_PORT); - - - L("Colourmap_rgba=%d:%d:%d:%d lenght=%d:%d:%d:%d\n",displayInfo.red_offset,displayInfo.green_offset,displayInfo.blue_offset,displayInfo.alpha_offset, - displayInfo.red_length,displayInfo.green_length,displayInfo.blue_length,displayInfo.alpha_length); - - initVncServer(argc, argv); - - bindIPCserver(); - sendServerStarted(); - - - - if (rhost) - { - rfbClientPtr cl; - cl = rfbReverseConnection(vncscr, rhost, rport); - if (cl == NULL) - { - char *str=malloc(255*sizeof(char)); - sprintf(str,"~SHOW|Couldn't connect to remote host:\n%s\n",rhost); - - L("Couldn't connect to remote host: %s\n",rhost); - sendMsgToGui(str); - free(str); - } - else - { - cl->onHold = FALSE; - rfbStartOnHoldClient(cl); - } - } - - rfbRunEventLoop(vncscr,-1,TRUE); - - while (1) - { - usleep(300000*(standby/2.0)); - - - if (idle) - standby++; - else - standby=2; - - if (vncscr->clientHead == NULL) - continue; - - - update_screen(); - } - - close_app(); -} - - - \ No newline at end of file diff --git a/droidvncdaemon/vnc/framebuffer_method.c~ b/droidvncdaemon/vnc/framebuffer_method.c~ deleted file mode 100755 index a7abcc7..0000000 --- a/droidvncdaemon/vnc/framebuffer_method.c~ +++ /dev/null @@ -1,137 +0,0 @@ -/* -droid VNC server - a vnc server for android -Copyright (C) 2011 Jose Pereira - -Other contributors: -Oleksandr Andrushchenko - -This library is free software; you can redistribute it and/or -modify it under the terms of the GNU Lesser General Public -License as published by the Free Software Foundation; either -version 3 of the License, or (at your option) any later version. - -This library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Lesser General Public License for more details. - -You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -*/ - -#include "framebuffer_method.h" -#include "common.h" -#include "gui.h" - -int fbfd = -1; - - -char framebuffer_device[256] = "/dev/graphics/fb0"; - - -void setFramebufferDevice(char *s) -{ - strcpy(framebuffer_device,s); -} - - -int initFramebuffer(void) -{ - L("--Initializing framebuffer access method--\n"); - - fbmmap = MAP_FAILED; - - if ((fbfd = open(framebuffer_device, O_RDWR)) == -1) - { - L("Cannot open fb device %s\n", framebuffer_device); - sendMsgToGui("~SHOW|Cannot open fb device, please try out other display grab method\n"); - return -1; - } - - update_fb_info(); - - - if (ioctl(fbfd, FBIOGET_FSCREENINFO, &fscrinfo) != 0) - { - L("ioctl error\n"); - return -1; - } - - L("line_lenght=%d xres=%d, yres=%d, xresv=%d, yresv=%d, xoffs=%d, yoffs=%d, bpp=%d\n", - (int)fscrinfo.line_length,(int)scrinfo.xres, (int)scrinfo.yres, - (int)scrinfo.xres_virtual, (int)scrinfo.yres_virtual, - (int)scrinfo.xoffset, (int)scrinfo.yoffset, - (int)scrinfo.bits_per_pixel); - - - - - size_t size=scrinfo.yres_virtual; - if (size - -This library is free software; you can redistribute it and/or -modify it under the terms of the GNU Lesser General Public -License as published by the Free Software Foundation; either -version 3 of the License, or (at your option) any later version. - -This library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Lesser General Public License for more details. - -You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -*/ - -#ifndef ADB_FRAMEBUFFER_METHOD -#define ADB_FRAMEBUFFER_METHOD - -#include "common.h" - -unsigned int *fbmmap; - -struct fb_var_screeninfo scrinfo; -struct fb_fix_screeninfo fscrinfo; - -void initFramebuffer(void); -void cleanupFramebuffer(void); -void update_fb_info(); -int roundUpToPageSize(int x); -void setFramebufferDevice(char *); - -#endif \ No newline at end of file diff --git a/droidvncdaemon/vnc/gralloc_method.c~ b/droidvncdaemon/vnc/gralloc_method.c~ deleted file mode 100644 index 56b6619..0000000 --- a/droidvncdaemon/vnc/gralloc_method.c~ +++ /dev/null @@ -1,245 +0,0 @@ -/* -droid vnc server - Android VNC server -Copyright (C) 2011 Jose Pereira - -This library is free software; you can redistribute it and/or -modify it under the terms of the GNU Lesser General Public -License as published by the Free Software Foundation; either -version 3 of the License, or (at your option) any later version. - -This library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Lesser General Public License for more details. - -You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -*/ - -#include "gralloc_method.h" -#include "common.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#define r(fd, ptr, size) (read((fd), (ptr), (size)) != (int)(size)) -#define w(fd, ptr, size) (write((fd), (ptr), (size)) != (int)(size)) - - -static int fill_format(struct fbinfo* info, int format) -{ - // bpp, red, green, blue, alpha - - static const int format_map[][9] = { - {0, 0, 0, 0, 0, 0, 0, 0, 0}, // INVALID - {32, 0, 8, 8, 8, 16, 8, 24, 8}, // HAL_PIXEL_FORMAT_RGBA_8888 - {32, 0, 8, 8, 8, 16, 8, 0, 0}, // HAL_PIXEL_FORMAT_RGBX_8888 - {24, 16, 8, 8, 8, 0, 8, 0, 0}, // HAL_PIXEL_FORMAT_RGB_888 - {16, 11, 5, 5, 6, 0, 5, 0, 0}, // HAL_PIXEL_FORMAT_RGB_565 - {32, 16, 8, 8, 8, 0, 8, 24, 8}, // HAL_PIXEL_FORMAT_BGRA_8888 - {16, 11, 5, 6, 5, 1, 5, 0, 1}, // HAL_PIXEL_FORMAT_RGBA_5551 - {16, 12, 4, 8, 4, 4, 4, 0, 4} // HAL_PIXEL_FORMAT_RGBA_4444 - }; - const int *p; - - if (format == 0 || format > HAL_PIXEL_FORMAT_RGBA_4444) - return -ENOTSUP; - - p = format_map[format]; - - info->bpp = *(p++); - info->red_offset = *(p++); - info->red_length = *(p++); - info->green_offset = *(p++); - info->green_length = *(p++); - info->blue_offset = *(p++); - info->blue_length = *(p++); - info->alpha_offset = *(p++); - info->alpha_length = *(p++); - - return 0; -} -#if 0 -static int readfb_devfb (int fd) -{ - struct fb_var_screeninfo vinfo; - int fb, offset; - char x[256]; - int rv = -ENOTSUP; - - struct fbinfo fbinfo; - unsigned i, bytespp; - - fb = open("/dev/graphics/fb0", O_RDONLY); - if (fb < 0) goto done; - - if (ioctl(fb, FBIOGET_VSCREENINFO, &vinfo) < 0) goto done; - fcntl(fb, F_SETFD, FD_CLOEXEC); - - bytespp = vinfo.bits_per_pixel / 8; - - fbinfo.bpp = vinfo.bits_per_pixel; - fbinfo.size = vinfo.xres * vinfo.yres * bytespp; - fbinfo.width = vinfo.xres; - fbinfo.height = vinfo.yres; - fbinfo.red_offset = vinfo.red.offset; - fbinfo.red_length = vinfo.red.length; - fbinfo.green_offset = vinfo.green.offset; - fbinfo.green_length = vinfo.green.length; - fbinfo.blue_offset = vinfo.blue.offset; - fbinfo.blue_length = vinfo.blue.length; - fbinfo.alpha_offset = vinfo.transp.offset; - fbinfo.alpha_length = vinfo.transp.length; - - /* HACK: for several of our 3d cores a specific alignment - * is required so the start of the fb may not be an integer number of lines - * from the base. As a result we are storing the additional offset in - * xoffset. This is not the correct usage for xoffset, it should be added - * to each line, not just once at the beginning */ - offset = vinfo.xoffset * bytespp; - - offset += vinfo.xres * vinfo.yoffset * bytespp; - - rv = 0; - - if (w(fd, &fbinfo, sizeof(fbinfo))) goto done; - - lseek(fb, offset, SEEK_SET); - for (i = 0; i < fbinfo.size; i += 256) { - if (r(fb, &x, 256)) goto done; - if (w(fd, &x, 256)) goto done; - } - - if (r(fb, &x, fbinfo.size % 256)) goto done; - if (w(fd, &x, fbinfo.size % 256)) goto done; - -done: - if (fb >= 0) close(fb); - return rv; -} - -#endif - - -struct gralloc_module_t *gralloc; -struct framebuffer_device_t *fbdev = 0; -struct alloc_device_t *allocdev = 0; -buffer_handle_t buf = 0; -unsigned char* data = 0; -int stride; - -#define CHECK_RV if (rv != 0){close_gralloc();return rv;} - -int init_gralloc() -{ - L("--Initializing gralloc access method--\n"); - grallocfb=0; - - int linebytes; - int rv; - - rv = hw_get_module(GRALLOC_HARDWARE_MODULE_ID, (const hw_module_t**)&gralloc); - - CHECK_RV; - - rv = framebuffer_open(&gralloc->common, &fbdev); - - CHECK_RV; - - if (!fbdev->read) { - rv = -ENOTSUP; - close_gralloc(); - return rv; - } - - rv = gralloc_open(&gralloc->common, &allocdev); - - CHECK_RV; - - rv = allocdev->alloc(allocdev, fbdev->width, fbdev->height, - fbdev->format, GRALLOC_USAGE_SW_READ_OFTEN, - &buf, &stride); - - - rv = fbdev->read(fbdev, buf); - - CHECK_RV; - - rv = gralloc->lock(gralloc, buf, GRALLOC_USAGE_SW_READ_OFTEN, 0, 0, - fbdev->width, fbdev->height, (void**)&data); - CHECK_RV; - - rv = fill_format(&displayInfo, fbdev->format); - - CHECK_RV; - - stride *= (displayInfo.bpp >> 3); - linebytes = fbdev->width * (displayInfo.bpp >> 3); - displayInfo.size = linebytes * fbdev->height; - displayInfo.width = fbdev->width; - displayInfo.height = fbdev->height; - - // point of no return: don't attempt alternative means of reading - // after this - rv = 0; - - grallocfb=malloc(displayInfo.size); - - L("Stride=%d Linebytes=%d %p\n",stride,linebytes,fbdev->setUpdateRect); - - memcpy(grallocfb,data,displayInfo.size); - - if (data) - gralloc->unlock(gralloc, buf); - - L("Copy %d bytes\n",displayInfo.size); - - L("Returning rv=%d\n",rv); - return rv; -} - - -void close_gralloc() -{ - if (buf) - allocdev->free(allocdev, buf); - if (allocdev) - gralloc_close(allocdev); - if (fbdev) - framebuffer_close(fbdev); -} - - - - -int readfb_gralloc () -{ - int rv; - - - rv = fbdev->read(fbdev, buf); - - CHECK_RV; - - rv = gralloc->lock(gralloc, buf, GRALLOC_USAGE_SW_READ_OFTEN, 0, 0, - fbdev->width, fbdev->height, (void**)&data); - CHECK_RV; - - memcpy(grallocfb,data,displayInfo.size); - - if (data) - gralloc->unlock(gralloc, buf); - - return rv; -} - - diff --git a/droidvncdaemon/vnc/gui.c~ b/droidvncdaemon/vnc/gui.c~ deleted file mode 100755 index b0d144b..0000000 --- a/droidvncdaemon/vnc/gui.c~ +++ /dev/null @@ -1,131 +0,0 @@ -/* -droid VNC server - a vnc server for android -Copyright (C) 2011 Jose Pereira - -This library is free software; you can redistribute it and/or -modify it under the terms of the GNU Lesser General Public -License as published by the Free Software Foundation; either -version 3 of the License, or (at your option) any later version. - -This library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Lesser General Public License for more details. - -You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -*/ - -#include "gui.h" - -#define SOCKET_ERROR -1 -#define BUFFER_SIZE 1024 -#define QUEUE_SIZE 1 - -int hServerSocket; /* handle to socket */ -struct sockaddr_in Address; /* Internet socket address stuct */ -int nAddressSize=sizeof(struct sockaddr_in); -char pBuffer[BUFFER_SIZE]; -static int nHostPort; - -int sendMsgToGui(char *buffer) -{ - int sock, n; - unsigned int length; - struct sockaddr_in server; - - sock= socket(AF_INET, SOCK_DGRAM, 0); - if (sock < 0) perror("socket"); - - bzero(&server,sizeof(server)); - server.sin_family = AF_INET; - server.sin_addr.s_addr=inet_addr("127.0.0.1"); - server.sin_port = htons(13131); - length=sizeof(struct sockaddr_in); - - n=sendto(sock,buffer, - strlen(buffer),0,(struct sockaddr *)&server,length); - if (n < 0) perror("Sendto"); - - L("Sent %s\n",buffer); -// n = recvfrom(sock,buffer,256,0,(struct sockaddr *)&from, &length); -// if (n < 0) error("recvfrom"); -// write(1,"Got an ack: ",12); -// write(1,buffer,n); - - close(sock); - return 0; -} - -int bindIPCserver() -{ - nHostPort=13132; - - L("Starting IPC connection..."); - - /* make a socket */ - hServerSocket=socket(AF_INET,SOCK_DGRAM,0); - - if(hServerSocket == SOCKET_ERROR) - { - L("\nCould not make a socket\n"); - return 0; - } - - /* fill address struct */ - Address.sin_addr.s_addr=INADDR_ANY; - Address.sin_port=htons(nHostPort); - Address.sin_family=AF_INET; - - - /* bind to a port */ - if(bind(hServerSocket,(struct sockaddr*)&Address,sizeof(Address)) == SOCKET_ERROR) - { - L("\nCould not connect to IPC gui, another daemon already running?\n"); - sendMsgToGui("~SHOW|Could not connect to IPC gui, another daemon already running?\n"); - - exit(-1); - } - - - L("binded to port %d\n",nHostPort); - - pthread_t thread; - pthread_create( &thread,NULL,handle_connections,NULL); - - return 1; -} - - - -void *handle_connections() -{ - L("\nWaiting for a connection\n"); - struct sockaddr_in from; - int fromlen = sizeof(struct sockaddr_in); - int n; - - while (1) { - n = recvfrom(hServerSocket,pBuffer,BUFFER_SIZE,0,(struct sockaddr *)&from,&fromlen); - if (n < 0) perror("recvfrom"); - - L("Recebido: %s\n",pBuffer); - - if (strstr(pBuffer,"~PING|")!=NULL) - { - char *resp="~PONG|"; - n = sendto(hServerSocket,resp,strlen(resp), - 0,(struct sockaddr *)&from,fromlen); - if (n < 0) perror("sendto"); - } - else if (strstr(pBuffer,"~KILL|")!=NULL) - close_app(); - } -} - - -void unbindIPCserver() -{ - close(hServerSocket); -} \ No newline at end of file diff --git a/droidvncdaemon/vnc/update_screen.c~ b/droidvncdaemon/vnc/update_screen.c~ deleted file mode 100755 index 5721c01..0000000 --- a/droidvncdaemon/vnc/update_screen.c~ +++ /dev/null @@ -1,211 +0,0 @@ -/* -droid VNC server - a vnc server for android -Copyright (C) 2011 Jose Pereira - -This library is free software; you can redistribute it and/or -modify it under the terms of the GNU Lesser General Public -License as published by the Free Software Foundation; either -version 3 of the License, or (at your option) any later version. - -This library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Lesser General Public License for more details. - -You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -*/ - -#define OUT_T CONCAT3E(uint,OUT,_t) -#define FUNCTION CONCAT2E(update_screen_,OUT) - -void FUNCTION(void) -{ - int i,j; - int offset=0,pixelToVirtual; - OUT_T* a; - OUT_T* b=0; - - - if (method==FRAMEBUFFER) - update_fb_info();//important for doubleframebuffing_* - else if (method==ADB) - updateADBFrame(); - else if (method==GRALLOC) - readfb_gralloc(); - #ifndef ANDROID_FROYO - else if (method==GINGERBREAD) - updateScreen(); - #endif - - a = (OUT_T*)cmpbuf; - - if (method==FRAMEBUFFER) - b = (OUT_T*)fbmmap; - else if (method==ADB) - b = (OUT_T*)adbbuf; - else if (method==GRALLOC) - b = (OUT_T*)grallocfb; - #ifndef ANDROID_FROYO - else if (method==GINGERBREAD) - b = (OUT_T*)gingerbuf; - #endif - - int max_x=-1,max_y=-1, min_x=99999, min_y=99999; - idle=1; - - if (rotation==0) - { - for (j = 0; j < vncscr->height; j++) - { - for (i = 0; i < vncscr->width; i++) - { - offset = j * vncscr->width; - - if (method==FRAMEBUFFER) - pixelToVirtual = PIXEL_TO_VIRTUALPIXEL_FB(i,j); - else - pixelToVirtual = PIXEL_TO_VIRTUALPIXEL(i,j); - - if (a[i + offset]!=b[pixelToVirtual]) - { - a[i + offset]=b[pixelToVirtual]; - if (i>max_x) - max_x=i; - if (imax_y) - max_y=j; - if (jwidth*vncscr->height*scrinfo.bits_per_pixel/CHAR_BIT); - } - else if (rotation==90) - { - for (j = 0; j < vncscr->width; j++) - { - for (i = 0; i < vncscr->height; i++) - - { - offset = i * vncscr->width; - - if (method==FRAMEBUFFER) - pixelToVirtual = PIXEL_TO_VIRTUALPIXEL_FB(i,j); - else - pixelToVirtual = PIXEL_TO_VIRTUALPIXEL(i,j); - - if (a[(vncscr->width - 1 - j + offset)] != b[pixelToVirtual]) - { - a[(vncscr->width - 1 - j + offset)] = b[pixelToVirtual]; - - if (i>max_y) - max_y=i; - if (iwidth-j; - - if (h < min_x) - min_x=vncscr->width-j; - if (h > max_x) - max_x=vncscr->width-j; - - idle=0; - } - } - } - } - else if (rotation==180) - { - for (j = 0; j < vncscr->height; j++) - { - for (i = 0; i < vncscr->width; i++) - { - offset = (vncscr->height - 1 - j) * vncscr->width; - - if (method==FRAMEBUFFER) - pixelToVirtual = PIXEL_TO_VIRTUALPIXEL_FB(i,j); - else - pixelToVirtual = PIXEL_TO_VIRTUALPIXEL(i,j); - - if (a[((vncscr->width - 1 - i) + offset )]!=b[pixelToVirtual]) - { - a[((vncscr->width - 1 - i) + offset )]=b[pixelToVirtual]; - - - if (i>max_x) - max_x=i; - if (iheight-j; - - if (h < min_y) - min_y=vncscr->height-j; - if (h > max_y) - max_y=vncscr->height-j; - - idle=0; - } - } - } - } - else if (rotation==270) - { - for (j = 0; j < vncscr->width; j++) - { - for (i = 0; i < vncscr->height; i++) - { - offset = (vncscr->height - 1 - i) * vncscr->width; - - if (method==FRAMEBUFFER) - pixelToVirtual = PIXEL_TO_VIRTUALPIXEL_FB(i,j); - else - pixelToVirtual = PIXEL_TO_VIRTUALPIXEL(i,j); - - if(a[j + offset] != b[pixelToVirtual]) - { - a[j + offset] = b[pixelToVirtual]; - - if (i>max_y) - max_y=i; - if (i max_x) - max_x=j; - - idle=0; - } - } - } -} - - - if (!idle) - { - memcpy(vncbuf,a,displayInfo.width*displayInfo.height*displayInfo.bpp/CHAR_BIT); - - min_x--; - min_x--; - max_x++; - max_y++; - -// L("Changed x(%d-%d) y(%d-%d)\n",min_x,max_x,min_y,max_y); - - rfbMarkRectAsModified(vncscr, min_x, min_y, max_x, max_y); - } - -} - - -