mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-26 18:01:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update IPC JSON responses for HiDPI setups

Browse source
This commit is contained in:
Drew DeVault 2016-07-28 14:42:39 -04:00
parent 11e7ca044c
commit cad085ed9d
1 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
sway/ipc-json.c
View file

@ -11,8 +11,17 @@ static json_object *ipc_json_create_rect(swayc_t *c) {
json_object_object_add(rect, "x", json_object_new_int((int32_t)c->x)); json_object_object_add(rect, "x", json_object_new_int((int32_t)c->x));
json_object_object_add(rect, "y", json_object_new_int((int32_t)c->y)); json_object_object_add(rect, "y", json_object_new_int((int32_t)c->y));
json_object_object_add(rect, "width", json_object_new_int((int32_t)c->width));
json_object_object_add(rect, "height", json_object_new_int((int32_t)c->height)); struct wlc_size size;
if (c->type == C_OUTPUT) {
size = *wlc_output_get_resolution(c->handle);
} else {
size.w = c->width;
size.h = c->height;
}
json_object_object_add(rect, "width", json_object_new_int((int32_t)size.w));
json_object_object_add(rect, "height", json_object_new_int((int32_t)size.h));
return rect; return rect;
} }
@ -111,12 +120,14 @@ static float ipc_json_child_percentage(swayc_t *c) {
} }
static void ipc_json_describe_output(swayc_t *output, json_object *object) { static void ipc_json_describe_output(swayc_t *output, json_object *object) {
uint32_t scale = wlc_output_get_scale(output->handle);
json_object_object_add(object, "active", json_object_new_boolean(true)); json_object_object_add(object, "active", json_object_new_boolean(true));
json_object_object_add(object, "primary", json_object_new_boolean(false)); json_object_object_add(object, "primary", json_object_new_boolean(false));
json_object_object_add(object, "layout", json_object_new_string("output")); json_object_object_add(object, "layout", json_object_new_string("output"));
json_object_object_add(object, "type", json_object_new_string("output")); json_object_object_add(object, "type", json_object_new_string("output"));
json_object_object_add(object, "current_workspace", json_object_object_add(object, "current_workspace",
(output->focused) ? json_object_new_string(output->focused->name) : NULL); (output->focused) ? json_object_new_string(output->focused->name) : NULL);
json_object_object_add(object, "scale", json_object_new_int(scale));
} }
static void ipc_json_describe_workspace(swayc_t *workspace, json_object *object) { static void ipc_json_describe_workspace(swayc_t *workspace, json_object *object) {