RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-06-01 02:58:11 +00:00
Code Issues Activity Actions

Clipboard: Add a key-value map alongside the clipboard storage

Browse source 
A clipping now consists of three things:

- The raw clip data
- A MIME type
- A key-value map (String, String) for anything you like
This commit is contained in:
Andreas Kling 2020-09-05 16:26:22 +02:00
parent 51146e3075
commit 2e6d59b7b2
7 changed files with 34 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Libraries/LibGUI/Clipboard.cpp
View file

@ -92,10 +92,11 @@ Clipboard::DataAndType Clipboard::data_and_type() const
}
auto data = ByteBuffer::copy(shared_buffer->data(), response->data_size());
auto type = response->mime_type();
return { data, type };
auto metadata = response->metadata().entries();
return { data, type, metadata };
}
void Clipboard::set_data(ReadonlyBytes data, const String& type)
void Clipboard::set_data(ReadonlyBytes data, const String& type, const HashMap<String, String>& metadata)
{
auto shared_buffer = SharedBuffer::create_with_size(data.size() + 1);
if (!shared_buffer) {
@ -109,7 +110,7 @@ void Clipboard::set_data(ReadonlyBytes data, const String& type)
shared_buffer->seal();
shared_buffer->share_with(connection().server_pid());
connection().send_sync<Messages::ClipboardServer::SetClipboardData>(shared_buffer->shbuf_id(), data.size(), type);
connection().send_sync<Messages::ClipboardServer::SetClipboardData>(shared_buffer->shbuf_id(), data.size(), type, metadata);
}
void ClipboardServerConnection::handle(const Messages::ClipboardClient::ClipboardDataChanged& message)
@ -119,4 +120,9 @@ void ClipboardServerConnection::handle(const Messages::ClipboardClient::Clipboar
clipboard.on_change(message.mime_type());
}
void Clipboard::set_bitmap(const Gfx::Bitmap& bitmap)
{
(void) bitmap;
}
}

7
Libraries/LibGUI/Clipboard.h
View file

@ -27,8 +27,10 @@
#pragma once
#include <AK/Function.h>
#include <AK/HashMap.h>
#include <AK/String.h>
#include <LibGUI/Forward.h>
#include <LibGfx/Forward.h>
namespace GUI {
@ -38,16 +40,19 @@ public:
ByteBuffer data() const { return data_and_type().data; }
String mime_type() const { return data_and_type().mime_type; }
void set_data(ReadonlyBytes, const String& mime_type = "text/plain");
void set_data(ReadonlyBytes, const String& mime_type = "text/plain", const HashMap<String, String>& metadata = {});
void set_plain_text(const String& text)
{
set_data(text.bytes());
}
void set_bitmap(const Gfx::Bitmap&);
struct DataAndType {
ByteBuffer data;
String mime_type;
HashMap<String, String> metadata;
};
DataAndType data_and_type() const;

7
Libraries/LibIPC/Dictionary.h
View file

@ -33,7 +33,12 @@ namespace IPC {
class Dictionary {
public:
Dictionary() {}
Dictionary() { }
Dictionary(const HashMap<String, String>& initial_entries)
: m_entries(initial_entries)
{
}
bool is_empty() const { return m_entries.is_empty(); }
size_t size() const { return m_entries.size(); }