wlr_xwayland_surface: fix prefix of two functions

Since we're breaking this API anyways, replace the ambiguous "or" in the
function name with the explicit "override redirect" to avoid confusion.
master
Isaac Freund 3 years ago committed by Simon Zeni
parent 5ecbd23c1d
commit d3b7e040af

@ -299,10 +299,10 @@ void wlr_xwayland_surface_ping(struct wlr_xwayland_surface *surface);
* Returns: true if the window should receive focus * Returns: true if the window should receive focus
* false if it should be ignored * false if it should be ignored
*/ */
bool wlr_xwayland_or_surface_wants_focus( bool wlr_xwayland_surface_override_redirect_wants_focus(
const struct wlr_xwayland_surface *xsurface); const struct wlr_xwayland_surface *xsurface);
enum wlr_xwayland_icccm_input_model wlr_xwayland_icccm_input_model( enum wlr_xwayland_icccm_input_model wlr_xwayland_surface_icccm_input_model(
const struct wlr_xwayland_surface *xsurface); const struct wlr_xwayland_surface *xsurface);
/** /**

@ -2322,7 +2322,7 @@ void wlr_xwayland_surface_ping(struct wlr_xwayland_surface *surface) {
surface->pinging = true; surface->pinging = true;
} }
bool wlr_xwayland_or_surface_wants_focus( bool wlr_xwayland_surface_override_redirect_wants_focus(
const struct wlr_xwayland_surface *xsurface) { const struct wlr_xwayland_surface *xsurface) {
static const enum atom_name needles[] = { static const enum atom_name needles[] = {
NET_WM_WINDOW_TYPE_COMBO, NET_WM_WINDOW_TYPE_COMBO,
@ -2347,8 +2347,8 @@ bool wlr_xwayland_or_surface_wants_focus(
return true; return true;
} }
enum wlr_xwayland_icccm_input_model wlr_xwayland_icccm_input_model( enum wlr_xwayland_icccm_input_model wlr_xwayland_surface_icccm_input_model(
const struct wlr_xwayland_surface *xsurface) { const struct wlr_xwayland_surface *xsurface) {
bool take_focus = xwm_atoms_contains(xsurface->xwm, bool take_focus = xwm_atoms_contains(xsurface->xwm,
xsurface->protocols, xsurface->protocols_len, xsurface->protocols, xsurface->protocols_len,
WM_TAKE_FOCUS); WM_TAKE_FOCUS);

Loading…
Cancel
Save