From 8fef2295ddc05433cce070c4ce339bd6feb66e1c Mon Sep 17 00:00:00 2001 From: Alex Kotov Date: Thu, 18 Nov 2021 19:53:22 +0500 Subject: [PATCH] Reorder code and add empty lines --- src/config.def.h | 4 ++++ src/settings.c | 24 ++++++++++++------------ src/settings.h | 6 +++--- 3 files changed, 19 insertions(+), 15 deletions(-) diff --git a/src/config.def.h b/src/config.def.h index b3899e4..6d65c01 100644 --- a/src/config.def.h +++ b/src/config.def.h @@ -3,6 +3,7 @@ static const char wm_name[] = "PolytreeWM"; /* appearance */ + static const int topbar = 1; /* 0 means bottom bar */ static const char *fonts[] = { "monospace:size=10" }; static const char col_gray1[] = "#222222"; @@ -33,6 +34,7 @@ static const Rule rules[] = { }; /* layout(s) */ + static const float mfact = 0.55; /* factor of master area size [0.05..0.95] */ static const Layout layouts[] = { @@ -45,6 +47,7 @@ static const Layout layouts[] = { }; /* key definitions */ + #define MODKEY Mod4Mask #define TAGKEYS(KEY,TAG) \ { MODKEY, KEY, view, {.ui = 1 << TAG} }, \ @@ -113,6 +116,7 @@ static Key keys[] = { /* button definitions */ /* click can be ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle, ClkClientWin, or ClkRootWin */ + static Button buttons[] = { /* click event mask button function argument */ { ClkClientWin, MODKEY, Button1, movemouse, {0} }, diff --git a/src/settings.c b/src/settings.c index 794e809..5c1fd3f 100644 --- a/src/settings.c +++ b/src/settings.c @@ -11,9 +11,9 @@ #define MIN_SNAP_DISTANCE 1 #define MAX_SNAP_DISTANCE 10000 +static SettingsForSingleWindow border_for_single_window = SETTINGS_FOR_SINGLE_WINDOW_NOBODY_IS_FULLSCREEN; static int border_width = 2; static int default_clients_in_master = 1; -static SettingsForSingleWindow border_for_single_window = SETTINGS_FOR_SINGLE_WINDOW_NOBODY_IS_FULLSCREEN; static SettingsForSingleWindow gap_for_single_window = SETTINGS_FOR_SINGLE_WINDOW_NOBODY_IS_FULLSCREEN; static bool enable_swallowing = true; static bool focus_on_wheel = true; @@ -26,6 +26,17 @@ static unsigned int snap_distance = 32; static bool status_on_all_monitors = false; static bool swallow_floating = false; +SettingsForSingleWindow settings_get_border_for_single_window() +{ + return border_for_single_window; +} + +void settings_set_border_for_single_window(const SettingsForSingleWindow new_border_for_single_window) +{ + border_for_single_window = new_border_for_single_window; + // TODO: notify WM to rearrange clients +} + int settings_get_border_width() { return border_width; @@ -51,17 +62,6 @@ void settings_set_default_clients_in_master(int new_default_clients_in_master) default_clients_in_master = new_default_clients_in_master; } -SettingsForSingleWindow settings_get_border_for_single_window() -{ - return border_for_single_window; -} - -void settings_set_border_for_single_window(const SettingsForSingleWindow new_border_for_single_window) -{ - border_for_single_window = new_border_for_single_window; - // TODO: notify WM to rearrange clients -} - SettingsForSingleWindow settings_get_gap_for_single_window() { return gap_for_single_window; diff --git a/src/settings.h b/src/settings.h index 4c57eb5..c089fba 100644 --- a/src/settings.h +++ b/src/settings.h @@ -12,15 +12,15 @@ typedef enum { SETTINGS_FOR_SINGLE_WINDOW_NOBODY_IS_FULLSCREEN, } SettingsForSingleWindow; +SettingsForSingleWindow settings_get_border_for_single_window(); +void settings_set_border_for_single_window(SettingsForSingleWindow new_border_for_single_window); + int settings_get_border_width(); void settings_set_border_width(int new_border_width); int settings_get_default_clients_in_master(); void settings_set_default_clients_in_master(int new_default_clients_in_master); -SettingsForSingleWindow settings_get_border_for_single_window(); -void settings_set_border_for_single_window(SettingsForSingleWindow new_border_for_single_window); - SettingsForSingleWindow settings_get_gap_for_single_window(); void settings_set_gap_for_single_window(SettingsForSingleWindow new_gap_for_single_window);