Zynh0722/dwl
1
0
Fork 0
forked from mirror/dwl
Code Pull requests Activity

dwm-style enum

Browse source
This commit is contained in:
Devin J. Pohly 2020-04-21 14:00:18 -05:00
parent 2903d5180a
commit 364b664a6c
1 changed files with 13 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
dwl.c
View file

@ -32,12 +32,8 @@
#define CLEANMASK(mask) (mask & ~WLR_MODIFIER_CAPS) #define CLEANMASK(mask) (mask & ~WLR_MODIFIER_CAPS)
#define LENGTH(X) (sizeof X / sizeof X[0]) #define LENGTH(X) (sizeof X / sizeof X[0])
/* For brevity's sake, struct members are annotated where they are used. */ /* enums */
enum dwl_cursor_mode { enum { CurNormal, CurMove, CurResize }; /* cursor */
DWL_CURSOR_PASSTHROUGH,
DWL_CURSOR_MOVE,
DWL_CURSOR_RESIZE,
};
struct dwl_server { struct dwl_server {
struct wl_display *wl_display; struct wl_display *wl_display;
@ -60,7 +56,7 @@ struct dwl_server {
struct wl_listener new_input; struct wl_listener new_input;
struct wl_listener request_cursor; struct wl_listener request_cursor;
struct wl_list keyboards; struct wl_list keyboards;
enum dwl_cursor_mode cursor_mode; unsigned int cursor_mode;
struct dwl_view *grabbed_view; struct dwl_view *grabbed_view;
double grab_x, grab_y; double grab_x, grab_y;
int grab_width, grab_height; int grab_width, grab_height;
@ -146,7 +142,7 @@ static void motionnotify(struct dwl_server *server, uint32_t time);
static void motionrelative(struct wl_listener *listener, void *data); static void motionrelative(struct wl_listener *listener, void *data);
static void movemouse(struct dwl_server *server, const Arg *arg); static void movemouse(struct dwl_server *server, const Arg *arg);
static void moverequest(struct wl_listener *listener, void *data); static void moverequest(struct wl_listener *listener, void *data);
static void moveresize(struct dwl_view *view, enum dwl_cursor_mode mode, static void moveresize(struct dwl_view *view, unsigned int mode,
uint32_t edges); uint32_t edges);
static void quit(struct dwl_server *server, const Arg *arg); static void quit(struct dwl_server *server, const Arg *arg);
static void render(struct wlr_surface *surface, int sx, int sy, void *data); static void render(struct wlr_surface *surface, int sx, int sy, void *data);
@ -204,7 +200,7 @@ buttonpress(struct wl_listener *listener, void *data)
server->cursor->x, server->cursor->y, &surface, &sx, &sy); server->cursor->x, server->cursor->y, &surface, &sx, &sy);
if (event->state == WLR_BUTTON_RELEASED) { if (event->state == WLR_BUTTON_RELEASED) {
/* If you released any buttons, we exit interactive move/resize mode. */ /* If you released any buttons, we exit interactive move/resize mode. */
server->cursor_mode = DWL_CURSOR_PASSTHROUGH; server->cursor_mode = CurNormal;
} else { } else {
/* Focus that client if the button was _pressed_ */ /* Focus that client if the button was _pressed_ */
focus(view, surface); focus(view, surface);
@ -603,10 +599,10 @@ void
motionnotify(struct dwl_server *server, uint32_t time) motionnotify(struct dwl_server *server, uint32_t time)
{ {
/* If the mode is non-passthrough, delegate to those functions. */ /* If the mode is non-passthrough, delegate to those functions. */
if (server->cursor_mode == DWL_CURSOR_MOVE) { if (server->cursor_mode == CurMove) {
handlemove(server, time); handlemove(server, time);
return; return;
} else if (server->cursor_mode == DWL_CURSOR_RESIZE) { } else if (server->cursor_mode == CurResize) {
handleresize(server, time); handleresize(server, time);
return; return;
} }
@ -675,7 +671,7 @@ movemouse(struct dwl_server *server, const Arg *arg)
if (!view) { if (!view) {
return; return;
} }
moveresize(view, DWL_CURSOR_MOVE, 0); moveresize(view, CurMove, 0);
} }
void void
@ -687,11 +683,11 @@ moverequest(struct wl_listener *listener, void *data)
* provied serial against a list of button press serials sent to this * provied serial against a list of button press serials sent to this
* client, to prevent the client from requesting this whenever they want. */ * client, to prevent the client from requesting this whenever they want. */
struct dwl_view *view = wl_container_of(listener, view, request_move); struct dwl_view *view = wl_container_of(listener, view, request_move);
moveresize(view, DWL_CURSOR_MOVE, 0); moveresize(view, CurMove, 0);
} }
void void
moveresize(struct dwl_view *view, enum dwl_cursor_mode mode, uint32_t edges) moveresize(struct dwl_view *view, unsigned int mode, uint32_t edges)
{ {
/* This function sets up an interactive move or resize operation, where the /* This function sets up an interactive move or resize operation, where the
* compositor stops propagating pointer events to clients and instead * compositor stops propagating pointer events to clients and instead
@ -707,7 +703,7 @@ moveresize(struct dwl_view *view, enum dwl_cursor_mode mode, uint32_t edges)
server->cursor_mode = mode; server->cursor_mode = mode;
struct wlr_box geo_box; struct wlr_box geo_box;
wlr_xdg_surface_get_geometry(view->xdg_surface, &geo_box); wlr_xdg_surface_get_geometry(view->xdg_surface, &geo_box);
if (mode == DWL_CURSOR_MOVE) { if (mode == CurMove) {
server->grab_x = server->cursor->x - view->x; server->grab_x = server->cursor->x - view->x;
server->grab_y = server->cursor->y - view->y; server->grab_y = server->cursor->y - view->y;
} else { } else {
@ -861,7 +857,7 @@ resizemouse(struct dwl_server *server, const Arg *arg)
wlr_cursor_warp_closest(server->cursor, NULL, wlr_cursor_warp_closest(server->cursor, NULL,
view->x + geo_box.x + geo_box.width, view->x + geo_box.x + geo_box.width,
view->y + geo_box.y + geo_box.height); view->y + geo_box.y + geo_box.height);
moveresize(view, DWL_CURSOR_RESIZE, WLR_EDGE_BOTTOM|WLR_EDGE_RIGHT); moveresize(view, CurResize, WLR_EDGE_BOTTOM|WLR_EDGE_RIGHT);
} }
void void
@ -874,7 +870,7 @@ resizerequest(struct wl_listener *listener, void *data)
* client, to prevent the client from requesting this whenever they want. */ * client, to prevent the client from requesting this whenever they want. */
struct wlr_xdg_toplevel_resize_event *event = data; struct wlr_xdg_toplevel_resize_event *event = data;
struct dwl_view *view = wl_container_of(listener, view, request_resize); struct dwl_view *view = wl_container_of(listener, view, request_resize);
moveresize(view, DWL_CURSOR_RESIZE, event->edges); moveresize(view, CurResize, event->edges);
} }
void void