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

Don't use MULTIPLE target atom for getting selections

Browse source 
The ICCCM claims this is a "required" target for selection owners,
however several GTK clients (zenity, winecfg) don't seem to support it.
(So much for required.) Just manually grab all the supported targets
individually from the selection owner instead.
Fix for #50
This commit is contained in:
Shawn Wallace 2024-09-15 01:28:32 -04:00
parent 402a764a11
commit b962a0f33b
3 changed files with 200 additions and 212 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/xstate/mod.rs
View file

@ -4,7 +4,7 @@ use selection::{SelectionData, SelectionTarget};
use crate::server::WindowAttributes;
use bitflags::bitflags;
use log::{debug, trace, warn};
use std::ffi::{CString, CStr};
use std::ffi::CString;
use std::os::fd::{AsRawFd, BorrowedFd};
use std::sync::Arc;
use xcb::{x, Xid, XidNew};
@ -405,16 +405,6 @@ impl XState {
}
}
fn get_atom_name(&self, atom: x::Atom) -> String {
match self
.connection
.wait_for_reply(self.connection.send_request(&x::GetAtomName { atom }))
{
Ok(reply) => reply.name().to_string(),
Err(err) => format!("<error getting atom name: {err:?}> {atom:?}"),
}
}
fn get_window_attributes(&self, window: x::Window) -> XResult<WindowAttributes> {
let geometry = self.connection.send_request(&x::GetGeometry {
drawable: x::Drawable::Window(window),
@ -637,7 +627,7 @@ impl XState {
if log::log_enabled!(log::Level::Debug) {
debug!(
"changed property {:?} for {:?}",
self.get_atom_name(event.atom()),
get_atom_name(&self.connection, event.atom()),
window
);
}
@ -665,6 +655,7 @@ xcb::atoms_struct! {
pub utf8_string => b"UTF8_STRING" only_if_exists = false,
pub clipboard => b"CLIPBOARD" only_if_exists = false,
pub targets => b"TARGETS" only_if_exists = false,
pub save_targets => b"SAVE_TARGETS" only_if_exists = false,
pub multiple => b"MULTIPLE" only_if_exists = false,
pub timestamp => b"TIMESTAMP" only_if_exists = false,
pub selection_reply => b"_selection_reply" only_if_exists = false,
@ -864,3 +855,10 @@ impl super::FromServerState<Arc<xcb::Connection>> for Atoms {
state.atoms.as_ref().unwrap().clone()
}
}
fn get_atom_name(connection: &xcb::Connection, atom: x::Atom) -> String {
match connection.wait_for_reply(connection.send_request(&x::GetAtomName { atom })) {
Ok(reply) => reply.name().to_string(),
Err(err) => format!("<error getting atom name: {err:?}> {atom:?}"),
}
}