Bump version.

mouse, as appropriate.

CHANGELOG.txt

@@ -1,3 +1,106 @@
+New in Ren'Py 6.9.3
+-------------------
+
+This release includes Launcher2, a near-total rewrite of the Ren'Py
+launcher. Among the more important changes are:
+
+* The launcher now supports a project directory. It is no longer
+necessary to move projects around when upgrading Ren'Py.
+
+* The launcher has support for selecting the editor to use. While we
+ship with jEdit support, other editors can be downloaded from the
+Ren'Py web site.
+
+* When building distributions, the launcher now allows the user to
+choose which distributions are built.
+
+* The Macintosh distribution now places all non-documentation files
+inside a single application.
+
+* There is a new combined distribution, which includes support for
+Windows, Linux, and Macintosh in a single zip file.
+
+
+The new ui.detached function allows one to use the ui functions to
+define displayables without adding them to a layer.
+
+
+Ren'Py will now search for a directory named "Ren'Py Data" in the
+directories above your Ren'Py installation. If found, save data will
+be placed in that directory, rather than the system-specific default
+location. This should help make it easier to develop Ren'Py games when
+using a USB drive.
+
+
+The save location for screenshots has now been standardized. It is now
+the directory containing the executable used to start Ren'Py, be it a
+.exe, .py, .sh, or .app. (The latter is handled specially.)
+
+
+Allow config.layer_clipping to specify layers that are larger than the
+screen.
+
+
+The various layouts now change the mouse to the gamemenu or mainmenu
+mouse, as appropriate.
+
+
+This distribution include a new NVL-mode tutorial, teaching people how
+to make NVL-mode games.
+
+
+Fixed a long-standing problem that could cause Rollback to operate
+incorrectly with object that were unreachable at the time of the
+Rollback.
+
+Fixed a problem that prevented animations from displaying correctly
+when the animation was displayed more than once.
+
+Fixed a problem that could cause children of the various
+MultiBox-based displayables (Fixed, HBox, VBox, and LiveComposite) to
+display animations incorrectly.
+
+
+New in Ren'Py 6.9.2
+-------------------
+
+The semantics for play and queue have changed slightly. Now, when a
+play statement is followed by one or more queue statements, the first 
+file in each play or queue statement will be played. For example:
+
+play music "a.ogg"
+queue music "b.ogg"
+queue music "c.ogg"
+
+will play "a.ogg", "b.ogg", and then loop "c.ogg". This change also
+applies to renpy.music.play and renpy.music.queue.
+
+
+Rollback was changed so that doing anything other than a roll-forward
+while in rollback mode exits rollback immediately.
+
+
+The library alias for config has been removed.
+
+
+Fixed a regression that caused dissolves to be terribly slow.
+
+Fixed a bug that caused Ren'Py to crash when playing music on Windows
+when Data Execution Prevention was enabled. DEP is enabled by default
+on 64-bit Windows Vista.
+
+Fixed a bug that caused Ren'Py to crash when a window icon was used on
+a computer with a 16-bit or 8-bit screen depth.
+
+Fixed a bug that caused ui.sizer to malfunction.
+
+Fixed a repeated word in "The Question".
+
+Fixed a bug that could cause it to take two tries to define a joystick 
+button.
+
+
+
 New in Ren'Py 6.9.1
 -------------------
 

build_launchertrans.py

@@ -1,51 +0,0 @@
-1#!/usr/bin/env python
-
-import glob
-import re
-from sets import Set as set
-import sys
-
-seen_files = set()
-seen_strings = set()
-
-def tl(fn, s):
-
-    s = eval(s)
-
-    if len(s) < 3:
-        return
-    
-    if s in seen_strings:
-        return
-
-    if fn not in seen_files:
-        print >>out
-        print >>out, "    # Translatable strings found in", fn
-        print >>out
-        seen_files.add(fn)
-
-    print >>out, "    config.translations[%r] = %r" % (s, s)
-    seen_strings.add(s)
-
-def process(fn):
-    
-    data = file(fn).read()
-
-    for m in re.finditer(r'\bu\"(\\"|[^"])+\"', data):
-        tl(fn, m.group(0))
-
-    for m in re.finditer(r"\bu\'(\\'|[^'])+\'", data):
-        tl(fn, m.group(0))
-
-if __name__ == "__main__":
-
-    # out = file("extras/translations.rpy", "w")
-    out = sys.stdout
-    
-    print >>out, "# This file contains a list of all of the phrases you can translate"
-    print >>out, "# from the Ren'Py launcher."
-    print >>out, ""
-    print >>out, "init python:"
-
-    for fn in glob.glob("launcher/*.rpy"):
-        process(fn)

build_pot.py

@@ -0,0 +1,84 @@
+1#!/usr/bin/env python
+
+import collections
+import glob
+import re
+import sys
+import time
+
+# A map from string to filename, line number where the string is found.
+strings = collections.defaultdict(list)
+
+def process(fn):
+
+    lineno = 0
+    
+    for data in file(fn, "r"):
+
+        lineno += 1
+
+        matches = [ ]
+        
+        matches += re.finditer(r'\bu\"(\\"|[^"])+\"', data)
+        matches += re.finditer(r"\bu\'(\\'|[^'])+\'", data)
+
+        for m in matches:
+            s = m.group(0)[2:-1]
+
+            if "\\u" in s:
+                continue
+
+            if len(s) == 1:
+                continue
+            
+            strings[s].append("%s:%d" % (fn, lineno))
+
+if __name__ == "__main__":
+
+    files = [ ]
+
+    files += glob.glob("launcher2/*.rpy")
+    files += glob.glob("common/*.rpy")
+    files += glob.glob("common/_layout/*.rpym")
+    files += glob.glob("common/_compat/*.rpym")
+        
+    for fn in files:
+        process(fn)
+
+
+    converse = [ ]
+        
+    for k, v in strings.iteritems():
+        v = " ".join(sorted(v))
+        converse.append((v, k))
+
+    converse.sort()
+
+    print """\
+# Ren'Py Visual Novel Engine
+# Copyright (C) 2009 PyTom <pytom@bishoujo.us>
+# This file is distributed under the same license as the Ren'Py package.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: mainline\\n"
+"Report-Msgid-Bugs-To: PyTom <pytom@bishoujo.us>\\n"
+"POT-Creation-Date: %s\\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: 8bit\\n"
+""" % time.strftime("%Y-%m-%d %H:%M%z")
+    
+    for v, k in converse:
+        print
+        print "#:", v
+        print "#, python-format"
+        print "msgid \"%s\"" % k
+        print "msgstr \"\""
+        
+        
+        

build_strings.py

@@ -0,0 +1,80 @@
+1#!/usr/bin/env python
+
+import collections
+import glob
+import re
+import sys
+import time
+import os
+
+# A map from string to filename, line number where the string is found.
+strings = collections.defaultdict(list)
+
+def process(fn):
+
+    lineno = 0
+    
+    for data in file(fn, "r"):
+
+        lineno += 1
+
+        matches = [ ]
+        
+        matches += re.finditer(r'\bu\"(\\"|[^"])+\"', data)
+        matches += re.finditer(r"\bu\'(\\'|[^'])+\'", data)
+
+        for m in matches:
+            s = m.group(0)[2:-1]
+
+            if "\\u" in s:
+                continue
+
+            if len(s) == 1:
+                continue
+            
+            strings[s].append("%s:%d" % (fn, lineno))
+
+if __name__ == "__main__":
+
+    files = [ ]
+
+    files += glob.glob("launcher/*.rpy")
+    files += glob.glob("common/*.rpy")
+    files += glob.glob("common/_layout/*.rpym")
+    files += glob.glob("common/_compat/*.rpym")
+
+    if "launcher/strings.rpy" in files:
+        files.remove("launcher/strings.rpy")
+    
+    for fn in files:
+        process(fn)
+
+    converse = [ ]
+        
+    for k, v in strings.iteritems():
+        v = " ".join(sorted(v))
+        converse.append((v, k))
+
+    converse.sort()
+
+    f = file("launcher/strings.rpy", "w")
+
+    files = set(i for i in os.listdir("launcher") if i.endswith(".rpy"))
+    
+    print >>f, """\
+init python:
+    LAUNCHER_RPYS = %r
+
+    TRANSLATION_STRINGS = [
+""" % files
+    
+    for v, k in converse:
+        # print
+        # print "#:", v
+        # print "#, python-format"
+
+        print >>f, "        %r," % unicode(k)
+
+    print >>f, """\
+    ]
+"""

build_translations.py

@@ -1,48 +0,0 @@
-1#!/usr/bin/env python
-
-import glob
-import re
-from sets import Set as set
-import sys
-
-seen_files = set()
-seen_strings = set()
-
-def tl(fn, s):
-
-    s = eval(s)
-
-    if s in seen_strings:
-        return
-
-    if fn not in seen_files:
-        print >>out
-        print >>out, "    # Translatable strings found in", fn
-        print >>out
-        seen_files.add(fn)
-
-    print >>out, "    config.translations[%r] = %r" % (s, s)
-    seen_strings.add(s)
-
-def process(fn):
-    
-    data = file(fn).read()
-
-    for m in re.finditer(r'\bu\"(\\"|[^"])+\"', data):
-        tl(fn, m.group(0))
-
-    for m in re.finditer(r"\bu\'(\\'|[^'])+\'", data):
-        tl(fn, m.group(0))
-
-if __name__ == "__main__":
-
-    # out = file("extras/translations.rpy", "w")
-    out = sys.stdout
-    
-    print >>out, "# This file contains a list of all of the phrases you can translate"
-    print >>out, "# from the Ren'Py common code."
-    print >>out, ""
-    print >>out, "init python:"
-
-    for fn in glob.glob("common/*.rpy") + glob.glob("common/_layout/*.rpym") + glob.glob("common/_compat/*.rpym"):
-        process(fn)

common/00compat.rpy

@@ -13,6 +13,9 @@ init -1210 python:
         if version <= (6, 5, 0):
             layout.compat()
 
+        if version <= (6, 9, 1):
+            store.library = store.config
+            
 init 1210 python hide::
 
     # This returns true if the script_version is <= the

common/00library.rpy

@@ -129,10 +129,13 @@ init -1180 python:
             return
 
         _preferences.fullscreen = False
-        
-        import webbrowser
-        webbrowser.open_new("file:///" + config.basedir + "/" + config.help)
-        
+
+        try:
+            import webbrowser
+            webbrowser.open_new("file:///" + config.basedir + "/" + config.help)
+        except:
+            pass
+            
     
 init -1180 python hide:
 
@@ -140,18 +143,36 @@ init -1180 python hide:
     def screenshot():
         import os.path
         import os
-
-        pattern = os.environ.get("RENPY_SCREENSHOT_PATTERN", "screenshot%04d.png")
+        import __main__
         
+        pattern = os.environ.get("RENPY_SCREENSHOT_PATTERN", "screenshot%04d.png")
+
+        # Pick the directory to save into.
+        dest = config.renpy_base.rstrip("/")
+        
+        # Guess if we're an OSX App.
+        if dest.endswith("/Contents/Resources/autorun"):
+            # Go up 4 directories.
+            dest = os.path.dirname(dest)
+            dest = os.path.dirname(dest)
+            dest = os.path.dirname(dest)
+            dest = os.path.dirname(dest)
+
+        # Try to pick a filename.
         i = 1
         while True:
-            fn = pattern % i
+            fn = dest + "/" + pattern % i
             if not os.path.exists(fn):
                 break
             i += 1
 
-        renpy.screenshot(fn)
-
+        try:
+            renpy.screenshot(fn)
+        except:
+            import traceback
+            traceback.print_exc()
+        
+            
     def dump_styles():
         if config.developer:
             renpy.style.write_text("styles.txt")
@@ -297,25 +318,6 @@ label _hide_windows:
 
     
 # This code here handles check for the correct version of the Ren'Py module.
-
-label _check_module:
-
-    if not config.module_warning:
-        return
-
-    python hide:
-        module_info = _(u"While Ren'Py games may be playable without the renpy module, some features may be disabled. For more information, read the module/README.txt file or go to http://www.bishoujo.us/renpy/.")
-
-        if renpy.module_version() == 0:
-            _show_exception(_(u"renpy module not found."),
-                            _(u"The renpy module could not be loaded on your system.") + "\n\n" + module_info)
-        elif renpy.module_version() < config.module_version:
-            _show_exception(_(u"Old renpy module found."),
-                            _(u"An old version (%d) of the Ren'Py module was found on your system, while this game requires version %d.") % (renpy.module_version(), config.module_version) + "\n\n" + module_info)
-
-    return
-    
-
                          
 label _save_reload_game:
     python hide:
@@ -660,7 +662,7 @@ label _start:
         for i in config.start_callbacks:
             i()
     
-    call _check_module from _call__check_module_1
+    # call _check_module from _call__check_module_1
     call _load_reload_game from _call__load_reload_game_1
 
     scene black

common/_layout/classic_joystick_preferences.rpym

@@ -28,8 +28,6 @@ init python:
     style.js_prefs_button.xminimum = 0.5
     style.js_prefs_box.box_first_spacing = 10
     
-
-    
     config.joystick_keys = [
         (u'Left', 'joy_left'),
         (u'Right', 'joy_right'),
@@ -42,8 +40,6 @@ init python:
         (u'Hide Text', 'joy_hide'),
         (u'Menu', 'joy_menu'),
         ]
-
-    
     
     def _joystick_select_binding():
 
@@ -55,8 +51,8 @@ init python:
             layout.button(_(label) + " - " + _(_preferences.joymap.get(key, u"Not Assigned")), "prefs_js", clicked=my_clicked, index=label)
     
     def _joystick_get_binding():
-        ui.add(renpy.display.joystick.JoyBehavior())
         ui.saybehavior()
+        ui.add(renpy.display.joystick.JoyBehavior())
 
     def _joystick_take_binding(binding, key):
 
@@ -79,7 +75,7 @@ init python:
                 ui.close()
 
                 _joystick_get_binding()
-                binding = ui.interact()
+                binding = ui.interact(mouse="gamemenu")
                 _joystick_take_binding(binding, key)
                 
                 return True
@@ -104,7 +100,7 @@ label joystick_preferences_screen:
         python:
             layout.navigation("joystick_preferences")
             _joystick_preferences()
-            ui.interact()
+            ui.interact(mouse="gamemenu")
 
             
         

common/_layout/classic_load_save.rpym

@@ -291,7 +291,7 @@ init python:
             ui.close() # slots
             ui.close() # whole thing
 
-            result = ui.interact()
+            result = ui.interact(mouse="gamemenu")
             type, value = result
 
             if type == "return":

common/_layout/classic_main_menu.rpym

@@ -50,7 +50,7 @@ label main_menu_screen:
 
         ui.close()
 
-        ui.interact()
+        ui.interact(mouse="mainmenu")
         
     return
             

common/_layout/classic_preferences_common.rpym

@@ -54,7 +54,7 @@ init python:
 
         ui.close()
 
-        ui.interact()
+        ui.interact(mouse="gamemenu")
 
     class _Preference(object):
         """

common/_layout/classic_yesno_prompt.rpym

@@ -49,7 +49,7 @@ init python hide:
         ui.close()
         ui.close()
 
-        rv = ui.interact()
+        rv = ui.interact(mouse="gamemenu")
         renpy.transition(config.intra_transition)
         return rv
 

common/_layout/grouped_main_menu.rpym

@@ -62,7 +62,7 @@ label main_menu_screen:
             
         ui.close() # outer box
 
-        ui.interact()
+        ui.interact(mouse="mainmenu")
         
     return
             

common/_layout/imagemap_load_save.rpym

@@ -289,7 +289,7 @@ init python:
 
             ime.close()
                 
-            result = ui.interact()
+            result = ui.interact(mouse="gamemenu")
             type, value = result
 
             if type == "return":

common/_layout/imagemap_main_menu.rpym

@@ -32,7 +32,8 @@ label main_menu_screen:
         rv = renpy.imagemap(
             config.main_menu_ground,
             config.main_menu_selected,
-            config.main_menu_hotspots)
+            config.main_menu_hotspots,
+            mouse="mainmenu")
 
         for e in config.main_menu:
             name = e[0]

common/_layout/imagemap_preferences.rpym

@@ -40,7 +40,7 @@ init python:
     def __show_preferences():
 
         ime = _ImageMapper(
-            "prefs",
+            "preferences",
             config.preferences_ground,
             config.preferences_idle,
             config.preferences_hover,
@@ -127,7 +127,7 @@ init python:
         ime.bar("Voice Volume", 128, int(_preferences.get_volume('voice') * 128), set_voice)
 
         ime.close()
-        ui.interact()
+        ui.interact(mouse="gamemenu")
         
 label preferences_screen:
 

common/_layout/imagemap_yesno_prompt.rpym

@@ -33,7 +33,7 @@ init python hide:
         
         layout.prompt(message, "yesno")
 
-        rv = ui.interact()
+        rv = ui.interact(mouse="gamemenu")
         renpy.transition(config.intra_transition)
         return rv
 

common/_layout/scrolling_load_save.rpym

@@ -182,7 +182,7 @@ init python:
         ui.add(DynamicDisplayable(_file_picker_thumbnail))
 
         try:
-            rv = ui.interact()
+            rv = ui.interact(mouse="gamemenu")
         finally:
             __session.scrollbar_position = adj.value
             __session.thumbnail = None

doc/docs.css

@@ -1,8 +1,8 @@
 #bodyContent {
-    font-size: 136%;
+    font-size: medium;
     background: #fff;
-    margin-left: 3em;
-    margin-right: 3em;
+    margin-left: 20%;
+    margin-right: 20%;
     padding: 1.5em;
 }
 

doc/get.sh

@@ -12,8 +12,8 @@ rm -Rf images
 mkdir -p images
 cp `find www.renpy.org -name \*.png -type f` images
 
-# No jpgs yet.
-# cp `find www.renpy.org -name \*.jpg -type f` images
+No jpgs yet.
+cp `find www.renpy.org -name \*.jpg -type f` images
 
 rm -Rf reference tutorials
 python2.5 process.py

launcher/EasyDialogsResources.py

@@ -0,0 +1,144 @@
+import binascii
+
+
+def a2b(a):
+    return binascii.a2b_hex(''.join(a.split()))
+
+
+resources = {
+             260 : a2b('''
+                          01 00 ff ff 00 00 00 00  00 00 00 00 c8 00 c0 80
+                          02 00 00 00 00 00 b8 00  29 00 00 00 00 00 00 00
+                          08 00 90 01 00 01 4d 00  53 00 20 00 53 00 68 00
+                          65 00 6c 00 6c 00 20 00  44 00 6c 00 67 00 00 00
+                          00 00 00 00 00 00 00 00  01 00 01 50 7f 00 14 00
+                          32 00 0e 00 01 00 00 00  ff ff 80 00 4f 00 4b 00
+                          00 00 00 00 00 00 00 00  00 00 00 00 04 08 00 50
+                          07 00 07 00 aa 00 0c 00  ea 03 00 00 ff ff 81 00
+                          00 00 00 00             
+                       '''),
+             261 : a2b('''
+                          01 00 ff ff 00 00 00 00  00 00 00 00 c8 00 c0 80
+                          04 00 00 00 00 00 b8 00  3a 00 00 00 00 00 00 00
+                          08 00 90 01 00 01 4d 00  53 00 20 00 53 00 68 00
+                          65 00 6c 00 6c 00 20 00  44 00 6c 00 67 00 00 00
+                          00 00 00 00 00 00 00 00  80 00 81 50 07 00 14 00
+                          aa 00 0c 00 ec 03 00 00  ff ff 81 00 00 00 00 00
+                          00 00 00 00 00 00 00 00  01 00 01 50 7f 00 25 00
+                          32 00 0e 00 01 00 00 00  ff ff 80 00 4f 00 4b 00
+                          00 00 00 00 00 00 00 00  00 00 00 00 00 00 01 50
+                          4a 00 25 00 32 00 0e 00  02 00 00 00 ff ff 80 00
+                          43 00 61 00 6e 00 63 00  65 00 6c 00 00 00 00 00
+                          00 00 00 00 00 00 00 00  04 08 00 50 07 00 07 00
+                          aa 00 0c 00 eb 03 00 00  ff ff 81 00 00 00 00 00
+                       '''),
+             262 : a2b('''
+                          01 00 ff ff 00 00 00 00  00 00 00 00 c8 00 c0 80
+                          04 00 00 00 00 00 b8 00  29 00 00 00 00 00 00 00
+                          08 00 90 01 00 01 4d 00  53 00 20 00 53 00 68 00
+                          65 00 6c 00 6c 00 20 00  44 00 6c 00 67 00 00 00
+                          00 00 00 00 00 00 00 00  00 00 01 50 7f 00 14 00
+                          32 00 0e 00 06 00 00 00  ff ff 80 00 59 00 65 00
+                          73 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00
+                          04 08 00 50 07 00 07 00  aa 00 0c 00 ed 03 00 00
+                          ff ff 81 00 00 00 00 00  00 00 00 00 00 00 00 00
+                          00 00 01 50 07 00 14 00  32 00 0e 00 07 00 00 00
+                          ff ff 80 00 4e 00 6f 00  00 00 00 00 00 00 00 00
+                          00 00 00 00 00 00 01 50  4b 00 14 00 32 00 0e 00
+                          02 00 00 00 ff ff 80 00  43 00 61 00 6e 00 63 00
+                          65 00 6c 00 00 00 00 00         
+                       '''),
+             263 : a2b('''
+                          01 00 ff ff 00 00 00 00  00 00 00 00 80 00 ca 80
+                          03 00 00 00 00 00 e2 00  29 00 00 00 00 00 00 00
+                          00 00 00 00 00 00 00 00  00 00 81 50 07 00 14 00
+                          97 00 0e 00 eb 03 00 00  6d 00 73 00 63 00 74 00
+                          6c 00 73 00 5f 00 70 00  72 00 6f 00 67 00 72 00
+                          65 00 73 00 73 00 33 00  32 00 00 00 00 00 00 00
+                          00 00 00 00 00 00 00 00  04 08 00 50 07 00 07 00
+                          d4 00 0c 00 ea 03 00 00  ff ff 81 00 00 00 00 00
+                          00 00 00 00 00 00 00 00  00 00 00 50 a9 00 14 00
+                          32 00 0e 00 02 00 00 00  ff ff 80 00 43 00 61 00
+                          6e 00 63 00 65 00 6c 00  00 00 00 00    
+                       '''),
+             264 : a2b('''
+                          01 00 ff ff 00 00 00 00  00 00 00 00 c8 00 c0 80
+                          04 00 00 00 00 00 b8 00  3a 00 00 00 00 00 00 00
+                          08 00 90 01 00 01 4d 00  53 00 20 00 53 00 68 00
+                          65 00 6c 00 6c 00 20 00  44 00 6c 00 67 00 00 00
+                          00 00 00 00 00 00 00 00  a0 00 81 50 07 00 14 00
+                          aa 00 0c 00 ec 03 00 00  ff ff 81 00 00 00 00 00
+                          00 00 00 00 00 00 00 00  01 00 01 50 7f 00 25 00
+                          32 00 0e 00 01 00 00 00  ff ff 80 00 4f 00 4b 00
+                          00 00 00 00 00 00 00 00  00 00 00 00 00 00 01 50
+                          4a 00 25 00 32 00 0e 00  02 00 00 00 ff ff 80 00
+                          43 00 61 00 6e 00 63 00  65 00 6c 00 00 00 00 00
+                          00 00 00 00 00 00 00 00  04 08 00 50 07 00 07 00
+                          aa 00 0c 00 eb 03 00 00  ff ff 81 00 00 00 00 00
+                       '''),
+             265 : a2b('''
+                          01 00 ff ff 00 00 00 00  00 00 00 00 c8 00 c8 80
+                          12 00 00 00 00 00 d9 00  fc 00 00 00 00 00 00 00
+                          08 00 90 01 00 01 4d 00  53 00 20 00 53 00 68 00
+                          65 00 6c 00 6c 00 20 00  44 00 6c 00 67 00 00 00
+                          00 00 00 00 00 00 00 00  01 00 01 50 6c 00 ea 00
+                          30 00 0e 00 01 00 00 00  ff ff 80 00 4f 00 4b 00
+                          00 00 00 00 00 00 00 00  00 00 00 00 00 00 01 50
+                          a2 00 ea 00 30 00 0e 00  02 00 00 00 ff ff 80 00
+                          43 00 61 00 6e 00 63 00  65 00 6c 00 00 00 00 00
+                          00 00 00 00 00 00 00 00  07 00 00 50 06 00 06 00
+                          cc 00 4e 00 ff ff ff ff  ff ff 80 00 00 00 00 00
+                          00 00 00 00 00 00 00 00  03 00 21 50 48 00 12 00
+                          84 00 64 00 03 00 00 00  ff ff 85 00 00 00 00 00
+                          00 00 00 00 00 00 00 00  00 00 02 50 0c 00 24 00
+                          c0 00 08 00 04 00 00 00  ff ff 82 00 00 00 00 00
+                          00 00 00 00 00 00 00 00  80 00 81 50 0c 00 30 00
+                          c0 00 0e 00 05 00 00 00  ff ff 81 00 00 00 00 00
+                          00 00 00 00 00 00 00 00  00 00 01 50 9c 00 42 00
+                          30 00 0e 00 06 00 00 00  ff ff 80 00 41 00 64 00
+                          64 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00
+                          07 00 00 50 06 00 54 00  cb 00 3c 00 ff ff ff ff
+                          ff ff 80 00 00 00 00 00  00 00 00 00 00 00 00 00
+                          03 00 21 50 48 00 61 00  84 00 64 00 07 00 00 00
+                          ff ff 85 00 00 00 00 00  00 00 00 00 00 00 00 00
+                          00 00 02 50 0c 00 72 00  c0 00 08 00 08 00 00 00
+                          ff ff 82 00 00 00 00 00  00 00 00 00 00 00 00 00
+                          00 00 01 50 9c 00 7e 00  30 00 0e 00 09 00 00 00
+                          ff ff 80 00 41 00 64 00  64 00 00 00 00 00 00 00
+                          00 00 00 00 00 00 00 00  00 00 01 50 06 00 96 00
+                          42 00 0e 00 0a 00 00 00  ff ff 80 00 41 00 64 00
+                          64 00 20 00 66 00 69 00  6c 00 65 00 2e 00 2e 00
+                          2e 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00
+                          00 00 01 50 4e 00 96 00  42 00 0e 00 0b 00 00 00
+                          ff ff 80 00 41 00 64 00  64 00 20 00 6e 00 65 00
+                          77 00 20 00 66 00 69 00  6c 00 65 00 2e 00 2e 00
+                          2e 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00
+                          00 00 01 50 06 00 a8 00  42 00 0e 00 0c 00 00 00
+                          ff ff 80 00 41 00 64 00  64 00 20 00 66 00 6f 00
+                          6c 00 64 00 65 00 72 00  2e 00 2e 00 2e 00 00 00
+                          00 00 00 00 00 00 00 00  00 00 00 00 07 00 00 50
+                          06 00 c6 00 cc 00 1e 00  ff ff ff ff ff ff 80 00
+                          43 00 6f 00 6d 00 6d 00  61 00 6e 00 64 00 20 00
+                          6c 00 69 00 6e 00 65 00  3a 00 00 00 00 00 00 00
+                          00 00 00 00 00 00 00 00  80 00 81 50 0c 00 d2 00
+                          c0 00 0e 00 0e 00 00 00  ff ff 81 00 00 00 00 00
+                          00 00 00 00 00 00 00 00  00 00 02 50 0c 00 14 00
+                          3c 00 08 00 1e 00 00 00  ff ff 82 00 4f 00 70 00
+                          74 00 69 00 6f 00 6e 00  3a 00 00 00 00 00 00 00
+                          00 00 00 00 00 00 00 00  00 00 02 50 0c 00 63 00
+                          3c 00 08 00 46 00 00 00  ff ff 82 00 43 00 6f 00
+                          6d 00 6d 00 61 00 6e 00  64 00 3a 00 00 00 00 00
+                       '''),
+             270 : a2b('''
+                          01 00 ff ff 00 00 00 00  00 00 00 00 48 04 00 44
+                          02 00 00 00 00 00 23 01  1a 00 00 00 00 00 00 00
+                          08 00 00 00 00 00 4d 00  53 00 20 00 53 00 68 00
+                          65 00 6c 00 6c 00 20 00  44 00 6c 00 67 00 00 00
+                          00 00 00 00 00 00 00 00  01 00 02 50 00 00 07 00
+                          23 01 08 00 ff ff ff ff  ff ff 82 00 53 00 74 00
+                          61 00 74 00 69 00 63 00  00 00 00 00 00 00 00 00
+                          00 00 00 00 00 00 02 40  00 00 12 00 23 01 08 00
+                          5f 04 00 00 ff ff 82 00  73 00 74 00 63 00 33 00
+                          32 00 00 00 00 00           
+                       '''),
+            }

launcher/None.editor.py

@@ -0,0 +1,6 @@
+# Name: None
+# Version: 1
+# Description: Disables the automatic launching of an editor.
+
+config.editor = None
+config.editor_transient = None

launcher/archiver.rpy

@@ -0,0 +1,177 @@
+init python:
+    import renpy.tools.archiver as archiver
+    import os
+    import os.path
+    import fnmatch
+    
+label archiver:
+
+    python hide:
+
+        # Get the options
+        name = project.info.get('archive_name', "data")
+        include = project.info.get('archive_include', "*.png *.gif *.jpg")
+        exclude = project.info.get('archive_exclude', "presplash.png")
+
+        # Allow the user to set the options.
+        while True:
+
+            set_tooltip("")
+
+            screen()
+            ui.vbox()
+            
+            title(_(u"Archiver"))
+
+            text(_(u"The archiver allows you to obfuscate your game by including files in an archive file."))
+
+            ui.null(height=15)
+            
+            text_variable(_(u"Archive Name:"), name, "name",
+                          _(u"The name of the archive to create."))
+
+            text_variable(_(u"Include Patterns:"), include, "include",
+                          _(u"Files matching these patterns are included in the archive."))
+
+            text_variable(_(u"Exclude Patterns:"), exclude, "exclude",
+                          _(u"Files matching these patterns are excluded from the archive."))
+
+            ui.null(height=15)
+
+            button(_(u"Archive"), ui.returns("archive"), _(u"Build the archive."))
+            button(_(u"Cancel"), ui.jumps("top"), "")
+
+            ui.close()
+
+            act = interact()
+
+            if act == "name":
+                name = input(
+                    _(u"Archive Name"),
+                    _(u"The name of the archive file to create, without the .rpa extension.\n\nThe \"data\" archive is loaded automatically. Other archives must be added to config.archives."),
+                    name)
+                       
+            elif act == "include":
+                include = input(
+                    _(u"Include Patterns"),
+                    _(u"This is a space-separated list of file patterns. Files matching these patterns are added to the archive.\n\nAsterisks (*) can be used as a wildcard."),
+                    include)
+
+            elif act == "exclude":
+                exclude = input(
+                    _(u"Include Patterns"),
+                    _(u"This is a space-separated list of file patterns. Files matching these patterns are excluded from the archive. If a file is matched by both an exclude and include pattern, the exclude takes precedence.\n\nAsterisks (*) can be used as a wildcard."),
+                    exclude)
+
+            elif act == "archive":
+                break
+
+        # Store the options.
+            
+        project.info["archive_name"] = name
+        project.info["archive_include"] = include
+        project.info["archive_exclude"] = exclude
+
+        project.save()
+
+
+        # Break up the extension lists.
+
+        include = [ i.strip() for i in include.split() ]
+        exclude = [ i.strip() for i in exclude.split() ]
+
+        # Get the gamedir and the archived dir.
+        gamedir = os.path.join(project.path, "game")
+        archived = os.path.join(project.path, "archived")
+
+        # The prefix of the archive file.
+        prefix = os.path.join(gamedir, name)
+
+        archived_files = set()
+        files = [ ]
+        
+        # Choose files to archive.
+
+        set_tooltip("")
+        
+        info(
+            _(u"Scanning Files..."),
+            "")
+        
+        for bdir in (gamedir, archived):
+            
+            for dirname, dirs, filenames in os.walk(bdir):
+                
+                dirs[:] = [ i for i in dirs if not i[0] == '.' ]
+
+                for fn in filenames:
+
+                    fullfn = dirname + "/" + fn
+                    shortfn = fullfn[len(bdir)+1:]
+
+                    if fn[0] == ".":
+                        continue
+                    
+                    if shortfn in archived_files:
+                        continue
+
+                    should_archive = False
+
+                    for i in include:
+                        if fnmatch.fnmatch(fn, i):
+                            should_archive = True
+
+                    for i in exclude:
+                        if fnmatch.fnmatch(fn, i):
+                            should_archive = False
+
+                    if not should_archive:
+                        continue
+
+                    files.append((fullfn, shortfn))
+                    archived_files.add(shortfn)
+
+        if not files:
+            error(_(u"The patterns did not match any files, so no archive was created."))
+                    
+        # Actually archiving files.
+        info(_(u"Archiving Files..."), "")
+                    
+        archiver.archive(prefix, files)
+
+        # Move files out of the way.
+        for fullfn, shortfn in files:
+            afn = archived + "/" + shortfn
+
+            if fullfn == afn:
+                continue
+
+            try:
+                os.makedirs(os.path.dirname(afn))
+            except:
+                pass
+
+            try:
+                os.rename(fullfn, afn)
+            except:
+                os.rename(afn, afn + ".old")
+                os.rename(fullfn, afn)
+                os.unlink(afn + ".old")
+
+        # Report success.
+        screen()
+        ui.vbox()
+        
+        title(_(u"Success"))
+        text(_(u"The files have been added to the archive, and moved into the \"archived\" directory. Future runs of the archiver will archive files in both the \"game\" and \"archived\" directories."))
+
+        ui.null(height=20)
+
+        button(_(u"Return"), ui.jumps("top"), None)
+        
+        ui.close()
+        interact()
+
+            
+        
+        

launcher/choose_theme.rpy

@@ -0,0 +1,329 @@
+init -1 python:
+    style_backup = renpy.style.backup()
+
+init python:
+
+    import codecs
+    import re
+    import sys
+    
+    ##########################################################################
+    # Code to update options.rpy
+    
+    def list_logical_lines(filename):
+        """
+         This reads in filename, and turns it into a list of logical
+         lines. 
+        """
+
+        f = codecs.open(filename, "rb", "utf-8")
+        data = f.read()
+        f.close()
+
+        # The result.
+        rv = []
+
+        # The current position we're looking at in the buffer.
+        pos = 0
+
+        # Looping over the lines in the file.
+        while pos < len(data):
+
+            # The line that we're building up.
+            line = ""
+
+           # The number of open parenthesis there are right now.
+            parendepth = 0
+
+            # Looping over the characters in a single logical line.
+            while pos < len(data):
+
+                c = data[pos]
+
+                if c == '\n' and not parendepth:
+                    rv.append(line)
+
+                    pos += 1
+                    # This helps out error checking.
+                    line = ""
+                    break
+
+                # Backslash/newline.
+                if c == "\\" and data[pos+1] == "\n":
+                    pos += 2
+                    line += "\\\n"
+                    continue
+
+                # Parenthesis.
+                if c in ('(', '[', '{'):
+                    parendepth += 1
+
+                if c in ('}', ']', ')') and parendepth:
+                    parendepth -= 1
+
+                # Comments.
+                if c == '#':
+                    while data[pos] != '\n':
+                        line += data[pos]
+                        pos += 1
+
+                    continue
+
+                # Strings.
+                if c in ('"', "'", "`"):
+                    delim = c
+                    line += c
+                    pos += 1
+
+                    escape = False
+
+                    while pos < len(data):
+
+                        c = data[pos]
+
+                        if escape:
+                            escape = False
+                            pos += 1
+                            line += c
+                            continue
+
+                        if c == delim:
+                            pos += 1
+                            line += c
+                            break
+
+                        if c == '\\':
+                            escape = True
+
+                        line += c
+                        pos += 1
+
+                        continue
+
+                    continue
+                    
+                line += c
+                pos += 1
+
+        if line:
+            rv.append(line)
+
+        return rv
+
+
+    def switch_theme(name):
+        """
+         Switches the theme of the current project to the named theme.
+         """
+
+        theme_functions = set(i[1] for i in themes)
+
+        td = theme_data[name].copy()
+        td["name"] = name
+
+        # Did we change the file at all?
+        changed = False
+
+        filename = os.path.join(project.gamedir, "options.rpy")
+
+        out = codecs.open(filename + ".new", "wb", "utf-8")
+        
+        for l in list_logical_lines(filename):
+
+            m = re.match(r'    theme.(\w+)\(', l)
+            if m:
+                if m.group(1) in theme_functions:
+                    l = theme_templates[td["theme"]] % td
+                    changed = True
+                    
+            out.write(l + "\n")
+
+        out.close()
+
+        if changed:
+            try:
+                os.unlink(filename + ".bak")
+            except:
+                pass
+
+            os.rename(filename, filename + ".bak")
+            os.rename(filename + ".new", filename)
+            
+        else:
+            os.unlink(filename + ".new")
+
+            error(_(u"Could not modify options.rpy. Perhaps it was changed too much."))
+            
+        set_tooltip(_(u"Theme changed to %s.") % name)
+        renpy.jump("top")
+
+    curried_switch_theme = renpy.curry(switch_theme)
+        
+    
+
+    ##########################################################################
+    # Code that handles display.
+    
+    current_theme = None
+
+    def show_theme(name, target):
+        """
+         Changes from the current theme to the roundrect theme named
+         `name`.
+         """
+
+        if current_theme == name:
+            return
+
+        store.current_theme = name
+        
+        td = theme_data[name].copy()
+        kind = td["theme"]
+        del td["theme"]
+
+        if kind == "roundrect":
+            td["rounded_window"] = False
+        
+        renpy.style.restore(style_backup)
+        getattr(theme, kind)(**td)
+        customize_styles()
+        renpy.style.rebuild()
+        
+        renpy.jump(target)
+        
+    curried_show_theme = renpy.curry(show_theme)
+
+    def theme_demo():
+        # The sample area, that shows what the theme looks like.
+        ui.window(style='default', background="#444", xpadding=1, ypadding=1)
+        ui.window(style='gm_root', xpadding=5, ypadding=5)
+        ui.vbox(5)
+
+        # Display Preference.
+        ui.window(style=style.prefs_pref_frame)
+        ui.vbox(style=style.prefs_pref_box)
+        
+        ui.hbox(style=style.prefs_pref_choicebox)
+        
+        layout.label(_(u"Display"), "prefs")
+        layout.button(_(u"Window"), "prefs", clicked=does_nothing, selected=True)
+        layout.button(_(u"Fullscreen"), "prefs", clicked=does_nothing, selected=False)
+        layout.button(_(u"Planetarium"), "prefs", clicked=None, selected=False)
+
+        ui.close()
+        ui.close()
+
+        # Volume Preference
+        ui.window(style=style.prefs_pref_frame)
+        ui.vbox(style=style.prefs_pref_box)
+
+        layout.label(_(u"Music Volume"), "prefs")
+        ui.vbox(style=style.prefs_volume_box)
+
+        ui.bar(128,
+               92,
+               changed=does_nothing,
+               style=style.prefs_volume_slider)
+
+        layout.button(_(u"Test"), "soundtest", clicked=does_nothing)
+
+        ui.close()
+        ui.close()
+        
+        ui.close() # vbox
+        
+    
+    # Used to have buttons not do anything.
+    def does_nothing(*args):
+        return
+
+
+label choose_theme:
+
+    python:
+        if not os.path.exists(os.path.join(project.gamedir, "options.rpy")):
+            error(_(u"The options.rpy file does not exist in the game directory, so this launcher cannot change the theme."))
+
+        current_theme = None
+        theme_adjustment = ui.adjustment()
+
+label repeat_choose_theme:
+
+    python hide:
+        
+        tip = _(u"Themes control the basic look of interface elements. You'll be able to pick a color scheme next.")
+
+        screen()
+        ui.vbox()
+        title(_(u"Choose Theme"))
+
+        ui.grid(2, 1, padding=10, xfill=True)
+
+        # The scroll area, that lets the user pick a theme.
+        scrolled('top', theme_adjustment)
+        ui.vbox()
+        
+        for name, function, exemplar in themes:
+             button(name,
+                    ui.returns(function),
+                    "",
+                    hovered=curried_show_theme(exemplar, "repeat_choose_theme"),
+                    unhovered=does_nothing)
+
+        ui.close() # vbox
+        ui.close() # scrolled
+
+        theme_demo()
+        
+        ui.close() # grid
+        ui.close() # vbox
+
+        set_tooltip(tip)
+        store.theme_function = interact()    
+
+        
+label choose_color_scheme:
+    
+    python:
+
+        current_theme = None
+        theme_adjustment = ui.adjustment()
+        
+label repeat_choose_color_scheme:
+
+    python hide:
+
+        tip = _(u"Please choose a color scheme for your project.")
+
+        themes = [ k for k,v in theme_data.iteritems() if v["theme"] == theme_function ]
+        themes.sort()
+
+        screen()
+        ui.vbox()
+        title(_(u"Choose Color Scheme"))
+
+        ui.grid(2, 1, padding=10, xfill=True)
+
+        # The scroll area, that lets the user pick a theme.
+        scrolled('choose_theme', theme_adjustment)
+        ui.vbox()
+        
+        for i in themes:
+             button(i,
+                    curried_switch_theme(i),
+                    "",
+                    hovered=curried_show_theme(i, "repeat_choose_color_scheme"),
+                    unhovered=does_nothing)
+
+        ui.close() # vbox
+        ui.close() # scrolled
+
+        theme_demo()
+        
+        ui.close() # grid
+        ui.close() # vbox
+
+        set_tooltip(tip)
+        interact()
+        
+

launcher/distribute.rpy

@@ -1,28 +1,28 @@
 # This file contains the code needed to build a Ren'Py distribution.
 
 init python:
-    import zipfile
-    import tarfile
     import os
     import os.path
+    import zipfile
+    import tarfile
     import time
     import sys
     import zlib
+    zlib.Z_DEFAULT_COMPRESSION = 9
 
     import pefile
     
-    # Returns true if a file or directory should not be included in
-    # the distribution
-    
-    ignored_files = ("thumbs.db",
-                     "launcherinfo.py",
-                     "traceback.txt",
-                     "errors.txt",
-                     "icon.ico",
-                     "icon.icns"
-                     )
-
+    # These are files that are ignored wherever they are found in a
+    # distribution.
+    ignored_files = (
+        "thumbs.db",
+        "traceback.txt",
+        "errors.txt",
+        "saves"
+        )
 
+    # These are files (and directories) that are ignored when found in
+    # the root directory of the distribution.
     root_ignored_files = (
         "common",
         "renpy",
@@ -33,52 +33,51 @@ init python:
         "msvcr71.dll",                     
         "lib",
         "iliad-icon.png",
-        "manifest.xml"
+        "manifest.xml",
+        "icon.ico",
+        "icon.icns",
+        "launcherinfo.py",
+        "archived",
+        )
+
+    # Extensions that should be made executable.
+    executable_extensions = (
+        "MacOS",
+        "so",
+        "dylib",
+        ".sh",
+        "python",
+        "python.real",
         )
     
-    def ignored(fn, dir, dest, root):
-        if fn[0] == ".":
-            return True
 
-        for i in store.ignore_extensions:
-            if fn.endswith(i):
-                return True
+    def tree(
+        src,
+        dest,
+        exclude_suffix=[ ".pyc", "~", ".bak" ],
+        exclude_prefix=[ "#", "." ],
+        exclude_files = set(ignored_files),
+        root_exclude_prefix = [ ],
+        root_exclude_suffix = [ ".py", ".sh", ".app" ],
+        root_exclude_files = set(root_ignored_files),
+        root=False):
 
-        if fn.lower() in ignored_files:
-            return True
+        """
+         Returns a list of source-filename, destination-filename pairs.
+         """
 
-        if fn == "saves":
-            return True
+        if dest[0] != "/":
+            raise Exception("Destination must begin with /: %r" % dest)
 
-        if fn == "archived":
-            return True
+        src = src.rstrip('/')
+        dest = dest.rstrip('/')
 
-        if root and dir == dest:
-            if fn.endswith(".py") or fn.endswith(".sh") or fn.endswith(".app"):
-                return True
+        def include(fn, is_root):
+            """
+             Returns True if the file should be included in the list of
+             files we are copying.
+             """
 
-            if fn in root_ignored_files:
-                return True
-            
-        return False
-
-    def tree(src, dest,
-             exclude_suffix=[ ".pyc", "~", ".bak" ],
-             exclude_prefix=[ ".", '#' ],
-             exclude=ignored_files,
-             exclude_func=ignored,
-             root=False,
-             ):
-
-        # Get rid of trailing slashes.
-        if src[-1] == "/":
-            src = src[:-1]
-
-        if dest and dest[-1] == "/":
-            dest = dest[:-1]
-
-        # What should we include?
-        def include(fn, destdir, dest):
             for i in exclude_suffix:
                 if fn.endswith(i):
                     return False
@@ -87,448 +86,464 @@ init python:
                 if fn.startswith(i):
                     return False
 
-            for i in exclude:
-                if i == fn.lower():
+            if fn in exclude_files:
+                return False
+
+            if not root or not is_root:
+                return True
+
+            for i in root_exclude_suffix:
+                if fn.endswith(i):
                     return False
 
-            if exclude_func and exclude_func(fn, destdir, dest, root):
+            for i in root_exclude_prefix:
+                if fn.startswith(i):
+                    return False
+
+            if fn in root_exclude_files:
                 return False
 
             return True
-
-
+        
         rv = [ ]
-
+        
         # Walk the tree, including what is necessary.
         for srcdir, dirs, files in os.walk(src):
 
-            if dest:
-                destdir = dest + srcdir[len(src):]
-            else:
-                destdir = srcdir[len(src) + 1:]
-
-            if destdir:
-                rv.append((srcdir, destdir))
+            is_root = (srcdir == src)
+            
+            srcdir += "/"
+            destdir = dest + srcdir[len(src):]
+            destdir.replace("\\", "/")
+            
+            rv.append((srcdir, destdir))
 
             for fn in files:
-
-                if not include(fn, destdir, dest):
+                
+                if not include(fn, is_root):
                     continue
 
-                sfn = srcdir + "/" + fn
-
-                if destdir:
-                    dfn = destdir + "/" + fn
-                else:
-                    dfn = fn
-
-                dfn = dfn.replace("\\", "/")
+                sfn = srcdir + fn
+                dfn = destdir + fn
                     
                 rv.append((sfn, dfn))
 
-            dirs[:] = [ i for i in dirs if include(i, destdir, dest) ]
+            dirs[:] = [ i for i in dirs if include(i, is_root) ]
 
+        rv = [ (a.replace("\\", "/"), b.replace("\\", "/")) for a, b in rv ]
+                                                            
         return rv
 
+    
+    def make_zip(t, filename, files, file_data):
+        """
+         This creates `filename`.zip, containing `files`, placed in the
+         `filename` directory. `file_data` is a map from source file to
+         replacement data.
+         """
+
+        files.sort(key=lambda a : a[1])
+        progress_len = len(files)
+
+        fn = os.path.join(os.path.dirname(project.path), filename)
         
+        zf = zipfile.ZipFile(fn + ".zip", "w", zipfile.ZIP_DEFLATED)
+
+        for i, (fn, an) in enumerate(files):
+
+            progress(t, progress_len, i)
+            
+            if os.path.isdir(fn):
+                continue
+
+            zi = zipfile.ZipInfo(filename + an)
+
+            s = os.stat(fn)
+            zi.date_time = time.gmtime(s.st_mtime)[:6]
+            zi.compress_type = zipfile.ZIP_DEFLATED
+            zi.create_system = 3
+
+            for i in executable_extensions:
+                if os.path.dirname(fn).endswith(i) or fn.endswith(i):
+                    zi.external_attr = long(0100777) << 16
+                    break
+            else:
+                zi.external_attr = long(0100666) << 16 
+
+            if fn in file_data:
+                data = file_data[fn]
+            else:
+                data = file(fn, "rb").read()
+
+            zf.writestr(zi, data)
+
+        zf.close()
+        
+    def make_tar(t, filename, files):
+        """
+         Makes a tarfile, as above.
+         """
+        
+        files.sort(key=lambda a : a[1])
+        progress_len = len(files)
+        
+        fn = os.path.join(os.path.dirname(project.path), filename)
+
+        tf = tarfile.open(fn + ".tar.bz2", "w:bz2")
+        tf.dereference = True
+
+        for j, (fn, an) in enumerate(files):
+
+            progress(t, progress_len, j)
+
+            info = tf.gettarinfo(fn, filename + an)
+
+            perms = 0666
+            
+            if info.isdir():
+                perms = 0777
+
+            for i in executable_extensions:
+                if fn.endswith(i):
+                    perms = 0777
+
+            info.mode = perms
+            info.uid = 1000
+            info.gid = 1000
+            info.uname = "renpy"
+            info.gname = "renpy"
+
+            if info.isreg():
+                tf.addfile(info, file(fn, "rb"))
+            else:
+                tf.addfile(info)
+
+        tf.close()
+        
+    
+    def dist_exists(fn):
+        """
+         Returns true if the given file exists in the renpy directory.
+         """
+        
+        return os.path.exists(os.path.join(config.renpy_base, fn))
+
+
 label distribute:
 
+    call lint
+
+    if not yesno(_(u"Building Distributions"), 
+                 _(u"I've just performed a lint on your project. If it contains errors, you should say no and fix them.\nPlease also check {a=http://www.renpy.org/wiki/renpy/Download_Ren'Py}www.renpy.org{/a} to see if updates or fixes are available.\n\nDo you want to continue?")):
+
+        jump top
+
     python hide:
-        zlib.Z_DEFAULT_COMPRESSION = 9
 
-        store.progress_time = 0
+        # Do we have the files?
+        has_windows = dist_exists("renpy.exe")
+        has_linux = dist_exists("lib/linux-x86")
+        has_mac = dist_exists("renpy.app")
+        has_all = has_windows and has_mac and has_linux
 
-        def progress(tit, n, m, time=time):
+        # Should we build these distributions?
+        build_windows = has_windows and project.info.get("build_windows", has_windows)
+        build_linux = has_linux and project.info.get("build_linux", has_linux)
+        build_mac = has_mac and project.info.get("build_mac", has_mac)
+        build_all = has_all and project.info.get("build_all", False)
+
+        # The base name of the distribution.
+        base_name = project.info.get("distribution_base", project.name)
+
+        # The executable name.
+        executable_name = project.info.get("executable_name", project.name)
+
+        # Extensions to exclude.
+        ignore_extensions = project.info.get("ignore_extensions", "~ .bak")
+
+        # Documentation extensions.
+        documentation_extensions = project.info.get("documentation_extensions", "txt html")
+                
+        # Prompt the user for all of the above.
+
+        while True:
+        
+            set_tooltip("")
+            screen()
             
-            if time.time() < store.progress_time + .1:
-                return
+            ui.vbox()
 
-            title(tit)
+            title(_(u"Building Distributions"))
+
+            text_variable(_(u"Base Name:"), base_name, "base_name",
+                          _(u"Used to generate the names of directories and archive files."))
+
+            text_variable(_(u"Executable Name:"), executable_name, "executable_name",
+                          _(u"Used to generate the names of executables and runnable programs."))
+
+            text_variable(_(u"Ignore Extensions:"), ignore_extensions, "ignore_extensions",
+                          _(u"Files with these extensions will not be included in the distributions."))
+
+            text_variable(_(u"Documentation Extensions:"), documentation_extensions, "documentation_extensions",
+                          _(u"Files with these extensions will be treated as documentation, when building the Macintosh application."))
+
+            text(_(u"Distributions to Build:"))
+
+            if has_windows:
+                toggle_button(_(u"Windows x86"), build_windows, ui.returns("build_windows"),
+                              _(u"Zip distribution for the 32-bit Windows platform."))
+
+            if has_linux:
+                toggle_button(_(u"Linux x86"), build_linux, ui.returns("build_linux"),
+                              _(u"Tar.Bz2 distribution for the Linux x86 platform."))
+
+            if has_mac:
+                toggle_button(_(u"Macintosh Universal"), build_mac, ui.returns("build_mac"),
+                              _(u"Single application distribution for the Macintosh x86 and ppc platforms."))
+
+            if has_all:
+                toggle_button(_(u"Windows/Linux/Mac Combined"), build_all, ui.returns("build_all"),
+                              _(u"Zip distribution for the Windows x86, Linux x86, Macintosh x86 and Macintosh ppc platforms."))
+                
+
+            ui.null(height=15)
+            
+            button(_(u"Build"), ui.returns("build"), _(u"Start building the distributions."))
+            button(_(u"Cancel"), ui.jumps("top"), "")
 
-            mid(message)
-            ui.bar(m, n, xmaximum=200, xalign=0.5)
             ui.close()
 
-            ui.pausebehavior(0)
-            interact()
+            act = interact()
+
+            if act == "build_windows":
+                build_windows = not build_windows
+            elif act == "build_linux":
+                build_linux = not build_linux
+            elif act == "build_mac":
+                build_mac = not build_mac
+            elif act == "build_all":
+                build_all = not build_all
+            elif act == "base_name":
+
+                base_name = input(
+                    _(u"Base Name"),
+                    _(u"Please enter in the base name for your distribution. This name is used to generate the names of directories and archive files. Usually, this is the name of your game, plus a version number, like \"moonlight-1.0\"."),
+                    base_name)
+
+            elif act == "executable_name":
+                
+                executable_name = input(
+                    _(u"Executable Name"),
+                    _(u"Please enter a name for the executables in your distribution. This should not include an extension, as that will be added automatically."),
+                    executable_name)
             
-        # Check to see which platforms we can build on.
-        if os.path.exists(config.renpy_base + "/renpy.exe"):
-            windows = True
-        else:
-            windows = False
+            elif act == "ignore_extensions":
 
-        if os.path.exists(config.renpy_base + "/lib/linux-x86"):
-            linux = True
-        else:
-            linux = False
+                ignore_extensions = input(
+                    _(u"Ignore Extensions"),
+                    _(u"Please enter a space-separated list of file extensions. Files with these extensions will not be included in the built distributions."),
+                    ignore_extensions)
 
-        if os.path.exists(config.renpy_base + "/lib/linux-iliad"):
-            iliad = True
-        else:
-            iliad = False
+            elif act == "documentation_extensions":
 
-        if os.path.exists(config.renpy_base + "/renpy.app"):
-            mac = True
-        else:
-            mac = False
-            
-        if not (windows or mac or linux or iliad):
-            store.error(u"Can't Distribute", u"Ren'Py is missing files required for distribution. Please download the full package from {a=http://www.renpy.org/}www.renpy.org{/a}.", "tools_menu")
-        
-        lint()
+                documentation_extensions = input(
+                    _(u"Documentation Extensions"),
+                    _(u"Please enter a space separated list of documentation extensions. Files in the base directory with these extensions will have a second copy stored outside of the Macintosh application."),
+                    documentation_extensions)
+                
+            elif act == "build":
+                break
 
-        store.message = ""
+        # Store the user-selected options in info, and save info.
 
-        title(_(u"Building Distributions"))
+        project.info["distribution_base"] = base_name
+        project.info["executable_name"] = executable_name
+        project.info["ignore_extensions"] = ignore_extensions
+        project.info["documentation_extensions"] = documentation_extensions
 
-        mid()
-        text(u"I've just performed a lint on your project. If it contains errors, you should say no and fix them.\nCheck {a=http://www.renpy.org/wiki/renpy/Download_Ren'Py}www.renpy.org{/a} to see if updates or fixes are available.\n\nDo you want to continue?")
-        ui.close()
-
-        bottom()
-        button(u"Yes", clicked=ui.returns(True))
-        button(u"No", clicked=ui.returns(False))
-        ui.close()
-
-        if not interact():
-            renpy.jump("tools")
-
-
-        # if not windows or not mac or not linux:
-        #    store.message = "The full version of Ren'Py can build for Windows, Mac, and Linux. Download it from www.renpy.org."
-            
-        title(u"Building Distributions")
-
-        mid()
-        text(u"Distributions will be built for the following platforms:")
-
-        spacer()
-
-        if windows:
-            text(u"Windows 2000+", style='launcher_input')
-
-        if linux:
-            text(u"Linux x86", style='launcher_input')
-
-        if iliad:
-            text(u"iLiad", style='launcher_input')
-                        
-        if mac:
-            text(u"Mac OS X 10.4+", style='launcher_input')
-
-        spacer()
-
-
-        # TODO: If missing platforms, prompt for a DL.
-
-        text(u"Is this okay?")
-        ui.close()
-
-        bottom()
-        button(u"Yes", clicked=ui.returns(True))
-        button(u"No", clicked=ui.returns(False))
-        ui.close()
-
-        if not interact():
-            renpy.jump("tools")
-
-        default_name = project.info.get('distribution_base', project.name)
-
-        name = prompt(u"Building Distributions",
-                      u"Please enter a base name for the directories making up this distribution.",
-                      "tools",
-                      default_name,
-                      u"This usually should include a name and version number, like 'moonlight_walks-1.0'.")
-
-        name = name.strip()
-
-        if not name:
-            store.error(u"Error", u"The distribution name should not be empty.", "tools_menu")
-
-        try:
-            name = name.encode("ascii")
-        except:
-            store.error(u"Error", u"Distribution names must be ASCII. This is because archive file formats do not support non-ASCII characters in a uniform way.", "tools_menu")
-
-        project.info['distribution_base'] = name
-
-        ignore_extensions = project.info.get('ignore_extensions', "~ .bak")
-        ignore_extensions = prompt(u"Building Distributions", u"Please enter a space separated list of the file extensions you do not want included in the distribution.", "tools", ignore_extensions)
-        store.ignore_extensions = [ i.strip() for i in ignore_extensions.strip().split() ]
-        project.info['ignore_extensions'] = ignore_extensions    
+        project.info["build_windows"] = build_windows
+        project.info["build_linux"] = build_linux
+        project.info["build_mac"] = build_mac
+        project.info["build_all"] = build_all
 
         project.save()
+
+        # Convert some of these to more useful formats.
+        ignore_extensions = [ i.strip() for i in ignore_extensions.split() ]
+        documentation_extensions = [ i.strip() for i in documentation_extensions.split() ]
         
-        # Figure out the files that will make up the distribution.
+        # Scan for the files we want to include in the various distributions.
+        info(_(u"Scanning..."), "")
 
-        multi = [ ]
+        # Files included in the various distributions.
+        multi_files = [ ]
+        win_files = [ ]
+        linux_files = [ ]
+        mac_files = [ ]
 
-        # This finds the files and directories in the tree, and includes
-        # them in the result.
-
-                
-        # renpy and common directories.
-        multi.extend(tree(config.renpy_base + "/renpy", "renpy"))
-        multi.append((config.renpy_base + "/LICENSE.txt", "renpy/LICENSE.txt"))
-        multi.extend(tree(config.commondir, "common"))
+        # A map from source file name to replacement data to be placed in
+        # that file.
+        file_data = { }
         
-        # Include the project.
-        multi.extend(tree(project.path, '',
-                          exclude_suffix = [ ],
-                          exclude_prefix = [ ],
-                          exclude=[ ],
-                          root=True))
         
-        shortgamedir = project.gamedir[len(project.path)+1:]
+        ######################################################################
+        # Multi files.
 
+        rb = config.renpy_base.replace("\\", "/") + "/"
 
-        def add_script_version(fn, multi=multi, shortgamedir=shortgamedir):
+          
 
-            for a, b in multi:
-                if b == shortgamedir + "/" + fn:
+               
+        # Project files.
+        multi_files.extend(tree(project.path, "/", root=True, exclude_suffix=ignore_extensions))
+        multi_files.append((rb + "renpy.py",  "/" + executable_name + ".py"))
+        
+        # Renpy files.
+        multi_files.extend(tree(rb + "common", "/common"))
+        multi_files.extend(tree(rb + "renpy", "/renpy"))
+        multi_files.append((rb + "LICENSE.txt", "/renpy/LICENSE.txt"))
+        
+        def add_script_version(fn, ignore_extensions=ignore_extensions, multi_files=multi_files, rb=rb):
+            """
+             Add a script_version file if it does not already exist, and if the
+             extension is allowed by the game.
+             """
+
+            for a, b in multi_files:
+                if b == "/game/" + fn:
                     return
 
-            for i in store.ignore_extensions:
+            for i in ignore_extensions:
                 if fn.endswith(i):
-                    return 
+                    return
 
-            multi.append((config.gamedir + "/" + fn, shortgamedir + "/" + fn))
+            multi_files.append((rb + "launcher/" + fn, "/game/" + fn))
 
         add_script_version("script_version.rpy")
         add_script_version("script_version.rpyc")
-            
-        # renpy.py
-        multi.append((config.renpy_base + "/renpy.py",
-                      project.name + ".py"))
 
-        # Windows Zip
-        if windows:
-            win_files = [
-                ( config.renpy_base + "/renpy.exe", project.name + ".exe"),
-                ( config.renpy_base + "/renpy.code", "renpy.code" ),
-                ( config.renpy_base + "/python25.dll", "python25.dll" ),
-                ( config.renpy_base + "/msvcr71.dll", "msvcr71.dll" ),
-                ]
+        
+        ######################################################################
+        # Windows files.
+
+        if build_windows or build_all:
+
+            win_files.append((rb + "renpy.exe", "/" + executable_name + ".exe"))
+            win_files.append((rb + "renpy.code", "/renpy.code"))
+            win_files.append((rb + "python25.dll", "/python25.dll"))
+            win_files.append((rb + "msvcr71.dll", "/msvcr71.dll"))
 
-            win_data = { }
             if os.path.exists(project.path + "/icon.ico"):
-                win_data[project.name + ".exe"] = pefile.change_icons(
-                    config.renpy_base + "/renpy.exe",
+                file_data[rb + "renpy.exe"] = pefile.change_icons(
+                    rb + "renpy.exe",
                     project.path + "/icon.ico",
                     )
+
+                
+        ######################################################################
+        # Linux files.
+        
+        if build_linux or build_all:
+
+            linux_files.append((rb + "renpy.sh", "/" + executable_name + ".sh"))
+            linux_files.append((rb + "lib", "/lib"))
+            linux_files.append((rb + "lib/python", "/lib/python"))
+            linux_files.extend(tree(rb + "lib/linux-x86", "/lib/linux-x86"))
+
+            # Warning: The tar.bz2 builder doesn't support file_data.
+
             
-            zf = zipfile.ZipFile(name + ".zip", "w", zipfile.ZIP_DEFLATED)
+        ######################################################################
+        # Mac (non-app) files.
+        
+        if build_mac or build_all:
+            mac_files = tree(rb + "renpy.app",
+                             "/" + executable_name + ".app")
 
-            progress_len = len(multi) + len(win_files)
-            store.message = u"Be sure to announce your project at the Lemma Soft Forums."
-                               
-            for i, (fn, an) in enumerate(multi + win_files):
-                progress(u"Building Windows", i, progress_len)
+            # Rename executable.
+            mac_files = [ (fn, an.replace("Ren'Py Launcher", executable_name)) for (fn, an) in mac_files ]
 
-                if os.path.isdir(fn):
-                    continue
-                
-                zi = zipfile.ZipInfo(name + "/" + an)
+            # Plist file.
+            quoted_name = executable_name.replace("&", "&amp;").replace("<", "&lt;")                                               
+            info_plist = file(rb + "renpy.app/Contents/Info.plist", "rb").read().replace("Ren'Py Launcher", quoted_name)
+            file_data[rb + "renpy.app/Contents/Info.plist"] = info_plist
 
-                s = os.stat(fn)
-                zi.date_time = time.gmtime(s.st_mtime)[:6]
-                zi.compress_type = zipfile.ZIP_DEFLATED
-                zi.create_system = 3
-
-                zi.external_attr = long(0100666) << 16 
-                data = file(fn, "rb").read()
-
-                data = win_data.get(an, data)
-                
-                zf.writestr(zi, data)
-
-
-            zf.close()
-
-
-        # Linux Tar Bz2
-        if linux:
-
-            linux_files = [
-                (config.renpy_base + "/lib/linux-x86", "lib/linux-x86"),
-                (config.renpy_base + "/renpy.sh", project.name + ".sh"),
-                (config.renpy_base + "/lib/python", "lib/python"),
-                ]
-                
-
-            linux_files.extend(tree(config.renpy_base + "/lib/linux-x86", "lib/linux-x86"))
-
-            tf = tarfile.open(name + "-linux-x86.tar.bz2", "w:bz2")
-            tf.dereference = True
-
-            progress_len = len(multi) + len(linux_files)
-            store.message = u"If appropriate, please submit your game to www.renai.us."
-
-            for j, i in enumerate(multi + linux_files):
-
-                progress(u"Building Linux", j, progress_len)
-
-                fn, an = i
-
-                info = tf.gettarinfo(fn, name + "-linux-x86/" + an)
-
-                if info.isdir():
-                    perms = 0777
-                elif info.name.endswith(".sh"):
-                    perms = 0777
-                elif info.name.endswith(".so"):
-                    perms = 0777
-                elif info.name.endswith("python"):
-                    perms = 0777
-                elif info.name.endswith("python.real"):
-                    perms = 0777
-                else:
-                    perms = 0666
-
-                info.mode = perms
-                info.uid = 1000
-                info.gid = 1000
-                info.uname = "renpy"
-                info.gname = "renpy"
-
-                if info.isreg():
-                    tf.addfile(info, file(fn, "rb"))
-                else:
-                    tf.addfile(info)
-
-            tf.close()
-
-
-        # iLiad Tar Bz2
-        if iliad:
-
-            iliad_files = [
-                (config.renpy_base + "/lib", "lib"),
-                (config.renpy_base + "/renpy-iliad.sh", project.name + ".sh"),
-                (config.renpy_base + "/lib/python", "lib/python"),
-                (config.renpy_base + "/manifest.xml", "manifest.xml"),
-                (config.renpy_base + "/iliad-icon.png", "iliad-icon.png"),
-                ]
-                
-            iliad_files.extend(tree(config.renpy_base + "/lib/linux-iliad", "lib/linux-iliad"))
-
-            iliad_data = { }
-
-            manifest = file(config.renpy_base + "/manifest.xml", "r").read()
-            manifest = manifest.replace("GAMENAME", project.name)
-            iliad_data["manifest.xml"] = manifest
-            
-            zf = zipfile.ZipFile(name + "-iLiad.zip", "w", zipfile.ZIP_DEFLATED)
-
-            progress_len = len(multi) + len(iliad_files)
-            store.message = u"We thank Hixbooks for sponsoring iLiad support."
-
-            for i, (fn, an) in enumerate(multi + iliad_files):
-
-                progress(u"Building iLiad", i, progress_len)
-
-                if os.path.isdir(fn):
-                    continue
-                
-                zi = zipfile.ZipInfo(project.name + "/" + an)
-                
-                s = os.stat(fn)
-                zi.date_time = time.gmtime(s.st_mtime)[:6]
-                zi.compress_type = zipfile.ZIP_DEFLATED
-                zi.create_system = 3
-
-                for ext in [ ".sh", ".so", "python", "python.real" ]:
-                    if fn.endswith(ext):
-                        zi.external_attr = long(0100777) << 16 
-                        data = file(fn, "rb").read()
-                        break
-                else:
-                    zi.external_attr = long(0100666) << 16 
-                    data = file(fn, "rb").read()
-
-                data = iliad_data.get(an, data)                    
-                zf.writestr(zi, data)
-
-            zf.close()
-
-        if mac:
-
-            mac_files = tree(config.renpy_base + "/renpy.app",
-                             project.name + ".app")
-
-            mac_files = [ (fn, an.replace("Ren'Py Launcher", project.name)) for (fn, an) in mac_files ]
-
-            # Data replacement for macintosh.
-            mac_data = { }
-            
-            quoted_name = project.name.replace("&", "&amp;").replace("<", "&lt;")                                               
-            info_plist = file(config.renpy_base + "/renpy.app/Contents/Info.plist", "rb").read().replace("Ren'Py Launcher", quoted_name)
-            mac_data[project.name + ".app/Contents/Info.plist"] = info_plist
-
-            quoted_name = project.name.replace("\"", "\\\"")
-            launcher_py = file(config.renpy_base + "/renpy.app/Contents/Resources/launcher.py", "rb").read().replace("Ren'Py Launcher", quoted_name)
-            mac_data[project.name + ".app/Contents/Resources/launcher.py"] = launcher_py
+            # Launcher script.
+            quoted_name = executable_name.replace("\"", "\\\"")
+            launcher_py = file(rb + "renpy.app/Contents/Resources/launcher.py", "rb").read().replace("Ren'Py Launcher", quoted_name)
+            file_data[rb + "renpy.app/Contents/Resources/launcher.py"] = launcher_py
 
+            # Icon file.
             if os.path.exists(project.path + "/icon.icns"):
                 icon_data = file(project.path + "/icon.icns", "rb").read()
-                mac_data[project.name + ".app/Contents/Resources/launcher.icns"] = icon_data
-            
-            zf = zipfile.ZipFile(name + "-mac.zip", "w", zipfile.ZIP_DEFLATED)
+                file_data[rb + "renpy.app/Contents/Resources/launcher.icns"] = icon_data
 
-            progress_len = len(multi) + len(mac_files)
-            store.message = u"Thank you for choosing Ren'Py."
 
-            for i, (fn, an) in enumerate(multi + mac_files):
+        ######################################################################
+        # Now, build the various distributions.
 
-                progress(u"Building Mac OS X", i, progress_len)
+        if build_windows:
+            make_zip(
+                _(u"Building Windows..."),
+                base_name + "-win32",
+                multi_files + win_files,
+                file_data)
 
-                if os.path.isdir(fn):
-                    continue
+        if build_linux:
+            make_tar(
+                _(u"Building Linux..."),
+                base_name + "-linux-x86",
+                multi_files + linux_files)
                 
-                zi = zipfile.ZipInfo(name + "-mac/" + an)
-                
-                s = os.stat(fn)
-                zi.date_time = time.gmtime(s.st_mtime)[:6]
-                zi.compress_type = zipfile.ZIP_DEFLATED
-                zi.create_system = 3
 
-                if os.path.dirname(fn).endswith("MacOS") or fn.endswith(".so") or fn.endswith(".dylib"):
-                    zi.external_attr = long(0100777) << 16 
-                    data = file(fn, "rb").read()
+        if build_mac:
+
+            # Reorganize the files so all the non application files live inside
+            # the application. If there's documentation involved, then it
+            # lives in both places.
+            macapp_files = [ ]
+
+            for fn, an in multi_files + mac_files:
+                if not an.startswith("/" + executable_name + ".app"):
+                    new_an = "/" + executable_name + ".app/Contents/Resources/autorun" + an
+                    macapp_files.append((fn, new_an))
+
+                    if an.rindex('/') == 0:
+                        for i in documentation_extensions:
+                            if fn.endswith(i):
+                                macapp_files.append((fn, an))
+                                break
                 else:
-                    zi.external_attr = long(0100666) << 16 
-                    data = file(fn, "rb").read()
+                    macapp_files.append((fn, an))
+                    
+            make_zip(
+                _(u"Building Macintosh..."),
+                base_name + "-mac",
+                macapp_files,
+                file_data)
 
-                data = mac_data.get(an, data)                    
-                zf.writestr(zi, data)
+            
+        if build_all:
+            make_zip(
+                _(u"Building Combined..."),
+                base_name + "-all",
+                multi_files + win_files + linux_files + mac_files,
+                file_data)
 
-            zf.close()
+        # Report success to the user.
+        set_tooltip(_(u"Thank you for choosing Ren'Py."))
 
-                
-        # Announce Success
-
-        store.message = ""
-
-        title(u"Success")
-
-        mid()
-        text(u"The distribution(s) have been built. Be sure to test them before release.")
-
-        spacer()
-
-        if mac:
-            text(u"Note that unpacking and repacking Mac zips and Linux tarballs on Windows isn't supported.")
-
-        ui.close()
-
-        bottom()
-        button(u"Return", clicked=ui.returns(True))
-        ui.close()
+        screen()
+        ui.vbox()
         
+        title(_(u"Success"))
+        text(_(u"The distributions have been built. Be sure to test them before release.\n\nNote that unpacking and repacking the Macintosh, Linux, or Combined distributions on Windows is not supported.\n\nPlease announce your release at the {a=http://lemmasoft.renai.us/forums/}Lemma Soft Forums{/a}, so we can add it to the Ren'Py web site."))
+
+        ui.null(height=20)
+
+        button(_(u"Return"), ui.jumps("top"), None)
+        
+        ui.close()
         interact()
 
         
-    jump tools
-               
-        

launcher/editor.rpy

@@ -1,29 +1,162 @@
-# This file contains logic for detecting an editor, and for selecting
-# the default editor.
+# This file contains logic for selecting an editor.
 
-init:
-    python hide:
-        import os
-        import os.path
-        import sys
+init python:
 
-        if not config.editor:
+    import glob
+    import re
+    import traceback
+    import os
+    import os.path
+    
+    
+    # The default name for the editor.
+    if persistent.editor is None:
+        persistent.editor = "jEdit"
+    
+    # A map from editor name to the file containing information about
+    # that editor.
+    editors = { }
 
-            editor = os.path.normpath(config.renpy_base + "/jedit/jedit.jar")
+    # A map from editor to the version of that editor.
+    editor_versions = { }
 
-            if os.path.exists(editor):
+    # A map from editor to a description of that editor.
+    editor_descriptions = { }
+    
+    # Should we set up the editor? How about the transient editor?
+    set_editor = "RENPY_EDITOR" not in os.environ
+    set_editor_transient = "RENPY_EDITOR_TRANSIENT" not in os.environ
 
-                editor = renpy.shell_escape(editor)
+    if set_editor and not set_editor_transient:
+        config.editor_transient = config.editor
+        os.environ['RENPY_EDITOR_TRANSIENT'] = config.editor
+        set_editor_transient = False
 
-                if sys.platform == 'win32':
-                    config.editor = 'javaw.exe -jar "' + editor + '" -reuseview "%(filename)s" +line:%(line)d "%(otherfiles)s"'
-                    config.editor_transient = 'javaw.exe -jar "' + editor + '" -newplainview "%(filename)s" +line:%(line)d "%(otherfiles)s"'
-                else:
-                    config.editor = 'java -jar "' + editor + '" -reuseview "%(filename)s" +line:%(line)d "%(otherfiles)s"'
-                    config.editor_transient = 'java -jar "' + editor + '" -newplainview "%(filename)s" +line:%(line)d "%(otherfiles)s"'
+    def scan_editor(ef):
+        """
+         Scans a single editor file to get the meta-information. If it
+         checks out, adds it to editors. Uses editor_versions as a cache
+         so we only add the newest version of each editor.
+         """
+
+        info = { }
+        
+        f = file(ef, "r")
+        for l in f:
+            m = re.match("#\s*(\w+):\s*(.*?)\s*$", l)
+            if not m:
+                break
+
+            info[m.group(1)] = m.group(2)
+
+        f.close()
             
-        if config.editor:
-            os.environ['RENPY_EDITOR'] = config.editor
-        if config.editor_transient:
-            os.environ['RENPY_EDITOR_TRANSIENT'] = config.editor_transient
-                
+        try:
+            name = info["Name"]
+            version = int(info["Version"])
+            description = info.get("Description", "")
+        except:
+            traceback.print_exc()
+            print >>sys.stderr, ef
+            
+
+        if version > editor_versions.get(name, -1):
+            editors[name] = ef
+            editor_versions[name] = version
+            editor_descriptions[name] = description
+            
+    
+    def scan_editors():
+        """
+         Finds all *.editor.py files, and uses them to populate the list
+         of editors.
+         """
+
+        editors.clear()
+        editor_versions.clear()
+        editor_descriptions.clear()
+        
+        for d in [ config.renpy_base, persistent.projects_directory ]:
+            if d is None:
+                continue
+            
+            for ef in glob.glob(d + "/*/*.editor.py"):
+                scan_editor(ef)
+
+
+    def setup_editor():
+        """
+         Sets the system up to respect the value containined in
+         persistent.editor.
+         """
+
+        if not set_editor:
+            return
+        
+        ef = None
+        
+        for i in [ persistent.editor, "jEdit", "None" ]:
+            if i in editors:
+                ef = editors[i]
+                break
+        else:
+            return
+
+        ctx = {
+           "renpy" : renpy,
+            "config" : config,
+            "persistent" : persistent,
+            "base" : os.path.dirname(ef),
+            }
+        
+        execfile(ef, ctx, ctx)
+
+        if set_editor:
+            if config.editor:
+                os.environ['RENPY_EDITOR'] = config.editor
+            else:
+                if 'RENPY_EDITOR' in os.environ:
+                    del os.environ['RENPY_EDITOR']
+
+        if set_editor_transient:
+            if config.editor_transient:
+                os.environ['RENPY_EDITOR_TRANSIENT'] = config.editor_transient
+            else:
+                if 'RENPY_EDITOR_TRANSIENT' in os.environ:
+                    del os.environ['RENPY_EDITOR_TRANSIENT']
+
+label editor:
+
+    python hide:
+
+        if not set_editor:
+            error(_(u"The editor has been set from the RENPY_EDITOR environment variable, and cannot be changed."), "options")
+        
+        set_tooltip("")
+
+        screen()
+        ui.vbox()
+        title(_(u"Choose Editor"))
+
+        text(_(u"Please choose the editor that will be use to edit scripts and display errors. More editors can be downloaded from {a=http://www.renpy.org/wiki/renpy/Editors}the Ren'Py website{/a}."))
+
+        ui.null(height=15)
+        
+        scrolled("options")
+
+        ui.vbox()
+
+        for i in sorted(editors, key=lambda a : a.lower()):
+            button(i,
+                   ui.returns(i),
+                   editor_descriptions[i])
+
+        ui.close() # Vbox
+        ui.close() # Scrolled
+
+        ui.close() # Vbox
+
+        persistent.editor = interact()
+        setup_editor()
+        
+    jump options

launcher/interface.rpy

@@ -0,0 +1,315 @@
+# This file contains the various components of the launcher interface.
+
+init python:
+
+    import time
+
+    
+    # Settings.
+    config.developer = True
+    
+    # Style customizations. These need to be in a function so that we can
+    # change them when we're choosing a theme.
+    def customize_styles():
+        style.window.yminimum = 60
+        style.window.left_padding = 60
+
+        style.hyperlink_text.color = "#03c"
+        style.hyperlink_text.hover_color = "#00c"
+        style.hyperlink_text.size = 15
+        style.hyperlink_text.underline = False
+        style.hyperlink_text.font = "DejaVuSerif.ttf"
+        
+        
+    customize_styles()
+        
+    tooltip = _(u"Welcome!")
+
+    def show_tooltip(st, at):
+        return Text(tooltip, color="#fff", size=14), None
+
+    def set_tooltip(s):
+        global tooltip
+        
+        if tooltip != s:
+            tooltip = s
+            renpy.restart_interaction()
+
+    tooltips = renpy.curry(set_tooltip)
+
+    def unset_tooltip(s):
+        global tooltip
+
+        if s and tooltip == s:
+            tooltip = ""
+            renpy.restart_interaction()
+
+    untooltips = renpy.curry(unset_tooltip)
+            
+            
+    def screen():
+        """
+         Display a screen. This should be called before any code that
+         draws to the screen.
+         """
+
+        ui.add(Solid("#fff"))
+        
+        ui.window(yalign=1.0)
+        ui.add(DynamicDisplayable(show_tooltip))
+
+        ui.image("eileen_small.png", xalign=0.0, yalign=1.0)
+        
+        ui.window(xmargin=20, top_margin=4, bottom_margin=85, style='default')
+        
+    def interact():
+        """
+         Closes the screen, and causes an interaction to occur.
+         """
+        
+        return ui.interact(suppress_overlay=True, suppress_underlay=True)
+
+    def title(s):
+        """
+         Display a title on the screen.
+         """
+
+        ui.window(style="default", bottom_margin=4, top_margin=12)
+        ui.text(s, size=26, color="#333", font="DejaVuSerif.ttf")
+                
+    def text(s):
+        """
+         Display text on the screen.
+         """
+        
+        ui.text(s, size=15, color="#333", font="DejaVuSerif.ttf", justify=True)
+        
+    def button(s, clicked=None, subtitle="", hovered=None, unhovered=None, size=20):
+        """
+         Displays a button with caption `s`.
+         """
+
+        if subtitle is not None:
+            if hovered is None:
+                hovered = tooltips(subtitle)
+                
+            if unhovered is None:
+                unhovered = untooltips(subtitle)
+        
+        ui.button(style="default", clicked=clicked,
+                  hovered=hovered, unhovered=unhovered,
+                  top_padding=3, bottom_padding=3)
+
+        ui.text(s, style="default", size=size,
+                color="#03c", hover_color="00c", insensitive_color="#aaa",
+                font="DejaVuSerif.ttf", minwidth=250)
+
+    def small_button(s, clicked=None, subtitle="", hovered=None, unhovered=None):
+        """
+         Displays a button with caption `s`.
+         """
+
+        if hovered is None:
+            hovered = tooltips(subtitle)
+
+        if unhovered is None:
+            unhovered = untooltips(subtitle)
+        
+        ui.button(style="default", clicked=clicked,
+                  hovered=hovered, unhovered=unhovered,
+                  top_padding=0, bottom_padding=0)
+
+        ui.text(s, style="default", size=15,
+                color="#03c", hover_color="00c", insensitive_color="#aaa",
+                font="DejaVuSerif.ttf", minwidth=250)
+
+    def toggle_button(s, checked, clicked=None, subtitle=""):
+        """
+         Displays a button with caption `s`.
+         """
+        
+        hovered = tooltips(subtitle)
+        unhovered = untooltips(subtitle)
+
+        if checked:
+            s = u"\u25a3 " + s
+        else:
+            s = u"\u25a1 " + s
+        
+        ui.button(style="default", clicked=clicked,
+                  hovered=hovered, unhovered=unhovered,
+                  top_padding=0, bottom_padding=0)
+
+        ui.text(s, style="default", size=15,
+                color="#03c", hover_color="00c", insensitive_color="#aaa",
+                font="DejaVuSerif.ttf", minwidth=250)
+        
+    def scrolled(cancel, yadj=None):
+
+        if yadj is None:
+            yadj = ui.adjustment()
+
+        ui.side(['r', 'b', 'c'])
+
+        ui.bar(adjustment=yadj, style='lscrollbar')
+        
+        if cancel:
+            ui.vbox()
+            ui.null(height=12)
+            button(_(u"Cancel"), clicked=ui.jumps(cancel))
+            ui.close()
+        else:
+            ui.null()               
+                    
+        ui.viewport(yadjustment=yadj, mousewheel=True)
+
+        # Left up to the user to close.
+
+    def error(message, target="top"):
+        """
+         Displays an error to the user, and lets him click to return to
+         `target`.
+         """
+
+        set_tooltip("")
+        
+        screen()
+        
+        ui.vbox()
+        title(_(u"Error"))
+        text(message)
+
+        ui.null(height=20)
+        
+        if target is None:
+            clicked = ui.returns(True)
+        else:
+            clicked = ui.jumps(target)
+        
+        button(_(u"Return"), clicked, None)
+        ui.close()
+
+        interact()
+
+    def info(t, message):
+        """
+         Displays an informational message to the user, and immediately
+         returns.
+         """
+
+        ui.pausebehavior(0)
+
+        screen()
+        
+        ui.vbox()
+        title(t)
+        text(message)
+        ui.close()
+
+        interact()
+        
+    def yesno(t, message):
+        """
+         Asks a yes/no question of the user.
+         """
+
+        set_tooltip("")
+        
+        screen()
+
+        ui.vbox()
+        title(t)
+        text(message)
+        button(_(u"Yes"), ui.returns(True), "")
+        button(_(u"No"), ui.returns(False), "")
+        ui.close()
+
+        return interact()
+         
+    def text_variable(t, value, returns, tooltip=""):
+
+        text(t)
+        small_button(value, ui.returns(returns), tooltip)
+        ui.null(height=5)
+
+    def input(t, prompt, value, cancel=None):
+
+        set_tooltip(_(u"Press enter when done."))
+
+        while True:
+        
+            screen()
+            ui.vbox()
+
+            title(t)
+            text(prompt)
+            ui.null(height=10)
+            ui.input(value, size=20, color="#00c")
+
+            if cancel is not None:
+                ui.null(height=20)
+                button(_(u"Cancel"), ui.jumps(cancel), "")
+
+            ui.close()
+
+            value = interact()
+            value = value.strip()
+            
+            if not value:
+                error(
+                    _(u"The string cannot be empty. Please enter some text."),
+                    None)
+
+                continue
+                
+            try:
+                value = value.encode("ascii")
+            except:
+                error(
+                    _(u"Non-ASCII filenames are not allowed. This is because Zip files cannot reliably represent non-ASCII filenames."),
+                    None)
+
+                continue
+                
+            break
+            
+        return value
+
+    # The time progress was last updated. We only update the progress
+    # every 10th of a second, so that we don't waste time doing
+    # such updates.
+    progress_time = 0
+
+
+    def progress(what, limit, amount):
+        """
+         Show progress to the user.
+         """
+        
+        global progress_time
+        
+        t = time.time()
+        if t < progress_time + .1:
+            return
+
+        progress_time = t
+
+        set_tooltip(_(u"Processed %d of %d files.") % (amount + 1, limit))
+        
+        ui.pausebehavior(0)
+
+        screen()
+
+        ui.vbox(xfill=True)
+
+        title(what)
+        ui.null(height=20)
+        ui.bar(limit, amount, xmaximum=300, xalign=0.5, style='lbar')
+
+        ui.close()
+        interact()
+        
+        
+        
+        
+    

launcher/jEdit.editor.py

@@ -0,0 +1,17 @@
+# Name: jEdit
+# Version: 1
+# Description: jEdit requires Java be installed on your computer.
+
+import os
+import os.path
+import sys
+
+editor = os.path.normpath(base + "/../jedit/jedit.jar")
+editor = renpy.shell_escape(editor)
+
+if sys.platform == 'win32':
+    config.editor = 'javaw.exe -jar "' + editor + '" -reuseview "%(filename)s" +line:%(line)d "%(otherfiles)s"'
+    config.editor_transient = 'javaw.exe -jar "' + editor + '" -newplainview "%(filename)s" +line:%(line)d "%(otherfiles)s"'
+else:
+    config.editor = 'java -jar "' + editor + '" -reuseview "%(filename)s" +line:%(line)d "%(otherfiles)s"'
+    config.editor_transient = 'java -jar "' + editor + '" -newplainview "%(filename)s" +line:%(line)d "%(otherfiles)s"'

launcher/new.rpy

@@ -1,167 +1,49 @@
-label new:
+init python:
+
+    import os
+    import os.path
+    import shutil
+    
+label new_project:
+
+    if persistent.projects_directory is None:
+        call choose_projects_directory
 
     python hide:
 
-        import os
-        import os.path
-        import time
-        
+        name = input(
+            _(u"New Project"),
+            _(u"Please type the name of your new project."),
+            "", cancel='top')
 
-        # Select a template.
-        
-        choices = [ (p.name, p.info["description"], p, None, False) for p in projects if p.info.get("template", None)]
-
-        template = paged_menu(u"Select a Template", choices, u"Please select a project to use as a template for your project.")
-
-        # Choose project name.
-        
-        name = prompt(u"Project Name", u"Type the name of your new project, and press enter.\n", "main")
         name = name.strip()
 
-        error = None
+        path = os.path.join(persistent.projects_directory, name)
 
-        if not name:
-            error = u"Please enter a non-empty project name."
-        elif os.path.exists(name):
-            error = u"A file or directory named '%s' already exists." % name
-        else:
-            try:
-                name = name.encode("ascii")
-            except:
-                error = u"Project names must be ASCII. This is because the ZIP file format does not support non-ASCII characters in a uniform way."
-                
-        if error:
-            store.error(u"Error", error, "main")
-
-        # Tell the user we're creating the project.
-        title(u"Creating Project")
-        store.message = u"Please wait while we create the project."
-        ui.pausebehavior(0)
-        interact()
-                    
-        # Here is where we actually create the project.
-
-        import shutil
-
-        shutil.copytree(template.path, name)
-
-        unlink = template.info.get("unlink", [ ])
-        unlink += [ 'launcherinfo.py' ]
+        set_tooltip("")
         
-        for i in unlink:
-            if os.path.exists(name + "/" + i):
-                os.unlink(name + "/" + i)
+        if os.path.exists(path):
+            error(_(u"Something with that name already exists in the projects directory."))
+            
+        info(_(u"Creating Project"),
+             _(u"Please wait while we create the project."))
+
+        template = os.path.join(config.renpy_base, "template")
+        
+        shutil.copytree(template, path)
+
+        launcherinfo = os.path.join(path, "launcherinfo.py")
+        if os.path.exists(launcherinfo):
+            os.unlink(launcherinfo)
 
-        for dir, dirs, files in os.walk(name):
-            for d in list(dirs):
-                if d.startswith("."):
-                    dirs.remove(d)
-                    dn = dir + "/" + d
-                    shutil.rmtree(dn, True)
-                
         # Change the save directory.
-        options = file(name + "/game/options.rpy").read()
+        options = file(path + "/game/options.rpy").read()
         save_dir = "%s-%d" % (name, time.time())
         options = options.replace("template-1220804310", save_dir)
-        file(name + "/game/options.rpy", "w").write(options)
-                
-        persistent.project = name
+        file(path + "/game/options.rpy", "w").write(options)
 
-    call find_project from _call_find_project_2
+        p = Project(path)
+        p.select()
 
-label choose_theme:
+    jump choose_theme
 
-    python hide:
-        
-        # Select a color scheme.
-        
-        themes = theme_data.keys()
-        themes.sort()
-        
-        choices = [ ]
-        for i in themes:
-
-            def hovered(i=i):
-                td = theme_data[i].copy()
-                engine = td["theme"]
-                del td["theme"]
-
-                if engine == "roundrect":
-                    renpy.style.restore(style_backup)
-                    theme.roundrect(launcher=True, **td)
-                    renpy.style.rebuild()
-                    return ("repeat", 0)
-
-            choices.append((i, None, i, hovered, False))
-
-        color_theme = paged_menu(u"Select a Theme", choices, u"Please select a color theme for your project. You can always change the colors later.", cancel='color_theme_cancel')
-
-        # Restore default theme.
-        renpy.style.restore(style_backup)
-        theme.roundrect(launcher=True)
-        renpy.style.rebuild()
-
-        ofn = project.path + "/game/options.rpy"
-
-        import os
-        import re
-
-        if not os.path.exists(ofn):
-            error(u"Changing Theme", u"The options file does not seem to exist.", "main")
-        
-        inf = file(ofn, "rU")
-        outf = file(ofn + ".new", "w")
-
-        td = theme_data[color_theme]
-
-        # TODO: Make this less specific to roundrect. Need to figure out
-        # how to switch themes, rather than just recolor them.
-
-        changing = False
-        changed = False
-        
-        for l in inf:
-
-            if re.match(r'\s*theme.roundrect\(', l):
-                changing = True
-                changed = True
-            elif re.match(r'\s*\)', l):
-                changing = False
-            elif changing:
-
-                def repl(m, td=td):
-                    return m.group(1) + m.group(2) + " = \"" + td.get(m.group(2), m.group(3)) + "\","
-
-                l = re.sub(r'^(\s*)(\w+) = "([\da-fA-F#]+)",', repl, l)
-                
-            outf.write(l)
-
-        outf.close()
-        inf.close()
-
-        try:
-            os.rename(ofn + ".new", ofn)            
-        except:
-            
-            # I hate windows.
-            os.rename(ofn, ofn + ".old")
-            os.rename(ofn + ".new", ofn)
-            os.unlink(ofn + ".old")
-            
-        if not changed:
-            error(u"Changing Theme", u"Could not modify options.rpy, perhaps it was edited too much.", "main")
-        
-    jump main
-        
-
-
-label color_theme_cancel:
-
-    python hide:
-
-        # Restore default theme.
-        renpy.style.restore(style_backup)
-        theme.roundrect(launcher=True)
-        renpy.style.rebuild()
-
-    jump main

launcher/options.rpy

@@ -0,0 +1,129 @@
+## This file contains some of the options that can be changed to customize
+## your Ren'Py game. It only contains the most common options... there
+## is quite a bit more customization you can do.
+##
+## Lines beginning with two '#' marks are comments, and you shouldn't
+## uncomment them. Lines beginning with a single '#' mark are
+## commented-out code, and you may want to uncomment them when
+## appropriate.
+
+init -1 python hide:
+
+    ## Should we enable the use of developer tools? This should be
+    ## set to False before the game is released, so the user can't
+    ## cheat using developer tools.
+
+    config.developer = True
+
+    ## These control the width and height of the screen.
+
+    config.screen_width = 540
+    config.screen_height = 440
+
+    ## This controls the title of the window, when Ren'Py is
+    ## running in a window.
+
+    config.window_title = _(u"%s Launcher") % renpy.version()
+
+    #########################################
+    # Themes
+    
+    ## We then want to call a theme function. themes.roundrect is
+    ## a theme that features the use of rounded rectangles. It's
+    ## the only theme we currently support.
+    ##
+    ## The theme function takes a number of parameters that can
+    ## customize the color scheme.
+
+    theme.roundrect(
+
+        ## The color of an idle widget face.
+        widget = "#003c78",
+
+        ## The color of a focused widget face.
+        widget_hover = "#0050a0",
+
+        ## The color of the text in a widget.
+        widget_text = "#c8ffff",
+
+        ## The color of the text in a selected widget. (For
+        ## example, the current value of a preference.)
+        widget_selected = "#ffffc8",
+
+        ## The color of a disabled widget face. 
+        disabled = "#404040",
+
+        ## The color of disabled widget text.
+        disabled_text = "#c8c8c8",
+
+        ## The color of informational labels.
+        label = "#ffffff",
+
+        ## The color of a frame containing widgets.
+        frame = "#6496c8",
+
+        ## If this is True, the in-game window is rounded. If False,
+        ## the in-game window is square.
+        rounded_window = False,
+
+        ## The background of the main menu. This can be a color
+        ## beginning with '#', or an image filename. The latter
+        ## should take up the full height and width of the screen.
+        mm_root = "#dcebff",
+
+        ## The background of the game menu. This can be a color
+        ## beginning with '#', or an image filename. The latter
+        ## should take up the full height and width of the screen.
+        gm_root = "#dcebff",
+
+        ## And we're done with the theme. The theme will customize
+        ## various styles, so if we want to change them, we should
+        ## do so below.            
+        )
+
+    theme.outline_bars(
+        inside="#6496c8",
+        idle="#06c",
+        hover="#00c")
+
+    # Copy the bar styles used by the launcher, so the theme
+    # selector can't change them.
+    style.lbar = Style(style.default)
+    style.lbar.take(style.bar)
+    style.lscrollbar = Style(style.default)
+    style.lscrollbar.take(style.vscrollbar)
+
+    #########################################
+    ## These settings let you change some of the sounds that are used by
+    ## Ren'Py.
+
+    ## Set this to False if the game does not have any sound effects.
+    config.sound = False
+
+python early:
+    config.save_directory = "launcher-2"
+
+init -1 python hide:
+    #########################################
+    ## Default values of Preferences.
+
+    ## Note: These options are only evaluated the first time a
+    ## game is run. To have them run a second time, delete
+    ## game/saves/persistent
+
+    ## Should we start in fullscreen mode?
+
+    config.default_fullscreen = False
+
+    ## The default text speed in characters per second. 0 is infinite.
+
+    config.default_text_cps = 0
+
+    #########################################
+    ## More customizations can go here.
+
+    config.has_autosave = False
+    
+    config.window_icon = "logo.png"
+    config.windows_icon = "logo32.png"
+    

launcher/opts.rpy

@@ -0,0 +1,42 @@
+# This file handles the launcher options screen.
+
+label options:
+
+    python hide:
+
+        screen()
+        ui.vbox()
+
+        title(_(u"Launcher Options"))
+
+        editor = persistent.editor
+        if not set_editor:
+            editor = _(u"Using RENPY_EDITOR")
+        
+        text_variable(_("Text Editor"), editor, "editor",
+                      _(u"Change the default text editor."))
+
+        ui.null(height=15)
+
+        button(_(u"Projects Directory"),
+               ui.jumps("options_cpd"),
+               _(u"Select the directory Ren'Py searches for projects."))
+
+        ui.null(height=15)
+        
+        button(_(u"Return"), ui.jumps("top"), "")
+
+        ui.close()
+
+        act = interact()
+
+        if act == "editor":
+            renpy.jump("editor")
+
+
+    jump options
+        
+label options_cpd:
+    call choose_projects_directory
+    jump options
+    

launcher/posixpath.py

@@ -0,0 +1,453 @@
+"""Common operations on Posix pathnames.
+
+Instead of importing this module directly, import os and refer to
+this module as os.path.  The "os.path" name is an alias for this
+module on Posix systems; on other systems (e.g. Mac, Windows),
+os.path provides the same operations in a manner specific to that
+platform, and is an alias to another module (e.g. macpath, ntpath).
+
+Some of this can actually be useful on non-Posix systems too, e.g.
+for manipulation of the pathname component of URLs.
+"""
+
+import os
+import stat
+
+__all__ = ["normcase","isabs","join","splitdrive","split","splitext",
+           "basename","dirname","commonprefix","getsize","getmtime",
+           "getatime","getctime","islink","exists","lexists","isdir","isfile",
+           "ismount","walk","expanduser","expandvars","normpath","abspath",
+           "samefile","sameopenfile","samestat",
+           "curdir","pardir","sep","pathsep","defpath","altsep","extsep",
+           "devnull","realpath","supports_unicode_filenames"]
+
+# strings representing various path-related bits and pieces
+curdir = '.'
+pardir = '..'
+extsep = '.'
+sep = '/'
+pathsep = ':'
+defpath = ':/bin:/usr/bin'
+altsep = None
+devnull = '/dev/null'
+
+# Normalize the case of a pathname.  Trivial in Posix, string.lower on Mac.
+# On MS-DOS this may also turn slashes into backslashes; however, other
+# normalizations (such as optimizing '../' away) are not allowed
+# (another function should be defined to do that).
+
+def normcase(s):
+    """Normalize case of pathname.  Has no effect under Posix"""
+    return s
+
+
+# Return whether a path is absolute.
+# Trivial in Posix, harder on the Mac or MS-DOS.
+
+def isabs(s):
+    """Test whether a path is absolute"""
+    return s.startswith('/')
+
+
+# Join pathnames.
+# Ignore the previous parts if a part is absolute.
+# Insert a '/' unless the first part is empty or already ends in '/'.
+
+def join(a, *p):
+    """Join two or more pathname components, inserting '/' as needed"""
+    path = a
+    for b in p:
+        if b.startswith('/'):
+            path = b
+        elif path == '' or path.endswith('/'):
+            path +=  b
+        else:
+            path += '/' + b
+    return path
+
+
+# Split a path in head (everything up to the last '/') and tail (the
+# rest).  If the path ends in '/', tail will be empty.  If there is no
+# '/' in the path, head  will be empty.
+# Trailing '/'es are stripped from head unless it is the root.
+
+def split(p):
+    """Split a pathname.  Returns tuple "(head, tail)" where "tail" is
+    everything after the final slash.  Either part may be empty."""
+    i = p.rfind('/') + 1
+    head, tail = p[:i], p[i:]
+    if head and head != '/'*len(head):
+        head = head.rstrip('/')
+    return head, tail
+
+
+# Split a path in root and extension.
+# The extension is everything starting at the last dot in the last
+# pathname component; the root is everything before that.
+# It is always true that root + ext == p.
+
+def splitext(p):
+    """Split the extension from a pathname.  Extension is everything from the
+    last dot to the end.  Returns "(root, ext)", either part may be empty."""
+    i = p.rfind('.')
+    if i<=p.rfind('/'):
+        return p, ''
+    else:
+        return p[:i], p[i:]
+
+
+# Split a pathname into a drive specification and the rest of the
+# path.  Useful on DOS/Windows/NT; on Unix, the drive is always empty.
+
+def splitdrive(p):
+    """Split a pathname into drive and path. On Posix, drive is always
+    empty."""
+    return '', p
+
+
+# Return the tail (basename) part of a path.
+
+def basename(p):
+    """Returns the final component of a pathname"""
+    return split(p)[1]
+
+
+# Return the head (dirname) part of a path.
+
+def dirname(p):
+    """Returns the directory component of a pathname"""
+    return split(p)[0]
+
+
+# Return the longest prefix of all list elements.
+
+def commonprefix(m):
+    "Given a list of pathnames, returns the longest common leading component"
+    if not m: return ''
+    s1 = min(m)
+    s2 = max(m)
+    n = min(len(s1), len(s2))
+    for i in xrange(n):
+        if s1[i] != s2[i]:
+            return s1[:i]
+    return s1[:n]
+
+# Get size, mtime, atime of files.
+
+def getsize(filename):
+    """Return the size of a file, reported by os.stat()."""
+    return os.stat(filename).st_size
+
+def getmtime(filename):
+    """Return the last modification time of a file, reported by os.stat()."""
+    return os.stat(filename).st_mtime
+
+def getatime(filename):
+    """Return the last access time of a file, reported by os.stat()."""
+    return os.stat(filename).st_atime
+
+def getctime(filename):
+    """Return the metadata change time of a file, reported by os.stat()."""
+    return os.stat(filename).st_ctime
+
+# Is a path a symbolic link?
+# This will always return false on systems where os.lstat doesn't exist.
+
+def islink(path):
+    """Test whether a path is a symbolic link"""
+    try:
+        st = os.lstat(path)
+    except (os.error, AttributeError):
+        return False
+    return stat.S_ISLNK(st.st_mode)
+
+
+# Does a path exist?
+# This is false for dangling symbolic links.
+
+def exists(path):
+    """Test whether a path exists.  Returns False for broken symbolic links"""
+    try:
+        st = os.stat(path)
+    except os.error:
+        return False
+    return True
+
+
+# Being true for dangling symbolic links is also useful.
+
+def lexists(path):
+    """Test whether a path exists.  Returns True for broken symbolic links"""
+    try:
+        st = os.lstat(path)
+    except os.error:
+        return False
+    return True
+
+
+# Is a path a directory?
+# This follows symbolic links, so both islink() and isdir() can be true
+# for the same path.
+
+def isdir(path):
+    """Test whether a path is a directory"""
+    try:
+        st = os.stat(path)
+    except os.error:
+        return False
+    return stat.S_ISDIR(st.st_mode)
+
+
+# Is a path a regular file?
+# This follows symbolic links, so both islink() and isfile() can be true
+# for the same path.
+
+def isfile(path):
+    """Test whether a path is a regular file"""
+    try:
+        st = os.stat(path)
+    except os.error:
+        return False
+    return stat.S_ISREG(st.st_mode)
+
+
+# Are two filenames really pointing to the same file?
+
+def samefile(f1, f2):
+    """Test whether two pathnames reference the same actual file"""
+    s1 = os.stat(f1)
+    s2 = os.stat(f2)
+    return samestat(s1, s2)
+
+
+# Are two open files really referencing the same file?
+# (Not necessarily the same file descriptor!)
+
+def sameopenfile(fp1, fp2):
+    """Test whether two open file objects reference the same file"""
+    s1 = os.fstat(fp1)
+    s2 = os.fstat(fp2)
+    return samestat(s1, s2)
+
+
+# Are two stat buffers (obtained from stat, fstat or lstat)
+# describing the same file?
+
+def samestat(s1, s2):
+    """Test whether two stat buffers reference the same file"""
+    return s1.st_ino == s2.st_ino and \
+           s1.st_dev == s2.st_dev
+
+
+# Is a path a mount point?
+# (Does this work for all UNIXes?  Is it even guaranteed to work by Posix?)
+
+def ismount(path):
+    """Test whether a path is a mount point"""
+    try:
+        s1 = os.lstat(path)
+        s2 = os.lstat(join(path, '..'))
+    except os.error:
+        return False # It doesn't exist -- so not a mount point :-)
+    dev1 = s1.st_dev
+    dev2 = s2.st_dev
+    if dev1 != dev2:
+        return True     # path/.. on a different device as path
+    ino1 = s1.st_ino
+    ino2 = s2.st_ino
+    if ino1 == ino2:
+        return True     # path/.. is the same i-node as path
+    return False
+
+
+# Directory tree walk.
+# For each directory under top (including top itself, but excluding
+# '.' and '..'), func(arg, dirname, filenames) is called, where
+# dirname is the name of the directory and filenames is the list
+# of files (and subdirectories etc.) in the directory.
+# The func may modify the filenames list, to implement a filter,
+# or to impose a different order of visiting.
+
+def walk(top, func, arg):
+    """Directory tree walk with callback function.
+
+    For each directory in the directory tree rooted at top (including top
+    itself, but excluding '.' and '..'), call func(arg, dirname, fnames).
+    dirname is the name of the directory, and fnames a list of the names of
+    the files and subdirectories in dirname (excluding '.' and '..').  func
+    may modify the fnames list in-place (e.g. via del or slice assignment),
+    and walk will only recurse into the subdirectories whose names remain in
+    fnames; this can be used to implement a filter, or to impose a specific
+    order of visiting.  No semantics are defined for, or required of, arg,
+    beyond that arg is always passed to func.  It can be used, e.g., to pass
+    a filename pattern, or a mutable object designed to accumulate
+    statistics.  Passing None for arg is common."""
+
+    try:
+        names = os.listdir(top)
+    except os.error:
+        return
+    func(arg, top, names)
+    for name in names:
+        name = join(top, name)
+        try:
+            st = os.lstat(name)
+        except os.error:
+            continue
+        if stat.S_ISDIR(st.st_mode):
+            walk(name, func, arg)
+
+
+# Expand paths beginning with '~' or '~user'.
+# '~' means $HOME; '~user' means that user's home directory.
+# If the path doesn't begin with '~', or if the user or $HOME is unknown,
+# the path is returned unchanged (leaving error reporting to whatever
+# function is called with the expanded path as argument).
+# See also module 'glob' for expansion of *, ? and [...] in pathnames.
+# (A function should also be defined to do full *sh-style environment
+# variable expansion.)
+
+def expanduser(path):
+    """Expand ~ and ~user constructions.  If user or $HOME is unknown,
+    do nothing."""
+    if not path.startswith('~'):
+        return path
+    i = path.find('/', 1)
+    if i < 0:
+        i = len(path)
+    if i == 1:
+        if 'HOME' not in os.environ:
+            import pwd
+            userhome = pwd.getpwuid(os.getuid()).pw_dir
+        else:
+            userhome = os.environ['HOME']
+    else:
+        import pwd
+        try:
+            pwent = pwd.getpwnam(path[1:i])
+        except KeyError:
+            return path
+        userhome = pwent.pw_dir
+    userhome = userhome.rstrip('/')
+    return userhome + path[i:]
+
+
+# Expand paths containing shell variable substitutions.
+# This expands the forms $variable and ${variable} only.
+# Non-existent variables are left unchanged.
+
+_varprog = None
+
+def expandvars(path):
+    """Expand shell variables of form $var and ${var}.  Unknown variables
+    are left unchanged."""
+    global _varprog
+    if '$' not in path:
+        return path
+    if not _varprog:
+        import re
+        _varprog = re.compile(r'\$(\w+|\{[^}]*\})')
+    i = 0
+    while True:
+        m = _varprog.search(path, i)
+        if not m:
+            break
+        i, j = m.span(0)
+        name = m.group(1)
+        if name.startswith('{') and name.endswith('}'):
+            name = name[1:-1]
+        if name in os.environ:
+            tail = path[j:]
+            path = path[:i] + os.environ[name]
+            i = len(path)
+            path += tail
+        else:
+            i = j
+    return path
+
+
+# Normalize a path, e.g. A//B, A/./B and A/foo/../B all become A/B.
+# It should be understood that this may change the meaning of the path
+# if it contains symbolic links!
+
+def normpath(path):
+    """Normalize path, eliminating double slashes, etc."""
+    if path == '':
+        return '.'
+    initial_slashes = path.startswith('/')
+    # POSIX allows one or two initial slashes, but treats three or more
+    # as single slash.
+    if (initial_slashes and
+        path.startswith('//') and not path.startswith('///')):
+        initial_slashes = 2
+    comps = path.split('/')
+    new_comps = []
+    for comp in comps:
+        if comp in ('', '.'):
+            continue
+        if (comp != '..' or (not initial_slashes and not new_comps) or
+             (new_comps and new_comps[-1] == '..')):
+            new_comps.append(comp)
+        elif new_comps:
+            new_comps.pop()
+    comps = new_comps
+    path = '/'.join(comps)
+    if initial_slashes:
+        path = '/'*initial_slashes + path
+    return path or '.'
+
+
+def abspath(path):
+    """Return an absolute path."""
+    if not isabs(path):
+        path = join(os.getcwd(), path)
+    return normpath(path)
+
+
+# Return a canonical path (i.e. the absolute location of a file on the
+# filesystem).
+
+def realpath(filename):
+    """Return the canonical path of the specified filename, eliminating any
+symbolic links encountered in the path."""
+    if isabs(filename):
+        bits = ['/'] + filename.split('/')[1:]
+    else:
+        bits = [''] + filename.split('/')
+
+    for i in range(2, len(bits)+1):
+        component = join(*bits[0:i])
+        # Resolve symbolic links.
+        if islink(component):
+            resolved = _resolve_link(component)
+            if resolved is None:
+                # Infinite loop -- return original component + rest of the path
+                return abspath(join(*([component] + bits[i:])))
+            else:
+                newpath = join(*([resolved] + bits[i:]))
+                return realpath(newpath)
+
+    return abspath(filename)
+
+
+def _resolve_link(path):
+    """Internal helper function.  Takes a path and follows symlinks
+    until we either arrive at something that isn't a symlink, or
+    encounter a path we've seen before (meaning that there's a loop).
+    """
+    paths_seen = []
+    while islink(path):
+        if path in paths_seen:
+            # Already seen this path, so we must have a symlink loop
+            return None
+        paths_seen.append(path)
+        # Resolve where the link points to
+        resolved = os.readlink(path)
+        if not isabs(resolved):
+            dir = dirname(path)
+            path = normpath(join(dir, resolved))
+        else:
+            path = normpath(resolved)
+    return path
+
+supports_unicode_filenames = False

launcher/project.rpy

@@ -0,0 +1,312 @@
+init python:
+    import os
+    import os.path
+    import sys
+    import platform
+    import subprocess
+    
+    ZWSP = u"\u200B"
+
+    # The process of the running game.
+    game_proc = None
+    
+    class ProcessBehavior(renpy.display.layout.Null):
+
+        def __init__(self, proc):
+            super(ProcessBehavior, self).__init__()
+            
+            self.proc = proc
+
+        def event(self, ev, x, y, st):
+
+            if self.proc.poll() is not None:
+                return True
+                
+            renpy.game.interface.timeout(.25)
+
+    def quote_char(c):
+        n = ord(c)
+        if 0x20 <= n <= 0x7f:
+            return c
+        else:
+            return "\\x%02x" % n
+
+    # Quotes an arbitrary string (without knowing the encoding) for display.
+    def quote(s):
+        s ="".join(quote_char(i) for i in s)
+        s = s.replace("/", "/" + ZWSP)
+        s = s.replace("\\", "\\" + ZWSP)
+        return s
+        
+    class Project(object):
+
+        def __init__(self, path):
+            # The name of the project.
+            self.name = os.path.basename(path) 
+            
+            # The full path to the project.
+            self.path = path
+
+            # The path to the game directory, for convenience.
+            self.gamedir = os.path.join(path, "game")
+            
+        def __repr__(self):
+            return "<Project %r>" % (self.path)
+
+        def select(self):
+            """
+             Select this project as the one that we're working on.
+             """
+
+            global project
+            global game_proc
+            
+            persistent.project_path = self.path
+            project = self
+            game_proc = None
+
+            # Load the informatrion dictionary.
+            info = dict()
+            launcherinfo = os.path.join(self.path, "launcherinfo.py")
+            
+            if os.path.exists(launcherinfo):
+                source = file(launcherinfo, "rU").read().decode("utf8")
+                if source[0] == u'\ufeff':
+                    source = source[1:]
+                source = source.encode("raw_unicode_escape")
+
+                exec source in info
+
+                del info["__builtins__"]
+
+            self.info = info
+            
+        def save(self):
+            """
+             Saves the info dictionary into the launcherinfo file.
+             """
+
+            launcherinfo = os.path.join(self.path, "launcherinfo.py")
+
+            f = file(launcherinfo + ".new", "w")
+            for k, v in self.info.iteritems():
+                f.write("%s = %r\n" % (k, v))
+            f.close()
+
+            try:
+                os.rename(launcherinfo + ".new", launcherinfo)
+            except:
+                os.unlink(launcherinfo)
+                os.rename(launcherinfo + ".new", launcherinfo)
+
+            
+            
+    def scan_projects():
+        """
+         Scans for projects. Returns a list of Project objects.
+         """
+        
+        rv = [ ]
+        
+        project_dirs = [ config.renpy_base ]
+
+        if persistent.projects_directory:
+            project_dirs.append(persistent.projects_directory)
+
+        for d in project_dirs:
+
+            if not os.path.isdir(d):
+                continue
+
+            for pd in sorted(os.listdir(d), key=lambda a : a.lower()):
+                path = os.path.join(d, pd)
+
+                if not os.path.isdir(path):
+                    continue
+                
+                gamedir = os.path.join(path, "game")
+
+                if not os.path.isdir(gamedir):
+                    continue
+
+                rv.append(Project(path))
+                
+        return rv
+    
+
+    def choose_default_project():
+        """
+         Chooses the default project, based on the persistent information.
+         """
+        
+        project = None
+        projects = scan_projects()
+
+        for i in projects:
+            if i.path == persistent.project_path:
+                i.select()
+                return
+
+        for i in projects:
+            if i.name == "demo":
+                i.select()
+                return
+
+        if projects:
+            projects[0].select()
+            return
+
+        
+    def select_project(p):
+        p.select()
+        renpy.jump("top")
+        
+    curried_select_project = renpy.curry(select_project)
+        
+label select_project:
+
+    if persistent.projects_directory is None:
+        call choose_projects_directory
+   
+    python:
+
+        screen()
+
+        ui.vbox()
+
+        title(_(u"Select Project"))
+        scrolled("top")
+
+        ui.vbox()
+        
+        projects = scan_projects()
+
+        for i in projects:
+
+            button(i.name,
+                   curried_select_project(i),
+                   quote(i.path))
+
+        ui.close() # vbox            
+        ui.close() # scrolled
+        ui.close() # vbox
+
+        interact()
+
+label launch:
+    
+    python hide:
+        
+        if sys.platform == "win32" and sys.argv[0].lower().endswith(".exe"):
+            proc = subprocess.Popen([sys.argv[0], project.path])
+        else:
+            proc = subprocess.Popen([sys.executable, sys.argv[0], project.path])
+
+        set_tooltip(_(u"%s has been launched.") % project.name.capitalize())
+
+        store.game_proc = proc
+
+    jump top
+
+
+label game_directory:
+
+    python hide:
+        gamedir = os.path.normpath(project.gamedir)
+
+        if sys.platform == "win32":
+            os.startfile(gamedir)
+        elif platform.mac_ver()[0]:
+            subprocess.Popen([ "open", gamedir ])
+        else:
+            subprocess.Popen([ "xdg-open", gamedir ])
+
+        gamedir = quote(gamedir)
+        set_tooltip(_(u"Opening game directory:\n%s") % gamedir)
+            
+    jump top
+
+
+label edit_script:
+
+    python hide:
+
+        if not config.editor:
+            error(_(u"No editor has been selected."))
+                    
+        files = [ project.gamedir + "/" + i for i in os.listdir(project.gamedir) if i.endswith(".rpy") if not i[0] == "."]
+        files.sort()
+
+        for i in files[:]:
+            if i.endswith("options.rpy"):
+                files.remove(i)
+                files.insert(0, i)
+
+        for i in files[:]:
+            if i.endswith("script.rpy"):
+                files.remove(i)
+                files.insert(0, i)
+
+        if not files:
+            error(_(u"No files to edit."))
+                
+        if not renpy.launch_editor(files):
+            error(_(u"Launching the editor failed."))
+        
+        set_tooltip(_(u"Launched editor with %d script files.") % len(files))
+
+    jump top
+
+    
+label lint:
+
+    python hide:
+
+        set_tooltip("")
+        
+        info(_(u"Lint"), _(u"Lint in progress."))
+
+        lf = file("lint.txt", "w+")
+
+        if hasattr(sys, "winver") and sys.argv[0].lower().endswith(".exe"):
+            CREATE_NO_WINDOW=0x08000000
+            proc = subprocess.Popen([config.renpy_base + "/console.exe", "--lint", project.path], stdin=lf, stdout=lf, stderr=lf, creationflags=CREATE_NO_WINDOW)
+        else:
+            proc = subprocess.Popen([sys.executable, sys.argv[0], "--lint", project.path], stdout=lf)
+
+        proc.wait()
+
+        lf.close()
+
+        renpy.launch_editor([ "lint.txt" ], transient=1)
+
+    return
+
+
+label call_lint:
+    call lint
+
+    python:
+        set_tooltip(_(u"Lint complete."))
+
+    jump top
+
+
+label delete_persistent:
+
+    python hide:
+        set_tooltip("")
+    
+        info(_(u"Delete Persistent"), _(u"Deleting persistent data."))
+    
+        if hasattr(sys, "winver") and sys.argv[0].lower().endswith(".exe"):
+            proc = subprocess.Popen([config.renpy_base + "/console.exe", "--rmpersistent", project.path])
+        else:
+            proc = subprocess.Popen([sys.executable, sys.argv[0], "--rmpersistent", project.path])
+        
+        proc.wait()
+
+        set_tooltip(_(u"Persistent data has been deleted."))
+
+    jump top
+                    

launcher/projectsdir.rpy

@@ -0,0 +1,61 @@
+init python:
+
+    import os
+    import subprocess
+
+    try:
+        import EasyDialogs
+    except ImportError:
+        try:
+            import EasyDialogsWin as EasyDialogs
+        except:
+            EasyDialogs = None
+
+
+label choose_projects_directory:
+
+    python hide:
+
+        set_tooltip("")
+        
+        info(_(u"Choose Projects Directory"),
+             _(u"Please choose the directory containing your projects."))
+
+
+        path = persistent.projects_directory
+        
+        if path is None:
+            path = os.path.dirname(config.renpy_base)
+
+
+        if EasyDialogs:
+
+            choice = EasyDialogs.AskFolder(defaultLocation=path, wanted=str)
+            if choice is not None:
+                path = choice                
+
+        else:
+
+            try:
+
+                env = os.environ.copy()
+                if 'RENPY_OLD_LD_LIBRARY_PATH' in env:
+                    env['LD_LIBRARY_PATH'] = env['RENPY_OLD_LD_LIBRARY_PATH']
+                
+                zen = subprocess.Popen([ "zenity", "--title=Select Projects Directory", "--file-selection", "--directory", "--filename=" + path ],
+                                       env=env, stdout=subprocess.PIPE)
+
+                choice = zen.stdout.read()        
+                zen.wait()
+
+                if choice:
+                    path = choice[:-1]
+            
+            except:
+                error(_(u"Could not run zenity. The projects directory has been set to the directory immediately above the directory containing Ren'Py."), None)
+
+        persistent.projects_directory = path                    
+        choose_default_project()
+
+    return
+                               

launcher/script.rpy

@@ -0,0 +1,112 @@
+label main_menu:
+    return
+
+label start:
+    python:
+        choose_default_project()
+        scan_editors()
+        setup_editor()
+        
+    jump top
+
+label top:
+    python:
+
+        if game_proc and game_proc.poll() is None:
+            launch = None
+            ui.add(ProcessBehavior(game_proc))
+        else:
+            launch = ui.jumps("launch")
+            game_proc = None
+            
+        screen()
+        
+        ui.vbox()
+        ui.viewport(draggable=True, ymaximum=47)
+        title(project.name.capitalize())
+
+        ui.grid(2, 4, transpose=True)
+        
+        button(_(u"Launch"),
+               launch,
+               _(u"Launches the project."))
+
+        button(_(u"Edit Script"),
+               ui.jumps("edit_script"),
+               _(u"Edits the script of the project."))
+
+        button(_(u"Game Directory"),
+               ui.jumps("game_directory"),
+               _(u"Opens the project's game directory."))
+        
+        button(_(u"Check Script (Lint)"),
+               ui.jumps("call_lint"),
+               _(u"Checks the script of the project for likely errors."))
+
+
+        button(_(u"Choose Theme"),
+               ui.jumps("choose_theme"),
+               _(u"Changes the theme used by the project."))
+        
+        button(_(u"Delete Persistent"),
+               ui.jumps("delete_persistent"),
+               _(u"Deletes the persistent data associated with the project."))
+        
+        button(_(u"Archive Files"),
+               ui.jumps("archiver"),
+               _(u"Archives files found in the game and archived directories."))
+
+        button(_(u"Build Distributions"),
+               ui.jumps("distribute"),
+               _(u"Builds distributions of the project."))
+        
+        ui.close()
+
+        title(_(u"Ren'Py"))
+        
+        ui.grid(2, 3, transpose=True)
+        
+        button(_(u"Select Project"),
+               ui.jumps("select_project"),
+               _(u"Select a project to work with."))
+
+        button(_(u"New Project"),
+               ui.jumps("new_project"),
+               _(u"Create a new project."))
+
+        button(_(u"Quit"),
+               renpy.quit,
+               _(u"Causes the launcher to exit."))
+        
+        button(_(u"Options"),
+               ui.jumps("options"),
+               _(u"Change Ren'Py launcher options."))
+
+        button(_(u"Ren'Py Help"),
+               ui.jumps("documentation"),
+               _(u"Open the Ren'Py documentation in a web browser."))
+
+        ui.null()
+
+        ui.close()
+        ui.close()
+        
+        interact()
+
+    # ProcessBehavior can return True, which sends us here.
+    jump top
+
+
+label documentation:
+
+    python hide:
+        import webbrowser
+        webbrowser.open_new("file:///" + config.renpy_base + "/doc/index.html")
+        set_tooltip(_(u"Now showing the Ren'Py documentation in your web browser."))
+
+    jump top
+
+
+label confirm_quit:
+    $ renpy.quit()
+    

launcher/script_version.rpy

@@ -1,3 +1,3 @@
 init -999:
-    $ config.script_version = (6, 9, 1)
+    $ config.script_version = (6, 9, 3)
     

launcher/strings.rpy

@@ -0,0 +1,192 @@
+init python:
+    LAUNCHER_RPYS = set(['options.rpy', 'strings.rpy', 'transupdate.rpy', 'choose_theme.rpy', 'archiver.rpy', 'project.rpy', 'script_version.rpy', 'new.rpy', 'themes_data.rpy', 'opts.rpy', 'interface.rpy', 'projectsdir.rpy', 'distribute.rpy', 'script.rpy', 'editor.rpy'])
+
+    TRANSLATION_STRINGS = [
+
+        u'Developer Menu',
+        u'Return to the developer menu',
+        u'Skip Mode',
+        u'Fast Skip Mode',
+        u'Please click to continue.',
+        u'Start Game',
+        u'Load Game',
+        u'Preferences',
+        u'Help',
+        u'Quit',
+        u'Return',
+        u'Save Game',
+        u'Main Menu',
+        u'Are you sure you want to quit?',
+        u'Are you sure you want to return to the main menu?\\nThis will lose unsaved progress.',
+        u'Begin Skipping',
+        u'Empty Slot.',
+        u'Previous',
+        u'Next',
+        u'Yes',
+        u'No',
+        u'Loading will lose unsaved progress.\\nAre you sure you want to do this?',
+        u'Are you sure you want to overwrite your save?',
+        u'The error message was:',
+        u'You may want to try saving in a different slot, or playing for a while and trying again later.',
+        u'Save Failed.',
+        u'Continue Game',
+        u'Test',
+        u'Left',
+        u'Right',
+        u'Up',
+        u'Down',
+        u'Not Assigned',
+        u'Select/Dismiss',
+        u'Rollback',
+        u'Hold to Skip',
+        u'Joystick Mapping',
+        u'Move the joystick or press a joystick button to create the mapping. Click the mouse to remove the mapping.',
+        u'Toggle Skip',
+        u'Hide Text',
+        u'Menu',
+        u'Display',
+        u'Window',
+        u'Fullscreen',
+        u'Transitions',
+        u'All',
+        u'Some',
+        u'None',
+        u'Skip',
+        u'Seen Messages',
+        u'All Messages',
+        u'After Choices',
+        u'Stop Skipping',
+        u'Keep Skipping',
+        u'Text Speed',
+        u'Auto-Forward Time',
+        u'Music Volume',
+        u'Sound Volume',
+        u'Joystick...',
+        u'Joystick Configuration',
+        u'Voice Volume',
+        u'Auto',
+        u'Quick',
+        u'The patterns did not match any files, so no archive was created.',
+        u'Archiving Files...',
+        u'Success',
+        u'The files have been added to the archive, and moved into the \\"archived\\" directory. Future runs of the archiver will archive files in both the \\"game\\" and \\"archived\\" directories.',
+        u'Archiver',
+        u'The archiver allows you to obfuscate your game by including files in an archive file.',
+        u'Archive Name:',
+        u'The name of the archive to create.',
+        u'Include Patterns:',
+        u'Files matching these patterns are included in the archive.',
+        u'Exclude Patterns:',
+        u'Files matching these patterns are excluded from the archive.',
+        u'Archive',
+        u'Build the archive.',
+        u'Cancel',
+        u'Archive Name',
+        u'The name of the archive file to create, without the .rpa extension.\\n\\nThe \\"data\\" archive is loaded automatically. Other archives must be added to config.archives.',
+        u'Include Patterns',
+        u'This is a space-separated list of file patterns. Files matching these patterns are added to the archive.\\n\\nAsterisks (*) can be used as a wildcard.',
+        u'This is a space-separated list of file patterns. Files matching these patterns are excluded from the archive. If a file is matched by both an exclude and include pattern, the exclude takes precedence.\\n\\nAsterisks (*) can be used as a wildcard.',
+        u'Scanning Files...',
+        u'Could not modify options.rpy. Perhaps it was changed too much.',
+        u'Theme changed to %s.',
+        u'Planetarium',
+        u'The options.rpy file does not exist in the game directory, so this launcher cannot change the theme.',
+        u"Themes control the basic look of interface elements. You'll be able to pick a color scheme next.",
+        u'Choose Theme',
+        u'Please choose a color scheme for your project.',
+        u'Choose Color Scheme',
+        u'Building Distributions',
+        u'Base Name:',
+        u'Used to generate the names of directories and archive files.',
+        u'Executable Name:',
+        u'Used to generate the names of executables and runnable programs.',
+        u'Ignore Extensions:',
+        u'Files with these extensions will not be included in the distributions.',
+        u'Documentation Extensions:',
+        u'Files with these extensions will be treated as documentation, when building the Macintosh application.',
+        u'Distributions to Build:',
+        u'Windows x86',
+        u'Zip distribution for the 32-bit Windows platform.',
+        u'Linux x86',
+        u'Tar.Bz2 distribution for the Linux x86 platform.',
+        u'Macintosh Universal',
+        u'Single application distribution for the Macintosh x86 and ppc platforms.',
+        u'Windows/Linux/Mac Combined',
+        u'Zip distribution for the Windows x86, Linux x86, Macintosh x86 and Macintosh ppc platforms.',
+        u'Build',
+        u'Start building the distributions.',
+        u'Base Name',
+        u'Please enter in the base name for your distribution. This name is used to generate the names of directories and archive files. Usually, this is the name of your game, plus a version number, like \\"moonlight-1.0\\".',
+        u'Executable Name',
+        u'Please enter a name for the executables in your distribution. This should not include an extension, as that will be added automatically.',
+        u'Ignore Extensions',
+        u'Please enter a space-separated list of file extensions. Files with these extensions will not be included in the built distributions.',
+        u'Documentation Extensions',
+        u'Please enter a space separated list of documentation extensions. Files in the base directory with these extensions will have a second copy stored outside of the Macintosh application.',
+        u'Scanning...',
+        u'Building Windows...',
+        u'Building Linux...',
+        u'Building Macintosh...',
+        u'Building Combined...',
+        u"Thank you for choosing Ren'Py.",
+        u"The distributions have been built. Be sure to test them before release.\\n\\nNote that unpacking and repacking the Macintosh, Linux, or Combined distributions on Windows is not supported.\\n\\nPlease announce your release at the {a=http://lemmasoft.renai.us/forums/}Lemma Soft Forums{/a}, so we can add it to the Ren'Py web site.",
+        u'The editor has been set from the RENPY_EDITOR environment variable, and cannot be changed.',
+        u'Choose Editor',
+        u"Please choose the editor that will be use to edit scripts and display errors. More editors can be downloaded from {a=http://www.renpy.org/wiki/renpy/Editors}the Ren'Py website{/a}.",
+        u'Error',
+        u'Press enter when done.',
+        u'Welcome!',
+        u'The string cannot be empty. Please enter some text.',
+        u'Non-ASCII filenames are not allowed. This is because Zip files cannot reliably represent non-ASCII filenames.',
+        u'Processed %d of %d files.',
+        u'New Project',
+        u'Please type the name of your new project.',
+        u'Something with that name already exists in the projects directory.',
+        u'Creating Project',
+        u'Please wait while we create the project.',
+        u'%s Launcher',
+        u'Launcher Options',
+        u'Change the default text editor.',
+        u'Projects Directory',
+        u"Select the directory Ren'Py searches for projects.",
+        u'Select Project',
+        u'%s has been launched.',
+        u'Opening game directory:\\n%s',
+        u'No editor has been selected.',
+        u'No files to edit.',
+        u'Launching the editor failed.',
+        u'Launched editor with %d script files.',
+        u'Lint',
+        u'Lint in progress.',
+        u'Lint complete.',
+        u'Deleting persistent data.',
+        u'Delete Persistent',
+        u'Persistent data has been deleted.',
+        u'Choose Projects Directory',
+        u'Please choose the directory containing your projects.',
+        u"Could not run zenity. The projects directory has been set to the directory immediately above the directory containing Ren'Py.",
+        u"Now showing the Ren'Py documentation in your web browser.",
+        u'Launch',
+        u'Launches the project.',
+        u'Edit Script',
+        u'Edits the script of the project.',
+        u'Game Directory',
+        u"Opens the project's game directory.",
+        u'Check Script (Lint)',
+        u'Checks the script of the project for likely errors.',
+        u'Changes the theme used by the project.',
+        u'Deletes the persistent data associated with the project.',
+        u'Archive Files',
+        u'Archives files found in the game and archived directories.',
+        u'Build Distributions',
+        u'Builds distributions of the project.',
+        u"Ren'Py",
+        u'Select a project to work with.',
+        u'Create a new project.',
+        u'Causes the launcher to exit.',
+        u'Options',
+        u"Change Ren'Py launcher options.",
+        u"Ren'Py Help",
+        u"Open the Ren'Py documentation in a web browser.",
+    ]
+

launcher/themes_data.rpy

@@ -1,244 +1,305 @@
 init 1 python:
-    theme_data = {'Basic Blue': {'disabled': '#404040',
-                'disabled_text': '#c8c8c8',
-                'frame': '#6496c8',
-                'gm_root': '#dcebff',
-                'label': '#ffffff',
-                'mm_root': '#dcebff',
-                'theme': 'roundrect',
-                'widget': '#003c78',
-                'widget_hover': '#0050a0',
-                'widget_selected': '#ffffc8',
-                'widget_text': '#c8ffff'},
- 'Bloody Mary': {'disabled': '#400000',
-                 'disabled_text': '#260000',
-                 'frame': '#400808',
-                 'gm_root': '#000000',
-                 'label': '#ffffff',
-                 'mm_root': '#000000',
-                 'theme': 'roundrect',
-                 'widget': '#000000',
-                 'widget_hover': '#830000',
-                 'widget_selected': '#ffffff',
-                 'widget_text': '#C2C2C2'},
- 'Colorblind': {'disabled': '#898989',
-                'disabled_text': '#666666',
-                'frame': '#252525',
-                'gm_root': '#393939',
-                'label': '#c2c2c2',
-                'mm_root': '#393939',
-                'theme': 'roundrect',
-                'widget': '#898989',
-                'widget_hover': '#464646',
-                'widget_selected': '#F2F2F2',
-                'widget_text': '#CCCCCC'},
- 'Cotton Candy': {'disabled': '#C8AFA1',
-                  'disabled_text': '#E1D4C9',
-                  'frame': '#FCF5F2',
-                  'gm_root': '#D0B4BA',
-                  'label': '#805C40',
-                  'mm_root': '#D0B4BA',
-                  'theme': 'roundrect',
-                  'widget': '#ECC7D0',
-                  'widget_hover': '#E1D4C9',
-                  'widget_selected': '#805C40',
-                  'widget_text': '#805C40'},
- 'Creamsicle': {'disabled': '#FFECBF',
-                'disabled_text': '#ffffff',
-                'frame': '#FFECBF',
-                'gm_root': '#FDF5E3',
-                'label': '#502F13',
-                'mm_root': '#FDF5E3',
-                'theme': 'roundrect',
-                'widget': '#D96B00',
-                'widget_hover': '#FD9B1C',
-                'widget_selected': '#ffffff',
-                'widget_text': '#FCE6B1'},
- 'Dramatic Flesh': {'disabled': '#ab6038',
-                    'disabled_text': '#BF7C51',
-                    'frame': '#49271b',
-                    'gm_root': '#2a201f',
-                    'label': '#ffffff',
-                    'mm_root': '#2a201f',
-                    'theme': 'roundrect',
-                    'widget': '#BF7C51',
-                    'widget_hover': '#dda570',
-                    'widget_selected': '#ffffff',
-                    'widget_text': '#E5DFDF'},
- 'Easter Baby': {'disabled': '#DDE9FF',
-                 'disabled_text': '#A6AFBF',
-                 'frame': '#CCF8DC',
-                 'gm_root': '#FBF9DF',
-                 'label': '#698071',
-                 'mm_root': '#FBF9DF',
-                 'theme': 'roundrect',
-                 'widget': '#F5D4EE',
-                 'widget_hover': '#F0DDFF',
-                 'widget_selected': '#000000',
-                 'widget_text': '#698071'},
- 'Favorite Jeans': {'disabled': '#919994',
-                    'disabled_text': '#B6BFB9',
-                    'frame': '#6f7571',
-                    'gm_root': '#b0b8ba',
-                    'label': '#ffffff',
-                    'mm_root': '#b0b8ba',
-                    'theme': 'roundrect',
-                    'widget': '#8699a7',
-                    'widget_hover': '#9eb1ad',
-                    'widget_selected': '#ffffff',
-                    'widget_text': '#dcdfd6'},
- 'Fine China': {'disabled': '#ADB9CC',
-                'disabled_text': '#DFBA14',
-                'frame': '#ADB9CC',
-                'gm_root': '#F7F7FA',
-                'label': '#39435E',
-                'mm_root': '#F7F7FA',
-                'theme': 'roundrect',
-                'widget': '#6A7183',
-                'widget_hover': '#1A2B47',
-                'widget_selected': '#E3E3E4',
-                'widget_text': '#C9C9CB'},
- 'First Valentines': {'disabled': '#F8F2D0',
-                      'disabled_text': '#BFA1A1',
-                      'frame': '#F8F2D0',
-                      'gm_root': '#D98989',
-                      'label': '#5D1010',
-                      'mm_root': '#D98989',
-                      'theme': 'roundrect',
-                      'widget': '#F09898',
-                      'widget_hover': '#D6C5BB',
-                      'widget_selected': '#B31E1E',
-                      'widget_text': '#593131'},
- 'Ice Queen': {'disabled': '#F0F2F2',
-               'disabled_text': '#FBFBFB',
-               'frame': '#ffffff',
-               'gm_root': '#E6E6E6',
-               'label': '#D9D9D9',
-               'mm_root': '#E6E6E6',
-               'theme': 'roundrect',
-               'widget': '#D9D9D9',
-               'widget_hover': '#F0F2F2',
-               'widget_selected': '#737373',
-               'widget_text': '#ffffff'},
- 'Mocha Latte': {'disabled': '#614D3A',
-                 'disabled_text': '#80654D',
-                 'frame': '#926841',
-                 'gm_root': '#1A140E',
-                 'label': '#F1EBE5',
-                 'mm_root': '#1A140E',
-                 'theme': 'roundrect',
-                 'widget': '#4D3B29',
-                 'widget_hover': '#996E45',
-                 'widget_selected': '#ffffff',
-                 'widget_text': '#B99D83'},
- 'Muted Horror': {'disabled': '#73735C',
-                  'disabled_text': '#8C8C70',
-                  'frame': '#555544',
-                  'gm_root': '#1A0001',
-                  'label': '#1A0001',
-                  'mm_root': '#1A0001',
-                  'theme': 'roundrect',
-                  'widget': '#777777',
-                  'widget_hover': '#73735C',
-                  'widget_selected': '#000000',
-                  'widget_text': '#404033'},
- 'Old Polaroid': {'disabled': '#A89E7D',
-                  'disabled_text': '#CCC097',
-                  'frame': '#49403E',
-                  'gm_root': '#A84A3E',
-                  'label': '#ffffff',
-                  'mm_root': '#A84A3E',
-                  'theme': 'roundrect',
-                  'widget': '#A89E7D',
-                  'widget_hover': '#8DB6B9',
-                  'widget_selected': '#ffffff',
-                  'widget_text': '#49403E'},
- 'Really Red': {'disabled': '#404040',
-                'disabled_text': '#c8c8c8',
-                'frame': '#e17373',
-                'gm_root': '#ffd0d0',
-                'label': '#ffffff',
-                'mm_root': '#ffd0d0',
-                'theme': 'roundrect',
-                'widget': '#963232',
-                'widget_hover': '#c83232',
-                'widget_selected': '#ffffc8',
-                'widget_text': '#ffffff'},
- 'Summer Sky': {'disabled': '#6074BF',
-                'disabled_text': '#7383BF',
-                'frame': '#6074BF',
-                'gm_root': '#B4CDD4',
-                'label': '#94C7D4',
-                'mm_root': '#B4CDD4',
-                'theme': 'roundrect',
-                'widget': '#F2E6AA',
-                'widget_hover': '#FCFCA4',
-                'widget_selected': '#1A5766',
-                'widget_text': '#7DA8B3'},
- 'Swamp Critter': {'disabled': '#A2521D',
-                   'disabled_text': '#753D00',
-                   'frame': '#797C1C',
-                   'gm_root': '#B09D5A',
-                   'label': '#ffffff',
-                   'mm_root': '#B09B4F',
-                   'theme': 'roundrect',
-                   'widget': '#753D00',
-                   'widget_hover': '#B19A48',
-                   'widget_selected': '#ffffff',
-                   'widget_text': '#CCCAC2'},
- 'Urban Sprawl': {'disabled': '#8F0000',
-                  'disabled_text': '#333333',
-                  'frame': '#8F0000',
-                  'gm_root': '#000000',
-                  'label': '#ffffff',
-                  'mm_root': '#000000',
-                  'theme': 'roundrect',
-                  'widget': '#333333',
-                  'widget_hover': '#000000',
-                  'widget_selected': '#ffffff',
-                  'widget_text': '#6C8A2F'},
- 'Victorian Gingerbread': {'disabled': '#7A674F',
-                           'disabled_text': '#664F33',
-                           'frame': '#BF8A73',
-                           'gm_root': '#695640',
-                           'label': '#F2EDC4',
-                           'mm_root': '#695640',
-                           'theme': 'roundrect',
-                           'widget': '#7A674F',
-                           'widget_hover': '#BDA77D',
-                           'widget_selected': '#FDFBEE',
-                           'widget_text': '#F2EDC4'},
- 'Watermelon Pie': {'disabled': '#FABF46',
-                    'disabled_text': '#FFE06D',
-                    'frame': '#C3CD91',
-                    'gm_root': '#F7F7C5',
-                    'label': '#FCFCD7',
-                    'mm_root': '#F7F7C5',
-                    'theme': 'roundrect',
-                    'widget': '#FFE06D',
-                    'widget_hover': '#E38A4F',
-                    'widget_selected': '#996600',
-                    'widget_text': '#FAA700'},
- 'White Chocolate': {'disabled': '#614D3A',
-                     'disabled_text': '#80654D',
-                     'frame': '#926841',
-                     'gm_root': '#FBF9EA',
-                     'label': '#F1EBE5',
-                     'mm_root': '#FBF9EA',
-                     'theme': 'roundrect',
-                     'widget': '#33271C',
-                     'widget_hover': '#ECE7C4',
-                     'widget_selected': '#ffffff',
-                     'widget_text': '#B99D83'},
- 'Winter Mint': {'disabled': '#426143',
-                 'disabled_text': '#819981',
-                 'frame': '#245536',
-                 'gm_root': '#e5f1e5',
-                 'label': '#ffffff',
-                 'mm_root': '#e5f1e5',
-                 'theme': 'roundrect',
-                 'widget': '#7AA27B',
-                 'widget_hover': '#A3C7A3',
-                 'widget_selected': '#ffffff',
-                 'widget_text': '#CDE0CE'}}
+
+    # This is a list of (theme name, theme function, theme exemplar) tuples.
+    themes = [
+        ("Roundrect", "roundrect", "Basic Blue"),
+        ]
+
+    # This is a map from theme function to template text that sensibly calls
+    # that function.
+    theme_templates = { }
+    
+    theme_templates["roundrect"] = """\
+    theme.roundrect(
+        # Color scheme: %(name)s
+                                    
+        ## The color of an idle widget face.
+        widget = "%(widget)s",
+
+        ## The color of a focused widget face.
+        widget_hover = "%(widget_hover)s",
+
+        ## The color of the text in a widget.
+        widget_text = "%(widget_text)s",
+
+        ## The color of the text in a selected widget. (For
+        ## example, the current value of a preference.)
+        widget_selected = "%(widget_selected)s",
+
+        ## The color of a disabled widget face. 
+        disabled = "%(disabled)s",
+
+        ## The color of disabled widget text.
+        disabled_text = "%(disabled_text)s",
+
+        ## The color of informational labels.
+        label = "%(label)s",
+
+        ## The color of a frame containing widgets.
+        frame = "%(frame)s",
+
+        ## The background of the main menu. This can be a color
+        ## beginning with '#', or an image filename. The latter
+        ## should take up the full height and width of the screen.
+        mm_root = "%(mm_root)s",
+
+        ## The background of the game menu. This can be a color
+        ## beginning with '#', or an image filename. The latter
+        ## should take up the full height and width of the screen.
+        gm_root = "%(gm_root)s",
+
+        ## If this is True, the in-game window is rounded. If False,
+        ## the in-game window is square.
+        rounded_window = False,
+
+        ## And we're done with the theme. The theme will customize
+        ## various styles, so if we want to change them, we should
+        ## do so below.            
+        )"""
+
+    # This is a map from theme name to the code needed to implement that
+    # theme.
+    theme_data = {
+        'Basic Blue': {'disabled': '#404040',
+                       'disabled_text': '#c8c8c8',
+                       'frame': '#6496c8',
+                       'gm_root': '#dcebff',
+                       'label': '#ffffff',
+                       'mm_root': '#dcebff',
+                       'theme': 'roundrect',
+                       'widget': '#003c78',
+                       'widget_hover': '#0050a0',
+                       'widget_selected': '#ffffc8',
+                       'widget_text': '#c8ffff'},
+        'Bloody Mary': {'disabled': '#400000',
+                        'disabled_text': '#260000',
+                        'frame': '#400808',
+                        'gm_root': '#000000',
+                        'label': '#ffffff',
+                        'mm_root': '#000000',
+                        'theme': 'roundrect',
+                        'widget': '#000000',
+                        'widget_hover': '#830000',
+                        'widget_selected': '#ffffff',
+                        'widget_text': '#C2C2C2'},
+        'Colorblind': {'disabled': '#898989',
+                       'disabled_text': '#666666',
+                       'frame': '#252525',
+                       'gm_root': '#393939',
+                       'label': '#c2c2c2',
+                       'mm_root': '#393939',
+                       'theme': 'roundrect',
+                       'widget': '#898989',
+                       'widget_hover': '#464646',
+                       'widget_selected': '#F2F2F2',
+                       'widget_text': '#CCCCCC'},
+        'Cotton Candy': {'disabled': '#C8AFA1',
+                         'disabled_text': '#E1D4C9',
+                         'frame': '#FCF5F2',
+                         'gm_root': '#D0B4BA',
+                         'label': '#805C40',
+                         'mm_root': '#D0B4BA',
+                         'theme': 'roundrect',
+                         'widget': '#ECC7D0',
+                         'widget_hover': '#E1D4C9',
+                         'widget_selected': '#805C40',
+                         'widget_text': '#805C40'},
+        'Creamsicle': {'disabled': '#FFECBF',
+                       'disabled_text': '#ffffff',
+                       'frame': '#FFECBF',
+                       'gm_root': '#FDF5E3',
+                       'label': '#502F13',
+                       'mm_root': '#FDF5E3',
+                       'theme': 'roundrect',
+                       'widget': '#D96B00',
+                       'widget_hover': '#FD9B1C',
+                       'widget_selected': '#ffffff',
+                       'widget_text': '#FCE6B1'},
+        'Dramatic Flesh': {'disabled': '#ab6038',
+                           'disabled_text': '#BF7C51',
+                           'frame': '#49271b',
+                           'gm_root': '#2a201f',
+                           'label': '#ffffff',
+                           'mm_root': '#2a201f',
+                           'theme': 'roundrect',
+                           'widget': '#BF7C51',
+                           'widget_hover': '#dda570',
+                           'widget_selected': '#ffffff',
+                           'widget_text': '#E5DFDF'},
+        'Easter Baby': {'disabled': '#DDE9FF',
+                        'disabled_text': '#A6AFBF',
+                        'frame': '#CCF8DC',
+                        'gm_root': '#FBF9DF',
+                        'label': '#698071',
+                        'mm_root': '#FBF9DF',
+                        'theme': 'roundrect',
+                        'widget': '#F5D4EE',
+                        'widget_hover': '#F0DDFF',
+                        'widget_selected': '#000000',
+                        'widget_text': '#698071'},
+        'Favorite Jeans': {'disabled': '#919994',
+                           'disabled_text': '#B6BFB9',
+                           'frame': '#6f7571',
+                           'gm_root': '#b0b8ba',
+                           'label': '#ffffff',
+                           'mm_root': '#b0b8ba',
+                           'theme': 'roundrect',
+                           'widget': '#8699a7',
+                           'widget_hover': '#9eb1ad',
+                           'widget_selected': '#ffffff',
+                           'widget_text': '#dcdfd6'},
+        'Fine China': {'disabled': '#ADB9CC',
+                       'disabled_text': '#DFBA14',
+                       'frame': '#ADB9CC',
+                       'gm_root': '#F7F7FA',
+                       'label': '#39435E',
+                       'mm_root': '#F7F7FA',
+                       'theme': 'roundrect',
+                       'widget': '#6A7183',
+                       'widget_hover': '#1A2B47',
+                       'widget_selected': '#E3E3E4',
+                       'widget_text': '#C9C9CB'},
+        'First Valentines': {'disabled': '#F8F2D0',
+                             'disabled_text': '#BFA1A1',
+                             'frame': '#F8F2D0',
+                             'gm_root': '#D98989',
+                             'label': '#5D1010',
+                             'mm_root': '#D98989',
+                             'theme': 'roundrect',
+                             'widget': '#F09898',
+                             'widget_hover': '#D6C5BB',
+                             'widget_selected': '#B31E1E',
+                             'widget_text': '#593131'},
+        'Ice Queen': {'disabled': '#F0F2F2',
+                      'disabled_text': '#FBFBFB',
+                      'frame': '#ffffff',
+                      'gm_root': '#E6E6E6',
+                      'label': '#D9D9D9',
+                      'mm_root': '#E6E6E6',
+                      'theme': 'roundrect',
+                      'widget': '#D9D9D9',
+                      'widget_hover': '#F0F2F2',
+                      'widget_selected': '#737373',
+                      'widget_text': '#ffffff'},
+        'Mocha Latte': {'disabled': '#614D3A',
+                        'disabled_text': '#80654D',
+                        'frame': '#926841',
+                        'gm_root': '#1A140E',
+                        'label': '#F1EBE5',
+                        'mm_root': '#1A140E',
+                        'theme': 'roundrect',
+                        'widget': '#4D3B29',
+                        'widget_hover': '#996E45',
+                        'widget_selected': '#ffffff',
+                        'widget_text': '#B99D83'},
+        'Muted Horror': {'disabled': '#73735C',
+                         'disabled_text': '#8C8C70',
+                         'frame': '#555544',
+                         'gm_root': '#1A0001',
+                         'label': '#1A0001',
+                         'mm_root': '#1A0001',
+                         'theme': 'roundrect',
+                         'widget': '#777777',
+                         'widget_hover': '#73735C',
+                         'widget_selected': '#000000',
+                         'widget_text': '#404033'},
+        'Old Polaroid': {'disabled': '#A89E7D',
+                         'disabled_text': '#CCC097',
+                         'frame': '#49403E',
+                         'gm_root': '#A84A3E',
+                         'label': '#ffffff',
+                         'mm_root': '#A84A3E',
+                         'theme': 'roundrect',
+                         'widget': '#A89E7D',
+                         'widget_hover': '#8DB6B9',
+                         'widget_selected': '#ffffff',
+                         'widget_text': '#49403E'},
+        'Really Red': {'disabled': '#404040',
+                       'disabled_text': '#c8c8c8',
+                       'frame': '#e17373',
+                       'gm_root': '#ffd0d0',
+                       'label': '#ffffff',
+                       'mm_root': '#ffd0d0',
+                       'theme': 'roundrect',
+                       'widget': '#963232',
+                       'widget_hover': '#c83232',
+                       'widget_selected': '#ffffc8',
+                       'widget_text': '#ffffff'},
+        'Summer Sky': {'disabled': '#6074BF',
+                       'disabled_text': '#7383BF',
+                       'frame': '#6074BF',
+                       'gm_root': '#B4CDD4',
+                       'label': '#94C7D4',
+                       'mm_root': '#B4CDD4',
+                       'theme': 'roundrect',
+                       'widget': '#F2E6AA',
+                       'widget_hover': '#FCFCA4',
+                       'widget_selected': '#1A5766',
+                       'widget_text': '#7DA8B3'},
+        'Swamp Critter': {'disabled': '#A2521D',
+                          'disabled_text': '#753D00',
+                          'frame': '#797C1C',
+                          'gm_root': '#B09D5A',
+                          'label': '#ffffff',
+                          'mm_root': '#B09B4F',
+                          'theme': 'roundrect',
+                          'widget': '#753D00',
+                          'widget_hover': '#B19A48',
+                          'widget_selected': '#ffffff',
+                          'widget_text': '#CCCAC2'},
+        'Urban Sprawl': {'disabled': '#8F0000',
+                         'disabled_text': '#333333',
+                         'frame': '#8F0000',
+                         'gm_root': '#000000',
+                         'label': '#ffffff',
+                         'mm_root': '#000000',
+                         'theme': 'roundrect',
+                         'widget': '#333333',
+                         'widget_hover': '#000000',
+                         'widget_selected': '#ffffff',
+                         'widget_text': '#6C8A2F'},
+        'Victorian Gingerbread': {'disabled': '#7A674F',
+                                  'disabled_text': '#664F33',
+                                  'frame': '#BF8A73',
+                                  'gm_root': '#695640',
+                                  'label': '#F2EDC4',
+                                  'mm_root': '#695640',
+                                  'theme': 'roundrect',
+                                  'widget': '#7A674F',
+                                  'widget_hover': '#BDA77D',
+                                  'widget_selected': '#FDFBEE',
+                                  'widget_text': '#F2EDC4'},
+        'Watermelon Pie': {'disabled': '#FABF46',
+                           'disabled_text': '#FFE06D',
+                           'frame': '#C3CD91',
+                           'gm_root': '#F7F7C5',
+                           'label': '#FCFCD7',
+                           'mm_root': '#F7F7C5',
+                           'theme': 'roundrect',
+                           'widget': '#FFE06D',
+                           'widget_hover': '#E38A4F',
+                           'widget_selected': '#996600',
+                           'widget_text': '#FAA700'},
+        'White Chocolate': {'disabled': '#614D3A',
+                            'disabled_text': '#80654D',
+                            'frame': '#926841',
+                            'gm_root': '#FBF9EA',
+                            'label': '#F1EBE5',
+                            'mm_root': '#FBF9EA',
+                            'theme': 'roundrect',
+                            'widget': '#33271C',
+                            'widget_hover': '#ECE7C4',
+                            'widget_selected': '#ffffff',
+                            'widget_text': '#B99D83'},
+        'Winter Mint': {'disabled': '#426143',
+                        'disabled_text': '#819981',
+                        'frame': '#245536',
+                        'gm_root': '#e5f1e5',
+                        'label': '#ffffff',
+                        'mm_root': '#e5f1e5',
+                        'theme': 'roundrect',
+                        'widget': '#7AA27B',
+                        'widget_hover': '#A3C7A3',
+                        'widget_selected': '#ffffff',
+                        'widget_text': '#CDE0CE'}}
 

launcher/transupdate.rpy

@@ -0,0 +1,62 @@
+# This file contains code for updating translations. Basically, it will
+# search for a non-default file in launcher, and if that file exists, it
+# will append missing translations to it.
+
+init python:
+    import os
+    import os.path
+    import traceback
+    import codecs
+    
+    def update_translations():
+
+        # Find the first file in the launcher directory that was
+        # not distributed with Ren'Py.
+        for fn in sorted(os.listdir(config.gamedir)):
+            if not fn.endswith(".rpy"):
+                continue
+
+            if fn in LAUNCHER_RPYS:
+                continue
+
+            break
+
+        else:
+            return
+
+        # Find untranslated strings.
+        new_translations = [ ]
+
+        for t in TRANSLATION_STRINGS:
+            if t not in config.translations:
+                new_translations.append(t)
+
+        if not new_translations:
+            return
+
+
+        # Add a block to the file with the untranslated strings.
+        f = codecs.open(os.path.join(config.gamedir, fn), "a", "utf-8")
+        
+        print >>f
+        print >>f, "# New translations for", renpy.version()
+        print >>f, "init -1 python hide:"
+        print >>f, "    config.translations.update({"
+        
+        for t in new_translations:
+
+            print >>f
+            print >>f, "    %r" % t
+            print >>f, "    : %r," % t
+
+        print >>f
+        print >>f, "    })"
+            
+        f.close()
+    
+init 100 python hide:
+
+    try:
+        update_translations()
+    except:
+        traceback.print_exc()

launcher1/distribute.rpy

@@ -0,0 +1,534 @@
+# This file contains the code needed to build a Ren'Py distribution.
+
+init python:
+    import zipfile
+    import tarfile
+    import os
+    import os.path
+    import time
+    import sys
+    import zlib
+
+    import pefile
+    
+    # Returns true if a file or directory should not be included in
+    # the distribution
+    
+    ignored_files = ("thumbs.db",
+                     "launcherinfo.py",
+                     "traceback.txt",
+                     "errors.txt",
+                     "icon.ico",
+                     "icon.icns"
+                     )
+
+
+    root_ignored_files = (
+        "common",
+        "renpy",
+        "renpy.code",
+        "python23.dll",
+        "python24.dll",
+        "python25.dll",
+        "msvcr71.dll",                     
+        "lib",
+        "iliad-icon.png",
+        "manifest.xml"
+        )
+    
+    def ignored(fn, dir, dest, root):
+        if fn[0] == ".":
+            return True
+
+        for i in store.ignore_extensions:
+            if fn.endswith(i):
+                return True
+
+        if fn.lower() in ignored_files:
+            return True
+
+        if fn == "saves":
+            return True
+
+        if fn == "archived":
+            return True
+
+        if root and dir == dest:
+            if fn.endswith(".py") or fn.endswith(".sh") or fn.endswith(".app"):
+                return True
+
+            if fn in root_ignored_files:
+                return True
+            
+        return False
+
+    def tree(src, dest,
+             exclude_suffix=[ ".pyc", "~", ".bak" ],
+             exclude_prefix=[ ".", '#' ],
+             exclude=ignored_files,
+             exclude_func=ignored,
+             root=False,
+             ):
+
+        # Get rid of trailing slashes.
+        if src[-1] == "/":
+            src = src[:-1]
+
+        if dest and dest[-1] == "/":
+            dest = dest[:-1]
+
+        # What should we include?
+        def include(fn, destdir, dest):
+            for i in exclude_suffix:
+                if fn.endswith(i):
+                    return False
+
+            for i in exclude_prefix:
+                if fn.startswith(i):
+                    return False
+
+            for i in exclude:
+                if i == fn.lower():
+                    return False
+
+            if exclude_func and exclude_func(fn, destdir, dest, root):
+                return False
+
+            return True
+
+
+        rv = [ ]
+
+        # Walk the tree, including what is necessary.
+        for srcdir, dirs, files in os.walk(src):
+
+            if dest:
+                destdir = dest + srcdir[len(src):]
+            else:
+                destdir = srcdir[len(src) + 1:]
+
+            if destdir:
+                rv.append((srcdir, destdir))
+
+            for fn in files:
+
+                if not include(fn, destdir, dest):
+                    continue
+
+                sfn = srcdir + "/" + fn
+
+                if destdir:
+                    dfn = destdir + "/" + fn
+                else:
+                    dfn = fn
+
+                dfn = dfn.replace("\\", "/")
+                    
+                rv.append((sfn, dfn))
+
+            dirs[:] = [ i for i in dirs if include(i, destdir, dest) ]
+
+        return rv
+
+        
+label distribute:
+
+    python hide:
+        zlib.Z_DEFAULT_COMPRESSION = 9
+
+        store.progress_time = 0
+
+        def progress(tit, n, m, time=time):
+            
+            if time.time() < store.progress_time + .1:
+                return
+
+            title(tit)
+
+            mid(message)
+            ui.bar(m, n, xmaximum=200, xalign=0.5)
+            ui.close()
+
+            ui.pausebehavior(0)
+            interact()
+            
+        # Check to see which platforms we can build on.
+        if os.path.exists(config.renpy_base + "/renpy.exe"):
+            windows = True
+        else:
+            windows = False
+
+        if os.path.exists(config.renpy_base + "/lib/linux-x86"):
+            linux = True
+        else:
+            linux = False
+
+        if os.path.exists(config.renpy_base + "/lib/linux-iliad"):
+            iliad = True
+        else:
+            iliad = False
+
+        if os.path.exists(config.renpy_base + "/renpy.app"):
+            mac = True
+        else:
+            mac = False
+            
+        if not (windows or mac or linux or iliad):
+            store.error(u"Can't Distribute", u"Ren'Py is missing files required for distribution. Please download the full package from {a=http://www.renpy.org/}www.renpy.org{/a}.", "tools_menu")
+        
+        lint()
+
+        store.message = ""
+
+        title(_(u"Building Distributions"))
+
+        mid()
+        text(u"I've just performed a lint on your project. If it contains errors, you should say no and fix them.\nCheck {a=http://www.renpy.org/wiki/renpy/Download_Ren'Py}www.renpy.org{/a} to see if updates or fixes are available.\n\nDo you want to continue?")
+        ui.close()
+
+        bottom()
+        button(u"Yes", clicked=ui.returns(True))
+        button(u"No", clicked=ui.returns(False))
+        ui.close()
+
+        if not interact():
+            renpy.jump("tools")
+
+
+        # if not windows or not mac or not linux:
+        #    store.message = "The full version of Ren'Py can build for Windows, Mac, and Linux. Download it from www.renpy.org."
+            
+        title(u"Building Distributions")
+
+        mid()
+        text(u"Distributions will be built for the following platforms:")
+
+        spacer()
+
+        if windows:
+            text(u"Windows 2000+", style='launcher_input')
+
+        if linux:
+            text(u"Linux x86", style='launcher_input')
+
+        if iliad:
+            text(u"iLiad", style='launcher_input')
+                        
+        if mac:
+            text(u"Mac OS X 10.4+", style='launcher_input')
+
+        spacer()
+
+
+        # TODO: If missing platforms, prompt for a DL.
+
+        text(u"Is this okay?")
+        ui.close()
+
+        bottom()
+        button(u"Yes", clicked=ui.returns(True))
+        button(u"No", clicked=ui.returns(False))
+        ui.close()
+
+        if not interact():
+            renpy.jump("tools")
+
+        default_name = project.info.get('distribution_base', project.name)
+
+        name = prompt(u"Building Distributions",
+                      u"Please enter a base name for the directories making up this distribution.",
+                      "tools",
+                      default_name,
+                      u"This usually should include a name and version number, like 'moonlight_walks-1.0'.")
+
+        name = name.strip()
+
+        if not name:
+            store.error(u"Error", u"The distribution name should not be empty.", "tools_menu")
+
+        try:
+            name = name.encode("ascii")
+        except:
+            store.error(u"Error", u"Distribution names must be ASCII. This is because archive file formats do not support non-ASCII characters in a uniform way.", "tools_menu")
+
+        project.info['distribution_base'] = name
+
+        ignore_extensions = project.info.get('ignore_extensions', "~ .bak")
+        ignore_extensions = prompt(u"Building Distributions", u"Please enter a space separated list of the file extensions you do not want included in the distribution.", "tools", ignore_extensions)
+        store.ignore_extensions = [ i.strip() for i in ignore_extensions.strip().split() ]
+        project.info['ignore_extensions'] = ignore_extensions    
+
+        project.save()
+        
+        # Figure out the files that will make up the distribution.
+
+        multi = [ ]
+
+        # This finds the files and directories in the tree, and includes
+        # them in the result.
+
+                
+        # renpy and common directories.
+        multi.extend(tree(config.renpy_base + "/renpy", "renpy"))
+        multi.append((config.renpy_base + "/LICENSE.txt", "renpy/LICENSE.txt"))
+        multi.extend(tree(config.commondir, "common"))
+        
+        # Include the project.
+        multi.extend(tree(project.path, '',
+                          exclude_suffix = [ ],
+                          exclude_prefix = [ ],
+                          exclude=[ ],
+                          root=True))
+        
+        shortgamedir = project.gamedir[len(project.path)+1:]
+
+
+        def add_script_version(fn, multi=multi, shortgamedir=shortgamedir):
+
+            for a, b in multi:
+                if b == shortgamedir + "/" + fn:
+                    return
+
+            for i in store.ignore_extensions:
+                if fn.endswith(i):
+                    return 
+
+            multi.append((config.gamedir + "/" + fn, shortgamedir + "/" + fn))
+
+        add_script_version("script_version.rpy")
+        add_script_version("script_version.rpyc")
+            
+        # renpy.py
+        multi.append((config.renpy_base + "/renpy.py",
+                      project.name + ".py"))
+
+        # Windows Zip
+        if windows:
+            win_files = [
+                ( config.renpy_base + "/renpy.exe", project.name + ".exe"),
+                ( config.renpy_base + "/renpy.code", "renpy.code" ),
+                ( config.renpy_base + "/python25.dll", "python25.dll" ),
+                ( config.renpy_base + "/msvcr71.dll", "msvcr71.dll" ),
+                ]
+
+            win_data = { }
+            if os.path.exists(project.path + "/icon.ico"):
+                win_data[project.name + ".exe"] = pefile.change_icons(
+                    config.renpy_base + "/renpy.exe",
+                    project.path + "/icon.ico",
+                    )
+            
+            zf = zipfile.ZipFile(name + ".zip", "w", zipfile.ZIP_DEFLATED)
+
+            progress_len = len(multi) + len(win_files)
+            store.message = u"Be sure to announce your project at the Lemma Soft Forums."
+                               
+            for i, (fn, an) in enumerate(multi + win_files):
+                progress(u"Building Windows", i, progress_len)
+
+                if os.path.isdir(fn):
+                    continue
+                
+                zi = zipfile.ZipInfo(name + "/" + an)
+
+                s = os.stat(fn)
+                zi.date_time = time.gmtime(s.st_mtime)[:6]
+                zi.compress_type = zipfile.ZIP_DEFLATED
+                zi.create_system = 3
+
+                zi.external_attr = long(0100666) << 16 
+                data = file(fn, "rb").read()
+
+                data = win_data.get(an, data)
+                
+                zf.writestr(zi, data)
+
+
+            zf.close()
+
+
+        # Linux Tar Bz2
+        if linux:
+
+            linux_files = [
+                (config.renpy_base + "/lib/linux-x86", "lib/linux-x86"),
+                (config.renpy_base + "/renpy.sh", project.name + ".sh"),
+                (config.renpy_base + "/lib/python", "lib/python"),
+                ]
+                
+
+            linux_files.extend(tree(config.renpy_base + "/lib/linux-x86", "lib/linux-x86"))
+
+            tf = tarfile.open(name + "-linux-x86.tar.bz2", "w:bz2")
+            tf.dereference = True
+
+            progress_len = len(multi) + len(linux_files)
+            store.message = u"If appropriate, please submit your game to www.renai.us."
+
+            for j, i in enumerate(multi + linux_files):
+
+                progress(u"Building Linux", j, progress_len)
+
+                fn, an = i
+
+                info = tf.gettarinfo(fn, name + "-linux-x86/" + an)
+
+                if info.isdir():
+                    perms = 0777
+                elif info.name.endswith(".sh"):
+                    perms = 0777
+                elif info.name.endswith(".so"):
+                    perms = 0777
+                elif info.name.endswith("python"):
+                    perms = 0777
+                elif info.name.endswith("python.real"):
+                    perms = 0777
+                else:
+                    perms = 0666
+
+                info.mode = perms
+                info.uid = 1000
+                info.gid = 1000
+                info.uname = "renpy"
+                info.gname = "renpy"
+
+                if info.isreg():
+                    tf.addfile(info, file(fn, "rb"))
+                else:
+                    tf.addfile(info)
+
+            tf.close()
+
+
+        # iLiad Tar Bz2
+        if iliad:
+
+            iliad_files = [
+                (config.renpy_base + "/lib", "lib"),
+                (config.renpy_base + "/renpy-iliad.sh", project.name + ".sh"),
+                (config.renpy_base + "/lib/python", "lib/python"),
+                (config.renpy_base + "/manifest.xml", "manifest.xml"),
+                (config.renpy_base + "/iliad-icon.png", "iliad-icon.png"),
+                ]
+                
+            iliad_files.extend(tree(config.renpy_base + "/lib/linux-iliad", "lib/linux-iliad"))
+
+            iliad_data = { }
+
+            manifest = file(config.renpy_base + "/manifest.xml", "r").read()
+            manifest = manifest.replace("GAMENAME", project.name)
+            iliad_data["manifest.xml"] = manifest
+            
+            zf = zipfile.ZipFile(name + "-iLiad.zip", "w", zipfile.ZIP_DEFLATED)
+
+            progress_len = len(multi) + len(iliad_files)
+            store.message = u"We thank Hixbooks for sponsoring iLiad support."
+
+            for i, (fn, an) in enumerate(multi + iliad_files):
+
+                progress(u"Building iLiad", i, progress_len)
+
+                if os.path.isdir(fn):
+                    continue
+                
+                zi = zipfile.ZipInfo(project.name + "/" + an)
+                
+                s = os.stat(fn)
+                zi.date_time = time.gmtime(s.st_mtime)[:6]
+                zi.compress_type = zipfile.ZIP_DEFLATED
+                zi.create_system = 3
+
+                for ext in [ ".sh", ".so", "python", "python.real" ]:
+                    if fn.endswith(ext):
+                        zi.external_attr = long(0100777) << 16 
+                        data = file(fn, "rb").read()
+                        break
+                else:
+                    zi.external_attr = long(0100666) << 16 
+                    data = file(fn, "rb").read()
+
+                data = iliad_data.get(an, data)                    
+                zf.writestr(zi, data)
+
+            zf.close()
+
+        if mac:
+
+            mac_files = tree(config.renpy_base + "/renpy.app",
+                             project.name + ".app")
+
+            mac_files = [ (fn, an.replace("Ren'Py Launcher", project.name)) for (fn, an) in mac_files ]
+
+            # Data replacement for macintosh.
+            mac_data = { }
+            
+            quoted_name = project.name.replace("&", "&amp;").replace("<", "&lt;")                                               
+            info_plist = file(config.renpy_base + "/renpy.app/Contents/Info.plist", "rb").read().replace("Ren'Py Launcher", quoted_name)
+            mac_data[project.name + ".app/Contents/Info.plist"] = info_plist
+
+            quoted_name = project.name.replace("\"", "\\\"")
+            launcher_py = file(config.renpy_base + "/renpy.app/Contents/Resources/launcher.py", "rb").read().replace("Ren'Py Launcher", quoted_name)
+            mac_data[project.name + ".app/Contents/Resources/launcher.py"] = launcher_py
+
+            if os.path.exists(project.path + "/icon.icns"):
+                icon_data = file(project.path + "/icon.icns", "rb").read()
+                mac_data[project.name + ".app/Contents/Resources/launcher.icns"] = icon_data
+            
+            zf = zipfile.ZipFile(name + "-mac.zip", "w", zipfile.ZIP_DEFLATED)
+
+            progress_len = len(multi) + len(mac_files)
+            store.message = u"Thank you for choosing Ren'Py."
+
+            for i, (fn, an) in enumerate(multi + mac_files):
+
+                progress(u"Building Mac OS X", i, progress_len)
+
+                if os.path.isdir(fn):
+                    continue
+                
+                zi = zipfile.ZipInfo(name + "-mac/" + an)
+                
+                s = os.stat(fn)
+                zi.date_time = time.gmtime(s.st_mtime)[:6]
+                zi.compress_type = zipfile.ZIP_DEFLATED
+                zi.create_system = 3
+
+                if os.path.dirname(fn).endswith("MacOS") or fn.endswith(".so") or fn.endswith(".dylib"):
+                    zi.external_attr = long(0100777) << 16 
+                    data = file(fn, "rb").read()
+                else:
+                    zi.external_attr = long(0100666) << 16 
+                    data = file(fn, "rb").read()
+
+                data = mac_data.get(an, data)                    
+                zf.writestr(zi, data)
+
+            zf.close()
+
+                
+        # Announce Success
+
+        store.message = ""
+
+        title(u"Success")
+
+        mid()
+        text(u"The distribution(s) have been built. Be sure to test them before release.")
+
+        spacer()
+
+        if mac:
+            text(u"Note that unpacking and repacking Mac zips and Linux tarballs on Windows isn't supported.")
+
+        ui.close()
+
+        bottom()
+        button(u"Return", clicked=ui.returns(True))
+        ui.close()
+        
+        interact()
+
+        
+    jump tools
+               
+        

launcher1/editor.rpy

@@ -0,0 +1,29 @@
+# This file contains logic for detecting an editor, and for selecting
+# the default editor.
+
+init:
+    python hide:
+        import os
+        import os.path
+        import sys
+
+        if not config.editor:
+
+            editor = os.path.normpath(config.renpy_base + "/jedit/jedit.jar")
+
+            if os.path.exists(editor):
+
+                editor = renpy.shell_escape(editor)
+
+                if sys.platform == 'win32':
+                    config.editor = 'javaw.exe -jar "' + editor + '" -reuseview "%(filename)s" +line:%(line)d "%(otherfiles)s"'
+                    config.editor_transient = 'javaw.exe -jar "' + editor + '" -newplainview "%(filename)s" +line:%(line)d "%(otherfiles)s"'
+                else:
+                    config.editor = 'java -jar "' + editor + '" -reuseview "%(filename)s" +line:%(line)d "%(otherfiles)s"'
+                    config.editor_transient = 'java -jar "' + editor + '" -newplainview "%(filename)s" +line:%(line)d "%(otherfiles)s"'
+            
+        if config.editor:
+            os.environ['RENPY_EDITOR'] = config.editor
+        if config.editor_transient:
+            os.environ['RENPY_EDITOR_TRANSIENT'] = config.editor_transient
+                

launcher1/new.rpy

@@ -0,0 +1,167 @@
+label new:
+
+    python hide:
+
+        import os
+        import os.path
+        import time
+        
+
+        # Select a template.
+        
+        choices = [ (p.name, p.info["description"], p, None, False) for p in projects if p.info.get("template", None)]
+
+        template = paged_menu(u"Select a Template", choices, u"Please select a project to use as a template for your project.")
+
+        # Choose project name.
+        
+        name = prompt(u"Project Name", u"Type the name of your new project, and press enter.\n", "main")
+        name = name.strip()
+
+        error = None
+
+        if not name:
+            error = u"Please enter a non-empty project name."
+        elif os.path.exists(name):
+            error = u"A file or directory named '%s' already exists." % name
+        else:
+            try:
+                name = name.encode("ascii")
+            except:
+                error = u"Project names must be ASCII. This is because the ZIP file format does not support non-ASCII characters in a uniform way."
+                
+        if error:
+            store.error(u"Error", error, "main")
+
+        # Tell the user we're creating the project.
+        title(u"Creating Project")
+        store.message = u"Please wait while we create the project."
+        ui.pausebehavior(0)
+        interact()
+                    
+        # Here is where we actually create the project.
+
+        import shutil
+
+        shutil.copytree(template.path, name)
+
+        unlink = template.info.get("unlink", [ ])
+        unlink += [ 'launcherinfo.py' ]
+        
+        for i in unlink:
+            if os.path.exists(name + "/" + i):
+                os.unlink(name + "/" + i)
+
+        for dir, dirs, files in os.walk(name):
+            for d in list(dirs):
+                if d.startswith("."):
+                    dirs.remove(d)
+                    dn = dir + "/" + d
+                    shutil.rmtree(dn, True)
+                
+        # Change the save directory.
+        options = file(name + "/game/options.rpy").read()
+        save_dir = "%s-%d" % (name, time.time())
+        options = options.replace("template-1220804310", save_dir)
+        file(name + "/game/options.rpy", "w").write(options)
+                
+        persistent.project = name
+
+    call find_project from _call_find_project_2
+
+label choose_theme:
+
+    python hide:
+        
+        # Select a color scheme.
+        
+        themes = theme_data.keys()
+        themes.sort()
+        
+        choices = [ ]
+        for i in themes:
+
+            def hovered(i=i):
+                td = theme_data[i].copy()
+                engine = td["theme"]
+                del td["theme"]
+
+                if engine == "roundrect":
+                    renpy.style.restore(style_backup)
+                    theme.roundrect(launcher=True, **td)
+                    renpy.style.rebuild()
+                    return ("repeat", 0)
+
+            choices.append((i, None, i, hovered, False))
+
+        color_theme = paged_menu(u"Select a Theme", choices, u"Please select a color theme for your project. You can always change the colors later.", cancel='color_theme_cancel')
+
+        # Restore default theme.
+        renpy.style.restore(style_backup)
+        theme.roundrect(launcher=True)
+        renpy.style.rebuild()
+
+        ofn = project.path + "/game/options.rpy"
+
+        import os
+        import re
+
+        if not os.path.exists(ofn):
+            error(u"Changing Theme", u"The options file does not seem to exist.", "main")
+        
+        inf = file(ofn, "rU")
+        outf = file(ofn + ".new", "w")
+
+        td = theme_data[color_theme]
+
+        # TODO: Make this less specific to roundrect. Need to figure out
+        # how to switch themes, rather than just recolor them.
+
+        changing = False
+        changed = False
+        
+        for l in inf:
+
+            if re.match(r'\s*theme.roundrect\(', l):
+                changing = True
+                changed = True
+            elif re.match(r'\s*\)', l):
+                changing = False
+            elif changing:
+
+                def repl(m, td=td):
+                    return m.group(1) + m.group(2) + " = \"" + td.get(m.group(2), m.group(3)) + "\","
+
+                l = re.sub(r'^(\s*)(\w+) = "([\da-fA-F#]+)",', repl, l)
+                
+            outf.write(l)
+
+        outf.close()
+        inf.close()
+
+        try:
+            os.rename(ofn + ".new", ofn)            
+        except:
+            
+            # I hate windows.
+            os.rename(ofn, ofn + ".old")
+            os.rename(ofn + ".new", ofn)
+            os.unlink(ofn + ".old")
+            
+        if not changed:
+            error(u"Changing Theme", u"Could not modify options.rpy, perhaps it was edited too much.", "main")
+        
+    jump main
+        
+
+
+label color_theme_cancel:
+
+    python hide:
+
+        # Restore default theme.
+        renpy.style.restore(style_backup)
+        theme.roundrect(launcher=True)
+        renpy.style.rebuild()
+
+    jump main

launcher1/pefile.py

@@ -0,0 +1,343 @@
+
+# http://www.csn.ul.ie/~caolan/publink/winresdump/winresdump/doc/pefile.html
+# Contains a reasonable description of the format.
+
+import struct
+import sys
+import array
+
+# The starting point of the resource segment in the file.
+RESOURCE_BASE=0x3600
+
+# The virtual memory location the resource segment is loaded
+# to.
+RESOURCE_VIRTUAL=0x6000
+
+# The offset of the field that tells us with the alignment need be.
+ALIGNMENT_FIELD = 0x130
+
+# The start of the .rsrc segment header.
+RSRC_HEADER = 0x268
+
+# Locations in the file where we need to patch in the resource
+# segment length.
+RESOURCE_LENGTH_PATCHES = [ 0x0184, RSRC_HEADER + 0x8 ]
+
+# Locations in the file where we need to patch in the padded
+# resource segment length.
+RESOURCE_PADDED_PATCHES = [ RSRC_HEADER + 0x10 ]
+
+# Locations in the file where we need to patch in the change in the
+# size of the resource segement (and hence the change in the file's
+# total size.)
+SIZE_DELTA_PATCHES = [ 0x148 ]
+
+# A location in the file that will be checked to be sure it matches
+# RESOURCE_BASE.
+CHECK_ADDRESS = RSRC_HEADER + 0x14
+
+# A location in the file that will be checked to make sure it matches
+# RESOURCE_VIRTUAL
+CHECK_ADDRESS2 = RSRC_HEADER + 0xc
+
+# This class performs various operations on memory-loaded binary files,
+# including modifications.
+class BinFile(object):
+
+    def set_u32(self, addr, value):
+        self.a[addr+0] = (value >> 0) & 0xff
+        self.a[addr+1] = (value >> 8) & 0xff
+        self.a[addr+2] = (value >> 16) & 0xff
+        self.a[addr+3] = (value >> 24) & 0xff
+    
+    def u32(self):
+        addr = self.addr
+        rv = self.a[addr]
+        rv |= self.a[addr+1] << 8
+        rv |= self.a[addr+2] << 16
+        rv |= self.a[addr+3] << 24
+        self.addr += 4
+        return rv
+
+    def u16(self):
+        addr = self.addr
+        rv = self.a[addr]
+        rv |= self.a[addr+1] << 8
+        self.addr += 2
+        return rv
+
+    def u8(self):
+        rv = self.a[self.addr]
+        self.addr += 1
+        return rv
+
+    def name(self):
+        c = self.u16()
+
+        rv = u""
+        for i in range(c):
+            rv += unichr(self.u16())
+
+        return rv
+    
+    def seek(self, addr):
+        self.addr = addr
+
+    def tostring(self):
+        return self.a.tostring()
+
+    def substring(self, start, len):
+        return self.a[start:start+len].tostring()
+    
+    def __init__(self, fn):
+        data = open(fn, "rb").read()
+        self.a = array.array('B')
+        self.a.fromstring(data)
+
+##############################################################################
+# These functions parse data out of the file. In these functions, offset is
+# relative to the start of the file.
+
+# This parses a data block out of the resources.
+def parse_data(offset):
+    pe.seek(RESOURCE_BASE + offset)
+    data_offset = pe.u32()
+    data_len = pe.u32()
+    code_page = pe.u32()
+    pe.u32()
+
+    l = [ ]
+
+    pe.seek(data_offset + RESOURCE_BASE - RESOURCE_VIRTUAL)
+    for i in range(data_len):
+        l.append(chr(pe.u8()))
+
+    return (code_page, "".join(l))
+
+# This parses a resource directory.
+def parse_directory(offset):
+
+    pe.seek(RESOURCE_BASE + offset)
+    char = pe.u32()
+    timedate = pe.u32()
+    major = pe.u16()
+    minor = pe.u16()
+    n_named = pe.u16()
+    n_id = pe.u16()
+
+    entries = [ ]
+    
+    for i in range(n_named + n_id):
+        entries.append((pe.u32(), pe.u32()))
+
+    rv = { }
+
+    for name, value in entries:
+
+        if name & 0x80000000:
+            pe.seek((name & 0x7fffffff) + RESOURCE_BASE)
+            name = pe.name()
+
+        if value & 0x80000000:
+            value = parse_directory(value & 0x7fffffff)
+        else:
+            value = parse_data(value)
+
+        rv[name] = value
+            
+    return rv 
+
+
+##############################################################################
+# This utility function displays the tree of resources that have been loaded.
+def show_resources(d, prefix):
+
+    if not isinstance(d, dict):
+        print prefix, "Codepage", d[0], "length", len(d[1])
+        return
+        
+    for k in d:
+        print prefix, k
+        show_resources(d[k], prefix + "  ")
+
+##############################################################################
+# These functions repack the resources into a new resource segment. Here,
+# the offset is relative to the start of the resource segment.
+
+class Packer(object):
+
+    def pack(self, d):
+        self.data = ""
+        self.data_offset = 0
+
+        self.entries = ""
+        self.entries_offset = 0
+        
+        head = self.pack_dict(d, 0)
+
+        self.data = ""
+        self.data_offset = len(head) + len(self.entries)
+
+        self.entries = ""
+        self.entries_offset = len(head)
+
+        return self.pack_dict(d, 0) + self.entries + self.data
+
+
+        
+    def pack_name(self, s):
+        rv = self.data_offset + len(self.data)
+
+        l = len(s)
+        s = s.encode("utf-16le")
+        self.data += struct.pack("<H", l) + s + "\0\0"
+        
+        return rv
+
+    def pack_tuple(self, t):
+        codepage, data = t
+
+        rv = len(self.entries) + self.entries_offset        
+
+        if len(self.data) % 2:
+            self.data += "P"
+
+        daddr = len(self.data) + self.data_offset
+        
+        self.entries += struct.pack("<IIII", daddr + RESOURCE_VIRTUAL, len(data), codepage, 0)
+        self.data += data
+
+        # if len(self.data) % 1 == 1:
+        #    self.data += 'P'
+        
+        return rv
+    
+        
+        
+    
+    def pack_dict(self, d, offset):
+        name_entries = sorted((a, b) for a, b in d.iteritems() if isinstance(a, unicode))
+        id_entries = sorted((a, b) for a, b in d.iteritems() if isinstance(a, int))
+        
+        rv = struct.pack("<IIHHHH", 0, 0, 4, 0, len(name_entries), len(id_entries))
+        
+        offset += len(rv) + (len(name_entries) + len(id_entries)) * 8
+        
+        rest = ""
+        
+        for (name, value) in name_entries + id_entries:
+            if isinstance(name, unicode):
+                name = 0x80000000 | self.pack_name(name)
+
+            if isinstance(value, dict):
+                addr = offset | 0x80000000
+                packed = self.pack_dict(value, offset)
+                offset += len(packed)
+                rest += packed
+            else:
+                addr = self.pack_tuple(value)
+                
+            rv += struct.pack("<II", name, addr)
+
+        return rv + rest
+        
+##############################################################################
+# This loads in an icon file, and returns a dictionary that is suitable for
+# use in the resources of an exe file.
+def load_icon(fn):
+    f = BinFile(fn)
+
+    f.seek(0)
+    f.u16()
+    f.u16()
+    count = f.u16()
+
+    rv = { }
+    rv[3] = { }
+
+    group = struct.pack("HHH", 0, 1, count)    
+    
+    for i in range(count):
+        width = f.u8()
+        height = f.u8()
+        colors = f.u8()
+        reserved = f.u8()
+        planes = f.u16()
+        bpp = f.u16()
+        size = f.u32()
+        offset = f.u32()
+
+        addr = f.addr
+        f.seek(offset + 16)
+        if not f.u32():
+            f.set_u32(offset + 20, 0)
+            
+        rv[3][i + 1] = { 0 : (1252, f.substring(offset, size)) }
+
+
+        group += struct.pack("BBBBHHIH", width, height, colors, reserved,
+                             planes, bpp, size, i + 1)
+        
+        f.seek(addr)
+
+    rv[14] = { 1 : { 0 : (1252, group) } }
+        
+    return rv
+
+
+##############################################################################
+# This is the main function that should be called externally, that copies over
+# the icons.
+def change_icons(oldexe, icofn):
+    global pe
+    pe = BinFile(oldexe)
+
+    # Check that RESOURCE_BASE and RESOURCE_VIRTUAL are still valid.
+    pe.seek(CHECK_ADDRESS)
+    if pe.u32() != RESOURCE_BASE:
+        raise Exception("RESOURCE_BASE is no longer correct. Please check all relocations.") 
+
+    pe.seek(CHECK_ADDRESS2)
+    if pe.u32() != RESOURCE_VIRTUAL:
+        raise Exception("RESOURCE_VIRTUAL is no longer correct. Please check all relocations.")
+
+    resources = parse_directory(0)
+#    show_resources(resources, "")
+    resources.update(load_icon(icofn))
+#    show_resources(resources, "")
+    
+    rsrc = Packer().pack(resources)
+    rsrc_len = len(rsrc)
+
+    pe.seek(ALIGNMENT_FIELD)
+    alignment = pe.u32()
+
+    if len(rsrc) % alignment:
+        pad = alignment - (len(rsrc) % alignment)
+        padding = "RENPYVNE" * (pad / 8 + 1)
+        padding = padding[:pad]
+        rsrc += padding
+        
+    padded_len = len(rsrc)
+
+    for addr in RESOURCE_LENGTH_PATCHES:
+        pe.set_u32(addr, rsrc_len)
+
+    for addr in RESOURCE_PADDED_PATCHES:
+        pe.seek(addr)
+        size_delta = padded_len - pe.u32()
+        pe.set_u32(addr, padded_len)
+
+    for addr in SIZE_DELTA_PATCHES:
+        pe.seek(addr)
+        pe.set_u32(addr, pe.u32() + size_delta)
+
+        
+    return pe.tostring()[:RESOURCE_BASE] + rsrc
+    
+if __name__ == "__main__":
+
+    f = file(sys.argv[3], "wb")
+    f.write(change_icons(sys.argv[1], sys.argv[2]))
+    f.close()
+    

launcher1/themes_data.rpy

@@ -0,0 +1,244 @@
+init 1 python:
+    theme_data = {'Basic Blue': {'disabled': '#404040',
+                'disabled_text': '#c8c8c8',
+                'frame': '#6496c8',
+                'gm_root': '#dcebff',
+                'label': '#ffffff',
+                'mm_root': '#dcebff',
+                'theme': 'roundrect',
+                'widget': '#003c78',
+                'widget_hover': '#0050a0',
+                'widget_selected': '#ffffc8',
+                'widget_text': '#c8ffff'},
+ 'Bloody Mary': {'disabled': '#400000',
+                 'disabled_text': '#260000',
+                 'frame': '#400808',
+                 'gm_root': '#000000',
+                 'label': '#ffffff',
+                 'mm_root': '#000000',
+                 'theme': 'roundrect',
+                 'widget': '#000000',
+                 'widget_hover': '#830000',
+                 'widget_selected': '#ffffff',
+                 'widget_text': '#C2C2C2'},
+ 'Colorblind': {'disabled': '#898989',
+                'disabled_text': '#666666',
+                'frame': '#252525',
+                'gm_root': '#393939',
+                'label': '#c2c2c2',
+                'mm_root': '#393939',
+                'theme': 'roundrect',
+                'widget': '#898989',
+                'widget_hover': '#464646',
+                'widget_selected': '#F2F2F2',
+                'widget_text': '#CCCCCC'},
+ 'Cotton Candy': {'disabled': '#C8AFA1',
+                  'disabled_text': '#E1D4C9',
+                  'frame': '#FCF5F2',
+                  'gm_root': '#D0B4BA',
+                  'label': '#805C40',
+                  'mm_root': '#D0B4BA',
+                  'theme': 'roundrect',
+                  'widget': '#ECC7D0',
+                  'widget_hover': '#E1D4C9',
+                  'widget_selected': '#805C40',
+                  'widget_text': '#805C40'},
+ 'Creamsicle': {'disabled': '#FFECBF',
+                'disabled_text': '#ffffff',
+                'frame': '#FFECBF',
+                'gm_root': '#FDF5E3',
+                'label': '#502F13',
+                'mm_root': '#FDF5E3',
+                'theme': 'roundrect',
+                'widget': '#D96B00',
+                'widget_hover': '#FD9B1C',
+                'widget_selected': '#ffffff',
+                'widget_text': '#FCE6B1'},
+ 'Dramatic Flesh': {'disabled': '#ab6038',
+                    'disabled_text': '#BF7C51',
+                    'frame': '#49271b',
+                    'gm_root': '#2a201f',
+                    'label': '#ffffff',
+                    'mm_root': '#2a201f',
+                    'theme': 'roundrect',
+                    'widget': '#BF7C51',
+                    'widget_hover': '#dda570',
+                    'widget_selected': '#ffffff',
+                    'widget_text': '#E5DFDF'},
+ 'Easter Baby': {'disabled': '#DDE9FF',
+                 'disabled_text': '#A6AFBF',
+                 'frame': '#CCF8DC',
+                 'gm_root': '#FBF9DF',
+                 'label': '#698071',
+                 'mm_root': '#FBF9DF',
+                 'theme': 'roundrect',
+                 'widget': '#F5D4EE',
+                 'widget_hover': '#F0DDFF',
+                 'widget_selected': '#000000',
+                 'widget_text': '#698071'},
+ 'Favorite Jeans': {'disabled': '#919994',
+                    'disabled_text': '#B6BFB9',
+                    'frame': '#6f7571',
+                    'gm_root': '#b0b8ba',
+                    'label': '#ffffff',
+                    'mm_root': '#b0b8ba',
+                    'theme': 'roundrect',
+                    'widget': '#8699a7',
+                    'widget_hover': '#9eb1ad',
+                    'widget_selected': '#ffffff',
+                    'widget_text': '#dcdfd6'},
+ 'Fine China': {'disabled': '#ADB9CC',
+                'disabled_text': '#DFBA14',
+                'frame': '#ADB9CC',
+                'gm_root': '#F7F7FA',
+                'label': '#39435E',
+                'mm_root': '#F7F7FA',
+                'theme': 'roundrect',
+                'widget': '#6A7183',
+                'widget_hover': '#1A2B47',
+                'widget_selected': '#E3E3E4',
+                'widget_text': '#C9C9CB'},
+ 'First Valentines': {'disabled': '#F8F2D0',
+                      'disabled_text': '#BFA1A1',
+                      'frame': '#F8F2D0',
+                      'gm_root': '#D98989',
+                      'label': '#5D1010',
+                      'mm_root': '#D98989',
+                      'theme': 'roundrect',
+                      'widget': '#F09898',
+                      'widget_hover': '#D6C5BB',
+                      'widget_selected': '#B31E1E',
+                      'widget_text': '#593131'},
+ 'Ice Queen': {'disabled': '#F0F2F2',
+               'disabled_text': '#FBFBFB',
+               'frame': '#ffffff',
+               'gm_root': '#E6E6E6',
+               'label': '#D9D9D9',
+               'mm_root': '#E6E6E6',
+               'theme': 'roundrect',
+               'widget': '#D9D9D9',
+               'widget_hover': '#F0F2F2',
+               'widget_selected': '#737373',
+               'widget_text': '#ffffff'},
+ 'Mocha Latte': {'disabled': '#614D3A',
+                 'disabled_text': '#80654D',
+                 'frame': '#926841',
+                 'gm_root': '#1A140E',
+                 'label': '#F1EBE5',
+                 'mm_root': '#1A140E',
+                 'theme': 'roundrect',
+                 'widget': '#4D3B29',
+                 'widget_hover': '#996E45',
+                 'widget_selected': '#ffffff',
+                 'widget_text': '#B99D83'},
+ 'Muted Horror': {'disabled': '#73735C',
+                  'disabled_text': '#8C8C70',
+                  'frame': '#555544',
+                  'gm_root': '#1A0001',
+                  'label': '#1A0001',
+                  'mm_root': '#1A0001',
+                  'theme': 'roundrect',
+                  'widget': '#777777',
+                  'widget_hover': '#73735C',
+                  'widget_selected': '#000000',
+                  'widget_text': '#404033'},
+ 'Old Polaroid': {'disabled': '#A89E7D',
+                  'disabled_text': '#CCC097',
+                  'frame': '#49403E',
+                  'gm_root': '#A84A3E',
+                  'label': '#ffffff',
+                  'mm_root': '#A84A3E',
+                  'theme': 'roundrect',
+                  'widget': '#A89E7D',
+                  'widget_hover': '#8DB6B9',
+                  'widget_selected': '#ffffff',
+                  'widget_text': '#49403E'},
+ 'Really Red': {'disabled': '#404040',
+                'disabled_text': '#c8c8c8',
+                'frame': '#e17373',
+                'gm_root': '#ffd0d0',
+                'label': '#ffffff',
+                'mm_root': '#ffd0d0',
+                'theme': 'roundrect',
+                'widget': '#963232',
+                'widget_hover': '#c83232',
+                'widget_selected': '#ffffc8',
+                'widget_text': '#ffffff'},
+ 'Summer Sky': {'disabled': '#6074BF',
+                'disabled_text': '#7383BF',
+                'frame': '#6074BF',
+                'gm_root': '#B4CDD4',
+                'label': '#94C7D4',
+                'mm_root': '#B4CDD4',
+                'theme': 'roundrect',
+                'widget': '#F2E6AA',
+                'widget_hover': '#FCFCA4',
+                'widget_selected': '#1A5766',
+                'widget_text': '#7DA8B3'},
+ 'Swamp Critter': {'disabled': '#A2521D',
+                   'disabled_text': '#753D00',
+                   'frame': '#797C1C',
+                   'gm_root': '#B09D5A',
+                   'label': '#ffffff',
+                   'mm_root': '#B09B4F',
+                   'theme': 'roundrect',
+                   'widget': '#753D00',
+                   'widget_hover': '#B19A48',
+                   'widget_selected': '#ffffff',
+                   'widget_text': '#CCCAC2'},
+ 'Urban Sprawl': {'disabled': '#8F0000',
+                  'disabled_text': '#333333',
+                  'frame': '#8F0000',
+                  'gm_root': '#000000',
+                  'label': '#ffffff',
+                  'mm_root': '#000000',
+                  'theme': 'roundrect',
+                  'widget': '#333333',
+                  'widget_hover': '#000000',
+                  'widget_selected': '#ffffff',
+                  'widget_text': '#6C8A2F'},
+ 'Victorian Gingerbread': {'disabled': '#7A674F',
+                           'disabled_text': '#664F33',
+                           'frame': '#BF8A73',
+                           'gm_root': '#695640',
+                           'label': '#F2EDC4',
+                           'mm_root': '#695640',
+                           'theme': 'roundrect',
+                           'widget': '#7A674F',
+                           'widget_hover': '#BDA77D',
+                           'widget_selected': '#FDFBEE',
+                           'widget_text': '#F2EDC4'},
+ 'Watermelon Pie': {'disabled': '#FABF46',
+                    'disabled_text': '#FFE06D',
+                    'frame': '#C3CD91',
+                    'gm_root': '#F7F7C5',
+                    'label': '#FCFCD7',
+                    'mm_root': '#F7F7C5',
+                    'theme': 'roundrect',
+                    'widget': '#FFE06D',
+                    'widget_hover': '#E38A4F',
+                    'widget_selected': '#996600',
+                    'widget_text': '#FAA700'},
+ 'White Chocolate': {'disabled': '#614D3A',
+                     'disabled_text': '#80654D',
+                     'frame': '#926841',
+                     'gm_root': '#FBF9EA',
+                     'label': '#F1EBE5',
+                     'mm_root': '#FBF9EA',
+                     'theme': 'roundrect',
+                     'widget': '#33271C',
+                     'widget_hover': '#ECE7C4',
+                     'widget_selected': '#ffffff',
+                     'widget_text': '#B99D83'},
+ 'Winter Mint': {'disabled': '#426143',
+                 'disabled_text': '#819981',
+                 'frame': '#245536',
+                 'gm_root': '#e5f1e5',
+                 'label': '#ffffff',
+                 'mm_root': '#e5f1e5',
+                 'theme': 'roundrect',
+                 'widget': '#7AA27B',
+                 'widget_hover': '#A3C7A3',
+                 'widget_selected': '#ffffff',
+                 'widget_text': '#CDE0CE'}}
+

module/core.c

@@ -1000,18 +1000,18 @@ void transform32_std(PyObject *pysrc, PyObject *pydst,
 
     unsigned int amul = (int) (a * 256);
     
-    lsx = corner_x * 256;
-    lsy = corner_y * 256;
+    lsx = corner_x * 65536;
+    lsy = corner_y * 65536;
 
-    xdx *= 256;
-    ydx *= 256;
-    xdy *= 256;
-    ydy *= 256;
+    xdx *= 65536;
+    ydx *= 65536;
+    xdy *= 65536;
+    ydy *= 65536;
 
 
     // Scaled subtracted srcw and srch.
-    float fsw = (srcw - 2) * 256;
-    float fsh = (srch - 2) * 256;
+    float fsw = (srcw - 1) * 65536 - 1;
+    float fsh = (srch - 1) * 65536 - 1;
 
     for (y = 0; y < dsth; y++, lsx += xdy, lsy += ydy) {
 
@@ -1058,7 +1058,7 @@ void transform32_std(PyObject *pysrc, PyObject *pydst,
 
         sx = lsx + minx * xdx;
         sy = lsy + minx * ydx;
-                
+
         int sxi = (int) sx;
         int syi = (int) sy;
         int xdxi = (int) xdx;
@@ -1066,13 +1066,13 @@ void transform32_std(PyObject *pysrc, PyObject *pydst,
 
         while (d <= dend) {
             int px, py;
-            px = sxi >> 8;
-            py = syi >> 8;
+            px = sxi >> 16;
+            py = syi >> 16;
                 
             unsigned char *sp = srcpixels + py * srcpitch + px * 4;
 
-            int yfrac = syi & 0xff; // ((short) sy) & 0xff;
-            int xfrac = sxi & 0xff; // ((short) sx) & 0xff;
+            int yfrac = (syi >> 8) & 0xff; // ((short) sy) & 0xff;
+            int xfrac = (sxi >> 8) & 0xff; // ((short) sx) & 0xff;
 
             unsigned int pal = *(unsigned int *) sp;
             unsigned int pbl = *(unsigned int *) (sp + 4);
@@ -1164,17 +1164,17 @@ int transform32_mmx(PyObject *pysrc, PyObject *pydst,
     // Compute the coloring multiplier.
     unsigned int amul = (unsigned int) (a * 256);
     
-    lsx = corner_x * 256;
-    lsy = corner_y * 256;
+    lsx = corner_x * 65536;
+    lsy = corner_y * 65536;
 
-    xdx *= 256;
-    ydx *= 256;
-    xdy *= 256;
-    ydy *= 256;
+    xdx *= 65536;
+    ydx *= 65536;
+    xdy *= 65536;
+    ydy *= 65536;
 
     // Scaled subtracted srcw and srch.
-    float fsw = (srcw - 2) * 256;
-    float fsh = (srch - 2) * 256;
+    float fsw = (srcw - 1) * 65536 - 1;
+    float fsh = (srch - 1) * 65536 - 1;
 
     for (y = 0; y < dsth; y++, lsx += xdy, lsy += ydy) {
 
@@ -1235,13 +1235,13 @@ int transform32_mmx(PyObject *pysrc, PyObject *pydst,
         
         while (d <= dend) {
 
-            px = sxi >> 8;
-            py = syi >> 8;
+            px = sxi >> 16;
+            py = syi >> 16;
 
             unsigned char *sp = srcpixels + py * srcpitch + px * 4;
 
-            unsigned int yfrac = syi & 0xff; // ((short) sy) & 0xff;
-            unsigned int xfrac = sxi & 0xff; // ((short) sx) & 0xff;
+            unsigned int yfrac = (syi >> 8) & 0xff; // ((short) sy) & 0xff;
+            unsigned int xfrac = (sxi >> 8) & 0xff; // ((short) sx) & 0xff;
 
             // Put xfrac in mm5, yfrac in m6
             pxor_r2r(mm5, mm5);

module/pss.c

@@ -111,9 +111,6 @@ struct Channel {
     /* The queued up sample. */
     struct VideoState *queued;    
 
-    /* A sample that's dying, and needs to be deallocated. */
-    struct VideoState *dying;
-    
     /* The name of the queued up sample. */
     PyObject *queued_name;
 
@@ -172,6 +169,13 @@ struct Channel {
     unsigned int vol2_done;
 };
 
+struct Dying {
+    struct VideoState *stream;
+    struct Dying *next;
+};
+
+static struct Dying *dying = NULL;
+
 /*
  * The number of channels the system knows about.
  */
@@ -443,10 +447,15 @@ static void callback(void *userdata, Uint8 *stream, int length) {
             if (c->stop_bytes == 0 || bytes == 0) {
 
                 int old_tight = c->playing_tight;
-
+                struct Dying *d;
+                
                 post_event(c);
 
-                c->dying = c->playing;
+                d = malloc(sizeof(struct Dying));
+                d->next = dying;
+                d->stream = c->playing;
+                dying = d;
+                
                 decref(c->playing_name);
 
                 c->playing = c->queued;
@@ -491,7 +500,6 @@ static int check_channel(int c) {
             channels[i].queued = NULL;
             channels[i].playing_name = NULL;
             channels[i].queued_name = NULL;
-            channels[i].dying = NULL;
             channels[i].volume = SDL_MIX_MAXVOLUME;        
             channels[i].paused = 1;
             channels[i].event = 0;
@@ -1089,14 +1097,20 @@ void PSS_periodic() {
 
     int i;
 
-    for (i = 0; i < num_channels; i++) {
-        if (channels[i].dying) {
-            ENTER();
-            ffpy_stream_close(channels[i].dying);
-            channels[i].dying = NULL;
-            EXIT();
-        }
+    if (!dying) {
+        return;
     }
+
+    ENTER();
+    
+    while (dying) {
+        struct Dying *d = dying;
+        ffpy_stream_close(d->stream);
+        dying = d->next;
+        free(d);
+    }
+    
+    EXIT();
 }
 
 /* This should be called in response to an FF_ALLOC_EVENT, with a pygame

module/setup.py

@@ -14,6 +14,7 @@ except:
 # These control the level of optimization versus debugging.
 extra_compile_args = [ "-O3", "-funroll-loops" ]
 # extra_compile_args = [ "-O0", "-ggdb" ]
+# extra_compile_args = [ "-O0", "-gstabs" ]
 
 
 # This environment variable should have the full path to the installed

renpy.pot

@@ -0,0 +1,877 @@
+# Ren'Py Visual Novel Engine
+# Copyright (C) 2009 PyTom <pytom@bishoujo.us>
+# This file is distributed under the same license as the Ren'Py package.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: mainline\n"
+"Report-Msgid-Bugs-To: PyTom <pytom@bishoujo.us>\n"
+"POT-Creation-Date: 2009-06-27 23:09-0400\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: 8bit\n"
+
+
+#: common/00developer.rpy:18
+#, python-format
+msgid "Developer Menu"
+msgstr ""
+
+#: common/00developer.rpy:190 common/00developer.rpy:78
+#, python-format
+msgid "Return to the developer menu"
+msgstr ""
+
+#: common/00library.rpy:221
+#, python-format
+msgid "Skip Mode"
+msgstr ""
+
+#: common/00library.rpy:224
+#, python-format
+msgid "Fast Skip Mode"
+msgstr ""
+
+#: common/00library.rpy:307
+#, python-format
+msgid "While Ren'Py games may be playable without the renpy module, some features may be disabled. For more information, read the module/README.txt file or go to http://www.bishoujo.us/renpy/."
+msgstr ""
+
+#: common/00library.rpy:310
+#, python-format
+msgid "renpy module not found."
+msgstr ""
+
+#: common/00library.rpy:311
+#, python-format
+msgid "The renpy module could not be loaded on your system."
+msgstr ""
+
+#: common/00library.rpy:313
+#, python-format
+msgid "Old renpy module found."
+msgstr ""
+
+#: common/00library.rpy:314
+#, python-format
+msgid "An old version (%d) of the Ren'Py module was found on your system, while this game requires version %d."
+msgstr ""
+
+#: common/00library.rpy:498
+#, python-format
+msgid "Please click to continue."
+msgstr ""
+
+#: common/00menus.rpy:14 common/_compat/mainmenu.rpym:7
+#, python-format
+msgid "Start Game"
+msgstr ""
+
+#: common/00menus.rpy:15 common/00menus.rpy:25 common/_compat/gamemenu.rpym:13
+#, python-format
+msgid "Load Game"
+msgstr ""
+
+#: common/00menus.rpy:16 common/00menus.rpy:23 common/_compat/gamemenu.rpym:11 common/_compat/mainmenu.rpym:9
+#, python-format
+msgid "Preferences"
+msgstr ""
+
+#: common/00menus.rpy:17 common/00menus.rpy:27
+#, python-format
+msgid "Help"
+msgstr ""
+
+#: common/00menus.rpy:18 common/00menus.rpy:28 common/_compat/gamemenu.rpym:15 common/_compat/mainmenu.rpym:10
+#, python-format
+msgid "Quit"
+msgstr ""
+
+#: common/00menus.rpy:22 common/_compat/gamemenu.rpym:9 launcher2/archiver.rpy:170 launcher2/distribute.rpy:534 launcher2/interface.rpy:189
+#, python-format
+msgid "Return"
+msgstr ""
+
+#: common/00menus.rpy:24 common/_compat/gamemenu.rpym:12
+#, python-format
+msgid "Save Game"
+msgstr ""
+
+#: common/00menus.rpy:26 common/_compat/gamemenu.rpym:14
+#, python-format
+msgid "Main Menu"
+msgstr ""
+
+#: common/00menus.rpy:34 common/_compat/gamemenu.rpym:427
+#, python-format
+msgid "Are you sure you want to quit?"
+msgstr ""
+
+#: common/00menus.rpy:40 common/_compat/gamemenu.rpym:439
+#, python-format
+msgid "Are you sure you want to return to the main menu?\nThis will lose unsaved progress."
+msgstr ""
+
+#: common/_compat/gamemenu.rpym:10 common/_layout/classic_preferences.rpym:65 common/_layout/classic_preferences_common.rpym:339 common/_layout/one_column_preferences.rpym:52 common/_layout/two_column_preferences.rpym:59
+#, python-format
+msgid "Begin Skipping"
+msgstr ""
+
+#: common/_compat/gamemenu.rpym:177 common/_layout/classic_load_save.rpym:115 common/_layout/imagemap_load_save.rpym:95 common/_layout/scrolling_load_save.rpym:171
+#, python-format
+msgid "Empty Slot."
+msgstr ""
+
+#: common/_compat/gamemenu.rpym:334 common/_layout/classic_load_save.rpym:250
+#, python-format
+msgid "Previous"
+msgstr ""
+
+#: common/_compat/gamemenu.rpym:341 common/_layout/classic_load_save.rpym:257
+#, python-format
+msgid "Next"
+msgstr ""
+
+#: common/_compat/gamemenu.rpym:412 common/_layout/classic_yesno_prompt.rpym:46 launcher2/interface.rpy:223
+#, python-format
+msgid "Yes"
+msgstr ""
+
+#: common/_compat/gamemenu.rpym:413 common/_layout/classic_yesno_prompt.rpym:47 launcher2/interface.rpy:224
+#, python-format
+msgid "No"
+msgstr ""
+
+#: common/_compat/gamemenu.rpym:464 common/_layout/classic_load_save.rpym:328 common/_layout/imagemap_load_save.rpym:325 common/_layout/scrolling_load_save.rpym:214
+#, python-format
+msgid "Loading will lose unsaved progress.\nAre you sure you want to do this?"
+msgstr ""
+
+#: common/_compat/gamemenu.rpym:478 common/_layout/classic_load_save.rpym:314 common/_layout/imagemap_load_save.rpym:312 common/_layout/scrolling_load_save.rpym:200
+#, python-format
+msgid "Are you sure you want to overwrite your save?"
+msgstr ""
+
+#: common/_compat/gamemenu.rpym:494
+#, python-format
+msgid "The error message was:"
+msgstr ""
+
+#: common/_compat/gamemenu.rpym:496
+#, python-format
+msgid "You may want to try saving in a different slot, or playing for a while and trying again later."
+msgstr ""
+
+#: common/_compat/gamemenu.rpym:498
+#, python-format
+msgid "Save Failed."
+msgstr ""
+
+#: common/_compat/mainmenu.rpym:8
+#, python-format
+msgid "Continue Game"
+msgstr ""
+
+#: common/_compat/preferences.rpym:225 common/_layout/classic_preferences_common.rpym:179 common/_layout/classic_preferences_common.rpym:190 launcher2/choose_theme.rpy:228
+#, python-format
+msgid "Test"
+msgstr ""
+
+#: common/_compat/preferences.rpym:34 common/_layout/classic_joystick_preferences.rpym:32
+#, python-format
+msgid "Left"
+msgstr ""
+
+#: common/_compat/preferences.rpym:35 common/_layout/classic_joystick_preferences.rpym:33
+#, python-format
+msgid "Right"
+msgstr ""
+
+#: common/_compat/preferences.rpym:36 common/_layout/classic_joystick_preferences.rpym:34
+#, python-format
+msgid "Up"
+msgstr ""
+
+#: common/_compat/preferences.rpym:37 common/_layout/classic_joystick_preferences.rpym:35
+#, python-format
+msgid "Down"
+msgstr ""
+
+#: common/_compat/preferences.rpym:377 common/_compat/preferences.rpym:428 common/_layout/classic_joystick_preferences.rpym:51 common/_layout/classic_joystick_preferences.rpym:93
+#, python-format
+msgid "Not Assigned"
+msgstr ""
+
+#: common/_compat/preferences.rpym:38 common/_layout/classic_joystick_preferences.rpym:36
+#, python-format
+msgid "Select/Dismiss"
+msgstr ""
+
+#: common/_compat/preferences.rpym:39 common/_layout/classic_joystick_preferences.rpym:37
+#, python-format
+msgid "Rollback"
+msgstr ""
+
+#: common/_compat/preferences.rpym:40 common/_layout/classic_joystick_preferences.rpym:38
+#, python-format
+msgid "Hold to Skip"
+msgstr ""
+
+#: common/_compat/preferences.rpym:408 common/_layout/classic_joystick_preferences.rpym:73
+#, python-format
+msgid "Joystick Mapping"
+msgstr ""
+
+#: common/_compat/preferences.rpym:409 common/_layout/classic_joystick_preferences.rpym:74
+#, python-format
+msgid "Move the joystick or press a joystick button to create the mapping. Click the mouse to remove the mapping."
+msgstr ""
+
+#: common/_compat/preferences.rpym:41 common/_layout/classic_joystick_preferences.rpym:39
+#, python-format
+msgid "Toggle Skip"
+msgstr ""
+
+#: common/_compat/preferences.rpym:42 common/_layout/classic_joystick_preferences.rpym:40
+#, python-format
+msgid "Hide Text"
+msgstr ""
+
+#: common/_compat/preferences.rpym:43 common/_layout/classic_joystick_preferences.rpym:41
+#, python-format
+msgid "Menu"
+msgstr ""
+
+#: common/_compat/preferences.rpym:482 common/_compat/preferences.rpym:557 common/_layout/classic_preferences.rpym:57 common/_layout/classic_preferences_common.rpym:321 common/_layout/one_column_preferences.rpym:49 common/_layout/two_column_preferences.rpym:56 launcher2/choose_theme.rpy:208
+#, python-format
+msgid "Display"
+msgstr ""
+
+#: common/_compat/preferences.rpym:483 common/_layout/classic_preferences_common.rpym:322 launcher2/choose_theme.rpy:209
+#, python-format
+msgid "Window"
+msgstr ""
+
+#: common/_compat/preferences.rpym:484 common/_layout/classic_preferences_common.rpym:323 launcher2/choose_theme.rpy:210
+#, python-format
+msgid "Fullscreen"
+msgstr ""
+
+#: common/_compat/preferences.rpym:487 common/_compat/preferences.rpym:558 common/_layout/classic_preferences.rpym:58 common/_layout/classic_preferences_common.rpym:326 common/_layout/one_column_preferences.rpym:50 common/_layout/two_column_preferences.rpym:57
+#, python-format
+msgid "Transitions"
+msgstr ""
+
+#: common/_compat/preferences.rpym:488 common/_layout/classic_preferences_common.rpym:327
+#, python-format
+msgid "All"
+msgstr ""
+
+#: common/_compat/preferences.rpym:489 common/_layout/classic_preferences_common.rpym:328
+#, python-format
+msgid "Some"
+msgstr ""
+
+#: common/_compat/preferences.rpym:490 common/_layout/classic_preferences_common.rpym:329
+#, python-format
+msgid "None"
+msgstr ""
+
+#: common/_compat/preferences.rpym:495 common/_compat/preferences.rpym:563 common/_layout/classic_preferences.rpym:64 common/_layout/classic_preferences_common.rpym:334 common/_layout/one_column_preferences.rpym:51 common/_layout/two_column_preferences.rpym:58
+#, python-format
+msgid "Skip"
+msgstr ""
+
+#: common/_compat/preferences.rpym:496 common/_layout/classic_preferences_common.rpym:335
+#, python-format
+msgid "Seen Messages"
+msgstr ""
+
+#: common/_compat/preferences.rpym:497 common/_layout/classic_preferences_common.rpym:336
+#, python-format
+msgid "All Messages"
+msgstr ""
+
+#: common/_compat/preferences.rpym:504 common/_compat/preferences.rpym:564 common/_layout/classic_preferences.rpym:66 common/_layout/classic_preferences_common.rpym:345 common/_layout/one_column_preferences.rpym:53 common/_layout/two_column_preferences.rpym:60
+#, python-format
+msgid "After Choices"
+msgstr ""
+
+#: common/_compat/preferences.rpym:505 common/_layout/classic_preferences_common.rpym:346
+#, python-format
+msgid "Stop Skipping"
+msgstr ""
+
+#: common/_compat/preferences.rpym:506 common/_layout/classic_preferences_common.rpym:347
+#, python-format
+msgid "Keep Skipping"
+msgstr ""
+
+#: common/_compat/preferences.rpym:526 common/_compat/preferences.rpym:565 common/_layout/classic_preferences.rpym:59 common/_layout/classic_preferences_common.rpym:352 common/_layout/one_column_preferences.rpym:54 common/_layout/two_column_preferences.rpym:61
+#, python-format
+msgid "Text Speed"
+msgstr ""
+
+#: common/_compat/preferences.rpym:544 common/_compat/preferences.rpym:566 common/_layout/classic_preferences.rpym:67 common/_layout/classic_preferences_common.rpym:353 common/_layout/one_column_preferences.rpym:55 common/_layout/two_column_preferences.rpym:62
+#, python-format
+msgid "Auto-Forward Time"
+msgstr ""
+
+#: common/_compat/preferences.rpym:549 common/_compat/preferences.rpym:570 common/_layout/classic_preferences.rpym:71 common/_layout/classic_preferences_common.rpym:357 common/_layout/one_column_preferences.rpym:56 common/_layout/two_column_preferences.rpym:66
+#, python-format
+msgid "Music Volume"
+msgstr ""
+
+#: common/_compat/preferences.rpym:550 common/_compat/preferences.rpym:571 common/_layout/classic_preferences.rpym:72 common/_layout/classic_preferences_common.rpym:360 common/_layout/one_column_preferences.rpym:57 common/_layout/two_column_preferences.rpym:67
+#, python-format
+msgid "Sound Volume"
+msgstr ""
+
+#: common/_compat/preferences.rpym:552 common/_compat/preferences.rpym:559 common/_layout/classic_preferences.rpym:60 common/_layout/classic_preferences_common.rpym:370 common/_layout/one_column_preferences.rpym:59 common/_layout/two_column_preferences.rpym:69
+#, python-format
+msgid "Joystick..."
+msgstr ""
+
+#: common/_compat/preferences.rpym:554 common/_compat/preferences.rpym:575
+#, python-format
+msgid "Joystick Configuration"
+msgstr ""
+
+#: common/_compat/preferences.rpym:580 common/_layout/classic_preferences.rpym:73 common/_layout/classic_preferences_common.rpym:364 common/_layout/one_column_preferences.rpym:58 common/_layout/two_column_preferences.rpym:68
+#, python-format
+msgid "Voice Volume"
+msgstr ""
+
+#: common/_layout/classic_load_save.rpym:126
+#, python-format
+msgid "Auto"
+msgstr ""
+
+#: common/_layout/classic_load_save.rpym:129
+#, python-format
+msgid "Quick"
+msgstr ""
+
+#: launcher2/archiver.rpy:135
+#, python-format
+msgid "The patterns did not match any files, so no archive was created."
+msgstr ""
+
+#: launcher2/archiver.rpy:138
+#, python-format
+msgid "Archiving Files..."
+msgstr ""
+
+#: launcher2/archiver.rpy:165 launcher2/distribute.rpy:529
+#, python-format
+msgid "Success"
+msgstr ""
+
+#: launcher2/archiver.rpy:166
+#, python-format
+msgid "The files have been added to the archive, and moved into the \"archived\" directory. Future runs of the archiver will archive files in both the \"game\" and \"archived\" directories."
+msgstr ""
+
+#: launcher2/archiver.rpy:30
+#, python-format
+msgid "Archive Name:"
+msgstr ""
+
+#: launcher2/archiver.rpy:31
+#, python-format
+msgid "The name of the archive to create."
+msgstr ""
+
+#: launcher2/archiver.rpy:33
+#, python-format
+msgid "Include Patterns:"
+msgstr ""
+
+#: launcher2/archiver.rpy:34
+#, python-format
+msgid "Files matching these patterns are included in the archive."
+msgstr ""
+
+#: launcher2/archiver.rpy:36
+#, python-format
+msgid "Exclude Patterns:"
+msgstr ""
+
+#: launcher2/archiver.rpy:37
+#, python-format
+msgid "Files matching these patterns are excluded from the archive."
+msgstr ""
+
+#: launcher2/archiver.rpy:41
+#, python-format
+msgid "Archive"
+msgstr ""
+
+#: launcher2/archiver.rpy:41
+#, python-format
+msgid "Build the archive."
+msgstr ""
+
+#: launcher2/archiver.rpy:42 launcher2/distribute.rpy:304 launcher2/interface.rpy:159
+#, python-format
+msgid "Cancel"
+msgstr ""
+
+#: launcher2/archiver.rpy:50
+#, python-format
+msgid "Archive Name"
+msgstr ""
+
+#: launcher2/archiver.rpy:51
+#, python-format
+msgid "The name of the archive file to create, without the .rpa extension.\n\nThe \"data\" archive is loaded automatically. Other archives must be added to config.archives."
+msgstr ""
+
+#: launcher2/archiver.rpy:56 launcher2/archiver.rpy:62
+#, python-format
+msgid "Include Patterns"
+msgstr ""
+
+#: launcher2/archiver.rpy:57
+#, python-format
+msgid "This is a space-separated list of file patterns. Files matching these patterns are added to the archive.\n\nAsterisks (*) can be used as a wildcard."
+msgstr ""
+
+#: launcher2/archiver.rpy:63
+#, python-format
+msgid "This is a space-separated list of file patterns. Files matching these patterns are excluded from the archive. If a file is matched by both an exclude and include pattern, the exclude takes precedence.\n\nAsterisks (*) can be used as a wildcard."
+msgstr ""
+
+#: launcher2/archiver.rpy:98
+#, python-format
+msgid "Scanning Files..."
+msgstr ""
+
+#: launcher2/choose_theme.rpy:155
+#, python-format
+msgid "Could not modify options.rpy. Perhaps it was changed too much."
+msgstr ""
+
+#: launcher2/choose_theme.rpy:157
+#, python-format
+msgid "Theme changed to %s."
+msgstr ""
+
+#: launcher2/choose_theme.rpy:211
+#, python-format
+msgid "Planetarium"
+msgstr ""
+
+#: launcher2/choose_theme.rpy:245
+#, python-format
+msgid "The options.rpy file does not exist in the game directory, so this launcher cannot change the theme."
+msgstr ""
+
+#: launcher2/choose_theme.rpy:254
+#, python-format
+msgid "Themes control the basic look of interface elements. You'll be able to pick a color scheme next."
+msgstr ""
+
+#: launcher2/choose_theme.rpy:258 launcher2/script.rpy:45
+#, python-format
+msgid "Choose Theme"
+msgstr ""
+
+#: launcher2/choose_theme.rpy:296
+#, python-format
+msgid "Please choose a color scheme for your project."
+msgstr ""
+
+#: launcher2/choose_theme.rpy:303
+#, python-format
+msgid "Choose Color Scheme"
+msgstr ""
+
+#: launcher2/distribute.rpy:270
+#, python-format
+msgid "Base Name:"
+msgstr ""
+
+#: launcher2/distribute.rpy:271
+#, python-format
+msgid "Used to generate the names of directories and archive files."
+msgstr ""
+
+#: launcher2/distribute.rpy:273
+#, python-format
+msgid "Executable Name:"
+msgstr ""
+
+#: launcher2/distribute.rpy:274
+#, python-format
+msgid "Used to generate the names of executables and runnable programs."
+msgstr ""
+
+#: launcher2/distribute.rpy:276
+#, python-format
+msgid "Ignore Extensions:"
+msgstr ""
+
+#: launcher2/distribute.rpy:277
+#, python-format
+msgid "Files with these extensions will not be included in the distributions."
+msgstr ""
+
+#: launcher2/distribute.rpy:279
+#, python-format
+msgid "Documentation Extensions:"
+msgstr ""
+
+#: launcher2/distribute.rpy:280
+#, python-format
+msgid "Files with these extensions will be treated as documentation, when building the Macintosh application."
+msgstr ""
+
+#: launcher2/distribute.rpy:282
+#, python-format
+msgid "Distributions to Build:"
+msgstr ""
+
+#: launcher2/distribute.rpy:285
+#, python-format
+msgid "Windows x86"
+msgstr ""
+
+#: launcher2/distribute.rpy:286
+#, python-format
+msgid "Zip distribution for the 32-bit Windows platform."
+msgstr ""
+
+#: launcher2/distribute.rpy:289
+#, python-format
+msgid "Linux x86"
+msgstr ""
+
+#: launcher2/distribute.rpy:290
+#, python-format
+msgid "Tar.Bz2 distribution for the Linux x86 platform."
+msgstr ""
+
+#: launcher2/distribute.rpy:293
+#, python-format
+msgid "Macintosh Universal"
+msgstr ""
+
+#: launcher2/distribute.rpy:294
+#, python-format
+msgid "Single application distribution for the Macintosh x86 and ppc platforms."
+msgstr ""
+
+#: launcher2/distribute.rpy:297
+#, python-format
+msgid "Windows/Linux/Mac Combined"
+msgstr ""
+
+#: launcher2/distribute.rpy:298
+#, python-format
+msgid "Zip distribution for the Windows x86, Linux x86, Macintosh x86 and Macintosh ppc platforms."
+msgstr ""
+
+#: launcher2/distribute.rpy:303
+#, python-format
+msgid "Build"
+msgstr ""
+
+#: launcher2/distribute.rpy:303
+#, python-format
+msgid "Start building the distributions."
+msgstr ""
+
+#: launcher2/distribute.rpy:321
+#, python-format
+msgid "Base Name"
+msgstr ""
+
+#: launcher2/distribute.rpy:322
+#, python-format
+msgid "Please enter in the base name for your distribution. This name is used to generate the names of directories and archive files. Usually, this is the name of your game, plus a version number, like \"moonlight-1.0\"."
+msgstr ""
+
+#: launcher2/distribute.rpy:328
+#, python-format
+msgid "Executable Name"
+msgstr ""
+
+#: launcher2/distribute.rpy:329
+#, python-format
+msgid "Please enter a name for the executables in your distribution. This should not include an extension, as that will be added automatically."
+msgstr ""
+
+#: launcher2/distribute.rpy:335
+#, python-format
+msgid "Ignore Extensions"
+msgstr ""
+
+#: launcher2/distribute.rpy:336
+#, python-format
+msgid "Please enter a space-separated list of file extensions. Files with these extensions will not be included in the built distributions."
+msgstr ""
+
+#: launcher2/distribute.rpy:342
+#, python-format
+msgid "Documentation Extensions"
+msgstr ""
+
+#: launcher2/distribute.rpy:343
+#, python-format
+msgid "Please enter a space separated list of documentation extensions. Files in the base directory with these extensions will have a second copy stored outside of the Macintosh application."
+msgstr ""
+
+#: launcher2/distribute.rpy:368
+#, python-format
+msgid "Scanning..."
+msgstr ""
+
+#: launcher2/distribute.rpy:476
+#, python-format
+msgid "Building Windows..."
+msgstr ""
+
+#: launcher2/distribute.rpy:483
+#, python-format
+msgid "Building Linux..."
+msgstr ""
+
+#: launcher2/distribute.rpy:510
+#, python-format
+msgid "Building Macintosh..."
+msgstr ""
+
+#: launcher2/distribute.rpy:518
+#, python-format
+msgid "Building Combined..."
+msgstr ""
+
+#: launcher2/distribute.rpy:524
+#, python-format
+msgid "Thank you for choosing Ren'Py."
+msgstr ""
+
+#: launcher2/distribute.rpy:530
+#, python-format
+msgid "The distributions have been built. Be sure to test them before release.\n\nNote that unpacking and repacking the Macintosh, Linux, or Combined distributions on Windows is not supported.\n\nPlease announce your release at the {a=http://lemmasoft.renai.us/forums/}Lemma Soft Forums{/a}, so we can add it to the Ren'Py web site."
+msgstr ""
+
+#: launcher2/interface.rpy:179
+#, python-format
+msgid "Error"
+msgstr ""
+
+#: launcher2/interface.rpy:237
+#, python-format
+msgid "Press enter when done."
+msgstr ""
+
+#: launcher2/interface.rpy:255
+#, python-format
+msgid "The string cannot be empty. Please enter some text."
+msgstr ""
+
+#: launcher2/interface.rpy:26
+#, python-format
+msgid "Welcome!"
+msgstr ""
+
+#: launcher2/interface.rpy:264
+#, python-format
+msgid "Non-ASCII filenames are not allowed. This is because Zip files cannot reliably represent non-ASCII filenames."
+msgstr ""
+
+#: launcher2/interface.rpy:292
+#, python-format
+msgid "Processed %d of %d files."
+msgstr ""
+
+#: launcher2/options.rpy:26
+#, python-format
+msgid "%s Launcher"
+msgstr ""
+
+#: launcher2/project.rpy:173 launcher2/script.rpy:67
+#, python-format
+msgid "Select Project"
+msgstr ""
+
+#: launcher2/project.rpy:201
+#, python-format
+msgid "%s has been launched."
+msgstr ""
+
+#: launcher2/project.rpy:221
+#, python-format
+msgid "Opening game directory:\n%s"
+msgstr ""
+
+#: launcher2/project.rpy:244
+#, python-format
+msgid "No files to edit."
+msgstr ""
+
+#: launcher2/project.rpy:247
+#, python-format
+msgid "Launching the editor failed. You may need Java, which can be downloaded for free from {a=http://www.java.com}java.com{/a}."
+msgstr ""
+
+#: launcher2/project.rpy:249
+#, python-format
+msgid "Launched editor with %d script files."
+msgstr ""
+
+#: launcher2/project.rpy:282
+#, python-format
+msgid "Lint complete."
+msgstr ""
+
+#: launcher2/project.rpy:292
+#, python-format
+msgid "Deleting persistent data."
+msgstr ""
+
+#: launcher2/project.rpy:292 launcher2/script.rpy:49
+#, python-format
+msgid "Delete Persistent"
+msgstr ""
+
+#: launcher2/project.rpy:301
+#, python-format
+msgid "Persistent data has been deleted."
+msgstr ""
+
+#: launcher2/script.rpy:113
+#, python-format
+msgid "Now showing the Ren'Py documentation in your web browser."
+msgstr ""
+
+#: launcher2/script.rpy:28
+#, python-format
+msgid "Launch"
+msgstr ""
+
+#: launcher2/script.rpy:30
+#, python-format
+msgid "Launches the project."
+msgstr ""
+
+#: launcher2/script.rpy:32
+#, python-format
+msgid "Edit Script"
+msgstr ""
+
+#: launcher2/script.rpy:34
+#, python-format
+msgid "Edits the script of the project."
+msgstr ""
+
+#: launcher2/script.rpy:36
+#, python-format
+msgid "Game Directory"
+msgstr ""
+
+#: launcher2/script.rpy:38
+#, python-format
+msgid "Opens the project's game directory."
+msgstr ""
+
+#: launcher2/script.rpy:40
+#, python-format
+msgid "Check Script (Lint)"
+msgstr ""
+
+#: launcher2/script.rpy:42
+#, python-format
+msgid "Checks the script of the project for likely errors."
+msgstr ""
+
+#: launcher2/script.rpy:47
+#, python-format
+msgid "Changes the theme used by the project."
+msgstr ""
+
+#: launcher2/script.rpy:51
+#, python-format
+msgid "Deletes the persistent data associated with the project."
+msgstr ""
+
+#: launcher2/script.rpy:53
+#, python-format
+msgid "Archive Files"
+msgstr ""
+
+#: launcher2/script.rpy:55
+#, python-format
+msgid "Archives files found in the game and archived directories."
+msgstr ""
+
+#: launcher2/script.rpy:57
+#, python-format
+msgid "Build Distributions"
+msgstr ""
+
+#: launcher2/script.rpy:59
+#, python-format
+msgid "Builds distributions of the project."
+msgstr ""
+
+#: launcher2/script.rpy:69
+#, python-format
+msgid "Select a project to work with."
+msgstr ""
+
+#: launcher2/script.rpy:71
+#, python-format
+msgid "New Project"
+msgstr ""
+
+#: launcher2/script.rpy:73
+#, python-format
+msgid "Create a new project."
+msgstr ""
+
+#: launcher2/script.rpy:81
+#, python-format
+msgid "Project Directory"
+msgstr ""
+
+#: launcher2/script.rpy:83
+#, python-format
+msgid "Select the directory in which the project can be found."
+msgstr ""
+
+#: launcher2/script.rpy:85
+#, python-format
+msgid "Select Editor"
+msgstr ""
+
+#: launcher2/script.rpy:87
+#, python-format
+msgid "Select the text editor to use."
+msgstr ""
+
+#: launcher2/script.rpy:89
+#, python-format
+msgid "Add-ons"
+msgstr ""
+
+#: launcher2/script.rpy:91
+#, python-format
+msgid "Download additional components for use with Ren'Py."
+msgstr ""
+
+#: launcher2/script.rpy:93
+#, python-format
+msgid "Ren'Py Help"
+msgstr ""
+
+#: launcher2/script.rpy:95
+#, python-format
+msgid "Open the Ren'Py documentation in a web browser."
+msgstr ""

renpy.py

@@ -37,10 +37,24 @@ def path_to_common(renpy_base):
 # the path to a directory that will hold save files.
 def path_to_saves(gamedir):
     import renpy
-
+    
     if not renpy.config.save_directory:
         return gamedir + "/saves"
 
+    # Search the path above Ren'Py for a directory named "Ren'Py Data".
+    # If it exists, then use that for our save directory.
+    path = renpy.config.renpy_base
+
+    while True:
+        if os.path.isdir(path + "/Ren'Py Data"):
+            return path + "/Ren'Py Data/" + renpy.config.save_directory
+
+        newpath = os.path.dirname(path)
+        if path == newpath:
+            break
+        path = newpath
+
+    # Otherwise, put the saves in a standard place.
     if platform.mac_ver()[0]:
         rv = "~/Library/RenPy/" + renpy.config.save_directory
         return os.path.expanduser(rv)
@@ -68,8 +82,8 @@ def path_to_renpy_base():
 ##############################################################################
 
 # The version of the Mac Launcher and py4renpy that we use.
-macos_version = (6, 9, 1)
-linux_version = (6, 9, 1)
+macos_version = (6, 9, 3)
+linux_version = (6, 9, 3)
 
 if __name__ == "__main__":
 

renpy/__init__.py

@@ -27,7 +27,7 @@
 # ***** ***** ***** ***** ***** ***** **** ***** ***** ***** *****
 # Be sure to change script_version in launcher/script_version.rpy, too!
 # Also check to see if we have to update renpy.py.
-version = "Ren'Py 6.9.1d"
+version = "Ren'Py 6.9.3b"
 script_version = 5003000
 savegame_suffix = "-LT1.save"
 

renpy/audio/audio.py

@@ -240,6 +240,11 @@ class Channel(object):
 
         # Is this channel tight?
         self.tight = tight
+
+        # The number of items in the queue that should be kept
+        # on queue clear.
+        self.keep_queue = 0
+
         
         if default_loop is None:
             # By default, should we loop the music?
@@ -340,14 +345,18 @@ class Channel(object):
                 break
 
             # Otherwise, we might be able to enqueue something.
-            topq = self.queue[0]
+            topq = self.queue.pop(0)
 
-            # At this point, we've decided to try to play
-            # top. So let's see how far we can get.
-
-            # Update the queue
-            self.queue = self.queue[1:]
+            # Blacklist of old file formats we used to support, but we now
+            # ignore.
+            lfn = topq.filename.lower()
+            for i in (".mod", ".xm", ".mid", ".midi"):
+                if lfn.endswith(i):
+                    topq = None
 
+            if not topq:
+                continue
+            
             try:
                 topf = load(topq.filename)
 
@@ -379,22 +388,27 @@ class Channel(object):
 
     def dequeue(self, even_tight=False):
         """
-        Clears any queued music. Doesn't stop the playing music, if
-        any, but will prevent looping from occuring.
+        Clears the queued music.
+
+        If the first item in the queue has not been started, then it is
+        left in the queue unless all is given.
         """
 
-        self.queue = [ ]
+        self.queue = self.queue[:self.keep_queue]
         self.loop = [ ]
-
+            
         if not pcm_ok:
             return
-        
-        pss.dequeue(self.number, even_tight)
+
+        if self.keep_queue == 0:
+            pss.dequeue(self.number, even_tight)
 
     def interact(self):
         """
         Called (mostly) once per interaction.
         """
+
+        self.keep_queue = 0
         
         if pcm_ok:
 
@@ -423,6 +437,7 @@ class Channel(object):
         of seconds. Also clears any queued music.
         """
 
+        self.keep_queue = 0
         self.dequeue()
 
         if not pcm_ok:
@@ -445,6 +460,8 @@ class Channel(object):
         if tight is None:
             tight = self.tight
 
+        self.keep_queue += 1
+            
         for filename in filenames:
             qe = QueueEntry(filename, int(fadein * 1000), tight)
             self.queue.append(qe)

renpy/audio/music.py

@@ -185,8 +185,6 @@ def stop(channel="music", fadeout=None):
     try:        
         c = get_channel(channel)
         ctx = c.context
-        
-        c.dequeue()
 
         if fadeout is None:
             fadeout = renpy.config.fade_music

renpy/bootstrap.py

@@ -54,7 +54,10 @@ def extra_imports():
     import pygame.locals
     import pygame.color
     import pygame.colordict
-    
+    import posixpath
+    import ctypes
+    import ctypes.wintypes
+    import EasyDialogs
     
 trace_file = None
 trace_local = None

renpy/display/behavior.py

@@ -187,9 +187,7 @@ class Keymap(renpy.display.layout.Null):
 
 class RollForward(renpy.display.layout.Null):
     """
-    This is a behavior that maps keys to functions that are called when
-    the key is pressed. The keys are specified by giving the appropriate
-    k_constant from pygame.constants, or the unicode for the key.
+    This behavior implements rollforward.
     """
 
     def __init__(self, value):
@@ -202,6 +200,7 @@ class RollForward(renpy.display.layout.Null):
         if map_event(ev, "rollforward"):
             renpy.game.interface.suppress_transition = True
             renpy.game.after_rollback = True
+            renpy.game.log.rolled_forward = True
             return self.value
 
 class PauseBehavior(renpy.display.layout.Null):

renpy/display/core.py

@@ -497,7 +497,7 @@ class SceneLists(renpy.object.Object):
 
         if key and name:
             self.image_predict_info.images[layer][key] = name
-                
+
         l = self.layers[layer]
 
         at = None
@@ -699,15 +699,13 @@ class Display(object):
 
             # Convert the aspect ratio to be square.
             iw, ih = im.get_size()
-            if iw != ih:
-                imax = max(iw, ih)
-                square_im = renpy.display.scale.PygameSurface((imax, imax), pygame.SRCALPHA)
-                square_im.blit(im, ( (imax-iw)/2, (imax-ih)/2 ))
-                im = square_im
+            imax = max(iw, ih)
+            square_im = renpy.display.scale.PygameSurface((imax, imax), pygame.SRCALPHA, depth=32)
+            square_im.blit(im, ( (imax-iw)/2, (imax-ih)/2 ))
+            im = square_im
 
-            
             if on_windows and im.get_size() != (32, 32):
-                im = renpy.display.scale.real_bilinear(im, (32, 32))
+                im = renpy.display.scale.real_smoothscale(im, (32, 32))
                 
             pygame.display.set_icon(im)
 
@@ -1015,16 +1013,23 @@ class Display(object):
         Saves a full-size screenshot in the given filename.
         """
 
-        renpy.display.scale.image_save_unscaled(self.window, filename)
-
+        try:
+            renpy.display.scale.image_save_unscaled(self.window, filename)
+        except:
+            if renpy.config.debug:
+                raise
+            pass
+        
+            
         
     def screenshot(self, scale):
         """
-        Returns a pygame Surface that is a screenshot of the current
-        contents of the window.
+        Returns a string containing the contents of the window, as a PNG.
         """
 
-        surf = renpy.display.scale.smoothscale(self.window, scale)
+        surf = self.window.convert_alpha()
+        surf = renpy.display.scale.smoothscale(surf, scale)
+        surf = surf.convert()
         
         sio = cStringIO.StringIO()
         renpy.display.module.save_png(surf, sio, 0)
@@ -1140,6 +1145,8 @@ class Interface(object):
                     yanchor = 0,
                     xmaximum = w,
                     ymaximum = h,
+                    xminimum = w,
+                    yminimum = h,
                     clipping = True,
                     )
 

renpy/display/im.py

@@ -676,7 +676,7 @@ class FrameImage(ImageBase):
 
             # Compute sizes.
             srcsize = (sx1 - sx0, sy1 - sy0)
-            dstsize = (dx1 - dx0, dy1 - dy0)
+            dstsize = (int(dx1 - dx0), int(dy1 - dy0))
 
             # Get a subsurface.
             surf = source.subsurface((sx0, sy0, srcsize[0], srcsize[1]))
@@ -687,7 +687,7 @@ class FrameImage(ImageBase):
                     tilew, tileh = srcsize
                     dstw, dsth = dstsize
 
-                    surf2 = pygame.Surface(dstsize, 0, surf)
+                    surf2 = renpy.display.scale.PygameSurface(dstsize, 0, surf)
 
                     for y in range(0, dsth, tileh):
                         for x in range(0, dstw, tilew):
@@ -707,6 +707,7 @@ class FrameImage(ImageBase):
             # Blit.
             dest.blit(surf, (dx0, dy0))
 
+
         # Top row.
         draw(0, xb, 0, yb)
         draw(xb, -xb, 0, yb)
@@ -721,7 +722,7 @@ class FrameImage(ImageBase):
         draw(0, xb, -yb, 0)
         draw(xb, -xb, -yb, 0)
         draw(-xb, 0, -yb, 0)
-        
+
         # And, finish up.
         return rv
 

renpy/display/layout.py

@@ -26,7 +26,7 @@ import pygame
 from pygame.constants import *
 
 import renpy
-from renpy.display.render import render, IDENTITY, Matrix2D
+from renpy.display.render import render, Render, IDENTITY, Matrix2D
 import time
 import math
 
@@ -127,7 +127,7 @@ class Container(renpy.display.core.Displayable):
             return
 
         self.children.pop(i)
-        self.offsets = self.list_type()
+        self.offsets = self._list_type()
 
         if self.children:
             self.child = self.children[-1]
@@ -147,7 +147,7 @@ class Container(renpy.display.core.Displayable):
     def render(self, width, height, st, at):
 
         rv = Render(width, height)
-        self.offsets = self.list_type()
+        self.offsets = self._list_type()
         
         for c in self.children:
             cr = render(c, width, height, st, at)
@@ -156,6 +156,7 @@ class Container(renpy.display.core.Displayable):
 
         return rv
 
+    
     def event(self, ev, x, y, st):
 
         children = self.children
@@ -172,6 +173,7 @@ class Container(renpy.display.core.Displayable):
                 
         return None
 
+    
     def visit(self):
         return self.children
     
@@ -425,17 +427,31 @@ class MultiBox(Container):
         
     def render(self, width, height, st, at):
 
-        t = renpy.game.interface.frame_time
+        # Do we need to adjust the child times due to our being a layer?
+        if self.layer_name or (self.layers is not None):
+            adjust_times = True
+        else:
+            adjust_times = False
 
+        xminimum = self.style.xminimum
+        if xminimum is not None:
+            width = max(width, scale(xminimum, width))
+
+        yminimum = self.style.yminimum
+        if yminimum is not None:
+            height = max(height, scale(yminimum, height))
+            
         if self.first:
-        
-            it = renpy.game.interface.interact_time
-
-            self.start_times = [ i or it for i in self.start_times ]
-            self.anim_times = [ i or it for i in self.anim_times ]
 
             self.first = False
+
+            if adjust_times:
             
+                it = renpy.game.interface.interact_time
+                
+                self.start_times = [ i or it for i in self.start_times ]
+                self.anim_times = [ i or it for i in self.anim_times ]
+                            
             layout = self.style.box_layout
 
             if layout is None:
@@ -446,19 +462,26 @@ class MultiBox(Container):
         else:
             layout = self.layout
 
-                
+
+        # Handle time adjustment, store the results in csts and cats.
+        if adjust_times:            
+            t = renpy.game.interface.frame_time
+
+            csts = [ t - start for start in self.start_times ]
+            cats = [ t - anim for anim in self.anim_times ]
+
+        else:
+            csts = [ st ] * len(self.children)
+            cats = [ at ] * len(self.children)
+            
         if layout == "fixed":
 
             self.offsets = [ ]
             
             rv = renpy.display.render.Render(width, height, layer_name=self.layer_name)
 
-
-            for child, start, anim in zip(self.children, self.start_times, self.anim_times):
-
-                cst = t - start
-                cat = t - anim
-
+            for child, cst, cat in zip(self.children, csts, cats):
+                
                 surf = render(child, width, height, cst, cat)
 
                 if surf:
@@ -466,7 +489,7 @@ class MultiBox(Container):
                     self.offsets.append(offset)
                 else:
                     self.offsets.append((0, 0))
-
+                    
             return rv
                     
         if layout == "horizontal":
@@ -491,10 +514,10 @@ class MultiBox(Container):
 
             padding = 0
 
-            for i, padding, start, anim in zip(self.children, spacings, self.start_times, self.anim_times):
-
+            for i, padding, cst, cat in zip(self.children, spacings, csts, cats):
+                
                 xoffsets.append(xo)
-                surf = render(i, remwidth, height, t - start, t - anim)
+                surf = render(i, remwidth, height, cst, cat)
 
                 sw, sh = surf.get_size()
 
@@ -551,11 +574,11 @@ class MultiBox(Container):
 
             padding = 0
 
-            for i, padding, start, anim in zip(self.children, spacings, self.start_times, self.anim_times):
+            for i, padding, cst, cat in zip(self.children, spacings, csts, cats):
 
                 yoffsets.append(yo)
 
-                surf = render(i, width, remheight, t - start, t - anim)
+                surf = render(i, width, remheight, cst, cat)
 
                 sw, sh = surf.get_size()
 

renpy/display/render.py

@@ -105,7 +105,9 @@ def render(d, width, height, st, at):
     to be redrawn.
     """
 
-    orig_wh = (width, height)
+    ft = renpy.game.interface.frame_time 
+    
+    orig_wh = (width, height, ft-st, ft-at)
     rv = render_cache[d].get(orig_wh, None)
     if rv is not None:
         return rv
@@ -131,7 +133,7 @@ def render(d, width, height, st, at):
     if height < 0:
         height = 0
             
-    wh = (width, height)
+    wh = (width, height, ft-st, ft-at)
             
     rv = render_cache[d].get(wh, None)
     if rv is not None:
@@ -141,7 +143,7 @@ def render(d, width, height, st, at):
     rv.render_of.append(d)
 
     if style.clipping:
-        rv = rv.subsurface((0, 0, width, height), focus=True)
+        rv = rv.subsurface((0, 0, rv.width, rv.height), focus=True)
         rv.render_of.append(d)
 
     render_cache[d][wh] = rv
@@ -735,7 +737,7 @@ def draw_screen(xoffset, yoffset, full_redraw):
 
     dest = pygame.display.get_surface().subsurface(cliprect)
     draw(dest, None, screen_render, -x, -y, True)
-    
+
     return updates
 
 def kill_old_screen():
@@ -1278,7 +1280,7 @@ class Render(object):
                             vc = [ ]
                             rv = True
                     else:
-                        if not source.get_masks()[3]:
+                        if not child.get_masks()[3]:
                             vc = [ ]
                             rv = True
             

renpy/display/scale.py

@@ -89,7 +89,7 @@ def image_save_unscaled(surf, dest):
 
 if _renpy:
     real_renpy_pixellate = _renpy.pixellate
-    real_renpy_bilinear = _renpy.bilinear
+    real_renpy_transform = _renpy.transform
 
     def real_smoothscale(src, size, dest=None):
         """
@@ -123,7 +123,11 @@ if _renpy:
             real_renpy_pixellate(src, inter, xshrink, yshrink, 1, 1)
             src = inter
 
-        real_renpy_bilinear(src, dest)
+        real_renpy_transform(src, dest,
+                             0, 0,
+                             1.0 * iwidth / width , 0,                             
+                             0, 1.0 * iheight / height,
+                             )
 
         return dest
     
@@ -511,11 +515,7 @@ def load_scaling():
     def image_load(*args, **kwargs):
 
         full = old_image_load(*args, **kwargs)
-
-        if full.get_masks()[3] == 0:
-            full = full.convert()
-        else:
-            full = full.convert_alpha()
+        full = full.convert_alpha()
 
         return surface_scale(full)
 

renpy/display/text.py

@@ -813,6 +813,7 @@ class Text(renpy.display.core.Displayable):
                 return True
             else:
                 renpy.game.interface.timeout((self.slow_done_time + self.pause_length) - st)
+
         if self.slow and self.style.slow_abortable and renpy.display.behavior.map_event(ev, "dismiss"):
             self.slow = False
             raise renpy.display.core.IgnoreEvent()
@@ -1301,6 +1302,9 @@ class Text(renpy.display.core.Displayable):
         Called to call slow_done, and also to update slow_done_time.
         """
 
+        if not self.slow:
+            return
+
         self.slow = False
         
         if self.slow_done:

renpy/display/transition.py

@@ -286,7 +286,6 @@ class Pixellate(Transition):
 
         rdr = render(visible, width, height, st, at)
 
-        # No alpha support.
         surf = rdr.pygame_surface(False)
         
         if surf.get_size() != self.surface_size:
@@ -348,7 +347,7 @@ class Dissolve(Transition):
 
         bottom = render(self.old_widget, width, height, st, at)
         top = render(self.new_widget, width, height, st, at)
-
+        
         bottom_surface = bottom.pygame_surface(self.alpha)
         top_surface = top.pygame_surface(self.alpha)
 
@@ -356,7 +355,7 @@ class Dissolve(Transition):
         height = min(top.height, bottom.height)
 
         def draw(dest, x, y):
-
+            
             dw, dh = dest.get_size()
 
             w = min(dw, width + x)
@@ -371,6 +370,7 @@ class Dissolve(Transition):
                 dest.subsurface((0, 0, w, h)),
                 alpha)
 
+
         if self.alpha:
 
             rv = renpy.display.render.Render(width, height)

renpy/exports.py

@@ -58,7 +58,7 @@ def roll_forward_info():
 def in_rollback():
     return renpy.game.log.in_rollback()
 
-def checkpoint(data=None):
+def checkpoint(data=None, keep_rollback=False):
     """
     This creates a checkpoint that the user can rollback to. The
     checkpoint is placed at the statement after the last statement
@@ -68,7 +68,7 @@ def checkpoint(data=None):
     """
 
     if renpy.store._rollback:
-        renpy.game.log.checkpoint(data)
+        renpy.game.log.checkpoint(data, keep_rollback=keep_rollback)
 
 def block_rollback():
     """
@@ -509,7 +509,7 @@ def say(who, what, interact=True):
 
 
 def imagemap(ground, selected, hotspots, unselected=None, overlays=False,
-             style='imagemap', with_none=None, **properties):
+             style='imagemap', mouse='imagemap', with_none=None, **properties):
     """
     Displays an imagemap. An image map consists of two images and a
     list of hotspots that are defined on that image. When the user
@@ -552,7 +552,7 @@ def imagemap(ground, selected, hotspots, unselected=None, overlays=False,
     
     rv = renpy.ui.interact(suppress_overlay=(not overlays),
                            type='imagemap',
-                           mouse='imagemap',
+                           mouse=mouse,
                            roll_forward=roll_forward)
 
     renpy.exports.checkpoint(rv)
@@ -590,7 +590,7 @@ def pause(delay=None, music=None, with_none=None, hard=False):
         roll_forward = None
     
     rv = renpy.ui.interact(mouse='pause', type='pause', roll_forward=roll_forward)
-    renpy.exports.checkpoint(rv)
+    renpy.exports.checkpoint(rv, keep_rollback=True)
 
 
     if with_none is None:
@@ -692,6 +692,7 @@ def rollback():
         return
     
     if renpy.config.rollback_enabled:
+        renpy.config.skipping = None
         renpy.game.log.complete()
         renpy.game.log.rollback(1)
 

renpy/game.py

@@ -76,7 +76,7 @@ seen_session = { }
 # The set of statements we've ever seen.
 seen_ever = { }
 
-# True if we're in the first interaction after a rollback.
+# True if we're in the first interaction after a rollback or rollforward.
 after_rollback = False
 
 # Code that's run after the init code.

renpy/main.py

@@ -136,7 +136,7 @@ def main():
         renpy.config.commondir = commondir
     else:
         renpy.config.commondir = None
-
+        
     # Load Ren'Py extensions.
     for dir in renpy.config.searchpath:
         for fn in os.listdir(dir):

renpy/python.py

@@ -305,7 +305,6 @@ class RevertableList(list):
     __getslice__ = wrapper(list.__getslice__)
     __mul__ = wrapper(list.__mul__)
 
-    # TODO: Handle __iter__ (or not).
     def get_rollback(self):
         return self[:]
 
@@ -536,6 +535,7 @@ class Rollback(renpy.object.Object):
         for o, rb in self.objects:
             if id(o) in reachable:
                 new_objects.append((o, rb))
+                reached(rb, reachable, wait)
             else:
                 if renpy.config.debug:
                     print "Removing unreachable:", o
@@ -601,13 +601,19 @@ class RollbackLog(renpy.object.Object):
         self.ever_been_changed = { }
         self.rollback_limit = 0
         self.forward = [ ]
+
+        # Did we just do a roll forward?
+        self.rolled_forward = False
+
         
         # Reset the RNG on the creation of a new game.
         rng.reset()
 
     def after_setstate(self):
         self.mutated = { }
-
+        self.rolled_forward = False
+        
+        
     def begin(self):
         """
         Called before a node begins executing, to indicate that the
@@ -639,6 +645,8 @@ class RollbackLog(renpy.object.Object):
         # save code.
         global mutate_flag
         mutate_flag = True
+
+        self.rolled_forward = False
         
     def complete(self):
         """
@@ -738,7 +746,7 @@ class RollbackLog(renpy.object.Object):
         return None
             
 
-    def checkpoint(self, data=None):
+    def checkpoint(self, data=None, keep_rollback=False):
         """
         Called to indicate that this is a checkpoint, which means
         that the user may want to rollback to just before this
@@ -760,7 +768,10 @@ class RollbackLog(renpy.object.Object):
                 # Otherwise, clear the forward stack.
                 fwd_name, fwd_data = self.forward[0]
 
-                if (self.current.context.current == fwd_name and data == fwd_data):
+                if (self.current.context.current == fwd_name
+                    and data == fwd_data
+                    and (keep_rollback or self.rolled_forward)
+                    ):
                     self.forward.pop(0)
                 else:
                     self.forward = [ ]
@@ -768,8 +779,6 @@ class RollbackLog(renpy.object.Object):
             # Log the data in case we roll back again.
             self.current.forward = data
 
-            
-        
     def block(self):
         """
         Called to indicate that the user should not be able to rollback

renpy/store.py

@@ -53,9 +53,6 @@ _config = renpy.config
 
 class _Config(object):
 
-    def __init__(self, name):
-        vars(self)["_name"] = name
-    
     def register(self, name, default, cat=None, help=None):
         setattr(self, name, default)
         _config.help.append((cat, name, help))
@@ -64,7 +61,7 @@ class _Config(object):
         cvars = vars(_config)
 
         if name not in cvars:
-            raise Exception('%s.%s is not a known configuration variable.' % (self._name, name))
+            raise Exception('config.%s is not a known configuration variable.' % (name))
 
         return cvars[name]
 
@@ -72,7 +69,7 @@ class _Config(object):
         cvars = vars(_config)
 
         if name not in cvars and renpy.config.locked:
-            raise Exception('%s.%s is not a known configuration variable.' % (self._name, name))
+            raise Exception('config.%s is not a known configuration variable.' % (name))
 
         if name == "script_version":
             renpy.store._set_script_version(value)
@@ -85,8 +82,7 @@ class _Config(object):
         else:
             delattr(renpy.config, name)
         
-config = _Config("config")
-library = _Config("library")
+config = _Config()
 
 _list = list
 _dict = dict

renpy/ui.py

@@ -30,8 +30,8 @@ import sets
 
 import renpy
 
-# The current widget. None at init time, otherwise either a layer name
-# or a displayable.
+# The current widget. None if we have none, otherwise either a layer
+# name or a displayable.
 current = None
 
 # A stack of current widgets and/or layers.
@@ -78,9 +78,6 @@ def add(w, make_current=False, once=False):
     global current
     global current_once
 
-    if current is None:
-        raise Exception("Interaction not allowed during init phase.")
-
     atw = w 
     
     while at_stack:
@@ -88,6 +85,8 @@ def add(w, make_current=False, once=False):
     
     if isinstance(current, str):
         renpy.game.context(-1).scene_lists.add(current, atw)
+    elif current is None:
+        pass
     else:
         current.add(atw)
 
@@ -104,9 +103,6 @@ def add(w, make_current=False, once=False):
     return w
 
 def remove(d):
-    
-    if current is None:
-        raise Exception("Interaction not allowed during init phase.")
 
     if not isinstance(current, basestring):
         raise Exception("ui.remove only works directly on a layer.")
@@ -119,23 +115,24 @@ def at(a):
 
 def clear():
 
-    if current is None:
-        raise Exception("Interaction not allowed during init phase.")
-
     if isinstance(current, basestring):
         renpy.game.context(-1).scene_lists.clear(current)
     else:
         raise Exception("ui.clear cannot be called when a widget is open.")
-    
 
+def detached():
+    global current_once
+    global current
+
+    current_stack.append(current)
+    current_once = True
+    current = None
+    
 def layer(name):
 
     global current_once
     global current
     
-    if current is None:
-        raise Exception("Interaction not allowed during init phase.")
-
     if not isinstance(current, str):
         raise Exception("Opening a layer while a widget is open is not allowed.")
 

scite/SciTE.editor.py

@@ -0,0 +1,17 @@
+# Name: SciTE
+# Version: 1
+# Description: The SciTE editor, for Windows and Linux.
+
+import os.path
+import sys
+
+if sys.platform == 'win32':
+    editor = base + "/scite.exe"
+else:
+    editor = base + "/scite"
+
+editor = os.path.normpath(editor)
+editor = renpy.shell_escape(editor)
+
+config.editor = '"' + editor + '" "%(allfiles)s" -goto:%(line)d'
+config.editor_transient = config.editor +' -revert:'

scite/launcher/editor.rpy

@@ -1,33 +0,0 @@
-
-# This file contains logic for detecting an editor, and for selecting
-# the default editor.
-
-init:
-    python hide:
-        import os.path
-        import sys
-        import platform
-        
-
-        if not config.editor:
-             
-            if platform.mac_ver()[0]:
-                config.editor = "open -t '%(allfiles)s'"
-            else:
-                
-                if sys.platform == 'win32':
-                    editor = config.renpy_base + "/editor/scite.exe"
-                else:
-                    editor = config.renpy_base + "/editor/scite"
-
-                editor = os.path.normpath(editor)
-                editor = renpy.shell_escape(editor)
-                
-                config.editor = '"' + editor + '" "%(allfiles)s" -goto:%(line)d'
-                config.editor_transient = config.editor+' -revert:'
-
-            if config.editor:
-                os.environ['RENPY_EDITOR'] = config.editor
-            if config.editor_transient:
-                os.environ['RENPY_EDITOR_TRANSIENT'] = config.editor_transient
-                

the_question/game/script.rpy

@@ -190,7 +190,7 @@ label marry:
     s "I know. So, will you marry me?"
     m "Ummm, of course I will. I've actually been meaning to ask you, but since you brought it up..."
     s "I know, but you are so indecisive, that I thought I'd take the initiative. "
-    m "I guess... It's all all about asking the right question... at the right time."
+    m "I guess... It's all about asking the right question... at the right time."
     
     show sylvie2 giggle
     

the_question/launcherinfo.py

@@ -1,2 +1,9 @@
-description="A simple and complete Ren'Py game."
-
+documentation_extensions = 'txt html'
+description = "A simple and complete Ren'Py game."
+build_mac = True
+build_all = True
+build_windows = False
+distribution_base = 'the_question-1.0'
+ignore_extensions = '~ .bak'
+build_linux = False
+executable_name = 'the_question'