Support both mouse and touch input in GUIs in a single binary #14146

grorp · 2023-12-22T13:27:57Z

Currently, touch input in GUIs is only supported if Minetest was built with ENABLE_TOUCH=TRUE. Also, ENABLE_TOUCH partially breaks mouse input (e.g. in inventory lists).

With this PR, support for both mouse and touch input in GUIs is included in all binaries. This is good because there are devices that support both mouse and touch input (e.g. Android devices with bluetooth mice or "convertible" laptops). The only input-method-dependent feature in Minetest's GUIs are tooltips. Since the input method is no longer hardcoded at build time, tooltips now behave according to the last used input method instead.

This PR is only about GUI input, not about the touchscreen controls. It should make #14075 marginally simpler because #14075 will no longer have to care about GUI input.

/cc @okias

To do

This PR is a Ready for Review.

How to test

Ideally, use a device that supports both mouse and touch input.

What won't work for testing:

Android devices
Irrlicht doesn't support mouse input on Android properly, it treats all mouse input as touch input.
USE_SDL2=TRUE
Irrlicht+SDL2 doesn't support touch input properly yet, it converts all touch input to mouse input. See SDL: Implement touchscreen support minetest/irrlicht#262.

Build Minetest with ENABLE_TOUCH=FALSE. Verify that you can use both mouse and touch input in GUIs, but the in-game controls are the desktop controls.

Build Minetest with ENABLE_TOUCH=TRUE. Verify that you can use both mouse and touch input in GUIs, but the in-game controls are the touchscreen controls.

…there

src/gui/guiFormSpecMenu.cpp

sfan5

code review only

src/gui/guiFormSpecMenu.cpp

src/gui/modalMenu.cpp

okias · 2023-12-22T15:47:35Z

Thank you, I'll test it over the holidays and rebase.

okias · 2023-12-23T13:56:06Z

So far, rebase my MR a top of it. Seems to work on my laptop (w/o touchscreen). For phone I need to start basing on master branch, since the patch won't apply cleanly on 5.8

okias · 2023-12-23T16:10:42Z

Tested on phone (master + this + mine rebased patch), so far works.

SmallJoker

Tested on Linux, mouse input. Does not break anything, thus looks good.

src/gui/modalMenu.h

src/gui/guiHyperText.cpp

Co-authored-by: SmallJoker <[email protected]>

Zughy · 2023-12-27T13:11:27Z

@SmallJoker was that an approval?

SmallJoker

Thank you for the changes. LGTM.

SmallJoker · 2023-12-27T15:28:25Z

@Zughy My approvals only come with a [ 👍 comment OR approval via GitHub feature] AND the approval label.

okias

Otherwise LGTM :)

~~Question: Btw. within the minetest, you usually don't squash/fixup within the MR if the changes adjusting the same MR code?~~ Nevermind, I see it get squashed at merge time.

okias · 2023-12-27T18:18:47Z

src/gui/modalMenu.h

@@ -102,11 +116,11 @@ class GUIModalMenu : public gui::IGUIElement
 	// wants to launch other menus
 	bool m_allow_focus_removal = false;

-#ifdef HAVE_TOUCHSCREENGUI
-	irr_ptr<gui::IGUIElement> m_hovered;
+	// Stuff related to touchscreen input


I think newlines around this TS part should be adjusted.

I intentionally added a blank line after the comment to make it clear that the comment refers not only to m_touch_hovered directly below, but also to simulateMouseEvent, enter and leave.

Add ZMQ Worlds shittiest minetest interface CI MacOS install zmq Handshakes, plus send Screenshots back cleanup Extract all command names Move remote handler into own file hook mouse . non-working protobuf commit switch to capnproto Send image with capnp Send reward Multi keypress in the client support all possible keys Add environment.yml Commit unmodified eluther gym env Fail to close the inventory Minetester define action and obs space Gymnasium basic work gym env check bounds switch dummy client to pygame More work on gym client more progress First working gym client Rm old client Combine isRemote() and isRandom() Make client port configurable fix camera mode and sneak . fix remote cli flag vscode Add basic reward mod Parse reward from HUD in C++ . Cmake changes to get Linux building README: add linux packages for capnp minor linux changes save png HACK . Linux CI deps tri again tri again gitmodules submodules submodules . First draft env start xvfb more headless fix screenshot startup issue add handshaker for debugging create a new world when starting a game Now `minetest --gameid <foo> --go` should work. Previously it would fail because a world was not specified, and the default one did not exist. Change-Id: Ic6001f73713d59930e96c3f2a30395f5b0b8cbb9 Improve Irrlicht instructions (#14055) Specify the version when cloning. Move instructions from CMakeLists to docs/compiling/. Check if liquid can flow into empty node before picking it as source (#14057) Fix unittest failure for release versions (#14067) GUIFormspecMenu: Fix race condition between quit event and cleanup in Game (#14010) To not instantly free GUIFormSpec upon close/quit, Game periodically cleans up the remaining instance on the next frame. When a new formspec is received and processed after closing the previous formspec but before the cleanup in Game, the formspec would be closed regardless. This now re-creates the formspec when the old one is already pending for removal. Add sound volume when unfocused setting (#14083) This adds a new setting to set sound volume multiplier when Minetest window is unfocused/inactive (sound_volume_unfocused, located in Settings > Graphics and Audio > Audio > Volume when unfocused). If the window is not focused, the sound volume will be multiplied by sound_volume_unfocused setting. The sound volume will be set back to sound_volume again when the window is focused. Avoid movement jitter (#13093) This allows the client and server to agree on the position of objects and attached players even when there is lag. Try to fix safeWriteToFile producing empty files on Windows (#14085) Use win32 APIs to write the temporary file before copying to the final destination. Because we've observed the final file being empty, we suspect that std::ostream::flush is not flushing. Also add a test for it. Remove use_texture_alpha compatibility code for nodeboxes & meshes (#13929) Warning: inform about entity name when bug detected about attachement (#13354) Clean up porting.h a bit Improve clock_gettime usage - correctly use value of _POSIX_MONOTONIC_CLOCK - drop special path for macOS: it supports clock_gettime since macOS 10.12 Reduce test framework macrosity Delete clang-format files and comments (#14079) Fix Windows architecture reporting in sysinfo Upload artifacts in MinGW CI Get rid of VERSION_EXTRA for buildbot This is probably a leftover of when CMake didn't automatically detect the revision from git. Hash-check buildbot dependencies Inventory: prevent item loss when stacking oversized ItemStacks (#14072) Remove usage of removed "PP" macro This fixes a compilation error introduced by e7be135. Allow running individual benchmarks mirrors and reuses the option from 2f6a9d1 Try to benchmark common MapBlock usage Allocate data seperately from MapBlock class again This effectively reverts commit b3503e7. Change MapBlock content cache to a vector Get rid of parent pointer in MapBlock Elide MapBlock::contents_cached Reduce size of some MapBlock members Also adds assertions to catch refcounting errors (on a debug build). Reorder members of MapBlock for performance Before and after as obtained via `pahole -C MapBlock bin/minetest`: /* size: 336, cachelines: 6, members: 23 */ /* sum members: 329, holes: 4, sum holes: 7 */ vs. /* size: 336, cachelines: 6, members: 23 */ /* sum members: 329, holes: 2, sum holes: 7 */ There is not much to be gained by packing but I made sure to move the most important data (mainly for the client) into the first cache line. Update porting.h to fix build errors on macOS 14 / Xcode 15 Allow cheaper culling checks at a distance (#14073) * Allow cheaper culling checks at a distance * Pick a random ray, so that far missing block will eventually be shown Extract Game::drawScene from Game::updateFrame Add `touch_controls` boolean to `get_player_window_information()` (#14092) MinGW toolchain refresh Add dithering (#9014) Android: Pause rendering while the app is paused (#14058) Hand roll UTF-16 conversion in CGUITTFont (#14121) Extend bone override capabilities (#12388) Fix touch input on Linux The code relied on touch IDs being consecutive. This is true on Android, but not on Linux. Therefore, touch input on Linux was broken since 53886dc. Enable segment heap on Windows Fix TouchScreenGUI ignoring server-sent pitch changes Manually configurable minimum protocol version (#14054) Partially address #13483. Server operators can set a minimum protocol version to match the game requirements (or any other restriction they may want), and it's applied as an additional constraint on top of the baseline compatibility range, optional strict_protocol_version_checking, and any kick-on-join used by the game/mods. Fix on_(grant|revoke) not being run by mods Split windows from linux CI workflows Fix set_bone_position regression (error on passing none) Initial implementation of 'Godrays' Make volumetric light effect strength server controllable - Make volumetric light effect strength server controllable - Separate volumetric and bloom shader pipeline - Require bloom to be enable, scale godrays with bloom Touchscreen: Make server-sent overrides of button textures work (#14145) Support specifying game in config In minetest.conf: ``` game_dir = /path/to/game ``` Change-Id: I790cc6ea91aa988e82e0a1fda23ab4ae2f8026a3 Link with -latomic Rework server stepping and dtime calculation Address some clang-tidy warnings Update clang-tidy workflow Fix minor issue with log_deprecated() Remove non-existent textures from texture_packs.md These textures were removed 5 years ago by 326eeca. Make the loading screen progress bar respect "gui_scaling" MacOS: Add codesigning instructions to docs (#14060) Optimize and improve built-in PNG writer (#14020) Update CMakeLists.txt to fix MacOS build (#14160) Co-authored-by: sfan5 <[email protected]> Support both mouse and touch input in GUIs in a single binary (#14146) Avoid short overflow with large viewing ranges (#14175) Rename `hud_elem_type` to `type` (#14065) Fix AsyncRunStep() skipping steps when dtime < 1 ms Clean up OS-specific initialization Clean up gettext initialization Enable some runtime hardening on win32 Perform server occlusion check before a block is loaded or generated (#14148) Do not emerge blocks in the active_object_send_range_blocks range (#14152) The active object range is about active objects (not blocks). Activate blocks (and hence any object "in" them) in the cone define by the active object range (and fov) when they are loaded (i.e. visible), otherwise ignore them. Extend sanity checks in ActiveBlockList::update also fixes the space indentation Add missing header for gcc-14 https://gcc.gnu.org/gcc-14/porting_to.html Signed-off-by: Alfred Wingate <[email protected]> Method add_pos for object/player (#14126) Comply with base64 license terms (#14199) Remove reference to defunct gitlab docker image see #14164 Fix tonemapping effect Apply saturation even if tonemapping is disabled Legible Lua profiler (#14142) Replace clientmap's MeshBufListList with a hashmap Use AL_SOFT_direct_channels_remix extension for non-positional stereo sounds (#14195) Don't apply gui_scaling & DPI twice to table[] / textlist[] scrollbar (#14206) Remove server's address and port from pause menu (#14082) Touchscreen: Recognize double-taps as double-clicks (#14187) Fix GameUI text staying visible during shutdown. (#14197) Don't run CDB update_detector more than once (#14214) Remove controls listed in the pause menu (no touchscreen) (#13282) Add "--needed" to Arch command to avoid reinstalling packages Fix logic in porting::attachOrCreateConsole() No functional change but now the comment is actually correct. Add unittest to check thread_local destructor brokenness Avoid unused argument spam with MinGW-clang Fix native thread handle usage on win32 Fix some console window behavior on Windows Ensure deterministic client occlusion culling and minor improvements (#14212) * Ensure deterministic client occlusion culling * Increase culling optimize distance slightly * More accurate culling when sampling Android: Add selection dialog (drop down/combo box) (#13814) - The handling of IGUIComboBox uses the new setAndSendSelected() method. - getDialogState() is now getInputDialogState() and returns the state of the input dialog. - getLastDialogType() is added and returns current/last shown dialog's type. - getInputDialogState() now returns an enum instead of int. - getAndroidUIInput() now returns void instead of bool. - New data types (enum) are added: (1) GameActivity.DialogType (Java) and porting::AndroidDialogType (C++) (2) GameActivity.DialogState (Java) and porting::AndroidDialogState (C++) - When showing a text input dialog, there is no custom accept button text any more. - showDialog()/showDialogUI() for text input is now showTextInputDialog()/showTextInputDialogUI(). - showInputDialog()/showDialogUI() for text input is now showTextInputDialog()/showTextInputDialogUI(). - getDialogValue()/getInputDialogValue() is now getDialogMessage()/getInputDialogMessage(). Co-authored-by: Gregor Parzefall <[email protected]> Extend capabilities of Address class Some minor cleanups for UDPSocket class Rework client connecting and enable fallback address use Fix dividing by zero crashes in texture modifiers slimmer gitignore Bit of cleanup ruff First ZMQ Req returns image . add a basic env test Document env setup ci ci ci ci . ci ci ci ci ci make build a bit faster maybe ci ci ci ci pytest pytest again add channels pytest forgot to setup env cleanup minetest env pytest timeout & logging . doc . pytest Rm wrong comment & stdout printing ci ci Better macos instructions rm android and windows ci rm docker ci try fix macos ci try fix clang tidy ci macos submodules macos submodules macos submodules 1 macos submodules 1 macos submodules 1 macos submodules 1 macos submodules 1 Add test world macos submodules 11 macos build again move reward mod move world . no mdofi

grorp added 3 commits December 22, 2023 13:18

Allow both mouse and touch input in GUIs in a single binary

c96e93a

Comment

37b9d8f

Fix crash on Android because Irrlicht doesn't provide ICursorControl …

62801c5

…there

grorp added Feature ✨ PRs that add or enhance a feature @ Client / Controls / Input Formspec labels Dec 22, 2023

grorp commented Dec 22, 2023

View reviewed changes

src/gui/guiFormSpecMenu.cpp Show resolved Hide resolved

sfan5 reviewed Dec 22, 2023

View reviewed changes

src/gui/guiFormSpecMenu.cpp Outdated Show resolved Hide resolved

src/gui/modalMenu.cpp Outdated Show resolved Hide resolved

src/gui/modalMenu.cpp Show resolved Hide resolved

Remove irr::

8aae58c

okias mentioned this pull request Dec 23, 2023

Allow toggling touchscreen mode at runtime #14075

Merged

Replace #ifndef with regular if

d4b0c34

SmallJoker reviewed Dec 26, 2023

View reviewed changes

src/gui/modalMenu.h Outdated Show resolved Hide resolved

src/gui/modalMenu.h Show resolved Hide resolved

src/gui/guiHyperText.cpp Outdated Show resolved Hide resolved

grorp and others added 2 commits December 27, 2023 10:48

Update src/gui/guiHyperText.cpp

5ec9d79

Co-authored-by: SmallJoker <[email protected]>

Apply more suggestions

b913c61

SmallJoker approved these changes Dec 27, 2023

View reviewed changes

SmallJoker added the One approval ✅ ◻️ label Dec 27, 2023

okias reviewed Dec 27, 2023

View reviewed changes

grorp merged commit 32e4928 into luanti-org:master Dec 27, 2023
13 checks passed

grorp deleted the touch-mouse-gui-single-binary branch December 27, 2023 21:38

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Support both mouse and touch input in GUIs in a single binary #14146

Support both mouse and touch input in GUIs in a single binary #14146

grorp commented Dec 22, 2023 •

edited

Loading

sfan5 left a comment

okias commented Dec 22, 2023

okias commented Dec 23, 2023

okias commented Dec 23, 2023

SmallJoker left a comment

Zughy commented Dec 27, 2023

SmallJoker left a comment

SmallJoker commented Dec 27, 2023 •

edited

Loading

okias left a comment •

edited

Loading

okias Dec 27, 2023

grorp Dec 27, 2023

Support both mouse and touch input in GUIs in a single binary #14146

Support both mouse and touch input in GUIs in a single binary #14146

Conversation

grorp commented Dec 22, 2023 • edited Loading

To do

How to test

sfan5 left a comment

Choose a reason for hiding this comment

okias commented Dec 22, 2023

okias commented Dec 23, 2023

okias commented Dec 23, 2023

SmallJoker left a comment

Choose a reason for hiding this comment

Zughy commented Dec 27, 2023

SmallJoker left a comment

Choose a reason for hiding this comment

SmallJoker commented Dec 27, 2023 • edited Loading

okias left a comment • edited Loading

Choose a reason for hiding this comment

okias Dec 27, 2023

Choose a reason for hiding this comment

grorp Dec 27, 2023

Choose a reason for hiding this comment

grorp commented Dec 22, 2023 •

edited

Loading

SmallJoker commented Dec 27, 2023 •

edited

Loading

okias left a comment •

edited

Loading