Updated CHANGELOG and MANIFEST for v0.33.

Using Freeze/Thaw to disable animation didn't work well as it was
interfering with popup messages (for example, when a file is modified) and
was not consistent with the behavior of opening files.

CHANGELOG.md

@@ -1,5 +1,99 @@
 # ZeroBrane Studio Changelog
 
+## v0.33 (Oct 22 2012)
+
+### Highlights
+  - Added **Linux support**.
+  - Added **Moai auto-complete**.
+  - Added **Gideros debugging, auto-complete, and live coding**.
+  - Added **syntax aware indentation**.
+  - Added **re/storing open files and interpreter** when switching project folders.
+
+### Improvements
+  - Added configuration option to specify hostname when the default one is not reachable (fixes #68).
+  - Added search for Moai and Love2d executables in default locations on OSX and Windows.
+  - Added handling of command line parameters on OSX and Linux; updated documentation.
+  - Added auto-recovery to save/restore editor content (fixes #23).
+  - Added syntax aware indentation.
+  - Added re/storing open files and interpreter when switching project folders.
+  - Added auto-activation of files requested during debugging.
+  - Added editor.autoactivate parameter (false by default) to enable activation.
+  - Added zbstudio.sh script to run on OSX/Linux; updated permissions (closes #15).
+  - Added variable ratio for sliders in scratchpad.
+  - Added Linux/OSX/Windows CMake-based launcher build (thanks to toiffel).
+  - Added configuration parameter for the number of characters typed before displaying auto-complete suggestions for dynamic words.
+  - Added proper closing of the application after Shutdown/Logoff events (fixes #57).
+  - Added Moai auto-complete (closes #52).
+  - Added hiding auto-complete suggestions on losing focus in the editor.
+  - Added proper reporting of errors in the stack window.
+  - Added wxlua.deb file and install script that pull and build all required dependencies on Linux (covers most of #15).
+  - Added osx executables and build files.
+  - Added disabling full screen mode when the last editor tab is closed.
+  - Added proper reporting of errors in config files.
+  - Added toggling folders in project pane by single click (fixes #41).
+  - Added examples for configuring tabs and moai entry points.
+  - Added reporting compilation success rate (fixes #39)
+  - Added shortcuts for adding and removing watches.
+  - Added highlighting rows with updated values in the Watch window.
+  - Added 'Add Watch Expression' and 'Evaluate in Console' context menu items in the editor.
+  - Added handling of canceling editing in adding a watch.
+  - Added Gideros auto-complete and live coding support (closes #62).
+  - Added Gideros integration on OSX; added search for gideros in default locations on Windows and OSX.
+  - Added Gideros integration and debugging support.
+  - Added debugging-related buttons to the toolbar.
+  - Improved reporting of compilation and run-time errors when running as scratchpad.
+  - Made debugger strict.lua and LuaJIT friendly (upgraded to MobDebug v0.502).
+  - Updated configuration example to avoid using ide.spec that is not available (fixes #67).
+  - Updated CMake build script to handle wildcards in the MANIFEST.
+  - Updated configuring toolbar size to improve Linux compatibility.
+  - Updated MobDebug to v0.497 to fix issues and improve performance.
+  - Updated a warning message about single instance communication.
+  - Updated cpath processing to allow Linux version to run side-by-side with Windows and Mac.
+  - Updated licensing information.
+  - Enabled scratchpad support in the debugger when interpreter is capable of providing it.
+  - Disabled auto-complete in comments and strings.
+  - Disabled toggling breakpoints while debugger is running (as they wouldn't be changed anyway).
+  - Disabled 'not activated file for debugging' message when auto-activation is disabled.
+  - Disabled tooltip when scratchpad is on (fixes #51).
+  - Disabled showing calltip when the editor is not in focus.
+  - Disabled showing calltip over markup in comments.
+  - Disabled 'Run as Scratchpad' in the menu for those intepreters that don't support scratchpad.
+  - Updated configuration examples to add editor settings and fix user.lua path.
+  - Moved all Estrela features into a separate bundle that can be loaded using cfg/estrela.lua config.
+  - Removed multiple file types offered in Save As dialog.
+
+### Incompatibilities
+  - Changed searching for user config in '$HOME/.zbstudio' from '$HOME/.zbs'.
+  - Temporarily removed the ability to modify spec-related configuration parameters from configuration files.
+
+### Fixes
+  - Fixed opening a non-existing file from the Recent Files list.
+  - Fixed Find/Replace dialog checkboxes that didn't react to clicks on OSX (fixes #63).
+  - Fixed an auto-complete issue with mixed case dynamic words (fixes #60).
+  - Fixed 'Trying to solve a NULL hostname' warning message.
+  - Fixed a typo that prevented a corner case in autocomplete from working.
+  - Fixed inconsistent error messages about various config files.
+  - Fixed an issue with auto-complete when dot or colon is used (fixes #56).
+  - Fixed an issue with debugging scripts started using absolute file path.
+  - Fixed setting working directory for interpreters to the file path when the project directory is not set.
+  - Fixed an issue with Backspace not closing auto-complete suggestions.
+  - Fixed enabling items in the Edit menu (fixes #56).
+  - Fixed function list in the toolbar on Mac (helps #14).
+  - Fixed deleting of comment blocks with hidden markup (fixes #40).
+  - Fixed an issue with function list when all editor tabs are closed.
+  - Fixed multiple calltips shown on Linux (helps #15).
+  - Fixed an issue with mouse cursor in scratchpad not properly updated on Linux (fixes #49; helps #15).
+  - Fixed an issue with static analyzer that failes on function names like a.b.c (fixes #50).
+  - Fixed disabling Paste menu on Linux when needed (fixes #46; helps #15).
+  - Fixed an issue with context menu on Linux (fixes #47; helps #15).
+  - Fixed debugger failure when debugging is initiated externally and there is an unsaved file in one of editor tabs.
+  - Fixed stopping the debugger when an editor tab where debugging happens is closed.
+  - Fixed enabling of several menu items with no editor tab (fixes #42).
+  - Fixed an issue with loading stock icons on Linux.
+  - Fixed Cut/Copy menu items to reflect proper status in the editor.
+  - Fixed typo in the static analyzer output.
+  - Resolved conflict between lua executable names on Windows and Mac.
+
 ## v0.32 (Sep 03 2012)
 
 ### Highlights

LICENSE

@@ -49,7 +49,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 
---[[ wxLua License License ]]----------------------------------------------
+--[[ wxLua License ]]------------------------------------------------------
 
 http://wxlua.sourceforge.net/
 
@@ -61,7 +61,7 @@ Original wxLua Lua sample IDE:
   luascript at thersgb.net
 
 wxLua is based on 
-wxWindows Library Licence, Version 3
+wxWindows Library License, Version 3
 
 Copyright (c) 1998 Julian Smart, Robert Roebling et al
 
@@ -178,7 +178,7 @@ output file generation.
 
 MobDebug sources are released under the MIT License
 
-Copyright (c) 2011 Paul Kulchenko (paul@kulchenko.com)
+Copyright (c) 2011-2012 Paul Kulchenko (paul@kulchenko.com)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,70 +1,56 @@
 # Project Description
 
-A simple and extensible Lua IDE and debugger. It supports multiple file
-formats, "api" for autocompletion and tooltips, and custom command-line
-tools. Its main focus is extensibility for target applications using Lua.
+[ZeroBrane Studio](http://studio.zerobrane.com/) is a lightweight Lua IDE with code completion, syntax
+highlighting, remote debugger, code analyzer, live coding, and debugging
+support for several Lua engines (LuaJIT, Löve 2D, Moai, Gideros, MobileLua,
+and others).
 
 ## Features
 
-* Written in Lua, so easily customizable
-* Automatically loads several 'plugin' like classes
-  - applications: overall control of applications settings
-  - specs (spec/): file syntax, lexer, keywords
-  - apis (api/): for code-completion and tool-tips
-  - interpreters (interpreters/): how a project is run
-  - config (cfg/): contains style and basic editor settings
-  - tools (tools/): additional tools, e.g. cg compiler, dx fxc compiler
-* Auto-completion for functions, keywords...
-* Function tips
-* Function list in file (quick jump to)
-* Function call highlighting
-* Bracket matching/highlighting
-* Project file browser
-* Experimental type/class guessing for auto-completion
-* Support for different editor styles
-* Console to directly test code snippets with local and remote execution
-* Integrated debugger (with support for local and remote debugging)
+* Written in Lua, so easily customizable.
+* Small, portable, and cross-platform (Windows, Mac OSX, and Linux).
+* Auto-completion for functions, keywords, and custom APIs.
+* Interactive console to directly test code snippets with local and remote execution.
+* Integrated debugger (with support for local and remote debugging).
+* Live coding with Lua ([demo](http://notebook.kulchenko.com/zerobrane/live-coding-in-lua-bret-victor-style)), Löve 2D ([demo](http://notebook.kulchenko.com/zerobrane/live-coding-with-love)), and Gideros ([demo](http://notebook.kulchenko.com/zerobrane/gideros-live-coding-with-zerobrane-studio-ide)).
+* Support for plugin-like components:
+  - applications: overall control of applications settings;
+  - specs (spec/): file syntax, lexer, keywords;
+  - apis (api/): for code-completion and tool-tips;
+  - interpreters (interpreters/): how a project is run;
+  - config (cfg/): contains style and basic editor settings;
+  - tools (tools/): additional tools.
 
-## Frontends
+## Screenshot
 
-There is currently two front-ends using the same editor engine. The original
-one is `Estrela`, which has a focus on 3d graphics related usage of Lua,
-especially in combination with the luxinia engine or luxinia2 framework.
-The second front-end is `ZeroBrane Studio` (zbstudio) which has a focus
-on using Lua in education, mobile development, and robotics.
-
-Both are part of the standard distribution.
-
-## Installation
-
-```bash
-$ git clone git://github.com/pkulchenko/ZeroBraneStudio.git zbstudio
-  or
-$ git clone git://estrelaeditor.git.sourceforge.net/gitroot/estrelaeditor/estrelaeditor estrelaeditor
-```
+![ZeroBrane Studio debugger screenshot](http://studio.zerobrane.com/images/debugging.png)
 
 ## Usage
 
 ```
-Open File(s):
-  <exe> <filename> [<filename>...]
+Open file(s):
+  <zbstudio> <filename> [<filename>...]
   any non-option will be treated as filename
 
-Overriding Config:
-  <exe> [...] -cfg "<luacode overriding config>" [...]
-  e.g.: zbstudio.exe -cfg "singleinstance=false;" somefile.lua
+Overriding default configuration:
+  <zbstudio> -cfg "<luacode overriding config>" [<filename>]
+  e.g.: zbstudio -cfg "editor.fontsize=12" somefile.lua
+
+Loading custom configuration:
+  <zbstudio> -cfg "config/file.lua" [<filename>]
+  e.g.: zbstudio -cfg cfg/estrela.lua
 ```
 
 ## Author
 
-### Estrela Editor
-
-  **Luxinia Dev:** Christoph Kubisch (crazybutcher@luxinia.de)
-
 ### ZeroBrane Studio and MobDebug
 
   **ZeroBrane LLC:** Paul Kulchenko (paul@kulchenko.com)
 
+### Estrela Editor
+
+  **Luxinia Dev:** Christoph Kubisch (crazybutcher@luxinia.de)
+
 ## License
 
 See LICENSE file.

bin/lua.app/Contents/Info.plist

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleExecutable</key>
+        <string>lua</string>
+        <key>CFBundleDisplayName</key>
+        <string>Lua</string>
+	<key>CFBundleGetInfoString</key>
+	<string></string>
+	<key>CFBundleIconFile</key>
+	<string></string>
+	<key>CFBundleIdentifier</key>
+	<string></string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleLongVersionString</key>
+	<string></string>
+	<key>CFBundleName</key>
+	<string>Lua</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string></string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string></string>
+	<key>CSResourcesFileMapped</key>
+	<true/>
+	<key>LSRequiresCarbon</key>
+	<true/>
+	<key>NSHumanReadableCopyright</key>
+	<string></string>
+</dict>
+</plist>

build/CMakeLists.txt

@@ -0,0 +1,142 @@
+# setup the minimum allowed CMake version
+cmake_minimum_required(VERSION 2.8)
+
+# set the default build type (this needs to be done *before* project command)
+if(NOT CMAKE_BUILD_TYPE)
+  set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Choose the type of build." FORCE)
+  set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release" "RelWithDebInfo" "MinSizeRel")
+endif()
+
+# restrict configuration types to the selected build type
+set(CMAKE_CONFIGURATION_TYPES ${CMAKE_BUILD_TYPE} CACHE INTERNAL "" FORCE)
+
+# set the project name
+project("zbstudio")
+
+# set the top-level project directory relative to CMakeLists.txt location
+set(TOPDIR ..)
+
+# checks if the Lua module is available
+function(check_lua_module MODULE)
+  if(NOT ${MODULE}_FOUND)
+    # find Lua executable at first
+    find_program(LUA_EXECUTABLE "lua")
+    if(NOT LUA_EXECUTABLE)
+      message(FATAL_ERROR "Lua executable is not found")
+    endif()
+
+    # run a short script with "require" statement to determine if the Lua module is available
+    execute_process(COMMAND "${LUA_EXECUTABLE}" -e "require(\"${MODULE}\")"
+      RESULT_VARIABLE EXIT_CODE OUTPUT_QUIET ERROR_QUIET)
+    if(EXIT_CODE EQUAL 0)
+      set(${MODULE}_FOUND TRUE CACHE INTERNAL "")
+      message(STATUS "Found Lua module: ${MODULE}")
+    elseif(ARGV1)
+      message(FATAL_ERROR "Lua module \"${MODULE}\" is not found")
+    endif()
+  endif()
+endfunction()
+
+# adds an user option to select between system-wide and bundled Lua module
+function(add_system_lua_module_option MODULE)
+  string(TOUPPER ${MODULE} UPPERCASE_MODULE)
+  if(NOT DEFINED USE_SYSTEM_${UPPERCASE_MODULE})
+    option(USE_SYSTEM_${UPPERCASE_MODULE}
+      "Use a system-wide \"${MODULE}\" Lua module instead of the bundled one." ${${MODULE}_FOUND})
+  endif()
+endfunction()
+
+# installs all files listed in the manifest
+function(install_from_manifest TYPE MANIFEST DESTDIR EXCLUDE_REGEX)
+  file(STRINGS ${MANIFEST} PATTERN_LIST)
+  foreach(PATTERN ${PATTERN_LIST})
+    string(STRIP ${PATTERN} PATTERN)
+    if(NOT PATTERN MATCHES ${EXCLUDE_REGEX})
+      file(GLOB FILELIST RELATIVE "${CMAKE_SOURCE_DIR}/${TOPDIR}" "${CMAKE_SOURCE_DIR}/${TOPDIR}/${PATTERN}")
+      foreach(FILENAME ${FILELIST})
+        get_filename_component(FILEPATH ${FILENAME} PATH)
+        install(${TYPE} ${TOPDIR}/${FILENAME} DESTINATION ${DESTDIR}/${FILEPATH})
+      endforeach()
+    endif()
+  endforeach()
+endfunction()
+
+if(WIN32)
+  # add the executable file to our project
+  add_executable(zbstudio WIN32 ${TOPDIR}/build/win32_starter.c ${TOPDIR}/zbstudio/res/zbstudio.rc)
+
+  # link to the static multi-threaded CRT under MSVC
+  if(MSVC)
+    string(TOUPPER ${CMAKE_BUILD_TYPE} BUILD_TYPE)
+    foreach(FLAGS_VAR CMAKE_C_FLAGS CMAKE_CXX_FLAGS CMAKE_C_FLAGS_${BUILD_TYPE} CMAKE_CXX_FLAGS_${BUILD_TYPE})
+      string(REGEX REPLACE "/MD" "/MT" ${FLAGS_VAR} ${${FLAGS_VAR}})
+      string(REGEX REPLACE "/MDd" "/MTd" ${FLAGS_VAR} ${${FLAGS_VAR}})
+    endforeach()
+  endif()
+
+  # setup the data directory
+  set(DATADIR .)
+
+  # install IDE executable
+  install(TARGETS zbstudio DESTINATION ${DATADIR})
+
+  # install files from manifest
+  install_from_manifest(FILES ${TOPDIR}/zbstudio/MANIFEST ${DATADIR} "^$")
+  install_from_manifest(FILES ${TOPDIR}/zbstudio/MANIFEST-bin-win32 ${DATADIR} "^zbstudio.exe$")
+elseif(APPLE)
+  # setup the data directory
+  set(ROOTDIR ZeroBraneStudio.app/Contents)
+  set(DATADIR ${ROOTDIR}/ZeroBraneStudio)
+
+  # install IDE shell script
+  install(PROGRAMS ${TOPDIR}/zbstudio/ZeroBraneStudio.app/Contents/MacOS/ZeroBraneStudio DESTINATION ${ROOTDIR}/MacOS)
+
+  # install icon pack and .plist file
+  install(DIRECTORY ${TOPDIR}/zbstudio/ZeroBraneStudio.app/Contents/Resources DESTINATION ${ROOTDIR})
+  install(FILES ${TOPDIR}/zbstudio/ZeroBraneStudio.app/Contents/Info.plist DESTINATION ${ROOTDIR})
+
+  # install files from manifest
+  install_from_manifest(FILES ${TOPDIR}/zbstudio/MANIFEST ${DATADIR} "^$")
+  install_from_manifest(PROGRAMS ${TOPDIR}/zbstudio/MANIFEST-bin-macos ${DATADIR} "^$")
+else()
+  # check the available Lua modules
+  check_lua_module(wx TRUE)
+  check_lua_module(socket TRUE)
+  check_lua_module(copas ${USE_SYSTEM_COPAS})
+  check_lua_module(luainspect ${USE_SYSTEM_LUAINSPECT})
+  #check_lua_module(mobdebug ${USE_SYSTEM_MOBDEBUG})
+
+  # add user options to select between system-wide and bundled Lua modules
+  add_system_lua_module_option(copas)
+  add_system_lua_module_option(luainspect)
+  #add_system_lua_module_option(mobdebug)
+
+  # setup the data directory
+  set(DATADIR share/zbstudio)
+
+  # install IDE shell script
+  set(IDE_DATADIR "${CMAKE_INSTALL_PREFIX}/${DATADIR}")
+  configure_file(${TOPDIR}/zbstudio/zbstudio.in "${CMAKE_BINARY_DIR}/zbstudio")
+  install(PROGRAMS "${CMAKE_BINARY_DIR}/zbstudio" DESTINATION bin)
+
+  # install bundled Lua modules
+  if(NOT USE_SYSTEM_COPAS)
+    install(DIRECTORY ${TOPDIR}/lualibs/copas ${TOPDIR}/lualibs/coxpcall DESTINATION ${DATADIR}/lualibs)
+  endif()
+  if(NOT USE_SYSTEM_LUAINSPECT)
+    install(DIRECTORY ${TOPDIR}/lualibs/luainspect ${TOPDIR}/lualibs/metalua DESTINATION ${DATADIR}/lualibs)
+  endif()
+  if(NOT USE_SYSTEM_MOBDEBUG)
+    install(DIRECTORY ${TOPDIR}/lualibs/mobdebug DESTINATION ${DATADIR}/lualibs)
+  endif()
+
+  # install .desktop file and hicolor icon theme
+  install(DIRECTORY ${TOPDIR}/zbstudio/res/icons/ DESTINATION share/icons/hicolor)
+  install(FILES ${TOPDIR}/zbstudio/res/zbstudio.desktop DESTINATION share/applications)
+
+  # install miscellaneous documentation files
+  install(FILES ${TOPDIR}/CHANGELOG.md ${TOPDIR}/LICENSE ${TOPDIR}/README.md DESTINATION share/doc/zbstudio)
+
+  # install files from manifest
+  install_from_manifest(FILES ${TOPDIR}/zbstudio/MANIFEST ${DATADIR} "^(CHANGELOG.md|LICENSE|README.md)$|^lualibs/")
+endif()

build/build-dmg.sh

@@ -0,0 +1,42 @@
+#!/bin/bash
+
+set -x
+
+TEMPLATE_DMG=/tmp/ZeroBraneStudio-template.dmg
+BUILT_DMG=ZeroBraneStudio.dmg
+WKDIR=/tmp/zbs-build
+
+# remove problematic symlink
+rm ../zbstudio/ZeroBraneStudio.app/Contents/ZeroBraneStudio
+
+bunzip2 -kf ZeroBraneStudio.dmg.bz2
+mv ZeroBraneStudio.dmg $TEMPLATE_DMG
+hdiutil attach "${TEMPLATE_DMG}" -noautoopen -quiet -mountpoint "${WKDIR}"
+
+rm -rf "${WKDIR}/ZeroBraneStudio.app"
+
+# copy the app to where it should be
+cp -pr "../zbstudio/ZeroBraneStudio.app" "${WKDIR}/ZeroBraneStudio.app"
+
+mkdir "${WKDIR}/ZeroBraneStudio.app/Contents/ZeroBraneStudio"
+
+# only pick the files listed in manifests and 'myprograms' (if exists)
+if [[ -d ../myprograms ]]; then MYPROGRAMS=$(cd ..; find myprograms -iname *.lua); fi
+(cd ".."; tar cf - $MYPROGRAMS $(< zbstudio/MANIFEST) $(< zbstudio/MANIFEST-bin-macos) | (cd "${WKDIR}/ZeroBraneStudio.app/Contents/ZeroBraneStudio/"; tar xf -))
+
+codesign -s "ZeroBrane LLC" ${WKDIR}/ZeroBraneStudio.app
+codesign --signature-size 6400 -s "ZeroBrane LLC" ${WKDIR}/ZeroBraneStudio.app/Contents/ZeroBraneStudio/bin/lua.app
+
+# clean up
+sudo rm -rf "${WKDIR}/.Trashes"
+sudo rm -rf "${WKDIR}/.fseventsd"
+
+hdiutil detach "${WKDIR}" -quiet -force
+hdiutil convert "${TEMPLATE_DMG}" -quiet -format UDZO -imagekey zlib-level=9 -o "${BUILT_DMG}"
+
+rm -f "${TEMPLATE_DMG}"
+
+cd ../zbstudio/ZeroBraneStudio.app/Contents
+ln -s ../../.. ZeroBraneStudio
+
+echo Built ${BUILT_DMG}.

build/install-deb.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+sudo apt-get install gdebi
+sudo gdebi wxlua*.deb

build/win32_starter.c

@@ -4,7 +4,7 @@
 // (providing a single exe file in our main directory without
 // polluting it with all these dlls located in the /bin folder)
 
-#ifdef __MINGW__ /* not sure if this is the *official* define */
+#ifdef __MINGW32__
 #define _WIN32_WINNT 0x0502
 #endif
 

cfg/estrela.lua

@@ -1,9 +1,15 @@
+local G = ... -- point to the global environment in the script
+-- update app configuration to load all tools, specs, and interpreters
+G.ide.app.loadfilters.tools = function() return true end
+G.ide.app.loadfilters.specs = function() return true end
+G.ide.app.loadfilters.interpreters = function() return true end
+
 local luxpath = os.getenv("LUXINIA")
 path.luxinia = luxpath and luxpath.."/" or "../luxinia/engine/"
 local luxpath2 = os.getenv("LUXINIA2")
 path.luxinia2 = luxpath2 and luxpath2.."/" or "../luxinia2/runtime/bin_Windows_x86/"
 
-interpreter = "estrelashell"
+interpreter = "luadeb"
 
 editor.fontname = "Courier New"
 editor.caretline = true

cfg/user-sample.lua

@@ -1,30 +1,31 @@
---[[-- Rename this file to `user.lua` to get loaded
+--[[-- Copy required content from this file to `user.lua`
 
 Configuration files are loaded in the following order
 
 1. <application>\config.lua
 2. cfg\user.lua
-3. ~\.zbs\user.lua
+3. ~\.zbstudio\user.lua
 4. -cfg commandline strings
 
+--]]--
+
 -- an example of how loaded configuration can be modified from this file
 
-local G = ... -- this now points to the global environment in the script
-local luaspec = G.ide.specs['lua']
-luaspec.exts[2] = "luaz"
-luaspec.keywords[1] = luaspec.keywords[1] .. ' foo'
-
 -- change font size to 12
 editor.fontsize = 12 -- this is mapped to ide.config.editor.fontsize
+editor.fontname = "Courier New"
 filehistorylength = 20 -- this is mapped to ide.config.filehistorylength
 
--- specify full path to love2d executable; this is only needed
+-- specify full path to love2d *executable*; this is only needed
 -- if the game folder and the executable are NOT in the same folder.
 path.love2d = 'd:/lua/love/love'
 
--- specify full path to moai executable if it's not in one of PATH folders
+-- specify full path to moai *executable* if it's not in one of PATH folders
 path.moai = 'd:/lua/moai/moai'
 
+-- specify full path to gideros *executable* if it's not in one of PATH folders
+path.gideros = 'd:/Program Files/Gideros/GiderosPlayer.exe'
+
 -- specify full path to lua interpreter if you need to use your own version
 path.lua = 'd:/lua/lua'
 
@@ -32,4 +33,21 @@ path.lua = 'd:/lua/lua'
 -- which may negatively affect breakpoints during debugging
 editor.iofilter = "0d0d0aFix"
 
---]]--
+-- to have 4 spaces when TAB is used in the editor
+editor.tabwidth = 4
+
+-- to have TABs stored in the file (to allow mixing tabs and spaces)
+editor.usetabs  = true
+
+-- to disable wrapping of long lines in the editor
+editor.usewrap = false
+
+-- to turn dynamic words on and to start suggestions after 4 characters
+acandtip.nodynwords = false
+acandtip.startat = 4
+
+-- to automatically open files requested during debugging
+editor.autoactivate = true
+
+-- specify a list of MOAI entrypoints
+moai = { entrypoints = { "main.lua", "source/main.lua" } }

estrela/app.lua

@@ -1,29 +0,0 @@
-local ide = ide
-local app = {
-
-  loadfilters = {
-    tools = function(file) return true end,
-    specs = function(file) return true end,
-    interpreters = function(file) return true end,
-  },
-
-  postinit = function ()
-    dofile("estrela/menu_help.lua")
-  
-    local icon = wx.wxIcon()
-    icon:LoadFile("estrela/res/estrela.ico",wx.wxBITMAP_TYPE_ICO)
-    ide.frame:SetIcon(icon)
-  end,
-  
-  stringtable = {
-    editor = "Estrela Editor",
-    about = "About Estrela Editor",
-    editormessage = "Estrela Editor Message",
-    statuswelcome = "Welcome to Estrela Editor",
-    settingsapp = "EstrelaEditor",
-    settingsvendor = "LuxiniaDev",
-  },
-  
-}
-
-return app

estrela/buildcbwin/win32_starter.cbp

@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<CodeBlocks_project_file>
-	<FileVersion major="1" minor="6" />
-	<Project>
-		<Option title="starter" />
-		<Option pch_mode="2" />
-		<Option compiler="gcc" />
-		<Build>
-			<Target title="Debug">
-				<Option output="..\..\estrela" prefix_auto="1" extension_auto="1" />
-				<Option working_dir="..\..\" />
-				<Option object_output="obj\Debug\" />
-				<Option type="1" />
-				<Option compiler="gcc" />
-				<Option use_console_runner="0" />
-				<Compiler>
-					<Add option="-g" />
-				</Compiler>
-			</Target>
-			<Target title="Release">
-				<Option output="..\..\estrela" prefix_auto="1" extension_auto="1" />
-				<Option working_dir="..\..\" />
-				<Option object_output="obj\Release\" />
-				<Option type="0" />
-				<Option compiler="gcc" />
-				<Compiler>
-					<Add option="-O2" />
-				</Compiler>
-				<Linker>
-					<Add option="-s" />
-				</Linker>
-			</Target>
-		</Build>
-		<Compiler>
-			<Add option="-Wall" />
-			<Add option="-D__MINGW__" />
-		</Compiler>
-		<Linker>
-			<Add library="kernel32" />
-		</Linker>
-		<Unit filename="..\res\estrela.ico" />
-		<Unit filename="..\res\estrela.rc">
-			<Option compilerVar="WINDRES" />
-		</Unit>
-		<Unit filename="..\win32_starter.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Extensions>
-			<code_completion />
-			<envvars />
-			<debugger />
-		</Extensions>
-	</Project>
-</CodeBlocks_project_file>

estrela/buildvc9/win32_starter.vcproj

@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="estrela_editor"
-	ProjectGUID="{065C5DC6-EAE4-4A57-9069-39810D816C41}"
-	RootNamespace="luxinia_glfw"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories=""
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				AdditionalIncludeDirectories=""
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies=""
-				OutputFile="../../estrela.exe"
-				LinkIncremental="2"
-				AdditionalLibraryDirectories=""
-				IgnoreDefaultLibraryNames="libc"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(TargetPath).pdb"
-				SubSystem="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories=""
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;"
-				RuntimeLibrary="0"
-				EnableEnhancedInstructionSet="0"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				AdditionalIncludeDirectories=""
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies=""
-				OutputFile="../../estrela.exe"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories=""
-				GenerateManifest="true"
-				IgnoreAllDefaultLibraries="false"
-				IgnoreDefaultLibraryNames=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(TargetPath).pdb"
-				SubSystem="2"
-				OptimizeReferences="0"
-				EnableCOMDATFolding="0"
-				RandomizedBaseAddress="0"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Sources"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\win32_starter.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Ressourcendateien"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-			<File
-				RelativePath="..\..\res\estrela.rc"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

estrela/menu_help.lua

@@ -1,113 +0,0 @@
--- authors: Lomtik Software (J. Winwood & John Labenski)
---          Luxinia Dev (Eike Decker & Christoph Kubisch)
----------------------------------------------------------
-local ide = ide
--- ---------------------------------------------------------------------------
--- Create the Help menu and attach the callback functions
-
-local frame    = ide.frame
-local menuBar  = frame.menuBar
-
-local helpMenu = wx.wxMenu{
-		{ ID_ABOUT,      "&About\tF1",       "About Estrela Editor" },
-		}
-menuBar:Append(helpMenu, "&Help")
-
-local function DisplayAbout(event)
-	local page = [[
-		<html>
-		<body bgcolor = "#ffffff" text='#ffffff'>
-		<table border='0' width="100%">
-		  <tr><td><img src = "estrela/res/estrela.png"></center></td><td>
-		<table cellspacing = 4 cellpadding = 4 width = "400">
-		  <tr>
-			<td bgcolor = "#010156">
-			<center>
-				<font size = +2 color = "#FFFFFF"><br><b>]]..
-					wxlua.wxLUA_VERSION_STRING..[[</b></font>
-				<font size = +1 color = "#FFFFFF">built with</font>
-				<font size = +2 color = "#FFFFFF"><b>]]..
-					wx.wxVERSION_STRING..[[</b></font>
-			</center>
-			</td>
-		  </tr>
-		  <tr>
-			<td bgcolor = "#4747A1">
-			<b>Estrela Editor</b><br>
-			<b><font color='#ffffff'>Copyright &copy; 2008-2011 Luxinia DevTeam</font></b>
-			<p>
-			<font size=-1>
-			  <table cellpadding = 0 cellspacing = 0 width = "100%">
-				<tr>
-				  <td width = "65%">
-					Christoph Kubisch<br>
-					Eike Decker<p>
-				  </td>
-				  <td valign = top>
-				  </td>
-				</tr>
-			  </table>
-			<font size = 1>
-				Licensed under The MIT License.
-			</font>
-			</font>
-			</td>
-		  </tr>
-		  <tr>
-			<td bgcolor = "#4747A1">
-			<b>based on wxLua editor sample</b><br>
-			<b>Copyright &copy; 2002-2005 Lomtick Software</b>
-			<p>
-			<font size=-1>
-			  <table cellpadding = 0 cellspacing = 0 width = "100%">
-				<tr>
-				  <td width = "65%">
-					J. Winwood (luascript@thersgb.net)<br>
-					John Labenski<p>
-				  </td>
-				  <td valign = top>
-					<img src = "estrela/res/wxlualogo2.png">
-				  </td>
-				</tr>
-			  </table>
-			<font size = 1>
-				wxLua binding licensed under wxWindows Library License, Version 3.
-			</font>
-			</font>
-			</td>
-		  </tr>
-		</table>
-		</td></tr></table>
-		</body>
-		</html>
-	]]
-
-	local dlg = wx.wxDialog(frame, wx.wxID_ANY, "About Estrela Editor")
-
-	local html = wx.wxLuaHtmlWindow(dlg, wx.wxID_ANY,
-									wx.wxDefaultPosition, wx.wxSize(500, 270),
-									wx.wxHW_SCROLLBAR_NEVER)
-	local line = wx.wxStaticLine(dlg, wx.wxID_ANY)
-	local button = wx.wxButton(dlg, wx.wxID_OK, "OK")
-
-	button:SetDefault()
-
-	html:SetBorders(0)
-	html:SetPage(page)
-	html:SetSize(html:GetInternalRepresentation():GetWidth(),
-				 html:GetInternalRepresentation():GetHeight())
-
-	local topsizer = wx.wxBoxSizer(wx.wxVERTICAL)
-	topsizer:Add(html, 1, wx.wxALL, 10)
-	topsizer:Add(line, 0, wx.wxEXPAND + wx.wxLEFT + wx.wxRIGHT, 10)
-	topsizer:Add(button, 0, wx.wxALL + wx.wxALIGN_RIGHT, 10)
-
-	dlg:SetAutoLayout(true)
-	dlg:SetSizer(topsizer)
-	topsizer:Fit(dlg)
-
-	dlg:ShowModal()
-	dlg:Destroy()
-end
-
-frame:Connect(ID_ABOUT, wx.wxEVT_COMMAND_MENU_SELECTED, DisplayAbout)

estrela/readme.txt

@@ -1,20 +0,0 @@
-Estrela Editor
------------------
-Estrela Editor is a wxLua based IDE. It supports multiple 
-fileformats, "api" for autocompletion and tooltips, and custom 
-commandline tools. Focus is extensibility for target applications 
-using Lua. Its main purpose is as IDE for the 3D engine "Luxinia".
-
-
-
-Commandline:
-------------
-
-Open File(s):
-	<exe> <filename> [<filename>...]
-	any non-option will be treated as filename
-
-Overriding Config:
-	<exe> [...] -cfg "<luacode overriding config>" [...]
-	e.g.: estrela.exe -cfg "singleinstance=false;" somefile.lua
-

estrela/res/estrela.rc

@@ -1 +0,0 @@
-icon ICON "../res/estrela.ico"

estrela/res/idelogo.svg

@@ -1,706 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg2178"
-   sodipodi:version="0.32"
-   inkscape:version="0.46+devel"
-   width="146"
-   height="146"
-   version="1.0"
-   sodipodi:docname="idelogo.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:export-filename="D:\dev\c\tools\wxide\res\estrela.png"
-   inkscape:export-xdpi="36.990002"
-   inkscape:export-ydpi="36.990002">
-  <metadata
-     id="metadata2183">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs2181">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 73 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="146 : 73 : 1"
-       inkscape:persp3d-origin="73 : 48.666667 : 1"
-       id="perspective86" />
-    <linearGradient
-       id="linearGradient4596">
-      <stop
-         style="stop-color:#5151ac;stop-opacity:1;"
-         offset="0"
-         id="stop4598" />
-      <stop
-         style="stop-color:#000055;stop-opacity:1;"
-         offset="1"
-         id="stop4600" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4588">
-      <stop
-         style="stop-color:#62769d;stop-opacity:1;"
-         offset="0"
-         id="stop4590" />
-      <stop
-         style="stop-color:#ff0000;stop-opacity:0;"
-         offset="1"
-         id="stop4592" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5185">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop5187" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1"
-         offset="1"
-         id="stop5189" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2237">
-      <stop
-         style="stop-color:#0d0d3f;stop-opacity:1;"
-         offset="0"
-         id="stop2239" />
-      <stop
-         id="stop3702"
-         offset="0.33628318"
-         style="stop-color:#12127a;stop-opacity:1;" />
-      <stop
-         style="stop-color:#3e3e80;stop-opacity:1"
-         offset="1"
-         id="stop2241" />
-    </linearGradient>
-    <filter
-       inkscape:collect="always"
-       x="-0.13963953"
-       width="1.279279"
-       y="-0.14821953"
-       height="1.2964391"
-       id="filter3840">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="6.5521521"
-         id="feGaussianBlur3842" />
-    </filter>
-    <filter
-       inkscape:collect="always"
-       id="filter6278">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="2.214876"
-         id="feGaussianBlur6280" />
-    </filter>
-    <mask
-       maskUnits="userSpaceOnUse"
-       id="mask6290">
-      <rect
-         style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
-         id="rect6292"
-         width="128"
-         height="128"
-         x="0"
-         y="-8.5265128e-014"
-         ry="13.206349"
-         inkscape:export-filename="c:\temp\logotest"
-         inkscape:export-xdpi="300"
-         inkscape:export-ydpi="300" />
-    </mask>
-    <mask
-       maskUnits="userSpaceOnUse"
-       id="mask6295">
-      <rect
-         style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
-         id="rect6297"
-         width="128"
-         height="128"
-         x="0"
-         y="-8.5265128e-014"
-         ry="13.206349"
-         inkscape:export-filename="c:\temp\logotest"
-         inkscape:export-xdpi="300"
-         inkscape:export-ydpi="300" />
-    </mask>
-    <filter
-       inkscape:collect="always"
-       id="filter6316">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.6425"
-         id="feGaussianBlur6318" />
-    </filter>
-    <filter
-       inkscape:collect="always"
-       x="-0.096865753"
-       width="1.1937315"
-       y="-0.13864499"
-       height="1.27729"
-       id="filter6400">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="5.3595156"
-         id="feGaussianBlur6402" />
-    </filter>
-    <filter
-       inkscape:collect="always"
-       x="-0.091426807"
-       width="1.1828536"
-       y="-0.21857401"
-       height="1.437148"
-       id="filter6510">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="4.3854492"
-         id="feGaussianBlur6512" />
-    </filter>
-    <filter
-       inkscape:collect="always"
-       x="-0.065166176"
-       width="1.1303324"
-       y="-0.14160248"
-       height="1.283205"
-       id="filter6588">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="3.0129427"
-         id="feGaussianBlur6590" />
-    </filter>
-    <filter
-       inkscape:collect="always"
-       x="-0.10324995"
-       width="1.2064999"
-       y="-0.19036609"
-       height="1.3807322"
-       id="filter6628">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="5.1083162"
-         id="feGaussianBlur6630" />
-    </filter>
-    <filter
-       inkscape:collect="always"
-       x="-0.66312472"
-       width="2.3262494"
-       y="-0.13057123"
-       height="1.2611425"
-       id="filter6690">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="2.059841"
-         id="feGaussianBlur6692" />
-    </filter>
-    <filter
-       inkscape:collect="always"
-       x="-0.75290101"
-       width="2.505802"
-       y="-0.11094242"
-       height="1.2218848"
-       id="filter6776">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="2.1015794"
-         id="feGaussianBlur6778" />
-    </filter>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4596"
-       id="linearGradient4602"
-       x1="63.296463"
-       y1="141"
-       x2="63.296463"
-       y2="-5.0469656"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(13.788582,2.1213203)" />
-    <filter
-       inkscape:collect="always"
-       id="filter3377"
-       x="-0.1015625"
-       width="1.203125"
-       y="-0.087053571"
-       height="1.1741071">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="2.7929688"
-         id="feGaussianBlur3379" />
-    </filter>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4596"
-       id="linearGradient3381"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.89166667,0,0,0.89166667,19.638582,9.162987)"
-       x1="63.296463"
-       y1="141"
-       x2="63.296463"
-       y2="-5.0469656" />
-    <filter
-       inkscape:collect="always"
-       id="filter3419"
-       x="-0.10422356"
-       width="1.2084471"
-       y="-0.093260085"
-       height="1.1865202">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="4.0324593"
-         id="feGaussianBlur3421" />
-    </filter>
-    <filter
-       inkscape:collect="always"
-       id="filter3425"
-       x="-0.12187501"
-       width="1.24375"
-       y="-0.10446428"
-       height="1.2089286">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="2.9431967"
-         id="feGaussianBlur3427" />
-    </filter>
-    <filter
-       inkscape:collect="always"
-       id="filter3451"
-       x="-0.1187245"
-       width="1.237449"
-       y="-0.12130321"
-       height="1.2426064">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="7.6549135"
-         id="feGaussianBlur3453" />
-    </filter>
-    <filter
-       height="1.3165256"
-       y="-0.15826278"
-       width="1.3097967"
-       x="-0.15489837"
-       id="filter3467"
-       inkscape:collect="always">
-      <feGaussianBlur
-         id="feGaussianBlur3469"
-         stdDeviation="9.98727"
-         inkscape:collect="always" />
-    </filter>
-    <filter
-       inkscape:collect="always"
-       id="filter3483"
-       x="-0.27362286"
-       width="1.5472457"
-       y="-0.27956598"
-       height="1.559132">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="17.642184"
-         id="feGaussianBlur3485" />
-    </filter>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4596"
-       id="linearGradient3497"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9558335,0,0,0.9558335,16.173573,4.9921428)"
-       x1="63.296463"
-       y1="141"
-       x2="63.296463"
-       y2="-5.0469656" />
-    <filter
-       inkscape:collect="always"
-       id="filter3499"
-       x="-0.059528317"
-       width="1.1190566"
-       y="-0.10133829"
-       height="1.2026766">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="1.667066"
-         id="feGaussianBlur3501" />
-    </filter>
-    <filter
-       inkscape:collect="always"
-       id="filter3509"
-       x="-0.0309375"
-       width="1.061875"
-       y="-2.0109374"
-       height="5.0218749">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="1.3472814"
-         id="feGaussianBlur3511" />
-    </filter>
-  </defs>
-  <sodipodi:namedview
-     inkscape:window-height="719"
-     inkscape:window-width="1024"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0"
-     guidetolerance="10.0"
-     gridtolerance="10.0"
-     objecttolerance="10.0"
-     borderopacity="1.0"
-     bordercolor="#666666"
-     pagecolor="#ffffff"
-     id="base"
-     inkscape:zoom="1"
-     inkscape:cx="74.122861"
-     inkscape:cy="61.737644"
-     inkscape:window-x="-4"
-     inkscape:window-y="-4"
-     inkscape:current-layer="layer2"
-     showborder="true"
-     inkscape:showpageshadow="false"
-     showgrid="false" />
-  <g
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="opacity:0.34615383;display:none"
-     transform="translate(6,5)">
-    <image
-       xlink:href="c:\temp\luxlogo.png"
-       sodipodi:absref="c:\temp\luxlogo.png"
-       width="128"
-       height="128"
-       id="image2185"
-       x="0"
-       y="0" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     style="display:inline"
-     transform="translate(6,5)">
-    <rect
-       y="4.7046537"
-       x="14.288583"
-       height="124.83334"
-       width="107"
-       id="rect3423"
-       style="opacity:1;fill:url(#linearGradient3381);fill-opacity:1;fill-rule:evenodd;stroke:none;filter:url(#filter3425)"
-       transform="matrix(1.0719628,0,0,1.0719628,-4.8782561,-4.8302384)"
-       inkscape:export-filename="D:\dev\c\tools\wxide\res\estrela.png"
-       inkscape:export-xdpi="181.25587"
-       inkscape:export-ydpi="181.25587" />
-    <rect
-       style="opacity:1;fill:url(#linearGradient3497);fill-opacity:1;fill-rule:evenodd;stroke:none"
-       id="rect4586"
-       width="114.70002"
-       height="133.8167"
-       x="10.438573"
-       y="0.21297537"
-       inkscape:export-filename="D:\dev\c\tools\wxide\res\estrela.png"
-       inkscape:export-xdpi="181.25587"
-       inkscape:export-ydpi="181.25587" />
-    <g
-       id="g3227"
-       transform="matrix(0.36255137,0,0,0.36255137,43.548278,21.953343)"
-       inkscape:export-filename="D:\dev\c\tools\wxide\res\estrela.png"
-       inkscape:export-xdpi="181.25587"
-       inkscape:export-ydpi="181.25587">
-      <g
-         id="g2599"
-         transform="matrix(0.73621364,0,0,0.73621364,15.540372,-36.334537)">
-        <path
-           sodipodi:nodetypes="csscssc"
-           style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="M 19.37247,3.0246539 C -16.608082,20.649318 -41.404147,57.657551 -41.404147,100.40056 c 0,59.80351 48.5400427,108.34356 108.343566,108.34356 40.892381,0 76.510811,-22.69984 94.952061,-56.1714 -15.59146,8.96867 -33.63299,14.11858 -52.89924,14.11858 C 50.276054,166.69131 2.5877015,119.06356 2.5877015,60.347369 c 0,-21.110232 6.1656802,-40.772917 16.7847685,-57.3227151 z"
-           id="path2193"
-           inkscape:export-filename="c:\temp\logotest"
-           inkscape:export-xdpi="300"
-           inkscape:export-ydpi="300" />
-        <path
-           style="fill:#ffffff;fill-rule:evenodd;stroke:none"
-           d="m 46.59366,22.910342 11.81888,0 9.19246,-10.505671 5.252837,14.445294 11.818878,1.969814 -11.818878,9.192463 0.656603,13.132087 -11.81888,-9.849067 -11.818877,3.939627 4.59623,-11.818877 -7.879253,-10.50567 z"
-           id="path2205"
-           inkscape:export-filename="c:\temp\logotest"
-           inkscape:export-xdpi="300"
-           inkscape:export-ydpi="300" />
-        <path
-           style="fill:#ffffff;fill-rule:evenodd;stroke:none"
-           d="m 113.62886,82.661339 13.7887,-14.445296 -5.25284,-19.69813 18.38488,8.535854 15.10187,-10.505668 -1.9698,19.698131 15.1019,12.475482 -19.04153,4.596232 -7.87924,15.758505 -8.53582,-16.41511 -19.69812,0 z"
-           id="path2207"
-           inkscape:export-filename="c:\temp\logotest"
-           inkscape:export-xdpi="300"
-           inkscape:export-ydpi="300" />
-        <path
-           style="fill:#ffffff;fill-rule:evenodd;stroke:none;display:inline"
-           d="m 84.710796,92.101734 3.261705,-2.372978 0.427566,-4.744945 4.349957,2.931871 3.6572,-1.829365 -1.416054,4.909864 2.817849,3.492287 -5.239188,-0.345107 -2.470713,3.460214 -1.104536,-4.184532 -4.283786,-1.317309 z"
-           id="path2209"
-           inkscape:export-filename="c:\temp\logotest"
-           inkscape:export-xdpi="300"
-           inkscape:export-ydpi="300" />
-      </g>
-    </g>
-    <text
-       xml:space="preserve"
-       style="font-size:29.89867401px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Palatino Linotype;-inkscape-font-specification:Palatino Linotype"
-       x="66.859642"
-       y="95.922615"
-       id="text2585"
-       sodipodi:linespacing="100%"
-       inkscape:export-filename="D:\dev\c\tools\wxide\res\estrela.png"
-       inkscape:export-xdpi="181.25587"
-       inkscape:export-ydpi="181.25587"><tspan
-         sodipodi:role="line"
-         id="tspan2587"
-         x="66.859642"
-         y="95.922615">Estrela</tspan><tspan
-         sodipodi:role="line"
-         x="66.859642"
-         y="125.82129"
-         id="tspan2589">Editor</tspan></text>
-    <rect
-       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;"
-       id="rect3383"
-       width="104.51637"
-       height="1.6079443"
-       x="15.530396"
-       y="99.936134"
-       inkscape:export-filename="D:\dev\c\tools\wxide\res\estrela.png"
-       inkscape:export-xdpi="181.25587"
-       inkscape:export-ydpi="181.25587" />
-    <g
-       transform="matrix(0.36255137,0,0,0.36255137,43.548278,21.953343)"
-       id="g3439"
-       style="filter:url(#filter3451)"
-       inkscape:export-filename="D:\dev\c\tools\wxide\res\estrela.png"
-       inkscape:export-xdpi="181.25587"
-       inkscape:export-ydpi="181.25587">
-      <g
-         transform="matrix(0.73621364,0,0,0.73621364,15.540372,-36.334537)"
-         id="g3441">
-        <path
-           inkscape:export-ydpi="300"
-           inkscape:export-xdpi="300"
-           inkscape:export-filename="c:\temp\logotest"
-           id="path3443"
-           d="M 19.37247,3.0246539 C -16.608082,20.649318 -41.404147,57.657551 -41.404147,100.40056 c 0,59.80351 48.5400427,108.34356 108.343566,108.34356 40.892381,0 76.510811,-22.69984 94.952061,-56.1714 -15.59146,8.96867 -33.63299,14.11858 -52.89924,14.11858 C 50.276054,166.69131 2.5877015,119.06356 2.5877015,60.347369 c 0,-21.110232 6.1656802,-40.772917 16.7847685,-57.3227151 z"
-           style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           sodipodi:nodetypes="csscssc" />
-        <path
-           inkscape:export-ydpi="300"
-           inkscape:export-xdpi="300"
-           inkscape:export-filename="c:\temp\logotest"
-           id="path3445"
-           d="m 46.59366,22.910342 11.81888,0 9.19246,-10.505671 5.252837,14.445294 11.818878,1.969814 -11.818878,9.192463 0.656603,13.132087 -11.81888,-9.849067 -11.818877,3.939627 4.59623,-11.818877 -7.879253,-10.50567 z"
-           style="fill:#ffffff;fill-rule:evenodd;stroke:none" />
-        <path
-           inkscape:export-ydpi="300"
-           inkscape:export-xdpi="300"
-           inkscape:export-filename="c:\temp\logotest"
-           id="path3447"
-           d="m 113.62886,82.661339 13.7887,-14.445296 -5.25284,-19.69813 18.38488,8.535854 15.10187,-10.505668 -1.9698,19.698131 15.1019,12.475482 -19.04153,4.596232 -7.87924,15.758505 -8.53582,-16.41511 -19.69812,0 z"
-           style="fill:#ffffff;fill-rule:evenodd;stroke:none" />
-        <path
-           inkscape:export-ydpi="300"
-           inkscape:export-xdpi="300"
-           inkscape:export-filename="c:\temp\logotest"
-           id="path3449"
-           d="m 84.710796,92.101734 3.261705,-2.372978 0.427566,-4.744945 4.349957,2.931871 3.6572,-1.829365 -1.416054,4.909864 2.817849,3.492287 -5.239188,-0.345107 -2.470713,3.460214 -1.104536,-4.184532 -4.283786,-1.317309 z"
-           style="fill:#ffffff;fill-rule:evenodd;stroke:none;display:inline" />
-      </g>
-    </g>
-    <g
-       style="filter:url(#filter3467)"
-       id="g3455"
-       transform="matrix(0.36255137,0,0,0.36255137,43.548278,21.953343)"
-       inkscape:export-filename="D:\dev\c\tools\wxide\res\estrela.png"
-       inkscape:export-xdpi="181.25587"
-       inkscape:export-ydpi="181.25587">
-      <g
-         id="g3457"
-         transform="matrix(0.73621364,0,0,0.73621364,15.540372,-36.334537)">
-        <path
-           sodipodi:nodetypes="csscssc"
-           style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="M 19.37247,3.0246539 C -16.608082,20.649318 -41.404147,57.657551 -41.404147,100.40056 c 0,59.80351 48.5400427,108.34356 108.343566,108.34356 40.892381,0 76.510811,-22.69984 94.952061,-56.1714 -15.59146,8.96867 -33.63299,14.11858 -52.89924,14.11858 C 50.276054,166.69131 2.5877015,119.06356 2.5877015,60.347369 c 0,-21.110232 6.1656802,-40.772917 16.7847685,-57.3227151 z"
-           id="path3459"
-           inkscape:export-filename="c:\temp\logotest"
-           inkscape:export-xdpi="300"
-           inkscape:export-ydpi="300" />
-        <path
-           style="fill:#ffffff;fill-rule:evenodd;stroke:none"
-           d="m 46.59366,22.910342 11.81888,0 9.19246,-10.505671 5.252837,14.445294 11.818878,1.969814 -11.818878,9.192463 0.656603,13.132087 -11.81888,-9.849067 -11.818877,3.939627 4.59623,-11.818877 -7.879253,-10.50567 z"
-           id="path3461"
-           inkscape:export-filename="c:\temp\logotest"
-           inkscape:export-xdpi="300"
-           inkscape:export-ydpi="300" />
-        <path
-           style="fill:#ffffff;fill-rule:evenodd;stroke:none"
-           d="m 113.62886,82.661339 13.7887,-14.445296 -5.25284,-19.69813 18.38488,8.535854 15.10187,-10.505668 -1.9698,19.698131 15.1019,12.475482 -19.04153,4.596232 -7.87924,15.758505 -8.53582,-16.41511 -19.69812,0 z"
-           id="path3463"
-           inkscape:export-filename="c:\temp\logotest"
-           inkscape:export-xdpi="300"
-           inkscape:export-ydpi="300" />
-        <path
-           style="fill:#ffffff;fill-rule:evenodd;stroke:none;display:inline"
-           d="m 84.710796,92.101734 3.261705,-2.372978 0.427566,-4.744945 4.349957,2.931871 3.6572,-1.829365 -1.416054,4.909864 2.817849,3.492287 -5.239188,-0.345107 -2.470713,3.460214 -1.104536,-4.184532 -4.283786,-1.317309 z"
-           id="path3465"
-           inkscape:export-filename="c:\temp\logotest"
-           inkscape:export-xdpi="300"
-           inkscape:export-ydpi="300" />
-      </g>
-    </g>
-    <g
-       transform="matrix(0.36255137,0,0,0.36255137,43.548278,21.953343)"
-       id="g3471"
-       style="filter:url(#filter3483)"
-       inkscape:export-filename="D:\dev\c\tools\wxide\res\estrela.png"
-       inkscape:export-xdpi="181.25587"
-       inkscape:export-ydpi="181.25587">
-      <g
-         transform="matrix(0.73621364,0,0,0.73621364,15.540372,-36.334537)"
-         id="g3473">
-        <path
-           inkscape:export-ydpi="300"
-           inkscape:export-xdpi="300"
-           inkscape:export-filename="c:\temp\logotest"
-           id="path3475"
-           d="M 19.37247,3.0246539 C -16.608082,20.649318 -41.404147,57.657551 -41.404147,100.40056 c 0,59.80351 48.5400427,108.34356 108.343566,108.34356 40.892381,0 76.510811,-22.69984 94.952061,-56.1714 -15.59146,8.96867 -33.63299,14.11858 -52.89924,14.11858 C 50.276054,166.69131 2.5877015,119.06356 2.5877015,60.347369 c 0,-21.110232 6.1656802,-40.772917 16.7847685,-57.3227151 z"
-           style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           sodipodi:nodetypes="csscssc" />
-        <path
-           inkscape:export-ydpi="300"
-           inkscape:export-xdpi="300"
-           inkscape:export-filename="c:\temp\logotest"
-           id="path3477"
-           d="m 46.59366,22.910342 11.81888,0 9.19246,-10.505671 5.252837,14.445294 11.818878,1.969814 -11.818878,9.192463 0.656603,13.132087 -11.81888,-9.849067 -11.818877,3.939627 4.59623,-11.818877 -7.879253,-10.50567 z"
-           style="fill:#ffffff;fill-rule:evenodd;stroke:none" />
-        <path
-           inkscape:export-ydpi="300"
-           inkscape:export-xdpi="300"
-           inkscape:export-filename="c:\temp\logotest"
-           id="path3479"
-           d="m 113.62886,82.661339 13.7887,-14.445296 -5.25284,-19.69813 18.38488,8.535854 15.10187,-10.505668 -1.9698,19.698131 15.1019,12.475482 -19.04153,4.596232 -7.87924,15.758505 -8.53582,-16.41511 -19.69812,0 z"
-           style="fill:#ffffff;fill-rule:evenodd;stroke:none" />
-        <path
-           inkscape:export-ydpi="300"
-           inkscape:export-xdpi="300"
-           inkscape:export-filename="c:\temp\logotest"
-           id="path3481"
-           d="m 84.710796,92.101734 3.261705,-2.372978 0.427566,-4.744945 4.349957,2.931871 3.6572,-1.829365 -1.416054,4.909864 2.817849,3.492287 -5.239188,-0.345107 -2.470713,3.460214 -1.104536,-4.184532 -4.283786,-1.317309 z"
-           style="fill:#ffffff;fill-rule:evenodd;stroke:none;display:inline" />
-      </g>
-    </g>
-    <text
-       sodipodi:linespacing="100%"
-       id="text3487"
-       y="93.989136"
-       x="66.922005"
-       style="font-size:27.89152144999999900px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Palatino Linotype;-inkscape-font-specification:Palatino Linotype;filter:url(#filter3499);opacity:1"
-       xml:space="preserve"
-       transform="matrix(1.0719628,0,0,1.0719628,-4.8782561,-4.8302384)"
-       inkscape:export-filename="D:\dev\c\tools\wxide\res\estrela.png"
-       inkscape:export-xdpi="181.25587"
-       inkscape:export-ydpi="181.25587"><tspan
-         y="93.989136"
-         x="66.922005"
-         id="tspan3489"
-         sodipodi:role="line">Estrela</tspan><tspan
-         id="tspan3491"
-         y="121.88066"
-         x="66.922005"
-         sodipodi:role="line">Editor</tspan></text>
-    <rect
-       y="99.936134"
-       x="15.530396"
-       height="1.6079443"
-       width="104.51637"
-       id="rect3507"
-       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter3509)"
-       inkscape:export-xdpi="181.25587"
-       inkscape:export-ydpi="181.25587"
-       inkscape:export-filename="D:\dev\c\tools\wxide\res\estrela.png" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer4"
-     inkscape:label="uninstall"
-     style="opacity:0.87179488;display:none">
-    <path
-       style="opacity:0.90909095;fill:#ff0000;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter6628)"
-       d="M 14,129.5 C 14.336023,78.681123 10.223888,102.29852 28,126 C 30.459675,129.27957 31.666667,118.66667 33.5,115 C 34.280157,113.43969 60.370804,77.40912 51.5,105.5 C 50.690734,108.06268 52.166667,110.83333 52.5,113.5 C 53.627928,122.52343 58.069819,95.430181 64.5,89 C 77.260993,76.239007 72.034223,53.027263 77.5,84 C 81.920823,109.05133 73.638657,88.715336 86.5,85.5 C 115.4259,78.268526 69.170508,123.74712 95.5,104 C 128.78796,79.03403 116,64.235283 116,113.5 C 116,117.62311 118,105.5 119,101.5 C 121.13437,92.962501 126.33333,117.5 130,125.5 C 130.87839,127.41648 131.33333,121.5 132,119.5 C 133.424,115.228 131.66667,128.5 131.5,133"
-       id="path6594"
-       transform="matrix(1,0,0,1.6987359,0,-92.931881)" />
-    <path
-       style="opacity:0.81404952;fill:#ff0000;fill-rule:nonzero;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline;filter:url(#filter6400)"
-       d="M 9.5,127 C 9.3333333,127 9.1666667,127 9,127 C 5.1450826,127 5,115.26288 5,113 C 5,108.88399 4.5,104.31286 4.5,100 C 4.5,90.729345 9.3911698,86.181384 14,78.5 C 16.525846,74.290257 21.294069,70.176551 23.5,66.5 C 24.010025,65.649958 19.12736,72.1816 18,75 C 16.175585,79.561038 16.938863,85.255452 18,89.5 C 19.417577,95.17031 20.550245,97.050245 24.5,101 C 27.204082,103.70408 28.564013,105.87197 30.5,102 C 32.717007,97.565986 32.821681,88.213274 34,83.5 C 36.21779,74.628838 33.5,60.648945 33.5,51.5 C 33.5,51.084452 43.746631,33.513476 40.5,46.5 C 37.526688,58.393246 42.328731,65.743097 48.5,75 C 57.52302,88.53453 51.657407,61.728395 65.5,52.5 C 75.452786,45.864809 69.5,56.563364 69.5,63.5 C 69.5,97.806907 73.726993,52.544988 80,63 C 104.74932,104.24887 98.5,68.637999 98.5,48 C 98.5,43.548461 105.9654,52.637713 112,63.5 C 131.67898,98.922169 101.60755,95.392446 125.5,71.5 C 131.39727,65.602731 126.5,88.160003 126.5,96.5 C 126.5,103.50198 126.00977,110.56839 127,117.5 C 127.95497,124.1848 139.22574,81.791102 137,108.5 C 136.48054,114.73353 136,120.29333 136,126.5 C 136,131.40801 136.45529,134 131,134 C 124.83333,134 118.66667,134 112.5,134 C 106.66667,134 100.83333,134 95,134 C 87.666667,134 80.333333,134 73,134 C 59.815481,134 46.676285,134.5 33.5,134.5 C 29,134.5 24.5,134.5 20,134.5 C 17.560468,134.5 15.299427,130.79943 14.5,130 C 12.881524,128.38152 11.876707,127.47534 9.5,127 z "
-       id="path6360" />
-    <path
-       style="opacity:0.7892562;fill:#ffff00;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter6510)"
-       d="M 18,133 C 17.666667,128.16667 17.333333,123.33333 17,118.5 C 16.12131,105.759 12.392768,108.83915 20.5,121 C 26.928487,130.64273 27.121348,121.87865 34.5,114.5 C 40.14466,108.85534 28.809035,133.69097 46.5,116 C 69.437036,93.062964 57.251105,73.257733 62,106.5 C 62.141421,107.48995 62,108.5 62,109.5 C 62,116.18839 65.961948,99.019026 77,93.5 C 84.016889,89.991555 79.782388,94.911939 82,106 C 84.489642,118.44821 104.6601,90.259847 107.5,86 C 108.99663,83.755053 110.63899,106.80503 109.5,112.5 C 107.85301,120.73495 118.5,80.922943 118.5,109 C 118.5,136.59389 130.5,113.97346 130.5,123.5 C 130.5,126.59415 130.47115,131.64424 130,134"
-       id="path6404" />
-    <path
-       style="opacity:0.47107436;fill:#ffff00;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter6588)"
-       d="M 23,129.5 C 23,132.18128 23.707157,117.52684 20.5,105.5 C 18.755021,98.956331 22.5,82.949866 22.5,98 C 22.5,101.13302 26.815124,126.46219 32,113.5 C 37.373635,100.06591 49.880495,78.048761 46.5,86.5 C 45.909734,87.975665 37.7573,136.7281 47.5,107.5 C 47.857122,106.42863 51.414918,124.58508 58,118 C 68.456644,107.54336 70,50.914151 70,100.5 C 70,131.81187 78.663987,96.334003 94,92.5 C 101.72907,90.567732 88.111037,107.55652 87.5,115.5 C 87.384247,117.00479 87.833333,118.5 88,120 C 89.236992,131.13293 100.98113,100.50944 111,95.5 C 121.54122,90.229389 111.5,106.05757 111.5,112 C 111.5,113.79505 112.83333,115.33333 113.5,117 C 114.6363,119.84076 116.5,111.66667 118,109 C 127.18664,92.668192 120.25003,138.81244 129.5,118 C 129.81325,117.2952 131,128.12728 131,131.5"
-       id="path6514"
-       transform="matrix(1,0,0,1.558102,0,-73.390417)" />
-    <path
-       style="opacity:0.73966944;fill:#ffa500;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter6690)"
-       d="M 98.5,75 C 103.15482,68.57691 90.320092,24.848129 101.5,40.5 C 102.88049,42.432688 106.61962,69.035283 102,72.5 C 100.85302,73.360232 99.666667,74.166667 98.5,75 z "
-       id="path6632" />
-    <path
-       style="opacity:0.94214872;fill:#ffba00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter6776)"
-       d="M 51,68 C 45.233621,73.766379 50.387595,36.449622 50.5,36 C 53.115126,25.539495 57.714899,13.962753 49.5,34.5 C 44.403872,47.24032 50.084923,57.754768 53.5,68 C 53.763523,68.790569 51.833333,68 51,68 z "
-       id="path6696" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="border"
-     style="display:none">
-    <rect
-       transform="translate(6,5)"
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline;filter:url(#filter6316)"
-       id="rect6282"
-       width="128"
-       height="128"
-       x="0"
-       y="-8.5265128e-014"
-       ry="13.206349"
-       inkscape:export-filename="c:\temp\logotest"
-       inkscape:export-xdpi="300"
-       inkscape:export-ydpi="300" />
-    <rect
-       transform="translate(6,5)"
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:6;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline;filter:url(#filter6278)"
-       id="rect4190"
-       width="128"
-       height="128"
-       x="0"
-       y="-8.5265128e-014"
-       ry="13.206349"
-       inkscape:export-filename="c:\temp\logotest"
-       inkscape:export-xdpi="300"
-       inkscape:export-ydpi="300"
-       mask="url(#mask6290)" />
-    <rect
-       transform="translate(6,5)"
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
-       id="rect5203"
-       width="128"
-       height="128"
-       x="0"
-       y="-8.5265128e-014"
-       ry="13.206349"
-       inkscape:export-filename="c:\temp\logotest"
-       inkscape:export-xdpi="300"
-       inkscape:export-ydpi="300"
-       mask="url(#mask6295)" />
-  </g>
-</svg>

estrela/res/wxlogo.svg

@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="204.22055"
-   height="96.006279"
-   id="svg3513"
-   sodipodi:version="0.32"
-   inkscape:version="0.46+devel"
-   version="1.0"
-   inkscape:export-filename="D:\dev\c\tools\wxide\res\wxlualogo2.png"
-   inkscape:export-xdpi="59.996075"
-   inkscape:export-ydpi="59.996075"
-   sodipodi:docname="wxlogo.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs3515">
-    <linearGradient
-       id="linearGradient3538">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3540" />
-      <stop
-         style="stop-color:#e3e3eb;stop-opacity:1;"
-         offset="1"
-         id="stop3542" />
-    </linearGradient>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective3521" />
-    <inkscape:perspective
-       id="perspective3530"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3538"
-       id="linearGradient3544"
-       x1="88.214287"
-       y1="0.2142856"
-       x2="88.214287"
-       y2="81.130592"
-       gradientUnits="userSpaceOnUse" />
-    <filter
-       inkscape:collect="always"
-       id="filter4057"
-       x="-0.044305418"
-       width="1.0886108"
-       y="-0.10071105"
-       height="1.2014221">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="2.2929748"
-         id="feGaussianBlur4059" />
-    </filter>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="98.55416"
-     inkscape:cy="58.784487"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1024"
-     inkscape:window-height="719"
-     inkscape:window-x="-4"
-     inkscape:window-y="-4" />
-  <metadata
-     id="metadata3518">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Ebene 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-102.354,-435.00191)">
-    <rect
-       ry="12.142858"
-       y="-1.9285716"
-       x="-5"
-       height="85"
-       width="193.21428"
-       id="rect3546"
-       style="opacity:0.5;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter4057)"
-       transform="translate(112.85714,442.43362)" />
-    <rect
-       style="opacity:1;fill:url(#linearGradient3544);fill-opacity:1;fill-rule:nonzero;stroke:none"
-       id="rect3536"
-       width="193.21428"
-       height="85"
-       x="-5"
-       y="-1.9285716"
-       transform="translate(112.85714,442.43362)"
-       ry="12.142858" />
-    <image
-       y="442.43362"
-       x="112.85714"
-       id="image3532"
-       height="77"
-       width="180"
-       sodipodi:absref="D:\dev\c\tools\wxide\res\wxlualogo.png"
-       xlink:href="wxlualogo.png" />
-  </g>
-</svg>

interpreters/estrelaeditor.lua

@@ -1,12 +0,0 @@
-return {
-  name = "Estrela Editor",
-  description = "Estrela Editor as run target (IDE development)",
-  api = {"wxwidgets","baselib"},
-  frun = function(self,wfilename)
-    local cmd = ide.editorFilename and '"'..ide.editorFilename..'" '..(wfilename and wfilename:GetFullPath() or "")..' -cfg "singleinstance=false;"' or nil
-    CommandLineRun(cmd,nil,false,true)
-  end,
-  fprojdir = function(self,wfilename)
-    return wfilename:GetPath(wx.wxPATH_GET_VOLUME)
-  end,
-}

interpreters/gideros.lua

@@ -0,0 +1,121 @@
+local gideros
+local win = ide.osname == "Windows"
+local mac = ide.osname == "Macintosh"
+
+return {
+  name = "Gideros",
+  description = "Gideros mobile platform",
+  api = {"baselib", "gideros"},
+  frun = function(self,wfilename,rundebug)
+    gideros = gideros or ide.config.path.gideros -- check if the path is configured
+    if not gideros then
+      local sep = win and ';' or ':'
+      local default =
+           win and ([[C:\Program Files\Gideros]]..sep..[[D:\Program Files\Gideros]]..sep)
+        or mac and ('/Applications/Gideros Studio/Gideros Player.app/Contents/MacOS'..sep)
+        or ''
+      local path = default
+                 ..(os.getenv('PATH') or '')..sep
+                 ..(os.getenv('HOME') and os.getenv('HOME') .. '/bin' or '')
+      local paths = {}
+      for p in path:gmatch("[^"..sep.."]+") do
+        gideros = gideros or GetFullPathIfExists(p, win and 'GiderosPlayer.exe' or 'Gideros Player')
+        table.insert(paths, p)
+      end
+      if not gideros then
+        DisplayOutput("Can't find gideros executable in any of the folders in PATH: "
+          ..table.concat(paths, ", ").."\n")
+        return
+      end
+    end
+    if gideros and not wx.wxFileName(gideros):FileExists() then
+      DisplayOutput("Can't find the specified gideros executable '"..gideros.."'.\n")
+      return
+    end
+
+    local giderostools = wx.wxFileName.DirName(wx.wxFileName(gideros)
+      :GetPath(wx.wxPATH_GET_VOLUME)
+      ..(win and '/Tools' or '/../../../Gideros Studio.app/Contents/Tools'))
+    giderostools:Normalize()
+    local giderospath = giderostools:GetPath(wx.wxPATH_GET_VOLUME)
+    local gdrbridge = GetFullPathIfExists(giderospath, win and 'gdrbridge.exe' or 'gdrbridge')
+    if not gdrbridge then
+      DisplayOutput("Can't find gideros bridge executable in '"..giderospath.."'.\n")
+      return
+    end
+
+    -- find *.gproj file in the project directory
+    local file
+    for _, proj in ipairs(FileSysGet(self:fworkdir(wfilename).."/*.gproj", wx.wxFILE)) do
+      if file then
+        DisplayOutput("Found multiple .gproj files in the project directory; ignored '"..proj.."'\n")
+      end
+      file = proj
+    end
+    if not file then
+      DisplayOutput("Can't find gideros project file in the project directory.\n")
+      return
+    end
+
+    if rundebug then DebuggerAttachDefault() end
+
+    local cmd = ('"%s"'):format(gideros)
+    -- CommandLineRun(cmd,wdir,tooutput,nohide,stringcallback,uid,endcallback)
+    local pid = CommandLineRun(cmd,self:fworkdir(wfilename),not mac,true,nil,nil,
+      function() ide.debugger.pid = nil end)
+
+    do
+      DisplayOutput("Starting the player and waiting for the bridge to connect at '"..gdrbridge.."'.\n")
+      local cmd = ('"%s" %s'):format(gdrbridge, 'isconnected')
+      local attempts, connected = 12
+      for _ = 1, attempts do
+        local proc = wx.wxProcess()
+        proc:Redirect()
+        proc:Connect(wx.wxEVT_END_PROCESS, function(event) proc = nil end)
+        local bid = wx.wxExecute(cmd, wx.wxEXEC_ASYNC + wx.wxEXEC_MAKE_GROUP_LEADER, proc)
+        if not bid or bid == -1 or bid == 0 then
+          DisplayOutput(("Program unable to run as '%s'\n"):format(cmd))
+          return
+        end
+
+        local streamin = proc:GetInputStream()
+        for _ = 1, 20 do
+          if streamin:CanRead() then
+            connected = tonumber(streamin:Read(4096)) == 1
+            break end
+          wx.wxSafeYield()
+          wx.wxWakeUpIdle()
+          wx.wxMilliSleep(250)
+        end
+
+        if connected then break end
+        if connected == nil and proc then
+          wx.wxProcess.Kill(bid, wx.wxSIGKILL, wx.wxKILL_CHILDREN)
+          wx.wxProcess.Kill(pid, wx.wxSIGKILL, wx.wxKILL_CHILDREN)
+          DisplayOutput("Couldn't connect to the player. Try again or check starting the player and the bridge manually.\n")
+          return
+        end
+      end
+      if not connected then
+        wx.wxProcess.Kill(pid, wx.wxSIGKILL, wx.wxKILL_CHILDREN)
+        DisplayOutput("Couldn't connect after "..attempts.." attempts. Try again or check starting the player manually.\n")
+        return
+      end
+
+      DisplayOutput("Starting project file '"..file.."'.\n")
+
+      cmd = ('"%s" %s "%s"'):format(gdrbridge, 'play', file)
+      wx.wxExecute(cmd, wx.wxEXEC_ASYNC)
+    end
+    return pid
+  end,
+  fprojdir = function(self,wfilename)
+    return wfilename:GetPath(wx.wxPATH_GET_VOLUME)
+  end,
+  fworkdir = function(self,wfilename)
+    return ide.config.path.projectdir or wfilename:GetPath(wx.wxPATH_GET_VOLUME)
+  end,
+  hasdebugger = true,
+  fattachdebug = function(self) DebuggerAttachDefault() end,
+  scratchextloop = true,
+}

interpreters/love2d.lua

@@ -1,5 +1,6 @@
 local love2d
 local win = ide.osname == "Windows"
+local mac = ide.osname == "Macintosh"
 
 return {
   name = "Love2d",
@@ -9,7 +10,12 @@ return {
     love2d = love2d or ide.config.path.love2d -- check if the path is configured
     if not love2d then
       local sep = win and ';' or ':'
-      local path = (os.getenv('PATH') or '')..sep
+      local default =
+           win and ([[C:\Program Files\love]]..sep..[[D:\Program Files\love]]..sep)
+        or mac and ('/Applications/love.app/Contents/MacOS'..sep)
+        or ''
+      local path = default
+                 ..(os.getenv('PATH') or '')..sep
                  ..(GetPathWithSep(self:fworkdir(wfilename)))..sep
                  ..(os.getenv('HOME') and GetPathWithSep(os.getenv('HOME'))..'bin' or '')
       local paths = {}

interpreters/luadeb.lua

@@ -4,8 +4,9 @@ local function exePath()
   local mainpath = ide.editorFilename:gsub("[^/\\]+$","")
   local macExe = mainpath..'bin/lua.app/Contents/MacOS/lua'
   return ide.config.path.lua or
-    (ide.osname == "Windows" and mainpath..[[bin\lua]]
-     or (wx.wxFileExists(macExe) and macExe or mainpath..'bin/lua'))
+        (ide.osname == "Windows" and mainpath..[[bin\lua.exe]]
+     or (ide.osname == "Unix" and [[lua]]) -- using installed lua
+     or (wx.wxFileExists(macExe) and macExe or mainpath..[[bin/lua]]))
 end
 
 return {
@@ -46,4 +47,5 @@ return {
   end,
   hasdebugger = true,
   fattachdebug = function(self) DebuggerAttachDefault() end,
+  scratchextloop = false,
 }

interpreters/moai.lua

@@ -4,12 +4,16 @@ local win = ide.osname == "Windows"
 return {
   name = "Moai",
   description = "Moai mobile platform",
-  api = {"baselib"},
+  api = {"baselib", "moai"},
   frun = function(self,wfilename,rundebug)
     moai = moai or ide.config.path.moai -- check if the path is configured
     if not moai then
       local sep = win and ';' or ':'
-      local path = (os.getenv('PATH') or '')..sep
+      local default =
+           win and ([[C:\Program Files\moai]]..sep..[[D:\Program Files\moai]]..sep)
+        or ''
+      local path = default
+                 ..(os.getenv('PATH') or '')..sep
                  ..(os.getenv('MOAI_BIN') or '')..sep
                  ..(os.getenv('HOME') and os.getenv('HOME') .. '/bin' or '')
       local paths = {}
@@ -81,5 +85,4 @@ return {
   end,
   hasdebugger = true,
   fattachdebug = function(self) DebuggerAttachDefault() end,
-  scratchextloop = true,
 }

lualibs/mobdebug/mobdebug.lua

@@ -1,12 +1,12 @@
 --
--- MobDebug 0.489
+-- MobDebug 0.502
 -- Copyright 2011-12 Paul Kulchenko
 -- Based on RemDebug 1.0 Copyright Kepler Project 2005
 --
 
 local mobdebug = {
   _NAME = "mobdebug",
-  _VERSION = 0.489,
+  _VERSION = 0.502,
   _COPYRIGHT = "Paul Kulchenko",
   _DESCRIPTION = "Mobile Remote Debugger for the Lua programming language",
   port = 8171
@@ -23,9 +23,25 @@ local require = require
 local setmetatable = setmetatable
 local string = string
 local tonumber = tonumber
-local mosync = mosync
-local jit = jit
-local moai = MOAISim
+
+-- if strict.lua is used, then need to avoid referencing some global
+-- variables, as they can be undefined;
+-- use rawget to to avoid complaints from strict.lua at run-time.
+-- it's safe to do the initialization here as all these variables
+-- should get defined values (of any) before the debugging starts.
+-- there is also global 'wx' variable, which is checked as part of
+-- the debug loop as 'wx' can be loaded at any time during debugging.
+local genv = _G or _ENV
+local jit = rawget(genv, "jit")
+local mosync = rawget(genv, "mosync")
+local MOAICoroutine = rawget(genv, "MOAICoroutine")
+
+-- check for OS and convert file names to lower case on windows
+-- (its file system is case insensitive, but case preserving), as setting a
+-- breakpoint on x:\Foo.lua will not work if the file was loaded as X:\foo.lua.
+local iswindows = os.getenv('WINDIR')
+  or (os.getenv('OS') or ''):match('[Ww]indows')
+  or pcall(require, "winapi")
 
 -- this is a socket class that implements maConnect interface
 local function socketMobileLua() 
@@ -163,6 +179,12 @@ if mosync and mosync.EventMonitor then
   mosync.EventMonitor.RunEventLoop = function(self) end
 end
 
+-- turn jit off based on Mike Pall's comment in this discussion:
+-- http://www.freelists.org/post/luajit/Debug-hooks-and-JIT,2
+-- "You need to turn it off at the start if you plan to receive
+-- reliable hook calls at any later point in time."
+if jit and jit.off then jit.off() end
+
 local socket = mosync and socketMobileLua() or (require "socket")
 
 local debug = require "debug"
@@ -182,15 +204,18 @@ local step_over = false
 local step_level = 0
 local stack_level = 0
 local server
+local rset
+local basedir = ""
 local deferror = "execution aborted at default debugee"
 local debugee = function () 
   local a = 1
   for _ = 1, 10 do a = a + 1 end
   error(deferror)
 end
+local function q(s) return s:gsub('([%(%)%.%%%+%-%*%?%[%^%$%]])','%%%1') end
 
 local serpent = (function() ---- include Serpent module for serialization
-local n, v = "serpent", 0.16 -- (C) 2012 Paul Kulchenko; MIT License
+local n, v = "serpent", 0.18 -- (C) 2012 Paul Kulchenko; MIT License
 local c, d = "Paul Kulchenko", "Serializer and pretty printer of Lua data types"
 local snum = {[tostring(1/0)]='1/0 --[[math.huge]]',[tostring(-1/0)]='-1/0 --[[-math.huge]]',[tostring(0/0)]='0/0'}
 local badtype = {thread = true, userdata = true}
@@ -208,14 +233,14 @@ local function s(t, opts)
   local space, maxl = (opts.compact and '' or ' '), (opts.maxlevel or math.huge)
   local comm = opts.comment and (tonumber(opts.comment) or math.huge)
   local seen, sref, syms, symn = {}, {}, {}, 0
-  local function gensym(val) return tostring(val):gsub("[^%w]",""):gsub("(%d%w+)",
-    function(s) if not syms[s] then symn = symn+1; syms[s] = symn end return syms[s] end) end
+  local function gensym(val) return (tostring(val):gsub("[^%w]",""):gsub("(%d%w+)",
+    function(s) if not syms[s] then symn = symn+1; syms[s] = symn end return syms[s] end)) end
   local function safestr(s) return type(s) == "number" and (huge and snum[tostring(s)] or s)
     or type(s) ~= "string" and tostring(s) -- escape NEWLINE/010 and EOF/026
     or ("%q"):format(s):gsub("\010","n"):gsub("\026","\\026") end
   local function comment(s,l) return comm and (l or 0) < comm and ' --[['..tostring(s)..']]' or '' end
   local function globerr(s,l) return globals[s] and globals[s]..comment(s,l) or not fatal
-    and safestr(tostring(s)) or error("Can't serialize "..tostring(s)) end
+    and safestr(select(2, pcall(tostring, s))) or error("Can't serialize "..tostring(s)) end
   local function safename(path, name) -- generates foo.bar, foo[3], or foo['b a r']
     local n = name == nil and '' or name
     local plain = type(n) == "string" and n:match("^[%l%u_][%w_]*$") and not keyword[n]
@@ -227,16 +252,19 @@ local function s(t, opts)
     table.sort(o, function(a,b)
       return (o[a] and 0 or to[type(a)] or 'z')..(tostring(a):gsub("%d+",padnum))
            < (o[b] and 0 or to[type(b)] or 'z')..(tostring(b):gsub("%d+",padnum)) end) end
-  local function val2str(t, name, indent, path, plainindex, level)
+  local function val2str(t, name, indent, insref, path, plainindex, level)
     local ttype, level = type(t), (level or 0)
     local spath, sname = safename(path, name)
     local tag = plainindex and
       ((type(name) == "number") and '' or name..space..'='..space) or
       (name ~= nil and sname..space..'='..space or '')
-    if seen[t] then
+    if seen[t] then -- if already seen and in sref processing,
+      if insref then return tag..seen[t] end -- then emit right away
       table.insert(sref, spath..space..'='..space..seen[t])
       return tag..'nil'..comment('ref', level)
-    elseif badtype[ttype] then return tag..globerr(t, level)
+    elseif badtype[ttype] then
+      seen[t] = spath
+      return tag..globerr(t, level)
     elseif ttype == 'function' then
       seen[t] = spath
       local ok, res = pcall(string.dump, t)
@@ -245,7 +273,7 @@ local function s(t, opts)
       return tag..(func or globerr(t, level))
     elseif ttype == "table" then
       if level >= maxl then return tag..'{}'..comment('max', level) end
-      seen[t] = spath
+      seen[t] = insref or spath -- set path to use as reference
       if next(t) == nil then return tag..'{}'..comment(t, level) end -- table empty
       local maxn, o, out = #t, {}, {}
       for key = 1, maxn do table.insert(o, key) end
@@ -255,14 +283,15 @@ local function s(t, opts)
         local value, ktype, plainindex = t[key], type(key), n <= maxn and not sparse
         if opts.ignore and opts.ignore[value] -- skip ignored values; do nothing
         or sparse and value == nil then -- skipping nils; do nothing
-        elseif ktype == 'table' or ktype == 'function' then
+        elseif ktype == 'table' or ktype == 'function' or badtype[ktype] then
           if not seen[key] and not globals[key] then
-            table.insert(sref, 'local '..val2str(key,gensym(key),indent)) end
-          table.insert(sref, seen[t]..'['..(seen[key] or globals[key] or gensym(key))
-            ..']'..space..'='..space..(seen[value] or val2str(value,nil,indent)))
+            table.insert(sref, 'placeholder')
+            sref[#sref] = 'local '..val2str(key,gensym(key),indent,gensym(key)) end
+          table.insert(sref, 'placeholder')
+          local path = seen[t]..'['..(seen[key] or globals[key] or gensym(key))..']'
+          sref[#sref] = path..space..'='..space..(seen[value] or val2str(value,nil,indent,path))
         else
-          if badtype[ktype] then plainindex, key = true, '['..globerr(key, level+1)..']' end
-          table.insert(out,val2str(value,key,indent,spath,plainindex,level+1))
+          table.insert(out,val2str(value,key,indent,insref,seen[t],plainindex,level+1))
         end
       end
       local prefix = string.rep(indent or '', level)
@@ -322,35 +351,18 @@ end
 
 local function set_breakpoint(file, line)
   if file == '-' and lastfile then file = lastfile end
-  if not breakpoints[file] then
-    breakpoints[file] = {}
-  end
+  if not breakpoints[file] then breakpoints[file] = {} end
   breakpoints[file][line] = true  
 end
 
 local function remove_breakpoint(file, line)
   if file == '-' and lastfile then file = lastfile end
-  if breakpoints[file] then
-    breakpoints[file][line] = nil
-  end
-end
-
--- moai host uses full path in source files whereas the standard lua
--- interpreter uses relative paths this debugger relies on.
--- to check if there is a breakpoint, do a string search (from the end)
--- to find a potentially matching breakpoint.
--- may have false positives, but good enough as only affects moai debugging.
-local function has_breakpoint_moai(file, line)
-  for fname, lines in pairs(breakpoints) do
-    if #file > #fname and file:find('/'..fname, -#fname-1, true)
-    and lines[line] then return true end
-  end
-  return false
+  if breakpoints[file] then breakpoints[file][line] = nil end
 end
 
+-- this file name is already converted to lower case on windows.
 local function has_breakpoint(file, line)
   return breakpoints[file] and breakpoints[file][line]
-    or moai and has_breakpoint_moai(file, line)
 end
 
 local function restore_vars(vars)
@@ -496,13 +508,19 @@ local function debug_hook(event, line)
       lastsource = caller.source
       file = lastsource
       if string.find(file, "@") == 1 then file = string.sub(file, 2) end
-      -- remove references to the current folder (./ or .\)
-      if string.find(file, "%.[/\\]") == 1 then file = string.sub(file, 3) end
+      if iswindows then file = string.lower(file) end
+      file = string.gsub(file, "\\", "/") -- convert slash
+      -- remove references to the current folder (./)
+      if string.find(file, "%./") == 1 then file = string.sub(file, 3)
+      else file = string.gsub(file, '^'..q(basedir), '') end
       -- fix filenames for loaded strings that may contain scripts with newlines
       if string.find(file, "\n") then
         file = string.sub(string.gsub(file, "\n", ' '), 1, 32) -- limit to 32 chars
       end
-      file = string.gsub(file, "\\", "/") -- convert slash
+
+      -- set to true if we got here; this only needs to be done once per
+      -- session, so do it here to at least avoid setting it for every line.
+      seen_hook = true
       lastfile = file
     end
 
@@ -525,11 +543,10 @@ local function debug_hook(event, line)
       (step_into
       or (step_over and stack_level <= step_level)
       or has_breakpoint(file, line)
-      or (socket.select({server}, {}, 0))[server])
+      or (socket.select(rset, nil, 0))[server])
 
     if getin then
       vars = vars or capture_vars()
-      seen_hook = true
       step_into = false
       step_over = false
       status, res = coroutine.resume(coro_debugger, events.BREAK, vars, file, line)
@@ -573,7 +590,7 @@ end
 
 local function debugger_loop(sfile, sline)
   local command
-  local app
+  local app, osname
   local eval_env = {}
   local function emptyWatch () return false end
   local loaded = {}
@@ -581,6 +598,7 @@ local function debugger_loop(sfile, sline)
 
   while true do
     local line, err
+    local wx = rawget(genv, "wx") -- use rawread to make strict.lua happy
     if wx and server.settimeout then server:settimeout(0.1) end
     while true do
       line, err = server:receive()
@@ -590,13 +608,18 @@ local function debugger_loop(sfile, sline)
         if app then
           local win = app:GetTopWindow()
           local inloop = app:IsMainLoopRunning()
+          osname = osname or wx.wxPlatformInfo.Get():GetOperatingSystemFamilyName()
           if win and not inloop then
             -- process messages in a regular way
             -- and exit as soon as the event loop is idle
-            win:Connect(wx.wxEVT_IDLE, function()
+            if osname == 'Unix' then wx.wxTimer(app):Start(10, true) end
+            local exitLoop = function()
               win:Disconnect(wx.wxID_ANY, wx.wxID_ANY, wx.wxEVT_IDLE)
+              win:Disconnect(wx.wxID_ANY, wx.wxID_ANY, wx.wxEVT_TIMER)
               app:ExitMainLoop()
-            end)
+            end
+            win:Connect(wx.wxEVT_IDLE, exitLoop)
+            win:Connect(wx.wxEVT_TIMER, exitLoop)
             app:MainLoop()
           end
         end
@@ -757,6 +780,14 @@ local function debugger_loop(sfile, sline)
         server:send("401 Error in Execution " .. string.len(file) .. "\n")
         server:send(file)
       end
+    elseif command == "BASEDIR" then
+      local _, _, dir = string.find(line, "^[A-Z]+%s+(.+)%s*$")
+      if dir then
+        basedir = dir
+        server:send("200 OK\n")
+      else
+        server:send("400 Bad Request\n")
+      end
     elseif command == "SUSPEND" then
       -- do nothing; it already fulfilled its role
     elseif command == "STACK" then
@@ -803,6 +834,7 @@ local function start(controller_host, controller_port)
 
   server = socket.connect(controller_host, controller_port)
   if server then
+    rset = {server} -- store hash to avoid recreating it later
     -- check if we are called from the debugger as this may happen
     -- when another debugger function calls start(); only check one level deep
     local this = debug.getinfo(1, "S").source
@@ -838,6 +870,8 @@ local function controller(controller_host, controller_port)
   local exitonerror = not skip -- exit if not running a scratchpad
   server = socket.connect(controller_host, controller_port)
   if server then
+    rset = {server} -- store hash to avoid recreating it later
+
     local function report(trace, err)
       local msg = err .. "\n" .. trace
       server:send("401 Error in Execution " .. string.len(msg) .. "\n")
@@ -921,9 +955,6 @@ local function off()
   end
 end
 
-local basedir = ""
-local function q(s) return s:gsub('([%(%)%.%%%+%-%*%?%[%^%$%]])','%%%1') end
-
 -- Handles server debugging commands 
 local function handle(params, client)
   local _, _, command = string.find(params, "^([a-z]+)")
@@ -968,8 +999,9 @@ local function handle(params, client)
   elseif command == "setb" then
     _, _, _, file, line = string.find(params, "^([a-z]+)%s+(.-)%s+(%d+)%s*$")
     if file and line then
+      if iswindows then file = string.lower(file) end
       file = string.gsub(file, "\\", "/") -- convert slash
-      file = string.gsub(file, q(basedir), '') -- remove basedir
+      file = string.gsub(file, '^'..q(basedir), '') -- remove basedir
       if not breakpoints[file] then breakpoints[file] = {} end
       client:send("SETB " .. file .. " " .. line .. "\n")
       if client:receive() == "200 OK" then 
@@ -1004,8 +1036,9 @@ local function handle(params, client)
   elseif command == "delb" then
     _, _, _, file, line = string.find(params, "^([a-z]+)%s+(.-)%s+(%d+)%s*$")
     if file and line then
+      if iswindows then file = string.lower(file) end
       file = string.gsub(file, "\\", "/") -- convert slash
-      file = string.gsub(file, q(basedir), '') -- remove basedir
+      file = string.gsub(file, '^'..q(basedir), '') -- remove basedir
       if not breakpoints[file] then breakpoints[file] = {} end
       client:send("DELB " .. file .. " " .. line .. "\n")
       if client:receive() == "200 OK" then 
@@ -1082,7 +1115,7 @@ local function handle(params, client)
         file:close()
 
         local file = string.gsub(exp, "\\", "/") -- convert slash
-        file = string.gsub(file, q(basedir), '') -- remove basedir
+        file = string.gsub(file, '^'..q(basedir), '') -- remove basedir
         client:send("LOAD " .. string.len(lines) .. " " .. file .. "\n")
         client:send(lines)
       end
@@ -1153,13 +1186,18 @@ local function handle(params, client)
         print("Error in stack information: " .. err)
         return nil, nil, err
       end
-      local stack = func()
+      local ok, stack = pcall(func)
+      if not ok then
+        print("Error in stack information: " .. stack)
+        return nil, nil, stack
+      end
       for _,frame in ipairs(stack) do
         -- remove basedir from short_src or source
         local src = string.gsub(frame[1][2], "\\", "/") -- convert slash
         if string.find(src, "@") == 1 then src = string.sub(src, 2) end
         if string.find(src, "%./") == 1 then src = string.sub(src, 3) end
-        frame[1][2] = string.gsub(src, q(basedir), '') -- remove basedir
+        if iswindows then src = string.lower(src) end
+        frame[1][2] = string.gsub(src, '^'..q(basedir), '') -- remove basedir
         print(serpent.line(frame[1], {comment = false}))
       end
       return stack
@@ -1174,10 +1212,20 @@ local function handle(params, client)
   elseif command == "basedir" then
     local _, _, dir = string.find(params, "^[a-z]+%s+(.+)$")
     if dir then
+      if iswindows then dir = string.lower(dir) end
       dir = string.gsub(dir, "\\", "/") -- convert slash
       if not string.find(dir, "/$") then dir = dir .. "/" end
       basedir = dir
-      print("New base directory is " .. basedir)
+
+      client:send("BASEDIR "..dir.."\n")
+      local resp = client:receive()
+      local _, _, status = string.find(resp, "^(%d+)%s+%w+%s*$")
+      if status == "200" then
+        print("New base directory is " .. basedir)
+      else
+        print("Unknown error")
+        return nil, nil, "Debugger error: unexpected response after BASEDIR"
+      end
     else
       print(basedir)
     end

spec/lua.lua

@@ -3,6 +3,29 @@
 
 local funcdef = "([A-Za-z_][A-Za-z0-9_%.%:]*)%s*"
 local funccall = "([A-Za-z_][A-Za-z0-9_]*)%s*"
+local decindent = {
+  ['else'] = true, ['elseif'] = true, ['end'] = true}
+local incindent = {
+  ['else'] = true, ['elseif'] = true, ['for'] = true, ['do'] = true,
+  ['if'] = true, ['repeat'] = true, ['until'] = true, ['while'] = true}
+local function isfndef(str)
+  local l
+  local s,e,cap,par = string.find(str, "function%s+" .. funcdef .. "(%(.-%))")
+  -- try to match without brackets now, but only at the beginning of the line
+  if (not s) then
+    s,e,cap = string.find(str, "^%s*function%s+" .. funcdef)
+  end
+  -- try to match "foo = function()"
+  if (not s) then
+    s,e,cap,par = string.find(str, funcdef .. "=%s*function%s*(%(.-%))")
+  end
+  if (s) then
+    l = string.find(string.sub(str,1,s-1),"local%s+$")
+    cap = cap .. " " .. (par or "(?)")
+  end
+  return s,e,cap,l
+end
+
 return {
   exts = {"lua", "rockspec"},
   lexer = wxstc.wxSTC_LEX_LUA,
@@ -12,22 +35,29 @@ return {
   isfncall = function(str)
     return string.find(str, funccall .. "%(")
   end,
-  isfndef = function(str)
-    local l
-    local s,e,cap,par = string.find(str, "function%s+" .. funcdef .. "(%(.-%))")
-    -- try to match without brackets now, but only at the beginning of the line
-    if (not s) then
-      s,e,cap = string.find(str, "^%s*function%s+" .. funcdef)
-    end
-    -- try to match "foo = function()"
-    if (not s) then
-      s,e,cap,par = string.find(str, funcdef .. "=%s*function%s*(%(.-%))")
-    end
-    if (s) then
-      l = string.find(string.sub(str,1,s-1),"local%s+$")
-      cap = cap .. " " .. (par or "(?)")
-    end
-    return s,e,cap,l
+  isfndef = isfndef,
+  isdecindent = function(str)
+    -- this handles three different cases:
+    local term = str:match("^%s*(%w+)%s*$")
+    -- (1) 'end', 'elseif', 'else'
+    local match = term and decindent[term]
+    -- (2) 'end)' and 'end}'
+    if not term then term, match = str:match("^%s*(end)%s*([%)%}]+)%s*[,;]?") end
+    -- (3) '},', '};', '),' and ');'
+    if not term then match = str:match("^%s*[%)%}]+%s*[,;]?%s*$") end
+
+    return match and 1 or 0, match and term and 1 or 0
+  end,
+  isincindent = function(str)
+    local term = str:match("^%s*(%w+)[^%w]*")
+    term = term and incindent[term] and 1 or 0
+    local _, opened = str:gsub("([%{%(])", "%1")
+    local _, closed = str:gsub("([%}%)])", "%1")
+    local func = (isfndef(str) or str:match("[^%w]+function%s*%(")) and 1 or 0
+    -- ended should only be used to negate term and func effects
+    local ended = (term + func > 0) and str:match("[^%w]+end%s*$") and 1 or 0
+
+    return opened - closed + func + term - ended
   end,
 
   typeassigns = function(editor)

src/defs.lua

@@ -79,7 +79,7 @@ style = {
 -- content is optional
 -- config is loaded into existing config table
 config = {
-  appname = "estrela", -- by default the launcher name
+  appname = "zbstudio", -- by default the launcher name
 
   path = {
     -- path for tools/interpreters
@@ -91,28 +91,20 @@ config = {
     -- some tools/interpreters
   },
   editor = {
-    fontname = "Courier New",
-    -- default font
-    fontsize = 10,
-    -- defailt size
-    caretline = true,
-    -- show active line
-
-    -- input/output filtering of strings
-    -- current filters "GermanUtf8Ascii"
-    iofilter = nil,
-
-    -- use indicator to show function calls
-    -- if spec allows
-    showfncall = true,
-
+    fontname = "Courier New", -- default font
+    fontsize = 10, -- default size
+    caretline = true, -- show active line
+    iofilter = nil, -- input/output filtering of strings
+    showfncall = true, -- use indicator to show function calls if spec allows
     tabwidth = 4,
     usetabs = true, -- if false then spaces are used
     usewrap = true, -- if true then the text is wrapped in the editor
     whitespace = false,
     autotabs = true, -- if true test for tabs after file load,
-    -- sets "usetabs" to true for this file
+                     -- sets "usetabs" to true for this file
     calltipdelay = nil, -- delay to show calltip (in ms)
+    autoactivate = false, -- auto-activate/open files during debugging
+    smartindent = false, -- use smart indentation if spec allows
   },
 
   default = {
@@ -122,6 +114,7 @@ config = {
 
   debugger = {
     verbose = false,
+    hostname = nil, -- hostname to use when the detected one is incorrect
   }
 
   outputshell = {
@@ -132,25 +125,28 @@ config = {
     -- defult size
   }
 
+  filetree = { -- filetree settings
+    fontname = nil, -- no default font as it is system dependent
+    fontsize = nil, -- no default size as it is system dependent
+  }
+
   styles = {},
   -- styles table as above for editor
 
   stylesoutshell = {},
   -- styles for output/shell
 
-  interpreter = "EstrelaEditor",
+  interpreter = "luadeb",
   -- the default "project" lua interpreter
 
   autocomplete = true,
   -- whether autocomplete is on by default
 
   acandtip = {
-    shorttip = false,
-    -- tooltips are compact during typing
-    nodynwords = false,
-    -- no dynamic words (user entered words)
-    ignorecase = false,
-    -- ignores case when performing comparison with autocomplete list
+    shorttip = false,   -- tooltips are compact during typing
+    nodynwords = false, -- no dynamic words (user entered words)
+    ignorecase = false, -- ignores case when performing comparison with autocomplete list
+    startat = 2,        -- start suggesting dynamic words after 2 characters
     strategy = 0,
     -- 0: is string comparison
     -- 1: substring leading characters (camel case or _ separated)
@@ -176,6 +172,8 @@ config = {
   activateoutput = false, -- activate output/console on Run/Debug/Compile
   unhidewindow = false, -- to unhide a gui window
   allowinteractivescript = false, -- allow interaction in the output window
+  projectautoopen = false, -- allow auto open/close files on a project switch
+  autorecoverinactivity = nil, -- period of inactivity (s) for autorecover
 }
 
 -- application engine
@@ -320,5 +318,8 @@ interpreter = {
   fprojdir = function(self,wfilename) return "projpath_from_filename" end, -- (opt)
   fattachdebug = function(self) end, -- (opt)
   hasdebugger = false, -- if debugging is available
-  scratchextloop = false, -- (opt) if scratchpad requires handling for external loop
+  scratchextloop = nil, -- (opt) indicates scratchpad support
+    -- nil, no support for scratchpad;
+    -- false, scratchpad supported;
+    -- true, scratchpad supported and requires handling for external loop.
 }

src/editor/autocomplete.lua

@@ -11,7 +11,7 @@ local statusBar = ide.frame.statusBar
 
 local function newAPI(api)
   api = api or {}
-  for i,v in pairs(api) do
+  for i in pairs(api) do
     api[i] = nil
   end
   -- tool tip info and reserved names
@@ -36,8 +36,6 @@ local apis = {
   lua = newAPI(),
 }
 
-local config = ide.config.ac
-
 function GetApi(apitype)
   return apis[apitype] or apis["none"]
 end
@@ -58,20 +56,16 @@ local function addAPI(apifile,only,subapis,known) -- relative to API directory
 
   local fn,err = loadfile(apifile)
   if err then
-    print("API file '"..apifile.."' could not be loaded: "..err.."\n")
+    DisplayOutput("Error while loading API file: "..err.."\n")
     return
   end
-  local mt
   local env = apis[ftype] or newAPI()
   apis[ftype] = env
   env = env.ac.childs
-  local suc,res = xpcall(function()return fn(env)end, function(err)
-      DisplayOutput("Error while loading API file: "..apifile..":\n")
-      DisplayOutput(debug.traceback(err))
-      DisplayOutput("\n")
-    end)
-
-  if (suc and res) then
+  local suc,res = pcall(function()return fn(env)end)
+  if (not suc) then
+    DisplayOutput("Error while processing API file: "..res.."\n")
+  elseif (res) then
     local function gennames(tab,prefix)
       for i,v in pairs(tab) do
         v.classname = (prefix and (prefix..".") or "")..i
@@ -89,9 +83,8 @@ local function addAPI(apifile,only,subapis,known) -- relative to API directory
 end
 
 local function loadallAPIs (only,subapis,known)
-  for i,dir in ipairs(FileSysGet("./api/*",wx.wxDIR)) do
-    local files = FileSysGet(dir.."/*.*",wx.wxFILE)
-    for i,file in ipairs(files) do
+  for _, dir in ipairs(FileSysGet("api/*", wx.wxDIR)) do
+    for _, file in ipairs(FileSysGet(dir.."/*.*", wx.wxFILE)) do
       if file:match "%.lua$" then
         addAPI(file,only,subapis,known)
       end
@@ -146,7 +139,7 @@ local function fillTips(api,apibasename,apiname)
         -- build info
         local inf = frontname.."\n"..info.description
         local sentence = info.description:match("^([^\n]+)\n.*")
-        local sentence = sentence and sentence:match("([^%.]+)%..*$")
+        sentence = sentence and sentence:match("([^%.]+)%..*$")
         local infshort = frontname.."\n"..(sentence and sentence.."..." or info.description)
         local infshortbatch = (info.returns and info.args) and frontname or infshort
 
@@ -266,7 +259,7 @@ function ReloadLuaAPI()
   interpreterapi = interpreterapi and interpreterapi.api
   if (interpreterapi) then
     local apinames = {}
-    for i,v in ipairs(interpreterapi) do
+    for _, v in ipairs(interpreterapi) do
       apinames[v] = true
     end
     interpreterapi = apinames
@@ -276,7 +269,7 @@ end
 
 do
   local known = {}
-  for n,spec in pairs(ide.specs) do
+  for _, spec in pairs(ide.specs) do
     if (spec.apitype) then
       known[spec.apitype] = true
     end
@@ -388,7 +381,7 @@ local function getAutoCompApiList(childs,fragment)
     local wlist = cache[childs]
     if not wlist then
       wlist = " "
-      for i,v in pairs(childs) do
+      for i in pairs(childs) do
         wlist = wlist..i.." "
       end
       cache[childs] = wlist
@@ -415,8 +408,8 @@ local function getAutoCompApiList(childs,fragment)
   local t = {}
   cache[childs] = t
 
-  local sub = strat == 1
-  for key, info in pairs(childs) do
+  local sub = strategy == 1
+  for key in pairs(childs) do
     local used = {}
     --
     local kl = key:lower()
@@ -468,7 +461,7 @@ function CreateAutoCompList(editor,key)
   if not (progress) then return end
 
   if (tab == ac) then
-    local obj,krest = rest:match("([%w_]+)[:%.]([%w_]+)%s*$")
+    local _, krest = rest:match("([%w_]+)[:%.]([%w_]+)%s*$")
     if (krest) then
       if (#krest < 3) then return end
       tab = tip.finfo
@@ -480,13 +473,14 @@ function CreateAutoCompList(editor,key)
     rest = rest:gsub("[^%w_]","")
   end
 
-  local last = key:match "([%w_]+)%s*$"
+  local last = key:match("([%w_]+)%s*$")
 
   -- build dynamic word list
   -- only if api search couldnt descend
   -- ie we couldnt find matching sub items
   local dw = ""
-  if (tab == ac) then
+  if (tab == ac and last and #last >= (ide.config.acandtip.startat or 2)) then
+    last = last:lower()
     if dynamicwords[last] then
       local list = dynamicwords[last]
       table.sort(list,function(a,b)
@@ -496,7 +490,7 @@ function CreateAutoCompList(editor,key)
         end)
       -- ignore if word == last and sole user
       for i,v in ipairs(list) do
-        if (v == last and dywordentries[v] == 1) then
+        if (v:lower() == last and dywordentries[v] == 1) then
           table.remove(list,i)
           break
         end
@@ -504,7 +498,6 @@ function CreateAutoCompList(editor,key)
   
       local res = table.concat(list," ")
       dw = res ~= "" and " "..res or ""
-
     end
   end
 
@@ -526,13 +519,13 @@ function CreateAutoCompList(editor,key)
             local ma,mb = 0,0
             g(a,pat,function(...)
                 local l = {...}
-                for i,v in ipairs(l) do
+                for _, v in ipairs(l) do
                   ma = ma + ((v=="") and 0 or 1)
                 end
               end)
             g(b,pat,function(...)
                 local l = {...}
-                for i,v in ipairs(l) do
+                for _, v in ipairs(l) do
                   mb = mb + ((v=="") and 0 or 1)
                 end
               end)

src/editor/commands.lua

@@ -8,8 +8,10 @@ local openDocuments = ide.openDocuments
 local uimgr = frame.uimgr
 
 function NewFile(event)
-  local editor = CreateEditor(ide.config.default.fullname)
+  local editor = CreateEditor()
   SetupKeywords(editor, "lua")
+  AddEditor(editor, ide.config.default.fullname)
+  return editor
 end
 
 -- Find an editor page that hasn't been used at all, eg. an untouched NewFile()
@@ -26,18 +28,20 @@ local function findDocumentToReuse()
   return editor
 end
 
-function LoadFile(filePath, editor, file_must_exist)
+function LoadFile(filePath, editor, file_must_exist, skipselection)
+  local filePath = wx.wxFileName(filePath)
+  filePath:Normalize() -- make it absolute and remove all .. and . if possible
+
   -- prevent files from being reopened again
   if (not editor) then
-    local filePath = wx.wxFileName(filePath)
     for id, doc in pairs(openDocuments) do
       if doc.filePath and filePath:SameAs(wx.wxFileName(doc.filePath)) then
-        notebook:SetSelection(doc.index)
+        if not skipselection then notebook:SetSelection(doc.index) end
         return doc.editor
       end
     end
   end
-  filePath = wx.wxFileName(filePath):GetFullPath()
+  filePath = filePath:GetFullPath()
 
   -- if not opened yet, try open now
   local file_text = FileRead(filePath)
@@ -50,17 +54,18 @@ function LoadFile(filePath, editor, file_must_exist)
   end
 
   local current = editor and editor:GetCurrentPos()
-  editor = editor
-    or findDocumentToReuse()
-    or CreateEditor(wx.wxFileName(filePath):GetFullName()
-      or ide.config.default.fullname)
+  editor = editor or findDocumentToReuse() or CreateEditor()
 
+  editor:Freeze()
   editor:Clear()
   editor:ClearAll()
   SetupKeywords(editor, GetFileExt(filePath))
   editor:MarkerDeleteAll(BREAKPOINT_MARKER)
   editor:MarkerDeleteAll(CURRENT_LINE_MARKER)
-  editor:AppendText(file_text)
+  editor:AppendText(file_text or "")
+  editor:Colourise(0, -1)
+  editor:Thaw()
+
   if current then editor:GotoPos(current) end
   if (ide.config.editor.autotabs) then
     local found = string.find(file_text,"\t") ~= nil
@@ -69,11 +74,14 @@ function LoadFile(filePath, editor, file_must_exist)
 
   editor:EmptyUndoBuffer()
   local id = editor:GetId()
+  if not openDocuments[id] then -- the editor has not been added to notebook
+    AddEditor(editor, wx.wxFileName(filePath):GetFullName()
+      or ide.config.default.fullname)
+  end
   openDocuments[id].filePath = filePath
   openDocuments[id].fileName = wx.wxFileName(filePath):GetFullName()
   openDocuments[id].modTime = GetFileModTime(filePath)
   SetDocumentModified(id, false)
-  editor:Colourise(0, -1)
 
   IndicateFunctions(editor)
 
@@ -81,7 +89,7 @@ function LoadFile(filePath, editor, file_must_exist)
 
   -- activate the editor; this is needed for those cases when the editor is
   -- created from some other element, for example, from a project tree.
-  SetEditorSelection()
+  if not skipselection then SetEditorSelection() end
 
   return editor
 end
@@ -104,9 +112,7 @@ local function getExtsString()
 end
 
 function OpenFile(event)
-
   local exts = getExtsString()
-
   local fileDialog = wx.wxFileDialog(ide.frame, "Open file",
     "",
     "",
@@ -142,6 +148,7 @@ function SaveFile(editor, filePath)
       openDocuments[id].fileName = wx.wxFileName(filePath):GetFullName()
       openDocuments[id].modTime = GetFileModTime(filePath)
       SetDocumentModified(id, false)
+      SetAutoRecoveryMark()
       return true
     else
       wx.wxMessageBox("Unable to save file '"..filePath.."': "..err,
@@ -165,12 +172,11 @@ function SaveFileAs(editor)
   local fn = wx.wxFileName(filePath)
   fn:Normalize() -- want absolute path for dialog
 
-  local exts = getExtsString()
-
+  local ext = fn:GetExt()
   local fileDialog = wx.wxFileDialog(ide.frame, "Save file as",
     fn:GetPath(wx.wxPATH_GET_VOLUME),
     fn:GetFullName(),
-    exts,
+    "*."..(ext and #ext > 0 and ext or "*"),
     wx.wxFD_SAVE)
 
   if fileDialog:ShowModal() == wx.wxID_OK then
@@ -196,7 +202,7 @@ function SaveAll()
     local editor = document.editor
     local filePath = document.filePath
 
-    if document.isModified then
+    if document.isModified or not document.filePath then
       SaveFile(editor, filePath) -- will call SaveFileAs if necessary
     end
   end
@@ -263,11 +269,14 @@ function ClosePage(selection)
     -- abort the debugger if the current marker is in the window being closed
     -- also abort the debugger if it is running, as we don't know what
     -- window will need to be activated when the debugger is paused
-    if debugger and debugger.pid and
+    if debugger and debugger.server and
       (debugger.running or editor:MarkerNext(0, CURRENT_LINE_MARKER_VALUE) >= 0) then
       debugger.terminate()
     end
     removePage(ide.openDocuments[id].index)
+
+    -- disable full screen if the last tab is closed
+    if not (notebook:GetSelection() >= 0) then ShowFullScreen(false) end
   end
 end
 
@@ -395,6 +404,7 @@ function ClearAllCurrentLineMarkers()
   end
 end
 
+local compileOk, compileTotal = 0, 0
 function CompileProgram(editor, quiet)
   -- remove shebang line (#!) as it throws a compilation error as
   -- loadstring() doesn't allow it even though lua/loadfile accepts it.
@@ -402,19 +412,27 @@ function CompileProgram(editor, quiet)
   local editorText = editor:GetText():gsub("^#!.-\n", "\n")
   local id = editor:GetId()
   local filePath = DebuggerMakeFileName(editor, openDocuments[id].filePath)
-  local _, errMsg, line_num = wxlua.CompileLuaScript(editorText, filePath)
+  local func, line_num, errMsg, _ = loadstring(editorText, filePath), -1
+  if not func then
+    _, errMsg, line_num = wxlua.CompileLuaScript(editorText, filePath)
+  end
 
   if ide.frame.menuBar:IsChecked(ID_CLEAROUTPUT) then ClearOutput() end
 
+  compileTotal = compileTotal + 1
   if line_num > -1 then
     DisplayOutput("Compilation error on line "..tostring(line_num)..":\n"..
       errMsg:gsub("Lua:.-\n", "").."\n")
     if not quiet then editor:GotoLine(line_num-1) end
   else
-    if not quiet then DisplayOutput("Compilation successful.\n") end
+    compileOk = compileOk + 1
+    if not quiet then
+      DisplayOutput(("Compilation successful; %.0f%% success rate (%d/%d).\n")
+        :format(compileOk/compileTotal*100, compileOk, compileTotal))
+    end
   end
 
-  return line_num == -1 -- return true if it compiled ok
+  return line_num == -1, editorText -- return true if it compiled ok
 end
 
 ------------------
@@ -451,28 +469,22 @@ function GetOpenFiles()
       local wxfname = wx.wxFileName(document.filePath)
       wxfname:Normalize()
 
-      table.insert(opendocs,{fname=wxfname:GetFullPath(),id=document.index,
-          cursorpos = document.editor:GetCurrentPos()})
+      table.insert(opendocs, {filename=wxfname:GetFullPath(),
+        id=document.index, cursorpos = document.editor:GetCurrentPos()})
     end
   end
 
   -- to keep tab order
   table.sort(opendocs,function(a,b) return (a.id < b.id) end)
 
-  local openfiles = {}
-  for i,doc in ipairs(opendocs) do
-    table.insert(openfiles,{filename = doc.fname, cursorpos = doc.cursorpos} )
-  end
-
   local id = GetEditor()
   id = id and id:GetId()
-
-  return openfiles, id and openDocuments[id].index or 0
+  return opendocs, {index = (id and openDocuments[id].index or 0)}
 end
 
-function SetOpenFiles(nametab,index)
+function SetOpenFiles(nametab,params)
   for i,doc in ipairs(nametab) do
-    local editor = LoadFile(doc.filename,nil,true)
+    local editor = LoadFile(doc.filename,nil,true,true) -- skip selection
     if editor then
       editor:SetCurrentPos(doc.cursorpos or 0)
       editor:SetSelectionStart(doc.cursorpos or 0)
@@ -480,7 +492,8 @@ function SetOpenFiles(nametab,index)
       editor:EnsureCaretVisible()
     end
   end
-  notebook:SetSelection(index or 0)
+  notebook:SetSelection(params and params.index or 0)
+  SetEditorSelection()
 end
 
 local beforeFullScreenPerspective
@@ -501,7 +514,158 @@ function ShowFullScreen(setFullScreen)
   pcall(function() frame:ShowFullScreen(setFullScreen) end)
 end
 
+local function restoreFiles(files)
+  -- open files, but ignore some functions that are not needed;
+  -- as we may be opening multiple files, it doesn't make sense to
+  -- select editor and do some other similar work after each file.
+  local noop, func = function() end, LoadFile
+  local genv = {SetEditorSelection = noop, SettingsAppendFileToHistory = noop}
+  setmetatable(genv, {__index = _G})
+  local env = getfenv(func)
+  setfenv(func, genv)
+  -- provide fake index so that it doesn't activate it as the index may be not
+  -- quite correct if some of the existing files are already open in the IDE.
+  SetOpenFiles(files, {index = #files + notebook:GetPageCount()})
+  setfenv(func, env)
+end
+
+function ProjectConfig(dir, config)
+  if config then ide.session.projects[dir] = config
+  else return unpack(ide.session.projects[dir] or {}) end
+end
+
+function SetOpenTabs(params)
+  local recovery, nametab = loadstring("return "..params.recovery)
+  if recovery then recovery, nametab = pcall(recovery) end
+  if not recovery then
+    DisplayOutput("Can't process auto-recovery record; invalid format: "..nametab.."\n")
+    return
+  end
+  DisplayOutput("Found auto-recovery record and restored saved session.\n")
+  for _,doc in ipairs(nametab) do
+    local editor = doc.filename and LoadFile(doc.filename,nil,true,true) or NewFile()
+    local opendoc = openDocuments[editor:GetId()]
+    if doc.content then
+      notebook:SetPageText(opendoc.index, doc.tabname)
+      editor:SetText(doc.content)
+      if doc.filename and doc.modified < opendoc.modTime:GetTicks() then
+        DisplayOutput("File '"..doc.filename.."' has more recent timestamp than restored '"..doc.tabname.."'."
+          .." Please review before saving.\n")
+      end
+    end
+    editor:SetCurrentPos(doc.cursorpos or 0)
+    editor:SetSelectionStart(doc.cursorpos or 0)
+    editor:SetSelectionEnd(doc.cursorpos or 0)
+    editor:EnsureCaretVisible()
+  end
+  notebook:SetSelection(params and params.index or 0)
+  SetEditorSelection()
+end
+
+local function getOpenTabs()
+  local opendocs = {}
+  for id, document in pairs(ide.openDocuments) do
+    table.insert(opendocs, {
+      filename = document.filePath,
+      tabname = notebook:GetPageText(document.index),
+      modified = document.modTime and document.modTime:GetTicks(), -- get number of seconds
+      content = document.isModified and document.editor:GetText() or nil,
+      id = document.index, cursorpos = document.editor:GetCurrentPos()})
+  end
+
+  -- to keep tab order
+  table.sort(opendocs, function(a,b) return (a.id < b.id) end)
+
+  local id = GetEditor()
+  id = id and id:GetId()
+  return opendocs, {index = (id and openDocuments[id].index or 0)}
+end
+
+function SetAutoRecoveryMark()
+  ide.session.lastupdated = os.time()
+end
+
+local function saveAutoRecovery(event)
+  if not ide.config.autorecoverinactivity or not ide.session.lastupdated then return end
+  if ide.session.lastupdated < (ide.session.lastsaved or 0)
+  or ide.session.lastupdated + ide.config.autorecoverinactivity > os.time()
+    then return end
+
+  -- find all open modified files and save them
+  local opentabs, params = getOpenTabs()
+  if #opentabs > 0 then
+    params.recovery = require('mobdebug').line(opentabs, {comment = false})
+    SettingsSaveAll()
+    SettingsSaveFileSession({}, params)
+    ide.settings:Flush()
+  end
+  ide.session.lastsaved = os.time()
+  ide.frame.statusBar:SetStatusText("Saved auto-recover at "..os.date("%H:%M:%S")..".", 1)
+end
+
+function StoreRestoreProjectTabs(curdir, newdir)
+  local win = ide.osname == 'Windows'
+  local interpreter = ide.interpreter.fname
+  local current, closing, restore = notebook:GetSelection(), 0, false
+
+  if curdir and #curdir > 0 then
+    local lowcurdir = win and string.lower(curdir) or curdir
+    local lownewdir = win and string.lower(newdir) or newdir
+    local projdocs, closdocs = {}, {}
+    for _, document in ipairs(GetOpenFiles()) do
+      local dpath = win and string.lower(document.filename) or document.filename
+      if dpath:find(lowcurdir, 1, true) then
+        table.insert(projdocs, document)
+        closing = closing + (document.id < current and 1 or 0)
+        -- only close if the file is not in new project as it would be reopened
+        if not dpath:find(lownewdir, 1, true) then
+          table.insert(closdocs, document)
+        end
+      elseif document.id == current then restore = true end
+    end
+
+    -- adjust for the number of closing tabs on the left from the current one
+    current = current - closing
+
+    -- save opened files from this project
+    ProjectConfig(curdir, {projdocs,
+      {index = notebook:GetSelection() - current, interpreter = interpreter}})
+
+    -- close pages for those files that match the project in the reverse order
+    -- (as ids shift when pages are closed)
+    for i = #closdocs, 1, -1 do ClosePage(closdocs[i].id) end
+  end
+
+  local files, params = ProjectConfig(newdir)
+  if files then restoreFiles(files) end
+
+  if params and params.interpreter and ide.interpreter.fname ~= params.interpreter then
+    ProjectSetInterpreter(params.interpreter) -- set the interpreter
+  end
+
+  local index = params and params.index
+  if notebook:GetPageCount() == 0 then NewFile()
+  elseif restore and current >= 0 then notebook:SetSelection(current)
+  elseif index and index >= 0 and files[index+1] then
+    -- move the editor tab to the front with the file from the config
+    LoadFile(files[index+1].filename, nil, true)
+    SetEditorSelection() -- activate the editor in the active tab
+  end
+
+  -- remove current config as it may change; the current configuration is
+  -- stored with the general config.
+  -- The project configuration will be updated when the project is changed.
+  ProjectConfig(newdir, {})
+end
+
 function CloseWindow(event)
+  -- if the app is already exiting, then help it exit; wxwidgets on Windows
+  -- is supposed to report Shutdown/logoff events by setting CanVeto() to
+  -- false, but it doesn't happen. We simply leverage the fact that
+  -- CloseWindow is called several times in this case and exit. Similar
+  -- behavior has been also seen on Linux, so this logic applies everywhere.
+  if ide.exitingProgram then os.exit() end
+
   ide.exitingProgram = true -- don't handle focus events
 
   if not SaveOnExit(event:CanVeto()) then
@@ -511,15 +675,12 @@ function CloseWindow(event)
   end
 
   ShowFullScreen(false)
-  SettingsSaveProjectSession(FileTreeGetProjects())
-  SettingsSaveFileSession(GetOpenFiles())
-  SettingsSaveView()
-  SettingsSaveFramePosition(ide.frame, "MainFrame")
-  SettingsSaveEditorSettings()
+  SettingsSaveAll()
   if DebuggerCloseWatchWindow then DebuggerCloseWatchWindow() end
   if DebuggerCloseStackWindow then DebuggerCloseStackWindow() end
   if DebuggerShutdown then DebuggerShutdown() end
   ide.settings:delete() -- always delete the config
+  if ide.session.timer then ide.session.timer:Stop() end
   event:Skip()
 
   -- without explicit exit() the IDE crashes with SIGILL exception when closed
@@ -527,3 +688,11 @@ function CloseWindow(event)
   if ide.osname == "Macintosh" then os.exit() end
 end
 frame:Connect(wx.wxEVT_CLOSE_WINDOW, CloseWindow)
+
+frame:Connect(wx.wxEVT_TIMER, saveAutoRecovery)
+
+if ide.config.autorecoverinactivity then
+  ide.session.timer = wx.wxTimer(frame)
+  -- check at least 5s to be never more than 5s off
+  ide.session.timer:Start(math.min(5, ide.config.autorecoverinactivity)*1000)
+end

src/editor/debugger.lua

@@ -17,26 +17,43 @@ debugger.watchWindow = nil -- the watchWindow, nil when not created
 debugger.watchCtrl = nil -- the child ctrl in the watchWindow
 debugger.stackWindow = nil -- the stackWindow, nil when not created
 debugger.stackCtrl = nil -- the child ctrl in the stackWindow
-debugger.hostname = (function() -- check what address is resolvable
-  local addr = wx.wxIPV4address()
+debugger.hostname = ide.config.debugger.hostname or (function()
+  local addr = wx.wxIPV4address() -- check what address is resolvable
   for _, host in ipairs({wx.wxGetHostName(), wx.wxGetFullHostName()}) do
-    if addr:Hostname(host) then return host end
+    if host and #host > 0 and addr:Hostname(host) then return host end
   end
   return "localhost" -- last resort; no known good hostname
 end)()
 
 local notebook = ide.frame.notebook
 
-local function updateWatchesSync()
+local function updateWatchesSync(num)
   local watchCtrl = debugger.watchCtrl
   if watchCtrl and debugger.server
     and not debugger.running and not debugger.scratchpad then
     for idx = 0, watchCtrl:GetItemCount() - 1 do
-      local expression = watchCtrl:GetItemText(idx)
-      local _, values, error = debugger.evaluate(expression)
-      if error then error = error:gsub("%[.-%]:%d+:%s+","")
-      elseif #values == 0 then values = {'nil'} end
-      watchCtrl:SetItem(idx, 1, error and ('error: '..error) or values[1])
+      if not num or idx == num then
+        local expression = watchCtrl:GetItemText(idx)
+        local _, values, error = debugger.evaluate(expression)
+        if error then error = error:gsub("%[.-%]:%d+:%s+","")
+        elseif #values == 0 then values = {'nil'} end
+
+        local newval = error and ('error: '..error) or values[1]
+        -- get the current value from a list item
+        do local litem = wx.wxListItem()
+          litem:SetMask(wx.wxLIST_MASK_TEXT)
+          litem:SetId(idx)
+          litem:SetColumn(1)
+          watchCtrl:GetItem(litem)
+          watchCtrl:SetItemBackgroundColour(idx,
+            watchCtrl:GetItem(litem) and newval ~= litem:GetText()
+            and ide.config.styles.caretlinebg
+            and wx.wxColour(unpack(ide.config.styles.caretlinebg.bg))
+            or watchCtrl:GetBackgroundColour())
+        end
+
+        watchCtrl:SetItem(idx, 1, newval)
+      end
     end
   end
 end
@@ -57,8 +74,14 @@ local function updateStackSync()
   local stackCtrl = debugger.stackCtrl
   if stackCtrl and debugger.server
     and not debugger.running and not debugger.scratchpad then
-    local stack = debugger.stack()
-    if not stack or #stack == 0 then stackCtrl:DeleteAllItems(); return end
+    local stack, _, err = debugger.stack()
+    if not stack or #stack == 0 then
+      stackCtrl:DeleteAllItems()
+      if err then -- report an error if any
+        stackCtrl:AppendItem(stackCtrl:AddRoot("Stack"), "Error: " .. err, 0)
+      end
+      return
+    end
     stackCtrl:Freeze()
     stackCtrl:DeleteAllItems()
     local params = {comment = false, nocode = true}
@@ -109,14 +132,20 @@ local function updateStackSync()
 end
 
 local function updateStackAndWatches()
+  -- check if the debugger is running and may be waiting for a response.
+  -- allow that request to finish, otherwise updateWatchesSync() does nothing.
+  if debugger.running then debugger.update() end
   if debugger.server and not debugger.running then
     copas.addthread(function() updateStackSync() updateWatchesSync() end)
   end
 end
 
-local function updateWatches()
+local function updateWatches(num)
+  -- check if the debugger is running and may be waiting for a response.
+  -- allow that request to finish, otherwise updateWatchesSync() does nothing.
+  if debugger.running then debugger.update() end
   if debugger.server and not debugger.running then
-    copas.addthread(function() updateWatchesSync() end)
+    copas.addthread(function() updateWatchesSync(num) end)
   end
 end
 
@@ -136,17 +165,19 @@ local function killClient()
   end
 end
 
-local function activateDocument(fileName, line)
-  if not fileName then return end
+local function activateDocument(file, line)
+  if not file then return end
 
-  if not wx.wxIsAbsolutePath(fileName) and debugger.basedir then
-    fileName = debugger.basedir .. fileName
+  if not wx.wxIsAbsolutePath(file) and debugger.basedir then
+    file = debugger.basedir .. file
   end
 
   local activated
-  local fileName = wx.wxFileName(fileName)
+  local indebugger = file:find('mobdebug%.lua$')
+  local fileName = wx.wxFileName(file)
   for _, document in pairs(ide.openDocuments) do
-    if fileName:SameAs(wx.wxFileName(document.filePath)) then
+    -- skip those tabs that may have file without names (untitled.lua)
+    if document.filePath and fileName:SameAs(wx.wxFileName(document.filePath)) then
       local editor = document.editor
       local selection = document.index
       notebook:SetSelection(selection)
@@ -161,7 +192,22 @@ local function activateDocument(fileName, line)
     end
   end
 
-  return activated ~= nil, activated
+  if not activated and not indebugger and ide.config.editor.autoactivate then
+    -- found file, but can't activate yet (because this part may be executed
+    -- in a different co-routine), so schedule pending activation.
+    if wx.wxFileName(file):FileExists() then
+      debugger.activate = {file, line}
+      return true -- report successful activation, even though it's pending
+    end
+
+    if not debugger.missing[file] then -- only report files once per session
+      debugger.missing[file] = true
+      DisplayOutput(("Couldn't activate file '%s' for debugging; continuing without it.\n")
+        :format(file))
+    end
+  end
+
+  return activated ~= nil
 end
 
 local function reSetBreakpoints()
@@ -185,7 +231,10 @@ local function reSetBreakpoints()
 end
 
 debugger.shell = function(expression, isstatement)
-  if debugger.server and not debugger.running then
+  -- check if the debugger is running and may be waiting for a response.
+  -- allow that request to finish, otherwise updateWatchesSync() does nothing.
+  if debugger.running then debugger.update() end
+  if debugger.server and not debugger.running and not debugger.scratchpad then
     copas.addthread(function ()
         -- exec command is not expected to return anything.
         -- eval command returns 0 or more results.
@@ -254,18 +303,27 @@ debugger.listen = function()
 
       local options = debugger.options or {}
       if not debugger.scratchpad then SetAllEditorsReadOnly(true) end
-      local wxfilepath = GetEditorFileAndCurInfo()
-      local startfile = options.startfile or wxfilepath:GetFullPath()
-      local basedir = options.basedir
-        or FileTreeGetDir()
-        or wxfilepath:GetPath(wx.wxPATH_GET_VOLUME + wx.wxPATH_GET_SEPARATOR)
-      -- guarantee that the path has a trailing separator
-      debugger.basedir = wx.wxFileName.DirName(basedir):GetFullPath()
+
       debugger.server = copas.wrap(skt)
       debugger.socket = skt
       debugger.loop = false
       debugger.scratchable = false
       debugger.stats = {line = 0}
+      debugger.missing = {}
+
+      local wxfilepath = GetEditorFileAndCurInfo()
+      local startfile = options.startfile or options.startwith
+        or (wxfilepath and wxfilepath:GetFullPath())
+
+      if not startfile then
+        DisplayOutput("Can't start debugging without an opened file or with the current file not being saved ('untitled.lua').\n")
+        return debugger.terminate()
+      end
+
+      local startpath = wx.wxFileName(startfile):GetPath(wx.wxPATH_GET_VOLUME + wx.wxPATH_GET_SEPARATOR)
+      local basedir = options.basedir or FileTreeGetDir() or startpath
+      -- guarantee that the path has a trailing separator
+      debugger.basedir = wx.wxFileName.DirName(basedir):GetFullPath()
 
       -- load the remote file into the debugger
       -- set basedir first, before loading to make sure that the path is correct
@@ -294,11 +352,10 @@ debugger.listen = function()
           local activated = activateDocument(file, line)
 
           -- if not found, check using full file path and reset basedir
-          if not activated then
-            local path = wxfilepath:GetPath(wx.wxPATH_GET_VOLUME + wx.wxPATH_GET_SEPARATOR)
-            activated = activateDocument(path..file, line)
+          if not activated and not wx.wxIsAbsolutePath(file) then
+            activated = activateDocument(startpath..file, line)
             if activated then
-              debugger.basedir = path
+              debugger.basedir = startpath
               debugger.handle("basedir " .. debugger.basedir)
               -- reset breakpoints again as basedir has changed
               reSetBreakpoints()
@@ -306,10 +363,14 @@ debugger.listen = function()
           end
 
           if not activated then
-            DisplayOutput(("Can't find file '%s' to activate for debugging; open the file in the editor before debugging.\n")
+            DisplayOutput(("Can't find file '%s' in the current project to activate for debugging. Update the project or open the file in the editor before debugging.\n")
               :format(file))
             return debugger.terminate()
           end
+
+          -- debugger may still be available for scratchpad,
+          -- if the interpreter signals scratchpad support, so enable it.
+          debugger.scratchable = ide.interpreter.scratchextloop ~= nil
         elseif err then
           DisplayOutput(("Can't debug the script in the active editor window. Compilation error:\n%s\n")
             :format(err))
@@ -411,7 +472,15 @@ end
 debugger.loadstring = function(file, string)
   return debugger.handle("loadstring '" .. file .. "' " .. string)
 end
-debugger.update = function() copas.step(0) end
+debugger.update = function()
+  copas.step(0)
+  -- if there are any pending activations
+  if debugger.activate then
+    local file, line = (table.unpack or unpack)(debugger.activate)
+    if LoadFile(file) then activateDocument(file, line) end
+    debugger.activate = nil
+  end
+end
 debugger.terminate = function()
   if debugger.server then
     if debugger.pid then -- if there is PID, try local kill
@@ -458,7 +527,7 @@ debugger.breakpoint = function(file, line, state)
   debugger.handleAsync((state and "setb " or "delb ") .. file .. " " .. line)
 end
 debugger.quickeval = function(var, callback)
-  if debugger.server and not debugger.running then
+  if debugger.server and not debugger.running and not debugger.scratchpad then
     copas.addthread(function ()
       local _, values, err = debugger.evaluate(var)
       local val = err
@@ -572,7 +641,7 @@ function DebuggerCreateStackWindow()
         local strval = mobdebug.line(value, {comment = false, nocode = true})
         local text = type(name) == "number"
           and (num == name and strval or ("[%s] = %s"):format(name, strval))
-          or ("%s = %s"):format(name, strval)
+          or ("%s = %s"):format(tostring(name), strval)
         local item = stackCtrl:AppendItem(item_id, text, image)
         if checkIfExpandable(value, item) then
           stackCtrl:SetItemHasChildren(item, true)
@@ -600,9 +669,9 @@ function DebuggerCreateWatchWindow()
   debugger.watchWindow = watchWindow
 
   local watchMenu = wx.wxMenu{
-    { ID_ADDWATCH, "&Add Watch" },
+    { ID_ADDWATCH, "&Add Watch\tIns" },
     { ID_EDITWATCH, "&Edit Watch\tF2" },
-    { ID_REMOVEWATCH, "&Remove Watch" },
+    { ID_REMOVEWATCH, "&Remove Watch\tDel" },
     { ID_EVALUATEWATCH, "Evaluate &Watches" }}
 
   local watchMenuBar = wx.wxMenuBar()
@@ -641,6 +710,8 @@ function DebuggerCreateWatchWindow()
     return -1
   end
 
+  local defaultExpr = ""
+
   watchWindow:Connect(wx.wxEVT_CLOSE_WINDOW,
     function (event)
       DebuggerCloseWatchWindow()
@@ -652,7 +723,7 @@ function DebuggerCreateWatchWindow()
   watchWindow:Connect(ID_ADDWATCH, wx.wxEVT_COMMAND_MENU_SELECTED,
     function ()
       local row = watchCtrl:InsertItem(watchCtrl:GetItemCount(), "Expr")
-      watchCtrl:SetItem(row, 0, "Expr")
+      watchCtrl:SetItem(row, 0, defaultExpr)
       watchCtrl:SetItem(row, 1, "Value")
       watchCtrl:EditLabel(row)
     end)
@@ -690,19 +761,42 @@ function DebuggerCreateWatchWindow()
 
   watchCtrl:Connect(wx.wxEVT_COMMAND_LIST_END_LABEL_EDIT,
     function (event)
-      if #(event:GetText()) > 0 then
-        watchCtrl:SetItem(event:GetIndex(), 0, event:GetText())
-        updateWatches()
+      local row = event:GetIndex()
+      if event:IsEditCancelled() then
+        if watchCtrl:GetItemText(row) == defaultExpr then
+          watchCtrl:DeleteItem(row)
+        end
+      else
+        watchCtrl:SetItem(row, 0, event:GetText())
+        updateWatches(row)
       end
       event:Skip()
     end)
 end
 
+function DebuggerAddWatch(watch)
+  if (not debugger.watchWindow) then DebuggerCreateWatchWindow() end
+
+  local watchCtrl = debugger.watchCtrl
+  -- check if this expression is already on the list
+  for idx = 0, watchCtrl:GetItemCount() - 1 do
+    if watchCtrl:GetItemText(idx) == watch then return end
+  end
+
+  local row = watchCtrl:InsertItem(watchCtrl:GetItemCount(), "Expr")
+  watchCtrl:SetItem(row, 0, watch)
+  watchCtrl:SetItem(row, 1, "Value")
+
+  updateWatches(row)
+end
+
 function DebuggerMakeFileName(editor, filePath)
   return filePath or ide.config.default.fullname
 end
 
 function DebuggerToggleBreakpoint(editor, line)
+  -- ignore requests to toggle when the debugger is running
+  if debugger.server and debugger.running then return end
   local markers = editor:MarkerGet(line)
   if markers >= CURRENT_LINE_MARKER_VALUE then
     markers = markers - CURRENT_LINE_MARKER_VALUE
@@ -724,8 +818,14 @@ end
 
 -- scratchpad functions
 
+local function q(s) return s:gsub('([%(%)%.%%%+%-%*%?%[%^%$%]])','%%%1') end
 function DebuggerRefreshScratchpad()
   if debugger.scratchpad and debugger.scratchpad.updated then
+
+    local scratchpadEditor = debugger.scratchpad.editor
+    local compiled, code = CompileProgram(scratchpadEditor, true)
+    if not compiled then return end
+
     if debugger.scratchpad.running then
       -- break the current execution first
       -- don't try too frequently to avoid overwhelming the debugger
@@ -736,9 +836,6 @@ function DebuggerRefreshScratchpad()
       end
     else
       local clear = ide.frame.menuBar:IsChecked(ID_CLEAROUTPUT)
-      local scratchpadEditor = debugger.scratchpad.editor
-      -- take editor text and remove shebang line
-      local code = scratchpadEditor:GetText():gsub("^#!.-\n", "\n")
       local filePath = DebuggerMakeFileName(scratchpadEditor,
         ide.openDocuments[scratchpadEditor:GetId()].filePath)
 
@@ -755,6 +852,8 @@ function DebuggerRefreshScratchpad()
         debugger.scratchpad.updated = false
         debugger.scratchpad.runs = (debugger.scratchpad.runs or 0) + 1
 
+        if clear then ClearOutput() end
+
         -- the code can be running in two ways under scratchpad:
         -- 1. controlled by the application, requires stopper (most apps)
         -- 2. controlled by some external loop (for example, love2d).
@@ -768,23 +867,19 @@ function DebuggerRefreshScratchpad()
           else _, _, err = debugger.execute(code) end
         else   _, _, err = debugger.loadstring(filePath, code .. stopper) end
 
-        local prefix = "Compilation error"
-
-        if clear then ClearOutput() end
+        -- when execute() is used, it's not possible to distinguish between
+        -- compilation and run-time error, so just report as "Scratchpad error"
+        local prefix = extloop and "Scratchpad error" or "Compilation error"
 
         if not err then
           _, _, err = debugger.handle("run")
           prefix = "Execution error"
         end
         if err and not err:find(errormsg) then
-          local line = err:match('.*%[string "[%w:/%\\_%-%.]+"%]:(%d+)%s*:')
-          -- check if the line number in the error matches the line we added
-          -- to stop the script; if so, compile it the usual way and report.
-          -- the usual way is not used all the time because it is slow
-          if prefix == "Compilation error" and
-             tonumber(line) == scratchpadEditor:GetLineCount()+1 then
-            _, err, line = wxlua.CompileLuaScript(code, filePath)
-            err = err:gsub("Lua:.-\n", "") -- remove "syntax error" part
+          local fragment, line = err:match('.-%[string "([^\010\013]+)"%]:(%d+)%s*:')
+          -- make the code shorter to better see the error message
+          if prefix == "Scratchpad error" and fragment and #fragment > 30 then
+            err = err:gsub(q(fragment), function(s) return s:sub(1,30)..'...' end)
           end
           DisplayOutput(prefix .. (line and " on line " .. line or "") .. ":\n"
             .. err:gsub('stack traceback:.+', ''):gsub('\n+$', '') .. "\n")
@@ -817,6 +912,8 @@ function DebuggerScratchpadOn(editor)
 
   local scratchpadEditor = editor
   scratchpadEditor:StyleSetUnderline(numberStyle, true)
+  debugger.scratchpad.margin = scratchpadEditor:GetMarginWidth(0) +
+    scratchpadEditor:GetMarginWidth(1) + scratchpadEditor:GetMarginWidth(2)
 
   scratchpadEditor:Connect(wxstc.wxEVT_STC_MODIFIED, function(event)
     local evtype = event:GetModificationType()
@@ -861,8 +958,8 @@ function DebuggerScratchpadOn(editor)
     end
     scratchpad.start = nstart + 1
     scratchpad.length = nend - nstart - 1
-    scratchpad.origin = tonumber(scratchpadEditor:GetTextRange(nstart+1,nend))
-    if scratchpad.origin then
+    scratchpad.origin = scratchpadEditor:GetTextRange(nstart+1,nend)
+    if tonumber(scratchpad.origin) then
       scratchpad.point = point
       scratchpadEditor:CaptureMouse()
     end
@@ -884,31 +981,52 @@ function DebuggerScratchpadOn(editor)
 
     -- record the fact that we are over a number or dragging slider
     scratchpad.over = scratchpad and
-      (ipoint or (bit.band(scratchpadEditor:GetStyleAt(pos),31) == numberStyle))
+      (ipoint ~= nil or (bit.band(scratchpadEditor:GetStyleAt(pos),31) == numberStyle))
 
     if ipoint then
-      -- calculate difference in point position
-      local dx = point.x - ipoint.x
-      local dy = - (point.y - ipoint.y) -- invert dy as y increases down
-
-      -- re-calculate the value
       local startpos = scratchpad.start
       local endpos = scratchpad.start+scratchpad.length
-      local num = tonumber(scratchpad.origin) + dx/10
+
+      -- calculate difference in point position
+      local dx = point.x - ipoint.x
+
+      -- calculate the number of decimal digits after the decimal point
+      local origin = scratchpad.origin
+      local decdigits = #(origin:match('%.(%d+)') or '')
+
+      -- calculate new value
+      local value = tonumber(origin) + dx * 10^-decdigits
+
+      -- convert new value back to string to check the number of decimal points
+      -- this is needed because the rate of change is determined by the
+      -- current value. For example, for number 1, the next value is 2,
+      -- but for number 1.1, the next is 1.2 and for 1.01 it is 1.02.
+      -- But if 1.01 becomes 1.00, the both zeros after the decimal point
+      -- need to be preserved to keep the increment ratio the same when
+      -- the user wants to release the slider and start again.
+      origin = tostring(value)
+      local newdigits = #(origin:match('%.(%d+)') or '')
+      if decdigits ~= newdigits then
+        origin = origin .. (origin:find('%.') and '' or '.') .. ("0"):rep(decdigits-newdigits)
+      end
 
       -- update length
-      scratchpad.length = string.len(num)
+      scratchpad.length = #origin
 
       -- update the value in the document
       scratchpadEditor:SetTargetStart(startpos)
       scratchpadEditor:SetTargetEnd(endpos)
-      scratchpadEditor:ReplaceTarget("" .. num)
+      scratchpadEditor:ReplaceTarget(origin)
     else event:Skip() end
   end)
 
   scratchpadEditor:Connect(wx.wxEVT_SET_CURSOR, function(event)
     if (debugger.scratchpad and debugger.scratchpad.over) then
       event:SetCursor(wx.wxCursor(wx.wxCURSOR_SIZEWE))
+    elseif debugger.scratchpad and ide.osname == 'Unix' then
+      -- restore the cursor manually on Linux since event:Skip() doesn't reset it
+      local ibeam = event:GetX() > debugger.scratchpad.margin
+      event:SetCursor(wx.wxCursor(ibeam and wx.wxCURSOR_IBEAM or wx.wxCURSOR_RIGHT_ARROW))
     else event:Skip() end
   end)
 
@@ -926,6 +1044,8 @@ function DebuggerScratchpadOff()
   scratchpadEditor:Disconnect(wx.wxID_ANY, wx.wxID_ANY, wx.wxEVT_LEFT_UP)
   scratchpadEditor:Disconnect(wx.wxID_ANY, wx.wxID_ANY, wx.wxEVT_SET_CURSOR)
 
+  wx.wxSetCursor(wx.wxNullCursor) -- restore cursor
+
   debugger.scratchpad = nil
   debugger.terminate()
 

src/editor/editor.lua

@@ -153,6 +153,8 @@ function SetEditorSelection(selection)
   else
     FileTreeMarkSelected('')
   end
+
+  SetAutoRecoveryMark()
 end
 
 function GetEditorFileAndCurInfo(nochecksave)
@@ -163,9 +165,7 @@ function GetEditorFileAndCurInfo(nochecksave)
 
   local id = editor:GetId()
   local filepath = openDocuments[id].filePath
-  if (nochecksave and not filepath) then
-    return
-  end
+  if not filepath then return end
 
   local fn = wx.wxFileName(filepath)
   fn:Normalize()
@@ -182,6 +182,7 @@ end
 
 -- Set if the document is modified and update the notebook page text
 function SetDocumentModified(id, modified)
+  if not openDocuments[id] then return end
   local pageText = openDocuments[id].fileName or ide.config.default.fullname
 
   if modified then
@@ -193,10 +194,16 @@ function SetDocumentModified(id, modified)
 end
 
 function EditorAutoComplete(editor)
-  if (editor == nil or not editor.spec) then return end
+  if not (editor and editor.spec) then return end
+
+  local pos = editor:GetCurrentPos()
+  -- don't do auto-complete in comments or strings.
+  -- the current position and the previous one have default style (0),
+  -- so we need to check two positions back.
+  local style = pos >= 2 and bit.band(editor:GetStyleAt(pos-2),31) or 0
+  if editor.spec.iscomment[style] or editor.spec.isstring[style] then return end
 
   -- retrieve the current line and get a string to the current cursor position in the line
-  local pos = editor:GetCurrentPos()
   local line = editor:GetCurrentLine()
   local linetx = editor:GetLine(line)
   local linestart = editor:PositionFromLine(line)
@@ -219,49 +226,63 @@ function EditorAutoComplete(editor)
   end
 end
 
-function EditorCallTip(editor, pos)
+local function getValAtPosition(editor, pos)
   local line = editor:LineFromPosition(pos)
   local linetx = editor:GetLine(line)
   local linestart = editor:PositionFromLine(line)
   local localpos = pos-linestart
 
-  local ident = "([a-zA-Z_0-9][a-zA-Z_0-9%.%:]*)"
+  local ident = "([a-zA-Z_][a-zA-Z_0-9%.%:]*)"
   local linetxtopos = linetx:sub(1,localpos)
   linetxtopos = linetxtopos..")"
   linetxtopos = linetxtopos:match(ident .. "%b()$")
 
+  local selected = editor:GetSelectionStart() ~= editor:GetSelectionEnd()
+    and pos >= editor:GetSelectionStart() and pos <= editor:GetSelectionEnd()
+
+  -- check if we have a selected text or an identifier
+  -- for an identifier, check fragments on the left and on the right.
+  -- this is to match 'io' in 'i^o.print' and 'io.print' in 'io.pr^int'.
+  -- remove square brackets to make tbl[index].x show proper values.
+  local start = linetx:sub(1,localpos)
+    :gsub("%b[]", function(s) return ("."):rep(#s) end)
+    :find(ident.."$")
+
+  -- check if the style is the right one; this is to ignore
+  -- comments, strings, numbers (to avoid '1 = 1'), keywords, and such
+  if start and not selected then
+    local style = bit.band(editor:GetStyleAt(linestart+start),31)
+    if editor.spec.iscomment[style]
+    or (MarkupIsAny and MarkupIsAny(style)) -- markup in comments
+    or editor.spec.isstring[style]
+    or style == wxstc.wxSTC_LUA_NUMBER
+    or style == wxstc.wxSTC_LUA_WORD then
+      -- don't do anything for strings or comments or numbers
+      return nil, linetxtopos
+    end
+  end
+
+  local right = linetx:sub(localpos+1,#linetx):match("^[a-zA-Z_0-9]*")
+  local var = selected and editor:GetSelectedText()
+    or (start and linetx:sub(start,localpos):gsub(":",".")..right or nil)
+
+  return var, linetxtopos
+end
+
+function EditorCallTip(editor, pos, x, y)
+  local var, linetxtopos = getValAtPosition(editor, pos)
   local tip = linetxtopos and GetTipInfo(editor,linetxtopos.."(",false)
   if ide.debugger and ide.debugger.server then
-    local selected = editor:GetSelectionStart() ~= editor:GetSelectionEnd()
-      and pos >= editor:GetSelectionStart() and pos <= editor:GetSelectionEnd()
-
-    -- check if we have a selected text or an identifier
-    -- for an identifier, check fragments on the left and on the right.
-    -- this is to match 'io' in 'i^o.print' and 'io.print' in 'io.pr^int'.
-    -- remove square brackets to make tbl[index].x show proper values.
-    local start = linetx:sub(1,localpos)
-      :gsub("%b[]", function(s) return ("."):rep(#s) end)
-      :find(ident.."$")
-
-    -- check if the style is the right one; this is to ignore
-    -- comments, strings, numbers (to avoid '1 = 1'), keywords, and such
-    if start and not selected then
-      local style = bit.band(editor:GetStyleAt(linestart+start),31)
-      if editor.spec.iscomment[style]
-      or editor.spec.isstring[style]
-      or style == wxstc.wxSTC_LUA_NUMBER
-      or style == wxstc.wxSTC_LUA_WORD then
-        return -- don't do anything for strings or comments or numbers
-      end
-    end
-
-    local right = linetx:sub(localpos+1,#linetx):match("^[a-zA-Z_0-9]*")
-    local var = selected and editor:GetSelectedText()
-      or (start and linetx:sub(start,localpos):gsub(":",".")..right or nil)
     if var then
       local limit = 128
       ide.debugger.quickeval(var, function(val)
         if #val > limit then val = val:sub(1, limit-3).."..." end
+        -- check if the mouse position is specified and the mouse has moved,
+        -- then don't show the tooltip as it's already too late for it.
+        if x and y then
+          local mpos = wx.wxGetMousePosition()
+          if mpos.x ~= x or mpos.y ~= y then return end
+        end
         editor:CallTipShow(pos, val) end)
     end
   elseif tip then
@@ -270,10 +291,10 @@ function EditorCallTip(editor, pos)
 end
 
 -- ----------------------------------------------------------------------------
--- Create an editor and add it to the notebook
-function CreateEditor(name)
+-- Create an editor
+function CreateEditor()
   local editor = wxstc.wxStyledTextCtrl(notebook, editorID,
-    wx.wxDefaultPosition, wx.wxDefaultSize,
+    wx.wxDefaultPosition, wx.wxSize(0, 0),
     wx.wxBORDER_STATIC)
 
   editorID = editorID + 1 -- increment so they're always unique
@@ -302,8 +323,6 @@ function CreateEditor(name)
   editor:SetCaretLineVisible(ide.config.editor.caretline and 1 or 0)
 
   editor:SetVisiblePolicy(wxstc.wxSTC_VISIBLE_SLOP, 3)
-  --editor:SetXCaretPolicy(wxstc.wxSTC_CARET_SLOP, 10)
-  --editor:SetYCaretPolicy(wxstc.wxSTC_CARET_SLOP, 3)
 
   editor:SetMarginWidth(0, editor:TextWidth(32, "99999_")) -- line # margin
 
@@ -367,6 +386,8 @@ function CreateEditor(name)
 
   editor:Connect(wxstc.wxEVT_STC_MODIFIED,
     function (event)
+      SetAutoRecoveryMark()
+
       if (editor.assignscache and editor:GetCurrentLine() ~= editor.assignscache.line) then
         editor.assignscache = false
       end
@@ -402,19 +423,44 @@ function CreateEditor(name)
       local linetx = editor:GetLine(line)
       local linestart = editor:PositionFromLine(line)
       local localpos = pos-linestart
-
       local linetxtopos = linetx:sub(1,localpos)
 
       if (ch == char_CR and eol==2) or (ch == char_LF and eol==0) then
         if (line > 0) then
           local indent = editor:GetLineIndentation(line - 1)
-          if indent > 0 then
-            editor:SetLineIndentation(line, indent)
-            local tw = editor:GetTabWidth()
-            local ut = editor:GetUseTabs()
-            local indent = ut and (indent / tw) or indent
-            editor:GotoPos(pos+indent)
+          local linedone = editor:GetLine(line - 1)
+
+          -- if the indentation is 0 and the current line is not empty
+          -- then take indentation from the current line (instead of the
+          -- previous one). This may happen when CR is hit at the beginning
+          -- of a line (rather than at the end).
+          if indent == 0 and not linetx:match("^[\010\013]*$") then
+            indent = editor:GetLineIndentation(line)
           end
+
+          local tw = editor:GetTabWidth()
+          local ut = editor:GetUseTabs()
+
+          if ide.config.editor.smartindent
+          and editor.spec.isdecindent and editor.spec.isincindent then
+            local closed, blockend = editor.spec.isdecindent(linedone)
+            local opened = editor.spec.isincindent(linedone)
+
+            -- if the current block is already indented, skip reverse indenting
+            if (line > 1) and (closed > 0 or blockend > 0)
+            and editor:GetLineIndentation(line-2) > indent then
+              -- adjust opened first; this is needed when use ENTER after })
+              if blockend == 0 then opened = opened + closed end
+              closed, blockend = 0, 0
+            end
+            editor:SetLineIndentation(line-1, indent - tw * closed)
+            indent = indent + tw * (opened - blockend)
+            if indent < 0 then indent = 0 end
+          end
+          editor:SetLineIndentation(line, indent)
+
+          indent = ut and (indent / tw) or indent
+          editor:GotoPos(editor:GetCurrentPos()+indent)
         end
 
       elseif ch == ("("):byte() then
@@ -434,9 +480,24 @@ function CreateEditor(name)
 
   editor:Connect(wxstc.wxEVT_STC_DWELLSTART,
     function (event)
-      local position = editor:PositionFromPointClose(event:GetX(),event:GetY())
+      -- on Linux DWELLSTART event seems to be generated even for those
+      -- editor windows that are not active. What's worse, when generated
+      -- the event seems to report "old" position when retrieved using
+      -- event:GetX and event:GetY, so instead we use wxGetMousePosition.
+      local linux = ide.osname == 'Unix'
+      if linux and editor ~= GetEditor() then return end
+      -- check if this editor has focus; it may not when Stack/Watch window
+      -- is on top, but DWELL events are still triggered in this case.
+      -- Don't want to show calltip as it is still shown when the focus
+      -- is switched to a different application.
+      local focus = editor:FindFocus()
+      if focus and focus:GetId() ~= editor:GetId() then return end
+      local mpos = wx.wxGetMousePosition()
+      local cpos = editor:ScreenToClient(mpos)
+      local position = editor:PositionFromPointClose(
+        linux and cpos.x or event:GetX(), linux and cpos.y or event:GetY())
       if position ~= wxstc.wxSTC_INVALID_POSITION then
-        EditorCallTip(editor, position)
+        EditorCallTip(editor, position, mpos.x, mpos.y)
       end
       event:Skip()
     end)
@@ -447,6 +508,12 @@ function CreateEditor(name)
       event:Skip()
     end)
 
+  editor:Connect(wx.wxEVT_KILL_FOCUS,
+    function (event)
+      if editor:AutoCompActive() then editor:AutoCompCancel() end
+      event:Skip()
+    end)
+
   editor:Connect(wxstc.wxEVT_STC_USERLISTSELECTION,
     function (event)
       local pos = editor:GetCurrentPos()
@@ -515,6 +582,35 @@ function CreateEditor(name)
         if notebook:GetSelection() == last
         then notebook:SetSelection(first)
         else notebook:AdvanceSelection(true) end
+      elseif (keycode == wx.WXK_DELETE or keycode == wx.WXK_BACK)
+        -- ide.osname == 'Macintosh' has wx.wxMOD_NONE not defined
+        -- for some reason (at least in wxlua 2.8.12.1)
+        and (event:GetModifiers() == (wx.wxMOD_NONE or 0)) then
+        -- Delete and Backspace behave the same way for selected text
+        if #(editor:GetSelectedText()) > 0 then
+          editor:SetTargetStart(editor:GetSelectionStart())
+          editor:SetTargetEnd(editor:GetSelectionEnd())
+        else
+          local pos = editor:GetCurrentPos()
+          if keycode == wx.WXK_BACK then
+            pos = pos - 1
+            if pos < 0 then return end
+          end
+
+          -- check if the modification is to one of "invisible" characters.
+          -- if not, proceed with "normal" processing as there are other
+          -- events that may depend on Backspace, for example, re-calculating
+          -- auto-complete suggestions.
+          local style = bit.band(editor:GetStyleAt(pos), 31)
+          if not MarkupIsSpecial or not MarkupIsSpecial(style) then
+            event:Skip()
+            return
+          end
+
+          editor:SetTargetStart(pos)
+          editor:SetTargetEnd(pos+1)
+        end
+        editor:ReplaceTarget("")
       else
         if ide.osname == 'Macintosh' and event:CmdDown() then
           return -- ignore a key press if Command key is also pressed
@@ -523,6 +619,44 @@ function CreateEditor(name)
       end
     end)
 
+  local value
+  editor:Connect(wx.wxEVT_CONTEXT_MENU,
+    function (event)
+      local menu = wx.wxMenu()
+      menu:Append(wx.wxID_UNDO, "&Undo")
+      menu:Append(wx.wxID_REDO, "&Redo")
+      menu:AppendSeparator()
+      menu:Append(wx.wxID_CUT, "Cu&t")
+      menu:Append(wx.wxID_COPY, "&Copy")
+      menu:Append(wx.wxID_PASTE, "&Paste")
+      menu:Append(wx.wxID_SELECTALL, "Select &All")
+      menu:AppendSeparator()
+      menu:Append(ID_QUICKADDWATCH, "Add Watch Expression")
+      menu:Append(ID_QUICKEVAL, "Evaluate in Console")
+
+      local point = editor:ScreenToClient(event:GetPosition())
+      local pos = editor:PositionFromPointClose(point.x, point.y)
+      value = pos ~= wxstc.wxSTC_INVALID_POSITION and getValAtPosition(editor, pos) or nil
+      menu:Enable(ID_QUICKADDWATCH, value ~= nil)
+      menu:Enable(ID_QUICKEVAL, value ~= nil)
+
+      -- cancel calltip as it interferes with popup menu
+      if editor:CallTipActive() then editor:CallTipCancel() end
+      editor:PopupMenu(menu)
+    end)
+
+  editor:Connect(ID_QUICKADDWATCH, wx.wxEVT_COMMAND_MENU_SELECTED,
+    function(event) DebuggerAddWatch(value) end)
+
+  editor:Connect(ID_QUICKEVAL, wx.wxEVT_COMMAND_MENU_SELECTED,
+    function(event) ShellExecuteCode(value) end)
+
+  return editor
+end
+
+-- ----------------------------------------------------------------------------
+-- Add an editor to the notebook
+function AddEditor(editor, name)
   if notebook:AddPage(editor, name, true) then
     local id = editor:GetId()
     local document = {}
@@ -533,9 +667,9 @@ function CreateEditor(name)
     document.modTime = nil
     document.isModified = false
     openDocuments[id] = document
+    return document
   end
-
-  return editor
+  return
 end
 
 function GetSpec(ext,forcespec)
@@ -657,15 +791,16 @@ end
 ----------------------------------------------------
 -- function list for current file
 
-funclist:Connect(wx.wxEVT_SET_FOCUS,
+-- wx.wxEVT_SET_FOCUS is not triggered for wxChoice on Mac (wx 2.8.12),
+-- so use wx.wxEVT_LEFT_DOWN instead
+funclist:Connect(ide.osname == 'Macintosh' and wx.wxEVT_LEFT_DOWN or wx.wxEVT_SET_FOCUS,
   function (event)
     event:Skip()
 
-    -- parse current file and update list
     local editor = GetEditor()
+    if (editor and not (editor.spec and editor.spec.isfndef)) then return end
 
-    if (not (editor and editor.spec and editor.spec.isfndef)) then return end
-
+    -- parse current file and update list
     -- first populate with the current label to minimize flicker
     -- then populate the list and update the label
     local current = funclist:GetCurrentSelection()
@@ -676,7 +811,7 @@ funclist:Connect(wx.wxEVT_SET_FOCUS,
     funclist:SetSelection(0)
 
     local lines = 0
-    local linee = editor:GetLineCount()-1
+    local linee = (editor and editor:GetLineCount() or 0)-1
     for line=lines,linee do
       local tx = editor:GetLine(line)
       local s,_,cap,l = editor.spec.isfndef(tx)

src/editor/filetree.lua

@@ -155,9 +155,9 @@ local function treeSetConnectorsAndIcons(tree,treedata)
       local dir = treeGetItemFullName(tree,treedata,item_id)
       treeAddDir(tree,item_id,dir)
       return true
-    end )
+    end)
   tree:Connect( wx.wxEVT_COMMAND_TREE_ITEM_COLLAPSED,
-    function() return true end )
+    function() return true end)
   tree:Connect( wx.wxEVT_COMMAND_TREE_ITEM_ACTIVATED,
     function( event )
       local item_id = event:GetItem()
@@ -177,7 +177,20 @@ local function treeSetConnectorsAndIcons(tree,treedata)
           treeAddDir(tree,tree:GetItemParent(item_id),name)
         end 
       end
-    end )
+    end)
+  -- toggle a folder on
+  tree:Connect( wx.wxEVT_LEFT_DOWN,
+    function( event )
+      local item_id = tree:HitTest(event:GetPosition())
+      -- only toggle if this is a folder and the click is on the label
+      if item_id and tree:GetItemImage(item_id) == 0 then
+        tree:Toggle(item_id)
+        tree:SelectItem(item_id)
+      else
+        event:Skip()
+      end
+      return true
+    end)
 end
 
 -- project
@@ -237,6 +250,11 @@ function filetree:updateProjectDir(newdir, cboxsel)
   end
 
   if ((not newdir) or filetree.projdirText == newdir or not wx.wxDirExists(newdir)) then return end
+
+  if ide.config.projectautoopen and filetree.projdirText then
+    StoreRestoreProjectTabs(filetree.projdirText, newdir)
+  end
+
   filetree.projdirText = newdir
 
   PrependStringToArray(filetree.projdirTextArray,newdir,ide.config.projecthistorylength)

src/editor/findreplace.lua

@@ -95,6 +95,7 @@ function findReplace:GetSelectedString()
       findReplace.foundString = true
     end
   end
+  return editor and findReplace.foundString
 end
 
 function findReplace:FindString(reverse)
@@ -247,8 +248,7 @@ function findReplace:RunInFiles(replace)
   end
 
   findReplace.oveditor = wxstc.wxStyledTextCtrl(findReplace.dialog, wx.wxID_ANY,
-    wx.wxDefaultPosition, wx.wxSize(1,1),
-    wx.wxBORDER_STATIC)
+    wx.wxDefaultPosition, wx.wxSize(1,1), wx.wxBORDER_STATIC)
   findReplace.occurrences = 0
 
   local fname = wx.wxFileName(findReplace.filedirText)
@@ -271,8 +271,8 @@ local function createFindReplaceDialog(replace,infiles)
   findReplace.replace = replace
   findReplace.infiles = infiles
 
-  local findDialog = wx.wxDialog(ide.frame, wx.wxID_ANY, infiles and "Find In Files" or "Find", wx.wxDefaultPosition, wx.wxDefaultSize,
-    wx.wxDEFAULT_DIALOG_STYLE)
+  local findDialog = wx.wxDialog(ide.frame, wx.wxID_ANY, infiles and "Find In Files" or "Find",
+    wx.wxDefaultPosition, wx.wxDefaultSize, wx.wxDEFAULT_DIALOG_STYLE)
 
   -- Create right hand buttons and sizer
   local findButton = wx.wxButton(findDialog, ID_FIND_NEXT, infiles and "&Find All" or "&Find Next")
@@ -294,14 +294,16 @@ local function createFindReplaceDialog(replace,infiles)
 
   -- Create find/replace text entry sizer
   local findStatText = wx.wxStaticText( findDialog, wx.wxID_ANY, "Find: ")
-  local findTextCombo = wx.wxComboBox(findDialog, wx.wxID_ANY, findReplace.findText, wx.wxDefaultPosition, wx.wxDefaultSize, findReplace.findTextArray, wx.wxCB_DROPDOWN)
+  local findTextCombo = wx.wxComboBox(findDialog, wx.wxID_ANY, findReplace.findText,
+    wx.wxDefaultPosition, wx.wxDefaultSize, findReplace.findTextArray, wx.wxCB_DROPDOWN)
   findTextCombo:SetFocus()
 
   local infilesMaskStat,infilesMaskCombo
   local infilesDirStat,infilesDirCombo,infilesDirButton
   if (infiles) then
     infilesMaskStat = wx.wxStaticText( findDialog, wx.wxID_ANY, "File Type: ")
-    infilesMaskCombo = wx.wxComboBox(findDialog, wx.wxID_ANY, findReplace.filemaskText, wx.wxDefaultPosition, wx.wxSize(250,20), findReplace.filemaskTextArray)
+    infilesMaskCombo = wx.wxComboBox(findDialog, wx.wxID_ANY, findReplace.filemaskText,
+      wx.wxDefaultPosition, wx.wxDefaultSize, findReplace.filemaskTextArray)
 
     local fname = GetEditorFileAndCurInfo(true)
     if (fname) then
@@ -321,25 +323,30 @@ local function createFindReplaceDialog(replace,infiles)
 
   local findReplaceSizer = wx.wxFlexGridSizer(2, 3, 0, 0)
   findReplaceSizer:AddGrowableCol(1)
-  findReplaceSizer:Add(findStatText, 0, wx.wxALL + wx.wxALIGN_LEFT, 0)
-  findReplaceSizer:Add(findTextCombo, 1, wx.wxALL + wx.wxGROW + wx.wxCENTER, 0)
-  findReplaceSizer:Add(16,8, 0, wx.wxALL + wx.wxALIGN_RIGHT + wx.wxADJUST_MINSIZE,0)
+  findReplaceSizer:Add(findStatText, 0, wx.wxALL + wx.wxALIGN_RIGHT + wx.wxALIGN_CENTER_VERTICAL, 0)
+  findReplaceSizer:Add(findTextCombo, 1, wx.wxALL + wx.wxGROW + wx.wxCENTER+ wx.wxALIGN_CENTER_VERTICAL, 0)
+  findReplaceSizer:Add(16, 8, 0, wx.wxALL + wx.wxALIGN_RIGHT + wx.wxADJUST_MINSIZE,0)
 
   if (infiles) then
-    findReplaceSizer:Add(infilesMaskStat, 0, wx.wxTOP + wx.wxALIGN_CENTER, 5)
-    findReplaceSizer:Add(infilesMaskCombo, 1, wx.wxTOP + wx.wxGROW + wx.wxCENTER, 5)
-    findReplaceSizer:Add(16,8, 0, wx.wxTOP + wx.wxALIGN_RIGHT + wx.wxADJUST_MINSIZE ,5)
+    findReplaceSizer:Add(infilesMaskStat, 0, wx.wxTOP + wx.wxALIGN_RIGHT + wx.wxALIGN_CENTER_VERTICAL, 5)
+    findReplaceSizer:Add(infilesMaskCombo, 1, wx.wxTOP + wx.wxGROW + wx.wxCENTER+ wx.wxALIGN_CENTER_VERTICAL, 5)
+    findReplaceSizer:Add(16, 8, 0, wx.wxTOP, 5)
 
-    findReplaceSizer:Add(infilesDirStat, 0, wx.wxTOP + wx.wxALIGN_CENTER, 5)
-    findReplaceSizer:Add(infilesDirCombo, 1, wx.wxTOP + wx.wxGROW + wx.wxCENTER, 5)
-    findReplaceSizer:Add(infilesDirButton, 0, wx.wxTOP + wx.wxALIGN_RIGHT + wx.wxADJUST_MINSIZE, 5)
+    findReplaceSizer:Add(infilesDirStat, 0, wx.wxTOP + wx.wxALIGN_RIGHT + wx.wxALIGN_CENTER_VERTICAL, 5)
+    findReplaceSizer:Add(infilesDirCombo, 1, wx.wxTOP + wx.wxGROW + wx.wxCENTER+ wx.wxALIGN_CENTER_VERTICAL, 5)
+    findReplaceSizer:Add(infilesDirButton, 0, wx.wxTOP + wx.wxALIGN_RIGHT + wx.wxADJUST_MINSIZE+ wx.wxALIGN_CENTER_VERTICAL, 5)
   end
 
   if (replace) then
-    findReplaceSizer:Add(replaceStatText, 0, wx.wxTOP + wx.wxALIGN_CENTER, 5)
-    findReplaceSizer:Add(replaceTextCombo, 1, wx.wxTOP + wx.wxGROW + wx.wxCENTER, 5)
+    findReplaceSizer:Add(replaceStatText, 0, wx.wxTOP + wx.wxALIGN_RIGHT + wx.wxALIGN_CENTER_VERTICAL, 5)
+    findReplaceSizer:Add(replaceTextCombo, 1, wx.wxTOP + wx.wxGROW + wx.wxCENTER+ wx.wxALIGN_CENTER_VERTICAL, 5)
   end
 
+  -- the StaticBox(Sizer) needs to be created before checkboxes, otherwise
+  -- checkboxes don't get any clicks on OSX (ide.osname == 'Macintosh')
+  -- as the z-order for event traversal appears to be incorrect.
+  local optionsSizer = wx.wxStaticBoxSizer(wx.wxVERTICAL, findDialog, "Options" )
+
   -- Create find/replace option checkboxes
   local wholeWordCheckBox = wx.wxCheckBox(findDialog, wx.wxID_ANY, "Match &whole word")
   local matchCaseCheckBox = wx.wxCheckBox(findDialog, wx.wxID_ANY, "Match &case")
@@ -355,7 +362,7 @@ local function createFindReplaceDialog(replace,infiles)
   optionSizer:Add(matchCaseCheckBox, 0, wx.wxALL + wx.wxGROW + wx.wxCENTER, 3)
   optionSizer:Add(wrapAroundCheckBox, 0, wx.wxALL + wx.wxGROW + wx.wxCENTER, 3)
   optionSizer:Add(regexCheckBox, 0, wx.wxALL + wx.wxGROW + wx.wxCENTER, 3)
-  local optionsSizer = wx.wxStaticBoxSizer(wx.wxVERTICAL, findDialog, "Options" );
+
   optionsSizer:Add(optionSizer, 0, 0, 5)
 
   -- Create scope radiobox
@@ -365,6 +372,9 @@ local function createFindReplaceDialog(replace,infiles)
 
   local scopeSizer
   if (infiles) then
+    -- the StaticBox(Sizer) needs to be created before checkboxes
+    scopeSizer = wx.wxStaticBoxSizer(wx.wxVERTICAL, findDialog, "In Files")
+
     subDirCheckBox = wx.wxCheckBox(findDialog, wx.wxID_ANY, "&Subdirectories")
     makeBakCheckBox = wx.wxCheckBox(findDialog, wx.wxID_ANY, ".&bak on Replace")
     subDirCheckBox:SetValue(findReplace.fSubDirs)
@@ -374,13 +384,12 @@ local function createFindReplaceDialog(replace,infiles)
     optionSizer:Add(subDirCheckBox, 0, wx.wxALL + wx.wxGROW + wx.wxCENTER, 3)
     optionSizer:Add(makeBakCheckBox, 0, wx.wxALL + wx.wxGROW + wx.wxCENTER, 3)
 
-    scopeSizer = wx.wxStaticBoxSizer(wx.wxVERTICAL, findDialog, "In Files" );
     scopeSizer:Add(optionSizer, 0, 0, 5)
   else
     scopeRadioBox = wx.wxRadioBox(findDialog, wx.wxID_ANY, "Scope", wx.wxDefaultPosition, wx.wxDefaultSize, {"&Up", "&Down"}, 1, wx.wxRA_SPECIFY_COLS)
     scopeRadioBox:SetSelection(iff(findReplace.fDown, 1, 0))
 
-    scopeSizer = wx.wxBoxSizer(wx.wxVERTICAL, findDialog );
+    scopeSizer = wx.wxBoxSizer(wx.wxVERTICAL, findDialog)
     scopeSizer:Add(scopeRadioBox, 0, 0, 0)
   end
 

src/editor/gui.lua

@@ -68,11 +68,15 @@ end
 local function createToolBar(frame)
   local toolBar = wx.wxToolBar(frame, wx.wxID_ANY,
     wx.wxDefaultPosition, wx.wxDefaultSize, wx.wxTB_FLAT + wx.wxTB_NODIVIDER)
-  local funclist = wx.wxChoice.new(toolBar,ID "toolBar.funclist",wx.wxDefaultPosition, wx.wxSize.new(240,16))
+  local funclist = wx.wxChoice.new(toolBar,ID "toolBar.funclist",
+    -- Linux requires a bit larger size for the function list in the toolbar.
+    -- Mac also requires a bit larger size, but setting it to 20 resets
+    -- back to 16 when the toolbar is refreshed.
+    wx.wxDefaultPosition, wx.wxSize.new(240,ide.osname == "Unix" and 24 or 16))
   
-  -- note: Ususally the bmp size isn't necessary, but the HELP icon is not the right size in MSW
+  -- usually the bmp size isn't necessary, but the HELP icon is not the right size in MSW
   local getBitmap = (ide.app.createbitmap or wx.wxArtProvider.GetBitmap)
-  local toolBmpSize = toolBar:GetToolBitmapSize()
+  local toolBmpSize = wx.wxSize(16, 16)
   toolBar:AddTool(ID_NEW, "New", getBitmap(wx.wxART_NORMAL_FILE, wx.wxART_TOOLBAR, toolBmpSize), "Create an empty document")
   toolBar:AddTool(ID_OPEN, "Open", getBitmap(wx.wxART_FILE_OPEN, wx.wxART_TOOLBAR, toolBmpSize), "Open an existing document")
   toolBar:AddTool(ID_SAVE, "Save", getBitmap(wx.wxART_FILE_SAVE, wx.wxART_TOOLBAR, toolBmpSize), "Save the current document")
@@ -87,8 +91,21 @@ local function createToolBar(frame)
   toolBar:AddSeparator()
   toolBar:AddTool(ID_FIND, "Find", getBitmap(wx.wxART_FIND, wx.wxART_TOOLBAR, toolBmpSize), "Find text")
   toolBar:AddTool(ID_REPLACE, "Replace", getBitmap(wx.wxART_FIND_AND_REPLACE, wx.wxART_TOOLBAR, toolBmpSize), "Find and replace text")
+  if ide.app.createbitmap then -- custom handler should handle all bitmaps
+    toolBar:AddSeparator()
+    toolBar:AddTool(ID_START_DEBUG, "Start Debugging", getBitmap("wxART_DEBUG_START", wx.wxART_TOOLBAR, toolBmpSize), "Start debugging")
+    toolBar:AddTool(ID_STOP_DEBUG, "Stop Debugging", getBitmap("wxART_DEBUG_STOP", wx.wxART_TOOLBAR, toolBmpSize), "Stop debugging")
+    toolBar:AddTool(ID_BREAK, "Break", getBitmap("wxART_DEBUG_BREAK", wx.wxART_TOOLBAR, toolBmpSize), "Break running process")
+    toolBar:AddTool(ID_STEP, "Step into", getBitmap("wxART_DEBUG_STEP_INTO", wx.wxART_TOOLBAR, toolBmpSize), "Step into")
+    toolBar:AddTool(ID_STEP_OVER, "Step over", getBitmap("wxART_DEBUG_STEP_OVER", wx.wxART_TOOLBAR, toolBmpSize), "Step over")
+    toolBar:AddTool(ID_STEP_OUT, "Step out", getBitmap("wxART_DEBUG_STEP_OUT", wx.wxART_TOOLBAR, toolBmpSize), "Step out")
+    toolBar:AddSeparator()
+    toolBar:AddTool(ID_TOGGLEBREAKPOINT, "Toggle breakpoint", getBitmap("wxART_DEBUG_BREAKPOINT_TOGGLE", wx.wxART_TOOLBAR, toolBmpSize), "Toggle breakpoint")
+    toolBar:AddTool(ID_VIEWCALLSTACK, "Stack window", getBitmap("wxART_DEBUG_CALLSTACK", wx.wxART_TOOLBAR, toolBmpSize), "View stack window")
+    toolBar:AddTool(ID_VIEWWATCHWINDOW, "Watch window", getBitmap("wxART_DEBUG_WATCH", wx.wxART_TOOLBAR, toolBmpSize), "View watch window")
+  end
   toolBar:AddSeparator()
-  toolBar:AddTool(ID "debug.projectdir.fromfile", "Update", getBitmap(wx.wxART_GO_DIR_UP , wx.wxART_TOOLBAR, toolBmpSize), "Sets projectdir from file")
+  toolBar:AddTool(ID "debug.projectdir.fromfile", "Update", getBitmap(wx.wxART_GO_DIR_UP , wx.wxART_TOOLBAR, toolBmpSize), "Set project directory from current file")
   toolBar:AddSeparator()
   toolBar:AddControl(funclist)
   toolBar:Realize()

src/editor/ids.lua

@@ -65,6 +65,9 @@ ID_ADDWATCH         = NewID()
 ID_EDITWATCH        = NewID()
 ID_REMOVEWATCH      = NewID()
 ID_EVALUATEWATCH    = NewID()
+-- Editor popup menu items
+ID_QUICKADDWATCH    = NewID()
+ID_QUICKEVAL        = NewID()
 
 local ids = {}
 function ID (name)

src/editor/inspect.lua

@@ -42,6 +42,8 @@ function M.show_warnings(top_ast)
     warnings[#warnings+1] = (path or "?") .. "(" .. (linenum or 0) .. "): " .. msg
   end
   local function known(o) return not T.istype[o] end
+  local function index(f) -- build abc.def.xyz name recursively
+    return (f[1].tag == 'Id' and f[1][1] or index(f[1])) .. '.' .. f[2][1] end
   local isseen, globseen = {}, {}
   LA.walk(top_ast, function(ast)
     local line = ast.lineinfo and ast.lineinfo.first[1] or 0
@@ -68,7 +70,7 @@ function M.show_warnings(top_ast)
           local assignment = not func.tag or func.tag == 'Set' or func.tag == 'Localrec'
           local func1 = func[1][1]
           local fname = assignment and func1 and type(func1[1]) == 'string' and func1[1]
-            or (func1.tag == 'Index' and func1[1][1] .. '.' .. func1[2][1])
+            or (func1.tag == 'Index' and index(func1))
           -- "function foo(bar)" => func.tag == 'Set'
           --   `Set{{`Id{"foo"}},{`Function{{`Id{"bar"}},{}}}}
           -- "local function foo(bar)" => func.tag == 'Localrec'
@@ -76,6 +78,8 @@ function M.show_warnings(top_ast)
           -- "print(function(bar) end)" => func.tag == nil
           -- "function tbl:foo(bar)" => func.tag == 'Set'
           --   `Set{{`Index{`Id{"tbl"},`String{"foo"}}},{`Function{{`Id{"self"},`Id{"bar"}},{}}}}
+          -- "function tbl.abc:foo(bar)" => func.tag == 'Set'
+          --   `Set{{`Index{`Index{`Id{"tbl"},`String{"abc"}},`String{"foo"}}},{`Function{{`Id{"self"},`Id{"bar"}},{}}}},
           warn("unused parameter '" .. name .. "'" ..
                (func and assignment
                      and (fname and func.tag
@@ -156,7 +160,7 @@ local function analyzeProgram(editor)
   local filePath = DebuggerMakeFileName(editor, openDocuments[id].filePath)
 
   if frame.menuBar:IsChecked(ID_CLEAROUTPUT) then ClearOutput() end
-  DisplayOutput("Analizing the source code")
+  DisplayOutput("Analyzing the source code")
   frame:Update()
 
   local warn, err = M.warnings_from_string(editorText, filePath)

src/editor/markup.lua

@@ -26,6 +26,7 @@ local markup = {
 
 -- allow other editor features to recognize this special markup
 function MarkupIsSpecial(style) return style == 31 end
+function MarkupIsAny(style) return style >= 25 and style <= 31 end
 
 local function q(s) return s:gsub('(.)','%%%1') end
 

src/editor/menu_edit.lua

@@ -46,13 +46,17 @@ function OnUpdateUIEditMenu(event)
   local editor = getControlWithFocus()
   if editor == nil then event:Enable(false); return end
 
+  local alwaysOn = { [ID_SELECTALL] = true, [ID_FOLD] = true,
+    [ID_COMMENT] = true, [ID_AUTOCOMPLETE] = true}
   local menu_id = event:GetId()
   local enable =
-    -- buggy GTK clipboard runs eventloop and can generate asserts
-    menu_id == ID_PASTE and (wx.__WXGTK__ or editor:CanPaste()) or
+    ((menu_id == ID_COPY or menu_id == ID_CUT) and
+     (editor:GetClassInfo():GetClassName() ~= 'wxStyledTextCtrl'
+      or editor:GetSelectionStart() ~= editor:GetSelectionEnd())) or
+    menu_id == ID_PASTE and editor:CanPaste() or
     menu_id == ID_UNDO and editor:CanUndo() or
     menu_id == ID_REDO and editor:CanRedo() or
-    (menu_id ~= ID_PASTE and menu_id ~= ID_UNDO and menu_id ~= ID_REDO)
+    alwaysOn[menu_id]
   -- wxComboBox doesn't have SELECT ALL, so disable it
   if editor:GetClassInfo():GetClassName() == 'wxComboBox'
   and menu_id == ID_SELECTALL then enable = false end
@@ -65,7 +69,7 @@ function OnEditMenu(event)
   -- if there is no editor, or if it's not the editor we care about,
   -- then allow normal processing to take place
   if editor == nil or
-     editor:FindFocus():GetId() ~= editor:GetId() or
+     (editor:FindFocus() and editor:FindFocus():GetId() ~= editor:GetId()) or
      editor:GetClassInfo():GetClassName() ~= 'wxStyledTextCtrl'
     then event:Skip(); return end
 
@@ -100,6 +104,8 @@ frame:Connect(ID "edit.showtooltip", wx.wxEVT_COMMAND_MENU_SELECTED,
 
     EditorCallTip(editor, editor:GetCurrentPos())
   end)
+frame:Connect(ID "edit.showtooltip", wx.wxEVT_UPDATE_UI,
+  function (event) event:Enable(GetEditor() ~= nil) end)
 
 frame:Connect(ID_AUTOCOMPLETE, wx.wxEVT_COMMAND_MENU_SELECTED,
   function (event)

src/editor/menu_file.lua

@@ -63,12 +63,13 @@ frame:Connect(ID_SAVE, wx.wxEVT_COMMAND_MENU_SELECTED,
 frame:Connect(ID_SAVE, wx.wxEVT_UPDATE_UI,
   function (event)
     local editor = GetEditor()
+    local enabled = false
     if editor then
       local id = editor:GetId()
-      if openDocuments[id] then
-        event:Enable(openDocuments[id].isModified or not openDocuments[id].filePath)
-      end
+      enabled = openDocuments[id]
+        and (openDocuments[id].isModified or not openDocuments[id].filePath)
     end
+    event:Enable(enabled)
   end)
 
 frame:Connect(ID_SAVEAS, wx.wxEVT_COMMAND_MENU_SELECTED,
@@ -90,7 +91,7 @@ frame:Connect(ID_SAVEALL, wx.wxEVT_UPDATE_UI,
   function (event)
     local atLeastOneModifiedDocument = false
     for id, document in pairs(openDocuments) do
-      if document.isModified then
+      if document.isModified or not document.filePath then
         atLeastOneModifiedDocument = true
         break
       end

src/editor/menu_project.lua

@@ -79,7 +79,7 @@ menuBar:Append(debugMenu, "&Project")
 -- Project directory handling
 
 function ProjectUpdateProjectDir(projdir,skiptree)
-  ide.config.path.projectdir = projdir
+  ide.config.path.projectdir = projdir ~= "" and projdir or nil
   menuBar:SetLabel(ID "debug.projectdir.currentdir",projdir)
   frame:SetStatusText(projdir)
   if (not skiptree) then
@@ -98,7 +98,7 @@ local function projChoose(event)
   local projectdir = ide.config.path.projectdir
 
   local filePicker = wx.wxDirDialog(frame, "Chose a project directory",
-    projectdir~="" and projectdir or wx.wxGetCwd(),wx.wxFLP_USE_TEXTCTRL)
+    projectdir ~= "" and projectdir or wx.wxGetCwd(),wx.wxFLP_USE_TEXTCTRL)
   local res = filePicker:ShowModal(true)
   if res == wx.wxID_OK then
     ProjectUpdateProjectDir(filePicker:GetPath())
@@ -244,7 +244,8 @@ frame:Connect(ID_TOGGLEBREAKPOINT, wx.wxEVT_COMMAND_MENU_SELECTED,
 frame:Connect(ID_TOGGLEBREAKPOINT, wx.wxEVT_UPDATE_UI,
   function (event)
     local editor = GetEditor()
-    event:Enable((ide.interpreter) and (ide.interpreter.hasdebugger) and (editor ~= nil))
+    event:Enable((ide.interpreter) and (ide.interpreter.hasdebugger) and (editor ~= nil)
+      and (not debugger.running) and (not debugger.scratchpad))
   end)
 
 frame:Connect(ID_COMPILE, wx.wxEVT_COMMAND_MENU_SELECTED,
@@ -280,6 +281,7 @@ frame:Connect(ID_RUNNOW, wx.wxEVT_UPDATE_UI,
     -- allow scratchpad if there is no server or (there is a server and it is
     -- allowed to turn it into a scratchpad) and we are not debugging anything
     event:Enable((ide.interpreter) and (ide.interpreter.hasdebugger) and
+                 (ide.interpreter.scratchextloop ~= nil) and -- nil == no scratchpad support
                  (editor ~= nil) and ((debugger.server == nil or debugger.scratchable)
                  and debugger.pid == nil or debugger.scratchpad ~= nil))
   end)

src/editor/menu_search.lua

@@ -44,20 +44,21 @@ frame:Connect(ID_FIND_IN_FILES, wx.wxEVT_COMMAND_MENU_SELECTED,
     findReplace:GetSelectedString()
     findReplace:Show(false,true)
   end)
-frame:Connect(ID_FIND_IN_FILES, wx.wxEVT_UPDATE_UI, OnUpdateUISearchMenu)
-
 frame:Connect(ID_REPLACE_IN_FILES, wx.wxEVT_COMMAND_MENU_SELECTED,
   function (event)
     findReplace:GetSelectedString()
     findReplace:Show(true,true)
   end)
-frame:Connect(ID_REPLACE_IN_FILES, wx.wxEVT_UPDATE_UI, OnUpdateUISearchMenu)
 
-frame:Connect(ID_FINDNEXT, wx.wxEVT_COMMAND_MENU_SELECTED, function (event) findReplace:GetSelectedString() findReplace:FindString() end)
-frame:Connect(ID_FINDNEXT, wx.wxEVT_UPDATE_UI, function (event) findReplace:HasText() end)
+frame:Connect(ID_FINDNEXT, wx.wxEVT_COMMAND_MENU_SELECTED,
+  function (event) findReplace:GetSelectedString() findReplace:FindString() end)
+frame:Connect(ID_FINDNEXT, wx.wxEVT_UPDATE_UI,
+  function (event) event:Enable(findReplace:GetSelectedString() and findReplace:HasText()) end)
 
-frame:Connect(ID_FINDPREV, wx.wxEVT_COMMAND_MENU_SELECTED, function (event) findReplace:GetSelectedString() findReplace:FindString(true) end)
-frame:Connect(ID_FINDPREV, wx.wxEVT_UPDATE_UI, function (event) findReplace:HasText() end)
+frame:Connect(ID_FINDPREV, wx.wxEVT_COMMAND_MENU_SELECTED,
+  function (event) findReplace:GetSelectedString() findReplace:FindString(true) end)
+frame:Connect(ID_FINDPREV, wx.wxEVT_UPDATE_UI,
+  function (event) event:Enable(findReplace:GetSelectedString() and findReplace:HasText()) end)
 
 -------------------- Find replace end
 

src/editor/menu_view.lua

@@ -48,9 +48,11 @@ frame:Connect(ID "view.filetree.show", wx.wxEVT_COMMAND_MENU_SELECTED,
 frame:Connect(ID_FULLSCREEN, wx.wxEVT_COMMAND_MENU_SELECTED, function ()
     pcall(function() ShowFullScreen(not frame:IsFullScreen()) end)
   end)
+frame:Connect(ID_FULLSCREEN, wx.wxEVT_UPDATE_UI,
+  function (event) event:Enable(GetEditor() ~= nil) end)
 
 frame:Connect(ID_VIEWWATCHWINDOW, wx.wxEVT_COMMAND_MENU_SELECTED,
-  function (event) DebuggerCreateWatchWindow() end)
+  function () DebuggerCreateWatchWindow() end)
 
 frame:Connect(ID_VIEWCALLSTACK, wx.wxEVT_COMMAND_MENU_SELECTED,
-  function (event) DebuggerCreateStackWindow() end)
+  function () DebuggerCreateStackWindow() end)

src/editor/settings.lua

@@ -11,12 +11,7 @@ ide.settings = settings
 
 local function settingsReadSafe(settings,what,default)
   local cr,out = settings:Read(what,default)
-
-  if (cr) then
-    return out
-  else
-    return default
-  end
+  return cr and out or default
 end
 
 -- ----------------------------------------------------------------------------
@@ -133,34 +128,33 @@ function SettingsAppendFileToHistory (filename)
 end
 
 ---
--- () SettingsRestoreFileSession (function)
+-- () SettingsRestoreFileSession (function [, string section])
 -- restores a list of opened files from the file settings
 -- calls the given function with the restored table, a list
 -- of tables containing tables like
 -- {filename = "filename", cursorpos = <cursor position>}
-function SettingsRestoreFileSession(fntab)
-  local listname = "/session"
+function SettingsRestoreFileSession(fntab, section)
+  local listname = section or "/session"
   local path = settings:GetPath()
   settings:SetPath(listname)
   local outtab = {}
-  local couldread = true
-  local id = 1
-  local name
-  while(couldread) do
-    couldread, name = settings:Read(tostring(id), "")
-    local fname,cursorpos = name:match("^(.+);(.-)$")
-    name = fname or name
-    cursorpos = tonumber(cursorpos or 0)
-    couldread = couldread and name ~= ""
-    if (couldread) then
-      table.insert(outtab,{filename = name, cursorpos = cursorpos})
-      id = id + 1
+  local params = {}
+  local ismore, key, index = settings:GetFirstEntry("", 0)
+  while (ismore) do
+    local couldread, value = settings:Read(key, "")
+    if tonumber(key) then
+      local fname,cursorpos = value:match("^(.+);(.-)$")
+      if (couldread and value ~= "") then
+        outtab[tonumber(key)] =
+          {filename = fname or value, cursorpos = tonumber(cursorpos) or 0}
+      end
+    else
+      params[key] = tonumber(value) or value
     end
+    ismore, key, index = settings:GetNextEntry(index)
   end
 
-  local index = settingsReadSafe(settings,"index",1)
-
-  if fntab then fntab(outtab,index) end
+  if fntab then fntab(outtab, params) end
 
   settings:SetPath(path)
 
@@ -168,11 +162,11 @@ function SettingsRestoreFileSession(fntab)
 end
 
 ---
--- () SettingsSaveFileList (table opendocs)
+-- () SettingsSaveFileSession (table opendocs, table params [, string section])
 -- saves the list of currently opened documents (passed in the opendocs table)
 -- in the settings.
-function SettingsSaveFileSession(opendocs,index)
-  local listname = "/session"
+function SettingsSaveFileSession(opendocs, params, section)
+  local listname = section or "/session"
   local path = settings:GetPath()
   settings:DeleteGroup(listname)
   settings:SetPath(listname)
@@ -180,14 +174,15 @@ function SettingsSaveFileSession(opendocs,index)
   for i,doc in ipairs(opendocs) do
     settings:Write(tostring(i), doc.filename..";"..doc.cursorpos)
   end
-  settings:Write("index",index)
+
+  -- save all other parameters
+  for k,v in pairs(params) do settings:Write(k, v) end
 
   settings:SetPath(path)
 end
 
 ---
 -- () SettingsRestoreProjectSession (function)
-
 function SettingsRestoreProjectSession(fntab)
   local listname = "/projectsession"
   local path = settings:GetPath()
@@ -196,12 +191,15 @@ function SettingsRestoreProjectSession(fntab)
   local couldread = true
   local id = 1
   local name
-  while(couldread) do
+  while (couldread) do
     couldread, name = settings:Read(tostring(id), "")
     couldread = couldread and name ~= ""
     if (couldread) then
       if (wx.wxDirExists(name)) then
         table.insert(outtab,name)
+
+        local function projsession(...) ProjectConfig(name, {...}) end
+        SettingsRestoreFileSession(projsession, listname .. "/" .. tostring(id))
       end
       id = id + 1
     end
@@ -226,6 +224,11 @@ function SettingsSaveProjectSession(projdirs)
 
   for i,dir in ipairs(projdirs) do
     settings:Write(tostring(i), dir)
+
+    local opendocs, params = ProjectConfig(dir)
+    if opendocs and #opendocs > 0 then
+      SettingsSaveFileSession(opendocs, params, listname .. "/" .. tostring(i))
+    end
   end
 
   settings:SetPath(path)
@@ -433,3 +436,11 @@ function SettingsSaveEditorSettings()
 
   settings:SetPath(path)
 end
+
+function SettingsSaveAll()
+  SettingsSaveProjectSession(FileTreeGetProjects())
+  SettingsSaveFileSession(GetOpenFiles())
+  SettingsSaveView()
+  SettingsSaveFramePosition(ide.frame, "MainFrame")
+  SettingsSaveEditorSettings()
+end

src/editor/singleinstance.lua

@@ -9,8 +9,8 @@ if it fails it tries to contact the running application
 - if it confirms being the IDE we let that instance open it, finish our application
 - otherwise we throw an error message on the user and start like normal
 
-probably a pitfal: an estreala instance is running but is not visible (because it was finished
-  though the UDP thing still runs)
+probably a pitfal: an instance is running but is not visible
+  (because it was finished though the UDP thing still runs)
 ]]
 
 if not ide.config.singleinstance then return end
@@ -23,12 +23,12 @@ local svr = socket.udp()
 
 local success, errmsg = svr:setsockname("127.0.0.1",port) -- bind on local host
 
-local protocoll = {client = {}, server = {}}
+local protocol = {client = {}, server = {}}
 
-protocoll.client.greeting = "Is this you, my IDE? It's me, a new instance."
-protocoll.server.greeting = "Yes it is me, how may I serve you?"
-protocoll.client.requestloading = "Could you please load this file for me: %s"
-protocoll.server.answerok = "Sure. You may now leave."
+protocol.client.greeting = "Is this you, my IDE? It's me, a new instance."
+protocol.server.greeting = "Yes it is me, how may I serve you?"
+protocol.client.requestloading = "Could you please load this file for me: %s"
+protocol.server.answerok = "Sure. You may now leave."
 
 if success then -- ok, server was started, we are solo
   --TODO: if multiple files are to be opened, each file is handled one by one - we could create a single string instead...
@@ -44,42 +44,36 @@ if success then -- ok, server was started, we are solo
       local msg, err, port = svr:receivefrom() -- receive a msg
       if msg then
         local ip = err -- the errmsg is actually the IP
-        -- DisplayOutput("client sent request: "..tostring(ip)..","..tostring(port).."\n")
-        -- DisplayOutput("UDP.SingleInstanceServer: "..msg.."\n")
-        if msg == protocoll.client.greeting then -- just send back hi
-          svr:sendto(protocoll.server.greeting,ip,port)
-        elseif msg:match(protocoll.client.requestloading:gsub("%%s",".+$")) then -- ok we need to open something
-          local filename = msg:match(protocoll.client.requestloading:gsub("%%s","(.+)$"))
-          -- DisplayOutput("UDP.SingleInstanceServer: open file "..filename.."\n")
-
-          LoadFile(filename, nil, true)
-          svr:sendto(protocoll.server.answerok,ip,port)
-
-          ide.frame:RequestUserAttention() -- let's let the user know we want his attention
-
+        if msg == protocol.client.greeting then -- just send back hi
+          svr:sendto(protocol.server.greeting,ip,port)
+        elseif msg:match(protocol.client.requestloading:gsub("%%s",".+$")) then -- ok we need to open something
+          svr:sendto(protocol.server.answerok,ip,port)
+          local filename = msg:match(protocol.client.requestloading:gsub("%%s","(.+)$"))
+          if filename then
+            if LoadFile(filename, nil, true)
+            then ide.frame:RequestUserAttention() -- let's let the user know we want his attention
+            else DisplayOutput("Can't open requested file '"..filename.."'.\n") end
+          end
         end
-
       end
-      --DisplayOutput("check "..os.clock().."\n")
     end)
 else -- something different is running on our port
   local cln = socket.udp()
   cln:setpeername("127.0.0.1",port)
-  cln:settimeout(5) -- two seconds of waiting should be enough, if no response, we asume we are running
-
-  cln:send(protocoll.client.greeting)
+  cln:settimeout(2)
+  cln:send(protocol.client.greeting)
 
   local msg,err = cln:receive()
   local arg = ide.arg
-  if msg and msg == protocoll.server.greeting then
+  if msg and msg == protocol.server.greeting then
     local failed = false
     for index = 2, #arg do
       local fileName = arg[index]
       if fileName ~= "--" then
-        cln:send(protocoll.client.requestloading:format(fileName))
+        cln:send(protocol.client.requestloading:format(fileName))
 
         local msg,err = cln:receive()
-        if msg~=protocoll.server.answerok then
+        if msg ~= protocol.server.answerok then
           failed = true
           print(err,msg)
         else
@@ -91,10 +85,7 @@ else -- something different is running on our port
     else -- done
       os.exit(0)
     end
-    --DisplayOutput("OK\n")
   else
-    print("The Single instance communication has failed, it is not certain if this is the only running instance")
+    print("The single instance communication has failed; there may be another instance running, which may cause interference with the debugger.")
   end
 end
-
---print("UDP Server: "..success.." - "..tostring(errmsg).."\n")

src/main.lua

@@ -2,12 +2,19 @@
 ---------------------------------------------------------
 
 -- put bin/ and lualibs/ first to avoid conflicts with included modules
--- that may have other versions present somewhere else in path/cpath
+-- that may have other versions present somewhere else in path/cpath.
+-- don't need to do this on Linux where we expect all the libraries
+-- and binaries to be installed in *regular* places.
 local iswindows = os.getenv('WINDIR') or (os.getenv('OS') or ''):match('[Ww]indows')
-package.cpath = (iswindows
-  and 'bin/?.dll;bin/clibs/?.dll;'
-   or 'bin/clibs/?.dylib;bin/lib?.dylib;bin/?.so;bin/clibs/?.so;')
-  .. package.cpath
+
+if iswindows or not pcall(require, "wx")
+  or wx.wxPlatformInfo.Get():GetOperatingSystemFamilyName() == 'Macintosh' then
+  package.cpath = (iswindows
+    and 'bin/?.dll;bin/clibs/?.dll;'
+     or 'bin/clibs/?.dylib;bin/lib?.dylib;')
+    .. package.cpath
+end
+
 package.path  = 'lualibs/?.lua;lualibs/?/?.lua;lualibs/?/init.lua;lualibs/?/?/?.lua;lualibs/?/?/init.lua;'
               .. package.path
 
@@ -35,6 +42,7 @@ ide = {
     },
     debugger = {
       verbose = false,
+      hostname = nil,
     },
     default = {
       name = 'untitled',
@@ -83,6 +91,11 @@ ide = {
   filetree = nil, -- filetree
   findReplace = nil, -- find & replace handling
   settings = nil, -- user settings (window pos, last files..)
+  session = {
+    projects = {}, -- project configuration for the current session
+    lastupdated = nil, -- timestamp of the last modification in any of the editors
+    lastsaved = nil, -- timestamp of the last recovery information saved
+  },
 
   -- misc
   exitingProgram = false, -- are we currently exiting, ID_EXIT
@@ -109,10 +122,11 @@ function setLuaPaths(mainpath, os)
   -- (luaconf.h) in Windows, any exclamation mark ('!') in the path is replaced
   -- by the path of the directory of the executable file of the current process.
   -- this effectively prevents any path with an exclamation mark from working.
-  -- if the path has an excamation mark, we allow Lua to expand it
-  -- (for use in LUA_PATH/LUA_CPATH)
+  -- if the path has an excamation mark, allow Lua to expand it as this
+  -- expansion happens only once.
   if os == "Windows" and mainpath:find('%!') then mainpath = "!/../" end
-  wx.wxSetEnv("LUA_PATH", package.path .. ';'
+  wx.wxSetEnv("LUA_PATH", package.path .. ";"
+    .. "./?.lua;./?/init.lua;./lua/?.lua;./lua/?/init.lua;"
     .. mainpath.."lualibs/?/?.lua;"..mainpath.."lualibs/?.lua")
 
   local clibs =
@@ -165,28 +179,46 @@ do
   setLuaPaths(GetPathWithSep(ide.editorFilename), ide.osname)
 end
 
+-- temporarily replace print() to capture reported error messages to show
+-- them later in the Output window after everything is loaded.
+local resumePrint do
+  local errors = {}
+  local origprint = print
+  print = function(...) errors[#errors+1] = {...} end
+  resumePrint = function()
+    print = origprint
+    for _, e in ipairs(errors) do DisplayOutput(unpack(e), "\n") end
+  end
+end
+
 -----------------------
 -- load config
-local function addConfig(filename,showerror,isstring)
-  local cfgfn,err = isstring and loadstring(filename) or loadfile(filename)
+local function addConfig(filename,isstring)
+  -- skip those files that don't exist
+  if not isstring and not wx.wxFileName(filename):FileExists() then return end
+  -- if it's marked as command, but exists as a file, load it as a file
+  if isstring and wx.wxFileName(filename):FileExists() then isstring = false end
+
+  local cfgfn, err, msg
+  if isstring
+  then msg, cfgfn, err = "string", loadstring(filename)
+  else msg, cfgfn, err = "file", loadfile(filename) end
+
   if not cfgfn then
-    if (showerror) then
-      print(("Error while loading configuration file: %s\n%s"):format(filename,err))
-    end
+    print(("Error while loading configuration %s: %s"):format(msg, err))
   else
     ide.config.os = os
     ide.config.wxstc = wxstc
     setfenv(cfgfn,ide.config)
-    xpcall(function()cfgfn(assert(_G or _ENV))end,
-      function(err)
-        print("Error while executing configuration file: \n",
-          debug.traceback(err))
-      end)
+    local _, err = pcall(function()cfgfn(assert(_G or _ENV))end)
+    if err then
+      print(("Error while processing configuration %s: %s"):format(msg, err))
+    end
   end
 end
 
 do
-  addConfig(ide.config.path.app.."/config.lua",true)
+  addConfig(ide.config.path.app.."/config.lua")
 end
 
 ----------------------
@@ -209,18 +241,13 @@ end
 local function addToTab(tab,file)
   local cfgfn,err = loadfile(file)
   if not cfgfn then
-    print(("Error while loading configuration file (%s): \n%s"):format(file,err))
+    print(("Error while loading configuration file: %s"):format(err))
   else
     local name = file:match("([a-zA-Z_0-9]+)%.lua$")
-
-    local success,result
-    success, result = xpcall(
-      function()return cfgfn(_G or _ENV)end,
-      function(err)
-        print(("Error while executing configuration file (%s): \n%s"):
-          format(file,debug.traceback(err)))
-      end)
-    if (name and success) then
+    local success, result = pcall(function()return cfgfn(assert(_G or _ENV))end)
+    if not success then
+      print(("Error while processing configuration file: %s"):format(result))
+    elseif name then
       if (tab[name]) then
         local out = tab[name]
         for i,v in pairs(result) do
@@ -235,73 +262,81 @@ end
 
 -- load interpreters
 local function loadInterpreters()
-  local files = FileSysGet("./interpreters/*.*",wx.wxFILE)
-  for i,file in ipairs(files) do
+  for _, file in ipairs(FileSysGet("interpreters/*.*", wx.wxFILE)) do
     if file:match "%.lua$" and app.loadfilters.interpreters(file) then
       addToTab(ide.interpreters,file)
     end
   end
 end
-loadInterpreters()
 
 -- load specs
 local function loadSpecs()
-  local files = FileSysGet("./spec/*.*",wx.wxFILE)
-  for i,file in ipairs(files) do
+  for _, file in ipairs(FileSysGet("spec/*.*", wx.wxFILE)) do
     if file:match "%.lua$" and app.loadfilters.specs(file) then
       addToTab(ide.specs,file)
     end
   end
 
-  for n,spec in pairs(ide.specs) do
+  for _, spec in pairs(ide.specs) do
     spec.sep = spec.sep or ""
     spec.iscomment = {}
     spec.iskeyword0 = {}
     spec.isstring = {}
     if (spec.lexerstyleconvert) then
       if (spec.lexerstyleconvert.comment) then
-        for i,s in pairs(spec.lexerstyleconvert.comment) do
+        for _, s in pairs(spec.lexerstyleconvert.comment) do
           spec.iscomment[s] = true
         end
       end
       if (spec.lexerstyleconvert.keywords0) then
-        for i,s in pairs(spec.lexerstyleconvert.keywords0) do
+        for _, s in pairs(spec.lexerstyleconvert.keywords0) do
           spec.iskeyword0[s] = true
         end
       end
       if (spec.lexerstyleconvert.stringtxt) then
-        for i,s in pairs(spec.lexerstyleconvert.stringtxt) do
+        for _, s in pairs(spec.lexerstyleconvert.stringtxt) do
           spec.isstring[s] = true
         end
       end
     end
   end
 end
-loadSpecs()
 
 -- load tools
 local function loadTools()
-  local files = FileSysGet("./tools/*.*",wx.wxFILE)
-  for i,file in ipairs(files) do
+  for _, file in ipairs(FileSysGet("tools/*.*", wx.wxFILE)) do
     if file:match "%.lua$" and app.loadfilters.tools(file) then
       addToTab(ide.tools,file)
     end
   end
 end
-loadTools()
 
 if app.preinit then app.preinit() end
 
 do
-  addConfig("cfg/user.lua",false)
+  -- process user config
+  for _, file in ipairs(FileSysGet("cfg/user.lua", wx.wxFILE)) do
+    addConfig(file)
+  end
   local home = os.getenv("HOME")
-  if home then addConfig(home .. "/.zbs/user.lua",false) end
-  for i,v in ipairs(configs) do
-    addConfig(v,true,true)
+  if home then
+    for _, file in ipairs(FileSysGet(home .. "/.zbstudio/user.lua", wx.wxFILE)) do
+      addConfig(file)
+    end
+  end
+  -- process all other configs (if any)
+  for _, v in ipairs(configs) do
+    addConfig(v, true)
   end
   configs = nil
 end
 
+-- load this after preinit and processing configs to allow
+-- each of the lists to be modified
+loadInterpreters()
+loadSpecs()
+loadTools()
+
 ---------------
 -- Load App
 
@@ -332,7 +367,11 @@ dofile "src/version.lua"
 -- load rest of settings
 SettingsRestoreEditorSettings()
 SettingsRestoreFramePosition(ide.frame, "MainFrame")
-SettingsRestoreFileSession(SetOpenFiles)
+SettingsRestoreFileSession(function(tabs, params)
+  if params and params.recovery
+  then return SetOpenTabs(params)
+  else return SetOpenFiles(tabs, params) end
+end)
 SettingsRestoreFileHistory(UpdateFileHistoryUI)
 SettingsRestoreProjectSession(FileTreeSetProjects)
 SettingsRestoreView()
@@ -341,20 +380,14 @@ SettingsRestoreView()
 -- Load the filenames
 
 do
-  local notebook = ide.frame.notebook
-  local loaded
-
-  for i,fileName in ipairs(filenames) do
+  for _, fileName in ipairs(filenames) do
     if fileName ~= "--" then
       LoadFile(fileName, nil, true)
-      loaded = true
     end
   end
 
-  if notebook:GetPageCount() == 0 then
-    local editor = CreateEditor("untitled.lua")
-    SetupKeywords(editor, "lua")
-  end
+  local notebook = ide.frame.notebook
+  if notebook:GetPageCount() == 0 then NewFile() end
 end
 
 if app.postinit then app.postinit() end
@@ -366,9 +399,8 @@ ide.frame:SetMenuBar(ide.frame.menuBar)
 if ide.osname == 'Macintosh' then -- force refresh to fix the filetree
   pcall(function() ide.frame:ShowFullScreen(true) ide.frame:ShowFullScreen(false) end)
 end
-ide.frame:Show(true)
 
--- call wx.wxGetApp():MainLoop() last to start the wxWidgets event loop,
--- otherwise the program will exit immediately.
--- Does nothing if the MainLoop is already running.
+resumePrint()
+
+ide.frame:Show(true)
 wx.wxGetApp():MainLoop()

src/misc/util.lua

@@ -172,6 +172,7 @@ function FileSysGet(dir,spec)
     table.insert(content,(f:gsub("^file:",""))) -- remove file: protocol (wx2.9+)
     f = browse:FindNext()
   end
+  if ide.osname == 'Unix' then table.sort(content) end
   return content
 end
 

zbstudio.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+if [[ $(uname) == 'Darwin' ]]; then
+  open zbstudio/ZeroBraneStudio.app --args "$@"
+else
+  type lua 2>/dev/null >&2 && lua -e "os.exit(pcall(require, 'wx') and 0 or 1)"
+  if [[ "$?" != "0" ]]; then (cd build; bash install-deb.sh); fi
+  lua src/main.lua zbstudio "$@"
+fi

zbstudio/MANIFEST

@@ -1,21 +1,14 @@
 CHANGELOG.md
 LICENSE
 README.md
-api/lua/baselib.lua
-api/lua/love2d.lua
-api/readme.txt
-bin/clibs/mime/core.dll
-bin/clibs/ssl.dll
-bin/clibs/socket/core.dll
-bin/lua.exe
-bin/lua5.1.dll
-bin/lua51.dll
-bin/winapi.dll
-bin/wx.dll
+api/lua/*.lua
+api/opencl/*.lua
+api/glsl/*.lua
+api/cg/*.lua
+api/README
 cfg/user-sample.lua
-interpreters/love2d.lua
-interpreters/luadeb.lua
-interpreters/moai.lua
+cfg/estrela.lua
+interpreters/*.lua
 lualibs/copas/copas.lua
 lualibs/coxpcall/coxpcall.lua
 lualibs/luainspect/ast.lua
@@ -56,7 +49,7 @@ lualibs/socket/url.lua
 lualibs/ssl.lua
 lualibs/ssl/https.lua
 lualibs/testwell.lua
-spec/lua.lua
+spec/*.lua
 src/defs.lua
 src/editor/autocomplete.lua
 src/editor/commands.lua
@@ -87,7 +80,7 @@ src/misc/util.lua
 src/preferences/editor.lua
 src/preferences/project.lua
 src/version.lua
-zbstudio.exe
+tools/*.lua
 zbstudio/app.lua
 zbstudio/config.lua
 zbstudio/menu_help.lua
@@ -95,15 +88,24 @@ zbstudio/res/16.ico
 zbstudio/res/16/LICENSE
 zbstudio/res/16/wxART_COPY.png
 zbstudio/res/16/wxART_CUT.png
+zbstudio/res/16/wxART_DEBUG_BREAK.png
+zbstudio/res/16/wxART_DEBUG_BREAKPOINT_TOGGLE.png
+zbstudio/res/16/wxART_DEBUG_CALLSTACK.png
+zbstudio/res/16/wxART_DEBUG_START.png
+zbstudio/res/16/wxART_DEBUG_STEP_INTO.png
+zbstudio/res/16/wxART_DEBUG_STEP_OUT.png
+zbstudio/res/16/wxART_DEBUG_STEP_OVER.png
+zbstudio/res/16/wxART_DEBUG_STOP.png
+zbstudio/res/16/wxART_DEBUG_WATCH.png
 zbstudio/res/16/wxART_FILE_OPEN.png
 zbstudio/res/16/wxART_FILE_SAVE.png
 zbstudio/res/16/wxART_FIND.png
 zbstudio/res/16/wxART_FIND_AND_REPLACE.png
 zbstudio/res/16/wxART_FOLDER.png
 zbstudio/res/16/wxART_GO_DIR_UP.png
-zbstudio/res/16/wxART_GO_FORWARD-wxART_OTHER_C.png 
+zbstudio/res/16/wxART_GO_FORWARD-wxART_OTHER_C.png
 zbstudio/res/16/wxART_HELP_PAGE.png
-zbstudio/res/16/wxART_LIST_VIEW-wxART_OTHER_C.png  
+zbstudio/res/16/wxART_LIST_VIEW-wxART_OTHER_C.png
 zbstudio/res/16/wxART_NEW_DIR.png
 zbstudio/res/16/wxART_NORMAL_FILE-wxART_OTHER_C.png
 zbstudio/res/16/wxART_NORMAL_FILE.png
@@ -112,4 +114,5 @@ zbstudio/res/16/wxART_REDO.png
 zbstudio/res/16/wxART_REPORT_VIEW-wxART_OTHER_C.png
 zbstudio/res/16/wxART_UNDO.png
 zbstudio/res/32.ico
+zbstudio/res/estrela.png
 zbstudio/res/zerobrane.png

zbstudio/MANIFEST-bin-macos

@@ -0,0 +1,13 @@
+bin/libjpeg.8.dylib
+bin/libwx.dylib
+bin/libwxlua-wx28d-2.8.12.dylib
+bin/libwxlua_bind-wx28d-2.8.12.dylib
+bin/libwxlua_debug-wx28d-2.8.12.dylib
+bin/libwxlua_lua51-wx28d-2.8.12.dylib
+bin/libwxlua_socket-wx28d-2.8.12.dylib
+bin/libwxstedit-wx28d-1.6.0.dylib
+bin/lua
+bin/clibs/mime/core.dylib
+bin/clibs/socket/core.dylib
+bin/lua.app/Contents/Info.plist
+bin/lua.app/Contents/MacOS/lua

zbstudio/MANIFEST-bin-win32

@@ -0,0 +1,9 @@
+bin/clibs/mime/core.dll
+bin/clibs/ssl.dll
+bin/clibs/socket/core.dll
+bin/lua.exe
+bin/lua5.1.dll
+bin/lua51.dll
+bin/winapi.dll
+bin/wx.dll
+zbstudio.exe

zbstudio/ZeroBraneStudio.app/Contents/Info.plist

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleExecutable</key>
+        <string>ZeroBraneStudio</string>
+        <key>CFBundleDisplayName</key>
+        <string>ZeroBraneStudio</string>
+	<key>CFBundleGetInfoString</key>
+	<string></string>
+	<key>CFBundleIconFile</key>
+	<string>zbstudio.icns</string>
+	<key>CFBundleIdentifier</key>
+	<string></string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleLongVersionString</key>
+	<string></string>
+	<key>CFBundleName</key>
+	<string>ZeroBraneStudio</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string></string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string></string>
+	<key>CSResourcesFileMapped</key>
+	<true/>
+	<key>LSRequiresCarbon</key>
+	<true/>
+	<key>NSHumanReadableCopyright</key>
+	<string></string>
+</dict>
+</plist>

zbstudio/ZeroBraneStudio.app/Contents/MacOS/ZeroBraneStudio

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+ZBS_PATH=${0%/*/*}
+if [ ! -d $ZBS_PATH ]; then ZBS_PATH=${PWD%/*}; fi
+export DYLD_LIBRARY_PATH="$ZBS_PATH/ZeroBraneStudio/bin"
+if [[ ! -e $DYLD_LIBRARY_PATH/libedit.3.dylib && ! -e /usr/lib/libedit.3.dylib ]]
+then ln -s /usr/lib/libedit.2.dylib $DYLD_LIBRARY_PATH/libedit.3.dylib; fi
+(cd "$ZBS_PATH/ZeroBraneStudio"; bin/lua src/main.lua zbstudio "$@")

zbstudio/ZeroBraneStudio.app/Contents/ZeroBraneStudio

@@ -0,0 +1 @@
+../../..

zbstudio/app.lua

@@ -7,7 +7,7 @@ local CreateBitmap = function(id, client, size)
   local file
   if wx.wxFileName(fileClient):FileExists() then file = fileClient
   elseif wx.wxFileName(fileKey):FileExists() then file = fileKey
-  else return wx.wxNullBitmap end
+  else return wx.wxArtProvider.GetBitmap(id, client, size) end
   local icon = icons[file] or wx.wxBitmap(file)
   icons[file] = icon
   return icon
@@ -17,15 +17,11 @@ local app = {
   createbitmap = CreateBitmap,
   loadfilters = {
     tools = function(file) return false end,
-    specs = function(file) return true end,
-    interpreters = function(file) return true end,
+    specs = function(file) return file:find('^spec[/\\]lua%.lua$') end,
+    interpreters = function(file) return not file:find('estrela') end,
   },
 
   preinit = function ()
-    local artProvider = wx.wxLuaArtProvider()
-    artProvider.CreateBitmap = function(self, ...) return CreateBitmap(...) end
-    wx.wxArtProvider.Push(artProvider)
-
     ide.config.interpreter = "luadeb"
     ide.config.unhidewindow = { -- allow unhiding of GUI windows
       -- 1 - unhide if hidden, 0 - hide if shown

zbstudio/config.lua

@@ -5,6 +5,7 @@ editor.usetabs  = false
 editor.tabwidth = 2
 editor.usewrap = true
 editor.calltipdelay = 500
+editor.smartindent = true
 
 local G = ... -- this now points to the global environment
 if G.ide.osname == 'Macintosh' then filetree.fontsize = 11 end
@@ -18,6 +19,8 @@ acandtip.shorttip = false
 acandtip.nodynwords = true
 
 activateoutput = true
+projectautoopen = true
+autorecoverinactivity = 10
 
 styles = {
   -- lexer specific (inherit fg/bg from text)
@@ -27,7 +30,7 @@ styles = {
   stringeol = {fg = {0, 0, 0}, bg = {224, 192, 224}, fill = true},
   preprocessor = {fg = {127, 127,0}},
   operator = {fg = {0, 0, 0}},
-  number = {fg = {90, 100, 0}},
+  number = {fg = {90, 0, 255}},
 
   keywords0 = {fg = {0, 0, 127}, b = true},
   keywords1 = {fg = {127, 0, 0}, b = true},
@@ -51,7 +54,7 @@ styles = {
   calltipbg = nil,
   sel = nil,
   caret = nil,
-  caretlinebg = {bg = {250,250,240}},
+  caretlinebg = {bg = {240,240,230}},
   fold = nil,
   whitespace = nil,
 

zbstudio/menu_help.lua

@@ -18,15 +18,15 @@ local function DisplayAbout(event)
     <html>
       <body text="#777777">
 	<table border="0" width="100%">
-	  <tr><td><img src="zbstudio/res/zerobrane.png"></center></td></tr>
+	  <tr><td><img src="zbstudio/res/zerobrane.png"></td></tr>
 	  <tr><td>
-	<table cellspacing="3" cellpadding="3">
+	<table cellspacing="3" cellpadding="3" width="100%">
 	  <tr>
 		<td>
 		<b>ZeroBrane Studio (]]..ide.VERSION..[[; using MobDebug ]]..mobdebug._VERSION..[[)</b><br>
 		<b>Copyright &copy; 2011-2012 ZeroBrane LLC</b><br>
 		Paul Kulchenko<br>
-		Licensed under The MIT License.
+		Licensed under the MIT License.
 		</td>
 	  </tr>
 	  <tr>
@@ -34,8 +34,9 @@ local function DisplayAbout(event)
 		<b>Based on Estrela Editor</b><br>
 		<b>Copyright &copy; 2008-2011 Luxinia DevTeam</b><br>
 		Christoph Kubisch, Eike Decker<br>
-		Licensed under The MIT License.
+		Licensed under the MIT License.
 		</td>
+		<td><img align="right" src="zbstudio/res/estrela.png"></td>
 	  </tr>
 	  <tr>
 		<td>