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

Add set_clipboard_context function and relevant plumbing. Use Option more consistantly (less unwraps) in textinput's selection handling.

Browse source
This commit is contained in:
Avi Weinstock 2015-06-18 11:58:03 -04:00
parent 52c2049f2a
commit f86252a60b
5 changed files with 83 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

7
components/compositing/constellation.rs
View file

@ -475,6 +475,13 @@ impl<LTF: LayoutTaskFactory, STF: ScriptTaskFactory> Constellation<LTF, STF> {
);
sender.send(result).unwrap();
}
ConstellationMsg::SetClipboardContents(s) => {
if let Some(ref ctx) = self.clipboard_ctx {
if let Err(e) = ctx.set_contents(s) {
debug!("Error setting clipboard contents ({})", e);
}
}
}
ConstellationMsg::WebDriverCommand(command) => {
debug!("constellation got webdriver command message");
self.handle_webdriver_msg(command);

2
components/msg/constellation_msg.rs
View file

@ -247,6 +247,8 @@ pub enum Msg {
Focus(PipelineId),
/// Requests that the constellation retrieve the current contents of the clipboard
GetClipboardContents(IpcSender<String>),
/// Requests that the constellation set the contents of the clipboard
SetClipboardContents(String),
/// Dispatch a webdriver command
WebDriverCommand(WebDriverCommandMsg),
/// Notifies the constellation that the viewport has been constrained in some manner

10
components/script/clipboard_provider.rs
View file

@ -13,7 +13,7 @@ pub trait ClipboardProvider {
// blocking method to get the clipboard contents
fn clipboard_contents(&mut self) -> String;
// blocking method to set the clipboard contents
fn set_clipboard_contents(&mut self, &str);
fn set_clipboard_contents(&mut self, String);
}
impl ClipboardProvider for ConstellationChan {
@ -22,8 +22,8 @@ impl ClipboardProvider for ConstellationChan {
self.0.send(ConstellationMsg::GetClipboardContents(tx)).unwrap();
rx.recv().unwrap()
}
fn set_clipboard_contents(&mut self, _: &str) {
panic!("not yet implemented");
fn set_clipboard_contents(&mut self, s: String) {
self.0.send(ConstellationMsg::SetClipboardContents(s)).unwrap();
}
}
@ -43,7 +43,7 @@ impl ClipboardProvider for DummyClipboardContext {
fn clipboard_contents(&mut self) -> String {
self.content.clone()
}
fn set_clipboard_contents(&mut self, s: &str) {
self.content = s.to_owned();
fn set_clipboard_contents(&mut self, s: String) {
self.content = s;
}
}

36
components/script/textinput.rs
View file

@ -143,8 +143,8 @@ impl<T: ClipboardProvider> TextInput<T> {
self.replace_selection(s.into());
}
pub fn get_sorted_selection(&self) -> (TextPoint, TextPoint) {
let begin = self.selection_begin.unwrap();
pub fn get_sorted_selection(&self) -> Option<(TextPoint, TextPoint)> {
self.selection_begin.map(|begin| {
let end = self.edit_point;
if begin.line < end.line || (begin.line == end.line && begin.index < end.index) {
@ -152,10 +152,29 @@ impl<T: ClipboardProvider> TextInput<T> {
} else {
(end, begin)
}
})
}
pub fn get_selection_text(&self) -> Option<String> {
self.get_sorted_selection().map(|(begin, end)| {
if begin.line != end.line {
let mut s = String::new();
s.push_str(self.lines[begin.line].slice_chars(begin.index, self.lines[begin.line].len()));
for (_, line) in self.lines.iter().enumerate().filter(|&(i,_)| begin.line < i && i < end.line) {
s.push_str("\n");
s.push_str(line);
}
s.push_str("\n");
s.push_str(self.lines[end.line].slice_chars(0, end.index));
s
} else {
self.lines[begin.line].slice_chars(begin.index, end.index).to_owned()
}
})
}
pub fn replace_selection(&mut self, insert: String) {
let (begin, end) = self.get_sorted_selection();
if let Some((begin, end)) = self.get_sorted_selection() {
self.clear_selection();
let new_lines = {
@ -189,6 +208,7 @@ impl<T: ClipboardProvider> TextInput<T> {
self.lines = new_lines;
}
}
/// Return the length of the current line under the editing point.
pub fn current_line_length(&self) -> usize {
@ -237,8 +257,7 @@ impl<T: ClipboardProvider> TextInput<T> {
self.selection_begin = Some(self.edit_point);
}
} else {
if self.selection_begin.is_some() {
let (begin, end) = self.get_sorted_selection();
if let Some((begin, end)) = self.get_sorted_selection() {
self.edit_point = if adjust < 0 {begin} else {end};
self.clear_selection();
return
@ -308,6 +327,13 @@ impl<T: ClipboardProvider> TextInput<T> {
self.select_all();
KeyReaction::Nothing
},
Key::C if is_control_key(mods) => {
if let Some(text) = self.get_selection_text() {
println!("get_selection_text(): {}", &text);
self.clipboard_provider.set_clipboard_contents(text);
}
KeyReaction::DispatchInput
},
Key::V if is_control_key(mods) => {
let contents = self.clipboard_provider.clipboard_contents();
self.insert_string(contents);

4
tests/unit/script/textinput.rs
View file

@ -50,14 +50,14 @@ fn test_textinput_get_sorted_selection() {
let mut textinput = TextInput::new(Lines::Single, "abcdefg".to_owned(), DummyClipboardContext::new(""));
textinput.adjust_horizontal(2, Selection::NotSelected);
textinput.adjust_horizontal(2, Selection::Selected);
let (begin, end) = textinput.get_sorted_selection();
let (begin, end) = textinput.get_sorted_selection().unwrap();
assert_eq!(begin.index, 2);
assert_eq!(end.index, 4);
textinput.clear_selection();
textinput.adjust_horizontal(-2, Selection::Selected);
let (begin, end) = textinput.get_sorted_selection();
let (begin, end) = textinput.get_sorted_selection().unwrap();
assert_eq!(begin.index, 2);
assert_eq!(end.index, 4);
}