diff options
| author | emersion <contact@emersion.fr> | 2017-11-17 12:45:07 +0100 |
|---|---|---|
| committer | emersion <contact@emersion.fr> | 2017-11-17 12:45:07 +0100 |
| commit | bb6d34e7a5e270c6998f95f45c1e518d9c053714 (patch) | |
| tree | 4c3a34eb809203e76c63ac90239f6d07312cc0f5 /rootston/cursor.c | |
| parent | 10f3be73843250c400531873b4dd27dba44919fd (diff) | |
rootston: add per-seat views
Diffstat (limited to 'rootston/cursor.c')
| -rw-r--r-- | rootston/cursor.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/rootston/cursor.c b/rootston/cursor.c index 5949a364..0dbc413c 100644 --- a/rootston/cursor.c +++ b/rootston/cursor.c @@ -60,7 +60,7 @@ static void roots_cursor_update_position(struct roots_cursor *cursor, uint32_t t if (seat->focus) { double dx = cursor->cursor->x - cursor->offs_x; double dy = cursor->cursor->y - cursor->offs_y; - view_move(seat->focus, cursor->view_x + dx, + view_move(seat->focus->view, cursor->view_x + dx, cursor->view_y + dy); } break; @@ -68,8 +68,8 @@ static void roots_cursor_update_position(struct roots_cursor *cursor, uint32_t t if (seat->focus) { double dx = cursor->cursor->x - cursor->offs_x; double dy = cursor->cursor->y - cursor->offs_y; - double active_x = seat->focus->x; - double active_y = seat->focus->y; + double active_x = seat->focus->view->x; + double active_y = seat->focus->view->y; int width = cursor->view_width; int height = cursor->view_height; if (cursor->resize_edges & ROOTS_CURSOR_RESIZE_EDGE_TOP) { @@ -98,18 +98,18 @@ static void roots_cursor_update_position(struct roots_cursor *cursor, uint32_t t height = 0; } - if (active_x != seat->focus->x || - active_y != seat->focus->y) { - view_move_resize(seat->focus, active_x, active_y, + if (active_x != seat->focus->view->x || + active_y != seat->focus->view->y) { + view_move_resize(seat->focus->view, active_x, active_y, width, height); } else { - view_resize(seat->focus, width, height); + view_resize(seat->focus->view, width, height); } } break; case ROOTS_CURSOR_ROTATE: if (seat->focus) { - struct roots_view *view = seat->focus; + struct roots_view *view = seat->focus->view; int ox = view->x + view->wlr_surface->current->width/2, oy = view->y + view->wlr_surface->current->height/2; int ux = cursor->offs_x - ox, |