mika/nx-hbmenu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed mallocs and used bool flags instead.

Browse Source
This commit is contained in:
Steven Mattera 2018-05-30 18:24:32 -04:00
parent 5f04f106cf
commit 595ad7b663
2 changed files with 19 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
nx_main/nx_touch.c
View File

@ -7,8 +7,7 @@
struct touchInfo_s touchInfo; struct touchInfo_s touchInfo;
void touchInit() { void touchInit() {
touchInfo.firstTouch = NULL; touchInfo.gestureInProgress = false;
touchInfo.prevTouch = NULL;
touchInfo.isTap = true; touchInfo.isTap = true;
touchInfo.initMenuXPos = 0; touchInfo.initMenuXPos = 0;
touchInfo.initMenuIndex = 0; touchInfo.initMenuIndex = 0;
@ -37,30 +36,28 @@ void handleTouch(menu_s* menu) {
u32 touches = hidTouchCount(); u32 touches = hidTouchCount();
// On touch start. // On touch start.
if (touches == 1 && touchInfo.firstTouch == NULL) { if (touches == 1 && !touchInfo.gestureInProgress) {
hidTouchRead(&currentTouch, 0); hidTouchRead(&currentTouch, 0);
touchInfo.firstTouch = malloc(sizeof(touchPosition)); touchInfo.gestureInProgress = true;
touchInfo.prevTouch = malloc(sizeof(touchPosition)); touchInfo.firstTouch = currentTouch;
touchInfo.firstTouch->px = currentTouch.px; touchInfo.prevTouch = currentTouch;
touchInfo.firstTouch->py = currentTouch.py;
touchInfo.isTap = true; touchInfo.isTap = true;
touchInfo.initMenuXPos = menu->xPos; touchInfo.initMenuXPos = menu->xPos;
touchInfo.initMenuIndex = menu->curEntry; touchInfo.initMenuIndex = menu->curEntry;
} }
// On touch moving. // On touch moving.
else if (touches >= 1 && touchInfo.firstTouch != NULL) { else if (touches >= 1 && touchInfo.gestureInProgress) {
hidTouchRead(&currentTouch, 0); hidTouchRead(&currentTouch, 0);
touchInfo.prevTouch->px = currentTouch.px; touchInfo.prevTouch = currentTouch;
touchInfo.prevTouch->py = currentTouch.py;
if (touchInfo.isTap && (abs(touchInfo.firstTouch->px - currentTouch.px) > TAP_MOVEMENT_GAP || abs(touchInfo.firstTouch->py - currentTouch.py) > TAP_MOVEMENT_GAP)) { if (touchInfo.isTap && (abs(touchInfo.firstTouch.px - currentTouch.px) > TAP_MOVEMENT_GAP || abs(touchInfo.firstTouch.py - currentTouch.py) > TAP_MOVEMENT_GAP)) {
touchInfo.isTap = false; touchInfo.isTap = false;
} }
if (!menuIsMsgBoxOpen() && touchInfo.firstTouch->py > LISTING_START_Y && touchInfo.firstTouch->py < LISTING_END_Y && !touchInfo.isTap && menu->nEntries > 7) { if (!menuIsMsgBoxOpen() && touchInfo.firstTouch.py > LISTING_START_Y && touchInfo.firstTouch.py < LISTING_END_Y && !touchInfo.isTap && menu->nEntries > 7) {
menu->xPos = touchInfo.initMenuXPos + (currentTouch.px - touchInfo.firstTouch->px); menu->xPos = touchInfo.initMenuXPos + (currentTouch.px - touchInfo.firstTouch.px);
menu->curEntry = touchInfo.initMenuIndex + ((int) (touchInfo.firstTouch->px - currentTouch.px) / 170); menu->curEntry = touchInfo.initMenuIndex + ((int) (touchInfo.firstTouch.px - currentTouch.px) / 170);
if (menu->curEntry < 0) if (menu->curEntry < 0)
menu->curEntry = 0; menu->curEntry = 0;
@ -70,7 +67,7 @@ void handleTouch(menu_s* menu) {
} }
} }
// On touch end. // On touch end.
else if (touchInfo.firstTouch != NULL) { else if (touchInfo.gestureInProgress) {
if (menuIsMsgBoxOpen()) { if (menuIsMsgBoxOpen()) {
MessageBox currMsgBox = menuGetCurrentMsgBox(); MessageBox currMsgBox = menuGetCurrentMsgBox();
int start_x = 1280 / 2 - currMsgBox.width / 2; int start_x = 1280 / 2 - currMsgBox.width / 2;
@ -78,19 +75,15 @@ void handleTouch(menu_s* menu) {
int end_x = start_x + currMsgBox.width; int end_x = start_x + currMsgBox.width;
int end_y = start_y + 80; int end_y = start_y + 80;
if (touchInfo.firstTouch->px > start_x && touchInfo.firstTouch->px < end_x && touchInfo.firstTouch->py > start_y && touchInfo.firstTouch->py < end_y && touchInfo.isTap) { if (touchInfo.firstTouch.px > start_x && touchInfo.firstTouch.px < end_x && touchInfo.firstTouch.py > start_y && touchInfo.firstTouch.py < end_y && touchInfo.isTap) {
menuCloseMsgBox(); menuCloseMsgBox();
} }
} else { } else {
if (touchInfo.firstTouch->py > LISTING_START_Y && touchInfo.firstTouch->py < LISTING_END_Y && touchInfo.isTap) { if (touchInfo.firstTouch.py > LISTING_START_Y && touchInfo.firstTouch.py < LISTING_END_Y && touchInfo.isTap) {
handleTap(menu, touchInfo.prevTouch->px); handleTap(menu, touchInfo.prevTouch.px);
} }
} }
free(touchInfo.firstTouch); touchInfo.gestureInProgress = false;
touchInfo.firstTouch = NULL;
free(touchInfo.prevTouch);
touchInfo.prevTouch = NULL;
} }
} }

5
nx_main/nx_touch.h
View File

@ -4,8 +4,9 @@
#include "../common/common.h" #include "../common/common.h"
struct touchInfo_s { struct touchInfo_s {
touchPosition* firstTouch; bool gestureInProgress;
touchPosition* prevTouch; touchPosition firstTouch;
touchPosition prevTouch;
bool isTap; bool isTap;
int initMenuXPos; int initMenuXPos;
int initMenuIndex; int initMenuIndex;