Paths

Table of Contentst

Diffusion 0 A.D. Public Repository rP23926

Fix issues relating to SDL and wxWidgets interaction in Atlas.
rP23926
Actions

Description

Fix issues relating to SDL and wxWidgets interaction in Atlas.

This fixes the transfer of key inputs from WxWidgets to SDL, making it possible to type in the in-game GUI from Atlas.

Also fixes whitespace issues in some Atlas files.

The following improvements are OSX specific:

fixes an SDL assertion related to unused subsystems in Atlas.
Remove the 'osxguiapplication' override. This fixes the editor starting up in the background and not accepting input when launched from in-game.
To prevent an issue with sdl/wxwidgets conflict when running from inside the game, actually boot a new instance (see #2427)

Reported by: wik (Many thanks for your investigations)

Tested by: trompetin17, Stan

Fixes #2427
Fixes #2846

Differential Revision: https://code.wildfiregames.com/D2788

Details

Committed

wraitii

Aug 3 2020, 2:23 PM

Differential Revision

D2788: Fix 1 general and 3 OSX-specific issues in Atlas

Parents

rP23925: Improve ship pickup.

Branches

Unknown

Tags

Unknown

Build Status

Buildable 12717
Build 24691: Trigger Windows Autobuild
Build 24690: Post-Commit Build	Jenkins
Build 24689: Post-Commit Build (macOS)	Jenkins

Event Timeline

wraitii committed rP23926: Fix issues relating to SDL and wxWidgets interaction in Atlas..Aug 3 2020, 2:23 PM

wraitii added an edge: D2788: Fix 1 general and 3 OSX-specific issues in Atlas.

Harbormaster completed building B12717: rP23926: Fix issues relating to SDL and wxWidgets interaction in Atlas..Aug 3 2020, 2:31 PM

vladislavbelov added a subscriber: vladislavbelov.Aug 3 2020, 11:07 PM

vladislavbelov added inline comments.

/ps/trunk/source/lib/sysdep/os/osx/osx_atlas.h
23	`INCLUDED_OSX_ATLAS`.
31	It seems like out of CC, because it's not underscored and not in upper camel case.
/ps/trunk/source/lib/sysdep/os/osx/osx_atlas.mm
44	Might be `const`, `std::string` c-tor is unnecessary.
/ps/trunk/source/tools/atlas/AtlasUI/ScenarioEditor/ScenarioEditor.cpp
189	Why hard-coded bounds and not `std::isalnum`?
/ps/trunk/source/tools/atlas/GameInterface/Handlers/MiscHandlers.cpp
207	`static_cast`.
211	Duplication, it might be compressed.

Thanks for the comments. Overall I don't think they warrant a lint-commit on this soonish, I'll keep it in mind for my next atlas diff I think.

/ps/trunk/source/lib/sysdep/os/osx/osx_atlas.h
23	I'm actually following the convention of other osx/ specific headers here (I copied one of the files as thesis of this), but I agree it's inconsistent with the rest of the codebase.
31	That one's my bad, it should probably be osx_StartNewAtlasProcess
/ps/trunk/source/lib/sysdep/os/osx/osx_atlas.mm
44	doesn't matter much tbh
/ps/trunk/source/tools/atlas/AtlasUI/ScenarioEditor/ScenarioEditor.cpp
189	Didn't have it in mind when changing this, would have been slightly better.

Mac-OS bundle is failing since this commit, see jenkins logs
../../../source/lib/sysdep/os/osx/osx_atlas.mm:49:2: error: type arguments cannot be applied to non-parameterized class 'NSDictionary'

NSDictionary<NSString*, id> *params = @{ NSWorkspaceLaunchConfigurationArguments: args };

This commit now has outstanding concerns.Sep 26 2020, 11:15 AM

Could be the --macosx-version-min=10.9 flag cc @Itms

We dropped 10.9

This commit no longer requires audit.Dec 5 2020, 3:13 PM

Changes (8)

Path

Size

ps/

trunk/

source/

lib/

sysdep/

os/

osx/

osx_atlas.h

osx_atlas.mm

main.cpp

ps/

GameSetup/

HWDetect.cpp

tools/

atlas/

AtlasUI/

Misc/

DLLInterface.cpp

KeyMap.cpp

ScenarioEditor/

ScenarioEditor.cpp

GameInterface/

Handlers/

MiscHandlers.cpp

rP23926

View Options

ps/trunk/source/lib/sysdep/os/osx/osx_atlas.h

View Options

ps/trunk/source/lib/sysdep/os/osx/osx_atlas.mm

View Options

ps/trunk/source/main.cpp

View Options

ps/trunk/source/ps/GameSetup/HWDetect.cpp

View Options

ps/trunk/source/tools/atlas/AtlasUI/Misc/DLLInterface.cpp

View Options

ps/trunk/source/tools/atlas/AtlasUI/Misc/KeyMap.cpp

View Options

ps/trunk/source/tools/atlas/AtlasUI/ScenarioEditor/ScenarioEditor.cpp

View Options

ps/trunk/source/tools/atlas/GameInterface/Handlers/MiscHandlers.cpp

Fix issues relating to SDL and wxWidgets interaction in Atlas.rP23926Actions

Description

Details

Event Timeline

Changes (8)

rP23926

ps/trunk/source/lib/sysdep/os/osx/osx_atlas.h

ps/trunk/source/lib/sysdep/os/osx/osx_atlas.mm

ps/trunk/source/main.cpp

ps/trunk/source/ps/GameSetup/HWDetect.cpp

ps/trunk/source/tools/atlas/AtlasUI/Misc/DLLInterface.cpp

ps/trunk/source/tools/atlas/AtlasUI/Misc/KeyMap.cpp

ps/trunk/source/tools/atlas/AtlasUI/ScenarioEditor/ScenarioEditor.cpp

ps/trunk/source/tools/atlas/GameInterface/Handlers/MiscHandlers.cpp

Fix issues relating to SDL and wxWidgets interaction in Atlas.
rP23926
Actions