i3compat: add window_type to IPC response

i3 added these in i3/i3#3797
This commit is contained in:
Jason Nader 2020-02-13 07:20:33 +09:00 committed by Drew DeVault
parent f96dbf748a
commit 8608a1c38b
2 changed files with 37 additions and 1 deletions

View file

@ -85,6 +85,35 @@ static const char *ipc_json_output_transform_description(enum wl_output_transfor
return NULL; return NULL;
} }
#if HAVE_XWAYLAND
static const char *ipc_json_xwindow_type_description(enum atom_name window_type) {
switch (window_type) {
case NET_WM_WINDOW_TYPE_NORMAL:
return "normal";
case NET_WM_WINDOW_TYPE_DIALOG:
return "dialog";
case NET_WM_WINDOW_TYPE_UTILITY:
return "utility";
case NET_WM_WINDOW_TYPE_TOOLBAR:
return "toolbar";
case NET_WM_WINDOW_TYPE_SPLASH:
return "splash";
case NET_WM_WINDOW_TYPE_MENU:
return "menu";
case NET_WM_WINDOW_TYPE_DROPDOWN_MENU:
return "dropdown_menu";
case NET_WM_WINDOW_TYPE_POPUP_MENU:
return "popup_menu";
case NET_WM_WINDOW_TYPE_TOOLTIP:
return "tooltip";
case NET_WM_WINDOW_TYPE_NOTIFICATION:
return "notification";
default:
return "unknown";
}
}
#endif
json_object *ipc_json_get_version(void) { json_object *ipc_json_get_version(void) {
int major = 0, minor = 0, patch = 0; int major = 0, minor = 0, patch = 0;
json_object *version = json_object_new_object(); json_object *version = json_object_new_object();
@ -452,6 +481,13 @@ static void ipc_json_describe_view(struct sway_container *c, json_object *object
json_object_object_add(window_props, "window_role", json_object_new_string(role)); json_object_object_add(window_props, "window_role", json_object_new_string(role));
} }
uint32_t window_type = view_get_window_type(c->view);
if (window_type) {
json_object_object_add(window_props, "window_type",
json_object_new_string(
ipc_json_xwindow_type_description(window_type)));
}
json_object_object_add(object, "window_properties", window_props); json_object_object_add(object, "window_properties", window_props);
} }
#endif #endif

View file

@ -382,7 +382,7 @@ node and will have the following properties:
|- window_properties |- window_properties
: object : object
: (Only xwayland views) An object containing the _title_, _class_, _instance_, : (Only xwayland views) An object containing the _title_, _class_, _instance_,
_window\_role_, and _transient\_for_ for the view _window\_role_, _window\_type_, and _transient\_for_ for the view
*Example Reply:* *Example Reply:*