perso
/
finalcut
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Added unit test for the mouse classes

This commit is contained in:
Markus Gans 2018-03-25 14:24:21 +02:00
parent c114c14830
commit 67bc999513
3 changed files with 169 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2017-03-25 Markus Gans <guru.mail@muenster.de>
* Added unit test for the mouse classes
* Fixed small parsing errors with mouse events
2017-03-17 Markus Gans <guru.mail@muenster.de> 2017-03-17 Markus Gans <guru.mail@muenster.de>
* Added unit test for FObject * Added unit test for FObject
* Some minor bug fixes in FObject * Some minor bug fixes in FObject

18
src/fmouse.cpp
View File

@ -536,6 +536,7 @@ void FMouseX11::processEvent (struct timeval* time)
&& uChar(button) == x11_button_state ) && uChar(button) == x11_button_state )
{ {
mouse_event_occurred = false; mouse_event_occurred = false;
x11_mouse[0] = '\0'; // Delete already interpreted data
return; return;
} }
@ -736,6 +737,7 @@ void FMouseSGR::processEvent (struct timeval* time)
if ( *p < '0' || *p > '9') if ( *p < '0' || *p > '9')
{ {
mouse_event_occurred = false; mouse_event_occurred = false;
sgr_mouse[0] = '\0'; // Delete already interpreted data
return; return;
} }
@ -748,6 +750,7 @@ void FMouseSGR::processEvent (struct timeval* time)
if ( *p < '0' || *p > '9') if ( *p < '0' || *p > '9')
{ {
mouse_event_occurred = false; mouse_event_occurred = false;
sgr_mouse[0] = '\0'; // Delete already interpreted data
return; return;
} }
@ -759,6 +762,7 @@ void FMouseSGR::processEvent (struct timeval* time)
if ( *p < '0' || *p > '9') if ( *p < '0' || *p > '9')
{ {
mouse_event_occurred = false; mouse_event_occurred = false;
sgr_mouse[0] = '\0'; // Delete already interpreted data
return; return;
} }
@ -782,6 +786,7 @@ void FMouseSGR::processEvent (struct timeval* time)
&& sgr_button_state == uChar(((*p & 0x20) << 2) + button) ) && sgr_button_state == uChar(((*p & 0x20) << 2) + button) )
{ {
mouse_event_occurred = false; mouse_event_occurred = false;
sgr_mouse[0] = '\0'; // Delete already interpreted data
return; return;
} }
@ -991,6 +996,7 @@ void FMouseUrxvt::processEvent (struct timeval* time)
if ( *p < '0' || *p > '9') if ( *p < '0' || *p > '9')
{ {
mouse_event_occurred = false; mouse_event_occurred = false;
urxvt_mouse[0] = '\0'; // Delete already interpreted data
return; return;
} }
@ -1009,6 +1015,7 @@ void FMouseUrxvt::processEvent (struct timeval* time)
if ( *p < '0' || *p > '9') if ( *p < '0' || *p > '9')
{ {
mouse_event_occurred = false; mouse_event_occurred = false;
urxvt_mouse[0] = '\0'; // Delete already interpreted data
return; return;
} }
@ -1027,6 +1034,7 @@ void FMouseUrxvt::processEvent (struct timeval* time)
if ( *p < '0' || *p > '9') if ( *p < '0' || *p > '9')
{ {
mouse_event_occurred = false; mouse_event_occurred = false;
urxvt_mouse[0] = '\0'; // Delete already interpreted data
return; return;
} }
@ -1059,12 +1067,14 @@ void FMouseUrxvt::processEvent (struct timeval* time)
&& urxvt_button_state == uChar(button) ) && urxvt_button_state == uChar(button) )
{ {
mouse_event_occurred = false; mouse_event_occurred = false;
urxvt_mouse[0] = '\0'; // Delete already interpreted data
return; return;
} }
mouse_event_occurred = true; mouse_event_occurred = true;
setPos (FPoint(x, y)); setPos (FPoint(x, y));
urxvt_button_state = uChar(button); urxvt_button_state = uChar(button);
// Delete already interpreted data
urxvt_mouse[0] = '\0'; urxvt_mouse[0] = '\0';
} }
@ -1268,7 +1278,7 @@ void FMouseControl::setDblclickInterval (const long timeout)
while ( iter != mouse_protocol.end() ) while ( iter != mouse_protocol.end() )
{ {
if ( iter->second ) if ( iter->second )
return iter->second->setDblclickInterval(timeout); iter->second->setDblclickInterval(timeout);
++iter; ++iter;
} }
@ -1458,8 +1468,8 @@ bool FMouseControl::isInputDataPending()
while ( iter != mouse_protocol.end() ) while ( iter != mouse_protocol.end() )
{ {
if ( iter->second ) if ( iter->second && iter->second->isInputDataPending() )
return iter->second->isInputDataPending(); return true;
++iter; ++iter;
} }
@ -1537,6 +1547,8 @@ void FMouseControl::setRawData ( FMouse::mouse_type mt
void FMouseControl::processEvent (struct timeval* time) void FMouseControl::processEvent (struct timeval* time)
{ {
FMouse* mouse_object = getMouseWithData(); FMouse* mouse_object = getMouseWithData();
// Clear all old mouse events
clearEvent();
if ( mouse_object ) if ( mouse_object )
mouse_object->processEvent(time); mouse_object->processEvent(time);

154
src/test/fmouse-test.cpp
View File

@ -300,7 +300,6 @@ void FMouseTest::x11MouseTest()
// Left mouse button pressed // Left mouse button pressed
char rawdata2[] = { 0x1b, '[', 'M', 0x20, 0x21, 0x21 }; char rawdata2[] = { 0x1b, '[', 'M', 0x20, 0x21, 0x21 };
x11_mouse.setRawData (rawdata2, sizeof(rawdata2)); x11_mouse.setRawData (rawdata2, sizeof(rawdata2));
CPPUNIT_ASSERT ( x11_mouse.hasData() ); CPPUNIT_ASSERT ( x11_mouse.hasData() );
CPPUNIT_ASSERT ( ! x11_mouse.isInputDataPending() ); CPPUNIT_ASSERT ( ! x11_mouse.isInputDataPending() );
x11_mouse.processEvent (&tv); x11_mouse.processEvent (&tv);
@ -882,7 +881,6 @@ void FMouseTest::urxvtMouseTest()
timeval tv; timeval tv;
FObject::getCurrentTime(&tv); FObject::getCurrentTime(&tv);
urxvt_mouse.processEvent (&tv); urxvt_mouse.processEvent (&tv);
CPPUNIT_ASSERT ( urxvt_mouse.getPos() == FPoint(49, 6) ); CPPUNIT_ASSERT ( urxvt_mouse.getPos() == FPoint(49, 6) );
CPPUNIT_ASSERT ( urxvt_mouse.hasEvent() ); CPPUNIT_ASSERT ( urxvt_mouse.hasEvent() );
CPPUNIT_ASSERT ( urxvt_mouse.isLeftButtonPressed() ); CPPUNIT_ASSERT ( urxvt_mouse.isLeftButtonPressed() );
@ -1237,11 +1235,12 @@ void FMouseTest::mouseControlTest()
} }
// Left mouse button pressed on an X11 mouse // Left mouse button pressed on an X11 mouse
char rawdata1[] = { 0x1b, '[', 'M', 0x20, 0x25, 0x28 }; char rawdata1[] = { 0x1b, '[', 'M', 0x20, 0x25, 0x28
, 0x1b, '[', 'M', 0x23, 0x25, 0x28 };
mouse_control.setRawData (FMouse::x11, rawdata1, sizeof(rawdata1)); mouse_control.setRawData (FMouse::x11, rawdata1, sizeof(rawdata1));
CPPUNIT_ASSERT ( mouse_control.hasData() ); CPPUNIT_ASSERT ( mouse_control.hasData() );
CPPUNIT_ASSERT ( ! mouse_control.isInputDataPending() ); CPPUNIT_ASSERT ( mouse_control.isInputDataPending() );
timeval tv; timeval tv;
FObject::getCurrentTime(&tv); FObject::getCurrentTime(&tv);
mouse_control.processEvent (&tv); mouse_control.processEvent (&tv);
@ -1250,7 +1249,154 @@ void FMouseTest::mouseControlTest()
CPPUNIT_ASSERT ( mouse_control.hasEvent() ); CPPUNIT_ASSERT ( mouse_control.hasEvent() );
CPPUNIT_ASSERT ( mouse_control.isLeftButtonPressed() ); CPPUNIT_ASSERT ( mouse_control.isLeftButtonPressed() );
CPPUNIT_ASSERT ( ! mouse_control.isLeftButtonReleased() ); CPPUNIT_ASSERT ( ! mouse_control.isLeftButtonReleased() );
CPPUNIT_ASSERT ( ! mouse_control.isLeftButtonDoubleClick() );
CPPUNIT_ASSERT ( ! mouse_control.isRightButtonPressed() );
CPPUNIT_ASSERT ( ! mouse_control.isRightButtonReleased() );
CPPUNIT_ASSERT ( ! mouse_control.isMiddleButtonPressed() );
CPPUNIT_ASSERT ( ! mouse_control.isMiddleButtonReleased() );
CPPUNIT_ASSERT ( ! mouse_control.isShiftKeyPressed() );
CPPUNIT_ASSERT ( ! mouse_control.isControlKeyPressed() );
CPPUNIT_ASSERT ( ! mouse_control.isMetaKeyPressed() );
CPPUNIT_ASSERT ( ! mouse_control.isWheelUp() );
CPPUNIT_ASSERT ( ! mouse_control.isWheelDown() );
CPPUNIT_ASSERT ( ! mouse_control.isMoved() );
CPPUNIT_ASSERT ( mouse_control.isInputDataPending() );
mouse_control.setRawData (FMouse::x11, rawdata1, sizeof(rawdata1));
mouse_control.processEvent (&tv);
CPPUNIT_ASSERT ( ! mouse_control.isInputDataPending() );
CPPUNIT_ASSERT ( ! mouse_control.isLeftButtonPressed() );
CPPUNIT_ASSERT ( mouse_control.isLeftButtonReleased() );
CPPUNIT_ASSERT ( ! mouse_control.isLeftButtonDoubleClick() );
// Middle mouse button on an SGR mouse
char rawdata2[] = { 0x1b, '[', '<', '1', ';', '1', ';', '1', 'M'
, 0x1b, '[', '<', '1', ';', '1', ';', '1', 'm' };
mouse_control.setRawData (FMouse::sgr, rawdata2, sizeof(rawdata2));
CPPUNIT_ASSERT ( mouse_control.hasData() );
CPPUNIT_ASSERT ( mouse_control.isInputDataPending() );
FObject::getCurrentTime(&tv);
mouse_control.processEvent (&tv);
CPPUNIT_ASSERT ( ! mouse_control.hasData() );
CPPUNIT_ASSERT ( mouse_control.getPos() == FPoint(1, 1) );
CPPUNIT_ASSERT ( mouse_control.hasEvent() );
CPPUNIT_ASSERT ( ! mouse_control.isLeftButtonPressed() );
CPPUNIT_ASSERT ( ! mouse_control.isLeftButtonReleased() );
CPPUNIT_ASSERT ( ! mouse_control.isLeftButtonDoubleClick() );
CPPUNIT_ASSERT ( ! mouse_control.isRightButtonPressed() );
CPPUNIT_ASSERT ( ! mouse_control.isRightButtonReleased() );
CPPUNIT_ASSERT ( mouse_control.isMiddleButtonPressed() );
CPPUNIT_ASSERT ( ! mouse_control.isMiddleButtonReleased() );
CPPUNIT_ASSERT ( ! mouse_control.isShiftKeyPressed() );
CPPUNIT_ASSERT ( ! mouse_control.isControlKeyPressed() );
CPPUNIT_ASSERT ( ! mouse_control.isMetaKeyPressed() );
CPPUNIT_ASSERT ( ! mouse_control.isWheelUp() );
CPPUNIT_ASSERT ( ! mouse_control.isWheelDown() );
CPPUNIT_ASSERT ( ! mouse_control.isMoved() );
mouse_control.setRawData (FMouse::sgr, rawdata2, sizeof(rawdata2));
mouse_control.processEvent (&tv);
CPPUNIT_ASSERT ( ! mouse_control.isInputDataPending() );
CPPUNIT_ASSERT ( ! mouse_control.isMiddleButtonPressed() );
CPPUNIT_ASSERT ( mouse_control.isMiddleButtonReleased() );
// Right mouse button on a urxvt mouse
char rawdata3[] = { 0x1b, '[', '3', '4', ';', '3', ';', '3', 'M'
, 0x1b, '[', '3', '5', ';', '3', ';', '4', 'M' };
mouse_control.setRawData (FMouse::urxvt, rawdata3, sizeof(rawdata3));
CPPUNIT_ASSERT ( mouse_control.hasData() );
CPPUNIT_ASSERT ( mouse_control.isInputDataPending() );
FObject::getCurrentTime(&tv);
mouse_control.processEvent (&tv);
CPPUNIT_ASSERT ( ! mouse_control.hasData() );
CPPUNIT_ASSERT ( mouse_control.getPos() == FPoint(3, 3) );
CPPUNIT_ASSERT ( mouse_control.hasEvent() );
CPPUNIT_ASSERT ( ! mouse_control.isLeftButtonPressed() );
CPPUNIT_ASSERT ( ! mouse_control.isLeftButtonReleased() );
CPPUNIT_ASSERT ( ! mouse_control.isLeftButtonDoubleClick() );
CPPUNIT_ASSERT ( mouse_control.isRightButtonPressed() );
CPPUNIT_ASSERT ( ! mouse_control.isRightButtonReleased() );
CPPUNIT_ASSERT ( ! mouse_control.isMiddleButtonPressed() );
CPPUNIT_ASSERT ( ! mouse_control.isMiddleButtonReleased() );
CPPUNIT_ASSERT ( ! mouse_control.isShiftKeyPressed() );
CPPUNIT_ASSERT ( ! mouse_control.isControlKeyPressed() );
CPPUNIT_ASSERT ( ! mouse_control.isMetaKeyPressed() );
CPPUNIT_ASSERT ( ! mouse_control.isWheelUp() );
CPPUNIT_ASSERT ( ! mouse_control.isWheelDown() );
CPPUNIT_ASSERT ( ! mouse_control.isMoved() );
mouse_control.setRawData (FMouse::urxvt, rawdata3, sizeof(rawdata3));
mouse_control.processEvent (&tv);
CPPUNIT_ASSERT ( mouse_control.getPos() == FPoint(3, 4) );
CPPUNIT_ASSERT ( ! mouse_control.isInputDataPending() );
CPPUNIT_ASSERT ( ! mouse_control.isRightButtonPressed() );
CPPUNIT_ASSERT ( mouse_control.isRightButtonReleased() );
// Mouse wheel on an X11 mouse
char rawdata4[] = { 0x1b, '[', 'M', 0x60, 0x70, 0x39
, 0x1b, '[', 'M', 0x61, 0x70, 0x39 };
mouse_control.setRawData (FMouse::x11, rawdata4, sizeof(rawdata4));
CPPUNIT_ASSERT ( mouse_control.hasData() );
CPPUNIT_ASSERT ( mouse_control.isInputDataPending() );
FObject::getCurrentTime(&tv);
mouse_control.processEvent (&tv);
CPPUNIT_ASSERT ( ! mouse_control.hasData() );
CPPUNIT_ASSERT ( mouse_control.getPos() == FPoint(80, 25) );
CPPUNIT_ASSERT ( mouse_control.hasEvent() );
CPPUNIT_ASSERT ( ! mouse_control.isLeftButtonPressed() );
CPPUNIT_ASSERT ( ! mouse_control.isLeftButtonReleased() );
CPPUNIT_ASSERT ( ! mouse_control.isLeftButtonDoubleClick() );
CPPUNIT_ASSERT ( ! mouse_control.isRightButtonPressed() );
CPPUNIT_ASSERT ( ! mouse_control.isRightButtonReleased() );
CPPUNIT_ASSERT ( ! mouse_control.isMiddleButtonPressed() );
CPPUNIT_ASSERT ( ! mouse_control.isMiddleButtonReleased() );
CPPUNIT_ASSERT ( ! mouse_control.isShiftKeyPressed() );
CPPUNIT_ASSERT ( ! mouse_control.isControlKeyPressed() );
CPPUNIT_ASSERT ( ! mouse_control.isMetaKeyPressed() );
CPPUNIT_ASSERT ( mouse_control.isWheelUp() );
CPPUNIT_ASSERT ( ! mouse_control.isWheelDown() );
CPPUNIT_ASSERT ( ! mouse_control.isMoved() );
mouse_control.setRawData (FMouse::x11, rawdata4, sizeof(rawdata4));
mouse_control.processEvent (&tv);
CPPUNIT_ASSERT ( ! mouse_control.isInputDataPending() );
CPPUNIT_ASSERT ( mouse_control.isWheelDown() );
// Mouse move on an SGR mouse
char rawdata5[] = { 0x1b, '[', '<', '0', ';', '1', ';', '2', 'M'
, 0x1b, '[', '<', '3', '2', ';', '2', ';', '3', 'M'
, 0x1b, '[', '<', '0', ';', '3', ';', '4', 'm' };
mouse_control.setRawData (FMouse::sgr, rawdata5, sizeof(rawdata5));
CPPUNIT_ASSERT ( mouse_control.hasData() );
CPPUNIT_ASSERT ( mouse_control.isInputDataPending() );
FObject::getCurrentTime(&tv);
mouse_control.processEvent (&tv);
CPPUNIT_ASSERT ( ! mouse_control.hasData() );
CPPUNIT_ASSERT ( mouse_control.getPos() == FPoint(1, 2) );
CPPUNIT_ASSERT ( mouse_control.hasEvent() );
CPPUNIT_ASSERT ( mouse_control.isLeftButtonPressed() );
CPPUNIT_ASSERT ( ! mouse_control.isLeftButtonReleased() );
CPPUNIT_ASSERT ( ! mouse_control.isLeftButtonDoubleClick() );
CPPUNIT_ASSERT ( ! mouse_control.isRightButtonPressed() );
CPPUNIT_ASSERT ( ! mouse_control.isRightButtonReleased() );
CPPUNIT_ASSERT ( ! mouse_control.isMiddleButtonPressed() );
CPPUNIT_ASSERT ( ! mouse_control.isMiddleButtonReleased() );
CPPUNIT_ASSERT ( ! mouse_control.isShiftKeyPressed() );
CPPUNIT_ASSERT ( ! mouse_control.isControlKeyPressed() );
CPPUNIT_ASSERT ( ! mouse_control.isMetaKeyPressed() );
CPPUNIT_ASSERT ( ! mouse_control.isWheelUp() );
CPPUNIT_ASSERT ( ! mouse_control.isWheelDown() );
CPPUNIT_ASSERT ( ! mouse_control.isMoved() );
mouse_control.setRawData (FMouse::sgr, rawdata5, sizeof(rawdata5));
mouse_control.processEvent (&tv);
CPPUNIT_ASSERT ( mouse_control.getPos() == FPoint(2, 3) );
CPPUNIT_ASSERT ( mouse_control.isMoved() );
mouse_control.setRawData (FMouse::sgr, rawdata5, sizeof(rawdata5));
mouse_control.processEvent (&tv);
CPPUNIT_ASSERT ( mouse_control.getPos() == FPoint(3, 4) );
CPPUNIT_ASSERT ( ! mouse_control.isMoved() );
mouse_control.disable(); mouse_control.disable();
} }