diff options
| author | Drew DeVault <sir@cmpwn.com> | 2018-06-30 06:29:35 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-30 06:29:35 -0700 |
| commit | 02dfa9101ec7fd8328ed329d2f2faa815b1ad61c (patch) | |
| tree | 6feba965b132588632e2d21b3439a5f2fb2edc62 | |
| parent | 167105e6069d2dd66cd2d472c2a6b67703838125 (diff) | |
| parent | c263f7ca2992cf76c2d28bb61e8422b1dad45444 (diff) | |
Merge pull request #1102 from martinetd/wlr-subsurface-from-wlr-surface
s/wlr_subsurface_from_surface/wlr_subsurface_from_wlr_surface/
| -rw-r--r-- | include/wlr/types/wlr_compositor.h | 5 | ||||
| -rw-r--r-- | types/wlr_compositor.c | 4 | ||||
| -rw-r--r-- | types/wlr_surface.c | 6 |
3 files changed, 8 insertions, 7 deletions
diff --git a/include/wlr/types/wlr_compositor.h b/include/wlr/types/wlr_compositor.h index f6be0a74..51702884 100644 --- a/include/wlr/types/wlr_compositor.h +++ b/include/wlr/types/wlr_compositor.h @@ -31,10 +31,11 @@ struct wlr_compositor { void wlr_compositor_destroy(struct wlr_compositor *wlr_compositor); struct wlr_compositor *wlr_compositor_create(struct wl_display *display, - struct wlr_renderer *renderer); + struct wlr_renderer *renderer); bool wlr_surface_is_subsurface(struct wlr_surface *surface); -struct wlr_subsurface *wlr_subsurface_from_surface(struct wlr_surface *surface); +struct wlr_subsurface *wlr_subsurface_from_wlr_surface( + struct wlr_surface *surface); #endif diff --git a/types/wlr_compositor.c b/types/wlr_compositor.c index e4fd41dc..d2f7dbd7 100644 --- a/types/wlr_compositor.c +++ b/types/wlr_compositor.c @@ -17,7 +17,7 @@ bool wlr_surface_is_subsurface(struct wlr_surface *surface) { strcmp(surface->role, subsurface_role) == 0; } -struct wlr_subsurface *wlr_subsurface_from_surface( +struct wlr_subsurface *wlr_subsurface_from_wlr_surface( struct wlr_surface *surface) { assert(wlr_surface_is_subsurface(surface)); return (struct wlr_subsurface *)surface->role_data; @@ -57,7 +57,7 @@ static void subcompositor_handle_get_subsurface(struct wl_client *client, } if (wlr_surface_is_subsurface(surface) && - wlr_subsurface_from_surface(surface) != NULL) { + wlr_subsurface_from_wlr_surface(surface) != NULL) { wl_resource_post_error(resource, WL_SUBCOMPOSITOR_ERROR_BAD_SURFACE, "%s%d: wl_surface@%d is already a sub-surface", diff --git a/types/wlr_surface.c b/types/wlr_surface.c index 59a6fc2c..6bf224db 100644 --- a/types/wlr_surface.c +++ b/types/wlr_surface.c @@ -395,7 +395,7 @@ static bool subsurface_is_synchronized(struct wlr_subsurface *subsurface) { if (!wlr_surface_is_subsurface(subsurface->parent)) { break; } - subsurface = wlr_subsurface_from_surface(subsurface->parent); + subsurface = wlr_subsurface_from_wlr_surface(subsurface->parent); } return false; @@ -451,7 +451,7 @@ static void surface_commit(struct wl_client *client, if (wlr_surface_is_subsurface(surface)) { struct wlr_subsurface *subsurface = - wlr_subsurface_from_surface(surface); + wlr_subsurface_from_wlr_surface(surface); subsurface_commit(subsurface); return; } @@ -887,7 +887,7 @@ struct wlr_subsurface *wlr_subsurface_create(struct wlr_surface *surface, struct wlr_surface *wlr_surface_get_root_surface(struct wlr_surface *surface) { while (wlr_surface_is_subsurface(surface)) { struct wlr_subsurface *subsurface = - wlr_subsurface_from_surface(surface); + wlr_subsurface_from_wlr_surface(surface); surface = subsurface->parent; } return surface; |