Merge pull request #25 from nini22P/move-focus

add move_focus for windows

Author: MoAlyousef

fltk-webview-sys/Cargo.toml

@@ -1,7 +1,10 @@
 [package]
 name = "fltk-webview-sys"
 version = "0.4.1"
-authors = ["MoAlyousef <mohammed.alyousef@neurosrg.com>", "Adia Robbie <adyaro37@gmail.com>"]
+authors = [
+  "MoAlyousef <mohammed.alyousef@neurosrg.com>",
+  "Adia Robbie <adyaro37@gmail.com>",
+]
 edition = "2018"
 description = "Webview for embedded fltk windows"
 repository = "https://github.com/fltk-rs/fltk-webview"
@@ -16,4 +19,6 @@ wv = "0.2.1"
 
 [build-dependencies]
 pkg-config = "0.3"
-cc = "1"
+cc = "1"
+serde = { version = "1", features = ["derive"] }
+serde_json = "1"

fltk-webview-sys/build.rs

@@ -1,15 +1,23 @@
+use serde::Deserialize;
+use std::path::PathBuf;
+use std::process::Command;
+
 fn main() {
     println!("cargo:rerun-if-changed=src/gtk_helper.c");
     println!("cargo:rerun-if-changed=src/cocoa_helper.m");
+    println!("cargo:rerun-if-changed=src/win32_helper.c");
 
     #[cfg(target_os = "macos")]
     compile_cocoa_helper();
 
-    #[cfg(not(any(target_os = "macos", target_os = "windows")))]
+    #[cfg(target_os = "linux")]
     compile_gtk_helper();
+
+    #[cfg(target_os = "windows")]
+    compile_win32_helper();
 }
 
-#[cfg(not(any(target_os = "macos", target_os = "windows")))]
+#[cfg(target_os = "linux")]
 fn compile_gtk_helper() {
     let cflags = std::process::Command::new("pkg-config")
         .args(&["--cflags", "gtk+-3.0"])
@@ -31,3 +39,53 @@ fn compile_cocoa_helper() {
     build.file("src/cocoa_helper.m");
     build.compile("cocoa");
 }
+
+#[cfg(target_os = "windows")]
+fn compile_win32_helper() {
+    let wv_sys_path = find_wv_sys_path();
+    let mut build = cc::Build::new();
+    build.file("src/win32_helper.c");
+    build.include(&wv_sys_path.join("libs\\include"));
+    build.include(&wv_sys_path.join("webview\\core\\include"));
+    build.compile("windows");
+}
+
+#[derive(Debug, Deserialize)]
+struct Metadata {
+    packages: Vec<Package>,
+}
+#[derive(Debug, Deserialize)]
+struct Package {
+    name: String,
+    manifest_path: PathBuf,
+}
+
+fn find_wv_sys_path() -> PathBuf {
+    let output = Command::new("cargo")
+        .arg("metadata")
+        .output()
+        .expect("Failed to run cargo metadata");
+
+    let metadata: Metadata =
+        serde_json::from_slice(&output.stdout).expect("Failed to parse cargo metadata");
+
+    let wv_sys_pkg = metadata
+        .packages
+        .into_iter()
+        .find(|pkg| pkg.name == "wv-sys")
+        .expect("Could not find 'wv-sys' package in metadata");
+
+    let path = wv_sys_pkg
+        .manifest_path
+        .parent()
+        .expect("manifest_path has no parent");
+
+    if !path.exists() {
+        panic!(
+            "Failed to find headers at: {}. wv-sys internal layout may have changed.",
+            path.display()
+        );
+    }
+
+    path.to_path_buf()
+}

fltk-webview-sys/src/win32_helper.c

@@ -0,0 +1,17 @@
+#include "webview.h"
+#include "WebView2.h"
+
+void move_focus(webview_t webview)
+{
+  if (webview)
+  {
+    ICoreWebView2Controller *controller_ptr =
+        (ICoreWebView2Controller *)webview_get_native_handle(
+            webview, WEBVIEW_NATIVE_HANDLE_KIND_BROWSER_CONTROLLER);
+    if (controller_ptr)
+    {
+      controller_ptr->lpVtbl->MoveFocus(
+          controller_ptr, COREWEBVIEW2_MOVE_FOCUS_REASON_PROGRAMMATIC);
+    }
+  }
+}

src/lib.rs

@@ -27,6 +27,9 @@ impl FromFltkWindow for Webview {
         unsafe {
             #[cfg(target_os = "windows")]
             {
+                extern "C" {
+                    pub fn move_focus(wv: *mut wv::webview_t);
+                }
                 extern "system" {
                     pub fn SetFocus(child: *mut ()) -> *mut ();
                     pub fn CoInitializeEx(pvReserved: *mut (), dwCoInit: u32) -> i32;
@@ -76,28 +79,28 @@ impl FromFltkWindow for Webview {
                     win.h(),
                     SWP_NOZORDER | SWP_NOACTIVATE | SWP_FRAMECHANGED,
                 );
+                move_focus(inner as *mut _);
                 win.resize_callback(move |w, _, _, _, _| {
                     wv::webview_set_size(inner, w.w(), w.h(), 3);
                 });
                 win.resize(win.x(), win.y(), win.w(), win.h());
-                win.handle(|w, ev| {
+                win.handle(move |_w, ev| {
                     if ev == enums::Event::Focus {
-                        SetFocus(w.raw_handle() as _);
+                        move_focus(inner as *mut _);
                         true
                     } else {
                         false
                     }
                 });
                 let mut topwin =
                     window::Window::from_widget_ptr(win.top_window().unwrap().as_widget_ptr());
-                // SetFocus(topwin.raw_handle() as _);
                 topwin.set_callback(|t| {
                     if app::event() == enums::Event::Close {
                         t.hide();
                     }
                 });
                 topwin.assume_derived();
-                topwin.handle(|w, ev| match ev {
+                topwin.handle(move |w, ev| match ev {
                     fltk::enums::Event::Push => {
                         SetFocus(w.raw_handle() as _);
                         true