From 456f0f23cf299256290795d8d88c537d298143fe Mon Sep 17 00:00:00 2001 From: Mathieu Westphal Date: Sat, 11 Jan 2025 09:05:20 +0100 Subject: [PATCH] Console: Run console provided command in eventLoop using a buffer (#1899) - Add an internal API to setCommandBuffer - Use the API when trigger a command from console - actuall call triggerCommand in the event loop - Extensive testing - reload_current_file_groups - toggle_volume_rendering - set_camera top --- application/testing/CMakeLists.txt | 4 + library/private/interactor_impl.h | 5 + library/src/interactor_impl.cxx | 16 ++- .../TestInteractionConsoleCamera.png | 3 + .../TestInteractionConsoleLoadNext.png | 3 + .../TestInteractionConsoleReload.png | 3 + .../TestInteractionConsoleRender.png | 3 + .../TestInteractionConsoleCamera.log | 74 +++++++++++ .../TestInteractionConsoleClear.log | 1 + .../TestInteractionConsoleInvalidCommand.log | 2 + .../TestInteractionConsoleInvalidOption.log | 2 + .../TestInteractionConsoleLoadNext.log | 98 +++++++++++++++ .../TestInteractionConsoleOpenExit.log | 2 + .../TestInteractionConsoleReload.log | 118 ++++++++++++++++++ .../TestInteractionConsoleReload2.log | 118 ++++++++++++++++++ .../TestInteractionConsoleRender.log | 110 ++++++++++++++++ .../TestInteractionConsoleTypingSceneInfo.log | 2 + 17 files changed, 563 insertions(+), 1 deletion(-) create mode 100644 testing/baselines/TestInteractionConsoleCamera.png create mode 100644 testing/baselines/TestInteractionConsoleLoadNext.png create mode 100644 testing/baselines/TestInteractionConsoleReload.png create mode 100644 testing/baselines/TestInteractionConsoleRender.png create mode 100644 testing/recordings/TestInteractionConsoleCamera.log create mode 100644 testing/recordings/TestInteractionConsoleLoadNext.log create mode 100644 testing/recordings/TestInteractionConsoleReload.log create mode 100644 testing/recordings/TestInteractionConsoleReload2.log create mode 100644 testing/recordings/TestInteractionConsoleRender.log diff --git a/application/testing/CMakeLists.txt b/application/testing/CMakeLists.txt index 0bbc1f6684..a6fe930085 100644 --- a/application/testing/CMakeLists.txt +++ b/application/testing/CMakeLists.txt @@ -841,6 +841,10 @@ f3d_test(NAME TestInteractionConsoleInvalidCommand DATA f3d.glb INTERACTION UI) f3d_test(NAME TestInteractionConsoleInvalidOption DATA f3d.glb INTERACTION UI) #Escape;toggle foo;Return f3d_test(NAME TestInteractionConsoleClear DATA dragon.vtu INTERACTION UI) #Escape;e;Escape;printt;BackSpace;_scee;Left;n;Right;_info;Return;clear;Return f3d_test(NAME TestInteractionConsoleTypingSceneInfo DATA f3d.glb INTERACTION UI) #Escape;e;Escape;printt;BackSpace;_scee;Left;Right;_info;Return +f3d_test(NAME TestInteractionConsoleReload DATA f3d.glb INTERACTION UI) #Escape;reload_current_file_group;Return +f3d_test(NAME TestInteractionConsoleLoadNext DATA f3d.glb cow.vtp INTERACTION UI) #Escape;load_next_file_group;Return +f3d_test(NAME TestInteractionConsoleRender ARGS --coloring-by-cells DATA waveletMaterial.vti INTERACTION UI) #Escape;toggle_volume_rendering;Return +f3d_test(NAME TestInteractionConsoleCamera DATA f3d.glb INTERACTION UI) #Escape;set_camera top;Return if (F3D_MODULE_TINYFILEDIALOGS) f3d_test(NAME TestInteractionFileOpen INTERACTION NO_BASELINE ENV CTEST_OPEN_DIALOG_FILE=${F3D_SOURCE_DIR}/testing/data/cow.vtp) diff --git a/library/private/interactor_impl.h b/library/private/interactor_impl.h index 69ee46afc6..88458c6158 100644 --- a/library/private/interactor_impl.h +++ b/library/private/interactor_impl.h @@ -106,6 +106,11 @@ class interactor_impl : public interactor */ void EventLoop(); + /** + * Set a command to be run on the next event loop + */ + void SetCommandBuffer(const char* command); + /** * An exception that can be thrown by certain command callbacks * when the arguments of the callback are incorrect and expected diff --git a/library/src/interactor_impl.cxx b/library/src/interactor_impl.cxx index 0ee5d4c069..521f86e9c4 100644 --- a/library/src/interactor_impl.cxx +++ b/library/src/interactor_impl.cxx @@ -237,7 +237,7 @@ class interactor_impl::internals if (event == vtkF3DConsoleOutputWindow::TriggerEvent) { const char* commandWithArgs = static_cast(data); - self->Interactor.triggerCommand(commandWithArgs); + self->Interactor.SetCommandBuffer(commandWithArgs); } else if (event == vtkF3DConsoleOutputWindow::ShowEvent || event == vtkF3DConsoleOutputWindow::HideEvent) @@ -516,6 +516,12 @@ class interactor_impl::internals this->EventLoopUserCallBack(); } + if (this->CommandBuffer.has_value()) + { + this->Interactor.triggerCommand(this->CommandBuffer.value()); + this->CommandBuffer.reset(); + } + this->AnimationManager->Tick(); if (this->RenderRequested) @@ -543,6 +549,7 @@ class interactor_impl::internals std::map>> TimerCallBacks; std::map&)>> Commands; + std::optional CommandBuffer; std::map Bindings; std::multimap GroupedBinds; @@ -1254,6 +1261,13 @@ void interactor_impl::UpdateRendererAfterInteraction() this->Internals->Style->UpdateRendererAfterInteraction(); } +//---------------------------------------------------------------------------- +void interactor_impl::SetCommandBuffer(const char* command) +{ + // XXX This replace previous command buffer, it should be improved + this->Internals->CommandBuffer = command; +} + //---------------------------------------------------------------------------- interactor_impl::invalid_args_exception::invalid_args_exception(const std::string& what) : exception(what) diff --git a/testing/baselines/TestInteractionConsoleCamera.png b/testing/baselines/TestInteractionConsoleCamera.png new file mode 100644 index 0000000000..f19fe38665 --- /dev/null +++ b/testing/baselines/TestInteractionConsoleCamera.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5c08f2d20734e52d4c1ba8a79a8640ba4fd1a59a563fb8b695dc8570fd7107bb +size 2183 diff --git a/testing/baselines/TestInteractionConsoleLoadNext.png b/testing/baselines/TestInteractionConsoleLoadNext.png new file mode 100644 index 0000000000..88639a1cae --- /dev/null +++ b/testing/baselines/TestInteractionConsoleLoadNext.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6294c9979ff8f55ba879a6802fa2ebbfd84089944ef46f8c774c82b4164d8549 +size 18646 diff --git a/testing/baselines/TestInteractionConsoleReload.png b/testing/baselines/TestInteractionConsoleReload.png new file mode 100644 index 0000000000..677455f95b --- /dev/null +++ b/testing/baselines/TestInteractionConsoleReload.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:48c3404e4042e16e6001231955a79779a8f8dd5fa3022547ddab3b0352bf2068 +size 2289 diff --git a/testing/baselines/TestInteractionConsoleRender.png b/testing/baselines/TestInteractionConsoleRender.png new file mode 100644 index 0000000000..c8b6cc3e54 --- /dev/null +++ b/testing/baselines/TestInteractionConsoleRender.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:917d020d84fb71ccb3fe58efe65dff4379b090f0b8e911ceaa32fc3aafdfcee6 +size 25576 diff --git a/testing/recordings/TestInteractionConsoleCamera.log b/testing/recordings/TestInteractionConsoleCamera.log new file mode 100644 index 0000000000..0570b35a74 --- /dev/null +++ b/testing/recordings/TestInteractionConsoleCamera.log @@ -0,0 +1,74 @@ +# StreamVersion 1.2 +ConfigureEvent 1249 1374 0 0 0 0 0 +ExposeEvent 0 1406 0 0 0 0 0 +RenderEvent 0 1406 0 0 0 0 0 + +KeyPressEvent -763 401 0 27 1 Escape 0 +CharEvent -763 401 0 27 1 Escape 0 +KeyReleaseEvent -763 401 0 27 1 Escape 0 + +KeyPressEvent -763 401 0 115 1 s 0 +CharEvent -763 401 0 115 1 s 0 +KeyReleaseEvent -763 401 0 115 1 s 0 + +KeyPressEvent -763 401 0 101 1 e 0 +CharEvent -763 401 0 101 1 e 0 +KeyReleaseEvent -763 401 0 101 1 e 0 + +KeyPressEvent -763 401 0 116 1 t 0 +CharEvent -763 401 0 116 1 t 0 +KeyReleaseEvent -763 401 0 116 1 t 0 + +KeyPressEvent -763 401 1 95 1 underscore 0 +CharEvent -763 401 1 95 1 underscore 0 +KeyReleaseEvent -763 401 1 95 1 underscore 0 + +KeyPressEvent -763 401 0 99 1 c 0 +CharEvent -763 401 0 99 1 c 0 +KeyReleaseEvent -763 401 0 99 1 c 0 + +KeyPressEvent -763 401 0 97 1 a 0 +CharEvent -763 401 0 97 1 a 0 +KeyReleaseEvent -763 401 0 97 1 a 0 + +KeyPressEvent -763 401 0 109 1 m 0 +CharEvent -763 401 0 109 1 m 0 +KeyReleaseEvent -763 401 0 109 1 m 0 + +KeyPressEvent -763 401 0 101 1 e 0 +CharEvent -763 401 0 101 1 e 0 +KeyReleaseEvent -763 401 0 101 1 e 0 + +KeyPressEvent -763 401 0 114 1 r 0 +CharEvent -763 401 0 114 1 r 0 +KeyReleaseEvent -763 401 0 114 1 r 0 + +KeyPressEvent -763 401 0 97 1 a 0 +CharEvent -763 401 0 97 1 a 0 +KeyReleaseEvent -763 401 0 97 1 a 0 + +KeyPressEvent -763 401 0 32 1 space 0 +CharEvent -763 401 0 32 1 space 0 +KeyReleaseEvent -763 401 0 32 1 space 0 + +KeyPressEvent -763 401 0 116 1 t 0 +CharEvent -763 401 0 116 1 t 0 +KeyReleaseEvent -763 401 0 116 1 t 0 + +KeyPressEvent -763 401 0 111 1 o 0 +CharEvent -763 401 0 111 1 o 0 +KeyReleaseEvent -763 401 0 111 1 o 0 + +KeyPressEvent -763 401 0 112 1 p 0 +CharEvent -763 401 0 112 1 p 0 +KeyReleaseEvent -763 401 0 112 1 p 0 + +KeyPressEvent -763 401 0 13 1 Return 0 +CharEvent -763 401 0 13 1 Return 0 +KeyReleaseEvent -763 401 0 13 1 Return 0 + +KeyPressEvent -763 401 0 27 1 Escape 0 +CharEvent -763 401 0 27 1 Escape 0 +KeyReleaseEvent -763 401 0 27 1 Escape 0 + +TimerEvent 212 76 0 27 1 Escape 0 diff --git a/testing/recordings/TestInteractionConsoleClear.log b/testing/recordings/TestInteractionConsoleClear.log index dcacde83c2..4a6509df2c 100644 --- a/testing/recordings/TestInteractionConsoleClear.log +++ b/testing/recordings/TestInteractionConsoleClear.log @@ -123,3 +123,4 @@ KeyPressEvent 0 0 0 13 1 Return 0 CharEvent 0 0 0 13 1 Return 0 KeyReleaseEvent 0 0 0 13 1 Return 0 +TimerEvent 351 169 0 0 0 0 0 diff --git a/testing/recordings/TestInteractionConsoleInvalidCommand.log b/testing/recordings/TestInteractionConsoleInvalidCommand.log index 4fb4342b0a..8adb826b58 100644 --- a/testing/recordings/TestInteractionConsoleInvalidCommand.log +++ b/testing/recordings/TestInteractionConsoleInvalidCommand.log @@ -20,3 +20,5 @@ KeyReleaseEvent 0 0 0 111 1 o 0 KeyPressEvent 0 0 0 13 1 Return 0 CharEvent 0 0 0 13 1 Return 0 KeyReleaseEvent 0 0 0 13 1 Return 0 + +TimerEvent 351 169 0 0 0 0 0 diff --git a/testing/recordings/TestInteractionConsoleInvalidOption.log b/testing/recordings/TestInteractionConsoleInvalidOption.log index 07d0214d22..4fc7f8ca2d 100644 --- a/testing/recordings/TestInteractionConsoleInvalidOption.log +++ b/testing/recordings/TestInteractionConsoleInvalidOption.log @@ -48,3 +48,5 @@ KeyReleaseEvent 0 0 0 111 1 o 0 KeyPressEvent 0 0 0 13 1 Return 0 CharEvent 0 0 0 13 1 Return 0 KeyReleaseEvent 0 0 0 13 1 Return 0 + +TimerEvent 351 169 0 0 0 0 0 diff --git a/testing/recordings/TestInteractionConsoleLoadNext.log b/testing/recordings/TestInteractionConsoleLoadNext.log new file mode 100644 index 0000000000..719ff3d406 --- /dev/null +++ b/testing/recordings/TestInteractionConsoleLoadNext.log @@ -0,0 +1,98 @@ +# StreamVersion 1.2 +ConfigureEvent 1249 1374 0 0 0 0 0 +ExposeEvent 0 1406 0 0 0 0 0 +RenderEvent 0 1406 0 0 0 0 0 + +KeyPressEvent -179 393 0 27 1 Escape 0 +CharEvent -179 393 0 27 1 Escape 0 +KeyReleaseEvent -179 393 0 27 1 Escape 0 + +KeyPressEvent -179 393 0 108 1 l 0 +CharEvent -179 393 0 108 1 l 0 +KeyReleaseEvent -179 393 0 108 1 l 0 + +KeyPressEvent -179 393 0 111 1 o 0 +CharEvent -179 393 0 111 1 o 0 +KeyReleaseEvent -179 393 0 111 1 o 0 + +KeyPressEvent -179 393 0 97 1 a 0 +CharEvent -179 393 0 97 1 a 0 +KeyReleaseEvent -179 393 0 97 1 a 0 + +KeyPressEvent -179 393 0 100 1 d 0 +CharEvent -179 393 0 100 1 d 0 +KeyReleaseEvent -179 393 0 100 1 d 0 + +KeyPressEvent -179 393 1 95 1 underscore 0 +CharEvent -179 393 1 95 1 underscore 0 +KeyReleaseEvent -179 393 1 95 1 underscore 0 + +KeyPressEvent -179 393 0 110 1 n 0 +CharEvent -179 393 0 110 1 n 0 +KeyReleaseEvent -179 393 0 110 1 n 0 + +KeyPressEvent -179 393 0 101 1 e 0 +CharEvent -179 393 0 101 1 e 0 +KeyReleaseEvent -179 393 0 101 1 e 0 + +KeyPressEvent -179 393 0 120 1 x 0 +CharEvent -179 393 0 120 1 x 0 +KeyReleaseEvent -179 393 0 120 1 x 0 + +KeyPressEvent -179 393 0 116 1 t 0 +CharEvent -179 393 0 116 1 t 0 +KeyReleaseEvent -179 393 0 116 1 t 0 + +KeyPressEvent -179 393 1 95 1 underscore 0 +CharEvent -179 393 1 95 1 underscore 0 +KeyReleaseEvent -179 393 1 95 1 underscore 0 + +KeyPressEvent -179 393 0 102 1 f 0 +CharEvent -179 393 0 102 1 f 0 +KeyReleaseEvent -179 393 0 102 1 f 0 + +KeyPressEvent -179 393 0 105 1 i 0 +CharEvent -179 393 0 105 1 i 0 +KeyReleaseEvent -179 393 0 105 1 i 0 + +KeyPressEvent -179 393 0 108 1 l 0 +CharEvent -179 393 0 108 1 l 0 +KeyReleaseEvent -179 393 0 108 1 l 0 + +KeyPressEvent -179 393 0 101 1 e 0 +CharEvent -179 393 0 101 1 e 0 +KeyReleaseEvent -179 393 0 101 1 e 0 + +KeyPressEvent -179 393 1 95 1 underscore 0 +CharEvent -179 393 1 95 1 underscore 0 +KeyReleaseEvent -179 393 1 95 1 underscore 0 + +KeyPressEvent -179 393 0 103 1 g 0 +CharEvent -179 393 0 103 1 g 0 +KeyReleaseEvent -179 393 0 103 1 g 0 + +KeyPressEvent -179 393 0 114 1 r 0 +CharEvent -179 393 0 114 1 r 0 +KeyReleaseEvent -179 393 0 114 1 r 0 + +KeyPressEvent -179 393 0 111 1 o 0 +CharEvent -179 393 0 111 1 o 0 +KeyReleaseEvent -179 393 0 111 1 o 0 + +KeyPressEvent -179 393 0 117 1 u 0 +CharEvent -179 393 0 117 1 u 0 +KeyReleaseEvent -179 393 0 117 1 u 0 + +KeyPressEvent -179 393 0 112 1 p 0 +CharEvent -179 393 0 112 1 p 0 +KeyReleaseEvent -179 393 0 112 1 p 0 + +KeyPressEvent -179 393 0 13 1 Return 0 +CharEvent -179 393 0 13 1 Return 0 +KeyReleaseEvent -179 393 0 13 1 Return 0 + +KeyPressEvent -179 393 0 27 1 Escape 0 +CharEvent -179 393 0 27 1 Escape 0 +KeyReleaseEvent -179 393 0 27 1 Escape 0 + +TimerEvent 212 76 0 27 1 Escape 0 diff --git a/testing/recordings/TestInteractionConsoleOpenExit.log b/testing/recordings/TestInteractionConsoleOpenExit.log index dc7251e4d0..618a61ba29 100644 --- a/testing/recordings/TestInteractionConsoleOpenExit.log +++ b/testing/recordings/TestInteractionConsoleOpenExit.log @@ -25,3 +25,5 @@ KeyReleaseEvent 199 142 0 116 1 t 0 KeyPressEvent 199 142 0 13 1 Return 0 CharEvent 199 142 0 13 1 Return 0 KeyReleaseEvent 199 142 0 13 1 Return 0 + +TimerEvent 351 169 0 0 0 0 0 diff --git a/testing/recordings/TestInteractionConsoleReload.log b/testing/recordings/TestInteractionConsoleReload.log new file mode 100644 index 0000000000..437caa4a2f --- /dev/null +++ b/testing/recordings/TestInteractionConsoleReload.log @@ -0,0 +1,118 @@ +# StreamVersion 1.2 +ConfigureEvent 1249 1374 0 0 0 0 0 +ExposeEvent 0 1406 0 0 0 0 0 +RenderEvent 0 1406 0 0 0 0 0 + +KeyPressEvent -740 995 0 27 1 Escape 0 +CharEvent -740 995 0 27 1 Escape 0 +KeyReleaseEvent -740 995 0 27 1 Escape 0 + +KeyPressEvent -740 995 0 114 1 r 0 +CharEvent -740 995 0 114 1 r 0 +KeyReleaseEvent -740 995 0 114 1 r 0 + +KeyPressEvent -740 995 0 101 1 e 0 +CharEvent -740 995 0 101 1 e 0 +KeyReleaseEvent -740 995 0 101 1 e 0 + +KeyPressEvent -740 995 0 108 1 l 0 +CharEvent -740 995 0 108 1 l 0 +KeyReleaseEvent -740 995 0 108 1 l 0 + +KeyPressEvent -740 995 0 111 1 o 0 +CharEvent -740 995 0 111 1 o 0 +KeyReleaseEvent -740 995 0 111 1 o 0 + +KeyPressEvent -740 995 0 97 1 a 0 +CharEvent -740 995 0 97 1 a 0 +KeyReleaseEvent -740 995 0 97 1 a 0 + +KeyPressEvent -740 995 0 100 1 d 0 +CharEvent -740 995 0 100 1 d 0 +KeyReleaseEvent -740 995 0 100 1 d 0 + +KeyPressEvent -740 995 1 95 1 underscore 0 +CharEvent -740 995 1 95 1 underscore 0 +KeyReleaseEvent -740 995 1 95 1 underscore 0 + +KeyPressEvent -740 995 0 99 1 c 0 +CharEvent -740 995 0 99 1 c 0 +KeyReleaseEvent -740 995 0 99 1 c 0 + +KeyPressEvent -740 995 0 117 1 u 0 +CharEvent -740 995 0 117 1 u 0 +KeyReleaseEvent -740 995 0 117 1 u 0 + +KeyPressEvent -740 995 0 114 1 r 0 +CharEvent -740 995 0 114 1 r 0 +KeyReleaseEvent -740 995 0 114 1 r 0 + +KeyPressEvent -740 995 0 114 1 r 0 +CharEvent -740 995 0 114 1 r 0 +KeyReleaseEvent -740 995 0 114 1 r 0 + +KeyPressEvent -740 995 0 101 1 e 0 +CharEvent -740 995 0 101 1 e 0 +KeyReleaseEvent -740 995 0 101 1 e 0 + +KeyPressEvent -740 995 0 110 1 n 0 +CharEvent -740 995 0 110 1 n 0 +KeyReleaseEvent -740 995 0 110 1 n 0 + +KeyPressEvent -740 995 0 116 1 t 0 +CharEvent -740 995 0 116 1 t 0 +KeyReleaseEvent -740 995 0 116 1 t 0 + +KeyPressEvent -740 995 1 95 1 underscore 0 +CharEvent -740 995 1 95 1 underscore 0 +KeyReleaseEvent -740 995 1 95 1 underscore 0 + +KeyPressEvent -740 995 0 102 1 f 0 +CharEvent -740 995 0 102 1 f 0 +KeyReleaseEvent -740 995 0 102 1 f 0 + +KeyPressEvent -740 995 0 105 1 i 0 +CharEvent -740 995 0 105 1 i 0 +KeyReleaseEvent -740 995 0 105 1 i 0 + +KeyPressEvent -740 995 0 108 1 l 0 +CharEvent -740 995 0 108 1 l 0 +KeyReleaseEvent -740 995 0 108 1 l 0 + +KeyPressEvent -740 995 0 101 1 e 0 +CharEvent -740 995 0 101 1 e 0 +KeyReleaseEvent -740 995 0 101 1 e 0 + +KeyPressEvent -740 995 1 95 1 underscore 0 +CharEvent -740 995 1 95 1 underscore 0 +KeyReleaseEvent -740 995 1 95 1 underscore 0 + +KeyPressEvent -740 995 0 103 1 g 0 +CharEvent -740 995 0 103 1 g 0 +KeyReleaseEvent -740 995 0 103 1 g 0 + +KeyPressEvent -740 995 0 114 1 r 0 +CharEvent -740 995 0 114 1 r 0 +KeyReleaseEvent -740 995 0 114 1 r 0 + +KeyPressEvent -740 995 0 111 1 o 0 +CharEvent -740 995 0 111 1 o 0 +KeyReleaseEvent -740 995 0 111 1 o 0 + +KeyPressEvent -740 995 0 117 1 u 0 +CharEvent -740 995 0 117 1 u 0 +KeyReleaseEvent -740 995 0 117 1 u 0 + +KeyPressEvent -740 995 0 112 1 p 0 +CharEvent -740 995 0 112 1 p 0 +KeyReleaseEvent -740 995 0 112 1 p 0 + +KeyPressEvent -740 995 0 13 1 Return 0 +CharEvent -740 995 0 13 1 Return 0 +KeyReleaseEvent -740 995 0 13 1 Return 0 + +KeyPressEvent -740 995 0 27 1 Escape 0 +CharEvent -740 995 0 27 1 Escape 0 +KeyReleaseEvent -740 995 0 27 1 Escape 0 + +TimerEvent 212 76 0 27 1 Escape 0 diff --git a/testing/recordings/TestInteractionConsoleReload2.log b/testing/recordings/TestInteractionConsoleReload2.log new file mode 100644 index 0000000000..437caa4a2f --- /dev/null +++ b/testing/recordings/TestInteractionConsoleReload2.log @@ -0,0 +1,118 @@ +# StreamVersion 1.2 +ConfigureEvent 1249 1374 0 0 0 0 0 +ExposeEvent 0 1406 0 0 0 0 0 +RenderEvent 0 1406 0 0 0 0 0 + +KeyPressEvent -740 995 0 27 1 Escape 0 +CharEvent -740 995 0 27 1 Escape 0 +KeyReleaseEvent -740 995 0 27 1 Escape 0 + +KeyPressEvent -740 995 0 114 1 r 0 +CharEvent -740 995 0 114 1 r 0 +KeyReleaseEvent -740 995 0 114 1 r 0 + +KeyPressEvent -740 995 0 101 1 e 0 +CharEvent -740 995 0 101 1 e 0 +KeyReleaseEvent -740 995 0 101 1 e 0 + +KeyPressEvent -740 995 0 108 1 l 0 +CharEvent -740 995 0 108 1 l 0 +KeyReleaseEvent -740 995 0 108 1 l 0 + +KeyPressEvent -740 995 0 111 1 o 0 +CharEvent -740 995 0 111 1 o 0 +KeyReleaseEvent -740 995 0 111 1 o 0 + +KeyPressEvent -740 995 0 97 1 a 0 +CharEvent -740 995 0 97 1 a 0 +KeyReleaseEvent -740 995 0 97 1 a 0 + +KeyPressEvent -740 995 0 100 1 d 0 +CharEvent -740 995 0 100 1 d 0 +KeyReleaseEvent -740 995 0 100 1 d 0 + +KeyPressEvent -740 995 1 95 1 underscore 0 +CharEvent -740 995 1 95 1 underscore 0 +KeyReleaseEvent -740 995 1 95 1 underscore 0 + +KeyPressEvent -740 995 0 99 1 c 0 +CharEvent -740 995 0 99 1 c 0 +KeyReleaseEvent -740 995 0 99 1 c 0 + +KeyPressEvent -740 995 0 117 1 u 0 +CharEvent -740 995 0 117 1 u 0 +KeyReleaseEvent -740 995 0 117 1 u 0 + +KeyPressEvent -740 995 0 114 1 r 0 +CharEvent -740 995 0 114 1 r 0 +KeyReleaseEvent -740 995 0 114 1 r 0 + +KeyPressEvent -740 995 0 114 1 r 0 +CharEvent -740 995 0 114 1 r 0 +KeyReleaseEvent -740 995 0 114 1 r 0 + +KeyPressEvent -740 995 0 101 1 e 0 +CharEvent -740 995 0 101 1 e 0 +KeyReleaseEvent -740 995 0 101 1 e 0 + +KeyPressEvent -740 995 0 110 1 n 0 +CharEvent -740 995 0 110 1 n 0 +KeyReleaseEvent -740 995 0 110 1 n 0 + +KeyPressEvent -740 995 0 116 1 t 0 +CharEvent -740 995 0 116 1 t 0 +KeyReleaseEvent -740 995 0 116 1 t 0 + +KeyPressEvent -740 995 1 95 1 underscore 0 +CharEvent -740 995 1 95 1 underscore 0 +KeyReleaseEvent -740 995 1 95 1 underscore 0 + +KeyPressEvent -740 995 0 102 1 f 0 +CharEvent -740 995 0 102 1 f 0 +KeyReleaseEvent -740 995 0 102 1 f 0 + +KeyPressEvent -740 995 0 105 1 i 0 +CharEvent -740 995 0 105 1 i 0 +KeyReleaseEvent -740 995 0 105 1 i 0 + +KeyPressEvent -740 995 0 108 1 l 0 +CharEvent -740 995 0 108 1 l 0 +KeyReleaseEvent -740 995 0 108 1 l 0 + +KeyPressEvent -740 995 0 101 1 e 0 +CharEvent -740 995 0 101 1 e 0 +KeyReleaseEvent -740 995 0 101 1 e 0 + +KeyPressEvent -740 995 1 95 1 underscore 0 +CharEvent -740 995 1 95 1 underscore 0 +KeyReleaseEvent -740 995 1 95 1 underscore 0 + +KeyPressEvent -740 995 0 103 1 g 0 +CharEvent -740 995 0 103 1 g 0 +KeyReleaseEvent -740 995 0 103 1 g 0 + +KeyPressEvent -740 995 0 114 1 r 0 +CharEvent -740 995 0 114 1 r 0 +KeyReleaseEvent -740 995 0 114 1 r 0 + +KeyPressEvent -740 995 0 111 1 o 0 +CharEvent -740 995 0 111 1 o 0 +KeyReleaseEvent -740 995 0 111 1 o 0 + +KeyPressEvent -740 995 0 117 1 u 0 +CharEvent -740 995 0 117 1 u 0 +KeyReleaseEvent -740 995 0 117 1 u 0 + +KeyPressEvent -740 995 0 112 1 p 0 +CharEvent -740 995 0 112 1 p 0 +KeyReleaseEvent -740 995 0 112 1 p 0 + +KeyPressEvent -740 995 0 13 1 Return 0 +CharEvent -740 995 0 13 1 Return 0 +KeyReleaseEvent -740 995 0 13 1 Return 0 + +KeyPressEvent -740 995 0 27 1 Escape 0 +CharEvent -740 995 0 27 1 Escape 0 +KeyReleaseEvent -740 995 0 27 1 Escape 0 + +TimerEvent 212 76 0 27 1 Escape 0 diff --git a/testing/recordings/TestInteractionConsoleRender.log b/testing/recordings/TestInteractionConsoleRender.log new file mode 100644 index 0000000000..d7bae08968 --- /dev/null +++ b/testing/recordings/TestInteractionConsoleRender.log @@ -0,0 +1,110 @@ +# StreamVersion 1.2 +ConfigureEvent 1249 1374 0 0 0 0 0 +ExposeEvent 0 1406 0 0 0 0 0 +RenderEvent 0 1406 0 0 0 0 0 + +KeyPressEvent -300 299 0 27 1 Escape 0 +CharEvent -300 299 0 27 1 Escape 0 +KeyReleaseEvent -300 299 0 27 1 Escape 0 + +KeyPressEvent -300 299 0 116 1 t 0 +CharEvent -300 299 0 116 1 t 0 +KeyReleaseEvent -300 299 0 116 1 t 0 + +KeyPressEvent -300 299 0 111 1 o 0 +CharEvent -300 299 0 111 1 o 0 +KeyReleaseEvent -300 299 0 111 1 o 0 + +KeyPressEvent -300 299 0 103 1 g 0 +CharEvent -300 299 0 103 1 g 0 +KeyReleaseEvent -300 299 0 103 1 g 0 + +KeyPressEvent -300 299 0 103 1 g 0 +CharEvent -300 299 0 103 1 g 0 +KeyReleaseEvent -300 299 0 103 1 g 0 + +KeyPressEvent -300 299 0 108 1 l 0 +CharEvent -300 299 0 108 1 l 0 +KeyReleaseEvent -300 299 0 108 1 l 0 + +KeyPressEvent -300 299 0 101 1 e 0 +CharEvent -300 299 0 101 1 e 0 +KeyReleaseEvent -300 299 0 101 1 e 0 + +KeyPressEvent -300 299 1 95 1 underscore 0 +CharEvent -300 299 1 95 1 underscore 0 +KeyReleaseEvent -300 299 1 95 1 underscore 0 + +KeyPressEvent -300 299 0 118 1 v 0 +CharEvent -300 299 0 118 1 v 0 +KeyReleaseEvent -300 299 0 118 1 v 0 + +KeyPressEvent -300 299 0 111 1 o 0 +CharEvent -300 299 0 111 1 o 0 +KeyReleaseEvent -300 299 0 111 1 o 0 + +KeyPressEvent -300 299 0 108 1 l 0 +CharEvent -300 299 0 108 1 l 0 +KeyReleaseEvent -300 299 0 108 1 l 0 + +KeyPressEvent -300 299 0 117 1 u 0 +CharEvent -300 299 0 117 1 u 0 +KeyReleaseEvent -300 299 0 117 1 u 0 + +KeyPressEvent -300 299 0 109 1 m 0 +CharEvent -300 299 0 109 1 m 0 +KeyReleaseEvent -300 299 0 109 1 m 0 + +KeyPressEvent -300 299 0 101 1 e 0 +CharEvent -300 299 0 101 1 e 0 +KeyReleaseEvent -300 299 0 101 1 e 0 + +KeyPressEvent -300 299 1 95 1 underscore 0 +CharEvent -300 299 1 95 1 underscore 0 +KeyReleaseEvent -300 299 1 95 1 underscore 0 + +KeyPressEvent -300 299 0 114 1 r 0 +CharEvent -300 299 0 114 1 r 0 +KeyReleaseEvent -300 299 0 114 1 r 0 + +KeyPressEvent -300 299 0 101 1 e 0 +CharEvent -300 299 0 101 1 e 0 +KeyReleaseEvent -300 299 0 101 1 e 0 + +KeyPressEvent -300 299 0 110 1 n 0 +CharEvent -300 299 0 110 1 n 0 +KeyReleaseEvent -300 299 0 110 1 n 0 + +KeyPressEvent -300 299 0 100 1 d 0 +CharEvent -300 299 0 100 1 d 0 +KeyReleaseEvent -300 299 0 100 1 d 0 + +KeyPressEvent -300 299 0 101 1 e 0 +CharEvent -300 299 0 101 1 e 0 +KeyReleaseEvent -300 299 0 101 1 e 0 + +KeyPressEvent -300 299 0 114 1 r 0 +CharEvent -300 299 0 114 1 r 0 +KeyReleaseEvent -300 299 0 114 1 r 0 + +KeyPressEvent -300 299 0 105 1 i 0 +CharEvent -300 299 0 105 1 i 0 +KeyReleaseEvent -300 299 0 105 1 i 0 + +KeyPressEvent -300 299 0 110 1 n 0 +CharEvent -300 299 0 110 1 n 0 +KeyReleaseEvent -300 299 0 110 1 n 0 + +KeyPressEvent -300 299 0 103 1 g 0 +CharEvent -300 299 0 103 1 g 0 +KeyReleaseEvent -300 299 0 103 1 g 0 + +KeyPressEvent -300 299 0 13 1 Return 0 +CharEvent -300 299 0 13 1 Return 0 +KeyReleaseEvent -300 299 0 13 1 Return 0 + +KeyPressEvent -300 299 0 27 1 Escape 0 +CharEvent -300 299 0 27 1 Escape 0 +KeyReleaseEvent -300 299 0 27 1 Escape 0 + +TimerEvent 212 76 0 27 1 Escape 0 diff --git a/testing/recordings/TestInteractionConsoleTypingSceneInfo.log b/testing/recordings/TestInteractionConsoleTypingSceneInfo.log index ffd7acdf6d..fa426d5bf3 100644 --- a/testing/recordings/TestInteractionConsoleTypingSceneInfo.log +++ b/testing/recordings/TestInteractionConsoleTypingSceneInfo.log @@ -98,3 +98,5 @@ KeyReleaseEvent 0 0 0 111 1 o 0 KeyPressEvent 0 0 0 13 1 Return 0 CharEvent 0 0 0 13 1 Return 0 KeyReleaseEvent 0 0 0 13 1 Return 0 + +TimerEvent 351 169 0 0 0 0 0