bhrebec/xwayland-satellite
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor: fix handle_selection_request 8/7 args

Browse source 
Resolve Clippy's `too_many_arguments` lint on
`handle_selection_request` by removing the `success` and `refuse`
parameters and returning a bool indicating which needs to be run.

Use the helper functions defined last commit to simplify
`incr_copy_from_x11`

Reduce the `match` statement checking if the target is the TARGET
atom to an if statement. Although using `match` statements as
`if`/`else if`/`else` chains occur elsewhere, this one is both only 2
cases, and already of particular relevance to the current work.

Refactor `paste_impl` to be much easier to read. I did this code algebra
way back while investigating #142, but since I never figured that out,
the change has just been sitting in my stash.

refactor: simplify paste_data logic, some unnests
This commit is contained in:
En-En 2025-09-28 01:36:09 +00:00 • committed by Supreeeme
parent 1ec45141e6
commit cc011f3251
4 changed files with 117 additions and 147 deletions
Download patch file Download diff file Expand all files Collapse all files

23
tests/integration.rs
View file

@ -1520,12 +1520,7 @@ fn incr_copy_from_x11() {
let request = connection.await_selection_request();
assert_eq!(request.target(), connection.atoms.mime1);
connection
.send_and_check_request(&x::ChangeWindowAttributes {
window: request.requestor(),
value_list: &[x::Cw::EventMask(x::EventMask::PROPERTY_CHANGE)],
})
.unwrap();
connection.get_property_change_events(request.requestor());
connection.set_property(
request.requestor(),
connection.atoms.incr,
@ -1534,10 +1529,7 @@ fn incr_copy_from_x11() {
);
connection.send_selection_notify(&request);
// skip NewValue
let notify = match connection.poll_for_event().unwrap() {
Some(xcb::Event::X(x::Event::PropertyNotify(p))) => p,
other => panic!("Didn't get property notify event, instead got {other:?}"),
};
let notify = connection.await_property_notify();
assert_eq!(notify.atom(), request.property());
assert_eq!(notify.state(), x::Property::NewValue);
request.property()
@ -1555,11 +1547,7 @@ fn incr_copy_from_x11() {
}
assert_ne!(destination_property, x::Atom::none());
let notify = match connection.await_event() {
xcb::Event::X(x::Event::PropertyNotify(p)) => p,
other => panic!("Didn't get property notify event, instead got {other:?}"),
};
let notify = connection.await_property_notify();
match it.next() {
Some((idx, chunk)) => {
assert_eq!(notify.atom(), destination_property, "chunk {idx}");
@ -1572,10 +1560,7 @@ fn incr_copy_from_x11() {
);
testwl.dispatch();
// skip NewValue
let notify = match connection.poll_for_event().unwrap() {
Some(xcb::Event::X(x::Event::PropertyNotify(p))) => p,
other => panic!("Didn't get property notify event, instead got {other:?}"),
};
let notify = connection.await_property_notify();
assert_eq!(notify.atom(), destination_property, "chunk {idx}");
assert_eq!(notify.state(), x::Property::NewValue, "chunk {idx}");
false