PolytreeDE
/
polytreewm
1
0
Fork 0
Code Issues 4 Releases Activity

Improve settings

This commit is contained in:
Alex Kotov 2022-09-09 01:32:13 +04:00
parent f8a678ecf8
commit f69b3add80
Signed by: kotovalexarian
GPG Key ID: 553C0EBBEB5D5F08
2 changed files with 142 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/api/settings.rs
View File

@ -23,17 +23,17 @@ unsafe extern "C" fn settings_set_bar_on_top_by_default(value: bool) {
#[no_mangle]
unsafe extern "C" fn settings_set_border_for_single_window(value: c_uchar) {
SETTINGS.unwrap().border_for_single_window_set(value.into());
SETTINGS.unwrap().border().mode_set(value.into());
}
#[no_mangle]
unsafe extern "C" fn settings_get_border_width() -> c_int {
SETTINGS.unwrap().border_width()
SETTINGS.unwrap().border().width()
}
#[no_mangle]
unsafe extern "C" fn settings_set_border_width(value: c_int) {
SETTINGS.unwrap().border_width_set(value);
SETTINGS.unwrap().border().width_set(value);
}
#[no_mangle]
@ -78,17 +78,17 @@ unsafe extern "C" fn settings_set_focus_on_wheel(value: bool) {
#[no_mangle]
unsafe extern "C" fn settings_set_gap_for_single_window(value: c_uchar) {
SETTINGS.unwrap().gap_for_single_window_set(value.into());
SETTINGS.unwrap().gap().mode_set(value.into());
}
#[no_mangle]
unsafe extern "C" fn settings_get_gap_size() -> c_int {
SETTINGS.unwrap().gap_size()
SETTINGS.unwrap().gap().size()
}
#[no_mangle]
unsafe extern "C" fn settings_set_gap_size(value: c_int) {
SETTINGS.unwrap().gap_size_set(value);
SETTINGS.unwrap().gap().size_set(value);
}
#[no_mangle]
@ -181,7 +181,7 @@ unsafe extern "C" fn helpers_border_width(
selected_is_fullscreen: bool,
any_is_fullscreen: bool,
) -> c_int {
SETTINGS.unwrap().border_width_helper(
SETTINGS.unwrap().border().width_helper(
displayed_clients,
selected_is_fullscreen,
any_is_fullscreen,
@ -194,7 +194,7 @@ unsafe extern "C" fn helpers_gap_size(
selected_is_fullscreen: bool,
any_is_fullscreen: bool,
) -> c_int {
SETTINGS.unwrap().gap_size_helper(
SETTINGS.unwrap().gap().size_helper(
displayed_clients,
selected_is_fullscreen,
any_is_fullscreen,

234
src/settings.rs
View File

@ -6,14 +6,12 @@ use std::os::raw::*;
#[derive(Clone, Copy, Debug)]
pub struct Settings {
bar_on_top_by_default: bool,
border_for_single_window: ForSingleWindow,
border_width: c_int,
border: Border,
default_clients_in_master: c_int,
default_master_area_factor: c_float,
enable_swallowing: bool,
focus_on_wheel: bool,
gap_for_single_window: ForSingleWindow,
gap_size: c_int,
gap: Gap,
master_area_factor_per_unit: unit::Kind,
max_clients_in_master: Option<c_int>,
respect_resize_hints_in_floating_layout: bool,
@ -31,18 +29,28 @@ pub enum ForSingleWindow {
NobodyIsFullscreen,
}
#[derive(Clone, Copy, Debug)]
pub struct Border {
mode: ForSingleWindow,
width: c_int,
}
#[derive(Clone, Copy, Debug)]
pub struct Gap {
mode: ForSingleWindow,
size: c_int,
}
impl Default for Settings {
fn default() -> Self {
Self {
bar_on_top_by_default: true,
border_for_single_window: Default::default(),
border_width: 2,
border: Default::default(),
default_clients_in_master: 1,
default_master_area_factor: 0.6,
enable_swallowing: true,
focus_on_wheel: true,
gap_for_single_window: Default::default(),
gap_size: 10,
gap: Default::default(),
master_area_factor_per_unit: unit::Kind::Monitor,
max_clients_in_master: None,
respect_resize_hints_in_floating_layout: false,
@ -54,6 +62,24 @@ impl Default for Settings {
}
}
impl Default for Border {
fn default() -> Self {
Self {
mode: Default::default(),
width: 2,
}
}
}
impl Default for Gap {
fn default() -> Self {
Self {
mode: Default::default(),
size: 10,
}
}
}
impl Default for ForSingleWindow {
fn default() -> Self {
Self::NobodyIsFullscreen
@ -92,52 +118,8 @@ impl Settings {
self.bar_on_top_by_default = value;
}
pub fn border_for_single_window(&self) -> ForSingleWindow {
self.border_for_single_window
}
// TODO: notify WM to rearrange clients
pub fn border_for_single_window_set(&mut self, value: ForSingleWindow) {
self.border_for_single_window = value;
}
pub fn border_width(&self) -> c_int {
self.border_width
}
// TODO: notify WM to rearrange clients
pub fn border_width_set(&mut self, value: c_int) {
self.border_width = constraints::border_width(value);
}
pub fn border_width_helper(
&self,
displayed_clients: c_uint,
selected_is_fullscreen: bool,
any_is_fullscreen: bool,
) -> c_int {
if displayed_clients > 1 {
return self.border_width;
}
match self.border_for_single_window {
ForSingleWindow::Never => 0,
ForSingleWindow::Always => self.border_width,
ForSingleWindow::NotInFullscreen => {
if selected_is_fullscreen {
0
} else {
self.border_width
}
}
ForSingleWindow::NobodyIsFullscreen => {
if selected_is_fullscreen || any_is_fullscreen {
0
} else {
self.border_width
}
}
}
pub fn border(&mut self) -> &mut Border {
&mut self.border
}
pub fn default_clients_in_master(&self) -> c_int {
@ -174,52 +156,8 @@ impl Settings {
self.focus_on_wheel = value;
}
pub fn gap_for_single_window(&self) -> ForSingleWindow {
self.gap_for_single_window
}
// TODO: notify WM to rearrange clients
pub fn gap_for_single_window_set(&mut self, value: ForSingleWindow) {
self.gap_for_single_window = value;
}
pub fn gap_size(&self) -> c_int {
self.gap_size
}
// TODO: notify WM to rearrange clients
pub fn gap_size_set(&mut self, value: c_int) {
self.gap_size = constraints::gap_size(value);
}
pub fn gap_size_helper(
&self,
displayed_clients: c_uint,
selected_is_fullscreen: bool,
any_is_fullscreen: bool,
) -> c_int {
if displayed_clients > 1 {
return self.gap_size;
}
match self.gap_for_single_window {
ForSingleWindow::Never => 0,
ForSingleWindow::Always => self.gap_size,
ForSingleWindow::NotInFullscreen => {
if selected_is_fullscreen {
0
} else {
self.gap_size
}
}
ForSingleWindow::NobodyIsFullscreen => {
if selected_is_fullscreen || any_is_fullscreen {
0
} else {
self.gap_size
}
}
}
pub fn gap(&mut self) -> &mut Gap {
&mut self.gap
}
pub fn master_area_factor_per_unit(&self) -> unit::Kind {
@ -283,3 +221,99 @@ impl Settings {
self.swallow_floating = value;
}
}
impl Border {
pub fn mode(&self) -> ForSingleWindow {
self.mode
}
pub fn mode_set(&mut self, value: ForSingleWindow) {
self.mode = value;
}
pub fn width(&self) -> c_int {
self.width
}
pub fn width_set(&mut self, value: c_int) {
self.width = constraints::border_width(value);
}
pub fn width_helper(
&self,
displayed_clients: c_uint,
selected_is_fullscreen: bool,
any_is_fullscreen: bool,
) -> c_int {
if displayed_clients > 1 {
return self.width;
}
match self.mode {
ForSingleWindow::Never => 0,
ForSingleWindow::Always => self.width,
ForSingleWindow::NotInFullscreen => {
if selected_is_fullscreen {
0
} else {
self.width
}
}
ForSingleWindow::NobodyIsFullscreen => {
if selected_is_fullscreen || any_is_fullscreen {
0
} else {
self.width
}
}
}
}
}
impl Gap {
pub fn mode(&self) -> ForSingleWindow {
self.mode
}
pub fn mode_set(&mut self, value: ForSingleWindow) {
self.mode = value;
}
pub fn size(&self) -> c_int {
self.size
}
pub fn size_set(&mut self, value: c_int) {
self.size = constraints::gap_size(value);
}
pub fn size_helper(
&self,
displayed_clients: c_uint,
selected_is_fullscreen: bool,
any_is_fullscreen: bool,
) -> c_int {
if displayed_clients > 1 {
return self.size;
}
match self.mode {
ForSingleWindow::Never => 0,
ForSingleWindow::Always => self.size,
ForSingleWindow::NotInFullscreen => {
if selected_is_fullscreen {
0
} else {
self.size
}
}
ForSingleWindow::NobodyIsFullscreen => {
if selected_is_fullscreen || any_is_fullscreen {
0
} else {
self.size
}
}
}
}
}