mirror of
https://codeberg.org/dwl/dwl.git
synced 2025-10-27 10:14:14 +00:00
implement pointer constraints
mostly copied from sway implementation Co-authored-by: A Frederick Christenesn <dwl@ivories.org> Co-authored-by: pm4rcin <37148802+pm4rcin@users.noreply.github.com>
This commit is contained in:
Leonardo Hernández Hernández
parent
846ce52b92
commit
a0a4d8266f
9
Makefile
9
Makefile
@ -9,14 +9,14 @@ DWLDEVCFLAGS = -pedantic -Wall -Wextra -Wdeclaration-after-statement -Wno-unused
|
||||
-Werror=strict-prototypes -Werror=implicit -Werror=return-type -Werror=incompatible-pointer-types
|
||||
|
||||
# CFLAGS / LDFLAGS
|
||||
PKGS = wlroots wayland-server xkbcommon libinput $(XLIBS)
|
||||
PKGS = wlroots wayland-server xkbcommon libinput pixman-1 $(XLIBS)
|
||||
DWLCFLAGS = `$(PKG_CONFIG) --cflags $(PKGS)` $(DWLCPPFLAGS) $(DWLDEVCFLAGS) $(CFLAGS)
|
||||
LDLIBS = `$(PKG_CONFIG) --libs $(PKGS)` $(LIBS)
|
||||
LDLIBS = `$(PKG_CONFIG) --libs $(PKGS)` -lm $(LIBS)
|
||||
|
||||
all: dwl
|
||||
dwl: dwl.o util.o
|
||||
$(CC) dwl.o util.o $(LDLIBS) $(LDFLAGS) $(DWLCFLAGS) -o $@
|
||||
dwl.o: dwl.c config.mk config.h client.h xdg-shell-protocol.h wlr-layer-shell-unstable-v1-protocol.h
|
||||
dwl.o: dwl.c config.mk config.h client.h xdg-shell-protocol.h wlr-layer-shell-unstable-v1-protocol.h pointer-constraints-unstable-v1-protocol.h
|
||||
util.o: util.c util.h
|
||||
|
||||
# wayland-scanner is a tool which generates C headers and rigging for Wayland
|
||||
@ -31,6 +31,9 @@ xdg-shell-protocol.h:
|
||||
wlr-layer-shell-unstable-v1-protocol.h:
|
||||
$(WAYLAND_SCANNER) server-header \
|
||||
protocols/wlr-layer-shell-unstable-v1.xml $@
|
||||
pointer-constraints-unstable-v1-protocol.h:
|
||||
$(WAYLAND_SCANNER) server-header \
|
||||
$(WAYLAND_PROTOCOLS)/unstable/pointer-constraints/pointer-constraints-unstable-v1.xml $@
|
||||
|
||||
config.h:
|
||||
cp config.def.h $@
|
||||
|
||||
277
dwl.c
277
dwl.c
@ -1,10 +1,12 @@
|
||||
/*
|
||||
* See LICENSE file for copyright and license details.
|
||||
*/
|
||||
#include <assert.h>
|
||||
#include <getopt.h>
|
||||
#include <libinput.h>
|
||||
#include <limits.h>
|
||||
#include <linux/input-event-codes.h>
|
||||
#include <pixman-1/pixman.h>
|
||||
#include <signal.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
@ -32,9 +34,11 @@
|
||||
#include <wlr/types/wlr_output_layout.h>
|
||||
#include <wlr/types/wlr_output_management_v1.h>
|
||||
#include <wlr/types/wlr_pointer.h>
|
||||
#include <wlr/types/wlr_pointer_constraints_v1.h>
|
||||
#include <wlr/types/wlr_presentation_time.h>
|
||||
#include <wlr/types/wlr_primary_selection.h>
|
||||
#include <wlr/types/wlr_primary_selection_v1.h>
|
||||
#include <wlr/types/wlr_relative_pointer_v1.h>
|
||||
#include <wlr/types/wlr_scene.h>
|
||||
#include <wlr/types/wlr_screencopy_v1.h>
|
||||
#include <wlr/types/wlr_seat.h>
|
||||
@ -47,6 +51,7 @@
|
||||
#include <wlr/types/wlr_xdg_output_v1.h>
|
||||
#include <wlr/types/wlr_xdg_shell.h>
|
||||
#include <wlr/util/log.h>
|
||||
#include <wlr/util/region.h>
|
||||
#include <xkbcommon/xkbcommon.h>
|
||||
#ifdef XWAYLAND
|
||||
#include <X11/Xlib.h>
|
||||
@ -194,6 +199,14 @@ typedef struct {
|
||||
enum wl_output_transform rr;
|
||||
} MonitorRule;
|
||||
|
||||
typedef struct {
|
||||
struct wlr_pointer_constraint_v1 *constraint;
|
||||
Client *focused;
|
||||
|
||||
struct wl_listener set_region;
|
||||
struct wl_listener destroy;
|
||||
} PointerConstraint;
|
||||
|
||||
typedef struct {
|
||||
const char *id;
|
||||
const char *title;
|
||||
@ -214,6 +227,7 @@ static void arrangelayer(Monitor *m, struct wl_list *list,
|
||||
static void arrangelayers(Monitor *m);
|
||||
static void axisnotify(struct wl_listener *listener, void *data);
|
||||
static void buttonpress(struct wl_listener *listener, void *data);
|
||||
static void checkconstraintregion(void);
|
||||
static void chvt(const Arg *arg);
|
||||
static void checkidleinhibitor(struct wlr_surface *exclude);
|
||||
static void cleanup(void);
|
||||
@ -222,17 +236,22 @@ static void cleanupmon(struct wl_listener *listener, void *data);
|
||||
static void closemon(Monitor *m);
|
||||
static void commitlayersurfacenotify(struct wl_listener *listener, void *data);
|
||||
static void commitnotify(struct wl_listener *listener, void *data);
|
||||
static void commitpointerconstraint(struct wl_listener *listener, void *data);
|
||||
static void createidleinhibitor(struct wl_listener *listener, void *data);
|
||||
static void createkeyboard(struct wlr_input_device *device);
|
||||
static void createlayersurface(struct wl_listener *listener, void *data);
|
||||
static void createmon(struct wl_listener *listener, void *data);
|
||||
static void createnotify(struct wl_listener *listener, void *data);
|
||||
static void createpointer(struct wlr_input_device *device);
|
||||
static void createpointerconstraint(struct wl_listener *listener, void *data);
|
||||
static void cursorconstrain(struct wlr_pointer_constraint_v1 *constraint);
|
||||
static void cursorframe(struct wl_listener *listener, void *data);
|
||||
static void cursorwarptoconstrainthint(void);
|
||||
static void destroydragicon(struct wl_listener *listener, void *data);
|
||||
static void destroyidleinhibitor(struct wl_listener *listener, void *data);
|
||||
static void destroylayersurfacenotify(struct wl_listener *listener, void *data);
|
||||
static void destroynotify(struct wl_listener *listener, void *data);
|
||||
static void destroypointerconstraint(struct wl_listener *listener, void *data);
|
||||
static Monitor *dirtomon(enum wlr_direction dir);
|
||||
static void focusclient(Client *c, int lift);
|
||||
static void focusmon(const Arg *arg);
|
||||
@ -249,12 +268,14 @@ static void maplayersurfacenotify(struct wl_listener *listener, void *data);
|
||||
static void mapnotify(struct wl_listener *listener, void *data);
|
||||
static void monocle(Monitor *m);
|
||||
static void motionabsolute(struct wl_listener *listener, void *data);
|
||||
static void motionnotify(uint32_t time);
|
||||
static void motionnotify(uint32_t time, struct wlr_input_device *device, double sx,
|
||||
double sy, double sx_unaccel, double sy_unaccel);
|
||||
static void motionrelative(struct wl_listener *listener, void *data);
|
||||
static void moveresize(const Arg *arg);
|
||||
static void outputmgrapply(struct wl_listener *listener, void *data);
|
||||
static void outputmgrapplyortest(struct wlr_output_configuration_v1 *config, int test);
|
||||
static void outputmgrtest(struct wl_listener *listener, void *data);
|
||||
static void pointerconstraintsetregion(struct wl_listener *listener, void *data);
|
||||
static void pointerfocus(Client *c, struct wlr_surface *surface,
|
||||
double sx, double sy, uint32_t time);
|
||||
static void printstatus(void);
|
||||
@ -320,6 +341,13 @@ static struct wlr_layer_shell_v1 *layer_shell;
|
||||
static struct wlr_output_manager_v1 *output_mgr;
|
||||
static struct wlr_virtual_keyboard_manager_v1 *virtual_keyboard_mgr;
|
||||
|
||||
static struct wlr_relative_pointer_manager_v1 *relative_pointer_mgr;
|
||||
static struct wlr_pointer_constraints_v1 *pointer_constraints;
|
||||
static struct wl_listener pointer_constraint_commit;
|
||||
static PointerConstraint *active_constraint;
|
||||
static pixman_region32_t active_confine;
|
||||
static int active_confine_requires_warp;
|
||||
|
||||
static struct wlr_cursor *cursor;
|
||||
static struct wlr_xcursor_manager *cursor_mgr;
|
||||
|
||||
@ -347,6 +375,7 @@ static struct wl_listener layout_change = {.notify = updatemons};
|
||||
static struct wl_listener new_input = {.notify = inputdevice};
|
||||
static struct wl_listener new_virtual_keyboard = {.notify = virtualkeyboard};
|
||||
static struct wl_listener new_output = {.notify = createmon};
|
||||
static struct wl_listener new_pointer_constraint = {.notify = createpointerconstraint};
|
||||
static struct wl_listener new_xdg_surface = {.notify = createnotify};
|
||||
static struct wl_listener new_layer_shell_surface = {.notify = createlayersurface};
|
||||
static struct wl_listener output_mgr_apply = {.notify = outputmgrapply};
|
||||
@ -504,7 +533,7 @@ arrange(Monitor *m)
|
||||
|
||||
if (m && m->lt[m->sellt]->arrange)
|
||||
m->lt[m->sellt]->arrange(m);
|
||||
motionnotify(0);
|
||||
motionnotify(0, NULL, 0, 0, 0, 0);
|
||||
}
|
||||
|
||||
void
|
||||
@ -681,7 +710,7 @@ buttonpress(struct wl_listener *listener, void *data)
|
||||
* we will send an enter event after which the client will provide us
|
||||
* a cursor surface */
|
||||
wlr_seat_pointer_clear_focus(seat);
|
||||
motionnotify(0);
|
||||
motionnotify(0, NULL, 0, 0, 0, 0);
|
||||
/* Drop the window off on its new monitor */
|
||||
selmon = xytomon(cursor->x, cursor->y);
|
||||
setmon(grabc, selmon, 0);
|
||||
@ -697,6 +726,41 @@ buttonpress(struct wl_listener *listener, void *data)
|
||||
event->time_msec, event->button, event->state);
|
||||
}
|
||||
|
||||
void
|
||||
checkconstraintregion(void)
|
||||
{
|
||||
struct wlr_pointer_constraint_v1 *constraint = active_constraint->constraint;
|
||||
pixman_region32_t *region = &constraint->region;
|
||||
Client *c = client_from_wlr_surface(constraint->surface);
|
||||
double sx, sy;
|
||||
if (active_confine_requires_warp && c) {
|
||||
active_confine_requires_warp = 0;
|
||||
|
||||
sx = cursor->x + c->geom.x;
|
||||
sy = cursor->y + c->geom.y;
|
||||
|
||||
if (!pixman_region32_contains_point(region,
|
||||
floor(sx), floor(sy), NULL)) {
|
||||
int nboxes;
|
||||
pixman_box32_t *boxes = pixman_region32_rectangles(region, &nboxes);
|
||||
if (nboxes > 0) {
|
||||
sx = (boxes[0].x1 + boxes[0].x2) / 2.;
|
||||
sy = (boxes[0].y1 + boxes[0].y2) / 2.;
|
||||
|
||||
wlr_cursor_warp_closest(cursor, NULL,
|
||||
sx - c->geom.x, sy - c->geom.y);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* A locked pointer will result in an empty region, thus disallowing all movement. */
|
||||
if (constraint->type == WLR_POINTER_CONSTRAINT_V1_CONFINED) {
|
||||
pixman_region32_copy(&active_confine, region);
|
||||
} else {
|
||||
pixman_region32_clear(&active_confine);
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
chvt(const Arg *arg)
|
||||
{
|
||||
@ -854,6 +918,14 @@ commitnotify(struct wl_listener *listener, void *data)
|
||||
c->resize = 0;
|
||||
}
|
||||
|
||||
void
|
||||
commitpointerconstraint(struct wl_listener *listener, void *data)
|
||||
{
|
||||
assert(active_constraint->constraint->surface == data);
|
||||
|
||||
checkconstraintregion();
|
||||
}
|
||||
|
||||
void
|
||||
createidleinhibitor(struct wl_listener *listener, void *data)
|
||||
{
|
||||
@ -1085,6 +1157,73 @@ createpointer(struct wlr_input_device *device)
|
||||
wlr_cursor_attach_input_device(cursor, device);
|
||||
}
|
||||
|
||||
void
|
||||
createpointerconstraint(struct wl_listener *listener, void *data)
|
||||
{
|
||||
struct wlr_pointer_constraint_v1 *wlr_constraint = data;
|
||||
PointerConstraint *constraint = ecalloc(1, sizeof(*constraint));
|
||||
Client *c = client_from_wlr_surface(wlr_constraint->surface), *sel = selclient();
|
||||
constraint->constraint = wlr_constraint;
|
||||
wlr_constraint->data = constraint;
|
||||
|
||||
LISTEN(&wlr_constraint->events.set_region, &constraint->set_region,
|
||||
pointerconstraintsetregion);
|
||||
LISTEN(&wlr_constraint->events.destroy, &constraint->destroy,
|
||||
destroypointerconstraint);
|
||||
|
||||
if (c == sel)
|
||||
cursorconstrain(wlr_constraint);
|
||||
}
|
||||
|
||||
void
|
||||
cursorconstrain(struct wlr_pointer_constraint_v1 *wlr_constraint)
|
||||
{
|
||||
PointerConstraint *constraint = wlr_constraint->data;
|
||||
|
||||
if (active_constraint == constraint)
|
||||
return;
|
||||
|
||||
wl_list_remove(&pointer_constraint_commit.link);
|
||||
if (active_constraint) {
|
||||
if (!wlr_constraint)
|
||||
cursorwarptoconstrainthint();
|
||||
|
||||
wlr_pointer_constraint_v1_send_deactivated(active_constraint->constraint);
|
||||
}
|
||||
|
||||
active_constraint = constraint;
|
||||
|
||||
if (!wlr_constraint) {
|
||||
wl_list_init(&pointer_constraint_commit.link);
|
||||
return;
|
||||
}
|
||||
|
||||
active_confine_requires_warp = 1;
|
||||
|
||||
/* Stolen from sway/input/cursor.c:1435
|
||||
*
|
||||
* FIXME: Big hack, stolen from wlr_pointer_constraints_v1.c:121.
|
||||
* This is necessary because the focus may be set before the surface
|
||||
* has finished committing, which means that warping won't work properly,
|
||||
* since this code will be run *after* the focus has been set.
|
||||
* That is why we duplicate the code here.
|
||||
*/
|
||||
if (pixman_region32_not_empty(&wlr_constraint->current.region)) {
|
||||
pixman_region32_intersect(&wlr_constraint->region,
|
||||
&wlr_constraint->surface->input_region, &wlr_constraint->current.region);
|
||||
} else {
|
||||
pixman_region32_copy(&wlr_constraint->region,
|
||||
&wlr_constraint->surface->input_region);
|
||||
}
|
||||
|
||||
checkconstraintregion();
|
||||
|
||||
wlr_pointer_constraint_v1_send_activated(wlr_constraint);
|
||||
|
||||
LISTEN(&wlr_constraint->surface->events.commit, &pointer_constraint_commit,
|
||||
commitpointerconstraint);
|
||||
}
|
||||
|
||||
void
|
||||
cursorframe(struct wl_listener *listener, void *data)
|
||||
{
|
||||
@ -1096,6 +1235,31 @@ cursorframe(struct wl_listener *listener, void *data)
|
||||
wlr_seat_pointer_notify_frame(seat);
|
||||
}
|
||||
|
||||
void
|
||||
cursorwarptoconstrainthint(void)
|
||||
{
|
||||
struct wlr_pointer_constraint_v1 *constraint = active_constraint->constraint;
|
||||
|
||||
if (constraint->current.committed &
|
||||
WLR_POINTER_CONSTRAINT_V1_STATE_CURSOR_HINT) {
|
||||
double lx, ly;
|
||||
double sx = lx = constraint->current.cursor_hint.x;
|
||||
double sy = ly = constraint->current.cursor_hint.y;
|
||||
|
||||
Client *c = client_from_wlr_surface(constraint->surface);
|
||||
if (c) {
|
||||
lx -= c->geom.x;
|
||||
ly -= c->geom.y;
|
||||
}
|
||||
|
||||
wlr_cursor_warp(cursor, NULL, lx, ly);
|
||||
|
||||
/* Warp the pointer as well, so that on the next pointer rebase we don't
|
||||
* send an unexpected synthetic motion event to clients. */
|
||||
wlr_seat_pointer_warp(seat, sx, sy);
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
destroydragicon(struct wl_listener *listener, void *data)
|
||||
{
|
||||
@ -1103,7 +1267,7 @@ destroydragicon(struct wl_listener *listener, void *data)
|
||||
wlr_scene_node_destroy(icon->data);
|
||||
/* Focus enter isn't sent during drag, so refocus the focused node. */
|
||||
focusclient(selclient(), 1);
|
||||
motionnotify(0);
|
||||
motionnotify(0, NULL, 0, 0, 0, 0);
|
||||
}
|
||||
|
||||
void
|
||||
@ -1148,6 +1312,26 @@ destroynotify(struct wl_listener *listener, void *data)
|
||||
free(c);
|
||||
}
|
||||
|
||||
void
|
||||
destroypointerconstraint(struct wl_listener *listener, void *data)
|
||||
{
|
||||
PointerConstraint *constraint = wl_container_of(listener, constraint, destroy);
|
||||
wl_list_remove(&constraint->set_region.link);
|
||||
wl_list_remove(&constraint->destroy.link);
|
||||
|
||||
if (active_constraint == constraint) {
|
||||
cursorwarptoconstrainthint();
|
||||
|
||||
if (pointer_constraint_commit.link.next)
|
||||
wl_list_remove(&pointer_constraint_commit.link);
|
||||
|
||||
wl_list_init(&pointer_constraint_commit.link);
|
||||
active_constraint = NULL;
|
||||
}
|
||||
|
||||
free(constraint);
|
||||
}
|
||||
|
||||
Monitor *
|
||||
dirtomon(enum wlr_direction dir)
|
||||
{
|
||||
@ -1227,7 +1411,7 @@ focusclient(Client *c, int lift)
|
||||
}
|
||||
|
||||
/* Change cursor surface */
|
||||
motionnotify(0);
|
||||
motionnotify(0, NULL, 0, 0, 0, 0);
|
||||
|
||||
/* Have a client, so focus its top-level wlr_surface */
|
||||
client_notify_enter(client_surface(c), wlr_seat_get_keyboard(seat));
|
||||
@ -1418,7 +1602,7 @@ maplayersurfacenotify(struct wl_listener *listener, void *data)
|
||||
{
|
||||
LayerSurface *l = wl_container_of(listener, l, map);
|
||||
wlr_surface_send_enter(l->layer_surface->surface, l->mon->wlr_output);
|
||||
motionnotify(0);
|
||||
motionnotify(0, NULL, 0, 0, 0, 0);
|
||||
}
|
||||
|
||||
void
|
||||
@ -1515,21 +1699,61 @@ motionabsolute(struct wl_listener *listener, void *data)
|
||||
* so we have to warp the mouse there. There is also some hardware which
|
||||
* emits these events. */
|
||||
struct wlr_event_pointer_motion_absolute *event = data;
|
||||
wlr_cursor_warp_absolute(cursor, event->device, event->x, event->y);
|
||||
motionnotify(event->time_msec);
|
||||
double lx, ly, dx, dy;
|
||||
wlr_cursor_absolute_to_layout_coords(cursor, event->device, event->x, event->y, &lx, &ly);
|
||||
|
||||
dx = lx - cursor->x;
|
||||
dy = ly - cursor->y;
|
||||
|
||||
motionnotify(event->time_msec, event->device, dx, dy, dx, dy);
|
||||
}
|
||||
|
||||
void
|
||||
motionnotify(uint32_t time)
|
||||
motionnotify(uint32_t time, struct wlr_input_device *device, double dx, double dy,
|
||||
double dx_unaccel, double dy_unaccel)
|
||||
{
|
||||
double sx = 0, sy = 0;
|
||||
double sx_confined, sy_confined;
|
||||
Client *c = NULL;
|
||||
LayerSurface *l;
|
||||
struct wlr_surface *surface = NULL;
|
||||
struct wlr_drag_icon *icon;
|
||||
struct wlr_pointer_constraint_v1 *constraint = NULL;
|
||||
|
||||
/* Find the client under the pointer and send the event along. */
|
||||
xytonode(cursor->x, cursor->y, &surface, &c, NULL, &sx, &sy);
|
||||
|
||||
if (cursor_mode == CurPressed && !seat->drag) {
|
||||
if ((l = toplevel_from_wlr_layer_surface(
|
||||
seat->pointer_state.focused_surface))) {
|
||||
surface = seat->pointer_state.focused_surface;
|
||||
sx = cursor->x - l->geom.x;
|
||||
sy = cursor->y - l->geom.y;
|
||||
}
|
||||
}
|
||||
|
||||
/* time is 0 in internal calls meant to restore pointer focus. */
|
||||
if (time) {
|
||||
wlr_relative_pointer_manager_v1_send_relative_motion(
|
||||
relative_pointer_mgr, seat, (uint64_t)time * 1000,
|
||||
dx, dy, dx_unaccel, dy_unaccel);
|
||||
|
||||
wl_list_for_each(constraint, &pointer_constraints->constraints, link)
|
||||
cursorconstrain(constraint);
|
||||
|
||||
if (active_constraint) {
|
||||
constraint = active_constraint->constraint;
|
||||
if (constraint->surface == surface
|
||||
&& wlr_region_confine(&active_confine, sx, sy, sx + dx,
|
||||
sy + dy, &sx_confined, &sy_confined)) {
|
||||
dx = sx_confined - sx;
|
||||
dy = sy_confined - sy;
|
||||
} else {
|
||||
return;
|
||||
}
|
||||
}
|
||||
wlr_cursor_move(cursor, device, dx, dy);
|
||||
|
||||
wlr_idle_notify_activity(idle, seat);
|
||||
|
||||
/* Update selmon (even while dragging a window) */
|
||||
@ -1553,18 +1777,6 @@ motionnotify(uint32_t time)
|
||||
return;
|
||||
}
|
||||
|
||||
/* Find the client under the pointer and send the event along. */
|
||||
xytonode(cursor->x, cursor->y, &surface, &c, NULL, &sx, &sy);
|
||||
|
||||
if (cursor_mode == CurPressed && !seat->drag) {
|
||||
if ((l = toplevel_from_wlr_layer_surface(
|
||||
seat->pointer_state.focused_surface))) {
|
||||
surface = seat->pointer_state.focused_surface;
|
||||
sx = cursor->x - l->geom.x;
|
||||
sy = cursor->y - l->geom.y;
|
||||
}
|
||||
}
|
||||
|
||||
/* If there's no client surface under the cursor, set the cursor image to a
|
||||
* default. This is what makes the cursor image appear when you move it
|
||||
* off of a client or over its border. */
|
||||
@ -1585,8 +1797,8 @@ motionrelative(struct wl_listener *listener, void *data)
|
||||
* special configuration applied for the specific input device which
|
||||
* generated the event. You can pass NULL for the device if you want to move
|
||||
* the cursor around without any input. */
|
||||
wlr_cursor_move(cursor, event->device, event->delta_x, event->delta_y);
|
||||
motionnotify(event->time_msec);
|
||||
motionnotify(event->time_msec, event->device, event->delta_x, event->delta_y,
|
||||
event->unaccel_dx, event->unaccel_dy);
|
||||
}
|
||||
|
||||
void
|
||||
@ -1702,6 +1914,14 @@ outputmgrtest(struct wl_listener *listener, void *data)
|
||||
outputmgrapplyortest(config, 1);
|
||||
}
|
||||
|
||||
void
|
||||
pointerconstraintsetregion(struct wl_listener *listener, void *data)
|
||||
{
|
||||
PointerConstraint *constraint = wl_container_of(listener, constraint, set_region);
|
||||
active_confine_requires_warp = 1;
|
||||
constraint->constraint->surface->data = NULL;
|
||||
}
|
||||
|
||||
void
|
||||
pointerfocus(Client *c, struct wlr_surface *surface, double sx, double sy,
|
||||
uint32_t time)
|
||||
@ -2211,6 +2431,11 @@ setup(void)
|
||||
wl_signal_add(&output_mgr->events.apply, &output_mgr_apply);
|
||||
wl_signal_add(&output_mgr->events.test, &output_mgr_test);
|
||||
|
||||
relative_pointer_mgr = wlr_relative_pointer_manager_v1_create(dpy);
|
||||
pointer_constraints = wlr_pointer_constraints_v1_create(dpy);
|
||||
wl_signal_add(&pointer_constraints->events.new_constraint, &new_pointer_constraint);
|
||||
wl_list_init(&pointer_constraint_commit.link);
|
||||
|
||||
wlr_scene_set_presentation(scene, wlr_presentation_create(dpy, backend));
|
||||
|
||||
#ifdef XWAYLAND
|
||||
@ -2266,7 +2491,7 @@ startdrag(struct wl_listener *listener, void *data)
|
||||
return;
|
||||
|
||||
drag->icon->data = wlr_scene_subsurface_tree_create(layers[LyrDragIcon], drag->icon->surface);
|
||||
motionnotify(0);
|
||||
motionnotify(0, NULL, 0, 0, 0, 0);
|
||||
wl_signal_add(&drag->icon->events.destroy, &drag_icon_destroy);
|
||||
}
|
||||
|
||||
@ -2384,7 +2609,7 @@ unmaplayersurfacenotify(struct wl_listener *listener, void *data)
|
||||
if (layersurface->layer_surface->surface ==
|
||||
seat->keyboard_state.focused_surface)
|
||||
focusclient(selclient(), 1);
|
||||
motionnotify(0);
|
||||
motionnotify(0, NULL, 0, 0, 0, 0);
|
||||
}
|
||||
|
||||
void
|
||||
@ -2414,7 +2639,7 @@ unmapnotify(struct wl_listener *listener, void *data)
|
||||
wl_list_remove(&c->commit.link);
|
||||
wlr_scene_node_destroy(c->scene);
|
||||
printstatus();
|
||||
motionnotify(0);
|
||||
motionnotify(0, NULL, 0, 0, 0, 0);
|
||||
}
|
||||
|
||||
void
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user