mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2026-04-17 06:46:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

backend/x11: Implement a few useful window properties

Browse source 
It is currently impossible to tell if an X11 window is created by
wlroots, or what process / client it belongs to.

The following properties are now added to the window:
* WM_CLASS
* WM_CLIENT_MACHINE
*  _NET_WM_PID

Sample xprop output:
WM_CLASS(STRING) = "X11-1", "wlroots"
WM_CLIENT_MACHINE(STRING) = "My-Desktop"
_NET_WM_PID(CARDINAL) = 3629306
This commit is contained in:
Tasos Sahanidis 2024-10-19 16:25:13 +03:00
parent 47fb00f66d
commit 727d407f3d
No known key found for this signature in database
GPG key ID: 01A1DCBA22E005C4
3 changed files with 35 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
backend/x11/backend.c
View file

@ -424,6 +424,9 @@ struct wlr_backend *wlr_x11_backend_create(struct wl_event_loop *loop,
{ .name = "_NET_WM_NAME", .atom = &x11->atoms.net_wm_name }, { .name = "_NET_WM_NAME", .atom = &x11->atoms.net_wm_name },
{ .name = "UTF8_STRING", .atom = &x11->atoms.utf8_string }, { .name = "UTF8_STRING", .atom = &x11->atoms.utf8_string },
{ .name = "_VARIABLE_REFRESH", .atom = &x11->atoms.variable_refresh }, { .name = "_VARIABLE_REFRESH", .atom = &x11->atoms.variable_refresh },
{ .name = "_NET_WM_PID", .atom = &x11->atoms.net_wm_pid },
{ .name = "WM_CLIENT_MACHINE", .atom = &x11->atoms.wm_client_machine },
{ .name = "WM_CLASS", .atom = &x11->atoms.wm_class },
}; };
for (size_t i = 0; i < sizeof(atom) / sizeof(atom[0]); ++i) { for (size_t i = 0; i < sizeof(atom) / sizeof(atom[0]); ++i) {

29
backend/x11/output.c
View file

@ -3,6 +3,8 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <fcntl.h> #include <fcntl.h>
#include <unistd.h>
#include <limits.h>
#include <drm_fourcc.h> #include <drm_fourcc.h>
#include <xcb/dri3.h> #include <xcb/dri3.h>
@ -641,6 +643,33 @@ struct wlr_output *wlr_x11_output_create(struct wlr_backend *backend) {
wlr_x11_output_set_title(wlr_output, NULL); wlr_x11_output_set_title(wlr_output, NULL);
uint32_t pid = getpid();
xcb_change_property(x11->xcb, XCB_PROP_MODE_REPLACE, output->win,
x11->atoms.net_wm_pid, XCB_ATOM_CARDINAL, 32, 1,
&pid);
char hostname[_POSIX_HOST_NAME_MAX + 1];
if (gethostname(hostname, sizeof(hostname)) != -1) {
xcb_change_property(x11->xcb, XCB_PROP_MODE_REPLACE, output->win,
x11->atoms.wm_client_machine, XCB_ATOM_STRING, 8, strlen(hostname) + 1,
hostname);
}
#define X11_OUT_WM_CLASS_WLR "wlroots"
char wm_class[32];
static_assert(sizeof(wm_class) > sizeof(X11_OUT_WM_CLASS_WLR),
"wm_class must be large enough to contain X11_OUT_WM_CLASS_WLR and another string");
snprintf(wm_class, sizeof(wm_class) - sizeof(X11_OUT_WM_CLASS_WLR), "%s", wlr_output->name);
size_t wm_class_inst_size = strlen(wm_class) + 1;
snprintf(wm_class + wm_class_inst_size, sizeof(wm_class) - wm_class_inst_size,
"%s", X11_OUT_WM_CLASS_WLR);
xcb_change_property(x11->xcb, XCB_PROP_MODE_REPLACE, output->win,
x11->atoms.wm_class, XCB_ATOM_STRING, 8, wm_class_inst_size + sizeof(X11_OUT_WM_CLASS_WLR),
wm_class);
#undef X11_OUT_WM_CLASS_WLR
xcb_flush(x11->xcb); xcb_flush(x11->xcb);
wl_list_insert(&x11->outputs, &output->link); wl_list_insert(&x11->outputs, &output->link);

3
include/backend/x11.h
View file

@ -96,6 +96,9 @@ struct wlr_x11_backend {
xcb_atom_t net_wm_name; xcb_atom_t net_wm_name;
xcb_atom_t utf8_string; xcb_atom_t utf8_string;
xcb_atom_t variable_refresh; xcb_atom_t variable_refresh;
xcb_atom_t net_wm_pid;
xcb_atom_t wm_client_machine;
xcb_atom_t wm_class;
} atoms; } atoms;
// The time we last received an event // The time we last received an event