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

xwm.h: fix guard ifdef and remove wlr_ prefix from xwm_atoms_contains

This commit is contained in:
Dominique Martinet 2018-03-04 11:16:14 +01:00
parent d9a724c4a2
commit 2910972b25
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/xwayland/xwm.h
View File

@ -1,5 +1,5 @@
#ifndef WLR_XWM_H
#define WLR_XWM_H
#ifndef XWAYLAND_XWM_H
#define XWAYLAND_XWM_H
#include <wayland-server-core.h>
#include <wlr/xwayland.h>
@ -129,7 +129,7 @@ void xwm_selection_finish(struct wlr_xwm *xwm);
void xwm_set_seat(struct wlr_xwm *xwm, struct wlr_seat *seat);
bool wlr_xwm_atoms_contains(struct wlr_xwm *xwm, xcb_atom_t *atoms,
bool xwm_atoms_contains(struct wlr_xwm *xwm, xcb_atom_t *atoms,
size_t num_atoms, enum atom_name needle);
#endif

2
xwayland/xwayland.c
View File

@ -418,7 +418,7 @@ bool wlr_xwayland_surface_is_unmanaged(const struct wlr_xwayland_surface *surfac
};
for (size_t i = 0; i < sizeof(needles) / sizeof(needles[0]); ++i) {
if (wlr_xwm_atoms_contains(surface->xwm, surface->window_type,
if (xwm_atoms_contains(surface->xwm, surface->window_type,
surface->window_type_len, needles[i])) {
return true;
}

2
xwayland/xwm.c
View File

@ -1519,7 +1519,7 @@ void wlr_xwayland_surface_set_fullscreen(struct wlr_xwayland_surface *surface,
xcb_flush(surface->xwm->xcb_conn);
}
bool wlr_xwm_atoms_contains(struct wlr_xwm *xwm, xcb_atom_t *atoms,
bool xwm_atoms_contains(struct wlr_xwm *xwm, xcb_atom_t *atoms,
size_t num_atoms, enum atom_name needle) {
xcb_atom_t atom = xwm->atoms[needle];