refactor: simplify config

Author: nik-rev

default-config.kdl renamed to default.kdl

@@ -6,33 +6,8 @@ default-image-upload-provider the-null-pointer
 size-indicator #true
 instant #false
 
-theme {
-  selection-frame 0xab_61_37
-  
-  non-selected-region 0x00_00_00 opacity=0.5
-  
-  drop-shadow 0x00_00_00 opacity=0.5
-  
-  text-selection 0xab_61_37 opacity=0.3
-  
-  size-indicator-fg 0xff_ff_ff
-  size-indicator-bg 0x00_00_00 opacity=0.5
-  
-  tooltip-fg 0xff_ff_ff
-  tooltip-bg 0x00_00_00
-  
-  error-fg 0xff_ff_ff
-  error-bg 0xff_00_00 opacity=0.6
-  
-  info-box-fg 0xff_ff_ff
-  info-box-bg 0xab_61_37 opacity=0.95
-  
-  icon-fg 0xff_ff_ff
-  icon-bg 0xab_61_37
-}
-
 keys {
-  exit key=<escape>
+  exit key=<esc>
 
   copy-to-clipboard mod=ctrl key=c
   copy-to-clipboard key=<enter>
@@ -101,16 +76,38 @@ keys {
   shrink right 5 mod="ctrl + alt" key=l
   shrink right 5 mod="ctrl + alt" key=<right>
 
-  // "teleport" the selection to a place
-  goto left key=gh
-  goto bottom key=gj
-  goto top key=gk
-  goto right key=gl
-
-  goto center key=gc
-  goto top-left key=gg
-  goto top-right key=>
-  goto bottom-left key=<
-  goto bottom-right key=G
+  // move selection as far as it can go
+  move left #inf key=gh
+  move left #inf key=g<left>
+  move down #inf key=gj
+  move down #inf key=g<down>
+  move up #inf key=gk
+  move up #inf key=g<up>
+  move right #inf key=gl
+  move right #inf key=g<right>
 }
 
+theme {
+  selection-frame 0xab_61_37
+  
+  non-selected-region 0x00_00_00 opacity=0.5
+  
+  drop-shadow 0x00_00_00 opacity=0.5
+  
+  text-selection 0xab_61_37 opacity=0.3
+  
+  size-indicator-fg 0xff_ff_ff
+  size-indicator-bg 0x00_00_00 opacity=0.5
+  
+  tooltip-fg 0xff_ff_ff
+  tooltip-bg 0x00_00_00
+  
+  error-fg 0xff_ff_ff
+  error-bg 0xff_00_00 opacity=0.6
+  
+  info-box-fg 0xff_ff_ff
+  info-box-bg 0xab_61_37 opacity=0.95
+  
+  icon-fg 0xff_ff_ff
+  icon-bg 0xab_61_37
+}

src/app.rs

@@ -17,7 +17,7 @@ use iced::widget::{self, Column, Space, Stack, canvas, column, container, row};
 use iced::{Background, Color, Element, Font, Length, Point, Rectangle, Size, Task};
 
 use crate::background_image::BackgroundImage;
-use crate::corners::{Corner, Direction, RectPlace, Side, SideOrCorner};
+use crate::corners::{Corner, Direction, Side, SideOrCorner};
 use crate::rectangle::RectangleExt;
 use crate::selection::{Selection, SelectionStatus};
 
@@ -334,48 +334,6 @@ impl App {
                     return Self::exit();
                 }
                 KeyAction::Exit => return Self::exit(),
-                KeyAction::Goto(rect_place) => {
-                    let Some(selection) = self.selection.as_mut() else {
-                        self.error("Nothing is selected.");
-                        return Task::none();
-                    };
-                    let sel = selection.norm();
-                    let (image_width, image_height, _) = self.screenshot.raw();
-                    let image_height = image_height as f32;
-                    let image_width = image_width as f32;
-
-                    *selection = match rect_place {
-                        RectPlace::SideOrCorner(SideOrCorner::Side(side)) => match side {
-                            Side::Top => sel
-                                .with_x(|_| image_width / 2.0 - sel.rect.width / 2.0)
-                                .with_y(|_| 0.0),
-                            Side::Right => sel
-                                .with_x(|_| image_width - sel.rect.width)
-                                .with_y(|_| image_height / 2.0 - sel.rect.height / 2.0),
-                            Side::Bottom => sel
-                                .with_x(|_| image_width / 2.0 - sel.rect.width / 2.0)
-                                .with_y(|_| image_height - sel.rect.height),
-                            Side::Left => sel
-                                .with_x(|_| 0.0)
-                                .with_y(|_| image_height / 2.0 - sel.rect.height / 2.0),
-                        },
-                        RectPlace::SideOrCorner(SideOrCorner::Corner(corner)) => match corner {
-                            Corner::TopLeft => sel.with_x(|_| 0.0).with_y(|_| 0.0),
-                            Corner::TopRight => {
-                                sel.with_x(|_| image_width - sel.rect.width).with_y(|_| 0.0)
-                            }
-                            Corner::BottomLeft => sel
-                                .with_x(|_| 0.0)
-                                .with_y(|_| image_height - sel.rect.height),
-                            Corner::BottomRight => sel
-                                .with_x(|_| image_width - sel.rect.width)
-                                .with_y(|_| image_height - sel.rect.height),
-                        },
-                        RectPlace::Center => sel
-                            .with_x(|_| image_width / 2.0 - sel.rect.width / 2.0)
-                            .with_y(|_| image_height / 2.0 - sel.rect.height / 2.0),
-                    };
-                }
                 KeyAction::Move(direction, amount) => {
                     println!("{direction:?}, {amount:?}");
                     let Some(selection) = self.selection.as_mut() else {

src/config/mod.rs

@@ -19,13 +19,12 @@ pub mod key;
 pub mod macros;
 pub mod named_key;
 
-/// The default configuration for ferrishot, to be *merged* with the user's config
-pub const DEFAULT_KDL_CONFIG_STR: &str = include_str!("../../default-config.kdl");
+/// The default configuration for ferrishot, to be merged with the user's config
+pub const DEFAULT_KDL_CONFIG_STR: &str = include_str!("../../default.kdl");
 
 use crate::config::key::KeyMap;
 use crate::config::macros::Color;
 use crate::corners::Direction;
-use crate::corners::RectPlace;
 use crate::image_upload::ImageUploadService;
 pub use cli::CLI;
 use std::fs;
@@ -62,11 +61,6 @@ crate::declare_key_options! {
     Exit,
     /// Set selection to encompass the entire screen
     SelectFullScreen,
-    /// Teleport the selection to the given area
-    Goto {
-        #[knus(str)]
-        place: RectPlace,
-    },
     /// Shift the selection in the given direction by pixels
     Move {
         direction: Direction,

src/config/named_key.rs

@@ -35,6 +35,7 @@ named_keys! {
     ArrowLeft = "left",
     ArrowRight = "right",
     ArrowUp = "up",
+    Escape = "esc",
     Alt,
     AltGraph,
     CapsLock,
@@ -73,7 +74,6 @@ named_keys! {
     Attn,
     Cancel,
     ContextMenu,
-    Escape,
     Execute,
     Find,
     Help,

src/corners.rs

@@ -123,34 +123,6 @@ impl FromStr for SideOrCorner {
 
 /// A named place of the rectangle
 
-#[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord)]
-pub enum RectPlace {
-    /// A side or a corner of the rectangle
-    SideOrCorner(SideOrCorner),
-    /// Center of the rectangle
-    Center,
-}
-
-impl FromStr for RectPlace {
-    type Err = String;
-
-    fn from_str(s: &str) -> Result<Self, Self::Err> {
-        s.parse::<SideOrCorner>().map_or_else(
-            |_| {
-                if s == "center" {
-                    Ok(Self::Center)
-                } else {
-                    Err(format!(
-                        "expected one of center, {}",
-                        SideOrCorner::variants()
-                    ))
-                }
-            },
-            |side_or_corner| Ok(Self::SideOrCorner(side_or_corner)),
-        )
-    }
-}
-
 impl Corner {
     /// # Arguments
     ///

src/main.rs

@@ -33,6 +33,7 @@ fn main() -> miette::Result<()> {
         )
         .into_diagnostic()?;
         std::fs::write(&CLI.config_file, ferrishot::DEFAULT_KDL_CONFIG_STR).into_diagnostic()?;
+        println!("Success");
 
         return Ok(());
     }

src/message.rs

@@ -1,9 +1,10 @@
 //! A message represents some event in the app that mutates the state
 
-use iced::{Point, Rectangle, mouse::Cursor, wgpu::hal::DynPipelineCache};
+use iced::{Point, Rectangle, mouse::Cursor};
 
 use crate::{
-    corners::{Direction, RectPlace, SideOrCorner},
+    config::KeyAction,
+    corners::SideOrCorner,
     selection::{Selection, Speed, selection_lock::SelectionIsSome},
 };
 
@@ -80,5 +81,5 @@ pub enum Message {
         sel_is_some: SelectionIsSome,
     },
     /// An action can be triggered by a keybind
-    KeyBind(crate::config::KeyAction),
+    KeyBind(KeyAction),
 }