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

next
Michael Stapelberg 2010-11-29 11:10:17 +01:00
parent ee45c92564
commit a0cd3c2bab
3 changed files with 9 additions and 0 deletions

View File

@ -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;

View File

@ -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);

View File

@ -22,6 +22,7 @@ my $expected = {
id => ignore(),
rect => ignore(),
window_rect => ignore(),
percent => 0,
layout => 0,
focus => ignore(),
focused => 0,