bd2b0de231
Closes #ISSUE A [modal dialog](https://en.wikipedia.org/wiki/Modal_window) window is a window that demands the user's immediate attention and blocks interaction with other parts of the application until it's closed. - On Windows this is done by disabling the parent window when the dialog window is created and re-enabling the parent window when closed. - On Wayland this is done using the [`XdgDialog`](https://wayland.app/protocols/xdg-dialog-v1) protocol, which hints to the compositor that the dialog should be modal. While compositors like GNOME and KDE block parent interaction automatically, the XDG specification does not guarantee this behavior, compositors may deliver events to the parent window unfiltered. Since the specification explicitly requires clients to implement event filtering logic themselves, this PR implements client-side blocking in GPUI to ensure consistent modal behavior across all Wayland compositors, including those like Hyprland that don't block parent interaction. - On X11 this is done by enabling the application window property [`_NET_WM_STATE_MODAL`](https://specifications.freedesktop.org/wm/latest/ar01s05.html#id-1.6.8) state. I'm unable to implement this on MacOS as I lack the experience and the hardware to test it. If anyone is interested on implementing this let me know. |Window|Linux (wayland)| Linux (x11) |MacOS| |-|-|-|-| |<video src="https://github.com/user-attachments/assets/bfd0733a-445d-4b63-ac6b-ebe098a7dc74"></video>|<video src="https://github.com/user-attachments/assets/024cd6ec-ff81-4250-a5be-5d207a023f8c"></video>| N/A | <video src="https://github.com/user-attachments/assets/656e60a5-26b2-4ee2-8368-1fbbe872453c"></video>| TODO: - [x] Block parent interaction client-side on X11 Release Notes: - Added modal dialog window kind on GPUI --------- Co-authored-by: Jason Lee <huacnlee@gmail.com> Co-authored-by: Anthony Eid <anthony@zed.dev> Co-authored-by: Anthony Eid <hello@anthonyeid.me>
337 lines
8.5 KiB
TOML
337 lines
8.5 KiB
TOML
[package]
|
|
name = "gpui"
|
|
version = "0.2.2"
|
|
edition.workspace = true
|
|
authors = ["Nathan Sobo <nathan@zed.dev>"]
|
|
description = "Zed's GPU-accelerated UI framework"
|
|
repository = "https://github.com/zed-industries/zed"
|
|
publish = true
|
|
license = "Apache-2.0"
|
|
homepage = "https://gpui.rs"
|
|
readme = "README.md"
|
|
keywords = ["desktop", "gui", "immediate"]
|
|
categories = ["gui"]
|
|
|
|
|
|
[lints]
|
|
workspace = true
|
|
|
|
[features]
|
|
default = ["font-kit", "wayland", "x11", "windows-manifest"]
|
|
test-support = [
|
|
"leak-detection",
|
|
"collections/test-support",
|
|
"util/test-support",
|
|
"http_client/test-support",
|
|
"wayland",
|
|
"x11",
|
|
]
|
|
inspector = ["gpui_macros/inspector"]
|
|
leak-detection = ["backtrace"]
|
|
runtime_shaders = []
|
|
macos-blade = [
|
|
"blade-graphics",
|
|
"blade-macros",
|
|
"blade-util",
|
|
"bytemuck",
|
|
"objc2",
|
|
"objc2-metal",
|
|
]
|
|
wayland = [
|
|
"bitflags",
|
|
"blade-graphics",
|
|
"blade-macros",
|
|
"blade-util",
|
|
"bytemuck",
|
|
"ashpd/wayland",
|
|
"cosmic-text",
|
|
"font-kit",
|
|
"calloop-wayland-source",
|
|
"wayland-backend",
|
|
"wayland-client",
|
|
"wayland-cursor",
|
|
"wayland-protocols",
|
|
"wayland-protocols-plasma",
|
|
"wayland-protocols-wlr",
|
|
"filedescriptor",
|
|
"xkbcommon",
|
|
"open",
|
|
]
|
|
x11 = [
|
|
"blade-graphics",
|
|
"blade-macros",
|
|
"blade-util",
|
|
"bytemuck",
|
|
"ashpd",
|
|
"cosmic-text",
|
|
"font-kit",
|
|
"as-raw-xcb-connection",
|
|
"x11rb",
|
|
"xkbcommon",
|
|
"xim",
|
|
"x11-clipboard",
|
|
"filedescriptor",
|
|
"open",
|
|
"scap?/x11",
|
|
]
|
|
screen-capture = [
|
|
"scap",
|
|
]
|
|
windows-manifest = []
|
|
|
|
[lib]
|
|
path = "src/gpui.rs"
|
|
doctest = false
|
|
|
|
[dependencies]
|
|
anyhow.workspace = true
|
|
async-task = "4.7"
|
|
backtrace = { workspace = true, optional = true }
|
|
bitflags = { workspace = true, optional = true }
|
|
blade-graphics = { workspace = true, optional = true }
|
|
blade-macros = { workspace = true, optional = true }
|
|
blade-util = { workspace = true, optional = true }
|
|
bytemuck = { version = "1", optional = true }
|
|
collections.workspace = true
|
|
ctor.workspace = true
|
|
derive_more.workspace = true
|
|
etagere = "0.2"
|
|
futures.workspace = true
|
|
gpui_macros.workspace = true
|
|
http_client.workspace = true
|
|
image.workspace = true
|
|
inventory.workspace = true
|
|
itertools.workspace = true
|
|
log.workspace = true
|
|
num_cpus = "1.13"
|
|
parking = "2.0.0"
|
|
parking_lot.workspace = true
|
|
postage.workspace = true
|
|
profiling.workspace = true
|
|
rand.workspace = true
|
|
raw-window-handle = "0.6"
|
|
refineable.workspace = true
|
|
resvg = { version = "0.45.0", default-features = false, features = [
|
|
"text",
|
|
"system-fonts",
|
|
"memmap-fonts",
|
|
] }
|
|
usvg = { version = "0.45.0", default-features = false }
|
|
util_macros.workspace = true
|
|
schemars.workspace = true
|
|
seahash = "4.1"
|
|
semver.workspace = true
|
|
serde.workspace = true
|
|
serde_json.workspace = true
|
|
slotmap.workspace = true
|
|
smallvec.workspace = true
|
|
smol.workspace = true
|
|
stacksafe.workspace = true
|
|
strum.workspace = true
|
|
sum_tree.workspace = true
|
|
taffy = "=0.9.0"
|
|
thiserror.workspace = true
|
|
util.workspace = true
|
|
uuid.workspace = true
|
|
waker-fn = "1.2.0"
|
|
lyon = "1.0"
|
|
libc.workspace = true
|
|
pin-project = "1.1.10"
|
|
circular-buffer.workspace = true
|
|
spin = "0.10.0"
|
|
|
|
[target.'cfg(target_os = "macos")'.dependencies]
|
|
block = "0.1"
|
|
cocoa.workspace = true
|
|
cocoa-foundation.workspace = true
|
|
core-foundation.workspace = true
|
|
core-foundation-sys.workspace = true
|
|
core-graphics = "0.24"
|
|
core-video.workspace = true
|
|
core-text = "21"
|
|
# WARNING: If you change this, you must also publish a new version of zed-font-kit to crates.io
|
|
font-kit = { git = "https://github.com/zed-industries/font-kit", rev = "110523127440aefb11ce0cf280ae7c5071337ec5", package = "zed-font-kit", version = "0.14.1-zed", optional = true }
|
|
foreign-types = "0.5"
|
|
log.workspace = true
|
|
media.workspace = true
|
|
objc.workspace = true
|
|
objc2 = { version = "0.6", optional = true }
|
|
objc2-metal = { version = "0.3", optional = true }
|
|
mach2.workspace = true
|
|
#TODO: replace with "objc2"
|
|
metal.workspace = true
|
|
flume = "0.11"
|
|
|
|
[target.'cfg(any(target_os = "linux", target_os = "freebsd", target_os = "macos"))'.dependencies]
|
|
pathfinder_geometry = "0.5"
|
|
|
|
[target.'cfg(any(target_os = "linux", target_os = "freebsd", target_os = "windows"))'.dependencies]
|
|
scap = { workspace = true, optional = true }
|
|
|
|
[target.'cfg(any(target_os = "linux", target_os = "freebsd"))'.dependencies]
|
|
# Always used
|
|
flume = "0.11"
|
|
oo7 = { version = "0.5.0", default-features = false, features = [
|
|
"async-std",
|
|
"native_crypto",
|
|
] }
|
|
|
|
# Used in both windowing options
|
|
ashpd = { workspace = true, optional = true }
|
|
blade-graphics = { workspace = true, optional = true }
|
|
blade-macros = { workspace = true, optional = true }
|
|
blade-util = { workspace = true, optional = true }
|
|
bytemuck = { version = "1", optional = true }
|
|
cosmic-text = { version = "0.14.0", optional = true }
|
|
# WARNING: If you change this, you must also publish a new version of zed-font-kit to crates.io
|
|
font-kit = { git = "https://github.com/zed-industries/font-kit", rev = "110523127440aefb11ce0cf280ae7c5071337ec5", package = "zed-font-kit", version = "0.14.1-zed", features = [
|
|
"source-fontconfig-dlopen",
|
|
], optional = true }
|
|
|
|
calloop = { version = "0.14.3" }
|
|
filedescriptor = { version = "0.8.2", optional = true }
|
|
open = { version = "5.2.0", optional = true }
|
|
|
|
# Wayland
|
|
calloop-wayland-source = { version = "0.4.1", optional = true }
|
|
wayland-backend = { version = "0.3.3", features = [
|
|
"client_system",
|
|
"dlopen",
|
|
], optional = true }
|
|
wayland-client = { version = "0.31.11", optional = true }
|
|
wayland-cursor = { version = "0.31.11", optional = true }
|
|
wayland-protocols = { version = "0.32.9", features = [
|
|
"client",
|
|
"staging",
|
|
"unstable",
|
|
], optional = true }
|
|
wayland-protocols-plasma = { version = "0.3.9", features = [
|
|
"client",
|
|
], optional = true }
|
|
wayland-protocols-wlr = { version = "0.3.9", features = [
|
|
"client",
|
|
], optional = true }
|
|
|
|
# X11
|
|
as-raw-xcb-connection = { version = "1", optional = true }
|
|
x11rb = { version = "0.13.1", features = [
|
|
"allow-unsafe-code",
|
|
"xkb",
|
|
"randr",
|
|
"xinput",
|
|
"cursor",
|
|
"resource_manager",
|
|
"sync",
|
|
], optional = true }
|
|
xkbcommon = { version = "0.8.0", features = [
|
|
"wayland",
|
|
"x11",
|
|
], optional = true }
|
|
# WARNING: If you change this, you must also publish a new version of zed-xim to crates.io
|
|
xim = { git = "https://github.com/zed-industries/xim-rs.git", rev = "16f35a2c881b815a2b6cdfd6687988e84f8447d8" , features = [
|
|
"x11rb-xcb",
|
|
"x11rb-client",
|
|
], package = "zed-xim", version = "0.4.0-zed", optional = true }
|
|
x11-clipboard = { version = "0.9.3", optional = true }
|
|
|
|
[target.'cfg(target_os = "windows")'.dependencies]
|
|
flume = "0.11"
|
|
rand.workspace = true
|
|
windows.workspace = true
|
|
windows-core.workspace = true
|
|
windows-numerics = "0.2"
|
|
windows-registry = "0.5"
|
|
|
|
[dev-dependencies]
|
|
backtrace.workspace = true
|
|
collections = { workspace = true, features = ["test-support"] }
|
|
env_logger.workspace = true
|
|
http_client = { workspace = true, features = ["test-support"] }
|
|
lyon = { version = "1.0", features = ["extra"] }
|
|
pretty_assertions.workspace = true
|
|
rand.workspace = true
|
|
reqwest_client = { workspace = true, features = ["test-support"] }
|
|
unicode-segmentation.workspace = true
|
|
util = { workspace = true, features = ["test-support"] }
|
|
|
|
[target.'cfg(target_os = "windows")'.build-dependencies]
|
|
embed-resource = "3.0"
|
|
windows-registry = "0.5"
|
|
|
|
[target.'cfg(target_os = "macos")'.build-dependencies]
|
|
bindgen = "0.71"
|
|
cbindgen = { version = "0.28.0", default-features = false }
|
|
naga.workspace = true
|
|
|
|
[target.'cfg(any(target_os = "linux", target_os = "freebsd"))'.build-dependencies]
|
|
naga.workspace = true
|
|
|
|
|
|
[[example]]
|
|
name = "hello_world"
|
|
path = "examples/hello_world.rs"
|
|
|
|
[[example]]
|
|
name = "image"
|
|
path = "examples/image/image.rs"
|
|
|
|
[[example]]
|
|
name = "input"
|
|
path = "examples/input.rs"
|
|
|
|
[[example]]
|
|
name = "on_window_close_quit"
|
|
path = "examples/on_window_close_quit.rs"
|
|
|
|
[[example]]
|
|
name = "opacity"
|
|
path = "examples/opacity.rs"
|
|
|
|
[[example]]
|
|
name = "pattern"
|
|
path = "examples/pattern.rs"
|
|
|
|
[[example]]
|
|
name = "set_menus"
|
|
path = "examples/set_menus.rs"
|
|
|
|
[[example]]
|
|
name = "shadow"
|
|
path = "examples/shadow.rs"
|
|
|
|
[[example]]
|
|
name = "svg"
|
|
path = "examples/svg/svg.rs"
|
|
|
|
[[example]]
|
|
name = "tab_stop"
|
|
path = "examples/tab_stop.rs"
|
|
|
|
[[example]]
|
|
name = "text"
|
|
path = "examples/text.rs"
|
|
|
|
[[example]]
|
|
name = "text_wrapper"
|
|
path = "examples/text_wrapper.rs"
|
|
|
|
[[example]]
|
|
name = "tree"
|
|
path = "examples/tree.rs"
|
|
|
|
[[example]]
|
|
name = "uniform_list"
|
|
path = "examples/uniform_list.rs"
|
|
|
|
[[example]]
|
|
name = "window_shadow"
|
|
path = "examples/window_shadow.rs"
|
|
|
|
[[example]]
|
|
name = "grid_layout"
|
|
path = "examples/grid_layout.rs"
|
|
|
|
[[example]]
|
|
name = "mouse_pressure"
|
|
path = "examples/mouse_pressure.rs"
|