diff options
author | Drew DeVault <sir@cmpwn.com> | 2018-02-19 18:10:24 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-02-19 18:10:24 -0500 |
commit | c4fb9651445bb7302a904b05583c064ff09cb48e (patch) | |
tree | 266f8d4438350bbaa56567f5553ca441e5d4f1be /xwayland | |
parent | 09cfa39392bd049225b1be7590cd099131472bf2 (diff) | |
parent | 1d9be89e2d62316690ed211e50b79f2bec38e00f (diff) |
Merge pull request #651 from swaywm/revert-647-elf_visibility
Revert "ELF Visibility"
Diffstat (limited to 'xwayland')
-rw-r--r-- | xwayland/selection.c | 4 | ||||
-rw-r--r-- | xwayland/xwayland.c | 5 | ||||
-rw-r--r-- | xwayland/xwm.c | 9 |
3 files changed, 0 insertions, 18 deletions
diff --git a/xwayland/selection.c b/xwayland/selection.c index b16b8731..ffcde4d0 100644 --- a/xwayland/selection.c +++ b/xwayland/selection.c @@ -9,7 +9,6 @@ #include <wlr/util/log.h> #include <wlr/xwm.h> #include <xcb/xfixes.h> -#include "util/defs.h" static const size_t incr_chunk_size = 64 * 1024; @@ -806,7 +805,6 @@ static void selection_init(struct wlr_xwm *xwm, selection->atom, mask); } -WLR_API void xwm_selection_init(struct wlr_xwm *xwm) { uint32_t values[] = { XCB_EVENT_MASK_PROPERTY_CHANGE }; xwm->selection_window = xcb_generate_id(xwm->xcb_conn); @@ -830,7 +828,6 @@ void xwm_selection_init(struct wlr_xwm *xwm) { selection_init(xwm, &xwm->primary_selection, xwm->atoms[PRIMARY]); } -WLR_API void xwm_selection_finish(struct wlr_xwm *xwm) { if (!xwm) { return; @@ -899,7 +896,6 @@ static void seat_handle_primary_selection(struct wl_listener *listener, xwm_selection_set_owner(&xwm->primary_selection, source != NULL); } -WLR_API void xwm_set_seat(struct wlr_xwm *xwm, struct wlr_seat *seat) { if (xwm->seat != NULL) { wl_list_remove(&xwm->seat_selection.link); diff --git a/xwayland/xwayland.c b/xwayland/xwayland.c index 3ef4d41c..1d935180 100644 --- a/xwayland/xwayland.c +++ b/xwayland/xwayland.c @@ -20,7 +20,6 @@ #include <wlr/xwayland.h> #include <wlr/xwm.h> #include "sockets.h" -#include "util/defs.h" #include "util/signal.h" #ifdef __FreeBSD__ @@ -337,14 +336,12 @@ static bool wlr_xwayland_start(struct wlr_xwayland *wlr_xwayland, return true; } -WLR_API void wlr_xwayland_destroy(struct wlr_xwayland *wlr_xwayland) { wlr_xwayland_set_seat(wlr_xwayland, NULL); wlr_xwayland_finish(wlr_xwayland); free(wlr_xwayland); } -WLR_API struct wlr_xwayland *wlr_xwayland_create(struct wl_display *wl_display, struct wlr_compositor *compositor) { struct wlr_xwayland *wlr_xwayland = calloc(1, sizeof(struct wlr_xwayland)); @@ -358,7 +355,6 @@ struct wlr_xwayland *wlr_xwayland_create(struct wl_display *wl_display, return NULL; } -WLR_API void wlr_xwayland_set_cursor(struct wlr_xwayland *wlr_xwayland, uint8_t *pixels, uint32_t stride, uint32_t width, uint32_t height, int32_t hotspot_x, int32_t hotspot_y) { @@ -390,7 +386,6 @@ static void wlr_xwayland_handle_seat_destroy(struct wl_listener *listener, wlr_xwayland_set_seat(xwayland, NULL); } -WLR_API void wlr_xwayland_set_seat(struct wlr_xwayland *xwayland, struct wlr_seat *seat) { if (xwayland->seat) { diff --git a/xwayland/xwm.c b/xwayland/xwm.c index 72b7a8a4..94dfdaab 100644 --- a/xwayland/xwm.c +++ b/xwayland/xwm.c @@ -14,7 +14,6 @@ #include <xcb/render.h> #include <xcb/xcb_image.h> #include <xcb/xfixes.h> -#include "util/defs.h" #include "util/signal.h" #ifdef WLR_HAS_XCB_ICCCM @@ -1044,7 +1043,6 @@ static void handle_compositor_surface_create(struct wl_listener *listener, } } -WLR_API void wlr_xwayland_surface_activate(struct wlr_xwayland_surface *xsurface, bool activated) { struct wlr_xwayland_surface *focused = xsurface->xwm->focus_surface; @@ -1055,7 +1053,6 @@ void wlr_xwayland_surface_activate(struct wlr_xwayland_surface *xsurface, } } -WLR_API void wlr_xwayland_surface_configure(struct wlr_xwayland_surface *xsurface, int16_t x, int16_t y, uint16_t width, uint16_t height) { xsurface->x = x; @@ -1072,7 +1069,6 @@ void wlr_xwayland_surface_configure(struct wlr_xwayland_surface *xsurface, xcb_flush(xwm->xcb_conn); } -WLR_API void wlr_xwayland_surface_close(struct wlr_xwayland_surface *xsurface) { struct wlr_xwm *xwm = xsurface->xwm; @@ -1104,7 +1100,6 @@ void wlr_xwayland_surface_close(struct wlr_xwayland_surface *xsurface) { xcb_flush(xwm->xcb_conn); } -WLR_API void xwm_destroy(struct wlr_xwm *xwm) { if (!xwm) { return; @@ -1297,7 +1292,6 @@ static void xwm_get_render_format(struct wlr_xwm *xwm) { free(reply); } -WLR_API void xwm_set_cursor(struct wlr_xwm *xwm, const uint8_t *pixels, uint32_t stride, uint32_t width, uint32_t height, int32_t hotspot_x, int32_t hotspot_y) { if (!xwm->render_format_id) { @@ -1338,7 +1332,6 @@ void xwm_set_cursor(struct wlr_xwm *xwm, const uint8_t *pixels, uint32_t stride, xcb_flush(xwm->xcb_conn); } -WLR_API struct wlr_xwm *xwm_create(struct wlr_xwayland *wlr_xwayland) { struct wlr_xwm *xwm = calloc(1, sizeof(struct wlr_xwm)); if (xwm == NULL) { @@ -1425,7 +1418,6 @@ struct wlr_xwm *xwm_create(struct wlr_xwayland *wlr_xwayland) { return xwm; } -WLR_API void wlr_xwayland_surface_set_maximized(struct wlr_xwayland_surface *surface, bool maximized) { surface->maximized_horz = maximized; @@ -1434,7 +1426,6 @@ void wlr_xwayland_surface_set_maximized(struct wlr_xwayland_surface *surface, xcb_flush(surface->xwm->xcb_conn); } -WLR_API void wlr_xwayland_surface_set_fullscreen(struct wlr_xwayland_surface *surface, bool fullscreen) { surface->fullscreen = fullscreen; |