mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-11-03 09:01:43 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Initialize outputs from backend and add to tree

Browse source
This commit is contained in:
Drew DeVault 2017-11-11 11:58:43 -05:00
parent 0ba6554c4f
commit 7eafcc75f6
9 changed files with 106 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

17
sway/ipc-json.c
View file

@ -3,6 +3,8 @@
#include <string.h>
#include <stdint.h>
#include <libinput.h>
#include <wlr/types/wlr_box.h>
#include <wlr/types/wlr_output.h>
#include "sway/container.h"
#include "sway/input.h"
#include "sway/ipc-json.h"
@ -14,16 +16,19 @@ 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, "y", json_object_new_int((int32_t)c->y));
struct wlc_size size;
struct wlr_box box;
if (c->type == C_OUTPUT) {
size = *wlc_output_get_resolution(c->handle);
wlr_output_effective_resolution(c->_handle.output,
&box.width, &box.height);
} else {
size.w = c->width;
size.h = c->height;
box.width = c->width;
box.width = 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));
json_object_object_add(rect, "width",
json_object_new_int((int32_t)box.width));
json_object_object_add(rect, "height",
json_object_new_int((int32_t)box.height));
return rect;
}