xwm: Set _NET_WM_CM_S0 instead of relying on the xwayland module to do it

Not sure why I made xwayland claim this selection, seem a little
awkward in retrospect.
dev
Kristian Høgsberg 11 years ago
parent ac6104ea11
commit 69981d9621
  1. 6
      src/xwayland/window-manager.c
  2. 1
      src/xwayland/xwayland.h

@ -1537,6 +1537,7 @@ weston_wm_get_resources(struct weston_wm *wm)
{ "WM_STATE", F(atom.wm_state) }, { "WM_STATE", F(atom.wm_state) },
{ "WM_S0", F(atom.wm_s0) }, { "WM_S0", F(atom.wm_s0) },
{ "WM_CLIENT_MACHINE", F(atom.wm_client_machine) }, { "WM_CLIENT_MACHINE", F(atom.wm_client_machine) },
{ "_NET_WM_CM_S0", F(atom.net_wm_cm_s0) },
{ "_NET_WM_NAME", F(atom.net_wm_name) }, { "_NET_WM_NAME", F(atom.net_wm_name) },
{ "_NET_WM_PID", F(atom.net_wm_pid) }, { "_NET_WM_PID", F(atom.net_wm_pid) },
{ "_NET_WM_ICON", F(atom.net_wm_icon) }, { "_NET_WM_ICON", F(atom.net_wm_icon) },
@ -1692,6 +1693,11 @@ weston_wm_create_wm_window(struct weston_wm *wm)
wm->wm_window, wm->wm_window,
wm->atom.wm_s0, wm->atom.wm_s0,
XCB_TIME_CURRENT_TIME); XCB_TIME_CURRENT_TIME);
xcb_set_selection_owner(wm->conn,
wm->wm_window,
wm->atom.net_wm_cm_s0,
XCB_TIME_CURRENT_TIME);
} }
struct weston_wm * struct weston_wm *

@ -85,6 +85,7 @@ struct weston_wm {
xcb_atom_t wm_state; xcb_atom_t wm_state;
xcb_atom_t wm_s0; xcb_atom_t wm_s0;
xcb_atom_t wm_client_machine; xcb_atom_t wm_client_machine;
xcb_atom_t net_wm_cm_s0;
xcb_atom_t net_wm_name; xcb_atom_t net_wm_name;
xcb_atom_t net_wm_pid; xcb_atom_t net_wm_pid;
xcb_atom_t net_wm_icon; xcb_atom_t net_wm_icon;

Loading…
Cancel
Save