Diffusion 0 A.D. Public Repository rP22676

PushGuiPage support for passing a function instead of a function name.
Concern RaisedrP22676
Actions

Description

PushGuiPage support for passing a function instead of a function name.
Allows coding the GUI without global functions which break prototype-oriented coding, refs #5322, fixing the concern in rP14496.

Supports stacked message boxes and removes the according workaround.
Change structree / civinfo switch-dialog code from rP21339 to perform the callback for page that actually registered the callback.
Ensure the parent that the callbackhandler is always called if the page is closed.
Merge PopGuiPage and PopGuiPageCB following that choice, incidentally leaving cleaner code.

Differential Revision: https://code.wildfiregames.com/D1684
Comments by: Yves, Vladislav, wraitii, leper

Details

Auditors

wraitii

Committed

elexis

Aug 16 2019, 8:46 PM

Differential Revision

D1684: Pass callback function to PushGuiPage and unify PopGuiPage/PopGuiPageCB

Parents

rP22675: Fix miniupnp memory leak from rP14332 again after it was fixed in rP14348 and…

Branches

Unknown

Tags

Unknown

Build Status

Buildable 8888
Build 14586: Trigger Windows Autobuild
Build 14585: Post-Commit Build	Jenkins

Event Timeline

elexis committed rP22676: PushGuiPage support for passing a function instead of a function name..Aug 16 2019, 8:46 PM

elexis added an edge: D1684: Pass callback function to PushGuiPage and unify PopGuiPage/PopGuiPageCB.

elexis mentioned this in rP14496: Removes g_ScriptingHost and implements global to compartment 1 to 1 relation..Aug 16 2019, 8:47 PM

Harbormaster failed to build B8888: rP22676: PushGuiPage support for passing a function instead of a function name.!Aug 16 2019, 8:48 PM

elexis added inline comments.Aug 29 2019, 11:32 PM

/ps/trunk/binaries/data/mods/public/gui/session/menu.js
1229	This callback should, must have been updated too!

elexis mentioned this in rP22807: Fix missing PushGuiPage callback replacement in session/ openManual() in….Aug 31 2019, 1:02 PM

elexis mentioned this in D2273: Fix structree / history civ button rebase error in D2240 / rP22854 and global hotekys triggering upon release in rP22851.Sep 9 2019, 5:59 PM

elexis added inline comments.Sep 22 2019, 12:49 AM

/ps/trunk/binaries/data/mods/public/gui/locale_advanced/locale_advanced.js
59	This closed without callback, the one below called with callback. Now its always called with callback, so the callback must ignore the undefined return value instead of complaining about that.

elexis mentioned this in rP22966: Fix top panel being hidden during pause mode following rP22957 / D2292 reported….Sep 22 2019, 12:51 PM

elexis mentioned this in rP20644: Implement hotkeys and mousescroll to change tabs in tabbed pages (credits….Oct 16 2019, 2:55 PM

elexis mentioned this in D2389: Make options page agnostic of session page, RangeOverlayManager GUI class.Oct 25 2019, 1:23 PM

elexis mentioned this in D2538: Fix gamesetup/aiconfig dialog regression following rP22676/D1684.Jan 7 2020, 2:18 PM

elexis mentioned this in rP23341: Fix aiconfig dialog errors in multiplayer mode following rP18078, refs #3911….Jan 7 2020, 2:30 PM

90% sure this causes #5614. Need to figure serialisation of the function though...

/ps/trunk/source/gui/GUIManager.cpp
232	This reads like it should crash in debug mode, but maybe it doesn't.
246	And here for a fun double-whammy which I think explains #5614: we 'deserialize' the callback from the original GUI script interface via the CGUIManager page into the current one. But if the page was hot loaded, that original is now destroyed. So this is actually broken twice.
/ps/trunk/source/gui/scripting/JSInterface_GUIManager.cpp
32	Notice initData is cloned but not the function, which is suspicious