Aren/toaruos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Mouse-initiated window rotation

Browse Source
This commit is contained in:
Kevin Lange 2016-09-03 00:21:45 +09:00
parent 2365244a18
commit e671d988cf
3 changed files with 35 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
userspace/gui/compositor/compositor.c
View File

@ -1693,6 +1693,21 @@ static void mouse_start_drag(yutani_globals_t * yg) {
}
}
static void mouse_start_rotate(yutani_globals_t * yg) {
set_focused_at(yg, yg->mouse_x / MOUSE_SCALE, yg->mouse_y / MOUSE_SCALE);
yg->mouse_window = get_focused(yg);
if (yg->mouse_window) {
yg->mouse_state = YUTANI_MOUSE_STATE_ROTATING;
yg->mouse_init_x = yg->mouse_x;
yg->mouse_init_y = yg->mouse_y;
int32_t x_diff = yg->mouse_x / MOUSE_SCALE - (yg->mouse_window->x + yg->mouse_window->width / 2);
int32_t y_diff = yg->mouse_y / MOUSE_SCALE - (yg->mouse_window->y + yg->mouse_window->height / 2);
int new_r = atan2(x_diff, y_diff) * 180.0 / (-M_PI);
yg->mouse_init_r = yg->mouse_window->rotation - new_r;
make_top(yg, yg->mouse_window);
}
}
static void mouse_start_resize(yutani_globals_t * yg, yutani_scale_direction_t direction) {
set_focused_at(yg, yg->mouse_x / MOUSE_SCALE, yg->mouse_y / MOUSE_SCALE);
yg->mouse_window = get_focused(yg);
@ -1778,15 +1793,11 @@ static void handle_mouse_event(yutani_globals_t * yg, struct yutani_msg_mouse_ev
{
if ((me->event.buttons & YUTANI_MOUSE_BUTTON_LEFT) && (yg->kbd_state.k_alt)) {
mouse_start_drag(yg);
#if YUTANI_RESIZE_RIGHT
} else if ((me->event.buttons & YUTANI_MOUSE_BUTTON_RIGHT) && (yg->kbd_state.k_alt)) {
yg->resizing_button = YUTANI_MOUSE_BUTTON_RIGHT;
mouse_start_resize(yg, SCALE_AUTO);
#else
mouse_start_rotate(yg);
} else if ((me->event.buttons & YUTANI_MOUSE_BUTTON_MIDDLE) && (yg->kbd_state.k_alt)) {
yg->resizing_button = YUTANI_MOUSE_BUTTON_MIDDLE;
mouse_start_resize(yg, SCALE_AUTO);
#endif
} else if ((me->event.buttons & YUTANI_MOUSE_BUTTON_LEFT) && (!yg->kbd_state.k_alt)) {
yg->mouse_state = YUTANI_MOUSE_STATE_DRAGGING;
set_focused_at(yg, yg->mouse_x / MOUSE_SCALE, yg->mouse_y / MOUSE_SCALE);
@ -1853,6 +1864,23 @@ static void handle_mouse_event(yutani_globals_t * yg, struct yutani_msg_mouse_ev
}
}
break;
case YUTANI_MOUSE_STATE_ROTATING:
{
if (!(me->event.buttons & YUTANI_MOUSE_BUTTON_RIGHT)) {
yg->mouse_window = NULL;
yg->mouse_state = YUTANI_MOUSE_STATE_NORMAL;
mark_screen(yg, yg->mouse_x / MOUSE_SCALE - MOUSE_OFFSET_X, yg->mouse_y / MOUSE_SCALE - MOUSE_OFFSET_Y, MOUSE_WIDTH, MOUSE_HEIGHT);
} else {
/* Calculate rotation and make relative to initial rotation */
int32_t x_diff = yg->mouse_x / MOUSE_SCALE - (yg->mouse_window->x + yg->mouse_window->width / 2);
int32_t y_diff = yg->mouse_y / MOUSE_SCALE - (yg->mouse_window->y + yg->mouse_window->height / 2);
int new_r = atan2(x_diff, y_diff) * 180.0 / (-M_PI);
mark_window(yg, yg->mouse_window);
yg->mouse_window->rotation = new_r + yg->mouse_init_r;
mark_window(yg, yg->mouse_window);
}
}
break;
case YUTANI_MOUSE_STATE_DRAGGING:
{
if (!(me->event.buttons & yg->mouse_drag_button)) {

1
userspace/gui/compositor/yutani_int.h
View File

@ -114,6 +114,7 @@ typedef struct {
int mouse_win_y;
int mouse_init_x;
int mouse_init_y;
int mouse_init_r;
int mouse_drag_button;
int mouse_moved;

1
userspace/lib/yutani.h
View File

@ -270,6 +270,7 @@ typedef struct yutani_window {
#define YUTANI_MOUSE_STATE_MOVING 1
#define YUTANI_MOUSE_STATE_DRAGGING 2
#define YUTANI_MOUSE_STATE_RESIZING 3
#define YUTANI_MOUSE_STATE_ROTATING 4
/*
* YUTANI_MOUSE_EVENT