Add edges support, remove get_input_bounds
This commit is contained in:
parent
33a97576ca
commit
28d4b475dc
|
@ -53,6 +53,13 @@ enum roots_cursor_mode {
|
||||||
ROOTS_CURSOR_ROTATE = 3,
|
ROOTS_CURSOR_ROTATE = 3,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
enum roots_cursor_resize_edge {
|
||||||
|
ROOTS_CURSOR_RESIZE_EDGE_TOP = 1,
|
||||||
|
ROOTS_CURSOR_RESIZE_EDGE_BOTTOM = 2,
|
||||||
|
ROOTS_CURSOR_RESIZE_EDGE_LEFT = 4,
|
||||||
|
ROOTS_CURSOR_RESIZE_EDGE_RIGHT = 8,
|
||||||
|
};
|
||||||
|
|
||||||
struct roots_input_event {
|
struct roots_input_event {
|
||||||
uint32_t serial;
|
uint32_t serial;
|
||||||
struct wlr_cursor *cursor;
|
struct wlr_cursor *cursor;
|
||||||
|
@ -71,6 +78,7 @@ struct roots_input {
|
||||||
enum roots_cursor_mode mode;
|
enum roots_cursor_mode mode;
|
||||||
struct roots_view *active_view;
|
struct roots_view *active_view;
|
||||||
int offs_x, offs_y;
|
int offs_x, offs_y;
|
||||||
|
int view_width, view_height;
|
||||||
uint32_t resize_edges;
|
uint32_t resize_edges;
|
||||||
|
|
||||||
// Ring buffer of input events that could trigger move/resize/rotate
|
// Ring buffer of input events that could trigger move/resize/rotate
|
||||||
|
|
|
@ -33,8 +33,10 @@ void view_begin_resize(struct roots_input *input, struct wlr_cursor *cursor,
|
||||||
struct roots_view *view, uint32_t edges) {
|
struct roots_view *view, uint32_t edges) {
|
||||||
input->mode = ROOTS_CURSOR_RESIZE;
|
input->mode = ROOTS_CURSOR_RESIZE;
|
||||||
wlr_log(L_DEBUG, "begin resize");
|
wlr_log(L_DEBUG, "begin resize");
|
||||||
input->offs_x = cursor->x - (double)view->wlr_surface->current.width - view->x;
|
input->offs_x = cursor->x - view->x;
|
||||||
input->offs_y = cursor->y - (double)view->wlr_surface->current.height - view->y;
|
input->offs_y = cursor->y - view->y;
|
||||||
|
input->view_width = view->wlr_surface->current.width;
|
||||||
|
input->view_height = view->wlr_surface->current.height;
|
||||||
input->resize_edges = edges;
|
input->resize_edges = edges;
|
||||||
wlr_seat_pointer_clear_focus(input->wl_seat);
|
wlr_seat_pointer_clear_focus(input->wl_seat);
|
||||||
}
|
}
|
||||||
|
@ -64,9 +66,24 @@ void cursor_update_position(struct roots_input *input, uint32_t time) {
|
||||||
break;
|
break;
|
||||||
case ROOTS_CURSOR_RESIZE:
|
case ROOTS_CURSOR_RESIZE:
|
||||||
if (input->active_view) {
|
if (input->active_view) {
|
||||||
// TODO: edges
|
int dx = input->cursor->x - input->offs_x;
|
||||||
uint32_t width = input->cursor->x - input->offs_x;
|
int dy = input->cursor->y - input->offs_y;
|
||||||
uint32_t height = input->cursor->y - input->offs_y;
|
int width = input->view_width;
|
||||||
|
int height = input->view_height;
|
||||||
|
if (input->resize_edges & ROOTS_CURSOR_RESIZE_EDGE_TOP) {
|
||||||
|
input->active_view->y = dy;
|
||||||
|
height -= dy;
|
||||||
|
}
|
||||||
|
if (input->resize_edges & ROOTS_CURSOR_RESIZE_EDGE_BOTTOM) {
|
||||||
|
height += dy;
|
||||||
|
}
|
||||||
|
if (input->resize_edges & ROOTS_CURSOR_RESIZE_EDGE_LEFT) {
|
||||||
|
input->active_view->x = dx;
|
||||||
|
width -= dx;
|
||||||
|
}
|
||||||
|
if (input->resize_edges & ROOTS_CURSOR_RESIZE_EDGE_RIGHT) {
|
||||||
|
width += dx;
|
||||||
|
}
|
||||||
view_resize(input->active_view, width, height);
|
view_resize(input->active_view, width, height);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -10,16 +10,12 @@
|
||||||
#include "rootston/server.h"
|
#include "rootston/server.h"
|
||||||
#include "rootston/input.h"
|
#include "rootston/input.h"
|
||||||
|
|
||||||
static void get_input_bounds(struct roots_view *view, struct wlr_box *box) {
|
/*static void get_input_bounds(struct roots_view *view, struct wlr_box *box) {
|
||||||
assert(view->type == ROOTS_XDG_SHELL_V6_VIEW);
|
assert(view->type == ROOTS_XDG_SHELL_V6_VIEW);
|
||||||
struct wlr_xdg_surface_v6 *surf = view->xdg_surface_v6;
|
struct wlr_xdg_surface_v6 *surf = view->xdg_surface_v6;
|
||||||
|
// TODO: surf->geometry can be NULL
|
||||||
memcpy(box, surf->geometry, sizeof(struct wlr_box));
|
memcpy(box, surf->geometry, sizeof(struct wlr_box));
|
||||||
// TODO: real input bounds
|
}*/
|
||||||
box->x -= 10;
|
|
||||||
box->y -= 10;
|
|
||||||
box->width += 20;
|
|
||||||
box->height += 20;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void activate(struct roots_view *view, bool active) {
|
static void activate(struct roots_view *view, bool active) {
|
||||||
assert(view->type == ROOTS_XDG_SHELL_V6_VIEW);
|
assert(view->type == ROOTS_XDG_SHELL_V6_VIEW);
|
||||||
|
@ -108,7 +104,7 @@ void handle_xdg_shell_v6_surface(struct wl_listener *listener, void *data) {
|
||||||
view->xdg_surface_v6 = surface;
|
view->xdg_surface_v6 = surface;
|
||||||
view->roots_xdg_surface_v6 = roots_surface;
|
view->roots_xdg_surface_v6 = roots_surface;
|
||||||
view->wlr_surface = surface->surface;
|
view->wlr_surface = surface->surface;
|
||||||
view->get_input_bounds = get_input_bounds;
|
//view->get_input_bounds = get_input_bounds;
|
||||||
view->activate = activate;
|
view->activate = activate;
|
||||||
view->resize = resize;
|
view->resize = resize;
|
||||||
view->desktop = desktop;
|
view->desktop = desktop;
|
||||||
|
|
Loading…
Reference in New Issue