From a25f5464170b5e1714d64748ecf2471943e1d4cc Mon Sep 17 00:00:00 2001
From: Ilari Liusvaara <ilari.liusvaara@elisanet.fi>
Date: Sun, 16 Dec 2012 23:22:53 +0200
Subject: [PATCH] Remove more old crapola

---
 include/core/settings.hpp               |   2 -
 include/library/commands.hpp            |   2 +-
 include/library/settings-cmd-bridge.hpp |  34 --
 manual.lyx                              | 401 ++-----------------
 manual.txt                              | 491 ++++++++----------------
 src/core/keymapper.cpp                  | 122 ------
 src/core/memorymanip.cpp                | 149 -------
 src/core/misc.cpp                       |   1 -
 src/core/moviedata.cpp                  |  54 ---
 src/core/settings.cpp                   |   3 -
 src/library/commands.cpp                | 117 ------
 src/library/settings-cmd-bridge.cpp     | 147 -------
 src/lua/bind.cpp                        |  46 +++
 src/platform/wxwidgets/main.cpp         | 102 ++++-
 14 files changed, 325 insertions(+), 1346 deletions(-)
 delete mode 100644 include/library/settings-cmd-bridge.hpp
 delete mode 100644 src/library/settings-cmd-bridge.cpp
 create mode 100644 src/lua/bind.cpp

diff --git a/include/core/settings.hpp b/include/core/settings.hpp
index 59dbce39..952bb32b 100644
--- a/include/core/settings.hpp
+++ b/include/core/settings.hpp
@@ -2,9 +2,7 @@
 #define _settings__hpp__included__
 
 #include "library/settings.hpp"
-#include "library/settings-cmd-bridge.hpp"
 
 extern setting_group lsnes_set;
-extern settings_command_bridge cmd_bridge;
 
 #endif
diff --git a/include/library/commands.hpp b/include/library/commands.hpp
index 705016fa..0122def9 100644
--- a/include/library/commands.hpp
+++ b/include/library/commands.hpp
@@ -69,7 +69,7 @@ private:
 	mutex_class int_mutex;
 	std::ostream* output;
 	void (*oom_panic_routine)();
-	command* builtin[4];
+	command* builtin[1];
 };
 
 /**
diff --git a/include/library/settings-cmd-bridge.hpp b/include/library/settings-cmd-bridge.hpp
deleted file mode 100644
index d887c29e..00000000
--- a/include/library/settings-cmd-bridge.hpp
+++ /dev/null
@@ -1,34 +0,0 @@
-#ifndef _library__settings_cmd_bridge__hpp__included__
-#define _library__settings_cmd_bridge__hpp__included__
-
-#include "commands.hpp"
-#include "settings.hpp"
-
-/**
- * Bridge between command group and settings group.
- */
-class settings_command_bridge
-{
-public:
-/**
- * Create a bridge.
- */
-	settings_command_bridge(setting_group& sgroup, command_group& cgroup, const std::string& set_cmd,
-		const std::string& unset_cmd, const std::string& get_cmd, const std::string& show_cmd);
-/**
- * Destroy a bridge.
- */
-	~settings_command_bridge() throw();
-/**
- * Set output to use.
- */
-	void set_output(std::ostream& out);
-private:
-	command* c1;
-	command* c2;
-	command* c3;
-	command* c4;
-	std::ostream* output;
-};
-
-#endif
diff --git a/manual.lyx b/manual.lyx
index de120dcd..27014350 100644
--- a/manual.lyx
+++ b/manual.lyx
@@ -496,223 +496,6 @@ If command starts with '+' (after possible '*'), the command is executed
 Commands without '+' execute only on negative edge (release).
 \end_layout
 
-\begin_layout Subsection
-Settings:
-\end_layout
-
-\begin_layout Standard
-Settings control various aspects of emulator behaviour.
-\end_layout
-
-\begin_layout Subsubsection
-set-setting <setting> <value>
-\end_layout
-
-\begin_layout Standard
-Sets setting <setting> to value <value> (may be empty).
-\end_layout
-
-\begin_layout Subsubsection
-unset-setting <setting>
-\end_layout
-
-\begin_layout Standard
-Try to unset setting <setting> (not all settings can be unset).
-\end_layout
-
-\begin_layout Subsubsection
-get-setting <setting>
-\end_layout
-
-\begin_layout Standard
-Read value of setting <setting>
-\end_layout
-
-\begin_layout Subsubsection
-show-settings
-\end_layout
-
-\begin_layout Standard
-Print names and values of all settings.
-\end_layout
-
-\begin_layout Subsection
-Keybindings
-\end_layout
-
-\begin_layout Standard
-Keybindings bind commands or aliases to keys (or pseudo-keys).
- 
-\end_layout
-
-\begin_layout Standard
-Notes:
-\end_layout
-
-\begin_layout Itemize
-Do not bind edge active (+/-) commands to keys with modifiers, that won't
- work right!
-\end_layout
-
-\begin_layout Itemize
-Names of keys and modifiers are platform-dependent.
-\end_layout
-
-\begin_layout Itemize
-Be careful before binding pseudo-keys (such as joystick axes, buttons or
- hats) with modifiers.
- That may or may not work right.
-\end_layout
-
-\begin_layout Subsubsection
-bind-key [<mod>/<modmask>] <key> <command>
-\end_layout
-
-\begin_layout Standard
-Bind <command> to key <key> (activating if modifiers in <modmask> (comma-seperat
-ed list) are set as <mod> (comma-seperated list).
-\end_layout
-
-\begin_layout Standard
-The names of keys and modifiers are platform-dependent.
-\end_layout
-
-\begin_layout Subsubsection
-unbind-key [<mod>/<modmask>] <key>
-\end_layout
-
-\begin_layout Standard
-Unbind command from <key> (with specified <mod> and <modmask>).
-\end_layout
-
-\begin_layout Subsubsection
-set-axis <axis> [disabled | axis | axis-inverse | pressure0- | pressure0+
- | pressure-0 | pressure-+ | pressure+0 | pressure+-] [minus=<val>] [zero=<val>]
- [plus=<val>] [tolerance=<val>]
-\end_layout
-
-\begin_layout Standard
-Set axis parameters for axis <axis>.
-\end_layout
-
-\begin_layout Itemize
-disabled: Disable axis
-\end_layout
-
-\begin_layout Itemize
-axis: Normal axis
-\end_layout
-
-\begin_layout Itemize
-axis-inverse: Inverse axis
-\end_layout
-
-\begin_layout Itemize
-pressure0-: Pressure sensitive.
- Released at 0, pressed at -.
-\end_layout
-
-\begin_layout Itemize
-pressure0+: Pressure sensitive.
- Released at 0, pressed at +.
-\end_layout
-
-\begin_layout Itemize
-pressure-0: Pressure sensitive.
- Released at -, pressed at 0.
-\end_layout
-
-\begin_layout Itemize
-pressure-+: Pressure sensitive.
- Released at -, pressed at +.
-\end_layout
-
-\begin_layout Itemize
-pressure+0: Pressure sensitive.
- Released at +, pressed at 0.
-\end_layout
-
-\begin_layout Itemize
-pressure+-: Pressure sensitive.
- Released at +, pressed at -.
-\end_layout
-
-\begin_layout Itemize
-minus=<val>: Calibration at extreme minus position (-32768-32767)
-\end_layout
-
-\begin_layout Itemize
-zero=<val>: Calibration at neutral position (-32768-32767)
-\end_layout
-
-\begin_layout Itemize
-plus=<val>: Calibration at extreme plus position (-32768-32767)
-\end_layout
-
-\begin_layout Itemize
-tolerance=<value>: Center band tolerance (0<x<1).
- The smaller the value, the more sensitive the control is.
-\end_layout
-
-\begin_layout Subsubsection
-show-bindings
-\end_layout
-
-\begin_layout Standard
-Print all key bindings in effect.
-\end_layout
-
-\begin_layout Subsection
-Aliases
-\end_layout
-
-\begin_layout Standard
-Aliases bind command to sequence of commands.
- After alias has been defined, it replaces the command it shadows.
-\end_layout
-
-\begin_layout Standard
-Notes:
-\end_layout
-
-\begin_layout Itemize
-You can't alias command to itself.
-\end_layout
-
-\begin_layout Itemize
-Aliases starting with +/- are edge active just like ordinary commands starting
- with +/-.
-\end_layout
-
-\begin_layout Itemize
-One command can be aliased to multiple commands.
-\end_layout
-
-\begin_layout Subsubsection
-alias-command <command> <expansion>
-\end_layout
-
-\begin_layout Standard
-Append <expansion> to alias <command>.
- If alias does not already exist, it is created.
-\end_layout
-
-\begin_layout Subsubsection
-unalias-command <command>
-\end_layout
-
-\begin_layout Standard
-Clear alias expansion for <command>.
-\end_layout
-
-\begin_layout Subsubsection
-show-aliases
-\end_layout
-
-\begin_layout Standard
-Print all aliases and their expansions in effect.
-\end_layout
-
 \begin_layout Subsection
 run-script <script>
 \end_layout
@@ -782,107 +565,6 @@ write-<size> <address> <value>
 Write <value> to byte in address <address>.
 \end_layout
 
-\begin_layout Subsubsection
-search-memory reset
-\end_layout
-
-\begin_layout Standard
-Reset the memory search
-\end_layout
-
-\begin_layout Subsubsection
-search-memory count
-\end_layout
-
-\begin_layout Standard
-Print number of candidates remaining
-\end_layout
-
-\begin_layout Subsubsection
-search-memory print
-\end_layout
-
-\begin_layout Standard
-Print all candidates remaining
-\end_layout
-
-\begin_layout Subsubsection
-search-memory <usflag><sizeflag><op>
-\end_layout
-
-\begin_layout Standard
-Searches memory for addresses satisfying criteria.
-\end_layout
-
-\begin_layout Standard
-<usflag> can be:
-\end_layout
-
-\begin_layout Itemize
-u: unsigned
-\end_layout
-
-\begin_layout Itemize
-s: signed
-\end_layout
-
-\begin_layout Standard
-<sizeflag> can be:
-\end_layout
-
-\begin_layout Itemize
-b: byte
-\end_layout
-
-\begin_layout Itemize
-w: word
-\end_layout
-
-\begin_layout Itemize
-d: dword
-\end_layout
-
-\begin_layout Itemize
-q: qword
-\end_layout
-
-\begin_layout Standard
-<op> can be:
-\end_layout
-
-\begin_layout Itemize
-lt: < previous value.
-\end_layout
-
-\begin_layout Itemize
-le: <= previous value.
-\end_layout
-
-\begin_layout Itemize
-eq: = previous value.
-\end_layout
-
-\begin_layout Itemize
-ne: != previous value.
-\end_layout
-
-\begin_layout Itemize
-ge: >= previous value.
-\end_layout
-
-\begin_layout Itemize
-gt: > previous value.
-\end_layout
-
-\begin_layout Subsubsection
-search-memory <sizeflag> <value>
-\end_layout
-
-\begin_layout Standard
-Searches for addresses that currently have value <value>.
- <sizeflag> is as in previous command.
-\end_layout
-
 \begin_layout Subsection
 Main commands
 \end_layout
@@ -1025,57 +707,6 @@ toggle-rwmode
 Toggle between read-only and read-write modes.
 \end_layout
 
-\begin_layout Subsubsection
-set-gamename <name> 
-\end_layout
-
-\begin_layout Standard
-Set name of the game to <name>
-\end_layout
-
-\begin_layout Subsubsection
-get-gamename 
-\end_layout
-
-\begin_layout Standard
-Print the name of the game.
-\end_layout
-
-\begin_layout Subsubsection
-add-author <author> 
-\end_layout
-
-\begin_layout Standard
-Adds new author <author>.
- If <author> does not contain '|' it is full name.
- If it contains '|', '|' splits the full name and nickname.
-\end_layout
-
-\begin_layout Subsubsection
-edit-author <num> <author> 
-\end_layout
-
-\begin_layout Standard
-Edit the author in slot <num> (0-based) to be <author> (see add-author for
- format)
-\end_layout
-
-\begin_layout Subsubsection
-remove-author <num> 
-\end_layout
-
-\begin_layout Standard
-Remove author in slot <num>
-\end_layout
-
-\begin_layout Subsubsection
-print-authors 
-\end_layout
-
-\begin_layout Standard
-Print authors.
-\end_layout
-
 \begin_layout Subsubsection
 test-1, test-2, test-3
 \end_layout
@@ -2604,6 +2235,38 @@ Return the physical index, physical port and controller number in port for
  specified (1-based) logical controller.
 \end_layout
 
+\begin_layout Subsection
+Table keyboard
+\end_layout
+
+\begin_layout Standard
+Various keybinding-related functions
+\end_layout
+
+\begin_layout Subsubsection
+keyboard.bind(string mod, string mask, string key, string cmd)
+\end_layout
+
+\begin_layout Standard
+Bind specified key with specified modifers to specified command.
+\end_layout
+
+\begin_layout Subsubsection
+keyboard.unbind(string mod, string mask, string key)
+\end_layout
+
+\begin_layout Standard
+Unbind specified key with specified modifers.
+\end_layout
+
+\begin_layout Subsubsection
+keyboard.alias(string alias, string expansion)
+\end_layout
+
+\begin_layout Standard
+Set expansion of given command.
+\end_layout
+
 \begin_layout Subsection
 Table subtitle
 \end_layout
diff --git a/manual.txt b/manual.txt
index f402fd16..89716f73 100644
--- a/manual.txt
+++ b/manual.txt
@@ -217,123 +217,11 @@ made.
 
 • Commands without '+' execute only on negative edge (release).
 
-6.1 Settings:
-
-Settings control various aspects of emulator behaviour.
-
-6.1.1 set-setting <setting> <value>
-
-Sets setting <setting> to value <value> (may be empty).
-
-6.1.2 unset-setting <setting>
-
-Try to unset setting <setting> (not all settings can be unset).
-
-6.1.3 get-setting <setting>
-
-Read value of setting <setting>
-
-6.1.4 show-settings
-
-Print names and values of all settings.
-
-6.2 Keybindings
-
-Keybindings bind commands or aliases to keys (or pseudo-keys). 
-
-Notes:
-
-• Do not bind edge active (+/-) commands to keys with modifiers, 
-  that won't work right!
-
-• Names of keys and modifiers are platform-dependent.
-
-• Be careful before binding pseudo-keys (such as joystick axes, 
-  buttons or hats) with modifiers. That may or may not work 
-  right.
-
-6.2.1 bind-key [<mod>/<modmask>] <key> <command>
-
-Bind <command> to key <key> (activating if modifiers in <modmask> 
-(comma-seperated list) are set as <mod> (comma-seperated list).
-
-The names of keys and modifiers are platform-dependent.
-
-6.2.2 unbind-key [<mod>/<modmask>] <key>
-
-Unbind command from <key> (with specified <mod> and <modmask>).
-
-6.2.3 set-axis <axis> [disabled | axis | axis-inverse | 
-  pressure0- | pressure0+ | pressure-0 | pressure-+ | pressure+0 
-  | pressure+-] [minus=<val>] [zero=<val>] [plus=<val>] 
-  [tolerance=<val>]
-
-Set axis parameters for axis <axis>.
-
-• disabled: Disable axis
-
-• axis: Normal axis
-
-• axis-inverse: Inverse axis
-
-• pressure0-: Pressure sensitive. Released at 0, pressed at -.
-
-• pressure0+: Pressure sensitive. Released at 0, pressed at +.
-
-• pressure-0: Pressure sensitive. Released at -, pressed at 0.
-
-• pressure-+: Pressure sensitive. Released at -, pressed at +.
-
-• pressure+0: Pressure sensitive. Released at +, pressed at 0.
-
-• pressure+-: Pressure sensitive. Released at +, pressed at -.
-
-• minus=<val>: Calibration at extreme minus position 
-  (-32768-32767)
-
-• zero=<val>: Calibration at neutral position (-32768-32767)
-
-• plus=<val>: Calibration at extreme plus position (-32768-32767)
-
-• tolerance=<value>: Center band tolerance (0<x<1). The smaller 
-  the value, the more sensitive the control is.
-
-6.2.4 show-bindings
-
-Print all key bindings in effect.
-
-6.3 Aliases
-
-Aliases bind command to sequence of commands. After alias has 
-been defined, it replaces the command it shadows.
-
-Notes:
-
-• You can't alias command to itself.
-
-• Aliases starting with +/- are edge active just like ordinary 
-  commands starting with +/-.
-
-• One command can be aliased to multiple commands.
-
-6.3.1 alias-command <command> <expansion>
-
-Append <expansion> to alias <command>. If alias does not already 
-exist, it is created.
-
-6.3.2 unalias-command <command>
-
-Clear alias expansion for <command>.
-
-6.3.3 show-aliases
-
-Print all aliases and their expansions in effect.
-
-6.4 run-script <script>
+6.1 run-script <script>
 
 Run <script> as if commands were entered on the command line.
 
-6.5 Memory manipulation
+6.2 Memory manipulation
 
 <address> may be decimal or hexadecimal (prefixed with '0x'). 
 <value> can be hexadecimal (prefixed with '0x'), unsigned or 
@@ -354,180 +242,102 @@ When dealing with DSP memory, multi-byte reads/writes are
 native-endian (do not use operand sizes exceeding DSP bitness, 
 except dword is OK for 24-bit memory).
 
-6.5.1 read-<size> <address>
+6.2.1 read-<size> <address>
 
 Read the value of byte in <address>.
 
-6.5.2 read-s<size> <address>
+6.2.2 read-s<size> <address>
 
 Read the value of signed byte in <address>.
 
-6.5.3 write-<size> <address> <value>
+6.2.3 write-<size> <address> <value>
 
 Write <value> to byte in address <address>.
 
-6.5.4 search-memory reset
-
-Reset the memory search
-
-6.5.5 search-memory count
-
-Print number of candidates remaining
-
-6.5.6 search-memory print
-
-Print all candidates remaining
-
-6.5.7 search-memory <usflag><sizeflag><op>
-
-Searches memory for addresses satisfying criteria.
-
-<usflag> can be:
-
-• u: unsigned
-
-• s: signed
-
-<sizeflag> can be:
-
-• b: byte
-
-• w: word
-
-• d: dword
-
-• q: qword
-
-<op> can be:
-
-• lt: < previous value.
-
-• le: <= previous value.
-
-• eq: = previous value.
-
-• ne: != previous value.
-
-• ge: >= previous value.
-
-• gt: > previous value.
-
-6.5.8 search-memory <sizeflag> <value>
-
-Searches for addresses that currently have value <value>. 
-<sizeflag> is as in previous command.
-
-6.6 Main commands
+6.3 Main commands
 
 These commands are not available in lsnesrc, but are available 
 after ROM has been loaded.
 
-6.6.1 quit-emulator [/y]
+6.3.1 quit-emulator [/y]
 
 Quits the emulator (asking for confirmation). If /y is given, no 
 confirmation is asked.
 
-6.6.2 pause-emulator
+6.3.2 pause-emulator
 
 Toggle paused/unpaused
 
-6.6.3 +advance-frame 
+6.3.3 +advance-frame 
 
 Advance frame. If the button is still held after configurable 
 timeout expires, game unpauses for the duration frame advance is 
 held.
 
-6.6.4 +advance-poll 
+6.3.4 +advance-poll 
 
 Advance subframe. If the button is still held after configurable 
 timeout expires, game unpauses for the duration frame advance is 
 held.
 
-6.6.5 advance-skiplag 
+6.3.5 advance-skiplag 
 
 Skip to first poll in frame after current.
 
-6.6.6 reset 
+6.3.6 reset 
 
 Reset the SNES after this frame.
 
-6.6.7 load <filename> 
+6.3.7 load <filename> 
 
 Load savestate <filename> in current mode.
 
-6.6.8 load-state <filename> 
+6.3.8 load-state <filename> 
 
 Load savestate <filename> in readwrite mode.
 
-6.6.9 load-readonly <filename> 
+6.3.9 load-readonly <filename> 
 
 Load savestate <filename> in readonly mode.
 
-6.6.10 load-preserve <filename> 
+6.3.10 load-preserve <filename> 
 
 Load savestate <filename> in readonly mode, preserving current 
 events.
 
-6.6.11 load-movie <filename> 
+6.3.11 load-movie <filename> 
 
 Load savestate <filename>, ignoring save part in readonly mode.
 
-6.6.12 save-state <filename> 
+6.3.12 save-state <filename> 
 
 Save system state to <filename> as soon as possible.
 
-6.6.13 save-movie <filename> 
+6.3.13 save-movie <filename> 
 
 Save movie to <filename>.
 
-6.6.14 set-rwmode 
+6.3.14 set-rwmode 
 
 Set read-write mode.
 
-6.6.15 set-romode 
+6.3.15 set-romode 
 
 Set read-only mode
 
-6.6.16 toggle-rwmode 
+6.3.16 toggle-rwmode 
 
 Toggle between read-only and read-write modes.
 
-6.6.17 set-gamename <name> 
-
-Set name of the game to <name>
-
-6.6.18 get-gamename 
-
-Print the name of the game.
-
-6.6.19 add-author <author> 
-
-Adds new author <author>. If <author> does not contain '|' it is 
-full name. If it contains '|', '|' splits the full name and 
-nickname.
-
-6.6.20 edit-author <num> <author> 
-
-Edit the author in slot <num> (0-based) to be <author> (see 
-add-author for format)
-
-6.6.21 remove-author <num> 
-
-Remove author in slot <num>
-
-6.6.22 print-authors 
-
-Print authors.
-
-6.6.23 test-1, test-2, test-3
+6.3.17 test-1, test-2, test-3
 
 Internal test commands. Don't use.
 
-6.6.24 take-screenshot <filename> 
+6.3.18 take-screenshot <filename> 
 
 Save screenshot to <filename>.
 
-6.6.25 +controller<num><button>
+6.3.19 +controller<num><button>
 
 Press button <button> on controller <num> (1-8). The following 
 button names are known:
@@ -564,101 +374,101 @@ button names are known:
 
 • turbo
 
-6.6.26 controllerh<num><button>
+6.3.20 controllerh<num><button>
 
 Hold/unhold button <button> on controller <num> (1-8). See 
 +controller for button names.
 
-6.6.27 controllerf<num><button>
+6.3.21 controllerf<num><button>
 
 Hold/unhold button <button> on controller <num> (1-8) for the 
 next frame. See +controller for button names.
 
 Cauntion: Does not work properly if outside frame advance.
 
-6.6.28 autofire (<pattern>|-)...
+6.3.22 autofire (<pattern>|-)...
 
 Set autofire pattern. Each parameter is comma-separated list of 
 button names (in form of 1start, 1A, 2B, etc..) to hold on that 
 frame. After reaching the end of pattern, the pattern restarts 
 from the beginning.
 
-6.6.29 repaint
+6.3.23 repaint
 
 Force a repaint.
 
-6.7 Save jukebox 
+6.4 Save jukebox 
 
-6.7.1 cycle-jukebox-backward
+6.4.1 cycle-jukebox-backward
 
 Cycle save jukebox backwards.
 
-6.7.2 cycle-jukebox-forward
+6.4.2 cycle-jukebox-forward
 
 Cycle save jukebox forwards
 
-6.7.3 load-jukebox
+6.4.3 load-jukebox
 
 Do load from jukebox (current mode).
 
-6.7.4 save-jukebox
+6.4.4 save-jukebox
 
 Do state save to jukebox.
 
-6.8 Lua 
+6.5 Lua 
 
 Only available if lua support is compiled in.
 
-6.8.1 evaluate-lua <luacode>
+6.5.1 evaluate-lua <luacode>
 
 Run Lua code <luacode> using built-in Lua interpretter.
 
-6.8.2 run-lua <script>
+6.5.2 run-lua <script>
 
 Run specified lua file using built-in Lua interpretter.
 
-6.8.3 reset-lua
+6.5.3 reset-lua
 
 Clear the Lua VM state and restore to factory defaults.
 
-6.9 Memory watch
+6.6 Memory watch
 
-6.9.1 add-watch <name> <expression>
+6.6.1 add-watch <name> <expression>
 
 Adds new watch (or modifies old one).
 
-6.9.2 remove-watch <name>
+6.6.2 remove-watch <name>
 
 Remove a watch.
 
-6.10 Sound 
+6.7 Sound 
 
-6.10.1 enable-sound <on/off> 
+6.7.1 enable-sound <on/off> 
 
 Enable/Disable sound.
 
-6.10.2 set-volume <multiplier>
+6.7.2 set-volume <multiplier>
 
 Set the volume multiplier to <multiplier>. 1 is normal volume, 
 and higher numbers are louder.
 
-6.10.3 set-volume <multiplier>%
+6.7.3 set-volume <multiplier>%
 
 Set the volume multiplier to <multiplier> percent. 100 is normal 
 volume, and higher numbers are louder.
 
-6.10.4 set-volume <multiplier>dB
+6.7.4 set-volume <multiplier>dB
 
 Set the volume multiplier to <multiplier> dB. 0 is normal volume, 
 and higher numbers are louder. The value may be negative.
 
-6.11 Misc.
+6.8 Misc.
 
-6.11.1 reload-rom [<file>]
+6.8.1 reload-rom [<file>]
 
 Reloads the main ROM image from <file>.
 
-6.11.2 +tangent
+6.8.2 +tangent
 
 Tangent for recording voice for commentary track. While pressed, 
 record a stream.
@@ -1299,162 +1109,179 @@ specified table.
 Return the physical index, physical port and controller number in 
 port for specified (1-based) logical controller.
 
-8.5 Table subtitle
+8.5 Table keyboard
+
+Various keybinding-related functions
+
+8.5.1 keyboard.bind(string mod, string mask, string key, string 
+  cmd)
+
+Bind specified key with specified modifers to specified command.
+
+8.5.2 keyboard.unbind(string mod, string mask, string key)
+
+Unbind specified key with specified modifers.
+
+8.5.3 keyboard.alias(string alias, string expansion)
+
+Set expansion of given command.
+
+8.6 Table subtitle
 
 Subtitle handling
 
-8.5.1 subtitle.byindex(number i)
+8.6.1 subtitle.byindex(number i)
 
 Read the frame and length of ith subtitle. Returns nothing if not 
 present.
 
-8.5.2 subtitle.set(number f, number l, string txt)
+8.6.2 subtitle.set(number f, number l, string txt)
 
 Set the text of subtitle.
 
-8.5.3 subtitle.get(number f, number l)
+8.6.3 subtitle.get(number f, number l)
 
 Get the text of subtitle.
 
-8.5.4 subtitle.delete(number f, number l)
+8.6.4 subtitle.delete(number f, number l)
 
 Delete specified subtitle.
 
-8.6 Table hostmemory
+8.7 Table hostmemory
 
 Host memory handling (extra memory saved to savestates). Host 
 memory starts empty.
 
-8.6.1 hostmemory.read(number address)
+8.7.1 hostmemory.read(number address)
 
 Reads hostmemory slot address. Slot numbers out of range return 
 false instead of numeric.
 
-8.6.2 hostmemory.write(number address, number value)
+8.7.2 hostmemory.write(number address, number value)
 
 Writes hostmemory slot with 0-255. Slot numbers out of range 
 cause extension of host memory slot space.
 
-8.6.3 hostmemory.readbyte(number address)
+8.7.3 hostmemory.readbyte(number address)
 
 Read unsigned byte (1 element) from given address. Slots out of 
 range return false.
 
-8.6.4 hostmemory.writebyte(number address, number value)
+8.7.4 hostmemory.writebyte(number address, number value)
 
 Write unsigned byte (1 element) to given slot. Slot numbers out 
 of range cause extension.
 
-8.6.5 hostmemory.readsbyte(number address)
+8.7.5 hostmemory.readsbyte(number address)
 
 Read signed byte (1 element) from given address. Slots out of 
 range return false.
 
-8.6.6 hostmemory.writesbyte(number address, number value)
+8.7.6 hostmemory.writesbyte(number address, number value)
 
 Write signed byte (1 element) to given slot. Slot numbers out of 
 range cause extension.
 
-8.6.7 hostmemory.readword(number address)
+8.7.7 hostmemory.readword(number address)
 
 Read unsigned word (2 elements) from given address. Slots out of 
 range return false.
 
-8.6.8 hostmemory.writeword(number address, number value)
+8.7.8 hostmemory.writeword(number address, number value)
 
 Write unsigned word (2 elements) to given slot. Slot numbers out 
 of range cause extension.
 
-8.6.9 hostmemory.readsword(number address)
+8.7.9 hostmemory.readsword(number address)
 
 Read signed word (2 elements) from given address. Slots out of 
 range return false.
 
-8.6.10 hostmemory.writesword(number address, number value)
+8.7.10 hostmemory.writesword(number address, number value)
 
 Write signed word (2 elements) to given slot. Slot numbers out of 
 range cause extension.
 
-8.6.11 hostmemory.readdword(number address)
+8.7.11 hostmemory.readdword(number address)
 
 Read unsigned doubleword (4 elements) from given address. Slots 
 out of range return false.
 
-8.6.12 hostmemory.writedword(number address, number value)
+8.7.12 hostmemory.writedword(number address, number value)
 
 Write unsigned doubleword (4 elements) to given slot. Slot 
 numbers out of range cause extension.
 
-8.6.13 hostmemory.readsdword(number address)
+8.7.13 hostmemory.readsdword(number address)
 
 Read signed doubleword (4 elements) from given address. Slots out 
 of range return false.
 
-8.6.14 hostmemory.writesdword(number address, number value)
+8.7.14 hostmemory.writesdword(number address, number value)
 
 Write signed doubleword (4 elements) to given slot. Slot numbers 
 out of range cause extension.
 
-8.6.15 hostmemory.readqword(number address)
+8.7.15 hostmemory.readqword(number address)
 
 Read unsigned quadword (8 elements) from given address. Slots out 
 of range return false.
 
-8.6.16 hostmemory.writeqword(number address, number value)
+8.7.16 hostmemory.writeqword(number address, number value)
 
 Write unsigned quadword (4 elements) to given slot. Slot numbers 
 out of range cause extension.
 
-8.6.17 hostmemory.readsqword(number address)
+8.7.17 hostmemory.readsqword(number address)
 
 Read signed quadword (8 elements) from given address. Slots out 
 of range return false.
 
-8.6.18 hostmemory.writesqword(number address, number value)
+8.7.18 hostmemory.writesqword(number address, number value)
 
 Write signed quadword (8 elements) to given slot. Slot numbers 
 out of range cause extension.
 
-8.7 Table movie
+8.8 Table movie
 
 Movie handling
 
-8.7.1 movie.currentframe()
+8.8.1 movie.currentframe()
 
 Return number of current frame.
 
-8.7.2 movie.framecount()
+8.8.2 movie.framecount()
 
 Return number of frames in movie.
 
-8.7.3 movie.readonly()
+8.8.3 movie.readonly()
 
 Return true if in readonly mode, false if in readwrite.
 
-8.7.4 movie.rerecords()
+8.8.4 movie.rerecords()
 
 Returns the current value of rerecord count.
 
-8.7.5 movie.set_readwrite()
+8.8.5 movie.set_readwrite()
 
 Set readwrite mode (does not cause on_readwrite callback).
 
-8.7.6 movie.frame_subframes(number frame)
+8.8.6 movie.frame_subframes(number frame)
 
 Count number of subframes in specified frame (frame numbers are 
 1-based) and return that.
 
-8.7.7 movie.read_subframe(number frame, number subframe)
+8.8.7 movie.read_subframe(number frame, number subframe)
 
 Read specifed subframe in specified frame and return data as 
 array (100 elements, numbered 0-99 currently).
 
-8.7.8 movie.read_rtc()
+8.8.8 movie.read_rtc()
 
 Returns the current value of the RTC as a pair (second, 
 subsecond).
 
-8.7.9 movie.unsafe_rewind([UNSAFEREWIND state])
+8.8.9 movie.unsafe_rewind([UNSAFEREWIND state])
 
 Start setting point for unsafe rewind or jump to point of unsafe 
 rewind.
@@ -1476,39 +1303,39 @@ The following warnings apply to unsafe rewinding:
 
 • Only call rewind from after the rewind point was set.
 
-8.8 Table settings
+8.9 Table settings
 
 Routines for settings manipulation
 
-8.8.1 settings.get(string name)
+8.9.1 settings.get(string name)
 
 Get value of setting. If setting is blank, returns false. If 
 setting value can't be obtained, returns (nil, error message).
 
-8.8.2 settings.set(string name, string value)
+8.9.2 settings.set(string name, string value)
 
 Set value of setting. If setting can't be set, returns (nil, 
 error message).
 
-8.8.3 settings.is_set(string name)
+8.9.3 settings.is_set(string name)
 
 Returns if setting is set. If setting does not exist, returns 
 (nil, error message).
 
-8.8.4 settings.blank(string name)
+8.9.4 settings.blank(string name)
 
 Blanks a setting and returns true. If setting can't be blanked, 
 returns (nil, error message).
 
-8.9 Table memory
+8.10 Table memory
 
 Contains various functions for managing memory
 
-8.9.1 memory.vma_count()
+8.10.1 memory.vma_count()
 
 Returns the number of VMAs
 
-8.9.2 memory.read_vma(number index)
+8.10.2 memory.read_vma(number index)
 
 Reads the specified VMA (indices start from zero). Trying to read 
 invalid VMA gives nil. The read VMA is table with the following 
@@ -1529,89 +1356,89 @@ fields:
 • native_endian (boolean): True if the VMA has native endian as 
   opposed to little endian.
 
-8.9.3 memory.find_vma(number address)
+8.10.3 memory.find_vma(number address)
 
 Finds the VMA containing specified address. Returns table in the 
 same format as read_vma or nil if not found.
 
-8.9.4 memory.readbyte(number address)
+8.10.4 memory.readbyte(number address)
 
 Reads the specified address as unsigned byte and returns the 
 result.
 
-8.9.5 memory.readsbyte(number address)
+8.10.5 memory.readsbyte(number address)
 
 Reads the specified address as signed byte and returns the 
 result.
 
-8.9.6 memory.writebyte(number address, number value)
+8.10.6 memory.writebyte(number address, number value)
 
 Writes the specified value (negative values undergo 2's 
 complement) to specified address (as a byte).
 
-8.9.7 memory.readword(number address)
+8.10.7 memory.readword(number address)
 
 Reads the specified address as unsigned word and returns the 
 result.
 
-8.9.8 memory.readsword(number address)
+8.10.8 memory.readsword(number address)
 
 Reads the specified address as signed word and returns the 
 result.
 
-8.9.9 memory.writeword(number address, number value)
+8.10.9 memory.writeword(number address, number value)
 
 Writes the specified value (negative values undergo 2's 
 complement) to specified address (as a word).
 
-8.9.10 memory.readdword(number address)
+8.10.10 memory.readdword(number address)
 
 Reads the specified address as unsigned doubleword and returns 
 the result.
 
-8.9.11 memory.readsdword(number address)
+8.10.11 memory.readsdword(number address)
 
 Reads the specified address as signed doubleword and returns the 
 result.
 
-8.9.12 memory.writedword(number address, number value)
+8.10.12 memory.writedword(number address, number value)
 
 Writes the specified value (negative values undergo 2's 
 complement) to specified address (as a doubleword).
 
-8.9.13 memory.readqword(number address)
+8.10.13 memory.readqword(number address)
 
 Reads the specified address as unsigned quadword and returns the 
 result.
 
-8.9.14 memory.readsqword(number address)
+8.10.14 memory.readsqword(number address)
 
 Reads the specified address as signed quadword and returns the 
 result.
 
-8.9.15 memory.writeqword(number address, number value)
+8.10.15 memory.writeqword(number address, number value)
 
 Writes the specified value (negative values undergo 2's 
 complement) to specified address (as a quadword).
 
-8.9.16 memory.hash_region(number base, number size)
+8.10.16 memory.hash_region(number base, number size)
 
 Hash specified number of bytes starting from specified address 
 and return the SHA-256.
 
-8.9.17 memory.hash_state()
+8.10.17 memory.hash_state()
 
 Hash the current system state. Mainly useful for debugging 
 savestates.
 
-8.9.18 memory.readregion(number base, number size)
+8.10.18 memory.readregion(number base, number size)
 
 Read a region of memory.
 
 • Warning: If the region crosses VMA boundary, the results are 
   undefined.
 
-8.9.19 memory.map<type>([number base, number size])
+8.10.19 memory.map<type>([number base, number size])
 
 Returns a table mapping specified memory aperture for read/write. 
 If parameters are omitted, entiere map space is the aperture.
@@ -1619,18 +1446,18 @@ If parameters are omitted, entiere map space is the aperture.
 • Type may be one of: byte, sbyte, word, sword, dword, sdword, 
   qword or sqword.
 
-8.9.20 memory.writeregion(number base, number size, table data)
+8.10.20 memory.writeregion(number base, number size, table data)
 
 Write a region of memory.
 
 • Warning: If the region crosses VMA boundary, the results are 
   undefined.
 
-8.9.21 memory.map_struct()
+8.10.21 memory.map_struct()
 
 Returns a new mapping structure (MMAP_STRUCT)
 
-8.9.22 MMAP_STRUCT(string key, number address, string type)
+8.10.22 MMAP_STRUCT(string key, number address, string type)
 
 Bind key in mmap structure to specified address with specified 
 type.
@@ -1638,43 +1465,43 @@ type.
 • Type may be one of: byte, sbyte, word, sword, dword, sdword, 
   qword or sqword.
 
-8.9.23 memory.read_expr(string expr)
+8.10.23 memory.read_expr(string expr)
 
 Evaluate specified watch expression and return result
 
-8.10 Table subtitle
+8.11 Table subtitle
 
 Contains functions for manipulating subtitles.
 
-8.10.1 subtitle.byindex(number index)
+8.11.1 subtitle.byindex(number index)
 
 Get (basetime, length) pair of specified subtitle index or 
 nothing if index isn't valid.
 
-8.10.2 subtitle.get(number basetime, number length)
+8.11.2 subtitle.get(number basetime, number length)
 
 Read the specified subtitle. Returns “” if the subtitle does not 
 exist.
 
-8.10.3 subtitle.set(number basetime, number length, string 
+8.11.3 subtitle.set(number basetime, number length, string 
   content)
 
 Set the specified subtitle.
 
-8.10.4 subtitle.deltete(number basetime, number length)
+8.11.4 subtitle.deltete(number basetime, number length)
 
 Delete the specified subtitle.
 
-8.11 Table _SYSTEM
+8.12 Table _SYSTEM
 
 Contains copy of global variables from time of Lua 
 initialization. Non-writeable.
 
-8.12 Callbacks
+8.13 Callbacks
 
 Various callbacks to Lua that can occur.
 
-8.12.1 Callback: on_paint(bool not_synth)
+8.13.1 Callback: on_paint(bool not_synth)
 
 Called when screen is being painted. Any gui.* calls requiring 
 graphic context draw on the screen.
@@ -1682,80 +1509,80 @@ graphic context draw on the screen.
 not_synth is true if this hook is being called in response to 
 received frame, false otherwise.
 
-8.12.2 Callback: on_video()
+8.13.2 Callback: on_video()
 
 Called when video dump frame is being painted. Any gui.* calls 
 requiring graphic context draw on the video.
 
-8.12.3 Callback: on_frame_emulated()
+8.13.3 Callback: on_frame_emulated()
 
 Called when emulating frame has completed and 
 on_paint()/on_video() calls are about to be issued.
 
-8.12.4 Callback: on_frame()
+8.13.4 Callback: on_frame()
 
 Called on each starting whole frame.
 
-8.12.5 Callback: on_startup()
+8.13.5 Callback: on_startup()
 
 Called when the emulator is starting (lsnes.rc and --run files 
 has been run).
 
-8.12.6 Callback: on_rewind()
+8.13.6 Callback: on_rewind()
 
 Called when rewind movie to beginning has completed.
 
-8.12.7 Callback: on_pre_load(string name)
+8.13.7 Callback: on_pre_load(string name)
 
 Called just before savestate/movie load occurs (note: loads are 
 always delayed, so this occurs even when load was initiated by 
 lua).
 
-8.12.8 Callback: on_err_load(string name)
+8.13.8 Callback: on_err_load(string name)
 
 Called if loadstate goes wrong.
 
-8.12.9 Callback: on_post_load(string name, boolean was_savestate)
+8.13.9 Callback: on_post_load(string name, boolean was_savestate)
 
 Called on successful loadstate. was_savestate gives if this was a 
 savestate or a movie.
 
-8.12.10 Callback: on_pre_save(string name, boolean is_savestate)
+8.13.10 Callback: on_pre_save(string name, boolean is_savestate)
 
 Called just before savestate save occurs (note: movie saves are 
 synchronous and won't trigger these callbacks if called from 
 Lua).
 
-8.12.11 Callback: on_err_save(string name)
+8.13.11 Callback: on_err_save(string name)
 
 Called if savestate goes wrong.
 
-8.12.12 Callback: on_post_save(string name, boolean is_savestate)
+8.13.12 Callback: on_post_save(string name, boolean is_savestate)
 
 Called on successful savaestate. is_savestate gives if this was a 
 savestate or a movie.
 
-8.12.13 Callback: on_quit()
+8.13.13 Callback: on_quit()
 
 Called when emulator is shutting down.
 
-8.12.14 Callback: on_input(boolean subframe)
+8.13.14 Callback: on_input(boolean subframe)
 
 Called when emulator is just sending input to bsnes core. 
 Warning: This is called even in readonly mode, but the results 
 are ignored.
 
-8.12.15 Callback: on_reset()
+8.13.15 Callback: on_reset()
 
 Called when SNES is reset.
 
-8.12.16 Callback: on_readwrite()
+8.13.16 Callback: on_readwrite()
 
 Called when moving into readwrite mode as result of “set-rwmode” 
 command (note: moving to rwmode by Lua won't trigger this, as per 
 recursive entry protection).
 
-8.12.17 Callback: on_snoop(number port, number controller, number 
+8.13.17 Callback: on_snoop(number port, number controller, number 
   index, number value)
 
 Called each time bsnes asks for input. The value is the final 
@@ -1764,31 +1591,31 @@ autofire have been taken into account). Might be useful when
 translating movies to format suitable for console verification. 
 Note: There is no way to modify the value to be sent.
 
-8.12.18 Callback: on_keyhook(string keyname, table state)
+8.13.18 Callback: on_keyhook(string keyname, table state)
 
 Sent when key that has keyhook events requested changes state. 
 Keyname is name of the key (group) and state is the state (same 
 kind as table values in input.raw).
 
-8.12.19 Callback: on_idle()
+8.13.19 Callback: on_idle()
 
 Called when requested by set_idle_timeout(), the timeout has 
 expired and emulator is waiting.
 
-8.12.20 Callback: on_timer()
+8.13.20 Callback: on_timer()
 
 Called when requested by set_idle_timeout() and the timeout has 
 expired (regardless if emulator is waiting).
 
-8.12.21 Callback: on_set_rewind(UNSAFEREWIND r)
+8.13.21 Callback: on_set_rewind(UNSAFEREWIND r)
 
 Called when unsafe rewind object has been constructed.
 
-8.12.22 Callback: on_pre_rewind() 
+8.13.22 Callback: on_pre_rewind() 
 
 Called just before unsafe rewind is about to occur.
 
-8.12.23 Callback: on_post_rewind() 
+8.13.23 Callback: on_post_rewind() 
 
 Called just after unsafe rewind has occured.
 
diff --git a/src/core/keymapper.cpp b/src/core/keymapper.cpp
index 288adc9c..d44c848c 100644
--- a/src/core/keymapper.cpp
+++ b/src/core/keymapper.cpp
@@ -18,44 +18,6 @@
 
 keyboard lsnes_kbd;
 
-namespace
-{
-	function_ptr_command<const std::string&> bind_key(lsnes_cmd, "bind-key", "Bind a (pseudo-)key",
-		"Syntax: bind-key [<mod>/<modmask>] <key> <command>\nBind command to specified key (with specified "
-		" modifiers)\n",
-		[](const std::string& t) throw(std::bad_alloc, std::runtime_error) {
-			auto r = regex("(([^ /\t]*)/([^ /\t]*)[ \t]+)?([^ \t]+)[ \t]+([^ \t].*)", t,
-				"Key and command required");
-			keymapper::bind(r[2], r[3], r[4], r[5]);
-			if(r[2] != "" || r[3] != "")
-				messages << r[2] << "/" << r[3] << " ";
-			messages << r[4] << " bound to '" << r[5] << "'" << std::endl;
-		});
-
-	function_ptr_command<const std::string&> unbind_key(lsnes_cmd, "unbind-key", "Unbind a (pseudo-)key",
-		"Syntax: unbind-key [<mod>/<modmask>] <key>\nUnbind specified key (with specified modifiers)\n",
-		[](const std::string& t) throw(std::bad_alloc, std::runtime_error) {
-			auto r = regex("(([^ /\t]*)/([^ /\t]*)[ \t]+)?([^ \t]+)[ \t]*", t, "Key required");
-			keymapper::unbind(r[2], r[3], r[4]);
-			if(r[2] != "" || r[3] != "")
-				messages << r[2] << "/" << r[3] << " ";
-			messages << r[4] << " unbound" << std::endl;
-		});
-
-	function_ptr_command<> show_bindings(lsnes_cmd, "show-bindings", "Show active bindings",
-		"Syntax: show-bindings\nShow bindings that are currently active.\n",
-		[]() throw(std::bad_alloc, std::runtime_error) {
-			keymapper::dumpbindings();
-		});
-
-	function_ptr_command<> show_inverse(lsnes_cmd, "show-inverse", "Show inverse bindings",
-		"Syntax: show-inverse\nShow inversebindings that are currently active.\n",
-		[]() throw(std::bad_alloc, std::runtime_error) {
-			for(auto i : inverse_key::get_ikeys())
-				messages << i->getname() << ":" << i->get(true) << ":" << i->get(false) << std::endl;
-		});
-}
-
 std::string fixup_command_polarity(std::string cmd, bool polarity) throw(std::bad_alloc)
 {
 	if(cmd == "" || cmd == "*")
@@ -96,90 +58,6 @@ namespace
 
 namespace
 {
-	function_ptr_command<const std::string&> set_axis(lsnes_cmd, "set-axis", "Set mode of Joystick axis",
-		"Syntax: set-axis <axis> <options>...\nKnown options: disabled, axis, axis-inverse, pressure0-\n"
-		"pressure0+, pressure-0, pressure-+, pressure+0, pressure+-\nminus=<val>, zero=<val>, plus=<val>\n"
-		"tolerance=<val>\n",
-		[](const std::string& t) throw(std::bad_alloc, std::runtime_error) {
-			auto r = regex("([^ \t]+)[ \t]+([^ \t].*)", t, "Axis name and option(s) required");
-			auto axis = lsnes_kbd.try_lookup_key(r[1]);
-			if(!axis)
-				throw std::runtime_error("Unknown axis name");
-			keyboard_key_axis* _axis = axis->cast_axis();
-			if(!_axis)
-				throw std::runtime_error("Not an axis");
-			auto p = _axis->get_calibration();
-			regex_results r2;
-			std::string options = r[2];
-			unsigned found_mask = 0;
-			while(options != "") {
-				std::string option;
-				extract_token(options, option, " \t", true);
-				unsigned optmask = 0;
-				if(option == "disabled") {
-					p.mode = -1;
-					optmask = 1;
-				} else if(option == "axis") {
-					p.mode = 1; p.esign_a = -1; p.esign_b = 1;
-					optmask = 1;
-				} else if(option == "axis-inverse") {
-					p.mode = 1; p.esign_a = 1; p.esign_b = -1;
-					optmask = 1;
-				} else if(option == "pressure0-") {
-					p.mode = 0; p.esign_a = 0; p.esign_b = -1;
-					optmask = 1;
-				} else if(option == "pressure0+") {
-					p.mode = 0; p.esign_a = 0; p.esign_b = 1;
-					optmask = 1;
-				} else if(option == "pressure-0") {
-					p.mode = 0; p.esign_a = -1; p.esign_b = 0;
-					optmask = 1;
-				} else if(option == "pressure-+") {
-					p.mode = 0; p.esign_a = -1; p.esign_b = 1;
-					optmask = 1;
-				} else if(option == "pressure+-") {
-					p.mode = 0; p.esign_a = 1; p.esign_b = -1;
-					optmask = 1;
-				} else if(option == "pressure+0") {
-					p.mode = 0; p.esign_a = 1; p.esign_b = 0;
-					optmask = 1;
-				} else if(r2 = regex("minus=([+-]?[0-9]+)", option)) {
-					p.left = parse_value<int32_t>(r2[1]);
-					optmask = 2;
-				} else if(r2 = regex("zero=([+-]?[0-9]+)", option)) {
-					p.center = parse_value<int32_t>(r2[1]);
-					optmask = 4;
-				} else if(r2 = regex("plus=([+-]?[0-9]+)", option)) {
-					p.right = parse_value<int32_t>(r2[1]);
-					optmask = 8;
-				} else if(r2 = regex("tolerance=0?(\\.[0-9]+)", option)) {
-					p.nullwidth = parse_value<double>(r2[1]);
-					optmask = 16;
-				} else
-					throw std::runtime_error("Unknown axis option");
-				if(found_mask & optmask)
-					throw std::runtime_error("Conflicting axis modes");
-				found_mask |= optmask;
-			}
-			_axis->set_calibration(p);
-		});
-
-	function_ptr_command<> set_axismode(lsnes_cmd, "show-axes", "Show all joystick axes",
-		"Syntax: show-axes\n",
-		[]() throw(std::bad_alloc, std::runtime_error) {
-			for(auto i : lsnes_kbd.all_keys()) {
-				keyboard_key_axis* j = i->cast_axis();
-				if(!j)
-					continue;
-				auto p = j->get_calibration();
-				std::string type = calibration_to_mode(p);
-				messages << i->get_name() << " " << type << " -:" << p.left << " 0:"
-					<< p.center << " +:" << p.right << " t:" << p.nullwidth
-					<< std::endl;
-			}
-		});
-
-
 	struct triple
 	{
 		triple(const std::string& _a, const std::string& _b, const std::string& _c)
diff --git a/src/core/memorymanip.cpp b/src/core/memorymanip.cpp
index 9a4d908b..6ff1b3e1 100644
--- a/src/core/memorymanip.cpp
+++ b/src/core/memorymanip.cpp
@@ -255,155 +255,6 @@ namespace
 		}
 	};
 
-	struct simple_mem_commands
-	{
-		simple_mem_commands()
-		{
-			cmds["sblt"] = &memory_search::byte_slt;
-			cmds["sble"] = &memory_search::byte_sle;
-			cmds["sbeq"] = &memory_search::byte_seq;
-			cmds["sbne"] = &memory_search::byte_sne;
-			cmds["sbge"] = &memory_search::byte_sge;
-			cmds["sbgt"] = &memory_search::byte_sgt;
-			cmds["ublt"] = &memory_search::byte_ult;
-			cmds["uble"] = &memory_search::byte_ule;
-			cmds["ubeq"] = &memory_search::byte_ueq;
-			cmds["ubne"] = &memory_search::byte_une;
-			cmds["ubge"] = &memory_search::byte_uge;
-			cmds["ubgt"] = &memory_search::byte_ugt;
-			cmds["bseqlt"] = &memory_search::byte_seqlt;
-			cmds["bseqle"] = &memory_search::byte_seqle;
-			cmds["bseqge"] = &memory_search::byte_seqge;
-			cmds["bseqgt"] = &memory_search::byte_seqgt;
-			cmds["swlt"] = &memory_search::word_slt;
-			cmds["swle"] = &memory_search::word_sle;
-			cmds["sweq"] = &memory_search::word_seq;
-			cmds["swne"] = &memory_search::word_sne;
-			cmds["swge"] = &memory_search::word_sge;
-			cmds["swgt"] = &memory_search::word_sgt;
-			cmds["uwlt"] = &memory_search::word_ult;
-			cmds["uwle"] = &memory_search::word_ule;
-			cmds["uweq"] = &memory_search::word_ueq;
-			cmds["uwne"] = &memory_search::word_une;
-			cmds["uwge"] = &memory_search::word_uge;
-			cmds["uwgt"] = &memory_search::word_ugt;
-			cmds["wseqlt"] = &memory_search::word_seqlt;
-			cmds["wseqle"] = &memory_search::word_seqle;
-			cmds["wseqge"] = &memory_search::word_seqge;
-			cmds["wseqgt"] = &memory_search::word_seqgt;
-			cmds["sdlt"] = &memory_search::dword_slt;
-			cmds["sdle"] = &memory_search::dword_sle;
-			cmds["sdeq"] = &memory_search::dword_seq;
-			cmds["sdne"] = &memory_search::dword_sne;
-			cmds["sdge"] = &memory_search::dword_sge;
-			cmds["sdgt"] = &memory_search::dword_sgt;
-			cmds["udlt"] = &memory_search::dword_ult;
-			cmds["udle"] = &memory_search::dword_ule;
-			cmds["udeq"] = &memory_search::dword_ueq;
-			cmds["udne"] = &memory_search::dword_une;
-			cmds["udge"] = &memory_search::dword_uge;
-			cmds["udgt"] = &memory_search::dword_ugt;
-			cmds["dseqlt"] = &memory_search::dword_seqlt;
-			cmds["dseqle"] = &memory_search::dword_seqle;
-			cmds["dseqge"] = &memory_search::dword_seqge;
-			cmds["dseqgt"] = &memory_search::dword_seqgt;
-			cmds["sqlt"] = &memory_search::qword_slt;
-			cmds["sqle"] = &memory_search::qword_sle;
-			cmds["sqeq"] = &memory_search::qword_seq;
-			cmds["sqne"] = &memory_search::qword_sne;
-			cmds["sqge"] = &memory_search::qword_sge;
-			cmds["sqgt"] = &memory_search::qword_sgt;
-			cmds["uqlt"] = &memory_search::qword_ult;
-			cmds["uqle"] = &memory_search::qword_ule;
-			cmds["uqeq"] = &memory_search::qword_ueq;
-			cmds["uqne"] = &memory_search::qword_une;
-			cmds["uqge"] = &memory_search::qword_uge;
-			cmds["uqgt"] = &memory_search::qword_ugt;
-			cmds["qseqlt"] = &memory_search::qword_seqlt;
-			cmds["qseqle"] = &memory_search::qword_seqle;
-			cmds["qseqge"] = &memory_search::qword_seqge;
-			cmds["qseqgt"] = &memory_search::qword_seqgt;
-		}
-		std::map<std::string, void (memory_search::*)()> cmds;
-	} simple_cmds;
-
-	class memorysearch_command : public memorymanip_command
-	{
-	public:
-		memorysearch_command() throw(std::bad_alloc) : memorymanip_command("search-memory") {}
-		void invoke2() throw(std::bad_alloc, std::runtime_error)
-		{
-			if(!isrch)
-				isrch = new memory_search(lsnes_memory);
-			if(simple_cmds.cmds.count(firstword) && !has_value)
-				(isrch->*(simple_cmds.cmds[firstword]))();
-			else if(firstword == "b" && has_value) {
-				if(static_cast<int64_t>(value) < -128 || value > 255)
-					throw std::runtime_error("Value to compare out of range");
-				isrch->byte_value(value & 0xFF);
-			} else if(firstword == "bdiff" && has_value) {
-				if(static_cast<int64_t>(value) < -128 || value > 255)
-					throw std::runtime_error("Value to compare out of range");
-				isrch->byte_difference(value & 0xFF);
-			} else if(firstword == "w" && has_value) {
-				if(static_cast<int64_t>(value) < -32768 || value > 65535)
-					throw std::runtime_error("Value to compare out of range");
-				isrch->word_value(value & 0xFFFF);
-			} else if(firstword == "wdiff" && has_value) {
-				if(static_cast<int64_t>(value) < -32768 || value > 65535)
-					throw std::runtime_error("Value to compare out of range");
-				isrch->word_difference(value & 0xFFFF);
-			} else if(firstword == "d" && has_value) {
-				if(static_cast<int64_t>(value) < -2147483648LL || value > 4294967295ULL)
-					throw std::runtime_error("Value to compare out of range");
-				isrch->dword_value(value & 0xFFFFFFFFULL);
-			} else if(firstword == "ddiff" && has_value) {
-				if(static_cast<int64_t>(value) < -2147483648LL || value > 4294967295ULL)
-					throw std::runtime_error("Value to compare out of range");
-				isrch->dword_difference(value & 0xFFFFFFFFULL);
-			} else if(firstword == "q" && has_value)
-				isrch->qword_value(value);
-			else if(firstword == "qdiff" && has_value)
-				isrch->qword_difference(value);
-			else if(firstword == "disqualify" && has_value)
-				isrch->dq_range(value, value);
-			else if(firstword == "disqualify_vma" && has_value) {
-				auto r = lsnes_memory.lookup(value);
-				if(r.first)
-					isrch->dq_range(r.first->base, r.first->last_address());
-			} else if(firstword == "update" && !has_value)
-				isrch->update();
-			else if(firstword == "reset" && !has_value)
-				isrch->reset();
-			else if(firstword == "count" && !has_value)
-				;
-			else if(firstword == "print" && !has_value) {
-				auto c = isrch->get_candidates();
-				for(auto ci : c) {
-					std::ostringstream x;
-					x << "0x" << std::hex << std::setw(8) << std::setfill('0') << ci;
-					messages << x.str() << std::endl;
-				}
-			} else
-				throw std::runtime_error("Unknown memorysearch subcommand '" + firstword + "'");
-			messages << isrch->get_candidate_count() << " candidates remain." << std::endl;
-		}
-		std::string get_short_help() throw(std::bad_alloc) { return "Search memory addresses"; }
-		std::string get_long_help() throw(std::bad_alloc)
-		{
-			return "Syntax: " + _command + " {s,u}{b,w,d,q}{lt,le,eq,ne,ge,gt}\n"
-				"Syntax: " + _command + " {b,w,d,q}seq{lt,le,ge,gt}\n"
-				"Syntax: " + _command + " {b,w,d,q} <value>\n"
-				"Syntax: " + _command + " {b,w,d,q}diff <value>\n"
-				"Syntax: " + _command + " disqualify{,_vma} <address>\n"
-				"Syntax: " + _command + " update\n"
-				"Syntax: " + _command + " reset\n"
-				"Syntax: " + _command + " count\n"
-				"Syntax: " + _command + " print\n"
-				"Searches addresses from memory.\n";
-		}
-	} memorysearch_o;
-
 	read_command<uint8_t, &memory_space::read<uint8_t>> ru1("read-byte");
 	read_command<uint16_t, &memory_space::read<uint16_t>> ru2("read-word");
 	read_command<uint32_t, &memory_space::read<uint32_t>> ru4("read-dword");
diff --git a/src/core/misc.cpp b/src/core/misc.cpp
index ef257025..f6917da1 100644
--- a/src/core/misc.cpp
+++ b/src/core/misc.cpp
@@ -254,7 +254,6 @@ void reached_main()
 	init_threaded_malloc();
 	lsnes_cmd.set_oom_panic(OOM_panic);
 	lsnes_cmd.set_output(platform::out());
-	cmd_bridge.set_output(platform::out());
 }
 
 std::string bsnes_core_version;
diff --git a/src/core/moviedata.cpp b/src/core/moviedata.cpp
index 5b4cb42e..3631bd5b 100644
--- a/src/core/moviedata.cpp
+++ b/src/core/moviedata.cpp
@@ -98,60 +98,6 @@ namespace
 		}
 	} mprefix;
 
-	function_ptr_command<> get_gamename(lsnes_cmd, "get-gamename", "Get the game name",
-		"Syntax: get-gamename\nPrints the game name\n",
-		[]() throw(std::bad_alloc, std::runtime_error) {
-			messages << "Game name is '" << our_movie.gamename << "'" << std::endl;
-		});
-
-	function_ptr_command<const std::string&> set_gamename(lsnes_cmd, "set-gamename", "Set the game name",
-		"Syntax: set-gamename <name>\nSets the game name to <name>\n",
-		[](const std::string& args) throw(std::bad_alloc, std::runtime_error) {
-			our_movie.gamename = args;
-			messages << "Game name changed to '" << our_movie.gamename << "'" << std::endl;
-		});
-
-	function_ptr_command<> show_authors(lsnes_cmd, "show-authors", "Show the run authors",
-		"Syntax: show-authors\nShows the run authors\n",
-		[]() throw(std::bad_alloc, std::runtime_error)
-		{
-			size_t idx = 0;
-			for(auto i : our_movie.authors) {
-				messages << (idx++) << ": " << i.first << "|" << i.second << std::endl;
-			}
-			messages << "End of authors list" << std::endl;
-		});
-
-	function_ptr_command<const std::string&> add_author(lsnes_cmd, "add-author", "Add an author",
-		"Syntax: add-author <fullname>\nSyntax: add-author |<nickname>\n"
-		"Syntax: add-author <fullname>|<nickname>\nAdds a new author\n",
-		[](const std::string& t) throw(std::bad_alloc, std::runtime_error) {
-			auto g = split_author(t);
-			our_movie.authors.push_back(g);
-			messages << (our_movie.authors.size() - 1) << ": " << g.first << "|" << g.second << std::endl;
-		});
-
-	function_ptr_command<const std::string&> remove_author(lsnes_cmd, "remove-author", "Remove an author",
-		"Syntax: remove-author <id>\nRemoves author with ID <id>\n",
-		[](const std::string& t) throw(std::bad_alloc, std::runtime_error) {
-			uint64_t index = parse_value<uint64_t>(t);
-			if(index >= our_movie.authors.size())
-				throw std::runtime_error("No such author");
-			our_movie.authors.erase(our_movie.authors.begin() + index);
-		});
-
-	function_ptr_command<const std::string&> edit_author(lsnes_cmd, "edit-author", "Edit an author",
-		"Syntax: edit-author <authorid> <fullname>\nSyntax: edit-author <authorid> |<nickname>\n"
-		"Syntax: edit-author <authorid> <fullname>|<nickname>\nEdits author name\n",
-		[](const std::string& t) throw(std::bad_alloc, std::runtime_error) {
-			auto r = regex("([^ \t]+)[ \t]+(|[^ \t].*)", t, "Index and author required.");
-			uint64_t index = parse_value<uint64_t>(r[1]);
-			if(index >= our_movie.authors.size())
-				throw std::runtime_error("No such author");
-			auto g = split_author(r[2]);
-			our_movie.authors[index] = g;
-		});
-
 	function_ptr_command<const std::string&> dump_coresave(lsnes_cmd, "dump-coresave", "Dump bsnes core state",
 		"Syntax: dump-coresave <name>\nDumps core save to <name>\n",
 		[](const std::string& name) throw(std::bad_alloc, std::runtime_error) {
diff --git a/src/core/settings.cpp b/src/core/settings.cpp
index 52c97640..e7d41e60 100644
--- a/src/core/settings.cpp
+++ b/src/core/settings.cpp
@@ -1,7 +1,4 @@
 #include "core/command.hpp"
 #include "core/settings.hpp"
-#include "library/settings-cmd-bridge.hpp"
 
 setting_group lsnes_set;
-settings_command_bridge cmd_bridge(lsnes_set, lsnes_cmd, "set-setting", "unset-setting", "get-setting",
-	"show-settings");
diff --git a/src/library/commands.cpp b/src/library/commands.cpp
index 8cb9dd98..0ff8a9c3 100644
--- a/src/library/commands.cpp
+++ b/src/library/commands.cpp
@@ -55,120 +55,6 @@ namespace
 		std::ostream*& output;
 	};
 
-	struct show_aliases : public command
-	{
-		show_aliases(command_group& group, std::ostream*& _output)
-			: command(group, "show-aliases"), in_group(group), output(_output)
-		{
-		}
-
-		~show_aliases() throw()
-		{
-		}
-
-		void invoke(const std::string& filename) throw(std::bad_alloc, std::runtime_error)
-		{
-			if(filename != "") {
-				(*output) << "Syntax: show-aliases" << std::endl;
-				return;
-			}
-			auto aliases = in_group.get_aliases();
-			for(auto i : aliases) {
-				std::string acmd = in_group.get_alias_for(i);
-				while(acmd != "") {
-					std::string j;
-					extract_token(acmd, j, "\n");
-					if(j != "")
-						(*output) << "alias " << i << " " << j << std::endl;
-				}
-			}
-		}
-
-		std::string get_short_help() throw(std::bad_alloc)
-		{
-			return "Show aliases";
-		}
-
-		std::string get_long_help() throw(std::bad_alloc)
-		{
-			return "Syntax: show-aliases\nShow expansions of all aliases\n";
-		}
-
-		command_group& in_group;
-		std::ostream*& output;
-	};
-
-	struct unalias_command : public command
-	{
-		unalias_command(command_group& group, std::ostream*& _output)
-			: command(group, "unalias-command"), in_group(group), output(_output)
-		{
-		}
-
-		~unalias_command() throw()
-		{
-		}
-
-		void invoke(const std::string& t) throw(std::bad_alloc, std::runtime_error)
-		{
-			auto r = regex("([^ \t]+)[ \t]*", t, "This command only takes one argument");
-			if(!in_group.valid_alias_name(r[1]))
-				throw std::runtime_error("Illegal alias name");
-			in_group.set_alias_for(r[1], "");
-			(*output) << "Command '" << r[1] << "' unaliased" << std::endl;
-		}
-
-		std::string get_short_help() throw(std::bad_alloc)
-		{
-			return "Unalias a command";
-		}
-
-		std::string get_long_help() throw(std::bad_alloc)
-		{
-			return "Syntax: unalias-command <aliasname>\nClear expansion of alias <aliasname>\n";
-		}
-
-		command_group& in_group;
-		std::ostream*& output;
-	};
-
-	struct alias_command : public command
-	{
-		alias_command(command_group& group, std::ostream*& _output)
-			: command(group, "alias-command"), in_group(group), output(_output)
-		{
-		}
-
-		~alias_command() throw()
-		{
-		}
-
-		void invoke(const std::string& t) throw(std::bad_alloc, std::runtime_error)
-		{
-			auto r = regex("([^ \t]+)[ \t]+([^ \t].*)", t, "Alias name and command needed");
-			if(!in_group.valid_alias_name(r[1]))
-				throw std::runtime_error("Illegal alias name");
-			std::string tmp = in_group.get_alias_for(r[1]);
-			tmp = tmp + r[2] + "\n";
-			in_group.set_alias_for(r[1], tmp);
-			(*output) << "Command '" << r[1] << "' aliased to '" << r[2] << "'" << std::endl;
-		}
-
-		std::string get_short_help() throw(std::bad_alloc)
-		{
-			return "Alias a command";
-		}
-
-		std::string get_long_help() throw(std::bad_alloc)
-		{
-			return "Syntax: alias-command <aliasname> <command>\nAppend <command> to expansion of alias "
-				"<aliasname>\nValid alias names can't be empty nor start with '*' or '?'\n";
-		}
-
-		command_group& in_group;
-		std::ostream*& output;
-	};
-
 	void default_oom_panic()
 	{
 		std::cerr << "PANIC: Fatal error, can't continue: Out of memory." << std::endl;
@@ -207,9 +93,6 @@ command_group::command_group() throw(std::bad_alloc)
 	regqueue_t::do_ready(*this, true);
 	//The builtin commands.
 	builtin[0] = new run_script(*this, output);
-	builtin[1] = new show_aliases(*this, output);
-	builtin[2] = new unalias_command(*this, output);
-	builtin[3] = new alias_command(*this, output);
 }
 
 command_group::~command_group() throw()
diff --git a/src/library/settings-cmd-bridge.cpp b/src/library/settings-cmd-bridge.cpp
deleted file mode 100644
index 73f4ad08..00000000
--- a/src/library/settings-cmd-bridge.cpp
+++ /dev/null
@@ -1,147 +0,0 @@
-#include "settings-cmd-bridge.hpp"
-#include "string.hpp"
-
-namespace
-{
-	struct set_setting_cmd : public command
-	{
-		set_setting_cmd(setting_group& _sgroup, command_group& _cgroup, const std::string& _cmd,
-			std::ostream*& out)
-			: command(_cgroup, _cmd), sgroup(_sgroup), output(out), cmd(_cmd)
-		{
-		}
-		~set_setting_cmd() throw() {}
-		void invoke(const std::string& t) throw(std::bad_alloc, std::runtime_error)
-		{
-			auto r = regex("([^ \t]+)([ \t]+(|[^ \t].*))?", t, "Setting name required.");
-			sgroup.set(r[1], r[3]);
-			(*output) << "Setting '" << r[1] << "' set to '" << r[3] << "'" << std::endl;
-		}
-		std::string get_short_help() throw(std::bad_alloc)
-		{
-			return "Set a setting";
-		}
-		std::string get_long_help() throw(std::bad_alloc)
-		{
-			return "Syntax: " + cmd + " <setting> [<value>]\nSet setting to a new value. Omit <value> "
-				"to set to ''\n";
-		}
-		setting_group& sgroup;
-		std::ostream*& output;
-		std::string cmd;
-	};
-
-	struct unset_setting_cmd : public command
-	{
-		unset_setting_cmd(setting_group& _sgroup, command_group& _cgroup, const std::string& _cmd,
-			std::ostream*& out)
-			: command(_cgroup, _cmd), sgroup(_sgroup), output(out), cmd(_cmd)
-		{
-		}
-		~unset_setting_cmd() throw() {}
-		void invoke(const std::string& t) throw(std::bad_alloc, std::runtime_error)
-		{
-			auto r = regex("([^ \t]+)[ \t]*", t, "Expected setting name and nothing else");
-			sgroup.blank(r[1]);
-			(*output) << "Setting '" << r[1] << "' unset" << std::endl;
-		}
-		std::string get_short_help() throw(std::bad_alloc)
-		{
-			return "Unset a setting";
-		}
-		std::string get_long_help() throw(std::bad_alloc)
-		{
-			return "Syntax: " + cmd + " <setting>\nTry to unset a setting. Note that not all settings "
-				"can be unset\n";
-		}
-		setting_group& sgroup;
-		std::ostream*& output;
-		std::string cmd;
-	};
-
-	struct get_setting_cmd : public command
-	{
-		get_setting_cmd(setting_group& _sgroup, command_group& _cgroup, const std::string& _cmd,
-			std::ostream*& out)
-			: command(_cgroup, _cmd), sgroup(_sgroup), output(out), cmd(_cmd)
-		{
-		}
-		~get_setting_cmd() throw() {}
-		void invoke(const std::string& t) throw(std::bad_alloc, std::runtime_error)
-		{
-			auto r = regex("([^ \t]+)[ \t]*", t, "Expected setting name and nothing else");
-			if(sgroup.is_set(r[1]))
-				(*output) << "Setting '" << r[1] << "' has value '"
-					<< sgroup.get(r[1]) << "'" << std::endl;
-			else
-				(*output) << "Setting '" << r[1] << "' is unset" << std::endl;
-		}
-		std::string get_short_help() throw(std::bad_alloc)
-		{
-			return "get value of a setting";
-		}
-		std::string get_long_help() throw(std::bad_alloc)
-		{
-			return "Syntax: " + cmd + " <setting>\nShow value of setting\n";
-		}
-		setting_group& sgroup;
-		std::ostream*& output;
-		std::string cmd;
-	};
-
-	struct show_setting_cmd : public command
-	{
-		show_setting_cmd(setting_group& _sgroup, command_group& _cgroup, const std::string& _cmd,
-			std::ostream*& out)
-			: command(_cgroup, _cmd), sgroup(_sgroup), output(out), cmd(_cmd)
-		{
-		}
-		~show_setting_cmd() throw() {}
-		void invoke(const std::string& t) throw(std::bad_alloc, std::runtime_error)
-		{
-			if(t != "")
-				throw std::runtime_error("This command does not take arguments");
-			for(auto i : sgroup.get_settings_set()) {
-				if(!sgroup.is_set(i))
-					(*output) << i << ": (unset)" << std::endl;
-				else
-					(*output) << i << ": " << sgroup.get(i) << std::endl;
-			}
-		}
-		std::string get_short_help() throw(std::bad_alloc)
-		{
-			return "Sghow values of all settings";
-		}
-		std::string get_long_help() throw(std::bad_alloc)
-		{
-			return "Syntax: " + cmd + "\nShow value of all settings\n";
-		}
-		setting_group& sgroup;
-		std::ostream*& output;
-		std::string cmd;
-	};
-}
-
-settings_command_bridge::settings_command_bridge(setting_group& sgroup, command_group& cgroup,
-	const std::string& set_cmd, const std::string& unset_cmd, const std::string& get_cmd,
-	const std::string& show_cmd)
-{
-	output = &std::cerr;
-	c1 = new set_setting_cmd(sgroup, cgroup, set_cmd, output);
-	c2 = new unset_setting_cmd(sgroup, cgroup, unset_cmd, output);
-	c3 = new get_setting_cmd(sgroup, cgroup, get_cmd, output);
-	c4 = new show_setting_cmd(sgroup, cgroup, show_cmd, output);
-}
-
-settings_command_bridge::~settings_command_bridge() throw()
-{
-	delete c1;
-	delete c2;
-	delete c3;
-	delete c4;
-}
-
-void settings_command_bridge::set_output(std::ostream& out)
-{
-	output = &out;
-}
diff --git a/src/lua/bind.cpp b/src/lua/bind.cpp
new file mode 100644
index 00000000..be9c211d
--- /dev/null
+++ b/src/lua/bind.cpp
@@ -0,0 +1,46 @@
+#include "core/keymapper.hpp"
+#include "core/command.hpp"
+#include "lua/internal.hpp"
+#include <stdexcept>
+
+namespace
+{
+	function_ptr_luafun kbind(LS, "keyboard.bind", [](lua_state& L, const std::string& fname) -> int {
+		std::string mod = L.get_string(1, fname.c_str());
+		std::string mask = L.get_string(2, fname.c_str());
+		std::string key = L.get_string(3, fname.c_str());
+		std::string cmd = L.get_string(4, fname.c_str());
+		try {
+			keymapper::bind(mod, mask, key, cmd);
+		} catch(std::exception& e) {
+			L.pushstring(e.what());
+			L.error();
+			return 0;
+		}
+	});
+
+	function_ptr_luafun kunbind(LS, "keyboard.unbind", [](lua_state& L, const std::string& fname) -> int {
+		std::string mod = L.get_string(1, fname.c_str());
+		std::string mask = L.get_string(2, fname.c_str());
+		std::string key = L.get_string(3, fname.c_str());
+		try {
+			keymapper::unbind(mod, mask, key);
+		} catch(std::exception& e) {
+			L.pushstring(e.what());
+			L.error();
+			return 0;
+		}
+	});
+
+	function_ptr_luafun kalias(LS, "keyboard.alias", [](lua_state& L, const std::string& fname) -> int {
+		std::string alias = L.get_string(1, fname.c_str());
+		std::string cmds = L.get_string(2, fname.c_str());
+		try {
+			lsnes_cmd.set_alias_for(alias, cmds);
+		} catch(std::exception& e) {
+			L.pushstring(e.what());
+			L.error();
+			return 0;
+		}
+	});
+}
diff --git a/src/platform/wxwidgets/main.cpp b/src/platform/wxwidgets/main.cpp
index 07fd4755..af149e68 100644
--- a/src/platform/wxwidgets/main.cpp
+++ b/src/platform/wxwidgets/main.cpp
@@ -32,6 +32,7 @@
 #include <wx/control.h>
 #include <wx/combobox.h>
 #include <wx/cmdline.h>
+#include <iostream>
 
 #define UISERV_RESIZED 9991
 #define UISERV_UIFUN 9992
@@ -167,9 +168,83 @@ end:
 		wxPostEvent(ui_services, uic);
 	}
 
+	void handle_config_line(std::string line)
+	{
+		regex_results r;
+		if(r = regex("AXIS[ \t]+([^ \t]+)[ \t]+(-?[0-9])[ \t]+(-?[0-9])[ \t]+(-?[0-9])[ \t]+"
+			"(-?[0-9]+)[ \t]+(-?[0-9]+)[ \t]+(-?[0-9]+)[ \t]+(0?.[0-9]+)[ \t]*", line)) {
+			keyboard_axis_calibration c;
+			c.mode = parse_value<int>(r[2]);
+			if(c.mode < -1 || c.mode > 1) {
+				messages << "Illegal axis mode " << c.mode << std::endl;
+				return;
+			}
+			c.esign_a = parse_value<int>(r[3]);
+			c.esign_b = parse_value<int>(r[4]);
+			if(c.esign_a < -1 || c.esign_a > 1 || c.esign_b < -1 || c.esign_b > 1 ||
+				c.esign_a == c.esign_b || (c.mode == 1 && (c.esign_a == 0 || c.esign_b == 0))) {
+				messages << "Illegal axis endings " << c.esign_a << "/" << c.esign_b << std::endl;
+				return;
+			}
+			c.left = parse_value<int32_t>(r[5]);
+			c.center = parse_value<int32_t>(r[6]);
+			c.right = parse_value<int32_t>(r[7]);
+			c.nullwidth = parse_value<double>(r[8]);
+			keyboard_key* _k = lsnes_kbd.try_lookup_key(r[1]);
+			keyboard_key_axis* k = NULL;
+			if(_k)
+				k = _k->cast_axis();
+			if(!k)
+				return;
+			k->set_calibration(c);
+			messages << "Calibration of " << r[1] << " changed: mode=" << calibration_to_mode(c)
+				<< " limits=" << c.left << "(" << c.center << ")" << c.right
+				<< " null=" << c.nullwidth << std::endl;
+		} else if(r = regex("UNSET[ \t]+([^ \t]+)[ \t]*", line)) {
+			try {
+				lsnes_set.blank(r[1]);
+				messages << "Setting " << r[1] << " unset" << std::endl;
+			} catch(std::exception& e) {
+				messages << "Can't unset " << r[1] << ": " << e.what() << std::endl;
+			}
+		} else if(r = regex("SET[ \t]+([^ \t]+)[ \t]+(.*)", line)) {
+			try {
+				lsnes_set.set(r[1], r[2]);
+				messages << "Setting " << r[1] << " set to " << r[2] << std::endl;
+			} catch(std::exception& e) {
+				messages << "Can't set " << r[1] << ": " << e.what() << std::endl;
+			}
+		} else if(r = regex("ALIAS[ \t]+([^ \t]+)[ \t]+(.*)", line)) {
+			if(!lsnes_cmd.valid_alias_name(r[1])) {
+				messages << "Illegal alias name " << r[1] << std::endl;
+				return;
+			}
+			std::string tmp = lsnes_cmd.get_alias_for(r[1]);
+			tmp = tmp + r[2] + "\n";
+			lsnes_cmd.set_alias_for(r[1], tmp);
+			messages << r[1] << " aliased to " << r[2] << std::endl;
+		} else if(r = regex("BIND[ \t]+([^/]*)/([^|]*)\\|([^ \t]+)[ \t]+(.*)", line)) {
+			keymapper::bind(r[1], r[2], r[3], r[4]);
+			if(r[1] != "" || r[2] != "")
+				messages << r[1] << "/" << r[2] << " ";
+			messages << r[3] << " bound to '" << r[4] << "'" << std::endl;
+			
+		} else
+			messages << "Unrecognized directive: " << line << std::endl;
+	}
+
+	void load_configuration()
+	{
+		std::string cfg = get_config_path() + "/lsneswxw.cfg";
+		std::ifstream cfgfile(cfg.c_str());
+		std::string line;
+		while(std::getline(cfgfile, line))
+			handle_config_line(line);
+	}
+	
 	void save_configuration()
 	{
-		std::string cfg = get_config_path() + "/lsneswxw.rc";
+		std::string cfg = get_config_path() + "/lsneswxw.cfg";
 		std::ofstream cfgfile(cfg.c_str());
 		//Joystick axis.
 		for(auto i : lsnes_kbd.all_keys()) {
@@ -177,19 +252,19 @@ end:
 			if(!j)
 				continue;
 			auto p = j->get_calibration();
-			cfgfile << "set-axis " << i->get_name() << " " << calibration_to_mode(p);
-			cfgfile << " minus=" << p.left << " zero=" << p.center << " plus=" << p.right
-				<< " tolerance=" << p.nullwidth << std::endl;
+			cfgfile << "AXIS " << i->get_name() << " " << p.mode << " " << p.esign_a << " " << p.esign_b
+				<< " " << p.left << " " << p.center << " " << p.right << " " << p.nullwidth
+				<< std::endl;
 		}
 		//Settings.
 		for(auto i : lsnes_set.get_settings_set()) {
 			if(!lsnes_set.is_set(i))
-				cfgfile << "unset-setting " << i << std::endl;
+				cfgfile << "UNSET " << i << std::endl;
 			else
-				cfgfile << "set-setting " << i << " " << lsnes_set.get(i) << std::endl;
+				cfgfile << "SET " << i << " " << lsnes_set.get(i) << std::endl;
 		}
 		for(auto i : lsnes_set.get_invalid_values())
-			cfgfile << "set-setting " << i.first << " " << i.second << std::endl;
+			cfgfile << "SET " << i.first << " " << i.second << std::endl;
 		//Aliases.
 		for(auto i : lsnes_cmd.get_aliases()) {
 			std::string old_alias_value = lsnes_cmd.get_alias_for(i);
@@ -203,7 +278,7 @@ end:
 					aliasline = old_alias_value;
 					old_alias_value = "";
 				}
-				cfgfile << "alias-command " << i << " " << aliasline << std::endl;
+				cfgfile << "ALIAS " << i << " " << aliasline << std::endl;
 			}
 		}
 		//Keybindings.
@@ -217,11 +292,8 @@ end:
 			std::string mod = i2.substr(0, s2);
 			std::string modspec = i2.substr(s2 + 1, s - s2 - 1);
 			std::string old_command_value = keymapper::get_command_for(i);
-			if(mod != "" || modspec != "")
-				cfgfile << "bind-key " << mod << "/" << modspec << " " << key << " "
-					<< old_command_value << std::endl;
-			else
-				cfgfile << "bind-key " << key << " " << old_command_value << std::endl;
+			cfgfile << "BIND " << mod << "/" << modspec << "|" << key << " "
+				<< old_command_value << std::endl;
 		}
 		//Last save.
 		std::ofstream lsave(get_config_path() + "/" + our_rom_name + ".ls");
@@ -367,9 +439,9 @@ bool lsnes_app::OnInit()
 
 	std::string cfgpath = get_config_path();
 	messages << "Saving per-user data to: " << get_config_path() << std::endl;
-	messages << "--- Running lsnesrc --- " << std::endl;
+	messages << "--- Loading configuration --- " << std::endl;
 	lsnes_set.set_storage_mode(true);
-	lsnes_cmd.invoke("run-script " + cfgpath + "/lsneswxw.rc");
+	load_configuration();
 	lsnes_set.set_storage_mode(false);
 	messages << "--- End running lsnesrc --- " << std::endl;