blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

xwayland: request hints

This commit is contained in:
emersion 2017-10-02 17:34:55 +02:00
parent cec012019f
commit 0c22ad09a7
No known key found for this signature in database
GPG Key ID: 0FDE7BE0E88F5E48
2 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
xwayland/xwm.c
View File

@ -12,6 +12,9 @@ const char *atom_map[ATOM_LAST] = {
"WL_SURFACE_ID", "WL_SURFACE_ID",
"WM_DELETE_WINDOW", "WM_DELETE_WINDOW",
"WM_PROTOCOLS", "WM_PROTOCOLS",
"WM_NORMAL_HINTS",
"WM_SIZE_HINTS",
"_MOTIF_WM_HINTS",
"UTF8_STRING", "UTF8_STRING",
"WM_S0", "WM_S0",
"_NET_SUPPORTED", "_NET_SUPPORTED",
@ -269,6 +272,24 @@ 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);
} }
static void read_surface_normal_hints(struct wlr_xwm *xwm,
struct wlr_xwayland_surface *surface, xcb_get_property_reply_t *reply) {
if (reply->type != xwm->atoms[WM_SIZE_HINTS]) {
return;
}
// TODO: xcb_icccm_get_wm_size_hints_from_reply
// See https://github.com/i3/i3/blob/55bc6741796e8b179b6111a721a3e9631934bb86/src/handlers.c#L994
wlr_log(L_DEBUG, "WM_NORMAL_HINTS (%d)", reply->value_len);
}
static void read_surface_motif_hints(struct wlr_xwm *xwm,
struct wlr_xwayland_surface *surface, xcb_get_property_reply_t *reply) {
// TODO
wlr_log(L_DEBUG, "MOTIF_WM_HINTS (%d)", reply->value_len);
}
static void read_surface_property(struct wlr_xwm *xwm, static void read_surface_property(struct wlr_xwm *xwm,
struct wlr_xwayland_surface *surface, xcb_atom_t property) { struct wlr_xwayland_surface *surface, xcb_atom_t property) {
xcb_get_property_cookie_t cookie = xcb_get_property(xwm->xcb_conn, 0, xcb_get_property_cookie_t cookie = xcb_get_property(xwm->xcb_conn, 0,
@ -294,6 +315,10 @@ 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_NORMAL_HINTS]) {
read_surface_normal_hints(xwm, surface, reply);
} else if (property == xwm->atoms[MOTIF_WM_HINTS]) {
read_surface_motif_hints(xwm, surface, reply);
} else { } else {
wlr_log(L_DEBUG, "unhandled x11 property %u", property); wlr_log(L_DEBUG, "unhandled x11 property %u", property);
} }
@ -313,6 +338,8 @@ 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_NORMAL_HINTS],
xwm->atoms[MOTIF_WM_HINTS],
xwm->atoms[NET_WM_STATE], xwm->atoms[NET_WM_STATE],
xwm->atoms[NET_WM_WINDOW_TYPE], xwm->atoms[NET_WM_WINDOW_TYPE],
xwm->atoms[NET_WM_NAME], xwm->atoms[NET_WM_NAME],

3
xwayland/xwm.h
View File

@ -49,6 +49,9 @@ enum atom_name {
WL_SURFACE_ID, WL_SURFACE_ID,
WM_DELETE_WINDOW, WM_DELETE_WINDOW,
WM_PROTOCOLS, WM_PROTOCOLS,
WM_NORMAL_HINTS,
WM_SIZE_HINTS,
MOTIF_WM_HINTS,
UTF8_STRING, UTF8_STRING,
WM_S0, WM_S0,
NET_SUPPORTED, NET_SUPPORTED,