logiguard fork: GPUI xdg-activation keyboard-focus serial fix
Some checks failed
Update All Top Ranking Issues / update_top_ranking_issues (push) Has been cancelled
Triage Project Sync (#84) / Sync triage project (push) Has been cancelled
release_nightly / notify_on_failure (push) Has been cancelled
release_nightly / check_style (push) Has been cancelled
release_nightly / run_tests_windows (push) Has been cancelled
release_nightly / clippy_windows (push) Has been cancelled
release_nightly / bundle_linux_aarch64 (push) Has been cancelled
release_nightly / bundle_linux_x86_64 (push) Has been cancelled
release_nightly / bundle_mac_aarch64 (push) Has been cancelled
release_nightly / bundle_mac_x86_64 (push) Has been cancelled
release_nightly / bundle_windows_aarch64 (push) Has been cancelled
release_nightly / bundle_windows_x86_64 (push) Has been cancelled
release_nightly / build_nix_linux_x86_64 (push) Has been cancelled
release_nightly / build_nix_mac_aarch64 (push) Has been cancelled
release_nightly / update_nightly_tag (push) Has been cancelled
Hotfix Review Monitor / check-hotfix-reviews (push) Has been cancelled
Stale PR Review Reminder / check-stale-prs (push) Has been cancelled
Update Weekly Top Ranking Issues / update_top_ranking_issues (push) Has been cancelled
Bump collab-staging Tag / update-collab-staging-tag (push) Has been cancelled
compliance_check / scheduled_compliance_check (push) Has been cancelled

Single-commit orphan branch: full zed-industries/zed @ 8c74db0 source tree
with a 3-file patch applied (no upstream history).

Patch (crates/gpui_linux/src/linux/wayland/):
  - serial.rs: add SerialKind::KeyboardEnter
  - client.rs: store wl_keyboard.enter serial; add latest_serial_of()
  - window.rs: activate() uses keyboard-enter serial (Mutter focus gate)

Mutter honors window activation only when the token carries the keyboard-
focus serial from wl_keyboard.enter; GPUI used a stale mouse-press serial.
See docs/tray-window-focus-wayland.md in logiguard.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
Mohamad Khani
2026-07-14 02:22:17 +03:30
commit b72a46db68
3984 changed files with 1583326 additions and 0 deletions

View File

@@ -0,0 +1,22 @@
[package]
name = "ztracing"
version = "0.1.0"
edition.workspace = true
publish.workspace = true
license = "GPL-3.0-or-later"
[lints]
workspace = true
[features]
tracy = ["tracing-tracy", "tracy-client"]
[dependencies]
zlog.workspace = true
tracing.workspace = true
tracing-subscriber = "0.3.22"
tracing-tracy = { version = "0.11.4", optional = true, features = ["enable", "ondemand"] }
tracy-client = { version = "0.18.2", optional = true, features = ["enable", "ondemand"] }
ztracing_macro.workspace = true

View File

@@ -0,0 +1 @@
../../LICENSE-AGPL

View File

@@ -0,0 +1 @@
../../LICENSE-APACHE

1
crates/ztracing/LICENSE-GPL Symbolic link
View File

@@ -0,0 +1 @@
../../LICENSE-GPL

14
crates/ztracing/build.rs Normal file
View File

@@ -0,0 +1,14 @@
use std::env;
fn main() {
if env::var_os("ZTRACING").is_some() {
println!("cargo::rustc-cfg=ztracing");
}
if env::var_os("ZTRACING_WITH_MEMORY").is_some() {
println!("cargo::rustc-cfg=ztracing");
println!("cargo::rustc-cfg=ztracing_with_memory");
}
println!("cargo::rerun-if-changed=build.rs");
println!("cargo::rerun-if-env-changed=ZTRACING");
println!("cargo::rerun-if-env-changed=ZTRACING_WITH_MEMORY");
}

View File

@@ -0,0 +1,95 @@
pub use tracing::{Level, field};
#[cfg(ztracing)]
pub use tracing::{
Span, debug_span, error_span, event, info_span, instrument, span, trace_span, warn_span,
};
#[cfg(not(ztracing))]
pub use ztracing_macro::instrument;
#[cfg(ztracing)]
const MAX_CALLSTACK_DEPTH: u16 = 16;
#[cfg(all(ztracing, ztracing_with_memory))]
#[global_allocator]
static GLOBAL: tracy_client::ProfiledAllocator<std::alloc::System> =
tracy_client::ProfiledAllocator::new(std::alloc::System, MAX_CALLSTACK_DEPTH);
#[cfg(not(ztracing))]
pub use __consume_all_tokens as trace_span;
#[cfg(not(ztracing))]
pub use __consume_all_tokens as info_span;
#[cfg(not(ztracing))]
pub use __consume_all_tokens as debug_span;
#[cfg(not(ztracing))]
pub use __consume_all_tokens as warn_span;
#[cfg(not(ztracing))]
pub use __consume_all_tokens as error_span;
#[cfg(not(ztracing))]
pub use __consume_all_tokens as event;
#[cfg(not(ztracing))]
pub use __consume_all_tokens as span;
#[cfg(not(ztracing))]
#[macro_export]
macro_rules! __consume_all_tokens {
($($t:tt)*) => {
$crate::Span
};
}
#[cfg(not(ztracing))]
pub struct Span;
#[cfg(not(ztracing))]
impl Span {
pub fn current() -> Self {
Self
}
pub fn enter(&self) {}
pub fn record<T, S>(&self, _t: T, _s: S) {}
}
#[cfg(ztracing)]
pub fn init() {
use tracing_subscriber::fmt::format::DefaultFields;
use tracing_subscriber::prelude::*;
#[derive(Default)]
struct TracyLayerConfig {
fmt: DefaultFields,
}
impl tracing_tracy::Config for TracyLayerConfig {
type Formatter = DefaultFields;
fn formatter(&self) -> &Self::Formatter {
&self.fmt
}
fn stack_depth(&self, _: &tracing::Metadata) -> u16 {
MAX_CALLSTACK_DEPTH
}
fn format_fields_in_zone_name(&self) -> bool {
true
}
fn on_error(&self, client: &tracy_client::Client, error: &'static str) {
client.color_message(error, 0xFF000000, 0);
}
}
zlog::info!("Starting tracy subscriber, you can now connect the profiler");
tracing::subscriber::set_global_default(
tracing_subscriber::registry()
.with(tracing_tracy::TracyLayer::new(TracyLayerConfig::default())),
)
.expect("setup tracy layer");
}
#[cfg(not(ztracing))]
pub fn init() {}