mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Merge pull request #1752 from deepak1556/clipboard_patch

Browse source 
clipboard: api to list supported types, reading and writing markup
This commit is contained in:
Cheng Zhao 2015-05-28 15:29:36 +08:00
commit d9102efff7
4 changed files with 72 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

29
atom/common/api/atom_api_clipboard.cc
View file

@ -37,6 +37,14 @@ struct Converter<ui::ClipboardType> {
namespace {
std::vector<base::string16> AvailableFormats(ui::ClipboardType type) {
std::vector<base::string16> format_types;
bool ignore;
ui::Clipboard* clipboard = ui::Clipboard::GetForCurrentThread();
clipboard->ReadAvailableTypes(type, &format_types, &ignore);
return format_types;
}
bool Has(const std::string& format_string, ui::ClipboardType type) {
ui::Clipboard* clipboard = ui::Clipboard::GetForCurrentThread();
ui::Clipboard::FormatType format(ui::Clipboard::GetFormatType(format_string));
@ -64,6 +72,24 @@ void WriteText(const base::string16& text, ui::ClipboardType type) {
writer.WriteText(text);
}
base::string16 ReadHtml(ui::ClipboardType type) {
base::string16 data;
base::string16 html;
std::string url;
uint32 start;
uint32 end;
ui::Clipboard::GetForCurrentThread()->ReadHTML(type, &html, &url,
&start, &end);
data = html.substr(start, end - start);
return data;
}
void WriteHtml(const base::string16& html,
ui::ClipboardType type) {
ui::ScopedClipboardWriter writer(type);
writer.WriteHTML(html, std::string());
}
gfx::Image ReadImage(ui::ClipboardType type) {
SkBitmap bitmap = ui::Clipboard::GetForCurrentThread()->ReadImage(type);
return gfx::Image::CreateFrom1xBitmap(bitmap);
@ -81,10 +107,13 @@ void Clear(ui::ClipboardType type) {
void Initialize(v8::Local<v8::Object> exports, v8::Local<v8::Value> unused,
v8::Local<v8::Context> context, void* priv) {
mate::Dictionary dict(context->GetIsolate(), exports);
dict.SetMethod("_availableFormats", &AvailableFormats);
dict.SetMethod("_has", &Has);
dict.SetMethod("_read", &Read);
dict.SetMethod("_readText", &ReadText);
dict.SetMethod("_writeText", &WriteText);
dict.SetMethod("_readHtml", &ReadHtml);
dict.SetMethod("_writeHtml", &WriteHtml);
dict.SetMethod("_readImage", &ReadImage);
dict.SetMethod("_writeImage", &WriteImage);
dict.SetMethod("_clear", &Clear);

3
atom/common/api/lib/clipboard.coffee
View file

@ -1,9 +1,12 @@
binding = process.atomBinding 'clipboard'
module.exports =
availableFormats: (type='standard') -> binding._availableFormats type
has: (format, type='standard') -> binding._has format, type
read: (format, type='standard') -> binding._read format, type
readText: (type='standard') -> binding._readText type
writeText: (text, type='standard') -> binding._writeText text, type
readHtml: (type='standard') -> binding._readHtml type
writeHtml: (markup, type='standard') -> binding._writeHtml markup, type
readImage: (type='standard') -> binding._readImage type
writeImage: (image, type='standard') -> binding._writeImage image, type
clear: (type='standard') -> binding._clear type