Merge pull request #1162 from dorkster/fixes

InputState: Fix reorder warning and use Point for current_touch