diff options
| author | Drew DeVault <sir@cmpwn.com> | 2017-09-28 19:06:41 -0400 |
|---|---|---|
| committer | Drew DeVault <sir@cmpwn.com> | 2017-09-28 19:06:41 -0400 |
| commit | 033036712ade73a872f1034ddb47235be11a74aa (patch) | |
| tree | ecae511da6a408177369858ac43d200bae427472 /xwayland/xwm.h | |
| parent | 2850a9360b23eaf27f6437a889b13bdcbe506863 (diff) | |
| parent | e4ad534ab41b01a08b6b4f19aa47805f6040f7b4 (diff) | |
Merge branch 'rootston'
Diffstat (limited to 'xwayland/xwm.h')
| -rw-r--r-- | xwayland/xwm.h | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/xwayland/xwm.h b/xwayland/xwm.h index 235145b9..ecbab535 100644 --- a/xwayland/xwm.h +++ b/xwayland/xwm.h @@ -52,17 +52,11 @@ enum atom_name { NET_SUPPORTED, NET_WM_S0, NET_WM_STATE, - ATOM_LAST + WM_TAKE_FOCUS, + ATOM_LAST, }; -static const char * const atom_map[ATOM_LAST] = { - "WL_SURFACE_ID", - "WM_PROTOCOLS", - "WM_S0", - "_NET_SUPPORTED", - "_NET_WM_S0", - "_NET_WM_STATE", -}; +extern const char *atom_map[ATOM_LAST]; struct wlr_xwm { struct wlr_xwayland *xwayland; @@ -74,8 +68,8 @@ struct wlr_xwm { xcb_screen_t *screen; xcb_window_t window; - struct wl_list new_windows; - struct wl_list unpaired_windows; + struct wl_list new_surfaces; + struct wl_list unpaired_surfaces; }; void xwm_destroy(struct wlr_xwm *xwm); |