-/* Copyright (c) 2012-2014, Bastien Dejean
+/* Copyright (c) 2012, Bastien Dejean
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * The views and conclusions contained in the software and documentation are those
- * of the authors and should not be interpreted as representing official policies,
- * either expressed or implied, of the FreeBSD Project.
*/
#include <errno.h>
num--, args++;
if (num < 2)
return MSG_SYNTAX;
+ if (!is_tiled(trg.node->client))
+ return MSG_FAILURE;
direction_t dir;
if (!parse_direction(*args, &dir))
return MSG_FAILURE;
desktop_t *d = trg.monitor->desk_head;
while (num > 0 && d != NULL) {
snprintf(d->name, sizeof(d->name), "%s", *args);
+ initialize_desktop(d);
+ arrange(trg.monitor, d);
d = d->next;
num--, args++;
}
int set_setting(coordinates_t loc, char *name, char *value)
{
-#define DESKWINSET(k, v) \
+#define DESKWINDEFSET(k, v) \
if (loc.node != NULL) \
loc.node->client->k = v; \
else if (loc.desktop != 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;
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) \
+ DESKWINDEFSET(border_width, bw)
+#undef DESKWINDEFSET
+#define DESKDEFSET(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
+ DESKDEFSET(window_gap, wg)
+#undef DESKDEFSET
#define MONDESKSET(k, v) \
if (loc.desktop != NULL) \
loc.desktop->k = v; \
SETCOLOR(normal_private_border_color)
SETCOLOR(urgent_border_color)
#undef SETCOLOR
+ } else if (streq("initial_polarity", name)) {
+ child_polarity_t p;
+ if (parse_child_polarity(value, &p)) {
+ initial_polarity = p;
+ } else {
+ return MSG_FAILURE;
+ }
} else if (streq("focus_follows_pointer", name)) {
bool b;
if (parse_bool(value, &b) && b != focus_follows_pointer) {
return MSG_FAILURE;
SETBOOL(borderless_monocle)
SETBOOL(gapless_monocle)
+ SETBOOL(pointer_follows_focus)
SETBOOL(pointer_follows_monitor)
SETBOOL(apply_floating_atom)
SETBOOL(auto_alternate)
SETBOOL(auto_cancel)
SETBOOL(history_aware_focus)
+ SETBOOL(focus_by_distance)
SETBOOL(ignore_ewmh_focus)
- SETBOOL(remove_disabled_monitor)
- SETBOOL(remove_unplugged_monitors)
- SETBOOL(merge_overlapping_monitors)
+ SETBOOL(center_pseudo_tiled)
#undef SETBOOL
+#define SETMONBOOL(s) \
+ } else if (streq(#s, name)) { \
+ if (!parse_bool(value, &s)) \
+ return MSG_FAILURE; \
+ if (s) \
+ update_monitors();
+ SETMONBOOL(remove_disabled_monitors)
+ SETMONBOOL(remove_unplugged_monitors)
+ SETMONBOOL(merge_overlapping_monitors)
+#undef SETMONBOOL
} else {
return MSG_FAILURE;
}
if (streq("split_ratio", name))
fprintf(rsp, "%lf", split_ratio);
else if (streq("window_gap", name))
- if (loc.desktop == NULL)
- return MSG_FAILURE;
- else
+ if (loc.desktop != NULL)
fprintf(rsp, "%i", loc.desktop->window_gap);
+ else
+ fprintf(rsp, "%i", window_gap);
else if (streq("border_width", name))
if (loc.node != NULL)
fprintf(rsp, "%u", loc.node->client->border_width);
else if (loc.desktop != NULL)
fprintf(rsp, "%u", loc.desktop->border_width);
else
- return MSG_FAILURE;
+ fprintf(rsp, "%u", border_width);
else if (streq("external_rules_command", name))
fprintf(rsp, "%s", external_rules_command);
else if (streq("status_prefix", name))
fprintf(rsp, "%s", status_prefix);
+ else if (streq("initial_polarity", name))
+ fprintf(rsp, "%s", initial_polarity == FIRST_CHILD ? "first_child" : "second_child");
#define MONDESKGET(k) \
else if (streq(#k, name)) \
if (loc.desktop != NULL) \
GETBOOL(borderless_monocle)
GETBOOL(gapless_monocle)
GETBOOL(focus_follows_pointer)
+ GETBOOL(pointer_follows_focus)
GETBOOL(pointer_follows_monitor)
GETBOOL(apply_floating_atom)
GETBOOL(auto_alternate)
GETBOOL(auto_cancel)
GETBOOL(history_aware_focus)
+ GETBOOL(focus_by_distance)
GETBOOL(ignore_ewmh_focus)
- GETBOOL(remove_disabled_monitor)
+ GETBOOL(center_pseudo_tiled)
+ GETBOOL(remove_disabled_monitors)
GETBOOL(remove_unplugged_monitors)
GETBOOL(merge_overlapping_monitors)
#undef GETBOOL
return false;
}
+bool parse_child_polarity(char *s, child_polarity_t *p)
+{
+ if (streq("first_child", s)) {
+ *p = FIRST_CHILD;
+ return true;
+ } else if (streq("second_child", s)) {
+ *p = SECOND_CHILD;
+ return true;
+ }
+ return false;
+}
+
bool parse_degree(char *s, int *d)
{
int i = atoi(s);
projects / bspwm.git / blobdiff