if (strcmp(cmd, "get") == 0) {
char *name = strtok(NULL, TOK_SEP);
get_setting(name, rsp);
- return;
} else if (strcmp(cmd, "set") == 0) {
char *name = strtok(NULL, TOK_SEP);
char *value = strtok(NULL, TOK_SEP);
set_setting(name, value, rsp);
- return;
} else if (strcmp(cmd, "list") == 0) {
char *name = strtok(NULL, TOK_SEP);
if (name != NULL) {
} else {
list(mon->desk, mon->desk->root, rsp, 0);
}
- return;
} else if (strcmp(cmd, "list_monitors") == 0) {
char *arg = strtok(NULL, TOK_SEP);
list_option_t opt;
if (parse_list_option(arg, &opt))
list_monitors(opt, rsp);
- return;
} else if (strcmp(cmd, "list_desktops") == 0) {
char *arg = strtok(NULL, TOK_SEP);
list_option_t opt;
if (parse_list_option(arg, &opt))
list_desktops(mon, opt, 0, rsp);
- return;
} else if (strcmp(cmd, "list_windows") == 0) {
list_windows(rsp);
- return;
} else if (strcmp(cmd, "list_history") == 0) {
list_history(rsp);
- return;
} else if (strcmp(cmd, "list_rules") == 0) {
list_rules(rsp);
- return;
} else if (strcmp(cmd, "close") == 0) {
window_close(mon->desk->focus);
- return;
} else if (strcmp(cmd, "kill") == 0) {
window_kill(mon->desk, mon->desk->focus);
} else if (strcmp(cmd, "rotate") == 0) {
if (parse_rotate(deg, &r))
rotate_tree(mon->desk->root, r);
}
+ arrange(mon, mon->desk);
} else if (strcmp(cmd, "flip") == 0) {
char *flp = strtok(NULL, TOK_SEP);
if (flp != NULL) {
if (parse_flip(flp, &f))
flip_tree(mon->desk->root, f);
}
+ arrange(mon, mon->desk);
} else if (strcmp(cmd, "balance") == 0) {
balance_tree(mon->desk->root);
+ arrange(mon, mon->desk);
} else if (strcmp(cmd, "grab_pointer") == 0) {
char *pac = strtok(NULL, TOK_SEP);
if (pac != NULL) {
}
} else if (strcmp(cmd, "track_pointer") == 0) {
char *arg1 = strtok(NULL, TOK_SEP);
- if (arg1 == NULL)
- return;
char *arg2 = strtok(NULL, TOK_SEP);
- if (arg2 == NULL)
+ if (arg1 == NULL || arg2 == NULL)
return;
int root_x, root_y;
if (sscanf(arg1, "%i", &root_x) == 1 && sscanf(arg2, "%i", &root_y) == 1)
track_pointer(root_x, root_y);
- return;
} else if (strcmp(cmd, "ungrab_pointer") == 0) {
ungrab_pointer();
} else if (strcmp(cmd, "layout") == 0) {
char *lyt = strtok(NULL, TOK_SEP);
if (lyt != NULL) {
- layout_t y;
- if (parse_layout(lyt, &y)) {
+ layout_t l;
+ if (parse_layout(lyt, &l)) {
char *name = strtok(NULL, TOK_SEP);
if (name == NULL) {
- mon->desk->layout = y;
+ change_layout(mon, mon->desk, l);
} else {
desktop_location_t loc;
do {
if (locate_desktop(name, &loc))
- loc.desktop->layout = y;
+ change_layout(loc.monitor, loc.desktop, l);
} while ((name = strtok(NULL, TOK_SEP)) != NULL);
}
}
}
- put_status();
} else if (strcmp(cmd, "cycle_layout") == 0) {
if (mon->desk->layout == LAYOUT_MONOCLE)
- mon->desk->layout = LAYOUT_TILED;
+ change_layout(mon, mon->desk, LAYOUT_TILED);
else
- mon->desk->layout = LAYOUT_MONOCLE;
- put_status();
+ change_layout(mon, mon->desk, LAYOUT_MONOCLE);
} else if (strcmp(cmd, "shift") == 0) {
char *dir = strtok(NULL, TOK_SEP);
if (dir != NULL) {
if (parse_direction(dir, &d))
swap_nodes(mon->desk->focus, focus_by_distance ? nearest_neighbor(mon->desk, mon->desk->focus, d) : find_neighbor(mon->desk->focus, d));
}
+ arrange(mon, mon->desk);
} else if (strcmp(cmd, "toggle_fullscreen") == 0) {
- if (mon->desk->focus != NULL)
- toggle_fullscreen(mon, mon->desk->focus->client);
+ toggle_fullscreen(mon->desk, mon->desk->focus);
+ arrange(mon, mon->desk);
} else if (strcmp(cmd, "toggle_floating") == 0) {
- split_mode = MODE_AUTOMATIC;
- toggle_floating(mon->desk->focus);
+ toggle_floating(mon->desk, mon->desk->focus);
+ arrange(mon, mon->desk);
} else if (strcmp(cmd, "toggle_locked") == 0) {
- if (mon->desk->focus != NULL)
- toggle_locked(mon->desk->focus->client);
+ toggle_locked(mon, mon->desk, mon->desk->focus);
} else if (strcmp(cmd, "toggle_visibility") == 0) {
toggle_visibility();
} else if (strcmp(cmd, "pad") == 0) {
}
}
}
- return;
} else if (strcmp(cmd, "ratio") == 0) {
- char *value = strtok(NULL, TOK_SEP);
- if (value != NULL && mon->desk->focus != NULL)
- sscanf(value, "%lf", &mon->desk->focus->split_ratio);
+ char *value;
+ if (mon->desk->focus != NULL && (value = strtok(NULL, TOK_SEP)) != NULL &&
+ sscanf(value, "%lf", &mon->desk->focus->split_ratio) == 1)
+ window_draw_border(mon->desk->focus, true, true);
} else if (strcmp(cmd, "cancel") == 0) {
split_mode = MODE_AUTOMATIC;
window_draw_border(mon->desk->focus, true, true);
- return;
} else if (strcmp(cmd, "presel") == 0) {
if (mon->desk->focus == NULL || !is_tiled(mon->desk->focus->client) || mon->desk->layout != LAYOUT_TILED)
return;
window_draw_border(mon->desk->focus, true, true);
}
}
- return;
} else if (strcmp(cmd, "push") == 0 || strcmp(cmd, "pull") == 0) {
char *dir = strtok(NULL, TOK_SEP);
if (dir != NULL) {
direction_t d;
if (parse_fence_move(cmd, &m) && parse_direction(dir, &d)) {
move_fence(mon->desk->focus, d, m);
+ arrange(mon, mon->desk);
+ }
+ }
+ } else if (strcmp(cmd, "fence_ratio") == 0) {
+ char *dir = strtok(NULL, TOK_SEP);
+ if (dir != NULL) {
+ direction_t d;
+ node_t *n;
+ if (parse_direction(dir, &d) && (n = find_fence(mon->desk->focus, d)) != NULL) {
+ char *value = strtok(NULL, TOK_SEP);
+ if (sscanf(value, "%lf", &n->split_ratio) == 1)
+ arrange(mon, mon->desk);
}
}
} else if (strcmp(cmd, "drop_to_monitor") == 0) {
else
m = ((mon->prev == NULL ? mon_tail : mon->prev));
transfer_node(mon, mon->desk, m, m->desk, mon->desk->focus);
- arrange(m, m->desk);
char *opt = strtok(NULL, TOK_SEP);
send_option_t o;
if (parse_send_option(opt, &o) && o == SEND_OPTION_FOLLOW)
- select_monitor(m);
+ focus_node(m, m->desk, m->desk->focus);
}
}
} else if (strcmp(cmd, "send_to_monitor") == 0) {
monitor_t *m = find_monitor(name);
if (m != NULL && m != mon) {
transfer_node(mon, mon->desk, m, m->desk, mon->desk->focus);
- arrange(m, m->desk);
char *opt = strtok(NULL, TOK_SEP);
send_option_t o;
if (parse_send_option(opt, &o) && o == SEND_OPTION_FOLLOW)
- select_monitor(m);
+ focus_node(m, m->desk, m->desk->focus);
}
}
} else if (strcmp(cmd, "drop_to") == 0) {
char *opt = strtok(NULL, TOK_SEP);
send_option_t o;
if (parse_send_option(opt, &o) && o == SEND_OPTION_FOLLOW)
- select_desktop(d);
+ focus_node(mon, d, d->focus);
}
}
} else if (strcmp(cmd, "send_to") == 0) {
desktop_location_t loc;
if (locate_desktop(name, &loc)) {
transfer_node(mon, mon->desk, loc.monitor, loc.desktop, mon->desk->focus);
- if (mon != loc.monitor && loc.monitor->desk == loc.desktop)
- arrange(loc.monitor, loc.desktop);
char *opt = strtok(NULL, TOK_SEP);
send_option_t o;
- if (parse_send_option(opt, &o) && o == SEND_OPTION_FOLLOW) {
- select_monitor(loc.monitor);
- select_desktop(loc.desktop);
- }
+ if (parse_send_option(opt, &o) && o == SEND_OPTION_FOLLOW)
+ focus_node(loc.monitor, loc.desktop, loc.desktop->focus);
}
}
} else if (strcmp(cmd, "rename_monitor") == 0) {
char *name = strtok(NULL, TOK_SEP);
if (name != NULL) {
monitor_t *m = find_monitor(name);
- if (m != NULL)
- select_monitor(m);
+ if (m != NULL) {
+ if (auto_alternate && m == mon && last_mon != NULL)
+ m = last_mon;
+ focus_node(m, m->desk, m->desk->focus);
+ }
}
} else if (strcmp(cmd, "use") == 0) {
char *name = strtok(NULL, TOK_SEP);
if (name != NULL) {
desktop_location_t loc;
if (locate_desktop(name, &loc)) {
- if (auto_alternate && loc.desktop == mon->desk) {
- select_desktop(mon->last_desk);
- } else {
- select_monitor(loc.monitor);
- select_desktop(loc.desktop);
- }
+ if (auto_alternate && loc.desktop == mon->desk && mon->last_desk != NULL)
+ focus_node(mon, mon->last_desk, mon->last_desk->focus);
+ else
+ focus_node(loc.monitor, loc.desktop, loc.desktop->focus);
}
}
} else if (strcmp(cmd, "cycle_monitor") == 0) {
cycle_leaf(mon, mon->desk, mon->desk->focus, d, k);
}
}
- return;
} else if (strcmp(cmd, "nearest") == 0) {
if (mon->desk->focus != NULL && mon->desk->focus->client->fullscreen)
return;
nearest_leaf(mon, mon->desk, mon->desk->focus, a, k);
}
}
- return;
+ } else if (strcmp(cmd, "biggest") == 0) {
+ node_t *n = find_biggest(mon->desk);
+ if (n != NULL)
+ snprintf(rsp, BUFSIZ, "0x%X", n->client->window);
} else if (strcmp(cmd, "circulate") == 0) {
if (mon->desk->layout == LAYOUT_MONOCLE
|| (mon->desk->focus != NULL && !is_tiled(mon->desk->focus->client)))
if (parse_circulate_direction(dir, &d))
circulate_leaves(mon, mon->desk, d);
}
+ arrange(mon, mon->desk);
} else if (strcmp(cmd, "rule") == 0) {
char *name = strtok(NULL, TOK_SEP);
if (name != NULL) {
}
add_rule(rule);
}
- return;
} else if (strcmp(cmd, "remove_rule") == 0) {
char *arg;
unsigned int uid;
while ((arg = strtok(NULL, TOK_SEP)) != NULL)
if (sscanf(arg, "%X", &uid) > 0)
remove_rule_by_uid(uid);
- return;
} else if (strcmp(cmd, "swap") == 0) {
- char *arg;
- swap_arg_t a;
- if ((arg = strtok(NULL, TOK_SEP)) != NULL) {
- if (parse_swap_argument(arg, &a)) {
- node_t *n = find_by_area(mon->desk, a);
- swap_nodes(mon->desk->focus, n);
- }
- } else {
- swap_nodes(mon->desk->focus, history_get(mon->desk->history, 1));
- }
+ char *opt = strtok(NULL, TOK_SEP);
+ swap_option_t o;
+ if (!parse_swap_option(opt, &o))
+ return;
+ node_t *last_focus = history_get(mon->desk->history, 1);
+ swap_nodes(mon->desk->focus, last_focus);
+ arrange(mon, mon->desk);
+ if (o == SWAP_OPTION_SWAP_FOCUS)
+ focus_node(mon, mon->desk, last_focus);
} else if (strcmp(cmd, "alternate") == 0) {
- focus_node(mon, mon->desk, history_get(mon->desk->history, 1), true);
- return;
+ focus_node(mon, mon->desk, history_get(mon->desk->history, 1));
} else if (strcmp(cmd, "alternate_desktop") == 0) {
- select_desktop(mon->last_desk);
+ if (mon->last_desk != NULL)
+ focus_node(mon, mon->last_desk, mon->last_desk->focus);
} else if (strcmp(cmd, "alternate_monitor") == 0) {
- select_monitor(last_mon);
+ if (last_mon != NULL)
+ focus_node(last_mon, last_mon->desk, last_mon->desk->focus);
} else if (strcmp(cmd, "add_in") == 0) {
char *name = strtok(NULL, TOK_SEP);
if (name != NULL) {
monitor_t *m = find_monitor(name);
if (m != NULL)
for (name = strtok(NULL, TOK_SEP); name != NULL; name = strtok(NULL, TOK_SEP))
- add_desktop(m, name);
+ add_desktop(m, make_desktop(name));
}
- return;
} else if (strcmp(cmd, "add") == 0) {
for (char *name = strtok(NULL, TOK_SEP); name != NULL; name = strtok(NULL, TOK_SEP))
- add_desktop(mon, name);
- return;
+ add_desktop(mon, make_desktop(name));
+ } else if (strcmp(cmd, "remove_desktop") == 0) {
+ for (char *name = strtok(NULL, TOK_SEP); name != NULL; name = strtok(NULL, TOK_SEP)) {
+ desktop_location_t loc;
+ if (locate_desktop(name, &loc)) {
+ if (loc.desktop->root == NULL && loc.monitor->desk_head != loc.monitor->desk_tail) {
+ remove_desktop(loc.monitor, loc.desktop);
+ desktop_show(loc.monitor->desk);
+ }
+ }
+ }
+ update_current();
+ } else if (strcmp(cmd, "send_desktop_to") == 0) {
+ if (mon->desk_head == mon->desk_tail)
+ return;
+ char *name = strtok(NULL, TOK_SEP);
+ if (name != NULL) {
+ monitor_t *m = find_monitor(name);
+ if (m != NULL && m != mon) {
+ char *opt = strtok(NULL, TOK_SEP);
+ send_option_t o;
+ if (!parse_send_option(opt, &o))
+ return;
+ desktop_t *d = mon->desk;
+ transfer_desktop(mon, m, d);
+ if (o == SEND_OPTION_FOLLOW)
+ focus_node(m, d, d->focus);
+ else if (o == SEND_OPTION_DONT_FOLLOW)
+ update_current();
+ }
+ }
} else if (strcmp(cmd, "focus") == 0) {
- if (mon->desk->focus != NULL && mon->desk->focus->client->fullscreen)
+ node_t *f = mon->desk->focus;
+ if (f == NULL || f->client->fullscreen)
return;
char *dir = strtok(NULL, TOK_SEP);
if (dir != NULL) {
direction_t d;
if (parse_direction(dir, &d)) {
- node_t *n;
- if (focus_by_distance)
- n = nearest_neighbor(mon->desk, mon->desk->focus, d);
- else
- n = find_neighbor(mon->desk->focus, d);
- focus_node(mon, mon->desk, n, true);
+ node_t *n = NULL;
+ if (history_aware_focus)
+ n = nearest_from_history(mon->desk->history, f, d);
+ if (n == NULL) {
+ if (focus_by_distance) {
+ n = nearest_neighbor(mon->desk, f, d);
+ } else {
+ n = find_neighbor(f, d);
+ }
+ }
+ focus_node(mon, mon->desk, n);
}
}
- if (mon->desk->layout == LAYOUT_TILED)
- return;
} else if (strcmp(cmd, "put_status") == 0) {
put_status();
} else if (strcmp(cmd, "adopt_orphans") == 0) {
adopt_orphans();
- } else if (strcmp(cmd, "restore") == 0) {
+ } else if (strcmp(cmd, "restore_layout") == 0) {
char *arg = strtok(NULL, TOK_SEP);
- restore(arg);
+ restore_layout(arg);
+ } else if (strcmp(cmd, "restore_history") == 0) {
+ char *arg = strtok(NULL, TOK_SEP);
+ restore_history(arg);
} else if (strcmp(cmd, "quit") == 0) {
char *arg = strtok(NULL, TOK_SEP);
if (arg != NULL)
sscanf(arg, "%i", &exit_status);
quit();
- return;
} else {
snprintf(rsp, BUFSIZ, "unknown command: %s", cmd);
- return;
}
-
- arrange(mon, mon->desk);
}
void set_setting(char *name, char *value, char *rsp)
enable_motion_recorder();
focus_follows_pointer = b;
}
+ return;
+ } else if (strcmp(name, "pointer_follows_monitor") == 0) {
+ bool b;
+ if (parse_bool(value, &b))
+ pointer_follows_monitor = b;
+ return;
} else if (strcmp(name, "adaptative_raise") == 0) {
bool b;
if (parse_bool(value, &b))
adaptative_raise = b;
+ return;
} else if (strcmp(name, "apply_shadow_property") == 0) {
bool b;
if (parse_bool(value, &b))
apply_shadow_property = b;
+ return;
} else if (strcmp(name, "auto_alternate") == 0) {
bool b;
if (parse_bool(value, &b))
auto_alternate = b;
+ return;
} else if (strcmp(name, "focus_by_distance") == 0) {
bool b;
if (parse_bool(value, &b))
focus_by_distance = b;
+ return;
+ } else if (strcmp(name, "history_aware_focus") == 0) {
+ bool b;
+ if (parse_bool(value, &b))
+ history_aware_focus = b;
+ return;
} else if (strcmp(name, "wm_name") == 0) {
strncpy(wm_name, value, sizeof(wm_name));
ewmh_update_wm_name();
return;
}
- arrange(mon, mon->desk);
+ for (monitor_t *m = mon_head; m != NULL; m = m->next)
+ for (desktop_t *d = m->desk_head; d != NULL; d = d->next)
+ arrange(m, d);
}
void get_setting(char *name, char* rsp)
snprintf(rsp, BUFSIZ, "%s", BOOLSTR(gapless_monocle));
else if (strcmp(name, "focus_follows_pointer") == 0)
snprintf(rsp, BUFSIZ, "%s", BOOLSTR(focus_follows_pointer));
+ else if (strcmp(name, "pointer_follows_monitor") == 0)
+ snprintf(rsp, BUFSIZ, "%s", BOOLSTR(pointer_follows_monitor));
else if (strcmp(name, "adaptative_raise") == 0)
snprintf(rsp, BUFSIZ, "%s", BOOLSTR(adaptative_raise));
else if (strcmp(name, "apply_shadow_property") == 0)
snprintf(rsp, BUFSIZ, "%s", BOOLSTR(auto_alternate));
else if (strcmp(name, "focus_by_distance") == 0)
snprintf(rsp, BUFSIZ, "%s", BOOLSTR(focus_by_distance));
+ else if (strcmp(name, "history_aware_focus") == 0)
+ snprintf(rsp, BUFSIZ, "%s", BOOLSTR(history_aware_focus));
else if (strcmp(name, "wm_name") == 0)
snprintf(rsp, BUFSIZ, "%s", wm_name);
else
return false;
}
-bool parse_swap_argument(char *s, swap_arg_t *a)
-{
- if (strcmp(s, "biggest") == 0) {
- *a = SWAP_BIGGEST;
- return true;
- } else if (strcmp(s, "smallest") == 0) {
- *a = SWAP_SMALLEST;
- return true;
- }
- return false;
-}
-
bool parse_cycle_direction(char *s, cycle_dir_t *d)
{
if (strcmp(s, "prev") == 0) {
bool parse_list_option(char *s, list_option_t *o)
{
- if (s == NULL || strcmp(s, "--verbose") == 0) {
+ if (s == NULL) {
*o = LIST_OPTION_VERBOSE;
return true;
} else if (strcmp(s, "--quiet") == 0) {
return false;
}
+bool parse_swap_option(char *s, swap_option_t *o)
+{
+ if (s == NULL) {
+ *o = SWAP_OPTION_SWAP_FOCUS;
+ return true;
+ } else if (strcmp(s, "--keep-focus") == 0) {
+ *o = SWAP_OPTION_KEEP_FOCUS;
+ return true;
+ }
+ return false;
+}
+
bool parse_rotate(char *s, rotate_t *r)
{
if (strcmp(s, "clockwise") == 0) {
projects / bspwm.git / blobdiff