From f3c87643e259a61215192bedea84e23e8942a147 Mon Sep 17 00:00:00 2001 From: Alberto Mardegan Date: Mon, 29 Jan 2024 22:37:05 +0300 Subject: [PATCH] Add support for the Wiimote controller Thanks @Fussmatte for the button pictures. The Product IDs added here are those reported by libSDL when running on a Wii. Fixes: #1136 --- desktop_version/fonts/buttons_10x10.fontmeta | 4 +-- desktop_version/fonts/buttons_10x10.png | Bin 2281 -> 2495 bytes desktop_version/fonts/buttons_12x12.fontmeta | 4 +-- desktop_version/fonts/buttons_12x12.png | Bin 2646 -> 2934 bytes desktop_version/fonts/buttons_8x8.fontmeta | 4 +-- desktop_version/fonts/buttons_8x8.png | Bin 2404 -> 2656 bytes desktop_version/src/ButtonGlyphs.cpp | 36 +++++++++++++++++-- 7 files changed, 40 insertions(+), 8 deletions(-) diff --git a/desktop_version/fonts/buttons_10x10.fontmeta b/desktop_version/fonts/buttons_10x10.fontmeta index 7dde371c38..53bddfe1a2 100644 --- a/desktop_version/fonts/buttons_10x10.fontmeta +++ b/desktop_version/fonts/buttons_10x10.fontmeta @@ -5,9 +5,9 @@ 10 1 - + - + diff --git a/desktop_version/fonts/buttons_10x10.png b/desktop_version/fonts/buttons_10x10.png index 4df5284d7c419186bc2412f7c23d7488e2013c3f..7005c75bf48365570f408cdbafacc158656d81ca 100644 GIT binary patch delta 2485 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 delta 2269 zcmV<32qO2t6X_9{7b&5XNO3n%3cZROI!oyxQb9_hc-=zlRji8$E%8vwrbO{p1Sy!6qKEDxdkKUM zvZbYKmUxgfAXqiiL-N1;^X9!bZzdBr!TDgw%$sli_rEva{(m#`|1)v03Dy~Q@sftBU*3P%ep`E-Yr`RUo)_RcjuV@gBy8u#hUXBm)9D0AgM)(sgT3GZK)GD@ z4d%jy3$Z6z*DvqehO<-l2wYqyQHAkLLIA>laKs^7x^Vz@S>P&VM>mHSpf9xD(WZ?#(WaddWNTePkkuj{&AsZ;_0 zlu9M7h{AX@-fFdqYPAYl?{qql1)}27x~l)U^T*LAlk@q!_^Sior{i)vVfIXrBcI$( zkx<9uh#NJ@chgvDzpWkKR;$%OA_DwB65gNdx}Glbntyn<^RMEm{EG_H{0RZ_onfMp zC(zWfjhMrPDn~uq9vT`l@;GE}6wr80u8JH00w*pk64}m+ z%;Ubv^QY=l<)3YoRM`$YPB(uJ031Jl+>@OKfNVC4yLa!3Fy1R3;J-BKo*HeS>r?K# zS3K@xtJM?R(~3y&76 zA0_8yvsutz&eP3tRR6fmq{o{gMbBW&TJNSxh$_vZN~_rLlFa1q1W(6}JAb=*ynCV& zQZAQ0Rf=V3Xviln8(z|x{G@p%ALGp5ZXd6&5>gu;77L)Ra2z`~=QDKd+?CFE7wvnd`#@r}4PeaXC70wnRtmt!9&`TW?H|YT^0IIH;K74d`*dhD z8Wj3nnl@~Mn(Rb=!u`Tm%&aC0YseNKU zZ3paKybPS5-s*UBn|LHDIrm3TjZ|ji;^SPIM->EBZi=4H$Um|pKMiso_kYRrJa2q_ z8~||V&K=RtPuBSOcwiqi;P-dBH-w__Y$KqJJ&J5R+o1dLs@^lC`SZOIO`-#U%bARC zn}ftBi!c_>Pj87(7NZ0jXjmdTPOeb*=CAxBrR^KSBs9*WHq}0Y?(!##N5_-f`8F4w z%+rZe)sOABCv(dzEzhPO(@O@X8oqAcd;*+aUl)sfN#=MlvtKMG zkO+<91N;$C1ODluO(HsK)nq%B2G?~x`TkA?`SJ?{McCk6UKlUQ^XntaMAZ{euXsC=x6^$qVfv0j_f%LY6twq%BtX;tF#lfF)2%Hp>GPW+ zMNc4<_{l%5fKq=ulnW^J>EvX9_x81GsiITFf&*-bZ*}QmV1MU3!-st$d^$Ply*#j7xPJXQip3(j-7bp7A}W;%ip3)6GD$oRzOCbtsEWm+kw@$F zmw2s(=lJXIKLu~Db_4+M(fhw{w!9ZMXDJed0{|b+-}0U*o`T;RK8!yKpNXf!wXrd; zxv~=A9acSX0Q>IW7rd)iuWE1P&zw0EiD%+)t}PD$zWM4uE%&=0-%Ou^Um?U~e>i_D ra8kJV2y0_w0Uj4$iWDhQ>>2zIAl=sD!}}?n00000NkvXXu0mjf^o?NS diff --git a/desktop_version/fonts/buttons_12x12.fontmeta b/desktop_version/fonts/buttons_12x12.fontmeta index ccfe3f0afb..92a89ec578 100644 --- a/desktop_version/fonts/buttons_12x12.fontmeta +++ b/desktop_version/fonts/buttons_12x12.fontmeta @@ -5,9 +5,9 @@ 12 1 - + - + diff --git a/desktop_version/fonts/buttons_12x12.png b/desktop_version/fonts/buttons_12x12.png index f2184484fca776c5e83425d76bc01318ae321483..4f305ada4f9308e61d2b1ec978ef15cb55208d8d 100644 GIT binary patch delta 2927 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 diff --git a/desktop_version/fonts/buttons_8x8.fontmeta b/desktop_version/fonts/buttons_8x8.fontmeta index 60e2e56676..8c174d6071 100644 --- a/desktop_version/fonts/buttons_8x8.fontmeta +++ b/desktop_version/fonts/buttons_8x8.fontmeta @@ -5,9 +5,9 @@ 8 1 - + - + diff --git a/desktop_version/fonts/buttons_8x8.png b/desktop_version/fonts/buttons_8x8.png index a3750e412fb032def5580cf36d1dd0afa944206e..c7a47b9f112ea8ee3be6c8394c82e56202411687 100644 GIT binary patch delta 2647 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 diff --git a/desktop_version/src/ButtonGlyphs.cpp b/desktop_version/src/ButtonGlyphs.cpp index 5317170819..9ef5b27c6e 100644 --- a/desktop_version/src/ButtonGlyphs.cpp +++ b/desktop_version/src/ButtonGlyphs.cpp @@ -71,6 +71,13 @@ typedef enum GLYPH_NINTENDO_GAMECUBE_R, GLYPH_NINTENDO_GAMECUBE_Z, + GLYPH_NINTENDO_WII_A, + GLYPH_NINTENDO_WII_B, + GLYPH_NINTENDO_WII_1, + GLYPH_NINTENDO_WII_2, + GLYPH_NINTENDO_WII_MINUS, + GLYPH_NINTENDO_WII_PLUS, + GLYPH_TOTAL } ButtonGlyphKey; @@ -89,6 +96,8 @@ typedef enum /* Added after 2.4 */ LAYOUT_GAMECUBE, + LAYOUT_WIIMOTE_ON_WII, + LAYOUT_WIIMOTE_ON_PC, LAYOUT_TOTAL } @@ -152,7 +161,21 @@ static const char* glyph_layout[LAYOUT_TOTAL][SDL_CONTROLLER_BUTTON_RIGHTSHOULDE glyph[GLYPH_UNKNOWN], glyph[GLYPH_UNKNOWN], "START", glyph[GLYPH_UNKNOWN], glyph[GLYPH_UNKNOWN], glyph[GLYPH_UNKNOWN], glyph[GLYPH_NINTENDO_GAMECUBE_Z] - } + }, + { // WIIMOTE on WII + glyph[GLYPH_NINTENDO_WII_1], glyph[GLYPH_NINTENDO_WII_2], + glyph[GLYPH_NINTENDO_WII_A], glyph[GLYPH_NINTENDO_WII_B], + "HOME", glyph[GLYPH_NINTENDO_WII_MINUS], glyph[GLYPH_NINTENDO_WII_PLUS], + glyph[GLYPH_UNKNOWN], glyph[GLYPH_UNKNOWN], + glyph[GLYPH_UNKNOWN], glyph[GLYPH_UNKNOWN] + }, + { // WIIMOTE on PC + glyph[GLYPH_NINTENDO_WII_A], glyph[GLYPH_NINTENDO_WII_B], + glyph[GLYPH_NINTENDO_WII_1], glyph[GLYPH_NINTENDO_WII_2], + "HOME", glyph[GLYPH_NINTENDO_WII_MINUS], glyph[GLYPH_NINTENDO_WII_PLUS], + glyph[GLYPH_UNKNOWN], glyph[GLYPH_UNKNOWN], + glyph[GLYPH_UNKNOWN], glyph[GLYPH_UNKNOWN] + }, }; static bool keyboard_is_active = true; @@ -232,10 +255,19 @@ void BUTTONGLYPHS_update_layout(SDL_GameController *c) { layout = LAYOUT_NINTENDO_SWITCH_JOYCON_R; } - else if (product == 0x0337) + else if (product == 0x0337 || + product == 0x0100) // First GC controller on a Wii or Gamecube { layout = LAYOUT_GAMECUBE; } + else if (product == 0x0306) + { + layout = LAYOUT_WIIMOTE_ON_PC; + } + else if (product == 0x0501) // First wiimote on Wii + { + layout = LAYOUT_WIIMOTE_ON_WII; + } else { layout = LAYOUT_NINTENDO_SWITCH_PRO;