Update Monitor Struct 🔥

	modified:   Cargo.lock
	modified:   Cargo.toml
	modified:   README.md
	modified:   src/lib.rs
	modified:   src/monitor.rs
	modified:   windows-capture-python/Cargo.lock
	modified:   windows-capture-python/Cargo.toml
	modified:   windows-capture-python/pyproject.toml

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "windows-capture"
-version = "1.0.36"
+version = "1.0.37"
 authors = ["NiiightmareXD"]
 edition = "2021"
 description = "Fastest Windows Screen Capture Library For Rust 🔥"

README.md

@@ -18,7 +18,7 @@ Add this library to your `Cargo.toml`:
 
 ```toml
 [dependencies]
-windows-capture = "1.0.36"
+windows-capture = "1.0.37"
 ```
 or run this command
 

src/lib.rs

@@ -22,7 +22,7 @@
 //!
 //! ```toml
 //! [dependencies]
-//! windows-capture = "1.0.36"
+//! windows-capture = "1.0.37"
 //! ```
 //! or run this command
 //!

src/monitor.rs

@@ -1,11 +1,12 @@
-use std::{error::Error, ptr};
+use std::{error::Error, mem, ptr};
 
 use windows::{
     Graphics::Capture::GraphicsCaptureItem,
     Win32::{
         Foundation::{BOOL, LPARAM, POINT, RECT, TRUE},
         Graphics::Gdi::{
-            EnumDisplayMonitors, MonitorFromPoint, HDC, HMONITOR, MONITOR_DEFAULTTOPRIMARY,
+            EnumDisplayMonitors, GetMonitorInfoW, MonitorFromPoint, HDC, HMONITOR, MONITORINFO,
+            MONITORINFOEXW, MONITOR_DEFAULTTOPRIMARY,
         },
         System::WinRT::Graphics::Capture::IGraphicsCaptureItemInterop,
     },
@@ -45,12 +46,41 @@ impl Monitor {
             None => return Err(Box::new(MonitorErrors::NotFound)),
         };
 
-        Ok(Self { monitor })
+        Ok(monitor)
+    }
+
+    /// Get Monitor Device Name
+    pub fn name(&self) -> Result<String, Box<dyn Error + Send + Sync>> {
+        let mut monitor_info = MONITORINFOEXW {
+            monitorInfo: MONITORINFO {
+                cbSize: mem::size_of::<MONITORINFOEXW>() as u32,
+                rcMonitor: RECT::default(),
+                rcWork: RECT::default(),
+                dwFlags: 0,
+            },
+            szDevice: [0; 32],
+        };
+        unsafe {
+            GetMonitorInfoW(
+                self.as_raw_hmonitor(),
+                std::ptr::addr_of_mut!(monitor_info).cast(),
+            )
+        };
+
+        Ok(String::from_utf16(
+            &monitor_info
+                .szDevice
+                .as_slice()
+                .iter()
+                .take_while(|ch| **ch != 0x0000)
+                .copied()
+                .collect::<Vec<_>>(),
+        )?)
     }
 
     /// Get A List Of All Monitors
-    pub fn enumerate() -> Result<Vec<HMONITOR>, Box<dyn Error + Send + Sync>> {
-        let mut monitors: Vec<HMONITOR> = Vec::new();
+    pub fn enumerate() -> Result<Vec<Self>, Box<dyn Error + Send + Sync>> {
+        let mut monitors: Vec<Self> = Vec::new();
 
         unsafe {
             EnumDisplayMonitors(
@@ -84,9 +114,9 @@ impl Monitor {
         _: *mut RECT,
         vec: LPARAM,
     ) -> BOOL {
-        let monitors = &mut *(vec.0 as *mut Vec<HMONITOR>);
+        let monitors = &mut *(vec.0 as *mut Vec<Self>);
 
-        monitors.push(monitor);
+        monitors.push(Self { monitor });
 
         TRUE
     }

windows-capture-python/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "windows-capture-python"
-version = "1.0.36"
+version = "1.0.37"
 authors = ["NiiightmareXD"]
 edition = "2021"
 description = "Fastest Windows Screen Capture Library For Python 🔥"

windows-capture-python/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "maturin"
 
 [project]
 name = "windows-capture"
-version = "1.0.36"
+version = "1.0.37"
 description = "Fastest Windows Screen Capture Library For Python 🔥"
 readme = "README.md"
 requires-python = ">=3.9"