alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

ipc: move refresh from output to output->current_mode

Browse source
This commit is contained in:
Cole Mickens 2018-11-03 15:07:51 -07:00
parent 71686ed0e7
commit ef888321ba
2 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sway/ipc-json.c
View file

@ -118,8 +118,6 @@ static void ipc_json_describe_output(struct sway_output *output,
json_object_new_string(wlr_output->serial));
json_object_object_add(object, "scale",
json_object_new_double(wlr_output->scale));
json_object_object_add(object, "refresh",
json_object_new_int(wlr_output->refresh));
json_object_object_add(object, "transform",
json_object_new_string(
ipc_json_get_output_transform(wlr_output->transform)));
@ -148,6 +146,8 @@ static void ipc_json_describe_output(struct sway_output *output,
json_object_new_int(wlr_output->width));
json_object_object_add(current_mode_object, "height",
json_object_new_int(wlr_output->height));
json_object_object_add(current_mode_object, "refresh",
json_object_new_int(wlr_output->refresh));
json_object_object_add(object, "current_mode", current_mode_object);
struct sway_node *parent = node_get_parent(&output->node);

20
swaymsg/main.c
View file

@ -163,28 +163,28 @@ static void pretty_print_seat(json_object *i) {
}
static void pretty_print_output(json_object *o) {
json_object *name, *rect, *focused, *active, *ws;
json_object *name, *rect, *focused, *active, *ws, *current_mode;
json_object_object_get_ex(o, "name", &name);
json_object_object_get_ex(o, "rect", &rect);
json_object_object_get_ex(o, "focused", &focused);
json_object_object_get_ex(o, "active", &active);
json_object_object_get_ex(o, "current_workspace", &ws);
json_object *make, *model, *serial, *scale, *refresh, *transform;
json_object *make, *model, *serial, *scale, *transform;
json_object_object_get_ex(o, "make", &make);
json_object_object_get_ex(o, "model", &model);
json_object_object_get_ex(o, "serial", &serial);
json_object_object_get_ex(o, "scale", &scale);
json_object_object_get_ex(o, "refresh", &refresh);
json_object_object_get_ex(o, "transform", &transform);
json_object *x, *y, *width, *height;
json_object *x, *y;
json_object_object_get_ex(rect, "x", &x);
json_object_object_get_ex(rect, "y", &y);
json_object_object_get_ex(rect, "width", &width);
json_object_object_get_ex(rect, "height", &height);
json_object *modes;
json_object_object_get_ex(o, "modes", &modes);
json_object *current_mode;
json_object *width, *height, *refresh;
json_object_object_get_ex(o, "current_mode", &current_mode);
json_object_object_get_ex(current_mode, "width", &width);
json_object_object_get_ex(current_mode, "height", &height);
json_object_object_get_ex(current_mode, "refresh", &refresh);
if (json_object_get_boolean(active)) {
printf(
@ -199,10 +199,8 @@ static void pretty_print_output(json_object *o) {
json_object_get_string(model),
json_object_get_string(serial),
json_object_get_boolean(focused) ? " (focused)" : "",
json_object_get_int(
json_object_object_get(current_mode, "width")),
json_object_get_int(
json_object_object_get(current_mode, "height")),
json_object_get_int(width),
json_object_get_int(height),
(float)json_object_get_int(refresh) / 1000,
json_object_get_int(x), json_object_get_int(y),
json_object_get_double(scale),