Allow apps to set window titles

Author: ameyer1024

Cargo.lock

@@ -217,6 +217,7 @@ impl EventKind {
     pub const PRESENT: EventKind = EventKind(1);
     pub const INPUT: EventKind = EventKind(2);
     pub const DISCONNECT: EventKind = EventKind(3);
+    pub const TITLE: EventKind = EventKind(4);
     pub const REQUEST_CLOSE: EventKind = EventKind(5);
 }
 
@@ -281,6 +282,29 @@ impl EventData for InputEvent {
     }
 }
 
+#[derive(Copy, Clone)]
+#[repr(C)]
+pub struct TitleEvent {
+    pub len: u8,
+    pub data: [u8; 7 * 8 - 1],
+}
+unsafe impl bytemuck::Zeroable for TitleEvent {}
+unsafe impl bytemuck::AnyBitPattern for TitleEvent {}
+impl EventData for TitleEvent {
+    const KIND: EventKind = EventKind::TITLE;
+    fn parse_data(data: &[u64; 7]) -> Option<Self> {
+        const _ASSERT: () = assert!(size_of::<TitleEvent>() <= size_of::<[u64; 7]>());
+        let bytes = &bytemuck::bytes_of(data)[..size_of::<Self>()];
+        Some(*bytemuck::from_bytes(bytes))
+    }
+    fn serialize_data(&self) -> [u64; 7] {
+        let mut out = [0u64; 7];
+        let data: [u8; size_of::<Self>()] = unsafe { core::mem::transmute(*self) };
+        bytemuck::cast_slice_mut(&mut out)[..size_of::<Self>()].copy_from_slice(&data);
+        out
+    }
+}
+
 #[derive(Copy, Clone)]
 #[repr(C)]
 pub struct RequestCloseEvent;

crates/display-proto/src/lib.rs

@@ -74,4 +74,16 @@ impl BufferHandle {
     pub fn get_sem_fd(&self, sem: SemDescriptor) -> u32 {
         self.fds[sem.0 as usize]
     }
+
+    pub fn set_title(&mut self, title: &[u8]) {
+        let truncated_len = title.len().min(7 * 8 - 1);
+        let mut title_event = super::TitleEvent {
+            len: truncated_len as u8,
+            data: [0; 7 * 8 - 1],
+        };
+        title_event.data[..truncated_len].copy_from_slice(&title[..truncated_len]);
+        self.client_to_server_queue()
+            .try_send_data(title_event)
+            .ok();
+    }
 }

crates/display-proto/src/local.rs

@@ -12,6 +12,7 @@ thunderdome = { version = "0.6", default-features = false }
 display-proto = { path = "../display-proto" }
 ulib = { path = "../ulib", features = ["heap-impl"] }
 gfx = { path = "../gfx" }
+lz4 = { path = "../lz4" }
 
 [dev-dependencies]
 ulib = { path = "../ulib", features = ["test"] }

crates/display-server/Cargo.toml

@@ -7,6 +7,7 @@ extern crate display_proto as proto;
 #[macro_use]
 extern crate ulib;
 
+use alloc::string::String;
 use alloc::vec::Vec;
 use proto::BufferHandle;
 use thunderdome::{Arena, Index};
@@ -23,6 +24,7 @@ struct BufferInfo {
 
 struct Client {
     handle: BufferHandle,
+    title: String,
     present_ready: bool,
 }
 
@@ -76,6 +78,7 @@ fn handle_incoming(
     let client = Client {
         handle,
         present_ready: false,
+        title: String::new(),
     };
     (window, client)
 }
@@ -321,6 +324,16 @@ fn handle_conns(mut fb: framebuffer::Framebuffer, server_socket: FileDesc) {
         load_image(include_bytes!("../assets/close-pressed.qoi"));
     assert!(close_height == close2_height && close_width == close2_width);
 
+    let compressed_font = include_bytes_align!(u32, "../../console/ctrld-fixed-10r.pcf.lz4");
+    let size = lz4::frame::read_frame(compressed_font)
+        .unwrap()
+        .0
+        .content_size()
+        .unwrap();
+    let mut font_data = alloc::vec![0; size as usize];
+    let font_data = lz4::decode_into(compressed_font, &mut font_data).unwrap();
+    let font = gfx::format::pcf::load_pcf(font_data).unwrap();
+
     let mut to_remove = Vec::<Index>::new();
 
     let mut intermediate_fb = alloc::vec![0u128; fb.data.len()];
@@ -447,6 +460,7 @@ fn handle_conns(mut fb: framebuffer::Framebuffer, server_socket: FileDesc) {
         }
 
         for (i, client) in clients.iter_mut() {
+            use proto::EventData;
             let mut ev_limit = 10;
             while let Some(msg) = client.handle.client_to_server_queue().try_recv() {
                 if ev_limit == 0 {
@@ -455,15 +469,21 @@ fn handle_conns(mut fb: framebuffer::Framebuffer, server_socket: FileDesc) {
                 ev_limit -= 1;
                 match msg.kind {
                     proto::EventKind::PRESENT => {
-                        // HACK: treat newest window as active
-                        use proto::EventData;
                         let proto::PresentEvent = proto::PresentEvent::parse(&msg).unwrap();
                         client.present_ready = true;
                         any_updated = true;
                     }
+                    proto::EventKind::TITLE => {
+                        let proto::TitleEvent { len, data } =
+                            proto::TitleEvent::parse(&msg).unwrap();
+                        let buf = &data[..(len as usize).min(data.len())];
+                        client.title = alloc::string::String::from_utf8_lossy(buf).into_owned();
+                        println!("Updated title: {:?}", client.title);
+                        any_updated = true;
+                    }
                     proto::EventKind::DISCONNECT => {
                         // TODO: auto-disconnect on process exit?
-                        println!("Client {:?} disconnected.", i);
+                        println!("[disp] client {:?} disconnected.", i);
                         to_remove.push(i);
                         break;
                     }
@@ -475,6 +495,7 @@ fn handle_conns(mut fb: framebuffer::Framebuffer, server_socket: FileDesc) {
         }
 
         let title_height = 12;
+        let title_fg_color = 0xFF000000;
         let title_bg_color_active = 0xFFFFFFFF;
         let title_bg_color_inactive = 0xFFCCCCCC;
 
@@ -529,6 +550,19 @@ fn handle_conns(mut fb: framebuffer::Framebuffer, server_socket: FileDesc) {
             }
 
             let out = bytemuck::cast_slice_mut::<_, u32>(&mut intermediate_fb);
+            let buf = &mut out
+                [window_y * fb.stride..(window_y + title_height).min(fb.height) * fb.stride];
+            let title_start = (fb.stride * 2) + window_x + 2;
+            font.draw_string(
+                &client.title,
+                buf,
+                title_start,
+                Some(effective_width.saturating_sub(2)),
+                fb.stride,
+                1,
+                title_fg_color,
+            );
+
             // Draw close button
 
             let close_pressed = match hovered {

crates/display-server/src/main.rs

@@ -566,6 +566,9 @@ impl<'a> BitmapData<'a> {
         // TODO: caching and performance improvements
         if scan == 1 {
             let rows = height;
+            let max_rows = (buffer.len().saturating_sub(start)) / buf_row_stride;
+            let rows = rows.min((max_rows / scale) * scale);
+
             let row_size = width.div_ceil(8);
             let row_stride = row_size.next_multiple_of(row_pad);
             // let safety_margin = (scale - 1) * buf_row_stride + (scale - 1);