-
Notifications
You must be signed in to change notification settings - Fork 44
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
3 changed files
with
20 additions
and
59 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,61 +1,20 @@ | ||
use super::wayland::WaylandActivationToken; | ||
use gtk4::{gdk, glib::translate::ToGlibPtr, prelude::*}; | ||
use wayland_client::{ | ||
backend::ObjectId, | ||
protocol::{__interfaces::WL_SURFACE_INTERFACE, wl_surface::WlSurface}, | ||
Proxy, | ||
}; | ||
use wayland_protocols::xdg::activation::v1::client::xdg_activation_token_v1::XdgActivationTokenV1; | ||
use gtk4::{gdk, glib, prelude::*}; | ||
|
||
#[derive(Debug)] | ||
pub struct Gtk4ActivationToken { | ||
pub token: String, | ||
inner: XdgActivationTokenV1, | ||
pub(crate) token: String, | ||
} | ||
|
||
impl Gtk4ActivationToken { | ||
pub fn from_native(native: &impl ::gtk4::glib::IsA<::gtk4::Native>) -> Option<Self> { | ||
let surface = native.surface(); | ||
match surface.display().backend() { | ||
gdk::Backend::Wayland => { | ||
// TODO use WaylandSurface::wl_surface(), see | ||
// https://github.com/gtk-rs/gtk4-rs/pull/1053 | ||
let cnx = wayland_client::Connection::connect_to_env().unwrap(); | ||
let surface_id = unsafe { | ||
let ptr = gdk4wayland::ffi::gdk_wayland_surface_get_wl_surface( | ||
surface | ||
.downcast_ref::<gdk4wayland::WaylandSurface>() | ||
.unwrap() | ||
.to_glib_none() | ||
.0, | ||
); | ||
|
||
ObjectId::from_ptr(&WL_SURFACE_INTERFACE, ptr as *mut _).unwrap() | ||
}; | ||
let wl_surface = WlSurface::from_id(&cnx, surface_id).unwrap(); | ||
|
||
let wl = WaylandActivationToken::from_surface(&wl_surface).unwrap(); | ||
|
||
Some(Self::from(wl)) | ||
} | ||
// TODO Can this be implemented for X11? | ||
pub fn from_native<N: glib::IsA<gdk::Display>>(native: &N) -> Option<Self> { | ||
match native.backend() { | ||
gdk::Backend::Wayland => native | ||
.startup_notification_id() | ||
.map(|token| Self { | ||
token: token.to_string(), | ||
}), | ||
gdk::Backend::X11 => todo!(), | ||
_ => None, | ||
} | ||
} | ||
} | ||
|
||
impl From<WaylandActivationToken> for Gtk4ActivationToken { | ||
fn from(mut wl_token: WaylandActivationToken) -> Self { | ||
let token = std::mem::take(&mut wl_token.token); | ||
// NOTE Safe unwrap, WlActivationToken has a inner set at construction. | ||
let inner = wl_token.inner.take().unwrap(); | ||
|
||
Self { inner, token } | ||
} | ||
} | ||
|
||
impl Drop for Gtk4ActivationToken { | ||
fn drop(&mut self) { | ||
self.inner.destroy(); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters