RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 23:07:35 +00:00
Code Issues Activity Actions

LibGUI: Port the drag&drop code to Core::MimeData

Browse source
This commit is contained in:
Andreas Kling 2020-02-14 13:18:34 +01:00
parent 3cba9c3c25
commit 814d59f462
10 changed files with 59 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

21
Libraries/LibGUI/Event.h
View file

@ -32,6 +32,10 @@
#include <LibGfx/Rect.h>
#include <LibGUI/WindowType.h>
namespace Core {
class MimeData;
}
namespace GUI {
class Event : public Core::Event {
@ -326,25 +330,18 @@ private:
class DropEvent final : public Event {
public:
DropEvent(const Gfx::Point& position, const String& text, const String& data_type, const String& data)
: Event(Event::Drop)
, m_position(position)
, m_text(text)
, m_data_type(data_type)
, m_data(data)
{
}
DropEvent(const Gfx::Point&, const String& text, NonnullRefPtr<Core::MimeData> mime_data);
~DropEvent();
const Gfx::Point& position() const { return m_position; }
const String& text() const { return m_text; }
const String& data_type() const { return m_data_type; }
const String& data() const { return m_data; }
const Core::MimeData& mime_data() const { return m_mime_data; }
private:
Gfx::Point m_position;
String m_text;
String m_data_type;
String m_data;
NonnullRefPtr<Core::MimeData> m_mime_data;
};
}

2
Libraries/LibGUI/FileSystemModel.cpp
View file

@ -561,7 +561,7 @@ bool FileSystemModel::accepts_drag(const ModelIndex& index, const StringView& da
{
if (!index.is_valid())
return false;
if (data_type != "url-list")
if (data_type != "text/uri-list")
return false;
auto& node = this->node(index);
return node.is_directory();

2
Libraries/LibGUI/FileSystemModel.h
View file

@ -123,7 +123,7 @@ public:
virtual void update() override;
virtual ModelIndex parent_index(const ModelIndex&) const override;
virtual ModelIndex index(int row, int column = 0, const ModelIndex& parent = ModelIndex()) const override;
virtual StringView drag_data_type() const override { return "url-list"; }
virtual StringView drag_data_type() const override { return "text/uri-list"; }
virtual bool accepts_drag(const ModelIndex&, const StringView& data_type) override;
static String timestamp_string(time_t timestamp)

1
Libraries/LibGUI/Makefile
View file

@ -19,6 +19,7 @@ OBJS = \
Desktop.o \
Dialog.o \
DragOperation.o \
Event.o \
FilePicker.o \
FileSystemModel.o \
FontDatabase.o \

5
Libraries/LibGUI/Window.cpp
View file

@ -28,7 +28,7 @@
#include <AK/JsonObject.h>
#include <AK/NeverDestroyed.h>
#include <AK/SharedBuffer.h>
#include <LibGfx/Bitmap.h>
#include <LibCore/MimeData.h>
#include <LibGUI/Action.h>
#include <LibGUI/Application.h>
#include <LibGUI/Event.h>
@ -36,6 +36,7 @@
#include <LibGUI/Widget.h>
#include <LibGUI/Window.h>
#include <LibGUI/WindowServerConnection.h>
#include <LibGfx/Bitmap.h>
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
@ -188,7 +189,7 @@ void Window::event(Core::Event& event)
if (!m_main_widget)
return;
auto result = m_main_widget->hit_test(drop_event.position());
auto local_event = make<DropEvent>(result.local_position, drop_event.text(), drop_event.data_type(), drop_event.data());
auto local_event = make<DropEvent>(result.local_position, drop_event.text(), drop_event.mime_data());
ASSERT(result.widget);
return result.widget->dispatch_event(*local_event, this);
}

8
Libraries/LibGUI/WindowServerConnection.cpp
View file

@ -24,6 +24,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <LibCore/MimeData.h>
#include <LibGUI/Action.h>
#include <LibGUI/Application.h>
#include <LibGUI/Clipboard.h>
@ -309,8 +310,11 @@ void WindowServerConnection::handle(const Messages::WindowClient::AsyncSetWallpa
void WindowServerConnection::handle(const Messages::WindowClient::DragDropped& message)
{
if (auto* window = Window::from_window_id(message.window_id()))
Core::EventLoop::current().post_event(*window, make<DropEvent>(message.mouse_position(), message.text(), message.data_type(), message.data()));
if (auto* window = Window::from_window_id(message.window_id())) {
auto mime_data = Core::MimeData::construct();
mime_data->set_data(message.data_type(), message.data().to_byte_buffer());
Core::EventLoop::current().post_event(*window, make<DropEvent>(message.mouse_position(), message.text(), mime_data));
}
}
void WindowServerConnection::handle(const Messages::WindowClient::DragAccepted&)

27
Libraries/LibVT/TerminalWidget.cpp
View file

@ -30,7 +30,7 @@
#include <AK/String.h>
#include <AK/StringBuilder.h>
#include <Kernel/KeyCode.h>
#include <LibGfx/Font.h>
#include <LibCore/MimeData.h>
#include <LibGUI/Action.h>
#include <LibGUI/Application.h>
#include <LibGUI/Clipboard.h>
@ -38,6 +38,7 @@
#include <LibGUI/Painter.h>
#include <LibGUI/ScrollBar.h>
#include <LibGUI/Window.h>
#include <LibGfx/Font.h>
#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
@ -698,21 +699,23 @@ void TerminalWidget::context_menu_event(GUI::ContextMenuEvent& event)
void TerminalWidget::drop_event(GUI::DropEvent& event)
{
if (event.data_type() == "text") {
if (event.mime_data().has_text()) {
event.accept();
write(m_ptm_fd, event.data().characters(), event.data().length());
} else if (event.data_type() == "url-list") {
auto text = event.mime_data().text();
write(m_ptm_fd, text.characters(), text.length());
} else if (event.mime_data().has_urls()) {
event.accept();
auto lines = event.data().split('\n');
auto urls = event.mime_data().urls();
bool first = true;
for (auto& line : lines) {
if (!first)
for (auto& url : event.mime_data().urls()) {
if (!first) {
write(m_ptm_fd, " ", 1);
first = false;
if (line.starts_with("file://"))
line = line.substring(7, line.length() - 7);
write(m_ptm_fd, line.characters(), line.length());
first = false;
}
if (url.protocol() == "file")
write(m_ptm_fd, url.path().characters(), url.path().length());
else
write(m_ptm_fd, url.to_string().characters(), url.to_string().length());
}
}
}