jachym/dwl-patches
1
0
Fork 0
mirror of https://codeberg.org/dwl/dwl-patches.git synced 2025-09-07 11:44:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

menu: fix pointer reset on error

Browse Source
This commit is contained in:
Nikita Ivanov 2025-03-26 01:11:20 +01:00
parent 955e7dec32
commit ca28e6d2d8
No known key found for this signature in database
GPG Key ID: 6E656AC5B97B5133
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
patches/menu/menu.patch
View File

@ -1,12 +1,12 @@
From 7cfdf80b9ca536c29e49165e00b0b913685e396d Mon Sep 17 00:00:00 2001 From da9861cf0448ca94011470634fd61c3ef2129a25 Mon Sep 17 00:00:00 2001
From: Nikita Ivanov <nikita.vyach.ivanov@gmail.com> From: Nikita Ivanov <nikita.vyach.ivanov@gmail.com>
Date: Fri, 21 Mar 2025 21:48:42 +0100 Date: Fri, 21 Mar 2025 21:48:42 +0100
Subject: [PATCH] Add menu command Subject: [PATCH] Add menu command
--- ---
config.def.h | 8 +++ config.def.h | 8 +++
dwl.c | 153 +++++++++++++++++++++++++++++++++++++++++++++++++++ dwl.c | 156 +++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 161 insertions(+) 2 files changed, 164 insertions(+)
diff --git a/config.def.h b/config.def.h diff --git a/config.def.h b/config.def.h
index 22d2171..a5914ca 100644 index 22d2171..a5914ca 100644
@ -35,7 +35,7 @@ index 22d2171..a5914ca 100644
{ MODKEY, XKB_KEY_e, togglefullscreen, {0} }, { MODKEY, XKB_KEY_e, togglefullscreen, {0} },
{ MODKEY, XKB_KEY_0, view, {.ui = ~0} }, { MODKEY, XKB_KEY_0, view, {.ui = ~0} },
diff --git a/dwl.c b/dwl.c diff --git a/dwl.c b/dwl.c
index def2562..868d0d0 100644 index def2562..b0e8310 100644
--- a/dwl.c --- a/dwl.c
+++ b/dwl.c +++ b/dwl.c
@@ -242,6 +242,12 @@ typedef struct { @@ -242,6 +242,12 @@ typedef struct {
@ -76,7 +76,7 @@ index def2562..868d0d0 100644
#ifdef XWAYLAND #ifdef XWAYLAND
static void activatex11(struct wl_listener *listener, void *data); static void activatex11(struct wl_listener *listener, void *data);
static void associatex11(struct wl_listener *listener, void *data); static void associatex11(struct wl_listener *listener, void *data);
@@ -1768,6 +1785,142 @@ maximizenotify(struct wl_listener *listener, void *data) @@ -1768,6 +1785,145 @@ maximizenotify(struct wl_listener *listener, void *data)
wlr_xdg_surface_schedule_configure(c->surface.xdg); wlr_xdg_surface_schedule_configure(c->surface.xdg);
} }
@ -133,12 +133,15 @@ index def2562..868d0d0 100644
+ static int i = 0; + static int i = 0;
+ +
+ if (mask & (WL_EVENT_HANGUP | WL_EVENT_ERROR)) { + if (mask & (WL_EVENT_HANGUP | WL_EVENT_ERROR)) {
+ i = 0;
+ menu(&(const Arg){ .v = NULL }); + menu(&(const Arg){ .v = NULL });
+ return 0; + return 0;
+ } + }
+ if ((n = read(menu_fd, line + i, LENGTH(line) - 1 - i)) == -1) { + if ((n = read(menu_fd, line + i, LENGTH(line) - 1 - i)) == -1) {
+ if (errno != EAGAIN) + if (errno != EAGAIN) {
+ i = 0;
+ menu(&(const Arg){ .v = NULL }); + menu(&(const Arg){ .v = NULL });
+ }
+ return 0; + return 0;
+ } + }
+ line[i + n] = '\0'; + line[i + n] = '\0';