From 8395b14de836e9655b6435a6a28c182b9578412d Mon Sep 17 00:00:00 2001
From: zoeyjodon <zoey@geneial.com>
Date: Mon, 27 May 2024 11:49:20 -0400
Subject: [PATCH] Add scroll bars to the virtual mouse

---
 3ds/gfx/touchpad.png                    | Bin 1246 -> 1749 bytes
 src/input/n3ds/MouseTouchHandler.cpp    |  21 ++++++++++++++++++---
 src/input/n3ds/N3dsTouchscreenInput.hpp |   2 ++
 3 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/3ds/gfx/touchpad.png b/3ds/gfx/touchpad.png
index d14770aadbc0c2e67070a61a17d0fc1dc2e55c80..f8482ae2466af9e93b6b26b117fb61671a316b50 100644
GIT binary patch
literal 1749
zcmeHI`BRfe7~U`W5&}#hs7NV-Nk?gIL97TBXh;IcQ3wSo0wR}k$PofXIn^W<4IZEt
znkY4pvB;st07g+U5K+bs$YsNA4y76yNI*eC31UC&blQKw-?}q<JkR^=zVq%rGkYQ^
z&<Ahyu@L|O@8|2a699;ctY>goWX!aeq#_fPwbRD~T<cjkfdDv(MyCPLc*b}s4ufFB
z4Bv<>08H+#bm*tM-}?c8P4V-heU}@pk$0z$Qa?K0-*@WK=Usbt@gv^Yjs+MSWiqB-
zt+#1Y`vylyhiw=7lZ2hmk)~6dN;gL<6{6<WrNxCjNvQfry-VuSt!3lBvUFd4yK7=8
z;91{(3mAT`tT246vXnQop*><w(B|_smpfmV9TR4#3a;D`Yn?=XXn_e@Aa<Gc{Mo1(
zno|A>Y@Ygo3bh@+)<`%5>E_ehWemDRSp~F*&r%~RMv87LNp?2ah8M!lK)Vq$)%lbj
zjlE}hi?&R!Ls(*=>DF}{3w7yw$7Y%m_1Pim`SL7QJ)tLR-&7_G9e%yE-C#{G?x{q3
zQ+;59I|KR4#BqTz|M+bGxDN%h);;zlIr2-fU{rGk+aSwI=5S`mE}5s+e<kiYQ`hn2
znTkC>AdV|G%uFjTXDkUo7rKy88*J5DzQsH>r<y5Y@}(ZQ({(O7b>Z~6x>UL(X1ajw
z<Yr%ZHm-MuF;J$xQ@U*X+hak*YcHT58Q(KK=B>+&#5CMe4!*3B?#N>oL7szY4|uP>
z&<<6uky?>p?F~iY6`;V8;@$kwiI^F09I4Ajy;LzNTIBX~ugQ0;8f|#!@}#*q$!Tvt
zJRE9rset&*K=aa#)qBW9<O-oqyJ%os-zo^+8|D5mm@k!v+=j8k7XYdeCKPRCQ|**!
zIQw}48yFA~fXEDq1b@H@N8ui<q7r%k>i!RXnA_M~Nojj0hldrDWBNCP{FwC=QS<Ud
zOYd%Na{>xBN$6TI*G(G#^C;`S(Y=-4kc*~039(`R?r`0S@iM0Xw)AP56DE7eoGP>o
zp^z%_DG+Rutl8ASBtvldR%ba~uxx}-sr8#O_FE&A<F@Am0jy&H#l3mJ=+Im)LdgX4
zDK%{#fOG$6H%tjR5O5OZ)vYeS$B@|6)hRX7O*#vzFgfeJBr!mMs!@FV-X_};((YW%
z69xSZlJ<9Ay|9uC@ljuuRvhN`)|@}ooWoiT7saFg>#o<_{*fppE4p&l(8dm_^n)00
z^7Z2UvOd2cq|N<EH1nKx)+tBwrepGlg2SS7_EXLf4?Q|5WIJo*C*%&CV}zIayDTc^
zZG<>fhhyZ7%#`LuXd<^j{NBoL3T)}-%VZ}_6p(ZAf4F#9WM2SXoLmk%WNPG8lmmxr
z(s_AHyrrvJXH%BVGVR-do6GaIN;JsO)OD}HS(eC3BA`9_pqi>uJhpwr*m)4pQ>13y
z$swVj!*qMos5jk2xB%JLCJ$6Oc!<o}v`$Bq<qE4us+>wj=QQioi#baH7#cQXOX$f%
z_rb~aeNBzW@z|gxwqvfWNr4a<ww`po1N)i5#o(B+R?JFd(peh`4x2;UucwbMx4>&@
zs?&?3gL+aC4wbZ3CRTv8pWrUu`-O+cHV|mSgnjtPITnWxH!<n=x>piwl<$6YCtn22
zyW2Uu0LEa|$_BBpI<yoWUPR1@zfpX}D3)~eeH{mZu^C(vpI(}XK@L;lc;fxp0NVX2
dn_A1~Q>?wv%**-P9w1*4@Y@mSb<HF8=wBfsv|j)K

literal 1246
zcmeAS@N?(olHy`uVBq!ia0y~yU~~YoKX9-C$wJ+|*+7c1ILO_JVcj{Imp~3nx}&cn
z1H;CC?mvmFKt5-IM`SSr1K%DHW}LdG$P=ih*we)^q$2L^?X!Nb0wf#)cksVFv9Q0i
zy|2bo-*-pgMhDG+x^GdQ$?iuc%a!ljwj*wB*!<bd3eV4fQ+McNV2WhoNa0kNpxWRt
zZIm+_2DsC~*1F2t-*@IQFPXv6sKdyziACUqkb^?@Uduf!iGlj-^KWm~mw#WsJ$-|W
zFb$H^wO>!azAdh<3kBP8CHLE%Z*RK)9xP9;ej+6{o1vXmcdNz&L*2WbNAnw71#XnC
z*1PjYasdZZbM&?c%k&*x1a9TsZTR|Z$1m>*$=zQV_N3<6-(a@=excP>?LeZUnT5g8
zNqZx{h*jKQbcf6N^uGN+m$ENCI-hYCOQYfTjKgmj;;OQYS)C5sZcPqjI3L@fDe&Xn
z9knyLmrgR8tYrM2;WyilYrzl3?{BWS`SJl7{ST&u`TkP+qWWlib-(?$ne%wfc6`eX
zUiaU0mhrO}EES#cED4#xw@M8f9<keOO6I*S?eLL#-ob^_df5X0G^B4@pShn&qwavQ
zRQBzDhA#OJXUe3%D>v-xVzAkK_t@WEtYVH2Bzw2!eo^h<U^<@?f7y-MLI5ZvlXdeR
z1D}gPMaprhvTOgD<_n+LcwXcV+x2~KFJ1pX$4+(*!~e~ejqXNUBPTO~bO_G5wCW_I
zOou|jdB5B%o?ur0vn?;5fK1t;UOd}GyMbAd<=sI`-C42@4esg<4p*|i@;kp+*lf$7
SCk!l;7(8A5T-G@yGywo%lbNOf

diff --git a/src/input/n3ds/MouseTouchHandler.cpp b/src/input/n3ds/MouseTouchHandler.cpp
index 22790dde..2543508d 100644
--- a/src/input/n3ds/MouseTouchHandler.cpp
+++ b/src/input/n3ds/MouseTouchHandler.cpp
@@ -37,6 +37,11 @@ void MouseTouchHandler::_handle_touch_down(touchPosition touch) {
     if (touch.py < 175) {
         previous_x = touch.px;
         previous_y = touch.py;
+        if (touch.px > 285) {
+            v_scroll = true;
+        } else if (touch.py < 35) {
+            h_scroll = true;
+        }
     } else if (touch.px > 160) {
         mouse_button = BUTTON_RIGHT;
         LiSendMouseButtonEvent(BUTTON_ACTION_PRESS, BUTTON_RIGHT);
@@ -53,15 +58,25 @@ void MouseTouchHandler::_handle_touch_up(touchPosition touch) {
     mouse_button = -1;
     previous_x = -1;
     previous_y = -1;
+    v_scroll = false;
+    h_scroll = false;
 }
 
 void MouseTouchHandler::_handle_touch_hold(touchPosition touch) {
     if (previous_x == -1) {
         return;
     }
-    short deltaX = N3DS_MOUSEPAD_SENSITIVITY * (touch.px - previous_x);
-    short deltaY = N3DS_MOUSEPAD_SENSITIVITY * (touch.py - previous_y);
+    short deltaX = touch.px - previous_x;
+    short deltaY = touch.py - previous_y;
     previous_x = touch.px;
     previous_y = touch.py;
-    LiSendMouseMoveEvent(deltaX, deltaY);
+
+    if (v_scroll) {
+        LiSendScrollEvent(-1 * deltaY);
+    } else if (h_scroll) {
+        LiSendHScrollEvent(deltaX);
+    } else {
+        LiSendMouseMoveEvent(N3DS_MOUSEPAD_SENSITIVITY * deltaX,
+                             N3DS_MOUSEPAD_SENSITIVITY * deltaY);
+    }
 }
diff --git a/src/input/n3ds/N3dsTouchscreenInput.hpp b/src/input/n3ds/N3dsTouchscreenInput.hpp
index 35fe77a9..dd298170 100644
--- a/src/input/n3ds/N3dsTouchscreenInput.hpp
+++ b/src/input/n3ds/N3dsTouchscreenInput.hpp
@@ -79,6 +79,8 @@ class MouseTouchHandler : public TouchHandlerBase {
     int mouse_button = -1;
     int previous_x = 0;
     int previous_y = 0;
+    bool v_scroll = false;
+    bool h_scroll = false;
 };
 
 enum KeyState { KEY_DISABLED, KEY_TEMPORARY, KEY_LOCKED, KEY_SHIFT };