From 744fac6777e5bcd4496f97715939056038131d29 Mon Sep 17 00:00:00 2001
From: benoa <izioualleuirs@free.fr>
Date: Sun, 15 Sep 2019 00:46:02 +0200
Subject: [PATCH] Wii: Add wiimote lightgun support

---
 config.def.h                         |   4 +
 configuration.c                      |   3 +
 configuration.h                      |   4 +-
 input/drivers/gx_input.c             | 174 ++++++++++++++++++++++++++-
 input/drivers_joypad/gx_joypad.c     | 105 ++++++++++++++++
 intl/msg_hash_lbl.h                  |   4 +
 intl/msg_hash_us.h                   |  10 ++
 menu/cbs/menu_cbs_sublabel.c         |   8 ++
 menu/menu_displaylist.c              |   6 +
 menu/menu_setting.c                  |  15 +++
 msg_hash.h                           |   3 +
 wii/libogc/libs/wii/libbte.a         | Bin 97912 -> 97912 bytes
 wii/libogc/libs/wii/libdb.a          | Bin 102260 -> 102260 bytes
 wii/libogc/libs/wii/libogc.a         | Bin 722704 -> 722704 bytes
 wii/libogc/libs/wii/libwiikeyboard.a | Bin 40698 -> 40698 bytes
 wii/libogc/libs/wii/libwiiuse.a      | Bin 63960 -> 64870 bytes
 wii/libogc/wiiuse/wpad.c             |  38 ++++++
 17 files changed, 372 insertions(+), 2 deletions(-)

diff --git a/config.def.h b/config.def.h
index 88a931c393..3c1b02c72b 100644
--- a/config.def.h
+++ b/config.def.h
@@ -93,6 +93,10 @@
 #define DEFAULT_MAX_PADS 16
 #endif
 
+#if defined(GEKKO)
+#define DEFAULT_MOUSE_SCALE 1
+#endif
+
 #if defined(RARCH_MOBILE) || defined(HAVE_LIBNX)
 #define DEFAULT_POINTER_ENABLE true
 #else
diff --git a/configuration.c b/configuration.c
index 749da361d6..910112c8ac 100644
--- a/configuration.c
+++ b/configuration.c
@@ -1726,6 +1726,9 @@ static struct config_uint_setting *populate_settings_uint(settings_t *settings,
    SETTING_UINT("input_max_users",              input_driver_get_uint(INPUT_ACTION_MAX_USERS),        true, input_max_users, false);
    SETTING_UINT("fps_update_interval",          &settings->uints.fps_update_interval, true, DEFAULT_FPS_UPDATE_INTERVAL, false);
    SETTING_UINT("input_menu_toggle_gamepad_combo", &settings->uints.input_menu_toggle_gamepad_combo, true, menu_toggle_gamepad_combo, false);
+#ifdef GEKKO
+   SETTING_UINT("input_mouse_scale",            &settings->uints.input_mouse_scale, true, DEFAULT_MOUSE_SCALE, false);
+#endif
    SETTING_UINT("audio_latency",                &settings->uints.audio_latency, false, 0 /* TODO */, false);
    SETTING_UINT("audio_resampler_quality",      &settings->uints.audio_resampler_quality, true, audio_resampler_quality_level, false);
    SETTING_UINT("audio_block_frames",           &settings->uints.audio_block_frames, true, 0, false);
diff --git a/configuration.h b/configuration.h
index 7c1dda92cd..7107eb790d 100644
--- a/configuration.h
+++ b/configuration.h
@@ -454,7 +454,9 @@ typedef struct settings
 
       unsigned input_bind_timeout;
       unsigned input_bind_hold;
-
+#ifdef GEKKO
+      unsigned input_mouse_scale;
+#endif
       unsigned input_menu_toggle_gamepad_combo;
       unsigned input_keyboard_gamepad_mapping_type;
       unsigned input_poll_type_behavior;
diff --git a/input/drivers/gx_input.c b/input/drivers/gx_input.c
index d93413a0bf..ddf178eb2e 100644
--- a/input/drivers/gx_input.c
+++ b/input/drivers/gx_input.c
@@ -32,11 +32,103 @@
 /* TODO/FIXME -
  * fix game focus toggle */
 
+/* gx joypad functions */
+bool gxpad_mousevalid(unsigned port);
+void gx_joypad_read_mouse(unsigned port, int *irx, int *iry, uint32_t *button);
+
+typedef struct
+{
+   int x_abs, y_abs;
+   int x_last, y_last;
+   uint32_t button;
+} gx_input_mouse_t;
+
 typedef struct gx_input
 {
    const input_device_driver_t *joypad;
+   int mouse_max;
+   gx_input_mouse_t *mouse;
 } gx_input_t;
 
+static int16_t gx_lightgun_state(gx_input_t *gx, unsigned id, uint16_t joy_idx)
+{
+   struct video_viewport vp = {0};
+   video_driver_get_viewport_info(&vp);
+   int16_t res_x               = 0;
+   int16_t res_y               = 0;
+   int16_t res_screen_x        = 0;
+   int16_t res_screen_y        = 0;
+   int16_t x = 0;
+   int16_t y = 0;
+
+   vp.x                        = 0;
+   vp.y                        = 0;
+   vp.width                    = 0;
+   vp.height                   = 0;
+   vp.full_width               = 0;
+   vp.full_height              = 0;
+
+   x = gx->mouse[joy_idx].x_abs;
+   y = gx->mouse[joy_idx].y_abs;
+
+   if (!(video_driver_translate_coord_viewport_wrap(&vp, x, y,
+         &res_x, &res_y, &res_screen_x, &res_screen_y)))
+      return 0;
+
+   switch (id)
+   {
+      case RETRO_DEVICE_ID_LIGHTGUN_SCREEN_X:
+         return res_screen_x;
+      case RETRO_DEVICE_ID_LIGHTGUN_SCREEN_Y:
+         return res_screen_y;
+      case RETRO_DEVICE_ID_LIGHTGUN_TRIGGER:
+         return gx->mouse[joy_idx].button & (1 << RETRO_DEVICE_ID_LIGHTGUN_TRIGGER);
+      case RETRO_DEVICE_ID_LIGHTGUN_AUX_A:
+         return gx->mouse[joy_idx].button & (1 << RETRO_DEVICE_ID_LIGHTGUN_AUX_A);
+      case RETRO_DEVICE_ID_LIGHTGUN_AUX_B:
+         return gx->mouse[joy_idx].button & (1 << RETRO_DEVICE_ID_LIGHTGUN_AUX_B);
+      case RETRO_DEVICE_ID_LIGHTGUN_AUX_C:
+         return gx->mouse[joy_idx].button & (1 << RETRO_DEVICE_ID_LIGHTGUN_AUX_C);
+      case RETRO_DEVICE_ID_LIGHTGUN_START:
+         return gx->mouse[joy_idx].button & (1 << RETRO_DEVICE_ID_LIGHTGUN_START);
+      case RETRO_DEVICE_ID_LIGHTGUN_SELECT:
+         return gx->mouse[joy_idx].button & (1 << RETRO_DEVICE_ID_LIGHTGUN_SELECT);
+      case RETRO_DEVICE_ID_LIGHTGUN_IS_OFFSCREEN:
+         return !gxpad_mousevalid(joy_idx);
+      default:
+         return 0;
+   }
+
+   return 0;
+}
+
+static int16_t gx_mouse_state(gx_input_t *gx, unsigned id, uint16_t joy_idx)
+{
+   int x = 0;
+   int y = 0;
+
+   settings_t *settings = config_get_ptr();
+   int x_scale = settings->uints.input_mouse_scale;
+   int y_scale = settings->uints.input_mouse_scale;
+
+   x = (gx->mouse[joy_idx].x_abs - gx->mouse[joy_idx].x_last) * x_scale;
+   y = (gx->mouse[joy_idx].y_abs - gx->mouse[joy_idx].y_last) * y_scale;
+
+   switch (id)
+   {
+      case RETRO_DEVICE_ID_MOUSE_X:
+         return x;
+      case RETRO_DEVICE_ID_MOUSE_Y:
+         return y;
+      case RETRO_DEVICE_ID_MOUSE_LEFT:
+         return gx->mouse[joy_idx].button & (1 << RETRO_DEVICE_ID_MOUSE_LEFT);
+      case RETRO_DEVICE_ID_MOUSE_RIGHT:
+         return gx->mouse[joy_idx].button & (1 << RETRO_DEVICE_ID_MOUSE_RIGHT);
+      default:
+         return 0;
+   }
+}
+
 static int16_t gx_input_state(void *data,
       rarch_joypad_info_t joypad_info,
       const struct retro_keybind **binds,
@@ -96,6 +188,12 @@ static int16_t gx_input_state(void *data,
             return input_joypad_analog(gx->joypad,
                   joypad_info, port, idx, id, binds[port]);
          break;
+
+      case RETRO_DEVICE_MOUSE:
+         return gx_mouse_state(gx, id, joypad_info.joy_idx);
+
+      case RETRO_DEVICE_LIGHTGUN:
+         return gx_lightgun_state(gx, id, joypad_info.joy_idx);
    }
 
    return 0;
@@ -111,9 +209,33 @@ static void gx_input_free_input(void *data)
    if (gx->joypad)
       gx->joypad->destroy();
 
+   if(gx->mouse)
+      free(gx->mouse);
+
    free(gx);
 }
 
+static inline int gx_count_mouse(gx_input_t *gx)
+{
+   int count = 0;
+
+   if(gx)
+   {
+      for(int i=0; i<DEFAULT_MAX_PADS; i++)
+      {
+         if(gx->joypad->name(i))
+         {
+            if(!strcmp(gx->joypad->name(i), "Wiimote Controller"))
+            {
+               count++;
+            }
+         }
+      }
+   }
+
+   return count;
+}
+
 static void *gx_input_init(const char *joypad_driver)
 {
    gx_input_t *gx = (gx_input_t*)calloc(1, sizeof(*gx));
@@ -122,22 +244,72 @@ static void *gx_input_init(const char *joypad_driver)
 
    gx->joypad = input_joypad_init_driver(joypad_driver, gx);
 
+   /* Allocate at least 1 mouse at startup */
+   gx->mouse_max = 1;
+   gx->mouse = (gx_input_mouse_t*) calloc(gx->mouse_max, sizeof(gx_input_mouse_t));
+
    return gx;
 }
 
+static void gx_input_poll_mouse(gx_input_t *gx)
+{
+   int count = 0;
+   count = gx_count_mouse(gx);
+
+   if(gx && count > 0)
+   {
+      if(count != gx->mouse_max)
+      {
+         gx_input_mouse_t* tmp = NULL;
+
+         tmp = (gx_input_mouse_t*)realloc(gx->mouse, count * sizeof(gx_input_mouse_t));
+         if(!tmp) 
+         {
+            free(gx->mouse);
+         }
+         else
+         {
+            gx->mouse = tmp;
+            gx->mouse_max = count;
+
+            for(int i=0; i<gx->mouse_max; i++)
+            {
+               gx->mouse[i].x_last = 0;
+               gx->mouse[i].y_last = 0;
+            }
+         }
+      }
+      
+      for(unsigned i=0; i<gx->mouse_max; i++)
+      {
+         gx->mouse[i].x_last = gx->mouse[i].x_abs;
+         gx->mouse[i].y_last = gx->mouse[i].y_abs;
+         gx_joypad_read_mouse(i, &gx->mouse[i].x_abs, &gx->mouse[i].y_abs, &gx->mouse[i].button);
+      } 
+   }
+}
+
 static void gx_input_poll(void *data)
 {
    gx_input_t *gx = (gx_input_t*)data;
 
    if (gx && gx->joypad)
+   {
       gx->joypad->poll();
+
+      if(gx->mouse)
+         gx_input_poll_mouse(gx);
+   }
 }
 
 static uint64_t gx_input_get_capabilities(void *data)
 {
    (void)data;
 
-   return (1 << RETRO_DEVICE_JOYPAD) |  (1 << RETRO_DEVICE_ANALOG);
+   return (1 << RETRO_DEVICE_JOYPAD) |
+          (1 << RETRO_DEVICE_ANALOG) |
+          (1 << RETRO_DEVICE_MOUSE) |
+          (1 << RETRO_DEVICE_LIGHTGUN);
 }
 
 static const input_device_driver_t  *gx_input_get_joypad_driver(void *data)
diff --git a/input/drivers_joypad/gx_joypad.c b/input/drivers_joypad/gx_joypad.c
index 5af82e6113..d560b31a32 100644
--- a/input/drivers_joypad/gx_joypad.c
+++ b/input/drivers_joypad/gx_joypad.c
@@ -29,6 +29,7 @@
 #define WPADInit WPAD_Init
 #define WPADDisconnect WPAD_Disconnect
 #define WPADProbe WPAD_Probe
+#define WPADSetDataFormat WPAD_SetDataFormat
 #endif
 
 #define WPAD_EXP_SICKSAXIS     252
@@ -41,6 +42,12 @@
 #define NUM_DEVICES 1
 #endif
 
+#ifdef HW_RVL
+#define MAX_MOUSEBUTTONS 6
+static const uint32_t gx_mousemask[MAX_MOUSEBUTTONS] = {WPAD_BUTTON_B, WPAD_BUTTON_A, WPAD_BUTTON_1, WPAD_BUTTON_2, 
+                                   WPAD_BUTTON_PLUS, WPAD_BUTTON_MINUS};
+#endif
+
 enum
 {
    GX_GC_A                 = 0,
@@ -102,6 +109,17 @@ static uint32_t pad_type[DEFAULT_MAX_PADS] = { WPAD_EXP_NOCONTROLLER, WPAD_EXP_N
 static int16_t analog_state[DEFAULT_MAX_PADS][2][2];
 static bool g_menu = false;
 
+struct gx_mousedata
+{
+   int32_t x, y;
+   uint32_t mouse_button;
+   bool valid;
+};
+
+static struct gx_mousedata gx_mouse[2];
+
+static bool gx_joypad_query_pad(unsigned pad);
+
 #ifdef HW_RVL
 static bool g_quit = false;
 
@@ -116,6 +134,45 @@ static void reset_cb(void)
    g_menu = true;
 }
 
+static inline void gx_mouse_info(uint32_t joybutton, unsigned port) {
+   uint8_t i;
+   ir_t ir;
+
+   /* Get the IR data from the wiimote */
+   WPAD_IR(port, &ir);
+   if (ir.valid)
+   {
+      gx_mouse[port].valid = true;
+      gx_mouse[port].x = ir.x;
+      gx_mouse[port].y = ir.y;
+   }
+   else
+   {
+      gx_mouse[port].valid = false;
+   }
+   
+   /* reset button state */
+   gx_mouse[port].mouse_button = 0; 
+   for (i = 0; i < MAX_MOUSEBUTTONS; i++) {
+      gx_mouse[port].mouse_button |= (joybutton & gx_mousemask[i]) ? (1 << i) : 0;
+   }
+
+   /* Small adjustment to match the RA buttons */
+   gx_mouse[port].mouse_button = gx_mouse[port].mouse_button << 2;
+}
+
+bool gxpad_mousevalid(unsigned port)
+{
+   return gx_mouse[port].valid;
+}
+
+void gx_joypad_read_mouse(unsigned port, int *irx, int *iry, uint32_t *button)
+{
+   *irx = gx_mouse[port].x;
+   *iry = gx_mouse[port].y;
+   *button = gx_mouse[port].mouse_button;
+}
+
 static const char *gx_joypad_name(unsigned pad)
 {
    switch (pad_type[pad])
@@ -150,6 +207,33 @@ static void handle_hotplug(unsigned port, uint32_t ptype)
             );
 }
 
+static void check_port0_active(uint8_t pad_count)
+{
+   settings_t *settings = config_get_ptr();
+   int idx = settings->uints.input_joypad_map[0];
+
+   if(pad_count < 2 && idx != 0)
+   {
+#ifdef HW_RVL
+      pad_type[0] = WPAD_EXP_NONE;
+#else
+      pad_type[0] = WPAD_EXP_GAMECUBE;
+#endif
+      settings->uints.input_joypad_map[0] = 0;
+               
+      input_autoconfigure_connect(
+            gx_joypad_name(0),
+            NULL,
+            gx_joypad.ident,
+            0, // port
+            0,
+            0
+            );
+
+      input_config_set_device_name(0, gx_joypad_name(0));
+   }
+}
+
 static bool gx_joypad_button(unsigned port, uint16_t key)
 {
    if (port >= DEFAULT_MAX_PADS)
@@ -309,6 +393,7 @@ static int16_t WPAD_StickY(WPADData *data, u8 right)
 static void gx_joypad_poll(void)
 {
    unsigned i, j, port;
+   uint8_t pad_count = 0;
    uint8_t gcpad = 0;
    uint64_t state_p1;
    uint64_t check_menu_toggle;
@@ -381,6 +466,13 @@ static void gx_joypad_poll(void)
 
          down = wpaddata->btns_h;
 
+         /* Mouse & Lightgun: Retrieve IR data */
+         if (ptype == WPAD_EXP_NONE)
+         {
+            if (port == WPAD_CHAN_0 || port == WPAD_CHAN_1)
+               gx_mouse_info(wpaddata->btns_h, port);
+         }
+
          *state_cur |= (down & WPAD_BUTTON_A) ? (UINT64_C(1) << GX_WIIMOTE_A) : 0;
          *state_cur |= (down & WPAD_BUTTON_B) ? (UINT64_C(1) << GX_WIIMOTE_B) : 0;
          *state_cur |= (down & WPAD_BUTTON_1) ? (UINT64_C(1) << GX_WIIMOTE_1) : 0;
@@ -389,6 +481,8 @@ static void gx_joypad_poll(void)
          *state_cur |= (down & WPAD_BUTTON_MINUS) ? (UINT64_C(1) << GX_WIIMOTE_MINUS) : 0;
          *state_cur |= (down & WPAD_BUTTON_HOME) ? (UINT64_C(1) << GX_WIIMOTE_HOME) : 0;
 
+
+
          if (ptype != WPAD_EXP_NUNCHUK)
          {
             /* Rotated d-pad on Wiimote. */
@@ -439,6 +533,14 @@ static void gx_joypad_poll(void)
       }
 #endif
 
+      /* Count active controllers */
+      if(gx_joypad_query_pad(port))
+         pad_count++;
+
+      /* Always enable 1 pad in port 0 if there's only 1 controller connected. 
+       * This avoids being stuck in rgui input settings. */
+      check_port0_active(pad_count);
+
       if (ptype != pad_type[port])
          handle_hotplug(port, ptype);
 
@@ -482,6 +584,9 @@ static bool gx_joypad_init(void *data)
    PAD_Init();
 #ifdef HW_RVL
    WPADInit();
+   /* Set IR for all wiimotes */
+   WPAD_SetVRes(WPAD_CHAN_ALL,640,480);
+   WPAD_SetDataFormat(WPAD_CHAN_ALL,WPAD_FMT_BTNS_ACC_IR);
 #endif
 
    gx_joypad_poll();
diff --git a/intl/msg_hash_lbl.h b/intl/msg_hash_lbl.h
index 6d13938271..4fcf775066 100644
--- a/intl/msg_hash_lbl.h
+++ b/intl/msg_hash_lbl.h
@@ -567,6 +567,10 @@ MSG_HASH(MENU_ENUM_LABEL_INPUT_ANALOG_DEADZONE,
       "input_analog_deadzone")
 MSG_HASH(MENU_ENUM_LABEL_INPUT_ANALOG_SENSITIVITY,
       "input_analog_sensitivity")
+#ifdef GEKKO
+MSG_HASH(MENU_ENUM_LABEL_INPUT_MOUSE_SCALE,
+      "input_mouse_scale")
+#endif
 MSG_HASH(MENU_ENUM_LABEL_INPUT_BIND_MODE,
       "input_bind_mode")
 MSG_HASH(MENU_ENUM_LABEL_INPUT_BIND_TIMEOUT,
diff --git a/intl/msg_hash_us.h b/intl/msg_hash_us.h
index 481537193a..616e31150e 100644
--- a/intl/msg_hash_us.h
+++ b/intl/msg_hash_us.h
@@ -1085,6 +1085,16 @@ MSG_HASH(
     MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_SENSITIVITY,
     "Analog Sensitivity"
     )
+#ifdef GEKKO
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_MOUSE_SCALE,
+    "Mouse Scale"
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_INPUT_MOUSE_SCALE,
+    "Adjust x/y scale for Wiimote lightgun speed."
+    )
+#endif
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_MENU_INPUT_SWAP_OK_CANCEL,
     "Menu Swap OK & Cancel Buttons"
diff --git a/menu/cbs/menu_cbs_sublabel.c b/menu/cbs/menu_cbs_sublabel.c
index f04573e8ee..daa910b278 100644
--- a/menu/cbs/menu_cbs_sublabel.c
+++ b/menu/cbs/menu_cbs_sublabel.c
@@ -230,6 +230,9 @@ default_sublabel_macro(action_bind_sublabel_audio_volume,                  MENU_
 default_sublabel_macro(action_bind_sublabel_audio_mixer_volume,            MENU_ENUM_SUBLABEL_AUDIO_MIXER_VOLUME)
 #endif
 default_sublabel_macro(action_bind_sublabel_audio_sync,                    MENU_ENUM_SUBLABEL_AUDIO_SYNC)
+#if defined(GEKKO)
+default_sublabel_macro(action_bind_sublabel_input_mouse_scale, MENU_ENUM_SUBLABEL_INPUT_MOUSE_SCALE)
+#endif
 default_sublabel_macro(action_bind_sublabel_axis_threshold,                MENU_ENUM_SUBLABEL_INPUT_BUTTON_AXIS_THRESHOLD)
 default_sublabel_macro(action_bind_sublabel_input_turbo_period,            MENU_ENUM_SUBLABEL_INPUT_TURBO_PERIOD)
 default_sublabel_macro(action_bind_sublabel_input_duty_cycle,              MENU_ENUM_SUBLABEL_INPUT_DUTY_CYCLE)
@@ -2402,6 +2405,11 @@ int menu_cbs_init_bind_sublabel(menu_file_list_cbs_t *cbs,
          case MENU_ENUM_LABEL_INPUT_BUTTON_AXIS_THRESHOLD:
             BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_axis_threshold);
             break;
+#if defined(GEKKO)
+         case MENU_ENUM_LABEL_INPUT_MOUSE_SCALE:
+            BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_input_mouse_scale);
+            break;
+#endif
          case MENU_ENUM_LABEL_AUDIO_SYNC:
             BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_audio_sync);
             break;
diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c
index 79ddeb8921..f47f7cbd4a 100644
--- a/menu/menu_displaylist.c
+++ b/menu/menu_displaylist.c
@@ -3768,6 +3768,12 @@ unsigned menu_displaylist_build_list(file_list_t *list, enum menu_displaylist_ct
                   MENU_ENUM_LABEL_INPUT_BUTTON_AXIS_THRESHOLD,
                   PARSE_ONLY_FLOAT, false) == 0)
             count++;
+#if defined(GEKKO)
+         if (menu_displaylist_parse_settings_enum(list,
+                  MENU_ENUM_LABEL_INPUT_MOUSE_SCALE,
+                  PARSE_ONLY_UINT, false) == 0)
+            count++;
+#endif
          if (menu_displaylist_parse_settings_enum(list,
                   MENU_ENUM_LABEL_INPUT_ANALOG_DEADZONE,
                   PARSE_ONLY_FLOAT, false) == 0)
diff --git a/menu/menu_setting.c b/menu/menu_setting.c
index f5364dc2b0..72ea5aa40b 100644
--- a/menu/menu_setting.c
+++ b/menu/menu_setting.c
@@ -10349,6 +10349,21 @@ static bool setting_append_list(
             menu_settings_list_current_add_range(list, list_info, 0, 2, 1, true, true);
             SETTINGS_DATA_LIST_CURRENT_ADD_FLAGS(list, list_info, SD_FLAG_LAKKA_ADVANCED);
 
+#ifdef GEKKO
+            CONFIG_UINT(
+                  list, list_info,
+                  &settings->uints.input_mouse_scale,
+                  MENU_ENUM_LABEL_INPUT_MOUSE_SCALE,
+                  MENU_ENUM_LABEL_VALUE_INPUT_MOUSE_SCALE,
+                  DEFAULT_MOUSE_SCALE,
+                  &group_info,
+                  &subgroup_info,
+                  parent_group,
+                  general_write_handler,
+                  general_read_handler);
+            menu_settings_list_current_add_range(list, list_info, 1, 4, 1, true, true);
+#endif
+
 #ifdef VITA
             CONFIG_BOOL(
                   list, list_info,
diff --git a/msg_hash.h b/msg_hash.h
index 4c11a0da26..9c614e0f6f 100644
--- a/msg_hash.h
+++ b/msg_hash.h
@@ -772,6 +772,9 @@ enum msg_hash_enums
    MENU_LABEL(INPUT_DESCRIPTOR_LABEL_SHOW),
    MENU_LABEL(INPUT_DESCRIPTOR_HIDE_UNBOUND),
    MENU_LABEL(INPUT_BUTTON_AXIS_THRESHOLD),
+#if defined(GEKKO)
+   MENU_LABEL(INPUT_MOUSE_SCALE),
+#endif
    MENU_LABEL(INPUT_ANALOG_DEADZONE),
    MENU_LABEL(INPUT_ANALOG_SENSITIVITY),
    MENU_LABEL(INPUT_BIND_TIMEOUT),
diff --git a/wii/libogc/libs/wii/libbte.a b/wii/libogc/libs/wii/libbte.a
index 191c62e51b4a23515eea2785a81a151166b4fa6c..9cc37e149b8ef3713532f949cec6140373fc88df 100644
GIT binary patch
delta 274
zcmezIhxNxF)(KJ^W+s+~W(F3f8<jYCWuP1*1qDL`0|O+|%*<r78}E`hm<nSgIfy!t
z3bq`VGMEYztSZtT`2@jKm||10{hSG-2pfJS|Ew5a@F~L_j?EMW1yfT46NSmXyqepM
Qyci2a@f)}=o^h8P0P*}ilK=n!

delta 274
zcmezIhxNxF)(KJ^2F8XK#zv+_8<jYCWndfy1p@^TfRKg;24-evo85Sq#Nk)Lmg7=}
zUq#v@pCFhDLzwx<wroFV!YIOqU&%i!#ut3b_}r?XU}|b$qA=N)S980O7h{1a%s?Zo
LcJ7O3+$9G9PJTLn

diff --git a/wii/libogc/libs/wii/libdb.a b/wii/libogc/libs/wii/libdb.a
index 876deee6b856e1c13d8ab5de0ccc80fbc61feffc..9981b20ee80e09ea8b50783f3b599a7a4317ab91 100644
GIT binary patch
delta 611
zcmew|kL}Amwh2<~W+s+~W(F1;6~A&RL)hjP3JQh>1_nr^nVE@#f{C%EnZo3SGMbx{
zxMc)opo%S#ltHur6>pv;Ga&_L999(y3Z@_{z{Zs|RtV!aj%%t14}KMS3m3r5ut0V>
z!bw_NmvBJMz@g&RUJ-V@Di%u}Wrg|*yAcWs#>N&V5MQO8(%{8w+U8Z)OEh6B46y~{
zb}L54IhrsVu_^&+votUOh2wT5ZN?TYLaI%SEWqyD{wb8P1@0RhW?LEnBOYw_p=ibk
WWtiDU*c=N?AciJT)oJyNd;$P?D~BQg

delta 611
zcmew|kL}Amwh2<~2F8XK#zv+a6~A&RL)nH33I+-w03i(x49v{T6ckL1EzJ}rFO<>T
zoWw07C<9e&1XG5rc=Ifo2`L1OGc_<UfEZWSSRo8E4y)apxu$yX;8&5iZ~*}`w6-qc
zz;DK@y&~**RV<b|%1Xdj#>N&V5MQO8(%{8w+U8Z)OEmGS*lxwhI7gF!jfMu61_q#L
y*{-C`*rG*9wTY1h*nQhSg)+7f@{Of|8N@f+4@EOZC=)Q-#Lxt)I<20OPXGXOK7geF

diff --git a/wii/libogc/libs/wii/libogc.a b/wii/libogc/libs/wii/libogc.a
index 8d1fd55a9fd701466d96f2b539f08e7c3573f54a..ec000bbe7f4d7ed97e52dbab051752e1fbf7fc53 100644
GIT binary patch
delta 3018
zcmai$U1%Le6vx^7v3qxtCZXE2gfvcWVznkIyR)-1v#pBN#+D%c2zg4=($-dspa_D5
z3Po&)ATdU6$*rQ;`dLkcl&elDRHcY5eJD}-B#PDARun<>EsD6gyC>w~>@I{0fgk_*
zpELh+W~U~5r^3IslHh?W9I4Kf*X-?z{_%ZEUB_{j{R+V;4P3=(rE_L|ZG7*17fpwi
zsx}oGHr39&uq)r5hSoa9x0va~(TV3f(uua2p^ZR@Wxk^tLie?oZhUFo5&J+1N_q9w
zQ&wMX`j4+xLMIZ)KrvPC#Ha5YL+i@vvM%%3v{&rWTkkTyC}b!z-(z)UJ=kkpwKJqW
z$#``iH+%Fm!g#JJwF8>;8`nx8D6u9{>bXKy=VnQdmfMXTjbJu`W-N%!emiXZQtFKR
zkU$GZRhtV9y*hu;*pUOTD6F4)%s9O^<8<HgMbxSTW5(QV>4F<h7_*H~yuyoTe!wbp
z<{rK7J;ON!rw2If3hAiDVbE`r9N!Gm$uzG^mmkRuZO)M9E_b5BF1(y;Z;1;N%ja<^
z*Lva2-08M-<nyz+r&j>tV&&+8uX96V>BzZ({0Pj&;x<4x1XEIkO}YEU{d@9y|DMA6
zCqNY4DSG3j!pPQmECq^C>Q_3)`}EJv#ZOknT}~oBk2_I%uishxr!oEL1y=ksAKyfx
zpzp^47qU3N0%$a|p;1prR*%GBfAPdOKqsV4avtpvEmoVQwO|&d^)NTPVY~&7y#Aos
zScV2A#n5+E7{fpths?fBa3l)rfs^K?RWTy*>}~kW93762#F22R%79gOo(xyi-!0Y$
z5TGPlx+-qU%`U6Z9&eN++7*8FM@@RQe876tjQgDgGr^<ROW%Ch+CqRv=OIkD=dftJ
zpWS6$Wf`>OPOLpWW_{ldT|>3?<SFZ3D?^Zp@RsXQYW>g}AsK=-s|E5S88(^v+`Ki>
z3O9u!VSJ@>qMNGRvW~Ta!vvZM6>iJL{deF$>)*rR&_j<u@_1>q9}skR=%$ZLJD*HP
zj<nflEkMv^p|_XqUw1>DC=&YPzNlW);Tw1CsQp$kUGV-fdreE0pd&^7fq&<?-31T4
zO!#zgm2h~yZ!2H3-`EDHqqM&KlTEwfB2XkO$CrL|5yB*+_kkd~qx9v6$lNxVDion~
zabWB3^u-Bc!MB@4Vg1`H<lUvX<H$#|<o1SiSKoy*T!b=F6-pV0M{)2x8HEoc+*a5W
zsZ?d^Mvq>7k^Bx{mpH6Du8`x+=?1U-K)RQLf*RCK*U91Lj2he^{(#mO{vvZrQN{%)
Q7sx&vY~d@P6dKI@|6w4R;s5{u

delta 3018
zcmai0TWC~A80PHd%$`Y1f|n>Erjt#)CXsXI%*>h9w$#>C3F0N>DMs;9s}w4NAVEPy
zLj+0Fl$ES4E!AGtM2M{Ih~Nbg6(1yuPo<^aE0#jhw^)iNd(Matvop)Gu<-Hy-~au$
z85(RI3cqz3*Y~)ODL#{(wV^5cLjr_cH2H~sJ=bN7A(ZntLHWj!1;zdi<4s5p=Dbjq
zs#sDyb6{<<UI#5U^e?mZh<yY58zh2DRc~r5){S&6mI$T#;^D`a!CN{V2$8}U$3a_h
z_@Ap&O-^vkOHTaqlhrjhtEcs_kB9wqi&#F-x|A|7W9s7)v*>KK?mCiMnKeRwfJtE^
zv0KD0X6>!gIv`-XbuVKg^cXLUjlvcYtg=>DO0i|aW1Ne{-s!d;Wg7K9FqapqQx&Zu
z`H{6cA+;*0#g31y6SED`sY_X8)#g5HY?_{M(NSx((vUo+Ih;o$3&q?YEqALSy2k>S
zPY#3l4kpM_19gZdCF<<TMAuRSHSvfWC3fYrM174uv59XIC+hT&i{}zMr$|UnH9w-`
zTB55@LewQW-;wN*b3r{7OSmC04_Ii*{6m}8C&i}qsSBUzNf+Np^(>cTsf>#d%{TV9
zi3io`voj1X`#y1_?tM5X{jyRYdIG2aO&TiUQyMoo3)16LVl)j`k7_?sp9Q$o5}obo
zqqhy*0U^;25p1TNnJvYt>(fo_=GWt`hJ5wDU73{zDIo}X)Z<|r=7hD?Zd;-c*>TLi
zF+&eo^sC+5Z3sz%94@Rm7OtolHQ;C2K%|Voz~iwgPntlgUT%~!Xphmtp8~du;61R#
zmVTE3V@9IuC7yf;mO%sB^IaT`_wKdeE;gV8;>O&=ec<<cy=#NV!P~$<h#8B0s67dK
zpn<RmY7G5zejE(c8Y)Et?naf${{;@##tO?dJ7zrGmXrH$^Z($#?Xf~NTI|`D>223T
zs!nIte5!}+sdLT&J!DnZdAcsnQ>`T&0zz5go(ON;!F|rRX+7b)ea@^J6QLWh(t-c}
zh|?qweA(!nxuoRV)GwW{SLmbPyzii9Lm@mG(5Mj1hQ04dLgj`QH$Q-5E8?jtr*Lv$
zOLzME00i>wrr!AC+2`;F+3spSacUG!uaK&gn^XK2&T!h0CMNPIc3yzJ@?oTo8P+)9
zJU{ffMa;Yo|CX;yHCQy<f=8<L0&o2Rn+=Up^$>2aHss*t;s><2@*IvCT6u5+Zgljr
JV5-7Sz5-tqdjJ3c

diff --git a/wii/libogc/libs/wii/libwiikeyboard.a b/wii/libogc/libs/wii/libwiikeyboard.a
index 4a24f7cee413923675faa10662162a37eff4ca5e..6ef17286b27b76651a65339aec525f196991a229 100644
GIT binary patch
delta 168
zcmeyhm+9ADrU_CUW+s+~W(F3P8<p6Yl%X681qDL`0|O+|%*;eV!OYyyNMZ7R8O_Zl
iOd3)$Fr7%sAX<QmH}8-sF~hIIBlwLWeiZ?&t0VykrY5og

delta 168
zcmeyhm+9ADrU_CU2F8XK#zv;b8<p6Yl%X6W1qA~I5P*<|1_owkW(o>s=7vTJllRML
mZZ2WckdlGvgegN-ym^OAi5W}<R^v8%1ivxFuOgszl_UUpza-WG

diff --git a/wii/libogc/libs/wii/libwiiuse.a b/wii/libogc/libs/wii/libwiiuse.a
index 60f39ba83a0b317400da7ff67bdf789ba3be2953..fc934065bb367b5061029b4286e7d54bf12c367d 100644
GIT binary patch
delta 8972
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
Y_GsZH{xKi_m7>!7m;dKRzkKDN0GU%~-2eap

delta 8005
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

diff --git a/wii/libogc/wiiuse/wpad.c b/wii/libogc/wiiuse/wpad.c
index 639ed79222..1d97f9f520 100644
--- a/wii/libogc/wiiuse/wpad.c
+++ b/wii/libogc/wiiuse/wpad.c
@@ -1104,3 +1104,41 @@ void WPAD_Accel(int chan, struct vec3w_t *accel)
 	//if(chan<0 || chan>=WPAD_MAX_WIIMOTES || accel==NULL ) return;
 	*accel = wpaddata[chan].accel;
 }
+
+s32 WPAD_SetDataFormat(s32 chan, s32 fmt)
+{
+	u32 level;
+	s32 ret;
+	int i;
+
+	if(chan == WPAD_CHAN_ALL) {
+		for(i=WPAD_CHAN_0; i<WPAD_MAX_WIIMOTES; i++)
+			if((ret = WPAD_SetDataFormat(i, fmt)) < WPAD_ERR_NONE)
+				return ret;
+		return WPAD_ERR_NONE;
+	}
+
+	if(chan<WPAD_CHAN_0 || chan>=WPAD_MAX_WIIMOTES) return WPAD_ERR_BAD_CHANNEL;
+
+	_CPU_ISR_Disable(level);
+	if(__wpads_inited==WPAD_STATE_DISABLED) {
+		_CPU_ISR_Restore(level);
+		return WPAD_ERR_NOT_READY;
+	}
+
+	if(__wpads[chan]!=NULL) {
+		switch(fmt) {
+			case WPAD_FMT_BTNS:
+			case WPAD_FMT_BTNS_ACC:
+			case WPAD_FMT_BTNS_ACC_IR:
+				__wpdcb[chan].data_fmt = fmt;
+				__wpad_setfmt(chan);
+				break;
+			default:
+				_CPU_ISR_Restore(level);
+				return WPAD_ERR_BADVALUE;
+		}
+	}
+	_CPU_ISR_Restore(level);
+	return WPAD_ERR_NONE;
+}