From 3d549026c2ab5642f9e9378c10ac291833d7b761 Mon Sep 17 00:00:00 2001 From: Zastian Pretorius Date: Wed, 6 Jul 2022 01:55:13 +0100 Subject: [PATCH] removed Region data_type --- penrose/.config/penrose/src/main.rs | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/penrose/.config/penrose/src/main.rs b/penrose/.config/penrose/src/main.rs index 369becb..0509fb6 100644 --- a/penrose/.config/penrose/src/main.rs +++ b/penrose/.config/penrose/src/main.rs @@ -3,14 +3,14 @@ extern crate penrose; use penrose::{ contrib::{ - actions::{focus_or_spawn,update_monitors_via_xrandr}, + actions::{focus_or_spawn, update_monitors_via_xrandr}, extensions::Scratchpad, }, core::{ config::Config, + data_types::RelativePosition, helpers::index_selectors, hooks::Hook, - data_types::{Region,RelativePosition}, layout::{side_stack, Layout, LayoutConf}, manager::WindowManager, xconnection::XConn, @@ -31,8 +31,7 @@ impl Hook for StartupHook { fn startup(&mut self, wm: &mut WindowManager) -> Result<()> { if wm.n_screens() == 1 { spawn!("polybar --reload barbase2") - } - else { + } else { spawn!("polybar --reload barbase1"); spawn!("polybar --reload barbase2") }; @@ -42,7 +41,6 @@ impl Hook for StartupHook { } } - struct Monitors {} impl Hook for Monitors where @@ -52,16 +50,12 @@ where update_monitors_via_xrandr("HDMI-A-0", "eDP", RelativePosition::Left); if wm.n_screens() != 1 { spawn!("polybar --reload barbase1") - } - else { + } else { spawn!("echo 'Only one screen connected'") } } } - - - fn main() -> penrose::Result<()> { // Initialise the logger (use LevelFilter::Debug to enable debug logging) if let Err(e) = SimpleLogger::init(LevelFilter::Info, simplelog::Config::default()) { @@ -76,9 +70,6 @@ fn main() -> penrose::Result<()> { sp.get_hook(), ]; - - - // Created at startup. See keybindings below for how to access them let mut config_builder = Config::default().builder(); config_builder @@ -119,7 +110,7 @@ fn main() -> penrose::Result<()> { "A-k" => run_internal!(cycle_client, Backward); "A-S-j" => run_internal!(drag_client, Forward); "A-S-k" => run_internal!(drag_client, Backward); - "A-S-f" => run_internal!(toggle_client_fullscreen, &Selector::Focused); + "A-t" => run_internal!(toggle_client_fullscreen, &Selector::Focused); "A-q" => run_internal!(kill_client); // workspace management