Set the default value of border widths and window gaps via `config`

diff --git a/Makefile b/Makefile
index 2572636e99b85fe9bf64fb76a67935d128d1bc91..3d601ebe231e9b631f1b28cc6efd48a37c3c176c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -58,9 +58,6 @@ uninstall:
        rm -f "$(DESTDIR)$(BASHCPL)"/bspc
        rm -f "$(DESTDIR)$(ZSHCPL)"/_bspc
 
-deps:
-       $(CC) -MM *.c > Sourcedeps
-
 doc:
        a2x -v -d manpage -f manpage -a revnumber=$(VERSION) doc/bspwm.1.txt
 

diff --git a/Sourcedeps b/Sourcedeps
index f757d4e7277bb4854303f9f5353a2f110609e2a9..5c9320726d8f631acb2474bf97d15b298c5865c6 100644 (file)
--- a/Sourcedeps
+++ b/Sourcedeps
@@ -1,32 +1,18 @@
-bspc.o: bspc.c helpers.h common.h
-bspwm.o: bspwm.c types.h helpers.h desktop.h monitor.h settings.h \
- messages.h subscribe.h events.h common.h window.h history.h stack.h \
- ewmh.h rule.h bspwm.h
-desktop.o: desktop.c bspwm.h types.h helpers.h ewmh.h history.h monitor.h \
- query.h tree.h window.h desktop.h
-events.o: events.c bspwm.h types.h helpers.h ewmh.h monitor.h query.h \
- settings.h tree.h window.h events.h
-ewmh.o: ewmh.c bspwm.h types.h helpers.h settings.h tree.h ewmh.h
-helpers.o: helpers.c bspwm.h types.h helpers.h
-history.o: history.c bspwm.h types.h helpers.h query.h
-messages.o: messages.c bspwm.h types.h helpers.h desktop.h ewmh.h \
- history.h monitor.h pointer.h query.h rule.h restore.h settings.h tree.h \
- window.h common.h subscribe.h messages.h
-monitor.o: monitor.c bspwm.h types.h helpers.h desktop.h ewmh.h history.h \
- query.h settings.h tree.h window.h monitor.h
-pointer.o: pointer.c bspwm.h types.h helpers.h query.h settings.h stack.h \
- tree.h monitor.h window.h pointer.h
-query.o: query.c bspwm.h types.h helpers.h desktop.h history.h messages.h \
- monitor.h tree.h query.h
-restore.o: restore.c bspwm.h types.h helpers.h desktop.h ewmh.h history.h \
- monitor.h query.h stack.h tree.h settings.h restore.h
-rule.o: rule.c bspwm.h types.h helpers.h ewmh.h window.h messages.h \
- settings.h rule.h
-settings.o: settings.c bspwm.h types.h helpers.h settings.h
-stack.o: stack.c bspwm.h types.h helpers.h window.h stack.h
-subscribe.o: subscribe.c bspwm.h types.h helpers.h tree.h settings.h \
- subscribe.h
-tree.o: tree.c bspwm.h types.h helpers.h desktop.h ewmh.h history.h \
- monitor.h query.h settings.h stack.h window.h tree.h
-window.o: window.c bspwm.h types.h helpers.h ewmh.h monitor.h query.h \
- rule.h settings.h stack.h tree.h messages.h window.h
+bspc.o: bspc.c common.h helpers.h
+bspwm.o: bspwm.c bspwm.h common.h desktop.h events.h ewmh.h helpers.h history.h messages.h monitor.h rule.h settings.h stack.h subscribe.h types.h window.h
+desktop.o: desktop.c bspwm.h desktop.h ewmh.h helpers.h history.h monitor.h query.h settings.h tree.h types.h window.h
+events.o: events.c bspwm.h events.h ewmh.h helpers.h monitor.h query.h settings.h tree.h types.h window.h
+ewmh.o: ewmh.c bspwm.h ewmh.h helpers.h settings.h tree.h types.h
+helpers.o: helpers.c bspwm.h helpers.h types.h
+history.o: history.c bspwm.h helpers.h query.h types.h
+messages.o: messages.c bspwm.h common.h desktop.h ewmh.h helpers.h history.h messages.h monitor.h pointer.h query.h restore.h rule.h settings.h subscribe.h tree.h types.h window.h
+monitor.o: monitor.c bspwm.h desktop.h ewmh.h helpers.h history.h monitor.h query.h settings.h tree.h types.h window.h
+pointer.o: pointer.c bspwm.h helpers.h monitor.h pointer.h query.h settings.h stack.h tree.h types.h window.h
+query.o: query.c bspwm.h desktop.h helpers.h history.h messages.h monitor.h query.h tree.h types.h
+restore.o: restore.c bspwm.h desktop.h ewmh.h helpers.h history.h monitor.h query.h restore.h settings.h stack.h tree.h types.h
+rule.o: rule.c bspwm.h ewmh.h helpers.h messages.h rule.h settings.h types.h window.h
+settings.o: settings.c bspwm.h helpers.h settings.h types.h
+stack.o: stack.c bspwm.h helpers.h stack.h types.h window.h
+subscribe.o: subscribe.c bspwm.h helpers.h settings.h subscribe.h tree.h types.h
+tree.o: tree.c bspwm.h desktop.h ewmh.h helpers.h history.h monitor.h query.h settings.h stack.h tree.h types.h window.h
+window.o: window.c bspwm.h ewmh.h helpers.h messages.h monitor.h query.h rule.h settings.h stack.h tree.h types.h window.h

diff --git a/desktop.c b/desktop.c
index fcc9770fc4f23a46a5ce5c09553601ffed99d20f..7af520c6aa4d9c2491b37fe5142dae91b88e3a8e 100644 (file)
--- a/desktop.c
+++ b/desktop.c
@@ -35,6 +35,7 @@
 #include "tree.h"
 #include "window.h"
 #include "desktop.h"
+#include "settings.h"
 
 void focus_desktop(monitor_t *m, desktop_t *d)
 {
@@ -123,8 +124,8 @@ desktop_t *make_desktop(const char *name)
        d->prev = d->next = NULL;
        d->root = d->focus = NULL;
        d->top_padding = d->right_padding = d->bottom_padding = d->left_padding = 0;
-       d->window_gap = WINDOW_GAP;
-       d->border_width = BORDER_WIDTH;
+       d->window_gap = window_gap;
+       d->border_width = border_width;
        d->floating = false;
        return d;
 }

diff --git a/desktop.h b/desktop.h
index 812dc1c5a37d0bb49835fb91b6b1bc34711b32dc..6d61949fb588e60ce792d60e92ebd7ec4a95146e 100644 (file)
--- a/desktop.h
+++ b/desktop.h
@@ -30,8 +30,6 @@
 #define BSPWM_DESKTOP_H
 
 #define DEFAULT_DESK_NAME    "Desktop"
-#define WINDOW_GAP           6
-#define BORDER_WIDTH         1
 
 void focus_desktop(monitor_t *m, desktop_t *d);
 desktop_t *closest_desktop(monitor_t *m, desktop_t *d, cycle_dir_t dir, desktop_select_t sel);

diff --git a/doc/bspwm.1 b/doc/bspwm.1
index 913fa5f21e11f9e390072c67f2329dbf99407d2e..526156f39b0fc7688d7ec8ce625c35416ff455a8 100644 (file)
--- a/doc/bspwm.1
+++ b/doc/bspwm.1
@@ -2,12 +2,12 @@
 .\"     Title: bspwm
 .\"    Author: [see the "Author" section]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 05/05/2014
+.\"      Date: 05/06/2014
 .\"    Manual: Bspwm Manual
 .\"    Source: Bspwm 0.8.8
 .\"  Language: English
 .\"
-.TH "BSPWM" "1" "05/05/2014" "Bspwm 0\&.8\&.8" "Bspwm Manual"
+.TH "BSPWM" "1" "05/06/2014" "Bspwm 0\&.8\&.8" "Bspwm Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -1131,13 +1131,13 @@ Merge overlapping monitors (the bigger remains)\&.
 .RS 4
 Padding space added at the sides of the monitor or desktop\&.
 .RE
-.SS "Desktop and Window Settings"
+.SS "Global, Desktop and Window Settings"
 .PP
 \fIborder_width\fR
 .RS 4
 Window border width\&.
 .RE
-.SS "Desktop Settings"
+.SS "Global and Desktop Settings"
 .PP
 \fIwindow_gap\fR
 .RS 4

diff --git a/doc/bspwm.1.txt b/doc/bspwm.1.txt
index 776388155849d5c4a297cef2a24b117721f28666..b91839882341eb31c6d40bf475fc1184096e25f7 100644 (file)
--- a/doc/bspwm.1.txt
+++ b/doc/bspwm.1.txt
@@ -694,14 +694,14 @@ Monitor and Desktop Settings
 'left_padding'::
        Padding space added at the sides of the monitor or desktop.
 
-Desktop and Window Settings
-~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Global, Desktop and Window Settings
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 'border_width'::
        Window border width.
 
-Desktop Settings
-~~~~~~~~~~~~~~~~
+Global and Desktop Settings
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 'window_gap'::
        Size of the gap that separates windows.

diff --git a/messages.c b/messages.c
index 26fd25eca5ca329584b56e9a25984df0e5e4e160..da669c405d62c826afe1c0c0f0722185e4eafc09 100644 (file)
--- a/messages.c
+++ b/messages.c
@@ -868,7 +868,7 @@ int cmd_quit(char **args, int num)
 
 int set_setting(coordinates_t loc, char *name, char *value)
 {
-#define DESKWINSET(k, v) \
+#define DESKWINGLOBSET(k, v) \
                if (loc.node != NULL) \
                        loc.node->client->k = v; \
                else if (loc.desktop != NULL) \
@@ -877,31 +877,27 @@ int set_setting(coordinates_t loc, char *name, char *value)
                        for (desktop_t *d = loc.monitor->desk_head; d != NULL; d = d->next) \
                                d->k = v; \
                else \
-                       for (monitor_t *m = mon_head; m != NULL; m = m->next) \
-                               for (desktop_t *d = m->desk_head; d != NULL; d = d->next) \
-                                       d->k = v;
+                       k = v;
        if (streq("border_width", name)) {
                unsigned int bw;
                if (sscanf(value, "%u", &bw) != 1)
                        return MSG_FAILURE;
-               DESKWINSET(border_width, bw)
-#undef DESKWINSET
-#define DESKSET(k, v) \
+               DESKWINGLOBSET(border_width, bw)
+#undef DESKWINGLOBSET
+#define DESKGLOBSET(k, v) \
                if (loc.desktop != NULL) \
                        loc.desktop->k = v; \
                else if (loc.monitor != NULL) \
                        for (desktop_t *d = loc.monitor->desk_head; d != NULL; d = d->next) \
                                d->k = v; \
                else \
-                       for (monitor_t *m = mon_head; m != NULL; m = m->next) \
-                               for (desktop_t *d = m->desk_head; d != NULL; d = d->next) \
-                                       d->k = v;
+                       k = v;
        } else if (streq("window_gap", name)) {
                int wg;
                if (sscanf(value, "%i", &wg) != 1)
                        return MSG_FAILURE;
-               DESKSET(window_gap, wg)
-#undef DESKSET
+               DESKGLOBSET(window_gap, wg)
+#undef DESKGLOBSET
 #define MONDESKSET(k, v) \
                if (loc.desktop != NULL) \
                        loc.desktop->k = v; \

diff --git a/settings.c b/settings.c
index 8caa6dd1f93a707b80b45264d943c880fcd021bb..99f2f76b2dab63800bf33fdb46b271b43026df03 100644 (file)
--- a/settings.c
+++ b/settings.c
@@ -62,6 +62,8 @@ void load_settings(void)
        snprintf(urgent_border_color, sizeof(urgent_border_color), "%s", URGENT_BORDER_COLOR);
 
        split_ratio = SPLIT_RATIO;
+       window_gap = WINDOW_GAP;
+       border_width = BORDER_WIDTH;
 
        borderless_monocle = BORDERLESS_MONOCLE;
        gapless_monocle = GAPLESS_MONOCLE;

diff --git a/settings.h b/settings.h
index 060f6c983c87f806e1b19b3e0d65fa2cca02e417..0a85b51844806d1bd76a8402114619fc49f44c34 100644 (file)
--- a/settings.h
+++ b/settings.h
@@ -53,6 +53,8 @@
 #define URGENT_BORDER_COLOR           "#EFA29A"
 
 #define SPLIT_RATIO    0.5
+#define WINDOW_GAP     6
+#define BORDER_WIDTH   1
 
 #define HISTORY_AWARE_FOCUS        false
 #define BORDERLESS_MONOCLE         false
@@ -86,6 +88,8 @@ char normal_private_border_color[MAXLEN];
 char urgent_border_color[MAXLEN];
 
 double split_ratio;
+int window_gap;
+unsigned int border_width;
 
 bool borderless_monocle;
 bool gapless_monocle;