mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-10-29 05:40:24 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

build: fix name collision with wlroots, when linking statically

Browse source
This commit is contained in:
Dima Krasner 2021-11-08 20:17:08 +02:00 • committed by Johan Malm
parent dd1663e627
commit 04450b5e4d
4 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/labwc.h
View file

@ -342,7 +342,7 @@ void xwayland_unmanaged_create(struct server *server,
void view_child_init(struct view_child *child, struct view *view, void view_child_init(struct view_child *child, struct view *view,
struct wlr_surface *wlr_surface); struct wlr_surface *wlr_surface);
void view_child_finish(struct view_child *child); void view_child_finish(struct view_child *child);
void subsurface_create(struct view *view, struct wlr_subsurface *wlr_subsurface); void view_subsurface_create(struct view *view, struct wlr_subsurface *wlr_subsurface);
void view_set_activated(struct view *view, bool activated); void view_set_activated(struct view *view, bool activated);
struct border view_border(struct view *view); struct border view_border(struct view *view);

2
src/subsurface.c
View file

@ -21,7 +21,7 @@ subsurface_handle_destroy(struct wl_listener *listener, void *data)
} }
void void
subsurface_create(struct view *view, struct wlr_subsurface *wlr_subsurface) view_subsurface_create(struct view *view, struct wlr_subsurface *wlr_subsurface)
{ {
struct view_subsurface *subsurface = struct view_subsurface *subsurface =
calloc(1, sizeof(struct view_subsurface)); calloc(1, sizeof(struct view_subsurface));

2
src/view-child.c
View file

@ -19,7 +19,7 @@ view_child_handle_new_subsurface(struct wl_listener *listener, void *data)
struct view_child *child; struct view_child *child;
child = wl_container_of(listener, child, new_subsurface); child = wl_container_of(listener, child, new_subsurface);
struct wlr_subsurface *wlr_subsurface = data; struct wlr_subsurface *wlr_subsurface = data;
subsurface_create(child->parent, wlr_subsurface); view_subsurface_create(child->parent, wlr_subsurface);
} }
void void

8
src/xdg.c
View file

@ -4,7 +4,7 @@
#include "ssd.h" #include "ssd.h"
/* /*
* xdg_popup_create() and subsurface_create() are only called for the * xdg_popup_create() and view_subsurface_create() are only called for the
* purposes of tracking damage. * purposes of tracking damage.
*/ */
static void static void
@ -20,7 +20,7 @@ new_subsurface_notify(struct wl_listener *listener, void *data)
{ {
struct view *view = wl_container_of(listener, view, new_subsurface); struct view *view = wl_container_of(listener, view, new_subsurface);
struct wlr_subsurface *wlr_subsurface = data; struct wlr_subsurface *wlr_subsurface = data;
subsurface_create(view, wlr_subsurface); view_subsurface_create(view, wlr_subsurface);
} }
static bool static bool
@ -337,11 +337,11 @@ xdg_toplevel_view_map(struct view *view)
struct wlr_subsurface *subsurface; struct wlr_subsurface *subsurface;
wl_list_for_each(subsurface, &view->surface->current.subsurfaces_below, wl_list_for_each(subsurface, &view->surface->current.subsurfaces_below,
current.link) { current.link) {
subsurface_create(view, subsurface); view_subsurface_create(view, subsurface);
} }
wl_list_for_each(subsurface, &view->surface->current.subsurfaces_above, wl_list_for_each(subsurface, &view->surface->current.subsurfaces_above,
current.link) { current.link) {
subsurface_create(view, subsurface); view_subsurface_create(view, subsurface);
} }
view->been_mapped = true; view->been_mapped = true;