From 332af8b062d93aa542c639d663199fde568172f7 Mon Sep 17 00:00:00 2001
From: Ivan Molodetskikh <yalterz@gmail.com>
Date: Mon, 2 Sep 2024 08:53:50 +0300
Subject: Rearrange some CLI and IPC enum values

---
 src/cli.rs        |  8 ++++----
 src/ipc/server.rs | 22 +++++++++++-----------
 2 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'src')

diff --git a/src/cli.rs b/src/cli.rs
index 99d22e63..238ffe9d 100644
--- a/src/cli.rs
+++ b/src/cli.rs
@@ -62,10 +62,12 @@ pub enum Msg {
     Outputs,
     /// List workspaces.
     Workspaces,
-    /// Print information about the focused window.
-    FocusedWindow,
+    /// Get the configured keyboard layouts.
+    KeyboardLayouts,
     /// Print information about the focused output.
     FocusedOutput,
+    /// Print information about the focused window.
+    FocusedWindow,
     /// Perform an action.
     Action {
         #[command(subcommand)]
@@ -86,8 +88,6 @@ pub enum Msg {
         #[command(subcommand)]
         action: OutputAction,
     },
-    /// Get the configured keyboard layouts.
-    KeyboardLayouts,
     /// Start continuously receiving events from the compositor.
     EventStream,
     /// Print the version of the running niri instance.
diff --git a/src/ipc/server.rs b/src/ipc/server.rs
index 9c292b34..dcdfc3fb 100644
--- a/src/ipc/server.rs
+++ b/src/ipc/server.rs
@@ -255,6 +255,17 @@ async fn process(ctx: &ClientCtx, request: Request) -> Reply {
             let outputs = ipc_outputs.values().cloned().map(|o| (o.name.clone(), o));
             Response::Outputs(outputs.collect())
         }
+        Request::Workspaces => {
+            let state = ctx.event_stream_state.borrow();
+            let workspaces = state.workspaces.workspaces.values().cloned().collect();
+            Response::Workspaces(workspaces)
+        }
+        Request::KeyboardLayouts => {
+            let state = ctx.event_stream_state.borrow();
+            let layout = state.keyboard_layouts.keyboard_layouts.clone();
+            let layout = layout.expect("keyboard layouts should be set at startup");
+            Response::KeyboardLayouts(layout)
+        }
         Request::FocusedWindow => {
             let state = ctx.event_stream_state.borrow();
             let windows = &state.windows.windows;
@@ -294,11 +305,6 @@ async fn process(ctx: &ClientCtx, request: Request) -> Reply {
 
             Response::OutputConfigChanged(response)
         }
-        Request::Workspaces => {
-            let state = ctx.event_stream_state.borrow();
-            let workspaces = state.workspaces.workspaces.values().cloned().collect();
-            Response::Workspaces(workspaces)
-        }
         Request::FocusedOutput => {
             let (tx, rx) = async_channel::bounded(1);
             ctx.event_loop.insert_idle(move |state| {
@@ -325,12 +331,6 @@ async fn process(ctx: &ClientCtx, request: Request) -> Reply {
             let output = result.map_err(|_| String::from("error getting active output info"))?;
             Response::FocusedOutput(output)
         }
-        Request::KeyboardLayouts => {
-            let state = ctx.event_stream_state.borrow();
-            let layout = state.keyboard_layouts.keyboard_layouts.clone();
-            let layout = layout.expect("keyboard layouts should be set at startup");
-            Response::KeyboardLayouts(layout)
-        }
         Request::EventStream => Response::Handled,
     };
 
-- 
cgit