xwm: Implement resizing by frame borders
diff --git a/src/compositor.h b/src/compositor.h
index a3ccc36..4a659bc 100644
--- a/src/compositor.h
+++ b/src/compositor.h
@@ -73,6 +73,9 @@
struct shell_surface *pshsurf,
int x, int y, uint32_t flags);
int (*move)(struct shell_surface *shsurf, struct weston_seat *ws);
+ int (*resize)(struct shell_surface *shsurf,
+ struct weston_seat *ws, uint32_t edges);
+
};
struct weston_border {
diff --git a/src/shell.c b/src/shell.c
index d764a79..9658976 100644
--- a/src/shell.c
+++ b/src/shell.c
@@ -626,8 +626,8 @@
};
static int
-weston_surface_resize(struct shell_surface *shsurf,
- struct weston_seat *ws, uint32_t edges)
+surface_resize(struct shell_surface *shsurf,
+ struct weston_seat *ws, uint32_t edges)
{
struct weston_resize_grab *resize;
@@ -673,7 +673,7 @@
ws->seat.pointer->focus != &shsurf->surface->surface)
return;
- if (weston_surface_resize(shsurf, ws, edges) < 0)
+ if (surface_resize(shsurf, ws, edges) < 0)
wl_resource_post_no_memory(resource);
}
@@ -1610,7 +1610,7 @@
else
edges |= WL_SHELL_SURFACE_RESIZE_BOTTOM;
- weston_surface_resize(shsurf, (struct weston_seat *) seat, edges);
+ surface_resize(shsurf, (struct weston_seat *) seat, edges);
}
static void
@@ -2658,6 +2658,7 @@
ec->shell_interface.set_toplevel = set_toplevel;
ec->shell_interface.set_transient = set_transient;
ec->shell_interface.move = surface_move;
+ ec->shell_interface.resize = surface_resize;
wl_list_init(&shell->backgrounds);
wl_list_init(&shell->panels);
diff --git a/src/xwayland/window-manager.c b/src/xwayland/window-manager.c
index a2f392b..bffb5ff 100644
--- a/src/xwayland/window-manager.c
+++ b/src/xwayland/window-manager.c
@@ -781,25 +781,39 @@
struct weston_wm_window *window;
enum theme_location location;
struct theme *t = wm->theme;
+ int width, height;
fprintf(stderr, "XCB_BUTTON_%s (detail %d)\n",
button->response_type == XCB_BUTTON_PRESS ?
"PRESS" : "RELEASE", button->detail);
window = hash_table_lookup(wm->window_hash, button->event);
+ weston_wm_window_get_frame_size(window, &width, &height);
+
if (button->response_type == XCB_BUTTON_PRESS &&
button->detail == 1) {
location = theme_get_location(t,
button->event_x,
button->event_y,
- window->width,
- window->height);
+ width, height);
switch (location) {
case THEME_LOCATION_TITLEBAR:
shell_interface->move(window->shsurf,
wm->server->compositor->seat);
break;
+ case THEME_LOCATION_RESIZING_TOP:
+ case THEME_LOCATION_RESIZING_BOTTOM:
+ case THEME_LOCATION_RESIZING_LEFT:
+ case THEME_LOCATION_RESIZING_RIGHT:
+ case THEME_LOCATION_RESIZING_TOP_LEFT:
+ case THEME_LOCATION_RESIZING_TOP_RIGHT:
+ case THEME_LOCATION_RESIZING_BOTTOM_LEFT:
+ case THEME_LOCATION_RESIZING_BOTTOM_RIGHT:
+ shell_interface->resize(window->shsurf,
+ wm->server->compositor->seat,
+ location);
+ break;
default:
break;
}