Desktop: Text clipboard support (#3461)

* gray background for viewport texture

* cust copy paste support

* connect clipboard read on web

* fix eyedropper bounds

* cleanup

* add missing char events for some named keys like enter

desktop/Cargo.toml

@@ -45,6 +45,7 @@ serde = { workspace = true }
 clap = { workspace = true, features = ["derive"] }
 pidlock = "0.2.2"
 ctrlc = "3.5.1"
+window_clipboard = "0.5"
 
 # Windows-specific dependencies
 [target.'cfg(target_os = "windows")'.dependencies]
@@ -64,4 +65,3 @@ objc2 = { version = "0.6.1", default-features = false }
 objc2-foundation = { version = "0.3.2", default-features = false }
 objc2-app-kit = { version = "0.3.2", default-features = false }
 muda = { git = "https://github.com/tauri-apps/muda.git", rev = "3f460b8fbaed59cda6d95ceea6904f000f093f15", default-features = false }
-

desktop/src/app.rs

@@ -259,6 +259,18 @@ impl App {
 					window.update_menu(entries);
 				}
 			}
+			DesktopFrontendMessage::ClipboardRead => {
+				if let Some(window) = &self.window {
+					let content = window.clipboard_read();
+					let message = DesktopWrapperMessage::ClipboardReadResult { content };
+					self.app_event_scheduler.schedule(AppEvent::DesktopWrapperMessage(message));
+				}
+			}
+			DesktopFrontendMessage::ClipboardWrite { content } => {
+				if let Some(window) = &mut self.window {
+					window.clipboard_write(content);
+				}
+			}
 			DesktopFrontendMessage::WindowClose => {
 				self.app_event_scheduler.schedule(AppEvent::CloseWindow);
 			}

desktop/src/cef/input.rs

@@ -91,6 +91,10 @@ pub(crate) fn handle_window_event(browser: &Browser, input_state: &mut InputStat
 
 			key_event.character = event.logical_key.to_char_representation() as u16;
 
+			if event.state == ElementState::Pressed && key_event.character != 0 {
+				key_event.type_ = cef_key_event_type_t::KEYEVENT_CHAR.into();
+			}
+
 			// Mitigation for CEF on Mac bug to prevent NSMenu being triggered by this key event.
 			//
 			// CEF converts the key event into an `NSEvent` internally and passes that to Chromium.

desktop/src/render/composite_shader.wgsl

@@ -61,7 +61,11 @@ fn fs_main(in: VertexOutput) -> @location(0) vec4<f32> {
 	}
 
 	let overlay_srgb = textureSample(t_overlays, s_diffuse, viewport_coordinate);
-	let viewport_srgb = textureSample(t_viewport, s_diffuse, viewport_coordinate);
+	var viewport_srgb = textureSample(t_viewport, s_diffuse, viewport_coordinate);
+
+	if (viewport_srgb.a < 0.001) {
+		viewport_srgb = constants.background_color;
+	}
 
 	if (overlay_srgb.a < 0.001) {
 		if (ui_srgb.a < 0.001) {

desktop/src/window.rs

@@ -38,6 +38,7 @@ pub(crate) struct Window {
 	#[allow(dead_code)]
 	native_handle: native::NativeWindowImpl,
 	custom_cursors: HashMap<CustomCursorSource, CustomCursor>,
+	clipboard: window_clipboard::Clipboard,
 }
 
 impl Window {
@@ -57,10 +58,12 @@ impl Window {
 
 		let winit_window = event_loop.create_window(attributes).unwrap();
 		let native_handle = native::NativeWindowImpl::new(winit_window.as_ref(), app_event_scheduler);
+		let clipboard = unsafe { window_clipboard::Clipboard::connect(&winit_window) }.expect("failed to create clipboard");
 		Self {
 			winit_window: winit_window.into(),
 			native_handle,
 			custom_cursors: HashMap::new(),
+			clipboard,
 		}
 	}
 
@@ -136,6 +139,22 @@ impl Window {
 	pub(crate) fn update_menu(&self, entries: Vec<MenuItem>) {
 		self.native_handle.update_menu(entries);
 	}
+
+	pub(crate) fn clipboard_read(&self) -> Option<String> {
+		match self.clipboard.read() {
+			Ok(data) => Some(data),
+			Err(e) => {
+				tracing::error!("Failed to read from clipboard: {e}");
+				None
+			}
+		}
+	}
+
+	pub(crate) fn clipboard_write(&mut self, data: String) {
+		if let Err(e) = self.clipboard.write(data) {
+			tracing::error!("Failed to write to clipboard: {e}")
+		}
+	}
 }
 
 pub(crate) enum Cursor {

desktop/wrapper/src/handle_desktop_wrapper_message.rs

@@ -1,6 +1,7 @@
 use graphene_std::Color;
 use graphene_std::raster::Image;
 use graphite_editor::messages::app_window::app_window_message_handler::AppWindowPlatform;
+use graphite_editor::messages::clipboard::utility_types::ClipboardContentRaw;
 use graphite_editor::messages::prelude::*;
 
 use super::DesktopWrapperMessageDispatcher;
@@ -156,5 +157,13 @@ pub(super) fn handle_desktop_wrapper_message(dispatcher: &mut DesktopWrapperMess
 		}
 		#[cfg(not(target_os = "macos"))]
 		DesktopWrapperMessage::MenuEvent { id: _ } => {}
+		DesktopWrapperMessage::ClipboardReadResult { content } => {
+			if let Some(content) = content {
+				let message = ClipboardMessage::ReadClipboard {
+					content: ClipboardContentRaw::Text(content),
+				};
+				dispatcher.queue_editor_message(message);
+			}
+		}
 	}
 }

desktop/wrapper/src/intercept_frontend_message.rs

@@ -126,6 +126,12 @@ pub(super) fn intercept_frontend_message(dispatcher: &mut DesktopWrapperMessageD
 				_ => {}
 			}
 		}
+		FrontendMessage::TriggerClipboardRead => {
+			dispatcher.respond(DesktopFrontendMessage::ClipboardRead);
+		}
+		FrontendMessage::TriggerClipboardWrite { content } => {
+			dispatcher.respond(DesktopFrontendMessage::ClipboardWrite { content });
+		}
 		FrontendMessage::WindowClose => {
 			dispatcher.respond(DesktopFrontendMessage::WindowClose);
 		}

desktop/wrapper/src/messages.rs

@@ -54,6 +54,10 @@ pub enum DesktopFrontendMessage {
 	UpdateMenu {
 		entries: Vec<MenuItem>,
 	},
+	ClipboardRead,
+	ClipboardWrite {
+		content: String,
+	},
 	WindowClose,
 	WindowMinimize,
 	WindowMaximize,
@@ -114,6 +118,9 @@ pub enum DesktopWrapperMessage {
 	MenuEvent {
 		id: String,
 	},
+	ClipboardReadResult {
+		content: Option<String>,
+	},
 }
 
 #[derive(Clone, serde::Serialize, serde::Deserialize, Debug)]