blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge roots_seat_cancel_* into one function

This commit is contained in:
Vincent Vanlaer 2018-02-06 22:55:56 +01:00
parent 147e5c0f8f
commit 90eb50d9aa
3 changed files with 18 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/rootston/seat.h
View File

@ -84,16 +84,12 @@ void roots_seat_cycle_focus(struct roots_seat *seat);
void roots_seat_begin_move(struct roots_seat *seat, struct roots_view *view); void roots_seat_begin_move(struct roots_seat *seat, struct roots_view *view);
void roots_seat_cancel_move(struct roots_seat *seat);
void roots_seat_begin_resize(struct roots_seat *seat, struct roots_view *view, void roots_seat_begin_resize(struct roots_seat *seat, struct roots_view *view,
uint32_t edges); uint32_t edges);
void roots_seat_cancel_resize(struct roots_seat *seat);
void roots_seat_begin_rotate(struct roots_seat *seat, struct roots_view *view); void roots_seat_begin_rotate(struct roots_seat *seat, struct roots_view *view);
void roots_seat_cancel_rotate(struct roots_seat *seat); void roots_seat_cancel_transform(struct roots_seat *seat);
struct roots_seat_view *roots_seat_view_from_view( struct roots_seat *seat, struct roots_seat_view *roots_seat_view_from_view( struct roots_seat *seat,
struct roots_view *view); struct roots_view *view);

4
rootston/keyboard.c
View File

@ -159,9 +159,7 @@ static bool keyboard_execute_compositor_binding(struct roots_keyboard *keyboard,
if (keysym == XKB_KEY_Escape) { if (keysym == XKB_KEY_Escape) {
wlr_seat_pointer_end_grab(keyboard->seat->seat); wlr_seat_pointer_end_grab(keyboard->seat->seat);
wlr_seat_keyboard_end_grab(keyboard->seat->seat); wlr_seat_keyboard_end_grab(keyboard->seat->seat);
roots_seat_cancel_move(keyboard->seat); roots_seat_cancel_transform(keyboard->seat);
roots_seat_cancel_resize(keyboard->seat);
roots_seat_cancel_rotate(keyboard->seat);
} }
return false; return false;

43
rootston/seat.c
View File

@ -738,18 +738,6 @@ void roots_seat_begin_move(struct roots_seat *seat, struct roots_view *view) {
ROOTS_XCURSOR_MOVE, seat->cursor->cursor); ROOTS_XCURSOR_MOVE, seat->cursor->cursor);
} }
void roots_seat_cancel_move(struct roots_seat *seat) {
struct roots_cursor *cursor = seat->cursor;
struct roots_view *view = roots_seat_get_focus(seat);
if (cursor->mode != ROOTS_CURSOR_MOVE || view == NULL) {
return;
}
cursor->mode = ROOTS_CURSOR_PASSTHROUGH;
view_move(view, cursor->view_x, cursor->view_y);
}
void roots_seat_begin_resize(struct roots_seat *seat, struct roots_view *view, void roots_seat_begin_resize(struct roots_seat *seat, struct roots_view *view,
uint32_t edges) { uint32_t edges) {
struct roots_cursor *cursor = seat->cursor; struct roots_cursor *cursor = seat->cursor;
@ -778,18 +766,6 @@ void roots_seat_begin_resize(struct roots_seat *seat, struct roots_view *view,
resize_name, seat->cursor->cursor); resize_name, seat->cursor->cursor);
} }
void roots_seat_cancel_resize(struct roots_seat *seat) {
struct roots_cursor *cursor = seat->cursor;
struct roots_view *view = roots_seat_get_focus(seat);
if (cursor->mode != ROOTS_CURSOR_RESIZE || view == NULL) {
return;
}
cursor->mode = ROOTS_CURSOR_PASSTHROUGH;
view_move_resize(view, cursor->view_x, cursor->view_y, cursor->view_width, cursor->view_height);
}
void roots_seat_begin_rotate(struct roots_seat *seat, struct roots_view *view) { void roots_seat_begin_rotate(struct roots_seat *seat, struct roots_view *view) {
struct roots_cursor *cursor = seat->cursor; struct roots_cursor *cursor = seat->cursor;
cursor->mode = ROOTS_CURSOR_ROTATE; cursor->mode = ROOTS_CURSOR_ROTATE;
@ -803,14 +779,27 @@ void roots_seat_begin_rotate(struct roots_seat *seat, struct roots_view *view) {
ROOTS_XCURSOR_ROTATE, seat->cursor->cursor); ROOTS_XCURSOR_ROTATE, seat->cursor->cursor);
} }
void roots_seat_cancel_rotate(struct roots_seat *seat) { void roots_seat_cancel_transform(struct roots_seat *seat) {
struct roots_cursor *cursor = seat->cursor; struct roots_cursor *cursor = seat->cursor;
struct roots_view *view = roots_seat_get_focus(seat); struct roots_view *view = roots_seat_get_focus(seat);
if (cursor->mode != ROOTS_CURSOR_ROTATE || view == NULL) { if (view == NULL) {
return; return;
} }
switch(cursor->mode) {
case ROOTS_CURSOR_MOVE:
view_move(view, cursor->view_x, cursor->view_y);
break;
case ROOTS_CURSOR_RESIZE:
view_move_resize(view, cursor->view_x, cursor->view_y, cursor->view_width, cursor->view_height);
break;
case ROOTS_CURSOR_ROTATE:
view->rotation = cursor->view_rotation;
break;
case ROOTS_CURSOR_PASSTHROUGH:
break;
}
cursor->mode = ROOTS_CURSOR_PASSTHROUGH; cursor->mode = ROOTS_CURSOR_PASSTHROUGH;
view->rotation = cursor->view_rotation;
} }