mirror of
https://github.com/labwc/labwc.git
synced 2025-11-05 13:29:58 -05:00
Fix a couple of glitches seen when exiting interactive move/resize:
- Cursor briefly set to left_ptr rather than the correct cursor image
- Cursor not updated if the view being moved/resized is destroyed
Also make sure to exit interactive mode if the view is going fullscreen
(labwc gets very confused otherwise).
Code changes in detail:
- Factor out set_server_cursor() which will set the correct cursor
image for non-client areas (either XCURSOR_DEFAULT or one of the
resize cursors).
- Unify the logic from cursor_rebase() and process_cursor_motion by
factoring out cursor_update_common(). This corrects some logic
discrepancies between the two, which should be a good thing(TM).
- Remove the extra cursor_set(XCURSOR_DEFAULT) from interactive_end()
and instead rely on cursor_update_focus() to do the right thing.
- Simplify cursor_button() by just calling interactive_end() when we
want to exit interactive mode.
- Call cursor_update_focus() from view_destroy() if the view had mouse
focus or was being interactively moved/resized.
v2: Eliminate force_reenter parameters and figure out automatically
when we need to re-enter the surface.
v3: Rename wlseat -> wlr_seat.
v4: Simplify client/server cursor logic.
140 lines
4.2 KiB
C
140 lines
4.2 KiB
C
// SPDX-License-Identifier: GPL-2.0-only
|
|
#include "labwc.h"
|
|
|
|
static int
|
|
max_move_scale(double pos_cursor, double pos_current,
|
|
double size_current, double size_orig)
|
|
{
|
|
double anchor_frac = (pos_cursor - pos_current) / size_current;
|
|
int pos_new = pos_cursor - (size_orig * anchor_frac);
|
|
if (pos_new < pos_current) {
|
|
/* Clamp by using the old offsets of the maximized window */
|
|
pos_new = pos_current;
|
|
}
|
|
return pos_new;
|
|
}
|
|
|
|
void
|
|
interactive_begin(struct view *view, enum input_mode mode, uint32_t edges)
|
|
{
|
|
if (mode == LAB_INPUT_STATE_MOVE && view->fullscreen) {
|
|
/**
|
|
* We don't allow moving fullscreen windows.
|
|
*
|
|
* If you think there is a good reason to allow it
|
|
* feel free to open an issue explaining your use-case.
|
|
*/
|
|
return;
|
|
}
|
|
if (mode == LAB_INPUT_STATE_RESIZE
|
|
&& (view->fullscreen || view->maximized)) {
|
|
/* We don't allow resizing while in maximized or fullscreen state */
|
|
return;
|
|
}
|
|
|
|
/*
|
|
* This function sets up an interactive move or resize operation, where
|
|
* the compositor stops propagating pointer events to clients and
|
|
* instead consumes them itself, to move or resize windows.
|
|
*/
|
|
struct seat *seat = &view->server->seat;
|
|
struct server *server = view->server;
|
|
server->grabbed_view = view;
|
|
server->input_mode = mode;
|
|
|
|
/* Remember view and cursor positions at start of move/resize */
|
|
server->grab_x = seat->cursor->x;
|
|
server->grab_y = seat->cursor->y;
|
|
server->grab_box.x = view->x;
|
|
server->grab_box.y = view->y;
|
|
server->grab_box.width = view->w;
|
|
server->grab_box.height = view->h;
|
|
server->resize_edges = edges;
|
|
|
|
if (view->maximized || view->tiled) {
|
|
if (mode == LAB_INPUT_STATE_MOVE) {
|
|
/* Exit maximized or tiled mode */
|
|
int new_x = max_move_scale(view->server->seat.cursor->x,
|
|
view->x, view->w, view->natural_geometry.width);
|
|
int new_y = max_move_scale(view->server->seat.cursor->y,
|
|
view->y, view->h, view->natural_geometry.height);
|
|
view->natural_geometry.x = new_x;
|
|
view->natural_geometry.y = new_y;
|
|
if (view->maximized) {
|
|
view_maximize(view, false);
|
|
}
|
|
if (view->tiled) {
|
|
view_move_resize(view, view->natural_geometry);
|
|
}
|
|
/**
|
|
* view_maximize() / view_move_resize() indirectly calls
|
|
* view->impl->configure which is async but we are using
|
|
* the current values in server->grab_box. We pretend the
|
|
* configure already happened by setting them manually.
|
|
*/
|
|
server->grab_box.x = new_x;
|
|
server->grab_box.y = new_y;
|
|
server->grab_box.width = view->natural_geometry.width;
|
|
server->grab_box.height = view->natural_geometry.height;
|
|
}
|
|
}
|
|
|
|
/* Moving or resizing always resets tiled state */
|
|
view->tiled = 0;
|
|
|
|
switch (mode) {
|
|
case LAB_INPUT_STATE_MOVE:
|
|
cursor_set(&server->seat, "grab");
|
|
break;
|
|
case LAB_INPUT_STATE_RESIZE:
|
|
cursor_set(&server->seat, wlr_xcursor_get_resize_name(edges));
|
|
break;
|
|
default:
|
|
break;
|
|
}
|
|
}
|
|
|
|
void
|
|
interactive_end(struct view *view)
|
|
{
|
|
if (view->server->grabbed_view == view) {
|
|
bool should_snap = view->server->input_mode == LAB_INPUT_STATE_MOVE
|
|
&& rc.snap_edge_range;
|
|
view->server->input_mode = LAB_INPUT_STATE_PASSTHROUGH;
|
|
view->server->grabbed_view = NULL;
|
|
if (should_snap) {
|
|
int snap_range = rc.snap_edge_range;
|
|
struct wlr_box *area = &view->output->usable_area;
|
|
|
|
/* Translate into output local coordinates */
|
|
double cursor_x = view->server->seat.cursor->x;
|
|
double cursor_y = view->server->seat.cursor->y;
|
|
wlr_output_layout_output_coords(view->server->output_layout,
|
|
view->output->wlr_output, &cursor_x, &cursor_y);
|
|
|
|
if (cursor_x <= area->x + snap_range) {
|
|
view_snap_to_edge(view, "left");
|
|
} else if (cursor_x >= area->x + area->width - snap_range) {
|
|
view_snap_to_edge(view, "right");
|
|
} else if (cursor_y <= area->y + snap_range) {
|
|
if (rc.snap_top_maximize) {
|
|
view_maximize(view, true);
|
|
/*
|
|
* When unmaximizing later on restore
|
|
* original position
|
|
*/
|
|
view->natural_geometry.x =
|
|
view->server->grab_box.x;
|
|
view->natural_geometry.y =
|
|
view->server->grab_box.y;
|
|
} else {
|
|
view_snap_to_edge(view, "up");
|
|
}
|
|
} else if (cursor_y >= area->y + area->height - snap_range) {
|
|
view_snap_to_edge(view, "down");
|
|
}
|
|
}
|
|
/* Update focus/cursor image */
|
|
cursor_update_focus(view->server);
|
|
}
|
|
}
|