kossLAN/wry
1
0
Fork 0
forked from wry/wry
Code Pull requests Activity

cli: add json output

Browse source
This commit is contained in:
Julian Orth 2026-03-23 13:23:37 +01:00
parent 65aca4903b
commit f3d650f2de
19 changed files with 1755 additions and 453 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/cli.rs
View file

@ -8,6 +8,7 @@ mod duration;
mod generate;
mod idle;
mod input;
mod json;
mod log;
mod pid;
mod quit;
@ -27,8 +28,9 @@ use {
crate::{
cli::{
clients::ClientsArgs, color_management::ColorManagementArgs, config::ConfigArgs,
damage_tracking::DamageTrackingArgs, idle::IdleCmd, input::InputArgs, randr::RandrArgs,
reexec::ReexecArgs, run_tagged::RunTaggedArgs, tree::TreeArgs, xwayland::XwaylandArgs,
damage_tracking::DamageTrackingArgs, idle::IdleCmd, input::InputArgs,
json::VERBOSE_JSON, randr::RandrArgs, reexec::ReexecArgs, run_tagged::RunTaggedArgs,
tree::TreeArgs, xwayland::XwaylandArgs,
},
compositor::{LogLevel, start_compositor},
format::{Format, ref_formats},
@ -37,6 +39,7 @@ use {
},
clap::{Args, Parser, Subcommand, ValueEnum, ValueHint, builder::PossibleValue},
clap_complete::Shell,
std::sync::atomic::Ordering::Relaxed,
};
/// A wayland compositor.
@ -53,6 +56,14 @@ pub struct GlobalArgs {
/// The log level.
#[clap(value_enum, long, default_value_t)]
pub log_level: LogLevel,
/// Output data as JSONL.
#[clap(long)]
pub json: bool,
/// Print all fields in JSON output.
///
/// By default, some fields that are empty arrays, null, or false are omitted.
#[clap(long)]
pub all_json_fields: bool,
}
#[derive(Subcommand, Debug)]
@ -225,6 +236,9 @@ pub fn main() {
if not_matches!(cli.command, Cmd::Run(_)) {
drop_all_pr_caps();
}
if cli.global.all_json_fields {
VERBOSE_JSON.store(true, Relaxed);
}
match cli.command {
Cmd::Run(a) => start_compositor(cli.global, a),
Cmd::GenerateCompletion(g) => generate::main(g),