2017-12-13 22:22:03 +11:00
|
|
|
use std::io;
|
|
|
|
use std::sync::Arc;
|
|
|
|
use std::path::{Path, PathBuf};
|
|
|
|
use std::str::Utf8Error;
|
X11: General cleanup (#491)
* X11: General cleanup
This is almost entirely internal changes, and as usual, doesn't actually
fix any problems people have complained about.
- `XSetInputFocus` can't be called before the window is visible. This
was previously handled by looping (with a sleep) and querying for the
window's state until it was visible. Now we use `XIfEvent`, which blocks
until we receive `VisibilityNotify`. Note that this can't be replaced
with an `XSync` (I tried).
- We now call `XSync` at the end of window creation and check for
errors, assuring that broken windows are never returned. When creating
invisible windows, this is the only time the output buffer is flushed
during the entire window creation process (AFAIK). For visible windows,
`XIfEvent` will generally flush, but window creation has overall been
reduced to the minimum number of flushes.
- `check_errors().expect()` has been a common pattern throughout the
backend, but it seems that people (myself included) didn't make a
distinction between using it after synchronous requests and asynchronous
requests. Now we only use it after async requests if we flush first,
though this still isn't correct (since the request likely hasn't been
processed yet). The only real solution (besides forcing a sync *every
time*) is to handle asynchronous errors *asynchronously*. For future
work, I plan on adding logging, though I don't plan on actually
*handling* those errors; that's more of something to hope for in the
hypothetical async/await XCB paradise.
- We now flush whenever it makes sense to. `util::Flusher` was added to
force contributors to be aware of the output buffer.
- `Window::get_position`, `Window::get_inner_position`,
`Window::get_inner_size`, and `Window::get_outer_size` previously all
required *several* round-trips. On my machine, it took an average of
around 80µs. They've now been reduced to one round-trip each, which
reduces my measurement to 16µs. This was accomplished simply by caching
the frame extents, which are expensive to calculate (due to various
queries and heuristics), but change infrequently and predictably. I
still recommend that application developers use these methods sparingly
and generally prefer storing the values from `Resized`/`Moved`, as
that's zero overhead.
- The above change enabled me to change the `Moved` event to supply
window positions, rather than client area positions. Additionally, we no
longer generate `Moved` for real (as in, not synthetic)
`ConfigureNotify` events. Real `ConfigureNotify` events contain
positions relative to the parent window, which are typically constant
and useless. Since that position would be completely different from the
root-relative positions supplied by synthetic `ConfigureNotify` events
(which are the vast majority of them), that meant real `ConfigureNotify`
events would *always* be detected as the position having changed, so the
resultant `Moved` was multiple levels of misleading. In practice, this
meant a garbage `Moved` would be sent every time the window was resized;
now a resize has to actually change the window's position to be
accompanied by `Moved`.
- Every time we processed an `XI_Enter` event, we would leak 4 bytes via
`util::query_pointer` (`XIQueryPointer`). `XIButtonState` contains a
dynamically-allocated mask field which we weren't freeing. As this event
occurs with fairly high frequency, long-running applications could
easily accumulate substantial leaks. `util::PointerState::drop` now
takes care of this.
- The `util` module has been split up into several sub-modules, as it
was getting rather lengthy. This accounts for a significant part of this
diff, unfortunately.
- Atoms are now cached. Xlib caches them too, so `XInternAtom` wouldn't
typically be a round-trip anyway, but the added complexity is
negligible.
- Switched from `std::sync::Mutex` to `parking_lot::Mutex` (within this
backend). There appears to be no downside to this, but if anyone finds
one, this would be easy to revert.
- The WM name and supported hints are now global to the application, and
are updated upon `ReparentNotify`, which should detect when the WM was
replaced (assuming a reparenting WM was involved, that is). Previously,
these values were per-window and would never update, meaning replacing
the WM could potentially lead to (admittedly very minor) problems.
- The result of `Window2::create_empty_cursor` will now only be used if
it actually succeeds.
- `Window2::load_cursor` no longer re-allocates the cursor name.
- `util::lookup_utf8` previously allocated a 16-byte buffer on the heap.
Now it allocates a 1024-byte buffer on the stack, and falls back to
dynamic allocation if the buffer is too small. This base buffer size is
admittedly gratuitous, but less so if you're using IME.
- `with_c_str` was finally removed.
- Added `util::Format` enum to help prevent goofs when dealing with
format arguments.
- `util::get_property`, something I added way back in my first winit PR,
only calculated offsets correctly for `util::Format::Char`. This was
concealed by the accomodating buffer size, as it would be very rare for
the offset to be needed; however, testing with a buffer size of 1,
`util::Format::Long` would read from the same offset multiple times, and
`util::Format::Short` would miss data. This function now works correctly
for all formats, relying on the simple fact that the offset increases by
the buffer size on each iteration. We also account for the extra byte
that `XGetWindowProperty` allocates at the end of the buffer, and copy
data from the buffer instead of moving it and taking ownership of the
pointer.
- Drag and drop now reliably works in release mode. This is presumably
related to the `util::get_property` changes.
- `util::change_property` now exists, which should make it easier to add
features in the future.
- The `EventsLoop` device map is no longer in a mutex.
- `XConnection` now implements `Debug`.
- Valgrind no longer complains about anything related to winit (with
either the system allocator or jemalloc, though "not having valgrind
complain about jemalloc" isn't something to strive for).
* X11: Add better diagnostics when initialization fails
* X11: Handle XIQueryDevice failure
* X11: Use correct types in error handler
2018-05-03 23:15:49 +10:00
|
|
|
use std::os::raw::*;
|
2017-12-13 22:22:03 +11:00
|
|
|
|
|
|
|
use percent_encoding::percent_decode;
|
|
|
|
|
|
|
|
use super::{ffi, util, XConnection, XError};
|
|
|
|
|
|
|
|
#[derive(Debug)]
|
|
|
|
pub struct DndAtoms {
|
|
|
|
pub aware: ffi::Atom,
|
|
|
|
pub enter: ffi::Atom,
|
|
|
|
pub leave: ffi::Atom,
|
|
|
|
pub drop: ffi::Atom,
|
|
|
|
pub position: ffi::Atom,
|
|
|
|
pub status: ffi::Atom,
|
|
|
|
pub action_private: ffi::Atom,
|
|
|
|
pub selection: ffi::Atom,
|
|
|
|
pub finished: ffi::Atom,
|
|
|
|
pub type_list: ffi::Atom,
|
|
|
|
pub uri_list: ffi::Atom,
|
|
|
|
pub none: ffi::Atom,
|
|
|
|
}
|
|
|
|
|
|
|
|
impl DndAtoms {
|
|
|
|
pub fn new(xconn: &Arc<XConnection>) -> Result<Self, XError> {
|
X11: General cleanup (#491)
* X11: General cleanup
This is almost entirely internal changes, and as usual, doesn't actually
fix any problems people have complained about.
- `XSetInputFocus` can't be called before the window is visible. This
was previously handled by looping (with a sleep) and querying for the
window's state until it was visible. Now we use `XIfEvent`, which blocks
until we receive `VisibilityNotify`. Note that this can't be replaced
with an `XSync` (I tried).
- We now call `XSync` at the end of window creation and check for
errors, assuring that broken windows are never returned. When creating
invisible windows, this is the only time the output buffer is flushed
during the entire window creation process (AFAIK). For visible windows,
`XIfEvent` will generally flush, but window creation has overall been
reduced to the minimum number of flushes.
- `check_errors().expect()` has been a common pattern throughout the
backend, but it seems that people (myself included) didn't make a
distinction between using it after synchronous requests and asynchronous
requests. Now we only use it after async requests if we flush first,
though this still isn't correct (since the request likely hasn't been
processed yet). The only real solution (besides forcing a sync *every
time*) is to handle asynchronous errors *asynchronously*. For future
work, I plan on adding logging, though I don't plan on actually
*handling* those errors; that's more of something to hope for in the
hypothetical async/await XCB paradise.
- We now flush whenever it makes sense to. `util::Flusher` was added to
force contributors to be aware of the output buffer.
- `Window::get_position`, `Window::get_inner_position`,
`Window::get_inner_size`, and `Window::get_outer_size` previously all
required *several* round-trips. On my machine, it took an average of
around 80µs. They've now been reduced to one round-trip each, which
reduces my measurement to 16µs. This was accomplished simply by caching
the frame extents, which are expensive to calculate (due to various
queries and heuristics), but change infrequently and predictably. I
still recommend that application developers use these methods sparingly
and generally prefer storing the values from `Resized`/`Moved`, as
that's zero overhead.
- The above change enabled me to change the `Moved` event to supply
window positions, rather than client area positions. Additionally, we no
longer generate `Moved` for real (as in, not synthetic)
`ConfigureNotify` events. Real `ConfigureNotify` events contain
positions relative to the parent window, which are typically constant
and useless. Since that position would be completely different from the
root-relative positions supplied by synthetic `ConfigureNotify` events
(which are the vast majority of them), that meant real `ConfigureNotify`
events would *always* be detected as the position having changed, so the
resultant `Moved` was multiple levels of misleading. In practice, this
meant a garbage `Moved` would be sent every time the window was resized;
now a resize has to actually change the window's position to be
accompanied by `Moved`.
- Every time we processed an `XI_Enter` event, we would leak 4 bytes via
`util::query_pointer` (`XIQueryPointer`). `XIButtonState` contains a
dynamically-allocated mask field which we weren't freeing. As this event
occurs with fairly high frequency, long-running applications could
easily accumulate substantial leaks. `util::PointerState::drop` now
takes care of this.
- The `util` module has been split up into several sub-modules, as it
was getting rather lengthy. This accounts for a significant part of this
diff, unfortunately.
- Atoms are now cached. Xlib caches them too, so `XInternAtom` wouldn't
typically be a round-trip anyway, but the added complexity is
negligible.
- Switched from `std::sync::Mutex` to `parking_lot::Mutex` (within this
backend). There appears to be no downside to this, but if anyone finds
one, this would be easy to revert.
- The WM name and supported hints are now global to the application, and
are updated upon `ReparentNotify`, which should detect when the WM was
replaced (assuming a reparenting WM was involved, that is). Previously,
these values were per-window and would never update, meaning replacing
the WM could potentially lead to (admittedly very minor) problems.
- The result of `Window2::create_empty_cursor` will now only be used if
it actually succeeds.
- `Window2::load_cursor` no longer re-allocates the cursor name.
- `util::lookup_utf8` previously allocated a 16-byte buffer on the heap.
Now it allocates a 1024-byte buffer on the stack, and falls back to
dynamic allocation if the buffer is too small. This base buffer size is
admittedly gratuitous, but less so if you're using IME.
- `with_c_str` was finally removed.
- Added `util::Format` enum to help prevent goofs when dealing with
format arguments.
- `util::get_property`, something I added way back in my first winit PR,
only calculated offsets correctly for `util::Format::Char`. This was
concealed by the accomodating buffer size, as it would be very rare for
the offset to be needed; however, testing with a buffer size of 1,
`util::Format::Long` would read from the same offset multiple times, and
`util::Format::Short` would miss data. This function now works correctly
for all formats, relying on the simple fact that the offset increases by
the buffer size on each iteration. We also account for the extra byte
that `XGetWindowProperty` allocates at the end of the buffer, and copy
data from the buffer instead of moving it and taking ownership of the
pointer.
- Drag and drop now reliably works in release mode. This is presumably
related to the `util::get_property` changes.
- `util::change_property` now exists, which should make it easier to add
features in the future.
- The `EventsLoop` device map is no longer in a mutex.
- `XConnection` now implements `Debug`.
- Valgrind no longer complains about anything related to winit (with
either the system allocator or jemalloc, though "not having valgrind
complain about jemalloc" isn't something to strive for).
* X11: Add better diagnostics when initialization fails
* X11: Handle XIQueryDevice failure
* X11: Use correct types in error handler
2018-05-03 23:15:49 +10:00
|
|
|
let names = [
|
|
|
|
b"XdndAware\0".as_ptr() as *mut c_char,
|
|
|
|
b"XdndEnter\0".as_ptr() as *mut c_char,
|
|
|
|
b"XdndLeave\0".as_ptr() as *mut c_char,
|
|
|
|
b"XdndDrop\0".as_ptr() as *mut c_char,
|
|
|
|
b"XdndPosition\0".as_ptr() as *mut c_char,
|
|
|
|
b"XdndStatus\0".as_ptr() as *mut c_char,
|
|
|
|
b"XdndActionPrivate\0".as_ptr() as *mut c_char,
|
|
|
|
b"XdndSelection\0".as_ptr() as *mut c_char,
|
|
|
|
b"XdndFinished\0".as_ptr() as *mut c_char,
|
|
|
|
b"XdndTypeList\0".as_ptr() as *mut c_char,
|
|
|
|
b"text/uri-list\0".as_ptr() as *mut c_char,
|
|
|
|
b"None\0".as_ptr() as *mut c_char,
|
2017-12-13 22:22:03 +11:00
|
|
|
];
|
2018-05-27 22:49:35 +10:00
|
|
|
let atoms = unsafe { xconn.get_atoms(&names) }?;
|
2017-12-13 22:22:03 +11:00
|
|
|
Ok(DndAtoms {
|
|
|
|
aware: atoms[0],
|
|
|
|
enter: atoms[1],
|
|
|
|
leave: atoms[2],
|
|
|
|
drop: atoms[3],
|
|
|
|
position: atoms[4],
|
|
|
|
status: atoms[5],
|
|
|
|
action_private: atoms[6],
|
|
|
|
selection: atoms[7],
|
|
|
|
finished: atoms[8],
|
|
|
|
type_list: atoms[9],
|
|
|
|
uri_list: atoms[10],
|
|
|
|
none: atoms[11],
|
|
|
|
})
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#[derive(Debug, Clone, Copy)]
|
|
|
|
pub enum DndState {
|
|
|
|
Accepted,
|
|
|
|
Rejected,
|
|
|
|
}
|
|
|
|
|
|
|
|
#[derive(Debug)]
|
|
|
|
pub enum DndDataParseError {
|
|
|
|
EmptyData,
|
|
|
|
InvalidUtf8(Utf8Error),
|
|
|
|
HostnameSpecified(String),
|
|
|
|
UnexpectedProtocol(String),
|
|
|
|
UnresolvablePath(io::Error),
|
|
|
|
}
|
|
|
|
|
|
|
|
impl From<Utf8Error> for DndDataParseError {
|
|
|
|
fn from(e: Utf8Error) -> Self {
|
|
|
|
DndDataParseError::InvalidUtf8(e)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
impl From<io::Error> for DndDataParseError {
|
|
|
|
fn from(e: io::Error) -> Self {
|
|
|
|
DndDataParseError::UnresolvablePath(e)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
pub struct Dnd {
|
|
|
|
xconn: Arc<XConnection>,
|
|
|
|
pub atoms: DndAtoms,
|
|
|
|
// Populated by XdndEnter event handler
|
|
|
|
pub version: Option<c_long>,
|
|
|
|
pub type_list: Option<Vec<c_ulong>>,
|
|
|
|
// Populated by XdndPosition event handler
|
|
|
|
pub source_window: Option<c_ulong>,
|
|
|
|
// Populated by SelectionNotify event handler (triggered by XdndPosition event handler)
|
|
|
|
pub result: Option<Result<Vec<PathBuf>, DndDataParseError>>,
|
|
|
|
}
|
|
|
|
|
|
|
|
impl Dnd {
|
|
|
|
pub fn new(xconn: Arc<XConnection>) -> Result<Self, XError> {
|
|
|
|
let atoms = DndAtoms::new(&xconn)?;
|
|
|
|
Ok(Dnd {
|
|
|
|
xconn,
|
|
|
|
atoms,
|
|
|
|
version: None,
|
|
|
|
type_list: None,
|
|
|
|
source_window: None,
|
|
|
|
result: None,
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn reset(&mut self) {
|
|
|
|
self.version = None;
|
|
|
|
self.type_list = None;
|
|
|
|
self.source_window = None;
|
|
|
|
self.result = None;
|
|
|
|
}
|
|
|
|
|
|
|
|
pub unsafe fn send_status(
|
|
|
|
&self,
|
|
|
|
this_window: c_ulong,
|
|
|
|
target_window: c_ulong,
|
|
|
|
state: DndState,
|
2017-12-16 06:37:09 +11:00
|
|
|
) -> Result<(), XError> {
|
2017-12-13 22:22:03 +11:00
|
|
|
let (accepted, action) = match state {
|
|
|
|
DndState::Accepted => (1, self.atoms.action_private as c_long),
|
|
|
|
DndState::Rejected => (0, self.atoms.none as c_long),
|
|
|
|
};
|
2018-05-27 22:49:35 +10:00
|
|
|
self.xconn.send_client_msg(
|
2017-12-13 22:22:03 +11:00
|
|
|
target_window,
|
2017-12-16 06:37:09 +11:00
|
|
|
target_window,
|
2017-12-13 22:22:03 +11:00
|
|
|
self.atoms.status,
|
2017-12-16 06:37:09 +11:00
|
|
|
None,
|
2018-05-27 22:49:35 +10:00
|
|
|
[this_window as c_long, accepted, 0, 0, action],
|
X11: General cleanup (#491)
* X11: General cleanup
This is almost entirely internal changes, and as usual, doesn't actually
fix any problems people have complained about.
- `XSetInputFocus` can't be called before the window is visible. This
was previously handled by looping (with a sleep) and querying for the
window's state until it was visible. Now we use `XIfEvent`, which blocks
until we receive `VisibilityNotify`. Note that this can't be replaced
with an `XSync` (I tried).
- We now call `XSync` at the end of window creation and check for
errors, assuring that broken windows are never returned. When creating
invisible windows, this is the only time the output buffer is flushed
during the entire window creation process (AFAIK). For visible windows,
`XIfEvent` will generally flush, but window creation has overall been
reduced to the minimum number of flushes.
- `check_errors().expect()` has been a common pattern throughout the
backend, but it seems that people (myself included) didn't make a
distinction between using it after synchronous requests and asynchronous
requests. Now we only use it after async requests if we flush first,
though this still isn't correct (since the request likely hasn't been
processed yet). The only real solution (besides forcing a sync *every
time*) is to handle asynchronous errors *asynchronously*. For future
work, I plan on adding logging, though I don't plan on actually
*handling* those errors; that's more of something to hope for in the
hypothetical async/await XCB paradise.
- We now flush whenever it makes sense to. `util::Flusher` was added to
force contributors to be aware of the output buffer.
- `Window::get_position`, `Window::get_inner_position`,
`Window::get_inner_size`, and `Window::get_outer_size` previously all
required *several* round-trips. On my machine, it took an average of
around 80µs. They've now been reduced to one round-trip each, which
reduces my measurement to 16µs. This was accomplished simply by caching
the frame extents, which are expensive to calculate (due to various
queries and heuristics), but change infrequently and predictably. I
still recommend that application developers use these methods sparingly
and generally prefer storing the values from `Resized`/`Moved`, as
that's zero overhead.
- The above change enabled me to change the `Moved` event to supply
window positions, rather than client area positions. Additionally, we no
longer generate `Moved` for real (as in, not synthetic)
`ConfigureNotify` events. Real `ConfigureNotify` events contain
positions relative to the parent window, which are typically constant
and useless. Since that position would be completely different from the
root-relative positions supplied by synthetic `ConfigureNotify` events
(which are the vast majority of them), that meant real `ConfigureNotify`
events would *always* be detected as the position having changed, so the
resultant `Moved` was multiple levels of misleading. In practice, this
meant a garbage `Moved` would be sent every time the window was resized;
now a resize has to actually change the window's position to be
accompanied by `Moved`.
- Every time we processed an `XI_Enter` event, we would leak 4 bytes via
`util::query_pointer` (`XIQueryPointer`). `XIButtonState` contains a
dynamically-allocated mask field which we weren't freeing. As this event
occurs with fairly high frequency, long-running applications could
easily accumulate substantial leaks. `util::PointerState::drop` now
takes care of this.
- The `util` module has been split up into several sub-modules, as it
was getting rather lengthy. This accounts for a significant part of this
diff, unfortunately.
- Atoms are now cached. Xlib caches them too, so `XInternAtom` wouldn't
typically be a round-trip anyway, but the added complexity is
negligible.
- Switched from `std::sync::Mutex` to `parking_lot::Mutex` (within this
backend). There appears to be no downside to this, but if anyone finds
one, this would be easy to revert.
- The WM name and supported hints are now global to the application, and
are updated upon `ReparentNotify`, which should detect when the WM was
replaced (assuming a reparenting WM was involved, that is). Previously,
these values were per-window and would never update, meaning replacing
the WM could potentially lead to (admittedly very minor) problems.
- The result of `Window2::create_empty_cursor` will now only be used if
it actually succeeds.
- `Window2::load_cursor` no longer re-allocates the cursor name.
- `util::lookup_utf8` previously allocated a 16-byte buffer on the heap.
Now it allocates a 1024-byte buffer on the stack, and falls back to
dynamic allocation if the buffer is too small. This base buffer size is
admittedly gratuitous, but less so if you're using IME.
- `with_c_str` was finally removed.
- Added `util::Format` enum to help prevent goofs when dealing with
format arguments.
- `util::get_property`, something I added way back in my first winit PR,
only calculated offsets correctly for `util::Format::Char`. This was
concealed by the accomodating buffer size, as it would be very rare for
the offset to be needed; however, testing with a buffer size of 1,
`util::Format::Long` would read from the same offset multiple times, and
`util::Format::Short` would miss data. This function now works correctly
for all formats, relying on the simple fact that the offset increases by
the buffer size on each iteration. We also account for the extra byte
that `XGetWindowProperty` allocates at the end of the buffer, and copy
data from the buffer instead of moving it and taking ownership of the
pointer.
- Drag and drop now reliably works in release mode. This is presumably
related to the `util::get_property` changes.
- `util::change_property` now exists, which should make it easier to add
features in the future.
- The `EventsLoop` device map is no longer in a mutex.
- `XConnection` now implements `Debug`.
- Valgrind no longer complains about anything related to winit (with
either the system allocator or jemalloc, though "not having valgrind
complain about jemalloc" isn't something to strive for).
* X11: Add better diagnostics when initialization fails
* X11: Handle XIQueryDevice failure
* X11: Use correct types in error handler
2018-05-03 23:15:49 +10:00
|
|
|
).flush()
|
2017-12-13 22:22:03 +11:00
|
|
|
}
|
|
|
|
|
|
|
|
pub unsafe fn send_finished(
|
|
|
|
&self,
|
|
|
|
this_window: c_ulong,
|
|
|
|
target_window: c_ulong,
|
|
|
|
state: DndState,
|
2017-12-16 06:37:09 +11:00
|
|
|
) -> Result<(), XError> {
|
2017-12-13 22:22:03 +11:00
|
|
|
let (accepted, action) = match state {
|
|
|
|
DndState::Accepted => (1, self.atoms.action_private as c_long),
|
|
|
|
DndState::Rejected => (0, self.atoms.none as c_long),
|
|
|
|
};
|
2018-05-27 22:49:35 +10:00
|
|
|
self.xconn.send_client_msg(
|
2017-12-13 22:22:03 +11:00
|
|
|
target_window,
|
2017-12-16 06:37:09 +11:00
|
|
|
target_window,
|
2017-12-13 22:22:03 +11:00
|
|
|
self.atoms.finished,
|
2017-12-16 06:37:09 +11:00
|
|
|
None,
|
2018-05-27 22:49:35 +10:00
|
|
|
[this_window as c_long, accepted, action, 0, 0],
|
X11: General cleanup (#491)
* X11: General cleanup
This is almost entirely internal changes, and as usual, doesn't actually
fix any problems people have complained about.
- `XSetInputFocus` can't be called before the window is visible. This
was previously handled by looping (with a sleep) and querying for the
window's state until it was visible. Now we use `XIfEvent`, which blocks
until we receive `VisibilityNotify`. Note that this can't be replaced
with an `XSync` (I tried).
- We now call `XSync` at the end of window creation and check for
errors, assuring that broken windows are never returned. When creating
invisible windows, this is the only time the output buffer is flushed
during the entire window creation process (AFAIK). For visible windows,
`XIfEvent` will generally flush, but window creation has overall been
reduced to the minimum number of flushes.
- `check_errors().expect()` has been a common pattern throughout the
backend, but it seems that people (myself included) didn't make a
distinction between using it after synchronous requests and asynchronous
requests. Now we only use it after async requests if we flush first,
though this still isn't correct (since the request likely hasn't been
processed yet). The only real solution (besides forcing a sync *every
time*) is to handle asynchronous errors *asynchronously*. For future
work, I plan on adding logging, though I don't plan on actually
*handling* those errors; that's more of something to hope for in the
hypothetical async/await XCB paradise.
- We now flush whenever it makes sense to. `util::Flusher` was added to
force contributors to be aware of the output buffer.
- `Window::get_position`, `Window::get_inner_position`,
`Window::get_inner_size`, and `Window::get_outer_size` previously all
required *several* round-trips. On my machine, it took an average of
around 80µs. They've now been reduced to one round-trip each, which
reduces my measurement to 16µs. This was accomplished simply by caching
the frame extents, which are expensive to calculate (due to various
queries and heuristics), but change infrequently and predictably. I
still recommend that application developers use these methods sparingly
and generally prefer storing the values from `Resized`/`Moved`, as
that's zero overhead.
- The above change enabled me to change the `Moved` event to supply
window positions, rather than client area positions. Additionally, we no
longer generate `Moved` for real (as in, not synthetic)
`ConfigureNotify` events. Real `ConfigureNotify` events contain
positions relative to the parent window, which are typically constant
and useless. Since that position would be completely different from the
root-relative positions supplied by synthetic `ConfigureNotify` events
(which are the vast majority of them), that meant real `ConfigureNotify`
events would *always* be detected as the position having changed, so the
resultant `Moved` was multiple levels of misleading. In practice, this
meant a garbage `Moved` would be sent every time the window was resized;
now a resize has to actually change the window's position to be
accompanied by `Moved`.
- Every time we processed an `XI_Enter` event, we would leak 4 bytes via
`util::query_pointer` (`XIQueryPointer`). `XIButtonState` contains a
dynamically-allocated mask field which we weren't freeing. As this event
occurs with fairly high frequency, long-running applications could
easily accumulate substantial leaks. `util::PointerState::drop` now
takes care of this.
- The `util` module has been split up into several sub-modules, as it
was getting rather lengthy. This accounts for a significant part of this
diff, unfortunately.
- Atoms are now cached. Xlib caches them too, so `XInternAtom` wouldn't
typically be a round-trip anyway, but the added complexity is
negligible.
- Switched from `std::sync::Mutex` to `parking_lot::Mutex` (within this
backend). There appears to be no downside to this, but if anyone finds
one, this would be easy to revert.
- The WM name and supported hints are now global to the application, and
are updated upon `ReparentNotify`, which should detect when the WM was
replaced (assuming a reparenting WM was involved, that is). Previously,
these values were per-window and would never update, meaning replacing
the WM could potentially lead to (admittedly very minor) problems.
- The result of `Window2::create_empty_cursor` will now only be used if
it actually succeeds.
- `Window2::load_cursor` no longer re-allocates the cursor name.
- `util::lookup_utf8` previously allocated a 16-byte buffer on the heap.
Now it allocates a 1024-byte buffer on the stack, and falls back to
dynamic allocation if the buffer is too small. This base buffer size is
admittedly gratuitous, but less so if you're using IME.
- `with_c_str` was finally removed.
- Added `util::Format` enum to help prevent goofs when dealing with
format arguments.
- `util::get_property`, something I added way back in my first winit PR,
only calculated offsets correctly for `util::Format::Char`. This was
concealed by the accomodating buffer size, as it would be very rare for
the offset to be needed; however, testing with a buffer size of 1,
`util::Format::Long` would read from the same offset multiple times, and
`util::Format::Short` would miss data. This function now works correctly
for all formats, relying on the simple fact that the offset increases by
the buffer size on each iteration. We also account for the extra byte
that `XGetWindowProperty` allocates at the end of the buffer, and copy
data from the buffer instead of moving it and taking ownership of the
pointer.
- Drag and drop now reliably works in release mode. This is presumably
related to the `util::get_property` changes.
- `util::change_property` now exists, which should make it easier to add
features in the future.
- The `EventsLoop` device map is no longer in a mutex.
- `XConnection` now implements `Debug`.
- Valgrind no longer complains about anything related to winit (with
either the system allocator or jemalloc, though "not having valgrind
complain about jemalloc" isn't something to strive for).
* X11: Add better diagnostics when initialization fails
* X11: Handle XIQueryDevice failure
* X11: Use correct types in error handler
2018-05-03 23:15:49 +10:00
|
|
|
).flush()
|
2017-12-13 22:22:03 +11:00
|
|
|
}
|
|
|
|
|
|
|
|
pub unsafe fn get_type_list(
|
|
|
|
&self,
|
|
|
|
source_window: c_ulong,
|
|
|
|
) -> Result<Vec<ffi::Atom>, util::GetPropertyError> {
|
2018-05-27 22:49:35 +10:00
|
|
|
self.xconn.get_property(
|
2017-12-13 22:22:03 +11:00
|
|
|
source_window,
|
|
|
|
self.atoms.type_list,
|
|
|
|
ffi::XA_ATOM,
|
|
|
|
)
|
|
|
|
}
|
|
|
|
|
|
|
|
pub unsafe fn convert_selection(&self, window: c_ulong, time: c_ulong) {
|
|
|
|
(self.xconn.xlib.XConvertSelection)(
|
|
|
|
self.xconn.display,
|
|
|
|
self.atoms.selection,
|
|
|
|
self.atoms.uri_list,
|
|
|
|
self.atoms.selection,
|
|
|
|
window,
|
|
|
|
time,
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
|
|
|
pub unsafe fn read_data(
|
|
|
|
&self,
|
|
|
|
window: c_ulong,
|
|
|
|
) -> Result<Vec<c_uchar>, util::GetPropertyError> {
|
2018-05-27 22:49:35 +10:00
|
|
|
self.xconn.get_property(
|
2017-12-13 22:22:03 +11:00
|
|
|
window,
|
|
|
|
self.atoms.selection,
|
|
|
|
self.atoms.uri_list,
|
|
|
|
)
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn parse_data(&self, data: &mut Vec<c_uchar>) -> Result<Vec<PathBuf>, DndDataParseError> {
|
|
|
|
if !data.is_empty() {
|
|
|
|
let mut path_list = Vec::new();
|
|
|
|
let decoded = percent_decode(data).decode_utf8()?.into_owned();
|
|
|
|
for uri in decoded.split("\r\n").filter(|u| !u.is_empty()) {
|
|
|
|
// The format is specified as protocol://host/path
|
|
|
|
// However, it's typically simply protocol:///path
|
|
|
|
let path_str = if uri.starts_with("file://") {
|
|
|
|
let path_str = uri.replace("file://", "");
|
|
|
|
if !path_str.starts_with('/') {
|
|
|
|
// A hostname is specified
|
|
|
|
// Supporting this case is beyond the scope of my mental health
|
|
|
|
return Err(DndDataParseError::HostnameSpecified(path_str));
|
|
|
|
}
|
|
|
|
path_str
|
|
|
|
} else {
|
|
|
|
// Only the file protocol is supported
|
|
|
|
return Err(DndDataParseError::UnexpectedProtocol(uri.to_owned()));
|
|
|
|
};
|
|
|
|
|
|
|
|
let path = Path::new(&path_str).canonicalize()?;
|
|
|
|
path_list.push(path);
|
|
|
|
}
|
|
|
|
Ok(path_list)
|
|
|
|
} else {
|
|
|
|
Err(DndDataParseError::EmptyData)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|