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

Merge remote-tracking branch 'upstream/master' into output-damage

Browse source
This commit is contained in:
emersion 2018-01-24 14:48:01 +01:00
commit 6281deb90f
No known key found for this signature in database
GPG key ID: 0FDE7BE0E88F5E48
15 changed files with 328 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

57
rootston/desktop.c
View file

@ -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;
@ -31,6 +32,55 @@ 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);
}
enum roots_deco_part view_get_deco_part(struct roots_view *view, double sx, double sy) {
if (!view->decorated) {
return ROOTS_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 ROOTS_DECO_PART_TITLEBAR;
}
enum roots_deco_part parts = 0;
if (sy >= -(titlebar_h + bw) &&
sy <= sh + bw) {
if (sx < 0 && sx > -bw) {
parts |= ROOTS_DECO_PART_LEFT_BORDER;
} else if (sx > sw && sx < sw + bw) {
parts |= ROOTS_DECO_PART_RIGHT_BORDER;
}
}
if (sx >= -bw && sx <= sw + bw) {
if (sy > sh && sy <= sh + bw) {
parts |= ROOTS_DECO_PART_BOTTOM_BORDER;
} else if (sy >= -(titlebar_h + bw) && sy < 0) {
parts |= ROOTS_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;
@ -468,6 +518,13 @@ 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;
*surface = NULL;
return true;
}
if (wlr_box_contains_point(&box, view_sx, view_sy) &&
pixman_region32_contains_point(&view->wlr_surface->current->input,
view_sx, view_sy, NULL)) {