container: Move pending state to state struct

Pending state is currently inlined directly in the container struct,
while the current state is in a state struct. A side-effect of this is
that it is not immediately obvious that pending double-buffered state is
accessed, nor is it obvious what state is double-buffered.

Instead, use the state struct for both current and pending.

1 files changed, 4 insertions, 4 deletions

diff --git a/sway/commands/border.c b/sway/commands/border.c
index 647663ac..7818fc96 100644
--- a/sway/commands/border.c
+++ b/sway/commands/border.c
@@ -19,11 +19,11 @@ static void set_border(struct sway_container *con,
                         view_set_csd_from_server(con->view, false);
                 } else if (!con->view->using_csd && new_border == B_CSD) {
                         view_set_csd_from_server(con->view, true);
-                        con->saved_border = con->border;
+                        con->saved_border = con->pending.border;
                 }
         }
         if (new_border != B_CSD || container_is_floating(con)) {
-                con->border = new_border;
+                con->pending.border = new_border;
         }
         if (con->view) {
                 con->view->using_csd = new_border == B_CSD;
@@ -35,7 +35,7 @@ static void border_toggle(struct sway_container *con) {
                 set_border(con, B_NONE);
                 return;
         }
-        switch (con->border) {
+        switch (con->pending.border) {
         case B_NONE:
                 set_border(con, B_PIXEL);
                 break;
@@ -88,7 +88,7 @@ struct cmd_results *cmd_border(int argc, char **argv) {
                                 "or 'border pixel <px>'");
         }
         if (argc == 2) {
-                container->border_thickness = atoi(argv[1]);
+                container->pending.border_thickness = atoi(argv[1]);
         }
 
         if (container_is_floating(container)) {