Salastil/ncmpcpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

narrow scope of MEVENTs and replace old_mouse_event properly

Browse Source 
previously it wasn't replaced if we hit the first 'if' that uses 'continue'.
This commit is contained in:
Andrzej Rybczak
2011-11-27 13:43:04 +01:00
parent f6bc65bbd1
commit 955e23c270
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/ncmpcpp.cpp
View File

@@ -334,8 +334,6 @@ int main(int argc, char **argv)
signal(SIGWINCH, sighandler); signal(SIGWINCH, sighandler);
# endif // !WIN32 # endif // !WIN32
MEVENT mouse_event, old_mouse_event;
old_mouse_event.bstate = 0;
mouseinterval(0); mouseinterval(0);
if (Config.mouse_support) if (Config.mouse_support)
mousemask(ALL_MOUSE_EVENTS, 0); mousemask(ALL_MOUSE_EVENTS, 0);
@@ -451,7 +449,6 @@ int main(int argc, char **argv)
// header stuff end // header stuff end
if (input != ERR) if (input != ERR)
//ApplyToVisibleWindows(&BasicScreen::RefreshWindow);
myScreen->RefreshWindow(); myScreen->RefreshWindow();
wFooter->ReadKey(input); wFooter->ReadKey(input);
@@ -535,6 +532,8 @@ int main(int argc, char **argv)
} }
else if (Config.mouse_support && input == KEY_MOUSE) else if (Config.mouse_support && input == KEY_MOUSE)
{ {
static MEVENT mouse_event, old_mouse_event;
old_mouse_event = mouse_event;
getmouse(&mouse_event); getmouse(&mouse_event);
// workaround shitty ncurses behavior introduced in >=5.8, when we mysteriously get // workaround shitty ncurses behavior introduced in >=5.8, when we mysteriously get
// a few times after ncmpcpp startup 2^27 code instead of BUTTON{1,3}_RELEASED. since that // a few times after ncmpcpp startup 2^27 code instead of BUTTON{1,3}_RELEASED. since that
@@ -575,7 +574,6 @@ int main(int argc, char **argv)
} }
else if (mouse_event.bstate & (BUTTON1_PRESSED | BUTTON2_PRESSED | BUTTON3_PRESSED | BUTTON4_PRESSED)) else if (mouse_event.bstate & (BUTTON1_PRESSED | BUTTON2_PRESSED | BUTTON3_PRESSED | BUTTON4_PRESSED))
myScreen->MouseButtonPressed(mouse_event); myScreen->MouseButtonPressed(mouse_event);
old_mouse_event = mouse_event;
} }
else if (Keypressed(input, Key.ToggleInterface)) else if (Keypressed(input, Key.ToggleInterface))
{ {