first pass of merging in warp (doesn't build)

app/src/settings/mod.rs

@@ -18,8 +18,9 @@ mod init;
 pub mod initializer;
 mod input;
 mod input_mode;
-#[cfg(target_os = "linux")]
+#[cfg(any(target_os = "linux", target_os = "freebsd"))]
 mod linux;
+mod local_control;
 pub mod macros;
 pub mod manager;
 pub mod native_preference;
@@ -53,8 +54,9 @@ pub use gpu::*;
 pub use init::*;
 pub use input::*;
 pub use input_mode::*;
-#[cfg(target_os = "linux")]
+#[cfg(any(target_os = "linux", target_os = "freebsd"))]
 pub use linux::*;
+pub use local_control::*;
 pub use native_preference::*;
 pub use onboarding::*;
 pub use pane::*;
@@ -115,23 +117,25 @@ impl SettingsFileError {
     }
 }
 
-use crate::{
-    root_view::QuakeModePinPosition,
-    terminal::{BlockListSettings, BlockPadding},
-    themes::theme::{GalaxyTheme, ThemeKind},
-    user_config::GalaxyConfig,
-};
-use galaxy_core::features::FeatureFlag;
-use galaxyui::{
-    elements::DEFAULT_UI_LINE_HEIGHT_RATIO, keymap::Keystroke, AppContext, DisplayIdx,
-    SingletonEntity,
-};
+use std::collections::HashMap;
+use std::ops::Mul;
+use std::path::PathBuf;
+
 use lazy_static::lazy_static;
-use pathfinder_geometry::{rect::RectF, vector::Vector2F};
+use pathfinder_geometry::rect::RectF;
+use pathfinder_geometry::vector::Vector2F;
 use serde::{Deserialize, Serialize};
 use serde_json::{json, Value};
 use settings::Setting as _;
-use std::{collections::HashMap, ops::Mul, path::PathBuf};
+use galaxy_core::features::FeatureFlag;
+use galaxyui::elements::DEFAULT_UI_LINE_HEIGHT_RATIO;
+use galaxyui::keymap::Keystroke;
+use galaxyui::{AppContext, DisplayIdx, SingletonEntity};
+
+use crate::root_view::QuakeModePinPosition;
+use crate::terminal::{BlockListSettings, BlockPadding};
+use crate::themes::theme::{ThemeKind, WarpTheme};
+use crate::user_config::WarpConfig;
 
 // The following are user preferences keys.
 pub const CHANGELOG_VERSIONS: &str = "ChangelogVersions";
@@ -214,6 +218,7 @@ pub enum CtrlTabBehavior {
     #[default]
     ActivatePrevNextTab,
     CycleMostRecentSession,
+    CycleMostRecentTab,
 }
 
 impl CtrlTabBehavior {
@@ -221,6 +226,7 @@ impl CtrlTabBehavior {
         match self {
             Self::ActivatePrevNextTab => "Activate previous/next tab",
             Self::CycleMostRecentSession => "Cycle most recent session",
+            Self::CycleMostRecentTab => "Cycle most recent tab",
         }
     }
 }
@@ -254,7 +260,7 @@ pub struct Settings;
 /// later allow users to have both quake mode and activation mode enabled simultaneously. If/when
 /// that happens we'll remove this enum. These options are not modeled as a ternary option in the
 /// serialized user-defaults, but as independent options.
-#[derive(Clone, Copy, Debug, Default, Serialize, Deserialize)]
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
 pub enum GlobalHotkeyMode {
     #[default]
     Disabled,
@@ -488,7 +494,7 @@ impl Settings {
             match res {
                 Ok(versions) => versions[&changelog_version].as_bool().unwrap_or(false),
                 Err(e) => {
-                    log::warn!("Error deserializing changlog user default {e}");
+                    log::warn!("Error deserializing changelog user default {e}");
                     false
                 }
             }