Skip to content

Persist desktop-specific split ratios #1492

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bndos wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Persist desktop-specific split ratios #1492

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/desktop.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,7 @@ desktop_t *make_desktop(const char *name, uint32_t id)
d->padding = (padding_t) PADDING;
d->window_gap = window_gap;
d->border_width = border_width;
d->split_ratio = split_ratio;
return d;
}

Expand Down
2 changes: 1 addition & 1 deletion src/restore.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,7 @@ node_t *restore_node(jsmntok_t **t, char *json)
int s = (*t)->size;
(*t)++;
/* hack to prevent a new ID from being generated */
node_t *n = make_node(UINT32_MAX);
node_t *n = make_node(UINT32_MAX, split_ratio);

for (int i = 0; i < s; i++) {
if (keyeq("id", *t, json)) {
Expand Down
9 changes: 5 additions & 4 deletions src/tree.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,7 @@ node_t *insert_node(monitor_t *m, desktop_t *d, node_t *n, node_t *f)
free(f);
f = NULL;
} else {
node_t *c = make_node(XCB_NONE);
node_t *c = make_node(XCB_NONE, d->split_ratio);
node_t *p = f->parent;
if (f->presel == NULL && (f->private || private_count(f->parent) > 0)) {
node_t *k = find_public(d);
Expand Down Expand Up @@ -442,6 +442,7 @@ node_t *insert_node(monitor_t *m, desktop_t *d, node_t *n, node_t *f)
}
if (d->root == f) {
d->root = c;
d->split_ratio = c->split_ratio;
}
cancel_presel(m, d, f);
set_marked(m, d, n, false);
Expand All @@ -463,7 +464,7 @@ node_t *insert_node(monitor_t *m, desktop_t *d, node_t *n, node_t *f)

void insert_receptacle(monitor_t *m, desktop_t *d, node_t *n)
{
node_t *r = make_node(XCB_NONE);
node_t *r = make_node(XCB_NONE, d->split_ratio);
insert_node(m, d, r, n);
put_status(SBSC_MASK_NODE_ADD, "node_add 0x%08X 0x%08X 0x%08X 0x%08X\n", m->id, d->id, n != NULL ? n->id : 0, r->id);

Expand Down Expand Up @@ -726,7 +727,7 @@ void show_node(desktop_t *d, node_t *n)
}
}

node_t *make_node(uint32_t id)
node_t *make_node(uint32_t id, double sr)
{
if (id == XCB_NONE) {
id = xcb_generate_id(dpy);
Expand All @@ -735,7 +736,7 @@ node_t *make_node(uint32_t id)
n->id = id;
n->parent = n->first_child = n->second_child = NULL;
n->vacant = n->hidden = n->sticky = n->private = n->locked = n->marked = false;
n->split_ratio = split_ratio;
n->split_ratio = sr;
n->split_type = TYPE_VERTICAL;
n->constraints = (constraints_t) {MIN_WIDTH, MIN_HEIGHT};
n->presel = NULL;
Expand Down
2 changes: 1 addition & 1 deletion src/tree.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ void transfer_sticky_nodes(monitor_t *ms, desktop_t *ds, monitor_t *md, desktop_
bool focus_node(monitor_t *m, desktop_t *d, node_t *n);
void hide_node(desktop_t *d, node_t *n);
void show_node(desktop_t *d, node_t *n);
node_t *make_node(uint32_t id);
node_t *make_node(uint32_t id, double sr);
client_t *make_client(void);
void initialize_client(node_t *n);
bool is_focusable(node_t *n);
Expand Down
1 change: 1 addition & 0 deletions src/types.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,6 +283,7 @@ typedef struct desktop_t desktop_t;
struct desktop_t {
char name[SMALEN];
uint32_t id;
double split_ratio;
layout_t layout;
layout_t user_layout;
node_t *root;
Expand Down
9 changes: 8 additions & 1 deletion src/window.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ bool manage_window(xcb_window_t win, rule_consequence_t *csq, int fd)
presel_ratio(m, d, f, csq->split_ratio);
}

node_t *n = make_node(win);
node_t *n = make_node(win, d->split_ratio);
client_t *c = make_client();
c->border_width = csq->border ? d->border_width : 0;
n->client = c;
Expand Down Expand Up @@ -547,6 +547,7 @@ bool move_client(coordinates_t *loc, int dx, int dy)
bool resize_client(coordinates_t *loc, resize_handle_t rh, int dx, int dy, bool relative)
{
node_t *n = loc->node;
desktop_t *d = loc->desktop;
if (n == NULL || n->client == NULL || n->client->state == STATE_FULLSCREEN) {
return false;
}
Expand Down Expand Up @@ -577,6 +578,9 @@ bool resize_client(coordinates_t *loc, resize_handle_t rh, int dx, int dy, bool
}
sr = MAX(0, sr);
sr = MIN(1, sr);
if (d->root == vertical_fence) {
d->split_ratio = sr;
}
vertical_fence->split_ratio = sr;
adjust_ratios(vertical_fence, vertical_fence->rectangle);
}
Expand All @@ -589,6 +593,9 @@ bool resize_client(coordinates_t *loc, resize_handle_t rh, int dx, int dy, bool
}
sr = MAX(0, sr);
sr = MIN(1, sr);
if (vertical_fence == NULL && d->root == horizontal_fence) {
d->split_ratio = sr;
}
horizontal_fence->split_ratio = sr;
adjust_ratios(horizontal_fence, horizontal_fence->rectangle);
}
Expand Down