Include 'percent' in tree JSON, use C-locale when dumping, update testcase

diff --git a/src/ipc.c b/src/ipc.c
index 6106bce73bc2198387326e99eb0c5091175529ff..3954107f2dd3b22d836201f9b9c0adc8435c79f7 100644 (file)
--- a/src/ipc.c
+++ b/src/ipc.c
@@ -180,6 +180,9 @@ void dump_node(yajl_gen gen, struct Con *con, bool inplace_restart) {
     ystr("orientation");
     y(integer, con->orientation);
 
+    ystr("percent");
+    y(double, con->percent);
+
     ystr("urgent");
     y(integer, con->urgent);
 
@@ -244,8 +247,10 @@ void dump_node(yajl_gen gen, struct Con *con, bool inplace_restart) {
 }
 
 IPC_HANDLER(tree) {
+    setlocale(LC_NUMERIC, "C");
     yajl_gen gen = yajl_gen_alloc(NULL, NULL);
     dump_node(gen, croot, false);
+    setlocale(LC_NUMERIC, "");
 
     const unsigned char *payload;
     unsigned int length;

diff --git a/src/util.c b/src/util.c
index cd58bce3fec2f5be3a3cc1c0c62ecc648873f67d..e05ce4652168d80b3f8a0cf020233d8a023fab04 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -368,10 +368,13 @@ static char **append_argument(char **original, char *argument) {
 #define ystr(str) yajl_gen_string(gen, (unsigned char*)str, strlen(str))
 
 void store_restart_layout() {
+    setlocale(LC_NUMERIC, "C");
     yajl_gen gen = yajl_gen_alloc(NULL, NULL);
 
     dump_node(gen, croot, true);
 
+    setlocale(LC_NUMERIC, "");
+
     const unsigned char *payload;
     unsigned int length;
     y(get_buf, &payload, &length);

diff --git a/testcases/t/16-nestedcons.t b/testcases/t/16-nestedcons.t
index d3fd31751ed48aa6c54d4d563b43207ed91336f9..365b0054cdb190a60e217ac009431db6054a9f32 100644 (file)
--- a/testcases/t/16-nestedcons.t
+++ b/testcases/t/16-nestedcons.t
@@ -22,6 +22,7 @@ my $expected = {
     id => ignore(),
     rect => ignore(),
     window_rect => ignore(),
+    percent => 0,
     layout => 0,
     focus => ignore(),
     focused => 0,