Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-02 20:20:14 +01:00
Code Issues Projects Releases Packages Wiki Activity

Update rust-clipboard to the version with working set_contents.

Browse source
This commit is contained in:
Avi Weinstock 2015-07-17 13:45:46 -04:00
parent f86252a60b
commit 9ba18850dd
5 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/compositing/constellation.rs
View file

@ -476,7 +476,7 @@ impl<LTF: LayoutTaskFactory, STF: ScriptTaskFactory> Constellation<LTF, STF> {
sender.send(result).unwrap(); sender.send(result).unwrap();
} }
ConstellationMsg::SetClipboardContents(s) => { ConstellationMsg::SetClipboardContents(s) => {
if let Some(ref ctx) = self.clipboard_ctx { if let Some(ref mut ctx) = self.clipboard_ctx {
if let Err(e) = ctx.set_contents(s) { if let Err(e) = ctx.set_contents(s) {
debug!("Error setting clipboard contents ({})", e); debug!("Error setting clipboard contents ({})", e);
} }

1
components/script/textinput.rs
View file

@ -329,7 +329,6 @@ impl<T: ClipboardProvider> TextInput<T> {
}, },
Key::C if is_control_key(mods) => { Key::C if is_control_key(mods) => {
if let Some(text) = self.get_selection_text() { if let Some(text) = self.get_selection_text() {
println!("get_selection_text(): {}", &text);
self.clipboard_provider.set_clipboard_contents(text); self.clipboard_provider.set_clipboard_contents(text);
} }
KeyReaction::DispatchInput KeyReaction::DispatchInput

2
components/servo/Cargo.lock generated
View file

@ -131,7 +131,7 @@ dependencies = [
[[package]] [[package]]
name = "clipboard" name = "clipboard"
version = "0.0.1" version = "0.0.1"
source = "git+https://github.com/aweinstock314/rust-clipboard#d271be958151cbc90d4cea670f028afe05e75cbe" source = "git+https://github.com/aweinstock314/rust-clipboard#67ec94ac27b28ff4ed3a4dde212f57e302f7cc35"
dependencies = [ dependencies = [
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
"x11 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "x11 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)",

2
ports/cef/Cargo.lock generated
View file

@ -130,7 +130,7 @@ dependencies = [
[[package]] [[package]]
name = "clipboard" name = "clipboard"
version = "0.0.1" version = "0.0.1"
source = "git+https://github.com/aweinstock314/rust-clipboard#d271be958151cbc90d4cea670f028afe05e75cbe" source = "git+https://github.com/aweinstock314/rust-clipboard#67ec94ac27b28ff4ed3a4dde212f57e302f7cc35"
dependencies = [ dependencies = [
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
"x11 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "x11 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)",

2
ports/gonk/Cargo.lock generated
View file

@ -117,7 +117,7 @@ dependencies = [
[[package]] [[package]]
name = "clipboard" name = "clipboard"
version = "0.0.1" version = "0.0.1"
source = "git+https://github.com/aweinstock314/rust-clipboard#d271be958151cbc90d4cea670f028afe05e75cbe" source = "git+https://github.com/aweinstock314/rust-clipboard#67ec94ac27b28ff4ed3a4dde212f57e302f7cc35"
dependencies = [ dependencies = [
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
"x11 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "x11 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)",