mirror/musikcube
1
0
Fork 0
mirror of https://github.com/clangen/musikcube.git synced 2024-11-19 20:13:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Mouse input feels much better, but the code is super gross. Will be

Browse Source 
refactored before moving forward.
This commit is contained in:
casey langen 2020-11-16 20:34:58 -08:00
parent 8b49240be0
commit c238ef71dd
1 changed files with 49 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
src/musikcube/cursespp/App.cpp
View File

@ -395,10 +395,9 @@ void App::Run(ILayoutPtr layout) {
mouseinterval(0);
struct MouseState {
void Update(mmask_t state) {
int64_t newTime = App::Now();
int newButton = 0;
bool Update(mmask_t state) {
bool result = false;
const int64_t newTime = App::Now();
const bool isDown =
state & BUTTON1_PRESSED ||
@ -412,9 +411,11 @@ void App::Run(ILayoutPtr layout) {
if (!isDown && !isUp) {
Reset();
return;
return false;
}
int newButton = 0;
if (state & BUTTON1_PRESSED || state & BUTTON1_RELEASED) {
newButton = 1;
}
@ -424,23 +425,32 @@ void App::Run(ILayoutPtr layout) {
if (state & BUTTON3_PRESSED || state & BUTTON3_RELEASED) {
newButton = 3;
}
const bool elapsed = newTime - time > 300;
if (newButton != button || elapsed) {
Reset();
}
else {
if (wasDown && isUp) {
if (this->clicked) {
this->doubleClicked = true;
}
else {
this->clicked = true;
}
if (isDown) {
if (!this->clicked) {
this->clicked = true;
this->wasDown = false; /* kludge */
}
else {
this->wasDown = true;
}
result = true;
}
else if (clicked && wasDown && !isDown) {
this->doubleClicked = true;
this->wasDown = true;
result = true;
}
this->button = newButton;
this->wasDown = isDown;
this->time = newTime;
return result;
}
void Reset() {
@ -452,6 +462,26 @@ void App::Run(ILayoutPtr layout) {
doubleClicked = false;
}
mmask_t ToCursesState() noexcept {
if (doubleClicked) {
switch (button) {
case 1: return BUTTON1_DOUBLE_CLICKED;
case 2: return BUTTON2_DOUBLE_CLICKED;
case 3: return BUTTON3_DOUBLE_CLICKED;
default: break;
}
}
else if (clicked) {
switch (button) {
case 1: return BUTTON1_CLICKED;
case 2: return BUTTON2_CLICKED;
case 3: return BUTTON3_CLICKED;
default: break;
}
}
return 0;
}
bool wasDown{ false };
bool clicked{ false };
bool doubleClicked{ false };
@ -518,7 +548,6 @@ process:
#else
if (getmouse(&mouseEvent) == 0) {
#endif
mouseState.Update(mouseEvent.bstate);
auto active = this->state.ActiveLayout();
if (active) {
using Event = IMouseHandler::Event;
@ -530,7 +559,11 @@ process:
}
}
else {
active->MouseEvent(event);
if (mouseState.Update(mouseEvent.bstate)) {
mouseEvent.bstate = mouseState.ToCursesState();
event = Event(mouseEvent, window);
active->MouseEvent(event);
}
}
}
}