Commit Graph

3856 Commits

Author SHA1 Message Date
twinaphex 721b3039e4 (UDev) Buildfix 2020-08-30 04:52:00 +02:00
twinaphex a244a39626 Cleanups 2020-08-30 00:25:21 +02:00
twinaphex 1e223733fc Add joypad_rumble function in Android joypad driver 2020-08-29 23:47:56 +02:00
twinaphex 71fb5ac941 Clear state in joypad_destroy 2020-08-29 23:35:11 +02:00
twinaphex b48b751a3c Rewrite set_rumble function 2020-08-29 23:33:13 +02:00
twinaphex 0d9b2eef4f (Android) Buildfix #2 2020-08-29 22:50:51 +02:00
twinaphex b133ea3296 (XInput) add ifdef 2020-08-29 22:48:28 +02:00
twinaphex cd972e0e4e (Android) Buildfix 2020-08-29 22:47:38 +02:00
twinaphex c5099a312c Reimplement XDK set_rumble function 2020-08-29 22:25:51 +02:00
twinaphex 84a312535e Cleanup set_rumble functions 2020-08-29 22:22:26 +02:00
twinaphex 48bdbe8dec No need to call this 2020-08-29 22:15:44 +02:00
twinaphex 2b393e2425 move input_key_pressed to retroarch.c 2020-08-29 22:09:29 +02:00
twinaphex b3744c3126 Put input_jpyad_init_driver last in 'input' callback function 2020-08-29 20:46:42 +02:00
twinaphex bf06d67a30 Cut down on some extra ifdefs 2020-08-29 19:59:04 +02:00
twinaphex 3ff521ab0b Simplify winraw_callback 2020-08-29 19:43:53 +02:00
twinaphex 8999d6e4a6 (DInput) Set a userdata struct for the window message loop properly -
get rid of input_get_data - we no longer need it
2020-08-29 03:41:33 +02:00
twinaphex 93f9d69742 Cleanups 2020-08-28 20:42:55 +02:00
twinaphex 1c0f79442b Cleanups 2020-08-28 20:40:06 +02:00
twinaphex 7c61a6527f (Wayland) Reorder structs, alignment 2020-08-28 20:38:25 +02:00
twinaphex abb6367150 Remove unused apple_keyboard_find_any_key 2020-08-28 20:05:34 +02:00
twinaphex 88a93b0053 Cleanups 2020-08-28 19:59:31 +02:00
twinaphex ace0e3eb90 Cleanups 2020-08-28 19:58:13 +02:00
twinaphex cdf7516c0c (Cocoa) Optimize button bitmask code - do a bitwise OR on the output
of both apple joypad drivers
2020-08-28 19:06:43 +02:00
twinaphex 708a029665 (HID) Hardcode 'hid' name for passing to input_autoconfig_connect 2020-08-28 19:01:24 +02:00
twinaphex a549805ad8 Fix low-level DS4 pad regression 2020-08-28 18:53:10 +02:00
twinaphex e725b7c013 Revert "(Cocoa) Optimize button bitmask code - do a bitwise OR on"
This reverts commit 00bea7f3b2.
2020-08-28 17:33:15 +02:00
twinaphex 97ebed7c0e Revert "(Cocoa) Buildfix"
This reverts commit 2c07234a5d.
2020-08-28 17:32:57 +02:00
Twinaphex 2c07234a5d (Cocoa) Buildfix 2020-08-28 17:10:31 +02:00
twinaphex 00bea7f3b2 (Cocoa) Optimize button bitmask code - do a bitwise OR on
the output of both apple joypad drivers
2020-08-28 16:48:08 +02:00
twinaphex 15cb55e0bb (DInput) Style nits 2020-08-28 02:27:55 +02:00
Autechre df245d4917
Merge pull request #11239 from jdgleaver/overlay-gamepad-hide
Add option to hide overlays when a gamepad is connected (Note: Restricted functionality on Android)
2020-08-26 20:23:47 +02:00
twinaphex e6b9420a15 (Input) reorder structs, alignment 2020-08-26 15:32:05 +02:00
twinaphex fe5307c4ac Use string_split_noalloc instead of string_split 2020-08-26 12:54:51 +02:00
jdgleaver cc2e098dab Add option to hide overlays when a gamepad is connected (Note: Restricted functionality on Android) 2020-08-25 11:12:37 +01:00
twinaphex 2ca12718f1 (DInput) Optimize array loop iterations 2020-08-19 04:04:44 +02:00
twinaphex a15a033e72 (XInput) Cleanups 2020-08-19 03:40:55 +02:00
twinaphex 5166eebcaf for loop cleanups - use space after 'for' 2020-08-19 03:06:22 +02:00
twinaphex 89b441787a Reorder retro_keybind, alignment 2020-08-15 22:36:56 +02:00
twinaphex 454338c4f3 (BTStack) Buildfix 2020-08-15 17:14:27 +02:00
twinaphex 6e1445c658 Reorder structs, alignment 2020-08-15 02:55:29 +02:00
twinaphex 501165af0b (BTStack) Buildfix attempt two 2020-08-15 02:26:43 +02:00
twinaphex bf85a658ba (BTStack) Attempt build fix 2020-08-14 23:46:31 +02:00
twinaphex acfb7d0a23 Reorder structs, alignment 2020-08-14 23:13:05 +02:00
twinaphex 10b06ce828 More struct reordering/alignment 2020-08-14 21:00:04 +02:00
Autechre 270d5d4111
Merge pull request #11191 from gblues/gblues/wiiu-fix-touchscreen
WIIU: Fix touchscreen mouse emulation
2020-08-14 19:50:59 +02:00
twinaphex 659d50c916 Struct reorderings 2020-08-14 18:31:28 +02:00
twinaphex b6228729b6 More struct alignment 2020-08-14 17:11:18 +02:00
gblues 4555481863 WIIU: Fix touchscreen mouse emulation
== DETAILS
The way the mouse emulation worked was to simply return a 3rd axis from the
gamepad, which the polling code updates with the touch state in real time.

Well, the code that figures out if it's a positive or negative axis was
failing because it didn't see that 3rd axis as valid. So, I added values
which allow it to be seen as valid, and voila! the touch screen input
works again.

== TESTING
Tested locally using "Beneath a Steel Sky" in ScummVM.
2020-08-13 23:31:17 -07:00
twinaphex c250b94dcf Move p_anim state to rarch_state 2020-08-14 06:29:13 +02:00
Twinaphex b1723f7cd0 Remove unused CocoaTouch menu - allows us to get rid of a lot of
dead code
2020-08-09 19:41:04 +02:00
twinaphex c3d8c8661f Buildfixes for C89_BUILD --disable-menu 2020-08-06 03:04:21 +02:00
twinaphex 76ec05314c Remove unused variable 2020-08-05 13:54:36 +02:00
twinaphex 0ef0ceb0e4 Fix C89_BUILD and CXX_BUILD 2020-08-04 14:34:07 +02:00
twinaphex 14647915a1 Add comments 2020-08-04 02:24:06 +02:00
twinaphex 498f31229c Backport
fe284542d0
-
Added reverse look-up table for better keyboard driver efficiency
2020-08-04 02:23:20 +02:00
twinaphex d864fd9ead Cleanups 2020-08-03 17:59:44 +02:00
twinaphex 4676e102d0 (input/drivers_joypad) Add TODO/FIXME notes 2020-08-03 17:31:22 +02:00
jdgleaver 535d73cf37 Ensure correct directory is used when saving autoconfig profiles 2020-08-03 13:10:00 +01:00
twinaphex 08a8de6227 (XInput) Proper joypad disconnect messages now with autoconfig
system
2020-07-31 22:31:38 +02:00
twinaphex 3518b4ef9c Cleanups - stray variables and functions can now be made static 2020-07-31 20:05:04 +02:00
twinaphex 65af2828da Move dinput_joypad_get_vidpid_from_xinput_index to
xinput_hybrid_joypad.c
2020-07-31 19:54:15 +02:00
twinaphex 212fc885ed Cleanups - xinput_hybrid_joypad.c no longer calls into separate
dinput_joypad driver interface
2020-07-31 19:52:03 +02:00
twinaphex 8ab1d7f8ec Cleanups 2020-07-31 19:30:03 +02:00
twinaphex 449f8dff8e Cleanups 2020-07-31 19:25:20 +02:00
twinaphex 5c7ba50ce1 Cleanups 2020-07-31 19:22:07 +02:00
twinaphex b171f35836 Move these globals out of dinput.c and into dinput_joypad_inl.h 2020-07-31 19:08:46 +02:00
twinaphex b5e0f7edfd Split up dinput_joypad.c into dinput_hybrid_joypad.c (both HAVE_DINPUT
and HAVE_XINPUT defined) and dinput_joypad.c (only HAVE_DINPUT defined)
2020-07-31 19:06:22 +02:00
twinaphex 5c5c57de9c Split up xinput_joypad.c into xinput_hybrid_joypad.c (assumes
-DHAVE_DINPUT) and xinput_joypad.c (no Dinput available at all)
2020-07-31 18:57:44 +02:00
twinaphex 95604f55b9 Add inline header files 2020-07-31 18:48:45 +02:00
twinaphex 04e67f1ac9 Make Xbox 360 reuse default xinput_joypad.c driver 2020-07-31 18:32:28 +02:00
twinaphex 771c0fec39 Add xinput_joypad.h header 2020-07-31 18:22:35 +02:00
twinaphex 748886c5e5 (DInput) Cleanups 2020-07-31 18:15:36 +02:00
twinaphex ed3ee2511f Cleanups - add local variable 2020-07-29 05:31:23 +02:00
rsn8887 78c9dbbd20 Fix input port assignments 2020-07-28 16:35:16 -05:00
twinaphex 89567dae5d (input hid) Change back to original code 2020-07-28 12:42:33 +02:00
twinaphex dc14f4150d Cleanup 2020-07-25 00:04:25 +02:00
twinaphex d92280e20e Cleanups 2020-07-25 00:02:26 +02:00
twinaphex b9cb8c8890 (device_null) Cleanups 2020-07-24 23:57:15 +02:00
twinaphex 9d76412715 (WiiU) Another buildfix 2020-07-24 23:55:06 +02:00
twinaphex a49b5b7129 Cleanups 2020-07-24 22:23:52 +02:00
twinaphex 08776496ed Cleanups 2020-07-24 22:12:33 +02:00
Autechre 35183c1fbb
Merge pull request #11073 from barbudreadmon/patch-6
psl1ght_input.c: fix typo
2020-07-24 19:12:10 +02:00
twinaphex 0003074cfe (Input HID) Cleanups/buildfixes 2020-07-24 19:11:20 +02:00
twinaphex 1b24c37919 (WiiU) More build fixes 2020-07-24 19:01:35 +02:00
barbudreadmon 6521eb980b
psl1ght_input.c: fix typo 2020-07-24 17:37:07 +02:00
twinaphex d2c3a6d71e (Wiiu) Buildfix 2020-07-24 04:40:39 +02:00
twinaphex a01380f847 (WiiU) Buildfixes 2020-07-23 18:01:15 +02:00
twinaphex eba83390ba Warning fixes 2020-07-23 07:39:08 +02:00
twinaphex 8777a6eb6a (WiiU) Buildfix 2020-07-23 05:42:51 +02:00
twinaphex 968ec1f4b1 (Android) Silence warning 2020-07-23 03:59:37 +02:00
Autechre 6c7143d02d
Merge pull request #10981 from yoshisuga/yoshisuga/ios-metal
iOS/tvOS Metal Renderer
2020-07-21 20:41:07 +02:00
twinaphex 41b9b8d650 (uwp_input.c) Refactor code 2020-07-20 23:22:07 +02:00
twinaphex caa1145b35 (joypad drivers) xdk_joypad.c - cleanup(joypad drivers) xdk_joypad.c -
cleanup(joypad drivers) xdk_joypad.c - cleanup(joypad drivers)
xdk_joypad.c - cleanup(joypad drivers) xdk_joypad.c - cleanup(joypad
drivers) xdk_joypad.c - cleanup(joypad drivers) xdk_joypad.c -
cleanup(joypad drivers) xdk_joypad.c - cleanup(joypad drivers)
xdk_joypad.c - cleanup
2020-07-20 23:15:19 +02:00
Francisco Javier Trujillo Mata 67e0a49941 Fix ps2_joypad compilation after refactor of the main driver 2020-07-20 22:51:00 +02:00
jdgleaver 8e2901d23a Minor optimisations 2020-07-20 13:24:18 +01:00
jdgleaver 9b1edc5eee Input autoconfig fixes/improvements 2020-07-20 12:34:29 +01:00
twinaphex 994d6aee63 Cleanups 2020-07-20 06:48:02 +02:00
twinaphex 0e9a86816e xinput_joypad_poll - make UWP codepath leading 2020-07-20 03:35:52 +02:00
twinaphex abd3365a34 (XInput Joypad) Cleanups 2020-07-20 03:19:14 +02:00
twinaphex 5f7e8593d0 (DInput Joypad) Cleanups(DInput Joypad) Cleanups(DInput Joypad)
Cleanups(DInput Joypad) Cleanups(DInput Joypad) Cleanups(DInput Joypad)
Cleanups(DInput Joypad) Cleanups(DInput Joypad) Cleanups(DInput Joypad)
Cleanups
2020-07-20 03:04:18 +02:00
twinaphex cd2d4f2248 Revert "Remove input_x11_common.c and merge into x11_input.c"
This reverts commit a0948c1d9d.
2020-07-20 01:46:03 +02:00
twinaphex a0948c1d9d Remove input_x11_common.c and merge into x11_input.c 2020-07-20 01:39:55 +02:00
twinaphex b4be9b7e03 (input/connect) Cleanup axis functions 2020-07-20 01:36:13 +02:00
twinaphex 2efb1600a8 (BTStack) Cleanup 2020-07-20 01:32:45 +02:00
twinaphex 005a9c005e (IOHIDManager) Cleanup 2020-07-20 01:30:42 +02:00
twinaphex 6cba44328d (PSP) Buildfix 2020-07-20 00:58:57 +02:00
twinaphex 174675ee71 (Wii) Buildfix 2020-07-20 00:57:16 +02:00
twinaphex 74e5d366c8 (WiiU) Buildfix 2020-07-20 00:53:21 +02:00
twinaphex 897a9de5be (drivers_joypad) Cleanup axis functions 2020-07-19 18:51:05 +02:00
Yoshi Sugawara fd9ac64d55 Merge branch 'master' into yoshisuga/ios-metal 2020-07-19 00:33:54 -10:00
twinaphex f1fed5397a (Winraw) code de-duplication 2020-07-19 05:17:11 +02:00
twinaphex 2509a75477 (Udev) Code de-duplication 2020-07-19 05:07:50 +02:00
twinaphex 6e2c519513 (X11) Buildfix 2020-07-19 04:51:22 +02:00
twinaphex abc19cbe02 (X11) Cleanups 2020-07-19 04:48:14 +02:00
twinaphex 0207e29ee9 (Android) Cleanups 2020-07-19 04:13:23 +02:00
twinaphex 24f310a26d Small cleanup 2020-07-19 03:48:26 +02:00
twinaphex 18dcda09d0 (IOHIDManager) Another buildfix 2020-07-19 03:39:32 +02:00
twinaphex b8f9e38b7e (IOHIDManager) Buildfix 2020-07-19 03:38:07 +02:00
twinaphex de73e3bff9 Buildfixes 2020-07-19 03:25:30 +02:00
twinaphex b1a6b35379 Buildfix 2020-07-19 03:23:07 +02:00
twinaphex 285b0ec0bb Buildfix 2020-07-19 03:20:41 +02:00
twinaphex d97e590aaf Reimplement multi button state functions 2020-07-19 03:18:12 +02:00
twinaphex 6540038c6b Updated PSL1GHT joypad driver's 'button' function 2020-07-18 23:10:55 +02:00
twinaphex ad2279bb29 Cleanups 2020-07-18 23:06:12 +02:00
twinaphex cb5b22b6ac (Android) Refactor axis functions 2020-07-18 22:38:23 +02:00
Autechre f8d6cea02a
Update udev_joypad.c 2020-07-18 21:56:27 +02:00
twinaphex 08ad00f5d3 Start preparing for being able to grab multiple buttons at the same time 2020-07-18 19:51:14 +02:00
twinaphex 8b078662cd Change function signature of joypad driver's 'button' 2020-07-18 18:07:57 +02:00
twinaphex e8e9a7b1d3 Get rid of multiple definition of wayland show mouse function 2020-07-17 13:59:13 +02:00
jdgleaver 84a71ea133 Rewrite 'task_autodetect.c': Ensure thread safety + clean-ups/rationalisation 2020-07-14 17:46:58 +01:00
twinaphex 748e3dccf2 (wayland) buildfixes 2020-07-14 16:20:15 +02:00
twinaphex b7c2cbc6b2 Move flush_wayland_fd to input/common/wayland_common.c 2020-07-14 16:17:43 +02:00
twinaphex 3d4a13e5b7 (Wayland) Add missing header 2020-07-14 16:10:01 +02:00
twinaphex 3cb1b7b4bb (Wayland) Move more code 2020-07-14 16:09:13 +02:00
twinaphex 646d627a6c Move more Wayland code 2020-07-14 16:04:10 +02:00
twinaphex 1f4a27abba Split up wayland code 2020-07-14 15:56:52 +02:00
twinaphex 88f742894d Move wayland header to input/common 2020-07-14 14:32:37 +02:00
Dylan Scott b4ac13cc5a
(Emscripten) Fix input code to ignore unknown keys 2020-07-14 03:33:55 -04:00
twinaphex 3297e464c4 (Input) Optimize input bitmask codepath 2020-07-14 01:39:07 +02:00
twinaphex 0a1942f528 Turn fifo_read_avail and fifo_write_avail into macros 2020-07-07 08:13:32 +02:00
twinaphex 6e59d52184 Cleanups/comments 2020-07-07 05:58:07 +02:00
twinaphex 5790f13798 Add comments 2020-07-07 03:49:54 +02:00
twinaphex 79cc4f9c4f Revert "Start going through wrapper functions for access to input_device_names"
This reverts commit 92293525c1.
2020-07-05 16:41:55 +02:00
twinaphex 92293525c1 Start going through wrapper functions for access to input_device_names 2020-07-05 10:33:21 +02:00
Autechre 043a60633f
Merge pull request #10951 from fjtrujy/salamanderPS2
WIP: PS2 Salamander and multi-core
2020-07-01 21:18:53 +02:00
Francisco Javier Trujillo Mata 9d2a1b5ac4 Improve dist scripts
Improve cores folder
Improve WaitTillDeviceIsReady
Now every single driver, init and deinit the IRX binaries
Improve platform PS2
Make salamander to open proper elf
2020-07-01 17:07:53 +02:00
twinaphex 14e20cea51 Cleanups 2020-07-01 15:29:25 +02:00
twinaphex a16ebe401c (UWP) Remove unused local variable 2020-06-29 13:58:13 +02:00
twinaphex d8824af4ac pass p_rarch around more 2020-06-29 07:06:07 +02:00
twinaphex dfeef4e772 (XInput) Do away with memsets 2020-06-29 02:44:35 +02:00
twinaphex aa4f84b037 (Dinput) get rid of memsets 2020-06-29 02:37:06 +02:00
Autechre ecc41fc59c
Merge pull request #10924 from benklop/master
Non-X11 lightgun support
2020-06-27 16:20:08 +02:00
Ben Klopfenstein 17465462b8 X11 lightgun support 2020-06-26 19:47:43 -06:00
twinaphex 1ae20ea17c Style nits - turn macro names into upper-case - some while style nits 2020-06-26 20:00:19 +02:00
twinaphex 601a73fa8b Use string_starts_with_size where possible - avoids the strlen 2020-06-25 12:51:04 +02:00
twinaphex a2b83636d7 (Android) Some slight optimizations 2020-06-24 13:27:32 +02:00
twinaphex 634f18ad43 Turn more functions static 2020-06-24 10:14:03 +02:00
twinaphex 2c185fe7e2 Move input remapping code to configuration.c 2020-06-23 22:18:33 +02:00
twinaphex 1348902146 (GX Input) Cleanups 2020-06-23 19:10:27 +02:00
twinaphex 689ac432d6 MOve input_joypad_analog call to inside retroarch.c instead of the
input driver itself, and make function static
2020-06-23 18:31:40 +02:00
twinaphex c9f634e85d Cleanups 2020-06-23 17:51:45 +02:00
twinaphex 10abdc5a0e Implement get_joypad_driver stub for Xenon 360 2020-06-23 17:35:39 +02:00
twinaphex 0503467f2c Turn functions static 2020-06-23 17:32:27 +02:00
twinaphex 35c55c4b50 Potential fix for #10884 2020-06-22 20:34:40 +02:00
twinaphex 4f78264541 Cleanups 2020-06-13 17:46:39 +02:00
twinaphex cc43f3a355 (SDL2 Input) Add RARCH_DEVICE_MOUSE_SCREEN 2020-06-13 17:32:18 +02:00
twinaphex 367cf5985d (winraw_input) Fix mouse input processing 2020-06-13 17:27:12 +02:00
twinaphex bba60163f7 (Dinput) Fix RARCH_DEVICE_MOUSE_SCREEN 2020-06-13 17:22:34 +02:00
twinaphex 01bd76405f Buildfixes 2020-06-13 08:37:26 +02:00
twinaphex c7cd327b5b Rearrange input state input drivers for ANALOG - do joypad
processing first, then keyboard second
2020-06-13 05:25:10 +02:00
twinaphex dd79629015 (QNX) Get rid of qnx_is_pressed 2020-06-13 02:13:32 +02:00
twinaphex 5b81b6887b (X11) Buildfix #3 2020-06-13 02:07:43 +02:00
twinaphex 9d65f7e633 (X11) Buildfix #2 2020-06-13 02:06:24 +02:00
twinaphex 60ca3d0ad7 (X11) Buildfix 2020-06-13 02:05:16 +02:00
twinaphex 9ede38df93 (X11) Cleanups 2020-06-13 02:03:48 +02:00
twinaphex 52ff31f877 Get rid of udev_is_pressed 2020-06-13 01:54:22 +02:00
twinaphex 6cc9a3f9b4 (UWP) Buildfix + uwp_input cleanups 2020-06-13 01:01:30 +02:00
twinaphex d03a0a7b51 (WiiU) Buildfix 2020-06-12 19:33:13 +02:00
twinaphex d998f86f1f Cleanups 2020-06-12 18:41:09 +02:00
twinaphex 4a91b11806 Further input driver standardization 2020-06-12 18:28:07 +02:00
jdgleaver 2c956fbe85 (X11/udev) When fetching RETRO_DEVICE_ID_JOYPAD_MASK, only query keyboard if corresponding gamepad button is not pressed 2020-06-12 16:06:32 +01:00
jdgleaver 321ede2256 (X11/udev) Input fixes 2020-06-12 14:12:22 +01:00
twinaphex 6092de544c (Wiiu) Buildfix 2020-06-12 07:13:55 +02:00
twinaphex 0e907f01ca (winraw_input) Cleanups - use button_is_pressed 2020-06-12 06:37:36 +02:00
twinaphex c1d63ca7c1 Revert "Grab pointer to video_driver_window_get_ptr once during init"
This reverts commit 784904071a.
2020-06-12 06:36:27 +02:00
twinaphex 451a06076d Revert "(dinput_joypad) Grab window pointer once"
This reverts commit d85eb927c1.
2020-06-12 06:36:19 +02:00
twinaphex 5a064ef4ca (dinput) Cleanups - use button_is_pressed 2020-06-12 06:26:03 +02:00
twinaphex d85eb927c1 (dinput_joypad) Grab window pointer once 2020-06-12 06:12:25 +02:00
twinaphex 784904071a Grab pointer to video_driver_window_get_ptr once during init
function, then use that throughout this driver's functions
2020-06-12 06:07:20 +02:00
twinaphex eb78b608d3 Cut down on code duplication 2020-06-12 00:50:08 +02:00
twinaphex 0b95a8838a (OSX) Cleanups 2020-06-12 00:30:24 +02:00
twinaphex ecfdc867f8 Cleanups 2020-06-12 00:16:31 +02:00
twinaphex e40d381f6b (WiiU) Cleanups 2020-06-11 22:05:30 +02:00
twinaphex 255794d903 (Udev) buildfix 2020-06-11 21:40:37 +02:00
twinaphex d1d8386343 (udev) Cleanups 2020-06-11 21:38:58 +02:00
twinaphex a7ab21ac15 (Emscripten) Buildfix 2020-06-11 21:21:20 +02:00
twinaphex 88a93dc648 (OSX) Buildfix 2020-06-11 21:00:28 +02:00
twinaphex 8cc220a4d2 (CTR) Buildfix 2020-06-11 20:59:35 +02:00
twinaphex 11520f9704 (X11) Buildfix 2020-06-11 20:23:44 +02:00
twinaphex dee0c5dbca CTR buildfix + cleanups 2020-06-11 19:33:27 +02:00