added window name event

src/backends/window_event.rs

@@ -17,6 +17,7 @@ pub enum WindowEvent<Window> {
     EnterEvent(EnterEvent<Window>),
     ConfigureEvent(ConfigureEvent<Window>),
     FullscreenEvent(FullscreenEvent<Window>), //1 { window: Window, event: 1 },
+    WindowNameEvent(WindowNameEvent<Window>),
 }
 
 #[derive(Debug, PartialEq, Eq, Copy, Clone)]
@@ -257,6 +258,18 @@ impl<Window> FullscreenEvent<Window> {
     }
 }
 
+#[derive(Debug)]
+pub struct WindowNameEvent<Window> {
+    pub window: Window,
+    pub name: String,
+}
+
+impl<Window> WindowNameEvent<Window> {
+    pub fn new(window: Window, name: String) -> Self {
+        Self { window, name }
+    }
+}
+
 #[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord)]
 pub struct KeyBind {
     pub key: VirtualKeyCode,

src/backends/xlib/mod.rs

@@ -1,22 +1,10 @@
 use log::{debug, error, warn};
 use num_traits::Zero;
-<<<<<<< HEAD
+use std::{ptr::NonNull, rc::Rc};
-use std::{ffi::CString, mem::MaybeUninit, ptr::NonNull, rc::Rc};
-use std::{ffi::CString, rc::Rc};
->>>>>>> variant B
-use std::{ffi::CString, mem::MaybeUninit, ptr::NonNull, rc::Rc};
-======= end
 
 use thiserror::Error;
 
-use x11::xlib::{self, Atom, Success, Window, XEvent, XInternAtom, XKeyEvent};
+use x11::xlib::{self, Atom, Success, XEvent, XKeyEvent};
-=======
-use std::{mem::MaybeUninit, ptr::NonNull, rc::Rc};
-
-use thiserror::Error;
-
-use x11::xlib::{self, Atom, XEvent, XKeyEvent};
->>>>>>> ab99fdd (refactored atoms)
 
 use crate::backends::{
     keycodes::KeyOrButton, xlib::keysym::mouse_button_to_xbutton,
@@ -37,7 +25,7 @@ use super::{
     window_event::{
         ButtonEvent, ConfigureEvent, DestroyEvent, EnterEvent, FullscreenEvent,
         FullscreenState, KeyEvent, KeyOrMouseBind, KeyState, MapEvent,
-        ModifierState, MotionEvent, UnmapEvent, WindowEvent,
+        ModifierState, MotionEvent, UnmapEvent, WindowEvent, WindowNameEvent,
     },
     WindowServerBackend,
 };
@@ -787,14 +775,27 @@ impl XLib {
                 let ev = unsafe { &event.property };
 
                 match ev.atom {
-                    atom if atom == self.ewmh_atoms[EWMHAtom::NetWmWindowType] => {
+                    atom if atom == self.ewmh_atoms[EWMHAtom::NetWmName]
+                        || atom == self.atoms[ICCCMAtom::WmName] =>
+                    {
+                        self.get_window_name(ev.window).map(|name| {
+                            XLibWindowEvent::WindowNameEvent(
+                                WindowNameEvent::new(ev.window, name),
+                            )
+                        })
+                    }
+                    atom if atom
+                        == self.ewmh_atoms[EWMHAtom::NetWmWindowType] =>
+                    {
                         if self
                             .get_atom_property(
                                 ev.window,
-                                ewmh_atoms[EWMHAtom::NetWmState],
+                                self.ewmh_atoms[EWMHAtom::NetWmState],
                             )
                             .map(|atom| {
-                                *atom == self.ewmh_atoms[EWMHAtom::NetWmStateFullscreen]
+                                *atom
+                                    == self.ewmh_atoms
+                                        [EWMHAtom::NetWmStateFullscreen]
                             })
                             .unwrap_or(false)
                         {
@@ -816,11 +817,16 @@ impl XLib {
                 let ev = unsafe { &event.client_message };
 
                 match ev.message_type {
-                    message_type if message_type == self.ewmh_atoms[EWMHAtom::NetWmState] => {
+                    message_type
+                        if message_type
+                            == self.ewmh_atoms[EWMHAtom::NetWmState] =>
+                    {
                         let data = ev.data.as_longs();
-                        if data[1] as u64 == self.ewmh_atoms[EWMHAtom::NetWmStateFullScreen]
+                        if data[1] as u64
-                            || data[2] as u64
                             == self.ewmh_atoms[EWMHAtom::NetWmStateFullscreen]
+                            || data[2] as u64
+                                == self.ewmh_atoms
+                                    [EWMHAtom::NetWmStateFullscreen]
                         {
                             debug!("fullscreen event");
                             Some(XLibWindowEvent::FullscreenEvent(
@@ -891,7 +897,7 @@ impl XLib {
                     &mut dl0,
                     &mut dl1,
                     ptr as *mut _ as *mut _,
-                ) == Success.into()
+                ) == i32::from(Success)
             });
 
         debug!("get_atom_property: {} {:?}", success, atom_out);

src/state.rs

@@ -4,7 +4,9 @@ use log::{error, info};
 
 use x11::xlib::{self, Window};
 
-use crate::backends::window_event::{FullscreenEvent, FullscreenState};
+use crate::backends::window_event::{
+    FullscreenEvent, FullscreenState, WindowNameEvent,
+};
 use crate::util::{Point, Size};
 use crate::{
     backends::{
@@ -500,6 +502,9 @@ where
                         self.arrange_clients();
                     }
                 }
+                WindowEvent::WindowNameEvent(WindowNameEvent { .. }) => {
+                    info!("{:#?}", event);
+                }
 
                 // i dont think i actually have to handle destroy notify events.
                 // every window should be unmapped regardless