Narrow Win32 runtime shell surface
This commit is contained in:
@@ -75,6 +75,15 @@ Latest slice:
|
|||||||
`windows_runtime_flow.cpp`.
|
`windows_runtime_flow.cpp`.
|
||||||
- `src/platform_windows/windows_runtime_flow.cpp` is now a thinner handoff
|
- `src/platform_windows/windows_runtime_flow.cpp` is now a thinner handoff
|
||||||
layer over that Windows session helper.
|
layer over that Windows session helper.
|
||||||
|
- `src/platform_windows/windows_runtime_shell.h` no longer exposes the removed
|
||||||
|
runtime-session entrypoint or drags bootstrap/splash declarations through the
|
||||||
|
broader shell header surface.
|
||||||
|
- `src/platform_windows/windows_runtime_shell.cpp` now hands runtime execution
|
||||||
|
directly to `run_bound_main_window_runtime(...)` instead of keeping a second
|
||||||
|
wrapper around that seam.
|
||||||
|
- `src/main.cpp` now includes `windows_bootstrap_helpers.h` directly for
|
||||||
|
`run_winmain_entry(...)` instead of relying on a transitive declaration
|
||||||
|
through the Windows runtime shell header.
|
||||||
- `src/platform_windows/windows_runtime_flow.*` now owns the Win32 bound-app
|
- `src/platform_windows/windows_runtime_flow.*` now owns the Win32 bound-app
|
||||||
startup/message-loop/shutdown orchestration that used to live in
|
startup/message-loop/shutdown orchestration that used to live in
|
||||||
`windows_runtime_shell.cpp`.
|
`windows_runtime_shell.cpp`.
|
||||||
|
|||||||
@@ -82,6 +82,14 @@ Current slice:
|
|||||||
Win32 runtime loop/startup/shutdown body.
|
Win32 runtime loop/startup/shutdown body.
|
||||||
- `src/platform_windows/windows_runtime_flow.cpp` is now only a thin handoff
|
- `src/platform_windows/windows_runtime_flow.cpp` is now only a thin handoff
|
||||||
into that session helper.
|
into that session helper.
|
||||||
|
- `src/platform_windows/windows_runtime_shell.h` no longer exposes the removed
|
||||||
|
runtime-session entrypoint or carries bootstrap/splash declarations for it.
|
||||||
|
- `src/platform_windows/windows_runtime_shell.cpp` now calls
|
||||||
|
`run_bound_main_window_runtime(...)` directly instead of keeping a second
|
||||||
|
wrapper entrypoint around that seam.
|
||||||
|
- `src/main.cpp` now includes `windows_bootstrap_helpers.h` directly for
|
||||||
|
`run_winmain_entry(...)` instead of depending on a transitive declaration
|
||||||
|
through the shell header.
|
||||||
- `src/platform_windows/windows_runtime_flow.*` now owns the Win32 bound-app
|
- `src/platform_windows/windows_runtime_flow.*` now owns the Win32 bound-app
|
||||||
startup/message-loop/shutdown orchestration.
|
startup/message-loop/shutdown orchestration.
|
||||||
- `src/platform_windows/windows_runtime_shell.cpp` now delegates that runtime
|
- `src/platform_windows/windows_runtime_shell.cpp` now delegates that runtime
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
#include "pch.h"
|
#include "pch.h"
|
||||||
|
|
||||||
|
#include "platform_windows/windows_bootstrap_helpers.h"
|
||||||
#include "platform_windows/windows_runtime_shell.h"
|
#include "platform_windows/windows_runtime_shell.h"
|
||||||
|
|
||||||
int main(int argc, char** argv)
|
int main(int argc, char** argv)
|
||||||
|
|||||||
@@ -4,8 +4,10 @@
|
|||||||
|
|
||||||
#include "app.h"
|
#include "app.h"
|
||||||
#include "log.h"
|
#include "log.h"
|
||||||
|
#include "platform_windows/windows_bootstrap_helpers.h"
|
||||||
#include "platform_windows/windows_lifecycle_state.h"
|
#include "platform_windows/windows_lifecycle_state.h"
|
||||||
#include "platform_windows/windows_main_window_session.h"
|
#include "platform_windows/windows_main_window_session.h"
|
||||||
|
#include "platform_windows/windows_platform_services.h"
|
||||||
#include "platform_windows/windows_runtime_shell.h"
|
#include "platform_windows/windows_runtime_shell.h"
|
||||||
#include "platform_windows/windows_runtime_state.h"
|
#include "platform_windows/windows_runtime_state.h"
|
||||||
#include "wacom.h"
|
#include "wacom.h"
|
||||||
|
|||||||
@@ -3,9 +3,7 @@
|
|||||||
#include "platform_windows/windows_runtime_shell.h"
|
#include "platform_windows/windows_runtime_shell.h"
|
||||||
|
|
||||||
#include "app.h"
|
#include "app.h"
|
||||||
#include "log.h"
|
|
||||||
#include "platform_windows/windows_bootstrap_helpers.h"
|
#include "platform_windows/windows_bootstrap_helpers.h"
|
||||||
#include "platform_windows/windows_lifecycle_state.h"
|
|
||||||
#include "platform_windows/windows_main_window_session.h"
|
#include "platform_windows/windows_main_window_session.h"
|
||||||
#include "platform_windows/windows_platform_services.h"
|
#include "platform_windows/windows_platform_services.h"
|
||||||
#include "platform_windows/windows_runtime_flow.h"
|
#include "platform_windows/windows_runtime_flow.h"
|
||||||
@@ -13,7 +11,6 @@
|
|||||||
#include "platform_windows/windows_stylus_input.h"
|
#include "platform_windows/windows_stylus_input.h"
|
||||||
#include "platform_windows/windows_window_shell.h"
|
#include "platform_windows/windows_window_shell.h"
|
||||||
#include "wacom.h"
|
#include "wacom.h"
|
||||||
#include "../resource.h"
|
|
||||||
|
|
||||||
namespace pp::platform::windows {
|
namespace pp::platform::windows {
|
||||||
|
|
||||||
@@ -108,14 +105,9 @@ int run_main_application(int argc, char** argv)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pp::platform::windows::run_main_window_runtime(startup, start_in_vr, instance, splash);
|
pp::platform::windows::run_bound_main_window_runtime(startup, start_in_vr, instance, splash);
|
||||||
release_bound_app();
|
release_bound_app();
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
void run_main_window_runtime(const MainWindowStartupState& startup, bool start_in_vr, HINSTANCE instance, SplashScreen& splash)
|
|
||||||
{
|
|
||||||
run_bound_main_window_runtime(startup, start_in_vr, instance, splash);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,15 +1,11 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "platform_windows/windows_bootstrap_helpers.h"
|
|
||||||
#include "platform_windows/windows_splash.h"
|
|
||||||
|
|
||||||
class App;
|
class App;
|
||||||
class WacomTablet;
|
class WacomTablet;
|
||||||
|
|
||||||
namespace pp::platform::windows {
|
namespace pp::platform::windows {
|
||||||
|
|
||||||
int run_main_application(int argc, char** argv);
|
int run_main_application(int argc, char** argv);
|
||||||
void run_main_window_runtime(const MainWindowStartupState& startup, bool start_in_vr, HINSTANCE instance, SplashScreen& splash);
|
|
||||||
void bind_app(App* app) noexcept;
|
void bind_app(App* app) noexcept;
|
||||||
[[nodiscard]] App* bound_app() noexcept;
|
[[nodiscard]] App* bound_app() noexcept;
|
||||||
void release_bound_app() noexcept;
|
void release_bound_app() noexcept;
|
||||||
|
|||||||
Reference in New Issue
Block a user