From 8d9d0bdb945c8fcad5650aac562404abdddb3d75 Mon Sep 17 00:00:00 2001 From: Dhruva Sambrani <44899822+DhruvaSambrani@users.noreply.github.com> Date: Thu, 6 Jun 2024 16:22:52 +0200 Subject: [PATCH] rebase winview to main --- patches/winview/winview.patch | 27 +++++++-------------------- 1 file changed, 7 insertions(+), 20 deletions(-) diff --git a/patches/winview/winview.patch b/patches/winview/winview.patch index d16f582..d3fc099 100644 --- a/patches/winview/winview.patch +++ b/patches/winview/winview.patch @@ -1,18 +1,8 @@ -From 7a2b65af8c7a56c8d78875530685422702be993e Mon Sep 17 00:00:00 2001 -From: Dhruva Sambrani <44899822+DhruvaSambrani@users.noreply.github.com> -Date: Mon, 8 Jan 2024 15:04:09 +0100 -Subject: [PATCH] first winview commit - ---- - config.def.h | 1 + - dwl.c | 12 ++++++++++++ - 2 files changed, 13 insertions(+) - diff --git a/config.def.h b/config.def.h -index a8ed61d..af9d866 100644 +index a784eb4..d09ee55 100644 --- a/config.def.h +++ b/config.def.h -@@ -138,6 +138,7 @@ static const Key keys[] = { +@@ -140,6 +140,7 @@ static const Key keys[] = { { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_space, togglefloating, {0} }, { MODKEY, XKB_KEY_e, togglefullscreen, {0} }, { MODKEY, XKB_KEY_0, view, {.ui = ~0} }, @@ -21,19 +11,19 @@ index a8ed61d..af9d866 100644 { MODKEY, XKB_KEY_comma, focusmon, {.i = WLR_DIRECTION_LEFT} }, { MODKEY, XKB_KEY_period, focusmon, {.i = WLR_DIRECTION_RIGHT} }, diff --git a/dwl.c b/dwl.c -index 632dabf..5f3a596 100644 +index 6f041a0..65df112 100644 --- a/dwl.c +++ b/dwl.c -@@ -327,6 +327,7 @@ static void updatetitle(struct wl_listener *listener, void *data); - static void urgent(struct wl_listener *listener, void *data); +@@ -346,6 +346,7 @@ static void urgent(struct wl_listener *listener, void *data); static void view(const Arg *arg); static void virtualkeyboard(struct wl_listener *listener, void *data); + static void virtualpointer(struct wl_listener *listener, void *data); +static void winview(const Arg *a); static Monitor *xytomon(double x, double y); static void xytonode(double x, double y, struct wlr_surface **psurface, Client **pc, LayerSurface **pl, double *nx, double *ny); -@@ -2726,6 +2727,17 @@ virtualkeyboard(struct wl_listener *listener, void *data) - wlr_keyboard_group_add_keyboard(vkb_group.wlr_group, &keyboard->keyboard); +@@ -2877,6 +2878,17 @@ virtualpointer(struct wl_listener *listener, void *data) + wlr_cursor_map_input_to_output(cursor, &pointer.base, event->suggested_output); } +void @@ -50,6 +40,3 @@ index 632dabf..5f3a596 100644 Monitor * xytomon(double x, double y) { --- -2.43.0 -