From dc701b72fc579776cf10bf7d5ec91c033f9bec8e Mon Sep 17 00:00:00 2001 From: Tony Crisci Date: Tue, 16 Jan 2018 07:12:46 -0500 Subject: abstract box matrix --- rootston/output.c | 42 ++---------------------------------------- 1 file changed, 2 insertions(+), 40 deletions(-) (limited to 'rootston') diff --git a/rootston/output.c b/rootston/output.c index c26ea36e..42dbd972 100644 --- a/rootston/output.c +++ b/rootston/output.c @@ -53,46 +53,8 @@ static void render_surface(struct wlr_surface *surface, }; if (wlr_output_layout_intersects(desktop->layout, wlr_output, &render_box)) { float matrix[16]; - - float translate_center[16]; - wlr_matrix_translate(&translate_center, - (int)ox + render_width / 2, (int)oy + render_height / 2, 0); - - float rotate[16]; - wlr_matrix_rotate(&rotate, rotation); - - float translate_origin[16]; - wlr_matrix_translate(&translate_origin, -render_width / 2, - -render_height / 2, 0); - - float scale[16]; - wlr_matrix_scale(&scale, render_width, render_height, 1); - - float transform[16]; - wlr_matrix_mul(&translate_center, &rotate, &transform); - wlr_matrix_mul(&transform, &translate_origin, &transform); - wlr_matrix_mul(&transform, &scale, &transform); - - if (surface->current->transform != WL_OUTPUT_TRANSFORM_NORMAL) { - float surface_translate_center[16]; - wlr_matrix_translate(&surface_translate_center, 0.5, 0.5, 0); - - float surface_transform[16]; - wlr_matrix_transform(surface_transform, - wlr_output_transform_invert(surface->current->transform)); - - float surface_translate_origin[16]; - wlr_matrix_translate(&surface_translate_origin, -0.5, -0.5, 0); - - wlr_matrix_mul(&transform, &surface_translate_center, - &transform); - wlr_matrix_mul(&transform, &surface_transform, &transform); - wlr_matrix_mul(&transform, &surface_translate_origin, - &transform); - } - - wlr_matrix_mul(&wlr_output->transform_matrix, &transform, &matrix); - + wlr_output_get_box_matrix(wlr_output, ox, oy, render_width, + render_height, surface->current->transform, rotation, &matrix); wlr_render_with_matrix(desktop->server->renderer, surface->texture, &matrix); -- cgit v1.2.3 From 3751a1732158546c4fbc203aa34fc4a4a68f1016 Mon Sep 17 00:00:00 2001 From: Tony Crisci Date: Tue, 16 Jan 2018 07:50:40 -0500 Subject: decorate xwayland views --- include/rootston/view.h | 5 +++++ render/gles2/renderer.c | 2 +- rootston/desktop.c | 12 ++++++++++++ rootston/output.c | 24 ++++++++++++++++++++++++ rootston/xwayland.c | 5 +++++ 5 files changed, 47 insertions(+), 1 deletion(-) (limited to 'rootston') diff --git a/include/rootston/view.h b/include/rootston/view.h index 579b148a..a18eda8f 100644 --- a/include/rootston/view.h +++ b/include/rootston/view.h @@ -61,6 +61,10 @@ struct roots_view { double x, y; float rotation; + bool decorated; + int border_width; + int titlebar_height; + bool maximized; struct roots_output *fullscreen_output; struct { @@ -113,6 +117,7 @@ struct roots_view { }; void view_get_box(const struct roots_view *view, struct wlr_box *box); +void view_get_deco_box(const struct roots_view *view, struct wlr_box *box); void view_activate(struct roots_view *view, bool active); void view_move(struct roots_view *view, double x, double y); void view_resize(struct roots_view *view, uint32_t width, uint32_t height); diff --git a/render/gles2/renderer.c b/render/gles2/renderer.c index 89cc4ffb..30247af0 100644 --- a/render/gles2/renderer.c +++ b/render/gles2/renderer.c @@ -177,7 +177,7 @@ static bool wlr_gles2_render_texture(struct wlr_renderer *_renderer, static void wlr_gles2_render_quad(struct wlr_renderer *renderer, const float (*color)[4], const float (*matrix)[16]) { GL_CALL(glUseProgram(shaders.quad)); - GL_CALL(glUniformMatrix4fv(0, 1, GL_TRUE, *matrix)); + GL_CALL(glUniformMatrix4fv(0, 1, GL_FALSE, *matrix)); GL_CALL(glUniform4f(1, (*color)[0], (*color)[1], (*color)[2], (*color)[3])); draw_quad(); } diff --git a/rootston/desktop.c b/rootston/desktop.c index d7da1600..3de1f669 100644 --- a/rootston/desktop.c +++ b/rootston/desktop.c @@ -31,6 +31,18 @@ void view_get_box(const struct roots_view *view, struct wlr_box *box) { } } +void view_get_deco_box(const struct roots_view *view, struct wlr_box *box) { + view_get_box(view, box); + if (!view->decorated) { + return; + } + + box->x -= view->border_width; + box->y -= (view->border_width + view->titlebar_height); + box->width += view->border_width * 2; + box->height += (view->border_width * 2 + view->titlebar_height); +} + static void view_update_output(const struct roots_view *view, const struct wlr_box *before) { struct roots_desktop *desktop = view->desktop; diff --git a/rootston/output.c b/rootston/output.c index 42dbd972..502e72d2 100644 --- a/rootston/output.c +++ b/rootston/output.c @@ -144,8 +144,32 @@ static void render_xwayland_children(struct wlr_xwayland_surface *surface, } } +static void render_decorations(struct roots_view *view, + struct roots_desktop *desktop, struct wlr_output *output) { + if (!view->decorated) { + return; + } + struct wlr_box deco_box; + view_get_deco_box(view, &deco_box); + double ox = deco_box.x; + double oy = deco_box.y; + wlr_output_layout_output_coords(desktop->layout, output, &ox, &oy); + ox *= output->scale; + oy *= output->scale; + + float matrix[16]; + wlr_output_get_box_matrix(output, ox, oy, deco_box.width, + deco_box.height, WL_OUTPUT_TRANSFORM_NORMAL, view->rotation, + &matrix); + + float color[4] = { 0.2, 0.2, 0.2, 1 }; + wlr_render_colored_quad(desktop->server->renderer, &color, &matrix); +} + static void render_view(struct roots_view *view, struct roots_desktop *desktop, struct wlr_output *wlr_output, struct timespec *when) { + render_decorations(view, desktop, wlr_output); + switch (view->type) { case ROOTS_XDG_SHELL_V6_VIEW: render_surface(view->wlr_surface, desktop, wlr_output, when, diff --git a/rootston/xwayland.c b/rootston/xwayland.c index 3d84dc19..eb84eba0 100644 --- a/rootston/xwayland.c +++ b/rootston/xwayland.c @@ -296,6 +296,7 @@ void handle_xwayland_surface(struct wl_listener *listener, void *data) { view->type = ROOTS_XWAYLAND_VIEW; view->x = (double)surface->x; view->y = (double)surface->y; + view->xwayland_surface = surface; view->roots_xwayland_surface = roots_surface; view->wlr_surface = surface->surface; @@ -311,6 +312,10 @@ void handle_xwayland_surface(struct wl_listener *listener, void *data) { wl_list_insert(&desktop->views, &view->link); if (!surface->override_redirect) { + view->decorated = true; + view->border_width = 4; + view->titlebar_height = 12; + view_setup(view); } } -- cgit v1.2.3 From 61bd79200cc3892b143b7321886db77e97c9f69f Mon Sep 17 00:00:00 2001 From: Tony Crisci Date: Tue, 16 Jan 2018 19:04:26 -0500 Subject: basic decorations --- include/rootston/cursor.h | 2 + include/rootston/input.h | 2 + include/rootston/seat.h | 8 ++++ include/rootston/view.h | 3 ++ rootston/cursor.c | 94 ++++++++++++++++++++++++++++++++++++++++++++--- rootston/desktop.c | 8 ++++ rootston/seat.c | 44 ++++++++++++++-------- 7 files changed, 141 insertions(+), 20 deletions(-) (limited to 'rootston') diff --git a/include/rootston/cursor.h b/include/rootston/cursor.h index 19ac4034..90d54c12 100644 --- a/include/rootston/cursor.h +++ b/include/rootston/cursor.h @@ -27,6 +27,8 @@ struct roots_cursor { float view_rotation; uint32_t resize_edges; + struct roots_seat_view *pointer_view; + struct wl_listener motion; struct wl_listener motion_absolute; struct wl_listener button; diff --git a/include/rootston/input.h b/include/rootston/input.h index 726dda24..2270ea0c 100644 --- a/include/rootston/input.h +++ b/include/rootston/input.h @@ -9,6 +9,8 @@ #include "rootston/view.h" #include "rootston/server.h" +struct roots_view; + struct roots_input { struct roots_config *config; struct roots_server *server; diff --git a/include/rootston/seat.h b/include/rootston/seat.h index cf5dd3b2..6ae7c3fa 100644 --- a/include/rootston/seat.h +++ b/include/rootston/seat.h @@ -28,6 +28,11 @@ struct roots_seat { struct roots_seat_view { struct roots_seat *seat; struct roots_view *view; + + bool has_button_grab; + double grab_vx; + double grab_vy; + struct wl_list link; // roots_seat::views struct wl_listener view_destroy; @@ -84,4 +89,7 @@ void roots_seat_begin_resize(struct roots_seat *seat, struct roots_view *view, void roots_seat_begin_rotate(struct roots_seat *seat, struct roots_view *view); +struct roots_seat_view *roots_seat_view_from_view( struct roots_seat *seat, + struct roots_view *view); + #endif diff --git a/include/rootston/view.h b/include/rootston/view.h index a18eda8f..68ccbef8 100644 --- a/include/rootston/view.h +++ b/include/rootston/view.h @@ -6,6 +6,9 @@ #include #include #include +#include "rootston/seat.h" + +struct roots_seat; struct roots_wl_shell_surface { struct roots_view *view; diff --git a/rootston/cursor.c b/rootston/cursor.c index 8bd514cc..8a34cd13 100644 --- a/rootston/cursor.c +++ b/rootston/cursor.c @@ -30,19 +30,81 @@ void roots_cursor_destroy(struct roots_cursor *cursor) { // TODO } +static void seat_view_deco_motion(struct roots_seat_view *view, double deco_vx, double deco_vy) { + struct roots_cursor *cursor = view->seat->cursor; + + double vx = deco_vx; + double vy = deco_vy; + if (view->has_button_grab) { + vx = view->grab_vx; + vy = view->grab_vy; + } + + bool is_titlebar = vy < 0 && -vy < view->view->titlebar_height; + uint32_t edges = 0; + if (vx < 0) { + edges |= WLR_EDGE_LEFT; + } else if (vx > view->view->wlr_surface->current->width) { + edges |= WLR_EDGE_RIGHT; + } else if (vy > view->view->wlr_surface->current->height) { + edges |= WLR_EDGE_BOTTOM; + } else if (-vy > view->view->titlebar_height) { + edges |= WLR_EDGE_TOP; + } + + if (view->has_button_grab) { + if (is_titlebar) { + roots_seat_begin_move(view->seat, view->view); + } else if (edges) { + roots_seat_begin_resize(view->seat, view->view, edges); + } + view->has_button_grab = false; + } else { + if (is_titlebar) { + wlr_xcursor_manager_set_cursor_image(cursor->xcursor_manager, + cursor->default_xcursor, cursor->cursor); + } else if (edges) { + const char *resize_name = wlr_xcursor_get_resize_name(edges); + wlr_xcursor_manager_set_cursor_image(cursor->xcursor_manager, + resize_name, cursor->cursor); + } + } +} + +static void seat_view_deco_leave(struct roots_seat_view *view) { + view->has_button_grab = false; +} + +static void seat_view_deco_button(struct roots_seat_view *view, double vx, + double vy, uint32_t button, uint32_t state) { + if (button == BTN_LEFT && state == WLR_BUTTON_PRESSED) { + view->has_button_grab = true; + view->grab_vx = vx; + view->grab_vy = vy; + } else { + view->has_button_grab = false; + } +} + static void roots_cursor_update_position(struct roots_cursor *cursor, uint32_t time) { struct roots_desktop *desktop = cursor->seat->input->server->desktop; struct roots_seat *seat = cursor->seat; struct roots_view *view; - struct wlr_surface *surface; + struct wlr_surface *surface = NULL; double sx, sy; switch (cursor->mode) { case ROOTS_CURSOR_PASSTHROUGH: view = desktop_view_at(desktop, cursor->cursor->x, cursor->cursor->y, &surface, &sx, &sy); + struct roots_seat_view *seat_view = + roots_seat_view_from_view(seat, view); + if (cursor->pointer_view && (surface || seat_view != cursor->pointer_view)) { + seat_view_deco_leave(cursor->pointer_view); + cursor->pointer_view = NULL; + } bool set_compositor_cursor = !view && cursor->cursor_client; - if (view) { + if (view && surface) { struct wl_client *view_client = wl_resource_get_client(view->wlr_surface->resource); set_compositor_cursor = view_client != cursor->cursor_client; @@ -52,7 +114,15 @@ static void roots_cursor_update_position(struct roots_cursor *cursor, cursor->default_xcursor, cursor->cursor); cursor->cursor_client = NULL; } - if (view) { + if (view && !surface) { + if (seat_view) { + cursor->pointer_view = seat_view; + seat_view_deco_motion(seat_view, + cursor->cursor->x - seat_view->view->x, + cursor->cursor->y - seat_view->view->y); + } + } if (view && surface) { + // motion over a view surface wlr_seat_pointer_notify_enter(seat->seat, surface, sx, sy); wlr_seat_pointer_notify_motion(seat->seat, time, sx, sy); } else { @@ -166,16 +236,30 @@ static void roots_cursor_press_button(struct roots_cursor *cursor, } return; } + + if (view && !surface) { + if (cursor->pointer_view) { + seat_view_deco_button(cursor->pointer_view, + cursor->cursor->x - cursor->pointer_view->view->x, + cursor->cursor->y - cursor->pointer_view->view->y, + button, state); + } + } + if (state == WLR_BUTTON_RELEASED && cursor->mode != ROOTS_CURSOR_PASSTHROUGH) { cursor->mode = ROOTS_CURSOR_PASSTHROUGH; + wlr_xcursor_manager_set_cursor_image(cursor->xcursor_manager, + cursor->default_xcursor, cursor->cursor); if (seat->seat->pointer_state.button_count == 0) { return; } } - if (!is_touch) { - wlr_seat_pointer_notify_button(seat->seat, time, button, state); + if (view && surface) { + if (!is_touch) { + wlr_seat_pointer_notify_button(seat->seat, time, button, state); + } } switch (state) { diff --git a/rootston/desktop.c b/rootston/desktop.c index 3de1f669..1ec1d552 100644 --- a/rootston/desktop.c +++ b/rootston/desktop.c @@ -392,6 +392,14 @@ struct roots_view *desktop_view_at(struct roots_desktop *desktop, double lx, if (view_at(view, lx, ly, surface, sx, sy)) { return view; } + + if (view->decorated) { + struct wlr_box deco_box; + view_get_deco_box(view, &deco_box); + if (wlr_box_contains_point(&deco_box, lx, ly)) { + return view; + } + } } return NULL; } diff --git a/rootston/seat.c b/rootston/seat.c index 130c7b27..06c0caa6 100644 --- a/rootston/seat.c +++ b/rootston/seat.c @@ -580,7 +580,7 @@ static struct roots_seat_view *seat_add_view(struct roots_seat *seat, seat_view->seat = seat; seat_view->view = view; - wl_list_insert(&seat->views, &seat_view->link); + wl_list_insert(seat->views.prev, &seat_view->link); seat_view->view_destroy.notify = seat_view_handle_destroy; wl_signal_add(&view->events.destroy, &seat_view->view_destroy); @@ -588,6 +588,31 @@ static struct roots_seat_view *seat_add_view(struct roots_seat *seat, return seat_view; } +struct roots_seat_view *roots_seat_view_from_view( + struct roots_seat *seat, struct roots_view *view) { + if (view == NULL) { + return NULL; + } + + bool found = false; + struct roots_seat_view *seat_view = NULL; + wl_list_for_each(seat_view, &seat->views, link) { + if (seat_view->view == view) { + found = true; + break; + } + } + if (!found) { + seat_view = seat_add_view(seat, view); + if (seat_view == NULL) { + wlr_log(L_ERROR, "Allocation failed"); + return NULL; + } + } + + return seat_view; +} + void roots_seat_set_focus(struct roots_seat *seat, struct roots_view *view) { // Make sure the view will be rendered on top of others, even if it's // already focused in this seat @@ -605,22 +630,11 @@ void roots_seat_set_focus(struct roots_seat *seat, struct roots_view *view) { view->xwayland_surface->override_redirect) { return; } - struct roots_seat_view *seat_view = NULL; if (view != NULL) { - bool found = false; - wl_list_for_each(seat_view, &seat->views, link) { - if (seat_view->view == view) { - found = true; - break; - } - } - if (!found) { - seat_view = seat_add_view(seat, view); - if (seat_view == NULL) { - wlr_log(L_ERROR, "Allocation failed"); - return; - } + seat_view = roots_seat_view_from_view(seat, view); + if (seat_view == NULL) { + return; } } -- cgit v1.2.3 From d13114520acef63f9293ff313b8a549bc81be30c Mon Sep 17 00:00:00 2001 From: Tony Crisci Date: Sun, 21 Jan 2018 15:53:29 -0500 Subject: move matrix model code to matrix.h --- include/wlr/render/matrix.h | 3 +++ include/wlr/types/wlr_output.h | 7 ------- render/matrix.c | 46 ++++++++++++++++++++++++++++++++++++++++++ rootston/output.c | 25 +++++++++++++++++------ types/wlr_output.c | 43 --------------------------------------- 5 files changed, 68 insertions(+), 56 deletions(-) (limited to 'rootston') diff --git a/include/wlr/render/matrix.h b/include/wlr/render/matrix.h index 0b35aad3..dbd06c8d 100644 --- a/include/wlr/render/matrix.h +++ b/include/wlr/render/matrix.h @@ -2,6 +2,7 @@ #define WLR_RENDER_MATRIX_H #include +#include void wlr_matrix_identity(float (*output)[16]); void wlr_matrix_translate(float (*output)[16], float x, float y, float z); @@ -14,5 +15,7 @@ void wlr_matrix_transform(float mat[static 16], enum wl_output_transform transform); void wlr_matrix_texture(float mat[static 16], int32_t width, int32_t height, enum wl_output_transform transform); +void wlr_matrix_box_model(float (*mat)[16], struct wlr_box *box, + enum wl_output_transform transform, float rotation); #endif diff --git a/include/wlr/types/wlr_output.h b/include/wlr/types/wlr_output.h index 4c59d98b..71463cb5 100644 --- a/include/wlr/types/wlr_output.h +++ b/include/wlr/types/wlr_output.h @@ -136,11 +136,4 @@ enum wl_output_transform wlr_output_transform_invert( enum wl_output_transform wlr_output_transform_compose( enum wl_output_transform tr_a, enum wl_output_transform tr_b); -/** - * Get a matrix suitable for rendering a box on the output. - */ -void wlr_output_get_box_matrix(struct wlr_output *output, int ox, int oy, - int width, int height, enum wl_output_transform transform, - float rotation, float (*mat)[16]); - #endif diff --git a/render/matrix.c b/render/matrix.c index 54dba4cc..a64a8f9b 100644 --- a/render/matrix.c +++ b/render/matrix.c @@ -1,6 +1,8 @@ #include #include #include +#include +#include #include /* Obtains the index for the given row/column */ @@ -158,3 +160,47 @@ void wlr_matrix_texture(float mat[static 16], int32_t width, int32_t height, mat[10] = 1.0f; mat[15] = 1.0f; } + +void wlr_matrix_box_model(float (*mat)[16], struct wlr_box *box, + enum wl_output_transform transform, float rotation) { + int x = box->x; + int y = box->y; + int width = box->width; + int height = box->height; + + float translate_center[16]; + wlr_matrix_translate(&translate_center, + (int)x + width / 2, (int)y + height / 2, 0); + + float rotate[16]; + wlr_matrix_rotate(&rotate, rotation); + + float translate_origin[16]; + wlr_matrix_translate(&translate_origin, -width / 2, + -height / 2, 0); + + float scale[16]; + wlr_matrix_scale(&scale, width, height, 1); + + wlr_matrix_mul(&translate_center, &rotate, mat); + wlr_matrix_mul(mat, &translate_origin, mat); + wlr_matrix_mul(mat, &scale, mat); + + if (transform != WL_OUTPUT_TRANSFORM_NORMAL) { + float surface_translate_center[16]; + wlr_matrix_translate(&surface_translate_center, 0.5, 0.5, 0); + + float surface_transform[16]; + wlr_matrix_transform(surface_transform, + wlr_output_transform_invert(transform)); + + float surface_translate_origin[16]; + wlr_matrix_translate(&surface_translate_origin, -0.5, -0.5, 0); + + wlr_matrix_mul(mat, &surface_translate_center, + mat); + wlr_matrix_mul(mat, &surface_transform, mat); + wlr_matrix_mul(mat, &surface_translate_origin, + mat); + } +} diff --git a/rootston/output.c b/rootston/output.c index 502e72d2..3680beac 100644 --- a/rootston/output.c +++ b/rootston/output.c @@ -52,9 +52,16 @@ static void render_surface(struct wlr_surface *surface, .width = render_width, .height = render_height, }; if (wlr_output_layout_intersects(desktop->layout, wlr_output, &render_box)) { + struct wlr_box model_box = { + .x = ox, + .y = oy, + .width = render_width, + .height = render_height, + }; float matrix[16]; - wlr_output_get_box_matrix(wlr_output, ox, oy, render_width, - render_height, surface->current->transform, rotation, &matrix); + wlr_matrix_box_model(&matrix, &model_box, surface->current->transform, + rotation); + wlr_matrix_mul(&wlr_output->transform_matrix, &matrix, &matrix); wlr_render_with_matrix(desktop->server->renderer, surface->texture, &matrix); @@ -157,11 +164,17 @@ static void render_decorations(struct roots_view *view, ox *= output->scale; oy *= output->scale; - float matrix[16]; - wlr_output_get_box_matrix(output, ox, oy, deco_box.width, - deco_box.height, WL_OUTPUT_TRANSFORM_NORMAL, view->rotation, - &matrix); + struct wlr_box model_box = { + .x = ox, + .y = oy, + .width = deco_box.width, + .height = deco_box.height, + }; + float matrix[16]; + wlr_matrix_box_model(&matrix, &model_box, WL_OUTPUT_TRANSFORM_NORMAL, + view->rotation); + wlr_matrix_mul(&output->transform_matrix, &matrix, &matrix); float color[4] = { 0.2, 0.2, 0.2, 1 }; wlr_render_colored_quad(desktop->server->renderer, &color, &matrix); } diff --git a/types/wlr_output.c b/types/wlr_output.c index 178306a8..b47fb3a0 100644 --- a/types/wlr_output.c +++ b/types/wlr_output.c @@ -751,46 +751,3 @@ enum wl_output_transform wlr_output_transform_compose( } return flipped | rotated; } - -void wlr_output_get_box_matrix(struct wlr_output *output, int ox, int oy, - int width, int height, enum wl_output_transform transform, - float rotation, float (*mat)[16]) { - float translate_center[16]; - wlr_matrix_translate(&translate_center, - (int)ox + width / 2, (int)oy + height / 2, 0); - - float rotate[16]; - wlr_matrix_rotate(&rotate, rotation); - - float translate_origin[16]; - wlr_matrix_translate(&translate_origin, -width / 2, - -height / 2, 0); - - float scale[16]; - wlr_matrix_scale(&scale, width, height, 1); - - float transform_matrix[16]; - wlr_matrix_mul(&translate_center, &rotate, &transform_matrix); - wlr_matrix_mul(&transform_matrix, &translate_origin, &transform_matrix); - wlr_matrix_mul(&transform_matrix, &scale, &transform_matrix); - - if (transform != WL_OUTPUT_TRANSFORM_NORMAL) { - float surface_translate_center[16]; - wlr_matrix_translate(&surface_translate_center, 0.5, 0.5, 0); - - float surface_transform[16]; - wlr_matrix_transform(surface_transform, - wlr_output_transform_invert(transform)); - - float surface_translate_origin[16]; - wlr_matrix_translate(&surface_translate_origin, -0.5, -0.5, 0); - - wlr_matrix_mul(&transform_matrix, &surface_translate_center, - &transform_matrix); - wlr_matrix_mul(&transform_matrix, &surface_transform, &transform_matrix); - wlr_matrix_mul(&transform_matrix, &surface_translate_origin, - &transform_matrix); - } - - wlr_matrix_mul(&output->transform_matrix, &transform_matrix, mat); -} -- cgit v1.2.3 From 41832714758c003c557da30193c6b02a2afe54b2 Mon Sep 17 00:00:00 2001 From: Tony Crisci Date: Sun, 21 Jan 2018 18:24:53 -0500 Subject: make it work with rotation --- include/rootston/seat.h | 4 ++-- include/rootston/view.h | 14 ++++++++++++- rootston/cursor.c | 39 +++++++++++++++++-------------------- rootston/desktop.c | 52 +++++++++++++++++++++++++++++++++++++++++-------- rootston/output.c | 10 ++++++++-- 5 files changed, 85 insertions(+), 34 deletions(-) (limited to 'rootston') diff --git a/include/rootston/seat.h b/include/rootston/seat.h index 6ae7c3fa..966d98e5 100644 --- a/include/rootston/seat.h +++ b/include/rootston/seat.h @@ -30,8 +30,8 @@ struct roots_seat_view { struct roots_view *view; bool has_button_grab; - double grab_vx; - double grab_vy; + double grab_sx; + double grab_sy; struct wl_list link; // roots_seat::views diff --git a/include/rootston/view.h b/include/rootston/view.h index 68ccbef8..77b78852 100644 --- a/include/rootston/view.h +++ b/include/rootston/view.h @@ -120,7 +120,6 @@ struct roots_view { }; void view_get_box(const struct roots_view *view, struct wlr_box *box); -void view_get_deco_box(const struct roots_view *view, struct wlr_box *box); void view_activate(struct roots_view *view, bool active); void view_move(struct roots_view *view, double x, double y); void view_resize(struct roots_view *view, uint32_t width, uint32_t height); @@ -134,4 +133,17 @@ bool view_center(struct roots_view *view); void view_setup(struct roots_view *view); void view_teardown(struct roots_view *view); +void view_get_deco_box(const struct roots_view *view, struct wlr_box *box); + +enum wlr_deco_part { + WLR_DECO_PART_NONE = 0, + WLR_DECO_PART_TOP_BORDER = (1 << 0), + WLR_DECO_PART_BOTTOM_BORDER = (1 << 1), + WLR_DECO_PART_LEFT_BORDER = (1 << 2), + WLR_DECO_PART_RIGHT_BORDER = (1 << 3), + WLR_DECO_PART_TITLEBAR = (1 << 4), +}; + +enum wlr_deco_part view_get_deco_part(struct roots_view *view, double sx, double sy); + #endif diff --git a/rootston/cursor.c b/rootston/cursor.c index 8a34cd13..87f568a8 100644 --- a/rootston/cursor.c +++ b/rootston/cursor.c @@ -30,25 +30,27 @@ void roots_cursor_destroy(struct roots_cursor *cursor) { // TODO } -static void seat_view_deco_motion(struct roots_seat_view *view, double deco_vx, double deco_vy) { +static void seat_view_deco_motion(struct roots_seat_view *view, double deco_sx, double deco_sy) { struct roots_cursor *cursor = view->seat->cursor; - double vx = deco_vx; - double vy = deco_vy; + double sx = deco_sx; + double sy = deco_sy; if (view->has_button_grab) { - vx = view->grab_vx; - vy = view->grab_vy; + sx = view->grab_sx; + sy = view->grab_sy; } - bool is_titlebar = vy < 0 && -vy < view->view->titlebar_height; + enum wlr_deco_part parts = view_get_deco_part(view->view, sx, sy); + + bool is_titlebar = (parts & WLR_DECO_PART_TITLEBAR); uint32_t edges = 0; - if (vx < 0) { + if (parts & WLR_DECO_PART_LEFT_BORDER) { edges |= WLR_EDGE_LEFT; - } else if (vx > view->view->wlr_surface->current->width) { + } else if (parts & WLR_DECO_PART_RIGHT_BORDER) { edges |= WLR_EDGE_RIGHT; - } else if (vy > view->view->wlr_surface->current->height) { + } else if (parts & WLR_DECO_PART_BOTTOM_BORDER) { edges |= WLR_EDGE_BOTTOM; - } else if (-vy > view->view->titlebar_height) { + } else if (parts & WLR_DECO_PART_TOP_BORDER) { edges |= WLR_EDGE_TOP; } @@ -75,12 +77,12 @@ static void seat_view_deco_leave(struct roots_seat_view *view) { view->has_button_grab = false; } -static void seat_view_deco_button(struct roots_seat_view *view, double vx, - double vy, uint32_t button, uint32_t state) { +static void seat_view_deco_button(struct roots_seat_view *view, double sx, + double sy, uint32_t button, uint32_t state) { if (button == BTN_LEFT && state == WLR_BUTTON_PRESSED) { view->has_button_grab = true; - view->grab_vx = vx; - view->grab_vy = vy; + view->grab_sx = sx; + view->grab_sy = sy; } else { view->has_button_grab = false; } @@ -117,9 +119,7 @@ static void roots_cursor_update_position(struct roots_cursor *cursor, if (view && !surface) { if (seat_view) { cursor->pointer_view = seat_view; - seat_view_deco_motion(seat_view, - cursor->cursor->x - seat_view->view->x, - cursor->cursor->y - seat_view->view->y); + seat_view_deco_motion(seat_view, sx, sy); } } if (view && surface) { // motion over a view surface @@ -239,10 +239,7 @@ static void roots_cursor_press_button(struct roots_cursor *cursor, if (view && !surface) { if (cursor->pointer_view) { - seat_view_deco_button(cursor->pointer_view, - cursor->cursor->x - cursor->pointer_view->view->x, - cursor->cursor->y - cursor->pointer_view->view->y, - button, state); + seat_view_deco_button(cursor->pointer_view, sx, sy, button, state); } } diff --git a/rootston/desktop.c b/rootston/desktop.c index 1ec1d552..2632eebd 100644 --- a/rootston/desktop.c +++ b/rootston/desktop.c @@ -19,6 +19,7 @@ #include "rootston/server.h" #include "rootston/seat.h" #include "rootston/xcursor.h" +#include "rootston/view.h" void view_get_box(const struct roots_view *view, struct wlr_box *box) { box->x = view->x; @@ -43,6 +44,43 @@ void view_get_deco_box(const struct roots_view *view, struct wlr_box *box) { box->height += (view->border_width * 2 + view->titlebar_height); } +enum wlr_deco_part view_get_deco_part(struct roots_view *view, double sx, double sy) { + if (!view->decorated) { + return WLR_DECO_PART_NONE; + } + + int sw = view->wlr_surface->current->width; + int sh = view->wlr_surface->current->height; + int bw = view->border_width; + int titlebar_h = view->titlebar_height; + + if (sx > 0 && sx < sw && sy < 0 && sy > -view->titlebar_height) { + return WLR_DECO_PART_TITLEBAR; + } + + enum wlr_deco_part parts = 0; + if (sy >= -(titlebar_h + bw) && + sy <= sh + bw) { + if (sx < 0 && sx > -bw) { + parts |= WLR_DECO_PART_LEFT_BORDER; + } else if (sx > sw && sx < sw + bw) { + parts |= WLR_DECO_PART_RIGHT_BORDER; + } + } + + if (sx >= -bw && sx <= sw + bw) { + if (sy > sh && sy <= sh + bw) { + parts |= WLR_DECO_PART_BOTTOM_BORDER; + } else if (sy >= -(titlebar_h + bw) && sy < 0) { + parts |= WLR_DECO_PART_TOP_BORDER; + } + } + + // TODO corners + + return parts; +} + static void view_update_output(const struct roots_view *view, const struct wlr_box *before) { struct roots_desktop *desktop = view->desktop; @@ -359,6 +397,12 @@ static bool view_at(struct roots_view *view, double lx, double ly, return true; } + if (view_get_deco_part(view, view_sx, view_sy)) { + *sx = view_sx; + *sy = view_sy; + return view; + } + if (wlr_box_contains_point(&box, view_sx, view_sy) && pixman_region32_contains_point(&view->wlr_surface->current->input, view_sx, view_sy, NULL)) { @@ -392,14 +436,6 @@ struct roots_view *desktop_view_at(struct roots_desktop *desktop, double lx, if (view_at(view, lx, ly, surface, sx, sy)) { return view; } - - if (view->decorated) { - struct wlr_box deco_box; - view_get_deco_box(view, &deco_box); - if (wlr_box_contains_point(&deco_box, lx, ly)) { - return view; - } - } } return NULL; } diff --git a/rootston/output.c b/rootston/output.c index 3680beac..0e568a14 100644 --- a/rootston/output.c +++ b/rootston/output.c @@ -158,8 +158,14 @@ static void render_decorations(struct roots_view *view, } struct wlr_box deco_box; view_get_deco_box(view, &deco_box); - double ox = deco_box.x; - double oy = deco_box.y; + double sx = deco_box.x - view->x; + double sy = deco_box.y - view->y; + rotate_child_position(&sx, &sy, deco_box.width, deco_box.height, + view->wlr_surface->current->width, + view->wlr_surface->current->height, view->rotation); + double ox = sx + view->x; + double oy = sy + view->y; + wlr_output_layout_output_coords(desktop->layout, output, &ox, &oy); ox *= output->scale; oy *= output->scale; -- cgit v1.2.3 From 54776dd19c20b0d0775a9426e811f81004a9a960 Mon Sep 17 00:00:00 2001 From: Tony Crisci Date: Sun, 21 Jan 2018 18:32:06 -0500 Subject: fix cursor issue --- rootston/cursor.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'rootston') diff --git a/rootston/cursor.c b/rootston/cursor.c index 87f568a8..8f6091ee 100644 --- a/rootston/cursor.c +++ b/rootston/cursor.c @@ -74,6 +74,9 @@ static void seat_view_deco_motion(struct roots_seat_view *view, double deco_sx, } static void seat_view_deco_leave(struct roots_seat_view *view) { + struct roots_cursor *cursor = view->seat->cursor; + wlr_xcursor_manager_set_cursor_image(cursor->xcursor_manager, + cursor->default_xcursor, cursor->cursor); view->has_button_grab = false; } @@ -86,6 +89,13 @@ static void seat_view_deco_button(struct roots_seat_view *view, double sx, } else { view->has_button_grab = false; } + + enum wlr_deco_part parts = view_get_deco_part(view->view, sx, sy); + if (state == WLR_BUTTON_RELEASED && (parts & WLR_DECO_PART_TITLEBAR)) { + struct roots_cursor *cursor = view->seat->cursor; + wlr_xcursor_manager_set_cursor_image(cursor->xcursor_manager, + cursor->default_xcursor, cursor->cursor); + } } static void roots_cursor_update_position(struct roots_cursor *cursor, @@ -246,8 +256,6 @@ static void roots_cursor_press_button(struct roots_cursor *cursor, if (state == WLR_BUTTON_RELEASED && cursor->mode != ROOTS_CURSOR_PASSTHROUGH) { cursor->mode = ROOTS_CURSOR_PASSTHROUGH; - wlr_xcursor_manager_set_cursor_image(cursor->xcursor_manager, - cursor->default_xcursor, cursor->cursor); if (seat->seat->pointer_state.button_count == 0) { return; } -- cgit v1.2.3 From e8c407d00e9acaff27973af8df4eaf19b6571d88 Mon Sep 17 00:00:00 2001 From: Tony Crisci Date: Sun, 21 Jan 2018 18:46:19 -0500 Subject: rename wlr_deco_part to roots_deco_part --- include/rootston/view.h | 16 ++++++++-------- rootston/cursor.c | 16 ++++++++-------- rootston/desktop.c | 16 ++++++++-------- 3 files changed, 24 insertions(+), 24 deletions(-) (limited to 'rootston') diff --git a/include/rootston/view.h b/include/rootston/view.h index 77b78852..108a8267 100644 --- a/include/rootston/view.h +++ b/include/rootston/view.h @@ -135,15 +135,15 @@ void view_teardown(struct roots_view *view); void view_get_deco_box(const struct roots_view *view, struct wlr_box *box); -enum wlr_deco_part { - WLR_DECO_PART_NONE = 0, - WLR_DECO_PART_TOP_BORDER = (1 << 0), - WLR_DECO_PART_BOTTOM_BORDER = (1 << 1), - WLR_DECO_PART_LEFT_BORDER = (1 << 2), - WLR_DECO_PART_RIGHT_BORDER = (1 << 3), - WLR_DECO_PART_TITLEBAR = (1 << 4), +enum roots_deco_part { + ROOTS_DECO_PART_NONE = 0, + ROOTS_DECO_PART_TOP_BORDER = (1 << 0), + ROOTS_DECO_PART_BOTTOM_BORDER = (1 << 1), + ROOTS_DECO_PART_LEFT_BORDER = (1 << 2), + ROOTS_DECO_PART_RIGHT_BORDER = (1 << 3), + ROOTS_DECO_PART_TITLEBAR = (1 << 4), }; -enum wlr_deco_part view_get_deco_part(struct roots_view *view, double sx, double sy); +enum roots_deco_part view_get_deco_part(struct roots_view *view, double sx, double sy); #endif diff --git a/rootston/cursor.c b/rootston/cursor.c index 8f6091ee..5430afe5 100644 --- a/rootston/cursor.c +++ b/rootston/cursor.c @@ -40,17 +40,17 @@ static void seat_view_deco_motion(struct roots_seat_view *view, double deco_sx, sy = view->grab_sy; } - enum wlr_deco_part parts = view_get_deco_part(view->view, sx, sy); + enum roots_deco_part parts = view_get_deco_part(view->view, sx, sy); - bool is_titlebar = (parts & WLR_DECO_PART_TITLEBAR); + bool is_titlebar = (parts & ROOTS_DECO_PART_TITLEBAR); uint32_t edges = 0; - if (parts & WLR_DECO_PART_LEFT_BORDER) { + if (parts & ROOTS_DECO_PART_LEFT_BORDER) { edges |= WLR_EDGE_LEFT; - } else if (parts & WLR_DECO_PART_RIGHT_BORDER) { + } else if (parts & ROOTS_DECO_PART_RIGHT_BORDER) { edges |= WLR_EDGE_RIGHT; - } else if (parts & WLR_DECO_PART_BOTTOM_BORDER) { + } else if (parts & ROOTS_DECO_PART_BOTTOM_BORDER) { edges |= WLR_EDGE_BOTTOM; - } else if (parts & WLR_DECO_PART_TOP_BORDER) { + } else if (parts & ROOTS_DECO_PART_TOP_BORDER) { edges |= WLR_EDGE_TOP; } @@ -90,8 +90,8 @@ static void seat_view_deco_button(struct roots_seat_view *view, double sx, view->has_button_grab = false; } - enum wlr_deco_part parts = view_get_deco_part(view->view, sx, sy); - if (state == WLR_BUTTON_RELEASED && (parts & WLR_DECO_PART_TITLEBAR)) { + enum roots_deco_part parts = view_get_deco_part(view->view, sx, sy); + if (state == WLR_BUTTON_RELEASED && (parts & ROOTS_DECO_PART_TITLEBAR)) { struct roots_cursor *cursor = view->seat->cursor; wlr_xcursor_manager_set_cursor_image(cursor->xcursor_manager, cursor->default_xcursor, cursor->cursor); diff --git a/rootston/desktop.c b/rootston/desktop.c index 2632eebd..5fa27db2 100644 --- a/rootston/desktop.c +++ b/rootston/desktop.c @@ -44,9 +44,9 @@ void view_get_deco_box(const struct roots_view *view, struct wlr_box *box) { box->height += (view->border_width * 2 + view->titlebar_height); } -enum wlr_deco_part view_get_deco_part(struct roots_view *view, double sx, double sy) { +enum roots_deco_part view_get_deco_part(struct roots_view *view, double sx, double sy) { if (!view->decorated) { - return WLR_DECO_PART_NONE; + return ROOTS_DECO_PART_NONE; } int sw = view->wlr_surface->current->width; @@ -55,24 +55,24 @@ enum wlr_deco_part view_get_deco_part(struct roots_view *view, double sx, double int titlebar_h = view->titlebar_height; if (sx > 0 && sx < sw && sy < 0 && sy > -view->titlebar_height) { - return WLR_DECO_PART_TITLEBAR; + return ROOTS_DECO_PART_TITLEBAR; } - enum wlr_deco_part parts = 0; + enum roots_deco_part parts = 0; if (sy >= -(titlebar_h + bw) && sy <= sh + bw) { if (sx < 0 && sx > -bw) { - parts |= WLR_DECO_PART_LEFT_BORDER; + parts |= ROOTS_DECO_PART_LEFT_BORDER; } else if (sx > sw && sx < sw + bw) { - parts |= WLR_DECO_PART_RIGHT_BORDER; + parts |= ROOTS_DECO_PART_RIGHT_BORDER; } } if (sx >= -bw && sx <= sw + bw) { if (sy > sh && sy <= sh + bw) { - parts |= WLR_DECO_PART_BOTTOM_BORDER; + parts |= ROOTS_DECO_PART_BOTTOM_BORDER; } else if (sy >= -(titlebar_h + bw) && sy < 0) { - parts |= WLR_DECO_PART_TOP_BORDER; + parts |= ROOTS_DECO_PART_TOP_BORDER; } } -- cgit v1.2.3 From 85a6939cf2753fd6a7fa84c9fcd370a4fb1f4095 Mon Sep 17 00:00:00 2001 From: Tony Crisci Date: Sun, 21 Jan 2018 19:03:10 -0500 Subject: rename matrix model box to project box --- include/wlr/render/matrix.h | 5 +++-- render/matrix.c | 7 +++++-- rootston/output.c | 14 ++++++-------- 3 files changed, 14 insertions(+), 12 deletions(-) (limited to 'rootston') diff --git a/include/wlr/render/matrix.h b/include/wlr/render/matrix.h index dbd06c8d..a333bf0f 100644 --- a/include/wlr/render/matrix.h +++ b/include/wlr/render/matrix.h @@ -15,7 +15,8 @@ void wlr_matrix_transform(float mat[static 16], enum wl_output_transform transform); void wlr_matrix_texture(float mat[static 16], int32_t width, int32_t height, enum wl_output_transform transform); -void wlr_matrix_box_model(float (*mat)[16], struct wlr_box *box, - enum wl_output_transform transform, float rotation); +void wlr_matrix_project_box(float (*mat)[16], struct wlr_box *box, + enum wl_output_transform transform, float rotation, float + (*projection)[16]); #endif diff --git a/render/matrix.c b/render/matrix.c index a64a8f9b..9a1b2bb4 100644 --- a/render/matrix.c +++ b/render/matrix.c @@ -161,8 +161,9 @@ void wlr_matrix_texture(float mat[static 16], int32_t width, int32_t height, mat[15] = 1.0f; } -void wlr_matrix_box_model(float (*mat)[16], struct wlr_box *box, - enum wl_output_transform transform, float rotation) { +void wlr_matrix_project_box(float (*mat)[16], struct wlr_box *box, + enum wl_output_transform transform, float rotation, + float (*projection)[16]) { int x = box->x; int y = box->y; int width = box->width; @@ -203,4 +204,6 @@ void wlr_matrix_box_model(float (*mat)[16], struct wlr_box *box, wlr_matrix_mul(mat, &surface_translate_origin, mat); } + + wlr_matrix_mul(projection, mat, mat); } diff --git a/rootston/output.c b/rootston/output.c index 0e568a14..689956ad 100644 --- a/rootston/output.c +++ b/rootston/output.c @@ -52,16 +52,15 @@ static void render_surface(struct wlr_surface *surface, .width = render_width, .height = render_height, }; if (wlr_output_layout_intersects(desktop->layout, wlr_output, &render_box)) { - struct wlr_box model_box = { + struct wlr_box project_box = { .x = ox, .y = oy, .width = render_width, .height = render_height, }; float matrix[16]; - wlr_matrix_box_model(&matrix, &model_box, surface->current->transform, - rotation); - wlr_matrix_mul(&wlr_output->transform_matrix, &matrix, &matrix); + wlr_matrix_project_box(&matrix, &project_box, surface->current->transform, + rotation, &wlr_output->transform_matrix); wlr_render_with_matrix(desktop->server->renderer, surface->texture, &matrix); @@ -170,7 +169,7 @@ static void render_decorations(struct roots_view *view, ox *= output->scale; oy *= output->scale; - struct wlr_box model_box = { + struct wlr_box project_box = { .x = ox, .y = oy, .width = deco_box.width, @@ -178,9 +177,8 @@ static void render_decorations(struct roots_view *view, }; float matrix[16]; - wlr_matrix_box_model(&matrix, &model_box, WL_OUTPUT_TRANSFORM_NORMAL, - view->rotation); - wlr_matrix_mul(&output->transform_matrix, &matrix, &matrix); + wlr_matrix_project_box(&matrix, &project_box, WL_OUTPUT_TRANSFORM_NORMAL, + view->rotation, &output->transform_matrix); float color[4] = { 0.2, 0.2, 0.2, 1 }; wlr_render_colored_quad(desktop->server->renderer, &color, &matrix); } -- cgit v1.2.3 From fc627afd1842a8288cec620daa729c170be2af17 Mon Sep 17 00:00:00 2001 From: Tony Crisci Date: Tue, 23 Jan 2018 07:11:54 -0500 Subject: fix decorations on wayland backend --- rootston/cursor.c | 4 ++-- rootston/desktop.c | 3 ++- rootston/seat.c | 4 ++++ 3 files changed, 8 insertions(+), 3 deletions(-) (limited to 'rootston') diff --git a/rootston/cursor.c b/rootston/cursor.c index 5430afe5..d8753f44 100644 --- a/rootston/cursor.c +++ b/rootston/cursor.c @@ -115,7 +115,7 @@ static void roots_cursor_update_position(struct roots_cursor *cursor, seat_view_deco_leave(cursor->pointer_view); cursor->pointer_view = NULL; } - bool set_compositor_cursor = !view && cursor->cursor_client; + bool set_compositor_cursor = !view && !surface && cursor->cursor_client; if (view && surface) { struct wl_client *view_client = wl_resource_get_client(view->wlr_surface->resource); @@ -211,7 +211,7 @@ static void roots_cursor_press_button(struct roots_cursor *cursor, struct roots_desktop *desktop = seat->input->server->desktop; bool is_touch = device->type == WLR_INPUT_DEVICE_TOUCH; - struct wlr_surface *surface; + struct wlr_surface *surface = NULL; double sx, sy; struct roots_view *view = desktop_view_at(desktop, lx, ly, &surface, &sx, &sy); diff --git a/rootston/desktop.c b/rootston/desktop.c index 5fa27db2..70dafec4 100644 --- a/rootston/desktop.c +++ b/rootston/desktop.c @@ -400,7 +400,8 @@ static bool view_at(struct roots_view *view, double lx, double ly, if (view_get_deco_part(view, view_sx, view_sy)) { *sx = view_sx; *sy = view_sy; - return view; + *surface = NULL; + return true; } if (wlr_box_contains_point(&box, view_sx, view_sy) && diff --git a/rootston/seat.c b/rootston/seat.c index 41ae6c9f..e6e505b5 100644 --- a/rootston/seat.c +++ b/rootston/seat.c @@ -573,6 +573,10 @@ static void seat_view_destroy(struct roots_seat_view *seat_view) { seat->cursor->mode = ROOTS_CURSOR_PASSTHROUGH; } + if (seat_view == seat->cursor->pointer_view) { + seat->cursor->pointer_view = NULL; + } + wl_list_remove(&seat_view->view_destroy.link); wl_list_remove(&seat_view->link); free(seat_view); -- cgit v1.2.3 From a4d601e3d6d6600bc4c26697d282616537ef9b02 Mon Sep 17 00:00:00 2001 From: Tony Crisci Date: Tue, 23 Jan 2018 08:16:43 -0500 Subject: decorations: respect motif hints --- rootston/xwayland.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'rootston') diff --git a/rootston/xwayland.c b/rootston/xwayland.c index eb84eba0..69c44add 100644 --- a/rootston/xwayland.c +++ b/rootston/xwayland.c @@ -312,9 +312,11 @@ void handle_xwayland_surface(struct wl_listener *listener, void *data) { wl_list_insert(&desktop->views, &view->link); if (!surface->override_redirect) { - view->decorated = true; - view->border_width = 4; - view->titlebar_height = 12; + if (surface->decorations == WLR_XWAYLAND_SURFACE_DECORATIONS_ALL) { + view->decorated = true; + view->border_width = 4; + view->titlebar_height = 12; + } view_setup(view); } -- cgit v1.2.3