Skip to content

Commit

Permalink
activation_token: Provide GTK 4 helper
Browse files Browse the repository at this point in the history
Unfortunately, `startup_notify_id` is not nullable so we do the same as GTK.

See https://gitlab.gnome.org/GNOME/gtk/-/commit/6efd1a9dad49b42db778bdc07020dfcf8845e2c8
  • Loading branch information
A6GibKm committed Jul 24, 2024
1 parent 47aa993 commit ff0fbf6
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ rust-version = "1.75"
async-std = ["zbus/async-io", "dep:async-fs", "dep:async-net"]
default = ["async-std"]
gtk4 = ["gtk4_x11", "gtk4_wayland"]
gtk4_wayland = ["gdk4wayland", "glib", "dep:gtk4"]
gtk4_x11 = ["gdk4x11", "glib", "dep:gtk4"]
gtk4_wayland = ["gdk4wayland", "glib/v2_76", "dep:gtk4"]
gtk4_x11 = ["gdk4x11", "glib/v2_76", "dep:gtk4"]
raw_handle = ["raw-window-handle", "wayland"]
tokio = ["zbus/tokio", "dep:tokio"]
glib = ["dep:glib"]
Expand Down
28 changes: 28 additions & 0 deletions src/activation_token/gtk4.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
use gtk4::{glib::translate::*, prelude::*};

use crate::ActivationToken;

impl ActivationToken {
/// Gets an activation token from a window.
pub fn from_window(widget: &impl IsA<::gtk4::Widget>) -> Option<Self> {
let display = widget.as_ref().display();
let context = display.app_launch_context();

// FIXME Call the vfunc directly since
// g_app_launch_context_get_startup_notify_id has NULL checks.
//
// See https://gitlab.gnome.org/GNOME/glib/-/merge_requests/3933
unsafe {
let klass: *mut gtk4::gio::ffi::GAppLaunchContextClass =
std::ptr::addr_of!((*context.class().parent()?)) as *mut _;
let get_startup_notify_id = (*klass).get_startup_notify_id.as_ref()?;

from_glib_full::<_, Option<String>>(get_startup_notify_id(
context.as_ptr().cast(),
std::ptr::null_mut(),
std::ptr::null_mut(),
))
}
.map(Self::from)
}
}
3 changes: 3 additions & 0 deletions src/activation_token/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ use std::ops::Deref;
use serde::{Deserialize, Serialize};
use zbus::zvariant::Type;

#[cfg(any(feature = "gtk4_wayland", feature = "gtk4_x11"))]
mod gtk4;

/// A token that can be used to activate an application.
///
/// No guarantees are made for the token structure.
Expand Down

0 comments on commit ff0fbf6

Please sign in to comment.