Yeah, all of that new input code is actually part of the rather massive pilot file code upgrade, which is slated for 3.7. At the moment that new input code supports 2 separate controls by default, but I'm actually thinking of upping that to 4 by the time it's ready for any sort of public testing. The good part about it though, is that upgrading the number of control inputs will no longer mess up pilot files, so we can bump any limits any time that we want.
The new input code is actually a rewrite of quite a few things, mainly for cleanup purposes, but also for general upgrade/update. The keyboard code, the mouse code, and the joystick code are all getting upgraded with the new pilot file code. The mouse code will receive the least number of changes (general improvements, support for mouse wheel as well as more than 3 buttons), the keyboard code getting quite a few (mainly for cleanup and better i18n support), with the joystick code is getting the largest group of changes. The various bits of code for dealing with inputs (like what does what, and the controlconfig screen) will also be getting quite a few changes in order to handle the improved input code.
The current plan is to do 3.6.10 in June, and 3.6.11 at the end of the year. Between those time periods I will start public testing of builds which have the new pilot file code. So with any luck you'll be able to make use of the new code this year, and well before 3.7 is ready. There is currently no ETA for 3.7, but the safest guess is that it's at least a year away (if we can stick with ~6 months between release dates, and if 3.6.11 is the last of the 3.6 series).