mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-10-31 22:25:21 -04: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-02-09 14:50:26 +01:00
commit cdd55b5d19
No known key found for this signature in database
GPG key ID: 0FDE7BE0E88F5E48
8 changed files with 86 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

51
rootston/cursor.c
View file

@ -249,38 +249,33 @@ static void roots_cursor_press_button(struct roots_cursor *cursor,
roots_seat_begin_rotate(seat, view);
break;
}
return;
}
} else {
if (view && !surface) {
if (cursor->pointer_view) {
seat_view_deco_button(cursor->pointer_view, sx, sy, button, state);
if (view && !surface) {
if (cursor->pointer_view) {
seat_view_deco_button(cursor->pointer_view, sx, sy, button, state);
}
}
if (state == WLR_BUTTON_RELEASED &&
cursor->mode != ROOTS_CURSOR_PASSTHROUGH) {
cursor->mode = ROOTS_CURSOR_PASSTHROUGH;
}
switch (state) {
case WLR_BUTTON_RELEASED:
if (!is_touch) {
roots_cursor_update_position(cursor, time);
}
break;
case WLR_BUTTON_PRESSED:
roots_seat_set_focus(seat, view);
break;
}
}
if (state == WLR_BUTTON_RELEASED &&
cursor->mode != ROOTS_CURSOR_PASSTHROUGH) {
cursor->mode = ROOTS_CURSOR_PASSTHROUGH;
if (seat->seat->pointer_state.button_count == 0) {
return;
}
}
if (view && surface) {
if (!is_touch) {
wlr_seat_pointer_notify_button(seat->seat, time, button, state);
}
}
switch (state) {
case WLR_BUTTON_RELEASED:
if (!is_touch) {
roots_cursor_update_position(cursor, time);
}
break;
case WLR_BUTTON_PRESSED:
roots_seat_set_focus(seat, view);
break;
if (!is_touch) {
wlr_seat_pointer_notify_button(seat->seat, time, button, state);
}
}

1
rootston/keyboard.c
View file

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

4
rootston/rootston.ini.example
View file

@ -2,7 +2,7 @@
# Disable X11 support. Enabled by default.
xwayland=false
# Single output configuration. String after semicolon must match output's name.
# Single output configuration. String after colon must match output's name.
[output:VGA-1]
# Set logical (layout) coordinates for this screen
x = 1920
@ -24,7 +24,7 @@ geometry = 2500x800
# Load a custom XCursor theme
theme = default
# Single device configuration. String after semicolon must match device's name.
# Single device configuration. String after colon must match device's name.
[device:PixArt Dell MS116 USB Optical Mouse]
# Restrict cursor movements for this mouse to single output
map-to-output = VGA-1

25
rootston/seat.c
View file

@ -861,3 +861,28 @@ void roots_seat_begin_rotate(struct roots_seat *seat, struct roots_view *view) {
wlr_xcursor_manager_set_cursor_image(seat->cursor->xcursor_manager,
ROOTS_XCURSOR_ROTATE, seat->cursor->cursor);
}
void roots_seat_end_compositor_grab(struct roots_seat *seat) {
struct roots_cursor *cursor = seat->cursor;
struct roots_view *view = roots_seat_get_focus(seat);
if (view == NULL) {
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;
}

2
rootston/xdg_shell_v6.c
View file

@ -147,7 +147,7 @@ static void move_resize(struct roots_view *view, double x, double y,
constrained_height);
if (serial > 0) {
roots_surface->pending_move_resize_configure_serial = serial;
} else {
} else if (roots_surface->pending_move_resize_configure_serial == 0) {
view_update_position(view, x, y);
}
}