am 45e77f6a: am 2501ab62: merge intel x86 patches into gingerbread branch
* commit '45e77f6af962789b1ef630718a353d7a844c943c':
Fix used before initialized error
diff --git a/Android.mk b/Android.mk
index 0b9a9d6..8234410 100644
--- a/Android.mk
+++ b/Android.mk
@@ -105,27 +105,4 @@
include $(BUILD_SHARED_LIBRARY)
-#########################################################################
-# Build stand-alone quake executable on device
-#########################################################################
-
-ifneq ($(BUILD_TINY_ANDROID),true)
-ifeq ($(TARGET_ARCH),arm)
-
-LOCAL_PATH:= $(TOP_LOCAL_PATH)/standalone
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES:= main.cpp
-
-LOCAL_SHARED_LIBRARIES := libc libm libutils libui libquake libEGL libGLESv1_CM
-
-LOCAL_MODULE:= quake
-
-LOCAL_MODULE_TAGS := optional
-
-include $(BUILD_EXECUTABLE)
-
-endif
-endif
-
endif # TARGET_SIMULATOR
diff --git a/NOTICE b/NOTICE
new file mode 100644
index 0000000..8cef88f
--- /dev/null
+++ b/NOTICE
@@ -0,0 +1,696 @@
+/*
+Copyright (C) 1996-2000 Id Software Inc.
+
+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 2
+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, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+*/
+
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.) 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
+this service 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 make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. 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.
+
+ We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+ 1. You may copy and distribute 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 and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+ 2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) You must cause the modified files to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in
+ whole or in part contains or is derived from the Program or any
+ part thereof, to be licensed as a whole at no charge to all third
+ parties under the terms of this License.
+
+ c) If the modified program normally reads commands interactively
+ when run, you must cause it, when started running for such
+ interactive use in the most ordinary way, to print or display an
+ announcement including an appropriate copyright notice and a
+ notice that there is no warranty (or else, saying that you provide
+ a warranty) and that users may redistribute the program under
+ these conditions, and telling the user how to view a copy of this
+ License. (Exception: if the Program itself is interactive but
+ does not normally print such an announcement, your work based on
+ the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable
+ source code, which must be distributed under the terms of Sections
+ 1 and 2 above on a medium customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least three
+ years, to give any third party, for a charge no more than your
+ cost of physically performing source distribution, a complete
+ machine-readable copy of the corresponding source code, to be
+ distributed under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer
+ to distribute corresponding source code. (This alternative is
+ allowed only for noncommercial distribution and only if you
+ received the program in object code or executable form with such
+ an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable. However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+ 5. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+ 6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+ 7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+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
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all. For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+ 9. The Free Software Foundation may publish revised and/or new versions
+of the 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 a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation. If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+ 10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission. For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this. Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+ NO WARRANTY
+
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, 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.
+
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE 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.
+
+ 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
+convey 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 2 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, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) year name of author
+ Gnomovision 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, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+ <signature of Ty Coon>, 1 April 1989
+ Ty Coon, President of Vice
+
+This 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 Library General
+Public License instead of this License.
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.) 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
+this service 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 make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. 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.
+
+ We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+ 1. You may copy and distribute 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 and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+ 2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) You must cause the modified files to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in
+ whole or in part contains or is derived from the Program or any
+ part thereof, to be licensed as a whole at no charge to all third
+ parties under the terms of this License.
+
+ c) If the modified program normally reads commands interactively
+ when run, you must cause it, when started running for such
+ interactive use in the most ordinary way, to print or display an
+ announcement including an appropriate copyright notice and a
+ notice that there is no warranty (or else, saying that you provide
+ a warranty) and that users may redistribute the program under
+ these conditions, and telling the user how to view a copy of this
+ License. (Exception: if the Program itself is interactive but
+ does not normally print such an announcement, your work based on
+ the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable
+ source code, which must be distributed under the terms of Sections
+ 1 and 2 above on a medium customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least three
+ years, to give any third party, for a charge no more than your
+ cost of physically performing source distribution, a complete
+ machine-readable copy of the corresponding source code, to be
+ distributed under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer
+ to distribute corresponding source code. (This alternative is
+ allowed only for noncommercial distribution and only if you
+ received the program in object code or executable form with such
+ an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable. However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+ 5. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+ 6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+ 7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+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
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all. For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+ 9. The Free Software Foundation may publish revised and/or new versions
+of the 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 a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation. If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+ 10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission. For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this. Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+ NO WARRANTY
+
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, 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.
+
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE 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.
+
+ 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
+convey 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 2 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, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) year name of author
+ Gnomovision 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, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+ <signature of Ty Coon>, 1 April 1989
+ Ty Coon, President of Vice
+
+This 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 Library General
+Public License instead of this License.
diff --git a/quake/src/WinQuake/WinQuake.ncb b/quake/src/WinQuake/WinQuake.ncb
deleted file mode 100644
index 59562db..0000000
--- a/quake/src/WinQuake/WinQuake.ncb
+++ /dev/null
Binary files differ
diff --git a/quake/src/WinQuake/host.cpp b/quake/src/WinQuake/host.cpp
index 670d7a0..f1af56a 100644
--- a/quake/src/WinQuake/host.cpp
+++ b/quake/src/WinQuake/host.cpp
@@ -42,6 +42,7 @@
double realtime; // without any filtering or bounding
double oldrealtime; // last frame run
int host_framecount;
+qboolean host_framethrottled; // Running too fast
int host_hunklevel;
@@ -644,7 +645,8 @@
rand ();
// decide the simulation time
- if (!Host_FilterTime (time))
+ host_framethrottled = !Host_FilterTime (time);
+ if (host_framethrottled)
return; // don't run too fast, or packets will flood out
// get new key events
diff --git a/quake/src/WinQuake/quakedef.h b/quake/src/WinQuake/quakedef.h
index 6b42720..807b47d 100644
--- a/quake/src/WinQuake/quakedef.h
+++ b/quake/src/WinQuake/quakedef.h
@@ -308,6 +308,7 @@
extern byte *host_basepal;
extern byte *host_colormap;
extern int host_framecount; // incremented every frame, never reset
+extern qboolean host_framethrottled; // Running too fast
extern double realtime; // not bounded in any way, changed at
// start of every frame, never reset
diff --git a/quake/src/WinQuake/sys_android.cpp b/quake/src/WinQuake/sys_android.cpp
index 1537814..c66f01c 100644
--- a/quake/src/WinQuake/sys_android.cpp
+++ b/quake/src/WinQuake/sys_android.cpp
@@ -622,7 +622,7 @@
currentFrame++;
}
-int AndroidStep(int width, int height)
+int AndroidStepImp(int width, int height)
{
// PMPBEGIN(("AndroidStep"));
double time, newtime;
@@ -645,6 +645,18 @@
return key_dest == key_game;
}
+int AndroidStep(int width, int height)
+{
+ for(;;) {
+ host_framethrottled = false;
+ int result = AndroidStepImp(width, height);
+ if (!host_framethrottled) {
+ return result;
+ }
+ usleep(1000);
+ }
+}
+
extern void Host_Quit();
void AndroidQuit() {
soft_quit = true;
diff --git a/src/com/android/quake/DownloaderActivity.java b/src/com/android/quake/DownloaderActivity.java
index 7af6422..4b321b3 100644
--- a/src/com/android/quake/DownloaderActivity.java
+++ b/src/com/android/quake/DownloaderActivity.java
@@ -28,7 +28,7 @@
import java.net.URL;
import java.nio.channels.FileLock;
-import android.security.MessageDigest;
+import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.text.DecimalFormat;
import java.util.ArrayList;
diff --git a/src/com/android/quake/QuakeView.java b/src/com/android/quake/QuakeView.java
index 3f99c57..e5fde42 100644
--- a/src/com/android/quake/QuakeView.java
+++ b/src/com/android/quake/QuakeView.java
@@ -136,7 +136,7 @@
private int keyCodeToQuakeCode(int keyCode) {
int key = 0;
- if (key >= sKeyCodeToQuakeCode.length) {
+ if (keyCode >= sKeyCodeToQuakeCode.length) {
return 0;
}
if (mAltKeyPressed) {
@@ -209,7 +209,18 @@
'.', QuakeLib.K_ALT, QuakeLib.K_ALT, QuakeLib.K_SHIFT, QuakeLib.K_SHIFT, QuakeLib.K_TAB, ' ', '$', // 56..63
'$', '$', QuakeLib.K_ENTER, QuakeLib.K_BACKSPACE, '`', '-', '=', '[', // 64..71
']', '\\', ';', '\'', '/', QuakeLib.K_CTRL, '#', '$', // 72..79
- QuakeLib.K_HOME, '$', QuakeLib.K_ESCAPE, '$', '$' // 80..84
+ QuakeLib.K_HOME, '$', QuakeLib.K_ESCAPE, '$', '$', 0, 0, 0, 0, // 80..
+ 0, 0, QuakeLib.K_PGUP, QuakeLib.K_PGDN, 0, 0, 0, 0, 0, 0, // 90..
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 100..
+ 0, QuakeLib.K_ESCAPE, QuakeLib.K_DEL, QuakeLib.K_CTRL, QuakeLib.K_CTRL, 0, 0, 0, 0, 0, // 110..
+ 0, 0, QuakeLib.K_HOME, QuakeLib.K_END, QuakeLib.K_INS, 0, 0, 0, 0, 0, // 120..
+ 0, QuakeLib.K_F1, QuakeLib.K_F2, QuakeLib.K_F3, QuakeLib.K_F4, // 130..134
+ QuakeLib.K_F5, QuakeLib.K_F6, QuakeLib.K_F7, QuakeLib.K_F8, QuakeLib.K_F9, // 135..139
+ QuakeLib.K_F10, QuakeLib.K_F11, QuakeLib.K_F12, 0, 0, 0, 0, 0, 0, 0, // 140..
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 150..
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 160
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 170..
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 // 180..
};
private static final int sKeyCodeToQuakeCodeShift[] =
@@ -225,7 +236,18 @@
0, 0, 0, 0, 0, 0, 0, 0, // 56..63
0, 0, 0, 0, 0, 0, 0, 0, // 64..71
0, 0, '?', '0', 0, QuakeLib.K_CTRL, 0, 0, // 72..79
- 0, 0, 0, 0, 0 // 80..84
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 80..
+ 0, 0, QuakeLib.K_PGUP, QuakeLib.K_PGDN, 0, 0, 0, 0, 0, 0, // 90..
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 100..
+ 0, QuakeLib.K_ESCAPE, QuakeLib.K_DEL, QuakeLib.K_CTRL, QuakeLib.K_CTRL, 0, 0, 0, 0, 0, // 110..
+ 0, 0, QuakeLib.K_HOME, QuakeLib.K_END, QuakeLib.K_INS, 0, 0, 0, 0, 0, // 120..
+ 0, QuakeLib.K_F1, QuakeLib.K_F2, QuakeLib.K_F3, QuakeLib.K_F4, // 130..134
+ QuakeLib.K_F5, QuakeLib.K_F6, QuakeLib.K_F7, QuakeLib.K_F8, QuakeLib.K_F9, // 135..139
+ QuakeLib.K_F10, QuakeLib.K_F11, QuakeLib.K_F12, 0, 0, 0, 0, 0, 0, 0, // 140..
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 150..
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 160
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 170..
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 // 180..
};
private static final int sKeyCodeToQuakeCodeAlt[] =
@@ -241,7 +263,18 @@
0, 0, 0, 0, 0, 0, 0, 0, // 56..63
0, 0, 0, 0, 0, 0, 0, 0, // 64..71
0, 0, 0, 0, 0, 0, 0, 0, // 72..79
- 0, 0, 0, 0, 0 // 80..83
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, // 80..
+ 0, 0, QuakeLib.K_PGUP, QuakeLib.K_PGDN, 0, 0, 0, 0, 0, 0, // 90..
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 100..
+ 0, QuakeLib.K_ESCAPE, QuakeLib.K_DEL, QuakeLib.K_CTRL, QuakeLib.K_CTRL, 0, 0, 0, 0, 0, // 110..
+ 0, 0, QuakeLib.K_HOME, QuakeLib.K_END, QuakeLib.K_INS, 0, 0, 0, 0, 0, // 120..
+ 0, QuakeLib.K_F1, QuakeLib.K_F2, QuakeLib.K_F3, QuakeLib.K_F4, // 130..134
+ QuakeLib.K_F5, QuakeLib.K_F6, QuakeLib.K_F7, QuakeLib.K_F8, QuakeLib.K_F9, // 135..139
+ QuakeLib.K_F10, QuakeLib.K_F11, QuakeLib.K_F12, 0, 0, 0, 0, 0, 0, 0, // 140..
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 150..
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 160
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 170..
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 // 180..
};
private class QuakeRenderer implements GLSurfaceView.Renderer {
diff --git a/standalone/main.cpp b/standalone/main.cpp
deleted file mode 100644
index 7a5b6ee..0000000
--- a/standalone/main.cpp
+++ /dev/null
@@ -1,362 +0,0 @@
-#include <stdio.h>
-#include <unistd.h>
-#include <EGL/egl.h>
-#include <GLES/gl.h>
-#include <pthread.h>
-#include <ui/EventHub.h>
-#include <ui/FramebufferNativeWindow.h>
-#include <ui/EGLUtils.h>
-
-extern void AndroidInitArgs(int argc, char** argv);
-extern int AndroidInit();
-extern int AndroidMotionEvent(unsigned long long eventTime, int action,
- float x, float y, float pressure, float size, int deviceId);
-extern int AndroidEvent(int type, int value);
-extern int AndroidStep(int width, int height);
-
-static int gDisplayWidth;
-static int gDisplayHeight;
-static EGLDisplay gDisplay;
-static EGLSurface gSurface;
-static EGLContext gContext;
-
-void checkEGLError(const char* msg) {
- unsigned int error = eglGetError();
- if (error != EGL_SUCCESS) {
- fprintf(stderr, "%s: error %u\n", msg, error);
- }
-}
-
-void checkGLError(const char* msg) {
- unsigned int error = glGetError();
- if (error != GL_NO_ERROR) {
- fprintf(stderr, "%s: error 0x%04X\n", msg, error);
- }
-}
-
-static android::sp<android::EventHub> gHub;
-
-class EventQueue {
-private:
- class Lock {
- public:
- Lock(pthread_mutex_t& mutex) {
- m_pMutex = &mutex;
- pthread_mutex_lock(m_pMutex);
- }
- ~Lock() {
- pthread_mutex_unlock(m_pMutex);
- }
- void wait(pthread_cond_t& cond) {
- pthread_cond_wait(&cond, m_pMutex);
- }
- void signal(pthread_cond_t& cond) {
- pthread_cond_signal(&cond);
- }
- private:
- pthread_mutex_t* m_pMutex;
- };
-
-public:
-
- static const int MOTION_ACTION_DOWN = 0;
- static const int MOTION_ACTION_UP = 1;
- static const int MOTION_ACTION_MOVE = 2;
-
-// Platform-specific event types.
-
- static const int EV_DEVICE_ADDED = android::EventHub::DEVICE_ADDED;
- static const int EV_DEVICE_REMOVED = android::EventHub::DEVICE_REMOVED;
-
- struct Event {
- int32_t deviceId;
- int32_t type;
- int32_t scancode;
- int32_t keycode;
- uint32_t flags;
- int32_t value;
- nsecs_t when;
- };
-
- EventQueue() {
- m_Head = 0;
- m_Count = 0;
- pthread_mutex_init(&m_mutex, NULL);
- pthread_cond_init(&m_space_available, NULL);
- startEventThread();
- }
-
- // Returns NULL if no event available.
- // Call recycleEvent when you're done with the event
- Event* getEvent() {
- Event* result = NULL;
- Lock lock(m_mutex);
- if (m_Count > 0) {
- result = m_Events + m_Head;
- }
- return result;
- }
-
- void recycleEvent(Event* pEvent) {
- Lock lock(m_mutex);
- if (pEvent == m_Events + m_Head && m_Count > 0) {
- m_Head = incQueue(m_Head);
- m_Count--;
- lock.signal(m_space_available);
- }
- }
-
-private:
- inline size_t incQueue(size_t index) {
- return modQueue(index + 1);
- }
-
- inline size_t modQueue(size_t index) {
- return index & EVENT_SIZE_MASK;
- }
-
- void startEventThread() {
- pthread_create( &m_eventThread, NULL, &staticEventThreadMain, this);
- }
-
- static void* staticEventThreadMain(void* arg) {
- return ((EventQueue*) arg)->eventThreadMain();
- }
-
- void* eventThreadMain() {
- gHub = new android::EventHub();
- while(true) {
- android::RawEvent rawEvent;
- bool result = gHub->getEvent(& rawEvent);
- if (result) {
- Event event;
- event.deviceId = rawEvent.deviceId;
- event.when = rawEvent.when;
- event.type = rawEvent.type;
- event.value = rawEvent.value;
- event.keycode = rawEvent.keyCode;
- event.scancode = rawEvent.scanCode;
- event.flags = rawEvent.flags;
-
- Lock lock(m_mutex);
- while( m_Count == MAX_EVENTS) {
- lock.wait(m_space_available);
- }
- m_Events[modQueue(m_Head + m_Count)] = event;
- m_Count = incQueue(m_Count);
- }
- }
- return NULL;
- }
-
- static const size_t MAX_EVENTS = 16;
- static const size_t EVENT_SIZE_MASK = 0xf;
-
- pthread_t m_eventThread;
- pthread_mutex_t m_mutex;
- pthread_cond_t m_space_available;
- unsigned int m_Head;
- unsigned int m_Count;
- Event m_Events[MAX_EVENTS];
-};
-
-bool gNoEvents;
-EventQueue* gpEventQueue;
-
-int init(int argc, char** argv) {
-
- for(int i = 0; i < argc; i++) {
- char* p = argv[i];
- if (strcmp(p, "-noevents") == 0) {
- printf("-noevents: will not look for events.\n");
- gNoEvents = true;
- }
- }
-
- if (! gNoEvents) {
- gpEventQueue = new EventQueue();
- }
-
- EGLNativeWindowType window = android_createDisplaySurface();
-
- gDisplay = eglGetDisplay(EGL_DEFAULT_DISPLAY);
-
- EGLint majorVersion;
- EGLint minorVersion;
-
- eglInitialize(gDisplay, &majorVersion, &minorVersion);
- checkEGLError("eglInitialize");
-
- EGLint configRequest[] = {
- EGL_SURFACE_TYPE, EGL_PBUFFER_BIT|EGL_WINDOW_BIT,
- EGL_DEPTH_SIZE, 16,
- EGL_NONE
- };
-
- EGLConfig config;
- android::EGLUtils::selectConfigForNativeWindow(gDisplay, configRequest, window, &config);
- gSurface = eglCreateWindowSurface(gDisplay, config, window, NULL);
-
- eglQuerySurface(gDisplay, gSurface, EGL_WIDTH, &gDisplayWidth);
- eglQuerySurface(gDisplay, gSurface, EGL_HEIGHT, &gDisplayHeight);
- fprintf(stderr, "display width = %d, height = %d\n", gDisplayWidth,
- gDisplayHeight);
-
- gContext = eglCreateContext(gDisplay, config, NULL, NULL);
- checkEGLError("eglCreateContext");
- eglMakeCurrent(gDisplay, gSurface, gSurface, gContext);
- checkEGLError("eglMakeCurrent");
-
- printf("vendor : %s\n", glGetString(GL_VENDOR));
- printf("renderer : %s\n", glGetString(GL_RENDERER));
- printf("version : %s\n", glGetString(GL_VERSION));
- printf("extensions: %s\n", glGetString(GL_EXTENSIONS));
-
- return 0;
-}
-
-// Quick and dirty implementation of absolute pointer events...
-
-bool lastAbsDown = false;
-bool absDown = false;
-bool absChanged = false;
-unsigned long long absDownTime = 0;
-int absX = 0;
-int absY = 0;
-int absPressure = 0;
-int absSize = 0;
-int lastAbsX = 0;
-int lastAbsY = 0;
-int lastAbsPressure = 0;
-int lastAbsSize = 0;
-
-
-void checkEvents() {
-
- if (gpEventQueue == NULL) {
- return;
- }
- while(true) {
- EventQueue::Event* pEvent = gpEventQueue->getEvent();
- if (pEvent == NULL) {
- return;
- }
-#if 1
- printf("Event deviceId: %d, type: %d, scancode: %d, keyCode: %d, flags: %d, value: %d, when: %llu\n",
- pEvent->deviceId, pEvent->type, pEvent->scancode,
- pEvent->keycode, pEvent->flags, pEvent->value, pEvent->when);
-#endif
- switch (pEvent->type) {
- case EV_KEY: // Keyboard input
- if (pEvent->scancode == BTN_TOUCH) {
- absDown = pEvent->value != 0;
- absChanged = true;
- }
- else {
- AndroidEvent(pEvent->value, pEvent->keycode);
- }
- break;
-
- case EV_ABS:
- if (pEvent->scancode == ABS_X) {
- absX = pEvent->value;
- absChanged = true;
- } else if (pEvent->scancode == ABS_Y) {
- absY = pEvent->value;
- absChanged = true;
- } else if (pEvent->scancode == ABS_PRESSURE) {
- absPressure = pEvent->value;
- absChanged = true;
- } else if (pEvent->scancode == ABS_TOOL_WIDTH) {
- absSize = pEvent->value;
- absChanged = true;
- }
-
- case EV_SYN:
- {
- if (absChanged) {
- absChanged = false;
- int action;
- if (absDown != lastAbsDown) {
- lastAbsDown = absDown;
- if (absDown) {
- action = EventQueue::MOTION_ACTION_DOWN;
- absDownTime = pEvent->when;
- } else {
- action = EventQueue::MOTION_ACTION_UP;
- absX = lastAbsX;
- absY = lastAbsY;
- absPressure = lastAbsPressure;
- absSize = lastAbsSize;
- }
- } else {
- action = EventQueue::MOTION_ACTION_MOVE;
- }
- float scaledX = absX;
- float scaledY = absY;
- float scaledPressure = 1.0f;
- float scaledSize = 0;
-#if 0
- if (di != null) {
- if (di.absX != null) {
- scaledX = ((scaledX-di.absX.minValue)
- / di.absX.range)
- * (mDisplay.getWidth()-1);
- }
- if (di.absY != null) {
- scaledY = ((scaledY-di.absY.minValue)
- / di.absY.range)
- * (mDisplay.getHeight()-1);
- }
- if (di.absPressure != null) {
- scaledPressure =
- ((absPressure-di.absPressure.minValue)
- / (float)di.absPressure.range);
- }
- if (di.absSize != null) {
- scaledSize =
- ((absSize-di.absSize.minValue)
- / (float)di.absSize.range);
- }
- }
-#endif
-
- unsigned long long whenMS = pEvent->when / 1000000;
- AndroidMotionEvent(whenMS, action,
- scaledX, scaledY, scaledPressure, scaledSize,
- pEvent->deviceId);
- lastAbsX = absX;
- lastAbsY = absY;
- }
- }
- break;
-
- default:
- break;
- }
- gpEventQueue->recycleEvent(pEvent);
- }
-}
-
-int main(int argc, char** argv) {
- fprintf(stderr, "Welcome to stand-alone Android quake.\n");
- AndroidInitArgs(argc, argv);
-
- int result = init(argc, argv);
- if (result) {
- return result;
- }
-
- if (!AndroidInit()) {
- return 1;
- }
-
- while(true) {
- AndroidStep(gDisplayWidth, gDisplayHeight);
- checkGLError("AndroidStep");
- eglSwapBuffers(gDisplay, gSurface);
- checkEGLError("eglSwapBuffers");
- checkEvents();
- }
- return 0;
-}
