diff options
| author | Drew DeVault <sir@cmpwn.com> | 2017-09-30 10:47:04 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-30 10:47:04 -0400 |
| commit | 5944505af66a8cc1c23158541d4d533a0d693b9d (patch) | |
| tree | 616dcba96739351b6ca7737bda9a526d74009ce1 /xwayland | |
| parent | 40303b7a09e52bffbef1ea9cb8120da85c7d185c (diff) | |
| parent | 7f5d0624d666ee2af7d607a44105cb15c44e8481 (diff) | |
| download | wlroots-5944505af66a8cc1c23158541d4d533a0d693b9d.tar.xz | |
Merge pull request #177 from emersion/xwayland-resize
rootston: add view->resize for xwayland
Diffstat (limited to 'xwayland')
| -rw-r--r-- | xwayland/xwm.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/xwayland/xwm.c b/xwayland/xwm.c index d7816bcd..2038ff0f 100644 --- a/xwayland/xwm.c +++ b/xwayland/xwm.c @@ -355,11 +355,8 @@ static void handle_configure_request(struct wlr_xwm *xwm, if (surface->surface == NULL) { // Surface has not been mapped yet - surface->x = ev->x; - surface->y = ev->y; - surface->width = ev->width; - surface->height = ev->height; - wlr_xwayland_surface_configure(xwm->xwayland, surface); + wlr_xwayland_surface_configure(xwm->xwayland, surface, ev->x, ev->y, + ev->width, ev->height); } else { struct wlr_xwayland_surface_configure_event *wlr_event = calloc(1, sizeof(struct wlr_xwayland_surface_configure_event)); @@ -610,13 +607,18 @@ void wlr_xwayland_surface_activate(struct wlr_xwayland *wlr_xwayland, } void wlr_xwayland_surface_configure(struct wlr_xwayland *wlr_xwayland, - struct wlr_xwayland_surface *surface) { + struct wlr_xwayland_surface *surface, int16_t x, int16_t y, + uint16_t width, uint16_t height) { + surface->x = x; + surface->y = y; + surface->width = width; + surface->height = height; + struct wlr_xwm *xwm = wlr_xwayland->xwm; uint32_t mask = XCB_CONFIG_WINDOW_X | XCB_CONFIG_WINDOW_Y | XCB_CONFIG_WINDOW_WIDTH | XCB_CONFIG_WINDOW_HEIGHT | XCB_CONFIG_WINDOW_BORDER_WIDTH; - uint32_t values[] = {surface->x, surface->y, surface->width, - surface->height, 0}; + uint32_t values[] = {x, y, width, height, 0}; xcb_configure_window(xwm->xcb_conn, surface->window_id, mask, values); } |