diff options
author | Henrik Rydberg <rydberg@euromail.se> | 2010-12-30 17:58:01 +0100 |
---|---|---|
committer | Henrik Rydberg <rydberg@euromail.se> | 2010-12-30 17:58:01 +0100 |
commit | f0aba58c91933a4702a7cc74f7daf4192868f570 (patch) | |
tree | 648c41fe09adb72344769dd6242638cbad835482 |
Initial load of utouch-frame
Compiles and runs on mtdev. ABI proof.
Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
-rw-r--r-- | .gitignore | 81 | ||||
-rw-r--r-- | COPYING | 672 | ||||
-rw-r--r-- | INSTALL | 25 | ||||
-rw-r--r-- | Makefile.am | 14 | ||||
-rw-r--r-- | README | 7 | ||||
-rwxr-xr-x | autogen.sh | 11 | ||||
-rw-r--r-- | configure.ac | 33 | ||||
-rw-r--r-- | docs/event-semantics.txt | 31 | ||||
-rw-r--r-- | include/utouch/frame-mtdev.h | 39 | ||||
-rw-r--r-- | include/utouch/frame.h | 250 | ||||
-rw-r--r-- | src/Makefile.am | 21 | ||||
-rw-r--r-- | src/frame-impl.h | 18 | ||||
-rw-r--r-- | src/frame-mtdev.c | 189 | ||||
-rw-r--r-- | src/frame.c | 303 | ||||
-rw-r--r-- | test/Makefile.am | 0 | ||||
-rw-r--r-- | tools/Makefile.am | 7 | ||||
-rw-r--r-- | tools/utouch-frame-test-mtdev.c | 202 | ||||
-rw-r--r-- | utouch-frame.pc.in | 9 |
18 files changed, 1912 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..cf601fa --- /dev/null +++ b/.gitignore @@ -0,0 +1,81 @@ +# +# X.Org module default exclusion patterns +# The next section if for module specific patterns +# +# Do not edit the following section +# GNU Build System (Autotools) +aclocal.m4 +autom4te.cache/ +autoscan.log +ChangeLog +compile +config.guess +config.h +config.h.in +config.log +config-ml.in +config.py +config.status +config.status.lineno +config.sub +configure +configure.scan +depcomp +.deps/ +install-sh +.libs/ +libtool +libtool.m4 +ltmain.sh +lt~obsolete.m4 +ltoptions.m4 +ltsugar.m4 +ltversion.m4 +Makefile +Makefile.in +mdate-sh +missing +mkinstalldirs +*.pc +py-compile +stamp-h? +symlink-tree +texinfo.tex +ylwrap + +# Do not edit the following section +# Edit Compile Debug Document Distribute +*~ +*.[0-9] +*.[0-9]x +*.bak +*.bin +core +*.dll +*.exe +*-ISO*.bdf +*-JIS*.bdf +*-KOI8*.bdf +*.kld +*.ko +*.ko.cmd +*.lai +*.l[oa] +*.[oa] +*.obj +*.patch +*.so +*.pcf.gz +*.pdb +*.tar.bz2 +*.tar.gz +# +# Add & Override patterns for mtdev +# +# Edit the following section as needed +# For example, !report.pc overrides *.pc. See 'man gitignore' +# +.bzrignore +.bzr +patches +tools/utouch-frame-test-mtdev @@ -0,0 +1,672 @@ +utouch-frame - Touch Frame Library (GPLv3 license) + + Copyright (C) 2010 Canonical Ltd. + Copyright (C) 2010 Henrik Rydberg <rydberg@bitmath.org> + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + <program> Copyright (C) <year> <name of author> + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +<http://www.gnu.org/licenses/>. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +<http://www.gnu.org/philosophy/why-not-lgpl.html>. @@ -0,0 +1,25 @@ +utouch-frame - Touch Frame Library + +To build, you need to have the autoconf, libtool, libutouch-evemu-dev +and mtdev-dev packages installed. Then, do + + ./autogen.sh + ./configure + make + +To test the touch properties of an MT device at /dev/input/eventX, do + + sudo ./test/utouch-frame-test /dev/input/eventX + +You should be able to see touch events in the terminal. After five +seconds of inactivity, the program exits. + +To install utouch-frame, do + + sudo make install + +By default, utouch-frame installs to /usr/local. To change, use the --prefix +configure option. + +Enjoy, +Henrik diff --git a/Makefile.am b/Makefile.am new file mode 100644 index 0000000..6a94173 --- /dev/null +++ b/Makefile.am @@ -0,0 +1,14 @@ +SUBDIRS = src tools test + +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = utouch-frame.pc + +INCLUDES = $(top_srcdir)/include/ + +.PHONY: ChangeLog INSTALL +INSTALL: + $(INSTALL_CMD) +ChangeLog: + bzr log > ChangeLog + +dist-hook: ChangeLog INSTALL @@ -0,0 +1,7 @@ +utouch-frame - Touch Frame Library + +This tree handles the buildup and synchronization of a set of +simultaneous touches. The library is input agnostic. + +Enjoy, +Henrik diff --git a/autogen.sh b/autogen.sh new file mode 100755 index 0000000..a08311b --- /dev/null +++ b/autogen.sh @@ -0,0 +1,11 @@ +#! /bin/sh + +srcdir=`dirname $0` +test -z "$srcdir" && srcdir=. + +ORIGDIR=`pwd` +cd $srcdir + +autoreconf -v --install || exit 1 +cd $ORIGDIR || exit $? + diff --git a/configure.ac b/configure.ac new file mode 100644 index 0000000..0ff758f --- /dev/null +++ b/configure.ac @@ -0,0 +1,33 @@ +# Initialize Autoconf +AC_PREREQ([2.60]) +AC_INIT([Touch Frame Library], + [1.0.0], + [], + [utouch-frame]) +AC_CONFIG_SRCDIR([Makefile.am]) +AC_CONFIG_HEADERS([config.h]) +AC_CONFIG_AUX_DIR([config-aux]) + +# Initialize Automake +AM_INIT_AUTOMAKE([foreign dist-bzip2]) +AM_MAINTAINER_MODE + +LIB_VERSION=1:0:0 +AC_SUBST([LIB_VERSION]) + +# Initialize libtool +AC_PROG_LIBTOOL + +# Checks for programs. +AC_PROG_CC +AC_PROG_INSTALL + +PKG_CHECK_MODULES([MTDEV], [mtdev >= 1.1]) +PKG_CHECK_MODULES([EVEMU], [utouch-evemu >= 1.0]) + +AC_CONFIG_FILES([Makefile + src/Makefile + test/Makefile + tools/Makefile + utouch-frame.pc]) +AC_OUTPUT diff --git a/docs/event-semantics.txt b/docs/event-semantics.txt new file mode 100644 index 0000000..87afe4e --- /dev/null +++ b/docs/event-semantics.txt @@ -0,0 +1,31 @@ +FRAME + +The touch frame, consisting of a set of simultaneous contacts. + +CONTACT + +The current MT contact configuration. Changes whenever an id changes. + +TOUCH + +The current touch configuration. Changes whenever the number of contacts +changes. A touch frame is well-defined a time T after the last +configuration change. This allows for simultaneous touches being +handled. It also allows for a very quick change of one finger to +another. Such an action changes the CONTACT state, but it does not change +the TOUCH state. + +DRAG/PINCH/ROTATE + +A transformation based on the touch frame. + +GESTURES + +Two creation points may be grouped if they are close in space-time, and +they are always close within the same controlling entity. There can be only +one controlling entity per point, and that decision is made upon +creation. The window manager is a controlling entity. Ambiguities can occur +between close points, and are resolved either by state rule or by +priority. Relaxing the time closeness criteria has no effect within a +controlling entity, but creates a larger set of ambiguous and undesired +groupings, which is considered inferior. diff --git a/include/utouch/frame-mtdev.h b/include/utouch/frame-mtdev.h new file mode 100644 index 0000000..f3957b9 --- /dev/null +++ b/include/utouch/frame-mtdev.h @@ -0,0 +1,39 @@ +/***************************************************************************** + * + * utouch-frame - Touch Frame Library + * + * Copyright (C) 2010-2011 Canonical Ltd. + * + * 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 <http://www.gnu.org/licenses/>. + * + ****************************************************************************/ + +#ifndef _UTOUCH_FRAME_MTDEV_H +#define _UTOUCH_FRAME_MTDEV_H + +#define MTDEV_NO_LEGACY_API + +#include <utouch/frame.h> +#include <evemu.h> +#include <mtdev.h> + +int utouch_frame_is_supported_mtdev(const struct evemu_device *dev); + +int utouch_frame_init_mtdev(utouch_frame_handle fh, + const struct evemu_device *dev); + +const struct utouch_frame * +utouch_frame_pump_mtdev(utouch_frame_handle fh, const struct input_event *ev); + +#endif diff --git a/include/utouch/frame.h b/include/utouch/frame.h new file mode 100644 index 0000000..08e4e26 --- /dev/null +++ b/include/utouch/frame.h @@ -0,0 +1,250 @@ +/***************************************************************************** + * + * utouch-frame - Touch Frame Library + * + * Copyright (C) 2010-2011 Canonical Ltd. + * + * 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 <http://www.gnu.org/licenses/>. + * + ****************************************************************************/ + +#ifndef _UTOUCH_FRAME_H +#define _UTOUCH_FRAME_H + +#include <stdint.h> + +#define UTOUCH_FRAME_VERSION 0x00001000 + +/** + * struct utouch_surface - device surface details + * @needs_pointer: device needs a screen pointer to function + * @is_direct: surface is a direct device (e.g. touchscreen) + * @is_buttonpad: surface has button(s) under it + * @is_semi_mt: surface detects bounding rectangle only + * @use_touch_major: device uses major axis for contact modulation + * @use_touch_minor: device uses minor axis for contact modulation + * @use_width_major: device uses approaching major axis for contact modulation + * @use_width_minor: device uses approaching minor axis for contact modulation + * @use_orientation: device uses ellipse orientation for contact modulation + * @use_pressure: device uses pressure for contact modulation + * @use_distance: device uses hover distance + * @phys_width: physical width in millimeters (mm) + * @phys_height: physical height in millimeters (mm) + * @phys_pressure: maximal physical pressure (N/cm^2) + * @min_x: minimum horizontal coordinate value + * @min_y: minimum vertical coordinate value + * @max_x: maximum horizontal coordinate value + * @max_y: maximum vertical coordinate value + * @max_pressure: maximum pressure coordinate value + * + * Device properties and touch surface details. Later versions of this + * struct may grow in size, but will remain binary compatible with + * older versions. + */ +struct utouch_surface { + int needs_pointer; + int is_direct; + int is_buttonpad; + int is_semi_mt; + int use_touch_major; + int use_touch_minor; + int use_width_major; + int use_width_minor; + int use_orientation; + int use_pressure; + int use_distance; + float phys_width; + float phys_height; + float phys_pressure; + float min_x; + float min_y; + float max_x; + float max_y; + float max_pressure; +}; + +#define UTOUCH_TOOL_FINGER 0 +#define UTOUCH_TOOL_PEN 1 + +/** + * struct utouch_contact - surface contact details + * @prev: pointer to same slot of previous frame + * @active: currently in use + * @slot: slot occupied by this contact + * @id: unique id of this contact + * @tool_type: the tool type of this contact + * @x: horizontal center position coordinate (surface units) + * @y: vertical center position coordinate (surface units) + * @touch_major: major axis of contact (surface units) + * @touch_minor: minor axis of contact (surface units) + * @width_major: major axis of approaching contact (surface units) + * @width_minor: minor axis of approaching contact (surface units) + * @orientation: direction of ellipse (left: -Pi/2, up: 0, right: Pi/2) + * @pressure: pressure of contact (pressure units) + * @distance: distance of contact (surface units) + * + * Surface contact details. Later versions of this struct may grow in + * size, but will remain binary compatible with older versions. + * + * Contact structures are connected into one ring per slot. The + * previous contact pointers are ABI agnostic, owned by the engine, + * and have engine scope. + */ +struct utouch_contact { + const struct utouch_contact *prev; + int active; + int slot; + int id; + int tool_type; + float x; + float y; + float touch_major; + float touch_minor; + float width_major; + float width_minor; + float orientation; + float pressure; + float distance; +}; + +/* time in milliseconds */ +typedef uint64_t utouch_frame_time_t; + +/* the frame engine handle */ +typedef struct utouch_frame_engine *utouch_frame_handle; + +/** + * struct utouch_frame - emitted frame details + * @prev: pointer to previous frame + * @sequence_id: frame sequence number + * @revision: changes whenever the contact count changes + * @slot_revision: changes whenever the slot id array change + * @num_active: the number of contacts in the active array + * @time: time of frame completion (ms) + * @mod_time: time of last contact count change (ms) + * @slot_mod_time: time of last slot id array change (ms) + * @active: the array of active contacts + * + * Contact frame details. Later versions of this struct may grow in + * size, but will remain binary compatible with older versions. + * + * Frames are connected into a ring. The previous frame pointer is ABI + * agnostic, owned by the engine, and has engine scope. + */ +struct utouch_frame { + const struct utouch_frame *prev; + unsigned int sequence_id; + unsigned int revision; + unsigned int slot_revision; + unsigned int num_active; + utouch_frame_time_t time; + utouch_frame_time_t mod_time; + utouch_frame_time_t slot_mod_time; + struct utouch_contact **active; + struct utouch_contact **slots; +}; + +/** + * utouch_frame_get_version - get library abi version + * + * Returns the version of the library, which may be different + * from the api version of the compiled user program. + */ +unsigned int utouch_frame_get_version(void); + +utouch_frame_handle utouch_frame_new_engine_raw(unsigned int num_frames, + unsigned int num_slots, + unsigned int frame_rate, + unsigned int version, + unsigned int surface_size, + unsigned int frame_size, + unsigned int slot_size); + +/** + * utouch_frame_new_engine - allocate a new frame engine + * @num_frames: number of frames in cyclic buffer + * @num_slots: maximum number of slots per frame + * @frame_rate: maximum frame rate (frames/s) + * + * Allocates memory, initializes the internal engine and returns a + * handle to it. A rate of 100 frames per second is normal. + */ +#define utouch_frame_new_engine(num_frames, num_slots, frame_rate) \ + utouch_frame_new_engine_raw(num_frames, \ + num_slots, \ + frame_rate, \ + UTOUCH_FRAME_VERSION, \ + sizeof(struct utouch_surface), \ + sizeof(struct utouch_frame), \ + sizeof(struct utouch_contact)) + +/** + * utouch_frame_delete_engine - deallocate a frame engine + * @fh: frame engine in use + * + * Deallocates all memory associated with the engine. + */ +void utouch_frame_delete_engine(utouch_frame_handle fh); + +/** + * utouch_frame_get_surface - get the mutable device surface information + * @fh: the frame engine in use + * + * Returns a pointer to the mutable device surface information. It is + * preferrably set up by one of the input handlers. The pointer is ABI + * agnostic, has frame engine scope, and is owned by the engine. + */ +struct utouch_surface *utouch_frame_get_surface(utouch_frame_handle fh); + +/** + * utouch_frame_get_current_slot - get the current mutable slot contact + * @fh: the frame engine in use + * + * Returns a pointer to the contact current being modified. The + * pointer is ABI agnostic, has frame engine scope, and is owned by + * the engine. + */ +struct utouch_contact *utouch_frame_get_current_slot(utouch_frame_handle fh); + +/** + * utouch_frame_set_current_slot - set the current slot number + * @fh: the frame engine in use + * @slot: the slot number + * + * Sets the slot currently being modified. Returns zero if successful, + * negative error otherwise. + */ +int utouch_frame_set_current_slot(utouch_frame_handle fh, int slot); + +/** + * utouch_frame_sync - synchronize and return new frame + * @fh: the frame engine in use + * @time: the frame synchronization time (ms) + * + * Scans through the updates, and in case the changes make up a new + * frame, returns the updated frame. + * + * If time is zero, a time-of-receipt will be used instead. + * + * The frame returned is always the next in the cyclic list, and + * always points back at the previous frame returned by this function. + * + * The returned pointer is ABI agnostic and owned by the frame + * engine. It may very well be zero if there is nothing to report or + * if the frame rate is limited. + */ +const struct utouch_frame *utouch_frame_sync(utouch_frame_handle fh, + utouch_frame_time_t time); + +#endif diff --git a/src/Makefile.am b/src/Makefile.am new file mode 100644 index 0000000..aa11733 --- /dev/null +++ b/src/Makefile.am @@ -0,0 +1,21 @@ +lib_LTLIBRARIES = libutouch-frame.la + +libutouch_frame_la_LDFLAGS = \ + -version-info @LIB_VERSION@ \ + -lm \ + $(EVEMU_LIBS) + $(MTDEV_LIBS) + +libutouch_frame_la_SOURCES = \ + frame-impl.h \ + frame.c \ + frame-mtdev.c + +AM_CFLAGS = $(CWARNFLAGS) + +INCLUDES = -I$(top_srcdir)/include/ + +libutouch_frameincludedir = $(includedir)/utouch +libutouch_frameinclude_HEADERS = \ + $(top_srcdir)/include/utouch/frame.h \ + $(top_srcdir)/include/utouch/frame-mtdev.h diff --git a/src/frame-impl.h b/src/frame-impl.h new file mode 100644 index 0000000..c31f7da --- /dev/null +++ b/src/frame-impl.h @@ -0,0 +1,18 @@ +#ifndef _FRAME_IMPL_H +#define _FRAME_IMPL_H + +#include <utouch/frame.h> + +struct utouch_frame_engine { + int num_frames; + int num_slots; + int hold_ms; + int frame; + int slot; + float max_orient; + struct utouch_surface *surface; + struct utouch_frame **frames; + struct utouch_frame *next; +}; + +#endif diff --git a/src/frame-mtdev.c b/src/frame-mtdev.c new file mode 100644 index 0000000..ed5dc9e --- /dev/null +++ b/src/frame-mtdev.c @@ -0,0 +1,189 @@ +/***************************************************************************** + * + * utouch-frame - Touch Frame Library + * + * Copyright (C) 2010 Canonical Ltd. + * + * 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 <http://www.gnu.org/licenses/>. + * + ****************************************************************************/ + +#include <utouch/frame-mtdev.h> +#include "frame-impl.h" +#include <linux/input.h> +#include <errno.h> +#include <math.h> + +int utouch_frame_is_supported_mtdev(const struct evemu_device *dev) +{ + + /* only support pure absolute devices at this time */ + if (evemu_has_event(dev, EV_REL, REL_X) || + evemu_has_event(dev, EV_REL, REL_Y)) + return 0; + + if (evemu_has_event(dev, EV_ABS, ABS_MT_POSITION_X) && + evemu_has_event(dev, EV_ABS, ABS_MT_POSITION_Y)) + return 1; + + return evemu_has_event(dev, EV_ABS, ABS_X) && + evemu_has_event(dev, EV_ABS, ABS_Y) && + evemu_has_event(dev, EV_KEY, BTN_TOUCH) && + evemu_has_event(dev, EV_KEY, BTN_TOOL_DOUBLETAP); +} + +int utouch_frame_init_mtdev(utouch_frame_handle fh, + const struct evemu_device *dev) +{ + struct utouch_surface *s = fh->surface; + float tmp; + + if (!utouch_frame_is_supported_mtdev(dev)) + return -ENODEV; + +#ifdef INPUT_PROP_POINTER + s->needs_pointer = evemu_has_prop(dev, INPUT_PROP_POINTER); + s->is_direct = evemu_has_prop(dev, INPUT_PROP_DIRECT); + s->is_buttonpad = evemu_has_prop(dev, INPUT_PROP_BUTTONPAD); + s->is_semi_mt = evemu_has_prop(dev, INPUT_PROP_SEMI_MT); +#endif + s->use_touch_major = evemu_has_event(dev, EV_ABS, ABS_MT_TOUCH_MAJOR); + s->use_touch_minor = evemu_has_event(dev, EV_ABS, ABS_MT_TOUCH_MINOR); + s->use_width_major = evemu_has_event(dev, EV_ABS, ABS_MT_WIDTH_MAJOR); + s->use_width_minor = evemu_has_event(dev, EV_ABS, ABS_MT_WIDTH_MINOR); + s->use_orientation = evemu_has_event(dev, EV_ABS, ABS_MT_ORIENTATION); + s->use_pressure = evemu_has_event(dev, EV_ABS, ABS_MT_PRESSURE); +#ifdef ABS_MT_DISTANCE + s->use_distance = evemu_has_event(dev, EV_ABS, ABS_MT_DISTANCE); +#endif + + + s->min_x = evemu_get_abs_minimum(dev, ABS_MT_POSITION_X); + s->min_y = evemu_get_abs_minimum(dev, ABS_MT_POSITION_Y); + s->max_x = evemu_get_abs_maximum(dev, ABS_MT_POSITION_X); + s->max_y = evemu_get_abs_maximum(dev, ABS_MT_POSITION_Y); + if (s->min_x == s->max_x) { + s->min_x = 0; + s->max_x = 1024; + } + if (s->min_y == s->max_y) { + s->min_y = 0; + s->max_y = 768; + } + + s->max_pressure = evemu_get_abs_maximum(dev, ABS_MT_PRESSURE); + if (s->use_pressure && s->max_pressure == 0) + s->max_pressure = 256; + + fh->max_orient = evemu_get_abs_maximum(dev, ABS_MT_ORIENTATION); + if (s->use_orientation && fh->max_orient == 0) + fh->max_orient = 1; + + tmp = evemu_get_abs_resolution(dev, ABS_MT_POSITION_X); + if (tmp > 0) + s->phys_width = (s->max_x - s->min_x) / tmp; + else if (s->needs_pointer) + s->phys_width = 100; + else + s->phys_width = 250; + + tmp = evemu_get_abs_resolution(dev, ABS_MT_POSITION_Y); + if (tmp > 0) + s->phys_height = (s->max_y - s->min_y) / tmp; + else if (s->needs_pointer) + s->phys_height = 65; + else + s->phys_height = 160; + + tmp = evemu_get_abs_resolution(dev, ABS_MT_PRESSURE); + if (tmp > 0) + s->phys_pressure = s->max_pressure / tmp; + else + s->phys_pressure = 10; + + return 0; +} + +static float touch_angle(utouch_frame_handle fh, int orient) +{ + return orient / fh->max_orient * M_PI_2; +} + +static int handle_abs_event(utouch_frame_handle fh, + const struct input_event *ev) +{ + struct utouch_contact *t = utouch_frame_get_current_slot(fh); + + switch (ev->code) { + case ABS_MT_SLOT: + utouch_frame_set_current_slot(fh, ev->value); + return 1; + case ABS_MT_POSITION_X: + t->x = ev->value; + return 1; + case ABS_MT_POSITION_Y: + t->y = ev->value; + return 1; + case ABS_MT_TOUCH_MAJOR: + t->touch_major = ev->value; + return 1; + case ABS_MT_TOUCH_MINOR: + t->touch_minor = ev->value; + return 1; + case ABS_MT_WIDTH_MAJOR: + t->width_major = ev->value; + return 1; + case ABS_MT_WIDTH_MINOR: + t->width_minor = ev->value; + return 1; + case ABS_MT_ORIENTATION: + t->orientation = touch_angle(fh, ev->value); + return 1; + case ABS_MT_PRESSURE: + t->pressure = ev->value; + return 1; +#ifdef ABS_MT_DISTANCE + case ABS_MT_DISTANCE: + t->distance = ev->value; + return 1; +#endif + case ABS_MT_TOOL_TYPE: + t->tool_type = ev->value; + return 1; + case ABS_MT_TRACKING_ID: + t->id = ev->value; + return 1; + default: + return 0; + } +} + +static utouch_frame_time_t get_evtime_ms(const struct input_event *syn) +{ + static const utouch_frame_time_t ms = 1000; + return syn->time.tv_usec / ms + syn->time.tv_sec * ms; +} + +const struct utouch_frame * +utouch_frame_pump_mtdev(utouch_frame_handle fh, const struct input_event *ev) +{ + const struct utouch_frame *f = 0; + + if (ev->type == EV_SYN && ev->code == SYN_REPORT) + f = utouch_frame_sync(fh, get_evtime_ms(ev)); + else if (ev->type == EV_ABS) + handle_abs_event(fh, ev); + + return f; +} diff --git a/src/frame.c b/src/frame.c new file mode 100644 index 0000000..9c4be97 --- /dev/null +++ b/src/frame.c @@ -0,0 +1,303 @@ +/***************************************************************************** + * + * utouch-frame - Touch Frame Library + * + * Copyright (C) 2010 Canonical Ltd. + * + * 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 <http://www.gnu.org/licenses/>. + * + ****************************************************************************/ + +#include "frame-impl.h" +#include <errno.h> +#include <math.h> +#include <memory.h> +#include <stdlib.h> +#include <sys/time.h> + +#define MAX(a, b) ((a) > (b) ? (a) : (b)) + +unsigned int utouch_frame_get_version(void) +{ + return UTOUCH_FRAME_VERSION; +} + +static void destroy_slots(struct utouch_contact **slots, int nslot) +{ + int i; + + if (slots) { + for (i = nslot - 1; i >= 0; i--) + free(slots[i]); + free(slots); + } +} + +static void destroy_frame(struct utouch_frame *frame, int nslot) +{ + if (frame) { + destroy_slots(frame->slots, nslot); + free(frame->active); + free(frame); + } +} + +static void destroy_frames(struct utouch_frame **frames, int nframe, int nslot) +{ + int i; + + if (frames) { + for (i = nframe - 1; i >= 0; i--) + destroy_frame(frames[i], nslot); + free(frames); + } +} + +static struct utouch_contact **create_slots(int nslot, int size) +{ + struct utouch_contact **slots; + struct utouch_contact *s; + int i; + + slots = calloc(nslot, sizeof(slots[0])); + if (!slots) + return 0; + + for (i = 0; i < nslot; i++) { + s = calloc(1, size); + if (!s) + goto out; + slots[i] = s; + s->slot = i; + s->id = -1; + } + + return slots; +out: + destroy_slots(slots, nslot); + return 0; +} + +static struct utouch_frame *create_frame(int nslot, + int frame_size, int slot_size) +{ + struct utouch_frame *frame; + int i; + + frame = calloc(1, frame_size); + if (!frame) + return 0; + + frame->active = calloc(nslot, sizeof(frame->active[0])); + frame->slots = create_slots(nslot, slot_size); + if (!frame->active || !frame->slots) + goto out; + + return frame; +out: + destroy_frame(frame, nslot); + return 0; +} + +static struct utouch_frame **create_frames(int nframe, int nslot, + int frame_size, int slot_size) +{ + struct utouch_frame **frames; + struct utouch_frame *f; + int i; + + frames = calloc(nframe, sizeof(frames[0])); + if (!frames) + return 0; + + for (i = 0; i < nframe; i++) { + f = create_frame(nslot, frame_size, slot_size); + if (!f) + goto out; + frames[i] = f; + } + + return frames; +out: + destroy_frames(frames, nframe, nslot); + return 0; +} + +utouch_frame_handle utouch_frame_new_engine_raw(unsigned int nframe, + unsigned int nslot, + unsigned int rate, + unsigned int version, + unsigned int surface_size, + unsigned int frame_size, + unsigned int slot_size) +{ + struct utouch_frame *f, *pf; + utouch_frame_handle fh; + int i, j; + + fh = calloc(1, sizeof(struct utouch_frame_engine)); + if (!fh) + return 0; + + fh->num_frames = nframe; + fh->num_slots = nslot; + fh->hold_ms = 1000 / rate; + + surface_size = MAX(surface_size, sizeof(struct utouch_surface)); + frame_size = MAX(frame_size, sizeof(struct utouch_frame)); + slot_size = MAX(slot_size, sizeof(struct utouch_contact)); + + fh->surface = calloc(1, surface_size); + fh->frames = create_frames(nframe, nslot, frame_size, slot_size); + fh->next = create_frame(nslot, frame_size, slot_size); + if (!fh->surface || !fh->frames || !fh->next) + goto out; + + pf = fh->frames[nframe - 1]; + for (i = 0; i < nframe; i++) { + f = fh->frames[i]; + for (j = 0; j < nslot; j++) + f->slots[j]->prev = pf->slots[j]; + f->prev = pf; + pf = f; + } + + return fh; +out: + utouch_frame_delete_engine(fh); + return 0; +} + +void utouch_frame_delete_engine(utouch_frame_handle fh) +{ + destroy_frame(fh->next, fh->num_slots); + destroy_frames(fh->frames, fh->num_frames, fh->num_slots); + free(fh->surface); + free(fh); +} + +struct utouch_surface *utouch_frame_get_surface(utouch_frame_handle fh) +{ + return fh->surface; +} + +struct utouch_contact *utouch_frame_get_current_slot(utouch_frame_handle fh) +{ + return fh->next->slots[fh->slot]; +} + +int utouch_frame_set_current_slot(utouch_frame_handle fh, int slot) +{ + if (slot < 0 || slot >= fh->num_slots) + return -EINVAL; + fh->slot = slot; + return 0; +} + +static void copy_contact(utouch_frame_handle fh, + struct utouch_contact *a, + const struct utouch_contact *b) +{ + struct utouch_surface *s = fh->surface; + + a->active = b->id != -1; + a->id = b->id; + a->tool_type = b->tool_type; + a->x = b->x; + a->y = b->y; + a->touch_major = b->touch_major; + a->touch_minor = s->use_touch_minor && b->touch_minor > 0 ? + b->touch_minor : b->touch_major; + a->width_major = b->width_major; + a->width_minor = s->use_width_minor && b->width_minor > 0 ? + b->width_minor : b->width_major; + a->orientation = b->orientation; + a->pressure = b->pressure; + a->distance = b->distance; +} + +static int detect_addrem(const struct utouch_contact *a, + const struct utouch_contact *b) +{ + return a->id != b->id || a->tool_type != b->tool_type; +} + +static int detect_mod(const struct utouch_contact *a, + const struct utouch_contact *b) +{ + return a->x != b->x || a->y != b->y || + a->touch_major != b->touch_major || + a->touch_minor != b->touch_minor || + a->width_major != b->width_major || + a->width_minor != b->width_minor || + a->orientation != b->orientation || + a->pressure != b->pressure || + a->distance != b->distance; +} + +static utouch_frame_time_t get_time_ms() +{ + static const utouch_frame_time_t ms = 1000; + struct timeval tv; + gettimeofday(&tv, 0); + return tv.tv_usec / ms + tv.tv_sec * ms; +} + +const struct utouch_frame *utouch_frame_sync(utouch_frame_handle fh, + utouch_frame_time_t time) +{ + struct utouch_frame *frame = fh->frames[fh->frame]; + const struct utouch_frame *prev = frame->prev; + struct utouch_frame *next = fh->next; + int naddrem = 0, nmod = 0; + int i; + + frame->num_active = 0; + for (i = 0; i < fh->num_slots; i++) { + struct utouch_contact *p = frame->slots[i]; + const struct utouch_contact *q = next->slots[i]; + + copy_contact(fh, p, q); + if (p->active) + frame->active[frame->num_active++] = p; + + naddrem += detect_addrem(p->prev, p); + nmod += detect_mod(p->prev, p); + } + if (naddrem + nmod == 0) + return 0; + + frame->time = time ? time : get_time_ms(); + if (naddrem == 0 && frame->time < prev->time + fh->hold_ms) + return 0; + + if (frame->num_active != prev->num_active) { + next->mod_time = frame->time; + next->revision++; + } + if (naddrem) { + next->slot_mod_time = frame->time; + next->slot_revision++; + } + + frame->revision = next->revision; + frame->slot_revision = next->slot_revision; + frame->mod_time = next->mod_time; + frame->slot_mod_time = next->slot_mod_time; + frame->sequence_id = next->sequence_id++; + + fh->frame = (fh->frame + 1) % fh->num_frames; + + return frame; +} diff --git a/test/Makefile.am b/test/Makefile.am new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/test/Makefile.am diff --git a/tools/Makefile.am b/tools/Makefile.am new file mode 100644 index 0000000..6b50897 --- /dev/null +++ b/tools/Makefile.am @@ -0,0 +1,7 @@ +bin_PROGRAMS = utouch-frame-test-mtdev + +INCLUDES=-I$(top_srcdir)/include/ + +utouch_frame_test_mtdev_SOURCES = utouch-frame-test-mtdev.c +utouch_frame_test_mtdev_LDFLAGS = -L$(top_builddir)/src/.libs/ \ + -lutouch-frame -lutouch-evemu -lmtdev -lm diff --git a/tools/utouch-frame-test-mtdev.c b/tools/utouch-frame-test-mtdev.c new file mode 100644 index 0000000..13f5a68 --- /dev/null +++ b/tools/utouch-frame-test-mtdev.c @@ -0,0 +1,202 @@ +/***************************************************************************** + * + * utouch-frame - Touch Frame Library + * + * Copyright (C) 2010-2011 Canonical Ltd. + * + * 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 <http://www.gnu.org/licenses/>. + * + * Authors: + * Henrik Rydberg <rydberg@bitmath.org> + * + ****************************************************************************/ + +#define MTDEV_NO_LEGACY_API + +#include <utouch/frame-mtdev.h> +#include <mtdev.h> +#include <string.h> +#include <stdio.h> +#include <unistd.h> +#include <fcntl.h> + +struct frame_test { + struct evemu_device *evemu; + struct mtdev *mtdev; + utouch_frame_handle fh; +}; + +static int init_evemu(struct frame_test *test, int fd) +{ + test->evemu = evemu_new(NULL); + if (!test->evemu) + return -1; + return evemu_extract(test->evemu, fd); +} + +static int init_mtdev(struct frame_test *test, int fd) +{ + test->mtdev = mtdev_new_open(fd); + if (!test->mtdev) + return -1; + return 0; +} + +static int init_frame(struct frame_test *test, int fd) +{ + test->fh = utouch_frame_new_engine(100, 32, 100); + if (!test->fh) + return -1; + return utouch_frame_init_mtdev(test->fh, test->evemu); +} + +static void destroy_all(struct frame_test *test) +{ + utouch_frame_delete_engine(test->fh); + mtdev_close_delete(test->mtdev); + evemu_delete(test->evemu); + memset(test, 0, sizeof(*test)); +} + +static void report_frame(const struct utouch_frame *frame) +{ + int i; + + for (i = 0; i < frame->num_active; i++) { + const struct utouch_contact *t = frame->active[i]; + + fprintf(stderr, "touch %d\n", i); + fprintf(stderr, " slot: %d\n", t->slot); + fprintf(stderr, " id: %d\n", t->id); + fprintf(stderr, " tool_type: %d\n", t->tool_type); + fprintf(stderr, " x: %f\n", t->x); + fprintf(stderr, " y: %f\n", t->y); + fprintf(stderr, " touch_major: %f\n", t->touch_major); + fprintf(stderr, " touch_minor: %f\n", t->touch_minor); + fprintf(stderr, " width_major: %f\n", t->width_major); + fprintf(stderr, " width_minor: %f\n", t->width_minor); + fprintf(stderr, " angle: %f\n", t->orientation); + fprintf(stderr, " pressure: %f\n", t->pressure); + fprintf(stderr, " distance: %f\n", t->distance); + } + + fprintf(stderr, "sync %d %ld %d %d %d\n", + frame->num_active, + frame->time, + frame->sequence_id, + frame->revision, + frame->slot_revision); +} + +static void loop_device(struct frame_test *test, int fd) +{ + const struct utouch_frame *frame; + struct input_event ev; + + while (!mtdev_idle(test->mtdev, fd, 5000)) { + while (mtdev_get(test->mtdev, fd, &ev, 1) > 0) { + frame = utouch_frame_pump_mtdev(test->fh, &ev); + if (frame) + report_frame(frame); + } + } +} + +static void report_device_caps(struct frame_test *test) +{ +#ifdef INPUT_PROP_POINTER + fprintf(stderr, "device props:\n"); + if (evemu_has_prop(test->evemu, INPUT_PROP_POINTER)) + fprintf(stderr, "\tpointer\n"); + if (evemu_has_prop(test->evemu, INPUT_PROP_DIRECT)) + fprintf(stderr, "\tdirect\n"); + if (evemu_has_prop(test->evemu, INPUT_PROP_BUTTONPAD)) + fprintf(stderr, "\tbuttonpad\n"); + if (evemu_has_prop(test->evemu, INPUT_PROP_SEMI_MT)) + fprintf(stderr, "\tsemi_mt\n"); +#endif + fprintf(stderr, "device mt events:\n"); + if (evemu_has_event(test->evemu, EV_ABS, ABS_MT_SLOT)) + fprintf(stderr, "\tslot\n"); + if (evemu_has_event(test->evemu, EV_ABS, ABS_MT_TOUCH_MAJOR)) + fprintf(stderr, "\ttouch_major\n"); + if (evemu_has_event(test->evemu, EV_ABS, ABS_MT_TOUCH_MINOR)) + fprintf(stderr, "\ttouch_minor\n"); + if (evemu_has_event(test->evemu, EV_ABS, ABS_MT_WIDTH_MAJOR)) + fprintf(stderr, "\twidth_major\n"); + if (evemu_has_event(test->evemu, EV_ABS, ABS_MT_WIDTH_MINOR)) + fprintf(stderr, "\twidth_minor\n"); + if (evemu_has_event(test->evemu, EV_ABS, ABS_MT_ORIENTATION)) + fprintf(stderr, "\torientation\n"); + if (evemu_has_event(test->evemu, EV_ABS, ABS_MT_POSITION_X)) + fprintf(stderr, "\tposition_x\n"); + if (evemu_has_event(test->evemu, EV_ABS, ABS_MT_POSITION_Y)) + fprintf(stderr, "\tposition_y\n"); + if (evemu_has_event(test->evemu, EV_ABS, ABS_MT_TOOL_TYPE)) + fprintf(stderr, "\tposition_y\n"); + if (evemu_has_event(test->evemu, EV_ABS, ABS_MT_TRACKING_ID)) + fprintf(stderr, "\ttracking_id\n"); + if (evemu_has_event(test->evemu, EV_ABS, ABS_MT_PRESSURE)) + fprintf(stderr, "\tpressure\n"); + if (evemu_has_event(test->evemu, EV_ABS, ABS_MT_DISTANCE)) + fprintf(stderr, "\tdistance\n"); +} + +int main(int argc, char *argv[]) +{ + struct frame_test test; + int fd; + + if (argc < 2) { + fprintf(stderr, "Usage: %s <device>\n", argv[0]); + return -1; + } + + fd = open(argv[1], O_RDONLY | O_NONBLOCK); + if (fd < 0) { + fprintf(stderr, "error: could not open device\n"); + return -1; + } + if (ioctl(fd, EVIOCGRAB, 1)) { + fprintf(stderr, "error: could not grab the device\n"); + return -1; + } + + if (init_evemu(&test, fd)) { + fprintf(stderr, "error: could not describe device\n"); + return -1; + } + if (!utouch_frame_is_supported_mtdev(test.evemu)) { + fprintf(stderr, "error: unsupported device\n"); + return -1; + } + + fprintf(stderr, "device: %s\n", evemu_get_name(test.evemu)); + + if (init_mtdev(&test, fd)) { + fprintf(stderr, "error: could not init mtdev\n"); + return -1; + } + if (init_frame(&test, fd)) { + fprintf(stderr, "error: could not init frame\n"); + return -1; + } + + report_device_caps(&test); + + loop_device(&test, fd); + + destroy_all(&test); + return 0; +} diff --git a/utouch-frame.pc.in b/utouch-frame.pc.in new file mode 100644 index 0000000..cbb305a --- /dev/null +++ b/utouch-frame.pc.in @@ -0,0 +1,9 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: utouch-frame +Description: Touch Frame Library +Version: @PACKAGE_VERSION@ +Libs: -L${libdir} -lutouch-frame |