hyprwm
/
wlroots-hyprland
mirror of https://github.com/hyprwm/wlroots-hyprland.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add support for WM_HINTS

This commit is contained in:
emersion 2017-10-05 16:24:45 +02:00
parent ca68ef37f0
commit 267f24753f
No known key found for this signature in database
GPG Key ID: 0FDE7BE0E88F5E48
3 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/wlr/xwayland.h
View File

@ -59,8 +59,10 @@ struct wlr_xwayland_surface {
uint32_t motif_hints[5]; uint32_t motif_hints[5];
#ifdef HAS_XCB_ICCCM #ifdef HAS_XCB_ICCCM
xcb_icccm_wm_hints_t hints;
xcb_size_hints_t size_hints; xcb_size_hints_t size_hints;
#else #else
char hints_padding[36];
char size_hints_padding[72]; char size_hints_padding[72];
#endif #endif

26
xwayland/xwm.c
View File

@ -15,6 +15,7 @@
const char *atom_map[ATOM_LAST] = { const char *atom_map[ATOM_LAST] = {
"WL_SURFACE_ID", "WL_SURFACE_ID",
"WM_DELETE_WINDOW", "WM_DELETE_WINDOW",
"WM_HINTS",
"WM_PROTOCOLS", "WM_PROTOCOLS",
"WM_NORMAL_HINTS", "WM_NORMAL_HINTS",
"WM_SIZE_HINTS", "WM_SIZE_HINTS",
@ -276,10 +277,30 @@ static void read_surface_protocols(struct wlr_xwm *xwm,
wlr_log(L_DEBUG, "WM_PROTOCOLS (%zu)", atoms_len); wlr_log(L_DEBUG, "WM_PROTOCOLS (%zu)", atoms_len);
} }
#ifdef HAS_XCB_ICCCM
static void read_surface_hints(struct wlr_xwm *xwm,
struct wlr_xwayland_surface *surface, xcb_get_property_reply_t *reply) {
// According to the docs, reply->type == xwm->atoms[WM_HINTS]
// In practice, reply->type == XCB_ATOM_ATOM
if (reply->value_len == 0) {
return;
}
xcb_icccm_get_wm_hints_from_reply(&surface->hints, reply);
wlr_log(L_DEBUG, "WM_HINTS (%d)", reply->value_len);
}
#else
static void read_surface_hints(struct wlr_xwm *xwm,
struct wlr_xwayland_surface *surface, xcb_get_property_reply_t *reply) {
// Do nothing
}
#endif
#ifdef HAS_XCB_ICCCM #ifdef HAS_XCB_ICCCM
static void read_surface_normal_hints(struct wlr_xwm *xwm, static void read_surface_normal_hints(struct wlr_xwm *xwm,
struct wlr_xwayland_surface *surface, xcb_get_property_reply_t *reply) { struct wlr_xwayland_surface *surface, xcb_get_property_reply_t *reply) {
if (reply->type != xwm->atoms[WM_SIZE_HINTS]) { if (reply->type != xwm->atoms[WM_SIZE_HINTS] || reply->value_len == 0) {
return; return;
} }
@ -331,6 +352,8 @@ static void read_surface_property(struct wlr_xwm *xwm,
read_surface_protocols(xwm, surface, reply); read_surface_protocols(xwm, surface, reply);
} else if (property == xwm->atoms[NET_WM_STATE]) { } else if (property == xwm->atoms[NET_WM_STATE]) {
read_surface_state(xwm, surface, reply); read_surface_state(xwm, surface, reply);
} else if (property == xwm->atoms[WM_HINTS]) {
read_surface_hints(xwm, surface, reply);
} else if (property == xwm->atoms[WM_NORMAL_HINTS]) { } else if (property == xwm->atoms[WM_NORMAL_HINTS]) {
read_surface_normal_hints(xwm, surface, reply); read_surface_normal_hints(xwm, surface, reply);
} else if (property == xwm->atoms[MOTIF_WM_HINTS]) { } else if (property == xwm->atoms[MOTIF_WM_HINTS]) {
@ -354,6 +377,7 @@ static void map_shell_surface(struct wlr_xwm *xwm,
XCB_ATOM_WM_NAME, XCB_ATOM_WM_NAME,
XCB_ATOM_WM_TRANSIENT_FOR, XCB_ATOM_WM_TRANSIENT_FOR,
xwm->atoms[WM_PROTOCOLS], xwm->atoms[WM_PROTOCOLS],
xwm->atoms[WM_HINTS],
xwm->atoms[WM_NORMAL_HINTS], xwm->atoms[WM_NORMAL_HINTS],
xwm->atoms[MOTIF_WM_HINTS], xwm->atoms[MOTIF_WM_HINTS],
xwm->atoms[NET_WM_STATE], xwm->atoms[NET_WM_STATE],

1
xwayland/xwm.h
View File

@ -49,6 +49,7 @@ enum atom_name {
WL_SURFACE_ID, WL_SURFACE_ID,
WM_DELETE_WINDOW, WM_DELETE_WINDOW,
WM_PROTOCOLS, WM_PROTOCOLS,
WM_HINTS,
WM_NORMAL_HINTS, WM_NORMAL_HINTS,
WM_SIZE_HINTS, WM_SIZE_HINTS,
MOTIF_WM_HINTS, MOTIF_WM_HINTS,