refactor: split cargo workspace

src/cli.rs

@@ -3,6 +3,7 @@ mod color;
 mod color_management;
 mod config;
 mod damage_tracking;
+mod dpms;
 mod duration;
 mod generate;
 mod idle;
@@ -13,8 +14,6 @@ mod pid;
 mod quit;
 mod randr;
 mod reexec;
-mod run_privileged;
-mod run_tagged;
 pub mod screenshot;
 mod seat_test;
 mod set_log_level;
@@ -28,15 +27,14 @@ use {
         cli::{
             clients::ClientsArgs, color_management::ColorManagementArgs, config::ConfigArgs,
             damage_tracking::DamageTrackingArgs, idle::IdleCmd, input::InputArgs,
-            json::VERBOSE_JSON, randr::RandrArgs, reexec::ReexecArgs, run_tagged::RunTaggedArgs,
-            tree::TreeArgs, xwayland::XwaylandArgs,
+            json::VERBOSE_JSON, randr::RandrArgs, reexec::ReexecArgs, tree::TreeArgs,
+            xwayland::XwaylandArgs,
         },
-        compositor::{LogLevel, start_compositor},
-        format::{Format, ref_formats},
-        portal,
+        compositor::start_compositor,
+        logger::LogLevel,
         pr_caps::drop_all_pr_caps,
     },
-    clap::{Args, Parser, Subcommand, ValueEnum, ValueHint, builder::PossibleValue},
+    clap::{Args, Parser, Subcommand, ValueEnum, ValueHint},
     clap_complete::Shell,
     std::sync::atomic::Ordering::Relaxed,
 };
@@ -85,14 +83,10 @@ pub enum Cmd {
     Screenshot(ScreenshotArgs),
     /// Inspect/modify the idle (screensaver) settings.
     Idle(IdleArgs),
-    /// Run a privileged program.
-    RunPrivileged(RunPrivilegedArgs),
-    /// Run a program with a connection tag.
-    RunTagged(RunTaggedArgs),
+    /// Turn monitors on or off.
+    Dpms(DpmsArgs),
     /// Tests the events produced by a seat.
     SeatTest(SeatTestArgs),
-    /// Run the desktop portal.
-    Portal,
     /// Inspect/modify graphics card and connector settings.
     Randr(RandrArgs),
     /// Inspect/modify input settings.
@@ -132,10 +126,16 @@ pub struct IdleArgs {
 }
 
 #[derive(Args, Debug)]
-pub struct RunPrivilegedArgs {
-    /// The program to run
-    #[clap(required = true, trailing_var_arg = true, value_hint = ValueHint::CommandWithArguments)]
-    pub program: Vec<String>,
+pub struct DpmsArgs {
+    /// Whether monitors should be on or off.
+    #[clap(value_enum)]
+    pub state: DpmsState,
+}
+
+#[derive(ValueEnum, Debug, Copy, Clone, Eq, PartialEq)]
+pub enum DpmsState {
+    On,
+    Off,
 }
 
 #[derive(ValueEnum, Debug, Copy, Clone, Hash, Default, PartialEq)]
@@ -224,16 +224,6 @@ pub struct GenerateArgs {
     shell: Shell,
 }
 
-impl ValueEnum for &'static Format {
-    fn value_variants<'a>() -> &'a [Self] {
-        ref_formats()
-    }
-
-    fn to_possible_value(&self) -> Option<PossibleValue> {
-        Some(PossibleValue::new(self.name))
-    }
-}
-
 pub fn main() {
     let cli = Jay::parse();
     if not_matches!(cli.command, Cmd::Run(_)) {
@@ -250,11 +240,9 @@ pub fn main() {
         Cmd::SetLogLevel(a) => set_log_level::main(cli.global, a),
         Cmd::Screenshot(a) => screenshot::main(cli.global, a),
         Cmd::Idle(a) => idle::main(cli.global, a),
+        Cmd::Dpms(a) => dpms::main(cli.global, a),
         Cmd::Unlock => unlock::main(cli.global),
-        Cmd::RunPrivileged(a) => run_privileged::main(cli.global, a),
-        Cmd::RunTagged(a) => run_tagged::main(cli.global, a),
         Cmd::SeatTest(a) => seat_test::main(cli.global, a),
-        Cmd::Portal => portal::run_freestanding(cli.global),
         Cmd::Randr(a) => randr::main(cli.global, a),
         Cmd::Input(a) => input::main(cli.global, a),
         Cmd::DamageTracking(a) => damage_tracking::main(cli.global, a),