Add XButton1/XButton2 support, clean up MouseState