diff options
author | nicm <nicm> | 2020-05-24 09:40:17 +0000 |
---|---|---|
committer | nicm <nicm> | 2020-05-24 09:40:17 +0000 |
commit | 18aab909593440bfa4fe003a9f683c0fb2993461 (patch) | |
tree | d63e37011e2943ec777b0af199f129c32b68ba59 /control.c | |
parent | 6c829827110c6616c8abe8cb3ef9e9ed0a1dbd7d (diff) |
Give control code its own state struct.
Diffstat (limited to 'control.c')
-rw-r--r-- | control.c | 43 |
1 files changed, 28 insertions, 15 deletions
@@ -38,6 +38,11 @@ struct control_offset { }; RB_HEAD(control_offsets, control_offset); +/* Control state. */ +struct control_state { + struct control_offsets offsets; +}; + /* Compare client offsets. */ static int control_offset_cmp(struct control_offset *co1, struct control_offset *co2) @@ -54,31 +59,26 @@ RB_GENERATE_STATIC(control_offsets, control_offset, entry, control_offset_cmp); static struct control_offset * control_get_offset(struct client *c, struct window_pane *wp) { - struct control_offset co = { .pane = wp->id }; + struct control_state *cs = c->control_state; + struct control_offset co = { .pane = wp->id }; - if (c->offsets == NULL) - return (NULL); - return (RB_FIND(control_offsets, c->offsets, &co)); + return (RB_FIND(control_offsets, &cs->offsets, &co)); } /* Add pane offsets for this client. */ static struct control_offset * control_add_offset(struct client *c, struct window_pane *wp) { + struct control_state *cs = c->control_state; struct control_offset *co; co = control_get_offset(c, wp); if (co != NULL) return (co); - if (c->offsets == NULL) { - c->offsets = xmalloc(sizeof *c->offsets); - RB_INIT(c->offsets); - } - co = xcalloc(1, sizeof *co); co->pane = wp->id; - RB_INSERT(control_offsets, c->offsets, co); + RB_INSERT(control_offsets, &cs->offsets, co); memcpy(&co->offset, &wp->offset, sizeof co->offset); return (co); } @@ -87,15 +87,13 @@ control_add_offset(struct client *c, struct window_pane *wp) void control_free_offsets(struct client *c) { + struct control_state *cs = c->control_state; struct control_offset *co, *co1; - if (c->offsets == NULL) - return; - RB_FOREACH_SAFE(co, control_offsets, c->offsets, co1) { - RB_REMOVE(control_offsets, c->offsets, co); + RB_FOREACH_SAFE(co, control_offsets, &cs->offsets, co1) { + RB_REMOVE(control_offsets, &cs->offsets, co); free(co); } - free(c->offsets); } /* Get offsets for client. */ @@ -255,8 +253,23 @@ control_callback(__unused struct client *c, __unused const char *path, void control_start(struct client *c) { + struct control_state *cs; + + cs = c->control_state = xcalloc(1, sizeof *cs); + RB_INIT(&cs->offsets); + file_read(c, "-", control_callback, c); if (c->flags & CLIENT_CONTROLCONTROL) file_print(c, "\033P1000p"); } + +/* Stop control mode. */ +void +control_stop(struct client *c) +{ + struct control_state *cs = c->control_state; + + control_free_offsets(c); + free(cs); +} |