8000 Fix file drop not working on Linux X11 by crumblingstatue · Pull Request #632 · not-fl3/miniquad · GitHub
[go: up one dir, main page]

Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/native/linux_x11.rs
10000 Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,11 @@ impl X11Display {
if let Ok(filenames) = std::str::from_utf8(&bytes) {
let mut d = crate::native_display().try_lock().unwrap();
d.dropped_files = Default::default();
for filename in filenames.lines() {
for mut filename in filenames.lines() {
// On Linux X11, dropped file paths may contain `file://` prefix
if let Some(stripped) = filename.strip_prefix("file://") {
filename = stripped;
}
let path = std::path::PathBuf::from(filename);
if let Ok(bytes) = std::fs::read(&path) {
d.dropped_files.paths.push(path);
Expand Down
3 changes: 2 additions & 1 deletion src/native/linux_x11/drag_n_drop.rs
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,8 @@ impl X11DnD {
};

for format in formats {
if format == libx11.extensions.utf8_string {
// On X11, file managers may yield `text/uri-list` for dragged files
if format == libx11.extensions.utf8_string || format == libx11.extensions.mime_text_uri_lst {
self.format = format;
break;
}
Expand Down
1 change: 1 addition & 0 deletions src/native/linux_x11/libx11.rs
Original file line number Diff line number Diff line change
Expand Up @@ -869,6 +869,7 @@ declare_atoms!(
xdnd_selection: "XdndSelection",
xdnd_status: "XdndStatus",
xdnd_type_list: "XdndTypeList",
mime_text_uri_lst: "text/uri-list",
);

use core::ffi::{c_char, c_int, c_long, c_uchar, c_uint, c_ulong, c_ushort, c_void};
Expand Down
Loading
0