Updated logic to request user attention for robustness and consistency between platforms.

Use `debugger.runonstart = false` to disable.

CHANGELOG.md

@@ -1,5 +1,263 @@
 # ZeroBrane Studio Changelog
 
+## v0.35 (Feb 10 2013)
+
+### Highlights
+  - Added support for **debugging Lua 5.2 scripts**.
+  - Added support for **cross-platform remote debugging**.
+  - Added support for starting Gideros **on-device debugging**.
+  - Added support for live coding, script reloading, and coroutine debugging under LuaJIT.
+  - Added **Marmalade Quick** support.
+  - Added **live-coding for Corona** interpreter.
+  - Added editor tab popup menu with 'Close All', 'Close Other', and other items.
+
+### Special thanks
+  - To Roland Yonaba and Fringale for updates to French translation.
+  - To Fringale for enhanced line-endings handling.
+  - To toiffel for build improvements, continuous work on wxwidgets 2.9 support, and several patches.
+  - To Andy Bower for the stream of feedback on live coding and on-device debugging.
+
+### Improvements
+  - Added `debugger.runonstart` option to configure if debugging should run immediately after starting.
+  - Added `editor.checkeol` option to configure checking for eol encoding in loaded files.
+  - Added Marmalade Quick support.
+  - Added support for starting Gideros on-device debugging.
+  - Added requesting user attention when stopped during debugging.
+  - Added example for `defaulteol` configuration option.
+  - Added configuration option for compact folding (`editor.`).
+  - Added support for cross-platform remote debugging.
+  - Added support for script reloading and coroutine debugging under LuaJIT (MobDebug 0.514).
+  - Added Russian translation for new messages.
+  - Added handling of malformed UTF8 characters in files (fixes #97).
+  - Added support for debugging Lua 5.2 scripts.
+  - Added workaround for Moai require path issue (fixes #96; fixes #87).
+  - Added editor tab popup menu with 'Close All', 'Close Other', and other items.
+  - Added C/CPP specification file and a configuration example.
+  - Added XCode-like key mapping.
+  - Added removing of file: prefix and url decoding of filepaths (helps #89).
+  - Added a workaround for returning incorrect project folder (helps #89).
+  - Adjusted handling of filepath to work with relative and absolute paths (helps #89).
+  - Enabled live-coding for Corona interpreter.
+  - Improved line-endings handling (Fringale).
+  - Improved reporting of stack and serialization run-time errors.
+  - Updated Gideros interpreter to run debugging immediately after starting; Use `debugger.runonstart = false` to disable.
+  - Updated Linux startup script to use online versions of wxlua packages (deb files).
+  - Updated handling of file: prefix as it's different on Windows and OSX (helps #89).
+  - Updated messages in the starter script.
+  - Updated function call parsing to recognize "func{}" and "func''" syntax.
+  - Updated os.exit() call in local console to exit gracefully.
+  - Updated French translation with various fixes and tweaks (Fringale).
+  - Updated French translation with newly added strings (Fringale).
+  - Updated 'Close page' and its translations.
+  - Updated configuration examples and documentation (helps #55).
+  - Updated the size of the function list dropdown on Windows (helps #89).
+  - Typos fixes, small changes in French translation (Roland Yonaba).
+
+### Incompatibilities
+  - Gideros debugging is changed to start immediately; use `debugger.runonstart = false` to disable.
+  - Removed mosync support from the debugger into a separate module.
+  - Added mixed end-of-line reporting; use `editor.checkeol = false` to disable.
+  - Added reporting of malformed UTF-8.
+
+### Fixes
+  - Fixed a rare crash on OSX when closing IDE with an application running under debugger.
+  - Fixed path handling for metalua to avoid conflicts with other modules that may include lexer.lua file.
+  - Fixed executing commands in the Remote console immediately after `mobdebug.start()` (closes #100).
+  - Fixed invalid escape sequence that fails under LuaJIT.
+  - Fixed an issue with spec files when a separator (sep) is not specified.
+
+## v0.34 (Dec 12 2012)
+
+### Highlights
+  - Added **internationalization** support (with Russian, Italian, Spanish, and French translations).
+  - Added **key binding** configuration for menu and toolbar items.
+  - Added **Corona SDK integration** with debugging and auto-complete.
+  - Added **Moai scratchpad support**.
+  - Added **color scheme support** with several schemes included.
+  - Added **GSL-shell support**.
+  - Added ability to pause and resume scratchpad.
+
+### Special thanks
+  - To Srdjan Markovic for Corona auto-complete support and Zenburn color scheme.
+  - To Roland Yonaba for French translation.
+  - To Leo Bartoloni for Italian translation.
+  - To Inigo Sola for Spanish translation.
+  - To toiffel for Russian translation and several patches.
+  - To Fringale for spec and API files cleanup and update for Lua 5.2.
+  - To Marcel van Herk for assistance with scratchpad break/resume functionality.
+
+### Improvements
+  - Added an option to specify the width of the calltip.
+  - Added showing short descriptions in tooltip for functions without lib/package.
+  - Added 'Project Directory' menu.
+  - Added ability to pause scratchpad when the script is completed (closes #83).
+  - Added ability to pause and resume scratchpad.
+  - Added GSL-shell support (closes #72).
+  - Added more color schemes (Solarized and Monokai).
+  - Added customized yield function for debugging (MobDebug v0.508; closes #81).
+  - Added proper hiding of current line marker during debugging (except when tracing).
+  - Added Corona auto-complete support (thanks to Srdjan Markovic).
+  - Added logic to show application windows without explicitly listing their class (closes #80); Windows only.
+  - Added Moai scratchpad support.
+  - Added missing constants to Moai API.
+  - Added setting focus on the window when a file is loaded in the existing instance.
+  - Added two more wxwindow window classes to the list of windows to show (Windows).
+  - Added scheme picker script to test color schemes from the IDE.
+  - Added Zenburn as a color scheme.
+  - Added styling for markers and Output/Console windows.
+  - Added Italian translation (thanks to Leo Bartoloni).
+  - Added Spanish translation (thanks to Inigo Sola).
+  - Added reporting of run-time errors from remote processes (helps #73).
+  - Added 'tomorrow' color theme.
+  - Added redirect of remote 'print' commands for Gideros applications.
+  - Added check for 'main.lua' in Corona projects.
+  - Added ability to suspend a running application even when there is no editor tab or file to activate.
+  - Added serialization of remote 'print' results and an output filter for debugging (helps #73).
+  - Added redirect of remote 'print' commands to the Output window in the IDE (helps #73).
+  - Added Corona SDK support (closes #73).
+  - Added French translation (thanks to Roland Yonaba).
+  - Added (more) verbose output to debugger to assist in troubleshooting.
+  - Added handling of LUA_DEV to make loading Lua for Windows libraries working out of the box (fixes #71).
+  - Added internationalization support (closes #70).
+  - Added notes about estrela being gone and compatibility.
+  - Added multi-tab support for scratchpad.
+  - Added documentation on accelerator/shortcut syntax.
+  - Added key map to change key binding for menu and toolbar items from a config file (closes #64).
+  - Added hiding IDE while closing and saving configuration.
+  - Completed reorganization of front-end processing (closes #67 and #5).
+  - Disabled editor autoactivation during debugging when tracing is on.
+  - Disabled functions that are not available under Corona on OSX (helps #73).
+  - Disabled showing auto-complete when the only option is already typed.
+  - Disabled showing a calltip on mouse over when it's already active.
+  - Extended list of default folders for interpreters where executables are searched for.
+  - Finished Russian translation.
+  - Limited auto-showing windows to Lua interpreter only (related to #80).
+  - Removed window types from config as they are no longer needed to be listed.
+  - Switched to showing short tooltips by default as some of the updated Lua API descriptions are very long.
+  - Updated descriptions for io.* functions; moved file:* functions to a pseudo library (f); helps #84.
+  - Updated LICENSE to add remdebug license information.
+  - Updated tooltip to show shortened descriptions on mouse-over.
+  - Updated spec and API files for Lua 5.2 (thanks to Fringale).
+  - Updated MobDebug to v0.507 to fix serialization issues (closes #77).
+  - Updated style processing to support styling of markup and allow dynamic switching of color schemes.
+  - Updated Lua keyword definitions to improve grouping for styling (closes #79).
+  - Updated love2d api to an updated version as of 11/1/2012 (fixes #78).
+
+### Incompatibilities
+  - The default port in the debugger has been changed from 8171 to 8172 to avoid conflicts with existing RemDebug implementations.
+
+### Fixes
+  - Fixed an issue with overlapping auto-complete suggestions.
+  - Fixed auto-complete not working after closed brackets.
+  - Fixed tooltip being shown when mouse moving outside of the editor area.
+  - Fixed a font zooming bug with Ctrl+MouseWheel.
+  - Fixed file marking in the project tree after opening a new file.
+  - Fixed an issue with breakpoints not available after aborting tracing on Linux/OSX.
+  - Fixed an issue with running scratchpad when entry points are configured.
+  - Fixed Linux launcher to pass filename parameter to the IDE.
+  - Fixed fold style to properly set background color.
+  - Fixed an issue with a config file being loaded into the editor when specified in the command line.
+  - Fixed an issue with markdown formatting not working after setting styles from a config file (fixes #74).
+
+## 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.
+
+### Special thanks
+  - To Andy Bower and Atilim Cetin for their assistance with Gideros integration and live coding.
+  - To toiffel for Linux/OSX/Windows CMake-based launcher build.
+  - To Christoph Kubisch for help with Estrela merge.
+
+### 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,29 @@ 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
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+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.
+
+--[[ RemDebug License ]]---------------------------------------------------
+
+Copyright (c) 2006 The Kepler Project.
 
 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,65 @@
 # 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, Corona,
+MobileLua, GSL-shell, and others). It originated from the [Estrela Editor](http://www.luxinia.de/index.php/Estrela/).
 
 ## 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 (e.g. glsl);
+  - 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. DirectX/Cg shader compiler...).
 
-## 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)
+
+## Where is Estrela?
+
+The projects have been merged again and zbstudio will lead the future.
+Please reassociate files with zbstudio. To keep your history of files and
+projects copy the contents of the `EstrelaEditor.ini` in your HOME directory
+to `ZeroBraneStudio.ini`. If you have used Estrela for graphics shader
+authoring or luxinia, create/modify the `cfg/user.lua` to include the content
+of `cfg/estrela.lua` to load all tools and specifications by default again.
+  
 ## License
 
 See LICENSE file.

api/lua/cggl30.lua

@@ -1,572 +0,0 @@
---[[// cggl cgGL | Cg OpenGL runtime
-typedef unsigned int GLuint;
-typedef unsigned int GLenum;
-typedef void GLvoid;
-typedef int GLsizei;
-typedef int GLint;
-
-typedef enum
-{
-  CG_GL_MATRIX_IDENTITY             = 0,
-  CG_GL_MATRIX_TRANSPOSE            = 1,
-  CG_GL_MATRIX_INVERSE              = 2,
-  CG_GL_MATRIX_INVERSE_TRANSPOSE    = 3,
-  CG_GL_MODELVIEW_MATRIX            = 4,
-  CG_GL_PROJECTION_MATRIX           = 5,
-  CG_GL_TEXTURE_MATRIX              = 6,
-  CG_GL_MODELVIEW_PROJECTION_MATRIX = 7,
-  CG_GL_VERTEX                      = 8,
-  CG_GL_FRAGMENT                    = 9,
-  CG_GL_GEOMETRY                    = 10,
-  CG_GL_TESSELLATION_CONTROL        = 11,
-  CG_GL_TESSELLATION_EVALUATION     = 12
-} CGGLenum;
-
- CGbool  cgGLIsProfileSupported(CGprofile profile);
- void  cgGLEnableProfile(CGprofile profile);
- void  cgGLDisableProfile(CGprofile profile);
- CGprofile  cgGLGetLatestProfile(CGGLenum profile_type);
- void  cgGLSetOptimalOptions(CGprofile profile);
- char const **  cgGLGetOptimalOptions(CGprofile profile);
- void  cgGLLoadProgram(CGprogram program);
- void  cgGLUnloadProgram(CGprogram program);
- CGbool  cgGLIsProgramLoaded(CGprogram program);
- void  cgGLBindProgram(CGprogram program);
- void  cgGLUnbindProgram(CGprofile profile);
- GLuint  cgGLGetProgramID(CGprogram program);
- void  cgGLSetParameter1f(CGparameter param, float x);
- void  cgGLSetParameter2f(CGparameter param, float x, float y);
- void  cgGLSetParameter3f(CGparameter param, float x, float y, float z);
- void  cgGLSetParameter4f(CGparameter param, float x, float y, float z, float w);
- void  cgGLSetParameter1fv(CGparameter param, const float *v);
- void  cgGLSetParameter2fv(CGparameter param, const float *v);
- void  cgGLSetParameter3fv(CGparameter param, const float *v);
- void  cgGLSetParameter4fv(CGparameter param, const float *v);
- void  cgGLSetParameter1d(CGparameter param, double x);
- void  cgGLSetParameter2d(CGparameter param, double x, double y);
- void  cgGLSetParameter3d(CGparameter param, double x, double y, double z);
- void  cgGLSetParameter4d(CGparameter param, double x, double y, double z, double w);
- void  cgGLSetParameter1dv(CGparameter param, const double *v);
- void  cgGLSetParameter2dv(CGparameter param, const double *v);
- void  cgGLSetParameter3dv(CGparameter param, const double *v);
- void  cgGLSetParameter4dv(CGparameter param, const double *v);
- void  cgGLGetParameter1f(CGparameter param, float *v);
- void  cgGLGetParameter2f(CGparameter param, float *v);
- void  cgGLGetParameter3f(CGparameter param, float *v);
- void  cgGLGetParameter4f(CGparameter param, float *v);
- void  cgGLGetParameter1d(CGparameter param, double *v);
- void  cgGLGetParameter2d(CGparameter param, double *v);
- void  cgGLGetParameter3d(CGparameter param, double *v);
- void  cgGLGetParameter4d(CGparameter param, double *v);
- void  cgGLSetParameterArray1f(CGparameter param, long offset, long nelements, const float *v);
- void  cgGLSetParameterArray2f(CGparameter param, long offset, long nelements, const float *v);
- void  cgGLSetParameterArray3f(CGparameter param, long offset, long nelements, const float *v);
- void  cgGLSetParameterArray4f(CGparameter param, long offset, long nelements, const float *v);
- void  cgGLSetParameterArray1d(CGparameter param, long offset, long nelements, const double *v);
- void  cgGLSetParameterArray2d(CGparameter param, long offset, long nelements, const double *v);
- void  cgGLSetParameterArray3d(CGparameter param, long offset, long nelements, const double *v);
- void  cgGLSetParameterArray4d(CGparameter param, long offset, long nelements, const double *v);
- void  cgGLGetParameterArray1f(CGparameter param, long offset, long nelements, float *v);
- void  cgGLGetParameterArray2f(CGparameter param, long offset, long nelements, float *v);
- void  cgGLGetParameterArray3f(CGparameter param, long offset, long nelements, float *v);
- void  cgGLGetParameterArray4f(CGparameter param, long offset, long nelements, float *v);
- void  cgGLGetParameterArray1d(CGparameter param, long offset, long nelements, double *v);
- void  cgGLGetParameterArray2d(CGparameter param, long offset, long nelements, double *v);
- void  cgGLGetParameterArray3d(CGparameter param, long offset, long nelements, double *v);
- void  cgGLGetParameterArray4d(CGparameter param, long offset, long nelements, double *v);
- void  cgGLSetParameterPointer(CGparameter param, GLint fsize, GLenum type, GLsizei stride, const GLvoid *pointer);
- void  cgGLEnableClientState(CGparameter param);
- void  cgGLDisableClientState(CGparameter param);
- void  cgGLSetMatrixParameterdr(CGparameter param, const double *matrix);
- void  cgGLSetMatrixParameterfr(CGparameter param, const float *matrix);
- void  cgGLSetMatrixParameterdc(CGparameter param, const double *matrix);
- void  cgGLSetMatrixParameterfc(CGparameter param, const float *matrix);
- void  cgGLGetMatrixParameterdr(CGparameter param, double *matrix);
- void  cgGLGetMatrixParameterfr(CGparameter param, float *matrix);
- void  cgGLGetMatrixParameterdc(CGparameter param, double *matrix);
- void  cgGLGetMatrixParameterfc(CGparameter param, float *matrix);
- void  cgGLSetStateMatrixParameter(CGparameter param, CGGLenum matrix, CGGLenum transform);
- void  cgGLSetMatrixParameterArrayfc(CGparameter param, long offset, long nelements, const float *matrices);
- void  cgGLSetMatrixParameterArrayfr(CGparameter param, long offset, long nelements, const float *matrices);
- void  cgGLSetMatrixParameterArraydc(CGparameter param, long offset, long nelements, const double *matrices);
- void  cgGLSetMatrixParameterArraydr(CGparameter param, long offset, long nelements, const double *matrices);
- void  cgGLGetMatrixParameterArrayfc(CGparameter param, long offset, long nelements, float *matrices);
- void  cgGLGetMatrixParameterArrayfr(CGparameter param, long offset, long nelements, float *matrices);
- void  cgGLGetMatrixParameterArraydc(CGparameter param, long offset, long nelements, double *matrices);
- void  cgGLGetMatrixParameterArraydr(CGparameter param, long offset, long nelements, double *matrices);
- void  cgGLSetTextureParameter(CGparameter param, GLuint texobj);
- GLuint  cgGLGetTextureParameter(CGparameter param);
- void  cgGLEnableTextureParameter(CGparameter param);
- void  cgGLDisableTextureParameter(CGparameter param);
- GLenum  cgGLGetTextureEnum(CGparameter param);
- void  cgGLSetManageTextureParameters(CGcontext ctx, CGbool flag);
- CGbool  cgGLGetManageTextureParameters(CGcontext ctx);
- void  cgGLSetupSampler(CGparameter param, GLuint texobj);
- void  cgGLRegisterStates(CGcontext ctx);
- void  cgGLEnableProgramProfiles(CGprogram program);
- void  cgGLDisableProgramProfiles(CGprogram program);
- void  cgGLSetDebugMode(CGbool debug);
- CGbuffer  cgGLCreateBuffer(CGcontext context, int size, const void *data, GLenum bufferUsage);
- GLuint  cgGLGetBufferObject(CGbuffer buffer);
-
-]]  
---auto-generated api from ffi headers
-local api =
-  {
-  ["CGGLenum"] = { type ='value', description = "", valuetype = nil, },
-  ["CG_GL_MATRIX_IDENTITY"] = { type ='value', },
-  ["CG_GL_MATRIX_TRANSPOSE"] = { type ='value', },
-  ["CG_GL_MATRIX_INVERSE"] = { type ='value', },
-  ["CG_GL_MATRIX_INVERSE_TRANSPOSE"] = { type ='value', },
-  ["CG_GL_MODELVIEW_MATRIX"] = { type ='value', },
-  ["CG_GL_PROJECTION_MATRIX"] = { type ='value', },
-  ["CG_GL_TEXTURE_MATRIX"] = { type ='value', },
-  ["CG_GL_MODELVIEW_PROJECTION_MATRIX"] = { type ='value', },
-  ["CG_GL_VERTEX"] = { type ='value', },
-  ["CG_GL_FRAGMENT"] = { type ='value', },
-  ["CG_GL_GEOMETRY"] = { type ='value', },
-  ["CG_GL_TESSELLATION_CONTROL"] = { type ='value', },
-  ["CG_GL_TESSELLATION_EVALUATION"] = { type ='value', },
-  ["cgGLIsProfileSupported"] = { type ='function', 
-    description = "", 
-    returns = "(CGbool)",
-    valuetype = nil,
-    args = "(CGprofile profile)", },
-  ["cgGLEnableProfile"] = { type ='function', 
-    description = "", 
-    returns = "(void)",
-    valuetype = nil,
-    args = "(CGprofile profile)", },
-  ["cgGLDisableProfile"] = { type ='function', 
-    description = "", 
-    returns = "(void)",
-    valuetype = nil,
-    args = "(CGprofile profile)", },
-  ["cgGLGetLatestProfile"] = { type ='function', 
-    description = "", 
-    returns = "(CGprofile)",
-    valuetype = nil,
-    args = "(CGGLenum profile_type)", },
-  ["cgGLSetOptimalOptions"] = { type ='function', 
-    description = "", 
-    returns = "(void)",
-    valuetype = nil,
-    args = "(CGprofile profile)", },
-  ["cgGLGetOptimalOptions"] = { type ='function', 
-    description = "", 
-    returns = "(char const **)",
-    valuetype = nil,
-    args = "(CGprofile profile)", },
-  ["cgGLLoadProgram"] = { type ='function', 
-    description = "", 
-    returns = "(void)",
-    valuetype = nil,
-    args = "(CGprogram program)", },
-  ["cgGLUnloadProgram"] = { type ='function', 
-    description = "", 
-    returns = "(void)",
-    valuetype = nil,
-    args = "(CGprogram program)", },
-  ["cgGLIsProgramLoaded"] = { type ='function', 
-    description = "", 
-    returns = "(CGbool)",
-    valuetype = nil,
-    args = "(CGprogram program)", },
-  ["cgGLBindProgram"] = { type ='function', 
-    description = "", 
-    returns = "(void)",
-    valuetype = nil,
-    args = "(CGprogram program)", },
-  ["cgGLUnbindProgram"] = { type ='function', 
-    description = "", 
-    returns = "(void)",
-    valuetype = nil,
-    args = "(CGprofile profile)", },
-  ["cgGLGetProgramID"] = { type ='function', 
-    description = "", 
-    returns = "(GLuint)",
-    valuetype = nil,
-    args = "(CGprogram program)", },
-  ["cgGLSetParameter1f"] = { type ='function', 
-    description = "", 
-    returns = "(void)",
-    valuetype = nil,
-    args = "(CGparameter param, float x)", },
-  ["cgGLSetParameter2f"] = { type ='function', 
-    description = "", 
-    returns = "(void)",
-    valuetype = nil,
-    args = "(CGparameter param, float x, float y)", },
-  ["cgGLSetParameter3f"] = { type ='function', 
-    description = "", 
-    returns = "(void)",
-    valuetype = nil,
-    args = "(CGparameter param, float x, float y, float z)", },
-  ["cgGLSetParameter4f"] = { type ='function', 
-    description = "", 
-    returns = "(void)",
-    valuetype = nil,
-    args = "(CGparameter param, float x, float y, float z, float w)", },
-  ["cgGLSetParameter1fv"] = { type ='function', 
-    description = "", 
-    returns = "(void)",
-    valuetype = nil,
-    args = "(CGparameter param, const float *v)", },
-  ["cgGLSetParameter2fv"] = { type ='function', 
-    description = "", 
-    returns = "(void)",
-    valuetype = nil,
-    args = "(CGparameter param, const float *v)", },
-  ["cgGLSetParameter3fv"] = { type ='function', 
-    description = "", 
-    returns = "(void)",
-    valuetype = nil,
-    args = "(CGparameter param, const float *v)", },
-  ["cgGLSetParameter4fv"] = { type ='function', 
-    description = "", 
-    returns = "(void)",
-    valuetype = nil,
-    args = "(CGparameter param, const float *v)", },
-  ["cgGLSetParameter1d"] = { type ='function', 
-    description = "", 
-    returns = "(void)",
-    valuetype = nil,
-    args = "(CGparameter param, double x)", },
-  ["cgGLSetParameter2d"] = { type ='function', 
-    description = "", 
-    returns = "(void)",
-    valuetype = nil,
-    args = "(CGparameter param, double x, double y)", },
-  ["cgGLSetParameter3d"] = { type ='function', 
-    description = "", 
-    returns = "(void)",
-    valuetype = nil,
-    args = "(CGparameter param, double x, double y, double z)", },
-  ["cgGLSetParameter4d"] = { type ='function', 
-    description = "", 
-    returns = "(void)",
-    valuetype = nil,
-    args = "(CGparameter param, double x, double y, double z, double w)", },
-  ["cgGLSetParameter1dv"] = { type ='function', 
-    description = "", 
-    returns = "(void)",
-    valuetype = nil,
-    args = "(CGparameter param, const double *v)", },
-  ["cgGLSetParameter2dv"] = { type ='function', 
-    description = "", 
-    returns = "(void)",
-    valuetype = nil,
-    args = "(CGparameter param, const double *v)", },
-  ["cgGLSetParameter3dv"] = { type ='function', 
-    description = "", 
-    returns = "(void)",
-    valuetype = nil,
-    args = "(CGparameter param, const double *v)", },
-  ["cgGLSetParameter4dv"] = { type ='function', 
-    description = "", 
-    returns = "(void)",
-    valuetype = nil,
-    args = "(CGparameter param, const double *v)", },
-  ["cgGLGetParameter1f"] = { type ='function', 
-    description = "", 
-    returns = "(void)",
-    valuetype = nil,
-    args = "(CGparameter param, float *v)", },
-  ["cgGLGetParameter2f"] = { type ='function', 
-    description = "", 
-    returns = "(void)",
-    valuetype = nil,
-    args = "(CGparameter param, float *v)", },
-  ["cgGLGetParameter3f"] = { type ='function', 
-    description = "", 
-    returns = "(void)",
-    valuetype = nil,
-    args = "(CGparameter param, float *v)", },
-  ["cgGLGetParameter4f"] = { type ='function', 
-    description = "", 
-    returns = "(void)",
-    valuetype = nil,
-    args = "(CGparameter param, float *v)", },
-  ["cgGLGetParameter1d"] = { type ='function', 
-    description = "", 
-    returns = "(void)",
-    valuetype = nil,
-    args = "(CGparameter param, double *v)", },
-  ["cgGLGetParameter2d"] = { type ='function', 
-    description = "", 
-    returns = "(void)",
-    valuetype = nil,
-    args = "(CGparameter param, double *v)", },
-  ["cgGLGetParameter3d"] = { type ='function', 
-    description = "", 
-    returns = "(void)",
-    valuetype = nil,
-    args = "(CGparameter param, double *v)", },
-  ["cgGLGetParameter4d"] = { type ='function', 
-    description = "", 
-    returns = "(void)",
-    valuetype = nil,
-    args = "(CGparameter param, double *v)", },
-  ["cgGLSetParameterArray1f"] = { type ='function', 
-    description = "", 
-    returns = "(void)",
-    valuetype = nil,
-    args = "(CGparameter param, long offset, long nelements, const float *v)", },
-  ["cgGLSetParameterArray2f"] = { type ='function', 
-    description = "", 
-    returns = "(void)",
-    valuetype = nil,
-    args = "(CGparameter param, long offset, long nelements, const float *v)", },
-  ["cgGLSetParameterArray3f"] = { type ='function', 
-    description = "", 
-    returns = "(void)",
-    valuetype = nil,
-    args = "(CGparameter param, long offset, long nelements, const float *v)", },
-  ["cgGLSetParameterArray4f"] = { type ='function', 
-    description = "", 
-    returns = "(void)",
-    valuetype = nil,
-    args = "(CGparameter param, long offset, long nelements, const float *v)", },
-  ["cgGLSetParameterArray1d"] = { type ='function', 
-    description = "", 
-    returns = "(void)",
-    valuetype = nil,
-    args = "(CGparameter param, long offset, long nelements, const double *v)", },
-  ["cgGLSetParameterArray2d"] = { type ='function', 
-    description = "", 
-    returns = "(void)",
-    valuetype = nil,
-    args = "(CGparameter param, long offset, long nelements, const double *v)", },
-  ["cgGLSetParameterArray3d"] = { type ='function', 
-    description = "", 
-    returns = "(void)",
-    valuetype = nil,
-    args = "(CGparameter param, long offset, long nelements, const double *v)", },
-  ["cgGLSetParameterArray4d"] = { type ='function', 
-    description = "", 
-    returns = "(void)",
-    valuetype = nil,
-    args = "(CGparameter param, long offset, long nelements, const double *v)", },
-  ["cgGLGetParameterArray1f"] = { type ='function', 
-    description = "", 
-    returns = "(void)",
-    valuetype = nil,
-    args = "(CGparameter param, long offset, long nelements, float *v)", },
-  ["cgGLGetParameterArray2f"] = { type ='function', 
-    description = "", 
-    returns = "(void)",
-    valuetype = nil,
-    args = "(CGparameter param, long offset, long nelements, float *v)", },
-  ["cgGLGetParameterArray3f"] = { type ='function', 
-    description = "", 
-    returns = "(void)",
-    valuetype = nil,
-    args = "(CGparameter param, long offset, long nelements, float *v)", },
-  ["cgGLGetParameterArray4f"] = { type ='function', 
-    description = "", 
-    returns = "(void)",
-    valuetype = nil,
-    args = "(CGparameter param, long offset, long nelements, float *v)", },
-  ["cgGLGetParameterArray1d"] = { type ='function', 
-    description = "", 
-    returns = "(void)",
-    valuetype = nil,
-    args = "(CGparameter param, long offset, long nelements, double *v)", },
-  ["cgGLGetParameterArray2d"] = { type ='function', 
-    description = "", 
-    returns = "(void)",
-    valuetype = nil,
-    args = "(CGparameter param, long offset, long nelements, double *v)", },
-  ["cgGLGetParameterArray3d"] = { type ='function', 
-    description = "", 
-    returns = "(void)",
-    valuetype = nil,
-    args = "(CGparameter param, long offset, long nelements, double *v)", },
-  ["cgGLGetParameterArray4d"] = { type ='function', 
-    description = "", 
-    returns = "(void)",
-    valuetype = nil,
-    args = "(CGparameter param, long offset, long nelements, double *v)", },
-  ["cgGLSetParameterPointer"] = { type ='function', 
-    description = "", 
-    returns = "(void)",
-    valuetype = nil,
-    args = "(CGparameter param, GLint fsize, GLenum type, GLsizei stride, const GLvoid *pointer)", },
-  ["cgGLEnableClientState"] = { type ='function', 
-    description = "", 
-    returns = "(void)",
-    valuetype = nil,
-    args = "(CGparameter param)", },
-  ["cgGLDisableClientState"] = { type ='function', 
-    description = "", 
-    returns = "(void)",
-    valuetype = nil,
-    args = "(CGparameter param)", },
-  ["cgGLSetMatrixParameterdr"] = { type ='function', 
-    description = "", 
-    returns = "(void)",
-    valuetype = nil,
-    args = "(CGparameter param, const double *matrix)", },
-  ["cgGLSetMatrixParameterfr"] = { type ='function', 
-    description = "", 
-    returns = "(void)",
-    valuetype = nil,
-    args = "(CGparameter param, const float *matrix)", },
-  ["cgGLSetMatrixParameterdc"] = { type ='function', 
-    description = "", 
-    returns = "(void)",
-    valuetype = nil,
-    args = "(CGparameter param, const double *matrix)", },
-  ["cgGLSetMatrixParameterfc"] = { type ='function', 
-    description = "", 
-    returns = "(void)",
-    valuetype = nil,
-    args = "(CGparameter param, const float *matrix)", },
-  ["cgGLGetMatrixParameterdr"] = { type ='function', 
-    description = "", 
-    returns = "(void)",
-    valuetype = nil,
-    args = "(CGparameter param, double *matrix)", },
-  ["cgGLGetMatrixParameterfr"] = { type ='function', 
-    description = "", 
-    returns = "(void)",
-    valuetype = nil,
-    args = "(CGparameter param, float *matrix)", },
-  ["cgGLGetMatrixParameterdc"] = { type ='function', 
-    description = "", 
-    returns = "(void)",
-    valuetype = nil,
-    args = "(CGparameter param, double *matrix)", },
-  ["cgGLGetMatrixParameterfc"] = { type ='function', 
-    description = "", 
-    returns = "(void)",
-    valuetype = nil,
-    args = "(CGparameter param, float *matrix)", },
-  ["cgGLSetStateMatrixParameter"] = { type ='function', 
-    description = "", 
-    returns = "(void)",
-    valuetype = nil,
-    args = "(CGparameter param, CGGLenum matrix, CGGLenum transform)", },
-  ["cgGLSetMatrixParameterArrayfc"] = { type ='function', 
-    description = "", 
-    returns = "(void)",
-    valuetype = nil,
-    args = "(CGparameter param, long offset, long nelements, const float *matrices)", },
-  ["cgGLSetMatrixParameterArrayfr"] = { type ='function', 
-    description = "", 
-    returns = "(void)",
-    valuetype = nil,
-    args = "(CGparameter param, long offset, long nelements, const float *matrices)", },
-  ["cgGLSetMatrixParameterArraydc"] = { type ='function', 
-    description = "", 
-    returns = "(void)",
-    valuetype = nil,
-    args = "(CGparameter param, long offset, long nelements, const double *matrices)", },
-  ["cgGLSetMatrixParameterArraydr"] = { type ='function', 
-    description = "", 
-    returns = "(void)",
-    valuetype = nil,
-    args = "(CGparameter param, long offset, long nelements, const double *matrices)", },
-  ["cgGLGetMatrixParameterArrayfc"] = { type ='function', 
-    description = "", 
-    returns = "(void)",
-    valuetype = nil,
-    args = "(CGparameter param, long offset, long nelements, float *matrices)", },
-  ["cgGLGetMatrixParameterArrayfr"] = { type ='function', 
-    description = "", 
-    returns = "(void)",
-    valuetype = nil,
-    args = "(CGparameter param, long offset, long nelements, float *matrices)", },
-  ["cgGLGetMatrixParameterArraydc"] = { type ='function', 
-    description = "", 
-    returns = "(void)",
-    valuetype = nil,
-    args = "(CGparameter param, long offset, long nelements, double *matrices)", },
-  ["cgGLGetMatrixParameterArraydr"] = { type ='function', 
-    description = "", 
-    returns = "(void)",
-    valuetype = nil,
-    args = "(CGparameter param, long offset, long nelements, double *matrices)", },
-  ["cgGLSetTextureParameter"] = { type ='function', 
-    description = "", 
-    returns = "(void)",
-    valuetype = nil,
-    args = "(CGparameter param, GLuint texobj)", },
-  ["cgGLGetTextureParameter"] = { type ='function', 
-    description = "", 
-    returns = "(GLuint)",
-    valuetype = nil,
-    args = "(CGparameter param)", },
-  ["cgGLEnableTextureParameter"] = { type ='function', 
-    description = "", 
-    returns = "(void)",
-    valuetype = nil,
-    args = "(CGparameter param)", },
-  ["cgGLDisableTextureParameter"] = { type ='function', 
-    description = "", 
-    returns = "(void)",
-    valuetype = nil,
-    args = "(CGparameter param)", },
-  ["cgGLGetTextureEnum"] = { type ='function', 
-    description = "", 
-    returns = "(GLenum)",
-    valuetype = nil,
-    args = "(CGparameter param)", },
-  ["cgGLSetManageTextureParameters"] = { type ='function', 
-    description = "", 
-    returns = "(void)",
-    valuetype = nil,
-    args = "(CGcontext ctx, CGbool flag)", },
-  ["cgGLGetManageTextureParameters"] = { type ='function', 
-    description = "", 
-    returns = "(CGbool)",
-    valuetype = nil,
-    args = "(CGcontext ctx)", },
-  ["cgGLSetupSampler"] = { type ='function', 
-    description = "", 
-    returns = "(void)",
-    valuetype = nil,
-    args = "(CGparameter param, GLuint texobj)", },
-  ["cgGLRegisterStates"] = { type ='function', 
-    description = "", 
-    returns = "(void)",
-    valuetype = nil,
-    args = "(CGcontext ctx)", },
-  ["cgGLEnableProgramProfiles"] = { type ='function', 
-    description = "", 
-    returns = "(void)",
-    valuetype = nil,
-    args = "(CGprogram program)", },
-  ["cgGLDisableProgramProfiles"] = { type ='function', 
-    description = "", 
-    returns = "(void)",
-    valuetype = nil,
-    args = "(CGprogram program)", },
-  ["cgGLSetDebugMode"] = { type ='function', 
-    description = "", 
-    returns = "(void)",
-    valuetype = nil,
-    args = "(CGbool debug)", },
-  ["cgGLCreateBuffer"] = { type ='function', 
-    description = "", 
-    returns = "(CGbuffer)",
-    valuetype = nil,
-    args = "(CGcontext context, int size, const void *data, GLenum bufferUsage)", },
-  ["cgGLGetBufferObject"] = { type ='function', 
-    description = "", 
-    returns = "(GLuint)",
-    valuetype = nil,
-    args = "(CGbuffer buffer)", },
-  }
-return {
-  cggl = {
-    type = 'lib',
-    description = "Cg OpenGL runtime",
-    childs = api,
-  },
-  cgGL = {
-    type = 'lib',
-    description = "Cg OpenGL runtime",
-    childs = api,
-  },
-}

api/lua/cudagl32.lua

@@ -1,79 +0,0 @@
---[[// cugl cuGL | Cuda GL Interop
-/*
- * Copyright 1993-2010 NVIDIA Corporation.  All rights reserved.
- *
- * NOTICE TO USER:   
- *
- * This source code is subject to NVIDIA ownership rights under U.S. and 
- * international Copyright laws.  Users and possessors of this source code 
- * are hereby granted a nonexclusive, royalty-free license to use this code 
- * in individual and commercial software.
- *
- * NVIDIA MAKES NO REPRESENTATION ABOUT THE SUITABILITY OF THIS SOURCE 
- * CODE FOR ANY PURPOSE.  IT IS PROVIDED "AS IS" WITHOUT EXPRESS OR 
- * IMPLIED WARRANTY OF ANY KIND.  NVIDIA DISCLAIMS ALL WARRANTIES WITH 
- * REGARD TO THIS SOURCE CODE, INCLUDING ALL IMPLIED WARRANTIES OF 
- * MERCHANTABILITY, NONINFRINGEMENT, AND FITNESS FOR A PARTICULAR PURPOSE.
- * IN NO EVENT SHALL NVIDIA BE LIABLE FOR ANY SPECIAL, INDIRECT, INCIDENTAL, 
- * OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS 
- * OF USE, DATA OR PROFITS,  WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE 
- * OR OTHER TORTIOUS ACTION,  ARISING OUT OF OR IN CONNECTION WITH THE USE 
- * OR PERFORMANCE OF THIS SOURCE CODE.  
- *
- * U.S. Government End Users.   This source code is a "commercial item" as 
- * that term is defined at  48 C.F.R. 2.101 (OCT 1995), consisting  of 
- * "commercial computer  software"  and "commercial computer software 
- * documentation" as such terms are  used in 48 C.F.R. 12.212 (SEPT 1995) 
- * and is provided to the U.S. Government only as a commercial end item.  
- * Consistent with 48 C.F.R.12.212 and 48 C.F.R. 227.7202-1 through 
- * 227.7202-4 (JUNE 1995), all U.S. Government End Users acquire the 
- * source code with only those rights set forth herein. 
- *
- * Any use of this source code in individual and commercial software must 
- * include, in the user documentation and internal comments to the code,
- * the above Disclaimer and U.S. Government End Users Notice.
- */
-
-CUresult cuGLCtxCreate_v2(CUcontext *pCtx, unsigned int Flags, CUdevice device );
-CUresult cuGraphicsGLRegisterBuffer(CUgraphicsResource *pCudaResource, GLuint buffer, unsigned int Flags);
-CUresult cuGraphicsGLRegisterImage(CUgraphicsResource *pCudaResource, GLuint image, GLenum target, unsigned int Flags);
-
-typedef void* HGPUNV;
-CUresult cuWGLGetDevice(CUdevice *pDevice, HGPUNV hGpu);
-]]  
---auto-generated api from ffi headers
-local api =
-  {
-  ["cuGLCtxCreate_v2"] = { type ='function', 
-    description = "", 
-    returns = "(CUresult)",
-    valuetype = nil,
-    args = "(CUcontext *pCtx, unsigned int Flags, CUdevice device)", },
-  ["cuGraphicsGLRegisterBuffer"] = { type ='function', 
-    description = "", 
-    returns = "(CUresult)",
-    valuetype = nil,
-    args = "(CUgraphicsResource *pCudaResource, GLuint buffer, unsigned int Flags)", },
-  ["cuGraphicsGLRegisterImage"] = { type ='function', 
-    description = "", 
-    returns = "(CUresult)",
-    valuetype = nil,
-    args = "(CUgraphicsResource *pCudaResource, GLuint image, GLenum target, unsigned int Flags)", },
-  ["cuWGLGetDevice"] = { type ='function', 
-    description = "", 
-    returns = "(CUresult)",
-    valuetype = nil,
-    args = "(CUdevice *pDevice, HGPUNV hGpu)", },
-  }
-return {
-  cugl = {
-    type = 'lib',
-    description = "Cuda GL Interop",
-    childs = api,
-  },
-  cuGL = {
-    type = 'lib',
-    description = "Cuda GL Interop",
-    childs = api,
-  },
-}

api/lua/love2d.lua

@@ -1,12 +1,37 @@
+-- Copyright 2011-12 Paul Kulchenko, ZeroBrane LLC
+
 -- converted from love_api.lua (https://love2d.org/forums/viewtopic.php?f=3&t=1796&start=30)
+-- (as of Nov 1, 2012)
 -- the conversion script is at the bottom of this file
--- there were several manual changes done to the "thread" methods that had
--- incorrect structure (demand, set, and few others)
+-- manually removed "linear clamped", "exponent clamped", and "inverse clamped"
+-- values as those can't be entered through auto-complete.
 
 local love = {
  childs = {
   audio = {
    childs = {
+    DistanceModel = {
+     childs = {
+      exponent = {
+       description = "Exponential attenuation.",
+       type = "value"
+      },
+      inverse = {
+       description = "Inverse distance attenuation.",
+       type = "value"
+      },
+      linear = {
+       description = "Linear attenuation.",
+       type = "value"
+      },
+      none = {
+       description = "Sources do not get attenuated.",
+       type = "value"
+      }
+     },
+     description = "class constants",
+     type = "class"
+    },
     Source = {
      childs = {
       getDirection = {
@@ -18,7 +43,7 @@ local love = {
       getDistance = {
        args = "()",
        description = "Returns the reference and maximum distance of the source.",
-       returns = "(ref: string, max: string)",
+       returns = "(ref: number, max: number)",
        type = "function"
       },
       getPitch = {
@@ -33,6 +58,12 @@ local love = {
        returns = "(x: number, y: number, z: number)",
        type = "function"
       },
+      getRolloff = {
+       args = "()",
+       description = "Returns the rolloff factor of the source.",
+       returns = "(rolloff: number)",
+       type = "function"
+      },
       getVelocity = {
        args = "()",
        description = "Gets the velocity of the Source.",
@@ -45,6 +76,12 @@ local love = {
        returns = "(volume: number)",
        type = "function"
       },
+      getVolumeLimits = {
+       args = "()",
+       description = "Returns the volume limits of the source.",
+       returns = "(min: number, max: number)",
+       type = "function"
+      },
       isLooping = {
        args = "()",
        description = "Returns whether the Source will loop.",
@@ -105,6 +142,12 @@ local love = {
        returns = "()",
        type = "function"
       },
+      setDistance = {
+       args = "(ref: number, max: number)",
+       description = "Sets the reference and maximum distance of the source.",
+       returns = "()",
+       type = "function"
+      },
       setLooping = {
        args = "(loop: boolean)",
        description = "Sets whether the Source should loop.",
@@ -123,6 +166,12 @@ local love = {
        returns = "()",
        type = "function"
       },
+      setRolloff = {
+       args = "(rolloff: number)",
+       description = "Sets the rolloff factor.",
+       returns = "()",
+       type = "function"
+      },
       setVelocity = {
        args = "(x: number, y: number, z: number)",
        description = "Sets the velocity of the Source.\n\nThis does not change the position of the Source, but lets the application know how it has to calculate the doppler effect.",
@@ -135,6 +184,12 @@ local love = {
        returns = "()",
        type = "function"
       },
+      setVolumeLimits = {
+       args = "(min: number, max: number)",
+       description = "Sets the volume limits of the source. The limits have to be numbers from 0 to 1.",
+       returns = "()",
+       type = "function"
+      },
       stop = {
        args = "()",
        description = "Stops a Source.",
@@ -143,7 +198,7 @@ local love = {
       },
       tell = {
        args = "(unit: TimeUnit)",
-       description = "Stops a Source.",
+       description = "Gets the currently playing position of the Source.",
        returns = "(position: number)",
        type = "function"
       }
@@ -182,7 +237,7 @@ local love = {
     getDistanceModel = {
      args = "()",
      description = "Returns the distance attenuation model.",
-     returns = "(model: string)",
+     returns = "(model: DistanceModel)",
      type = "function"
     },
     getNumSources = {
@@ -216,7 +271,7 @@ local love = {
      type = "function"
     },
     newSource = {
-     args = "(file: string, type: SourceType)",
+     args = "(filename: string, type: SourceType)",
      description = "Creates a new Source from a file, SoundData, or Decoder. Sources created from SoundData are always static.",
      returns = "(source: Source)",
      type = "function"
@@ -246,7 +301,7 @@ local love = {
      type = "function"
     },
     setDistanceModel = {
-     args = "(model: string)",
+     args = "(model: DistanceModel)",
      description = "Sets the distance attenuation model.",
      returns = "()",
      type = "function"
@@ -312,7 +367,7 @@ local love = {
        type = "value"
       },
       keyreleased = {
-       description = "Key releaed",
+       description = "Key released",
        type = "value"
       },
       mousepressed = {
@@ -364,7 +419,7 @@ local love = {
     wait = {
      args = "()",
      description = "Like love.event.poll(), but blocks until there is an event in the queue.",
-     returns = "(e: Event, a: mixed, b: mixed, c: mixed)",
+     returns = "(e: Event, a: mixed, b: mixed, c: mixed, d: mixed)",
      type = "function"
     }
    },
@@ -412,7 +467,7 @@ local love = {
        type = "function"
       },
       seek = {
-       args = "(pos: number)",
+       args = "(position: number)",
        description = "Seek to a position in a file.",
        returns = "(success: boolean)",
        type = "function"
@@ -575,7 +630,7 @@ local love = {
     },
     remove = {
      args = "(name: string)",
-     description = "Removes a file (or directory).",
+     description = "Removes a file or directory.",
      returns = "(ok: boolean)",
      type = "function"
     },
@@ -618,7 +673,7 @@ local love = {
      type = "value"
     },
     Rasterizer = {
-     description = "A Rasterizer handles font rendering, containing the font data (image or true-type font) and drawable glyphs.",
+     description = "A Rasterizer handles font rendering, containing the font data (image or TrueType font font) and drawable glyphs.",
      type = "value"
     },
     newFontData = {
@@ -665,20 +720,24 @@ local love = {
     },
     BlendMode = {
      childs = {
-      canvas = {
-       description = "Support for Canvas.",
+      additive = {
+       description = "Additive blend mode.",
        type = "value"
       },
-      npot = {
-       description = "Support for textures with non-power-of-two textures. See PO2 Syndrome.",
+      alpha = {
+       description = "Alpha blend mode (\"normal\").",
        type = "value"
       },
-      pixeleffect = {
-       description = "Support for PixelEffect.",
+      multiplicative = {
+       description = "Multiply blend mode.",
+       type = "value"
+      },
+      premultiplied = {
+       description = "Premultiplied blend mode.",
        type = "value"
       },
       subtractive = {
-       description = "Support for the subtractive blend mode.",
+       description = "Subtractive blend mode.",
        type = "value"
       }
      },
@@ -693,6 +752,12 @@ local love = {
        returns = "()",
        type = "function"
       },
+      getFilter = {
+       args = "()",
+       description = "Gets the filter mode of the Canvas.",
+       returns = "(min: FilterMode, mag: FilterMode)",
+       type = "function"
+      },
       getImageData = {
        args = "()",
        description = "Returns the image data stored in the Canvas. Think of it as taking a screenshot of the hidden screen that is the Canvas.",
@@ -711,6 +776,12 @@ local love = {
        returns = "()",
        type = "function"
       },
+      setFilter = {
+       args = "(min: FilterMode, mag: FilterMode)",
+       description = "Sets the filter of the Canvas.",
+       returns = "()",
+       type = "function"
+      },
       setWrap = {
        args = "(horiz: WrapMode, vert: WrapMode)",
        description = "Sets the wrapping properties of a Canvas.\n\n This function sets the way the edges of a Canvas are treated if it is scaled or rotated. If the WrapMode is set to \"clamp\", the edge will not be interpolated. If set to \"repeat\", the edge will be interpolated with the pixels on the opposing side of the framebuffer.",
@@ -799,6 +870,28 @@ local love = {
      description = "Defines the shape of characters than can be drawn onto the screen.",
      type = "lib"
     },
+    GraphicsFeature = {
+     childs = {
+      canvas = {
+       description = "Support for Canvas.",
+       type = "value"
+      },
+      npot = {
+       description = "Support for textures with non-power-of-two textures.",
+       type = "value"
+      },
+      pixeleffect = {
+       description = "Support for PixelEffect.",
+       type = "value"
+      },
+      subtractive = {
+       description = "Support for the subtractive blend mode.",
+       type = "value"
+      }
+     },
+     description = "class constants",
+     type = "class"
+    },
     Image = {
      childs = {
       getFilter = {
@@ -1118,21 +1211,21 @@ local love = {
        type = "function"
       }
      },
-     description = "A quadrilateral with texture coordinate information.\n\nQuads can be used to select part of a texture to draw. In this way, one large Texture Atlas can be loaded, and then split up into sub-images.",
+     description = "A quadrilateral with texture coordinate information.\n\nQuads can be used to select part of a texture to draw. In this way, one large texture atlas can be loaded, and then split up into sub-images.",
      type = "lib"
     },
     SpriteBatch = {
      childs = {
       add = {
-       args = "(x: number, y: number, r: number, sx: number, sy: number, ox: number, oy: number)",
+       args = "(x: number, y: number, r: number, sx: number, sy: number, ox: number, oy: number, kx: number, ky: number)",
        description = "Add a sprite to the batch.",
-       returns = "()",
+       returns = "(id: number)",
        type = "function"
       },
       addq = {
        args = "()",
        description = "Add a Quad to the batch.",
-       returns = "(quad: Quad, x: number, y: number, r: number, sx: number, sy: number, ox: number, oy: number)",
+       returns = "(id: number)",
        type = "function"
       },
       bind = {
@@ -1147,12 +1240,36 @@ local love = {
        returns = "()",
        type = "function"
       },
+      getImage = {
+       args = "()",
+       description = "Returns the image used by the SpriteBatch.",
+       returns = "(image: Image)",
+       type = "function"
+      },
+      set = {
+       args = "()",
+       description = "Changes a sprite in the batch. This requires the identifier returned by add and addq.",
+       returns = "(id: number, x: number, y: number, r: number, sx: number, sy: number, ox: number, oy: number, kx: number, ky: number)",
+       type = "function"
+      },
+      setColor = {
+       args = "(r: number, g: number, b: number, a: number)",
+       description = "Sets the color that will be used for the next add and set operations. Calling the function without arguments will clear the color.\n\nThe global color set with love.graphics.setColor will not work on the SpriteBatch if any of the sprites has its own color.",
+       returns = "()",
+       type = "function"
+      },
       setImage = {
        args = "(image: Image)",
        description = "Replaces the image used for the sprites.",
        returns = "()",
        type = "function"
       },
+      setq = {
+       args = "()",
+       description = "Changes a sprite with a quad in the batch. This requires the identifier returned by add and addq.",
+       returns = "(id: number)",
+       type = "function"
+      },
       unbind = {
        args = "()",
        description = "Unbinds the SpriteBatch.",
@@ -1267,12 +1384,6 @@ local love = {
      returns = "(height: number)",
      type = "function"
     },
-    getLineStipple = {
-     args = "()",
-     description = "Gets the current line stipple.",
-     returns = "(pattern: number, repeat: number)",
-     type = "function"
-    },
     getLineStyle = {
      args = "()",
      description = "Gets the line style.",
@@ -1357,12 +1468,6 @@ local love = {
      returns = "()",
      type = "function"
     },
-    ["love.graphics.newStencil"] = {
-     args = "(stencilFunction: function)",
-     description = "Creates a new stencil.",
-     returns = "(myStencil: function)",
-     type = "function"
-    },
     newCanvas = {
      args = "()",
      description = "Creates a new Canvas object for offscreen rendering.",
@@ -1383,7 +1488,7 @@ local love = {
     },
     newImageFont = {
      args = "(image: Image, glyphs: string)",
-     description = "Creates a new font by loading a specifically formatted image. There can be up to 256 glyphs.",
+     description = "Creates a new font by loading a specifically formatted image. There can be up to 256 glyphs.\n\nExpects ISO 8859-1 encoding for the glyphs string.",
      returns = "(font: Font)",
      type = "function"
     },
@@ -1395,7 +1500,7 @@ local love = {
     },
     newPixelEffect = {
      args = "(code: string)",
-     description = "Creates a new PixelEffect object for hardware-accelerated pixel level effects.\n\nA PixelEffect contains at least one function, named effect, which is the effect itself, but it can contain additional functions.\n\nvec4 effect( vec4 color, sampler2D texture, vec2 texture_coords, vec2 pixel_coords )",
+     description = "Creates a new PixelEffect object for hardware-accelerated pixel level effects.\n\nA PixelEffect contains at least one function, named effect, which is the effect itself, but it can contain additional functions.\n\nvec4 effect( vec4 color, Image texture, vec2 texture_coords, vec2 pixel_coords )",
      returns = "(pixeleffect: PixelEffect)",
      type = "function"
     },
@@ -1417,6 +1522,12 @@ local love = {
      returns = "(spriteBatch: SpriteBatch)",
      type = "function"
     },
+    newStencil = {
+     args = "(stencilFunction: function)",
+     description = "Creates a new stencil.",
+     returns = "(myStencil: function)",
+     type = "function"
+    },
     point = {
      args = "(x: number, y: number)",
      description = "Draws a point.\n\nThe pixel grid is actually offset to the center of each pixel. So to get clean pixels drawn use 0.5 + integer increments.",
@@ -1443,7 +1554,7 @@ local love = {
     },
     print = {
      args = "(text: string, x: number, y: number, r: number, sx: number, sy: number, ox: number, oy: number, kx: number, ky: number)",
-     description = "Draws text on screen. If no Font is set, one will be created and set (once) if needed.\n\nAs of LÖVE 0.7.1, when using translation and scaling functions while drawing text, this function assumes the scale occurs first. If you don't script with this in mind, the text won't be in the right position, or possibly even on screen.\n\nDrawing uses the current color, but only if the ColorMode is \"modulate\" (which is the default). If your text is displayed as white, it is probably because the color mode is \"replace\" (which is useful when drawing sprites). Change the color model to \"modulate\" before drawing.\n\nlove.graphics.print stops at the first '\000' (null) character. This can bite you if you are appending keystrokes to form your string, as some of those are multi-byte unicode characters which will likely contain null bytes.",
+     description = "Draws text on screen. If no Font is set, one will be created and set (once) if needed.\n\nWhen using translation and scaling functions while drawing text, this function assumes the scale occurs first. If you don't script with this in mind, the text won't be in the right position, or possibly even on screen.\n\nDrawing uses the current color, but only if the ColorMode is \"modulate\" (which is the default). If your text is displayed as white, it is probably because the color mode is \"replace\" (which is useful when drawing sprites). Change the color model to \"modulate\" before drawing.\n\nlove.graphics.print stops at the first '\000' (null) character. This can bite you if you are appending keystrokes to form your string, as some of those are multi-byte unicode characters which will likely contain null bytes.",
      returns = "()",
      type = "function"
     },
@@ -1473,24 +1584,24 @@ local love = {
     },
     reset = {
      args = "()",
-     description = "Resets the current graphics settings.\n\nCalling reset makes the current drawing color white, the current background color black, the window title empty and removes any scissor settings. It sets the BlendMode to alpha and ColorMode to modulate. It also sets both the point and line drawing modes to smooth and their sizes to 1.0 . Finally, it removes any stipple settings.",
+     description = "Resets the current graphics settings.\n\nCalling reset makes the current drawing color white, the current background color black, the window title empty and removes any scissor settings. It sets the BlendMode to alpha and ColorMode to modulate. It also sets both the point and line drawing modes to smooth and their sizes to 1.0.",
      returns = "()",
      type = "function"
     },
     rotate = {
      args = "(angle: number)",
-     description = "Rotates the coordinate system in two dimensions.\n\nCalling this function affects all future drawing operations by rotating the coordinate system around the origin by the given amount of radians. This change lasts until love.draw() exits.",
+     description = "Rotates the coordinate system in two dimensions.\n\nCalling this function affects all future drawing operations by rotating the coordinate system around the origin by the given amount of radians. This change lasts until love.draw exits.",
      returns = "()",
      type = "function"
     },
     scale = {
      args = "(sx: number, sy: number)",
-     description = "Scales the coordinate system in two dimensions.\n\nBy default the coordinate system in LÖVE corresponds to the display pixels in horizontal and vertical directions one-to-one, and the x-axis increases towards the right while the y-axis increases downwards. Scaling the coordinate system changes this relation.\n\nAfter scaling by sx and sy, all coordinates are treated as if they were multiplied by sx and sy. Every result of a drawing operation is also correspondingly scaled, so scaling by (2, 2) for example would mean making everything twice as large in both x- and y-directions. Scaling by a negative value flips the coordinate system in the corresponding direction, which also means everything will be drawn flipped or upside down, or both. Scaling by zero is not a useful operation.\n\nScale and translate are not commutative operations, therefore, calling them in different orders will change the outcome.\n\nScaling lasts until love.draw() exits.",
+     description = "Scales the coordinate system in two dimensions.\n\nBy default the coordinate system in LÖVE corresponds to the display pixels in horizontal and vertical directions one-to-one, and the x-axis increases towards the right while the y-axis increases downwards. Scaling the coordinate system changes this relation.\n\nAfter scaling by sx and sy, all coordinates are treated as if they were multiplied by sx and sy. Every result of a drawing operation is also correspondingly scaled, so scaling by (2, 2) for example would mean making everything twice as large in both x- and y-directions. Scaling by a negative value flips the coordinate system in the corresponding direction, which also means everything will be drawn flipped or upside down, or both. Scaling by zero is not a useful operation.\n\nScale and translate are not commutative operations, therefore, calling them in different orders will change the outcome.\n\nScaling lasts until love.draw exits.",
      returns = "()",
      type = "function"
     },
     setBackgroundColor = {
-     args = "(r: number, g: number, b: number)",
+     args = "(r: number, g: number, b: number, a: number)",
      description = "Sets the background color.",
      returns = "()",
      type = "function"
@@ -1545,7 +1656,7 @@ local love = {
     },
     setInvertedStencil = {
      args = "(stencilFunction: function)",
-     description = "Defines an inverted stencil for the drawing operations or releases the active one.\n\nIt's the same as love.graphics.setStencil with the mask inverted.",
+     description = "Defines an inverted stencil for the drawing operations or releases the active one.\n\nIt's the same as love.graphics.setStencil with the mask inverted.\n\nCalling the function without arguments releases the active stencil.",
      returns = "()",
      type = "function"
     },
@@ -1555,12 +1666,6 @@ local love = {
      returns = "()",
      type = "function"
     },
-    setLineStipple = {
-     args = "(pattern: number, repeat: number)",
-     description = "Sets the line stipple pattern.\n\nA stipple pattern is made up of a 16bit sequence of 0s and 1s, Just like binary.\n\nThe pattern is repeated to complete the line. Using the repeat will stretch the pattern and multiplies each 1 and 0. For example if three 1s are consecutively placed they are stretched to six if the repeat is 2. The maximum repeat is 255, and the minimum repeat is 1.\n\nA 1 is a a cue to draw a pixel whereas 0 is the opposite and does not draw a pixel, This is done per pixel for the given line.\n\nA pattern is read from back to front.\n\n0x3F07 would equal to 0011111100000111 in binary.\n\nYou can visualise the pattern by reading the binary sequence backwards.",
-     returns = "()",
-     type = "function"
-    },
     setLineStyle = {
      args = "(style: LineStyle)",
      description = "Sets the line style.",
@@ -1580,7 +1685,7 @@ local love = {
      type = "function"
     },
     setNewFont = {
-     args = "(filename: string, size: number)",
+     args = "(size: number)",
      description = "Creates and sets a new font.",
      returns = "(font: Font)",
      type = "function"
@@ -1617,7 +1722,7 @@ local love = {
     },
     setStencil = {
      args = "(stencilFunction: function)",
-     description = "Defines or releases a stencil for the drawing operations.\n\nThe passed function draws to the stencil instead of the screen, creating an image with transparent and opaque pixel. While active, it is used to test where pixel will be drawn or discarded.\n\nCalling the function without arguments releases the active stencil.",
+     description = "Defines or releases a stencil for the drawing operations.\n\nThe passed function draws to the stencil instead of the screen, creating an image with transparent and opaque pixels. While active, it is used to test where pixels will be drawn or discarded.\n\nCalling the function without arguments releases the active stencil.",
      returns = "()",
      type = "function"
     },
@@ -1635,7 +1740,7 @@ local love = {
     },
     translate = {
      args = "(dx: number, dy: number)",
-     description = "Translates the coordinate system in two dimensions.\n\nWhen this function is called with two numbers, dx, and dy, all the following drawing operations take effect as if their x and y coordinates were x+dx and y+dy.\n\nScale and translate are not commutative operations, therefore, calling them in different orders will change the outcome.\n\nThis change lasts until love.draw() exits or else a love.graphics.pop reverts to a previous love.graphics.push.\n\nTranslating using whole numbers will prevent tearing/blurring of images and fonts draw after translating.",
+     description = "Translates the coordinate system in two dimensions.\n\nWhen this function is called with two numbers, dx, and dy, all the following drawing operations take effect as if their x and y coordinates were x+dx and y+dy.\n\nScale and translate are not commutative operations, therefore, calling them in different orders will change the outcome.\n\nThis change lasts until love.draw exits or else a love.graphics.pop reverts to a previous love.graphics.push.\n\nTranslating using whole numbers will prevent tearing/blurring of images and fonts draw after translating.",
      returns = "()",
      type = "function"
     },
@@ -1646,12 +1751,66 @@ local love = {
      type = "function"
     }
    },
-   description = "The primary responsibility for the love.graphics module is the drawing of lines, shapes, text, Images and other Drawable objects onto the screen. Its secondary responsibilities include loading external files (including Images and Fonts) into memory, creating specialized objects (such as ParticleSystems or Framebuffers) and managing screen geometry.\n\nLÖVE's coordinate system is rooted in the upper-left corner of the screen, which is at location (0, 0). The x axis is horizontal: larger values are further to the right. The y axis is vertical: larger values are further towards the bottom.\n\nIn many cases, you draw images or shapes in terms of their upper-left corner (See the picture above).\n\nMany of the functions are used to manipulate the graphics coordinate system, which is essentially the the way coordinates are mapped to the display. You can change the position, scale, and even rotation in this way.",
+   description = "The primary responsibility for the love.graphics module is the drawing of lines, shapes, text, Images and other Drawable objects onto the screen. Its secondary responsibilities include loading external files (including Images and Fonts) into memory, creating specialized objects (such as ParticleSystems or Framebuffers) and managing screen geometry.\n\nLÖVE's coordinate system is rooted in the upper-left corner of the screen, which is at location (0, 0). The x-axis is horizontal: larger values are further to the right. The y-axis is vertical: larger values are further towards the bottom.\n\nIn many cases, you draw images or shapes in terms of their upper-left corner (See the picture above).\n\nMany of the functions are used to manipulate the graphics coordinate system, which is essentially the the way coordinates are mapped to the display. You can change the position, scale, and even rotation in this way.",
    type = "class"
   },
   image = {
    childs = {
     ImageData = {
+     childs = {
+      encode = {
+       args = "(outFile: string)",
+       description = "Encodes the ImageData and writes it to the save directory.",
+       returns = "()",
+       type = "function"
+      },
+      getHeight = {
+       args = "()",
+       description = "Gets the height of the ImageData.",
+       returns = "(height: number)",
+       type = "function"
+      },
+      getPixel = {
+       args = "(x: number, y: number)",
+       description = "Gets the pixel at the specified position.\n\nValid x and y values start at 0 and go up to image width and height minus 1.",
+       returns = "(r: number, g: number, b: number, a: number)",
+       type = "function"
+      },
+      getString = {
+       args = "()",
+       description = "Gets the full ImageData as a string.",
+       returns = "(pixels: string)",
+       type = "function"
+      },
+      getWidth = {
+       args = "()",
+       description = "Gets the width of the ImageData.",
+       returns = "(width: number)",
+       type = "function"
+      },
+      mapPixel = {
+       args = "(pixelFunction: function)",
+       description = "Transform an image by applying a function to every pixel.\n\nThis function is a higher order function. It takes another function as a parameter, and calls it once for each pixel in the ImageData.\n\nThe function parameter is called with six parameters for each pixel in turn. The parameters are numbers that represent the x and y coordinates of the pixel and its red, green, blue and alpha values. The function parameter can return up to four number values, which become the new r, g, b and a values of the pixel. If the function returns fewer values, the remaining components are set to 0.",
+       returns = "()",
+       type = "function"
+      },
+      paste = {
+       args = "(source: ImageData, dx: number, dy: number, sx: number, sy: number, sw: number, sh: number)",
+       description = "Paste into ImageData from another source ImageData.",
+       returns = "()",
+       type = "function"
+      },
+      setPixel = {
+       args = "(x: number, y: number, r: number, g: number, b: number, a: number)",
+       description = "Sets the color of a pixel.\n\nValid x and y values start at 0 and go up to image width and height minus 1.",
+       returns = "()",
+       type = "function"
+      }
+     },
+     description = "Raw (decoded) image data.\n\nYou can't draw ImageData directly to screen. See Image for that.",
+     type = "lib"
+    },
+    ImageFormat = {
      childs = {
       bmp = {
        description = "BMP image format.",
@@ -1677,12 +1836,6 @@ local love = {
      description = "class constants",
      type = "class"
     },
-    newEncodedImageData = {
-     args = "(imageData: ImageData, format: ImageFormat)",
-     description = "Encodes ImageData.",
-     returns = "(data: Data)",
-     type = "function"
-    },
     newImageData = {
      args = "(width: number, height: number)",
      description = "Create a new ImageData object.",
@@ -1757,7 +1910,7 @@ local love = {
     },
     getBall = {
      args = "(joystick: number, ball: number)",
-     description = "Returns the change in Ball position.",
+     description = "Returns the change in ball position.",
      returns = "(dx: number, dy: number)",
      type = "function"
     },
@@ -2053,7 +2206,7 @@ local love = {
        type = "value"
       },
       euro = {
-       description = "Euro (€) key",
+       description = "Euro (€) key",
        type = "value"
       },
       f = {
@@ -2473,19 +2626,19 @@ local love = {
     },
     getX = {
      args = "()",
-     description = "Returns the current x-position of the mouse.",
+     description = "Returns the current x position of the mouse.",
      returns = "(x: number)",
      type = "function"
     },
     getY = {
      args = "()",
-     description = "Returns the current y-position of the mouse.",
+     description = "Returns the current y position of the mouse.",
      returns = "(y: number)",
      type = "function"
     },
     isDown = {
      args = "(button: MouseConstant)",
-     description = "Checks whether a certain mouse button is down.",
+     description = "Checks whether a certain mouse button is down. This function does not detect mousewheel scrolling; you must use the love.mousepressed callback for that.",
      returns = "(down: boolean)",
      type = "function"
     },
@@ -2577,7 +2730,7 @@ local love = {
       },
       getAngle = {
        args = "()",
-       description = "Get the angle of the body.\n\nThe angle is measured in radians. If you need to transform it to degrees, use math.deg.\n\nA value of 0 radians will mean \"looking to the right\". Although radians increase counter-clockwise, the y axis points down so it becomes clockwise from our point of view.",
+       description = "Get the angle of the body.\n\nThe angle is measured in radians. If you need to transform it to degrees, use math.deg.\n\nA value of 0 radians will mean \"looking to the right\". Although radians increase counter-clockwise, the y-axis points down so it becomes clockwise from our point of view.",
        returns = "(angle: number)",
        type = "function"
       },
@@ -2599,6 +2752,12 @@ local love = {
        returns = "(fixtures: table)",
        type = "function"
       },
+      getGravityScale = {
+       args = "()",
+       description = "Returns the gravity scale factor.",
+       returns = "(scale: number)",
+       type = "function"
+      },
       getInertia = {
        args = "()",
        description = "Gets the rotational inertia of the body.\n\nThe rotational inertia is how hard is it to make the body spin. It is set with the 4th argument to Body:setMass, or automatically with Body:setMassFromShapes.",
@@ -2773,6 +2932,12 @@ local love = {
        returns = "()",
        type = "function"
       },
+      setActive = {
+       args = "(active: boolean)",
+       description = "Sets whether the body is active in the world.\n\nAn inactive body does not take part in the simulation. It will not move or cause any collisions.",
+       returns = "()",
+       type = "function"
+      },
       setAllowSleeping = {
        args = "(permission: boolean)",
        description = "Set the sleep behaviour of a body.\n\nA sleeping body is much more efficient to simulate than when awake.\n\nIf sleeping is allowed, a body that has come to rest will sleep.",
@@ -2781,7 +2946,7 @@ local love = {
       },
       setAngle = {
        args = "(angle: number)",
-       description = "Set the angle of the body.\n\nThe angle is measured in radians. If you need to transform it from degrees, use math.rad.\n\nA value of 0 radians will mean \"looking to the right\". .Although radians increase counter-clockwise, the y axis points down so it becomes clockwise from our point of view.\n\nIt is possible to cause a collision with another body by changing its angle.",
+       description = "Set the angle of the body.\n\nThe angle is measured in radians. If you need to transform it from degrees, use math.rad.\n\nA value of 0 radians will mean \"looking to the right\". .Although radians increase counter-clockwise, the y-axis points down so it becomes clockwise from our point of view.\n\nIt is possible to cause a collision with another body by changing its angle.",
        returns = "()",
        type = "function"
       },
@@ -2915,6 +3080,48 @@ local love = {
      description = "class constants",
      type = "class"
     },
+    ChainShape = {
+     childs = {
+      getChildEdge = {
+       args = "(index: number)",
+       description = "Returns a child of the shape as an EdgeShape.",
+       returns = "(EdgeShape: number)",
+       type = "function"
+      },
+      getPoint = {
+       args = "(index: number)",
+       description = "Returns a point of the shape.",
+       returns = "(x: number, y: number)",
+       type = "function"
+      },
+      getPoints = {
+       args = "()",
+       description = "Returns all points of the shape.",
+       returns = "(x1: number, y1: number, x2: number, y2: number, ...: number)",
+       type = "function"
+      },
+      getVertexCount = {
+       args = "()",
+       description = "Returns the number of vertices the shape has.",
+       returns = "(count: number)",
+       type = "function"
+      },
+      setNextVertex = {
+       args = "(x: number, y: number)",
+       description = "Sets a vertex that establishes a connection to the next shape.\n\nThis can help prevent unwanted collisions when a flat shape slides along the edge and moves over to the new shape.",
+       returns = "()",
+       type = "function"
+      },
+      setPrevVertex = {
+       args = "(x: number, y: number)",
+       description = "Sets a vertex that establishes a connection to the previous shape.\n\nThis can help prevent unwanted collisions when a flat shape slides along the edge and moves over to the new shape.",
+       returns = "()",
+       type = "function"
+      }
+     },
+     description = "A ChainShape consists of multiple line segments. It can be used to create the boundaries of your terrain. The shape does not have volume and can only collide with PolygonShape and CircleShape.\n\nUnlike the PolygonShape, the ChainShape does not have a vertices limit or has to form a convex shape, but self intersections are not supported. ",
+     type = "lib"
+    },
     CircleShape = {
      childs = {
       getLocalCenter = {
@@ -2934,6 +3141,12 @@ local love = {
        description = "Get the center of the circle in world coordinates.",
        returns = "(wx: number, wy: number)",
        type = "function"
+      },
+      setRadius = {
+       args = "(radius: number)",
+       description = "Sets the radius of the circle.",
+       returns = "()",
+       type = "function"
       }
      },
      description = "Circle extends Shape and adds a radius and a local position.",
@@ -2953,10 +3166,10 @@ local love = {
        returns = "(nx: number, ny: number)",
        type = "function"
       },
-      getPosition = {
+      getPositions = {
        args = "()",
-       description = "Get the location of the contact point between two shapes.",
-       returns = "(cx: number, cy: number)",
+       description = "Returns the contact points of the two colliding fixtures. There can be one or two points.",
+       returns = "(x1: number, y1: number, x2: number, y2: number)",
        type = "function"
       },
       getRestitution = {
@@ -2971,10 +3184,46 @@ local love = {
        returns = "(distance: number)",
        type = "function"
       },
-      getVelocity = {
+      isEnabled = {
        args = "()",
-       description = "Get the linear impact velocity of a contact.",
-       returns = "(vx: number, vy: number)",
+       description = "Returns whether the contact is enabled. The collision will be ignored if a contact gets disabled in the post solve callback.",
+       returns = "(enabled: boolean)",
+       type = "function"
+      },
+      isTouching = {
+       args = "()",
+       description = "Returns whether the two colliding fixtures are touching each other.",
+       returns = "(touching: boolean)",
+       type = "function"
+      },
+      resetFriction = {
+       args = "()",
+       description = "Resets the contact friction to the mixture value of both fixtures.",
+       returns = "()",
+       type = "function"
+      },
+      resetRestitution = {
+       args = "()",
+       description = "Resets the contact restitution to the mixture value of both fixtures.",
+       returns = "()",
+       type = "function"
+      },
+      setEnabled = {
+       args = "(enabled: boolean)",
+       description = "Enables or disables the contact.",
+       returns = "()",
+       type = "function"
+      },
+      setFriction = {
+       args = "(friction: number)",
+       description = "Sets the contact friction.",
+       returns = "()",
+       type = "function"
+      },
+      setRestitution = {
+       args = "(restitution: number)",
+       description = "Sets the contact restitution.",
+       returns = "()",
        type = "function"
       }
      },
@@ -3023,6 +3272,12 @@ local love = {
      description = "Keeps two bodies at the same distance.",
      type = "lib"
     },
+    EdgeShape = {
+     args = "()",
+     description = "A EdgeShape is a line segment. They can be used to create the boundaries of your terrain. The shape does not have volume and can only collide with PolygonShape and CircleShape.",
+     returns = "()",
+     type = "function"
+    },
     Fixture = {
      childs = {
       destroy = {
@@ -3254,8 +3509,8 @@ local love = {
        type = "function"
       },
       getReactionTorque = {
-       args = "()",
-       description = "Gets the reaction torque on Body 2.",
+       args = "(invdt: number)",
+       description = "Returns the reaction torque on the second body.",
        returns = "(torque: number)",
        type = "function"
       },
@@ -3307,6 +3562,18 @@ local love = {
     },
     MouseJoint = {
      childs = {
+      getDampingRatio = {
+       args = "()",
+       description = "Returns the damping ratio.",
+       returns = "(ratio: number)",
+       type = "function"
+      },
+      getFrequency = {
+       args = "()",
+       description = "Returns the frequency.",
+       returns = "(freq: number)",
+       type = "function"
+      },
       getMaxForce = {
        args = "()",
        description = "Gets the highest allowed force.",
@@ -3319,6 +3586,18 @@ local love = {
        returns = "(x: number, y: number)",
        type = "function"
       },
+      setDampingRatio = {
+       args = "(ratio: number)",
+       description = "Sets a new damping ratio.",
+       returns = "()",
+       type = "function"
+      },
+      setFrequency = {
+       args = "(freq: number)",
+       description = "Sets a new frequency.",
+       returns = "()",
+       type = "function"
+      },
       setMaxForce = {
        args = "(f: number)",
        description = "Sets the highest allowed force.",
@@ -3343,6 +3622,18 @@ local love = {
     },
     PrismaticJoint = {
      childs = {
+      enableLimit = {
+       args = "(enable: boolean)",
+       description = "Enables or disables the limits of the joint.",
+       returns = "()",
+       type = "function"
+      },
+      enableMotor = {
+       args = "(enable: boolean)",
+       description = "Starts or stops the joint motor.",
+       returns = "()",
+       type = "function"
+      },
       getJointSpeed = {
        args = "()",
        description = "Get the current joint angle speed.",
@@ -3391,9 +3682,9 @@ local love = {
        returns = "(upper: number)",
        type = "function"
       },
-      isLimitsEnabled = {
+      isLimitEnabled = {
        args = "()",
-       description = "Checks whether limits are enabled.",
+       description = "Checks whether the limits are enabled.",
        returns = "(enabled: boolean)",
        type = "function"
       },
@@ -3409,12 +3700,6 @@ local love = {
        returns = "()",
        type = "function"
       },
-      setLimitsEnabled = {
-       args = "(enable: boolean)",
-       description = "Enables/disables the joint limit.",
-       returns = "()",
-       type = "function"
-      },
       setLowerLimit = {
        args = "(lower: number)",
        description = "Sets the lower limit.",
@@ -3427,12 +3712,6 @@ local love = {
        returns = "()",
        type = "function"
       },
-      setMotorEnabled = {
-       args = "(enable: boolean)",
-       description = "Enables/disables the joint motor.",
-       returns = "()",
-       type = "function"
-      },
       setMotorSpeed = {
        args = "(s: number)",
        description = "Sets the motor speed.",
@@ -3463,13 +3742,13 @@ local love = {
        returns = "(a1x: number, a1y: number, a2x: number, a2y: number)",
        type = "function"
       },
-      getLength1 = {
+      getLengthA = {
        args = "()",
        description = "Get the current length of the rope segment attached to the first body.",
        returns = "(length: number)",
        type = "function"
       },
-      getLength2 = {
+      getLengthB = {
        args = "()",
        description = "Get the current length of the rope segment attached to the second body.",
        returns = "(length: number)",
@@ -3511,9 +3790,15 @@ local love = {
     },
     RevoluteJoint = {
      childs = {
+      enableLimits = {
+       args = "(enable: boolean)",
+       description = "Enables or disables the joint limits.",
+       returns = "()",
+       type = "function"
+      },
       enableMotor = {
        args = "(enable: boolean)",
-       description = "Enables/disables the joint motor.",
+       description = "Starts or stops the joint motor.",
        returns = "()",
        type = "function"
       },
@@ -3766,8 +4051,34 @@ local love = {
      type = "class"
     },
     WeldJoint = {
+     childs = {
+      getDampingRatio = {
+       args = "()",
+       description = "Returns the damping ratio of the joint.",
+       returns = "(ratio: number)",
+       type = "function"
+      },
+      getFrequency = {
+       args = "()",
+       description = "Returns the frequency.",
+       returns = "(freq: number)",
+       type = "function"
+      },
+      setDampingRatio = {
+       args = "(ratio: number)",
+       description = "The new damping ratio.",
+       returns = "()",
+       type = "function"
+      },
+      setFrequency = {
+       args = "()",
+       description = "Sets a new frequency.",
+       returns = "(freq: number)",
+       type = "function"
+      }
+     },
      description = "A WeldJoint essentially glues two bodies together.",
-     type = "value"
+     type = "lib"
     },
     World = {
      childs = {
@@ -3797,8 +4108,8 @@ local love = {
       },
       getCallbacks = {
        args = "()",
-       description = "Get functions to be called when two shapes collide.",
-       returns = "(add: function, persist: function, remove: function, result: function)",
+       description = "Returns functions for the callbacks during the world update.",
+       returns = "(beginContact: function, endContact: function, preSolve: function, postSolve: function)",
        type = "function"
       },
       getContactCount = {
@@ -3926,7 +4237,7 @@ local love = {
      type = "function"
     },
     newEdgeShape = {
-     args = "(body1: Body, body2: Body, x: number, y: number)",
+     args = "(x1: number, y1: number, x2: number, y2: number)",
      description = "Creates a edge shape.",
      returns = "(shape: EdgeShape)",
      type = "function"
@@ -4008,6 +4319,12 @@ local love = {
      description = "Creates a new World.",
      returns = "(world: World)",
      type = "function"
+    },
+    setMeter = {
+     args = "(scale: number)",
+     description = "Sets the meter scale factor.\n\nAll coordinates in the physics module are divided by this number, creating a convenient way to draw the objects directly to the screen without the need for graphics transformations.\n\nIt is recommended to create shapes no larger than 10 times the scale. This is important because Box2D is tuned to work well with shape sizes from 0.1 to 10 meters.",
+     returns = "()",
+     type = "function"
     }
    },
    description = "Can simulate 2D rigid body physics in a realistic manner. This module is based on Box2D, and this API corresponds to the Box2D API as closely as possible.",
@@ -4119,6 +4436,12 @@ local love = {
        returns = "(value: mixed)",
        type = "function"
       },
+      getKeys = {
+       args = "()",
+       description = "Returns the names of all messages in a table.",
+       returns = "(msgNames: table)",
+       type = "function"
+      },
       getName = {
        args = "()",
        description = "Get the name of a thread.",
@@ -4167,7 +4490,7 @@ local love = {
     },
     newThread = {
      args = "(name: string, filename: string)",
-     description = "Creates a new Thread from a File or Data Object.",
+     description = "Creates a new Thread from a File or Data object.",
      returns = "(thread: Thread)",
      type = "function"
     }

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,10 @@
+#!/bin/bash
+
+echo "Installing wxlua modules from ZeroBrane Studio repository..."
+sudo add-apt-repository ppa:zerobranestudio/zerobranestudio
+sudo apt-get update
+sudo apt-get install wxlua28
+
+# To remove wxlua and required packages use:
+# sudo apt-get purge wxlua28
+# sudo apt-get autoremove

build/messages.lua

@@ -0,0 +1,81 @@
+-- This scrips extracts all text messages for ZeroBrane Studio and generates
+-- a file that can be used to provide translation to a particular language.
+-- The name of the file -- ll-cc.lua -- has two segments:
+-- ll (mandatory) -- two letter [language code](http://en.wikipedia.org/wiki/List_of_ISO_639-1_codes);
+-- cc (optional) -- two letter [country code](http://en.wikipedia.org/wiki/ISO_3166-1#Officially_assigned_code_elements).
+
+-- You can generate an empty file with all messages by running:
+--  > bin\lua.exe build/messages.lua
+-- You can also update an existing file with new messages by running:
+--  > bin\lua.exe build/messages.lua cfg/i18n/ru.lua
+
+local iswindows = os.getenv('WINDIR') or (os.getenv('OS') or ''):match('[Ww]indows')
+if iswindows or not pcall(require, "wx") then
+  package.cpath = (iswindows and 'bin/?.dll;' or 'bin/lib?.dylib;') .. package.cpath
+end
+
+require "wx"
+
+function FileSysGet(dir,spec)
+  local content = {}
+  local browse = wx.wxFileSystem()
+  if not wx.wxFileName(dir):DirExists() then return content end
+  local f = browse:FindFirst(dir,spec)
+  while #f>0 do
+    table.insert(content,(f:gsub("^file:",""))) -- drop file: protocol (wx2.9+)
+    f = browse:FindNext()
+  end
+  return content
+end
+
+function FileRead(file)
+  local f = wx.wxFile(file, wx.wxFile.read)
+  if not f:IsOpened() then
+    error("Can't open file '"..file.."': "..wx.wxSysErrorMsg()) end
+  local _, content = f:Read(f:Length())
+  f:Close()
+  return content
+end
+
+local file = ... -- pass an existing file name as a parameter
+local messages = {}
+for _, mask in ipairs({"zbstudio/*.lua", "src/main.lua", "src/editor/*.lua"}) do
+  for _, file in ipairs(FileSysGet(mask, wx.wxFILE)) do
+    local content = FileRead(file)
+    for msg in content:gmatch("[^%w]TR(%b())") do
+      -- remove brackets aroung ("foo")
+      -- extract message from ("foo", count)
+      msg = msg:gsub("^%(", ""):gsub("%)$", ""):gsub([[(["']), .+]], "%1")
+      messages[msg] = messages[msg] or {}
+      messages[msg][file] = (messages[msg][file] or 0) + 1
+    end
+  end
+end
+
+local existing = {}
+if file then
+  local content = FileRead(file)
+  for msg, translation in content:gmatch("%s*%[([^%]]+)%]%s*=%s*([^\010\013]+)") do
+    if not translation:find('^nil') then existing[tonumber(msg) or msg] = translation end
+  end
+end
+
+local plural = existing[0] and ("  [0] = "..existing[0].."\n") or ""
+existing[0] = nil
+
+local msgs = {}
+for m, files in pairs(messages) do
+  local str = "  ["..m.."] = "..(existing[m] or 'nil, --')
+  str = str:gsub(" %-%-.*$", "").." -- "
+  for f in pairs(files) do str = str .. f .. ", " end
+  msgs[#msgs+1] = str:gsub(", $", "")
+  existing[m] = nil -- remove from the list of existing elements
+end
+
+table.sort(msgs)
+print("return {\n"..plural..table.concat(msgs, "\n").."\n}")
+if next(existing) then
+  local str = "-- no match found for the following elements: "
+  for msg in pairs(existing) do str = str .. msg .. ", " end
+  print((str:gsub(", $", "")))
+end

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
 
@@ -24,7 +24,6 @@ typedef void varfuncvoid (void *L,...);
 // from lua.h
 #define LUA_GLOBALSINDEX	(-10002)
 
-
 static voidfunc *luaL_newstate;
 static varfunc *luaL_loadbuffer;
 static varfunc *luaL_openlibs;
@@ -146,13 +145,12 @@ int main (int argc, char *argv[])
 #endif
   HINSTANCE hinstLib;
 
-
   char buffer[MAX_PATH],*file;
 
   if (!GetFullPathName(argv[0],MAX_PATH,buffer,&file)) {
     MessageBox(NULL,
       TEXT("Couldn't find the correct working directory"),
-      TEXT("Failed to start estrela"),
+      TEXT("Failed to start editor"),
       MB_OK|MB_ICONERROR);
     return 0;
   }
@@ -207,18 +205,18 @@ int main (int argc, char *argv[])
         else
           MessageBox(NULL,
           TEXT("An unexpected error occured while loading the lua chunk."),
-          TEXT("Failed to start estrela"),
+          TEXT("Failed to start editor"),
           MB_OK|MB_ICONERROR);
       } else
         MessageBox(NULL,
         TEXT("Couldn't initialize a luastate"),
-        TEXT("Failed to start estrela"),
+        TEXT("Failed to start editor"),
         MB_OK|MB_ICONERROR);
     } else {
       MessageBox(NULL,
         TEXT("Could not load all functions that are supposed to be located in the lua5.1.dll\n"
         "This is not supposed to be happening..."),
-        TEXT("Failed to start estrela"),
+        TEXT("Failed to start editor"),
         MB_OK|MB_ICONERROR);
     }
 
@@ -227,10 +225,9 @@ int main (int argc, char *argv[])
   } else {
     MessageBox(NULL,
       TEXT("The lua5.1.dll could not be found or loaded, please check the working directory of the application.\n"),
-      TEXT("Failed to initialize estrela"),
+      TEXT("Failed to initialize editor"),
       MB_OK|MB_ICONERROR);
   }
 
-
   return 0;
 }

cfg/brighteditorstyles.lua

@@ -1,38 +0,0 @@
-styles = {
-  -- lexer specific (inherit fg/bg from text)
-  lexerdef = {fg = {128, 128, 128},},
-  comment = {fg = {0, 127, 0 },bg = {240, 240, 220}, fill= true,},
-  stringtxt = {fg = {127, 0, 127},},
-  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 },},
-
-  keywords0 = {fg = {0, 0, 127}, b = true,},
-  keywords1 = {fg = {127, 0, 0}, b = true,},
-  keywords2 = {fg = {0, 127, 0}, b = true,},
-  keywords3 = {fg = {0, 0, 127}, b = true,},
-  keywords4 = {fg = {127, 0, 95}, b = true,},
-  keywords5 = {fg = {35, 95, 175}, b = true,},
-  keywords6 = {fg = {0, 127, 127}, b = true,},
-  keywords7 = {fg = {240, 255, 255}, b = true,},
-
-  -- common (inherit fg/bg from text)
-  text = nil, -- let os pick
-  linenumber = {fg = {90, 90, 80},},
-  bracematch = {fg = {0, 0, 255}, b = true},
-  bracemiss = {fg = {255, 0, 0 }, b = true},
-  ctrlchar = nil,
-  indent = {fg = {192, 192, 192},bg = {255, 255, 255},},
-  calltip = nil,
-
-  -- common special (need custom fg & bg)
-  calltipbg = nil,
-  sel = nil,
-  caret = nil,
-  caretlinebg = nil,
-  fold = nil,
-  whitespace = {fg = {180, 180, 180,},},
-
-  fncall = {fg = {175,175,255}, st= wxstc.wxSTC_INDIC_BOX},
-}

cfg/darkeditorstyles.lua

@@ -1,38 +0,0 @@
-styles = {
-  -- lexer specific (inherit fg/bg from text)
-  lexerdef = {fg = {128, 128, 128},},
-  comment = {fg = {200, 230, 120 },bg = {30, 40, 30 }, fill= true,},
-  stringtxt = {fg = {240,128,240},},
-  stringeol = {fg = {240,128,200},bg = {48, 24, 24}, fill = true,},
-  preprocessor = {fg = {220,175,140},},
-  operator = {fg = {210, 230, 240 },},
-  number = {fg = {210, 230, 255, },},
-
-  keywords0 = {fg = {240,240,0}},
-  keywords1 = {fg = {255,64,64},},
-  keywords2 = {fg = {0,240,240},},
-  keywords3 = {fg = {140,140,240},},
-  keywords4 = {fg = {255, 128, 0},},
-  keywords5 = {fg = {200,200,240},},
-  keywords6 = {fg = {64, 250, 64},},
-  keywords7 = {fg = {255, 128, 128},},
-
-  -- common (inherit fg/bg from text)
-  text = {fg = {240,240,240},bg = {24,24,24},},
-  linenumber = {fg = {30, 30, 40},bg = {230, 230, 230},},
-  bracematch = {fg = {255, 127, 0}, b = true},
-  bracemiss = {fg = {255, 0,0}, b = true},
-  ctrlchar = nil,
-  indent = {fg = {80, 80, 80},bg = {24,24,24},},
-  calltip = {fg = {255,255,255},bg = {10,10,10},},
-
-  -- common special (need custom fg & bg)
-  calltipbg = {fg = {240,240,240},bg = {10,10,10},},
-  sel = {fg = {180,220,140},bg = {70,105,100},},
-  caret = {fg = {250,250,250},},
-  caretlinebg = {fg = {180,220,140},bg = {24,44,44},},
-  fold = nil,
-  whitespace = {fg = {54,54,54},},
-
-  fncall = {fg = {140,140,0}, st = wxstc.wxSTC_INDIC_BOX},
-}

cfg/darkeditorstyles_dim.lua

@@ -1,38 +0,0 @@
-styles = {
-  -- lexer specific (inherit fg/bg from text)
-  lexerdef = {fg = {128, 128, 128},},
-  comment = {fg = {100, 155, 65}, bg = {30, 35, 30 }, fill= true,},
-  stringtxt = {fg = {200, 145, 145},},
-  stringeol = {fg = {200, 145, 145},bg = {48, 24, 24}, fill = true,},
-  preprocessor = {fg = {220, 175, 140},},
-  operator = {fg = {210, 230, 240 },},
-  number = {fg = {210, 230, 255, },},
-
-  keywords0 = {fg = {128,128,255},},
-  keywords1 = {fg = {210,90,90},},
-  keywords2 = {fg = {0,220,220},},
-  keywords3 = {fg = {220,220,0},},
-  keywords4 = {fg = {240, 128,0},},
-  keywords5 = {fg = {200,200,240},},
-  keywords6 = {fg = {64, 240, 64},},
-  keywords7 = {fg = {255, 128, 128},},
-
-  -- common (inherit fg/bg from text)
-  text = {fg = {200,200,200},bg = {18,24,26},},
-  linenumber = {fg = {30, 30, 40},bg = {230, 230, 230},},
-  bracematch = {fg = {255, 127, 0}, b = true},
-  bracemiss = {fg = {255, 0,0}, b = true},
-  ctrlchar = nil,
-  indent = {fg = {80, 80, 80},bg = {24,24,24},},
-  calltip = {fg = {255,255,255},bg = {10,10,10},},
-
-  -- common special (need custom fg & bg)
-  calltipbg = {fg = {240,240,240},bg = {10,10,10},},
-  sel = {fg = {180,220,140},bg = {70,105,100},},
-  caret = {fg = {250,250,250},},
-  caretlinebg = {fg = {180,220,140},bg = {24,44,44},},
-  fold = nil,
-  whitespace = {fg = {54,54,54},},
-
-  fncall = {fg = {75,75,150}, st= wxstc.wxSTC_INDIC_BOX},
-}

cfg/estrela.lua

@@ -0,0 +1,20 @@
+-- If you have used Estrela before, please copy this content
+-- to your user.lua file in the cfg/ directory
+
+-- load all tools, specs, and interpreters
+local all = function() return true end
+load.tools(all)
+load.specs(all)
+load.interpreters(all)
+
+-- this flag means that toggling between projects, will not affect the 
+-- list of opened files (old estrela default).
+-- zbstudio defaults here to true, meaning that you get 
+-- per-project list of openend files
+projectautoopen = false
+
+-- default search paths for luxinia
+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/"

cfg/i18n/en.lua

@@ -0,0 +1,4 @@
+return {
+  [0] = function(c) return c == 1 and 1 or 2 end, -- plural
+  ["traced %d instruction"] = {"traced %d instruction", "traced %d instructions"}, -- src\editor\debugger.lua
+}

cfg/i18n/es.lua

@@ -0,0 +1,193 @@
+-- Traducción realiazada por Iñigo Sola
+-- para la versión ZeroBrane Studio 17bdb48
+-- 10 de Noviembre de 2012
+return {
+  [0] = function(c) return c == 1 and 1 or 2 end, -- plural
+  ["&About"] = "&Acerca de...", -- src\editor\menu_help.lua
+  ["&Add Watch"] = "Añadir observación", -- src\editor\debugger.lua
+  ["&Break"] = "Ruptura", -- src\editor\menu_project.lua
+  ["&Close Page"] = "Cerrar página", -- src\editor\menu_file.lua
+  ["&Compile"] = "Compilar", -- src\editor\menu_project.lua
+  ["&Copy"] = "Copiar", -- src\editor\editor.lua, src\editor\menu_edit.lua
+  ["&Default Layout"] = "Diseño por defecto", -- src\editor\menu_view.lua
+  ["&Edit Watch"] = "Editar observación", -- src\editor\debugger.lua
+  ["&Edit"] = "Editar", -- src\editor\menu_edit.lua
+  ["&File"] = "Archivo", -- src\editor\menu_file.lua
+  ["&Find"] = "Buscar", -- src\editor\menu_search.lua
+  ["&Fold/Unfold All"] = "Plegar/desplegar todo", -- src\editor\menu_edit.lua
+  ["&Goto Line"] = "Ir a línea", -- src\editor\menu_search.lua
+  ["&Help"] = "Ayuda", -- src\editor\menu_help.lua
+  ["&New"] = "&Nuevo", -- src\editor\menu_file.lua
+  ["&Open..."] = "&Abrir...", -- src\editor\menu_file.lua
+  ["&Output/Console Window"] = "Salida/Consola", -- src\editor\menu_view.lua
+  ["&Paste"] = "Pegar", -- src\editor\editor.lua, src\editor\menu_edit.lua
+  ["&Project"] = "Proyecto", -- src\editor\menu_project.lua, src\editor\inspect.lua
+  ["&Redo"] = "Rehacer", -- src\editor\editor.lua, src\editor\menu_edit.lua
+  ["&Remove Watch"] = "Eliminar observación", -- src\editor\debugger.lua
+  ["&Replace"] = "Remplazar", -- src\editor\menu_search.lua
+  ["&Run"] = "Ejecutar", -- src\editor\menu_project.lua
+  ["&Save"] = "Guardar", -- src\editor\menu_file.lua
+  ["&Search"] = "Buscar", -- src\editor\menu_search.lua
+  ["&Sort"] = "Clasificar", -- src\editor\menu_search.lua
+  ["&Stack Window"] = "Ventana de la pila de ejecución", -- src\editor\menu_view.lua
+  ["&Start Debugger Server"] = "Lanzar servidor de depuración", -- src\editor\menu_project.lua
+  ["&Undo"] = "Deshacer", -- src\editor\editor.lua, src\editor\menu_edit.lua
+  ["&View"] = "Ver", -- src\editor\menu_view.lua
+  ["&Watch Window"] = "Ventana de observaciones", -- src\editor\menu_view.lua
+  ["&Watches"] = "Observaciones", -- src\editor\debugger.lua
+  ["About ZeroBrane Studio"] = "Acerca de ZeroBrane Studio", -- src\editor\menu_help.lua
+  ["Add Watch Expression"] = "Añadir expresión de observación", -- src\editor\editor.lua
+  ["Add to Scratchpad"] = "Añadir al borrador", -- src\editor\editor.lua
+  ["All files"] = "Todos los archivos", -- src\editor\commands.lua
+  ["Allow external process to start debugging"] = "Permitir proceso externo para iniciar depuración", -- src\editor\menu_project.lua
+  ["Analyze the source code"] = "Analizar el código fuente", -- src\editor\inspect.lua
+  ["Analyze"] = "Analizar", -- src\editor\inspect.lua
+  ["Auto Complete Identifiers"] = "Autocompletar identificadores", -- src\editor\menu_edit.lua
+  ["Auto complete while typing"] = "Autocompletar mientras se escribe", -- src\editor\menu_edit.lua
+  ["Break execution at the next executed line of code"] = "Parar ejecución en la siguiente línea de código", -- src\editor\menu_project.lua, src\editor\gui.lua
+  ["C&lear Output Window"] = "Limpiar ventana de Salida", -- src\editor\menu_project.lua
+  ["C&omment/Uncomment"] = "Comentar/descomentar", -- src\editor\menu_edit.lua
+  ["Can't debug the script in the active editor window."] = "No se puede depurar el script en la ventana activa del editor", -- src\editor\debugger.lua
+  ["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."] = "No se puede encontrar el archivo '%s' en el proyecto actual para activar la depuración. Actualiza el proyecto o abre el archivo en el editor antes de depurar.", -- src\editor\debugger.lua
+  ["Can't process auto-recovery record; invalid format: %s."] = "No se puede procesar la autorrecuperación; formato inválido: %s.", -- src\editor\commands.lua
+  ["Can't run the entry point script ('%s')."] = "No se pude ejecutar el punto de entrada del script (%s).", -- src\editor\debugger.lua
+  ["Can't start debugging session due to internal error '%s'."] = "No se puede iniciar la sesión de depuración debido a un error interno '%s'.'", -- src\editor\debugger.lua
+  ["Can't start debugging without an opened file or with the current file not being saved ('%s')."] = "No se puede iniciar la depuración sin abrir un archivo o si no ha sido guardado ('%s').", -- src\editor\debugger.lua
+  ["Choose a project directory"] = "Elegir el directorio del proyecto", -- src\editor\menu_project.lua
+  ["Clear &Dynamic Words"] = "Limpiar las palabras dinámicas", -- src\editor\menu_edit.lua
+  ["Clear the output window before compiling or debugging"] = "Limpiar la ventana de salida antes de compilar o depurar", -- src\editor\menu_project.lua
+  ["Close the current editor window"] = "Cerrar la ventana actual del editor", -- src\editor\menu_file.lua
+  ["Co&ntinue"] = "Continuar", -- src\editor\menu_project.lua
+  ["Col: %d"] = "Col: %d", -- src\editor\editor.lua
+  ["Comment or uncomment current or selected lines"] = {"Comentar o descomentar la línea activa (seleccionada)","Comentar o descomentar las líneas activas (seleccionadas)"}, -- src\editor\menu_edit.lua
+  ["Compilation error"] = "Error de compilación", -- src\editor\debugger.lua, src\editor\commands.lua
+  ["Compilation successful; %.0f%% success rate (%d/%d)."] = "Compilación exitosa; factor de éxito: %.0f%% (%d/%d).", -- src\editor\commands.lua
+  ["Compile the current file"] = "Compilar el archivo actual", -- src\editor\menu_project.lua
+  ["Complete &Identifier"] = "Completar identificador", -- src\editor\menu_edit.lua
+  ["Complete the current identifier"] = "Completar el actual identificador", -- src\editor\menu_edit.lua
+  ["Copy selected text to clipboard"] = "Copiar el texto seleccionado al portapapeles", -- src\editor\menu_edit.lua, src\editor\gui.lua
+  ["Couldn't activate file '%s' for debugging; continuing without it."] = "No se pudo activar el archivo '%s' para la depuración; continuar sin él.", -- src\editor\debugger.lua
+  ["Create an empty document"] = "Crear un documento en blanco", -- src\editor\menu_file.lua, src\editor\gui.lua
+  ["Cu&t"] = "Cortar", -- src\editor\editor.lua, src\editor\menu_edit.lua
+  ["Cut selected text to clipboard"] = "Cortar el texto selecionado al portapapeles", -- src\editor\menu_edit.lua, src\editor\gui.lua
+  ["Debugger server started at %s:%d."] = "Servidor de depuración inciado en %s:%s", -- src\editor\debugger.lua
+  ["Debugging session completed (%s)."] = "Sesión de depuración completada (%s).", -- src\editor\debugger.lua
+  ["Debugging session started in '%s'."] = "Sesión de depuración iniciada en '%s'.", -- src\editor\debugger.lua
+  ["Do you want to reload it?"] = "¿Quieres recargarlo?", -- src\editor\editor.lua
+  ["Do you want to save the changes to '%s'?"] = "¿Quieres guardar los cambios en '%s'?", -- src\editor\commands.lua
+  ["E&xit"] = "Salir", -- src\editor\menu_file.lua
+  ["Enter Lua code and press Enter to run it."] = "Introduce código Lua y pulsa <Entrer> para ejecutarlo.", -- src\editor\shellbox.lua
+  ["Enter line number"] = "Introduce número de línea", -- src\editor\menu_search.lua
+  ["Error while loading API file: %s"] = "Error mientras se cargaba el archivo de API: %s", -- src\editor\autocomplete.lua
+  ["Error while processing API file: %s"] = "Error mientras se procesaba el archivo de API: %s", -- src\editor\autocomplete.lua
+  ["Error"] = "Error", -- src\editor\commands.lua
+  ["Evaluate &Watches"] = "Evaluar las observaciones", -- src\editor\debugger.lua
+  ["Evaluate in Console"] = "Evaluar en consola", -- src\editor\editor.lua
+  ["Execute the current project/file and keep updating the code to see immediate results"] = "Ejecutar el proyecto/archivo actual y manteniendo actualizado el código para ver resultados en tiempo real", -- src\editor\menu_project.lua
+  ["Execute the current project/file"] = "Ejecutar el proyecto/archivo actual", -- src\editor\menu_project.lua
+  ["Execution error"] = "Error de ejecución", -- src\editor\debugger.lua
+  ["Exit program"] = "Salir del programa", -- src\editor\menu_file.lua
+  ["Expr"] = "Expr.", -- src\editor\debugger.lua
+  ["Expression"] = "Expresión", -- src\editor\debugger.lua
+  ["File '%s' has been modified on disk."] = "El archivo '%s' ha sido modificado en el disco.", -- src\editor\editor.lua
+  ["File '%s' has more recent timestamp than restored '%s'; please review before saving."] = "El archivo '%s' tiene una fecha más reciente que el restaurado '%s'; por favor, revísalo antes de guardar.", -- src\editor\commands.lua
+  ["File '%s' no longer exists."] = "El archivo '%s' no existe.", -- src\editor\editor.lua
+  ["File history"] = "Historial de archivos", -- src\editor\menu_file.lua
+  ["Find &In Files"] = "Buscar en archivos", -- src\editor\menu_search.lua
+  ["Find &Next"] = "Buscar siguiente", -- src\editor\menu_search.lua
+  ["Find &Previous"] = "Buscar anterior", -- src\editor\menu_search.lua
+  ["Find and replace text in files"] = "Buscar y remplazar texto en archivos", -- src\editor\menu_search.lua
+  ["Find and replace text"] = "Buscar y rempleazar texto", -- src\editor\menu_search.lua, src\editor\gui.lua
+  ["Find text in files"] = "Buscar texto en archivos", -- src\editor\menu_search.lua
+  ["Find text"] = "Buscar texto", -- src\editor\menu_search.lua, src\editor\gui.lua
+  ["Find the earlier text occurence"] = "Buscar la anterior aparición del texto", -- src\editor\menu_search.lua
+  ["Find the next text occurrence"] = "Buscar la siguiente aparecición del texto", -- src\editor\menu_search.lua
+  ["Fold or unfold all code folds"] = "Plegar o desplegar todo el código plegado", -- src\editor\menu_edit.lua
+  ["Found auto-recovery record and restored saved session."] = "Encontrada autorrecuperación y sesión restaurada.", -- src\editor\commands.lua
+  ["Full &Screen"] = "Pantalla completa", -- src\editor\menu_view.lua
+  ["Go to a selected line"] = "Ir a línea seleccionada", -- src\editor\menu_search.lua
+  ["Goto Line"] = "Ir a línea", -- src\editor\menu_search.lua
+  ["INS"] = "INS", -- src\editor\editor.lua
+  ["Jump to a function definition..."] = "Saltar a la definición de la función...", -- src\editor\editor.lua
+  ["Known Files"] = "Archivos conocidos", -- src\editor\commands.lua
+  ["Ln: %d"] = "Ln: %d", -- src\editor\editor.lua
+  ["Local console"] = "Consola local", -- src\editor\shellbox.lua, src\editor\gui.lua
+  ["Lua &Interpreter"] = "Intérprete Lua", -- src\editor\menu_project.lua
+  ["OVR"] = "OVR", -- src\editor\editor.lua
+  ["Open an existing document"] = "Abrir un documento existente", -- src\editor\menu_file.lua, src\editor\gui.lua
+  ["Open file"] = "Abrir archivo", -- src\editor\commands.lua
+  ["Output (running)"] = "Salida (en ejecución)", -- src\editor\output.lua
+  ["Output"] = "Salida", -- src\editor\output.lua, src\editor\settings.lua, src\editor\gui.lua
+  ["Paste text from the clipboard"] = "Pegar texto desde el portapapeles", -- src\editor\menu_edit.lua, src\editor\gui.lua
+  ["Prepend '=' to show complex values on multiple lines."] = "Antepón '=' para ver valores complejos en líneas múltiples", -- src\editor\shellbox.lua
+  ["Press cancel to abort."] = "Presiona cancelar para abortar.", -- src\editor\commands.lua
+  ["Program '%s' started in '%s' (pid: %d)."] = "Programa '%s' iniciado en '%s' (pid: %d).", -- src\editor\output.lua
+  ["Program can't start because conflicting process is running as '%s'."] = "El programa no puede iniciarse porque hay un proceso conflictivo en ejecución como '%s'.", -- src\editor\output.lua
+  ["Program completed in %.2f seconds (pid: %d)."] = "Programa completado en %.2f segundos (pid: %d).", -- src\editor\output.lua
+  ["Program starting as '%s'."] = "Programa iniciado como '%s'.", -- src\editor\output.lua
+  ["Program stopped (pid: %d)."] = "Programa parado (pid: %d).", -- src\editor\debugger.lua
+  ["Program unable to run as '%s'."] = "No se puede ejecutar el programa como '%s'.", -- src\editor\output.lua
+  ["Project"] = "Proyecto", -- src\editor\settings.lua, src\editor\gui.lua
+  ["Project/&FileTree Window"] = "Ventana de proyecto/árbol de archivos", -- src\editor\menu_view.lua
+  ["R/O"] = "R/O", -- src\editor\editor.lua
+  ["R/W"] = "R/W", -- src\editor\editor.lua
+  ["Re&place In Files"] = "Remplazar en archivos", -- src\editor\menu_search.lua
+  ["Recent Files"] = "Archivos recientes", -- src\editor\menu_file.lua
+  ["Redo last edit undone"] = "Rehacer la última edición deshecha", -- src\editor\menu_edit.lua, src\editor\gui.lua
+  ["Refused a request to start a new debugging session as there is one in progress already."] = "No se pudo lanzar una nueva sesión de depuración porque ya hay una en curso.", -- src\editor\debugger.lua
+  ["Remote console"] = "Consola remota", -- src\editor\shellbox.lua
+  ["Reset to default layout"] = "Restablecer el diseño por defecto", -- src\editor\menu_view.lua
+  ["Resets the dynamic word list for autocompletion"] = "Restablecer la lista dinámica de palabras para autocompletado", -- src\editor\menu_edit.lua
+  ["Run as Scratchpad"] = "Ejecutar como borrador", -- src\editor\menu_project.lua
+  ["S&top Debugging"] = "Parar depuración", -- src\editor\menu_project.lua
+  ["S&top Process"] = "Parar proceso", -- src\editor\menu_project.lua
+  ["Save &As..."] = "Guardar como...", -- src\editor\menu_file.lua
+  ["Save A&ll"] = "Guardar todo", -- src\editor\menu_file.lua
+  ["Save Changes?"] = "¿Guardar cambios?", -- src\editor\commands.lua
+  ["Save all open documents"] = "Guardar todos los documentos abiertos", -- src\editor\menu_file.lua, src\editor\gui.lua
+  ["Save file as"] = "Guardar archivo como", -- src\editor\commands.lua
+  ["Save file?"] = "¿Guardar archivo?", -- src\editor\commands.lua
+  ["Save the current document to a file with a new name"] = "Guardar el documento actual en un archivo con un nombre nuevo", -- src\editor\menu_file.lua
+  ["Save the current document"] = "Guardar el documento actual", -- src\editor\menu_file.lua, src\editor\gui.lua
+  ["Saved auto-recover at %s."] = "Guardar autorrecuperación en %s.", -- src\editor\commands.lua
+  ["Scratchpad error"] = "Error en el borrador", -- src\editor\debugger.lua
+  ["Select &All"] = "Seleccionar todo", -- src\editor\editor.lua, src\editor\menu_edit.lua
+  ["Select all text in the editor"] = "Seleccionar todo el texto en el editor", -- src\editor\menu_edit.lua
+  ["Set project directory from current file"] = "Establecer el directorio del proyecto del archivo actual", -- src\editor\gui.lua
+  ["Set the interpreter to be used"] = "Establecer el intérprete a ser usado", -- src\editor\menu_project.lua
+  ["Show &Tooltip"] = "Ver tooltip", -- src\editor\menu_edit.lua
+  ["Show tooltip for current position; place cursor after opening bracket of function"] = "Ver tooltip para la posición actual; posicionar el cursor después de abrir el paréntisis de los argumentos de la función", -- src\editor\menu_edit.lua
+  ["Sort selected lines"] = "Clasificar las líneas seleccionadas", -- src\editor\menu_search.lua
+  ["Stack Window"] = "Ventana de la pila de ejecución", -- src\editor\debugger.lua
+  ["Start &Debugging"] = "Comenzar depuración", -- src\editor\menu_project.lua
+  ["Start debugging"] = "Comenzar depuración", -- src\editor\menu_project.lua, src\editor\gui.lua
+  ["Step &Into"] = "Paso dentro", -- src\editor\menu_project.lua
+  ["Step &Over"] = "Paso sin entrar", -- src\editor\menu_project.lua
+  ["Step O&ut"] = "Paso fuera", -- src\editor\menu_project.lua
+  ["Step into"] = "Paso dentro", -- src\editor\menu_project.lua, src\editor\gui.lua
+  ["Step out of the current function"] = "Hasta salir de la función actual", -- src\editor\menu_project.lua, src\editor\gui.lua
+  ["Step over"] = "Paso sin entrar", -- src\editor\menu_project.lua, src\editor\gui.lua
+  ["Stop the currently running process"] = "Parar el proceso en ejecución", -- src\editor\menu_project.lua, src\editor\gui.lua
+  ["Switch to or from full screen mode"] = "Conmutar el modo de pantalla completa", -- src\editor\menu_view.lua
+  ["The API file must be located in a subdirectory of the API directory."] = "El archivo de API debe ser almacenado en un subdirectorio del directorio de API.", -- src\editor\autocomplete.lua
+  ["Toggle Break&point"] = "Conmutar punto de ruptura", -- src\editor\menu_project.lua
+  ["Toggle breakpoint"] = "Conmutar punto de ruptura", -- src\editor\menu_project.lua, src\editor\gui.lua
+  ["Tr&ace"] = "Traza", -- src\editor\menu_project.lua
+  ["Trace execution showing each executed line"] = "Traza de ejecución mostrando cada línea ejecutada", -- src\editor\menu_project.lua
+  ["Unable to load file '%s'."] = "No se pudo cargar el archivo '%s'.", -- src\editor\commands.lua
+  ["Unable to save file '%s': %s"] = "No se pudo guardar el archivo '%s': %s", -- src\editor\commands.lua
+  ["Unable to stop program (pid: %d), code %d."] = "No se puedo parar el programa (pid: %d), código %d.", -- src\editor\debugger.lua
+  ["Undo last edit"] = "Deshacer la última edición", -- src\editor\menu_edit.lua, src\editor\gui.lua
+  ["Use 'clear' to clear the shell output and the history."] = "Usa 'clear' para limpiar la consola de salida y el historial.", -- src\editor\shellbox.lua
+  ["Use Shift-Enter for multiline code."] = "Usa <Shift-Enter> para código multilínea.", -- src\editor\shellbox.lua
+  ["Value"] = "Valor", -- src\editor\debugger.lua
+  ["View the output/console window"] = "Ver ventana de salida/consola", -- src\editor\menu_view.lua
+  ["View the project/filetree window"] = "Ver la ventana de proyecto/árbol de archivos", -- src\editor\menu_view.lua
+  ["View the stack window"] = "Ver la ventana de la pila de ejecución", -- src\editor\menu_view.lua, src\editor\gui.lua
+  ["View the watch window"] = "Ver la ventana de observación", -- src\editor\menu_view.lua, src\editor\gui.lua
+  ["Watch Window"] = "Ventana de observación", -- src\editor\debugger.lua
+  ["Welcome to the interactive Lua interpreter."] = "Bienvenido al intérprete interactico de Lua.", -- src\editor\shellbox.lua
+  ["You must save the program first."] = "Debes guardar el programa primero", -- src\editor\commands.lua
+  ["on line %d"] = "en la línea %d", -- src\editor\debugger.lua, src\editor\commands.lua
+  ["traced %d instruction"] = {"%d instrucción trazada", "%d instrucciones trazadas"} -- src\editor\debugger.lua
+}

cfg/i18n/fr.lua

@@ -0,0 +1,200 @@
+return {
+  [0] = function(c) return c == 1 and 1 or 2 end, -- plural
+  ["&About"] = "À &propos", -- src\editor\menu_help.lua
+  ["&Add Watch"] = "&Ajouter une expression", -- src\editor\debugger.lua
+  ["&Break"] = "&Interrompre", -- src\editor\menu_project.lua
+  ["&Close Page"] = "&Fermer la page", -- src\editor\menu_file.lua, src\editor\gui.lua
+  ["&Compile"] = "&Compiler", -- src\editor\menu_project.lua
+  ["&Copy"] = "Co&pier", -- src\editor\editor.lua, src\editor\menu_edit.lua
+  ["&Default Layout"] = "Affichage par &défaut", -- src\editor\menu_view.lua
+  ["&Edit Watch"] = "&Modifier une expression", -- src\editor\debugger.lua
+  ["&Edit"] = "É&dition", -- src\editor\menu_edit.lua
+  ["&File"] = "&Fichier", -- src\editor\menu_file.lua
+  ["&Find"] = "&Rechercher...", -- src\editor\menu_search.lua
+  ["&Fold/Unfold All"] = "Re&plier/Déplier tout", -- src\editor\menu_edit.lua
+  ["&Goto Line"] = "&Aller à la ligne...", -- src\editor\menu_search.lua
+  ["&Help"] = "Aid&e", -- src\editor\menu_help.lua
+  ["&New"] = "&Nouveau", -- src\editor\menu_file.lua
+  ["&Open..."] = "&Ouvrir...", -- src\editor\menu_file.lua
+  ["&Output/Console Window"] = "&Sortie/Console", -- src\editor\menu_view.lua
+  ["&Paste"] = "Co&ller", -- src\editor\editor.lua, src\editor\menu_edit.lua
+  ["&Project"] = "&Projet", -- src\editor\menu_project.lua, src\editor\inspect.lua
+  ["&Redo"] = "&Rétablir", -- src\editor\editor.lua, src\editor\menu_edit.lua
+  ["&Remove Watch"] = "&Supprimer une expression", -- src\editor\debugger.lua
+  ["&Replace"] = "Re&mplacer...", -- src\editor\menu_search.lua
+  ["&Run"] = "&Exécuter", -- src\editor\menu_project.lua
+  ["&Save"] = "&Enregistrer", -- src\editor\menu_file.lua, src\editor\gui.lua
+  ["&Search"] = "&Recherche", -- src\editor\menu_search.lua
+  ["&Sort"] = "&Trier", -- src\editor\menu_search.lua
+  ["&Stack Window"] = "&Pile d'exécution", -- src\editor\menu_view.lua
+  ["&Start Debugger Server"] = "Lancer le &serveur de débogage", -- src\editor\menu_project.lua
+  ["&Undo"] = "&Annuler", -- src\editor\editor.lua, src\editor\menu_edit.lua
+  ["&View"] = "&Affichage", -- src\editor\menu_view.lua
+  ["&Watch Window"] = "&Expressions espionnes", -- src\editor\menu_view.lua
+  ["&Watches"] = "&Expressions", -- src\editor\debugger.lua
+  ["About ZeroBrane Studio"] = "À propos de ZeroBrane Studio", -- src\editor\menu_help.lua
+  ["Add Watch Expression"] = "Ajouter une expression", -- src\editor\editor.lua
+  ["Add to Scratchpad"] = "Ajouter au brouillon", -- src\editor\editor.lua
+  ["All files"] = "Tous les fichiers", -- src\editor\commands.lua
+  ["Allow external process to start debugging"] = "Autoriser les processus externes à lancer le débogage", -- src\editor\menu_project.lua
+  ["Analyze the source code"] = "Analyser le code source", -- src\editor\inspect.lua
+  ["Analyze"] = "Analyser", -- src\editor\inspect.lua
+  ["Auto Complete Identifiers"] = "Auto-compléter les identifiants", -- src\editor\menu_edit.lua
+  ["Auto complete while typing"] = "Auto-compléter lors de la saisie", -- src\editor\menu_edit.lua
+  ["Break execution at the next executed line of code"] = "Interrompre l'exécution à la ligne suivante", -- src\editor\menu_project.lua, src\editor\gui.lua
+  ["C&lear Output Window"] = "E&ffacer la fenêtre de sortie", -- src\editor\menu_project.lua
+  ["C&omment/Uncomment"] = "Co&mmenter/Décommenter", -- src\editor\menu_edit.lua
+  ["Can't debug the script in the active editor window."] = "Impossible de déboguer le script dans la fenêtre d'édition active.", -- src\editor\debugger.lua
+  ["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."] = "Impossible de trouver le fichier '%s' dans le projet courant pour permettre le débogage. Mettez le projet à jour ou ouvrez le fichier dans l'éditeur avant débogage.", -- src\editor\debugger.lua
+  ["Can't process auto-recovery record; invalid format: %s."] = "Impossible de lire la récupération automatique ; format invalide : %s.", -- src\editor\commands.lua
+  ["Can't run the entry point script ('%s')."] = "Impossible d'exécuter le point d'entrée du script ('%s').", -- src\editor\debugger.lua
+  ["Can't start debugging session due to internal error '%s'."] = "Impossible de lancer la session de débogage : erreur interne '%s'.", -- src\editor\debugger.lua
+  ["Can't start debugging without an opened file or with the current file not being saved ('%s')."] = "Impossible de lancer le débogage si aucun fichier n'est ouvert ou si le fichier courant n'a pas été enregistré ('%s').", -- src\editor\debugger.lua
+  ["Choose ..."] = "Choisir...", -- src\editor\menu_project.lua
+  ["Choose a project directory"] = "Choisissez un répertoire de projet", -- src\editor\menu_project.lua
+  ["Clear &Dynamic Words"] = "Effacer les mots &dynamiques", -- src\editor\menu_edit.lua
+  ["Clear the output window before compiling or debugging"] = "Effacer la fenêtre de sortie avant compilation ou débogage", -- src\editor\menu_project.lua
+  ["Close &Other Pages"] = "Fermer les &autres pages", -- src\editor\gui.lua
+  ["Close A&ll Pages"] = "Fermer &toutes les pages", -- src\editor\gui.lua
+  ["Close the current editor window"] = "Fermer la fenêtre d'édition active", -- src\editor\menu_file.lua
+  ["Co&ntinue"] = "Co&ntinuer", -- src\editor\menu_project.lua
+  ["Col: %d"] = "Col : %d", -- src\editor\editor.lua
+  ["Comment or uncomment current or selected lines"] = "Commenter ou décommenter les lignes courantes ou sélectionnées", -- src\editor\menu_edit.lua
+  ["Compilation error"] = "Erreur de commpilation", -- src\editor\debugger.lua, src\editor\commands.lua
+  ["Compilation successful; %.0f%% success rate (%d/%d)."] = "Compilation réussie ; taux de succès : %.0f%% (%d/%d).", -- src\editor\commands.lua
+  ["Compile the current file"] = "Сompiler le fichier courant", -- src\editor\menu_project.lua
+  ["Complete &Identifier"] = "Compléter l'&identifiant", -- src\editor\menu_edit.lua
+  ["Complete the current identifier"] = "Compléter l'identifiant courant", -- src\editor\menu_edit.lua
+  ["Copy selected text to clipboard"] = "Copier le texte sélectionné dans le presse-papiers", -- src\editor\menu_edit.lua, src\editor\gui.lua
+  ["Couldn't activate file '%s' for debugging; continuing without it."] = "Impossible d'activer le fichier '%s' pour débogage ; poursuite du processus en ignorant le fichier.", -- src\editor\debugger.lua
+  ["Create an empty document"] = "Créer un document vierge", -- src\editor\menu_file.lua, src\editor\gui.lua
+  ["Cu&t"] = "&Couper", -- src\editor\editor.lua, src\editor\menu_edit.lua
+  ["Cut selected text to clipboard"] = "Couper le texte selectionné et copier dans le presse-papiers", -- src\editor\menu_edit.lua, src\editor\gui.lua
+  ["Debugger server started at %s:%d."] = "Serveur de débogage démarré à %s:%d.", -- src\editor\debugger.lua
+  ["Debugging session completed (%s)."] = "Session de débogage terminée (%s).", -- src\editor\debugger.lua
+  ["Debugging session started in '%s'."] = "Session de débogage démarrée dans '%s'.", -- src\editor\debugger.lua
+  ["Debugging suspended at %s:%s (couldn't activate the file)."] = "Débogage interrompu à %s:%s (impossible d'activer le fichier).", -- src\editor\debugger.lua
+  ["Do you want to reload it?"] = "Voulez-vous le recharger ?", -- src\editor\editor.lua
+  ["Do you want to save the changes to '%s'?"] = "Voulez-vous enregistrer les modifications dans '%s' ?", -- src\editor\commands.lua
+  ["E&xit"] = "&Quitter", -- src\editor\menu_file.lua
+  ["Enter Lua code and press Enter to run it."] = "Saisissez du code Lua et appuyez sur <Entrée> pour l´exécuter.", -- src\editor\shellbox.lua
+  ["Enter line number"] = "Entrez le numéro de ligne", -- src\editor\menu_search.lua
+  ["Error while loading API file: %s"] = "Erreur lors du chargement du fichier d'API : %s", -- src\editor\autocomplete.lua
+  ["Error while loading configuration file: %s"] = "Erreur lors du chargement du fichier de configuration : %s", -- src\editor\style.lua
+  ["Error while processing API file: %s"] = "Erreur lors de la lecture du fichier d'API : %s", -- src\editor\autocomplete.lua
+  ["Error while processing configuration file: %s"] = "Erreur lors de la lecture du fichier de configuration : %s", -- src\editor\style.lua
+  ["Error"] = "Erreur", -- src\editor\commands.lua
+  ["Evaluate &Watches"] = "&Evaluer les expressions", -- src\editor\debugger.lua
+  ["Evaluate in Console"] = "Evaluer dans la console", -- src\editor\editor.lua
+  ["Execute the current project/file and keep updating the code to see immediate results"] = "Exécuter le projet/fichier courant en mettant le code à jour afin de voir les résultats en temps réel", -- src\editor\menu_project.lua
+  ["Execute the current project/file"] = "Exécuter le projet/fichier courant", -- src\editor\menu_project.lua
+  ["Execution error"] = "Erreur d'exécution", -- src\editor\debugger.lua
+  ["Exit program"] = "Quitter le programme", -- src\editor\menu_file.lua
+  ["Expr"] = "Expr.", -- src\editor\debugger.lua
+  ["Expression"] = "Expression", -- src\editor\debugger.lua
+  ["File '%s' has been modified on disk."] = "Le fichier '%s' a été modifié sur le disque.", -- src\editor\editor.lua
+  ["File '%s' has more recent timestamp than restored '%s'; please review before saving."] = "Le fichier '%s' a un horodatage plus récent que celui restauré '%s' ; veuillez vérifier avant d'enregistrer.", -- src\editor\commands.lua
+  ["File '%s' no longer exists."] = "Le fichier '%s' n'existe plus.", -- src\editor\editor.lua
+  ["File history"] = "Historique de fichier", -- src\editor\menu_file.lua
+  ["Find &In Files"] = "Rec&hercher dans les fichiers...", -- src\editor\menu_search.lua
+  ["Find &Next"] = "Rechercher l'occurence &suivante", -- src\editor\menu_search.lua
+  ["Find &Previous"] = "Rechercher l'occurence &précédente", -- src\editor\menu_search.lua
+  ["Find and replace text in files"] = "Rechercher et remplacer le texte dans les fichiers", -- src\editor\menu_search.lua
+  ["Find and replace text"] = "Rechercher et remplacer le texte", -- src\editor\menu_search.lua, src\editor\gui.lua
+  ["Find text in files"] = "Rechercher le texte dans les fichiers", -- src\editor\menu_search.lua
+  ["Find text"] = "Rechercher le texte", -- src\editor\menu_search.lua, src\editor\gui.lua
+  ["Find the earlier text occurence"] = "Recherche l'occurence précédente du texte", -- src\editor\menu_search.lua
+  ["Find the next text occurrence"] = "Recherche l'occurence suivante du texte", -- src\editor\menu_search.lua
+  ["Fold or unfold all code folds"] = "Replier ou déplier tous les blocs de code", -- src\editor\menu_edit.lua
+  ["Found auto-recovery record and restored saved session."] = "Une récupération automatique a été trouvé et la session a été restaurée.", -- src\editor\commands.lua
+  ["Full &Screen"] = "&Plein écran", -- src\editor\menu_view.lua
+  ["Go to a selected line"] = "Aller à la ligne sélectionnée", -- src\editor\menu_search.lua
+  ["Goto Line"] = "Aller à la ligne", -- src\editor\menu_search.lua
+  ["INS"] = "INS", -- src\editor\editor.lua
+  ["Jump to a function definition..."] = "Aller à la définition de fonction...", -- src\editor\editor.lua
+  ["Known Files"] = "Fichiers connus", -- src\editor\commands.lua
+  ["Ln: %d"] = "Lig : %d", -- src\editor\editor.lua
+  ["Local console"] = "Console locale", -- src\editor\shellbox.lua, src\editor\gui.lua
+  ["Lua &Interpreter"] = "Interpréteur L&ua", -- src\editor\menu_project.lua
+  ["OVR"] = "OVR", -- src\editor\editor.lua
+  ["Open an existing document"] = "Ouvrir un document existant", -- src\editor\menu_file.lua, src\editor\gui.lua
+  ["Open file"] = "Ouvrir un fichier", -- src\editor\commands.lua
+  ["Output (running)"] = "Sortie (en cours d'exécution)", -- src\editor\output.lua
+  ["Output"] = "Sortie", -- src\editor\output.lua, src\editor\settings.lua, src\editor\gui.lua
+  ["Paste text from the clipboard"] = "Coller le texte depuis le presse-papiers", -- src\editor\menu_edit.lua, src\editor\gui.lua
+  ["Prepend '=' to show complex values on multiple lines."] = "Préfixez par '=' pour afficher les valeurs complexes sur plusieurs lignes.", -- src\editor\shellbox.lua
+  ["Press cancel to abort."] = "Cliquez sur Annuler pour annuler.", -- src\editor\commands.lua
+  ["Program '%s' started in '%s' (pid: %d)."] = "Programme '%s' démarré dans '%s' (pid : %d).", -- src\editor\output.lua
+  ["Program can't start because conflicting process is running as '%s'."] = "Le programme ne peut démarrer à cause d'un conflit de processus avec '%s' (en cours d'exécution).", -- src\editor\output.lua
+  ["Program completed in %.2f seconds (pid: %d)."] = "Programme terminé en %.2f secondes (pid : %d).", -- src\editor\output.lua
+  ["Program starting as '%s'."] = "Programme démarré en tant que '%s'.", -- src\editor\output.lua
+  ["Program stopped (pid: %d)."] = "Programme stoppé (pid : %d).", -- src\editor\debugger.lua
+  ["Program unable to run as '%s'."] = "Impossible d'exécuter le programme en tant que '%s'.", -- src\editor\output.lua
+  ["Project Directory"] = "Répertoire de projet", -- src\editor\menu_project.lua
+  ["Project"] = "Projet", -- src\editor\settings.lua, src\editor\gui.lua
+  ["Project/&FileTree Window"] = "&Explorateur de projet", -- src\editor\menu_view.lua
+  ["R/O"] = "R/O", -- src\editor\editor.lua
+  ["R/W"] = "R/W", -- src\editor\editor.lua
+  ["Re&place In Files"] = "Remp&lacer dans les fichiers...", -- src\editor\menu_search.lua
+  ["Recent Files"] = "Fichiers récents", -- src\editor\menu_file.lua
+  ["Redo last edit undone"] = "Rétablir la dernière modification", -- src\editor\menu_edit.lua, src\editor\gui.lua
+  ["Refused a request to start a new debugging session as there is one in progress already."] = "Une requête de lancement de débogage a été refusée car une session de débogage est déjà en cours.", -- src\editor\debugger.lua
+  ["Remote console"] = "Console à distance", -- src\editor\shellbox.lua
+  ["Reset to default layout"] = "Restaurer l'affichage par défaut", -- src\editor\menu_view.lua
+  ["Resets the dynamic word list for autocompletion"] = "Réinitialiser la liste des mots dynamiques pour l'auto-complétion", -- src\editor\menu_edit.lua
+  ["Run as Scratchpad"] = "Exécuter comme brouillon", -- src\editor\menu_project.lua
+  ["S&top Debugging"] = "&Arrêter le débogage", -- src\editor\menu_project.lua
+  ["S&top Process"] = "&Arrêter le processus", -- src\editor\menu_project.lua
+  ["Save &As..."] = "Enregistrer &sous...", -- src\editor\menu_file.lua, src\editor\gui.lua
+  ["Save A&ll"] = "Enregistrer &tout", -- src\editor\menu_file.lua
+  ["Save Changes?"] = "Enregistrer les modifications ?", -- src\editor\commands.lua
+  ["Save all open documents"] = "Enregistrer tous les documents ouverts", -- src\editor\menu_file.lua, src\editor\gui.lua
+  ["Save file as"] = "Enregistrer le fichier sous", -- src\editor\commands.lua
+  ["Save file?"] = "Enregistrer le fichier ?", -- src\editor\commands.lua
+  ["Save the current document to a file with a new name"] = "Enregistrer le document courant sous un nouveau nom", -- src\editor\menu_file.lua
+  ["Save the current document"] = "Enregistrer le document courant", -- src\editor\menu_file.lua, src\editor\gui.lua
+  ["Saved auto-recover at %s."] = "Récup. auto enregistrée à %s.", -- src\editor\commands.lua
+  ["Scratchpad error"] = "Erreur dans le brouillon", -- src\editor\debugger.lua
+  ["Select &All"] = "Sélectionner &tout", -- src\editor\editor.lua, src\editor\menu_edit.lua
+  ["Select all text in the editor"] = "Sélectionner tout le texte dans l'éditeur", -- src\editor\menu_edit.lua
+  ["Set From Current File"] = "Définir depuis le fichier courant", -- src\editor\menu_project.lua
+  ["Set project directory from current file"] = "Définir le répertoire de projet depuis le fichier courant", -- src\editor\menu_project.lua, src\editor\gui.lua
+  ["Set the interpreter to be used"] = "Définir l'interpréteur à utiliser", -- src\editor\menu_project.lua
+  ["Set the project directory to be used"] = "Définir le répertoire de projet à utiliser", -- src\editor\menu_project.lua
+  ["Show &Tooltip"] = "Afficher l'info-&bulle", -- src\editor\menu_edit.lua
+  ["Show tooltip for current position; place cursor after opening bracket of function"] = "Afficher l'info-bulle pour la position actuelle ; placez le curseur après la parenthèse ouvrante de la fonction", -- src\editor\menu_edit.lua
+  ["Sort selected lines"] = "Trier les lignes sélectionnées", -- src\editor\menu_search.lua
+  ["Stack Window"] = "Fenêtre de pile d'éxécution", -- src\editor\debugger.lua
+  ["Start &Debugging"] = "Lancer le &débogage", -- src\editor\menu_project.lua
+  ["Start debugging"] = "Lancer le débogage", -- src\editor\menu_project.lua, src\editor\gui.lua
+  ["Step &Into"] = "Pas à pas détai&llé", -- src\editor\menu_project.lua
+  ["Step &Over"] = "Pas à pas so&mmaire", -- src\editor\menu_project.lua
+  ["Step O&ut"] = "Pas à pas so&rtant", -- src\editor\menu_project.lua
+  ["Step into"] = "Rentrer dans l'instruction suivante", -- src\editor\menu_project.lua, src\editor\gui.lua
+  ["Step out of the current function"] = "Sortir de la fonction courante", -- src\editor\menu_project.lua, src\editor\gui.lua
+  ["Step over"] = "Enjamber l'instruction suivante", -- src\editor\menu_project.lua, src\editor\gui.lua
+  ["Stop the currently running process"] = "Arrêter le processus en cours d'exécution", -- src\editor\menu_project.lua, src\editor\gui.lua
+  ["Switch to or from full screen mode"] = "Activer ou désactiver le mode plein écran", -- src\editor\menu_view.lua
+  ["The API file must be located in a subdirectory of the API directory."] = "Le fichier d'API doit être placé dans un sous-répertoire du répertoire d'API.", -- src\editor\autocomplete.lua
+  ["Toggle Break&point"] = "Créer/Supprimer un &point d'arrêt", -- src\editor\menu_project.lua
+  ["Toggle breakpoint"] = "Créer ou supprimer un point d'arrêt", -- src\editor\menu_project.lua, src\editor\gui.lua
+  ["Tr&ace"] = "&Tracer", -- src\editor\menu_project.lua
+  ["Trace execution showing each executed line"] = "Tracer l'exécution en montrant chaque ligne de code exécutée", -- src\editor\menu_project.lua
+  ["Unable to load file '%s'."] = "Impossible de charger le le fichier '%s'.", -- src\editor\commands.lua
+  ["Unable to save file '%s': %s"] = "Impossible d'enregistrer le fichier '%s' : %s", -- src\editor\commands.lua
+  ["Unable to stop program (pid: %d), code %d."] = "Impossible d'arrêter le programme (pid : %d), code %d.", -- src\editor\debugger.lua
+  ["Undo last edit"] = "Annuler la dernière modification", -- src\editor\menu_edit.lua, src\editor\gui.lua
+  ["Use '%s' to see full description."] = "Utilisez '%s' pour voir la description complète.", -- src\editor\editor.lua
+  ["Use 'clear' to clear the shell output and the history."] = "Utilisez 'clear' pour effacer la sortie console et l´historique.", -- src\editor\shellbox.lua
+  ["Use Shift-Enter for multiline code."] = "Appuyez sur <Shift-Entrée> pour du code multiligne.", -- src\editor\shellbox.lua
+  ["Value"] = "Valeur", -- src\editor\debugger.lua
+  ["View the output/console window"] = "Afficher la fenêtre de sortie/console", -- src\editor\menu_view.lua
+  ["View the project/filetree window"] = "Afficher la fenêtre d'explorateur de projet", -- src\editor\menu_view.lua
+  ["View the stack window"] = "Afficher la fenêtre de pile d'éxécution", -- src\editor\menu_view.lua, src\editor\gui.lua
+  ["View the watch window"] = "Afficher la fenêtre d'expressions espionnes", -- src\editor\menu_view.lua, src\editor\gui.lua
+  ["Watch Window"] = "Fenêtre d'expressions espionnes", -- src\editor\debugger.lua
+  ["Welcome to the interactive Lua interpreter."] = "Bienvenue dans l´interpréteur interactif Lua.", -- src\editor\shellbox.lua
+  ["You must save the program first."] = "Vous devez d'abord enregistrer le programme.", -- src\editor\commands.lua
+  ["on line %d"] = "à la ligne %d", -- src\editor\debugger.lua, src\editor\commands.lua
+  ["traced %d instruction"] = {"%d instruction tracée", "%d instructions tracées"} -- src\editor\debugger.lua
+}

cfg/i18n/it.lua

@@ -0,0 +1,190 @@
+return {
+  [0] = function(c) return c == 1 and 1 or 2 end, -- plural
+  ["&About"] = "Informazioni", -- src\editor\menu_help.lua
+  ["&Add Watch"] = "&Aggiungi Espressione di Controllo", -- src\editor\debugger.lua
+  ["&Break"] = "Interrompi", -- src\editor\menu_project.lua
+  ["&Close Page"] = "&Chiudi pagina", -- src\editor\menu_file.lua
+  ["&Compile"] = "&Compila", -- src\editor\menu_project.lua
+  ["&Copy"] = "&Copia", -- src\editor\editor.lua, src\editor\menu_edit.lua
+  ["&Default Layout"] = "Visualizzazione di &Default", -- src\editor\menu_view.lua
+  ["&Edit Watch"] = "Modifica Espressione di Controllo", -- src\editor\debugger.lua
+  ["&Edit"] = "Modifica", -- src\editor\menu_edit.lua
+  ["&File"] = "File", -- src\editor\menu_file.lua
+  ["&Find"] = "Ricerca", -- src\editor\menu_search.lua
+  ["&Fold/Unfold All"] = "Apri/Chiudi tutto", -- src\editor\menu_edit.lua
+  ["&Goto Line"] = "Vai a riga", -- src\editor\menu_search.lua
+  ["&Help"] = "Aiuto", -- src\editor\menu_help.lua
+  ["&New"] = "&Nuovo", -- src\editor\menu_file.lua
+  ["&Open..."] = "&Apri...", -- src\editor\menu_file.lua
+  ["&Output/Console Window"] = "Finestra di Output/Console", -- src\editor\menu_view.lua
+  ["&Paste"] = "Incolla", -- src\editor\editor.lua, src\editor\menu_edit.lua
+  ["&Project"] = "&Progetto", -- src\editor\menu_project.lua, src\editor\inspect.lua
+  ["&Redo"] = "&Ripeti", -- src\editor\editor.lua, src\editor\menu_edit.lua
+  ["&Remove Watch"] = "Elimina Espressione di Controllo", -- src\editor\debugger.lua
+  ["&Replace"] = "Sostituisci", -- src\editor\menu_search.lua
+  ["&Run"] = "Lancia", -- src\editor\menu_project.lua
+  ["&Save"] = "&Salva", -- src\editor\menu_file.lua
+  ["&Search"] = "Ricerca", -- src\editor\menu_search.lua
+  ["&Sort"] = "Ordina", -- src\editor\menu_search.lua
+  ["&Stack Window"] = "Stack di chiamate", -- src\editor\menu_view.lua
+  ["&Start Debugger Server"] = "Avvia Debugger Server", -- src\editor\menu_project.lua
+  ["&Undo"] = "Annulla", -- src\editor\editor.lua, src\editor\menu_edit.lua
+  ["&View"] = "Visualizza", -- src\editor\menu_view.lua
+  ["&Watch Window"] = "Finestra Espressioni di Controllo", -- src\editor\menu_view.lua
+  ["&Watches"] = "Espressioni di Controllo", -- src\editor\debugger.lua
+  ["About ZeroBrane Studio"] = "Informazioni su ZeroBrane Studio", -- src\editor\menu_help.lua
+  ["Add Watch Expression"] = "Aggiungi Espressione di Controllo", -- src\editor\editor.lua
+  ["Add to Scratchpad"] = "Aggiungi a Scratchpad ", -- src\editor\editor.lua
+  ["All files"] = "Tutti i files", -- src\editor\commands.lua
+  ["Allow external process to start debugging"] = "Permetti a processi esterni di avviare il debug", -- src\editor\menu_project.lua
+  ["Analyze the source code"] = "Analizza il codice", -- src\editor\inspect.lua
+  ["Analyze"] = "Analizza", -- src\editor\inspect.lua
+  ["Auto Complete Identifiers"] = "Autocompletamento identificatori", -- src\editor\menu_edit.lua
+  ["Auto complete while typing"] = "Autocompletamento in linea", -- src\editor\menu_edit.lua
+  ["Break execution at the next executed line of code"] = "Interrompi l'esecuzione alla successiva riga di codice ", -- src\editor\menu_project.lua, src\editor\gui.lua
+  ["C&lear Output Window"] = "Pulisci finestra di output", -- src\editor\menu_project.lua
+  ["C&omment/Uncomment"] = "Commenta/Scommenta", -- src\editor\menu_edit.lua
+  ["Can't debug the script in the active editor window."] = "Impossibile farte debug dello script nella finestra attiva", -- src\editor\debugger.lua
+  ["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."] = "File '%s' non trovato nel progetto per attivare il debug. Modificare il progetto o apire il file prima di lanciare il debug.", -- src\editor\debugger.lua
+  ["Can't process auto-recovery record; invalid format: %s."] = "Impossibile procedere all'auto-recovery; Formato non valido: %s.", -- src\editor\commands.lua
+  ["Can't run the entry point script ('%s')."] = "Impossibile eseguire il punto di ingresos dello script (%s).", -- src\editor\debugger.lua
+  ["Can't start debugging session due to internal error '%s'."] = "Impossibile lanciare la sessione di debug: errore interno '%s'.'", -- src\editor\debugger.lua
+  ["Can't start debugging without an opened file or with the current file not being saved ('%s')."] = "Impossibile lanciare il debug senza aver aperto un file o se il file corrente non è stato salvato ('%s').", -- src\editor\debugger.lua
+  ["Choose a project directory"] = "Scegli la directory di un progetto", -- src\editor\menu_project.lua
+  ["Clear &Dynamic Words"] = "Elimna le &Dynamic Words", -- src\editor\menu_edit.lua
+  ["Clear the output window before compiling or debugging"] = "Pulisci la finestra di output prima di compilare o lanciare debug", -- src\editor\menu_project.lua
+  ["Close the current editor window"] = "Chiude la finestra dell'edit corrente", -- src\editor\menu_file.lua
+  ["Co&ntinue"] = "Co&ntinua", -- src\editor\menu_project.lua
+  ["Col: %d"] = "Col: %d", -- src\editor\editor.lua
+  ["Comment or uncomment current or selected lines"] = "Commenta o scommenta la linea corrente o selezionat", -- src\editor\menu_edit.lua
+  ["Compilation error"] = "Errore di compilazione", -- src\editor\debugger.lua, src\editor\commands.lua
+  ["Compilation successful; %.0f%% success rate (%d/%d)."] = "Compilazione riuscita; tasso di successo : %.0f%% (%d/%d).", -- src\editor\commands.lua
+  ["Compile the current file"] = "Compila il file corrente", -- src\editor\menu_project.lua
+  ["Complete &Identifier"] = "Completa l'&Identificatore", -- src\editor\menu_edit.lua
+  ["Complete the current identifier"] = "Completa l'identificatore corrente", -- src\editor\menu_edit.lua
+  ["Copy selected text to clipboard"] = "Copia il testo selezionato negli appunti", -- src\editor\menu_edit.lua, src\editor\gui.lua
+  ["Couldn't activate file '%s' for debugging; continuing without it."] = "Impossibile attivare il file '%s' per debug; si prosegue senza.", -- src\editor\debugger.lua
+  ["Create an empty document"] = "Crea un documento vuoto", -- src\editor\menu_file.lua, src\editor\gui.lua
+  ["Cu&t"] = "&Taglia", -- src\editor\editor.lua, src\editor\menu_edit.lua
+  ["Cut selected text to clipboard"] = "Taglia il testo selezionato e mette negli appunti", -- src\editor\menu_edit.lua, src\editor\gui.lua
+  ["Debugger server started at %s:%d."] = "Server Debugger iniziato %s:%s", -- src\editor\debugger.lua
+  ["Debugging session completed (%s)."] = "Sessione di debug completata (%s).", -- src\editor\debugger.lua
+  ["Debugging session started in '%s'."] = "Sessione di debug iniziata da '%s'.", -- src\editor\debugger.lua
+  ["Do you want to reload it?"] = "Vuoi ricaricarlo?", -- src\editor\editor.lua
+  ["Do you want to save the changes to '%s'?"] = "Vuoi salvare le modifiche a '%s'?", -- src\editor\commands.lua
+  ["E&xit"] = "Uscita", -- src\editor\menu_file.lua
+  ["Enter Lua code and press Enter to run it."] = "Inserisci codice Lua e premi <Enter> per eseguirlo.", -- src\editor\shellbox.lua
+  ["Enter line number"] = "Inserisci il numero di linea", -- src\editor\menu_search.lua
+  ["Error while loading API file: %s"] = "Errore durante il caricamento del file API: %s", -- src\editor\autocomplete.lua
+  ["Error while processing API file: %s"] = "Errore durante l'elaborazione del file API: %s", -- src\editor\autocomplete.lua
+  ["Error"] = "Errore", -- src\editor\commands.lua
+  ["Evaluate &Watches"] = "Elabora Espressioni di Controllo", -- src\editor\debugger.lua
+  ["Evaluate in Console"] = "Elabora in console", -- src\editor\editor.lua
+  ["Execute the current project/file and keep updating the code to see immediate results"] = "Esegue il progetto/file corrente e permette di modificare il codice per vedere i risultati in tempo reale", -- src\editor\menu_project.lua
+  ["Execute the current project/file"] = "Esegue il progetto/file corrente", -- src\editor\menu_project.lua
+  ["Execution error"] = "Errore di esecuzione", -- src\editor\debugger.lua
+  ["Exit program"] = "Uscita dal programma", -- src\editor\menu_file.lua
+  ["Expr"] = "Expr.", -- src\editor\debugger.lua
+  ["Expression"] = "Espressione", -- src\editor\debugger.lua
+  ["File '%s' has been modified on disk."] = "Il file '%s' e' stato modificato sul disco.", -- src\editor\editor.lua
+  ["File '%s' has more recent timestamp than restored '%s'; please review before saving."] = "Il file '%s' ha un timestamp più recente di quello ripristinato '%s'; verificare prima di salvare.", -- src\editor\commands.lua
+  ["File '%s' no longer exists."] = "Il file '%s' non esiste piu'.", -- src\editor\editor.lua
+  ["File history"] = "Storia del file", -- src\editor\menu_file.lua
+  ["Find &In Files"] = "Ricerca nei files", -- src\editor\menu_search.lua
+  ["Find &Next"] = "Cerca il successivo", -- src\editor\menu_search.lua
+  ["Find &Previous"] = "Cerca il precedente", -- src\editor\menu_search.lua
+  ["Find and replace text in files"] = "Cerca e sostituisci testo nei files", -- src\editor\menu_search.lua
+  ["Find and replace text"] = "Cerca e sostituisci testo", -- src\editor\menu_search.lua, src\editor\gui.lua
+  ["Find text in files"] = "Cerca testo nei files", -- src\editor\menu_search.lua
+  ["Find text"] = "Cerca testo", -- src\editor\menu_search.lua, src\editor\gui.lua
+  ["Find the earlier text occurence"] = "Cerca la precedente occorrenza nel testo", -- src\editor\menu_search.lua
+  ["Find the next text occurrence"] = "Cerca la successiva occorrenza nel testo", -- src\editor\menu_search.lua
+  ["Fold or unfold all code folds"] = "Apri o chiudi tutti i blocchi di codice", -- src\editor\menu_edit.lua
+  ["Found auto-recovery record and restored saved session."] = "Trovato punto di auto-revcovery e ripristinata la sessione salvata", -- src\editor\commands.lua
+  ["Full &Screen"] = "Schermo pieno", -- src\editor\menu_view.lua
+  ["Go to a selected line"] = "Vai alla riga selezionata", -- src\editor\menu_search.lua
+  ["Goto Line"] = "Vai alla riga", -- src\editor\menu_search.lua
+  ["INS"] = "INS", -- src\editor\editor.lua
+  ["Jump to a function definition..."] = "Salta alla definizione della funzione...", -- src\editor\editor.lua
+  ["Known Files"] = "Files conosciuti", -- src\editor\commands.lua
+  ["Ln: %d"] = "Ln: %d", -- src\editor\editor.lua
+  ["Local console"] = "Console locale", -- src\editor\shellbox.lua, src\editor\gui.lua
+  ["Lua &Interpreter"] = "&Interprete Lua", -- src\editor\menu_project.lua
+  ["OVR"] = "OVR", -- src\editor\editor.lua
+  ["Open an existing document"] = "Apri un documento esistente", -- src\editor\menu_file.lua, src\editor\gui.lua
+  ["Open file"] = "Apri un file", -- src\editor\commands.lua
+  ["Output (running)"] = "Output (in corso d'esecuzione)", -- src\editor\output.lua
+  ["Output"] = "Output", -- src\editor\output.lua, src\editor\settings.lua, src\editor\gui.lua
+  ["Paste text from the clipboard"] = "Incolla testo dagli appunti", -- src\editor\menu_edit.lua, src\editor\gui.lua
+  ["Prepend '=' to show complex values on multiple lines."] = "Prefissa '=' per visualizzare valori complessi su piu` righe", -- src\editor\shellbox.lua
+  ["Press cancel to abort."] = "Premi cancel per bloccare.", -- src\editor\commands.lua
+  ["Program '%s' started in '%s' (pid: %d)."] = "Programma '%s' partito da '%s' (pid: %d).", -- src\editor\output.lua
+  ["Program can't start because conflicting process is running as '%s'."] = "Il programma non puo' partire perchè in conflitto con il processo in esecuzione '%s'.", -- src\editor\output.lua
+  ["Program completed in %.2f seconds (pid: %d)."] = "Programma completato in %.2f secondi (pid: %d).", -- src\editor\output.lua
+  ["Program starting as '%s'."] = "Programma partito da '%s'.", -- src\editor\output.lua
+  ["Program stopped (pid: %d)."] = "Programma fermato (pid: %d).", -- src\editor\debugger.lua
+  ["Program unable to run as '%s'."] = "Il programma non puo' partire '%s'.", -- src\editor\output.lua
+  ["Project"] = "Progetto", -- src\editor\settings.lua, src\editor\gui.lua
+  ["Project/&FileTree Window"] = "Progetto/Explorer", -- src\editor\menu_view.lua
+  ["R/O"] = "R/O", -- src\editor\editor.lua
+  ["R/W"] = "R/W", -- src\editor\editor.lua
+  ["Re&place In Files"] = "Sostituisci nei files", -- src\editor\menu_search.lua
+  ["Recent Files"] = "Files recenti", -- src\editor\menu_file.lua
+  ["Redo last edit undone"] = "Ripeti l'ultima azione annullata", -- src\editor\menu_edit.lua, src\editor\gui.lua
+  ["Refused a request to start a new debugging session as there is one in progress already."] = "Impossibile aprire una nuova sessione di debug in quanto ne esiste una in corso", -- src\editor\debugger.lua
+  ["Remote console"] = "Console remota", -- src\editor\shellbox.lua
+  ["Reset to default layout"] = "Ritorna al default layout", -- src\editor\menu_view.lua
+  ["Resets the dynamic word list for autocompletion"] = "Azzera la lista di dynamic words per l'autocompletamento", -- src\editor\menu_edit.lua
+  ["Run as Scratchpad"] = "Esegui in Scratchpad (Live coding)", -- src\editor\menu_project.lua
+  ["S&top Debugging"] = "Ferma il debugger", -- src\editor\menu_project.lua
+  ["S&top Process"] = "Ferma il processo", -- src\editor\menu_project.lua
+  ["Save &As..."] = "S&alva con nome...", -- src\editor\menu_file.lua
+  ["Save A&ll"] = "Sa&lva tutto", -- src\editor\menu_file.lua
+  ["Save Changes?"] = "Vuoi salvare le modifiche?", -- src\editor\commands.lua
+  ["Save all open documents"] = "Salva tutti i documenti aperti", -- src\editor\menu_file.lua, src\editor\gui.lua
+  ["Save file as"] = "Salva il file con nome", -- src\editor\commands.lua
+  ["Save file?"] = "Vuoi salvare il file?", -- src\editor\commands.lua
+  ["Save the current document to a file with a new name"] = "Salva il documento corrente in un file con un nuovo nome", -- src\editor\menu_file.lua
+  ["Save the current document"] = "Salva il documento corrente", -- src\editor\menu_file.lua, src\editor\gui.lua
+  ["Saved auto-recover at %s."] = "Salvato auto-recover a %s.", -- src\editor\commands.lua
+  ["Scratchpad error"] = "Errore durente Scratchpad", -- src\editor\debugger.lua
+  ["Select &All"] = "Selezion&a Tutto", -- src\editor\editor.lua, src\editor\menu_edit.lua
+  ["Select all text in the editor"] = "Seleziona tutto il testo nell'editor", -- src\editor\menu_edit.lua
+  ["Set project directory from current file"] = "Definisci la directory del progeetto dal file corrente", -- src\editor\gui.lua
+  ["Set the interpreter to be used"] = "Definisci l'interprete da utilizzare", -- src\editor\menu_project.lua
+  ["Show &Tooltip"] = "Mos&tra i consgli", -- src\editor\menu_edit.lua
+  ["Show tooltip for current position; place cursor after opening bracket of function"] = "Mostra i consigli per la posizione corrente; muovi il cursore dopo la parentesi o la funzione", -- src\editor\menu_edit.lua
+  ["Sort selected lines"] = "Ordina le righe selezionate", -- src\editor\menu_search.lua
+  ["Stack Window"] = "Finestra Stack", -- src\editor\debugger.lua
+  ["Start &Debugging"] = "Inizia il &Debug", -- src\editor\menu_project.lua
+  ["Start debugging"] = "Inizia il Debug", -- src\editor\menu_project.lua, src\editor\gui.lua
+  ["Step &Into"] = "Step &Into", -- src\editor\menu_project.lua
+  ["Step &Over"] = "Step &Over", -- src\editor\menu_project.lua
+  ["Step O&ut"] = "Step O&ut", -- src\editor\menu_project.lua
+  ["Step into"] = "Step into", -- src\editor\menu_project.lua, src\editor\gui.lua
+  ["Step out of the current function"] = "Contina fino all'uscita della funzione", -- src\editor\menu_project.lua, src\editor\gui.lua
+  ["Step over"] = "Continua senza entrare nella funzione", -- src\editor\menu_project.lua, src\editor\gui.lua
+  ["Stop the currently running process"] = "Ferma il processo in esecuzione", -- src\editor\menu_project.lua, src\editor\gui.lua
+  ["Switch to or from full screen mode"] = "Passa da tutto schermo a finestra", -- src\editor\menu_view.lua
+  ["The API file must be located in a subdirectory of the API directory."] = "Il file API deve essere presente in una sottodirectory o nella direcotory API.", -- src\editor\autocomplete.lua
+  ["Toggle Break&point"] = "Attiva/Disattiva Break&point", -- src\editor\menu_project.lua
+  ["Toggle breakpoint"] = "Attiva/Disattiva Breakpoint", -- src\editor\menu_project.lua, src\editor\gui.lua
+  ["Tr&ace"] = "Tr&ace", -- src\editor\menu_project.lua
+  ["Trace execution showing each executed line"] = "Traccia l'esecuzione mostrando le righe eseguite", -- src\editor\menu_project.lua
+  ["Unable to load file '%s'."] = "Impossibile aprire il file '%s'.", -- src\editor\commands.lua
+  ["Unable to save file '%s': %s"] = "Impossibile salvare il file '%s': %s", -- src\editor\commands.lua
+  ["Unable to stop program (pid: %d), code %d."] = "Impossibile fermare il programma (pid: %d), code %d.", -- src\editor\debugger.lua
+  ["Undo last edit"] = "Annulla l'ultima azione di edit", -- src\editor\menu_edit.lua, src\editor\gui.lua
+  ["Use 'clear' to clear the shell output and the history."] = "Utilizza 'clear' per pulire l`output e lo storico.", -- src\editor\shellbox.lua
+  ["Use Shift-Enter for multiline code."] = "Premi <Shift-Invio> per inserire piu` righe di codice.", -- src\editor\shellbox.lua
+  ["Value"] = "Valore", -- src\editor\debugger.lua
+  ["View the output/console window"] = "Mostra la finestra di output/console", -- src\editor\menu_view.lua
+  ["View the project/filetree window"] = "Mostra la finestra di progetto/explorer", -- src\editor\menu_view.lua
+  ["View the stack window"] = "Mostra la finestra dello Stack", -- src\editor\menu_view.lua, src\editor\gui.lua
+  ["View the watch window"] = "Mostra la finestra delle Espressioni di Controllo", -- src\editor\menu_view.lua, src\editor\gui.lua
+  ["Watch Window"] = "Finestra Espressioni di Controllo", -- src\editor\debugger.lua
+  ["Welcome to the interactive Lua interpreter."] = "Benvenuti nell`interprete interattivo Lua.", -- src\editor\shellbox.lua
+  ["You must save the program first."] = "Devi prima salvare il programma", -- src\editor\commands.lua
+  ["on line %d"] = "alla linea %d", -- src\editor\debugger.lua, src\editor\commands.lua
+  ["traced %d instruction"] = {"tracciata %d istruzione", "%d istruzioni tracciate"} -- src\editor\debugger.lua
+}

cfg/i18n/ru.lua

@@ -0,0 +1,200 @@
+return {
+  [0] = function(c) return (c%10 == 1 and c%100 ~= 11) and 1 or (c%10 >= 2 and c%10 <= 4 and (c%100 < 10 or c%100 >= 20) and 2) or 3 end, -- plural
+  ["&About"] = "&О программе", -- src\editor\menu_help.lua
+  ["&Add Watch"] = "&Добавить выражение", -- src\editor\debugger.lua
+  ["&Break"] = "Пр&ервать", -- src\editor\menu_project.lua
+  ["&Close Page"] = "&Закрыть", -- src\editor\menu_file.lua, src\editor\gui.lua
+  ["&Compile"] = "&Компилировать", -- src\editor\menu_project.lua
+  ["&Copy"] = "&Копировать", -- src\editor\editor.lua, src\editor\menu_edit.lua
+  ["&Default Layout"] = "Вид по &умолчанию", -- src\editor\menu_view.lua
+  ["&Edit Watch"] = "&Редактировать выражение", -- src\editor\debugger.lua
+  ["&Edit"] = "&Правка", -- src\editor\menu_edit.lua
+  ["&File"] = "&Файл", -- src\editor\menu_file.lua
+  ["&Find"] = "&Найти", -- src\editor\menu_search.lua
+  ["&Fold/Unfold All"] = "Св&ернуть/развернуть все", -- src\editor\menu_edit.lua
+  ["&Goto Line"] = "&Перейти к строке", -- src\editor\menu_search.lua
+  ["&Help"] = "&Справка", -- src\editor\menu_help.lua
+  ["&New"] = "Соз&дать", -- src\editor\menu_file.lua
+  ["&Open..."] = "&Открыть...", -- src\editor\menu_file.lua
+  ["&Output/Console Window"] = "Окно &вывода/консоли", -- src\editor\menu_view.lua
+  ["&Paste"] = "В&ставить", -- src\editor\editor.lua, src\editor\menu_edit.lua
+  ["&Project"] = "Пр&оект", -- src\editor\menu_project.lua, src\editor\inspect.lua
+  ["&Redo"] = "Верну&ть", -- src\editor\editor.lua, src\editor\menu_edit.lua
+  ["&Remove Watch"] = "&Удалить выражение", -- src\editor\debugger.lua
+  ["&Replace"] = "За&менить", -- src\editor\menu_search.lua
+  ["&Run"] = "За&пустить", -- src\editor\menu_project.lua
+  ["&Save"] = "&Сохранить", -- src\editor\menu_file.lua, src\editor\gui.lua
+  ["&Search"] = "По&иск", -- src\editor\menu_search.lua
+  ["&Sort"] = "&Cортировать", -- src\editor\menu_search.lua
+  ["&Stack Window"] = "Окно &стека", -- src\editor\menu_view.lua
+  ["&Start Debugger Server"] = "Запустить сервер отла&дки", -- src\editor\menu_project.lua
+  ["&Undo"] = "&Отменить", -- src\editor\editor.lua, src\editor\menu_edit.lua
+  ["&View"] = "&Вид", -- src\editor\menu_view.lua
+  ["&Watch Window"] = "Окно &наблюдения", -- src\editor\menu_view.lua
+  ["&Watches"] = "&Выражения", -- src\editor\debugger.lua
+  ["About ZeroBrane Studio"] = "О ZeroBrane Studio", -- src\editor\menu_help.lua
+  ["Add Watch Expression"] = "Добавить в окно наблюдения", -- src\editor\editor.lua
+  ["Add to Scratchpad"] = "Добавить в черновик", -- src\editor\editor.lua
+  ["All files"] = "Все файлы", -- src\editor\commands.lua
+  ["Allow external process to start debugging"] = "Разрешить внешнему процессу начать отладку", -- src\editor\menu_project.lua
+  ["Analyze the source code"] = "Проанализировать исходный код", -- src\editor\inspect.lua
+  ["Analyze"] = "Анализировать", -- src\editor\inspect.lua
+  ["Auto Complete Identifiers"] = "Автодополнение идентификаторов", -- src\editor\menu_edit.lua
+  ["Auto complete while typing"] = "Автоматически дополнять идентификаторы при наборе", -- src\editor\menu_edit.lua
+  ["Break execution at the next executed line of code"] = "Прервать выполнение на следующей строке", -- src\editor\menu_project.lua, src\editor\gui.lua
+  ["C&lear Output Window"] = "Очистка ок&на вывода", -- src\editor\menu_project.lua
+  ["C&omment/Uncomment"] = "Зако&мментировать/раскомментировать", -- src\editor\menu_edit.lua
+  ["Can't debug the script in the active editor window."] = "Невозможно отладить скрипт в текущем окне редактирования.", -- src\editor\debugger.lua
+  ["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."] = "Файл '%s', необходимый для отладки, не найден в текущем проекте. Обновите проект или откройте файл в редакторе перед началом отладки.", -- src\editor\debugger.lua
+  ["Can't process auto-recovery record; invalid format: %s."] = "Ошибка обработки записи автоматического восстановления; неверный формат: %s.", -- src\editor\commands.lua
+  ["Can't run the entry point script ('%s')."] = "Ошибка выполнения стартового скрипта ('%s').", -- src\editor\debugger.lua
+  ["Can't start debugging session due to internal error '%s'."] = "Невозможно начать отладочную сессию из-за внутренней ошибки '%s'.", -- src\editor\debugger.lua
+  ["Can't start debugging without an opened file or with the current file not being saved ('%s')."] = "Невозможно начать отладку без открытого файла или с несохраненным текущим файлом ('%s').", -- src\editor\debugger.lua
+  ["Choose ..."] = "Выбрать ...", -- src\editor\menu_project.lua
+  ["Choose a project directory"] = "Выберите каталог проекта", -- src\editor\menu_project.lua
+  ["Clear &Dynamic Words"] = "Очистить &динамические слова", -- src\editor\menu_edit.lua
+  ["Clear the output window before compiling or debugging"] = "Очистить окно вывода перед компиляцией или отладкой", -- src\editor\menu_project.lua
+  ["Close &Other Pages"] = "Закрыть &остальные вкладки", -- src\editor\gui.lua
+  ["Close A&ll Pages"] = "Закрыть &все вкладки", -- src\editor\gui.lua
+  ["Close the current editor window"] = "Закрыть текущее окно редактирования", -- src\editor\menu_file.lua
+  ["Co&ntinue"] = "Пр&одолжить", -- src\editor\menu_project.lua
+  ["Col: %d"] = "Стб: %d", -- src\editor\editor.lua
+  ["Comment or uncomment current or selected lines"] = "Закомментировать или раскомментировать текущую или выделенные строки", -- src\editor\menu_edit.lua
+  ["Compilation error"] = "Ошибка компиляции", -- src\editor\debugger.lua, src\editor\commands.lua
+  ["Compilation successful; %.0f%% success rate (%d/%d)."] = "Компиляция завершена успешно; процент успеха: %.0f%% (%d/%d).", -- src\editor\commands.lua
+  ["Compile the current file"] = "Скомпилировать текущий файл", -- src\editor\menu_project.lua
+  ["Complete &Identifier"] = "Дополнить &идентификатор", -- src\editor\menu_edit.lua
+  ["Complete the current identifier"] = "Дополнить текущий идентификатор", -- src\editor\menu_edit.lua
+  ["Copy selected text to clipboard"] = "Скопировать выделенный текст в буфер обмена", -- src\editor\menu_edit.lua, src\editor\gui.lua
+  ["Couldn't activate file '%s' for debugging; continuing without it."] = "Невозможно открыть файл '%s' для отладки; выполнение будет продолжено без него.", -- src\editor\debugger.lua
+  ["Create an empty document"] = "Создать новый документ", -- src\editor\menu_file.lua, src\editor\gui.lua
+  ["Cu&t"] = "Вы&резать", -- src\editor\editor.lua, src\editor\menu_edit.lua
+  ["Cut selected text to clipboard"] = "Вырезать выделенный текст в буфер обмена", -- src\editor\menu_edit.lua, src\editor\gui.lua
+  ["Debugger server started at %s:%d."] = "Сервер отладки запущен на %s:%d.", -- src\editor\debugger.lua
+  ["Debugging session completed (%s)."] = "Отладочная сессия завершена (%s).", -- src\editor\debugger.lua
+  ["Debugging session started in '%s'."] = "Отладочная сессия запущена в '%s'.", -- src\editor\debugger.lua
+  ["Debugging suspended at %s:%s (couldn't activate the file)."] = "Отладка остановлена на %s:%s (невозможно открыть файл).", -- src\editor\debugger.lua
+  ["Do you want to reload it?"] = "Перезагрузить его?", -- src\editor\editor.lua
+  ["Do you want to save the changes to '%s'?"] = "Сохранить изменения в '%s'?", -- src\editor\commands.lua
+  ["E&xit"] = "Вы&ход", -- src\editor\menu_file.lua
+  ["Enter Lua code and press Enter to run it."] = "Введите код на Lua и нажмите Enter для выполнения.", -- src\editor\shellbox.lua
+  ["Enter line number"] = "Введите номер строки", -- src\editor\menu_search.lua
+  ["Error while loading API file: %s"] = "Ошибка загрузки файла определений API: %s", -- src\editor\autocomplete.lua
+  ["Error while loading configuration file: %s"] = "Ошибка загрузки файла конфигурации: %s", -- src\editor\style.lua
+  ["Error while processing API file: %s"] = "Ошибка обработки файла определений API: %s", -- src\editor\autocomplete.lua
+  ["Error while processing configuration file: %s"] = "Ошибка обработки файла конфигурации: %s", -- src\editor\style.lua
+  ["Error"] = "Ошибка", -- src\editor\commands.lua
+  ["Evaluate &Watches"] = "&Вычислить выражения", -- src\editor\debugger.lua
+  ["Evaluate in Console"] = "Выполнить в консоли", -- src\editor\editor.lua
+  ["Execute the current project/file and keep updating the code to see immediate results"] = "Запустить текущий проект/файл и продолжать вносить изменения в код с немедленным выводом результатов", -- src\editor\menu_project.lua
+  ["Execute the current project/file"] = "Запустить текущий проект/файл", -- src\editor\menu_project.lua
+  ["Execution error"] = "Ошибка выполнения", -- src\editor\debugger.lua
+  ["Exit program"] = "Выйти из программы", -- src\editor\menu_file.lua
+  ["Expr"] = "Выр.", -- src\editor\debugger.lua
+  ["Expression"] = "Выражение", -- src\editor\debugger.lua
+  ["File '%s' has been modified on disk."] = "Файл '%s' был изменен на диске.", -- src\editor\editor.lua
+  ["File '%s' has more recent timestamp than restored '%s'; please review before saving."] = "Файл '%s' имеет более позднее время модификации, чем восстановленный '%s'; пожалуйста просмотрите его перед сохранением.", -- src\editor\commands.lua
+  ["File '%s' no longer exists."] = "Файл '%s' больше не существует.", -- src\editor\editor.lua
+  ["File history"] = "История файлов", -- src\editor\menu_file.lua
+  ["Find &In Files"] = "Н&айти в файлах", -- src\editor\menu_search.lua
+  ["Find &Next"] = "Найти &далее", -- src\editor\menu_search.lua
+  ["Find &Previous"] = "Найти &ранее", -- src\editor\menu_search.lua
+  ["Find and replace text in files"] = "Найти и заменить текст в файлах", -- src\editor\menu_search.lua
+  ["Find and replace text"] = "Найти и заменить текст", -- src\editor\menu_search.lua, src\editor\gui.lua
+  ["Find text in files"] = "Найти текст в файлах", -- src\editor\menu_search.lua
+  ["Find text"] = "Найти текст", -- src\editor\menu_search.lua, src\editor\gui.lua
+  ["Find the earlier text occurence"] = "Найти предыдущее вхождение текста", -- src\editor\menu_search.lua
+  ["Find the next text occurrence"] = "Найти следующее вхождение текста", -- src\editor\menu_search.lua
+  ["Fold or unfold all code folds"] = "Свернуть или развернуть все блоки кода", -- src\editor\menu_edit.lua
+  ["Found auto-recovery record and restored saved session."] = "Найдена запись авто-восстановления и восстановлена сохраненная сессия.", -- src\editor\commands.lua
+  ["Full &Screen"] = "Во весь экр&ан", -- src\editor\menu_view.lua
+  ["Go to a selected line"] = "Перейти к заданной строке", -- src\editor\menu_search.lua
+  ["Goto Line"] = "Перейти к строке", -- src\editor\menu_search.lua
+  ["INS"] = "ВСТ", -- src\editor\editor.lua
+  ["Jump to a function definition..."] = "Перейти к определению функции...", -- src\editor\editor.lua
+  ["Known Files"] = "Файлы Lua", -- src\editor\commands.lua
+  ["Ln: %d"] = "Стр: %d", -- src\editor\editor.lua
+  ["Local console"] = "Локальная консоль", -- src\editor\shellbox.lua, src\editor\gui.lua
+  ["Lua &Interpreter"] = "&Интерпретатор Lua", -- src\editor\menu_project.lua
+  ["OVR"] = "ЗАМ", -- src\editor\editor.lua
+  ["Open an existing document"] = "Открыть существующий документ", -- src\editor\menu_file.lua, src\editor\gui.lua
+  ["Open file"] = "Открыть файл", -- src\editor\commands.lua
+  ["Output (running)"] = "Вывод (запущен)", -- src\editor\output.lua
+  ["Output"] = "Вывод", -- src\editor\output.lua, src\editor\settings.lua, src\editor\gui.lua
+  ["Paste text from the clipboard"] = "Вставить текст из буфера обмена", -- src\editor\menu_edit.lua, src\editor\gui.lua
+  ["Prepend '=' to show complex values on multiple lines."] = "Укажите '=' в начале выражения для отображения сложных значений на нескольких строках.", -- src\editor\shellbox.lua
+  ["Press cancel to abort."] = "Нажмите Отмена для завершения.", -- src\editor\commands.lua
+  ["Program '%s' started in '%s' (pid: %d)."] = "Программа '%s' запущена в '%s' (pid: %d).", -- src\editor\output.lua
+  ["Program can't start because conflicting process is running as '%s'."] = "Программа не может быть запущена из-за конфликтующего процесса, выполняющегося как '%s'.", -- src\editor\output.lua
+  ["Program completed in %.2f seconds (pid: %d)."] = "Программа завершена за %.2f секунд (pid: %d).", -- src\editor\output.lua
+  ["Program starting as '%s'."] = "Программа запускается как '%s'.", -- src\editor\output.lua
+  ["Program stopped (pid: %d)."] = "Программа завершена (pid: %d).", -- src\editor\debugger.lua
+  ["Program unable to run as '%s'."] = "Программа не может быть запущена как '%s'.", -- src\editor\output.lua
+  ["Project Directory"] = "Каталог проекта", -- src\editor\menu_project.lua
+  ["Project"] = "Проект", -- src\editor\settings.lua, src\editor\gui.lua
+  ["Project/&FileTree Window"] = "Окно &проекта/списка файлов", -- src\editor\menu_view.lua
+  ["R/O"] = "R/O", -- src\editor\editor.lua
+  ["R/W"] = "R/W", -- src\editor\editor.lua
+  ["Re&place In Files"] = "Замени&ть в файлах", -- src\editor\menu_search.lua
+  ["Recent Files"] = "Недавние файлы", -- src\editor\menu_file.lua
+  ["Redo last edit undone"] = "Вернуть последнее отмененное изменение", -- src\editor\menu_edit.lua, src\editor\gui.lua
+  ["Refused a request to start a new debugging session as there is one in progress already."] = "Отказано в запросе на запуск новой отладочной сессии, поскольку одна сессия уже выполняется.", -- src\editor\debugger.lua
+  ["Remote console"] = "Удаленная консоль", -- src\editor\shellbox.lua
+  ["Reset to default layout"] = "Установить расположение окон по умолчанию", -- src\editor\menu_view.lua
+  ["Resets the dynamic word list for autocompletion"] = "Очистить список динамических слов для автодополнения", -- src\editor\menu_edit.lua
+  ["Run as Scratchpad"] = "Запустить как черновик", -- src\editor\menu_project.lua
+  ["S&top Debugging"] = "&Завершить отладку", -- src\editor\menu_project.lua
+  ["S&top Process"] = "&Завершить процесс", -- src\editor\menu_project.lua
+  ["Save &As..."] = "Сохранить &как...", -- src\editor\menu_file.lua, src\editor\gui.lua
+  ["Save A&ll"] = "Сохранить &все", -- src\editor\menu_file.lua
+  ["Save Changes?"] = "Сохранить изменения?", -- src\editor\commands.lua
+  ["Save all open documents"] = "Сохранить все открытые документы", -- src\editor\menu_file.lua, src\editor\gui.lua
+  ["Save file as"] = "Сохранить файл как", -- src\editor\commands.lua
+  ["Save file?"] = "Сохранить файл?", -- src\editor\commands.lua
+  ["Save the current document to a file with a new name"] = "Сохранить текущий документ в файл под новым именем", -- src\editor\menu_file.lua
+  ["Save the current document"] = "Сохранить текущий документ", -- src\editor\menu_file.lua, src\editor\gui.lua
+  ["Saved auto-recover at %s."] = "Сохранено авто-восст в %s.", -- src\editor\commands.lua
+  ["Scratchpad error"] = "Ошибка в черновике", -- src\editor\debugger.lua
+  ["Select &All"] = "Выделить &все", -- src\editor\editor.lua, src\editor\menu_edit.lua
+  ["Select all text in the editor"] = "Выделить весь текст в редакторе", -- src\editor\menu_edit.lua
+  ["Set From Current File"] = "Установить по текущему файлу", -- src\editor\menu_project.lua
+  ["Set project directory from current file"] = "Установить каталог проекта по текущему файлу", -- src\editor\menu_project.lua, src\editor\gui.lua
+  ["Set the interpreter to be used"] = "Установить используемый интерпретатор", -- src\editor\menu_project.lua
+  ["Set the project directory to be used"] = "Установить используемый каталог проекта", -- src\editor\menu_project.lua
+  ["Show &Tooltip"] = "Показать &подсказку", -- src\editor\menu_edit.lua
+  ["Show tooltip for current position; place cursor after opening bracket of function"] = "Показать подсказку в текущей позиции; переместите курсор в позицию после открывающей скобки функции", -- src\editor\menu_edit.lua
+  ["Sort selected lines"] = "Отсортировать выделенные строки", -- src\editor\menu_search.lua
+  ["Stack Window"] = "Окно стека", -- src\editor\debugger.lua
+  ["Start &Debugging"] = "Начать &отладку", -- src\editor\menu_project.lua
+  ["Start debugging"] = "Начать отладку", -- src\editor\menu_project.lua, src\editor\gui.lua
+  ["Step &Into"] = "&Войти", -- src\editor\menu_project.lua
+  ["Step &Over"] = "&Следующая строка", -- src\editor\menu_project.lua
+  ["Step O&ut"] = "В&ыйти", -- src\editor\menu_project.lua
+  ["Step into"] = "Войти в функцию", -- src\editor\menu_project.lua, src\editor\gui.lua
+  ["Step out of the current function"] = "Выйти из текущей функции", -- src\editor\menu_project.lua, src\editor\gui.lua
+  ["Step over"] = "Перейти на следующую строку", -- src\editor\menu_project.lua, src\editor\gui.lua
+  ["Stop the currently running process"] = "Завершить текущий процесс", -- src\editor\menu_project.lua, src\editor\gui.lua
+  ["Switch to or from full screen mode"] = "Переключить полноэкранный режим", -- src\editor\menu_view.lua
+  ["The API file must be located in a subdirectory of the API directory."] = "Файл определений API должен быть расположен в подкаталоге каталога API.", -- src\editor\autocomplete.lua
+  ["Toggle Break&point"] = "&Точка останова", -- src\editor\menu_project.lua
+  ["Toggle breakpoint"] = "Переключить точку останова", -- src\editor\menu_project.lua, src\editor\gui.lua
+  ["Tr&ace"] = "Т&рассировка", -- src\editor\menu_project.lua
+  ["Trace execution showing each executed line"] = "Отслеживать выполнение, показывая каждую выполненную строку", -- src\editor\menu_project.lua
+  ["Unable to load file '%s'."] = "Ошибка загрузки файла '%s'.", -- src\editor\commands.lua
+  ["Unable to save file '%s': %s"] = "Ошибка сохранения файла '%s': %s", -- src\editor\commands.lua
+  ["Unable to stop program (pid: %d), code %d."] = "Невозможно завершить программу (pid: %d), код %d.", -- src\editor\debugger.lua
+  ["Undo last edit"] = "Отменить последнее действие", -- src\editor\menu_edit.lua, src\editor\gui.lua
+  ["Use '%s' to see full description."] = "Используйте '%s' для полного описания.", -- src\editor\editor.lua
+  ["Use 'clear' to clear the shell output and the history."] = "Используйте команду 'clear' для очистки содержимого окна и истории.", -- src\editor\shellbox.lua
+  ["Use Shift-Enter for multiline code."] = "Используйте Shift-Enter для многострочного кода.", -- src\editor\shellbox.lua
+  ["Value"] = "Значение", -- src\editor\debugger.lua
+  ["View the output/console window"] = "Показать окно вывода/консоли", -- src\editor\menu_view.lua
+  ["View the project/filetree window"] = "Показать окно проекта/списка файлов", -- src\editor\menu_view.lua
+  ["View the stack window"] = "Показать окно стека", -- src\editor\menu_view.lua, src\editor\gui.lua
+  ["View the watch window"] = "Показать окно наблюдения", -- src\editor\menu_view.lua, src\editor\gui.lua
+  ["Watch Window"] = "Окно наблюдения", -- src\editor\debugger.lua
+  ["Welcome to the interactive Lua interpreter."] = "Добро пожаловать в интерактивный интерпретатор Lua.", -- src\editor\shellbox.lua
+  ["You must save the program first."] = "Вы должны сначала сохранить программу.", -- src\editor\commands.lua
+  ["on line %d"] = "в строке %d", -- src\editor\debugger.lua, src\editor\commands.lua
+  ["traced %d instruction"] = {"выполнена %d инструкция", "выполнено %d инструкции", "выполнено %d инструкций"}, -- src\editor\debugger.lua
+}

cfg/scheme-picker.lua

@@ -0,0 +1,25 @@
+--[[
+1. Pick a color scheme by clicking on a link:
+  - [Tomorrow](macro:shell(ApplyStyleConfig('cfg/tomorrow.lua','Tomorrow')))
+  - [TomorrowNight](macro:shell(ApplyStyleConfig('cfg/tomorrow.lua','TomorrowNight')))
+  - [TomorrowNightBlue](macro:shell(ApplyStyleConfig('cfg/tomorrow.lua','TomorrowNightBlue')))
+  - [TomorrowNightBright](macro:shell(ApplyStyleConfig('cfg/tomorrow.lua','TomorrowNightBright')))
+  - [TomorrowNightEighties](macro:shell(ApplyStyleConfig('cfg/tomorrow.lua','TomorrowNightEighties')))
+  - [Zenburn](macro:shell(ApplyStyleConfig('cfg/tomorrow.lua','Zenburn')))
+  - [Monokai](macro:shell(ApplyStyleConfig('cfg/tomorrow.lua','Monokai')))
+  - [SolarizedDark](macro:shell(ApplyStyleConfig('cfg/tomorrow.lua','SolarizedDark')))
+  - [SolarizedLight](macro:shell(ApplyStyleConfig('cfg/tomorrow.lua','SolarizedLight')))
+
+  - [ZeroBrane Studio](macro:shell(ide.config.styles = StylesGetDefault(); ReApplySpecAndStyles()))
+
+2. [Apply the same scheme to Output/Console windows](macro:shell(ide.config.stylesoutshell = ide.config.styles; ReApplySpecAndStyles())).
+
+3. Add the following code with the scheme you selected to `cfg/user.lua`.
+--]]
+
+local G = ...
+styles = G.loadfile('cfg/tomorrow.lua')('TomorrowNightBlue')
+stylesoutshell = styles -- also apply the same scheme to Output/Console windows
+
+-- code example
+if false and true then func(1, 2, 3) end

cfg/tomorrow.lua

@@ -0,0 +1,251 @@
+-- This is a file that sets color scheme based on Tomorrow format.
+-- Copyright 2011-12 Paul Kulchenko, ZeroBrane LLC
+
+-- Tomorrow colors from https://github.com/chriskempson/tomorrow-theme
+-- Zenburn colors from https://github.com/jnurmine/Zenburn/blob/master/colors/zenburn.vim (contributed by Srdjan Marković)
+-- Monokai colors from http://www.monokai.nl/blog/2006/07/15/textmate-color-theme/
+-- Solarized colors from https://github.com/altercation/vim-colors-solarized
+
+local theme = ...
+
+local function h2d(n) return 0+('0x'..n) end
+local function H(c, bg) c = c:gsub('#','')
+  -- since alpha is not implemented, convert RGBA to RGB
+  -- assuming 0 is transparent and 255 is opaque
+  -- based on http://stackoverflow.com/a/2645218/1442917
+  local bg = bg and H(bg) or {255, 255, 255}
+  local a = #c > 6 and h2d(c:sub(7,8))/255 or 1
+  local r, g, b = h2d(c:sub(1,2)), h2d(c:sub(3,4)), h2d(c:sub(5,6))
+  return {
+    math.min(255, math.floor((1-a)*bg[1]+a*r)),
+    math.min(255, math.floor((1-a)*bg[2]+a*g)),
+    math.min(255, math.floor((1-a)*bg[3]+a*b))}
+end
+
+local colors = {
+  Tomorrow = {
+    Background  = H'ffffff',
+    CurrentLine = H'efefef',
+    Selection   = H'd6d6d6',
+    Foreground  = H'4d4d4c',
+    Comment     = H'8e908c',
+    Red         = H'c82829',
+    Orange      = H'f5871f',
+    Yellow      = H'eab700',
+    Green       = H'718c00',
+    Aqua        = H'3e999f',
+    Blue        = H'4271ae',
+    Purple      = H'8959a8',
+  },
+  TomorrowNight = {
+    Background  = H'1d1f21',
+    CurrentLine = H'282a2e',
+    Selection   = H'373b41',
+    Foreground  = H'c5c8c6',
+    Comment     = H'969896',
+    Red         = H'cc6666',
+    Orange      = H'de935f',
+    Yellow      = H'f0c674',
+    Green       = H'b5bd68',
+    Aqua        = H'8abeb7',
+    Blue        = H'81a2be',
+    Purple      = H'b294bb',
+  },
+  TomorrowNightEighties = {
+    Background  = H'2d2d2d',
+    CurrentLine = H'393939',
+    Selection   = H'515151',
+    Foreground  = H'cccccc',
+    Comment     = H'999999',
+    Red         = H'f2777a',
+    Orange      = H'f99157',
+    Yellow      = H'ffcc66',
+    Green       = H'99cc99',
+    Aqua        = H'66cccc',
+    Blue        = H'6699cc',
+    Purple      = H'cc99cc',
+  },
+  TomorrowNightBlue = {
+    Background  = H'002451',
+    CurrentLine = H'00346e',
+    Selection   = H'003f8e',
+    Foreground  = H'ffffff',
+    Comment     = H'7285b7',
+    Red         = H'ff9da4',
+    Orange      = H'ffc58f',
+    Yellow      = H'ffeead',
+    Green       = H'd1f1a9',
+    Aqua        = H'99ffff',
+    Blue        = H'bbdaff',
+    Purple      = H'ebbbff',
+  },
+  TomorrowNightBright = {
+    Background  = H'000000',
+    CurrentLine = H'2a2a2a',
+    Selection   = H'424242',
+    Foreground  = H'eaeaea',
+    Comment     = H'969896',
+    Red         = H'd54e53',
+    Orange      = H'e78c45',
+    Yellow      = H'e7c547',
+    Green       = H'b9ca4a',
+    Aqua        = H'70c0b1',
+    Blue        = H'7aa6da',
+    Purple      = H'c397d8',
+  },
+  Zenburn = {
+    Background  = H'3f3f3f',
+    CurrentLine = H'363636',
+    Selection   = H'1f1f1f',
+    Foreground  = H'dcdccc',
+    Comment     = H'7f9f7f',
+    Red         = H'8cd0d3',
+    Orange      = H'dfaf8f',
+    Yellow      = H'e3ceab',
+    Green       = H'cc9393',
+    Aqua        = H'dca3a3',
+    Blue        = H'f0dfaf',
+    Purple      = H'efef8f',
+  },
+  Monokai = {
+    Background  = H'272822',
+    CurrentLine = H'49483E',
+    Selection   = H'49483E',
+    Foreground  = H'F8F8F2',
+    Comment     = H'75715E',
+    Red         = H'AE81FF',
+    Orange      = H'AE81FF',
+    Yellow      = H'F8F8F2',
+    Green       = H'E6DB74',
+    Aqua        = H'66D9EF',
+    Blue        = H'F92672',
+    Purple      = H'A6E22E',
+  },
+  SolarizedDark = {
+    Background  = H'042029',
+    CurrentLine = H'0A2933',
+    Selection   = H'073642',
+    Foreground  = H'839496',
+    Comment     = H'586E75',
+    Red         = H'D33682',
+    Orange      = H'B58900',
+    Yellow      = H'839496',
+    Green       = H'2AA198',
+    Aqua        = H'839496',
+    Blue        = H'859900',
+    Purple      = H'268BD2',
+  },
+  SolarizedLight = {
+    Background  = H'FDF6E3',
+    CurrentLine = H'EEE8D5',
+    Selection   = H'E0E0D0',
+    Foreground  = H'586E75',
+    Comment     = H'93A1A1',
+    Red         = H'D33682',
+    Orange      = H'B58900',
+    Yellow      = H'586E75',
+    Green       = H'2AA198',
+    Aqua        = H'586E75',
+    Blue        = H'859900',
+    Purple      = H'268BD2',
+  },
+}
+
+-- add more of the specified color (keeping all in 0-255 range)
+local mixer = function(c, n, more)
+  if not c or #c == 0 then return c end
+  local c = {c[1], c[2], c[3]} -- create a copy, so it can be modified
+  c[n] = c[n] + more
+  local excess = c[n] - 255
+  if excess > 0 then
+    for clr = 1, 3 do
+      c[clr] = n == clr and 255 or c[clr] > excess and c[clr] - excess or 0
+    end
+  end
+  return c
+end
+
+local C = colors[theme] or colors.Tomorrow
+return {
+  -- wxstc.wxSTC_LUA_DEFAULT
+  lexerdef = {fg = C.Foreground},
+  -- wxstc.wxSTC_LUA_COMMENT, wxstc.wxSTC_LUA_COMMENTLINE, wxstc.wxSTC_LUA_COMMENTDOC
+  comment = {fg = C.Comment, fill = true},
+  -- wxstc.wxSTC_LUA_STRING, wxstc.wxSTC_LUA_CHARACTER, wxstc.wxSTC_LUA_LITERALSTRING
+  stringtxt = {fg = C.Green},
+  -- wxstc.wxSTC_LUA_STRINGEOL
+  stringeol = {fg = C.Green, fill = true},
+  -- wxstc.wxSTC_LUA_PREPROCESSOR
+  preprocessor = {fg = C.Orange},
+  -- wxstc.wxSTC_LUA_OPERATOR
+  operator = {fg = C.Aqua},
+  -- wxstc.wxSTC_LUA_NUMBER
+  number = {fg = C.Red},
+
+  -- wxstc.wxSTC_LUA_WORD, wxstc.wxSTC_LUA_WORD#
+  keywords0 = {fg = C.Blue, b = true},
+  keywords1 = {fg = C.Aqua, b = false},
+  keywords2 = {fg = C.Aqua, b = true},
+  keywords3 = {fg = C.Purple, b = true},
+  keywords4 = {fg = C.Purple, b = true},
+  keywords5 = {fg = C.Purple, b = true},
+  keywords6 = {fg = C.Purple, b = true},
+  keywords7 = {fg = C.Purple, b = true},
+
+  -- common (inherit fg/bg from text)
+  -- wxstc.wxSTC_LUA_IDENTIFIER
+  text = {fg = C.Foreground, bg = C.Background},
+  linenumber = {fg = C.Comment},
+  bracematch = {fg = C.Orange, b = true},
+  bracemiss = {fg = C.Red, b = true},
+  ctrlchar = {fg = C.Yellow},
+  indent = {fg = C.Comment},
+  calltip = nil,
+
+  -- common special (need custom fg & bg)
+  calltipbg = nil,
+  sel = {bg = C.Selection},
+  caret = {fg = C.Foreground},
+  caretlinebg = {bg = C.CurrentLine},
+  fold = {fg = C.Comment, bg = C.Background},
+  whitespace = {fg = C.Comment, bg = C.Background},
+
+  fncall = {fg = C.Purple, st = wxstc.wxSTC_INDIC_PLAIN},
+  --[[ other possible values are:
+    wxSTC_INDIC_PLAIN	 Single-line underline
+    wxSTC_INDIC_SQUIGGLE Squiggly underline
+    wxSTC_INDIC_TT	 Line of small T-shapes
+    wxSTC_INDIC_DIAGONAL Diagonal hatching
+    wxSTC_INDIC_STRIKE	 Strike-out
+    wxSTC_INDIC_BOX      Box
+    wxSTC_INDIC_ROUNDBOX Rounded Box (not suppored in the current version?)
+  --]]
+
+  -- markup
+  ['['] = {hs = mixer(C.Comment, 3, 64)},
+  ['|'] = {fg = mixer(mixer(C.Comment, 1, 64), 3, 64)},
+
+  -- markers
+  marker = {
+    message = {bg = C.Selection},
+    output = {bg = C.CurrentLine},
+    prompt = {fg = C.Foreground, bg = C.Background},
+    error = {bg = mixer(C.Background, 1, 32)},
+  },
+}
+
+--[[
+
+---- Solarized license ----
+
+Copyright (c) 2011 Ethan Schoonover
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 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.
+
+---- Zenburn license ----
+
+GNU GPL, http://www.gnu.org/licenses/gpl.html
+
+--]]

cfg/user-sample.lua

@@ -1,35 +1,134 @@
---[[-- 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
+--]]--
 
+-- 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.exts[#luaspec.exts+1] = "luaz"
 luaspec.keywords[1] = luaspec.keywords[1] .. ' foo'
 
--- change font size to 12
+-- to modify a key mapping; see the full list of IDs in src/editor/keymap.lua
+local G = ...
+keymap[G.ID_STARTDEBUG] = "Ctrl-Shift-D"
+
+-- to 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
+-- to 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
+-- to specify full path to moai *executable* if it's not in one of PATH folders
 path.moai = 'd:/lua/moai/moai'
+-- Moai config.lua file is searched in the following places: (1) MOAI_CONFIG,
+-- (2) project directory (if set) or folder with the current file,
+-- (3) folder with the moai executable.
 
--- specify full path to lua interpreter if you need to use your own version
+-- to specify full path to gideros *executable* if it's not in one of PATH folders
+path.gideros = 'd:/Program Files/Gideros/GiderosPlayer.exe'
+
+-- to specify full path to corona *executable* if it's not in one of PATH folders
+path.corona = 'd:/path/to/Corona SDK/Corona Simulator.exe'
+
+-- to specify full path to lua interpreter if you need to use your own version
 path.lua = 'd:/lua/lua'
 
--- fix an issue with 0d0d0a line endings in MOAI examples,
+-- to specify full path to GSL-shell *executable* if it's not in one of PATH folders
+path.gslshell = [[D:\Lua\gsl-shell\gsl-shell.exe]]
+
+-- to provide output filter for those engines that support redirecting
+-- of "print" output to the IDE (like Corona SDK and Gideros)
+debugger.outputfilter = function(m) return #m < 124 and m or m:sub(1,120).."...\n" end
+
+-- to fix an issue with 0d0d0a line endings in MOAI examples,
 -- 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
+
+-- to specify a list of MOAI entrypoints
+moai = { entrypoints = { "main.lua", "source/main.lua" } }
+
+-- to specify language to use in the IDE (requires a file in cfg/i18n folder)
+language = "ru"
+
+-- to change background color (or other colors in the IDE);
+-- see cfg/tomorrow.lua for example/details on what other colors to change
+styles.text = {bg = {240,240,220}}
+
+-- to change the default color scheme; check tomorrow.lua for the list
+-- of supported schemes or use cfg/scheme-picker.lua to pick a scheme.
+local G = ...
+styles = G.loadfile('cfg/tomorrow.lua')('Tomorrow')
+-- also apply the same scheme to Output and Console windows
+stylesoutshell = styles
+
+-- to change markers used in console and output windows
+styles.marker = styles.marker or {}
+styles.marker.message = {ch = wxstc.wxSTC_MARK_ARROWS, {0, 0, 0}, {240, 240, 240}}
+styles.marker.output = {ch = wxstc.wxSTC_MARK_BACKGROUND, {0, 0, 0}, {240, 240, 240}}
+styles.marker.prompt = {ch = wxstc.wxSTC_MARK_CHARACTER+('>'):byte(), {0, 0, 0}, {240, 240, 240}}
+stylesoutshell = styles
+
+-- to disable indicators (underlining) on function calls
+editor.showfncall = false
+
+-- to change the color of the indicator used for function calls
+styles.fncall.fg = {240,0,0}
+
+-- to change the type of the indicator used for function calls
+styles.fncall.st = wxstc.wxSTC_INDIC_PLAIN
+  --[[ other possible values are:
+    wxSTC_INDIC_PLAIN	 Single-line underline
+    wxSTC_INDIC_SQUIGGLE Squiggly underline
+    wxSTC_INDIC_TT	 Line of small T-shapes
+    wxSTC_INDIC_DIAGONAL Diagonal hatching
+    wxSTC_INDIC_STRIKE	 Strike-out
+    wxSTC_INDIC_BOX      Box
+    wxSTC_INDIC_ROUNDBOX Rounded Box (not suppored in the current version?)
+  --]]
+
+-- to enable additional spec files (like spec/cpp.lua)
+load.specs(function(file) return file:find('spec[/\\]cpp%.lua$') end)
+
+-- to specify a default EOL encoding to be used for new files:
+-- `wxstc.wxSTC_EOL_CRLF` or `wxstc.wxSTC_EOL_LF`;
+-- `nil` means OS default: CRLF on Windows and OSX and LF on Linux/Unix.
+-- CRLF as a default on OSX is a bug and is likely to change in future versions.
+editor.defaulteol = wxstc.wxSTC_EOL_LF
+
+-- to turn off checking for mixed end-of-line encodings in loaded files
+editor.checkeol = false
+
+-- to force execution to continue immediately after starting debugging;
+-- set to `false` to disable (the interpreter will stop on the first line or
+-- when debugging starts); some interpreters may use `true` or `false`
+-- by default, but can be still reconfigured with this setting.
+debugger.runonstart = true
+
+-- to set compact fold that doesn't include empty lines after a block
+editor.foldcompact = true

cfg/xcode-keys.lua

@@ -0,0 +1,75 @@
+-- Copy the content of this file to user.lua;
+-- see the [configuration](http://studio.zerobrane.com/doc-configuration.html) page for details.
+
+local G = ...
+-- Alt-Shift-Cmd-X (Alt maps to Option, Ctrl maps to Command)
+-- The mapping is largely based on [Xcode Keyboard Shortcuts](http://developer.apple.com/library/mac/#documentation/IDEs/Conceptual/xcode_help-command_shortcuts/MenuCommands/MenuCommands014.html).
+local xcode = {
+-- File menu
+  [G.ID_NEW]              = "Ctrl-N",
+  [G.ID_OPEN]             = "Ctrl-O",
+  [G.ID_CLOSE]            = "Ctrl-W",
+  [G.ID_SAVE]             = "Ctrl-S",
+  [G.ID_SAVEAS]           = "Shift-Ctrl-S",
+  [G.ID_SAVEALL]          = "Alt-Ctrl-S",
+  [G.ID_RECENTFILES]      = "",
+  [G.ID_EXIT]             = "Ctrl-Q",
+-- Edit menu
+  [G.ID_CUT]              = "Ctrl-X",
+  [G.ID_COPY]             = "Ctrl-C",
+  [G.ID_PASTE]            = "Ctrl-V",
+  [G.ID_SELECTALL]        = "Ctrl-A",
+  [G.ID_UNDO]             = "Ctrl-Z",
+  [G.ID_REDO]             = "Shift-Ctrl-Z",
+  [G.ID_SHOWTOOLTIP]      = "Ctrl-T",
+  [G.ID_AUTOCOMPLETE]     = "Ctrl-K",
+  [G.ID_AUTOCOMPLETEENABLE] = "",
+  [G.ID_COMMENT]          = "Ctrl-U",
+  [G.ID_FOLD]             = "F12",
+  [G.ID_CLEARDYNAMICWORDS] = "",
+-- Search menu
+  [G.ID_FIND]             = "Ctrl-F",
+  [G.ID_FINDNEXT]         = "Ctrl-G",
+  [G.ID_FINDPREV]         = "Shift-Ctrl-G",
+  [G.ID_REPLACE]          = "Alt-Ctrl-F",
+  [G.ID_FINDINFILES]      = "Shift-Ctrl-F",
+  [G.ID_REPLACEINFILES]   = "Alt-Shift-Ctrl-F",
+  [G.ID_GOTOLINE]         = "",
+  [G.ID_SORT]             = "",
+-- View menu
+  [G.ID_VIEWFILETREE]     = "Shift-Ctrl-P",
+  [G.ID_VIEWOUTPUT]       = "Shift-Ctrl-O",
+  [G.ID_VIEWWATCHWINDOW]  = "Shift-Ctrl-W",
+  [G.ID_VIEWCALLSTACK]    = "Shift-Ctrl-S",
+  [G.ID_VIEWDEFAULTLAYOUT] = "",
+  [G.ID_VIEWFULLSCREEN]   = "Shift-Ctrl-A",
+-- Project menu
+  [G.ID_RUN]              = "Ctrl-R",
+  [G.ID_RUNNOW]           = "Shift-Ctrl-R",
+  [G.ID_COMPILE]          = "Ctrl-B",
+  [G.ID_ANALYZE]          = "Shift-Ctrl-B",
+  [G.ID_STARTDEBUG]       = "F5",
+  [G.ID_ATTACHDEBUG]      = "",
+  [G.ID_STOPDEBUG]        = "Ctrl-.",
+  [G.ID_STEP]             = "F7",
+  [G.ID_STEPOVER]         = "F6",
+  [G.ID_STEPOUT]          = "F8",
+  [G.ID_TRACE]            = "",
+  [G.ID_BREAK]            = "Ctrl-Y",
+  [G.ID_TOGGLEBREAKPOINT] = "Ctrl-\\",
+  [G.ID_CLEAROUTPUT]      = "",
+  [G.ID_INTERPRETER]      = "",
+  [G.ID_PROJECTDIR]       = "",
+-- Help menu
+  [G.ID_ABOUT]            = "F1",
+-- Watch window menu items
+  [G.ID_ADDWATCH]         = "Ins",
+  [G.ID_EDITWATCH]        = "F2",
+  [G.ID_REMOVEWATCH]      = "Del",
+  [G.ID_EVALUATEWATCH]    = "",
+-- Editor popup menu items
+  [G.ID_QUICKADDWATCH]    = "",
+  [G.ID_QUICKEVAL]        = "",
+}
+
+for id, key in G.pairs(xcode) do keymap[id] = key end

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/config.lua

@@ -1,61 +0,0 @@
-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"
-
-editor.fontname = "Courier New"
-editor.caretline = true
-editor.showfncall = true
-editor.whitespace = true
-editor.usetabs  = false
-editor.autotabs = true
-editor.tabwidth = 2
-
-filehistorylength = 20
-
-singleinstance = true
-singleinstanceport = 0xe493
-acandtip.shorttip = true
-acandtip.nodynwords = true
-acandtip.ignorecase = true
-
-styles = {
-  -- lexer specific (inherit fg/bg from text)
-  lexerdef = {fg = {128, 128, 128},},
-  comment = {fg = {0, 127, 0 },bg = {240, 240, 220}, fill= true,},
-  stringtxt = {fg = {127, 0, 127},},
-  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 },},
-
-  keywords0 = {fg = {0, 0, 127}, b = true,},
-  keywords1 = {fg = {127, 0, 0}, b = true,},
-  keywords2 = {fg = {0, 127, 0}, b = true,},
-  keywords3 = {fg = {0, 0, 127}, b = true,},
-  keywords4 = {fg = {127, 0, 95}, b = true,},
-  keywords5 = {fg = {35, 95, 175}, b = true,},
-  keywords6 = {fg = {0, 127, 127}, b = true,},
-  keywords7 = {fg = {240, 255, 255}, b = true,},
-
-  -- common (inherit fg/bg from text)
-  text = nil, -- let os pick
-  linenumber = {fg = {90, 90, 80},},
-  bracematch = {fg = {0, 0, 255}, b = true},
-  bracemiss = {fg = {255, 0, 0 }, b = true},
-  ctrlchar = nil,
-  indent = {fg = {192, 192, 192},bg = {255, 255, 255},},
-  calltip = nil,
-
-  -- common special (need custom fg & bg)
-  calltipbg = nil,
-  sel = nil,
-  caret = nil,
-  caretlinebg = nil,
-  fold = nil,
-  whitespace = nil,
-
-  fncall = {fg = {175,175,255}, st= wxstc.wxSTC_INDIC_BOX},
-}

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/corona.lua

@@ -0,0 +1,77 @@
+-- Copyright 2011-12 Paul Kulchenko, ZeroBrane LLC
+
+local corona
+local win = ide.osname == "Windows"
+local mac = ide.osname == "Macintosh"
+
+return {
+  name = "Corona",
+  description = "Corona SDK mobile framework",
+  api = {"baselib", "corona"},
+  frun = function(self,wfilename,rundebug)
+    corona = corona or ide.config.path.corona -- check if the path is configured
+    if not corona then
+      local sep = win and ';' or ':'
+      local default =
+           win and ([[C:\Program Files\Corona SDK]]..sep..[[D:\Program Files\Corona SDK]]..sep..
+                    [[C:\Program Files\Corona Labs\Corona SDK]]..sep..[[D:\Program Files\Corona Labs\Corona SDK]]..sep..
+                    [[C:\Program Files (x86)\Corona SDK]]..sep..[[D:\Program Files (x86)\Corona SDK]]..sep..
+                    [[C:\Program Files (x86)\Corona Labs\Corona SDK]]..sep..[[D:\Program Files (x86)\Corona Labs\Corona SDK]]..sep)
+        or mac and ('/Applications/CoronaSDK/Corona Simulator.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
+        corona = corona or GetFullPathIfExists(p, win and 'Corona Simulator.exe' or 'Corona Simulator')
+        table.insert(paths, p)
+      end
+      if not corona then
+        DisplayOutput("Can't find corona executable in any of the folders in PATH: "
+          ..table.concat(paths, ", ").."\n")
+        return
+      end
+    end
+
+    local file = GetFullPathIfExists(self:fworkdir(wfilename), 'main.lua')
+    if not file then
+      DisplayOutput("Can't find 'main.lua' file in the current project folder.\n")
+      return
+    end
+
+    -- can we really do debugging? do if asked and if not on mac OSX where it's not supported
+    local debug = rundebug and not mac
+    if rundebug then
+      -- start running the application right away
+      DebuggerAttachDefault({startwith = file,
+        runstart = ide.config.debugger.runonstart ~= false,
+        redirect = debug and "c", noshell = mac or nil, noeval = mac or nil})
+
+      -- copy mobdebug.lua to Resources/ folder on Win and to the project folder on OSX
+      -- as copying it to Resources/ folder seems to break the signature of the app.
+      local mdbc = mac and MergeFullPath(self:fworkdir(wfilename), "mobdebug.lua")
+        or MergeFullPath(GetPathWithSep(corona), "Resources/mobdebug.lua")
+      local mdbl = MergeFullPath(GetPathWithSep(ide.editorFilename), "lualibs/mobdebug/mobdebug.lua")
+      if not wx.wxFileExists(mdbc)
+      or GetFileModTime(mdbc):GetTicks() < GetFileModTime(mdbl):GetTicks() then
+        FileCopy(mdbl, mdbc)
+        DisplayOutput(("Copied ZeroBrane Studio debugger ('mobdebug.lua') to '%s' folder.\n"):format(mdbc))
+      end
+    end
+
+    local cmd = ('"%s" %s"%s"'):format(corona, debug and "-debug " or "", file)
+    -- CommandLineRun(cmd,wdir,tooutput,nohide,stringcallback,uid,endcallback)
+    return CommandLineRun(cmd,self:fworkdir(wfilename),true,false,nil,nil,
+      function() ide.debugger.pid = nil end)
+  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/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,158 @@
+-- Copyright 2011-12 Paul Kulchenko, ZeroBrane LLC
+
+local gideros
+local win = ide.osname == "Windows"
+local mac = ide.osname == "Macintosh"
+
+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.exe]]
+     or (ide.osname == "Unix" and [[lua]]) -- using installed lua
+     or (wx.wxFileExists(macExe) and macExe or mainpath..[[bin/lua]]))
+end
+
+local function isValidPid(bid, cmd)
+  if not bid or bid == -1 or bid == 0 then
+    DisplayOutputLn(("Program unable to run as '%s'."):format(cmd))
+    return
+  end
+  return bid
+end
+
+local function waitToComplete(bid)
+  while wx.wxProcess.Exists(bid) do
+    wx.wxSafeYield()
+    wx.wxWakeUpIdle()
+    wx.wxMilliSleep(100)
+  end
+end
+
+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..
+                    [[C:\Program Files (x86)\Gideros]]..sep..[[D:\Program Files (x86)\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
+        DisplayOutputLn("Can't find gideros executable in any of the folders in PATH: "
+          ..table.concat(paths, ", "))
+        return
+      end
+    end
+    if gideros and not wx.wxFileName(gideros):FileExists() then
+      DisplayOutputLn("Can't find the specified gideros executable '"..gideros.."'.")
+      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
+      DisplayOutputLn("Can't find gideros bridge executable in '"..giderospath.."'.")
+      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
+        DisplayOutputLn("Found multiple .gproj files in the project directory; ignored '"..proj.."'.")
+      end
+      file = file or proj
+    end
+    if not file then
+      DisplayOutputLn("Can't find gideros project file in the project directory.")
+      return
+    end
+
+    if rundebug then DebuggerAttachDefault(
+      {redirect = "c", runstart = ide.config.debugger.runonstart ~= false}) end
+
+    local pid
+    local remote = ide.config.gideros and ide.config.gideros.remote
+    if remote then
+      local cmd = ('"%s" %s "%s"'):format(gdrbridge, 'setip', remote)
+      DisplayOutputLn(("Configuring remote player at %s."):format(remote))
+      local bid = wx.wxExecute(cmd, wx.wxEXEC_ASYNC)
+      if not isValidPid(bid, cmd) then return end
+      waitToComplete(bid) -- wait for a bit to give Gideros chance to connect
+    else
+      local cmd = ('"%s"'):format(gideros)
+      -- CommandLineRun(cmd,wdir,tooutput,nohide,stringcallback,uid,endcallback)
+      pid = CommandLineRun(cmd,self:fworkdir(wfilename),not mac,true,nil,nil,
+        function() ide.debugger.pid = nil end)
+      if not pid then return end
+    end
+
+    do
+      DisplayOutputLn("Starting the player and waiting for the bridge to connect at '"..gdrbridge.."'.")
+      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 isValidPid(bid, cmd) then 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)
+          if not remote then wx.wxProcess.Kill(pid, wx.wxSIGKILL, wx.wxKILL_CHILDREN) end
+          DisplayOutputLn("Couldn't connect to the player. Try again or check starting the player and the bridge manually.")
+          return
+        end
+      end
+      if not connected then
+        if not remote then wx.wxProcess.Kill(pid, wx.wxSIGKILL, wx.wxKILL_CHILDREN) end
+        DisplayOutputLn("Couldn't connect after "..attempts.." attempts. Try again or check starting the player manually.")
+        return
+      end
+
+      local cmd = ('"%s" %s "%s"'):format(gdrbridge, 'play', file)
+      DisplayOutputLn(("Starting project file '%s'."):format(file))
+      local bid = wx.wxExecute(cmd, wx.wxEXEC_ASYNC)
+      if not isValidPid(bid, cmd) then return end
+    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/gslshell.lua

@@ -0,0 +1,73 @@
+-- Copyright 2011-12 Paul Kulchenko, ZeroBrane LLC
+
+local gslshell
+local win = ide.osname == "Windows"
+
+return {
+  name = "GSL-shell",
+  description = "GSL-shell interpreter",
+  api = {"baselib"},
+  frun = function(self,wfilename,rundebug)
+    gslshell = gslshell or ide.config.path.gslshell -- check if the path is configured
+    if not gslshell then
+      local sep = win and ';' or ':'
+      local default =
+           win and ([[C:\Program Files\gsl-shell]]..sep..[[D:\Program Files\gsl-shell]]..sep..
+                    [[C:\Program Files (x86)\gsl-shell]]..sep..[[D:\Program Files (x86)\gsl-shell]]..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 = {}
+      for p in path:gmatch("[^"..sep.."]+") do
+        gslshell = gslshell or GetFullPathIfExists(p, win and 'gsl-shell.exe' or 'gsl-shell')
+        table.insert(paths, p)
+      end
+      if not gslshell then
+        DisplayOutput("Can't find gsl-shell executable in any of the following folders: "
+          ..table.concat(paths, ", ").."\n")
+        return
+      end
+    end
+
+    do
+      -- add path to GSL-shell modules and templates/?.lua.in
+      local gslpath = GetPathWithSep(gslshell)
+      local luapath = gslpath.."gsl-shell/?.lua;"..gslpath.."gsl-shell/templates/?.lua.in"
+      local luacpath = gslpath.."gsl-shell/?.dll"
+
+      -- add GSL-shell modules to the end of LUA_PATH
+      local _, path = wx.wxGetEnv("LUA_PATH")
+      if path and not path:find(gslpath, 1, true) then
+        wx.wxSetEnv("LUA_PATH", path..";"..luapath)
+      end
+
+      -- add GSL-shell modules to the beginning of LUA_CPATH to make luajit
+      -- friendly luasocket to load before it loads luasocket shipped with ZBS
+      local _, cpath = wx.wxGetEnv("LUA_CPATH")
+      if cpath and not cpath:find(gslpath, 1, true) then
+        wx.wxSetEnv("LUA_CPATH", luacpath..";"..cpath)
+      end
+    end
+
+    if rundebug then
+      DebuggerAttachDefault({runstart = ide.config.debugger.runonstart == true})
+    end
+
+    local cmd = ('"%s" "%s"'):format(gslshell, wfilename:GetFullPath())
+    -- CommandLineRun(cmd,wdir,tooutput,nohide,stringcallback,uid,endcallback)
+    return CommandLineRun(cmd,self:fworkdir(wfilename),true,false,nil,nil,
+      function() ide.debugger.pid = nil end)
+  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,
+  skipcompile = true,
+  unhideanywindow = true,
+}

interpreters/love2d.lua

@@ -1,5 +1,8 @@
+-- Copyright 2011-12 Paul Kulchenko, ZeroBrane LLC
+
 local love2d
 local win = ide.osname == "Windows"
+local mac = ide.osname == "Macintosh"
 
 return {
   name = "Love2d",
@@ -9,7 +12,13 @@ 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..
+                    [[C:\Program Files (x86)\love]]..sep..[[D:\Program Files (x86)\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 = {}
@@ -29,7 +38,9 @@ return {
       return
     end
 
-    if rundebug then DebuggerAttachDefault() end
+    if rundebug then
+      DebuggerAttachDefault({runstart = ide.config.debugger.runonstart == true})
+    end
 
     local cmd = ('"%s" "%s"%s'):format(love2d,
       self:fworkdir(wfilename), rundebug and ' -debug' or '')

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 {
@@ -17,7 +18,7 @@ return {
     local filepath = wfilename:GetFullPath()
     local script
     if rundebug then
-      DebuggerAttachDefault()
+      DebuggerAttachDefault({runstart = ide.config.debugger.runonstart == true})
       script = rundebug
     else
       -- if running on Windows and can't open the file, this may mean that
@@ -46,4 +47,6 @@ return {
   end,
   hasdebugger = true,
   fattachdebug = function(self) DebuggerAttachDefault() end,
+  scratchextloop = false,
+  unhideanywindow = true,
 }

interpreters/luxinia.lua

@@ -1,21 +1,31 @@
-if (not(ide.config.path.luxinia and 
-        wx.wxFileExists(ide.config.path.luxinia..'luxinia.exe'))) then 
-  return 
-end
-
 return {
   name = "Luxinia",
   description = "Luxinia project",
   api = {"luxiniaapi","baselib"},
   frun = function(self,wfilename,withdebug)
+    if not ide.config.path.luxinia then wx.wxMessageBox("Please define 'path.luxinia' in your cfg/user.lua (see estrela.lua for examples)"); return end
     local projdir = ide.config.path.projectdir
-    local endstr = (projdir and projdir:len()>0
+    local args = (projdir and projdir:len()>0
       and " -p "..projdir or "")
 
     local fname = wfilename:GetFullName()
-    endstr = endstr..(fname and (" -t "..fname) or "")
+    args = args..(fname and (" -t "..fname) or "")
+    
+    if withdebug and ide.config.luxinia1debug then
+      DebuggerAttachDefault({
+          basedir=projdir,
+          run=true, }
+      )
+      local editorDir = string.gsub(ide.editorFilename:gsub("[^/\\]+$",""),"\\","/")
+      script = ""..
+      "package.path=package.path..';"..editorDir.."lualibs/?/?.lua';"..
+      "io.stdout:setvbuf('no'); mobdebug = require('mobdebug'); mobdebug.start('" .. ide.debugger.hostname.."',"..ide.debugger.portnumber..");"..
+      "jit.debug();mobdebug.off();"
 
-    local cmd = 'luxinia.exe --nologo'..endstr
+      args = args..' -b "'..script..'"'
+    end
+
+    local cmd = 'luxinia.exe --nologo'..args
     CommandLineRun(cmd,ide.config.path.luxinia,true,true)
   end,
   fuid = function(self,wfilename) return "luxinia "..(ide.config.path.projectdir or "") end,
@@ -30,4 +40,5 @@ return {
 
     return path:sub(0,-2)
   end,
+  hasdebugger = ide.config.luxinia1debug or false,
 }

interpreters/luxinia2.lua

@@ -1,15 +1,12 @@
-if (not(ide.config.path.luxinia2 and 
-        wx.wxFileExists(ide.config.path.luxinia2..'luajit.exe'))) then 
-  return 
-end
 
 return {
   name = "Luxinia2",
   description = "Luxinia2",
-  api = {"baselib","cg30","cggl30","glfw","glewgl","assimp20","luxmath","luxgfx","luxscene","luajit2",},
+  api = {"baselib","glfw","glewgl","assimp20","luxmath","luxgfx","luxscene","luajit2",},
 
   finitclient = function(self)
     if (not CommandLineRunning(self:fuid(wfilename))) then return end
+    if not ide.config.path.luxinia2 then wx.wxMessageBox("Please define 'path.luxinia2' in your cfg/user.lua (see estrela.lua for examples)"); return end
     local init = dofile(ide.config.path.luxinia2.."/../comserver/client.lua")
     local fenv = {}
     setmetatable(fenv,{__index = _G})

interpreters/marmalade.lua

@@ -0,0 +1,116 @@
+-- Copyright 2011-12 Paul Kulchenko, ZeroBrane LLC
+
+local quick
+local win = ide.osname == "Windows"
+local mac = ide.osname == "Macintosh"
+local exe = win and [[win32\s3e_simulator_debug.exe]] or [[loader/osx/s3e_simulator_debug]]
+local s3e = os.getenv("S3E_DIR")
+
+return {
+  name = "Marmalade Quick",
+  description = "Marmalade Quick mobile framework",
+  api = {"baselib"},
+  frun = function(self,wfilename,rundebug)
+    quick = quick or ide.config.path.quick or (s3e and GetFullPathIfExists(s3e, exe))
+    if not quick then
+      local sep = win and ';' or ':'
+      local path =
+           win and ([[C:\Marmalade]]..sep..[[D:\Marmalade]]..sep..
+                    [[C:\Program Files\Marmalade]]..sep..[[D:\Program Files\Marmalade]]..sep..
+                    [[C:\Program Files (x86)\Marmalade]]..sep..[[D:\Program Files (x86)\Marmalade]]..sep)
+        or mac and ([[/Developer/Marmalade]]..sep)
+        or ''
+      -- Marmalade can be installed in a folder with version number or without
+      -- so it may be c:\Marmalade\s3e\... or c:\Marmalade\6.2\s3e\...
+      local candidates, paths = {}, {}
+      for p in path:gmatch("[^"..sep.."]+") do
+        table.insert(paths, p)
+        for _, candidate in ipairs(FileSysGet(p.."/*.*", wx.wxDIR)) do
+          if GetFullPathIfExists(candidate, exe) then table.insert(candidates, candidate) end
+          if GetFullPathIfExists(candidate.."/s3e", exe) then table.insert(candidates, candidate.."/s3e") end
+        end
+      end
+      -- multiple candidates may be present, so sort and use the latest.
+      -- only happens if multiple versions are installed and S3E_DIR is not set.
+      table.sort(candidates)
+      if #candidates > 0 then
+        s3e = candidates[#candidates]
+        quick = GetFullPathIfExists(s3e, exe) -- guaranteed to exist
+      else
+        DisplayOutputLn("Can't find Marmalade installation in any of these folders (and S3E_DIR environmental variable is not set): "
+          ..table.concat(paths, ", "))
+        return
+      end
+    end
+
+    local projdir = self:fworkdir(wfilename)
+    local file = GetFullPathIfExists(projdir, 'main.lua')
+    if not file then
+      DisplayOutputLn("Can't find 'main.lua' file in the current project folder.")
+      return
+    end
+
+    -- check for *.mkb file; it can be in the same or in the parent folder
+    local mproj, mfile = MergeFullPath(projdir, "./")
+    for _, file in ipairs(FileSysGet(mproj.."*.mkb", wx.wxFILE)) do mfile = file end
+    if not mfile then
+      mproj, mfile = MergeFullPath(projdir, "../")
+      for _, file in ipairs(FileSysGet(mproj.."*.mkb", wx.wxFILE)) do mfile = file end
+    end
+    if not mfile then
+      DisplayOutputLn(("Can't find '%s' project file."):format(mproj))
+      return
+    end
+
+    local mkb = FileRead(mfile)
+    local datadir = mkb:match("options%s*%{[^%}]*s3e%-data%-dir%s*=%s*(.-)%s*[\r\n%}]")
+    datadir = datadir and datadir:gsub("^['\"]", ""):gsub("['\"][\r\n]*$", "")
+    local icf1, icf2 = mkb:match("options%s*%{[^%}]*app%-icf%s*=%s*(.-)%s*[\r\n%}]")
+    icf1 = icf1 and icf1:gsub("^['\"]", ""):gsub("['\"][\r\n]*$", "")
+    if icf1 and icf1:find(",") then
+      icf1, icf2 = icf1:match("(.+),(.*)")
+    end
+
+    datadir = datadir and (wx.wxIsAbsolutePath(datadir) and datadir or MergeFullPath(mproj, datadir))
+    icf1 = icf1 and (wx.wxIsAbsolutePath(icf1) and icf1 or MergeFullPath(mproj, icf1))
+    icf2 = icf2 and (wx.wxIsAbsolutePath(icf2) and icf2 or MergeFullPath(mproj, icf2))
+
+    if rundebug then
+      -- start running the application right away
+      DebuggerAttachDefault({redirect = mac and "r" or "c", basedir = datadir,
+        runstart = ide.config.debugger.runonstart ~= false})
+
+      -- copy mobdebug.lua to the configured datadir or project folder
+      local mdbc = MergeFullPath(datadir or projdir, "mobdebug.lua")
+      local mdbl = MergeFullPath(GetPathWithSep(ide.editorFilename), "lualibs/mobdebug/mobdebug.lua")
+      if not wx.wxFileExists(mdbc)
+      or GetFileModTime(mdbc):GetTicks() < GetFileModTime(mdbl):GetTicks() then
+        FileCopy(mdbl, mdbc)
+        DisplayOutputLn("Copied ZeroBrane Studio debugger ('mobdebug.lua') to the project folder.")
+      end
+    end
+
+    local dll = MergeFullPath(s3e, "../quick/target/quick_prebuilt_d.s86")
+    local options = table.concat({
+      ([[--dll="%s"]]):format(dll),
+      (datadir and ([[--data="%s"]]):format(datadir) or ''),
+      -- Quick doesn't handle correctly spaces in quoted parameters on OSX,
+      -- so replace those with escaped spaces; still quote on Windows
+      (icf1 and ([[--app-icf1=%s]]):format(mac and icf1:gsub(" ", "\\ ") or '"'..icf1..'"') or ''),
+      (icf2 and ([[--app-icf2=%s]]):format(mac and icf2:gsub(" ", "\\ ") or '"'..icf2..'"') or nil),
+    }, " ")
+
+    local cmd = ('"%s" %s'):format(quick, options)
+    -- CommandLineRun(cmd,wdir,tooutput,nohide,stringcallback,uid,endcallback)
+    return CommandLineRun(cmd,GetPathWithSep(projdir),true,true,nil,nil,
+      function() ide.debugger.pid = nil end)
+  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,
+}

interpreters/moai.lua

@@ -4,12 +4,17 @@ 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..
+                    [[C:\Program Files (x86)\moai]]..sep..[[D:\Program Files (x86)\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 = {}
@@ -41,7 +46,8 @@ return {
 
     if rundebug then
       -- start running the application right away
-      DebuggerAttachDefault({runstart=true, startwith = file})
+      DebuggerAttachDefault({startwith = file,
+        runstart = ide.config.debugger.runonstart ~= false})
       local code = (
 [[xpcall(function() 
     io.stdout:setvbuf('no')
@@ -58,6 +64,14 @@ return {
       end
       f:write(code)
       f:close()
+
+      -- add mobdebug as the first path to LUA_PATH to provide a workaround
+      -- for a MOAI issue: https://github.com/pkulchenko/ZeroBraneStudio/issues/96
+      local mdb = MergeFullPath(GetPathWithSep(ide.editorFilename), "lualibs/mobdebug/?.lua")
+      local _, path = wx.wxGetEnv("LUA_PATH")
+      if path and path:find(mdb, 1, true) ~= 1 then
+        wx.wxSetEnv("LUA_PATH", mdb..";"..path)
+      end
     end
 
     file = file or wfilename:GetFullPath()

lualibs/metalua/metalua.lua

@@ -2,7 +2,7 @@
 -- an abstract syntax tree (AST)
 local file = debug.getinfo(1, "S").source
 if string.find(file, "@") == 1 then file = string.sub(file, 2) end
-package.path = package.path .. ';' .. string.gsub(file, "metalua%.lua$", "?.lua")
+package.path = string.gsub(file, "metalua%.lua$", "?.lua") .. ';' .. package.path
 
 -- these modules are sufficient to build an AST from a source file/string
 require "lexer"

spec/cpp.lua

@@ -0,0 +1,78 @@
+-- author: Paul Kulchenko
+---------------------------------------------------------
+
+local funccall = "([A-Za-z_][A-Za-z0-9_]*)%s*"
+
+return {
+  exts = {"cpp", "c", "hpp", "h"},
+  lexer = wxstc.wxSTC_LEX_CPP,
+  apitype = "cpp",
+  linecomment = "//",
+  stylingbits = 5,
+
+  isfncall = function(str)
+    return string.find(str, funccall .. "%(")
+  end,
+
+  lexerstyleconvert = {
+    text = {wxstc.wxSTC_C_IDENTIFIER,},
+
+    lexerdef = {wxstc.wxSTC_C_DEFAULT,},
+    comment = {wxstc.wxSTC_C_COMMENT,
+      wxstc.wxSTC_C_COMMENTLINE,
+      wxstc.wxSTC_C_COMMENTDOC,},
+    stringtxt = {wxstc.wxSTC_C_STRING,
+      wxstc.wxSTC_C_CHARACTER,
+      wxstc.wxSTC_C_VERBATIM,},
+    stringeol = {wxstc.wxSTC_C_STRINGEOL,},
+    preprocessor= {wxstc.wxSTC_C_PREPROCESSOR,},
+    operator = {wxstc.wxSTC_C_OPERATOR,},
+    number = {wxstc.wxSTC_C_NUMBER,},
+
+    keywords0 = {wxstc.wxSTC_C_WORD,},
+    keywords1 = {wxstc.wxSTC_C_WORD2,},
+  },
+
+  keywords = {
+    [[ alignas alignof and and_eq asm auto bitand bitor break case catch
+       class compl const constexpr const_cast continue
+       decltype default delete do dynamic_cast else enum explicit export
+       extern for friend goto if inline mutable namespace new noexcept not
+       not_eq nullptr operator or or_eq private protected public register
+       reinterpret_cast return sizeof static static_assert static_cast
+       struct switch template this thread_local throw try typedef typeid
+       typename union using virtual volatile while xor xor_eq]],
+    [[ NULL bool char char16_t char32_t double false float int long 
+       short signed true unsigned void wchar_t]]
+  },
+}
+
+--[==[ C-only keywords
+    [[ auto break case const continue default do else enum extern for goto if
+       register return sizeof static struct switch typedef union volatile while]],
+    [[ NULL char double float int long short signed unsigned void]]
+--]==]
+
+--[[
+// Lexical states for SCLEX_CPP
+%define wxSTC_C_DEFAULT
+%define wxSTC_C_COMMENT
+%define wxSTC_C_COMMENTLINE
+%define wxSTC_C_COMMENTDOC
+%define wxSTC_C_NUMBER
+%define wxSTC_C_WORD
+%define wxSTC_C_STRING
+%define wxSTC_C_CHARACTER
+%define wxSTC_C_UUID
+%define wxSTC_C_PREPROCESSOR
+%define wxSTC_C_OPERATOR
+%define wxSTC_C_IDENTIFIER
+%define wxSTC_C_STRINGEOL
+%define wxSTC_C_VERBATIM
+%define wxSTC_C_REGEX
+%define wxSTC_C_COMMENTLINEDOC
+%define wxSTC_C_WORD2
+%define wxSTC_C_COMMENTDOCKEYWORD
+%define wxSTC_C_COMMENTDOCKEYWORDERROR
+%define wxSTC_C_GLOBALCLASS
+]]

spec/glsl.lua

@@ -19,27 +19,19 @@ return {
   end,
 
   lexerstyleconvert = {
-    text = {wxstc.wxSTC_C_IDENTIFIER,
-      wxstc.wxSTC_C_VERBATIM,
-      wxstc.wxSTC_C_REGEX,
-      wxstc.wxSTC_C_REGEX,
-      wxstc.wxSTC_C_GLOBALCLASS,},
+    text = {wxstc.wxSTC_C_IDENTIFIER,},
 
     lexerdef = {wxstc.wxSTC_C_DEFAULT,},
     comment = {wxstc.wxSTC_C_COMMENT,
       wxstc.wxSTC_C_COMMENTLINE,
-      wxstc.wxSTC_C_COMMENTDOC,
-      wxstc.wxSTC_C_COMMENTLINEDOC,
-      wxstc.wxSTC_C_COMMENTDOCKEYWORD,
-      wxstc.wxSTC_C_COMMENTDOCKEYWORDERROR,},
+      wxstc.wxSTC_C_COMMENTDOC,},
     stringtxt = {wxstc.wxSTC_C_STRING,
       wxstc.wxSTC_C_CHARACTER,
-      wxstc.wxSTC_C_UUID,},
+      wxstc.wxSTC_C_VERBATIM,},
     stringeol = {wxstc.wxSTC_C_STRINGEOL,},
     preprocessor= {wxstc.wxSTC_C_PREPROCESSOR,},
     operator = {wxstc.wxSTC_C_OPERATOR,},
-    number = {wxstc.wxSTC_C_NUMBER,
-      wxstc.wxSTC_C_WORD},
+    number = {wxstc.wxSTC_C_NUMBER,},
 
     keywords0 = {wxstc.wxSTC_C_WORD,},
     keywords1 = {wxstc.wxSTC_C_WORD2,},

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,
@@ -10,24 +33,31 @@ return {
   linecomment = "--",
   sep = "%.:",
   isfncall = function(str)
-    return string.find(str, funccall .. "%(")
+    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)
@@ -138,36 +168,32 @@ return {
   },
 
   keywords = {
-    [[and break do else elseif end false for function if ipairs pairs
-    in local nil not or repeat return then true until while]],
+    [[and break do else elseif end for function goto if in local not or repeat return then until while]],
 
-    [[_VERSION assert collectgarbage dofile error gcinfo loadfile loadstring
-    print rawget rawset require tonumber tostring type unpack]],
+    [[_G _VERSION _ENV false io.stderr io.stdin io.stdout nil math.huge math.pi package.config
+      package.cpath package.loaded package.loaders package.path package.preload package.searchers self true]],
 
-    [[_G getfenv getmetatable loadlib next pcall
-    rawequal setfenv setmetatable xpcall
-    string table math coroutine io os debug
-    load module select]],
+    [[assert collectgarbage dofile error getfenv getmetatable ipairs load loadfile loadstring
+      module next pairs pcall print rawequal rawget rawlen rawset require
+      select setfenv setmetatable tonumber tostring type unpack xpcall]],
 
-    [[string.byte string.char string.dump string.find string.len
-    string.lower string.rep string.sub string.upper string.format string.gfind string.gsub
-    table.concat table.foreach table.foreachi table.getn table.sort table.insert table.remove table.setn
-    math.abs math.acos math.asin math.atan math.atan2 math.ceil math.cos math.deg math.exp
-    math.floor math.frexp math.ldexp math.log math.log10 math.max math.min math.mod
-    math.pi math.pow math.rad math.random math.randomseed math.sin math.sqrt math.tan
-    string.gmatch string.match string.reverse table.maxn
-    math.cosh math.fmod math.modf math.sinh math.tanh math.huge]],
-
-    [[coroutine.create coroutine.resume coroutine.status
-    coroutine.wrap coroutine.yield
-    io.close io.flush io.input io.lines io.open io.output io.read io.tmpfile io.type io.write
-    io.stdin io.stdout io.stderr
-    os.clock os.date os.difftime os.execute os.exit os.getenv os.remove os.rename
-    os.setlocale os.time os.tmpname
-    coroutine.running package.cpath package.loaded package.loadlib package.path
-    package.preload package.seeall io.popen
-    debug.debug debug.getfenv debug.gethook debug.getinfo debug.getlocal
-    debug.getmetatable debug.getregistry debug.getupvalue debug.setfenv
-    debug.sethook debug.setlocal debug.setmetatable debug.setupvalue debug.traceback]],
+    [[bit32.arshift bit32.band bit32.bnot bit32.bor bit32.btest bit32.bxor bit32.extract
+      bit32.lrotate bit32.lshift bit32.replace bit32.rrotate bit32.rshift
+      coroutine.create coroutine.resume coroutine.running coroutine.status coroutine.wrap coroutine.yield
+      debug.debug debug.getfenv debug.gethook debug.getinfo debug.getlocal
+      debug.getmetatable debug.getregistry debug.getupvalue debug.getuservalue debug.setfenv
+      debug.sethook debug.setlocal debug.setmetatable debug.setupvalue debug.setuservalue
+      debug.traceback debug.upvalueid debug.upvaluejoin
+      io.close io.flush io.input io.lines io.open io.output io.popen io.read io.tmpfile io.type io.write
+      close flush lines read seek setvbuf write
+      math.abs math.acos math.asin math.atan math.atan2 math.ceil math.cos math.cosh math.deg math.exp
+      math.floor math.fmod math.frexp math.ldexp math.log math.log10 math.max math.min math.modf
+      math.pow math.rad math.random math.randomseed math.sin math.sinh math.sqrt math.tan math.tanh
+      os.clock os.date os.difftime os.execute os.exit os.getenv os.remove os.rename os.setlocale os.time os.tmpname
+      package.loadlib package.searchpath package.seeall
+      string.byte string.char string.dump string.find string.format string.gmatch string.gsub string.len
+      string.lower string.match string.rep string.reverse string.sub string.upper
+      byte find format gmatch gsub len lower match rep reverse sub upper
+      table.concat table.insert table.maxn table.pack table.remove table.sort table.unpack]]
   },
 }

src/defs.lua

@@ -54,7 +54,7 @@ style = {
   linenumber = stattr,
   bracematch = stattr,
   bracemiss = stattr,
-  escapechar = stattr,
+  ctrlchar = stattr,
   indent = stattr,
   calltip = stattr,
 
@@ -79,40 +79,32 @@ 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
-    luxinia = "C:/luxbin/",
-    -- path to luxinia exe
-
-    projectdir = "",
-    -- the project directory, used by
-    -- some tools/interpreters
+  path = { -- path for tools/interpreters
+    luxinia = "C:/luxbin/", -- path to luxinia exe
+    projectdir = "", -- the project directory, used by 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
+    foldcompact = true, -- use compact fold that includes empty lines
+    checkeol = true, -- check for eol encoding on loaded files and use it
+                     -- also report mixed eol encodings
+    defaulteol = nil, -- default line-endings for new files; valid values are
+                      -- wxstc.wxSTC_EOL_CRLF, wxstc.wxSTC_EOL_LF and nil (OS default)
   },
 
   default = {
@@ -122,60 +114,59 @@ config = {
 
   debugger = {
     verbose = false,
+    hostname = nil, -- hostname to use when the detected one is incorrect
+    port = nil, -- port number to use
+    runonstart = nil, -- if debugger should run immediately after starting
+    -- default values are different for different interpreters
   }
 
-  outputshell = {
-    -- output and shell settings
-    fontname = "Courier New",
-    -- default font
-    fontsize = 10,
-    -- defult size
+  outputshell = { -- output and shell settings
+    fontname = "Courier New", -- default font
+    fontsize = 10, -- defult size
   }
 
-  styles = {},
-  -- styles table as above for editor
+  filetree = { -- filetree settings
+    fontname = nil, -- no default font as it is system dependent
+    fontsize = nil, -- no default size as it is system dependent
+  }
 
-  stylesoutshell = {},
-  -- styles for output/shell
+  keymap = {}, -- mapping of menu IDs to hot keys
+  messages = {}, -- list of messages in a particular language
+  language = "en", -- current UI language
 
-  interpreter = "EstrelaEditor",
-  -- the default "project" lua interpreter
+  styles = {}, -- styles table as above for editor
+  stylesoutshell = {}, -- styles for output/shell
 
-  autocomplete = true,
-  -- whether autocomplete is on by default
+  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)
     -- 2: leading + any correctly ordered fragments (default)
+    width = 60, -- width of the tooltip text (in characters)
   }
 
-  savebak = false,
-  -- if bak files are created on save
+  savebak = false, -- if bak files are created on save
 
-  filehistorylength = 20,
-  -- historylength for files
+  filehistorylength = 20, -- historylength for files
 
-  projecthistorylength = 15,
-  -- historylength for project directories
+  projecthistorylength = 15, -- historylength for project directories
 
-  singleinstance = true,
-  -- if true creates a UDP server to exchange messages
-  -- for loading commandline passed files
-
-  singleinstanceport = 0xe493,
-  -- UDP port for single instance communication
+  singleinstance = true, -- if true creates a UDP server to run IDE once and to load files
+  singleinstanceport = 0xe493, -- UDP port for single instance communication
 
   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
@@ -247,7 +238,7 @@ spec = {
   linecomment = "//",
   -- string for linecomments
 
-  sep = "[%.:]",
+  sep = "%.:",
   -- class.function separator match string,
   -- e.g in lua both . and : are allowed
   -- default is "\1" which should yield no matches
@@ -320,5 +311,9 @@ 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.
+  skipcompile = nil, -- don't compile before running if true
 }

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
@@ -48,7 +46,7 @@ end
 local function addAPI(apifile,only,subapis,known) -- relative to API directory
   local ftype,fname = apifile:match("api[/\\]([^/\\]+)[/\\](.*)%.")
   if not ftype then
-    print("The API file must be located in a subdirectory of the API directory\n")
+    DisplayOutputLn(TR("The API file must be located in a subdirectory of the API directory."))
     return
   end
   if ((only and ftype ~= only) or (known and not known[ftype])) then 
@@ -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")
+    DisplayOutputLn(TR("Error while loading API file: %s"):format(err))
     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
+    DisplayOutputLn(TR("Error while processing API file: %s"):format(res))
+  elseif (res) then
     local function gennames(tab,prefix)
       for i,v in pairs(tab) do
         v.classname = (prefix and (prefix..".") or "")..i
@@ -85,13 +79,11 @@ local function addAPI(apifile,only,subapis,known) -- relative to API directory
       env[i] = v
     end
   end
-
 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
@@ -103,6 +95,8 @@ end
 -- ToolTip and reserved words list
 -- also fixes function descriptions
 
+local tipwidth = math.max(20, ide.config.acandtip.width or 60)
+local widthmask = ("[^\n]"):rep(tipwidth-10)..("[^\n]?"):rep(10)
 local function fillTips(api,apibasename,apiname)
   local apiac = api.ac
   local tclass = api.tip
@@ -130,23 +124,19 @@ local function fillTips(api,apibasename,apiname)
 
         -- fix description
         local frontname = (info.returns or "(?)").." "..libstr..key.." "..(info.args or "(?)")
-        frontname = frontname:gsub("\n"," ")
-        frontname = frontname:gsub("\t","")
-        frontname = frontname:gsub("("..("[^\n]"):rep(60)..".-[%s,%)%]:%.])([^%)])","%1\n %2")
+        frontname = frontname
+          :gsub("\n"," ")
+          :gsub("\t","")
+          :gsub("("..widthmask..")[ \t]([^%)])","%1\n %2")
 
-        info.description = info.description:gsub("\n\n","<br>")
-        info.description = info.description:gsub("[^%s]\n[^%s]","")
-        info.description = info.description:gsub("\n"," ")
-        info.description = info.description:gsub("<br>","\n")
-        info.description = info.description:gsub("[^%s]\t[^%s]"," ")
-        info.description = info.description:gsub("\t%s","")
-        info.description = info.description:gsub("%s\t","")
-        info.description = info.description:gsub("("..("[^\n]"):rep(60)..".-[%s,%)%]:%.])","%1\n")
+        info.description = info.description
+          :gsub("\n\n","<br>"):gsub("\n"," "):gsub("<br>","\n")
+          :gsub("[ \t]+"," ")
+          :gsub("("..widthmask..") ","%1\n")
 
         -- build info
         local inf = frontname.."\n"..info.description
-        local sentence = info.description:match("^([^\n]+)\n.*")
-        local sentence = sentence and sentence:match("([^%.]+)%..*$")
+        local sentence = info.description:match("^(.-)%. ?\n")
         local infshort = frontname.."\n"..(sentence and sentence.."..." or info.description)
         local infshortbatch = (info.returns and info.args) and frontname or infshort
 
@@ -239,7 +229,7 @@ end
 
 function GetTipInfo(editor, content, short)
   local caller = content:match("([%w_]+)%(%s*$")
-  local class = caller and content:match("([%w_]+)[%.:]"..caller.."%(%s*$")
+  local class = caller and content:match("([%w_]+)[%.:]"..caller.."%(%s*$") or ""
   local tip = editor.api.tip
 
   local classtab = short and tip.shortfinfoclass or tip.finfoclass
@@ -266,7 +256,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 +266,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 +378,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 +405,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 +458,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 +470,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 +487,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 +495,6 @@ function CreateAutoCompList(editor,key)
   
       local res = table.concat(list," ")
       dw = res ~= "" and " "..res or ""
-
     end
   end
 
@@ -526,13 +516,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)
@@ -557,5 +547,4 @@ function CreateAutoCompList(editor,key)
   local li = (compstr .. dw)
   
   return li ~= "" and (#li > 1024 and li:sub(1,1024).."..." or li)
-
 end

src/editor/commands.lua

@@ -7,9 +7,15 @@ local notebook = frame.notebook
 local openDocuments = ide.openDocuments
 local uimgr = frame.uimgr
 
+local CURRENT_LINE_MARKER = StylesGetMarker("currentline")
+local CURRENT_LINE_MARKER_VALUE = 2^CURRENT_LINE_MARKER
+local BREAKPOINT_MARKER = StylesGetMarker("breakpoint")
+
 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 +32,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,30 +58,73 @@ 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 "")
+
+  -- check the editor as it can be empty if the file has malformed UTF8;
+  -- skip binary files as they may have any sequences; can't show them anyway.
+  if file_text and #file_text > 0 and not isBinary(file_text)
+  and #(editor:GetText()) == 0 then
+    local replacement, invalid = "\022"
+    file_text, invalid = fixUTF8(file_text, replacement)
+    if #invalid > 0 then
+      editor:AppendText(file_text)
+      local lastline = nil
+      for _, n in ipairs(invalid) do
+        local line = editor:LineFromPosition(n)
+        if line ~= lastline then
+          DisplayOutputLn(("%s:%d: %s")
+            :format(filePath, line+1, TR("Replaced an invalid UTF8 character with %s."):format(replacement)))
+          lastline = line
+        end
+      end
+    end
+  end
+
+  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
     editor:SetUseTabs(found)
   end
+  
+  if (ide.config.editor.checkeol) then
+    -- Auto-detect CRLF/LF line-endings
+    local foundcrlf = string.find(file_text,"\r\n") ~= nil
+    local foundlf = (string.find(file_text,"[^\r]\n") ~= nil)
+      or (string.find(file_text,"^\n") ~= nil) -- edge case: file beginning with LF and having no other LF
+    if foundcrlf and foundlf then -- file with mixed line-endings
+      DisplayOutputLn(("%s: %s")
+        :format(filePath, TR("Mixed end-of-line encodings detected.")..' '..
+          TR("Use '%s' to show line endings and '%s' to convert them.")
+        :format("GetEditor():SetViewEOL(1)", "GetEditor():ConvertEOLs(GetEditor():GetEOLMode())")))
+    elseif foundcrlf then
+      editor:SetEOLMode(wxstc.wxSTC_EOL_CRLF)
+    elseif foundlf then
+      editor:SetEOLMode(wxstc.wxSTC_EOL_LF)
+    -- else (e.g. file is 1 line long or uses another line-ending): use default EOL mode
+    end
+  end
 
   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 +132,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
@@ -97,25 +148,23 @@ local function getExtsString()
   end
   knownexts = knownexts:len() > 0 and knownexts:sub(1,-2) or nil
 
-  local exts = knownexts and "Known Files ("..knownexts..")|"..knownexts.."|" or ""
-  exts = exts.."All files (*)|*"
+  local exts = knownexts and TR("Known Files").." ("..knownexts..")|"..knownexts.."|" or ""
+  exts = exts..TR("All files").." (*)|*"
 
   return exts
 end
 
 function OpenFile(event)
-
   local exts = getExtsString()
-
-  local fileDialog = wx.wxFileDialog(ide.frame, "Open file",
+  local fileDialog = wx.wxFileDialog(ide.frame, TR("Open file"),
     "",
     "",
     exts,
     wx.wxFD_OPEN + wx.wxFD_FILE_MUST_EXIST)
   if fileDialog:ShowModal() == wx.wxID_OK then
     if not LoadFile(fileDialog:GetPath(), nil, true) then
-      wx.wxMessageBox("Unable to load file '"..fileDialog:GetPath().."'.",
-        "Error",
+      wx.wxMessageBox(TR("Unable to load file '%s'."):format(fileDialog:GetPath()),
+        TR("Error"),
         wx.wxOK + wx.wxCENTRE, ide.frame)
     end
   end
@@ -142,10 +191,11 @@ 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,
-        "Error",
+      wx.wxMessageBox(TR("Unable to save file '%s': %s"):format(filePath, err),
+        TR("Error"),
         wx.wxICON_ERROR + wx.wxOK + wx.wxCENTRE, ide.frame)
     end
   end
@@ -165,12 +215,11 @@ function SaveFileAs(editor)
   local fn = wx.wxFileName(filePath)
   fn:Normalize() -- want absolute path for dialog
 
-  local exts = getExtsString()
-
-  local fileDialog = wx.wxFileDialog(ide.frame, "Save file as",
+  local ext = fn:GetExt()
+  local fileDialog = wx.wxFileDialog(ide.frame, TR("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 +245,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
@@ -256,18 +305,37 @@ function ClosePage(selection)
     DynamicWordsRemoveAll(editor)
     local debugger = ide.debugger
     -- check if the window with the scratchpad running is being closed
-    if debugger and debugger.scratchpad and debugger.scratchpad.editor == editor then
+    if debugger and debugger.scratchpad and debugger.scratchpad.editors
+    and debugger.scratchpad.editors[editor] then
       DebuggerScratchpadOff()
     end
     -- check if the debugger is running and is using the current window
     -- 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
+
+function CloseAllPagesExcept(selection)
+  local toclose = {}
+  for _, document in pairs(ide.openDocuments) do
+    table.insert(toclose, document.index)
+  end
+
+  table.sort(toclose)
+
+  -- close pages for those files that match the project in the reverse order
+  -- (as ids shift when pages are closed)
+  for i = #toclose, 1, -1 do
+    if toclose[i] ~= selection then ClosePage(toclose[i]) end
   end
 end
 
@@ -280,12 +348,12 @@ function SaveModifiedDialog(editor, allow_cancel)
   local filePath = document.filePath
   local fileName = document.fileName
   if document.isModified then
-    local message = "Do you want to save the changes to '"
-      ..(fileName or ide.config.default.name).."'?"
+    local message = TR("Do you want to save the changes to '%s'?")
+      :format(fileName or ide.config.default.name)
     local dlg_styles = wx.wxYES_NO + wx.wxCENTRE + wx.wxICON_QUESTION
     if allow_cancel then dlg_styles = dlg_styles + wx.wxCANCEL end
     local dialog = wx.wxMessageDialog(ide.frame, message,
-      "Save Changes?",
+      TR("Save Changes?"),
       dlg_styles)
     result = dialog:ShowModal()
     dialog:Destroy()
@@ -395,6 +463,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 +471,28 @@ 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")
+    DisplayOutput(TR("Compilation error")
+      .." "..TR("on line %d"):format(line_num)
+      ..":\n"..errMsg:gsub("Lua:.-\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
+      DisplayOutputLn(TR("Compilation successful; %.0f%% success rate (%d/%d).")
+        :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
 
 ------------------
@@ -425,8 +503,9 @@ function SaveIfModified(editor)
   if openDocuments[id].isModified then
     local saved = false
     if not openDocuments[id].filePath then
-      local ret = wx.wxMessageBox("You must save the program before running it.\nPress cancel to abort running.",
-        "Save file?", wx.wxOK + wx.wxCANCEL + wx.wxCENTRE, ide.frame)
+      local ret = wx.wxMessageBox(
+        TR("You must save the program first.").."\n"..TR("Press cancel to abort."),
+        TR("Save file?"), wx.wxOK + wx.wxCANCEL + wx.wxCENTRE, ide.frame)
       if ret == wx.wxOK then
         saved = SaveFileAs(editor)
       end
@@ -451,28 +530,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 +553,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 +575,159 @@ 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
+    DisplayOutputLn(TR("Can't process auto-recovery record; invalid format: %s."):format(nametab))
+    return
+  end
+  DisplayOutputLn(TR("Found auto-recovery record and restored saved session."))
+  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
+        DisplayOutputLn(TR("File '%s' has more recent timestamp than restored '%s'; please review before saving.")
+          :format(doc.filename, doc.tabname))
+      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(
+    TR("Saved auto-recover at %s."):format(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 +737,13 @@ function CloseWindow(event)
   end
 
   ShowFullScreen(false)
-  SettingsSaveProjectSession(FileTreeGetProjects())
-  SettingsSaveFileSession(GetOpenFiles())
-  SettingsSaveView()
-  SettingsSaveFramePosition(ide.frame, "MainFrame")
-  SettingsSaveEditorSettings()
+  ide.frame:Hide() -- hide everything while the IDE exits
+  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 +751,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

@@ -1,5 +1,5 @@
 -- Integration with MobDebug
--- Copyright 2011-12 Paul Kulchenko
+-- Copyright 2011-12 Paul Kulchenko, ZeroBrane LLC
 -- Original authors: Lomtik Software (J. Winwood & John Labenski)
 -- Luxinia Dev (Eike Decker & Christoph Kubisch)
 
@@ -12,31 +12,55 @@ local debugger = ide.debugger
 debugger.server = nil -- DebuggerServer object when debugging, else nil
 debugger.running = false -- true when the debuggee is running
 debugger.listening = false -- true when the debugger is listening for a client
-debugger.portnumber = mobdebug.port or 8171 -- the port # to use for debugging
+debugger.portnumber = ide.config.debugger.port or mobdebug.port -- the port # to use for debugging
 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 CURRENT_LINE_MARKER = StylesGetMarker("currentline")
+local CURRENT_LINE_MARKER_VALUE = 2^CURRENT_LINE_MARKER
+local BREAKPOINT_MARKER = StylesGetMarker("breakpoint")
+local BREAKPOINT_MARKER_VALUE = 2^BREAKPOINT_MARKER
+
+local function q(s) return s:gsub('([%(%)%.%%%+%-%*%?%[%^%$%]])','%%%1') end
+
+local function updateWatchesSync(num)
   local watchCtrl = debugger.watchCtrl
-  if watchCtrl and debugger.server
-    and not debugger.running and not debugger.scratchpad then
+  if watchCtrl and debugger.server and not debugger.running
+  and not debugger.scratchpad and not (debugger.options or {}).noeval 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 +81,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}
@@ -81,7 +111,9 @@ local function updateStackSync()
                           or " (defined in "..call[2]..")"))
       local callitem = stackCtrl:AppendItem(root, text, 0)
       for name,val in pairs(frame[2]) do
-        local value, comment = val[1], val[2]
+        -- comment can be not necessarily a string for tables with metatables
+        -- that provide its own __tostring method
+        local value, comment = val[1], tostring(val[2])
         local text = ("%s = %s%s"):
           format(name, mobdebug.line(value, params),
                  simpleType[type(value)] and "" or ("  --[["..comment.."]]"))
@@ -109,14 +141,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
 
@@ -127,28 +165,31 @@ local function killClient()
     -- (at least on Windows Vista SP2)
     local ret = wx.wxProcess.Kill(debugger.pid, wx.wxSIGKILL, wx.wxKILL_CHILDREN)
     if ret == wx.wxKILL_OK then
-      DisplayOutput(("Program stopped (pid: %d).\n"):format(debugger.pid))
+      DisplayOutputLn(TR("Program stopped (pid: %d)."):format(debugger.pid))
     elseif ret ~= wx.wxKILL_NO_PROCESS then
-      DisplayOutput(("Unable to stop program (pid: %d), code %d.\n")
+      DisplayOutputLn(TR("Unable to stop program (pid: %d), code %d.")
         :format(debugger.pid, ret))
     end
     debugger.pid = nil
   end
 end
 
-local function activateDocument(fileName, line)
-  if not fileName then return end
+local function activateDocument(file, line, skipauto)
+  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
+      RequestAttention()
       notebook:SetSelection(selection)
       SetEditorSelection(selection)
       ClearAllCurrentLineMarkers()
@@ -161,7 +202,23 @@ local function activateDocument(fileName, line)
     end
   end
 
-  return activated ~= nil, activated
+  if not (activated or indebugger or debugger.loop or skipauto)
+  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
+      DisplayOutputLn(TR("Couldn't activate file '%s' for debugging; continuing without it.")
+        :format(file))
+    end
+  end
+
+  return activated ~= nil
 end
 
 local function reSetBreakpoints()
@@ -185,7 +242,11 @@ 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 or debugger.scratchpad.paused) then
     copas.addthread(function ()
         -- exec command is not expected to return anything.
         -- eval command returns 0 or more results.
@@ -198,7 +259,7 @@ debugger.shell = function(expression, isstatement)
         expression = expression:gsub("^%s*=%s*","")
         local _, values, err = debugger.evaluate(expression)
         if not forceexpression and err and
-          (err:find("'<eof>' expected near '") or
+          (err:find("'?<eof>'? expected near '") or
            err:find("'%(' expected near") or
            err:find("unexpected symbol near '")) then
           _, values, err = debugger.execute(expression)
@@ -230,7 +291,7 @@ debugger.shell = function(expression, isstatement)
         end
 
         -- refresh Stack and Watch windows if executed a statement (and no err)
-        if isstatement and not err and not addret and #values == 0 then
+        if isstatement and not err and not addedret and #values == 0 then
           updateStackSync() updateWatchesSync() end
       end)
   end
@@ -238,34 +299,44 @@ end
 
 debugger.listen = function()
   local server = socket.bind("*", debugger.portnumber)
-  DisplayOutput(("Debugger server started at %s:%d.\n")
+  DisplayOutputLn(TR("Debugger server started at %s:%d.")
     :format(debugger.hostname, debugger.portnumber))
   copas.autoclose = false
   copas.addserver(server, function (skt)
       if debugger.server then
-        DisplayOutput("Refused a request to start a new debugging session as there is one in progress already.\n")
+        DisplayOutputLn(TR("Refused a request to start a new debugging session as there is one in progress already."))
         return
       end
 
       copas.setErrorHandler(function(error)
-        DisplayOutput("Can't start debugging session due to internal error '" .. error .. "'.\n")
+        DisplayOutputLn(TR("Can't start debugging session due to internal error '%s'."):format(error))
         debugger.terminate()
       end)
 
       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
+        DisplayOutputLn(TR("Can't start debugging without an opened file or with the current file not being saved ('%s').")
+          :format(ide.config.default.fullname))
+        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
@@ -273,47 +344,113 @@ debugger.listen = function()
 
       reSetBreakpoints()
 
+      if options.redirect then
+        debugger.handle("output stdout " .. options.redirect, nil,
+          { handler = function(m)
+              if not debugger.server then return end
+
+              -- if it's an error returned, then handle the error
+              if m and m:find("stack traceback:", 1, true) then
+                -- this is an error message sent remotely
+                local func = loadstring("return "..m)
+                if func then
+                  DisplayOutputLn(func())
+                  debugger.terminate()
+                  return
+                end
+              end
+
+              if ide.config.debugger.outputfilter then
+                m = ide.config.debugger.outputfilter(m)
+              elseif m then
+                local max = 240
+                m = #m < max+4 and m or m:sub(1,max) .. "...\n"
+              end
+              if m then DisplayOutputNoMarker(m) end
+            end})
+      end
+
       if (options.startwith) then
         local file, line, err = debugger.loadfile(options.startwith)
         if err then
-          DisplayOutput(("Can't run the entry point script (%s). Compilation error:\n%s\n")
-            :format(options.startwith, err))
+          DisplayOutputLn(TR("Can't run the entry point script ('%s').")
+            :format(options.startwith)
+            .." "..TR("Compilation error")
+            ..":\n"..err)
           return debugger.terminate()
         end
-      elseif (options.run) then
-        -- do nothing here
-      elseif (debugger.scratchpad) then
-        debugger.scratchpad.updated = true
-      else
+      elseif not (options.run or debugger.scratchpad) then
         local file, line, err = debugger.loadfile(startfile)
         -- "load" can work in two ways: (1) it can load the requested file
         -- OR (2) it can "refuse" to load it if the client was started
         -- with start() method, which can't load new files
         -- if file and line are set, this indicates option #2
-        if file and line then
-          local activated = activateDocument(file, line)
+        if err then
+          DisplayOutputLn(TR("Can't debug the script in the active editor window.")
+            .." "..TR("Compilation error")
+            ..":\n"..err)
+          return debugger.terminate()
+        elseif options.runstart then
+          -- do nothing as no activation is required; the script will be run
+        elseif file and line then
+          local activated = activateDocument(file, line, true)
 
           -- 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, true)
             if activated then
-              debugger.basedir = path
+              debugger.basedir = startpath
               debugger.handle("basedir " .. debugger.basedir)
               -- reset breakpoints again as basedir has changed
               reSetBreakpoints()
             end
           end
 
+          -- if not found and the files doesn't exist, it may be
+          -- a remote call; try to map it to the project folder
+          if not activated and not wx.wxFileName(file):FileExists() then
+            -- file is /foo/bar/my.lua; basedir is d:\local\path\
+            -- check for d:\local\path\my.lua, d:\local\path\bar\my.lua, ...
+            -- wxwidgets on Windows handles \\ and / as separators, but on OSX
+            -- and Linux it only handles 'native' separator;
+            -- need to translate for GetDirs to work.
+            local file = file:gsub("\\", "/")
+            local parts = wx.wxFileName(file):GetDirs()
+            local name = wx.wxFileName(file):GetFullName()
+
+            -- find the longest remote path that can be mapped locally
+            local longestpath, remotedir
+            while true do
+              local mapped = GetFullPathIfExists(basedir, name)
+              if mapped then
+                longestpath = mapped
+                remotedir = file:gsub(q(name):gsub("/", ".").."$", "")
+              end
+              if #parts == 0 then break end
+              name = table.remove(parts, #parts) .. "/" .. name
+            end
+
+            -- if found a local mapping under basedir
+            activated = longestpath and activateDocument(longestpath, line, true)
+            if activated then
+              -- find remote basedir by removing the tail from remote file
+              debugger.handle("basedir " .. debugger.basedir .. "\t" .. remotedir)
+              -- reset breakpoints again as remote basedir has changed
+              reSetBreakpoints()
+              DisplayOutputLn(TR("Mapped remote request for '%s' to '%s'.")
+                :format(remotedir, debugger.basedir))
+            end
+          end
+
           if not activated then
-            DisplayOutput(("Can't find file '%s' to activate for debugging; open the file in the editor before debugging.\n")
+            DisplayOutputLn(TR("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.")
               :format(file))
             return debugger.terminate()
           end
-        elseif err then
-          DisplayOutput(("Can't debug the script in the active editor window. Compilation error:\n%s\n")
-            :format(err))
-          return debugger.terminate()
+
+          -- debugger may still be available for scratchpad,
+          -- if the interpreter signals scratchpad support, so enable it.
+          debugger.scratchable = ide.interpreter.scratchextloop ~= nil
         else
           debugger.scratchable = true
           activateDocument(startfile, 1)
@@ -327,37 +464,40 @@ debugger.listen = function()
       updateStackSync()
       updateWatchesSync()
 
-      DisplayOutput(("Debugging session started in '%s'.\n")
-        :format(debugger.basedir))
+      DisplayOutputLn(TR("Debugging session started in '%s'."):format(debugger.basedir))
 
-      if (options.runstart) then
-        ClearAllCurrentLineMarkers()
-        debugger.run()
-      end
-
-      if (options.run) then
-        local file, line = debugger.handle("run")
-        activateDocument(file, line)
+      if (debugger.scratchpad) then
+        debugger.scratchpad.updated = true
+      else
+        if (options.runstart) then
+          ClearAllCurrentLineMarkers()
+          debugger.run()
+        end
+        if (options.run) then
+          local file, line = debugger.handle("run")
+          activateDocument(file, line)
+        end
       end
     end)
   debugger.listening = true
 end
 
-debugger.handle = function(command, server)
-  local _G = _G
-  local os = os
-  os.exit = function () end
-  _G.print = function (...)
-    if (ide.config.debugger.verbose) then
-      DisplayOutput(...)
-      DisplayOutput("\n")
-    end
+debugger.handle = function(command, server, options)
+  local verbose = ide.config.debugger.verbose
+  local osexit, gprint
+  osexit, os.exit = os.exit, function () end
+  if (verbose) then
+    gprint, _G.print = _G.print, function (...) DisplayOutputLn(...) end
   end
 
   debugger.running = true
-  local file, line, err = mobdebug.handle(command, server or debugger.server)
+  if verbose then DisplayOutputLn("Debugger sent (command):", command) end
+  local file, line, err = mobdebug.handle(command, server or debugger.server, options)
+  if verbose then DisplayOutputLn("Debugger received (file, line, err):", file, line, err) end
   debugger.running = false
 
+  os.exit = osexit
+  if (verbose) then _G.print = gprint end
   return file, line, err
 end
 
@@ -365,13 +505,23 @@ debugger.exec = function(command)
   if debugger.server and not debugger.running then
     copas.addthread(function ()
         local out
+        local attempts = 0
         while true do
+          -- clear markers before running the command
+          -- don't clear if running trace as the marker is then invisible,
+          -- and it needs to be visible during tracing
+          if not debugger.loop then ClearAllCurrentLineMarkers() end
+          debugger.breaking = false
           local file, line, err = debugger.handle(out or command)
           if out then out = nil end
           if line == nil then
-            if err then DisplayOutput(err .. "\n") end
+            if err then DisplayOutputLn(err) end
             DebuggerStop()
             return
+          elseif not debugger.server then
+            -- it is possible that while debugger.handle call was executing
+            -- the debugging was terminated; simply return in this case.
+            return
           else
             if activateDocument(file, line) then
               debugger.stats.line = debugger.stats.line + 1
@@ -383,6 +533,16 @@ debugger.exec = function(command)
                 return
               end
             else
+              -- clear the marker as it wasn't cleared earlier
+              if debugger.loop then ClearAllCurrentLineMarkers() end
+              -- we may be in some unknown location at this point;
+              -- If this happens, stop and report allowing users to set
+              -- breakpoints and step through.
+              if debugger.breaking then
+                DisplayOutputLn(TR("Debugging suspended at %s:%s (couldn't activate the file).")
+                  :format(file, line))
+                return
+              end
               -- redo now; if the call is from the debugger, then repeat
               -- the same command, except when it was "run" (switch to 'step');
               -- this is needed to "break" execution that happens in on() call.
@@ -390,8 +550,13 @@ debugger.exec = function(command)
               -- don't get out of "mobdebug", because it may happen with
               -- start() or on() call, which will get us out of the current
               -- file, which is not what we want.
-              out = (file:find('mobdebug%.lua$')
-                and (command == 'run' and 'step' or command) or "out")
+              -- Some engines (Corona SDK) report =?:0 as the current location.
+              -- repeat the same command, but check if this has been tried
+              -- too many times already; if so, get "out"
+              out = ((tonumber(line) == 0 and attempts < 10) and command
+                or (file:find('mobdebug%.lua$')
+                  and (command == 'run' and 'step' or command) or "out"))
+              attempts = attempts + 1
             end
           end
         end
@@ -411,7 +576,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
@@ -449,6 +622,7 @@ debugger.breaknow = function(command)
     debugger.socket:settimeout(0)
     -- restore running status
     debugger.running = running
+    debugger.breaking = true
     -- don't need to do anything else as the earlier call (run, step, etc.)
     -- will get the results (file, line) back and will update the UI
     return file, line, err
@@ -458,7 +632,8 @@ 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 and not (debugger.options or {}).noeval then
     copas.addthread(function ()
       local _, values, err = debugger.evaluate(var)
       local val = err
@@ -481,6 +656,9 @@ end
 function DebuggerShutdown()
   if debugger.server then debugger.terminate() end
   if debugger.pid then killClient() end
+  -- wait for a little bit as in some rare cases when closing the debugger
+  -- with a running application under OSX, the process crashes (wxlua2.8.12).
+  if ide.osname == "Macintosh" then wx.wxMilliSleep(100) end
 end
 
 function DebuggerStop()
@@ -491,8 +669,8 @@ function DebuggerStop()
     ShellSupportRemote(nil)
     ClearAllCurrentLineMarkers()
     DebuggerScratchpadOff()
-    DisplayOutput(("Debugging session completed (traced %d instruction%s).\n")
-      :format(debugger.stats.line, debugger.stats.line == 1 and '' or 's'))
+    local lines = TR("traced %d instruction", debugger.stats.line):format(debugger.stats.line)
+    DisplayOutputLn(TR("Debugging session completed (%s)."):format(lines))
   else
     -- it's possible that the application couldn't start, or that the
     -- debugger in the application didn't start, which means there is
@@ -535,13 +713,13 @@ function DebuggerCreateStackWindow()
   if (debugger.stackWindow) then return updateStackAndWatches() end
   local width = 360
   local stackWindow = wx.wxFrame(ide.frame, wx.wxID_ANY,
-    "Stack Window",
+    TR("Stack Window"),
     wx.wxDefaultPosition, wx.wxSize(width, 200),
     wx.wxDEFAULT_FRAME_STYLE + wx.wxFRAME_FLOAT_ON_PARENT)
 
   debugger.stackWindow = stackWindow
 
-  local stackCtrl = wx.wxTreeCtrl(stackWindow, ID "debug.stack",
+  local stackCtrl = wx.wxTreeCtrl(stackWindow, wx.wxID_ANY,
     wx.wxDefaultPosition, wx.wxDefaultSize,
     wx.wxTR_LINES_AT_ROOT + wx.wxTR_HAS_BUTTONS + wx.wxTR_SINGLE + wx.wxTR_HIDE_ROOT)
 
@@ -572,7 +750,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)
@@ -593,23 +771,23 @@ function DebuggerCreateWatchWindow()
   if (debugger.watchWindow) then return updateWatches() end
   local width = 360
   local watchWindow = wx.wxFrame(ide.frame, wx.wxID_ANY,
-    "Watch Window",
+    TR("Watch Window"),
     wx.wxDefaultPosition, wx.wxSize(width, 200),
     wx.wxDEFAULT_FRAME_STYLE + wx.wxFRAME_FLOAT_ON_PARENT)
 
   debugger.watchWindow = watchWindow
 
   local watchMenu = wx.wxMenu{
-    { ID_ADDWATCH, "&Add Watch" },
-    { ID_EDITWATCH, "&Edit Watch\tF2" },
-    { ID_REMOVEWATCH, "&Remove Watch" },
-    { ID_EVALUATEWATCH, "Evaluate &Watches" }}
+    { ID_ADDWATCH, TR("&Add Watch")..KSC(ID_ADDWATCH) },
+    { ID_EDITWATCH, TR("&Edit Watch")..KSC(ID_EDITWATCH) },
+    { ID_REMOVEWATCH, TR("&Remove Watch")..KSC(ID_REMOVEWATCH) },
+    { ID_EVALUATEWATCH, TR("Evaluate &Watches")..KSC(ID_EVALUATEWATCH) }}
 
   local watchMenuBar = wx.wxMenuBar()
-  watchMenuBar:Append(watchMenu, "&Watches")
+  watchMenuBar:Append(watchMenu, TR("&Watches"))
   watchWindow:SetMenuBar(watchMenuBar)
 
-  local watchCtrl = wx.wxListCtrl(watchWindow, ID_WATCH_LISTCTRL,
+  local watchCtrl = wx.wxListCtrl(watchWindow, wx.wxID_ANY,
     wx.wxDefaultPosition, wx.wxDefaultSize,
     wx.wxLC_REPORT + wx.wxLC_EDIT_LABELS)
 
@@ -617,11 +795,11 @@ function DebuggerCreateWatchWindow()
 
   local info = wx.wxListItem()
   info:SetMask(wx.wxLIST_MASK_TEXT + wx.wxLIST_MASK_WIDTH)
-  info:SetText("Expression")
+  info:SetText(TR("Expression"))
   info:SetWidth(width * 0.32)
   watchCtrl:InsertColumn(0, info)
 
-  info:SetText("Value")
+  info:SetText(TR("Value"))
   info:SetWidth(width * 0.56)
   watchCtrl:InsertColumn(1, info)
 
@@ -641,6 +819,8 @@ function DebuggerCreateWatchWindow()
     return -1
   end
 
+  local defaultExpr = ""
+
   watchWindow:Connect(wx.wxEVT_CLOSE_WINDOW,
     function (event)
       DebuggerCloseWatchWindow()
@@ -651,9 +831,9 @@ 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, 1, "Value")
+      local row = watchCtrl:InsertItem(watchCtrl:GetItemCount(), TR("Expr"))
+      watchCtrl:SetItem(row, 0, defaultExpr)
+      watchCtrl:SetItem(row, 1, TR("Value"))
       watchCtrl:EditLabel(row)
     end)
 
@@ -690,19 +870,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(), TR("Expr"))
+  watchCtrl:SetItem(row, 0, watch)
+  watchCtrl:SetItem(row, 1, TR("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
@@ -725,7 +928,12 @@ end
 -- scratchpad functions
 
 function DebuggerRefreshScratchpad()
-  if debugger.scratchpad and debugger.scratchpad.updated then
+  if debugger.scratchpad and debugger.scratchpad.updated and not debugger.scratchpad.paused 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,17 +944,17 @@ 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)
 
+      -- wrap into a function call to make "return" to work with scratchpad
+      code = "(function()"..code.."\nend)()"
+
       -- this is a special error message that is generated at the very end
       -- of each script to avoid exiting the (debugee) scratchpad process.
       -- these errors are handled and not reported to the user
       local errormsg = 'execution suspended at ' .. TimeGet()
-      local stopper = "\ndo error('" .. errormsg .. "') end"
+      local stopper = "error('" .. errormsg .. "')"
       -- store if interpreter requires a special handling for external loop
       local extloop = ide.interpreter.scratchextloop
 
@@ -755,6 +963,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,26 +978,23 @@ 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 TR("Scratchpad error") or TR("Compilation error")
 
         if not err then
           _, _, err = debugger.handle("run")
-          prefix = "Execution error"
+          prefix = TR("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 == TR("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")
+          DisplayOutputLn(prefix
+            ..(line and (" "..TR("on line %d"):format(line)) or "")
+            ..":\n"..err:gsub('stack traceback:.+', ''):gsub('\n+$', ''))
         end
         debugger.scratchpad.running = false
       end
@@ -800,23 +1007,32 @@ end
 local numberStyle = wxstc.wxSTC_LUA_NUMBER
 
 function DebuggerScratchpadOn(editor)
-  debugger.scratchpad = {editor = editor}
+  -- first check if there is already scratchpad editor.
+  -- this may happen when more than one editor is being added...
 
-  -- check if the debugger is already running; this happens when
-  -- scratchpad is turned on after external script has connected
-  if debugger.server then
-    debugger.scratchpad.updated = true
-    ClearAllCurrentLineMarkers()
-    SetAllEditorsReadOnly(false)
-    ShellSupportRemote(nil) -- disable remote shell
-    DebuggerRefreshScratchpad()
-  elseif not ProjectDebug(true, "scratchpad") then
-    debugger.scratchpad = nil
-    return
+  if debugger.scratchpad and debugger.scratchpad.editors then
+    debugger.scratchpad.editors[editor] = true
+  else
+    debugger.scratchpad = {editor = editor, editors = {[editor] = true}}
+
+    -- check if the debugger is already running; this happens when
+    -- scratchpad is turned on after external script has connected
+    if debugger.server then
+      debugger.scratchpad.updated = true
+      ClearAllCurrentLineMarkers()
+      SetAllEditorsReadOnly(false)
+      ShellSupportRemote(nil) -- disable remote shell
+      DebuggerRefreshScratchpad()
+    elseif not ProjectDebug(true, "scratchpad") then
+      debugger.scratchpad = nil
+      return
+    end
   end
 
   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()
@@ -825,6 +1041,7 @@ function DebuggerScratchpadOn(editor)
         bit.band(evtype,wxstc.wxSTC_PERFORMED_UNDO) ~= 0 or
         bit.band(evtype,wxstc.wxSTC_PERFORMED_REDO) ~= 0) then
       debugger.scratchpad.updated = true
+      debugger.scratchpad.editor = scratchpadEditor
     end
     event:Skip()
   end)
@@ -861,8 +1078,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
@@ -871,7 +1088,7 @@ function DebuggerScratchpadOn(editor)
   scratchpadEditor:Connect(wx.wxEVT_LEFT_UP, function(event)
     if debugger.scratchpad and debugger.scratchpad.point then
       debugger.scratchpad.point = nil
-      debugger.scratchpad.editor:ReleaseMouse()
+      scratchpadEditor:ReleaseMouse()
       wx.wxSetCursor(wx.wxNullCursor) -- restore cursor
     else event:Skip() end
   end)
@@ -884,31 +1101,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)
 
@@ -918,13 +1156,16 @@ end
 function DebuggerScratchpadOff()
   if not debugger.scratchpad then return end
 
-  local scratchpadEditor = debugger.scratchpad.editor
-  scratchpadEditor:StyleSetUnderline(numberStyle, false)
-  scratchpadEditor:Disconnect(wx.wxID_ANY, wx.wxID_ANY, wxstc.wxEVT_STC_MODIFIED)
-  scratchpadEditor:Disconnect(wx.wxID_ANY, wx.wxID_ANY, wx.wxEVT_MOTION)
-  scratchpadEditor:Disconnect(wx.wxID_ANY, wx.wxID_ANY, wx.wxEVT_LEFT_DOWN)
-  scratchpadEditor:Disconnect(wx.wxID_ANY, wx.wxID_ANY, wx.wxEVT_LEFT_UP)
-  scratchpadEditor:Disconnect(wx.wxID_ANY, wx.wxID_ANY, wx.wxEVT_SET_CURSOR)
+  for scratchpadEditor in pairs(debugger.scratchpad.editors) do
+    scratchpadEditor:StyleSetUnderline(numberStyle, false)
+    scratchpadEditor:Disconnect(wx.wxID_ANY, wx.wxID_ANY, wxstc.wxEVT_STC_MODIFIED)
+    scratchpadEditor:Disconnect(wx.wxID_ANY, wx.wxID_ANY, wx.wxEVT_MOTION)
+    scratchpadEditor:Disconnect(wx.wxID_ANY, wx.wxID_ANY, wx.wxEVT_LEFT_DOWN)
+    scratchpadEditor:Disconnect(wx.wxID_ANY, wx.wxID_ANY, wx.wxEVT_LEFT_UP)
+    scratchpadEditor:Disconnect(wx.wxID_ANY, wx.wxID_ANY, wx.wxEVT_SET_CURSOR)
+  end
+
+  wx.wxSetCursor(wx.wxNullCursor) -- restore cursor
 
   debugger.scratchpad = nil
   debugger.terminate()

src/editor/editor.lua

@@ -28,9 +28,9 @@ local function updateStatusText(editor)
     local col = 1 + pos - editor:PositionFromLine(line)
 
     texts = {
-      iff(editor:GetOvertype(), "OVR", "INS"),
-      iff(editor:GetReadOnly(), "R/O", "R/W"),
-      "Ln: "..tostring(line + 1).." Col: "..tostring(col) }
+      iff(editor:GetOvertype(), TR("OVR"), TR("INS")),
+      iff(editor:GetReadOnly(), TR("R/O"), TR("R/W")),
+      TR("Ln: %d"):format(line + 1).." "..TR("Col: %d"):format(col) }
   end
 
   if ide.frame then
@@ -103,11 +103,14 @@ local function isFileAlteredOnDisk(editor)
       local modTime = GetFileModTime(filePath)
       if modTime == nil then
         openDocuments[id].modTime = nil
-        wx.wxMessageBox(fileName.." is no longer on the disk.",
+        wx.wxMessageBox(
+          TR("File '%s' no longer exists."):format(fileName),
           GetIDEString("editormessage"),
           wx.wxOK + wx.wxCENTRE, ide.frame)
       elseif not editor:GetReadOnly() and modTime:IsValid() and oldModTime:IsEarlierThan(modTime) then
-        local ret = wx.wxMessageBox(fileName.." has been modified on disk.\nDo you want to reload it?",
+        local ret = wx.wxMessageBox(
+          TR("File '%s' has been modified on disk."):format(fileName)
+          .."\n"..TR("Do you want to reload it?"),
           GetIDEString("editormessage"),
           wx.wxYES_NO + wx.wxCENTRE, ide.frame)
 
@@ -141,18 +144,18 @@ function SetEditorSelection(selection)
   ide.frame:SetTitle(getFileTitle(editor))
 
   if editor then
-    if funclist:IsEmpty() then funclist:Append('Jump to a function definition...', 0) end
+    if funclist:IsEmpty() then funclist:Append(TR("Jump to a function definition..."), 0) end
     funclist:SetSelection(0)
 
     editor:SetFocus()
     editor:SetSTCFocus(true)
     local id = editor:GetId()
-    if openDocuments[id] and openDocuments[id].filePath then
-      FileTreeMarkSelected(openDocuments[id].filePath)
-    end
+    FileTreeMarkSelected(openDocuments[id] and openDocuments[id].filePath or '')
   else
     FileTreeMarkSelected('')
   end
+
+  SetAutoRecoveryMark()
 end
 
 function GetEditorFileAndCurInfo(nochecksave)
@@ -163,9 +166,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 +183,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,87 +195,126 @@ 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)
   local localpos = pos-linestart
 
   local lt = linetx:sub(1,localpos)
-  lt = lt:gsub("%s*("..editor.spec.sep..")%s*",function(a) return a end)
-  lt = lt:gsub("%s*%b[]%s*","")
-  lt = lt:gsub("%s*%b()%s*","")
-  lt = lt:gsub("%s*%b{}%s*","")
+  lt = lt:gsub("%s*(["..editor.spec.sep.."])%s*", "%1")
   lt = lt:match("[^%[%(%s]*$")
-  lt = lt:gsub("%s","")
 
   -- know now which string is to be completed
   local userList = CreateAutoCompList(editor,lt)
-  if userList and string.len(userList) > 0 then
+  -- don't show the list if the only option is what's already typed
+  if userList and #userList > 0 and userList ~= lt then
     editor:UserListShow(1, userList)
   elseif editor:AutoCompActive() then
     editor:AutoCompCancel()
   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)
+  -- don't show anything if the calltip is active; this may happen after
+  -- typing function name, while the mouse is over a different function.
+  if editor:CallTipActive() then return end
+
+  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
+    -- only shorten if shown on mouse-over. Use shortcut to get full info.
+    local shortento = 450
+    local showtooltip = ide.frame.menuBar:FindItem(ID_SHOWTOOLTIP)
+    local suffix = "...\n"
+        ..TR("Use '%s' to see full description."):format(showtooltip:GetLabel())
+    if x and y and #tip > shortento then
+      tip = tip:sub(1, shortento-#suffix):gsub("%W*%w*$","")..suffix
+    end
     editor:CallTipShow(pos, tip)
   end
 end
 
+function EditorIsModified(editor)
+  local modified = false
+  if editor then
+    local id = editor:GetId()
+    modified = openDocuments[id]
+      and (openDocuments[id].isModified or not openDocuments[id].filePath)
+  end
+  return modified
+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
@@ -299,11 +340,15 @@ function CreateEditor(name)
     editor:SetWrapVisualFlagsLocation(wxstc.wxSTC_WRAPVISUALFLAGLOC_END_BY_TEXT)
   end
 
+  if (ide.config.editor.defaulteol == wxstc.wxSTC_EOL_CRLF
+     or ide.config.editor.defaulteol == wxstc.wxSTC_EOL_LF) then
+    editor:SetEOLMode(ide.config.editor.defaulteol)
+  -- else: keep wxStyledTextCtrl default behavior (CRLF on Windows, LF on Unix)
+  end
+
   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
 
@@ -311,8 +356,8 @@ function CreateEditor(name)
   editor:SetMarginType(1, wxstc.wxSTC_MARGIN_SYMBOL)
   editor:SetMarginSensitive(1, true)
 
-  editor:MarkerDefine(BREAKPOINT_MARKER, wxstc.wxSTC_MARK_ROUNDRECT, wx.wxWHITE, wx.wxRED)
-  editor:MarkerDefine(CURRENT_LINE_MARKER, wxstc.wxSTC_MARK_ARROW, wx.wxBLACK, wx.wxGREEN)
+  editor:MarkerDefine(StylesGetMarker("currentline"))
+  editor:MarkerDefine(StylesGetMarker("breakpoint"))
 
   editor:SetMarginWidth(2, 16) -- fold margin
   editor:SetMarginType(2, wxstc.wxSTC_MARGIN_SYMBOL)
@@ -323,18 +368,20 @@ function CreateEditor(name)
     wxstc.wxSTC_FOLDFLAG_LINEAFTER_CONTRACTED)
 
   editor:SetProperty("fold", "1")
-  editor:SetProperty("fold.compact", "1")
+  editor:SetProperty("fold.compact", ide.config.editor.foldcompact and "1" or "0")
   editor:SetProperty("fold.comment", "1")
 
-  local grey = wx.wxColour(128, 128, 128)
-  editor:MarkerDefine(wxstc.wxSTC_MARKNUM_FOLDEROPEN, wxstc.wxSTC_MARK_BOXMINUS, wx.wxWHITE, grey)
-  editor:MarkerDefine(wxstc.wxSTC_MARKNUM_FOLDER, wxstc.wxSTC_MARK_BOXPLUS, wx.wxWHITE, grey)
-  editor:MarkerDefine(wxstc.wxSTC_MARKNUM_FOLDERSUB, wxstc.wxSTC_MARK_VLINE, wx.wxWHITE, grey)
-  editor:MarkerDefine(wxstc.wxSTC_MARKNUM_FOLDERTAIL, wxstc.wxSTC_MARK_LCORNER, wx.wxWHITE, grey)
-  editor:MarkerDefine(wxstc.wxSTC_MARKNUM_FOLDEREND, wxstc.wxSTC_MARK_BOXPLUSCONNECTED, wx.wxWHITE, grey)
-  editor:MarkerDefine(wxstc.wxSTC_MARKNUM_FOLDEROPENMID, wxstc.wxSTC_MARK_BOXMINUSCONNECTED, wx.wxWHITE, grey)
-  editor:MarkerDefine(wxstc.wxSTC_MARKNUM_FOLDERMIDTAIL, wxstc.wxSTC_MARK_TCORNER, wx.wxWHITE, grey)
-  grey:delete()
+  do
+    local fg, bg = wx.wxWHITE, wx.wxColour(128, 128, 128)
+    editor:MarkerDefine(wxstc.wxSTC_MARKNUM_FOLDEROPEN, wxstc.wxSTC_MARK_BOXMINUS, fg, bg)
+    editor:MarkerDefine(wxstc.wxSTC_MARKNUM_FOLDER, wxstc.wxSTC_MARK_BOXPLUS, fg, bg)
+    editor:MarkerDefine(wxstc.wxSTC_MARKNUM_FOLDERSUB, wxstc.wxSTC_MARK_VLINE, fg, bg)
+    editor:MarkerDefine(wxstc.wxSTC_MARKNUM_FOLDERTAIL, wxstc.wxSTC_MARK_LCORNER, fg, bg)
+    editor:MarkerDefine(wxstc.wxSTC_MARKNUM_FOLDEREND, wxstc.wxSTC_MARK_BOXPLUSCONNECTED, fg, bg)
+    editor:MarkerDefine(wxstc.wxSTC_MARKNUM_FOLDEROPENMID, wxstc.wxSTC_MARK_BOXMINUSCONNECTED, fg, bg)
+    editor:MarkerDefine(wxstc.wxSTC_MARKNUM_FOLDERMIDTAIL, wxstc.wxSTC_MARK_TCORNER, fg, bg)
+    bg:delete()
+  end
 
   if ide.config.editor.calltipdelay and ide.config.editor.calltipdelay > 0 then
     editor:SetMouseDwellTime(ide.config.editor.calltipdelay)
@@ -367,6 +414,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,30 +451,56 @@ 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 (ch == char_LF) 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
         local tip = GetTipInfo(editor,linetxtopos,ide.config.acandtip.shorttip)
         if tip then
+          if editor:CallTipActive() then editor:CallTipCancel() end
           editor:CallTipShow(pos,tip)
         end
 
       elseif ide.config.autocomplete then -- code completion prompt
         local trigger = linetxtopos:match("["..editor.spec.sep.."%w_]+$")
-        if (trigger and (#trigger > 1 or trigger:match("[%.:]"))) then
+        if (trigger and (#trigger > 1 or trigger:match("["..editor.spec.sep.."]"))) then
           ide.frame:AddPendingEvent(wx.wxCommandEvent(
             wx.wxEVT_COMMAND_MENU_SELECTED, ID_AUTOCOMPLETE))
         end
@@ -434,9 +509,28 @@ 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
+
+      -- event:GetX() and event:GetY() positions don't correspond to
+      -- the correct positions calculated using ScreenToClient (at least
+      -- on Windows and Linux), so use what's calculated.
+      local mpos = wx.wxGetMousePosition()
+      local cpos = editor:ScreenToClient(mpos)
+      local position = editor:PositionFromPointClose(cpos.x, cpos.y)
       if position ~= wxstc.wxSTC_INVALID_POSITION then
-        EditorCallTip(editor, position)
+        EditorCallTip(editor, position, mpos.x, mpos.y)
       end
       event:Skip()
     end)
@@ -447,6 +541,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 +615,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 +652,52 @@ function CreateEditor(name)
       end
     end)
 
+  local value
+  editor:Connect(wx.wxEVT_CONTEXT_MENU,
+    function (event)
+      local menu = wx.wxMenu()
+      menu:Append(ID_UNDO, TR("&Undo"))
+      menu:Append(ID_REDO, TR("&Redo"))
+      menu:AppendSeparator()
+      menu:Append(ID_CUT, TR("Cu&t"))
+      menu:Append(ID_COPY, TR("&Copy"))
+      menu:Append(ID_PASTE, TR("&Paste"))
+      menu:Append(ID_SELECTALL, TR("Select &All"))
+      menu:AppendSeparator()
+      menu:Append(ID_QUICKADDWATCH, TR("Add Watch Expression"))
+      menu:Append(ID_QUICKEVAL, TR("Evaluate in Console"))
+      menu:Append(ID_ADDTOSCRATCHPAD, TR("Add to Scratchpad"))
+
+      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)
+
+      local debugger = ide.debugger
+      menu:Enable(ID_ADDTOSCRATCHPAD, debugger.scratchpad
+        and debugger.scratchpad.editors and not debugger.scratchpad.editors[editor])
+
+      -- 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)
+
+  editor:Connect(ID_ADDTOSCRATCHPAD, wx.wxEVT_COMMAND_MENU_SELECTED,
+    function(event) DebuggerScratchpadOn(editor) 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 +708,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 +832,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 +852,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

@@ -55,7 +55,7 @@ local function treeAddDir(tree,parent_id,rootdir)
 
   -- append directories
   for _,dir in ipairs(FileSysGet(search,wx.wxDIR)) do
-    local name = dir:match("%"..string_Pathsep.."("..stringset_File.."+)$")
+    local name = dir:match("("..stringset_File.."+)$")
     local icon = 0
     local item = items[name .. icon]
     if item then -- existing item
@@ -79,7 +79,7 @@ local function treeAddDir(tree,parent_id,rootdir)
 
   -- then append files
   for _,file in ipairs(FileSysGet(search,wx.wxFILE)) do
-    local name = file:match("%"..string_Pathsep.."("..stringset_File.."+)$")
+    local name = file:match("("..stringset_File.."+)$")
     local known = GetSpec(GetFileExt(name))
     local icon = known and 1 or 2
     local item = items[name .. icon]
@@ -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
@@ -190,9 +203,10 @@ local projcombobox = wx.wxComboBox(projpanel, ID "filetree.proj.drivecb",
   wx.wxDefaultPosition, wx.wxDefaultSize,
   filetree.projdirTextArray, wx.wxTE_PROCESS_ENTER)
 
-local projbutton = wx.wxButton(projpanel, ID "debug.projectdir.choose", "...",wx.wxDefaultPosition, wx.wxSize(26,20))
+local projbutton = wx.wxButton(projpanel, ID_PROJECTDIRCHOOSE,
+  "...",wx.wxDefaultPosition, wx.wxSize(26,20))
 
-local projtree = wx.wxTreeCtrl(projpanel, ID "filetree.projtree",
+local projtree = wx.wxTreeCtrl(projpanel, wx.wxID_ANY,
   wx.wxDefaultPosition, wx.wxDefaultSize,
   filetree.showroot
   and (wx.wxTR_LINES_AT_ROOT + wx.wxTR_HAS_BUTTONS + wx.wxTR_SINGLE)
@@ -237,6 +251,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

@@ -3,13 +3,6 @@
 ---------------------------------------------------------
 local ide = ide
 
--- Global variables
--- Markers for editor marker margin
-BREAKPOINT_MARKER = 1
-BREAKPOINT_MARKER_VALUE = 2 -- = 2^BREAKPOINT_MARKER
-CURRENT_LINE_MARKER = 2
-CURRENT_LINE_MARKER_VALUE = 4 -- = 2^CURRENT_LINE_MARKER
-
 -- Pick some reasonable fixed width fonts to use for the editor
 local function setFont(style, config, name, size)
   return wx.wxFont(config.fontsize or size or 10, wx.wxFONTFAMILY_MODERN, style,
@@ -65,30 +58,54 @@ local function createFrame()
   return frame
 end
 
+local function SCinB(id) -- shortcut in brackets
+  local shortcut = KSC(id):gsub("\t","")
+  return shortcut and #shortcut > 0 and (" ("..shortcut..")") or ""
+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.
+    -- Windows with wxwidgets 2.9.x also requires a larger size.
+    wx.wxDefaultPosition, wx.wxSize.new(240,
+      (ide.osname == "Unix" or ide.osname == "Windows") 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()
-  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")
-  toolBar:AddTool(ID_SAVEALL, "Save All", getBitmap(wx.wxART_NEW_DIR, wx.wxART_TOOLBAR, toolBmpSize), "Save all documents")
+  local toolBmpSize = wx.wxSize(16, 16)
+  toolBar:AddTool(ID_NEW, "New", getBitmap(wx.wxART_NORMAL_FILE, wx.wxART_TOOLBAR, toolBmpSize), TR("Create an empty document")..SCinB(ID_NEW))
+  toolBar:AddTool(ID_OPEN, "Open", getBitmap(wx.wxART_FILE_OPEN, wx.wxART_TOOLBAR, toolBmpSize), TR("Open an existing document")..SCinB(ID_OPEN))
+  toolBar:AddTool(ID_SAVE, "Save", getBitmap(wx.wxART_FILE_SAVE, wx.wxART_TOOLBAR, toolBmpSize), TR("Save the current document")..SCinB(ID_SAVE))
+  toolBar:AddTool(ID_SAVEALL, "Save All", getBitmap(wx.wxART_NEW_DIR, wx.wxART_TOOLBAR, toolBmpSize), TR("Save all open documents")..SCinB(ID_SAVEALL))
   toolBar:AddSeparator()
-  toolBar:AddTool(ID_CUT, "Cut", getBitmap(wx.wxART_CUT, wx.wxART_TOOLBAR, toolBmpSize), "Cut the selection")
-  toolBar:AddTool(ID_COPY, "Copy", getBitmap(wx.wxART_COPY, wx.wxART_TOOLBAR, toolBmpSize), "Copy the selection")
-  toolBar:AddTool(ID_PASTE, "Paste", getBitmap(wx.wxART_PASTE, wx.wxART_TOOLBAR, toolBmpSize), "Paste text from the clipboard")
+  toolBar:AddTool(ID_CUT, "Cut", getBitmap(wx.wxART_CUT, wx.wxART_TOOLBAR, toolBmpSize), TR("Cut selected text to clipboard")..SCinB(ID_CUT))
+  toolBar:AddTool(ID_COPY, "Copy", getBitmap(wx.wxART_COPY, wx.wxART_TOOLBAR, toolBmpSize), TR("Copy selected text to clipboard")..SCinB(ID_COPY))
+  toolBar:AddTool(ID_PASTE, "Paste", getBitmap(wx.wxART_PASTE, wx.wxART_TOOLBAR, toolBmpSize), TR("Paste text from the clipboard")..SCinB(ID_PASTE))
   toolBar:AddSeparator()
-  toolBar:AddTool(ID_UNDO, "Undo", getBitmap(wx.wxART_UNDO, wx.wxART_TOOLBAR, toolBmpSize), "Undo last edit")
-  toolBar:AddTool(ID_REDO, "Redo", getBitmap(wx.wxART_REDO, wx.wxART_TOOLBAR, toolBmpSize), "Redo last undo")
+  toolBar:AddTool(ID_UNDO, "Undo", getBitmap(wx.wxART_UNDO, wx.wxART_TOOLBAR, toolBmpSize), TR("Undo last edit")..SCinB(ID_UNDO))
+  toolBar:AddTool(ID_REDO, "Redo", getBitmap(wx.wxART_REDO, wx.wxART_TOOLBAR, toolBmpSize), TR("Redo last edit undone")..SCinB(ID_REDO))
   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")
+  toolBar:AddTool(ID_FIND, "Find", getBitmap(wx.wxART_FIND, wx.wxART_TOOLBAR, toolBmpSize), TR("Find text")..SCinB(ID_FIND))
+  toolBar:AddTool(ID_REPLACE, "Replace", getBitmap(wx.wxART_FIND_AND_REPLACE, wx.wxART_TOOLBAR, toolBmpSize), TR("Find and replace text")..SCinB(ID_REPLACE))
+  if ide.app.createbitmap then -- custom handler should handle all bitmaps
+    toolBar:AddSeparator()
+    toolBar:AddTool(ID_STARTDEBUG, "Start Debugging", getBitmap("wxART_DEBUG_START", wx.wxART_TOOLBAR, toolBmpSize), TR("Start debugging")..SCinB(ID_STARTDEBUG))
+    toolBar:AddTool(ID_STOPDEBUG, "Stop Debugging", getBitmap("wxART_DEBUG_STOP", wx.wxART_TOOLBAR, toolBmpSize), TR("Stop the currently running process")..SCinB(ID_STOPDEBUG))
+    toolBar:AddTool(ID_BREAK, "Break", getBitmap("wxART_DEBUG_BREAK", wx.wxART_TOOLBAR, toolBmpSize), TR("Break execution at the next executed line of code")..SCinB(ID_BREAK))
+    toolBar:AddTool(ID_STEP, "Step into", getBitmap("wxART_DEBUG_STEP_INTO", wx.wxART_TOOLBAR, toolBmpSize), TR("Step into")..SCinB(ID_STEP))
+    toolBar:AddTool(ID_STEPOVER, "Step over", getBitmap("wxART_DEBUG_STEP_OVER", wx.wxART_TOOLBAR, toolBmpSize), TR("Step over")..SCinB(ID_STEPOVER))
+    toolBar:AddTool(ID_STEPOUT, "Step out", getBitmap("wxART_DEBUG_STEP_OUT", wx.wxART_TOOLBAR, toolBmpSize), TR("Step out of the current function")..SCinB(ID_STEPOUT))
+    toolBar:AddSeparator()
+    toolBar:AddTool(ID_TOGGLEBREAKPOINT, "Toggle breakpoint", getBitmap("wxART_DEBUG_BREAKPOINT_TOGGLE", wx.wxART_TOOLBAR, toolBmpSize), TR("Toggle breakpoint")..SCinB(ID_TOGGLEBREAKPOINT))
+    toolBar:AddTool(ID_VIEWCALLSTACK, "Stack window", getBitmap("wxART_DEBUG_CALLSTACK", wx.wxART_TOOLBAR, toolBmpSize), TR("View the stack window")..SCinB(ID_VIEWCALLSTACK))
+    toolBar:AddTool(ID_VIEWWATCHWINDOW, "Watch window", getBitmap("wxART_DEBUG_WATCH", wx.wxART_TOOLBAR, toolBmpSize), TR("View the watch window")..SCinB(ID_VIEWWATCHWINDOW))
+  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_PROJECTDIRFROMFILE, "Update", getBitmap(wx.wxART_GO_DIR_UP , wx.wxART_TOOLBAR, toolBmpSize), TR("Set project directory from current file")..SCinB(ID_PROJECTDIRFROMFILE))
   toolBar:AddSeparator()
   toolBar:AddControl(funclist)
   toolBar:Realize()
@@ -98,7 +115,6 @@ local function createToolBar(frame)
   return toolBar
 end
 
-
 local function createNotebook(frame)
   -- notebook for editors
   local notebook = wxaui.wxAuiNotebook(frame, wx.wxID_ANY,
@@ -127,6 +143,47 @@ local function createNotebook(frame)
       event:Veto() -- don't propagate the event as the page is already closed
     end)
 
+  local selection
+  notebook:Connect(wxaui.wxEVT_COMMAND_AUINOTEBOOK_TAB_RIGHT_UP,
+    function (event)
+      selection = event:GetSelection() -- save tab index the event is for
+      local menu = wx.wxMenu()
+      menu:Append(ID_CLOSE, TR("&Close Page"))
+      menu:Append(ID_CLOSEALL, TR("Close A&ll Pages"))
+      menu:Append(ID_CLOSEOTHER, TR("Close &Other Pages"))
+      menu:AppendSeparator()
+      menu:Append(ID_SAVE, TR("&Save"))
+      menu:Append(ID_SAVEAS, TR("Save &As..."))
+      notebook:PopupMenu(menu)
+    end)
+
+  local function IfAtLeastOneTab(event) event:Enable(notebook:GetPageCount() > 0) end
+  local function IfModified(event) event:Enable(EditorIsModified(GetEditor(selection))) end
+
+  notebook:Connect(ID_SAVE, wx.wxEVT_COMMAND_MENU_SELECTED, function ()
+      local editor = GetEditor(selection)
+      SaveFile(editor, openDocuments[editor:GetId()].filePath)
+    end)
+  notebook:Connect(ID_SAVE, wx.wxEVT_UPDATE_UI, IfModified)
+  notebook:Connect(ID_SAVEAS, wx.wxEVT_COMMAND_MENU_SELECTED, function()
+      SaveFileAs(GetEditor(selection))
+    end)
+  notebook:Connect(ID_SAVEAS, wx.wxEVT_UPDATE_UI, IfAtLeastOneTab)
+  notebook:Connect(ID_CLOSE, wx.wxEVT_COMMAND_MENU_SELECTED, function()
+      ClosePage(selection)
+    end)
+  notebook:Connect(ID_CLOSE, wx.wxEVT_UPDATE_UI, IfAtLeastOneTab)
+  notebook:Connect(ID_CLOSEALL, wx.wxEVT_COMMAND_MENU_SELECTED, function()
+      CloseAllPagesExcept(nil)
+    end)
+  notebook:Connect(ID_CLOSEALL, wx.wxEVT_UPDATE_UI, IfAtLeastOneTab)
+  notebook:Connect(ID_CLOSEOTHER, wx.wxEVT_COMMAND_MENU_SELECTED, function ()
+      CloseAllPagesExcept(selection)
+    end)
+  notebook:Connect(ID_CLOSEOTHER, wx.wxEVT_UPDATE_UI, function (event)
+      event:Enable(notebook:GetPageCount() > 1)
+    end)
+
   frame.notebook = notebook
   return notebook
 end
@@ -138,14 +195,14 @@ local function createBottomNotebook(frame)
     wxaui.wxAUI_NB_DEFAULT_STYLE + wxaui.wxAUI_NB_TAB_EXTERNAL_MOVE
     - wxaui.wxAUI_NB_CLOSE_ON_ACTIVE_TAB + wx.wxNO_BORDER)
 
-  local errorlog = wxstc.wxStyledTextCtrl(bottomnotebook, ID "output",
+  local errorlog = wxstc.wxStyledTextCtrl(bottomnotebook, wx.wxID_ANY,
     wx.wxDefaultPosition, wx.wxDefaultSize, wx.wxBORDER_STATIC)
 
-  local shellbox = wxstc.wxStyledTextCtrl(bottomnotebook, ID "shell",
+  local shellbox = wxstc.wxStyledTextCtrl(bottomnotebook, wx.wxID_ANY,
     wx.wxDefaultPosition, wx.wxDefaultSize, wx.wxBORDER_STATIC)
 
-  bottomnotebook:AddPage(errorlog, "Output", true)
-  bottomnotebook:AddPage(shellbox, "Local console", false)
+  bottomnotebook:AddPage(errorlog, TR("Output"), true)
+  bottomnotebook:AddPage(shellbox, TR("Local console"), false)
   bottomnotebook:Connect(wxaui.wxEVT_COMMAND_AUINOTEBOOK_PAGE_CLOSE,
     function (event)
       event:Veto() -- don't allow closing pages in this notebook
@@ -189,7 +246,7 @@ do
               CenterPane():PaneBorder(false):Hide())
               
   mgr:AddPane(frame.projpanel, wxaui.wxAuiPaneInfo():
-              Name("projpanel"):Caption("Project"):
+              Name("projpanel"):Caption(TR("Project")):
               MinSize(200,200):FloatingSize(200,400):
               Left():Layer(1):Position(1):
               CloseButton(true):MaximizeButton(false):PinButton(true):Hide())

src/editor/ids.lua

@@ -13,9 +13,12 @@ end
 ID_NEW              = wx.wxID_NEW
 ID_OPEN             = wx.wxID_OPEN
 ID_CLOSE            = NewID()
+ID_CLOSEALL         = NewID()
+ID_CLOSEOTHER       = NewID()
 ID_SAVE             = wx.wxID_SAVE
 ID_SAVEAS           = wx.wxID_SAVEAS
 ID_SAVEALL          = NewID()
+ID_RECENTFILES      = NewID()
 ID_EXIT             = wx.wxID_EXIT
 -- Edit menu
 ID_CUT              = wx.wxID_CUT
@@ -24,47 +27,58 @@ ID_PASTE            = wx.wxID_PASTE
 ID_SELECTALL        = wx.wxID_SELECTALL
 ID_UNDO             = wx.wxID_UNDO
 ID_REDO             = wx.wxID_REDO
+ID_SHOWTOOLTIP      = NewID()
 ID_AUTOCOMPLETE     = NewID()
-ID_AUTOCOMPLETE_ENABLE = NewID()
+ID_AUTOCOMPLETEENABLE = NewID()
 ID_COMMENT          = NewID()
 ID_FOLD             = NewID()
--- Find menu
+ID_CLEARDYNAMICWORDS = NewID()
+-- Search menu
 ID_FIND             = wx.wxID_FIND
 ID_FINDNEXT         = NewID()
 ID_FINDPREV         = NewID()
 ID_REPLACE          = NewID()
-ID_FIND_IN_FILES    = NewID()
-ID_REPLACE_IN_FILES = NewID()
+ID_FINDINFILES      = NewID()
+ID_REPLACEINFILES   = NewID()
 ID_GOTOLINE         = NewID()
 ID_SORT             = NewID()
--- Project/Debug menu
-ID_TOGGLEBREAKPOINT = NewID()
-ID_COMPILE          = NewID()
-ID_RUN              = NewID()
-ID_RUNNOW           = NewID()
-ID_ATTACH_DEBUG     = NewID()
-ID_START_DEBUG      = NewID()
-ID_STOP_DEBUG       = NewID()
-ID_STEP             = NewID()
-ID_STEP_OVER        = NewID()
-ID_STEP_OUT         = NewID()
-ID_CONTINUE         = NewID()
-ID_BREAK            = NewID()
-ID_TRACE            = NewID()
+-- View menu
+ID_VIEWFILETREE     = NewID()
+ID_VIEWOUTPUT       = NewID()
 ID_VIEWCALLSTACK    = NewID()
 ID_VIEWWATCHWINDOW  = NewID()
-ID_FULLSCREEN       = NewID()
+ID_VIEWDEFAULTLAYOUT = NewID()
+ID_VIEWFULLSCREEN   = NewID()
+-- Project menu
+ID_TOGGLEBREAKPOINT = NewID()
+ID_COMPILE          = NewID()
+ID_ANALYZE          = NewID()
+ID_RUN              = NewID()
+ID_RUNNOW           = NewID()
+ID_ATTACHDEBUG      = NewID()
+ID_STARTDEBUG       = NewID()
+ID_STOPDEBUG        = NewID()
+ID_STEP             = NewID()
+ID_STEPOVER         = NewID()
+ID_STEPOUT          = NewID()
+ID_BREAK            = NewID()
+ID_TRACE            = NewID()
 ID_CLEAROUTPUT      = NewID()
-ID_PROJECTDIR       = NewID()
 ID_INTERPRETER      = NewID()
+ID_PROJECTDIR       = NewID()
+ID_PROJECTDIRFROMFILE = NewID()
+ID_PROJECTDIRCHOOSE = NewID()
 -- Help menu
 ID_ABOUT            = wx.wxID_ABOUT
 -- Watch window menu items
-ID_WATCH_LISTCTRL   = NewID()
 ID_ADDWATCH         = NewID()
 ID_EDITWATCH        = NewID()
 ID_REMOVEWATCH      = NewID()
 ID_EVALUATEWATCH    = NewID()
+-- Editor popup menu items
+ID_QUICKADDWATCH    = NewID()
+ID_QUICKEVAL        = NewID()
+ID_ADDTOSCRATCHPAD  = 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
@@ -136,13 +140,12 @@ function M.show_warnings(top_ast)
 end
 
 local frame = ide.frame
-local menu = frame.menuBar:GetMenu(frame.menuBar:FindMenu("&Project"))
-local ID_ANALYZE = ID "debug.analyze"
+local menu = frame.menuBar:GetMenu(frame.menuBar:FindMenu(TR("&Project")))
 
 -- insert after "Compile" item
 for item = 0, menu:GetMenuItemCount()-1 do
    if menu:FindItemByPosition(item):GetId() == ID_COMPILE then
-     menu:Insert(item+1, ID_ANALYZE, "Analyze\tShift-F7", "Analyze the source code")
+     menu:Insert(item+1, ID_ANALYZE, TR("Analyze")..KSC(ID_ANALYZE), TR("Analyze the source code"))
      break
    end
 end
@@ -156,7 +159,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/keymap.lua

@@ -0,0 +1,99 @@
+local ide = ide
+
+--[[
+Accelerator general syntax is any combination of "CTRL", "ALT" and "SHIFT"
+strings (case doesn't matter) separated by either '-' or '+' characters and
+followed by the accelerator itself. The accelerator may be any alphanumeric
+character, any function key (from F1 to F12) or one of the special characters
+listed below (again, case doesn't matter):
+
+  DEL/DELETE   Delete key
+  INS/INSERT   Insert key
+  ENTER/RETURN Enter key
+  PGUP         PageUp key
+  PGDN         PageDown key
+  LEFT         Left cursor arrow key
+  RIGHT        Right cursor arrow key
+  UP           Up cursor arrow key
+  DOWN         Down cursor arrow key
+  HOME         Home key
+  END          End key
+  SPACE        Space
+  TAB          Tab key
+  ESC/ESCAPE   Escape key (Windows only)
+--]]
+
+ide.config.keymap = {
+-- File menu
+  [ID_NEW]              = "Ctrl-N",
+  [ID_OPEN]             = "Ctrl-O",
+  [ID_CLOSE]            = "Ctrl-W",
+  [ID_SAVE]             = "Ctrl-S",
+  [ID_SAVEAS]           = "Alt-Shift-S",
+  [ID_SAVEALL]          = "",
+  [ID_RECENTFILES]      = "",
+  [ID_EXIT]             = "Ctrl-Q",
+-- Edit menu
+  [ID_CUT]              = "Ctrl-X",
+  [ID_COPY]             = "Ctrl-C",
+  [ID_PASTE]            = "Ctrl-V",
+  [ID_SELECTALL]        = "Ctrl-A",
+  [ID_UNDO]             = "Ctrl-Z",
+  [ID_REDO]             = "Ctrl-Y",
+  [ID_SHOWTOOLTIP]      = "Ctrl-T",
+  [ID_AUTOCOMPLETE]     = "Ctrl-K",
+  [ID_AUTOCOMPLETEENABLE] = "",
+  [ID_COMMENT]          = "Ctrl-U",
+  [ID_FOLD]             = "F12",
+  [ID_CLEARDYNAMICWORDS] = "",
+-- Search menu
+  [ID_FIND]             = "Ctrl-F",
+  [ID_FINDNEXT]         = "F3",
+  [ID_FINDPREV]         = "Shift-F3",
+  [ID_REPLACE]          = "Ctrl-R",
+  [ID_FINDINFILES]      = "Ctrl-Shift-F",
+  [ID_REPLACEINFILES]   = "Ctrl-Shift-R",
+  [ID_GOTOLINE]         = "Ctrl-G",
+  [ID_SORT]             = "",
+-- View menu
+  [ID_VIEWFILETREE]     = "Ctrl-Shift-P",
+  [ID_VIEWOUTPUT]       = "Ctrl-Shift-O",
+  [ID_VIEWWATCHWINDOW]  = "Ctrl-Shift-W",
+  [ID_VIEWCALLSTACK]    = "Ctrl-Shift-S",
+  [ID_VIEWDEFAULTLAYOUT] = "",
+  [ID_VIEWFULLSCREEN]   = "Ctrl-Shift-A",
+-- Project menu
+  [ID_RUN]              = "F6",
+  [ID_RUNNOW]           = "Ctrl-F6",
+  [ID_COMPILE]          = "F7",
+  [ID_ANALYZE]          = "Shift-F7",
+  [ID_STARTDEBUG]       = "F5",
+  [ID_ATTACHDEBUG]      = "",
+  [ID_STOPDEBUG]        = "Shift-F5",
+  [ID_STEP]             = "F10",
+  [ID_STEPOVER]         = "Shift-F10",
+  [ID_STEPOUT]          = "Ctrl-F10",
+  [ID_TRACE]            = "",
+  [ID_BREAK]            = "Shift-F9",
+  [ID_TOGGLEBREAKPOINT] = "F9",
+  [ID_CLEAROUTPUT]      = "",
+  [ID_INTERPRETER]      = "",
+  [ID_PROJECTDIR]       = "",
+-- Help menu
+  [ID_ABOUT]            = "F1",
+-- Watch window menu items
+  [ID_ADDWATCH]         = "Ins",
+  [ID_EDITWATCH]        = "F2",
+  [ID_REMOVEWATCH]      = "Del",
+  [ID_EVALUATEWATCH]    = "",
+-- Editor popup menu items
+  [ID_QUICKADDWATCH]    = "",
+  [ID_QUICKEVAL]        = "",
+}
+
+function KSC(id, default)
+  -- this is only for the rare case of someone assigning a complete list
+  -- to ide.config.keymap.
+  local keymap = ide.config.keymap
+  return keymap[id] and "\t"..keymap[id] or default or ""
+end

src/editor/markup.lua

@@ -1,8 +1,6 @@
 -- Copyright (C) Paul Kulchenko 2011-2012
 -- styles for comment markup
 
-local styles = ide.config.styles
-local comment = styles.comment
 local MD_MARK_ITAL = '_' -- italic
 local MD_MARK_BOLD = '**' -- bold
 local MD_MARK_LINK = '[' -- link description start
@@ -15,25 +13,38 @@ local MD_MARK_BOXD = '|' -- highlight
 local MD_MARK_MARK = ' ' -- separator
 local MD_LINK_NEWWINDOW = '+' -- indicator to open a new window for links
 local markup = {
-  [MD_MARK_BOXD] = {st=25, fg={127,0,127}, bg=comment.bg, b=true},
-  [MD_MARK_CODE] = {st=26, fg={127,127,127}, bg=comment.bg, fs=9},
-  [MD_MARK_HEAD] = {st=27, fg=comment.fg, bg=comment.bg, fn="Lucida Console", b=true},
-  [MD_MARK_LINK] = {st=28, fg=comment.fg, bg=comment.bg, u=true, hs={0, 0, 127}},
-  [MD_MARK_BOLD] = {st=29, fg=comment.fg, bg=comment.bg, b=true, fs=11},
-  [MD_MARK_ITAL] = {st=30, fg=comment.fg, bg=comment.bg, i=true},
-  [MD_MARK_MARK] = {st=31, fg=comment.fg, bg=comment.bg, v=false},
+  [MD_MARK_BOXD] = {st=25, fg={127,0,127}, b=true},
+  [MD_MARK_CODE] = {st=26, fg={127,127,127}, fs=9},
+  [MD_MARK_HEAD] = {st=27, fn="Lucida Console", b=true},
+  [MD_MARK_LINK] = {st=28, u=true, hs={32,32,127}},
+  [MD_MARK_BOLD] = {st=29, b=true},
+  [MD_MARK_ITAL] = {st=30, i=true},
+  [MD_MARK_MARK] = {st=31, v=false},
 }
 
 -- 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
+function MarkupAddStyles(styles)
+  local comment = styles.comment or {}
+  for key,value in pairs(markup) do
+    local style = styles[key] or {}
+    -- copy all style features by value
+    for feature in pairs(value) do
+      style[feature] = style[feature] or value[feature] end
+    style.fg = style.fg or comment.fg
+    style.bg = style.bg or comment.bg
+    styles[key] = style
+  end
+end
 
 local function q(s) return s:gsub('(.)','%%%1') end
 
 local MD_MARK_PTRN = ''  -- combination of all markup marks that can start styling
 for key,value in pairs(markup) do
-  styles[key] = value
   if key ~= MD_MARK_MARK then MD_MARK_PTRN = MD_MARK_PTRN .. q(key) end
 end
+MarkupAddStyles(ide.config.styles)
 
 function MarkupHotspotClick(pos, editor)
   -- check if this is "our" hotspot event

src/editor/menu.lua

@@ -1,10 +0,0 @@
--- authors: Luxinia Dev (Eike Decker & Christoph Kubisch)
----------------------------------------------------------
-local ide = ide
-
-dofile "src/editor/menu_file.lua"
-dofile "src/editor/menu_edit.lua"
-dofile "src/editor/menu_search.lua"
-dofile "src/editor/menu_view.lua"
-dofile "src/editor/menu_project.lua"
-dofile "src/editor/menu_tools.lua"

src/editor/menu_edit.lua

@@ -9,26 +9,26 @@ local frame = ide.frame
 local menuBar = frame.menuBar
 
 local editMenu = wx.wxMenu{
-  { ID_CUT, "Cu&t\tCtrl-X", "Cut selected text to clipboard" },
-  { ID_COPY, "&Copy\tCtrl-C", "Copy selected text to the clipboard" },
-  { ID_PASTE, "&Paste\tCtrl-V", "Insert clipboard text at cursor" },
-  { ID_SELECTALL, "Select A&ll\tCtrl-A", "Select all text in the editor" },
+  { ID_CUT, TR("Cu&t")..KSC(ID_CUT), TR("Cut selected text to clipboard") },
+  { ID_COPY, TR("&Copy")..KSC(ID_COPY), TR("Copy selected text to clipboard") },
+  { ID_PASTE, TR("&Paste")..KSC(ID_PASTE), TR("Paste text from the clipboard") },
+  { ID_SELECTALL, TR("Select &All")..KSC(ID_SELECTALL), TR("Select all text in the editor") },
   { },
-  { ID_UNDO, "&Undo\tCtrl-Z", "Undo the last action" },
-  { ID_REDO, "&Redo\tCtrl-Y", "Redo the last action undone" },
+  { ID_UNDO, TR("&Undo")..KSC(ID_UNDO), TR("Undo last edit") },
+  { ID_REDO, TR("&Redo")..KSC(ID_REDO), TR("Redo last edit undone") },
   { },
-  { ID "edit.showtooltip", "Show &Tooltip\tCtrl-T", "Show tooltip for current position. Place cursor after opening bracket of function."},
-  { ID_AUTOCOMPLETE, "Complete &Identifier\tCtrl-K", "Complete the current identifier" },
-  { ID_AUTOCOMPLETE_ENABLE, "Auto complete Identifiers", "Auto complete while typing", wx.wxITEM_CHECK },
+  { ID_SHOWTOOLTIP, TR("Show &Tooltip")..KSC(ID_SHOWTOOLTIP), TR("Show tooltip for current position; place cursor after opening bracket of function") },
+  { ID_AUTOCOMPLETE, TR("Complete &Identifier")..KSC(ID_AUTOCOMPLETE), TR("Complete the current identifier") },
+  { ID_AUTOCOMPLETEENABLE, TR("Auto Complete Identifiers")..KSC(ID_AUTOCOMPLETEENABLE), TR("Auto complete while typing"), wx.wxITEM_CHECK },
   { },
-  { ID_COMMENT, "C&omment/Uncomment\tCtrl-U", "Comment or uncomment current or selected lines"},
+  { ID_COMMENT, TR("C&omment/Uncomment")..KSC(ID_COMMENT), TR("Comment or uncomment current or selected lines") },
   { },
-  { ID_FOLD, "&Fold/Unfold all\tF12", "Fold or unfold all code folds"},
-  { ID "edit.cleardynamics", "Clear &Dynamic Words", "Resets the dynamic word list for autcompletion."},
+  { ID_FOLD, TR("&Fold/Unfold All")..KSC(ID_FOLD), TR("Fold or unfold all code folds") },
+  { ID_CLEARDYNAMICWORDS, TR("Clear &Dynamic Words")..KSC(ID_CLEARDYNAMICWORDS), TR("Resets the dynamic word list for autocompletion") },
 }
-menuBar:Append(editMenu, "&Edit")
+menuBar:Append(editMenu, TR("&Edit"))
 
-editMenu:Check(ID_AUTOCOMPLETE_ENABLE, ide.config.autocomplete)
+editMenu:Check(ID_AUTOCOMPLETEENABLE, ide.config.autocomplete)
 
 local function getControlWithFocus()
   local editor = GetEditor()
@@ -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
 
@@ -84,12 +88,10 @@ for _, event in pairs({ID_CUT, ID_COPY, ID_PASTE, ID_SELECTALL, ID_UNDO, ID_REDO
   frame:Connect(event, wx.wxEVT_UPDATE_UI, OnUpdateUIEditMenu)
 end
 
-frame:Connect(ID "edit.cleardynamics", wx.wxEVT_COMMAND_MENU_SELECTED,
-  function (event)
-    DynamicWordsReset()
-  end)
+frame:Connect(ID_CLEARDYNAMICWORDS, wx.wxEVT_COMMAND_MENU_SELECTED,
+  function () DynamicWordsReset() end)
 
-frame:Connect(ID "edit.showtooltip", wx.wxEVT_COMMAND_MENU_SELECTED,
+frame:Connect(ID_SHOWTOOLTIP, wx.wxEVT_COMMAND_MENU_SELECTED,
   function (event)
     local editor = GetEditor()
 
@@ -100,6 +102,8 @@ frame:Connect(ID "edit.showtooltip", wx.wxEVT_COMMAND_MENU_SELECTED,
 
     EditorCallTip(editor, editor:GetCurrentPos())
   end)
+frame:Connect(ID_SHOWTOOLTIP, wx.wxEVT_UPDATE_UI,
+  function (event) event:Enable(GetEditor() ~= nil) end)
 
 frame:Connect(ID_AUTOCOMPLETE, wx.wxEVT_COMMAND_MENU_SELECTED,
   function (event)
@@ -107,7 +111,7 @@ frame:Connect(ID_AUTOCOMPLETE, wx.wxEVT_COMMAND_MENU_SELECTED,
   end)
 frame:Connect(ID_AUTOCOMPLETE, wx.wxEVT_UPDATE_UI, OnUpdateUIEditMenu)
 
-frame:Connect(ID_AUTOCOMPLETE_ENABLE, wx.wxEVT_COMMAND_MENU_SELECTED,
+frame:Connect(ID_AUTOCOMPLETEENABLE, wx.wxEVT_COMMAND_MENU_SELECTED,
   function (event)
     ide.config.autocomplete = event:IsChecked()
   end)

src/editor/menu_file.lua

@@ -2,28 +2,28 @@
 -- Luxinia Dev (Eike Decker & Christoph Kubisch)
 ---------------------------------------------------------
 local ide = ide
--- Create the File menu and attach the callback functions
-
 local frame = ide.frame
 local menuBar = frame.menuBar
+local notebook = frame.notebook
 local openDocuments = ide.openDocuments
 
 local fileMenu = wx.wxMenu({
-    { ID_NEW, "&New\tCtrl-N", "Create an empty document" },
-    { ID_OPEN, "&Open...\tCtrl-O", "Open an existing document" },
-    { ID_CLOSE, "&Close page\tCtrl-W", "Close the current editor window" },
+    { ID_NEW, TR("&New")..KSC(ID_NEW), TR("Create an empty document") },
+    { ID_OPEN, TR("&Open...")..KSC(ID_OPEN), TR("Open an existing document") },
+    { ID_CLOSE, TR("&Close Page")..KSC(ID_CLOSE), TR("Close the current editor window") },
     { },
-    { ID_SAVE, "&Save\tCtrl-S", "Save the current document" },
-    { ID_SAVEAS, "Save &As...\tAlt-Shift-S", "Save the current document to a file with a new name" },
-    { ID_SAVEALL, "Save A&ll...", "Save all open documents" },
+    { ID_SAVE, TR("&Save")..KSC(ID_SAVE), TR("Save the current document") },
+    { ID_SAVEAS, TR("Save &As...")..KSC(ID_SAVEAS), TR("Save the current document to a file with a new name") },
+    { ID_SAVEALL, TR("Save A&ll")..KSC(ID_SAVEALL), TR("Save all open documents") },
     { },
-    --{ ID "file.recentfiles", "Recent files",},
+    -- placeholder for ID_RECENTFILES
     { },
-    { ID_EXIT, "E&xit", "Exit Program" }})
-menuBar:Append(fileMenu, "&File")
+    { ID_EXIT, TR("E&xit")..KSC(ID_EXIT), TR("Exit program") }})
+menuBar:Append(fileMenu, TR("&File"))
 
 local filehistorymenu = wx.wxMenu({})
-local filehistory = wx.wxMenuItem(fileMenu,ID"file.recentfiles","Recent files", "File history", wx.wxITEM_NORMAL,filehistorymenu)
+local filehistory = wx.wxMenuItem(fileMenu, ID_RECENTFILES,
+  TR("Recent Files")..KSC(ID_RECENTFILES), TR("File history"), wx.wxITEM_NORMAL, filehistorymenu)
 fileMenu:Insert(8,filehistory)
 function UpdateFileHistoryUI(list)
   -- remove all at first
@@ -50,36 +50,22 @@ end
 frame:Connect(ID_NEW, wx.wxEVT_COMMAND_MENU_SELECTED, NewFile)
 frame:Connect(ID_OPEN, wx.wxEVT_COMMAND_MENU_SELECTED, OpenFile)
 frame:Connect(ID_SAVE, wx.wxEVT_COMMAND_MENU_SELECTED,
-  function (event)
+  function ()
     local editor = GetEditor()
-    local id = editor:GetId()
-    local filePath = openDocuments[id].filePath
-    if (filePath) then
-      SaveFile(editor, filePath)
-    else
-      SaveFileAs(editor)
-    end
+    SaveFile(editor, openDocuments[editor:GetId()].filePath)
   end)
 frame:Connect(ID_SAVE, wx.wxEVT_UPDATE_UI,
   function (event)
-    local editor = GetEditor()
-    if editor then
-      local id = editor:GetId()
-      if openDocuments[id] then
-        event:Enable(openDocuments[id].isModified or not openDocuments[id].filePath)
-      end
-    end
+    event:Enable(EditorIsModified(GetEditor()))
   end)
 
 frame:Connect(ID_SAVEAS, wx.wxEVT_COMMAND_MENU_SELECTED,
-  function (event)
-    local editor = GetEditor()
-    SaveFileAs(editor)
+  function ()
+    SaveFileAs(GetEditor())
   end)
 frame:Connect(ID_SAVEAS, wx.wxEVT_UPDATE_UI,
   function (event)
-    local editor = GetEditor()
-    event:Enable(editor ~= nil)
+    event:Enable(GetEditor() ~= nil)
   end)
 
 frame:Connect(ID_SAVEALL, wx.wxEVT_COMMAND_MENU_SELECTED,
@@ -90,7 +76,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
@@ -100,7 +86,7 @@ frame:Connect(ID_SAVEALL, wx.wxEVT_UPDATE_UI,
 
 frame:Connect(ID_CLOSE, wx.wxEVT_COMMAND_MENU_SELECTED,
   function (event)
-    ClosePage() -- this will find the current editor
+    ClosePage() -- this will find the current editor tab
   end)
 frame:Connect(ID_CLOSE, wx.wxEVT_UPDATE_UI,
   function (event)

src/editor/menu_help.lua

@@ -9,24 +9,25 @@ local menuBar = frame.menuBar
 local mobdebug = require "mobdebug"
 
 local helpMenu = wx.wxMenu{
-  { ID_ABOUT, "&About\tF1", "About ZeroBrane Studio" },
+  { ID_ABOUT, TR("&About")..KSC(ID_ABOUT), TR("About ZeroBrane Studio") },
 }
-menuBar:Append(helpMenu, "&Help")
+-- do not translate Help menu on Mac as it won't merge with "standard" menus
+menuBar:Append(helpMenu, ide.osname == 'Macintosh' and "&Help" or TR("&Help"))
 
 local function DisplayAbout(event)
   local page = [[
     <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>ZeroBrane Studio (]]..ide.VERSION..[[; 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,15 +35,16 @@ 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>
-		<b>Based on wxLua editor sample (]]..wxlua.wxLUA_VERSION_STRING..[[)</b><br>
+		<b>Based on wxLua editor (]]..wxlua.wxLUA_VERSION_STRING..[[)</b><br>
 		<b>Copyright &copy; 2002-2005 Lomtick Software</b><br>
 		J. Winwood, John Labenski<br>
-		Licensed under wxWindows Library License, Version 3.
+		Licensed under wxWindows Library License, v3.
 		</td>
 	  </tr>
 	  <tr>
@@ -55,7 +57,7 @@ local function DisplayAbout(event)
       </body>
     </html>]]
 
-  local dlg = wx.wxDialog(frame, wx.wxID_ANY, "About ZeroBrane Studio")
+  local dlg = wx.wxDialog(frame, wx.wxID_ANY, TR("About ZeroBrane Studio"))
   local html = wx.wxLuaHtmlWindow(dlg, wx.wxID_ANY,
     wx.wxDefaultPosition, wx.wxSize(440, 270),
     wx.wxHW_SCROLLBAR_NEVER)

src/editor/menu_project.lua

@@ -2,15 +2,10 @@
 -- Luxinia Dev (Eike Decker & Christoph Kubisch)
 ---------------------------------------------------------
 local ide = ide
-
--- Create the Debug menu and attach the callback functions
-
 local frame = ide.frame
 local menuBar = frame.menuBar
-
 local openDocuments = ide.openDocuments
 local debugger = ide.debugger
-local filetree = ide.filetree
 local bottomnotebook = frame.bottomnotebook
 local uimgr = frame.uimgr
 
@@ -33,8 +28,8 @@ do
   table.sort(interpreternames)
 
   local targetargs = {}
-  for i,v in ipairs(interpreternames) do
-    local id = ID ("debug.interpreter."..lkinterpreters[v])
+  for _,v in ipairs(interpreternames) do
+    local id = ID("debug.interpreter."..lkinterpreters[v])
     local inter = interpreters[id]
     table.insert(targetargs,{id,inter.name,inter.description,wx.wxITEM_CHECK})
   end
@@ -42,45 +37,55 @@ do
 end
 
 local debugTab = {
-  { ID_RUN, "&Run\tF6", "Execute the current project/file" },
-  { ID_RUNNOW, "Run as Scratchpad\tCtrl-F6", "Execute the current project/file and keep updating the code to see immediate results", wx.wxITEM_CHECK },
-  { ID_COMPILE, "&Compile\tF7", "Test compile the Lua file" },
-  { ID_START_DEBUG, "Start &Debugging\tF5", "Start a debugging session" },
-  { ID_ATTACH_DEBUG, "&Start Debugger Server", "Allow a client to start a debugging session" },
+  { ID_RUN, TR("&Run")..KSC(ID_RUN), TR("Execute the current project/file") },
+  { ID_RUNNOW, TR("Run as Scratchpad")..KSC(ID_RUNNOW), TR("Execute the current project/file and keep updating the code to see immediate results"), wx.wxITEM_CHECK },
+  { ID_COMPILE, TR("&Compile")..KSC(ID_COMPILE), TR("Compile the current file") },
+  { ID_STARTDEBUG, TR("Start &Debugging")..KSC(ID_STARTDEBUG), TR("Start debugging") },
+  { ID_ATTACHDEBUG, TR("&Start Debugger Server")..KSC(ID_ATTACHDEBUG), TR("Allow external process to start debugging") },
   { },
-  { ID_STOP_DEBUG, "S&top Debugging\tShift-F12", "Stop the currently running process" },
-  { ID_STEP, "Step &Into\tF10", "Step into the next line" },
-  { ID_STEP_OVER, "Step &Over\tShift-F10", "Step over the next line" },
-  { ID_STEP_OUT, "Step O&ut\tCtrl-F10", "Step out of the current function" },
-  { ID_TRACE, "Tr&ace", "Trace execution showing each executed line" },
-  { ID_BREAK, "&Break\tShift-F9", "Stop execution of the program at the next executed line of code" },
+  { ID_STOPDEBUG, TR("S&top Debugging")..KSC(ID_STOPDEBUG), TR("Stop the currently running process") },
+  { ID_STEP, TR("Step &Into")..KSC(ID_STEP), TR("Step into") },
+  { ID_STEPOVER, TR("Step &Over")..KSC(ID_STEPOVER), TR("Step over") },
+  { ID_STEPOUT, TR("Step O&ut")..KSC(ID_STEPOUT), TR("Step out of the current function") },
+  { ID_TRACE, TR("Tr&ace")..KSC(ID_TRACE), TR("Trace execution showing each executed line") },
+  { ID_BREAK, TR("&Break")..KSC(ID_BREAK), TR("Break execution at the next executed line of code") },
   { },
-  { ID_TOGGLEBREAKPOINT, "Toggle Break&point\tF9", "Toggle Breakpoint" },
+  { ID_TOGGLEBREAKPOINT, TR("Toggle Break&point")..KSC(ID_TOGGLEBREAKPOINT), TR("Toggle breakpoint") },
   { },
-  { ID_CLEAROUTPUT, "C&lear Output Window", "Clear the output window before compiling or debugging", wx.wxITEM_CHECK },
+  { ID_CLEAROUTPUT, TR("C&lear Output Window")..KSC(ID_CLEAROUTPUT), TR("Clear the output window before compiling or debugging"), wx.wxITEM_CHECK },
 }
 
-local debugMenu = wx.wxMenu(debugTab)
-local debugMenuRun = {start="Start &Debugging\tF5", continue="Co&ntinue\tF5"}
-local debugMenuStop = {debugging="S&top Debugging\tShift-F5", process="S&top Process\tShift-F5"}
-
 local targetDirMenu = wx.wxMenu{
-  {ID "debug.projectdir.choose","Choose ..."},
-  {ID "debug.projectdir.fromfile","From current filepath"},
-  {},
-  {ID "debug.projectdir.currentdir",""}
+  {ID_PROJECTDIRCHOOSE, TR("Choose ...")..KSC(ID_PROJECTDIRCHOOSE), TR("Choose a project directory")},
+  {ID_PROJECTDIRFROMFILE, TR("Set From Current File")..KSC(ID_PROJECTDIRFROMFILE), TR("Set project directory from current file")},
 }
-
-debugMenu:Append(ID_INTERPRETER,"Lua &Interpreter",targetMenu,"Set the interpreter to be used")
-debugMenu:Append(ID_PROJECTDIR,"Project Directory",targetDirMenu,"Set the project directory to be used")
-menuBar:Append(debugMenu, "&Project")
+local debugMenu = wx.wxMenu(debugTab)
+local debugMenuRun = {
+  start=TR("Start &Debugging")..KSC(ID_STARTDEBUG), continue=TR("Co&ntinue")..KSC(ID_STARTDEBUG)}
+local debugMenuStop = {
+  debugging=TR("S&top Debugging")..KSC(ID_STOPDEBUG), process=TR("S&top Process")..KSC(ID_STOPDEBUG)}
+debugMenu:Append(ID_PROJECTDIR, TR("Project Directory"), targetDirMenu, TR("Set the project directory to be used"))
+debugMenu:Append(ID_INTERPRETER, TR("Lua &Interpreter"), targetMenu, TR("Set the interpreter to be used"))
+menuBar:Append(debugMenu, TR("&Project"))
 
 -----------------------------
 -- Project directory handling
 
 function ProjectUpdateProjectDir(projdir,skiptree)
-  ide.config.path.projectdir = projdir
-  menuBar:SetLabel(ID "debug.projectdir.currentdir",projdir)
+  local dir = wx.wxFileName.DirName(projdir)
+
+  -- wxwidgets 2.9.x may report the last folder twice (depending on how the
+  -- user selects the folder), which makes the selected folder incorrect.
+  -- check if the last segment is repeated and drop it.
+  if not wx.wxDirExists(projdir) then
+    local dirs = dir:GetDirs()
+    if #dirs > 1 and dirs[-1] == dirs[-2] then dir:RemoveLastDir() end
+    if not wx.wxDirExists(dir:GetFullPath()) then return end
+  end
+
+  projdir = dir:GetPath(wx.wxPATH_GET_VOLUME) -- no trailing slash
+
+  ide.config.path.projectdir = projdir ~= "" and projdir or nil
   frame:SetStatusText(projdir)
   if (not skiptree) then
     ide.filetree:updateProjectDir(projdir)
@@ -90,26 +95,22 @@ ProjectUpdateProjectDir(ide.config.path.projectdir)
 
 local function projChoose(event)
   local editor = GetEditor()
-  local saved = false
   local fn = wx.wxFileName(
     editor and openDocuments[editor:GetId()].filePath or "")
   fn:Normalize() -- want absolute path for dialog
 
   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)
-  local res = filePicker:ShowModal(true)
-  if res == wx.wxID_OK then
+  local filePicker = wx.wxDirDialog(frame, TR("Choose a project directory"),
+    projectdir ~= "" and projectdir or wx.wxGetCwd(), wx.wxDIRP_DIR_MUST_EXIST)
+  if filePicker:ShowModal(true) == wx.wxID_OK then
     ProjectUpdateProjectDir(filePicker:GetPath())
   end
   return true
 end
 
-frame:Connect(ID "debug.projectdir.choose", wx.wxEVT_COMMAND_MENU_SELECTED,
-  projChoose)
-frame:Connect(ID "debug.projectdir.choose", wx.wxEVT_COMMAND_BUTTON_CLICKED,
-  projChoose)
+frame:Connect(ID_PROJECTDIRCHOOSE, wx.wxEVT_COMMAND_MENU_SELECTED, projChoose)
+frame:Connect(ID_PROJECTDIRCHOOSE, wx.wxEVT_COMMAND_BUTTON_CLICKED, projChoose)
 
 local function projFromFile(event)
   local editor = GetEditor()
@@ -120,10 +121,10 @@ local function projFromFile(event)
   local fn = wx.wxFileName(filepath)
   fn:Normalize() -- want absolute path for dialog
 
-  if ide.interpreter then ProjectUpdateProjectDir(ide.interpreter:fprojdir(fn)) end
+  if ide.interpreter then
+    ProjectUpdateProjectDir(ide.interpreter:fprojdir(fn)) end
 end
-frame:Connect(ID "debug.projectdir.fromfile", wx.wxEVT_COMMAND_MENU_SELECTED,
-  projFromFile)
+frame:Connect(ID_PROJECTDIRFROMFILE, wx.wxEVT_COMMAND_MENU_SELECTED, projFromFile)
 
 ------------------------------------
 -- Interpreter Selection and Running
@@ -153,14 +154,14 @@ local function evSelectInterpreter(event)
   selectInterpreter(event:GetId())
 end
 
-for id,inter in pairs(interpreters) do
+for id in pairs(interpreters) do
   frame:Connect(id,wx.wxEVT_COMMAND_MENU_SELECTED,evSelectInterpreter)
 end
 
 do
   local defaultid = (
     IDget("debug.interpreter."..ide.config.interpreter) or
-    ID ("debug.interpreter."..lastinterpreter)
+    ID("debug.interpreter."..lastinterpreter)
   )
   ide.interpreter = interpreters[defaultid]
   menuBar:Check(defaultid, true)
@@ -171,9 +172,11 @@ local function getNameToRun(skipcheck)
 
   -- test compile it before we run it, if successful then ask to save
   -- only compile if lua api
-  if (editor.spec.apitype and
+  if editor.spec.apitype and
     editor.spec.apitype == "lua" and
-    (not CompileProgram(editor, true) and not skipcheck)) then
+    (not skipcheck) and
+    (not ide.interpreter.skipcompile) and
+    (not CompileProgram(editor, true)) then
     return
   end
 
@@ -197,6 +200,7 @@ function ActivateOutput()
 end
 
 local function runInterpreter(wfilename, withdebugger)
+  if ide.frame.menuBar:IsChecked(ID_CLEAROUTPUT) then ClearOutput() end
   ActivateOutput()
 
   ClearAllCurrentLineMarkers()
@@ -218,8 +222,11 @@ local debuggers = {
 
 function ProjectDebug(skipcheck, debtype)
   if (debugger.server ~= nil) then
-    if (not debugger.running) then
-      ClearAllCurrentLineMarkers()
+    if (debugger.scratchpad and debugger.scratchpad.paused) then
+      debugger.scratchpad.paused = nil
+      debugger.scratchpad.updated = true
+      ShellSupportRemote(nil) -- disable remote while Scratchpad running
+    elseif (not debugger.running) then
       debugger.run()
     end
   else
@@ -236,7 +243,7 @@ end
 -- Actions
 
 frame:Connect(ID_TOGGLEBREAKPOINT, wx.wxEVT_COMMAND_MENU_SELECTED,
-  function (event)
+  function ()
     local editor = GetEditor()
     local line = editor:LineFromPosition(editor:GetCurrentPos())
     DebuggerToggleBreakpoint(editor, line)
@@ -244,11 +251,12 @@ 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,
-  function (event)
+  function ()
     local editor = GetEditor()
     ActivateOutput()
     CompileProgram(editor)
@@ -280,15 +288,16 @@ 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)
 
-frame:Connect(ID_ATTACH_DEBUG, wx.wxEVT_COMMAND_MENU_SELECTED,
-  function (event)
+frame:Connect(ID_ATTACHDEBUG, wx.wxEVT_COMMAND_MENU_SELECTED,
+  function ()
     if (ide.interpreter.fattachdebug) then ide.interpreter:fattachdebug() end
   end)
-frame:Connect(ID_ATTACH_DEBUG, wx.wxEVT_UPDATE_UI,
+frame:Connect(ID_ATTACHDEBUG, wx.wxEVT_UPDATE_UI,
   function (event)
     local editor = GetEditor()
     event:Enable((ide.interpreter) and (ide.interpreter.fattachdebug)
@@ -296,39 +305,36 @@ frame:Connect(ID_ATTACH_DEBUG, wx.wxEVT_UPDATE_UI,
       and (editor ~= nil) and (not debugger.scratchpad))
   end)
 
-frame:Connect(ID_START_DEBUG, wx.wxEVT_COMMAND_MENU_SELECTED, function () ProjectDebug() end)
-frame:Connect(ID_START_DEBUG, wx.wxEVT_UPDATE_UI,
+frame:Connect(ID_STARTDEBUG, wx.wxEVT_COMMAND_MENU_SELECTED, function () ProjectDebug() end)
+frame:Connect(ID_STARTDEBUG, wx.wxEVT_UPDATE_UI,
   function (event)
     local editor = GetEditor()
     event:Enable((ide.interpreter) and (ide.interpreter.hasdebugger) and
       ((debugger.server == nil and debugger.pid == nil) or
        (debugger.server ~= nil and not debugger.running)) and
-      (editor ~= nil) and (not debugger.scratchpad))
+      (editor ~= nil) and (not debugger.scratchpad or debugger.scratchpad.paused))
     local label = (debugger.server ~= nil)
       and debugMenuRun.continue or debugMenuRun.start
-    if debugMenu:GetLabel(ID_START_DEBUG) ~= label then
-      debugMenu:SetLabel(ID_START_DEBUG, label)
+    if debugMenu:GetLabel(ID_STARTDEBUG) ~= label then
+      debugMenu:SetLabel(ID_STARTDEBUG, label)
     end
   end)
 
-frame:Connect(ID_STOP_DEBUG, wx.wxEVT_COMMAND_MENU_SELECTED,
-  function (event)
-    DebuggerShutdown()
-  end)
-frame:Connect(ID_STOP_DEBUG, wx.wxEVT_UPDATE_UI,
+frame:Connect(ID_STOPDEBUG, wx.wxEVT_COMMAND_MENU_SELECTED,
+  function () DebuggerShutdown() end)
+frame:Connect(ID_STOPDEBUG, wx.wxEVT_UPDATE_UI,
   function (event)
     local editor = GetEditor()
     event:Enable((debugger.server ~= nil or debugger.pid ~= nil) and (editor ~= nil))
     local label = (debugger.server == nil and debugger.pid ~= nil)
       and debugMenuStop.process or debugMenuStop.debugging
-    if debugMenu:GetLabel(ID_STOP_DEBUG) ~= label then
-      debugMenu:SetLabel(ID_STOP_DEBUG, label)
+    if debugMenu:GetLabel(ID_STOPDEBUG) ~= label then
+      debugMenu:SetLabel(ID_STOPDEBUG, label)
     end
   end)
 
 frame:Connect(ID_STEP, wx.wxEVT_COMMAND_MENU_SELECTED,
-  function (event)
-    ClearAllCurrentLineMarkers()
+  function ()
     debugger.step()
   end)
 frame:Connect(ID_STEP, wx.wxEVT_UPDATE_UI,
@@ -338,24 +344,22 @@ frame:Connect(ID_STEP, wx.wxEVT_UPDATE_UI,
       and (editor ~= nil) and (not debugger.scratchpad))
   end)
 
-frame:Connect(ID_STEP_OVER, wx.wxEVT_COMMAND_MENU_SELECTED,
-  function (event)
-    ClearAllCurrentLineMarkers()
+frame:Connect(ID_STEPOVER, wx.wxEVT_COMMAND_MENU_SELECTED,
+  function ()
     debugger.over()
   end)
-frame:Connect(ID_STEP_OVER, wx.wxEVT_UPDATE_UI,
+frame:Connect(ID_STEPOVER, wx.wxEVT_UPDATE_UI,
   function (event)
     local editor = GetEditor()
     event:Enable((debugger.server ~= nil) and (not debugger.running)
       and (editor ~= nil) and (not debugger.scratchpad))
   end)
 
-frame:Connect(ID_STEP_OUT, wx.wxEVT_COMMAND_MENU_SELECTED,
-  function (event)
-    ClearAllCurrentLineMarkers()
+frame:Connect(ID_STEPOUT, wx.wxEVT_COMMAND_MENU_SELECTED,
+  function ()
     debugger.out()
   end)
-frame:Connect(ID_STEP_OUT, wx.wxEVT_UPDATE_UI,
+frame:Connect(ID_STEPOUT, wx.wxEVT_UPDATE_UI,
   function (event)
     local editor = GetEditor()
     event:Enable((debugger.server ~= nil) and (not debugger.running)
@@ -363,8 +367,7 @@ frame:Connect(ID_STEP_OUT, wx.wxEVT_UPDATE_UI,
   end)
 
 frame:Connect(ID_TRACE, wx.wxEVT_COMMAND_MENU_SELECTED,
-  function (event)
-    ClearAllCurrentLineMarkers()
+  function ()
     debugger.trace()
   end)
 frame:Connect(ID_TRACE, wx.wxEVT_UPDATE_UI,
@@ -375,16 +378,21 @@ frame:Connect(ID_TRACE, wx.wxEVT_UPDATE_UI,
   end)
 
 frame:Connect(ID_BREAK, wx.wxEVT_COMMAND_MENU_SELECTED,
-  function (event)
+  function ()
     if debugger.server then
       debugger.breaknow()
+      if debugger.scratchpad then
+        debugger.scratchpad.paused = true
+        ShellSupportRemote(debugger.shell)
+      end
     end
   end)
 frame:Connect(ID_BREAK, wx.wxEVT_UPDATE_UI,
   function (event)
     local editor = GetEditor()
-    event:Enable((debugger.server ~= nil) and (debugger.running)
-      and (editor ~= nil) and (not debugger.scratchpad))
+    event:Enable((debugger.server ~= nil) and (editor ~= nil)
+      and (debugger.running
+           or (debugger.scratchpad and not debugger.scratchpad.paused)))
   end)
 
 frame:Connect(wx.wxEVT_IDLE,

src/editor/menu_search.lua

@@ -10,18 +10,18 @@ local menuBar = frame.menuBar
 local findReplace = ide.findReplace
 
 local findMenu = wx.wxMenu{
-  { ID_FIND, "&Find\tCtrl-F", "Find the specified text" },
-  { ID_FINDNEXT, "Find &Next\tF3", "Find the next occurrence of the specified text" },
-  { ID_FINDPREV, "Find &Previous\tShift-F3", "Repeat the search backwards in the file" },
-  { ID_REPLACE, "&Replace\tCtrl-R", "Replaces the specified text with different text" },
+  { ID_FIND, TR("&Find")..KSC(ID_FIND), TR("Find text") },
+  { ID_FINDNEXT, TR("Find &Next")..KSC(ID_FINDNEXT), TR("Find the next text occurrence") },
+  { ID_FINDPREV, TR("Find &Previous")..KSC(ID_FINDPREV), TR("Find the earlier text occurence") },
+  { ID_REPLACE, TR("&Replace")..KSC(ID_REPLACE), TR("Find and replace text") },
   { },
-  { ID_FIND_IN_FILES, "Find &In Files\tCtrl-Shift-F", " Find specified text in files"},
-  { ID_REPLACE_IN_FILES, "Re&place In Files\tCtrl-Shift-R", " Replace specified text in files"},
+  { ID_FINDINFILES, TR("Find &In Files")..KSC(ID_FINDINFILES), TR("Find text in files") },
+  { ID_REPLACEINFILES, TR("Re&place In Files")..KSC(ID_REPLACEINFILES), TR("Find and replace text in files") },
   { },
-  { ID_GOTOLINE, "&Goto line\tCtrl-G", "Go to a selected line" },
+  { ID_GOTOLINE, TR("&Goto Line")..KSC(ID_GOTOLINE), TR("Go to a selected line") },
   { },
-  { ID_SORT, "&Sort", "Sort selected lines"}}
-menuBar:Append(findMenu, "&Search")
+  { ID_SORT, TR("&Sort")..KSC(ID_SORT), TR("Sort selected lines") }}
+menuBar:Append(findMenu, TR("&Search"))
 
 function OnUpdateUISearchMenu(event) event:Enable(GetEditor() ~= nil) end
 
@@ -39,25 +39,26 @@ frame:Connect(ID_REPLACE, wx.wxEVT_COMMAND_MENU_SELECTED,
   end)
 frame:Connect(ID_REPLACE, wx.wxEVT_UPDATE_UI, OnUpdateUISearchMenu)
 
-frame:Connect(ID_FIND_IN_FILES, wx.wxEVT_COMMAND_MENU_SELECTED,
+frame:Connect(ID_FINDINFILES, wx.wxEVT_COMMAND_MENU_SELECTED,
   function (event)
     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,
+frame:Connect(ID_REPLACEINFILES, 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
 
@@ -66,9 +67,9 @@ frame:Connect(ID_GOTOLINE, wx.wxEVT_COMMAND_MENU_SELECTED,
     local editor = GetEditor()
     local linecur = editor:LineFromPosition(editor:GetCurrentPos())
     local linemax = editor:LineFromPosition(editor:GetLength()) + 1
-    local linenum = wx.wxGetNumberFromUser( "Enter line number",
+    local linenum = wx.wxGetNumberFromUser(TR("Enter line number"),
       "1 .. "..tostring(linemax),
-      "Goto Line",
+      TR("Goto Line"),
       linecur, 1, linemax,
       frame)
     if linenum > 0 then

src/editor/menu_tools.lua

@@ -46,7 +46,7 @@ do
     local exec = tool.exec
     if (exec and cnt < maxcnt and exec.name and exec.fn and exec.description) then
       local id = ID("tools.exec."..tool.fname)
-      table.insert(toolArgs,{id , exec.name.."\tCtrl-"..cnt, exec.description})
+      table.insert(toolArgs,{id , exec.name, exec.description})
       -- flag it
       tool._execid = id
       cnt = cnt + 1

src/editor/menu_view.lua

@@ -7,50 +7,42 @@ local menuBar = frame.menuBar
 local uimgr = frame.uimgr
 
 local viewMenu = wx.wxMenu {
-  -- NYI { ID "view.preferences", "&Preferences...", "Brings up dialog for settings (TODO)" },
-  -- NYI { },
-  { ID "view.filetree.show", "Project/&FileTree Window\tCtrl-Shift-P", "View the project/filetree window" },
-  { ID "view.output.show", "&Output/Console Window\tCtrl-Shift-O", "View the output/console window" },
-  { ID_VIEWWATCHWINDOW, "&Watch Window\tCtrl-Shift-W", "View the Watch window" },
-  { ID_VIEWCALLSTACK, "&Stack Window\tCtrl-Shift-S", "View the Stack window" },
+  { ID_VIEWFILETREE, TR("Project/&FileTree Window")..KSC(ID_VIEWFILETREE), TR("View the project/filetree window") },
+  { ID_VIEWOUTPUT, TR("&Output/Console Window")..KSC(ID_VIEWOUTPUT), TR("View the output/console window") },
+  { ID_VIEWWATCHWINDOW, TR("&Watch Window")..KSC(ID_VIEWWATCHWINDOW), TR("View the watch window") },
+  { ID_VIEWCALLSTACK, TR("&Stack Window")..KSC(ID_VIEWCALLSTACK), TR("View the stack window") },
   { },
-  { ID "view.defaultlayout", "&Default Layout", "Reset to default layout"},
-  { ID_FULLSCREEN, "Full &Screen\tCtrl-Shift-A", "Switch to or from full screen mode"},
-  { ID "view.style.loadconfig", "&Load Config Style...", "Load and apply style from config file (must contain .styles)"},
+  { ID_VIEWDEFAULTLAYOUT, TR("&Default Layout")..KSC(ID_VIEWDEFAULTLAYOUT), TR("Reset to default layout") },
+  { ID_VIEWFULLSCREEN, TR("Full &Screen")..KSC(ID_VIEWFULLSCREEN), TR("Switch to or from full screen mode") },
 }
-menuBar:Append(viewMenu, "&View")
+menuBar:Append(viewMenu, TR("&View"))
 
---frame:Connect(ID "view.preferences", wx.wxEVT_COMMAND_MENU_SELECTED,preferencesDialog.show)
-
-frame:Connect(ID "view.style.loadconfig", wx.wxEVT_COMMAND_MENU_SELECTED,
-  function (event)
-    LoadConfigStyle()
-  end)
-  
-frame:Connect(ID "view.defaultlayout", wx.wxEVT_COMMAND_MENU_SELECTED,
+frame:Connect(ID_VIEWDEFAULTLAYOUT, wx.wxEVT_COMMAND_MENU_SELECTED,
   function (event)
     uimgr:LoadPerspective(uimgr.defaultPerspective)
     uimgr:Update()
   end)
   
-frame:Connect(ID "view.output.show", wx.wxEVT_COMMAND_MENU_SELECTED,
-  function (event)
+frame:Connect(ID_VIEWOUTPUT, wx.wxEVT_COMMAND_MENU_SELECTED,
+  function ()
     uimgr:GetPane("bottomnotebook"):Show(true)
     uimgr:Update()
   end)
   
-frame:Connect(ID "view.filetree.show", wx.wxEVT_COMMAND_MENU_SELECTED,
-  function (event)
+frame:Connect(ID_VIEWFILETREE, wx.wxEVT_COMMAND_MENU_SELECTED,
+  function ()
     uimgr:GetPane("projpanel"):Show(true)
     uimgr:Update()
   end)
 
-frame:Connect(ID_FULLSCREEN, wx.wxEVT_COMMAND_MENU_SELECTED, function ()
+frame:Connect(ID_VIEWFULLSCREEN, wx.wxEVT_COMMAND_MENU_SELECTED, function ()
     pcall(function() ShowFullScreen(not frame:IsFullScreen()) end)
   end)
+frame:Connect(ID_VIEWFULLSCREEN, 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)