@bobfrankston/msger 0.1.78 → 0.1.79

package/msger-native/Cargo.toml

@@ -9,3 +9,6 @@ tao = "0.30"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 image = "0.24"
+
+[target.'cfg(windows)'.dependencies]
+windows = { version = "0.58", features = ["Win32_UI_WindowsAndMessaging", "Win32_Foundation", "Win32_UI_Shell"] }

package/msger-native/src/main.rs

@@ -5,96 +5,56 @@ use tao::{
     event_loop::{ControlFlow, EventLoop},
     keyboard::KeyCode,
     window::WindowBuilder,
+    platform::windows::WindowExtWindows,
 };
 use wry::{WebViewBuilder, WebContext};
 
-// JavaScript API to inject into webviews
-const MSGER_JS_API: &str = r#"
-(function() {
-    console.log('[MSGER] Initializing msger API...');
-
-    // Check if IPC is available
-    const hasIPC = typeof window.ipc !== 'undefined' && window.ipc.postMessage;
-    console.log('[MSGER] IPC available:', hasIPC);
-
-    // Helper to safely send IPC messages
-    function safePostMessage(data) {
-        try {
-            if (!hasIPC) {
-                console.error('msger API: window.ipc not available');
-                return false;
-            }
-            window.ipc.postMessage(JSON.stringify(data));
-            return true;
-        } catch(e) {
-            console.error('msger API error:', e);
-            return false;
+#[cfg(windows)]
+use windows::Win32::UI::WindowsAndMessaging::{
+    GetSystemMenu, AppendMenuW, MF_STRING, MF_SEPARATOR, WM_SYSCOMMAND,
+};
+#[cfg(windows)]
+use windows::Win32::UI::Shell::{
+    SetWindowSubclass, DefSubclassProc,
+};
+#[cfg(windows)]
+use windows::Win32::Foundation::{HWND, LPARAM, WPARAM, LRESULT};
+#[cfg(windows)]
+use windows::core::PCWSTR;
+#[cfg(windows)]
+use std::sync::atomic::{AtomicBool, Ordering};
+
+// Custom menu ID for About item (must be < 0xF000 to avoid conflicts with system commands)
+#[cfg(windows)]
+const IDM_ABOUT: u32 = 0x1000;
+
+// Global flag to signal About menu was clicked
+#[cfg(windows)]
+static ABOUT_CLICKED: AtomicBool = AtomicBool::new(false);
+
+// Window subclass procedure to intercept WM_SYSCOMMAND
+#[cfg(windows)]
+unsafe extern "system" fn subclass_proc(
+    hwnd: HWND,
+    msg: u32,
+    wparam: WPARAM,
+    lparam: LPARAM,
+    _uidsubclass: usize,
+    _dwrefdata: usize,
+) -> LRESULT {
+    if msg == WM_SYSCOMMAND {
+        let cmd = wparam.0 & 0xFFF0;
+        if cmd == IDM_ABOUT as usize {
+            // Set flag that About was clicked
+            ABOUT_CLICKED.store(true, Ordering::SeqCst);
+            return LRESULT(0);
         }
     }
+    DefSubclassProc(hwnd, msg, wparam, lparam)
+}
 
-    window.msger = {
-        // Window control - only close() with window.close() workaround (IPC broken)
-        close: function(result) {
-            // IPC is broken in wry 0.47.2, so we use window.close() instead
-            // Result cannot be returned to parent process
-            try {
-                window.close();
-                return true;
-            } catch(e) {
-                console.error('window.close() failed:', e);
-                return false;
-            }
-        },
-        saveData: function(key, value) {
-            try {
-                localStorage.setItem('msger_' + key, JSON.stringify(value));
-                return true;
-            } catch(e) {
-                console.error('Failed to save data:', e);
-                return false;
-            }
-        },
-        loadData: function(key, defaultValue) {
-            try {
-                const item = localStorage.getItem('msger_' + key);
-                return item ? JSON.parse(item) : defaultValue;
-            } catch(e) {
-                console.error('Failed to load data:', e);
-                return defaultValue;
-            }
-        },
-        removeData: function(key) {
-            try {
-                localStorage.removeItem('msger_' + key);
-                return true;
-            } catch(e) {
-                console.error('Failed to remove data:', e);
-                return false;
-            }
-        },
-        clearData: function() {
-            try {
-                const keys = Object.keys(localStorage);
-                for (const key of keys) {
-                    if (key.startsWith('msger_')) {
-                        localStorage.removeItem(key);
-                    }
-                }
-                return true;
-            } catch(e) {
-                console.error('Failed to clear data:', e);
-                return false;
-            }
-        },
-        // Check if running in msger environment
-        isAvailable: function() {
-            return true;
-        }
-    };
-
-    console.log('[MSGER] API initialized successfully! window.msger =', window.msger);
-})();
-"#;
+// JavaScript API to inject into webviews
+const MSGER_JS_API: &str = include_str!("msger-api.js");
 
 #[derive(Deserialize, Debug)]
 #[serde(rename_all = "camelCase")]
@@ -359,6 +319,22 @@ fn main() {
         .build(&event_loop)
         .expect("Failed to create window"));
 
+    // Add About item to Windows system menu and install subclass
+    #[cfg(windows)]
+    unsafe {
+        let hwnd = HWND(window.hwnd() as *mut _);
+        let hmenu = GetSystemMenu(hwnd, false);
+        if !hmenu.is_invalid() {
+            // Add separator
+            AppendMenuW(hmenu, MF_SEPARATOR, 0, PCWSTR::null()).ok();
+            // Add About item
+            let about_text: Vec<u16> = "About (Window Info)\0".encode_utf16().collect();
+            AppendMenuW(hmenu, MF_STRING, IDM_ABOUT as usize, PCWSTR(about_text.as_ptr())).ok();
+        }
+        // Install window subclass to intercept WM_SYSCOMMAND
+        SetWindowSubclass(hwnd, Some(subclass_proc), 1, 0).ok();
+    }
+
     // Generate HTML
     let html = generate_html(&options);
 
@@ -488,6 +464,55 @@ fn main() {
 
     // Run event loop
     event_loop.run(move |event, _,control_flow| {
+        // Check for About menu click
+        #[cfg(windows)]
+        if ABOUT_CLICKED.swap(false, Ordering::SeqCst) {
+            // Get window information
+            let position = window_clone.outer_position().unwrap_or_default();
+            let inner_size = window_clone.inner_size();
+            let outer_size = window_clone.outer_size();
+            let scale_factor = window_clone.scale_factor();
+            let is_maximized = window_clone.is_maximized();
+            let is_fullscreen = window_clone.fullscreen().is_some();
+            let is_always_on_top = window_clone.is_always_on_top();
+
+            // Calculate logical sizes (what you specify in the API)
+            let logical_inner_width = (inner_size.width as f64 / scale_factor) as i32;
+            let logical_inner_height = (inner_size.height as f64 / scale_factor) as i32;
+            let logical_outer_width = (outer_size.width as f64 / scale_factor) as i32;
+            let logical_outer_height = (outer_size.height as f64 / scale_factor) as i32;
+
+            let info = format!(
+                "Window Information\\n\\n\
+                Position: x={}, y={}\\n\\n\
+                Logical Size (API): {}x{} inner\\n\
+                Physical Size (Screen): {}x{} inner\\n\
+                Outer Size (Physical): {}x{}\\n\
+                Outer Size (Logical): {}x{}\\n\\n\
+                Scale Factor: {:.2} ({}% DPI)\\n\
+                Maximized: {}\\n\
+                Fullscreen: {}\\n\
+                Always On Top: {}\\n\\n\
+                Version: {}",
+                position.x, position.y,
+                logical_inner_width, logical_inner_height,
+                inner_size.width, inner_size.height,
+                outer_size.width, outer_size.height,
+                logical_outer_width, logical_outer_height,
+                scale_factor, (scale_factor * 100.0) as i32,
+                is_maximized,
+                is_fullscreen,
+                is_always_on_top,
+                env!("NPM_VERSION")
+            );
+
+            // Show the info in an alert
+            let script = format!("alert('{}')", info);
+            if let Err(e) = webview.evaluate_script(&script) {
+                eprintln!("Failed to show about dialog: {}", e);
+            }
+        }
+
         // Check timeout
         if let Some(deadline) = timeout_instant {
             if std::time::Instant::now() >= deadline {

package/msger-native/src/msger-api.js

@@ -0,0 +1,84 @@
+(function() {
+    console.log('[MSGER] Initializing msger API...');
+
+    // Check if IPC is available
+    const hasIPC = typeof window.ipc !== 'undefined' && window.ipc.postMessage;
+    console.log('[MSGER] IPC available:', hasIPC);
+
+    // Helper to safely send IPC messages
+    function safePostMessage(data) {
+        try {
+            if (!hasIPC) {
+                console.error('msger API: window.ipc not available');
+                return false;
+            }
+            window.ipc.postMessage(JSON.stringify(data));
+            return true;
+        } catch(e) {
+            console.error('msger API error:', e);
+            return false;
+        }
+    }
+
+    window.msger = {
+        // Window control - only close() with window.close() workaround (IPC broken)
+        close: function(result) {
+            // IPC is broken in wry 0.47.2, so we use window.close() instead
+            // Result cannot be returned to parent process
+            try {
+                window.close();
+                return true;
+            } catch(e) {
+                console.error('window.close() failed:', e);
+                return false;
+            }
+        },
+        saveData: function(key, value) {
+            try {
+                localStorage.setItem('msger_' + key, JSON.stringify(value));
+                return true;
+            } catch(e) {
+                console.error('Failed to save data:', e);
+                return false;
+            }
+        },
+        loadData: function(key, defaultValue) {
+            try {
+                const item = localStorage.getItem('msger_' + key);
+                return item ? JSON.parse(item) : defaultValue;
+            } catch(e) {
+                console.error('Failed to load data:', e);
+                return defaultValue;
+            }
+        },
+        removeData: function(key) {
+            try {
+                localStorage.removeItem('msger_' + key);
+                return true;
+            } catch(e) {
+                console.error('Failed to remove data:', e);
+                return false;
+            }
+        },
+        clearData: function() {
+            try {
+                const keys = Object.keys(localStorage);
+                for (const key of keys) {
+                    if (key.startsWith('msger_')) {
+                        localStorage.removeItem(key);
+                    }
+                }
+                return true;
+            } catch(e) {
+                console.error('Failed to clear data:', e);
+                return false;
+            }
+        },
+        // Check if running in msger environment
+        isAvailable: function() {
+            return true;
+        }
+    };
+
+    console.log('[MSGER] API initialized successfully! window.msger =', window.msger);
+})();

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@bobfrankston/msger",
-    "version": "0.1.78",
+    "version": "0.1.79",
     "description": "Fast, lightweight, cross-platform message box - Rust-powered alternative to msgview",
     "type": "module",
     "main": "./index.js",