From 65006833f5f37b3be714d164a6b90c1e0899132b Mon Sep 17 00:00:00 2001
From: Adrien Prokopowicz <6529475+prokopyl@users.noreply.github.com>
Date: Mon, 15 Jun 2026 16:26:34 +0200
Subject: [PATCH] Implement window focus in X11

---
 src/x11/event_loop.rs |  2 ++
 src/x11/window.rs     | 18 +++++++++++++-----
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/x11/event_loop.rs b/src/x11/event_loop.rs
index a0e9f6ce..0fe6b34d 100644
--- a/src/x11/event_loop.rs
+++ b/src/x11/event_loop.rs
@@ -278,10 +278,12 @@ impl EventLoop {
             }
 
             XEvent::FocusIn(_) => {
+                self.window.is_focused.set(true);
                 self.handle_event(Event::Window(WindowEvent::Focused));
             }
 
             XEvent::FocusOut(_) => {
+                self.window.is_focused.set(false);
                 self.handle_event(Event::Window(WindowEvent::Unfocused));
             }
 
diff --git a/src/x11/window.rs b/src/x11/window.rs
index 081d83d3..e51e1011 100644
--- a/src/x11/window.rs
+++ b/src/x11/window.rs
@@ -15,9 +15,10 @@ use raw_window_handle::{
 use x11rb::connection::Connection;
 use x11rb::protocol::xproto::{
     AtomEnum, ChangeWindowAttributesAux, ConfigureWindowAux, ConnectionExt, CreateGCAux,
-    CreateWindowAux, EventMask, PropMode, Visualid, Window as XWindow, WindowClass,
+    CreateWindowAux, EventMask, InputFocus, PropMode, Visualid, Window as XWindow, WindowClass,
 };
 use x11rb::wrapper::ConnectionExt as _;
+use x11rb::CURRENT_TIME;
 
 use super::XcbConnection;
 use crate::{
@@ -104,6 +105,7 @@ pub(crate) struct WindowInner {
     mouse_cursor: Cell<MouseCursor>,
 
     pub(crate) close_requested: Cell<bool>,
+    pub(crate) is_focused: Cell<bool>,
 }
 
 pub struct Window<'a> {
@@ -291,6 +293,7 @@ impl<'a> Window<'a> {
             mouse_cursor: Cell::new(MouseCursor::default()),
 
             close_requested: Cell::new(false),
+            is_focused: false.into(),
 
             #[cfg(feature = "opengl")]
             gl_context,
@@ -333,12 +336,17 @@ impl<'a> Window<'a> {
         self.inner.close_requested.set(true);
     }
 
-    pub fn has_focus(&mut self) -> bool {
-        unimplemented!()
+    pub fn has_focus(&self) -> bool {
+        self.inner.is_focused.get()
     }
 
-    pub fn focus(&mut self) {
-        unimplemented!()
+    pub fn focus(&self) {
+        let _ = self.inner.xcb_connection.conn.set_input_focus(
+            InputFocus::POINTER_ROOT,
+            self.inner.window_id,
+            CURRENT_TIME,
+        );
+        let _ = self.inner.xcb_connection.conn.flush();
     }
 
     pub fn resize(&mut self, size: Size) {