toby/dwl
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

inline handlemove/handleresize

Browse source
This commit is contained in:
Devin J. Pohly 2020-04-21 14:59:32 -05:00
parent 599bec5583
commit 26714f172a
1 changed files with 12 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
dwl.c
View file

@ -101,8 +101,6 @@ static void cursorframe(struct wl_listener *listener, void *data);
static void destroynotify(struct wl_listener *listener, void *data); static void destroynotify(struct wl_listener *listener, void *data);
static void focus(Client *c, struct wlr_surface *surface); static void focus(Client *c, struct wlr_surface *surface);
static void focusnext(const Arg *arg); static void focusnext(const Arg *arg);
static void handlemove(uint32_t time);
static void handleresize(uint32_t time);
static void inputdevice(struct wl_listener *listener, void *data); static void inputdevice(struct wl_listener *listener, void *data);
static bool keybinding(uint32_t mods, xkb_keysym_t sym); static bool keybinding(uint32_t mods, xkb_keysym_t sym);
static void keypress(struct wl_listener *listener, void *data); static void keypress(struct wl_listener *listener, void *data);
@ -379,28 +377,6 @@ focusnext(const Arg *arg)
wl_list_insert(clients.prev, &c->link); wl_list_insert(clients.prev, &c->link);
} }
void
handlemove(uint32_t time)
{
/* Move the grabbed client to the new position. */
grabbed_client->x = cursor->x - grab_x;
grabbed_client->y = cursor->y - grab_y;
}
void
handleresize(uint32_t time)
{
/*
* Note that I took some shortcuts here. In a more fleshed-out compositor,
* you'd wait for the client to prepare a buffer at the new size, then
* commit any movement that was prepared.
*/
double dx = cursor->x - grab_x;
double dy = cursor->y - grab_y;
wlr_xdg_toplevel_set_size(grabbed_client->xdg_surface,
grab_width + dx, grab_height + dy);
}
void void
inputdevice(struct wl_listener *listener, void *data) inputdevice(struct wl_listener *listener, void *data)
{ {
@ -525,10 +501,20 @@ motionnotify(uint32_t time)
{ {
/* If the mode is non-passthrough, delegate to those functions. */ /* If the mode is non-passthrough, delegate to those functions. */
if (cursor_mode == CurMove) { if (cursor_mode == CurMove) {
handlemove(time); /* Move the grabbed client to the new position. */
grabbed_client->x = cursor->x - grab_x;
grabbed_client->y = cursor->y - grab_y;
return; return;
} else if (cursor_mode == CurResize) { } else if (cursor_mode == CurResize) {
handleresize(time); /*
* Note that I took some shortcuts here. In a more fleshed-out
* compositor, you'd wait for the client to prepare a buffer at
* the new size, then commit any movement that was prepared.
*/
double dx = cursor->x - grab_x;
double dy = cursor->y - grab_y;
wlr_xdg_toplevel_set_size(grabbed_client->xdg_surface,
grab_width + dx, grab_height + dy);
return; return;
} }