diff options
| -rw-r--r-- | COPYING | 911 | ||||
| -rwxr-xr-x[-rw-r--r--] | KukuActivity.py | 30 | ||||
| -rw-r--r-- | MANIFEST | 218 | ||||
| -rwxr-xr-x[-rw-r--r--] | QA.py | 51 | ||||
| -rwxr-xr-x[-rw-r--r--] | activity.py | 0 | ||||
| -rw-r--r-- | activity/activity.info | 6 | ||||
| -rw-r--r--[-rwxr-xr-x] | data/number_images/01x.jpg | bin | 7084 -> 7084 bytes | |||
| -rw-r--r--[-rwxr-xr-x] | data/number_images/02x.jpg | bin | 8317 -> 8317 bytes | |||
| -rw-r--r--[-rwxr-xr-x] | data/number_images/03x.jpg | bin | 5421 -> 5421 bytes | |||
| -rw-r--r--[-rwxr-xr-x] | data/number_images/04x.jpg | bin | 8574 -> 8574 bytes | |||
| -rw-r--r--[-rwxr-xr-x] | data/number_images/05x.jpg | bin | 6632 -> 6632 bytes | |||
| -rw-r--r--[-rwxr-xr-x] | data/number_images/06x.jpg | bin | 8132 -> 8132 bytes | |||
| -rw-r--r--[-rwxr-xr-x] | data/number_images/07x.jpg | bin | 10302 -> 10302 bytes | |||
| -rw-r--r--[-rwxr-xr-x] | data/number_images/08x.jpg | bin | 8105 -> 8105 bytes | |||
| -rw-r--r--[-rwxr-xr-x] | data/number_images/09x.jpg | bin | 8458 -> 8458 bytes | |||
| -rw-r--r--[-rwxr-xr-x] | data/number_images/10x.jpg | bin | 8471 -> 8471 bytes | |||
| -rw-r--r--[-rwxr-xr-x] | data/number_images/11x.jpg | bin | 8573 -> 8573 bytes | |||
| -rw-r--r--[-rwxr-xr-x] | data/number_images/12x.jpg | bin | 10726 -> 10726 bytes | |||
| -rw-r--r--[-rwxr-xr-x] | data/number_images/13x.jpg | bin | 7400 -> 7400 bytes | |||
| -rw-r--r--[-rwxr-xr-x] | data/number_images/14x.jpg | bin | 8037 -> 8037 bytes | |||
| -rw-r--r--[-rwxr-xr-x] | data/number_images/15x.jpg | bin | 10862 -> 10862 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | grid.py | 50 | ||||
| -rwxr-xr-x[-rw-r--r--] | kuku.py | 424 | ||||
| -rwxr-xr-x[-rw-r--r--] | kuku_config.py | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | kuku_utils.py | 24 | ||||
| -rw-r--r-- | locale/en/LC_MESSAGES/kuku.mo | bin | 393 -> 0 bytes | |||
| -rw-r--r-- | locale/en/LC_MESSAGES/kuku.po | 21 | ||||
| -rw-r--r-- | locale/kuku.pot | 21 | ||||
| -rw-r--r-- | locale/sw/LC_MESSAGES/kuku.mo | bin | 394 -> 0 bytes | |||
| -rw-r--r-- | locale/sw/LC_MESSAGES/kuku.po | 21 | ||||
| -rw-r--r-- | olpcgames/COPYING | 674 | ||||
| -rwxr-xr-x[-rw-r--r--] | olpcgames/__init__.py | 110 | ||||
| -rwxr-xr-x | olpcgames/_cairoimage.py | 135 | ||||
| -rwxr-xr-x | olpcgames/_gtkmain.py | 70 | ||||
| -rwxr-xr-x | olpcgames/_version.py | 2 | ||||
| -rwxr-xr-x[-rw-r--r--] | olpcgames/activity.py | 246 | ||||
| -rwxr-xr-x | olpcgames/buildmanifest.py | 33 | ||||
| -rwxr-xr-x[-rw-r--r--] | olpcgames/camera.py | 297 | ||||
| -rwxr-xr-x[-rw-r--r--] | olpcgames/canvas.py | 454 | ||||
| -rwxr-xr-x | olpcgames/data/__init__.py | 36 | ||||
| -rw-r--r-- | olpcgames/data/sleeping.svg | 52 | ||||
| -rwxr-xr-x | olpcgames/data/sleeping_svg.py | 61 | ||||
| -rwxr-xr-x | olpcgames/dbusproxy.py | 93 | ||||
| -rwxr-xr-x | olpcgames/eventwrap.py | 388 | ||||
| -rwxr-xr-x | olpcgames/gtkEvent.py | 289 | ||||
| -rwxr-xr-x | olpcgames/mesh.py | 583 | ||||
| -rwxr-xr-x | olpcgames/pangofont.py | 346 | ||||
| -rwxr-xr-x | olpcgames/pausescreen.py | 116 | ||||
| -rwxr-xr-x | olpcgames/svg.py | 71 | ||||
| -rwxr-xr-x | olpcgames/svgsprite.py | 52 | ||||
| -rwxr-xr-x | olpcgames/textsprite.py | 40 | ||||
| -rwxr-xr-x[-rw-r--r--] | olpcgames/util.py | 96 | ||||
| -rwxr-xr-x[-rw-r--r--] | olpcgames/video.py | 243 | ||||
| -rwxr-xr-x[-rw-r--r--] | question.py | 24 | ||||
| -rwxr-xr-x[-rw-r--r--] | setup.py | 11 | ||||
| -rwxr-xr-x[-rw-r--r--] | tile.py | 50 |
56 files changed, 5114 insertions, 1235 deletions
@@ -1,285 +1,626 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 - Copyright (C) 1989, 1991 Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. - Preamble + 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 Lesser General Public License instead.) You can apply it to + 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 -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. +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 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. + 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 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. +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. - 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 + 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. - 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 + 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 -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 +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 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 + 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 @@ -287,15 +628,15 @@ 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 +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 + 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 + 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, @@ -303,37 +644,31 @@ the "copyright" line and a pointer to where the full notice is found. 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., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + 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 is interactive, make it output a short notice like this -when it starts in an interactive mode: + If the program does terminal interaction, 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'. + <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, 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 Lesser General -Public License instead of this License. +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>. diff --git a/KukuActivity.py b/KukuActivity.py index 1dc1456..5064fb9 100644..100755 --- a/KukuActivity.py +++ b/KukuActivity.py @@ -1,10 +1,26 @@ -""" -olpcgames.py - -Taken from Noah Kantrowitz's simple demo USInvaders - -""" - +#! /usr/bin/env python +# -*- coding: utf-8 -*- +# +# Kuku Anakula +# Copyright (C) 2007, Julius B. Lucks, Adrian DelMaestro, Sera L. Young +# Copyright (C) 2012, Alan Aguiar +# +# 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/>. +# +# Contact information: +# Julius B. Lucks <julius@younglucks.com> +# Alan Aguiar <alanjas@gmail.com> import pygtk pygtk.require('2.0') @@ -1,111 +1,107 @@ -Kuku.activity/ -Kuku.activity/COPYING -Kuku.activity/KukuActivity.py -Kuku.activity/MANIFEST -Kuku.activity/QA.py -Kuku.activity/README -Kuku.activity/activity.py -Kuku.activity/activity -Kuku.activity/activity/activity-kuku.svg -Kuku.activity/activity/activity.info -Kuku.activity/data -Kuku.activity/data/bock.ogg -Kuku.activity/data/kuku.gif -Kuku.activity/data/kuku.png -Kuku.activity/data/kuku_clock.png -Kuku.activity/data/kuku_death.ogg -Kuku.activity/data/kuku_default.png -Kuku.activity/data/kuku_endpage.png -Kuku.activity/data/kuku_happy.png -Kuku.activity/data/kuku_high_score.png -Kuku.activity/data/kuku_left.gif -Kuku.activity/data/kuku_num_correct.png -Kuku.activity/data/kuku_pecking.png -Kuku.activity/data/kuku_right.png -Kuku.activity/data/kuku_slow.ogg -Kuku.activity/data/kuku_startpage.png -Kuku.activity/data/kuku_stunned.png -Kuku.activity/data/kuku_win.ogg -Kuku.activity/data/kuku_win.png -Kuku.activity/data/number_images -Kuku.activity/data/number_images/01x.jpg -Kuku.activity/data/number_images/02x.jpg -Kuku.activity/data/number_images/03x.jpg -Kuku.activity/data/number_images/04x.jpg -Kuku.activity/data/number_images/05x.jpg -Kuku.activity/data/number_images/06x.jpg -Kuku.activity/data/number_images/07x.jpg -Kuku.activity/data/number_images/08x.jpg -Kuku.activity/data/number_images/09x.jpg -Kuku.activity/data/number_images/10x.jpg -Kuku.activity/data/number_images/11x.jpg -Kuku.activity/data/number_images/12x.jpg -Kuku.activity/data/number_images/13x.jpg -Kuku.activity/data/number_images/14x.jpg -Kuku.activity/data/number_images/15x.jpg -Kuku.activity/data/peckbad.ogg -Kuku.activity/data/peckgood.ogg -Kuku.activity/data/question_files -Kuku.activity/data/question_files/arithmetic -Kuku.activity/data/question_files/arithmetic/README.txt -Kuku.activity/data/question_files/arithmetic/addition_p0_0-10.dat -Kuku.activity/data/question_files/arithmetic/addition_p0_0-100.dat -Kuku.activity/data/question_files/arithmetic/addsub_p0_-10-10.dat -Kuku.activity/data/question_files/arithmetic/addsub_p0_-100-100.dat -Kuku.activity/data/question_files/arithmetic/addsub_p0_0-10.dat -Kuku.activity/data/question_files/arithmetic/addsub_p0_0-100.dat -Kuku.activity/data/question_files/arithmetic/allops_p0_0-10.dat -Kuku.activity/data/question_files/arithmetic/allops_p0_0-100.dat -Kuku.activity/data/question_files/arithmetic/allops_p1_0-10.dat -Kuku.activity/data/question_files/arithmetic/allops_p1_0-100.dat -Kuku.activity/data/question_files/arithmetic/division_p0_-10-10.dat -Kuku.activity/data/question_files/arithmetic/division_p0_-100-100.dat -Kuku.activity/data/question_files/arithmetic/division_p0_0-10.dat -Kuku.activity/data/question_files/arithmetic/division_p0_0-100.dat -Kuku.activity/data/question_files/arithmetic/multdiv_p0_-10-10.dat -Kuku.activity/data/question_files/arithmetic/multdiv_p0_-100-100.dat -Kuku.activity/data/question_files/arithmetic/multdiv_p0_0-10.dat -Kuku.activity/data/question_files/arithmetic/multdiv_p0_0-100.dat -Kuku.activity/data/question_files/arithmetic/multiples_p0_-10-10.dat -Kuku.activity/data/question_files/arithmetic/multiples_p0_0-10.dat -Kuku.activity/data/question_files/arithmetic/multiplication_p0_-10-10.dat -Kuku.activity/data/question_files/arithmetic/multiplication_p0_-100-100.dat -Kuku.activity/data/question_files/arithmetic/multiplication_p0_0-10.dat -Kuku.activity/data/question_files/arithmetic/multiplication_p0_0-100.dat -Kuku.activity/data/question_files/arithmetic/my_questions.dat -Kuku.activity/data/question_files/arithmetic/random_p0_-10-10.dat -Kuku.activity/data/question_files/arithmetic/random_p0_0-10.dat -Kuku.activity/data/question_files/arithmetic/random_p1_-10-10.dat -Kuku.activity/data/question_files/arithmetic/random_p1_0-10.dat -Kuku.activity/data/question_files/arithmetic/subtraction_p0_0-10.dat -Kuku.activity/data/question_files/arithmetic/subtraction_p0_0-100.dat -Kuku.activity/data/question_files/numbers -Kuku.activity/data/question_files/numbers/numbers_1-10.dat -Kuku.activity/data/question_files/numbers/numbers_11-15.dat -Kuku.activity/data/tile.gif -Kuku.activity/grid.py -Kuku.activity/kuku.py -Kuku.activity/kuku.svg -Kuku.activity/kuku_config.py -Kuku.activity/kuku_utils.py -Kuku.activity/locale -Kuku.activity/locale/en -Kuku.activity/locale/en/LC_MESSAGES -Kuku.activity/locale/en/LC_MESSAGES/kuku.mo -Kuku.activity/locale/en/LC_MESSAGES/kuku.po -Kuku.activity/locale/kuku.pot -Kuku.activity/locale/sw -Kuku.activity/locale/sw/LC_MESSAGES -Kuku.activity/locale/sw/LC_MESSAGES/kuku.mo -Kuku.activity/locale/sw/LC_MESSAGES/kuku.po -Kuku.activity/olpcgames.py -Kuku.activity/olpcgames -Kuku.activity/olpcgames/__init__.py -Kuku.activity/olpcgames/activity.py -Kuku.activity/olpcgames/camera.py -Kuku.activity/olpcgames/canvas.py -Kuku.activity/olpcgames/util.py -Kuku.activity/olpcgames/video.py -Kuku.activity/question.py -Kuku.activity/setup.py -Kuku.activity/tile.py +tile.py +setup.py +README +question.py +QA.py +kuku_utils.py +kuku_config.py +KukuActivity.py +kuku.svg +kuku.py +grid.py +COPYING +activity.py +olpcgames/__init__.py +olpcgames/_version.py +olpcgames/_gtkmain.py +olpcgames/_cairoimage.py +olpcgames/video.py +olpcgames/util.py +olpcgames/textsprite.py +olpcgames/svgsprite.py +olpcgames/svg.py +olpcgames/pausescreen.py +olpcgames/pangofont.py +olpcgames/mesh.py +olpcgames/gtkEvent.py +olpcgames/eventwrap.py +olpcgames/dbusproxy.py +olpcgames/COPYING +olpcgames/canvas.py +olpcgames/camera.py +olpcgames/buildmanifest.py +olpcgames/activity.py +olpcgames/data/__init__.py +olpcgames/data/sleeping_svg.py +olpcgames/data/sleeping.svg +data/tile.gif +data/peckgood.ogg +data/peckbad.ogg +data/kuku_win.png +data/kuku_win.ogg +data/kuku_stunned.png +data/kuku_startpage.png +data/kuku_slow.ogg +data/kuku_pecking.png +data/kuku_num_correct.png +data/kuku_left.gif +data/kuku_high_score.png +data/kuku_happy.png +data/kuku_endpage.png +data/kuku_default.png +data/kuku_death.ogg +data/kuku_clock.png +data/kuku.png +data/kuku.gif +data/bock.ogg +data/question_files/numbers/numbers_11-15.dat +data/question_files/numbers/numbers_1-10.dat +data/question_files/arithmetic/subtraction_p0_0-100.dat +data/question_files/arithmetic/subtraction_p0_0-10.dat +data/question_files/arithmetic/README.txt +data/question_files/arithmetic/random_p1_0-10.dat +data/question_files/arithmetic/random_p1_-10-10.dat +data/question_files/arithmetic/random_p0_0-10.dat +data/question_files/arithmetic/random_p0_-10-10.dat +data/question_files/arithmetic/my_questions.dat +data/question_files/arithmetic/multiplication_p0_0-100.dat +data/question_files/arithmetic/multiplication_p0_0-10.dat +data/question_files/arithmetic/multiplication_p0_-100-100.dat +data/question_files/arithmetic/multiplication_p0_-10-10.dat +data/question_files/arithmetic/multiples_p0_0-10.dat +data/question_files/arithmetic/multiples_p0_-10-10.dat +data/question_files/arithmetic/multdiv_p0_0-100.dat +data/question_files/arithmetic/multdiv_p0_0-10.dat +data/question_files/arithmetic/multdiv_p0_-100-100.dat +data/question_files/arithmetic/multdiv_p0_-10-10.dat +data/question_files/arithmetic/division_p0_0-100.dat +data/question_files/arithmetic/division_p0_0-10.dat +data/question_files/arithmetic/division_p0_-100-100.dat +data/question_files/arithmetic/division_p0_-10-10.dat +data/question_files/arithmetic/allops_p1_0-100.dat +data/question_files/arithmetic/allops_p1_0-10.dat +data/question_files/arithmetic/allops_p0_0-100.dat +data/question_files/arithmetic/allops_p0_0-10.dat +data/question_files/arithmetic/addsub_p0_0-100.dat +data/question_files/arithmetic/addsub_p0_0-10.dat +data/question_files/arithmetic/addsub_p0_-100-100.dat +data/question_files/arithmetic/addsub_p0_-10-10.dat +data/question_files/arithmetic/addition_p0_0-100.dat +data/question_files/arithmetic/addition_p0_0-10.dat +data/number_images/15x.jpg +data/number_images/14x.jpg +data/number_images/13x.jpg +data/number_images/12x.jpg +data/number_images/11x.jpg +data/number_images/10x.jpg +data/number_images/09x.jpg +data/number_images/08x.jpg +data/number_images/07x.jpg +data/number_images/06x.jpg +data/number_images/05x.jpg +data/number_images/04x.jpg +data/number_images/03x.jpg +data/number_images/02x.jpg +data/number_images/01x.jpg +activity/activity.info +activity/activity-kuku.svg @@ -1,31 +1,28 @@ -""" +#! /usr/bin/env python +# -*- coding: utf-8 -*- +# +# Kuku Anakula +# Copyright (C) 2007, Julius B. Lucks, Adrian DelMaestro, Sera L. Young +# Copyright (C) 2012, Alan Aguiar +# +# 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/>. +# +# Contact information: +# Julius B. Lucks <julius@younglucks.com> +# Alan Aguiar <alanjas@gmail.com> -QA.py - -QA class containing basic questions and -answers. - -Copyright 2007, Julius B. Lucks, Adrian DelMaestro, Sera L. Young - -This file is part of Kuku. - -Kuku 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 version 2 of the License. - -Kuku 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 Kuku; if not, write to the Free Software -Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -The copy of the GNU General Public License is found in the COPYING file -included in the source distribution. - - -""" +# QA class containing basic questions and answers. import re import random diff --git a/activity.py b/activity.py index c768154..c768154 100644..100755 --- a/activity.py +++ b/activity.py diff --git a/activity/activity.info b/activity/activity.info index 6ea06fe..b813f0c 100644 --- a/activity/activity.info +++ b/activity/activity.info @@ -1,7 +1,7 @@ [Activity] name = Kuku Anakula -activity_version = 1 -host_version = 1 +activity_version = 2 service_name = org.laptop.dev.KukuActivity icon = activity-kuku -class = activity.KukuActivity
\ No newline at end of file +class = activity.KukuActivity +license = GPLv3+
\ No newline at end of file diff --git a/data/number_images/01x.jpg b/data/number_images/01x.jpg Binary files differindex 4b8b35a..4b8b35a 100755..100644 --- a/data/number_images/01x.jpg +++ b/data/number_images/01x.jpg diff --git a/data/number_images/02x.jpg b/data/number_images/02x.jpg Binary files differindex bfd6f1b..bfd6f1b 100755..100644 --- a/data/number_images/02x.jpg +++ b/data/number_images/02x.jpg diff --git a/data/number_images/03x.jpg b/data/number_images/03x.jpg Binary files differindex 44329a2..44329a2 100755..100644 --- a/data/number_images/03x.jpg +++ b/data/number_images/03x.jpg diff --git a/data/number_images/04x.jpg b/data/number_images/04x.jpg Binary files differindex 63c1d8f..63c1d8f 100755..100644 --- a/data/number_images/04x.jpg +++ b/data/number_images/04x.jpg diff --git a/data/number_images/05x.jpg b/data/number_images/05x.jpg Binary files differindex 0e0df29..0e0df29 100755..100644 --- a/data/number_images/05x.jpg +++ b/data/number_images/05x.jpg diff --git a/data/number_images/06x.jpg b/data/number_images/06x.jpg Binary files differindex be5b5cf..be5b5cf 100755..100644 --- a/data/number_images/06x.jpg +++ b/data/number_images/06x.jpg diff --git a/data/number_images/07x.jpg b/data/number_images/07x.jpg Binary files differindex 17f09bb..17f09bb 100755..100644 --- a/data/number_images/07x.jpg +++ b/data/number_images/07x.jpg diff --git a/data/number_images/08x.jpg b/data/number_images/08x.jpg Binary files differindex 8ce3123..8ce3123 100755..100644 --- a/data/number_images/08x.jpg +++ b/data/number_images/08x.jpg diff --git a/data/number_images/09x.jpg b/data/number_images/09x.jpg Binary files differindex 5120b45..5120b45 100755..100644 --- a/data/number_images/09x.jpg +++ b/data/number_images/09x.jpg diff --git a/data/number_images/10x.jpg b/data/number_images/10x.jpg Binary files differindex 866446f..866446f 100755..100644 --- a/data/number_images/10x.jpg +++ b/data/number_images/10x.jpg diff --git a/data/number_images/11x.jpg b/data/number_images/11x.jpg Binary files differindex 93a949c..93a949c 100755..100644 --- a/data/number_images/11x.jpg +++ b/data/number_images/11x.jpg diff --git a/data/number_images/12x.jpg b/data/number_images/12x.jpg Binary files differindex 1e4bf75..1e4bf75 100755..100644 --- a/data/number_images/12x.jpg +++ b/data/number_images/12x.jpg diff --git a/data/number_images/13x.jpg b/data/number_images/13x.jpg Binary files differindex 708f705..708f705 100755..100644 --- a/data/number_images/13x.jpg +++ b/data/number_images/13x.jpg diff --git a/data/number_images/14x.jpg b/data/number_images/14x.jpg Binary files differindex 9ea6403..9ea6403 100755..100644 --- a/data/number_images/14x.jpg +++ b/data/number_images/14x.jpg diff --git a/data/number_images/15x.jpg b/data/number_images/15x.jpg Binary files differindex 7a57cf8..7a57cf8 100755..100644 --- a/data/number_images/15x.jpg +++ b/data/number_images/15x.jpg @@ -1,30 +1,26 @@ -""" -grid.py - -Includes classes Grid. Grid is a container class -for Tiles and is in charge of their construction. The Grid -is a representation of the playing board. - -Copyright 2007, Julius B. Lucks, Adrian DelMaestro, Sera L. Young - -This file is part of Kuku. - -Kuku 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 version 2 of the License. - -Kuku 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 Kuku; if not, write to the Free Software -Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -The copy of the GNU General Public License is found in the COPYING file -included in the source distribution. - -""" +#! /usr/bin/env python +# -*- coding: utf-8 -*- +# +# Kuku Anakula +# Copyright (C) 2007, Julius B. Lucks, Adrian DelMaestro, Sera L. Young +# Copyright (C) 2012, Alan Aguiar +# +# 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/>. +# +# Contact information: +# Julius B. Lucks <julius@younglucks.com> +# Alan Aguiar <alanjas@gmail.com> import pygame from tile import Tile @@ -1,28 +1,26 @@ -""" -kuku.py - -Copyright 2007, Julius B. Lucks, Adrian DelMaestro, Sera L. Young - -This file is part of Kuku. - -Kuku 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 version 2 of the License. - -Kuku 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 Kuku; if not, write to the Free Software -Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -The copy of the GNU General Public License is found in the COPYING file -included in the source distribution. - -""" - -# Based on oldalien in pygame/examples +#! /usr/bin/env python +# -*- coding: utf-8 -*- +# +# Kuku Anakula +# Copyright (C) 2007, Julius B. Lucks, Adrian DelMaestro, Sera L. Young +# Copyright (C) 2012, Alan Aguiar +# +# 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/>. +# +# Contact information: +# Julius B. Lucks <julius@younglucks.com> +# Alan Aguiar <alanjas@gmail.com> import pygame, os.path, sys import random @@ -33,20 +31,20 @@ import pickle as p import question import re - from kuku_utils import * #import configuration from kuku_config import * +from gettext import gettext as _ #i18n -import gettext -gettext.install('kuku', './locale', unicode=False) -presLan_en = gettext.translation("kuku", os.path.join(get_bundle_path(),'locale'), languages=['en']) -presLan_sw = gettext.translation("kuku", os.path.join(get_bundle_path(),'locale'), languages=['sw']) +#import gettext +#gettext.install('kuku', './locale', unicode=False) +#presLan_en = gettext.translation("kuku", os.path.join(get_bundle_path(),'locale'), languages=['en']) +#presLan_sw = gettext.translation("kuku", os.path.join(get_bundle_path(),'locale'), languages=['sw']) -presLan_en.install() +#presLan_en.install() # presLan_sw.install() try: @@ -65,8 +63,8 @@ else: scale_x = 1. scale_y = 1. FONT_SIZE = 36 - - + + dirtyrects = [] # list of update_rects class Img: pass # container for images @@ -96,42 +94,42 @@ for question_file in QUESTION_FILES: question_list = question.QuestionList(qs) question_lists.append(question_list) question_group = question.QuestionGroup(question_lists) - + class State(object): - """State object - + """State object + maintaines score, lives, high score, etc. """ - + def __init__(self): self.score = 0 self.lives = PLAYER_LIVES self.high_score = 0 self.time = GAME_TIME self.won = 0 - + def __str__(self): str = 'score %i\n lives %i\n High Score %i\n Time %i\n Won %i \n' %\ (self.score,self.lives,self.high_score,self.time,self.won) return str - + def save(self): """save state object - + in kuku_state.obj""" f = file(data_path('kuku_state.obj'),'w') p.dump(self,f) f.close() - + def update(self,lives=None,score=None,time=None): """update lives, score and time""" - + #update score and time self.score = score or self.score self.time = time or self.time - + #if you have not lost a life (i.e. have a correct answer), # your score is greater than 0, and a multiple of 10, # then you have won @@ -139,18 +137,18 @@ class State(object): # and you have just lost a life) if lives == self.lives and self.score > 0 and self.score%10 ==0: self.won = 1 - + #update lives self.lives = lives or self.lives - + if self.high_score < self.score: self.high_score = self.score - + # if self.score > 0 and self.score%10 ==0: # self.won = 1 - + # print self - + @@ -160,25 +158,25 @@ class Actor: def __init__(self, image): self.set_image(image) self.rect = image.get_rect() - + def update(self): "update the sprite state for this frame" pass - + def set_image(self,image): """set a new image""" self.image = image - + def draw(self, screen): "draws the sprite into the screen" r = screen.blit(self.image, self.rect) return r - + def erase(self, screen, background): "gets the sprite off of the screen" r = screen.blit(background, self.rect, self.rect) return r - + def get_rect(self): return self.rect @@ -191,7 +189,7 @@ class Player(Actor): self.grid = grid self.grid_position = self.grid.get_center_position() self.set_rect_position(self.image) - + def set_rect_position(self,cimage): """set_rect_position based on grid_position""" #get tile based on grid position @@ -200,18 +198,18 @@ class Player(Actor): t = self.grid.get_tile(self.grid_position[0], self.grid_position[1]) self.rect.centerx = t.rect.centerx - + if (cimage.get_rect().height == int(130*scale_y)): self.rect.centery = t.rect.centery else: self.rect.centery = t.rect.centery - int(24*scale_y) - - + + except IndexError: pass - + def move(self, x_direction,y_direction): - + #step = +/- 1 x_step = 0 y_step = 0 @@ -219,25 +217,25 @@ class Player(Actor): x_step = x_direction/abs(x_direction) if y_direction: y_step = y_direction/abs(y_direction) - + #change image to reflect right and left if x_step < 0: self.set_image(Img.player_left) elif x_direction > 0: self.set_image(Img.player_right) - step = 1 + step = 1 #elif y_direction != 0: #self.set_image(Img.player_right) - + self.move_grid_position(x_step,y_step) self.set_rect_position(self.image) - - + + def move_grid_position(self,x_step,y_step): """docstring for move_grid_position""" #check grid bounds new_position = [self.grid_position[0] + x_step, - self.grid_position[1] + y_step] + self.grid_position[1] + y_step] # print 'N',new_position if self.grid.check_bounds(new_position[0],new_position[1]): self.grid_position = new_position @@ -245,20 +243,20 @@ class Player(Actor): class QuestionAnswer: """The question/answer class. - + Displays the questions as well as answers on the screen""" - + def __init__(self, gridsize,q,answer_pool=None): self.Nx = gridsize[0] self.Ny = gridsize[1] self.question = q self.question_string = self.question.q_string self.answer_pool = answer_pool - + self.answers = [] - + if self.question.type == question.N_TYPE: - + self.correct_answer = self.question.a_list[0] while (len(self.answers) < self.Nx*self.Ny): ind = random.randint(0,len(answer_pool)-1) @@ -266,20 +264,20 @@ class QuestionAnswer: if not (self.correct_answer in self.answers): correct_index = random.randint(0,self.Nx*self.Ny-1) self.answers[correct_index] = self.correct_answer - + elif self.question.type == question.MULTIPLES_TYPE: - + #draw random possibility ind = random.randint(0,self.question.n_answers-1) self.correct_answer = int(self.question.a_list[ind]) - + #dirty hack to get which number multiples of self.q_num = int(re.findall('\d',self.question.q_string_raw)[0]) if self.correct_answer < 10: maxans = 50 else: maxans = 3*self.correct_answer - + while (len(self.answers) < self.Nx*self.Ny): # Construct a random integer between 0 and maxans rand_ans = random.randint(0,maxans) @@ -294,16 +292,16 @@ class QuestionAnswer: if not (self.correct_answer in self.answers): correct_index = random.randint(0,self.Nx*self.Ny-1) self.answers[correct_index] = self.correct_answer - + else: self.correct_answer = int(self.question.a_list[0]) # print self.correct_answer - + if self.correct_answer < 10: maxans = 50 else: maxans = 3*self.correct_answer - + while (len(self.answers) < self.Nx*self.Ny): # Construct a random integer between 0 and maxans rand_ans = random.randint(0,maxans) @@ -316,34 +314,36 @@ class QuestionAnswer: if not (self.correct_answer in self.answers): correct_index = random.randint(0,self.Nx*self.Ny-1) self.answers[correct_index] = self.correct_answer - + def get_correct_answer(self): return self.correct_answer - + def display_question(self,screen,font): """Display the question on the screen.""" - - text = font.render(self.question_string,1,(10,10,10)) - - # print self.question_string - + + font = pygame.font.Font(None, 80) + text = font.render(self.question_string + ' ?',1,(255,10,10)) + + # print self.question_string + #if text to wide, decrease font_size until #it fits - font_size = FONT_SIZE - while text.get_rect().width > 300.*scale_x: - font_size = int(font_size*2./3.) - font = pygame.font.Font(None, font_size) - text = font.render(self.question_string,1,(10,10,10)) - + #font_size = FONT_SIZE + #while text.get_rect().width > 300.*scale_x: + # font_size = int(font_size*2./3.) + #font = pygame.font.Font(None, font_size) + #text = font.render(self.question_string,1,(10,10,10)) + #font = pygame.font.Font(None, 60) + tlcorner = screen.get_rect().topleft textpos = (tlcorner[0] + 5, tlcorner[1] + 10) return [screen.blit(text,textpos)] - + def set_answers(self,screen,grid,font): '''Displays question answers in the BRH corner of each game tile.''' - + for x in range(self.Nx): for y in range(self.Ny): tilenum = x + y*self.Ny @@ -351,11 +351,11 @@ class QuestionAnswer: grid.get_tile(x,y).set_answer(answer=self.answers[tilenum], font=font) elif self.question.type == question.N_TYPE: - grid.get_tile(x,y).set_answer(image_name=self.answers[tilenum]) + grid.get_tile(x,y).set_answer(image_name=self.answers[tilenum]) class Time(object): - + def __init__(self,number,image,screen,font): self.number = number self.font = font @@ -363,11 +363,11 @@ class Time(object): self.image = image screen_rect = screen.get_rect() image_rect = self.image.get_rect() - + #max width is 3 digits self.text = self.font.render(str(100),1,(10,10,10)) - - self.rect = pygame.Rect(screen_rect.left, + + self.rect = pygame.Rect(screen_rect.left, (4./8.)*screen_rect.bottom-image_rect.height, image_rect.width+self.text.get_rect().width, image_rect.height) @@ -375,11 +375,11 @@ class Time(object): """draw the number of lives left""" dirtyrects = [] # print 'score' - if self.update: + if self.update: #white out r = screen.fill((255,255,255),self.rect) dirtyrects.append(r) - + r = screen.blit(self.image, self.rect) dirtyrects.append(r) @@ -397,16 +397,16 @@ class Time(object): """docstring for add""" self.number += number self.update = 1 - + def set(self,number): """docstring for set""" self.number = number - + def get_ticks(self): return self.number - - + + class Score(object): @@ -418,21 +418,21 @@ class Score(object): self.image = image screen_rect = screen.get_rect() image_rect = self.image.get_rect() - + #max width is 3 digits self.text = self.font.render(str(100),1,(10,10,10)) - - self.rect = pygame.Rect(screen_rect.left, + + self.rect = pygame.Rect(screen_rect.left, (3./4.)*screen_rect.bottom-image_rect.height, image_rect.width+self.text.get_rect().width, image_rect.height) - - + + def draw(self,screen): """draw the number of lives left""" dirtyrects = [] # print 'score' - if self.update: + if self.update: #white out screen.fill((255,255,255),self.rect) @@ -448,21 +448,21 @@ class Score(object): self.update = 0 return dirtyrects - + def add(self,number): """docstring for add""" self.number += number self.update = 1 - + def set(self,number): """docstring for set""" self.number = number self.update = 1 - + def get_score(self): """docstring for get_score""" return self.number - + class HighScore(Score): """HighScore""" @@ -470,15 +470,15 @@ class HighScore(Score): Score.__init__(self,number,image,screen,font) screen_rect = screen.get_rect() image_rect = self.image.get_rect() - self.rect = pygame.Rect(screen_rect.left, + self.rect = pygame.Rect(screen_rect.left, (5./8.)*screen_rect.bottom-image_rect.height, image_rect.width+self.text.get_rect().width, image_rect.height) - - + + class Lives(object): - + def __init__(self,number,image,screen,font): self.number = number self.font = font @@ -488,44 +488,44 @@ class Lives(object): self.vertical_offset = 10 screen_rect = screen.get_rect() image_rect = self.image.get_rect() - + self.text = self.font.render(str(self.number),1,(10,10,10)) - + self.rect = pygame.Rect(screen_rect.left, screen_rect.bottom-self.vertical_offset-image_rect.height, image_rect.width+self.text.get_rect().width, image_rect.height) - + def draw_lives(self,screen): """draw the number of lives left""" dirtyrects = [] - if self.update: + if self.update: #white out screen.fill((255,255,255),self.rect) - + r = screen.blit(self.image, self.rect) dirtyrects.append(r) - + self.text = self.font.render(str(self.number),1,(10,10,10)) textpos = (self.rect.right - self.text.get_rect().width, self.rect.bottom - self.text.get_rect().height ) dirtyrects.append(screen.blit(self.text,textpos)) - + self.update = 0 return dirtyrects - + def kill(self): """take one life (never drop below zero)""" self.number -= 1 self.update = 1 - + def get_lives(self): """docstring for get_lives""" return self.number - + def set_lives(self,number): """docstring for set_lives""" self.number = number @@ -549,7 +549,7 @@ def game_over(screen,gridsize,font): else: qa,num_players,score,time_clock = game_start(screen,gridsize,font) return (qa,num_players,score,time_clock) - + def game_win(screen,gridsize,font,state): """the game over screen""" screen.fill((255,255,255)) @@ -571,14 +571,14 @@ def game_win(screen,gridsize,font,state): qa,num_players,score,time_clock = game_start(screen,gridsize,font,started=1) score.set(state.score) return (qa,num_players,score,time_clock) - + def game_start(screen,gridsize,font,started=1): """the game over screen""" # Start music pygame.mixer.music.load(data_path('kuku_slow.ogg')) pygame.mixer.music.play(-1,0.0) - + if not started: screen.fill((255,255,255)) vec = (screen.get_rect().center[0]-Img.game_start.get_rect().center[0], @@ -587,16 +587,16 @@ def game_start(screen,gridsize,font,started=1): r = Img.game_start.get_rect() r = r.move(vec[0],vec[1]) screen.blit(Img.game_start,r) - + message = _('Begin!') text = font.render(message,1,(10,10,10)) twidth = text.get_rect().width theight = text.get_rect().height tlcorner = screen.get_rect().center textpos = (tlcorner[0]-twidth/2, tlcorner[1]) - + screen.blit(text,textpos) - + pygame.display.update() while True: evt = pygame.event.wait() @@ -607,43 +607,43 @@ def game_start(screen,gridsize,font,started=1): started = 1 qa,num_players,score,time_clock = reset_board(screen,gridsize,font) return (qa,num_players,score,time_clock) - - - + + + def reset_board(screen,gridsize,font, num_players=None,score=None, time_clock=None): """docstring for reset_board""" # Stop all sounds #pygame.mixer.stop() - + # # Start music # pygame.mixer.music.load(data_path('kuku_slow.ogg')) # pygame.mixer.music.play(-1,0.0) - + question_list = question_group.next() q = question_list.next() # print q.a_string, q.a_type qa = QuestionAnswer(gridsize,q, answer_pool=question_list.get_all_answers()) - + if not num_players: num_players = Lives(PLAYER_LIVES,Img.lives,screen,font) else: num_players.update = 1 - + if not score: score = Score(0,Img.correct,screen,font) else: score.update = 1 - + if not time_clock: time_clock = Time(GAME_TIME,Img.timer,screen,font) - + screen.fill((255,255,255)) pygame.display.update() return (qa,num_players,score,time_clock) - + def main(): """main pygame loop""" global dirtyrects @@ -657,9 +657,9 @@ def main(): pygame.K_KP7, pygame.K_ESCAPE ] - + pygame.init() - + #load the state object if it exists try: f = file(data_path('kuku_state.obj'),'r') @@ -667,39 +667,39 @@ def main(): f.close() except IOError: state = State() - - + + # # Start music # pygame.mixer.music.load(data_path('kuku_slow.ogg')) # pygame.mixer.music.play(-1,0.0) - + # load game sounds bock = pygame.mixer.Sound(data_path('bock.ogg')) peck_good = pygame.mixer.Sound(data_path('peckgood.ogg')) peck_bad = pygame.mixer.Sound(data_path('peckbad.ogg')) kuku_lose = pygame.mixer.Sound(data_path('kuku_death.ogg')) kuku_win = pygame.mixer.Sound(data_path('kuku_win.ogg')) - + # create a font instance font = pygame.font.Font(None, FONT_SIZE) - + #For Mac only # pygame.display.set_icon(pygame.image.load('data/kuku.png')) - + screen = pygame.display.set_mode(SCREENRECT.size,0) - + #whiten screen screen.fill((255,255,255)) - + # make background background = pygame.Surface(SCREENRECT.size).convert() background.fill((255,255,255)) screen.blit(background, (0,0)) pygame.display.update() - + # set the gridsize gridsize = (GRID_SIZE,GRID_SIZE) - + # Load player images kuku = load_image('kuku_default.png',1) kuku_peck = load_image('kuku_pecking.png',1) @@ -711,19 +711,19 @@ def main(): kuku_num_correct = load_image('kuku_num_correct.png',1) kuku_high_score = load_image('kuku_high_score.png',1) kuku_clock = load_image('kuku_clock.png',1) - + Img.game_start = pygame.transform.scale(kuku_game_start, (int(scale_x*kuku_game_start.get_rect().width), int(scale_y*kuku_game_start.get_rect().height))) - + Img.game_over = pygame.transform.scale(kuku_game_over, (int(scale_x*kuku_game_over.get_rect().width), int(scale_y*kuku_game_over.get_rect().height))) - + Img.game_win = pygame.transform.scale(kuku_game_win, (int(scale_x*kuku_game_win.get_rect().width), int(scale_y*kuku_game_win.get_rect().height))) - + Img.player_right = pygame.transform.scale(kuku, (int(scale_x*kuku.get_rect().width), int(scale_y*kuku.get_rect().height))) @@ -732,54 +732,54 @@ def main(): (int(scale_x*kuku_peck.get_rect().width), int(scale_y*kuku_peck.get_rect().height))) Img.peck_left = pygame.transform.flip(Img.peck_right,1,0) - + #change this to get image correct Img.lives = pygame.transform.scale(kuku_peck, (int(scale_x*kuku_peck.get_rect().width), int(scale_y*kuku_peck.get_rect().height))) - + Img.correct = pygame.transform.scale(kuku_num_correct, (int(scale_x*kuku_num_correct.get_rect().width), int(scale_y*kuku_num_correct.get_rect().height))) - + Img.high_score = pygame.transform.scale(kuku_high_score, (int(scale_x*kuku_high_score.get_rect().width), int(scale_y*kuku_high_score.get_rect().height))) - + #clock Img.timer = pygame.transform.scale(kuku_clock, (int(scale_x*kuku_clock.get_rect().width), int(scale_y*kuku_clock.get_rect().height))) - + Img.stunned_right = pygame.transform.scale(kuku_stunned, (int(scale_x*kuku_stunned.get_rect().width), int(scale_y*kuku_stunned.get_rect().height))) Img.stunned_left = pygame.transform.flip(Img.stunned_right,1,0) - + Img.happy_right = pygame.transform.scale(kuku_happy, (int(scale_x*kuku_happy.get_rect().width), int(scale_y*kuku_happy.get_rect().height))) Img.happy_left = pygame.transform.flip(Img.happy_right,1,0) - - + + #create high_score high_score = HighScore(state.high_score,Img.high_score,screen,font) - - + + # print Img.player_right.get_rect().height, Img.stunned_right.get_rect().height #create player grid = Grid(SCREENRECT,gridsize) player = Player(grid) - + # qa,num_players = reset_board(screen,gridsize,font) qa,num_players,score,time_clock = game_start(screen,gridsize,font,started=0) - + # keep track of time clock = pygame.time.Clock() actor_facing = 1 x_direction = 0 y_direction = 0 - + time = 0 try: while True: @@ -799,11 +799,11 @@ def main(): score=score.get_score(), time =time_clock.get_ticks()) high_score.set(state.high_score) - + for evt in pygame.event.get(): - + # print 'MAINLOOP TYPE:',evt.key - + if evt.type == pygame.QUIT: raise StopGame elif evt.type == pygame.KEYDOWN: @@ -814,7 +814,7 @@ def main(): x = player.grid_position[0] y = player.grid_position[1] ctile = grid.draw_tile(x,y,screen) - + #Pecking animation - 1st erase player, #then set pecking image, then only update #these dirtyrects, then delay @@ -823,16 +823,16 @@ def main(): animate_dirtyrects.append(player.draw(screen)) pygame.display.update(animate_dirtyrects) pygame.time.wait(200) - + #try an answer if (grid.get_tile(x,y).get_answer() == qa.get_correct_answer()): peck_good.play() score.add(1) - + time_clock.set(GAME_TIME) time_clock.update = 1 time = 0 - + if actor_facing == 1: player.set_image(Img.happy_right) else: @@ -847,29 +847,29 @@ def main(): score=score.get_score(), time =time_clock.get_ticks()) high_score.set(state.high_score) - - + + else: peck_bad.play() num_players.kill() time_clock.set(GAME_TIME) time = 0 - + #probably right here state.update(lives=num_players.get_lives(), time =time_clock.get_ticks()) high_score.set(state.high_score) - - - + + + if actor_facing == 1: player.set_image(Img.stunned_right) player.set_rect_position(Img.stunned_right) else: player.set_image(Img.stunned_left) - player.set_rect_position(Img.stunned_left) - - + player.set_rect_position(Img.stunned_left) + + elif evt.key == pygame.K_LEFT or evt.key == pygame.K_KP7: bock.play() x_direction = -1 @@ -882,7 +882,7 @@ def main(): elif evt.key == pygame.K_UP or evt.key == pygame.K_KP9: bock.play() y_direction = -1 - + if num_players.get_lives() <= 0: #reset the question # qa,num_players = reset_board(screen,gridsize,font) @@ -893,9 +893,9 @@ def main(): score=score.get_score(), time =time_clock.get_ticks()) high_score.set(state.high_score) - - - + + + if state.won: pygame.mixer.music.fadeout(2000) kuku_win.play() @@ -904,50 +904,50 @@ def main(): state.update(lives=num_players.get_lives(), score=score.get_score(), time =time_clock.get_ticks()) - state.won = 0 + state.won = 0 high_score.set(state.high_score) - - + + # determine which direction the actor is facing if x_direction in [-1,1]: actor_facing = x_direction - + for actor in [player]: grid_pos = actor.grid_position - # pygame.display.update(actor.erase(screen, - # grid.get_tile(grid_pos[0],grid_pos[1]).get_background())) - # pygame.display.update(grid.get_tile(grid_pos[0],grid_pos[1]).draw(screen)) - dirtyrects.extend(grid.get_tile(grid_pos[0],grid_pos[1]).draw(screen)) + # pygame.display.update(actor.erase(screen, + # grid.get_tile(grid_pos[0],grid_pos[1]).get_background())) + # pygame.display.update(grid.get_tile(grid_pos[0],grid_pos[1]).draw(screen)) + dirtyrects.extend(grid.get_tile(grid_pos[0],grid_pos[1]).draw(screen)) dirtyrects.append(actor.erase(screen, grid.get_tile(grid_pos[0],grid_pos[1]).get_background())) - + actor.update() - - # old_position = player.grid_position + + # old_position = player.grid_position player.move(x_direction,y_direction) x_direction = 0 y_direction = 0 - + #questions and answers dirtyrects.extend(qa.display_question(screen,font)) qa.set_answers(screen,grid,font) dirtyrects.extend(grid.draw(screen)) - + for actor in [player]: dirtyrects.append(actor.draw(screen)) - + #lives dirtyrects.extend(num_players.draw_lives(screen)) - + #score dirtyrects.extend(score.draw(screen)) - + #high_score dirtyrects.extend(high_score.draw(screen)) - + #time_clock dirtyrects.extend(time_clock.draw(screen)) - + #do the update pygame.display.update(dirtyrects) dirtyrects = [] @@ -956,8 +956,8 @@ def main(): state.score = 0 state.lives = PLAYER_LIVES state.time = GAME_TIME - state.save() - + state.save() + if __name__ == '__main__': main()
\ No newline at end of file diff --git a/kuku_config.py b/kuku_config.py index 8871c65..8871c65 100644..100755 --- a/kuku_config.py +++ b/kuku_config.py diff --git a/kuku_utils.py b/kuku_utils.py index ec46ee4..e536f79 100644..100755 --- a/kuku_utils.py +++ b/kuku_utils.py @@ -1,3 +1,27 @@ +#! /usr/bin/env python +# -*- coding: utf-8 -*- +# +# Kuku Anakula +# Copyright (C) 2007, Julius B. Lucks, Adrian DelMaestro, Sera L. Young +# Copyright (C) 2012, Alan Aguiar +# +# 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/>. +# +# Contact information: +# Julius B. Lucks <julius@younglucks.com> +# Alan Aguiar <alanjas@gmail.com> + import os import pygame from pygame.locals import * diff --git a/locale/en/LC_MESSAGES/kuku.mo b/locale/en/LC_MESSAGES/kuku.mo Binary files differdeleted file mode 100644 index 6ca41c8..0000000 --- a/locale/en/LC_MESSAGES/kuku.mo +++ /dev/null diff --git a/locale/en/LC_MESSAGES/kuku.po b/locale/en/LC_MESSAGES/kuku.po deleted file mode 100644 index c029d8c..0000000 --- a/locale/en/LC_MESSAGES/kuku.po +++ /dev/null @@ -1,21 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR ORGANIZATION -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2007-06-19 17:15+EDT\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" -"Content-Transfer-Encoding: utf-8\n" -"Generated-By: pygettext.py 1.5\n" - - -#: kuku.py:500 -msgid "Begin!" -msgstr "Begin!" - diff --git a/locale/kuku.pot b/locale/kuku.pot deleted file mode 100644 index f937e30..0000000 --- a/locale/kuku.pot +++ /dev/null @@ -1,21 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR ORGANIZATION -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2007-06-19 17:15+EDT\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" -"Content-Transfer-Encoding: utf-8\n" -"Generated-By: pygettext.py 1.5\n" - - -#: kuku.py:500 -msgid "Begin!" -msgstr "" - diff --git a/locale/sw/LC_MESSAGES/kuku.mo b/locale/sw/LC_MESSAGES/kuku.mo Binary files differdeleted file mode 100644 index f41851f..0000000 --- a/locale/sw/LC_MESSAGES/kuku.mo +++ /dev/null diff --git a/locale/sw/LC_MESSAGES/kuku.po b/locale/sw/LC_MESSAGES/kuku.po deleted file mode 100644 index 8d84881..0000000 --- a/locale/sw/LC_MESSAGES/kuku.po +++ /dev/null @@ -1,21 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR ORGANIZATION -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2007-06-19 17:15+EDT\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" -"Content-Transfer-Encoding: utf-8\n" -"Generated-By: pygettext.py 1.5\n" - - -#: kuku.py:500 -msgid "Begin!" -msgstr "Kuanza!" - diff --git a/olpcgames/COPYING b/olpcgames/COPYING new file mode 100644 index 0000000..94a9ed0 --- /dev/null +++ b/olpcgames/COPYING @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <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>. diff --git a/olpcgames/__init__.py b/olpcgames/__init__.py index e65c295..504388c 100644..100755 --- a/olpcgames/__init__.py +++ b/olpcgames/__init__.py @@ -1,8 +1,102 @@ -try:
- from canvas import * - from activity import *
- import camera -except ImportError:
- pass
-
-widget = None
+"""Wrapper/adaptation system for writing/porting Pygame games to OLPC/Sugar + +The wrapper system attempts to substitute various pieces of the Pygame +implementation in order to make code written without knowledge of the +OLPC/Sugar environment run "naturally" under the GTK environment of +Sugar. It also provides some convenience mechanisms for dealing with +e.g. the Camera and Mesh Network system. + +Considerations for Developers: + +Pygame programs running under OLPCGames will generally not have +"hardware" surfaces, and will not be able to have a reduced-resolution +full-screen view to optimise rendering. The Pygame code will run in +a secondary thread, with the main GTK UI running in the primary thread. +A third "mainloop" thread will occasionally be created to handle the +GStreamer interface to the camera. + +Attributes of Note: + + ACTIVITY -- if not None, then the activity instance which represents + this activity at the Sugar shell level. + WIDGET -- PygameCanvas instance, a GTK widget with an embedded + socket object which is a proxy for the SDL window Pygame to which + pygame renders. + + Constants: All event constants used by the package are defined at this + level. Note that eventually we will need to switch to using UserEvent + and making these values sub-types rather than top-level types. + + +Pygame events at the Activity Level: + + pygame.USEREVENT + code == olpcgames.FILE_READ_REQUEST + filename (unicode/string) -- filename from which to read + metadata (dictionary-like) -- mapping from key to string values + + Note: due to a limitation in the Sugar API, the GTK event loop + will be *frozen* during this operation, as a result you cannot + make any DBUS or GTK calls, nor can you use GUI during the + call to provide input. That is, you have to process this event + synchronously. + + code == olpcgames.FILE_WRITE_REQUEST + filename (unicode/string) -- file name to which to write + metadata (dictionary-like) -- mapping from key: value where all + values must (currently) be strings + + Note: due to a limitation in the Sugar API, the GTK event loop + will be *frozen* during this operation, as a result you cannot + make any DBUS or GTK calls, nor can you use GUI during the + call to provide input. That is, you have to process this event + synchronously. + +see also the mesh and camera modules for more events. + +Deprecated: + + This module includes the activity.PyGameActivity class currently, + this is a deprecated mechanism for accessing the activity class, + and uses the deprecated spelling (case) of the name. Use: + + from olpcgames import activity + + class MyActivity( activity.PygameActivity ): + ... + + to define your PygameActivity subclass (note the case of the + spelling, which now matches Pygame's own spelling). +""" +from olpcgames._version import __version__ +ACTIVITY = None +widget = WIDGET = None + +# XXX problem here, we're filling up the entirety of the Pygame +# event-set with just this small bit of functionality, obviously +# Pygame is not intending for this kind of usage! +( + CAMERA_LOAD, CAMERA_LOAD_FAIL, + + CONNECT,PARTICIPANT_ADD, + PARTICIPANT_REMOVE, + MESSAGE_UNI,MESSAGE_MULTI, +) = range( 25, 32 ) + +# These events use UserEvent.code, eventually *all* events should be +# delivered as UserEvent with code set to the values defined here... + +( + #NET_CONNECT, NET_PARTICIPANT_ADD,NET_PARTICIPANT_REMOVE, + #NET_MESSAGE_UNICAST, NET_MESSAGE_MULTICAST, + #CAMERA_LOAD, CAMERA_LOAD_FAIL, + FILE_READ_REQUEST, FILE_WRITE_REQUEST, +) = range( + 2**16, 2**16+2, +) + +try: + from olpcgames.activity import PygameActivity as PyGameActivity +except ImportError, err: + PyGameActivity = None + diff --git a/olpcgames/_cairoimage.py b/olpcgames/_cairoimage.py new file mode 100755 index 0000000..3cfa22c --- /dev/null +++ b/olpcgames/_cairoimage.py @@ -0,0 +1,135 @@ +"""Utility functions for cairo-specific operations + +USE_BASE_ARRAY -- if False (default), uses numpy arrays, + currently this is the only version that works on 32-bit + machines. +""" +import pygame, struct, logging +big_endian = struct.pack( '=i', 1 ) == struct.pack( '>i', 1 ) + +log = logging.getLogger( 'olpcgames._cairoimage' ) +##log.setLevel( logging.DEBUG ) + +USE_BASE_ARRAY = False + +def newContext( width, height ): + """Create a new render-to-image context + + width, height -- pixel dimensions to be rendered + + Produces an ARGB format Cairo ImageSurface for + rendering your data into using rsvg, Cairo or Pango. + + returns (ImageSurface, CairoContext) for rendering + """ + import cairo + csrf = cairo.ImageSurface(cairo.FORMAT_ARGB32, width, height) + context = cairo.Context (csrf) + #log.info( 'Format (expect: %s): %s', cairo.FORMAT_ARGB32, csrf.get_format()) + return csrf, context + +def mangle_color(color): + """Mange a colour depending on endian-ness, and swap-necessity + + Converts a 3 or 4 int (or float) value in the range 0-255 into a + 4-float value in the range 0.0-1.0 + """ + r,g,b = color[:3] + if len(color) > 3: + a = color[3] + else: + a = 255.0 + return map(_fixColorBase, (r,g,b,a) ) + +def _fixColorBase( v ): + """Return a properly clamped colour in floating-point space""" + return max((0,min((v,255.0))))/255.0 + +def asImage( csrf ): + """Get the pixels in csrf as a Pygame image + + Note that Pygame 1.7.1 on (Gentoo Linux) AMD64 is incorrectly + calculating the required size ARGB images, so this code will *not* work + on that platform with that version of the library. Pygame-ctypes + does work correctly there. + + Note also that Pygame 1.7.1 is showing a strange colour rotation + bug on 32-bit platforms, such that ARGB mode cannot be used for + images there. Instead we have to do an expensive bit-shift operation + to produce an RGBA image from the ARGB native Cairo format. + + Will raise a ValueError if passed a Null image (i.e. dimension of 0) + + returns Pygame.Surface (image) with convert_alpha() called for it. + """ + # Create and return a new Pygame Image derived from the Cairo Surface + format = 'ARGB' + if hasattr(csrf,'get_data'): + # more recent API, native-format, but have to (potentially) convert the format... + log.debug( 'Native-mode api (get_data)' ) + data = csrf.get_data() + if not big_endian: + # we use array here because it's considerably lighter-weight + # to import than the numpy module + log.debug( 'Not big-endian, byte-swapping array' ) + if USE_BASE_ARRAY: + import array + a = array.array( 'I' ) + a.fromstring( data ) + a.byteswap() + data = a.tostring() + else: + import numpy + n = numpy.fromstring( data, dtype='I' ) + n = ((n & 0xff000000) >> 24 ) | ((n & 0x00ffffff) << 8 ) + n = n.byteswap() + data = n.tostring() + format = 'RGBA' + else: + log.debug( 'Big-endian, array unchanged' ) + data = str(data) # there's one copy + else: + # older api, not native, but we know what it is... + log.debug( 'Non-native mode api, explicitly RGBA' ) + data = csrf.get_data_as_rgba() + data = str(data) # there's one copy + format = 'RGBA' + width, height = csrf.get_width(),csrf.get_height() + + try: + log.info( 'Format = %s', format ) + return pygame.image.fromstring( + data, + (width,height), + format + ) # there's the next + except ValueError, err: + err.args += (len(data), (width,height), width*height*4,format ) + raise + +if __name__ == "__main__": + import unittest + logging.basicConfig() + class Tests( unittest.TestCase ): + def test_colours( self ): + """Test that colours are correctly translated + + If we draw a given colour in cairo, we want the same + colour to show up in Pygame, let's test that... + """ + for sourceColour in [ + (255,0,0, 255), + (0,255,0, 255), + (0,0,255, 255), + (255,255,0, 255), + (0,255,255,255), + (255,0,255,255), + ]: + csrf,cctx = newContext( 1,1 ) + background = mangle_color( sourceColour ) + cctx.set_source_rgba(*background) + cctx.paint() + img = asImage( csrf ) + colour = img.get_at( (0,0)) + assert colour == sourceColour, (sourceColour,mangle_color(sourceColour),colour) + unittest.main() diff --git a/olpcgames/_gtkmain.py b/olpcgames/_gtkmain.py new file mode 100755 index 0000000..33a6a83 --- /dev/null +++ b/olpcgames/_gtkmain.py @@ -0,0 +1,70 @@ +"""Support for GObject mainloop-requiring libraries when not inside GTK + +INITIALIZED -- whether we have a running gobject loop yet... +LOOP_TRACKER -- if present, the manual gtk event loop used to + support gobject-based code running in a non-Gobject event loop + +Holder -- objects which can be held as attributes to keep the mainloop running +""" +import threading, logging +log = logging.getLogger( 'olpcgames._gtkmain' ) +##log.setLevel( logging.DEBUG ) + +INITIALIZED = False +LOOP_TRACKER = None + +class _TrackLoop( object ): + """Tracks the number of open loops and stops when finished""" + count = 0 + _mainloop = None + def increment( self ): + log.info( 'Increment from %s', self.count ) + self.count += 1 # XXX race condition here? + if self.count == 1: + log.info( 'Creating GObject mainloop') + self.t_loop = threading.Thread(target=self.loop) + self.t_loop.setDaemon( True ) + self.t_loop.start() + def decrement( self ): + log.info( 'Decrement from %s', self.count ) + self.count -= 1 + def loop( self ): + """Little thread loop that replicates the gtk mainloop""" + import gtk + while self.count >= 1: + log.debug( 'GTK loop restarting' ) + while gtk.events_pending(): + gtk.main_iteration() + log.debug( 'GTK loop exiting' ) + try: + del self.t_loop + except AttributeError, err: + pass + +class Holder(): + """Object which, while held, keeps the gtk mainloop running""" + def __init__( self ): + log.info( 'Beginning hold on GTK mainloop with Holder object' ) + startGTK() + def __del__( self ): + log.info( 'Releasing hold on GTK mainloop with Holder object' ) + stopGTK() + +def startGTK( ): + """GTK support is required here, process...""" + if not INITIALIZED: + init() + if LOOP_TRACKER: + LOOP_TRACKER.increment() +def stopGTK( ): + """GTK support is no longer required, release""" + if LOOP_TRACKER: + LOOP_TRACKER.decrement() +def init( ): + """Create a gobject mainloop in a sub-thread (you don't need to call this normally)""" + global INITIALIZED, LOOP_TRACKER + if not INITIALIZED: + if not LOOP_TRACKER: + LOOP_TRACKER = _TrackLoop() + INITIALIZED = True + return LOOP_TRACKER diff --git a/olpcgames/_version.py b/olpcgames/_version.py new file mode 100755 index 0000000..4c42917 --- /dev/null +++ b/olpcgames/_version.py @@ -0,0 +1,2 @@ +"""Module defining the current version of the library""" +__version__ = '2.0' diff --git a/olpcgames/activity.py b/olpcgames/activity.py index 91e92a7..538ba13 100644..100755 --- a/olpcgames/activity.py +++ b/olpcgames/activity.py @@ -1,35 +1,241 @@ +"""Embeds the Canvas widget into a Sugar-specific Activity environment + +The olpcgames.activity module encapsulates creation of a Pygame activity. +Your Activity should inherit from this class. Simply setting some class +attributes is all you need to do in a class inheriting from +olpcgames.activity.PygameActivity in order to get Pygame to work. + +(The skeleton builder script creates this file automatically for you). + +Note: + You should not import pygame into your activity file, as the olpcgames + wrapper needs to be initialized before pygame is imported the first time. + +Example usage: + + class PygameActivity(activity.Activity): + game_name = None + game_title = 'Pygame Game' + game_size = (units.grid_to_pixels(16), + units.grid_to_pixels(11)) + pygame_mode = 'SDL' +""" +import logging +logging.root.setLevel( logging.WARN ) +log = logging.getLogger( 'olpcgames.activity' ) +##log.setLevel( logging.DEBUG ) + import pygtk pygtk.require('2.0') import gtk -import hippo +import gtk.gdk +import os from sugar.activity import activity -from sugar.graphics import units -from olpcgames.canvas import PyGameCanvas +from sugar.graphics import style +from olpcgames.canvas import PygameCanvas +from olpcgames import mesh, util -__all__ = ['PyGameActivity'] +__all__ = ['PygameActivity'] -class PyGameActivity(activity.Activity): - +class PygameActivity(activity.Activity): + """Pygame-specific activity type, provides boilerplate toolbar, creates canvas + + Subclass Overrides: + + game_name -- specifies a fully-qualified name for the game's main-loop + format like so: + 'package.module:main' + if no function name is provided, "main" is assumed. + + game_handler -- DEPRECATED. alternate specification via direct + reference to a main-loop function. + + game_size -- two-value tuple specifying the size of the display in pixels, + this is currently static, so once the window is created it cannot be + changed. + + If None, use the bulk of the screen for the Pygame surface based on + the values reported by the gtk.gdk functions. Note that None is + *not* the default value. + + game_title -- title to be displayed in the Sugar Shell UI + + pygame_mode -- chooses the rendering engine used for handling the + Pygame drawing mode, 'SDL' chooses the standard Pygame renderer, + 'Cairo' chooses the experimental pygamecairo renderer. + + Note: You likely do *not* want to use Cairo, it is no longer maintained. + + PYGAME_CANVAS_CLASS -- normally PygameCanvas, but can be overridden + if you want to provide a different canvas class, e.g. to provide a different + internal layout. Note: only used where pygame_mode == 'SDL' + + The Activity, once created, will be made available as olpcgames.ACTIVITY, + and that access mechanism should allow code to test for the presence of the + activity before accessing Sugar-specific functionality. + + XXX Note that currently the toolbar and window layout are hard-coded into + this super-class, with no easy way of overriding without completely rewriting + the __init__ method. We should allow for customising both the UI layout and + the toolbar contents/layout/connection. + + XXX Note that if you change the title of your activity in the toolbar you may + see the same focus issues as we have patched around in the build_toolbar + method. If so, please report them to Mike Fletcher. + """ game_name = None - game_title = 'PyGame Game' + game_title = 'Pygame Game' game_handler = None - game_size = (units.grid_to_pixels(16), - units.grid_to_pixels(11)) - + game_size = (16 * style.GRID_CELL_SIZE, + 11 * style.GRID_CELL_SIZE) + pygame_mode = 'SDL' + def __init__(self, handle): - super(PyGameActivity, self).__init__(handle) - - self.set_title(self.game_title) - - toolbar = activity.ActivityToolbar(self) - toolbar.show() - self.set_toolbox(toolbar) - toolbar.title.unset_flags(gtk.CAN_FOCUS) + """Initialise the Activity with the activity-description handle""" + super(PygameActivity, self).__init__(handle) + self.make_global() + if self.game_size is None: + width,height = gtk.gdk.screen_width(), gtk.gdk.screen_height() + log.info( 'Total screen size: %s %s', width,height) + # for now just fudge the toolbar size... + self.game_size = width, height - (1*style.GRID_CELL_SIZE) + self.set_title(self.game_title) + toolbar = self.build_toolbar() + log.debug( 'Toolbar size: %s', toolbar.get_size_request()) + canvas = self.build_canvas() + self.connect( 'configure-event', canvas._translator.do_resize_event ) + + def make_global( self ): + """Hack to make olpcgames.ACTIVITY point to us + """ + import weakref, olpcgames + assert not olpcgames.ACTIVITY, """Activity.make_global called twice, have you created two Activity instances in a single process?""" + olpcgames.ACTIVITY = weakref.proxy( self ) + + def build_toolbar( self ): + """Build our Activity toolbar for the Sugar system + + This is a customisation point for those games which want to + provide custom toolbars when running under Sugar. + """ + toolbar = activity.ActivityToolbar(self) + toolbar.show() + self.set_toolbox(toolbar) + def shared_cb(*args, **kwargs): + log.info( 'shared: %s, %s', args, kwargs ) + try: + mesh.activity_shared(self) + except Exception, err: + log.error( """Failure signaling activity sharing to mesh module: %s""", util.get_traceback(err) ) + else: + log.info( 'mesh activity shared message sent, trying to grab focus' ) + try: + self._pgc.grab_focus() + except Exception, err: + log.warn( 'Focus failed: %s', err ) + else: + log.info( 'asserting focus' ) + assert self._pgc.is_focus(), """Did not successfully set pygame canvas focus""" + log.info( 'callback finished' ) - assert self.game_handler or self.game_name, 'You must specify a handler module (%r)'%(self.game_handler or self.game_name) - self._pgc = PyGameCanvas(*self.game_size) + def joined_cb(*args, **kwargs): + log.info( 'joined: %s, %s', args, kwargs ) + mesh.activity_joined(self) + self._pgc.grab_focus() + self.connect("shared", shared_cb) + self.connect("joined", joined_cb) + + if self.get_shared(): + # if set at this point, it means we've already joined (i.e., + # launched from Neighborhood) + joined_cb() + + toolbar.title.unset_flags(gtk.CAN_FOCUS) + return toolbar + + PYGAME_CANVAS_CLASS = PygameCanvas + def build_canvas( self ): + """Construct the Pygame or PygameCairo canvas for drawing""" + assert self.game_handler or self.game_name, 'You must specify a game_handler or game_name on your Activity (%r)'%( + self.game_handler or self.game_name + ) + if self.pygame_mode != 'Cairo': + self._pgc = self.PYGAME_CANVAS_CLASS(*self.game_size) self.set_canvas(self._pgc) self._pgc.grab_focus() self._pgc.connect_game(self.game_handler or self.game_name) + # XXX Bad coder, do not hide in a widely subclassed operation + # map signal does not appear to show up on socket instances gtk.gdk.threads_init() + return self._pgc + else: + import hippo + self._drawarea = gtk.DrawingArea() + canvas = hippo.Canvas() + canvas.grab_focus() + self.set_canvas(canvas) + self.show_all() + + import pygamecairo + pygamecairo.install() + + pygamecairo.display.init(canvas) + app = self.game_handler or self.game_name + if ':' not in app: + app += ':main' + mod_name, fn_name = app.split(':') + mod = __import__(mod_name, globals(), locals(), []) + fn = getattr(mod, fn_name) + fn() + def read_file(self, file_path): + """Handle request to read the given file on the Pygame side + + This is complicated rather noticeably by the silly semantics of the Journal + where it unlinks the file as soon as this method returns. We either have to + handle the file-opening in PyGTK (not acceptable), block this thread until + the Pygame thread handles the event (which it may never do) or we have + to make the silly thing use a non-standard file-opening interface. + """ + log.info( 'read_file: %s %s', file_path, self.metadata ) + import olpcgames, pygame + from olpcgames import eventwrap + event = eventwrap.Event( + type = pygame.USEREVENT, + code = olpcgames.FILE_READ_REQUEST, + filename = file_path, + metadata = self.metadata, + ) + eventwrap.post( event ) + event.block() + def write_file( self, file_path ): + """Handle request to write to the given file on the Pygame side + + This is rather complicated by the need to have the file complete by the + time the function returns. Very poor API, after all, if I have to write a + multi-hundred-megabyte file it might take many minutes to complete + writing. + """ + log.info( 'write_file: %s %s', file_path, self.metadata ) + if os.path.exists( file_path ): + self.read_file( file_path ) + import olpcgames, pygame + from olpcgames import eventwrap + event = eventwrap.Event( + type = pygame.USEREVENT, + code = olpcgames.FILE_WRITE_REQUEST, + filename = file_path, + metadata = self.metadata, + ) + eventwrap.post( event ) + event.block() + if not os.path.exists( file_path ): + log.warn( '''No file created in %r''', file_path ) + raise NotImplementedError( """Pygame Activity code did not produce a file for %s"""%( file_path, )) + else: + log.info( '''Stored file in %r''', file_path ) + + +import olpcgames +olpcgames.PyGameActivity = PygameActivity +PyGameActivity = PygameActivity diff --git a/olpcgames/buildmanifest.py b/olpcgames/buildmanifest.py new file mode 100755 index 0000000..899433b --- /dev/null +++ b/olpcgames/buildmanifest.py @@ -0,0 +1,33 @@ +#! /usr/bin/env python +"""Stupid little script to automate generation of MANIFEST and po/POTFILES.in + +Really this should have been handled by using distutils, but oh well, +distutils is a hoary beast and I can't fault people for not wanting to +spend days spelunking around inside it to find the solutions... +""" +from distutils.filelist import FileList +import os + +def fileList( template ): + """Produce a formatted file-list for storing in a file""" + files = FileList() + for line in filter(None,template.splitlines()): + files.process_template_line( line ) + content = '\n'.join( files.files ) + return content + + +def main( ): + """Do the quicky finding of files for our manifests""" + content = fileList( open('MANIFEST.in').read() ) + open( 'MANIFEST','w').write( content ) + + content = fileList( open('POTFILES.in').read() ) + try: + os.makedirs( 'po' ) + except OSError, err: + pass + open( os.path.join('po','POTFILES.in'), 'w').write( content ) + +if __name__ == "__main__": + main() diff --git a/olpcgames/camera.py b/olpcgames/camera.py index 96262df..249f295 100644..100755 --- a/olpcgames/camera.py +++ b/olpcgames/camera.py @@ -1,76 +1,221 @@ -import threading
-import time
-import os
-
-import pygame
-import gst
-
-import video
-
-class CameraSprite(object):
- """Create gstreamer surface for the camera."""
-
- def __init__(self, x, y):
- import olpcgames
- if olpcgames.widget:
- self._init_video(olpcgames.widget, x, y)
-
- def _init_video(self, widget, x, y):
- self._vid = video.VideoWidget()
- widget._fixed.put(self._vid, x, y)
- self._vid.show()
-
- self.player = video.Player(self._vid)
- self.player.play()
-
-class Camera(object):
- """A class representing the camera."""
-
- def __init__(self):
- self.pipe = gst.parse_launch('v4l2src ! ffmpegcolorspace ! pngenc ! filesink location="/tmp/snap.png"')
- self.bus = self.pipe.get_bus()
-
- def snap(self):
- print 'Starting snap'
- self.pipe.set_state(gst.STATE_PLAYING)
- #while True:
- # evt = self.bus.poll(gst.MESSAGE_ANY, -1)
- # print 'Event %s %r'%(evt.type, evt)
- # os.system('du -hcs /tmp/snap.png')
- tmp = False
- while True:
- evt = self.bus.poll(gst.MESSAGE_STATE_CHANGED, -1)
- old, new, pending = evt.parse_state_changed()
- if pending == gst.STATE_VOID_PENDING:
- if tmp:
- break
- else:
- tmp = True
- print 'Ending snap'
-
- return pygame.image.load('/tmp/snap.png')
-
-def snap():
- """Dump a snapshot from the camera to a pygame surface."""
-
- pipe = gst.parse_launch('v4l2src ! ffmpegcolorspace ! pngenc ! filesink location="/tmp/snap.png"')
- bus = pipe.get_bus()
- cond = threading.Condition()
- cond.acquire()
-
- def _msg(bus, message):
- t = message.type
- if t == gst.MESSAGE_EOS:
- cond.acquire()
- cond.notify()
- cond.release()
- bus.connect('message', _msg)
-
- def _snap():
- pipe.set_state(gst.STATE_PLAYING)
-
- t = threading.Thread(target=_snap)
- t.start()
- cond.wait()
-
- return pygame.image.load('/tmp/snap.png')
\ No newline at end of file +"""Accesses OLPC Camera functionality via gstreamer + +Depends upon: + pygame + gstreamer (particularly gst-launch) + +Activity demonstrating usage: + + http://dev.laptop.org/git?p=projects/games-misc;a=tree;f=cameratest.activity;hb=HEAD + + +""" +import threading, subprocess +import logging +import olpcgames +import time +import os +import pygame +from olpcgames.util import get_activity_root + +log = logging.getLogger( 'olpcgames.camera' ) +#log.setLevel( logging.DEBUG ) + +CAMERA_LOAD, CAMERA_LOAD_FAIL = olpcgames.CAMERA_LOAD, olpcgames.CAMERA_LOAD + +class Camera(object): + """A class representing a still-picture camera + + Produces a simple gstreamer bus that terminates in a filesink, that is, + it stores the results in a file. When a picture is "snapped" the gstreamer + stream is iterated until it finishes processing and then the file can be + read. + + There are two APIs available, a synchronous API which can potentially + stall your activity's GUI (and is NOT recommended) and an + asynchronous API which returns immediately and delivers the captured + camera image via a Pygame event. To be clear, it is recommended + that you use the snap_async method, *not* the snap method. + + Note: + + The Camera class is simply a convenience wrapper around a fairly + straightforward gst-launch bus. If you have more involved + requirements for your camera manipulations you will probably + find it easier to write your own camera implementation than to + use this one. Basically we provide here the "normal" use case of + snapping a picture into a pygame image. + + Note: + + With the current camera implementation taking a single photograph + requires about 6 seconds! Obviously we'll need to figure out what's + taking gstreamer so long to process the pipe and fix that. + + """ + _aliases = { + 'camera': 'v4l2src', + 'test': 'videotestsrc', + 'testing': 'videotestsrc', + 'png': 'pngenc', + 'jpeg': 'jpegenc', + 'jpg': 'jpegenc', + } + def __init__(self, source='camera', format='png', filename=None, directory = None): + """Initialises the Camera's internal description + + source -- the gstreamer source for the video to capture, useful values: + 'v4l2src','camera' -- the camera + 'videotestsrc','test' -- test pattern generator source + format -- the gstreamer encoder to use for the capture, useful values: + 'pngenc','png' -- PNG format graphic + 'jpegenc','jpg','jpeg' -- JPEG format graphic + filename -- the filename to use for the capture, if not specified defaults + to a random UUID + '.' + format + directory -- the directory in which to create the temporary file, defaults + to get_activity_root() + 'tmp' + """ + log.info( 'Creating camera' ) + if not filename: + import uuid + filename = '%s.%s'%( uuid.uuid4(), format ) + self.source = self._aliases.get( source, source ) + self.format = self._aliases.get( format, format ) + self.filename = filename + self.directory = directory + SNAP_PIPELINE = 'gst-launch','%(source)s','!','ffmpegcolorspace','!','%(format)s','!','filesink','location="%(filename)s"' + def _create_subprocess( self ): + """Method to create the gstreamer subprocess from our settings""" + if not self.directory: + path = os.path.join( get_activity_root(), 'tmp' ) + try: + os.makedirs( path ) + log.info( 'Created temporary directory: %s', path ) + except (OSError,IOError), err: + pass + else: + path = self.directory + filename = os.path.join( path, self.filename ) + format = self.format + source = self.source + pipeline = [s%locals() for s in self.SNAP_PIPELINE ] + return filename, subprocess.Popen( + pipeline,stderr = subprocess.PIPE + ) + + def snap(self): + """Snap a picture via the camera by iterating gstreamer until finished + + Note: this is an unsafe implementation, it will cause the whole + activity to hang until the capture finishes. Time to finish is often + measured in whole seconds (3-6s). + + It is *strongly* recommended that you use snap_async instead of snap! + """ + log.debug( 'Starting snap' ) + filename, pipe = self._create_subprocess() + if not pipe.wait(): + log.debug( 'Ending snap, loading: %s', filename ) + return self._load_and_clean( filename ) + else: + raise IOError( """Unable to complete snapshot: %s""", pipe.stderr.read() ) + def _load_and_clean( self, filename ): + """Use pygame to load given filename, delete after loading/attempt""" + try: + log.info( 'Loading snapshot file: %s', filename ) + return pygame.image.load(filename) + finally: + try: + os.remove( filename ) + except (IOError,OSError), err: + pass + def snap_async( self, token=None ): + """Snap a picture asynchronously generating event on success/failure + + token -- passed back as attribute of the event which signals that capture + is finished + + We return events of type CAMERA_LOAD with an attribute "succeed" + depending on whether we succeed or not. Attributes of the events which + are returned: + + success -- whether the loading process succeeded + token -- as passed to this method + image -- pygame image.load result if successful, None otherwise + filename -- the filename in our temporary directory we used to store + the file temporarily (this file will be deleted before the event + is sent, the name is for informational purposes only). + err -- Exception instance if failed, None otherwise + + Basically identical to the snap method, save that it posts a message + to the event bus in pygame.event instead of blocking and returning... + + Example: + if event == pygame.MOUSEBUTTONDOWN: + camera = Camera( source='test', filename = 'picture32' ) + camera.snap_async( myIdentifier ) + ... + elif event.type == olpcgames.CAMERA_LOAD: + if event.token == myIdentifier: + doSomething( event.image ) + """ + log.debug( 'beginning async snap') + t = threading.Thread(target=self._background_snap, args=[token]) + t.start() + return token + + def _background_snap( + self, + token = None, + ): + """Process gst messages until pipe is finished + + pipe -- gstreamer pipe definition for parse_launch, normally it will + produce a file into which the camera should store an image + + We consider pipe to be finished when we have had two "state changed" + gstreamer events where the pending state is VOID, the first for when + we begin playing, the second for when we finish. + """ + log.debug( 'Background thread kicking off gstreamer capture begun' ) + from pygame.event import Event, post + filename, pipe = self._create_subprocess() + if not pipe.wait(): + success = True + log.debug( 'Ending capture, loading: %s', filename ) + try: + image = self._load_and_clean( filename ) + except Exception, err: + image = None + success = False + else: + err = None + else: + success = False + err = pipe.stderr.read() + image = None + evt = Event( + CAMERA_LOAD, + dict( + filename=filename, + success = success, + token = token, + image=image, + err=err + ) + ) + post( evt ) + +def snap(): + """Dump a snapshot from the camera to a pygame surface in background thread + + See Camera.snap + """ + return Camera().snap() + +def snap_async( token=None, **named ): + """Dump snapshot from camera return asynchronously as event in Pygame + + See Camera.snap_async + """ + return Camera(**named).snap_async( token ) diff --git a/olpcgames/canvas.py b/olpcgames/canvas.py index b90238d..2583827 100644..100755 --- a/olpcgames/canvas.py +++ b/olpcgames/canvas.py @@ -1,283 +1,171 @@ -import os
-import sys
-import threading
-from pprint import pprint
-
-import pygtk
-pygtk.require('2.0')
-import gtk
-import gobject
-import pygame
-
-import video
-
-__all__ = ['PyGameCanvas']
-
-class MockEvent(object):
- """Used to inject key-repeat events."""
-
- def __init__(self, keyval):
- self.keyval = keyval
-
-class PyGameCanvas(gtk.EventBox):
-
- key_trans = {
- 'Alt_L': pygame.K_LALT,
- 'Alt_R': pygame.K_RALT,
- 'Control_L': pygame.K_LCTRL,
- 'Control_R': pygame.K_RCTRL,
- 'Shift_L': pygame.K_LSHIFT,
- 'Shift_R': pygame.K_RSHIFT,
- 'Super_L': pygame.K_LSUPER,
- 'Super_R': pygame.K_RSUPER,
- 'KP_Page_Up' : pygame.K_KP9,
- 'KP_Page_Down' : pygame.K_KP3,
- 'KP_End' : pygame.K_KP1,
- 'KP_Home' : pygame.K_KP7,
- 'KP_Up': pygame.K_KP8,
- 'KP_Down': pygame.K_KP2,
- 'KP_Left': pygame.K_KP4,
- 'KP_Right': pygame.K_KP6
- }
-
- mod_map = {
- pygame.K_LALT: pygame.KMOD_LALT,
- pygame.K_RALT: pygame.KMOD_RALT,
- pygame.K_LCTRL: pygame.KMOD_LCTRL,
- pygame.K_RCTRL: pygame.KMOD_RCTRL,
- pygame.K_LSHIFT: pygame.KMOD_LSHIFT,
- pygame.K_RSHIFT: pygame.KMOD_RSHIFT,
- }
-
- def __init__(self, width, height):
-
- # Build the main widget
- super(PyGameCanvas,self).__init__()
-
- # Build the sub-widgets
- self._fixed = gtk.Fixed()
- self._align = gtk.Alignment(0.5, 0.5)
- self._inner_evb = gtk.EventBox()
- self._socket = gtk.Socket()
-
- # Set our X event masks
- self.set_events(
- gtk.gdk.KEY_PRESS_MASK | \
- gtk.gdk.KEY_RELEASE_MASK \
- )
-
- self._inner_evb.set_events(
- gtk.gdk.POINTER_MOTION_MASK | \
- gtk.gdk.POINTER_MOTION_HINT_MASK | \
- gtk.gdk.BUTTON_MOTION_MASK | \
- gtk.gdk.BUTTON_PRESS_MASK | \
- gtk.gdk.BUTTON_RELEASE_MASK
- )
-
- # Add internal widgets
- self._inner_evb.set_size_request(width, height)
- self._inner_evb.add(self._socket)
- self._socket.show()
-
- self._align.add(self._inner_evb)
- self._inner_evb.show()
-
- self._fixed.put(self._align, 0, 0)
- self._align.show()
-
- self.add(self._fixed)
- self._fixed.show()
-
- # Callback functions to link the event systems
- self.connect('unrealize', self._quit)
- self.connect('key_press_event', self._keydown)
- self.connect('key_release_event', self._keyup)
- self._inner_evb.connect('button_press_event', self._mousedown)
- self._inner_evb.connect('button_release_event', self._mouseup)
- self._inner_evb.connect('motion-notify-event', self._mousemove)
-
- # <Cue Thus Spract Zarathustra>
- self.show()
- self.set_flags(gtk.CAN_FOCUS)
-
- # Internal data
- self.__stopped = False
- self.__keystate = [0] * 323
- self.__mouse_pos = (0,0)
- self.__repeat = (None, None)
- self.__held = set()
- self.__held_time_left = {}
- self.__held_last_time = {}
- self.__tick_id = None
-
- def connect_game(self, app):
- # Setup the embedding
- os.environ['SDL_WINDOWID'] = str(self._socket.get_id())
- #print 'Socket ID=%s'%os.environ['SDL_WINDOWID']
- pygame.init()
-
- # Hijack some function
- pygame.key.get_pressed = self._get_pressed
- pygame.key.set_repeat = self._set_repeat
- pygame.mouse.get_pos = self._get_mouse_pos
-
- # Load the modules
- # NOTE: This is delayed because pygame.init() must come after the embedding is up
- if ':' not in app:
- app += ':main'
- mod_name, fn_name = app.split(':')
- mod = __import__(mod_name, globals(), locals(), [])
- fn = getattr(mod, fn_name)
-
- # Start Pygame
- self.__thread = threading.Thread(target=self._start, args=[fn])
- self.__thread.start()
-
- def _start(self, fn):
- import olpcgames
- olpcgames.widget = self
-
- fn()
- if not self.__stopped:
- gtk.main_quit()
-
- def _quit(self, data=None):
- print 'Quitting pygame'
- self.__stopped = True
- pygame.event.post(pygame.event.Event(pygame.QUIT))
- self.__thread.join()
- print 'Gone'
-
- def _keydown(self, widget, event):
- key = event.keyval
- if key in self.__held:
- return True
- else:
- if self.__repeat[0] is not None:
- self.__held_last_time[key] = pygame.time.get_ticks()
- self.__held_time_left[key] = self.__repeat[0]
- self.__held.add(key)
-
- return self._keyevent(widget, event, pygame.KEYDOWN)
-
- def _keyup(self, widget, event):
- key = event.keyval
- if self.__repeat[0] is not None:
- if key in self.__held:
- # This is possibly false if set_repeat() is called with a key held
- del self.__held_time_left[key]
- del self.__held_last_time[key]
- self.__held.discard(key)
-
- return self._keyevent(widget, event, pygame.KEYUP)
-
- def _keymods(self):
- """Extract the keymods as they stand currently."""
- mod = 0
- for key_val, mod_val in self.mod_map.iteritems():
- mod |= self.__keystate[key_val] and mod_val
- return mod
-
-
- def _keyevent(self, widget, event, type):
- key = gtk.gdk.keyval_name(event.keyval)
- if key is None:
- # No idea what this key is.
- return False
-
- keycode = None
- if key in self.key_trans:
- keycode = self.key_trans[key]
- elif hasattr(pygame, 'K_'+key.upper()):
- keycode = getattr(pygame, 'K_'+key.upper())
- elif hasattr(pygame, 'K_'+key.lower()):
- keycode = getattr(pygame, 'K_'+key.lower())
- else:
- print 'Key %s unrecognized'%key
-
- if keycode is not None:
- if type == pygame.KEYDOWN:
- mod = self._keymods()
- self.__keystate[keycode] = type == pygame.KEYDOWN
- if type == pygame.KEYUP:
- mod = self._keymods()
- ukey = gtk.gdk.keyval_to_unicode(event.keyval)
- evt = pygame.event.Event(type, key=keycode, unicode=ukey, mod=mod)
- self._post(evt)
- return True
-
- def _get_pressed(self):
- return self.__keystate
-
- def _mousedown(self, widget, event):
- return self._mouseevent(widget, event, pygame.MOUSEBUTTONDOWN)
-
- def _mouseup(self, widget, event):
- return self._mouseevent(widget, event, pygame.MOUSEBUTTONUP)
-
- def _mouseevent(self, widget, event, type):
- evt = pygame.event.Event(type,
- button=event.button,
- pos=(event.x, event.y))
- self._post(evt)
- return True
-
- def _mousemove(self, widget, event):
- # From http://www.learningpython.com/2006/07/25/writing-a-custom-widget-using-pygtk/
- # if this is a hint, then let's get all the necessary
- # information, if not it's all we need.
- if event.is_hint:
- x, y, state = event.window.get_pointer()
- else:
- x = event.x
- y = event.y
- state = event.state
-
- rel = (x - self.__mouse_pos[0],
- y - self.__mouse_pos[1])
- self.__mouse_pos = (x, y)
-
- buttons = (
- state & gtk.gdk.BUTTON1_MASK and 1 or 0,
- state & gtk.gdk.BUTTON2_MASK and 1 or 0,
- state & gtk.gdk.BUTTON3_MASK and 1 or 0,
- )
-
- evt = pygame.event.Event(pygame.MOUSEMOTION,
- pos=self.__mouse_pos,
- rel=rel,
- buttons=buttons)
- self._post(evt)
- return True
-
- def _tick(self):
- cur_time = pygame.time.get_ticks()
- for key in self.__held:
- delta = cur_time - self.__held_last_time[key]
- self.__held_last_time[key] = cur_time
-
- self.__held_time_left[key] -= delta
- if self.__held_time_left[key] <= 0:
- self.__held_time_left[key] = self.__repeat[1]
- self._keyevent(None, MockEvent(key), pygame.KEYDOWN)
-
- return True
-
- def _set_repeat(self, delay=None, interval=None):
- if delay is not None and self.__repeat[0] is None:
- self.__tick_id = gobject.timeout_add(10, self._tick)
- elif delay is None and self.__repeat[0] is not None:
- gobject.source_remove(self.__tick_id)
- self.__repeat = (delay, interval)
-
- def _get_mouse_pos(self):
- return self._inner_evb.window.get_pointer()[0:2]
-
- def _post(self, evt):
- try:
- pygame.event.post(evt)
- except pygame.error, e:
- if str(e) == 'Event queue full':
- pass
- else:
- raise e
+"""Implements bridge connection between Sugar/GTK and Pygame""" +import os +import sys +import logging +log = logging.getLogger( 'olpcgames.canvas' ) +##log.setLevel( logging.DEBUG ) +import threading +from pprint import pprint + +import pygtk +pygtk.require('2.0') +import gtk +import gobject +import pygame + +from olpcgames import gtkEvent, util + +__all__ = ['PygameCanvas'] + +class PygameCanvas(gtk.Layout): + """Canvas providing bridge methods to run Pygame in GTK + + The PygameCanvas creates a secondary thread in which the Pygame instance will + live, providing synthetic Pygame events to that thread via a Queue. The GUI + connection is done by having the Pygame canvas use a GTK Port object as it's + window pointer, it draws to that X-level window in order to produce output. + """ + mod_name = None + def __init__(self, width, height): + """Initializes the Canvas Object + + width,height -- passed to the inner EventBox in order to request a given size, + the Socket is the only child of this EventBox, and the Pygame commands + will be writing to the Window ID of the socket. The internal EventBox is + centered via an Alignment instance within the PygameCanvas instance. + + XXX Should refactor so that the internal setup can be controlled by the + sub-class, e.g. to get size from the host window, or something similar. + """ + # Build the main widget + log.info( 'Creating the pygame canvas' ) + super(PygameCanvas,self).__init__() + self.set_flags(gtk.CAN_FOCUS) + + # Build the sub-widgets + self._align = gtk.Alignment(0.5, 0.5) + self._inner_evb = gtk.EventBox() + self._socket = gtk.Socket() + + + # Add internal widgets + self._inner_evb.set_size_request(width, height) + self._inner_evb.add(self._socket) + + self._socket.show() + + self._align.add(self._inner_evb) + self._inner_evb.show() + + self._align.show() + + self.put(self._align, 0,0) + + # Construct a gtkEvent.Translator + self._translator = gtkEvent.Translator(self, self._inner_evb) + # <Cue Thus Spract Zarathustra> + self.show() + def connect_game(self, app): + """Imports the given main-loop and starts processing in secondary thread + + app -- fully-qualified Python path-name for the game's main-loop, with + name within module as :functionname, if no : character is present then + :main will be assumed. + + Side effects: + + Sets the SDL_WINDOWID variable to our socket's window ID + Calls Pygame init + Causes the gtkEvent.Translator to "hook" Pygame + Creates and starts secondary thread for Game/Pygame event processing. + """ + log.info( 'Connecting the pygame canvas' ) + # Setup the embedding + os.environ['SDL_WINDOWID'] = str(self._socket.get_id()) + #print 'Socket ID=%s'%os.environ['SDL_WINDOWID'] + pygame.init() + + self._translator.hook_pygame() + + # Load the modules + # NOTE: This is delayed because pygame.init() must come after the embedding is up + if ':' not in app: + app += ':main' + mod_name, fn_name = app.split(':') + self.mod_name = mod_name + mod = __import__(mod_name, globals(), locals(), []) + fn = getattr(mod, fn_name) + + # Start Pygame + self.__thread = threading.Thread(target=self._start, args=[fn]) + self.__thread.start() + + def _start(self, fn): + """The method that actually runs in the background thread""" + log.info( 'Staring the mainloop' ) + import olpcgames + olpcgames.widget = olpcgames.WIDGET = self + try: + import sugar.activity.activity,os + except ImportError, err: + log.info( """Running outside Sugar""" ) + else: + try: + os.chdir(sugar.activity.activity.get_bundle_path()) + except KeyError, err: + pass + + try: + try: + try: + log.info( '''Running mainloop: %s''', fn ) + fn() + except Exception, err: + log.error( + """Uncaught top-level exception: %s""", + util.get_traceback( err ), + ) + raise + else: + log.info( "Mainloop exited" ) + finally: + log.debug( "Clearing any pending events" ) + from olpcgames import eventwrap + eventwrap.clear() + finally: + log.info( 'Main function finished, calling main_quit' ) + gtk.main_quit() + + source_object_id = None + def view_source(self): + """Implement the 'view source' key by saving + datastore, and then telling the Journal to view it.""" + if self.source_object_id is None: + from sugar import profile + from sugar.datastore import datastore + from sugar.activity.activity import get_bundle_name, get_bundle_path + from gettext import gettext as _ + import os.path + jobject = datastore.create() + metadata = { + 'title': _('%s Source') % get_bundle_name(), + 'title_set_by_user': '1', + 'suggested_filename': 'pippy_app.py', + 'icon-color': profile.get_color().to_string(), + 'mime_type': 'text/x-python', + } + for k,v in metadata.items(): + jobject.metadata[k] = v # dict.update method is missing =( + jobject.file_path = os.path.join(get_bundle_path(), 'pippy_app.py') + datastore.write(jobject) + self.__source_object_id = jobject.object_id + jobject.destroy() + self.journal_show_object(self.__source_object_id) + def journal_show_object(self, object_id): + """Invoke journal_show_object from sugar.activity.activity if it + exists.""" + try: + from sugar.activity.activity import show_object_in_journal + show_object_in_journal(object_id) + except ImportError: + pass # no love from sugar. diff --git a/olpcgames/data/__init__.py b/olpcgames/data/__init__.py new file mode 100755 index 0000000..8510186 --- /dev/null +++ b/olpcgames/data/__init__.py @@ -0,0 +1,36 @@ +"""Design-time __init__.py for resourcepackage + +This is the scanning version of __init__.py for your +resource modules. You replace it with a blank or doc-only +init when ready to release. +""" +try: + __file__ +except NameError: + pass +else: + import os + if os.path.splitext(os.path.basename( __file__ ))[0] == "__init__": + try: + from resourcepackage import package, defaultgenerators + generators = defaultgenerators.generators.copy() + + ### CUSTOMISATION POINT + ## import specialised generators here, such as for wxPython + #from resourcepackage import wxgenerators + #generators.update( wxgenerators.generators ) + except ImportError: + pass + else: + package = package.Package( + packageName = __name__, + directory = os.path.dirname( os.path.abspath(__file__) ), + generators = generators, + ) + package.scan( + ### CUSTOMISATION POINT + ## force true -> always re-loads from external files, otherwise + ## only reloads if the file is newer than the generated .py file. + # force = 1, + ) + diff --git a/olpcgames/data/sleeping.svg b/olpcgames/data/sleeping.svg new file mode 100644 index 0000000..2c7ef50 --- /dev/null +++ b/olpcgames/data/sleeping.svg @@ -0,0 +1,52 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + width="737" + height="923" + version="1.0"> + <defs> + <linearGradient + id="linearGradient3152"> + <stop + style="stop-color:#b8ffb4;stop-opacity:1;" + offset="0" /> + <stop + offset="0.5" + style="stop-color:#2eff22;stop-opacity:0.5;" /> + <stop + style="stop-color:#ffffff;stop-opacity:0;" + offset="1" /> + </linearGradient> + <radialGradient + xlink:href="#linearGradient3152" + id="radialGradient3158" + cx="260" + cy="235" + fx="260" + fy="235" + r="259" + gradientTransform="matrix(1,0,0,1.2531846,0,-59.560934)" + gradientUnits="userSpaceOnUse" /> + </defs> + <g + transform="translate(-3,-73)"> + <path + style="opacity:1;color:#000000;fill:url(#radialGradient3158);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" + id="path2178" + d="M 519 235 A 259 324 0 1 1 0,235 A 259 324 0 1 1 519 235 z" + transform="matrix(1.4203822,0,0,1.4203822,0,200)" /> + <path + style="fill:#000000;fill-opacity:0.75;fill-rule:nonzero;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="M 420,366 C 438,381 455,400 478,408 C 523,427 576,424 620,405 C 632,400 644,393 655,387 C 652,389 638,397 649,391 C 658,385 666,379 676,376 C 688,370 673,379 669,382 C 637,401 604,421 566,427 C 526,435 482,429 446,408 C 431,398 419,385 405,374 C 410,371 415,368 420,366 z " /> + <path + style="fill:#000000;fill-opacity:0.75;fill-rule:nonzero;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="M 322,366 C 303,381 286,400 263,408 C 218,427 166,424 121,405 C 109,400 98,393 86,387 C 89,389 103,397 93,391 C 84,385 75,379 65,376 C 53,370 68,379 72,382 C 104,401 137,421 175,427 C 216,435 260,429 295,408 C 310,398 322,385 336,374 C 331,371 326,368 322,366 z " /> + <path + style="fill:#000000;fill-opacity:0.75;fill-rule:nonzero;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="M 363,383 C 347,418 353,458 345,495 C 339,525 324,551 312,579 C 304,598 298,620 309,639 C 317,655 335,667 353,669 C 379,671 405,664 429,653 C 442,646 405,667 423,656 C 429,652 434,647 441,645 C 455,639 439,650 434,653 C 408,669 378,679 347,679 C 327,679 308,667 297,651 C 285,634 287,613 294,594 C 302,570 316,548 324,523 C 335,493 335,460 338,428 C 340,415 342,401 349,390 C 353,388 358,385 363,383 z " /> + <path + style="fill:#000000;fill-opacity:0.75;fill-rule:nonzero;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="M 206,735 C 245,737 285,740 324,744 C 357,745 391,746 424,744 C 468,738 510,723 550,703 C 552,703 544,709 541,711 C 531,718 518,722 507,727 C 474,740 440,751 405,754 C 360,756 314,754 268,749 C 243,747 218,746 193,745 C 197,741 201,738 206,735 z " /> + </g> +</svg> diff --git a/olpcgames/data/sleeping_svg.py b/olpcgames/data/sleeping_svg.py new file mode 100755 index 0000000..c52398a --- /dev/null +++ b/olpcgames/data/sleeping_svg.py @@ -0,0 +1,61 @@ +# -*- coding: ISO-8859-1 -*- +"""Resource sleeping_svg (from file sleeping.svg)""" +# written by resourcepackage: (1, 0, 1) +source = 'sleeping.svg' +package = 'olpcgames.data' +data = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\012<svg\012\ + xmlns=\"http://www.w3.org/2000/svg\"\012 xmlns:xlink=\"http:/\ +/www.w3.org/1999/xlink\"\012 width=\"737\"\012 height=\"923\"\012 ve\ +rsion=\"1.0\">\012 <defs>\012 <linearGradient\012 id=\"linearG\ +radient3152\">\012 <stop\012 style=\"stop-color:#b8ffb4\ +;stop-opacity:1;\"\012 offset=\"0\" />\012 <stop\012 \ + offset=\"0.5\"\012 style=\"stop-color:#2eff22;stop-opaci\ +ty:0.5;\" />\012 <stop\012 style=\"stop-color:#ffffff;s\ +top-opacity:0;\"\012 offset=\"1\" />\012 </linearGradient>\ +\012 <radialGradient\012 xlink:href=\"#linearGradient3152\"\ +\012 id=\"radialGradient3158\"\012 cx=\"260\"\012 cy=\"2\ +35\"\012 fx=\"260\"\012 fy=\"235\"\012 r=\"259\"\012 gr\ +adientTransform=\"matrix(1,0,0,1.2531846,0,-59.560934)\"\012 \ + gradientUnits=\"userSpaceOnUse\" />\012 </defs>\012 <g\012 tran\ +sform=\"translate(-3,-73)\">\012 <path\012 style=\"opacity:1\ +;color:#000000;fill:url(#radialGradient3158);fill-opacity:1;\ +fill-rule:evenodd;stroke:none;stroke-width:1.5;stroke-lineca\ +p:butt;stroke-linejoin:miter;marker:none;marker-start:none;m\ +arker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-da\ +sharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility\ +:visible;display:inline;overflow:visible\"\012 id=\"path217\ +8\"\012 d=\"M 519 235 A 259 324 0 1 1 0,235 A 259 324 0 1 \ +1 519 235 z\"\012 transform=\"matrix(1.4203822,0,0,1.42038\ +22,0,200)\" />\012 <path\012 style=\"fill:#000000;fill-opac\ +ity:0.75;fill-rule:nonzero;stroke:none;stroke-width:1pt;stro\ +ke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1\"\012 \ + d=\"M 420,366 C 438,381 455,400 478,408 C 523,427 576,424 \ +620,405 C 632,400 644,393 655,387 C 652,389 638,397 649,391 \ +C 658,385 666,379 676,376 C 688,370 673,379 669,382 C 637,40\ +1 604,421 566,427 C 526,435 482,429 446,408 C 431,398 419,38\ +5 405,374 C 410,371 415,368 420,366 z \" />\012 <path\012 \ +style=\"fill:#000000;fill-opacity:0.75;fill-rule:nonzero;stro\ +ke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin\ +:miter;stroke-opacity:1\"\012 d=\"M 322,366 C 303,381 286,4\ +00 263,408 C 218,427 166,424 121,405 C 109,400 98,393 86,387\ + C 89,389 103,397 93,391 C 84,385 75,379 65,376 C 53,370 68,\ +379 72,382 C 104,401 137,421 175,427 C 216,435 260,429 295,4\ +08 C 310,398 322,385 336,374 C 331,371 326,368 322,366 z \" /\ +>\012 <path\012 style=\"fill:#000000;fill-opacity:0.75;fil\ +l-rule:nonzero;stroke:none;stroke-width:1pt;stroke-linecap:b\ +utt;stroke-linejoin:miter;stroke-opacity:1\"\012 d=\"M 363,\ +383 C 347,418 353,458 345,495 C 339,525 324,551 312,579 C 30\ +4,598 298,620 309,639 C 317,655 335,667 353,669 C 379,671 40\ +5,664 429,653 C 442,646 405,667 423,656 C 429,652 434,647 44\ +1,645 C 455,639 439,650 434,653 C 408,669 378,679 347,679 C \ +327,679 308,667 297,651 C 285,634 287,613 294,594 C 302,570 \ +316,548 324,523 C 335,493 335,460 338,428 C 340,415 342,401 \ +349,390 C 353,388 358,385 363,383 z \" />\012 <path\012 st\ +yle=\"fill:#000000;fill-opacity:0.75;fill-rule:nonzero;stroke\ +:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:m\ +iter;stroke-opacity:1\"\012 d=\"M 206,735 C 245,737 285,740\ + 324,744 C 357,745 391,746 424,744 C 468,738 510,723 550,703\ + C 552,703 544,709 541,711 C 531,718 518,722 507,727 C 474,7\ +40 440,751 405,754 C 360,756 314,754 268,749 C 243,747 218,7\ +46 193,745 C 197,741 201,738 206,735 z \" />\012 </g>\012</svg>\012" +### end diff --git a/olpcgames/dbusproxy.py b/olpcgames/dbusproxy.py new file mode 100755 index 0000000..a103e28 --- /dev/null +++ b/olpcgames/dbusproxy.py @@ -0,0 +1,93 @@ +"""Spike test for a safer networking system for DBUS-based objects""" +from olpcgames import eventwrap, util +from dbus import proxies +import logging +log = logging.getLogger( 'dbus' ) +log.setLevel( logging.DEBUG ) + +def wrap( value, tube=None,path=None ): + """Wrap object with any required pygame-side proxies""" + if isinstance( value,proxies._ProxyMethod ): + return DBUSMethod( value, tube=tube, path=path ) + elif isinstance( value, proxies._DeferredMethod ): + value._proxy_method = DBUSMethod( value._proxy_method, tube=tube, path=path ) + return value + elif isinstance( value, proxies.ProxyObject ): + return DBUSProxy( value, tube=tube, path=path ) + else: + return value + +class DBUSProxy( object ): + """Proxy for the DBUS Proxy object""" + def __init__( self, proxy, tube=None, path=None ): + log.info( 'Creating Pygame-side proxy for %s (%s)', proxy,path ) + self.__proxy = proxy + self.__tube = tube + self.__path = path + def __getattr__( self, key ): + """Retrieve attribute of given key""" + from dbus import proxies + return wrap( getattr( self.__proxy, key ) ) + def add_signal_receiver( self, callback, eventName, interface, path=None, sender_keyword='sender'): + """Add a new signal handler (which will be called many times) for given signal + """ + log.info( """Setting signal receiver %s for event %s on interface %s (object path %s) with sender_keyword = %r""", + callback, eventName, interface, path, sender_keyword, + ) + log.debug( """proxy: %s proxy.tube: %s""", self.__proxy, self.__proxy.tube ) + self.__tube.add_signal_receiver( + Callback( callback ), + eventName, + interface, + path = path or self.__path, + sender_keyword = sender_keyword, + ) + +class DBUSMethod( object ): + """DBUS method which does callbacks in the Pygame (eventwrapper) thread""" + def __init__( self, proxy, tube,path ): + log.info( 'Creating Pygame-side method proxy for %s', proxy ) + self.__proxy = proxy + self.__tube = tube + self.__path = path + def __call__( self, *args, **named ): + """Perform the asynchronous call""" + log.info( 'Calling proxy for %s with *%s, **%s', self.__proxy, args, named ) + callback, errback = named.get( 'reply_handler'), named.get( 'error_handler' ) + if not callback: + raise TypeError( """Require a reply_handler named argument to do any asynchronous call""" ) + else: + callback = Callback( callback ) + if not errback: + errback = defaultErrback + else: + errback = Callback( errback ) + named['reply_handler'] = callback + named['error_handler'] = errback + return self.__proxy( *args, **named ) + +def defaultErrback( error ): + """Log the error to stderr/log""" + log.error( """Failure in DBUS call: %s""", error ) + +class Callback( object ): + """PyGTK-side callback which generates a CallbackResult to process on the Pygame side""" + def __init__( self, callable, callContext = None): + """Initialize the callback to process results""" + self.callable = callable + if callContext is None: + callContext = util.get_traceback( None ) + self.callContext = callContext + def __call__( self, *args, **named ): + """PyGTK-side callback operation""" + log.info( 'Callback %s return value *%s, **%s', self.callable, args, named ) + from olpcgames import eventwrap + args = [wrap(a) for a in args] + named = dict([ + (k,wrap(v)) for k,v in named.items() + ]) + eventwrap.post( + eventwrap.CallbackResult( + self.callable, args, named, callContext = self.callContext + ) + ) diff --git a/olpcgames/eventwrap.py b/olpcgames/eventwrap.py new file mode 100755 index 0000000..402109c --- /dev/null +++ b/olpcgames/eventwrap.py @@ -0,0 +1,388 @@ +"""Provides substitute for Pygame's "event" module using gtkEvent + +Provides methods which will be substituted into Pygame in order to +provide the synthetic events that we will feed into the Pygame queue. +These methods are registered by the "install" method. + +This event queue does not support getting events only of a certain type. +You need to get all pending events at a time, or filter them yourself. You +can, however, block and unblock events of certain types, so that may be +useful to you. + +Set_grab doesn't do anything (you are not allowed to grab events). Sorry. + +Extensions: + + wait( timeout=None ) -- allows you to wait for only a specified period + before you return to the application. Can be used to e.g. wait for a + short period, then release some resources, then wait a bit more, then + release a few more resources, then a bit more... +""" +import pygame +import gtk +import Queue +import thread, threading +import logging +from olpcgames import util + +log = logging.getLogger( 'olpcgames.eventwrap' ) + +from pygame.event import Event, event_name, pump as pygame_pump, get as pygame_get + +class Event(object): + """Mock pygame events""" + def __init__(self, type, dict=None,**named): + """Initialise the new event variables from dictionary and named become attributes""" + self.type = type + if dict: + self.__dict__.update( dict ) + self.__dict__.update( named ) + def _get_dict( self ): + return self.__dict__ + dict = property( _get_dict ) + def __repr__( self ): + result = [] + for key,value in self.__dict__.items(): + if not key.startswith( '_' ): + result.append( '%s = %r'%( key, value )) + return '%s( %s, %s )'%( + self.__class__.__name__, + self.type, + ",".join( result ), + ) + def block( self ): + """Block until this event is finished processing + + Event process is only finalized on the *next* call to retrieve an event + after the processing operation in which the event is processed. In some + extremely rare cases we might actually see that happen, were the + file-saving event (for example) causes the Pygame event loop to exit. + In that case, the GTK event loop *could* hang. + """ + log.info( '''Blocking GTK thread on event: %s''', self ) + self.__lock = threading.Event() + self.__lock.wait() + def retire( self ): + """Block the GTK event loop until this event is processed""" + try: + self.__lock.set() + log.info( '''Released GTK thread on event: %s''', self ) + except AttributeError, err: + pass + +class CallbackResult( object ): + def __init__( self, callable, args, named, callContext=None ): + """Perform callback in Pygame loop with args and named + + callContext is used to provide more information when there is + a failure in the callback (for debugging purposes) + """ + self.callable = callable + self.args = args + self.named = named + if callContext is None: + callContext = util.get_traceback( None ) + self.callContext = callContext + def __call__( self ): + """Perform the actual callback in the Pygame event loop""" + try: + self.callable( *self.args, **self.named ) + except Exception, err: + log.error( + """Failure in callback %s( *%s, **%s ): %s\n%s""", + getattr(self.callable, '__name__',self.callable), + self.args, self.named, + util.get_traceback( err ), + self.callContext + ) + + +_EVENTS_TO_RETIRE = [] + +def _releaseEvents( ): + """Release/retire previously-processed events""" + if _EVENTS_TO_RETIRE: + for event in _EVENTS_TO_RETIRE: + try: + event.retire() + except AttributeError, err: + pass + +def _processCallbacks( events ): + """Process any callbacks in events and remove from the stream""" + result = [] + for event in events: + if isinstance( event, CallbackResult ): + event() + else: + result.append( event ) + if events and not result: + result.append( + Event( type=pygame.NOEVENT ) + ) + return result + +def _recordEvents( events ): + """Record the set of events to retire on the next iteration""" + global _EVENTS_TO_RETIRE + events = _processCallbacks( events ) + _EVENTS_TO_RETIRE = events + return events + +def install(): + """Installs this module (eventwrap) as an in-place replacement for the pygame.event module. + + Use install() when you need to interact with Pygame code written + without reference to the olpcgames wrapper mechanisms to have the + code use this module's event queue. + + XXX Really, use it everywhere you want to use olpcgames, as olpcgames + registers the handler itself, so you will always wind up with it registered when + you use olpcgames (the gtkEvent.Translator.hook_pygame method calls it). + """ + log.info( 'Installing OLPCGames event wrapper' ) + from olpcgames import eventwrap + import pygame + pygame.event = eventwrap + import sys + sys.modules["pygame.event"] = eventwrap + +# Event queue: +class _FilterQueue( Queue.Queue ): + """Simple Queue sub-class with a put_left method""" + def get_type( self, filterFunction, block=True, timeout=None ): + """Get events of a given type + + Note: can raise Empty *even* when blocking if someone else + pops the event off the queue before we get around to it. + """ + self.not_empty.acquire() + try: + if not block: + if self._empty_type( filterFunction ): + raise Queue.Empty + elif timeout is None: + while self._empty_type( filterFunction ): + self.not_empty.wait() + else: + if timeout < 0: + raise ValueError("'timeout' must be a positive number") + endtime = _time() + timeout + while self._empty_type( filterFunction ): + remaining = endtime - _time() + if remaining <= 0.0: + raise Queue.Empty + self.not_empty.wait(remaining) + item = self._get_type( filterFunction ) + self.not_full.notify() + return item + finally: + self.not_empty.release() + def _empty_type( self, filterFunction ): + """Are we empty with respect to filterFunction?""" + for element in self.queue: + if filterFunction( element ): + return False + return True + def _get_type( self, filterFunction ): + """Get the first instance which matches filterFunction""" + for element in self.queue: + if filterFunction( element ): + self.queue.remove( element ) + return element + # someone popped the event off the queue before we got to it! + raise Queue.Empty + def peek_type( self, filterFunction= lambda x: True ): + """Peek to see if we have filterFunction-matching element + + Note: obviously this is *not* thread safe, it's just informative... + """ + try: + for element in self.queue: + if filterFunction( element ): + return element + return None + except RuntimeError, err: + return None # none yet, at least + +g_events = _FilterQueue() + +# Set of blocked events as set by set +g_blocked = set() +g_blockedlock = thread.allocate_lock() # should use threading instead +g_blockAll = False + +def _typeChecker( types ): + """Create check whether an event is in types""" + try: + if 1 in types: + pass + def check( element ): + return element.type in types + return check + except TypeError, err: + def check( element ): + return element.type == types + return check + +def pump(): + """Handle any window manager and other external events that aren't passed to the user + + Call this periodically (once a frame) if you don't call get(), poll() or wait() + """ + pygame_pump() + _releaseEvents() + +def get( types=None): + """Get a list of all pending events + + types -- either an integer event-type or a sequence of integer event types + which restrict the set of event-types returned from the queue. Keep in mind + that if you do not remove events you may wind up with an eternally growing + queue or a full queue. Normally you will want to remove all events in your + top-level event-loop and propagate them yourself. + + Note: if you use types you lose all event ordering guarantees, events + may show up after events which were originally produced before them due to + the re-ordering of the queue on filtering! + """ + pump() + eventlist = [] + try: + if types: + check = _typeChecker( types ) + while True: + eventlist.append(g_events.get_type( check, block=False)) + else: + while True: + eventlist.append(g_events.get(block=False)) + except Queue.Empty: + pass + + pygameEvents = pygame_get() + if pygameEvents: + log.info( 'Raw Pygame events: %s', pygameEvents) + eventlist.extend( pygameEvents ) + return _recordEvents( eventlist ) + +def poll(): + """Get the next pending event if exists. Otherwise, return pygame.NOEVENT.""" + pump() + try: + result = g_events.get(block=False) + return _recordEvents( [result] )[0] + except Queue.Empty: + return Event(pygame.NOEVENT) + + +def wait( timeout = None): + """Get the next pending event, wait up to timeout if none + + timeout -- if present, only wait up to timeout seconds, if we + do not find an event before then, return None. timeout + is an OLPCGames-specific extension. + """ + pump() + try: + result = None + result = g_events.get(block=True, timeout=timeout) + try: + return _recordEvents( [result] )[0] + except IndexError, err: + return Event( type=pygame.NOEVENT ) + except Queue.Empty, err: + return None + +def peek(types=None): + """True if there is any pending event + + types -- optional set of event-types used to check whether + an event is of interest. If specified must be either a sequence + of integers/longs or an integer/long. + """ + if types: + check = _typeChecker( types ) + return g_events.peek_type( check ) is not None + return not g_events.empty() + +def clear(): + """Clears the entire pending queue of events + + Rarely used + """ + try: + discarded = [] + while True: + discarded.append( g_events.get(block=False) ) + discarded = _recordEvents( discarded ) + _releaseEvents() + return discarded + except Queue.Empty: + pass + +def set_blocked(item): + """Block item/items from being added to the event queue""" + g_blockedlock.acquire() + try: + # FIXME: we do not currently know how to block all event types when + # you set_blocked(none). + [g_blocked.add(x) for x in makeseq(item)] + finally: + g_blockedlock.release() + +def set_allowed(item): + """Allow item/items to be added to the event queue""" + g_blockedlock.acquire() + try: + if item is None: + # Allow all events when you set_allowed(none). Strange, eh? + # Pygame is a wonderful API. + g_blocked.clear() + else: + [g_blocked.remove(x) for x in makeseq(item)] + finally: + g_blockedlock.release() + +def get_blocked(*args, **kwargs): + g_blockedlock.acquire() + try: + blocked = frozenset(g_blocked) + return blocked + finally: + g_blockedlock.release() + +def set_grab(grabbing): + """This method will not be implemented""" + +def get_grab(): + """This method will not be implemented""" + +def post(event): + """Post a new event to the Queue of events""" + g_blockedlock.acquire() + try: + if getattr(event,'type',None) not in g_blocked: + g_events.put(event, block=False) + finally: + g_blockedlock.release() + +def makeseq(obj): + """Accept either a scalar object or a sequence, and return a sequence + over which we can iterate. If we were passed a sequence, return it + unchanged. If we were passed a scalar, return a tuple containing only + that scalar. This allows the caller to easily support one-or-many. + """ + # Strings are the exception because you can iterate over their chars + # -- yet, for all the purposes I've ever cared about, I want to treat + # a string as a scalar. + if isinstance(obj, basestring): + return (obj,) + try: + # Except as noted above, if you can get an iter() from an object, + # it's a collection. + iter(obj) + return obj + except TypeError: + # obj is a scalar. Wrap it in a tuple so we can iterate over the + # one item. + return (obj,) diff --git a/olpcgames/gtkEvent.py b/olpcgames/gtkEvent.py new file mode 100755 index 0000000..6b20102 --- /dev/null +++ b/olpcgames/gtkEvent.py @@ -0,0 +1,289 @@ +"""gtkEvent.py: translate GTK events into Pygame events.""" +import pygtk +pygtk.require('2.0') +import gtk +import gobject +import pygame +from olpcgames import eventwrap +import logging +log = logging.getLogger( 'olpcgames.gtkevent' ) +##log.setLevel( logging.DEBUG ) + +class _MockEvent(object): + """Used to inject key-repeat events on the gtk side.""" + def __init__(self, keyval): + self.keyval = keyval + +class Translator(object): + """Utility class to translate GTK events into Pygame events + + The Translator object interprets incoming GTK events and generates + Pygame events in the eventwrap module's queue as a result. + It also handles generating Pygame style key-repeat events + by synthesizing them via a GTK timer. + """ + key_trans = { + 'Alt_L': pygame.K_LALT, + 'Alt_R': pygame.K_RALT, + 'Control_L': pygame.K_LCTRL, + 'Control_R': pygame.K_RCTRL, + 'Shift_L': pygame.K_LSHIFT, + 'Shift_R': pygame.K_RSHIFT, + 'Super_L': pygame.K_LSUPER, + 'Super_R': pygame.K_RSUPER, + 'KP_Page_Up' : pygame.K_KP9, + 'KP_Page_Down' : pygame.K_KP3, + 'KP_End' : pygame.K_KP1, + 'KP_Home' : pygame.K_KP7, + 'KP_Up' : pygame.K_KP8, + 'KP_Down' : pygame.K_KP2, + 'KP_Left' : pygame.K_KP4, + 'KP_Right' : pygame.K_KP6, + + } + + mod_map = { + pygame.K_LALT: pygame.KMOD_LALT, + pygame.K_RALT: pygame.KMOD_RALT, + pygame.K_LCTRL: pygame.KMOD_LCTRL, + pygame.K_RCTRL: pygame.KMOD_RCTRL, + pygame.K_LSHIFT: pygame.KMOD_LSHIFT, + pygame.K_RSHIFT: pygame.KMOD_RSHIFT, + } + + def __init__(self, mainwindow, mouselistener=None): + """Initialise the Translator with the windows to which to listen""" + # _inner_evb is Mouselistener + self._mainwindow = mainwindow + if mouselistener is None: + mouselistener = mainwindow + + self._inner_evb = mouselistener + + # Need to set our X event masks so we see mouse motion and stuff -- + mainwindow.set_events( + gtk.gdk.KEY_PRESS_MASK | \ + gtk.gdk.KEY_RELEASE_MASK \ + ) + + self._inner_evb.set_events( + gtk.gdk.POINTER_MOTION_MASK | \ + gtk.gdk.POINTER_MOTION_HINT_MASK | \ + gtk.gdk.BUTTON_MOTION_MASK | \ + gtk.gdk.BUTTON_PRESS_MASK | \ + gtk.gdk.BUTTON_RELEASE_MASK + ) + + # Callback functions to link the event systems + mainwindow.connect('unrealize', self._quit) + mainwindow.connect('key_press_event', self._keydown) + mainwindow.connect('key_release_event', self._keyup) + self._inner_evb.connect('button_press_event', self._mousedown) + self._inner_evb.connect('button_release_event', self._mouseup) + self._inner_evb.connect('motion-notify-event', self._mousemove) + + # You might need to do this + mainwindow.set_flags(gtk.CAN_FOCUS) + self._inner_evb.set_flags(gtk.CAN_FOCUS) + + # Internal data + self.__stopped = False + self.__keystate = [0] * 323 + self.__button_state = [0,0,0] + self.__mouse_pos = (0,0) + self.__repeat = (None, None) + self.__held = set() + self.__held_time_left = {} + self.__held_last_time = {} + self.__tick_id = None + + #print "translator initialized" + self._inner_evb.connect( 'expose-event', self.do_expose_event ) +# screen = gtk.gdk.screen_get_default() +# screen.connect( 'size-changed', self.do_resize_event ) + self._inner_evb.connect( 'configure-event', self.do_resize_event ) + def do_expose_event(self, event, widget): + """Handle exposure event (trigger redraw by gst)""" + log.info( 'Expose event: %s', event ) + from olpcgames import eventwrap + eventwrap.post( eventwrap.Event( eventwrap.pygame.VIDEOEXPOSE )) + return True + def do_resize_event( self, activity, event ): + """Our screen (actually, the default screen) has resized""" + log.info( 'Resize event: %s %s', activity, event ) + log.info( 'Event values: %s', (event.width,event.height) ) +# from olpcgames import eventwrap +# # shouldn't the activity's window have this information too? +# eventwrap.post( +# eventwrap.Event( +# eventwrap.pygame.VIDEORESIZE, +# dict(size=(event.width,event.height), width=event.width, height=event.height) +# ) +# ) + return False # continue processing + def hook_pygame(self): + """Hook the various Pygame features so that we implement the event APIs""" + # Pygame should be initialized. Hijack their key and mouse methods + pygame.key.get_pressed = self._get_pressed + pygame.key.set_repeat = self._set_repeat + pygame.mouse.get_pressed = self._get_mouse_pressed + pygame.mouse.get_pos = self._get_mouse_pos + import eventwrap + eventwrap.install() + + def _quit(self, data=None): + self.__stopped = True + eventwrap.post(eventwrap.Event(pygame.QUIT)) + + def _keydown(self, widget, event): + key = event.keyval + log.debug( 'key down: %s', key ) + if key in self.__held: + return True + else: + if self.__repeat[0] is not None: + self.__held_last_time[key] = pygame.time.get_ticks() + self.__held_time_left[key] = self.__repeat[0] + self.__held.add(key) + + return self._keyevent(widget, event, pygame.KEYDOWN) + + def _keyup(self, widget, event): + key = event.keyval + if self.__repeat[0] is not None: + if key in self.__held: + # This is possibly false if set_repeat() is called with a key held + del self.__held_time_left[key] + del self.__held_last_time[key] + self.__held.discard(key) + + return self._keyevent(widget, event, pygame.KEYUP) + + def _keymods(self): + """Extract the keymods as they stand currently.""" + mod = 0 + for key_val, mod_val in self.mod_map.iteritems(): + mod |= self.__keystate[key_val] and mod_val + return mod + + + def _keyevent(self, widget, event, type): + key = gtk.gdk.keyval_name(event.keyval) + if key is None: + # No idea what this key is. + return False + + keycode = None + if key in self.key_trans: + keycode = self.key_trans[key] + elif hasattr(pygame, 'K_'+key.upper()): + keycode = getattr(pygame, 'K_'+key.upper()) + elif hasattr(pygame, 'K_'+key.lower()): + keycode = getattr(pygame, 'K_'+key.lower()) + elif key == 'XF86Start': + # view source request, specially handled... + self._mainwindow.view_source() + else: + print 'Key %s unrecognized'%key + + if keycode is not None: + if type == pygame.KEYDOWN: + mod = self._keymods() + self.__keystate[keycode] = type == pygame.KEYDOWN + if type == pygame.KEYUP: + mod = self._keymods() + ukey = unichr(gtk.gdk.keyval_to_unicode(event.keyval)) + if ukey == '\000': + ukey = '' + evt = eventwrap.Event(type, key=keycode, unicode=ukey, mod=mod) + assert evt.key, evt + self._post(evt) + return True + + def _get_pressed(self): + """Retrieve map/array of which keys are currently depressed (held down)""" + return self.__keystate + + def _get_mouse_pressed(self): + """Return three-element array of which mouse-buttons are currently depressed (held down)""" + return self.__button_state + + def _mousedown(self, widget, event): + self.__button_state[event.button-1] = 1 + return self._mouseevent(widget, event, pygame.MOUSEBUTTONDOWN) + + def _mouseup(self, widget, event): + self.__button_state[event.button-1] = 0 + return self._mouseevent(widget, event, pygame.MOUSEBUTTONUP) + + def _mouseevent(self, widget, event, type): + + evt = eventwrap.Event(type, + button=event.button, + pos=(event.x, event.y)) + self._post(evt) + return True + + def _mousemove(self, widget, event): + # From http://www.learningpython.com/2006/07/25/writing-a-custom-widget-using-pygtk/ + # if this is a hint, then let's get all the necessary + # information, if not it's all we need. + if event.is_hint: + x, y, state = event.window.get_pointer() + else: + x = event.x + y = event.y + state = event.state + + rel = (x - self.__mouse_pos[0], + y - self.__mouse_pos[1]) + self.__mouse_pos = (x, y) + + self.__button_state = [ + state & gtk.gdk.BUTTON1_MASK and 1 or 0, + state & gtk.gdk.BUTTON2_MASK and 1 or 0, + state & gtk.gdk.BUTTON3_MASK and 1 or 0, + ] + + evt = eventwrap.Event(pygame.MOUSEMOTION, + pos=self.__mouse_pos, + rel=rel, + buttons=self.__button_state) + self._post(evt) + return True + + def _tick(self): + """Generate synthetic events for held-down keys""" + cur_time = pygame.time.get_ticks() + for key in self.__held: + delta = cur_time - self.__held_last_time[key] + self.__held_last_time[key] = cur_time + + self.__held_time_left[key] -= delta + if self.__held_time_left[key] <= 0: + self.__held_time_left[key] = self.__repeat[1] + self._keyevent(None, _MockEvent(key), pygame.KEYDOWN) + + return True + + def _set_repeat(self, delay=None, interval=None): + """Set the key-repetition frequency for held-down keys""" + if delay is not None and self.__repeat[0] is None: + self.__tick_id = gobject.timeout_add(10, self._tick) + elif delay is None and self.__repeat[0] is not None: + gobject.source_remove(self.__tick_id) + self.__repeat = (delay, interval) + + def _get_mouse_pos(self): + """Retrieve the current mouse position as a two-tuple of integers""" + return self.__mouse_pos + + def _post(self, evt): + try: + eventwrap.post(evt) + except pygame.error, e: + if str(e) == 'Event queue full': + print "Event queue full!" + pass + else: + raise e diff --git a/olpcgames/mesh.py b/olpcgames/mesh.py new file mode 100755 index 0000000..1ad4c43 --- /dev/null +++ b/olpcgames/mesh.py @@ -0,0 +1,583 @@ +'''Utilities for wrapping the telepathy network for Pygame + +The 'mesh' module allows your Pygame game to be Shared +across the OLPC networking infrastructure (D-bus and Tubes). +It offers a simplified view of the Telepathy system. + +All Sugar activities have a 'Share' menu (toolbar) which is +intended to allow other people to join the activity instance +and collaborate with you. When you select Share, the activity's +icon appears on the Neighborhood view of other laptops. + +If you do nothing else with networking, this is all that will +happen: if anyone selects your shared activity icon, they will +just spawn a new instance of the activity, and they will get to +play your game alone. + +The mesh module automatically sets up a connection from each +participant to every other participant. It provides (string based) +communications channels that let you either broadcast messages +to other users or communicate point-to-point to one other user. + +You can use the "handles" which uniquely idenify users to send +messages to an individual user (send_to( handle, message )) or +broadcast( message ) to send a message to all participants. + +More advanced (structured) networking can be handled by using +the get_object( handle, path ) function, which looks up an object +(by DBUS path) shared by the user "handle" and returns a +DBUS/Telepathy proxy for that object. The object you get back is +actually an olpcgames.dbusproxy.DBUSProxy instance, which +enforces asynchronous operations and runs your +reply_handler/error_handler in the Pygame event loop. + +NOTE: + You *cannot* make synchronous calls on these objects! + You must use the named arguments: + + reply_handler, error_handler + + for every call which you perform on a shared object (normally + these are ExportedGObject instances). + +If you want to run your callbacks in the GTK event loop (for instance +because they need to handle GTK-side objects), you can use the +dbus_get_object function. This is *not* recommended for normal +usage, as any call to Pygame operations within the GTK event loop +can cause a segfault/core of your entire Activity. + +Note: + + mesh sets up N**2 connections for each shared activity, obviously + that will not scale to very large shared activities. + +Note: + + The intention is that mesh will be refactored, possibly as a + new module called "olpcgames.network", which would break out + the various components so that there is no longer an assumed + networking layout. We will attempt to retain the mesh module's + API as we do so. + +Events produced: + + olpcgames.CONNECT -- The tube connection was started. (i.e., the + user clicked Share or started the activity from the Neighborhood + screen). + + Event properties: + + id -- a unique identifier for this connection. (shouldn't be needed + for anything) + + olpcgames.PARTICIPANT_ADD -- A participant joined the activity. + This will trigger for the local user as well as any arriving remote + users. Note that this *only* occurs after the activity is shared, + that is, the local user does not appear until after they have + shared a locally-started activity. + + Event properties: + + handle -- the arriving user's handle (a uniquely identifying string + assigned to the user by the Telepathy system, not human + readable), see lookup_buddy to retrieve human-readable + descriptions of the user. + + olpcgames.PARTICIPANT_REMOVE -- A participant quit the activity. + + Event properties: + + handle -- the departing user's handle. + + olpcgames.MESSAGE_UNI -- A message was sent to you. + + Event properties: + + content -- the content of the message (a string) + handle -- the handle of the sending user. + + olpcgames.MESSAGE_MULTI -- A message was sent to everyone. + + Event properties: + + content -- the content of the message (a string) + handle -- the handle of the sending user. + +Note: + + Eventually we will stop using top-level Pygame event types for the + various networking message types (currently four of them). We will + likely use UserEvent with a sub-type specifier for the various events + that OLPCGames produces. + +See Also: + + http://blog.vrplumber.com/2016 -- Discussion of how Productive uses + the mesh module and raw Telepathy (ExportedGObject instances) +''' +import logging +log = logging.getLogger( 'olpcgames.mesh' ) +##log.setLevel( logging.DEBUG ) +import olpcgames +from olpcgames.util import get_traceback +try: + from sugar.presence.tubeconn import TubeConnection +except ImportError, err: + TubeConnection = object +try: + from dbus.gobject_service import ExportedGObject +except ImportError, err: + ExportedGObject = object +from dbus.service import method, signal + +try: + import telepathy +except ImportError, err: + telepathy = None + +try: + import sugar.presence.presenceservice +except Exception, err: + pass +import pygame.event as PEvent + +class OfflineError( Exception ): + """Raised when we cannot complete an operation due to being offline""" + +DBUS_IFACE="org.laptop.games.pygame" +DBUS_PATH="/org/laptop/games/pygame" +DBUS_SERVICE = None + + +### NEW PYGAME EVENTS ### + +CONNECT = olpcgames.CONNECT +PARTICIPANT_ADD = olpcgames.PARTICIPANT_ADD +PARTICIPANT_REMOVE = olpcgames.PARTICIPANT_REMOVE +MESSAGE_UNI = olpcgames.MESSAGE_UNI +MESSAGE_MULTI = olpcgames.MESSAGE_MULTI + + +# Private objects for useful purposes! +pygametubes = [] +text_chan, tubes_chan = (None, None) +conn = None +initiating = False +joining = False + +connect_callback = None + +def is_initiating(): + '''A version of is_initiator that's a bit less goofy, and can be used + before the Tube comes up.''' + global initiating + return initiating + +def is_joining(): + '''Returns True if the activity was started up by means of the + Neighbourhood mesh view.''' + global joining + return joining + +def set_connect_callback(cb): + '''Just the same as the Pygame event loop can listen for CONNECT, + this is just an ugly callback that the glib side can use to be aware + of when the Tube is ready.''' + global connect_callback + connect_callback = cb + +def activity_shared(activity): + '''Called when the user clicks Share.''' + + global initiating + initiating = True + + _setup(activity) + + + log.debug('This is my activity: making a tube...') + channel = tubes_chan[telepathy.CHANNEL_TYPE_TUBES] + if hasattr( channel, 'OfferDBusTube' ): + id = channel.OfferDBusTube( + DBUS_SERVICE, {}) + else: + id = channel.OfferTube( + telepathy.TUBE_TYPE_DBUS, DBUS_SERVICE, {}) + + global connect_callback + if connect_callback is not None: + connect_callback() + +def activity_joined(activity): + '''Called at the startup of our Activity, when the user started it via Neighborhood intending to join an existing activity.''' + + # Find out who's already in the shared activity: + log.debug('Joined an existing shared activity') + + for buddy in activity._shared_activity.get_joined_buddies(): + log.debug('Buddy %s is already in the activity' % buddy.props.nick) + + + global initiating + global joining + initiating = False + joining = True + + + _setup(activity) + + tubes_chan[telepathy.CHANNEL_TYPE_TUBES].ListTubes( + reply_handler=_list_tubes_reply_cb, + error_handler=_list_tubes_error_cb) + + global connect_callback + if connect_callback is not None: + connect_callback() + +def _getConn( activity ): + log.debug( '_getConn' ) + global conn + if conn: + return conn + else: + if hasattr( activity._shared_activity, 'telepathy_conn' ): + log.debug( '''new-style api for retrieving telepathy connection present''' ) + conn = activity._shared_activity.telepathy_conn + else: + pservice = _get_presence_service() + log.debug( '_get_presence_service -> %s', pservice ) + name, path = pservice.get_preferred_connection() + log.debug( '_get_presence_service -> %s, %s', name, path) + conn = telepathy.client.Connection(name, path) + log.debug( 'Telepathy Client Connection: %s', conn ) + return conn + + + +def _setup(activity): + '''Determines text and tube channels for the current Activity. If no tube +channel present, creates one. Updates text_chan and tubes_chan. + +setup(sugar.activity.Activity, telepathy.client.Connection)''' + global text_chan, tubes_chan, DBUS_SERVICE + log.info( 'Setup for %s', activity ) + if not DBUS_SERVICE: + DBUS_SERVICE = activity.get_bundle_id() + if not activity.get_shared(): + log.error('Failed to share or join activity') + raise "Failure" + + if hasattr( activity._shared_activity, 'telepathy_tubes_chan' ): + log.debug( '''Improved channel setup API available''' ) + _getConn( activity ) + conn = activity._shared_activity.telepathy_conn + tubes_chan = activity._shared_activity.telepathy_tubes_chan + text_chan = activity._shared_activity.telepathy_text_chan + else: + log.debug( '''Old-style setup API''' ) + bus_name, conn_path, channel_paths = activity._shared_activity.get_channels() + _getConn( activity ) + + # Work out what our room is called and whether we have Tubes already + room = None + tubes_chan = None + text_chan = None + for channel_path in channel_paths: + log.debug( 'Testing channel path: %s', channel_path) + channel = telepathy.client.Channel(bus_name, channel_path) + htype, handle = channel.GetHandle() + log.debug( ' Handle Type: %s Handle: %s', htype, handle) + if htype == telepathy.HANDLE_TYPE_ROOM: + log.debug('Found our room: it has handle#%d "%s"', + handle, conn.InspectHandles(htype, [handle])[0]) + room = handle + ctype = channel.GetChannelType() + if ctype == telepathy.CHANNEL_TYPE_TUBES: + log.debug('Found our Tubes channel at %s', channel_path) + tubes_chan = channel + elif ctype == telepathy.CHANNEL_TYPE_TEXT: + log.debug('Found our Text channel at %s', channel_path) + text_chan = channel + + if room is None: + log.error("Presence service didn't create a room") + raise "Failure" + if text_chan is None: + log.error("Presence service didn't create a text channel") + raise "Failure" + + # Make sure we have a Tubes channel - PS doesn't yet provide one + if tubes_chan is None: + log.debug("Didn't find our Tubes channel, requesting one...") + tubes_chan = conn.request_channel(telepathy.CHANNEL_TYPE_TUBES, + telepathy.HANDLE_TYPE_ROOM, room, True) + + tubes_chan[telepathy.CHANNEL_TYPE_TUBES].connect_to_signal('NewTube', + new_tube_cb) + + log.info( 'Setup for %s complete', activity ) + return (text_chan, tubes_chan) + +def new_tube_cb(id, initiator, type, service, params, state): + log.debug("New_tube_cb called: %s %s %s" % (id, initiator, type)) + if (type == telepathy.TUBE_TYPE_DBUS and service == DBUS_SERVICE): + if state == telepathy.TUBE_STATE_LOCAL_PENDING: + channel = tubes_chan[telepathy.CHANNEL_TYPE_TUBES] + if hasattr( channel, 'AcceptDBusTube' ): + channel.AcceptDBusTube( id ) + else: + channel.AcceptTube(id) + + tube_conn = TubeConnection(conn, + tubes_chan[telepathy.CHANNEL_TYPE_TUBES], + id, group_iface=text_chan[telepathy.CHANNEL_INTERFACE_GROUP]) + + global pygametubes, initiating + pygametubes.append(PygameTube(tube_conn, initiating, len(pygametubes))) + + +def _list_tubes_reply_cb(tubes): + for tube_info in tubes: + new_tube_cb(*tube_info) + +def _list_tubes_error_cb(e): + log.error('ListTubes() failed: %s', e) + +def lookup_buddy( dbus_handle, callback, errback=None ): + """Do a lookup on the buddy information, callback with the information + + Calls callback( buddy ) with the result of the lookup, or errback( error ) with + a dbus description of the error in the lookup process. + + returns None + """ + log.debug('Trying to find owner of handle %s...', dbus_handle) + cs_handle = instance().tube.bus_name_to_handle[dbus_handle] + log.debug('Trying to find my handle in %s...', cs_handle) + group = text_chan[telepathy.CHANNEL_INTERFACE_GROUP] + log.debug( 'Calling GetSelfHandle' ) + if not errback: + def errback( error ): + log.error( """Failure retrieving handle for buddy lookup: %s""", error ) + def with_my_csh( my_csh ): + log.debug('My handle in that group is %s', my_csh) + def _withHandle( handle ): + """process the results of the handle values""" + # XXX: we're assuming that we have Buddy objects for all contacts - + # this might break when the server becomes scalable. + pservice = _get_presence_service() + name, path = pservice.get_preferred_connection() + callback( pservice.get_buddy_by_telepathy_handle(name, path, handle) ) + if my_csh == cs_handle: + conn.GetSelfHandle(reply_handler = _withHandle, error_handler=errback) + log.debug('CS handle %s belongs to me, looking up with GetSelfHandle', cs_handle) + elif group.GetGroupFlags() & telepathy.CHANNEL_GROUP_FLAG_CHANNEL_SPECIFIC_HANDLES: + handle = group.GetHandleOwners([cs_handle])[0] + log.debug('CS handle %s belongs to %s', cs_handle, handle) + _withHandle( handle ) + else: + handle = cs_handle + log.debug('non-CS handle %s belongs to itself', handle) + _withHandle( handle ) + group.GetSelfHandle( reply_handler = with_my_csh, error_handler = errback) + + + +def get_buddy(dbus_handle): + """DEPRECATED: Get a Buddy from a handle + + THIS API WAS NOT THREAD SAFE! It has been removed to avoid + extremely hard-to-debug failures in activities. Use lookup_buddy + instead! + + Code that read: + + get_buddy( handle ) + doSomething( handle, buddy ) + doSomethingElse( buddy ) + + Translates to: + + def withBuddy( buddy ): + doSomething( handle, buddy ) + doSomethingElse( buddy ) + lookup_buddy( handle, callback=withBuddy ) + """ + raise RuntimeError( + """get_buddy is not thread safe and will crash your activity (hard). Use lookup_buddy.""" + ) + +def _get_presence_service( ): + """Attempt to retrieve the presence service (check for offline condition) + + The presence service, when offline, has no preferred connection type, + so we check that before returning the object... + """ + log.debug( """About to import sugar.presence.presenceservice""" ) + try: + log.debug( 'About to retrieve presence service instance' ) + pservice = sugar.presence.presenceservice.get_instance() + try: + log.debug( ' Retrieved presence service instance: %s', pservice ) + name, path = pservice.get_preferred_connection() + log.debug( ' Name = %s Path = %s', name, path ) + except (TypeError,ValueError), err: + log.warn('Working in offline mode, cannot retrieve buddy information for %s: %s', handle, err ) + raise OfflineError( """Unable to retrieve buddy information, currently offline""" ) + else: + return pservice + except Exception, err: + log.error( """Failure in _get_presence_service: %s""", get_traceback( err )) + +def instance(idx=0): + return pygametubes[idx] + + +class PygameTube(ExportedGObject): + '''The object whose instance is shared across D-bus + + Call instance() to get the instance of this object for your activity service. + Its 'tube' property contains the underlying D-bus Connection. + ''' + def __init__(self, tube, is_initiator, tube_id): + super(PygameTube, self).__init__(tube, DBUS_PATH) + log.info( 'PygameTube init' ) + self.tube = tube + self.is_initiator = is_initiator + self.entered = False + self.ordered_bus_names = [] + PEvent.post(PEvent.Event(CONNECT, id=tube_id)) + + if not self.is_initiator: + self.tube.add_signal_receiver(self.new_participant_cb, 'NewParticipants', DBUS_IFACE, path=DBUS_PATH) + self.tube.watch_participants(self.participant_change_cb) + self.tube.add_signal_receiver(self.broadcast_cb, 'Broadcast', DBUS_IFACE, path=DBUS_PATH, sender_keyword='sender') + + + def participant_change_cb(self, added, removed): + log.debug( 'participant_change_cb: %s %s', added, removed ) + for handle, bus_name in added: + dbus_handle = self.tube.participants[handle] + self.ordered_bus_names.append(dbus_handle) + PEvent.post(PEvent.Event(PARTICIPANT_ADD, handle=dbus_handle)) + + for handle in removed: + dbus_handle = self.tube.participants[handle] + self.ordered_bus_names.remove(dbus_handle) + PEvent.post(PEvent.Event(PARTICIPANT_REMOVE, handle=dbus_handle)) + + if self.is_initiator: + if not self.entered: + # Initiator will broadcast a new ordered_bus_names each time + # a participant joins. + self.ordered_bus_names = [self.tube.get_unique_name()] + self.NewParticipants(self.ordered_bus_names) + + self.entered = True + + @signal(dbus_interface=DBUS_IFACE, signature='as') + def NewParticipants(self, ordered_bus_names): + '''This is the NewParticipants signal, sent when the authoritative list of ordered_bus_names changes.''' + log.debug("sending NewParticipants: %s" % ordered_bus_names) + pass + + @signal(dbus_interface=DBUS_IFACE, signature='s') + def Broadcast(self, content): + '''This is the Broadcast signal; it sends a message to all other activity participants.''' + pass + + @method(dbus_interface=DBUS_IFACE, in_signature='s', out_signature='', sender_keyword='sender') + def Tell(self, content, sender=None): + '''This is the targeted-message interface; called when a message is received that was sent directly to me.''' + PEvent.post(PEvent.Event(MESSAGE_UNI, handle=sender, content=content)) + + def broadcast_cb(self, content, sender=None): + '''This is the Broadcast callback, fired when someone sends a Broadcast signal along the bus.''' + PEvent.post(PEvent.Event(MESSAGE_MULTI, handle=sender, content=content)) + + def new_participant_cb(self, new_bus_names): + '''This is the NewParticipants callback, fired when someone joins or leaves.''' + log.debug("new participant. new bus names %s, old %s" % (new_bus_names, self.ordered_bus_names)) + if self.ordered_bus_names != new_bus_names: + log.warn("ordered bus names out of sync with server, resyncing") + self.ordered_bus_names = new_bus_names + +def send_to(handle, content=""): + '''Sends the given message to the given buddy identified by handle.''' + log.debug( 'send_to: %s %s', handle, content ) + remote_proxy = dbus_get_object(handle, DBUS_PATH) + remote_proxy.Tell(content, reply_handler=dbus_msg, error_handler=dbus_err) + +def dbus_msg(): + log.debug("async reply to send_to") +def dbus_err(e): + log.error("async error: %s" % e) + +def broadcast(content=""): + '''Sends the given message to all participants.''' + log.debug( 'Broadcast: %s', content ) + instance().Broadcast(content) + +def my_handle(): + '''Returns the handle of this user + + Note, you can get a DBusException from this if you have + not yet got a unique ID assigned by the bus. You may need + to delay calling until you are sure you are connected. + ''' + log.debug( 'my handle' ) + return instance().tube.get_unique_name() + +def is_initiator(): + '''Returns the handle of this user.''' + log.debug( 'is initiator' ) + return instance().is_initiator + +def get_participants(): + '''Returns the list of active participants, in order of arrival. + List is maintained by the activity creator; if that person leaves it may not stay in sync.''' + log.debug( 'get_participants' ) + try: + return instance().ordered_bus_names[:] + except IndexError, err: + return [] # no participants yet, as we don't yet have a connection + +def dbus_get_object(handle, path, warning=True): + '''Get a D-bus object from another participant + + Note: this *must* be called *only* from the GTK mainloop, calling + it from Pygame will cause crashes! If you are *sure* you only ever + want to call methods on this proxy from GTK, you can use + warning=False to silence the warning log message. + ''' + if warning: + log.warn( 'Use of dbus_get_object is only safe from the GTK mainloop, use dbus_get_object_proxy instead: %s %s', handle, path ) + return instance().tube.get_object(handle, path) + +def get_object(handle, path): + '''Get a D-BUS proxy object from another participant for use in Pygame + + This is how you can communicate with other participants using + arbitrary D-bus objects without having to manage the participants + yourself. You can use the returned proxy's methods from Pygame, + with your callbacks occuring in the Pygame thread, rather than + in the DBUS/GTK event loop. + + Simply define a D-bus class with an interface and path that you + choose; when you want a reference to the corresponding remote + object on a participant, call this method. + + returns an olpcgames.dbusproxy.DBUSProxy( ) object wrapping + the DBUSProxy object. + + The dbus_get_object_proxy name is deprecated + ''' + log.debug( 'DBUS get_object( %r %r )', handle, path ) + from olpcgames import dbusproxy + return dbusproxy.DBUSProxy( + instance().tube.get_object( handle, path), + tube=instance().tube, + path=path + ) + +dbus_get_object_proxy = get_object diff --git a/olpcgames/pangofont.py b/olpcgames/pangofont.py new file mode 100755 index 0000000..441dfd1 --- /dev/null +++ b/olpcgames/pangofont.py @@ -0,0 +1,346 @@ +"""Implement Pygame's font interface using Pango for international support + +Depends on: + + pygtk (to get the pango context) + pycairo (for the pango rendering context) + python-pango (obviously) + numpy + (pygame) + +As soon as you import this module you have loaded *all* of the above. +You can still use pygame.font until you decide to call install(), which +will replace pygame.font with this module. + +Notes: + + * no ability to load TTF files, PangoFont uses the font files registered + with GTK/X to render graphics, it cannot load an arbitrary TTF file. + Most non-Sugar Pygame games use bundled TTF files, which means + that you will likely need at least some changes to your font handling. + + Note, however, that the Pygame Font class is available to load the TTF + files, so if you don't want to take advantage of PangoFont for already + written code, but want to use it for "system font" operations, you can + mix the two. + + * metrics are missing, Pango can provide the information, but the more + involved metrics system means that translating to the simplified model + in Pygame has as of yet not been accomplished. + + * better support for "exotic" languages and scripts (which is why we use it) + +The main problem with SDL_ttf is that it doesn't handle internationalization +nearly as well as Pango (in fact, pretty much nothing does). However, it is +fairly fast and it has a rich interface. You should avoid fonts where possible, +prerender using Pango for internationalizable text, and use Pango or SDL_ttf +for text that really needs to be rerendered each frame. (Use SDL_ttf if profiling +demonstrates that performance is poor with Pango.) + +Note: + Font -- is the original Pygame Font class, which allows you to load + fonts from TTF files/filenames + PangoFont -- is the Pango-specific rendering engine which allows + for the more involved cross-lingual rendering operations. +""" +import pango +import logging +import pangocairo +import pygame.rect, pygame.image +import gtk +import struct +from pygame import surface +from pygame.font import Font +from olpcgames import _cairoimage + +log = logging.getLogger( 'olpcgames.pangofont' ) +##log.setLevel( logging.DEBUG ) + +# Install myself on top of pygame.font +def install(): + """Replace Pygame's font module with this module""" + log.info( 'installing' ) + from olpcgames import pangofont + import pygame + pygame.font = pangofont + import sys + sys.modules["pygame.font"] = pangofont + +class PangoFont(object): + """Base class for a pygame.font.Font-like object drawn by Pango + + Attributes of note: + + fd -- instances Pango FontDescription object + WEIGHT_* -- parameters for use with set_weight + STYLE_* -- parameters for use with set_style + + """ + WEIGHT_BOLD = pango.WEIGHT_BOLD + WEIGHT_HEAVY = pango.WEIGHT_HEAVY + WEIGHT_LIGHT = pango.WEIGHT_LIGHT + WEIGHT_NORMAL = pango.WEIGHT_NORMAL + WEIGHT_SEMIBOLD = pango.WEIGHT_SEMIBOLD + WEIGHT_ULTRABOLD = pango.WEIGHT_ULTRABOLD + WEIGHT_ULTRALIGHT = pango.WEIGHT_ULTRALIGHT + STYLE_NORMAL = pango.STYLE_NORMAL + STYLE_ITALIC = pango.STYLE_ITALIC + STYLE_OBLIQUE = pango.STYLE_OBLIQUE + def __init__(self, family=None, size=None, bold=False, italic=False, underline=False, fd=None): + """If you know what pango.FontDescription (fd) you want, pass it in as + 'fd'. Otherwise, specify any number of family, size, bold, or italic, + and we will try to match something up for you.""" + + # Always set the FontDescription (FIXME - only set it if the user wants + # to change something?) + if fd is None: + fd = pango.FontDescription() + if family is not None: + fd.set_family(family) + if size is not None: + log.debug( 'Pre-conversion size: %s', size ) + size = int(size*1024) + log.debug( 'Font size: %s', size, ) + fd.set_size(size) # XXX magic number, pango's scaling + self.fd = fd + self.set_bold( bold ) + self.set_italic( italic ) + self.set_underline( underline ) + + def render(self, text, antialias=True, color=(255,255,255), background=None ): + """Render the font onto a new Surface and return it. + We ignore 'antialias' and use system settings. + + text -- (unicode) string with the text to render + antialias -- attempt to antialias the text or not + color -- three or four-tuple of 0-255 values specifying rendering + colour for the text + background -- three or four-tuple of 0-255 values specifying rendering + colour for the background, or None for trasparent background + + returns a pygame image instance + """ + log.info( 'render: %r, antialias = %s, color=%s, background=%s', text, antialias, color, background ) + + layout = self._createLayout( text ) + # determine pixel size + (logical, ink) = layout.get_pixel_extents() + ink = pygame.rect.Rect(ink) + + # Create a new Cairo ImageSurface + csrf,cctx = _cairoimage.newContext( ink.w, ink.h ) + cctx = pangocairo.CairoContext(cctx) + + # Mangle the colors on little-endian machines. The reason for this + # is that Cairo writes native-endian 32-bit ARGB values whereas + # Pygame expects endian-independent values in whatever format. So we + # tell our users not to expect transparency here (avoiding the A issue) + # and we swizzle all the colors around. + + # render onto it + if background is not None: + background = _cairoimage.mangle_color( background ) + cctx.set_source_rgba(*background) + cctx.paint() + + log.debug( 'incoming color: %s', color ) + color = _cairoimage.mangle_color( color ) + log.debug( ' translated color: %s', color ) + + cctx.new_path() + cctx.layout_path(layout) + cctx.set_source_rgba(*color) + cctx.fill() + + # Create and return a new Pygame Image derived from the Cairo Surface + return _cairoimage.asImage( csrf ) + + def set_bold( self, bold=True): + """Set our font description's weight to "bold" or "normal" + + bold -- boolean, whether to set the value to "bold" weight or not + """ + if bold: + self.set_weight( self.WEIGHT_BOLD ) + else: + self.set_weight( self.WEIGHT_NORMAL ) + def set_weight( self, weight ): + """Explicitly set our pango-style weight value""" + self.fd.set_weight( weight ) + return self.get_weight() + def get_weight( self ): + """Explicitly get our pango-style weight value""" + return self.fd.get_weight() + def get_bold( self ): + """Return whether our font's weight is bold (or above)""" + return self.fd.get_weight() >= pango.WEIGHT_BOLD + + def set_italic( self, italic=True ): + """Set our "italic" value (style)""" + if italic: + self.set_style( self.STYLE_ITALIC ) + else: + self.set_style( self.STYLE_NORMAL ) + def set_style( self, style ): + """Set our font description's pango-style""" + self.fd.set_style( style ) + return self.fd.get_style() + def get_style( self ): + """Get our font description's pango-style""" + return self.fd.get_style() + def get_italic( self ): + """Return whether we are currently italicised""" + return self.fd.get_style() == self.STYLE_ITALIC # what about oblique? + + def set_underline( self, underline=True ): + """Set our current underlining properly""" + self.underline = underline + def get_underline( self ): + """Retrieve our current underline setting""" + return self.underline + + def _createLayout( self, text ): + """Produces a Pango layout describing this text in this font""" + # create layout + layout = pango.Layout(gtk.gdk.pango_context_get()) + layout.set_font_description(self.fd) + if self.underline: + attrs = layout.get_attributes() + if not attrs: + attrs = pango.AttrList() + attrs.insert(pango.AttrUnderline(pango.UNDERLINE_SINGLE, 0, 32767)) + layout.set_attributes( attrs ) + layout.set_text(text) + return layout + + def size( self, text ): + """Determine space required to render given text + + returns tuple of (width,height) + """ + layout = self._createLayout( text ) + (logical, ink) = layout.get_pixel_extents() + ink = pygame.rect.Rect(ink) + return (ink.width,ink.height) + +## def get_linesize( self ): +## """Determine inter-line spacing for the font""" +## font = self.get_context().load_font( self.fd ) +## metrics = font.get_metrics() +## return pango.PIXELS( metrics.get_ascent() ) +## def get_height( self ): +## def get_ascent( self ): +## def get_descent( self ): + + +class SysFont(PangoFont): + """Construct a PangoFont from a font description (name), size in pixels, + bold, and italic designation. Similar to SysFont from Pygame.""" + def __init__(self, name, size, bold=False, italic=False): + fd = pango.FontDescription(name) + fd.set_absolute_size(size*pango.SCALE) + if bold: + fd.set_weight(pango.WEIGHT_BOLD) + if italic: + fd.set_style(pango.STYLE_OBLIQUE) + super(SysFont, self).__init__(fd=fd) + +# originally defined a new class, no reason for that... +NotImplemented = NotImplementedError + +def match_font(name,bold=False,italic=False): + """Stub, does not work, use fontByDesc instead""" + raise NotImplementedError("PangoFont doesn't support match_font directly, use SysFont or .fontByDesc") + +def fontByDesc(desc="",bold=False,italic=False): + """Constructs a FontDescription from the given string representation. + +The format of the fontByDesc string representation is passed directly +to the pango.FontDescription constructor and documented at: + + http://www.pygtk.org/docs/pygtk/class-pangofontdescription.html#constructor-pangofontdescription + +Bold and italic are provided as a convenience. + +The format of the string representation is: + + "[FAMILY-LIST] [STYLE-OPTIONS] [SIZE]" + +where FAMILY-LIST is a comma separated list of families optionally terminated by a comma, STYLE_OPTIONS is a whitespace separated list of words where each WORD describes one of style, variant, weight, or stretch, and SIZE is an decimal number (size in points). For example the following are all valid string representations: + + "sans bold 12" + "serif,monospace bold italic condensed 16" + "normal 10" + +The commonly available font families are: Normal, Sans, Serif and Monospace. The available styles are: +Normal the font is upright. +Oblique the font is slanted, but in a roman style. +Italic the font is slanted in an italic style. + +The available weights are: +Ultra-Light the ultralight weight (= 200) +Light the light weight (=300) +Normal the default weight (= 400) +Bold the bold weight (= 700) +Ultra-Bold the ultra-bold weight (= 800) +Heavy the heavy weight (= 900) + +The available variants are: +Normal +Small-Caps + +The available stretch styles are: +Ultra-Condensed the smallest width +Extra-Condensed +Condensed +Semi-Condensed +Normal the normal width +Semi-Expanded +Expanded +Extra-Expanded +Ultra-Expanded the widest width + """ + fd = pango.FontDescription(name) + if bold: + fd.set_weight(pango.WEIGHT_BOLD) + if italic: + fd.set_style(pango.STYLE_OBLIQUE) + return PangoFont(fd=fd) + +def get_init(): + """Return boolean indicating whether we are initialised + + Always returns True + """ + return True + +def init(): + """Initialise the module (null operation)""" + pass + +def quit(): + """De-initialise the module (null operation)""" + pass + +def get_default_font(): + """Return default-font specification to be passed to e.g. fontByDesc""" + return "sans" + +def get_fonts(): + """Return the set of all fonts available (currently just 3 generic types)""" + return ["sans","serif","monospace"] + + +def stdcolor(color): + """Produce a 4-element 0.0-1.0 color value from input""" + def fixlen(color): + if len(color) == 3: + return tuple(color) + (255,) + elif len(color) == 4: + return color + else: + raise TypeError("What sort of color is this: %s" % (color,)) + return [_fixColorBase(x) for x in fixlen(color)] +def _fixColorBase( v ): + """Return a properly clamped colour in floating-point space""" + return max((0,min((v,255.0))))/255.0 diff --git a/olpcgames/pausescreen.py b/olpcgames/pausescreen.py new file mode 100755 index 0000000..113a0ea --- /dev/null +++ b/olpcgames/pausescreen.py @@ -0,0 +1,116 @@ +"""Display a "paused" version of the currently-displayed screen + +This code is largely cribbed from the Pippy activity's display code, +but we try to be a little more generally usable than they are, as +we have more involved activities using the code. + +We use svgsprite to render a graphic which is stored in the +olpcgames data directory over a dimmed version of the current +screen contents. + +_LAST_EVENT_TIME -- tracks the last time that we saw an event + come across the wire. +""" +import logging +log = logging.getLogger( 'olpcgames.pausescreen' ) +import pygame +from pygame import sprite + +_LAST_EVENT_TIME = 0 + +def _set_last_event_time( time=None ): + """Set time as the last event time + + time -- if None, pygame.time.get_ticks() is used + + returns time set + """ + global _LAST_EVENT_TIME + if time is None: + time = pygame.time.get_ticks() + _LAST_EVENT_TIME = time + return time + +def last_event_time( ): + """Return the duration since last event for pausing operations + + returns time in seconds + """ + global _LAST_EVENT_TIME + return (pygame.time.get_ticks() - _LAST_EVENT_TIME)/1000. + + +def get_events( sleep_timeout = 10, pause=None, **args ): + """Retrieve the set of pending events or sleep + + sleep_timeout -- dormant period before we invoke pause_screen + pause -- callable to produce visual notification of pausing, normally + by taking the current screen and modifying it in some way. Defaults + to pauseScreen in this module. If you return nothing from this + function then no restoration or display-flipping will occur + *args -- if present, passed to 'pause' to configuration operation (e.g. + to specify a different overlaySVG file) + + returns set of pending events (potentially empty) + """ + if not pause: + pause = pauseScreen + events = pygame.event.get( ) + if not events: + log.info( 'No events in queue' ) + old_screen = None + if last_event_time() > sleep_timeout: + # we've been waiting long enough, go to sleep visually + log.warn( 'Pausing activity after %s with function %s', sleep_timeout, pause ) + old_screen = pause( ) + if old_screen: + pygame.display.flip() + # now we wait until there *are* some events (efficiently) + # and retrieve any extra events that are waiting... + events = [ pygame.event.wait() ] + pygame.event.get() + log.warn( 'Activity restarted') + if old_screen: + restoreScreen( old_screen ) + if events: + _set_last_event_time() + return events + +def pauseScreen( overlaySVG=None ): + """Display a "Paused" screen and suspend + + This default implementation will not do anything to shut down your + simulation or other code running in other threads. It will merely block + this thread (the pygame thread) until an event shows up in the + eventwrap queue. + + Returns a surface to pass to restoreScreen to continue... + """ + from olpcgames import svgsprite + if not overlaySVG: + from olpcgames.data import sleeping_svg + overlaySVG = sleeping_svg.data + screen = pygame.display.get_surface() + old_screen = screen.copy() # save this for later. + pause_sprite = svgsprite.SVGSprite( + overlaySVG, + ) + pause_sprite.rect.center = screen.get_rect().center + group = sprite.RenderUpdates( ) + group.add( pause_sprite ) + + # dim the screen and display the 'paused' message in the center. + BLACK = (0,0,0) + WHITE = (255,255,255) + dimmed = screen.copy() + dimmed.set_alpha(128) + screen.fill(BLACK) + screen.blit(dimmed, (0,0)) + + group.draw( screen ) + return old_screen + +def restoreScreen( old_screen ): + """Restore the original screen and return""" + screen = pygame.display.get_surface() + screen.blit(old_screen, (0,0)) + return old_screen diff --git a/olpcgames/svg.py b/olpcgames/svg.py new file mode 100755 index 0000000..c4dd707 --- /dev/null +++ b/olpcgames/svg.py @@ -0,0 +1,71 @@ +"""Image-load from svg files to Pygame images + +Dependent on RSVG and Cairo libraries +""" +from olpcgames import _cairoimage + +def load( file, (width, height)=(None,None) ): + """pygame.load like interface for loading SVG graphics + + file -- object with read() method (file-like object) or a string + filename for a file to be read off the local system + + See render function for details of width and height + arguments + + returns Pygame image instance + """ + try: + data = file.read() + except AttributeError, err: + data = open( file, 'r').read() + return render( data, (width,height) ) + +def render( data, (width, height)=(None,None) ): + """Render SVG graphic/data to a Pygame image object + + data -- SVG file for loading into the image, must be properly formed + and valid SVG to allow the rendering to complete + + (width,height) -- size of the resulting image in pixels, the graphic will + be scaled to fit into the image. + + If one dimension is left as None, then the graphic will be scaled to + fit the given dimension, with the other dimension provided by the + proportions of the graphic. + + If both dimensions are left as None, then they will both be provided + by the "natural" dimensions of the SVG at the natural (GTK-defined) + resolution of the screen. + + returns Pygame image instance + """ + import rsvg + handle = rsvg.Handle( data = data ) + originalSize = (width,height) + scale = 1.0 + hw,hh = handle.get_dimension_data()[:2] + if hw and hh: + if not width: + if not height: + width,height = hw,hh + else: + scale = float(height)/hh + width = hh/float(hw) * height + elif not height: + scale = float(width)/hw + height = hw/float(hh) * width + else: + # scale only, only rendering as large as it is... + if width/height > hw/hh: + # want it taller than it is... + width = hh/float(hw) * height + else: + height = hw/float(hh) * width + scale = float(height)/hh + + csrf, ctx = _cairoimage.newContext( int(width), int(height) ) + ctx.scale( scale, scale ) + handle.render_cairo( ctx ) + return _cairoimage.asImage( csrf ) + return None diff --git a/olpcgames/svgsprite.py b/olpcgames/svgsprite.py new file mode 100755 index 0000000..e47eed2 --- /dev/null +++ b/olpcgames/svgsprite.py @@ -0,0 +1,52 @@ +"""RSVG/Cairo-based rendering of SVG into Pygame Images""" +from pygame import sprite, Rect +from olpcgames import svg + +class SVGSprite( sprite.Sprite ): + """Sprite class which renders SVG source-code as a Pygame image + + Note: + + Currently this sprite class is a bit over-engineered, it gets in the way + if you want to, e.g. animate among a number of SVG drawings, as it + assumes that setSVG will always set a single SVG file for rendering. + """ + rect = image = None + resolution = None + def __init__( + self, svg=None, size=None, *args + ): + """Initialise the svg sprite + + svg -- svg source text (i.e. content of an svg file) + size -- optional, to constrain size, (width,height), leaving one + as None or 0 causes proportional scaling, leaving both + as None or 0 causes natural scaling (screen resolution) + args -- if present, groups to which to automatically add + """ + self.size = size + super( SVGSprite, self ).__init__( *args ) + if svg: + self.setSVG( svg ) + def setSVG( self, svg ): + """Set our SVG source""" + self.svg = svg + # XXX could delay this until actually asked to display... + if self.size: + width,height = self.size + else: + width,height = None,None + self.image = svg.render( self.svg, (width,height) ).convert_alpha() + rect = self.image.get_rect() + if self.rect: + rect.move( self.rect ) # should let something higher-level do that... + self.rect = rect + def copy( self ): + """Create a copy of this sprite without reloading the svg image""" + result = self.__class__( + size = self.size + ) + result.image = self.image + result.rect = Rect(self.rect) + result.resolution = self.resolution + return result diff --git a/olpcgames/textsprite.py b/olpcgames/textsprite.py new file mode 100755 index 0000000..7663630 --- /dev/null +++ b/olpcgames/textsprite.py @@ -0,0 +1,40 @@ +"""Simple Sprite sub-class that renders via a PangoFont""" +from pygame import sprite +from olpcgames import pangofont + +class TextSprite( sprite.Sprite ): + """Sprite with a simple text renderer""" + image = rect = text = color = background = None + def __init__( self, text=None, family=None, size=None, bold=False, italic=False, color=None, background=None ): + super( TextSprite, self ).__init__( ) + self.font = pangofont.PangoFont( family=family, size=size, bold=bold, italic=italic ) + self.set_color( color ) + self.set_background( background ) + self.set_text( text ) + def set_text( self, text ): + """Set our text string and render to a graphic""" + self.text = text + self.render( ) + def set_color( self, color =None): + """Set our rendering colour (default white)""" + self.color = color or (255,255,255) + self.render() + def set_background( self, color=None ): + """Set our background color, default transparent""" + self.background = color + self.render() + def render( self ): + """Render our image and rect (or None,None) + + After a render you will need to move the rect member to the + correct location on the screen. + """ + if self.text: + self.image = self.font.render( self.text, color = self.color, background = self.background ) + currentRect = self.rect + self.rect = self.image.get_rect() + if currentRect: + self.rect.center = currentRect.center + else: + self.rect = None + self.image = None diff --git a/olpcgames/util.py b/olpcgames/util.py index 528fb35..a0c26b0 100644..100755 --- a/olpcgames/util.py +++ b/olpcgames/util.py @@ -1,11 +1,85 @@ -import os.path
-
-try:
- from sugar.activity.activity import get_bundle_path
-except ImportError:
- def get_bundle_path():
- return ''
-
-def data_path(file_name):
- """Return the full path to a file in the data directory."""
- return os.path.join(get_bundle_path(), 'data', file_name)
\ No newline at end of file +"""Abstraction layer for working outside the Sugar environment""" +import traceback, cStringIO +import logging +log = logging.getLogger( 'olpcgames.util' ) +import os +import os.path + +NON_SUGAR_ROOT = '~/.sugar/default/olpcgames' + +try: + from sugar.activity.activity import get_bundle_path as _get_bundle_path + def get_bundle_path( ): + """Retrieve bundle path from activity with fix for silly registration bug""" + path = _get_bundle_path() + if path.endswith( '.activity.activity' ): + log.warn( '''Found double .activity suffix in bundle path, truncating: %s''', path ) + path = path[:-9] + return path +except ImportError: + log.warn( '''Do not appear to be running under Sugar, stubbing-in get_bundle_path''' ) + def get_bundle_path(): + """Retrieve a substitute data-path for non OLPC systems""" + return os.getcwd() + + +def get_activity_root( ): + """Return the activity root for data storage operations + + If the activity is present, returns the activity's root, + otherwise returns NON_SUGAR_ROOT as the directory. + """ + root = os.environ.get( 'SUGAR_ACTIVITY_ROOT' ) + if not root: + root = NON_SUGAR_ROOT + log.debug( 'Activity Root: %s', root ) + return os.path.expanduser( root ) + +def data_path(file_name): + """Return the full path to a file in the data sub-directory of the bundle""" + dirname = os.path.join(get_bundle_path(), 'data' ) + if not os.path.isdir( dirname ): + os.makedirs( dirname ) + return os.path.join( dirname, file_name ) +def tmp_path(file_name): + """Return the full path to a file in the temporary directory""" + dirname = os.path.join(get_bundle_path(), 'tmp' ) + if not os.path.isdir( dirname ): + os.makedirs( dirname ) + return os.path.join(dirname, file_name) + +def get_traceback(error): + """Get formatted traceback from current exception + + error -- Exception instance raised + + Attempts to produce a 10-level traceback as a string + that you can log off. Use like so: + + try: + doSomething() + except Exception, err: + log.error( + '''Failure during doSomething with X,Y,Z parameters: %s''', + util.get_traceback( err ), + ) + """ + if error is None: + error = [] + for (f,l,func,statement) in traceback.extract_stack()[:-2]: + if statement: + statement = ': %s'%( statement, ) + if func: + error.append( '%s.%s (%s)%s'%( f,func,l, statement)) + else: + error.append( '%s (%s)%s'%( f,l, statement)) + return "\n".join( error ) + else: + exception = str(error) + file = cStringIO.StringIO() + try: + traceback.print_exc( limit=10, file = file ) + exception = file.getvalue() + finally: + file.close() + return exception diff --git a/olpcgames/video.py b/olpcgames/video.py index a0218b4..032aa13 100644..100755 --- a/olpcgames/video.py +++ b/olpcgames/video.py @@ -1,69 +1,178 @@ -import os
-import signal
-
+"""Video widget for displaying a gstreamer pipe + +Note: currently this module is not all that elegant or useful, +we need a better recipe for using and working with Video +under OLPCGames. +""" +import logging +log = logging.getLogger( 'olpcgames.video' ) +#log.setLevel( logging.INFO ) +import os +import signal +import pygame +import weakref +import olpcgames +from olpcgames import _gtkmain + import pygtk pygtk.require('2.0') -import gtk
-import logging
-import gst
-
-class VideoWidget(gtk.DrawingArea):
- """A custom widget to render GStreamer video."""
-
- def __init__(self, x=160, y=120):
- super(VideoWidget, self).__init__()
- self._imagesink = None
- self.unset_flags(gtk.DOUBLE_BUFFERED)
- self.set_size_request(x,y)
-
- def do_expose_event(self, event):
- if self._imagesink:
- self._imagesink.expose()
- return False
- else:
- return True
-
- def set_sink(self, sink):
- assert self.window.xid
- self._imagesink = sink
- self._imagesink.set_xwindow_id(self.window.xid)
-
-#pipe_desc = 'v4l2src ! video/x-raw-yuv,width=160,height=120 ! ffmpegcolorspace ! xvimagesink'
-pipe_desc = 'v4l2src ! ffmpegcolorspace ! video/x-raw-yuv ! xvimagesink'
-class Player(object):
- def __init__(self, videowidget):
- self._playing = False
- self._videowidget = videowidget
-
- self._pipeline = gst.parse_launch(pipe_desc)
-
- bus = self._pipeline.get_bus()
- bus.enable_sync_message_emission()
- bus.add_signal_watch()
- bus.connect('sync-message::element', self.on_sync_message)
- bus.connect('message', self.on_message)
-
- def play(self):
- if self._playing == False:
- self._pipeline.set_state(gst.STATE_PLAYING)
- self._playing = True
-
- def pause(self):
- if self._playing == True:
- self._pipeline.set_state(gst.STATE_PAUSED)
- self._playing = False
-
- def on_sync_message(self, bus, message):
- if message.structure is None:
- return
- if message.structure.get_name() == 'prepare-xwindow-id':
- self._videowidget.set_sink(message.src)
-
- def on_message(self, bus, message):
- t = message.type
- if t == gst.MESSAGE_ERROR:
- err, debug = message.parse_error()
- logging.debug("Video error: (%s) %s" % (err, debug))
- self._playing = False
- gtk.main_quit()
-
\ No newline at end of file +import gtk +import gst + +class VideoWidget(gtk.DrawingArea): + """Widget to render GStreamer video over our Pygame Canvas + + The VideoWidget is a simple GTK window which is + held by the PygameCanvas, just as is the Pygame + window we normally use. As such this approach + *cannot* work without the GTK wrapper. + + It *should* be possible to use raw X11 operations + to create a child window of the Pygame/SDL window + and use that for the same purpose, but that would + require some pretty low-level ctypes hacking. + + Attributes of Note: + + rect -- Pygame rectangle which tells us where to + display ourselves, setting the rect changes the + position and size of the window. + """ + _imagesink = None + _renderedRect = None + def __init__(self, rect=None, force_aspect_ratio=True): + super(VideoWidget, self).__init__() + self.unset_flags(gtk.DOUBLE_BUFFERED) + if rect is None: + rect = pygame.Rect( (0,0), (160,120)) + self.rect = rect + self.force_aspect_ratio = force_aspect_ratio + self.set_size_request(rect.width,rect.height) + olpcgames.WIDGET.put( self, rect.left,rect.top) + self._renderedRect = rect + self.show() + + def set_rect( self, rect ): + """Set our rectangle (area of the screen)""" + log.debug( 'Set rectangle: %s', rect ) + self.set_size_request(rect.width,rect.height) + olpcgames.WIDGET.move( self, rect.left,rect.top) + self.rect = rect + + def do_expose_event(self, event): + """Handle exposure event (trigger redraw by gst)""" + if self._imagesink: + self._imagesink.expose() + return False + else: + return True + + def set_sink(self, sink): + """Set our window-sink for output""" + assert self.window.xid + self._imagesink = sink + self._imagesink.set_xwindow_id(self.window.xid) + self._imagesink.set_property('force-aspect-ratio', self.force_aspect_ratio) + +class PygameWidget( object ): + """Render "full-screen" video to the entire Pygame screen + + Not particularly useful unless this happens to be exactly what you need. + """ + def __init__( self ): + try: + window_id = pygame.display.get_wm_info()['window'] + except KeyError, err: # pygame-ctypes... + window_id = int(os.environ['SDL_WINDOWID']) + self.window_id = window_id + self._imagesink = None + #self._holder = _gtkmain.Holder() + def set_sink( self, sink ): + """Set up our gst sink""" + log.info( 'Setting sink: %s', sink ) + self._imagesink = sink + sink.set_xwindow_id( self.window_id ) + +#pipe_desc = 'v4l2src ! video/x-raw-yuv,width=160,height=120 ! ffmpegcolorspace ! xvimagesink' +class Player(object): + pipe_desc = 'v4l2src ! ffmpegcolorspace ! video/x-raw-yuv ! xvimagesink' + test_pipe_desc = 'videotestsrc ! ffmpegcolorspace ! video/x-raw-yuv ! xvimagesink' + _synchronized = False + def __init__(self, videowidget, pipe_desc=pipe_desc): + self._playing = False + self._videowidget = videowidget + + self._pipeline = gst.parse_launch(pipe_desc) + + bus = self._pipeline.get_bus() + bus.enable_sync_message_emission() + bus.add_signal_watch() + bus.connect('sync-message::element', self.on_sync_message) + bus.connect('message', self.on_message) + + def play(self): + log.info( 'Play' ) + if self._playing == False: + self._pipeline.set_state(gst.STATE_PLAYING) + self._playing = True + + def pause(self): + log.info( 'Pause' ) + if self._playing == True: + if self._synchronized: + log.debug( ' pause already sync\'d' ) + self._pipeline.set_state(gst.STATE_PAUSED) + self._playing = False + def stop( self ): + """Stop all playback""" + self._pipeline.set_state( gst.STATE_NULL ) + + def on_sync_message(self, bus, message): + log.info( 'Sync: %s', message ) + if message.structure is None: + return + if message.structure.get_name() == 'prepare-xwindow-id': + self._synchronized = True + self._videowidget.set_sink(message.src) + + def on_message(self, bus, message): + log.info( 'Message: %s', message ) + t = message.type + if t == gst.MESSAGE_ERROR: + err, debug = message.parse_error() + log.warn("Video error: (%s) %s" ,err, debug) + self._playing = False + +if __name__ == "__main__": + # Simple testing code... + logging.basicConfig() + log.setLevel( logging.DEBUG ) + from pygame import image,display, event + import pygame + def main(): + display.init() + maxX,maxY = display.list_modes()[0] + screen = display.set_mode( (maxX/3, maxY/3 ) ) + + display.flip() + + pgw = PygameWidget( ) + p = Player( pgw, pipe_desc=Player.test_pipe_desc ) + p.play() + + clock = pygame.time.Clock() + + running = True + while running: + clock.tick( 60 ) + for evt in [pygame.event.wait()] + pygame.event.get(): + if evt.type == pygame.KEYDOWN: + if p._playing: + p.pause() + else: + p.play() + elif evt.type == pygame.QUIT: + p.stop() + running = False + #display.flip() + main() diff --git a/question.py b/question.py index 18e90c5..8c1bbb5 100644..100755 --- a/question.py +++ b/question.py @@ -1,4 +1,26 @@ -#!/usr/bin/python +#! /usr/bin/env python +# -*- coding: utf-8 -*- +# +# Kuku Anakula +# Copyright (C) 2007, Julius B. Lucks, Adrian DelMaestro, Sera L. Young +# Copyright (C) 2012, Alan Aguiar +# +# 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/>. +# +# Contact information: +# Julius B. Lucks <julius@younglucks.com> +# Alan Aguiar <alanjas@gmail.com> import random import math @@ -3,8 +3,9 @@ try: from sugar.activity import bundlebuilder bundlebuilder.start() except ImportError: - import os - os.chdir('..') - os.system('cat Kuku.activity/MANIFEST | zip kuku.xo -@') - os.system('mv kuku.xo ./Kuku.activity') - os.chdir('Kuku.activity') + pass + #import os + #os.chdir('..') + #os.system('cat Kuku.activity/MANIFEST | zip kuku.xo -@') + #os.system('mv kuku.xo ./Kuku.activity') + #os.chdir('Kuku.activity') @@ -1,30 +1,28 @@ -""" -tile.py +#! /usr/bin/env python +# -*- coding: utf-8 -*- +# +# Kuku Anakula +# Copyright (C) 2007, Julius B. Lucks, Adrian DelMaestro, Sera L. Young +# Copyright (C) 2012, Alan Aguiar +# +# 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/>. +# +# Contact information: +# Julius B. Lucks <julius@younglucks.com> +# Alan Aguiar <alanjas@gmail.com> -Includes class Tile which represents -one tile on a grid. - -Copyright 2007, Julius B. Lucks, Adrian DelMaestro, Sera L. Young - -This file is part of Kuku. - -Kuku 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 version 2 of the License. - -Kuku 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 Kuku; if not, write to the Free Software -Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -The copy of the GNU General Public License is found in the COPYING file -included in the source distribution. - - -""" +# Includes class Tile which represents one tile on a grid. import pygame if not pygame.font: print 'Warning, fonts disabled' |
