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

Merge pull request #1747 from acrisci/ipc-layout

Browse source 
ipc layout
This commit is contained in:
emersion 2018-04-05 22:54:26 -04:00 committed by GitHub
parent f63d9417cd 6b308dbeb7
commit 254ca8103c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 55 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
sway/ipc-json.c
View file

@ -11,6 +11,25 @@
#include <wlr/types/wlr_output.h>
#include "wlr-layer-shell-unstable-v1-protocol.h"
static const char *ipc_json_layout_description(enum sway_container_layout l) {
switch (l) {
case L_VERT:
return "splitv";
case L_HORIZ:
return "splith";
case L_TABBED:
return "tabbed";
case L_STACKED:
return "stacked";
case L_FLOATING:
return "floating";
case L_NONE:
case L_LAYOUTS:
break;
}
return "none";
}
json_object *ipc_json_get_version() {
int major = 0, minor = 0, patch = 0;
json_object *version = json_object_new_object();
@ -115,7 +134,9 @@ static void ipc_json_describe_output(struct sway_container *container, json_obje
json_object_new_int(mode->refresh));
json_object_array_add(modes_array, mode_object);
}
json_object_object_add(object, "modes", modes_array);
json_object_object_add(object, "layout", json_object_new_string("output"));
}
static void ipc_json_describe_workspace(struct sway_container *workspace,
@ -127,12 +148,23 @@ static void ipc_json_describe_workspace(struct sway_container *workspace,
json_object_new_string(workspace->parent->name) : NULL);
json_object_object_add(object, "type", json_object_new_string("workspace"));
json_object_object_add(object, "urgent", json_object_new_boolean(false));
const char *layout = ipc_json_layout_description(workspace->workspace_layout);
json_object_object_add(object, "layout", json_object_new_string(layout));
}
static void ipc_json_describe_view(struct sway_container *c, json_object *object) {
json_object_object_add(object, "name",
c->name ? json_object_new_string(c->name) : NULL);
json_object_object_add(object, "type", json_object_new_string("con"));
if (c->parent) {
enum sway_container_layout layout = (c->parent->type == C_CONTAINER) ?
c->parent->layout : c->layout;
json_object_object_add(object, "layout",
json_object_new_string(ipc_json_layout_description(layout)));
}
}
json_object *ipc_json_describe_container(struct sway_container *c) {

25
sway/ipc-server.c
View file

@ -241,10 +241,19 @@ int ipc_client_handle_readable(int client_fd, uint32_t mask, void *data) {
return 0;
}
static bool ipc_has_event_listeners(enum ipc_command_type event) {
for (int i = 0; i < ipc_client_list->length; i++) {
struct ipc_client *client = ipc_client_list->items[i];
if ((client->subscribed_events & event_mask(event)) == 0) {
return true;
}
}
return false;
}
static void ipc_send_event(const char *json_string, enum ipc_command_type event) {
int i;
struct ipc_client *client;
for (i = 0; i < ipc_client_list->length; i++) {
for (int i = 0; i < ipc_client_list->length; i++) {
client = ipc_client_list->items[i];
if ((client->subscribed_events & event_mask(event)) == 0) {
continue;
@ -259,6 +268,9 @@ static void ipc_send_event(const char *json_string, enum ipc_command_type event)
void ipc_event_workspace(struct sway_container *old,
struct sway_container *new, const char *change) {
if (!ipc_has_event_listeners(IPC_EVENT_WORKSPACE)) {
return;
}
wlr_log(L_DEBUG, "Sending workspace::%s event", change);
json_object *obj = json_object_new_object();
json_object_object_add(obj, "change", json_object_new_string(change));
@ -284,6 +296,9 @@ void ipc_event_workspace(struct sway_container *old,
}
void ipc_event_window(struct sway_container *window, const char *change) {
if (!ipc_has_event_listeners(IPC_EVENT_WINDOW)) {
return;
}
wlr_log(L_DEBUG, "Sending window::%s event", change);
json_object *obj = json_object_new_object();
json_object_object_add(obj, "change", json_object_new_string(change));
@ -295,6 +310,9 @@ void ipc_event_window(struct sway_container *window, const char *change) {
}
void ipc_event_barconfig_update(struct bar_config *bar) {
if (!ipc_has_event_listeners(IPC_EVENT_BARCONFIG_UPDATE)) {
return;
}
wlr_log(L_DEBUG, "Sending barconfig_update event");
json_object *json = ipc_json_describe_bar_config(bar);
@ -304,6 +322,9 @@ void ipc_event_barconfig_update(struct bar_config *bar) {
}
void ipc_event_mode(const char *mode) {
if (!ipc_has_event_listeners(IPC_EVENT_MODE)) {
return;
}
wlr_log(L_DEBUG, "Sending mode::%s event", mode);
json_object *obj = json_object_new_object();
json_object_object_add(obj, "change", json_object_new_string(mode));