mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-11-03 09:01:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add view_resize

Browse source
This commit is contained in:
emersion 2017-09-30 11:57:39 +02:00
parent 97679b8e12
commit 33a97576ca
No known key found for this signature in database
GPG key ID: 0FDE7BE0E88F5E48
5 changed files with 30 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

3
include/rootston/input.h
View file

@ -71,6 +71,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;
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
int input_events_idx; int input_events_idx;
@ -111,6 +112,6 @@ const struct roots_input_event *get_input_event(struct roots_input *input,
void view_begin_move(struct roots_input *input, struct wlr_cursor *cursor, void view_begin_move(struct roots_input *input, struct wlr_cursor *cursor,
struct roots_view *view); struct roots_view *view);
void view_begin_resize(struct roots_input *input, struct wlr_cursor *cursor, void view_begin_resize(struct roots_input *input, struct wlr_cursor *cursor,
struct roots_view *view); struct roots_view *view, uint32_t edges);
#endif #endif

2
include/rootston/view.h
View file

@ -63,9 +63,11 @@ struct roots_view {
// elsewhere // elsewhere
void (*get_input_bounds)(struct roots_view *view, struct wlr_box *box); void (*get_input_bounds)(struct roots_view *view, struct wlr_box *box);
void (*activate)(struct roots_view *view, bool active); void (*activate)(struct roots_view *view, bool active);
void (*resize)(struct roots_view *view, uint32_t width, uint32_t height);
}; };
void view_get_input_bounds(struct roots_view *view, struct wlr_box *box); void view_get_input_bounds(struct roots_view *view, struct wlr_box *box);
void view_activate(struct roots_view *view, bool active); void view_activate(struct roots_view *view, bool active);
void view_resize(struct roots_view *view, uint32_t width, uint32_t height);
#endif #endif

16
rootston/cursor.c
View file

@ -30,10 +30,12 @@ void view_begin_move(struct roots_input *input, struct wlr_cursor *cursor,
} }
void view_begin_resize(struct roots_input *input, struct wlr_cursor *cursor, void view_begin_resize(struct roots_input *input, struct wlr_cursor *cursor,
struct roots_view *view) { struct roots_view *view, uint32_t edges) {
input->mode = ROOTS_CURSOR_RESIZE; input->mode = ROOTS_CURSOR_RESIZE;
input->offs_x = cursor->x - view->x; wlr_log(L_DEBUG, "begin resize");
input->offs_y = cursor->y - view->y; input->offs_x = cursor->x - (double)view->wlr_surface->current.width - view->x;
input->offs_y = cursor->y - (double)view->wlr_surface->current.height - view->y;
input->resize_edges = edges;
wlr_seat_pointer_clear_focus(input->wl_seat); wlr_seat_pointer_clear_focus(input->wl_seat);
} }
@ -61,9 +63,11 @@ void cursor_update_position(struct roots_input *input, uint32_t time) {
} }
break; break;
case ROOTS_CURSOR_RESIZE: case ROOTS_CURSOR_RESIZE:
// TODO: this is just for testing if (input->active_view) {
if (input->active_view && input->active_view->type == ROOTS_XDG_SHELL_V6_VIEW) { // TODO: edges
wlr_xdg_toplevel_v6_set_size(input->active_view->xdg_surface_v6, input->cursor->x - input->offs_x, input->cursor->y - input->offs_y); uint32_t width = input->cursor->x - input->offs_x;
uint32_t height = input->cursor->y - input->offs_y;
view_resize(input->active_view, width, height);
} }
break; break;
case ROOTS_CURSOR_ROTATE: case ROOTS_CURSOR_ROTATE:

6
rootston/desktop.c
View file

@ -41,6 +41,12 @@ void view_activate(struct roots_view *view, bool activate) {
} }
} }
void view_resize(struct roots_view *view, uint32_t width, uint32_t height) {
if (view->resize) {
view->resize(view, width, height);
}
}
struct roots_view *view_at(struct roots_desktop *desktop, int x, int y) { struct roots_view *view_at(struct roots_desktop *desktop, int x, int y) {
for (size_t i = 0; i < desktop->views->length; ++i) { for (size_t i = 0; i < desktop->views->length; ++i) {
struct roots_view *view = desktop->views->items[i]; struct roots_view *view = desktop->views->items[i];

11
rootston/xdg_shell_v6.c
View file

@ -29,6 +29,14 @@ static void activate(struct roots_view *view, bool active) {
} }
} }
static void resize(struct roots_view *view, uint32_t width, uint32_t height) {
assert(view->type == ROOTS_XDG_SHELL_V6_VIEW);
struct wlr_xdg_surface_v6 *surf = view->xdg_surface_v6;
if (surf->role == WLR_XDG_SURFACE_V6_ROLE_TOPLEVEL) {
wlr_xdg_toplevel_v6_set_size(surf, width, height);
}
}
static void handle_request_move(struct wl_listener *listener, void *data) { static void handle_request_move(struct wl_listener *listener, void *data) {
struct roots_xdg_surface_v6 *roots_xdg_surface = struct roots_xdg_surface_v6 *roots_xdg_surface =
wl_container_of(listener, roots_xdg_surface, request_move); wl_container_of(listener, roots_xdg_surface, request_move);
@ -52,7 +60,7 @@ static void handle_request_resize(struct wl_listener *listener, void *data) {
if (!event || input->mode != ROOTS_CURSOR_PASSTHROUGH) { if (!event || input->mode != ROOTS_CURSOR_PASSTHROUGH) {
return; return;
} }
view_begin_resize(input, event->cursor, view); view_begin_resize(input, event->cursor, view, e->edges);
} }
static void handle_destroy(struct wl_listener *listener, void *data) { static void handle_destroy(struct wl_listener *listener, void *data) {
@ -102,6 +110,7 @@ void handle_xdg_shell_v6_surface(struct wl_listener *listener, void *data) {
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->desktop = desktop; view->desktop = desktop;
roots_surface->view = view; roots_surface->view = view;
list_add(desktop->views, view); list_add(desktop->views, view);