diff --git a/Cargo.toml b/Cargo.toml index 6a1f202..d9a60f2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -47,7 +47,7 @@ exclude = [ ] [workspace.package] -version = "0.0.1-pre" +version = "0.2.0-beta.1" edition = "2021" rust-version = "1.95" authors = ["The Chanora Project Contributors"] diff --git a/apps/chanora_flutter/.metadata b/apps/chanora_flutter/.metadata index 17b3ef2..c96b2aa 100644 --- a/apps/chanora_flutter/.metadata +++ b/apps/chanora_flutter/.metadata @@ -5,7 +5,7 @@ version: revision: "00b0c91f06209d9e4a41f71b7a512d6eb3b9c694" - channel: "[user-branch]" + channel: "stable" project_type: app @@ -15,10 +15,7 @@ migration: - platform: root create_revision: 00b0c91f06209d9e4a41f71b7a512d6eb3b9c694 base_revision: 00b0c91f06209d9e4a41f71b7a512d6eb3b9c694 - - platform: ios - create_revision: 00b0c91f06209d9e4a41f71b7a512d6eb3b9c694 - base_revision: 00b0c91f06209d9e4a41f71b7a512d6eb3b9c694 - - platform: macos + - platform: windows create_revision: 00b0c91f06209d9e4a41f71b7a512d6eb3b9c694 base_revision: 00b0c91f06209d9e4a41f71b7a512d6eb3b9c694 diff --git a/apps/chanora_flutter/ios/Runner.xcodeproj/project.pbxproj b/apps/chanora_flutter/ios/Runner.xcodeproj/project.pbxproj index 338213f..8796212 100644 --- a/apps/chanora_flutter/ios/Runner.xcodeproj/project.pbxproj +++ b/apps/chanora_flutter/ios/Runner.xcodeproj/project.pbxproj @@ -505,7 +505,7 @@ CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; GENERATE_INFOPLIST_FILE = YES; - MARKETING_VERSION = 1.0; + MARKETING_VERSION = 0.2; PRODUCT_BUNDLE_IDENTIFIER = app.chanora.chanoraFlutter.RunnerTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; @@ -523,7 +523,7 @@ CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; GENERATE_INFOPLIST_FILE = YES; - MARKETING_VERSION = 1.0; + MARKETING_VERSION = 0.2; PRODUCT_BUNDLE_IDENTIFIER = app.chanora.chanoraFlutter.RunnerTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; @@ -539,7 +539,7 @@ CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; GENERATE_INFOPLIST_FILE = YES; - MARKETING_VERSION = 1.0; + MARKETING_VERSION = 0.2; PRODUCT_BUNDLE_IDENTIFIER = app.chanora.chanoraFlutter.RunnerTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; diff --git a/apps/chanora_flutter/macos/Frameworks/chanora_bridge.framework/Resources b/apps/chanora_flutter/macos/Frameworks/chanora_bridge.framework/Resources new file mode 120000 index 0000000..953ee36 --- /dev/null +++ b/apps/chanora_flutter/macos/Frameworks/chanora_bridge.framework/Resources @@ -0,0 +1 @@ +Versions/Current/Resources \ No newline at end of file diff --git a/apps/chanora_flutter/macos/Frameworks/chanora_bridge.framework/Versions/A/Resources/Info.plist b/apps/chanora_flutter/macos/Frameworks/chanora_bridge.framework/Versions/A/Resources/Info.plist new file mode 100644 index 0000000..1262641 --- /dev/null +++ b/apps/chanora_flutter/macos/Frameworks/chanora_bridge.framework/Versions/A/Resources/Info.plist @@ -0,0 +1,14 @@ + + + + + CFBundleExecutablechanora_bridge + CFBundleIdentifierapp.chanora.bridge + CFBundleNamechanora_bridge + CFBundlePackageTypeFMWK + CFBundleShortVersionString1.0.0 + CFBundleVersion1 + CFBundleSupportedPlatformsMacOSX + MinimumOSVersion10.15 + + diff --git a/apps/chanora_flutter/macos/Frameworks/chanora_bridge.framework/Versions/A/chanora_bridge b/apps/chanora_flutter/macos/Frameworks/chanora_bridge.framework/Versions/A/chanora_bridge new file mode 100755 index 0000000..7e20bfa Binary files /dev/null and b/apps/chanora_flutter/macos/Frameworks/chanora_bridge.framework/Versions/A/chanora_bridge differ diff --git a/apps/chanora_flutter/macos/Frameworks/chanora_bridge.framework/Versions/Current b/apps/chanora_flutter/macos/Frameworks/chanora_bridge.framework/Versions/Current new file mode 120000 index 0000000..8c7e5a6 --- /dev/null +++ b/apps/chanora_flutter/macos/Frameworks/chanora_bridge.framework/Versions/Current @@ -0,0 +1 @@ +A \ No newline at end of file diff --git a/apps/chanora_flutter/macos/Frameworks/chanora_bridge.framework/chanora_bridge b/apps/chanora_flutter/macos/Frameworks/chanora_bridge.framework/chanora_bridge new file mode 120000 index 0000000..ffe85df --- /dev/null +++ b/apps/chanora_flutter/macos/Frameworks/chanora_bridge.framework/chanora_bridge @@ -0,0 +1 @@ +Versions/Current/chanora_bridge \ No newline at end of file diff --git a/apps/chanora_flutter/macos/Podfile b/apps/chanora_flutter/macos/Podfile index ff5ddb3..7f14fd9 100644 --- a/apps/chanora_flutter/macos/Podfile +++ b/apps/chanora_flutter/macos/Podfile @@ -30,6 +30,9 @@ target 'Runner' do use_frameworks! flutter_install_all_macos_pods File.dirname(File.realpath(__FILE__)) + + pod 'chanora_bridge', :path => File.dirname(File.realpath(__FILE__)) + target 'RunnerTests' do inherit! :search_paths end diff --git a/apps/chanora_flutter/macos/Podfile.lock b/apps/chanora_flutter/macos/Podfile.lock index 5614921..eab35a3 100644 --- a/apps/chanora_flutter/macos/Podfile.lock +++ b/apps/chanora_flutter/macos/Podfile.lock @@ -1,22 +1,39 @@ PODS: + - audio_session (0.0.1): + - FlutterMacOS + - chanora_bridge (1.0.0) - connectivity_plus (0.0.1): - FlutterMacOS - FlutterMacOS (1.0.0) + - package_info_plus (0.0.1): + - FlutterMacOS DEPENDENCIES: + - audio_session (from `Flutter/ephemeral/.symlinks/plugins/audio_session/macos`) + - chanora_bridge (from `/Users/edison/chanora/apps/chanora_flutter/macos`) - connectivity_plus (from `Flutter/ephemeral/.symlinks/plugins/connectivity_plus/macos`) - FlutterMacOS (from `Flutter/ephemeral`) + - package_info_plus (from `Flutter/ephemeral/.symlinks/plugins/package_info_plus/macos`) EXTERNAL SOURCES: + audio_session: + :path: Flutter/ephemeral/.symlinks/plugins/audio_session/macos + chanora_bridge: + :path: "/Users/edison/chanora/apps/chanora_flutter/macos" connectivity_plus: :path: Flutter/ephemeral/.symlinks/plugins/connectivity_plus/macos FlutterMacOS: :path: Flutter/ephemeral + package_info_plus: + :path: Flutter/ephemeral/.symlinks/plugins/package_info_plus/macos SPEC CHECKSUMS: + audio_session: eaca2512cf2b39212d724f35d11f46180ad3a33e + chanora_bridge: 1403e892a388d6bbb751d2d658e539d7a456fb1b connectivity_plus: 4adf20a405e25b42b9c9f87feff8f4b6fde18a4e FlutterMacOS: d0db08ddef1a9af05a5ec4b724367152bb0500b1 + package_info_plus: f0052d280d17aa382b932f399edf32507174e870 -PODFILE CHECKSUM: 54d867c82ac51cbd61b565781b9fada492027009 +PODFILE CHECKSUM: d2e26b3cd926b9e407faa321206548300d262a08 COCOAPODS: 1.16.2 diff --git a/apps/chanora_flutter/macos/Runner.xcodeproj/project.pbxproj b/apps/chanora_flutter/macos/Runner.xcodeproj/project.pbxproj index 20b00ed..06b34a3 100644 --- a/apps/chanora_flutter/macos/Runner.xcodeproj/project.pbxproj +++ b/apps/chanora_flutter/macos/Runner.xcodeproj/project.pbxproj @@ -393,14 +393,10 @@ inputFileListPaths = ( "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", ); - inputPaths = ( - ); name = "[CP] Embed Pods Frameworks"; outputFileListPaths = ( "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", ); - outputPaths = ( - ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; @@ -485,7 +481,7 @@ CURRENT_PROJECT_VERSION = 1; GENERATE_INFOPLIST_FILE = YES; MACOSX_DEPLOYMENT_TARGET = 11.0; - MARKETING_VERSION = 1.0; + MARKETING_VERSION = 0.2; PRODUCT_BUNDLE_IDENTIFIER = app.chanora.chanoraFlutter.RunnerTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; @@ -501,7 +497,7 @@ CURRENT_PROJECT_VERSION = 1; GENERATE_INFOPLIST_FILE = YES; MACOSX_DEPLOYMENT_TARGET = 11.0; - MARKETING_VERSION = 1.0; + MARKETING_VERSION = 0.2; PRODUCT_BUNDLE_IDENTIFIER = app.chanora.chanoraFlutter.RunnerTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; @@ -517,7 +513,7 @@ CURRENT_PROJECT_VERSION = 1; GENERATE_INFOPLIST_FILE = YES; MACOSX_DEPLOYMENT_TARGET = 11.0; - MARKETING_VERSION = 1.0; + MARKETING_VERSION = 0.2; PRODUCT_BUNDLE_IDENTIFIER = app.chanora.chanoraFlutter.RunnerTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; diff --git a/apps/chanora_flutter/macos/chanora_bridge.podspec b/apps/chanora_flutter/macos/chanora_bridge.podspec new file mode 100644 index 0000000..a72ea00 --- /dev/null +++ b/apps/chanora_flutter/macos/chanora_bridge.podspec @@ -0,0 +1,210 @@ +# +# chanora_bridge — Rust bridge library as a CocoaPods-vended dynamic framework +# (macOS edition). +# +# What this file does: +# +# 1. `prepare_command` runs once per `pod install` and once per archive +# / device build. It: +# a) Invokes `cargo build --release` for both `aarch64-apple-darwin` +# (Apple Silicon) and `x86_64-apple-darwin` (Intel). +# b) Uses `lipo` to merge the two into a universal binary. +# c) Wraps the universal dylib in a proper `chanora_bridge.framework` +# bundle (Versions/A layout with the right Info.plist). +# d) Rewrites LC_ID_DYLIB to +# @rpath/chanora_bridge.framework/Versions/A/chanora_bridge so dyld +# resolves it as a framework when embedded in Runner.app. +# +# 2. `vendored_frameworks` exposes the result to the Pods workspace. +# CocoaPods then integrates the framework into Runner.xcodeproj +# with the appropriate embed phase. +# +# Path note: this podspec lives at apps/chanora_flutter/macos/, and +# refers to the Rust workspace at ../../.. (repo root). The +# prepare_command runs with PWD = the directory of this file, so all +# paths are relative to apps/chanora_flutter/macos/. + +Pod::Spec.new do |s| + s.name = 'chanora_bridge' + s.version = '1.0.0' + s.summary = 'Chanora Rust bridge (libchanora_bridge) as a macOS framework.' + s.description = <<-DESC + Vendors the Rust-built libchanora_bridge as chanora_bridge.framework so + flutter_rust_bridge's runtime loader can dlopen it on macOS. + DESC + s.homepage = 'https://github.com/EdisonJwa/chanora' + s.license = { :type => 'Apache-2.0 OR MIT', :text => 'See LICENSE-APACHE / LICENSE-MIT at the repo root' } + s.author = { 'EdisonJwa' => 'me@edison.network' } + s.source = { :path => '.' } + s.platform = :osx, '10.15' + + # Build the Rust bridge on `pod install`. The script runs under + # bash; we use `set -e` so any failure (cargo missing, target not + # installed, link error) aborts the install loudly. + s.prepare_command = <<-SCRIPT + set -e + REPO_ROOT="$(cd ../../.. && pwd)" + BRIDGE_ARM64="$REPO_ROOT/target/aarch64-apple-darwin/release/libchanora_bridge.dylib" + BRIDGE_X86_64="$REPO_ROOT/target/x86_64-apple-darwin/release/libchanora_bridge.dylib" + UNIVERSAL="$REPO_ROOT/target/universal/release/libchanora_bridge.dylib" + + echo "[chanora_bridge.podspec] cargo build aarch64-apple-darwin" + cd "$REPO_ROOT" + PATH="$HOME/.cargo/bin:$PATH" \\ + MACOSX_DEPLOYMENT_TARGET=10.15 \\ + CMAKE_POLICY_VERSION_MINIMUM=3.5 \\ + LIBOPUS_STATIC=1 \\ + LIBOPUS_NO_PKG=1 \\ + cargo build --release --target aarch64-apple-darwin -p chanora_bridge + + echo "[chanora_bridge.podspec] cargo build x86_64-apple-darwin" + PATH="$HOME/.cargo/bin:$PATH" \\ + MACOSX_DEPLOYMENT_TARGET=10.15 \\ + CMAKE_POLICY_VERSION_MINIMUM=3.5 \\ + LIBOPUS_STATIC=1 \\ + LIBOPUS_NO_PKG=1 \\ + cargo build --release --target x86_64-apple-darwin -p chanora_bridge + + if [ ! -f "$BRIDGE_ARM64" ]; then + echo "ERROR: arm64 dylib not found at $BRIDGE_ARM64" >&2 + exit 1 + fi + if [ ! -f "$BRIDGE_X86_64" ]; then + echo "ERROR: x86_64 dylib not found at $BRIDGE_X86_64" >&2 + exit 1 + fi + + # Create universal binary with lipo. + mkdir -p "$(dirname "$UNIVERSAL")" + lipo -create "$BRIDGE_ARM64" "$BRIDGE_X86_64" -output "$UNIVERSAL" + echo "[chanora_bridge.podspec] universal binary created" + + cd "$REPO_ROOT/apps/chanora_flutter/macos" + + # Build the chanora_bridge.framework layout (Versions/A) in a known + # location this podspec will then point vendored_frameworks at. + FW=Frameworks/chanora_bridge.framework + rm -rf "$FW" + mkdir -p "$FW/Versions/A/Resources" + ln -sfh A "$FW/Versions/Current" + ln -sfh Versions/Current/Resources "$FW/Resources" + cp "$UNIVERSAL" "$FW/Versions/A/chanora_bridge" + ln -sfh Versions/Current/chanora_bridge "$FW/chanora_bridge" + + cat > "$FW/Versions/A/Resources/Info.plist" < + + + + CFBundleExecutablechanora_bridge + CFBundleIdentifierapp.chanora.bridge + CFBundleNamechanora_bridge + CFBundlePackageTypeFMWK + CFBundleShortVersionString1.0.0 + CFBundleVersion1 + CFBundleSupportedPlatformsMacOSX + MinimumOSVersion10.15 + + +PLIST + + install_name_tool -id "@rpath/chanora_bridge.framework/Versions/A/chanora_bridge" \\ + "$FW/Versions/A/chanora_bridge" + echo "[chanora_bridge.podspec] framework ready at $FW" + SCRIPT + + # Pod CocoaPods picks this up; the framework gets embedded into + # Runner.app/Contents/Frameworks/ automatically. + s.vendored_frameworks = 'Frameworks/chanora_bridge.framework' + + # Re-run the cargo build + framework wrap on every Xcode build, + # not only on `pod install`. The `prepare_command` above runs + # once per `pod install` which is too sticky — Rust source + # changes were getting silently ignored because Xcode happily + # re-bundled the stale framework. This script_phase shells out to + # cargo on every Xcode "Build" so the framework is always in sync + # with the current Rust workspace. + # + # `:execution_position => :before_compile` runs the script before + # Xcode's CompileSources phase, so by the time the linker / embed + # step sees `Frameworks/chanora_bridge.framework`, it is fresh. + s.script_phase = { + :name => 'Rebuild chanora_bridge.framework from Rust', + :script => <<-SCRIPT, + set -e + REPO_ROOT="$(cd "${PODS_TARGET_SRCROOT}/../../.." && pwd)" + BRIDGE_ARM64="$REPO_ROOT/target/aarch64-apple-darwin/release/libchanora_bridge.dylib" + BRIDGE_X86_64="$REPO_ROOT/target/x86_64-apple-darwin/release/libchanora_bridge.dylib" + UNIVERSAL="$REPO_ROOT/target/universal/release/libchanora_bridge.dylib" + + echo "[chanora_bridge script_phase] cargo build aarch64-apple-darwin" + cd "$REPO_ROOT" + PATH="$HOME/.cargo/bin:$PATH" \ + MACOSX_DEPLOYMENT_TARGET=10.15 \ + CMAKE_POLICY_VERSION_MINIMUM=3.5 \ + LIBOPUS_STATIC=1 \ + LIBOPUS_NO_PKG=1 \ + cargo build --release --target aarch64-apple-darwin -p chanora_bridge + + echo "[chanora_bridge script_phase] cargo build x86_64-apple-darwin" + PATH="$HOME/.cargo/bin:$PATH" \ + MACOSX_DEPLOYMENT_TARGET=10.15 \ + CMAKE_POLICY_VERSION_MINIMUM=3.5 \ + LIBOPUS_STATIC=1 \ + LIBOPUS_NO_PKG=1 \ + cargo build --release --target x86_64-apple-darwin -p chanora_bridge + + cd "$REPO_ROOT/apps/chanora_flutter/macos" + FW=Frameworks/chanora_bridge.framework + + # Skip the wrap step if the framework's binary is already + # up-to-date with the cargo output (fast no-op on incremental + # builds where Rust didn't change). + if [ -f "$FW/Versions/A/chanora_bridge" ] && [ "$FW/Versions/A/chanora_bridge" -nt "$BRIDGE_ARM64" ] && [ "$FW/Versions/A/chanora_bridge" -nt "$BRIDGE_X86_64" ]; then + echo "[chanora_bridge script_phase] framework already up-to-date" + exit 0 + fi + + # Create universal binary with lipo. + mkdir -p "$(dirname "$UNIVERSAL")" + lipo -create "$BRIDGE_ARM64" "$BRIDGE_X86_64" -output "$UNIVERSAL" + + rm -rf "$FW" + mkdir -p "$FW/Versions/A/Resources" + ln -sfh A "$FW/Versions/Current" + ln -sfh Versions/Current/Resources "$FW/Resources" + cp "$UNIVERSAL" "$FW/Versions/A/chanora_bridge" + ln -sfh Versions/Current/chanora_bridge "$FW/chanora_bridge" + + cat > "$FW/Versions/A/Resources/Info.plist" < + + + + CFBundleExecutablechanora_bridge + CFBundleIdentifierapp.chanora.bridge + CFBundleNamechanora_bridge + CFBundlePackageTypeFMWK + CFBundleShortVersionString1.0.0 + CFBundleVersion1 + CFBundleSupportedPlatformsMacOSX + MinimumOSVersion10.15 + + +PLIST + + install_name_tool -id "@rpath/chanora_bridge.framework/Versions/A/chanora_bridge" \ + "$FW/Versions/A/chanora_bridge" + echo "[chanora_bridge script_phase] framework refreshed" + SCRIPT + :execution_position => :before_compile, + } + + # The pod has no Objective-C sources; it's purely a framework + # carrier. Suppress CocoaPods's source-file warning. + s.source_files = 'Frameworks/chanora_bridge.framework/Headers/*.h' + + # No public Swift / ObjC API to expose — the Flutter app talks to + # the framework via FRB's FFI symbol lookup at runtime, not via + # imports. +end diff --git a/apps/chanora_flutter/pubspec.yaml b/apps/chanora_flutter/pubspec.yaml index d5ed1f8..ba97f0a 100644 --- a/apps/chanora_flutter/pubspec.yaml +++ b/apps/chanora_flutter/pubspec.yaml @@ -16,7 +16,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html # In Windows, build-name is used as the major, minor, and patch parts # of the product and file versions while build-number is used as the build suffix. -version: 1.0.0-rc.8+75 +version: 0.2.0-beta.1+75 environment: sdk: ^3.11.5 diff --git a/apps/chanora_flutter/windows/.gitignore b/apps/chanora_flutter/windows/.gitignore new file mode 100644 index 0000000..d492d0d --- /dev/null +++ b/apps/chanora_flutter/windows/.gitignore @@ -0,0 +1,17 @@ +flutter/ephemeral/ + +# Visual Studio user-specific files. +*.suo +*.user +*.userosscache +*.sln.docstates + +# Visual Studio build-related files. +x64/ +x86/ + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!*.[Cc]ache/ diff --git a/apps/chanora_flutter/windows/CMakeLists.txt b/apps/chanora_flutter/windows/CMakeLists.txt new file mode 100644 index 0000000..5b2e579 --- /dev/null +++ b/apps/chanora_flutter/windows/CMakeLists.txt @@ -0,0 +1,108 @@ +# Project-level configuration. +cmake_minimum_required(VERSION 3.14) +project(chanora_flutter LANGUAGES CXX) + +# The name of the executable created for the application. Change this to change +# the on-disk name of your application. +set(BINARY_NAME "chanora_flutter") + +# Explicitly opt in to modern CMake behaviors to avoid warnings with recent +# versions of CMake. +cmake_policy(VERSION 3.14...3.25) + +# Define build configuration option. +get_property(IS_MULTICONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG) +if(IS_MULTICONFIG) + set(CMAKE_CONFIGURATION_TYPES "Debug;Profile;Release" + CACHE STRING "" FORCE) +else() + if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) + set(CMAKE_BUILD_TYPE "Debug" CACHE + STRING "Flutter build mode" FORCE) + set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS + "Debug" "Profile" "Release") + endif() +endif() +# Define settings for the Profile build mode. +set(CMAKE_EXE_LINKER_FLAGS_PROFILE "${CMAKE_EXE_LINKER_FLAGS_RELEASE}") +set(CMAKE_SHARED_LINKER_FLAGS_PROFILE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE}") +set(CMAKE_C_FLAGS_PROFILE "${CMAKE_C_FLAGS_RELEASE}") +set(CMAKE_CXX_FLAGS_PROFILE "${CMAKE_CXX_FLAGS_RELEASE}") + +# Use Unicode for all projects. +add_definitions(-DUNICODE -D_UNICODE) + +# Compilation settings that should be applied to most targets. +# +# Be cautious about adding new options here, as plugins use this function by +# default. In most cases, you should add new options to specific targets instead +# of modifying this function. +function(APPLY_STANDARD_SETTINGS TARGET) + target_compile_features(${TARGET} PUBLIC cxx_std_17) + target_compile_options(${TARGET} PRIVATE /W4 /WX /wd"4100") + target_compile_options(${TARGET} PRIVATE /EHsc) + target_compile_definitions(${TARGET} PRIVATE "_HAS_EXCEPTIONS=0") + target_compile_definitions(${TARGET} PRIVATE "$<$:_DEBUG>") +endfunction() + +# Flutter library and tool build rules. +set(FLUTTER_MANAGED_DIR "${CMAKE_CURRENT_SOURCE_DIR}/flutter") +add_subdirectory(${FLUTTER_MANAGED_DIR}) + +# Application build; see runner/CMakeLists.txt. +add_subdirectory("runner") + + +# Generated plugin build rules, which manage building the plugins and adding +# them to the application. +include(flutter/generated_plugins.cmake) + + +# === Installation === +# Support files are copied into place next to the executable, so that it can +# run in place. This is done instead of making a separate bundle (as on Linux) +# so that building and running from within Visual Studio will work. +set(BUILD_BUNDLE_DIR "$") +# Make the "install" step default, as it's required to run. +set(CMAKE_VS_INCLUDE_INSTALL_TO_DEFAULT_BUILD 1) +if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) + set(CMAKE_INSTALL_PREFIX "${BUILD_BUNDLE_DIR}" CACHE PATH "..." FORCE) +endif() + +set(INSTALL_BUNDLE_DATA_DIR "${CMAKE_INSTALL_PREFIX}/data") +set(INSTALL_BUNDLE_LIB_DIR "${CMAKE_INSTALL_PREFIX}") + +install(TARGETS ${BINARY_NAME} RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}" + COMPONENT Runtime) + +install(FILES "${FLUTTER_ICU_DATA_FILE}" DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" + COMPONENT Runtime) + +install(FILES "${FLUTTER_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + COMPONENT Runtime) + +if(PLUGIN_BUNDLED_LIBRARIES) + install(FILES "${PLUGIN_BUNDLED_LIBRARIES}" + DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + COMPONENT Runtime) +endif() + +# Copy the native assets provided by the build.dart from all packages. +set(NATIVE_ASSETS_DIR "${PROJECT_BUILD_DIR}native_assets/windows/") +install(DIRECTORY "${NATIVE_ASSETS_DIR}" + DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + COMPONENT Runtime) + +# Fully re-copy the assets directory on each build to avoid having stale files +# from a previous install. +set(FLUTTER_ASSET_DIR_NAME "flutter_assets") +install(CODE " + file(REMOVE_RECURSE \"${INSTALL_BUNDLE_DATA_DIR}/${FLUTTER_ASSET_DIR_NAME}\") + " COMPONENT Runtime) +install(DIRECTORY "${PROJECT_BUILD_DIR}/${FLUTTER_ASSET_DIR_NAME}" + DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" COMPONENT Runtime) + +# Install the AOT library on non-Debug builds only. +install(FILES "${AOT_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" + CONFIGURATIONS Profile;Release + COMPONENT Runtime) diff --git a/apps/chanora_flutter/windows/flutter/CMakeLists.txt b/apps/chanora_flutter/windows/flutter/CMakeLists.txt new file mode 100644 index 0000000..903f489 --- /dev/null +++ b/apps/chanora_flutter/windows/flutter/CMakeLists.txt @@ -0,0 +1,109 @@ +# This file controls Flutter-level build steps. It should not be edited. +cmake_minimum_required(VERSION 3.14) + +set(EPHEMERAL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/ephemeral") + +# Configuration provided via flutter tool. +include(${EPHEMERAL_DIR}/generated_config.cmake) + +# TODO: Move the rest of this into files in ephemeral. See +# https://github.com/flutter/flutter/issues/57146. +set(WRAPPER_ROOT "${EPHEMERAL_DIR}/cpp_client_wrapper") + +# Set fallback configurations for older versions of the flutter tool. +if (NOT DEFINED FLUTTER_TARGET_PLATFORM) + set(FLUTTER_TARGET_PLATFORM "windows-x64") +endif() + +# === Flutter Library === +set(FLUTTER_LIBRARY "${EPHEMERAL_DIR}/flutter_windows.dll") + +# Published to parent scope for install step. +set(FLUTTER_LIBRARY ${FLUTTER_LIBRARY} PARENT_SCOPE) +set(FLUTTER_ICU_DATA_FILE "${EPHEMERAL_DIR}/icudtl.dat" PARENT_SCOPE) +set(PROJECT_BUILD_DIR "${PROJECT_DIR}/build/" PARENT_SCOPE) +set(AOT_LIBRARY "${PROJECT_DIR}/build/windows/app.so" PARENT_SCOPE) + +list(APPEND FLUTTER_LIBRARY_HEADERS + "flutter_export.h" + "flutter_windows.h" + "flutter_messenger.h" + "flutter_plugin_registrar.h" + "flutter_texture_registrar.h" +) +list(TRANSFORM FLUTTER_LIBRARY_HEADERS PREPEND "${EPHEMERAL_DIR}/") +add_library(flutter INTERFACE) +target_include_directories(flutter INTERFACE + "${EPHEMERAL_DIR}" +) +target_link_libraries(flutter INTERFACE "${FLUTTER_LIBRARY}.lib") +add_dependencies(flutter flutter_assemble) + +# === Wrapper === +list(APPEND CPP_WRAPPER_SOURCES_CORE + "core_implementations.cc" + "standard_codec.cc" +) +list(TRANSFORM CPP_WRAPPER_SOURCES_CORE PREPEND "${WRAPPER_ROOT}/") +list(APPEND CPP_WRAPPER_SOURCES_PLUGIN + "plugin_registrar.cc" +) +list(TRANSFORM CPP_WRAPPER_SOURCES_PLUGIN PREPEND "${WRAPPER_ROOT}/") +list(APPEND CPP_WRAPPER_SOURCES_APP + "flutter_engine.cc" + "flutter_view_controller.cc" +) +list(TRANSFORM CPP_WRAPPER_SOURCES_APP PREPEND "${WRAPPER_ROOT}/") + +# Wrapper sources needed for a plugin. +add_library(flutter_wrapper_plugin STATIC + ${CPP_WRAPPER_SOURCES_CORE} + ${CPP_WRAPPER_SOURCES_PLUGIN} +) +apply_standard_settings(flutter_wrapper_plugin) +set_target_properties(flutter_wrapper_plugin PROPERTIES + POSITION_INDEPENDENT_CODE ON) +set_target_properties(flutter_wrapper_plugin PROPERTIES + CXX_VISIBILITY_PRESET hidden) +target_link_libraries(flutter_wrapper_plugin PUBLIC flutter) +target_include_directories(flutter_wrapper_plugin PUBLIC + "${WRAPPER_ROOT}/include" +) +add_dependencies(flutter_wrapper_plugin flutter_assemble) + +# Wrapper sources needed for the runner. +add_library(flutter_wrapper_app STATIC + ${CPP_WRAPPER_SOURCES_CORE} + ${CPP_WRAPPER_SOURCES_APP} +) +apply_standard_settings(flutter_wrapper_app) +target_link_libraries(flutter_wrapper_app PUBLIC flutter) +target_include_directories(flutter_wrapper_app PUBLIC + "${WRAPPER_ROOT}/include" +) +add_dependencies(flutter_wrapper_app flutter_assemble) + +# === Flutter tool backend === +# _phony_ is a non-existent file to force this command to run every time, +# since currently there's no way to get a full input/output list from the +# flutter tool. +set(PHONY_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/_phony_") +set_source_files_properties("${PHONY_OUTPUT}" PROPERTIES SYMBOLIC TRUE) +add_custom_command( + OUTPUT ${FLUTTER_LIBRARY} ${FLUTTER_LIBRARY_HEADERS} + ${CPP_WRAPPER_SOURCES_CORE} ${CPP_WRAPPER_SOURCES_PLUGIN} + ${CPP_WRAPPER_SOURCES_APP} + ${PHONY_OUTPUT} + COMMAND ${CMAKE_COMMAND} -E env + ${FLUTTER_TOOL_ENVIRONMENT} + "${FLUTTER_ROOT}/packages/flutter_tools/bin/tool_backend.bat" + ${FLUTTER_TARGET_PLATFORM} $ + VERBATIM +) +add_custom_target(flutter_assemble DEPENDS + "${FLUTTER_LIBRARY}" + ${FLUTTER_LIBRARY_HEADERS} + ${CPP_WRAPPER_SOURCES_CORE} + ${CPP_WRAPPER_SOURCES_PLUGIN} + ${CPP_WRAPPER_SOURCES_APP} +) diff --git a/apps/chanora_flutter/windows/flutter/generated_plugins.cmake b/apps/chanora_flutter/windows/flutter/generated_plugins.cmake new file mode 100644 index 0000000..7e0ec45 --- /dev/null +++ b/apps/chanora_flutter/windows/flutter/generated_plugins.cmake @@ -0,0 +1,25 @@ +# +# Generated file, do not edit. +# + +list(APPEND FLUTTER_PLUGIN_LIST + connectivity_plus +) + +list(APPEND FLUTTER_FFI_PLUGIN_LIST + jni +) + +set(PLUGIN_BUNDLED_LIBRARIES) + +foreach(plugin ${FLUTTER_PLUGIN_LIST}) + add_subdirectory(flutter/ephemeral/.plugin_symlinks/${plugin}/windows plugins/${plugin}) + target_link_libraries(${BINARY_NAME} PRIVATE ${plugin}_plugin) + list(APPEND PLUGIN_BUNDLED_LIBRARIES $) + list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries}) +endforeach(plugin) + +foreach(ffi_plugin ${FLUTTER_FFI_PLUGIN_LIST}) + add_subdirectory(flutter/ephemeral/.plugin_symlinks/${ffi_plugin}/windows plugins/${ffi_plugin}) + list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${ffi_plugin}_bundled_libraries}) +endforeach(ffi_plugin) diff --git a/apps/chanora_flutter/windows/runner/CMakeLists.txt b/apps/chanora_flutter/windows/runner/CMakeLists.txt new file mode 100644 index 0000000..394917c --- /dev/null +++ b/apps/chanora_flutter/windows/runner/CMakeLists.txt @@ -0,0 +1,40 @@ +cmake_minimum_required(VERSION 3.14) +project(runner LANGUAGES CXX) + +# Define the application target. To change its name, change BINARY_NAME in the +# top-level CMakeLists.txt, not the value here, or `flutter run` will no longer +# work. +# +# Any new source files that you add to the application should be added here. +add_executable(${BINARY_NAME} WIN32 + "flutter_window.cpp" + "main.cpp" + "utils.cpp" + "win32_window.cpp" + "${FLUTTER_MANAGED_DIR}/generated_plugin_registrant.cc" + "Runner.rc" + "runner.exe.manifest" +) + +# Apply the standard set of build settings. This can be removed for applications +# that need different build settings. +apply_standard_settings(${BINARY_NAME}) + +# Add preprocessor definitions for the build version. +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION=\"${FLUTTER_VERSION}\"") +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_MAJOR=${FLUTTER_VERSION_MAJOR}") +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_MINOR=${FLUTTER_VERSION_MINOR}") +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_PATCH=${FLUTTER_VERSION_PATCH}") +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_BUILD=${FLUTTER_VERSION_BUILD}") + +# Disable Windows macros that collide with C++ standard library functions. +target_compile_definitions(${BINARY_NAME} PRIVATE "NOMINMAX") + +# Add dependency libraries and include directories. Add any application-specific +# dependencies here. +target_link_libraries(${BINARY_NAME} PRIVATE flutter flutter_wrapper_app) +target_link_libraries(${BINARY_NAME} PRIVATE "dwmapi.lib") +target_include_directories(${BINARY_NAME} PRIVATE "${CMAKE_SOURCE_DIR}") + +# Run the Flutter tool portions of the build. This must not be removed. +add_dependencies(${BINARY_NAME} flutter_assemble) diff --git a/apps/chanora_flutter/windows/runner/Runner.rc b/apps/chanora_flutter/windows/runner/Runner.rc new file mode 100644 index 0000000..6001d70 --- /dev/null +++ b/apps/chanora_flutter/windows/runner/Runner.rc @@ -0,0 +1,121 @@ +// Microsoft Visual C++ generated resource script. +// +#pragma code_page(65001) +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include "winres.h" + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// English (United States) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE +BEGIN + "#include ""winres.h""\r\n" + "\0" +END + +3 TEXTINCLUDE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// +// Icon +// + +// Icon with lowest ID value placed first to ensure application icon +// remains consistent on all systems. +IDI_APP_ICON ICON "resources\\app_icon.ico" + + +///////////////////////////////////////////////////////////////////////////// +// +// Version +// + +#if defined(FLUTTER_VERSION_MAJOR) && defined(FLUTTER_VERSION_MINOR) && defined(FLUTTER_VERSION_PATCH) && defined(FLUTTER_VERSION_BUILD) +#define VERSION_AS_NUMBER FLUTTER_VERSION_MAJOR,FLUTTER_VERSION_MINOR,FLUTTER_VERSION_PATCH,FLUTTER_VERSION_BUILD +#else +#define VERSION_AS_NUMBER 1,0,0,0 +#endif + +#if defined(FLUTTER_VERSION) +#define VERSION_AS_STRING FLUTTER_VERSION +#else +#define VERSION_AS_STRING "0.2.0" +#endif + +VS_VERSION_INFO VERSIONINFO + FILEVERSION VERSION_AS_NUMBER + PRODUCTVERSION VERSION_AS_NUMBER + FILEFLAGSMASK VS_FFI_FILEFLAGSMASK +#ifdef _DEBUG + FILEFLAGS VS_FF_DEBUG +#else + FILEFLAGS 0x0L +#endif + FILEOS VOS__WINDOWS32 + FILETYPE VFT_APP + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904e4" + BEGIN + VALUE "CompanyName", "app.chanora" "\0" + VALUE "FileDescription", "chanora_flutter" "\0" + VALUE "FileVersion", VERSION_AS_STRING "0.2.0" + VALUE "InternalName", "chanora_flutter" "\0" + VALUE "LegalCopyright", "Copyright (C) 2026 app.chanora. All rights reserved." "\0" + VALUE "OriginalFilename", "chanora_flutter.exe" "\0" + VALUE "ProductName", "chanora_flutter" "\0" + VALUE "ProductVersion", VERSION_AS_STRING "0.2.0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1252 + END +END + +#endif // English (United States) resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED diff --git a/apps/chanora_flutter/windows/runner/flutter_window.cpp b/apps/chanora_flutter/windows/runner/flutter_window.cpp new file mode 100644 index 0000000..955ee30 --- /dev/null +++ b/apps/chanora_flutter/windows/runner/flutter_window.cpp @@ -0,0 +1,71 @@ +#include "flutter_window.h" + +#include + +#include "flutter/generated_plugin_registrant.h" + +FlutterWindow::FlutterWindow(const flutter::DartProject& project) + : project_(project) {} + +FlutterWindow::~FlutterWindow() {} + +bool FlutterWindow::OnCreate() { + if (!Win32Window::OnCreate()) { + return false; + } + + RECT frame = GetClientArea(); + + // The size here must match the window dimensions to avoid unnecessary surface + // creation / destruction in the startup path. + flutter_controller_ = std::make_unique( + frame.right - frame.left, frame.bottom - frame.top, project_); + // Ensure that basic setup of the controller was successful. + if (!flutter_controller_->engine() || !flutter_controller_->view()) { + return false; + } + RegisterPlugins(flutter_controller_->engine()); + SetChildContent(flutter_controller_->view()->GetNativeWindow()); + + flutter_controller_->engine()->SetNextFrameCallback([&]() { + this->Show(); + }); + + // Flutter can complete the first frame before the "show window" callback is + // registered. The following call ensures a frame is pending to ensure the + // window is shown. It is a no-op if the first frame hasn't completed yet. + flutter_controller_->ForceRedraw(); + + return true; +} + +void FlutterWindow::OnDestroy() { + if (flutter_controller_) { + flutter_controller_ = nullptr; + } + + Win32Window::OnDestroy(); +} + +LRESULT +FlutterWindow::MessageHandler(HWND hwnd, UINT const message, + WPARAM const wparam, + LPARAM const lparam) noexcept { + // Give Flutter, including plugins, an opportunity to handle window messages. + if (flutter_controller_) { + std::optional result = + flutter_controller_->HandleTopLevelWindowProc(hwnd, message, wparam, + lparam); + if (result) { + return *result; + } + } + + switch (message) { + case WM_FONTCHANGE: + flutter_controller_->engine()->ReloadSystemFonts(); + break; + } + + return Win32Window::MessageHandler(hwnd, message, wparam, lparam); +} diff --git a/apps/chanora_flutter/windows/runner/flutter_window.h b/apps/chanora_flutter/windows/runner/flutter_window.h new file mode 100644 index 0000000..6da0652 --- /dev/null +++ b/apps/chanora_flutter/windows/runner/flutter_window.h @@ -0,0 +1,33 @@ +#ifndef RUNNER_FLUTTER_WINDOW_H_ +#define RUNNER_FLUTTER_WINDOW_H_ + +#include +#include + +#include + +#include "win32_window.h" + +// A window that does nothing but host a Flutter view. +class FlutterWindow : public Win32Window { + public: + // Creates a new FlutterWindow hosting a Flutter view running |project|. + explicit FlutterWindow(const flutter::DartProject& project); + virtual ~FlutterWindow(); + + protected: + // Win32Window: + bool OnCreate() override; + void OnDestroy() override; + LRESULT MessageHandler(HWND window, UINT const message, WPARAM const wparam, + LPARAM const lparam) noexcept override; + + private: + // The project to run. + flutter::DartProject project_; + + // The Flutter instance hosted by this window. + std::unique_ptr flutter_controller_; +}; + +#endif // RUNNER_FLUTTER_WINDOW_H_ diff --git a/apps/chanora_flutter/windows/runner/main.cpp b/apps/chanora_flutter/windows/runner/main.cpp new file mode 100644 index 0000000..eab4ab2 --- /dev/null +++ b/apps/chanora_flutter/windows/runner/main.cpp @@ -0,0 +1,43 @@ +#include +#include +#include + +#include "flutter_window.h" +#include "utils.h" + +int APIENTRY wWinMain(_In_ HINSTANCE instance, _In_opt_ HINSTANCE prev, + _In_ wchar_t *command_line, _In_ int show_command) { + // Attach to console when present (e.g., 'flutter run') or create a + // new console when running with a debugger. + if (!::AttachConsole(ATTACH_PARENT_PROCESS) && ::IsDebuggerPresent()) { + CreateAndAttachConsole(); + } + + // Initialize COM, so that it is available for use in the library and/or + // plugins. + ::CoInitializeEx(nullptr, COINIT_APARTMENTTHREADED); + + flutter::DartProject project(L"data"); + + std::vector command_line_arguments = + GetCommandLineArguments(); + + project.set_dart_entrypoint_arguments(std::move(command_line_arguments)); + + FlutterWindow window(project); + Win32Window::Point origin(10, 10); + Win32Window::Size size(1280, 720); + if (!window.Create(L"chanora_flutter", origin, size)) { + return EXIT_FAILURE; + } + window.SetQuitOnClose(true); + + ::MSG msg; + while (::GetMessage(&msg, nullptr, 0, 0)) { + ::TranslateMessage(&msg); + ::DispatchMessage(&msg); + } + + ::CoUninitialize(); + return EXIT_SUCCESS; +} diff --git a/apps/chanora_flutter/windows/runner/resource.h b/apps/chanora_flutter/windows/runner/resource.h new file mode 100644 index 0000000..66a65d1 --- /dev/null +++ b/apps/chanora_flutter/windows/runner/resource.h @@ -0,0 +1,16 @@ +//{{NO_DEPENDENCIES}} +// Microsoft Visual C++ generated include file. +// Used by Runner.rc +// +#define IDI_APP_ICON 101 + +// Next default values for new objects +// +#ifdef APSTUDIO_INVOKED +#ifndef APSTUDIO_READONLY_SYMBOLS +#define _APS_NEXT_RESOURCE_VALUE 102 +#define _APS_NEXT_COMMAND_VALUE 40001 +#define _APS_NEXT_CONTROL_VALUE 1001 +#define _APS_NEXT_SYMED_VALUE 101 +#endif +#endif diff --git a/apps/chanora_flutter/windows/runner/resources/app_icon.ico b/apps/chanora_flutter/windows/runner/resources/app_icon.ico new file mode 100644 index 0000000..c04e20c Binary files /dev/null and b/apps/chanora_flutter/windows/runner/resources/app_icon.ico differ diff --git a/apps/chanora_flutter/windows/runner/runner.exe.manifest b/apps/chanora_flutter/windows/runner/runner.exe.manifest new file mode 100644 index 0000000..153653e --- /dev/null +++ b/apps/chanora_flutter/windows/runner/runner.exe.manifest @@ -0,0 +1,14 @@ + + + + + PerMonitorV2 + + + + + + + + + diff --git a/apps/chanora_flutter/windows/runner/utils.cpp b/apps/chanora_flutter/windows/runner/utils.cpp new file mode 100644 index 0000000..3a0b465 --- /dev/null +++ b/apps/chanora_flutter/windows/runner/utils.cpp @@ -0,0 +1,65 @@ +#include "utils.h" + +#include +#include +#include +#include + +#include + +void CreateAndAttachConsole() { + if (::AllocConsole()) { + FILE *unused; + if (freopen_s(&unused, "CONOUT$", "w", stdout)) { + _dup2(_fileno(stdout), 1); + } + if (freopen_s(&unused, "CONOUT$", "w", stderr)) { + _dup2(_fileno(stdout), 2); + } + std::ios::sync_with_stdio(); + FlutterDesktopResyncOutputStreams(); + } +} + +std::vector GetCommandLineArguments() { + // Convert the UTF-16 command line arguments to UTF-8 for the Engine to use. + int argc; + wchar_t** argv = ::CommandLineToArgvW(::GetCommandLineW(), &argc); + if (argv == nullptr) { + return std::vector(); + } + + std::vector command_line_arguments; + + // Skip the first argument as it's the binary name. + for (int i = 1; i < argc; i++) { + command_line_arguments.push_back(Utf8FromUtf16(argv[i])); + } + + ::LocalFree(argv); + + return command_line_arguments; +} + +std::string Utf8FromUtf16(const wchar_t* utf16_string) { + if (utf16_string == nullptr) { + return std::string(); + } + unsigned int target_length = ::WideCharToMultiByte( + CP_UTF8, WC_ERR_INVALID_CHARS, utf16_string, + -1, nullptr, 0, nullptr, nullptr) + -1; // remove the trailing null character + int input_length = (int)wcslen(utf16_string); + std::string utf8_string; + if (target_length == 0 || target_length > utf8_string.max_size()) { + return utf8_string; + } + utf8_string.resize(target_length); + int converted_length = ::WideCharToMultiByte( + CP_UTF8, WC_ERR_INVALID_CHARS, utf16_string, + input_length, utf8_string.data(), target_length, nullptr, nullptr); + if (converted_length == 0) { + return std::string(); + } + return utf8_string; +} diff --git a/apps/chanora_flutter/windows/runner/utils.h b/apps/chanora_flutter/windows/runner/utils.h new file mode 100644 index 0000000..3879d54 --- /dev/null +++ b/apps/chanora_flutter/windows/runner/utils.h @@ -0,0 +1,19 @@ +#ifndef RUNNER_UTILS_H_ +#define RUNNER_UTILS_H_ + +#include +#include + +// Creates a console for the process, and redirects stdout and stderr to +// it for both the runner and the Flutter library. +void CreateAndAttachConsole(); + +// Takes a null-terminated wchar_t* encoded in UTF-16 and returns a std::string +// encoded in UTF-8. Returns an empty std::string on failure. +std::string Utf8FromUtf16(const wchar_t* utf16_string); + +// Gets the command line arguments passed in as a std::vector, +// encoded in UTF-8. Returns an empty std::vector on failure. +std::vector GetCommandLineArguments(); + +#endif // RUNNER_UTILS_H_ diff --git a/apps/chanora_flutter/windows/runner/win32_window.cpp b/apps/chanora_flutter/windows/runner/win32_window.cpp new file mode 100644 index 0000000..60608d0 --- /dev/null +++ b/apps/chanora_flutter/windows/runner/win32_window.cpp @@ -0,0 +1,288 @@ +#include "win32_window.h" + +#include +#include + +#include "resource.h" + +namespace { + +/// Window attribute that enables dark mode window decorations. +/// +/// Redefined in case the developer's machine has a Windows SDK older than +/// version 10.0.22000.0. +/// See: https://docs.microsoft.com/windows/win32/api/dwmapi/ne-dwmapi-dwmwindowattribute +#ifndef DWMWA_USE_IMMERSIVE_DARK_MODE +#define DWMWA_USE_IMMERSIVE_DARK_MODE 20 +#endif + +constexpr const wchar_t kWindowClassName[] = L"FLUTTER_RUNNER_WIN32_WINDOW"; + +/// Registry key for app theme preference. +/// +/// A value of 0 indicates apps should use dark mode. A non-zero or missing +/// value indicates apps should use light mode. +constexpr const wchar_t kGetPreferredBrightnessRegKey[] = + L"Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize"; +constexpr const wchar_t kGetPreferredBrightnessRegValue[] = L"AppsUseLightTheme"; + +// The number of Win32Window objects that currently exist. +static int g_active_window_count = 0; + +using EnableNonClientDpiScaling = BOOL __stdcall(HWND hwnd); + +// Scale helper to convert logical scaler values to physical using passed in +// scale factor +int Scale(int source, double scale_factor) { + return static_cast(source * scale_factor); +} + +// Dynamically loads the |EnableNonClientDpiScaling| from the User32 module. +// This API is only needed for PerMonitor V1 awareness mode. +void EnableFullDpiSupportIfAvailable(HWND hwnd) { + HMODULE user32_module = LoadLibraryA("User32.dll"); + if (!user32_module) { + return; + } + auto enable_non_client_dpi_scaling = + reinterpret_cast( + GetProcAddress(user32_module, "EnableNonClientDpiScaling")); + if (enable_non_client_dpi_scaling != nullptr) { + enable_non_client_dpi_scaling(hwnd); + } + FreeLibrary(user32_module); +} + +} // namespace + +// Manages the Win32Window's window class registration. +class WindowClassRegistrar { + public: + ~WindowClassRegistrar() = default; + + // Returns the singleton registrar instance. + static WindowClassRegistrar* GetInstance() { + if (!instance_) { + instance_ = new WindowClassRegistrar(); + } + return instance_; + } + + // Returns the name of the window class, registering the class if it hasn't + // previously been registered. + const wchar_t* GetWindowClass(); + + // Unregisters the window class. Should only be called if there are no + // instances of the window. + void UnregisterWindowClass(); + + private: + WindowClassRegistrar() = default; + + static WindowClassRegistrar* instance_; + + bool class_registered_ = false; +}; + +WindowClassRegistrar* WindowClassRegistrar::instance_ = nullptr; + +const wchar_t* WindowClassRegistrar::GetWindowClass() { + if (!class_registered_) { + WNDCLASS window_class{}; + window_class.hCursor = LoadCursor(nullptr, IDC_ARROW); + window_class.lpszClassName = kWindowClassName; + window_class.style = CS_HREDRAW | CS_VREDRAW; + window_class.cbClsExtra = 0; + window_class.cbWndExtra = 0; + window_class.hInstance = GetModuleHandle(nullptr); + window_class.hIcon = + LoadIcon(window_class.hInstance, MAKEINTRESOURCE(IDI_APP_ICON)); + window_class.hbrBackground = 0; + window_class.lpszMenuName = nullptr; + window_class.lpfnWndProc = Win32Window::WndProc; + RegisterClass(&window_class); + class_registered_ = true; + } + return kWindowClassName; +} + +void WindowClassRegistrar::UnregisterWindowClass() { + UnregisterClass(kWindowClassName, nullptr); + class_registered_ = false; +} + +Win32Window::Win32Window() { + ++g_active_window_count; +} + +Win32Window::~Win32Window() { + --g_active_window_count; + Destroy(); +} + +bool Win32Window::Create(const std::wstring& title, + const Point& origin, + const Size& size) { + Destroy(); + + const wchar_t* window_class = + WindowClassRegistrar::GetInstance()->GetWindowClass(); + + const POINT target_point = {static_cast(origin.x), + static_cast(origin.y)}; + HMONITOR monitor = MonitorFromPoint(target_point, MONITOR_DEFAULTTONEAREST); + UINT dpi = FlutterDesktopGetDpiForMonitor(monitor); + double scale_factor = dpi / 96.0; + + HWND window = CreateWindow( + window_class, title.c_str(), WS_OVERLAPPEDWINDOW, + Scale(origin.x, scale_factor), Scale(origin.y, scale_factor), + Scale(size.width, scale_factor), Scale(size.height, scale_factor), + nullptr, nullptr, GetModuleHandle(nullptr), this); + + if (!window) { + return false; + } + + UpdateTheme(window); + + return OnCreate(); +} + +bool Win32Window::Show() { + return ShowWindow(window_handle_, SW_SHOWNORMAL); +} + +// static +LRESULT CALLBACK Win32Window::WndProc(HWND const window, + UINT const message, + WPARAM const wparam, + LPARAM const lparam) noexcept { + if (message == WM_NCCREATE) { + auto window_struct = reinterpret_cast(lparam); + SetWindowLongPtr(window, GWLP_USERDATA, + reinterpret_cast(window_struct->lpCreateParams)); + + auto that = static_cast(window_struct->lpCreateParams); + EnableFullDpiSupportIfAvailable(window); + that->window_handle_ = window; + } else if (Win32Window* that = GetThisFromHandle(window)) { + return that->MessageHandler(window, message, wparam, lparam); + } + + return DefWindowProc(window, message, wparam, lparam); +} + +LRESULT +Win32Window::MessageHandler(HWND hwnd, + UINT const message, + WPARAM const wparam, + LPARAM const lparam) noexcept { + switch (message) { + case WM_DESTROY: + window_handle_ = nullptr; + Destroy(); + if (quit_on_close_) { + PostQuitMessage(0); + } + return 0; + + case WM_DPICHANGED: { + auto newRectSize = reinterpret_cast(lparam); + LONG newWidth = newRectSize->right - newRectSize->left; + LONG newHeight = newRectSize->bottom - newRectSize->top; + + SetWindowPos(hwnd, nullptr, newRectSize->left, newRectSize->top, newWidth, + newHeight, SWP_NOZORDER | SWP_NOACTIVATE); + + return 0; + } + case WM_SIZE: { + RECT rect = GetClientArea(); + if (child_content_ != nullptr) { + // Size and position the child window. + MoveWindow(child_content_, rect.left, rect.top, rect.right - rect.left, + rect.bottom - rect.top, TRUE); + } + return 0; + } + + case WM_ACTIVATE: + if (child_content_ != nullptr) { + SetFocus(child_content_); + } + return 0; + + case WM_DWMCOLORIZATIONCOLORCHANGED: + UpdateTheme(hwnd); + return 0; + } + + return DefWindowProc(window_handle_, message, wparam, lparam); +} + +void Win32Window::Destroy() { + OnDestroy(); + + if (window_handle_) { + DestroyWindow(window_handle_); + window_handle_ = nullptr; + } + if (g_active_window_count == 0) { + WindowClassRegistrar::GetInstance()->UnregisterWindowClass(); + } +} + +Win32Window* Win32Window::GetThisFromHandle(HWND const window) noexcept { + return reinterpret_cast( + GetWindowLongPtr(window, GWLP_USERDATA)); +} + +void Win32Window::SetChildContent(HWND content) { + child_content_ = content; + SetParent(content, window_handle_); + RECT frame = GetClientArea(); + + MoveWindow(content, frame.left, frame.top, frame.right - frame.left, + frame.bottom - frame.top, true); + + SetFocus(child_content_); +} + +RECT Win32Window::GetClientArea() { + RECT frame; + GetClientRect(window_handle_, &frame); + return frame; +} + +HWND Win32Window::GetHandle() { + return window_handle_; +} + +void Win32Window::SetQuitOnClose(bool quit_on_close) { + quit_on_close_ = quit_on_close; +} + +bool Win32Window::OnCreate() { + // No-op; provided for subclasses. + return true; +} + +void Win32Window::OnDestroy() { + // No-op; provided for subclasses. +} + +void Win32Window::UpdateTheme(HWND const window) { + DWORD light_mode; + DWORD light_mode_size = sizeof(light_mode); + LSTATUS result = RegGetValue(HKEY_CURRENT_USER, kGetPreferredBrightnessRegKey, + kGetPreferredBrightnessRegValue, + RRF_RT_REG_DWORD, nullptr, &light_mode, + &light_mode_size); + + if (result == ERROR_SUCCESS) { + BOOL enable_dark_mode = light_mode == 0; + DwmSetWindowAttribute(window, DWMWA_USE_IMMERSIVE_DARK_MODE, + &enable_dark_mode, sizeof(enable_dark_mode)); + } +} diff --git a/apps/chanora_flutter/windows/runner/win32_window.h b/apps/chanora_flutter/windows/runner/win32_window.h new file mode 100644 index 0000000..e901dde --- /dev/null +++ b/apps/chanora_flutter/windows/runner/win32_window.h @@ -0,0 +1,102 @@ +#ifndef RUNNER_WIN32_WINDOW_H_ +#define RUNNER_WIN32_WINDOW_H_ + +#include + +#include +#include +#include + +// A class abstraction for a high DPI-aware Win32 Window. Intended to be +// inherited from by classes that wish to specialize with custom +// rendering and input handling +class Win32Window { + public: + struct Point { + unsigned int x; + unsigned int y; + Point(unsigned int x, unsigned int y) : x(x), y(y) {} + }; + + struct Size { + unsigned int width; + unsigned int height; + Size(unsigned int width, unsigned int height) + : width(width), height(height) {} + }; + + Win32Window(); + virtual ~Win32Window(); + + // Creates a win32 window with |title| that is positioned and sized using + // |origin| and |size|. New windows are created on the default monitor. Window + // sizes are specified to the OS in physical pixels, hence to ensure a + // consistent size this function will scale the inputted width and height as + // as appropriate for the default monitor. The window is invisible until + // |Show| is called. Returns true if the window was created successfully. + bool Create(const std::wstring& title, const Point& origin, const Size& size); + + // Show the current window. Returns true if the window was successfully shown. + bool Show(); + + // Release OS resources associated with window. + void Destroy(); + + // Inserts |content| into the window tree. + void SetChildContent(HWND content); + + // Returns the backing Window handle to enable clients to set icon and other + // window properties. Returns nullptr if the window has been destroyed. + HWND GetHandle(); + + // If true, closing this window will quit the application. + void SetQuitOnClose(bool quit_on_close); + + // Return a RECT representing the bounds of the current client area. + RECT GetClientArea(); + + protected: + // Processes and route salient window messages for mouse handling, + // size change and DPI. Delegates handling of these to member overloads that + // inheriting classes can handle. + virtual LRESULT MessageHandler(HWND window, + UINT const message, + WPARAM const wparam, + LPARAM const lparam) noexcept; + + // Called when CreateAndShow is called, allowing subclass window-related + // setup. Subclasses should return false if setup fails. + virtual bool OnCreate(); + + // Called when Destroy is called. + virtual void OnDestroy(); + + private: + friend class WindowClassRegistrar; + + // OS callback called by message pump. Handles the WM_NCCREATE message which + // is passed when the non-client area is being created and enables automatic + // non-client DPI scaling so that the non-client area automatically + // responds to changes in DPI. All other messages are handled by + // MessageHandler. + static LRESULT CALLBACK WndProc(HWND const window, + UINT const message, + WPARAM const wparam, + LPARAM const lparam) noexcept; + + // Retrieves a class instance pointer for |window| + static Win32Window* GetThisFromHandle(HWND const window) noexcept; + + // Update the window frame's theme to match the system theme. + static void UpdateTheme(HWND const window); + + bool quit_on_close_ = false; + + // window handle for top level window. + HWND window_handle_ = nullptr; + + // window handle for hosted content. + HWND child_content_ = nullptr; +}; + +#endif // RUNNER_WIN32_WINDOW_H_ diff --git a/tools/sync-version.sh b/tools/sync-version.sh new file mode 100755 index 0000000..7262819 --- /dev/null +++ b/tools/sync-version.sh @@ -0,0 +1,79 @@ +#!/usr/bin/env bash +# sync-version.sh — Synchronize version across the project. +# +# Source of truth: apps/chanora_flutter/pubspec.yaml +# Format: X.Y.Z-pre.N+BUILD (e.g., 0.2.0-beta.1+75) +# +# Derived files: +# Cargo.toml (workspace version) +# ios/Runner.xcodeproj/project.pbxproj (MARKETING_VERSION) +# macos/Runner.xcodeproj/project.pbxproj (MARKETING_VERSION) — if exists +# windows/Runner/Runner.rc (VERSION_AS_STRING) +# tools/build-ios.sh (VERSION) +# tools/build-windows.ps1 ($Version) +# +# Usage: +# ./tools/sync-version.sh # read from pubspec, write to all +# ./tools/sync-version.sh 0.3.0-rc.1+80 # set version, then sync + +set -euo pipefail +cd "$(dirname "$0")/.." + +# --- Parse or set version --- +if [[ $# -gt 0 ]]; then + NEW_VERSION="$1" + # Update pubspec.yaml + sed -i '' "s/^version: .*/version: ${NEW_VERSION}/" apps/chanora_flutter/pubspec.yaml + echo "Set pubspec.yaml version to ${NEW_VERSION}" +else + NEW_VERSION=$(grep '^version:' apps/chanora_flutter/pubspec.yaml | sed 's/version: //') + echo "Using pubspec.yaml version: ${NEW_VERSION}" +fi + +# --- Split version into components --- +# pubspec format: X.Y.Z-tag+BUILD (Flutter uses + for build number) +FULL="${NEW_VERSION}" +BASE=$(echo "${FULL}" | sed 's/+.*//') # 0.2.0-beta.1 +MAJOR_MINOR_PATCH=$(echo "${BASE}" | sed 's/-.*//') # 0.2.0 +MARKETING=$(echo "${MAJOR_MINOR_PATCH}" | cut -d. -f1,2) # 0.2 +BUILD=$(echo "${FULL}" | sed 's/.*+//') # 75 +VVERSION="v${BASE}" # v0.2.0-beta.1 + +echo " Full: ${FULL}" +echo " Base: ${BASE}" +echo " Major.Minor.Patch: ${MAJOR_MINOR_PATCH}" +echo " Marketing: ${MARKETING}" +echo " Build: ${BUILD}" +echo " V-prefixed: ${VVERSION}" + +# --- Cargo.toml (workspace version = base without build number) --- +sed -i '' "s/^version = \".*\"/version = \"${BASE}\"/" Cargo.toml +echo "Updated Cargo.toml → ${BASE}" + +# --- iOS Xcode project (MARKETING_VERSION) --- +sed -i '' "s/MARKETING_VERSION = .*;/MARKETING_VERSION = ${MARKETING};/g" \ + apps/chanora_flutter/ios/Runner.xcodeproj/project.pbxproj +echo "Updated ios/Runner.xcodeproj → MARKETING_VERSION = ${MARKETING}" + +# --- macOS Xcode project (if exists) --- +if [[ -f apps/chanora_flutter/macos/Runner.xcodeproj/project.pbxproj ]]; then + sed -i '' "s/MARKETING_VERSION = .*;/MARKETING_VERSION = ${MARKETING};/g" \ + apps/chanora_flutter/macos/Runner.xcodeproj/project.pbxproj + echo "Updated macos/Runner.xcodeproj → MARKETING_VERSION = ${MARKETING}" +fi + +# --- Windows Runner.rc --- +sed -i '' "s/VERSION_AS_STRING \".*\"/VERSION_AS_STRING \"${MAJOR_MINOR_PATCH}\"/g" \ + apps/chanora_flutter/windows/Runner/Runner.rc +echo "Updated windows/Runner/Runner.rc → ${MAJOR_MINOR_PATCH}" + +# --- tools/build-ios.sh --- +sed -i '' "s/^VERSION=\".*\"/VERSION=\"${VVERSION}\"/" tools/build-ios.sh +echo "Updated tools/build-ios.sh → ${VVERSION}" + +# --- tools/build-windows.ps1 --- +sed -i '' "s/\$Version = '.*'/\$Version = '${VVERSION}'/" tools/build-windows.ps1 +echo "Updated tools/build-windows.ps1 → ${VVERSION}" + +echo "" +echo "All versions synced to ${FULL}" \ No newline at end of file