sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[[SM-Commit] ] GIT changes to master grimoire by Ismael Luceno (fd7137af63a9937fc50954d3772bd56cb4b38420)
- From: Ismael Luceno <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org, sm-commit AT lists.sourcemage.org
- Subject: [[SM-Commit] ] GIT changes to master grimoire by Ismael Luceno (fd7137af63a9937fc50954d3772bd56cb4b38420)
- Date: Wed, 11 Sep 2024 14:07:42 +0000
GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:
windowmanagers/sway/patches/0001-Drop-wl_drm.patch
| 12 -
windowmanagers/sway/patches/0002-meson-bump-wlroots-version-after-0.17.0-release.patch
| 10
windowmanagers/sway/patches/0003-Chase-wlroots-4440.patch
| 14 -
windowmanagers/sway/patches/0004-Add-wlr-util-transform.h-includes.patch
| 10
windowmanagers/sway/patches/0005-Pass-wl_display-to-wlr_output_layout.patch
| 12 -
windowmanagers/sway/patches/0006-Chase-wlroots-4482.patch
| 8
windowmanagers/sway/patches/0007-Chase-wlroots-4003.patch
| 12 -
windowmanagers/sway/patches/0008-Chase-wlroots-4443.patch
| 14 -
windowmanagers/sway/patches/0009-Convert-to-new-pointer-enums.patch
| 92 ++++----
windowmanagers/sway/patches/0010-input-Rename-WLR_INPUT_DEVICE_TABLET_TOOL-to-WLR_INP.patch
| 110 ++++++++++
windowmanagers/sway/patches/0010-input-Rename-WLR_INPUT_DEVICE_TABLET_TOOL-to.patch
| 107 ---------
windowmanagers/sway/patches/0011-Fetch-input-device-vendor-product-from-libinput.patch
| 16 -
windowmanagers/sway/patches/0012-Update-for-versioned-wlroots-files.patch
| 10
windowmanagers/sway/patches/0013-input-pass-wlr_seat_client-to-wlr_seat_touch_notify_.patch
| 34 +++
windowmanagers/sway/patches/0013-input-pass-wlr_seat_client-to-wlr_seat_touch_notify_cancel-.patch
| 31 --
windowmanagers/sway/patches/0014-server-Use-wlr_renderer_get_texture_formats.patch
| 13 -
windowmanagers/sway/patches/0015-protocols-use-tablet-v2-xml-from-stable-.patch
| 29 --
windowmanagers/sway/patches/0015-protocols-use-tablet-v2-xml-from-stable.patch
| 31 ++
18 files changed, 298 insertions(+), 267 deletions(-)
New commits:
commit fd7137af63a9937fc50954d3772bd56cb4b38420
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>
sway: Update patch metadata
diff --git a/windowmanagers/sway/patches/0001-Drop-wl_drm.patch
b/windowmanagers/sway/patches/0001-Drop-wl_drm.patch
index 9e063ab..e9856c3 100644
--- a/windowmanagers/sway/patches/0001-Drop-wl_drm.patch
+++ b/windowmanagers/sway/patches/0001-Drop-wl_drm.patch
@@ -1,17 +1,19 @@
-From 7e69a7076fc8a4eb788e0229b1c99dd0b7b04bb7 Mon Sep 17 00:00:00 2001
+From b9ec4b8763f3106f0d1dbf3138ee5f2dd55b860d Mon Sep 17 00:00:00 2001
From: Simon Ser <contact AT emersion.fr>
Date: Wed, 18 Oct 2023 14:55:26 +0200
-Subject: [PATCH 1/15] Drop wl_drm
+Subject: [PATCH 01/15] Drop wl_drm
See https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/4397
-Signed-off-by: Ismael Luceno <ismael AT iodev.co.uk>
+Origin: Upstream
+Upstream-Status: Backported [commit 7e69a7076fc8a4eb788e0229b1c99dd0b7b04bb7]
+Signed-off-by: Ismael Luceno <ismael AT sourcemage.org>
---
sway/server.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/sway/server.c b/sway/server.c
-index 69a9f27ee9a7..e34ea2ff37c4 100644
+index 9edc8bfc276f..eac9719df3ba 100644
--- a/sway/server.c
+++ b/sway/server.c
@@ -13,7 +13,6 @@
@@ -22,7 +24,7 @@ index 69a9f27ee9a7..e34ea2ff37c4 100644
#include <wlr/types/wlr_export_dmabuf_v1.h>
#include <wlr/types/wlr_fractional_scale_v1.h>
#include <wlr/types/wlr_gamma_control_v1.h>
-@@ -178,7 +177,6 @@ bool server_init(struct sway_server *server) {
+@@ -147,7 +146,6 @@ bool server_init(struct sway_server *server) {
wlr_renderer_init_wl_shm(server->renderer, server->wl_display);
if (wlr_renderer_get_dmabuf_texture_formats(server->renderer) !=
NULL) {
diff --git
a/windowmanagers/sway/patches/0002-meson-bump-wlroots-version-after-0.17.0-release.patch
b/windowmanagers/sway/patches/0002-meson-bump-wlroots-version-after-0.17.0-release.patch
index e022354..cf8890e 100644
---
a/windowmanagers/sway/patches/0002-meson-bump-wlroots-version-after-0.17.0-release.patch
+++
b/windowmanagers/sway/patches/0002-meson-bump-wlroots-version-after-0.17.0-release.patch
@@ -1,15 +1,17 @@
-From 4ad15a4015feef2ecfba311c13e64e3976cc611c Mon Sep 17 00:00:00 2001
+From 452d9985229d5676e2fc5b2f0f64b0845a2127eb Mon Sep 17 00:00:00 2001
From: llyyr <llyyr.public AT gmail.com>
Date: Tue, 21 Nov 2023 23:55:19 +0530
-Subject: [PATCH 2/15] meson: bump wlroots version after 0.17.0 release
+Subject: [PATCH 02/15] meson: bump wlroots version after 0.17.0 release
-Signed-off-by: Ismael Luceno <ismael AT iodev.co.uk>
+Origin: Upstream
+Upstream-Status: Backported [commit 4ad15a4015feef2ecfba311c13e64e3976cc611c]
+Signed-off-by: Ismael Luceno <ismael AT sourcemage.org>
---
meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
-index eeee39cde85b..adf49c196c19 100644
+index c52d6629ab48..75654ad1df7c 100644
--- a/meson.build
+++ b/meson.build
@@ -37,7 +37,7 @@ if is_freebsd
diff --git a/windowmanagers/sway/patches/0003-Chase-wlroots-4440.patch
b/windowmanagers/sway/patches/0003-Chase-wlroots-4440.patch
index 2907c4e..517d0a0 100644
--- a/windowmanagers/sway/patches/0003-Chase-wlroots-4440.patch
+++ b/windowmanagers/sway/patches/0003-Chase-wlroots-4440.patch
@@ -1,10 +1,12 @@
-From a946b1aecfa3f32a3bfae66d66df0bdf77440d69 Mon Sep 17 00:00:00 2001
+From 199a4719afed9a517787f8f3dcc6e9aca7da4191 Mon Sep 17 00:00:00 2001
From: llyyr <llyyr.public AT gmail.com>
Date: Wed, 22 Nov 2023 00:05:03 +0530
-Subject: [PATCH 3/15] Chase wlroots!4440
+Subject: [PATCH 03/15] Chase wlroots!4440
References:
https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/4440
-Signed-off-by: Ismael Luceno <ismael AT iodev.co.uk>
+Origin: Upstream
+Upstream-Status: Backported [commit a946b1aecfa3f32a3bfae66d66df0bdf77440d69]
+Signed-off-by: Ismael Luceno <ismael AT sourcemage.org>
---
include/sway/input/input-manager.h | 2 -
protocols/meson.build | 1 -
@@ -120,7 +122,7 @@ index b62d1bb440a5..000000000000
- </interface>
-</protocol>
diff --git a/sway/input/input-manager.c b/sway/input/input-manager.c
-index dcaeb056ecef..4febc333426f 100644
+index 288fddc419e5..c1bbdde0e615 100644
--- a/sway/input/input-manager.c
+++ b/sway/input/input-manager.c
@@ -6,7 +6,6 @@
@@ -182,10 +184,10 @@ index dcaeb056ecef..4febc333426f 100644
wlr_keyboard_shortcuts_inhibit_v1_create(server->wl_display);
input->keyboard_shortcuts_inhibit_new_inhibitor.notify =
diff --git a/sway/server.c b/sway/server.c
-index 217c9ac940ac..de70e0abc682 100644
+index eac9719df3ba..d479bda7a3c4 100644
--- a/sway/server.c
+++ b/sway/server.c
-@@ -87,7 +87,6 @@ static bool is_privileged(const struct wl_global *global) {
+@@ -97,7 +97,6 @@ static bool is_privileged(const struct wl_global *global) {
global == server.gamma_control_manager_v1->global ||
global == server.layer_shell->global ||
global == server.session_lock.manager->global ||
diff --git
a/windowmanagers/sway/patches/0004-Add-wlr-util-transform.h-includes.patch
b/windowmanagers/sway/patches/0004-Add-wlr-util-transform.h-includes.patch
index 61085a8..b1f99d2 100644
--- a/windowmanagers/sway/patches/0004-Add-wlr-util-transform.h-includes.patch
+++ b/windowmanagers/sway/patches/0004-Add-wlr-util-transform.h-includes.patch
@@ -1,11 +1,13 @@
-From fd6d6f1d97deea2fc94aaeb58c85c99a498d905b Mon Sep 17 00:00:00 2001
+From 8b8448ab7522881be2c500580f834129bfe7fa4d Mon Sep 17 00:00:00 2001
From: Simon Ser <contact AT emersion.fr>
Date: Thu, 23 Nov 2023 13:08:09 +0100
-Subject: [PATCH 4/15] Add wlr/util/transform.h includes
+Subject: [PATCH 04/15] Add wlr/util/transform.h includes
References:
https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/4097
Closes: https://github.com/swaywm/sway/issues/7830
-Signed-off-by: Ismael Luceno <ismael AT iodev.co.uk>
+Origin: Upstream
+Upstream-Status: Backported [commit fd6d6f1d97deea2fc94aaeb58c85c99a498d905b]
+Signed-off-by: Ismael Luceno <ismael AT sourcemage.org>
---
sway/commands/output/transform.c | 1 +
sway/desktop/output.c | 1 +
@@ -24,7 +26,7 @@ index f4fcc8c99a24..8db71bb30b4f 100644
#include "sway/config.h"
#include "log.h"
diff --git a/sway/desktop/output.c b/sway/desktop/output.c
-index e02ab32d0ded..d9328701c98a 100644
+index bb61e1bde232..d525b2b4b877 100644
--- a/sway/desktop/output.c
+++ b/sway/desktop/output.c
@@ -16,6 +16,7 @@
diff --git
a/windowmanagers/sway/patches/0005-Pass-wl_display-to-wlr_output_layout.patch
b/windowmanagers/sway/patches/0005-Pass-wl_display-to-wlr_output_layout.patch
index 7fc4b89..aa9116b 100644
---
a/windowmanagers/sway/patches/0005-Pass-wl_display-to-wlr_output_layout.patch
+++
b/windowmanagers/sway/patches/0005-Pass-wl_display-to-wlr_output_layout.patch
@@ -1,10 +1,12 @@
-From 128b6253a924c30e8e4fd1f09ce19e21a826c5ad Mon Sep 17 00:00:00 2001
+From f6aa00f72f9f16a5e6a225d5975eff7df3f35dc8 Mon Sep 17 00:00:00 2001
From: Simon Ser <contact AT emersion.fr>
Date: Thu, 23 Nov 2023 13:08:53 +0100
-Subject: [PATCH 5/15] Pass wl_display to wlr_output_layout
+Subject: [PATCH 05/15] Pass wl_display to wlr_output_layout
References:
https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/4310
-Signed-off-by: Ismael Luceno <ismael AT iodev.co.uk>
+Origin: Upstream
+Upstream-Status: Backported [commit 128b6253a924c30e8e4fd1f09ce19e21a826c5ad]
+Signed-off-by: Ismael Luceno <ismael AT sourcemage.org>
---
include/sway/tree/root.h | 2 +-
sway/main.c | 2 --
@@ -39,10 +41,10 @@ index 85bc2f1c9658..23689757e0a2 100644
return 1;
}
diff --git a/sway/server.c b/sway/server.c
-index de70e0abc682..e4f8a7c8ca67 100644
+index d479bda7a3c4..a49fa0d8a034 100644
--- a/sway/server.c
+++ b/sway/server.c
-@@ -120,6 +120,8 @@ bool server_init(struct sway_server *server) {
+@@ -130,6 +130,8 @@ bool server_init(struct sway_server *server) {
wl_display_set_global_filter(server->wl_display, filter_global, NULL);
diff --git a/windowmanagers/sway/patches/0006-Chase-wlroots-4482.patch
b/windowmanagers/sway/patches/0006-Chase-wlroots-4482.patch
index a0c320a..28406f3 100644
--- a/windowmanagers/sway/patches/0006-Chase-wlroots-4482.patch
+++ b/windowmanagers/sway/patches/0006-Chase-wlroots-4482.patch
@@ -1,9 +1,11 @@
-From 64d644f0da15e4aef85ca1800b90aa65e333933c Mon Sep 17 00:00:00 2001
+From afd701c8297614d7a4657ca06888924c338fe271 Mon Sep 17 00:00:00 2001
From: Bill Li <billli11hkb AT gmail.com>
Date: Thu, 28 Dec 2023 03:33:53 +0800
-Subject: [PATCH 6/15] Chase wlroots!4482
+Subject: [PATCH 06/15] Chase wlroots!4482
-Signed-off-by: Ismael Luceno <ismael AT iodev.co.uk>
+Origin: Upstream
+Upstream-Status: Backported [commit 64d644f0da15e4aef85ca1800b90aa65e333933c]
+Signed-off-by: Ismael Luceno <ismael AT sourcemage.org>
---
sway/desktop/output.c | 2 +-
sway/desktop/render.c | 2 +-
diff --git a/windowmanagers/sway/patches/0007-Chase-wlroots-4003.patch
b/windowmanagers/sway/patches/0007-Chase-wlroots-4003.patch
index 6ff1c4b..71cd25a 100644
--- a/windowmanagers/sway/patches/0007-Chase-wlroots-4003.patch
+++ b/windowmanagers/sway/patches/0007-Chase-wlroots-4003.patch
@@ -1,19 +1,21 @@
-From a4e85332a1fe6b079c6da1689ca33d8ba4c71977 Mon Sep 17 00:00:00 2001
+From 4f4d22f5919059d91b3ac97a7537fb38fbcaf1c4 Mon Sep 17 00:00:00 2001
From: Kirill Primak <vyivel AT eclair.cafe>
Date: Mon, 22 Jan 2024 21:24:41 +0300
-Subject: [PATCH 7/15] Chase wlroots!4003
+Subject: [PATCH 07/15] Chase wlroots!4003
-Signed-off-by: Ismael Luceno <ismael AT iodev.co.uk>
+Origin: Upstream
+Upstream-Status: Backported [commit a4e85332a1fe6b079c6da1689ca33d8ba4c71977]
+Signed-off-by: Ismael Luceno <ismael AT sourcemage.org>
---
sway/input/seatop_default.c | 5 +++--
sway/input/seatop_down.c | 3 ++-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/sway/input/seatop_default.c b/sway/input/seatop_default.c
-index 0f4d03850b27..c56330fd90ef 100644
+index 1dce6dae2ed4..54dac8dab5e7 100644
--- a/sway/input/seatop_default.c
+++ b/sway/input/seatop_default.c
-@@ -796,8 +796,9 @@ static void handle_pointer_axis(struct sway_seat *seat,
+@@ -802,8 +802,9 @@ static void handle_pointer_axis(struct sway_seat *seat,
if (!handled) {
wlr_seat_pointer_notify_axis(cursor->seat->wlr_seat,
event->time_msec,
diff --git a/windowmanagers/sway/patches/0008-Chase-wlroots-4443.patch
b/windowmanagers/sway/patches/0008-Chase-wlroots-4443.patch
index 7ff7475..aedc1ba 100644
--- a/windowmanagers/sway/patches/0008-Chase-wlroots-4443.patch
+++ b/windowmanagers/sway/patches/0008-Chase-wlroots-4443.patch
@@ -1,18 +1,20 @@
-From f202bc84d2c072ae39fc4e8a350a8b0a616f350b Mon Sep 17 00:00:00 2001
+From 21938477e5f0032419c3aad4d7f8c24e5ce162f9 Mon Sep 17 00:00:00 2001
From: Kirill Primak <vyivel AT eclair.cafe>
Date: Thu, 25 Jan 2024 18:10:50 +0300
-Subject: [PATCH 8/15] Chase wlroots!4443
+Subject: [PATCH 08/15] Chase wlroots!4443
-Signed-off-by: Ismael Luceno <ismael AT iodev.co.uk>
+Origin: Upstream
+Upstream-Status: Backported [commit f202bc84d2c072ae39fc4e8a350a8b0a616f350b]
+Signed-off-by: Ismael Luceno <ismael AT sourcemage.org>
---
sway/server.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sway/server.c b/sway/server.c
-index 73bf9d70eb6f..cc20e89d7c05 100644
+index a49fa0d8a034..81df98a07727 100644
--- a/sway/server.c
+++ b/sway/server.c
-@@ -172,7 +172,7 @@ bool server_init(struct sway_server *server) {
+@@ -132,7 +132,7 @@ bool server_init(struct sway_server *server) {
root = root_create(server->wl_display);
@@ -21,7 +23,7 @@ index 73bf9d70eb6f..cc20e89d7c05 100644
if (!server->backend) {
sway_log(SWAY_ERROR, "Unable to create backend");
return false;
-@@ -355,7 +355,7 @@ bool server_init(struct sway_server *server) {
+@@ -313,7 +313,7 @@ bool server_init(struct sway_server *server) {
return false;
}
diff --git
a/windowmanagers/sway/patches/0009-Convert-to-new-pointer-enums.patch
b/windowmanagers/sway/patches/0009-Convert-to-new-pointer-enums.patch
index e94a31c..78dc482 100644
--- a/windowmanagers/sway/patches/0009-Convert-to-new-pointer-enums.patch
+++ b/windowmanagers/sway/patches/0009-Convert-to-new-pointer-enums.patch
@@ -1,10 +1,12 @@
-From fca8474e9bd64bff8df16fdaf409d5f575ba9501 Mon Sep 17 00:00:00 2001
+From b2e33ad1468e9a663618a39ec822d2df8c4d220a Mon Sep 17 00:00:00 2001
From: Simon Ser <contact AT emersion.fr>
Date: Wed, 28 Feb 2024 17:49:58 +0100
-Subject: [PATCH 9/15] Convert to new pointer enums
+Subject: [PATCH 09/15] Convert to new pointer enums
References:
https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/4575
-Signed-off-by: Ismael Luceno <ismael AT iodev.co.uk>
+Origin: Upstream
+Upstream-Status: Backported [commit fca8474e9bd64bff8df16fdaf409d5f575ba9501]
+Signed-off-by: Ismael Luceno <ismael AT sourcemage.org>
---
include/sway/input/cursor.h | 2 +-
include/sway/input/seat.h | 6 ++---
@@ -33,10 +35,10 @@ index 1e21c66fe326..527d03500c70 100644
void dispatch_cursor_axis(struct sway_cursor *cursor,
struct wlr_pointer_axis_event *event);
diff --git a/include/sway/input/seat.h b/include/sway/input/seat.h
-index e5aa847837ec..475753d8a9f0 100644
+index 97e81c1902c4..112d18b8952f 100644
--- a/include/sway/input/seat.h
+++ b/include/sway/input/seat.h
-@@ -17,7 +17,7 @@ struct sway_seat;
+@@ -17,7 +17,7 @@ struct render_context;
struct sway_seatop_impl {
void (*button)(struct sway_seat *seat, uint32_t time_msec,
struct wlr_input_device *device, uint32_t button,
@@ -45,7 +47,7 @@ index e5aa847837ec..475753d8a9f0 100644
void (*pointer_motion)(struct sway_seat *seat, uint32_t time_msec);
void (*pointer_axis)(struct sway_seat *seat,
struct wlr_pointer_axis_event *event);
-@@ -286,13 +286,13 @@ struct sway_container
*seat_get_focus_inactive_floating(struct sway_seat *seat,
+@@ -296,13 +296,13 @@ struct sway_container
*seat_get_focus_inactive_floating(struct sway_seat *seat,
struct sway_workspace *workspace);
void seat_pointer_notify_button(struct sway_seat *seat, uint32_t time_msec,
@@ -62,10 +64,10 @@ index e5aa847837ec..475753d8a9f0 100644
void seatop_pointer_motion(struct sway_seat *seat, uint32_t time_msec);
diff --git a/sway/commands/seat/cursor.c b/sway/commands/seat/cursor.c
-index 85c5edcadb8a..df7c379d1089 100644
+index 5a8a3bc8f770..7236f27f2925 100644
--- a/sway/commands/seat/cursor.c
+++ b/sway/commands/seat/cursor.c
-@@ -84,12 +84,12 @@ struct cmd_results *seat_cmd_cursor(int argc, char
**argv) {
+@@ -85,12 +85,12 @@ struct cmd_results *seat_cmd_cursor(int argc, char
**argv) {
static struct cmd_results *press_or_release(struct sway_cursor *cursor,
char *action, char *button_str) {
@@ -81,7 +83,7 @@ index 85c5edcadb8a..df7c379d1089 100644
} else {
return cmd_results_new(CMD_INVALID, "%s", expected_syntax);
}
-@@ -104,16 +104,16 @@ static struct cmd_results *press_or_release(struct
sway_cursor *cursor,
+@@ -105,16 +105,16 @@ static struct cmd_results *press_or_release(struct
sway_cursor *cursor,
} else if (button == SWAY_SCROLL_UP || button == SWAY_SCROLL_DOWN
|| button == SWAY_SCROLL_LEFT || button ==
SWAY_SCROLL_RIGHT) {
// Dispatch axis event
@@ -103,10 +105,10 @@ index 85c5edcadb8a..df7c379d1089 100644
.delta = delta * 15,
.delta_discrete = delta
diff --git a/sway/input/cursor.c b/sway/input/cursor.c
-index e8cd8112232c..7d66a89d98bd 100644
+index 36aab93e23f8..a275045e0603 100644
--- a/sway/input/cursor.c
+++ b/sway/input/cursor.c
-@@ -356,7 +356,7 @@ static void handle_pointer_motion_absolute(
+@@ -429,7 +429,7 @@ static void handle_pointer_motion_absolute(
void dispatch_cursor_button(struct sway_cursor *cursor,
struct wlr_input_device *device, uint32_t time_msec, uint32_t
button,
@@ -115,7 +117,7 @@ index e8cd8112232c..7d66a89d98bd 100644
if (time_msec == 0) {
time_msec = get_current_time_msec();
}
-@@ -368,7 +368,7 @@ static void handle_pointer_button(struct wl_listener
*listener, void *data) {
+@@ -441,7 +441,7 @@ static void handle_pointer_button(struct wl_listener
*listener, void *data) {
struct sway_cursor *cursor = wl_container_of(listener, cursor,
button);
struct wlr_pointer_button_event *event = data;
@@ -124,7 +126,7 @@ index e8cd8112232c..7d66a89d98bd 100644
cursor->pressed_button_count++;
} else {
if (cursor->pressed_button_count > 0) {
-@@ -430,7 +430,7 @@ static void handle_touch_up(struct wl_listener
*listener, void *data) {
+@@ -503,7 +503,7 @@ static void handle_touch_up(struct wl_listener
*listener, void *data) {
if (cursor->pointer_touch_id == cursor->seat->touch_id) {
cursor->pointer_touch_up = true;
dispatch_cursor_button(cursor, &event->touch->base,
@@ -133,7 +135,7 @@ index e8cd8112232c..7d66a89d98bd 100644
}
} else {
seatop_touch_up(seat, event);
-@@ -448,7 +448,7 @@ static void handle_touch_cancel(struct wl_listener
*listener, void *data) {
+@@ -521,7 +521,7 @@ static void handle_touch_cancel(struct wl_listener
*listener, void *data) {
if (cursor->pointer_touch_id == cursor->seat->touch_id) {
cursor->pointer_touch_up = true;
dispatch_cursor_button(cursor, &event->touch->base,
@@ -142,7 +144,7 @@ index e8cd8112232c..7d66a89d98bd 100644
}
} else {
seatop_touch_cancel(seat, event);
-@@ -661,7 +661,7 @@ static void handle_tool_tip(struct wl_listener
*listener, void *data) {
+@@ -738,7 +738,7 @@ static void handle_tool_tip(struct wl_listener
*listener, void *data) {
event->state == WLR_TABLET_TOOL_TIP_UP) {
cursor->simulating_pointer_from_tool_tip = false;
dispatch_cursor_button(cursor, &event->tablet->base,
event->time_msec,
@@ -151,7 +153,7 @@ index e8cd8112232c..7d66a89d98bd 100644
wlr_seat_pointer_notify_frame(cursor->seat->wlr_seat);
} else if (!surface || !wlr_surface_accepts_tablet_v2(tablet_v2,
surface)) {
// If we started holding the tool tip down on a surface that
accepts
-@@ -673,7 +673,7 @@ static void handle_tool_tip(struct wl_listener
*listener, void *data) {
+@@ -750,7 +750,7 @@ static void handle_tool_tip(struct wl_listener
*listener, void *data) {
} else {
cursor->simulating_pointer_from_tool_tip = true;
dispatch_cursor_button(cursor, &event->tablet->base,
@@ -160,7 +162,7 @@ index e8cd8112232c..7d66a89d98bd 100644
wlr_seat_pointer_notify_frame(cursor->seat->wlr_seat);
}
} else {
-@@ -776,13 +776,13 @@ static void handle_tool_button(struct wl_listener
*listener, void *data) {
+@@ -853,13 +853,13 @@ static void handle_tool_button(struct wl_listener
*listener, void *data) {
case WLR_BUTTON_PRESSED:
if (cursor->tool_buttons == 0) {
dispatch_cursor_button(cursor,
&event->tablet->base,
@@ -177,10 +179,10 @@ index e8cd8112232c..7d66a89d98bd 100644
break;
}
diff --git a/sway/input/seat.c b/sway/input/seat.c
-index 9dd078c6163e..7ae298288197 100644
+index 0fd0e8e65fc0..1b29e1a6c0c3 100644
--- a/sway/input/seat.c
+++ b/sway/input/seat.c
-@@ -1520,7 +1520,7 @@ struct seat_config *seat_get_config_by_name(const char
*name) {
+@@ -1575,7 +1575,7 @@ struct seat_config *seat_get_config_by_name(const char
*name) {
}
void seat_pointer_notify_button(struct sway_seat *seat, uint32_t time_msec,
@@ -189,7 +191,7 @@ index 9dd078c6163e..7ae298288197 100644
seat->last_button_serial =
wlr_seat_pointer_notify_button(seat->wlr_seat,
time_msec, button, state);
}
-@@ -1557,7 +1557,7 @@ void seatop_unref(struct sway_seat *seat, struct
sway_container *con) {
+@@ -1612,7 +1612,7 @@ void seatop_unref(struct sway_seat *seat, struct
sway_container *con) {
void seatop_button(struct sway_seat *seat, uint32_t time_msec,
struct wlr_input_device *device, uint32_t button,
@@ -199,10 +201,10 @@ index 9dd078c6163e..7ae298288197 100644
seat->seatop_impl->button(seat, time_msec, device, button,
state);
}
diff --git a/sway/input/seatop_default.c b/sway/input/seatop_default.c
-index f2a9c2cdf4cd..0c6f7c5e385c 100644
+index 54dac8dab5e7..af22b9cf34f4 100644
--- a/sway/input/seatop_default.c
+++ b/sway/input/seatop_default.c
-@@ -290,7 +290,7 @@ static void handle_tablet_tool_tip(struct sway_seat
*seat,
+@@ -287,7 +287,7 @@ static void handle_tablet_tool_tip(struct sway_seat
*seat,
static bool trigger_pointer_button_binding(struct sway_seat *seat,
struct wlr_input_device *device, uint32_t button,
@@ -211,7 +213,7 @@ index f2a9c2cdf4cd..0c6f7c5e385c 100644
bool on_titlebar, bool on_border, bool on_contents, bool
on_workspace) {
// We can reach this for non-pointer devices if we're currently
emulating
// pointer input for one. Emulated input should not trigger bindings.
The
-@@ -304,7 +304,7 @@ static bool trigger_pointer_button_binding(struct
sway_seat *seat,
+@@ -301,7 +301,7 @@ static bool trigger_pointer_button_binding(struct
sway_seat *seat,
char *device_identifier = device ? input_device_get_identifier(device)
: strdup("*");
struct sway_binding *binding = NULL;
@@ -220,7 +222,7 @@ index f2a9c2cdf4cd..0c6f7c5e385c 100644
state_add_button(e, button);
binding = get_active_mouse_binding(e,
config->current_mode->mouse_bindings, modifiers,
false,
-@@ -329,7 +329,7 @@ static bool trigger_pointer_button_binding(struct
sway_seat *seat,
+@@ -326,7 +326,7 @@ static bool trigger_pointer_button_binding(struct
sway_seat *seat,
static void handle_button(struct sway_seat *seat, uint32_t time_msec,
struct wlr_input_device *device, uint32_t button,
@@ -229,7 +231,7 @@ index f2a9c2cdf4cd..0c6f7c5e385c 100644
struct sway_cursor *cursor = seat->cursor;
// Determine what's under the cursor
-@@ -362,7 +362,7 @@ static void handle_button(struct sway_seat *seat,
uint32_t time_msec,
+@@ -359,7 +359,7 @@ static void handle_button(struct sway_seat *seat,
uint32_t time_msec,
// Handle clicking an empty workspace
if (node && node->type == N_WORKSPACE) {
@@ -238,7 +240,7 @@ index f2a9c2cdf4cd..0c6f7c5e385c 100644
seat_set_focus(seat, node);
transaction_commit_dirty();
}
-@@ -377,7 +377,7 @@ static void handle_button(struct sway_seat *seat,
uint32_t time_msec,
+@@ -374,7 +374,7 @@ static void handle_button(struct sway_seat *seat,
uint32_t time_msec,
seat_set_focus_layer(seat, layer);
transaction_commit_dirty();
}
@@ -247,7 +249,7 @@ index f2a9c2cdf4cd..0c6f7c5e385c 100644
seatop_begin_down_on_surface(seat, surface, sx, sy);
}
seat_pointer_notify_button(seat, time_msec, button, state);
-@@ -386,7 +386,7 @@ static void handle_button(struct sway_seat *seat,
uint32_t time_msec,
+@@ -383,7 +383,7 @@ static void handle_button(struct sway_seat *seat,
uint32_t time_msec,
// Handle tiling resize via border
if (cont && resize_edge && button == BTN_LEFT &&
@@ -256,7 +258,7 @@ index f2a9c2cdf4cd..0c6f7c5e385c 100644
// If a resize is triggered on a tabbed or stacked container,
change
// focus to the tab which already had inactive focus --
otherwise, we'd
// change the active tab when the user probably just wanted
to resize.
-@@ -404,7 +404,7 @@ static void handle_button(struct sway_seat *seat,
uint32_t time_msec,
+@@ -401,7 +401,7 @@ static void handle_button(struct sway_seat *seat,
uint32_t time_msec,
// Handle tiling resize via mod
bool mod_pressed = modifiers & config->floating_mod;
if (cont && !is_floating_or_child && mod_pressed &&
@@ -265,7 +267,7 @@ index f2a9c2cdf4cd..0c6f7c5e385c 100644
uint32_t btn_resize = config->floating_mod_inverse ?
BTN_LEFT : BTN_RIGHT;
if (button == btn_resize) {
-@@ -432,7 +432,7 @@ static void handle_button(struct sway_seat *seat,
uint32_t time_msec,
+@@ -429,7 +429,7 @@ static void handle_button(struct sway_seat *seat,
uint32_t time_msec,
}
// Handle changing focus when clicking on a container
@@ -274,7 +276,7 @@ index f2a9c2cdf4cd..0c6f7c5e385c 100644
// Default case: focus the container that was just clicked.
node = &cont->node;
-@@ -453,7 +453,7 @@ static void handle_button(struct sway_seat *seat,
uint32_t time_msec,
+@@ -450,7 +450,7 @@ static void handle_button(struct sway_seat *seat,
uint32_t time_msec,
// Handle beginning floating move
if (cont && is_floating_or_child && !is_fullscreen_or_child &&
@@ -283,7 +285,7 @@ index f2a9c2cdf4cd..0c6f7c5e385c 100644
uint32_t btn_move = config->floating_mod_inverse ? BTN_RIGHT
: BTN_LEFT;
if (button == btn_move && (mod_pressed || on_titlebar)) {
seatop_begin_move_floating(seat,
container_toplevel_ancestor(cont));
-@@ -463,7 +463,7 @@ static void handle_button(struct sway_seat *seat,
uint32_t time_msec,
+@@ -460,7 +460,7 @@ static void handle_button(struct sway_seat *seat,
uint32_t time_msec,
// Handle beginning floating resize
if (cont && is_floating_or_child && !is_fullscreen_or_child &&
@@ -292,7 +294,7 @@ index f2a9c2cdf4cd..0c6f7c5e385c 100644
// Via border
if (button == BTN_LEFT && resize_edge != WLR_EDGE_NONE) {
seat_set_focus_container(seat, cont);
-@@ -489,7 +489,7 @@ static void handle_button(struct sway_seat *seat,
uint32_t time_msec,
+@@ -486,7 +486,7 @@ static void handle_button(struct sway_seat *seat,
uint32_t time_msec,
// Handle moving a tiling container
if (config->tiling_drag && (mod_pressed || on_titlebar) &&
@@ -301,7 +303,7 @@ index f2a9c2cdf4cd..0c6f7c5e385c 100644
cont && cont->pending.fullscreen_mode ==
FULLSCREEN_NONE) {
// If moving a container by its title bar, use a threshold
for the drag
if (!mod_pressed && config->tiling_drag_threshold > 0) {
-@@ -502,14 +502,14 @@ static void handle_button(struct sway_seat *seat,
uint32_t time_msec,
+@@ -499,14 +499,14 @@ static void handle_button(struct sway_seat *seat,
uint32_t time_msec,
}
// Handle mousedown on a container surface
@@ -319,7 +321,7 @@ index f2a9c2cdf4cd..0c6f7c5e385c 100644
seat_pointer_notify_button(seat, time_msec, button, state);
return;
}
-@@ -684,7 +684,7 @@ static void handle_touch_down(struct sway_seat *seat,
+@@ -691,7 +691,7 @@ static void handle_touch_down(struct sway_seat *seat,
pointer_motion(cursor, event->time_msec, &event->touch->base,
dx, dy,
dx, dy);
dispatch_cursor_button(cursor, &event->touch->base,
event->time_msec,
@@ -328,7 +330,7 @@ index f2a9c2cdf4cd..0c6f7c5e385c 100644
}
}
-@@ -694,9 +694,9 @@ static void handle_touch_down(struct sway_seat *seat,
+@@ -701,9 +701,9 @@ static void handle_touch_down(struct sway_seat *seat,
static uint32_t wl_axis_to_button(struct wlr_pointer_axis_event *event) {
switch (event->orientation) {
@@ -341,10 +343,10 @@ index f2a9c2cdf4cd..0c6f7c5e385c 100644
default:
sway_log(SWAY_DEBUG, "Unknown axis orientation");
diff --git a/sway/input/seatop_down.c b/sway/input/seatop_down.c
-index 12d7ae7a6ee7..35fd3bcb2024 100644
+index b4421fe6ad0a..44b345d12dd4 100644
--- a/sway/input/seatop_down.c
+++ b/sway/input/seatop_down.c
-@@ -142,7 +142,7 @@ static void handle_pointer_axis(struct sway_seat *seat,
+@@ -143,7 +143,7 @@ static void handle_pointer_axis(struct sway_seat *seat,
static void handle_button(struct sway_seat *seat, uint32_t time_msec,
struct wlr_input_device *device, uint32_t button,
@@ -354,10 +356,10 @@ index 12d7ae7a6ee7..35fd3bcb2024 100644
if (seat->cursor->pressed_button_count == 0) {
diff --git a/sway/input/seatop_move_floating.c
b/sway/input/seatop_move_floating.c
-index 7de3f4d8373d..83668d88eee2 100644
+index ddcd4c53e4ec..0efedecc39df 100644
--- a/sway/input/seatop_move_floating.c
+++ b/sway/input/seatop_move_floating.c
-@@ -21,7 +21,7 @@ static void finalize_move(struct sway_seat *seat) {
+@@ -23,7 +23,7 @@ static void finalize_move(struct sway_seat *seat) {
static void handle_button(struct sway_seat *seat, uint32_t time_msec,
struct wlr_input_device *device, uint32_t button,
@@ -367,10 +369,10 @@ index 7de3f4d8373d..83668d88eee2 100644
finalize_move(seat);
}
diff --git a/sway/input/seatop_move_tiling.c
b/sway/input/seatop_move_tiling.c
-index 4f4d6e4198ba..c525b77a9e9b 100644
+index 26704d0d91a8..a1e455a97b97 100644
--- a/sway/input/seatop_move_tiling.c
+++ b/sway/input/seatop_move_tiling.c
-@@ -405,7 +405,7 @@ static void finalize_move(struct sway_seat *seat) {
+@@ -409,7 +409,7 @@ static void finalize_move(struct sway_seat *seat) {
static void handle_button(struct sway_seat *seat, uint32_t time_msec,
struct wlr_input_device *device, uint32_t button,
@@ -380,10 +382,10 @@ index 4f4d6e4198ba..c525b77a9e9b 100644
finalize_move(seat);
}
diff --git a/sway/input/seatop_resize_floating.c
b/sway/input/seatop_resize_floating.c
-index 168dfffe3eee..bec86e33ad43 100644
+index df6830266448..1fe13104b616 100644
--- a/sway/input/seatop_resize_floating.c
+++ b/sway/input/seatop_resize_floating.c
-@@ -20,7 +20,7 @@ struct seatop_resize_floating_event {
+@@ -21,7 +21,7 @@ struct seatop_resize_floating_event {
static void handle_button(struct sway_seat *seat, uint32_t time_msec,
struct wlr_input_device *device, uint32_t button,
@@ -393,10 +395,10 @@ index 168dfffe3eee..bec86e33ad43 100644
struct sway_container *con = e->con;
diff --git a/sway/input/seatop_resize_tiling.c
b/sway/input/seatop_resize_tiling.c
-index 9ce4ff8b1ace..15fd333b390b 100644
+index 869d11b50004..8ab2bcf37fbe 100644
--- a/sway/input/seatop_resize_tiling.c
+++ b/sway/input/seatop_resize_tiling.c
-@@ -45,7 +45,7 @@ static struct sway_container *container_get_resize_sibling(
+@@ -46,7 +46,7 @@ static struct sway_container *container_get_resize_sibling(
static void handle_button(struct sway_seat *seat, uint32_t time_msec,
struct wlr_input_device *device, uint32_t button,
diff --git
a/windowmanagers/sway/patches/0010-input-Rename-WLR_INPUT_DEVICE_TABLET_TOOL-to-WLR_INP.patch
b/windowmanagers/sway/patches/0010-input-Rename-WLR_INPUT_DEVICE_TABLET_TOOL-to-WLR_INP.patch
new file mode 100644
index 0000000..b557816
--- /dev/null
+++
b/windowmanagers/sway/patches/0010-input-Rename-WLR_INPUT_DEVICE_TABLET_TOOL-to-WLR_INP.patch
@@ -0,0 +1,110 @@
+From 5e67e543939561fc84af0ddaf99c1bff048a792d Mon Sep 17 00:00:00 2001
+From: Luofan Chen <clfbbn AT gmail.com>
+Date: Fri, 1 Mar 2024 11:43:14 +0800
+Subject: [PATCH 10/15] input: Rename WLR_INPUT_DEVICE_TABLET_TOOL to
+ WLR_INPUT_DEVICE_TABLET
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+wlroots has changed the naming, causing the following build errors when
+building:
+
+error: ‘WLR_INPUT_DEVICE_TABLET_TOOL’ undeclared
+
+Origin: Upstream
+Upstream-Status: Backported [commit 2058209a130f5051b59d8ebb24196409695deaaf]
+Signed-off-by: Ismael Luceno <ismael AT sourcemage.org>
+---
+ sway/input/cursor.c | 4 ++--
+ sway/input/input-manager.c | 2 +-
+ sway/input/seat.c | 10 +++++-----
+ 3 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/sway/input/cursor.c b/sway/input/cursor.c
+index a275045e0603..0c050be4ee6a 100644
+--- a/sway/input/cursor.c
++++ b/sway/input/cursor.c
+@@ -316,7 +316,7 @@ static enum sway_input_idle_source
idle_source_from_device(
+ return IDLE_SOURCE_POINTER;
+ case WLR_INPUT_DEVICE_TOUCH:
+ return IDLE_SOURCE_TOUCH;
+- case WLR_INPUT_DEVICE_TABLET_TOOL:
++ case WLR_INPUT_DEVICE_TABLET:
+ return IDLE_SOURCE_TABLET_TOOL;
+ case WLR_INPUT_DEVICE_TABLET_PAD:
+ return IDLE_SOURCE_TABLET_PAD;
+@@ -595,7 +595,7 @@ static void apply_mapping_from_region(struct
wlr_input_device *device,
+ double x1 = region->x1, x2 = region->x2;
+ double y1 = region->y1, y2 = region->y2;
+
+- if (region->mm && device->type == WLR_INPUT_DEVICE_TABLET_TOOL) {
++ if (region->mm && device->type == WLR_INPUT_DEVICE_TABLET) {
+ struct wlr_tablet *tablet =
wlr_tablet_from_input_device(device);
+ if (tablet->width_mm == 0 || tablet->height_mm == 0) {
+ return;
+diff --git a/sway/input/input-manager.c b/sway/input/input-manager.c
+index c1bbdde0e615..bac36a168857 100644
+--- a/sway/input/input-manager.c
++++ b/sway/input/input-manager.c
+@@ -112,7 +112,7 @@ const char *input_device_get_type(struct
sway_input_device *device) {
+ return "keyboard";
+ case WLR_INPUT_DEVICE_TOUCH:
+ return "touch";
+- case WLR_INPUT_DEVICE_TABLET_TOOL:
++ case WLR_INPUT_DEVICE_TABLET:
+ return "tablet_tool";
+ case WLR_INPUT_DEVICE_TABLET_PAD:
+ return "tablet_pad";
+diff --git a/sway/input/seat.c b/sway/input/seat.c
+index 1b29e1a6c0c3..cdf4edf603dc 100644
+--- a/sway/input/seat.c
++++ b/sway/input/seat.c
+@@ -640,7 +640,7 @@ static void seat_update_capabilities(struct sway_seat
*seat) {
+ case WLR_INPUT_DEVICE_TOUCH:
+ caps |= WL_SEAT_CAPABILITY_TOUCH;
+ break;
+- case WLR_INPUT_DEVICE_TABLET_TOOL:
++ case WLR_INPUT_DEVICE_TABLET:
+ caps |= WL_SEAT_CAPABILITY_POINTER;
+ break;
+ case WLR_INPUT_DEVICE_SWITCH:
+@@ -698,7 +698,7 @@ static const char *get_builtin_output_name(void) {
+ static bool is_touch_or_tablet_tool(struct sway_seat_device *seat_device) {
+ switch (seat_device->input_device->wlr_device->type) {
+ case WLR_INPUT_DEVICE_TOUCH:
+- case WLR_INPUT_DEVICE_TABLET_TOOL:
++ case WLR_INPUT_DEVICE_TABLET:
+ return true;
+ default:
+ return false;
+@@ -713,7 +713,7 @@ static void seat_apply_input_mapping(struct sway_seat
*seat,
+ switch (sway_device->input_device->wlr_device->type) {
+ case WLR_INPUT_DEVICE_POINTER:
+ case WLR_INPUT_DEVICE_TOUCH:
+- case WLR_INPUT_DEVICE_TABLET_TOOL:
++ case WLR_INPUT_DEVICE_TABLET:
+ break;
+ default:
+ return; // these devices don't support mappings
+@@ -906,7 +906,7 @@ void seat_configure_device(struct sway_seat *seat,
+ case WLR_INPUT_DEVICE_TOUCH:
+ seat_configure_touch(seat, seat_device);
+ break;
+- case WLR_INPUT_DEVICE_TABLET_TOOL:
++ case WLR_INPUT_DEVICE_TABLET:
+ seat_configure_tablet_tool(seat, seat_device);
+ break;
+ case WLR_INPUT_DEVICE_TABLET_PAD:
+@@ -945,7 +945,7 @@ void seat_reset_device(struct sway_seat *seat,
+ case WLR_INPUT_DEVICE_TOUCH:
+ seat_reset_input_config(seat, seat_device);
+ break;
+- case WLR_INPUT_DEVICE_TABLET_TOOL:
++ case WLR_INPUT_DEVICE_TABLET:
+ seat_reset_input_config(seat, seat_device);
+ break;
+ case WLR_INPUT_DEVICE_TABLET_PAD:
+--
+2.46.0
+
diff --git
a/windowmanagers/sway/patches/0010-input-Rename-WLR_INPUT_DEVICE_TABLET_TOOL-to.patch
b/windowmanagers/sway/patches/0010-input-Rename-WLR_INPUT_DEVICE_TABLET_TOOL-to.patch
deleted file mode 100644
index 7248102..0000000
---
a/windowmanagers/sway/patches/0010-input-Rename-WLR_INPUT_DEVICE_TABLET_TOOL-to.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-From 2058209a130f5051b59d8ebb24196409695deaaf Mon Sep 17 00:00:00 2001
-From: Luofan Chen <clfbbn AT gmail.com>
-Date: Fri, 1 Mar 2024 11:43:14 +0800
-Subject: [PATCH 10/15] input: Rename WLR_INPUT_DEVICE_TABLET_TOOL to
- WLR_INPUT_DEVICE_TABLET
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-wlroots has changed the naming, causing the following build errors when
-building:
-
-error: ‘WLR_INPUT_DEVICE_TABLET_TOOL’ undeclared
-Signed-off-by: Ismael Luceno <ismael AT iodev.co.uk>
----
- sway/input/cursor.c | 4 ++--
- sway/input/input-manager.c | 2 +-
- sway/input/seat.c | 10 +++++-----
- 3 files changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/sway/input/cursor.c b/sway/input/cursor.c
-index 7d66a89d98bd..3d04826cdf70 100644
---- a/sway/input/cursor.c
-+++ b/sway/input/cursor.c
-@@ -243,7 +243,7 @@ static enum sway_input_idle_source
idle_source_from_device(
- return IDLE_SOURCE_POINTER;
- case WLR_INPUT_DEVICE_TOUCH:
- return IDLE_SOURCE_TOUCH;
-- case WLR_INPUT_DEVICE_TABLET_TOOL:
-+ case WLR_INPUT_DEVICE_TABLET:
- return IDLE_SOURCE_TABLET_TOOL;
- case WLR_INPUT_DEVICE_TABLET_PAD:
- return IDLE_SOURCE_TABLET_PAD;
-@@ -518,7 +518,7 @@ static void apply_mapping_from_region(struct
wlr_input_device *device,
- double x1 = region->x1, x2 = region->x2;
- double y1 = region->y1, y2 = region->y2;
-
-- if (region->mm && device->type == WLR_INPUT_DEVICE_TABLET_TOOL) {
-+ if (region->mm && device->type == WLR_INPUT_DEVICE_TABLET) {
- struct wlr_tablet *tablet =
wlr_tablet_from_input_device(device);
- if (tablet->width_mm == 0 || tablet->height_mm == 0) {
- return;
-diff --git a/sway/input/input-manager.c b/sway/input/input-manager.c
-index 9ee635af23c7..056cc3ea8bf3 100644
---- a/sway/input/input-manager.c
-+++ b/sway/input/input-manager.c
-@@ -111,7 +111,7 @@ const char *input_device_get_type(struct
sway_input_device *device) {
- return "keyboard";
- case WLR_INPUT_DEVICE_TOUCH:
- return "touch";
-- case WLR_INPUT_DEVICE_TABLET_TOOL:
-+ case WLR_INPUT_DEVICE_TABLET:
- return "tablet_tool";
- case WLR_INPUT_DEVICE_TABLET_PAD:
- return "tablet_pad";
-diff --git a/sway/input/seat.c b/sway/input/seat.c
-index 7ae298288197..f2486893533c 100644
---- a/sway/input/seat.c
-+++ b/sway/input/seat.c
-@@ -607,7 +607,7 @@ static void seat_update_capabilities(struct sway_seat
*seat) {
- case WLR_INPUT_DEVICE_TOUCH:
- caps |= WL_SEAT_CAPABILITY_TOUCH;
- break;
-- case WLR_INPUT_DEVICE_TABLET_TOOL:
-+ case WLR_INPUT_DEVICE_TABLET:
- caps |= WL_SEAT_CAPABILITY_POINTER;
- break;
- case WLR_INPUT_DEVICE_SWITCH:
-@@ -665,7 +665,7 @@ static const char *get_builtin_output_name(void) {
- static bool is_touch_or_tablet_tool(struct sway_seat_device *seat_device) {
- switch (seat_device->input_device->wlr_device->type) {
- case WLR_INPUT_DEVICE_TOUCH:
-- case WLR_INPUT_DEVICE_TABLET_TOOL:
-+ case WLR_INPUT_DEVICE_TABLET:
- return true;
- default:
- return false;
-@@ -680,7 +680,7 @@ static void seat_apply_input_mapping(struct sway_seat
*seat,
- switch (sway_device->input_device->wlr_device->type) {
- case WLR_INPUT_DEVICE_POINTER:
- case WLR_INPUT_DEVICE_TOUCH:
-- case WLR_INPUT_DEVICE_TABLET_TOOL:
-+ case WLR_INPUT_DEVICE_TABLET:
- break;
- default:
- return; // these devices don't support mappings
-@@ -873,7 +873,7 @@ void seat_configure_device(struct sway_seat *seat,
- case WLR_INPUT_DEVICE_TOUCH:
- seat_configure_touch(seat, seat_device);
- break;
-- case WLR_INPUT_DEVICE_TABLET_TOOL:
-+ case WLR_INPUT_DEVICE_TABLET:
- seat_configure_tablet_tool(seat, seat_device);
- break;
- case WLR_INPUT_DEVICE_TABLET_PAD:
-@@ -912,7 +912,7 @@ void seat_reset_device(struct sway_seat *seat,
- case WLR_INPUT_DEVICE_TOUCH:
- seat_reset_input_config(seat, seat_device);
- break;
-- case WLR_INPUT_DEVICE_TABLET_TOOL:
-+ case WLR_INPUT_DEVICE_TABLET:
- seat_reset_input_config(seat, seat_device);
- break;
- case WLR_INPUT_DEVICE_TABLET_PAD:
---
-2.46.0
-
diff --git
a/windowmanagers/sway/patches/0011-Fetch-input-device-vendor-product-from-libinput.patch
b/windowmanagers/sway/patches/0011-Fetch-input-device-vendor-product-from-libinput.patch
index 51bae1d..944656c 100644
---
a/windowmanagers/sway/patches/0011-Fetch-input-device-vendor-product-from-libinput.patch
+++
b/windowmanagers/sway/patches/0011-Fetch-input-device-vendor-product-from-libinput.patch
@@ -1,20 +1,22 @@
-From f2a0e81b2438853e12a2b8fe9bddde154852d85d Mon Sep 17 00:00:00 2001
+From dc5dd92061760668ae752007970f2be2d838be5f Mon Sep 17 00:00:00 2001
From: Simon Ser <contact AT emersion.fr>
Date: Thu, 7 Mar 2024 12:16:11 +0100
Subject: [PATCH 11/15] Fetch input device vendor/product from libinput
References:
https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/4582
-Signed-off-by: Ismael Luceno <ismael AT iodev.co.uk>
+Origin: Upstream
+Upstream-Status: Backported [commit f2a0e81b2438853e12a2b8fe9bddde154852d85d]
+Signed-off-by: Ismael Luceno <ismael AT sourcemage.org>
---
sway/input/input-manager.c | 11 +++++++++--
sway/ipc-json.c | 8 ++++----
2 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/sway/input/input-manager.c b/sway/input/input-manager.c
-index 056cc3ea8bf3..089e1e718989 100644
+index bac36a168857..c6a61c89c3b8 100644
--- a/sway/input/input-manager.c
+++ b/sway/input/input-manager.c
-@@ -65,8 +65,15 @@ struct sway_seat
*input_manager_sway_seat_from_wlr_seat(struct wlr_seat *wlr_sea
+@@ -66,8 +66,15 @@ struct sway_seat
*input_manager_sway_seat_from_wlr_seat(struct wlr_seat *wlr_sea
}
char *input_device_get_identifier(struct wlr_input_device *device) {
@@ -33,10 +35,10 @@ index 056cc3ea8bf3..089e1e718989 100644
strip_whitespace(name);
diff --git a/sway/ipc-json.c b/sway/ipc-json.c
-index dfbb7a6ec41b..81ca34831f56 100644
+index 58356d4ea7cc..484b8118e5c0 100644
--- a/sway/ipc-json.c
+++ b/sway/ipc-json.c
-@@ -1097,10 +1097,6 @@ json_object *ipc_json_describe_input(struct
sway_input_device *device) {
+@@ -1086,10 +1086,6 @@ json_object *ipc_json_describe_input(struct
sway_input_device *device) {
json_object_new_string(device->identifier));
json_object_object_add(object, "name",
json_object_new_string(device->wlr_device->name));
@@ -47,7 +49,7 @@ index dfbb7a6ec41b..81ca34831f56 100644
json_object_object_add(object, "type",
json_object_new_string(
input_device_get_type(device)));
-@@ -1154,6 +1150,10 @@ json_object *ipc_json_describe_input(struct
sway_input_device *device) {
+@@ -1143,6 +1139,10 @@ json_object *ipc_json_describe_input(struct
sway_input_device *device) {
libinput_dev =
wlr_libinput_get_device_handle(device->wlr_device);
json_object_object_add(object, "libinput",
describe_libinput_device(libinput_dev));
diff --git
a/windowmanagers/sway/patches/0012-Update-for-versioned-wlroots-files.patch
b/windowmanagers/sway/patches/0012-Update-for-versioned-wlroots-files.patch
index c179f26..cfe3d0a 100644
---
a/windowmanagers/sway/patches/0012-Update-for-versioned-wlroots-files.patch
+++
b/windowmanagers/sway/patches/0012-Update-for-versioned-wlroots-files.patch
@@ -1,19 +1,21 @@
-From 2e9139df664f1e2dbe14b5df4a9646411b924c66 Mon Sep 17 00:00:00 2001
+From 287ffbeca8a2cf7b6e42542efa92adec2fb06018 Mon Sep 17 00:00:00 2001
From: Violet Purcell <vimproved AT inventati.org>
Date: Sun, 17 Mar 2024 13:27:34 -0400
Subject: [PATCH 12/15] Update for versioned wlroots files
References:
https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/4614
-Signed-off-by: Ismael Luceno <ismael AT iodev.co.uk>
+Origin: Upstream
+Upstream-Status: Backported [commit 2e9139df664f1e2dbe14b5df4a9646411b924c66]
+Signed-off-by: Ismael Luceno <ismael AT sourcemage.org>
---
meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
-index 3c444e07782f..eb66506ab2df 100644
+index 75654ad1df7c..af8ebca20580 100644
--- a/meson.build
+++ b/meson.build
-@@ -45,7 +45,7 @@ subproject(
+@@ -44,7 +44,7 @@ subproject(
required: false,
version: wlroots_version,
)
diff --git
a/windowmanagers/sway/patches/0013-input-pass-wlr_seat_client-to-wlr_seat_touch_notify_.patch
b/windowmanagers/sway/patches/0013-input-pass-wlr_seat_client-to-wlr_seat_touch_notify_.patch
new file mode 100644
index 0000000..d7652af
--- /dev/null
+++
b/windowmanagers/sway/patches/0013-input-pass-wlr_seat_client-to-wlr_seat_touch_notify_.patch
@@ -0,0 +1,34 @@
+From ee3411153959a7c03cde3d2a98a72cff732daa15 Mon Sep 17 00:00:00 2001
+From: Simon Ser <contact AT emersion.fr>
+Date: Thu, 28 Mar 2024 11:45:46 +0100
+Subject: [PATCH 13/15] input: pass wlr_seat_client to
+ wlr_seat_touch_notify_cancel()
+
+References:
https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/4613
+Origin: Upstream
+Upstream-Status: Backported [commit 9e1465107788af2c8ce93e2a288e9d32bc09711c]
+Signed-off-by: Ismael Luceno <ismael AT sourcemage.org>
+---
+ sway/input/seatop_down.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/sway/input/seatop_down.c b/sway/input/seatop_down.c
+index 44b345d12dd4..f68349d9b73d 100644
+--- a/sway/input/seatop_down.c
++++ b/sway/input/seatop_down.c
+@@ -118,7 +118,11 @@ static void handle_touch_cancel(struct sway_seat *seat,
+ }
+
+ if (e->surface) {
+- wlr_seat_touch_notify_cancel(seat->wlr_seat, e->surface);
++ struct wl_client *client =
wl_resource_get_client(e->surface->resource);
++ struct wlr_seat_client *seat_client =
wlr_seat_client_for_wl_client(seat->wlr_seat, client);
++ if (seat_client != NULL) {
++ wlr_seat_touch_notify_cancel(seat->wlr_seat,
seat_client);
++ }
+ }
+
+ if (wl_list_empty(&e->point_events)) {
+--
+2.46.0
+
diff --git
a/windowmanagers/sway/patches/0013-input-pass-wlr_seat_client-to-wlr_seat_touch_notify_cancel-.patch
b/windowmanagers/sway/patches/0013-input-pass-wlr_seat_client-to-wlr_seat_touch_notify_cancel-.patch
deleted file mode 100644
index 2272659..0000000
---
a/windowmanagers/sway/patches/0013-input-pass-wlr_seat_client-to-wlr_seat_touch_notify_cancel-.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 9e1465107788af2c8ce93e2a288e9d32bc09711c Mon Sep 17 00:00:00 2001
-From: Simon Ser <contact AT emersion.fr>
-Date: Thu, 28 Mar 2024 11:45:46 +0100
-Subject: [PATCH 13/15] input: pass wlr_seat_client to
wlr_seat_touch_notify_cancel()
-
-References:
https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/4613
-Signed-off-by: Ismael Luceno <ismael AT iodev.co.uk>
----
- sway/input/seatop_down.c | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/sway/input/seatop_down.c b/sway/input/seatop_down.c
-index 35fd3bcb2024..340e334bfd7c 100644
---- a/sway/input/seatop_down.c
-+++ b/sway/input/seatop_down.c
-@@ -117,7 +117,11 @@ static void handle_touch_cancel(struct sway_seat *seat,
- }
-
- if (e->surface) {
-- wlr_seat_touch_notify_cancel(seat->wlr_seat, e->surface);
-+ struct wl_client *client =
wl_resource_get_client(e->surface->resource);
-+ struct wlr_seat_client *seat_client =
wlr_seat_client_for_wl_client(seat->wlr_seat, client);
-+ if (seat_client != NULL) {
-+ wlr_seat_touch_notify_cancel(seat->wlr_seat,
seat_client);
-+ }
- }
-
- if (wl_list_empty(&e->point_events)) {
---
-2.46.0
-
diff --git
a/windowmanagers/sway/patches/0014-server-Use-wlr_renderer_get_texture_formats.patch
b/windowmanagers/sway/patches/0014-server-Use-wlr_renderer_get_texture_formats.patch
index 632b64f..6764fb7 100644
---
a/windowmanagers/sway/patches/0014-server-Use-wlr_renderer_get_texture_formats.patch
+++
b/windowmanagers/sway/patches/0014-server-Use-wlr_renderer_get_texture_formats.patch
@@ -1,4 +1,4 @@
-From ffcde7a70c1341d1ec1d38c00ff87faa1a816892 Mon Sep 17 00:00:00 2001
+From ad5082845cdde44bbee9ca9d765cdd3b14619e69 Mon Sep 17 00:00:00 2001
From: Kenny Levinsen <kl AT kl.wtf>
Date: Sun, 21 Apr 2024 16:42:08 +0200
Subject: [PATCH 14/15] server: Use wlr_renderer_get_texture_formats
@@ -7,17 +7,18 @@ wlr_renderer_get_{dmabuf|shm}_texture_formats have been
replaced by a
unified wlr_renderer_get_texture_formats interface using buffer caps.
References:
https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/4644
-[ismael AT sourcemage.org: Backported to 1.9]
+Origin: Upstream
+Upstream-Status: Backported [commit ffcde7a70c1341d1ec1d38c00ff87faa1a816892]
Signed-off-by: Ismael Luceno <ismael AT sourcemage.org>
---
- sway/server.c | 9 +-
- 1 file changed, 1 insertions(+), 1 deletions(-)
+ sway/server.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sway/server.c b/sway/server.c
-index d159dc9bd03f..180d3a6bc3df 100644
+index 81df98a07727..cc032148c99c 100644
--- a/sway/server.c
+++ b/sway/server.c
-@@ -240,7 +240,7 @@ bool server_init(struct sway_server *server) {
+@@ -146,7 +146,7 @@ bool server_init(struct sway_server *server) {
wlr_renderer_init_wl_shm(server->renderer, server->wl_display);
diff --git
a/windowmanagers/sway/patches/0015-protocols-use-tablet-v2-xml-from-stable-.patch
b/windowmanagers/sway/patches/0015-protocols-use-tablet-v2-xml-from-stable-.patch
deleted file mode 100644
index 242350f..0000000
---
a/windowmanagers/sway/patches/0015-protocols-use-tablet-v2-xml-from-stable-.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From cdde0165dad94e4522f8f6f040e9d30145fbb14f Mon Sep 17 00:00:00 2001
-From: Kirill Primak <vyivel AT eclair.cafe>
-Date: Thu, 27 Jun 2024 21:01:19 +0300
-Subject: [PATCH 15/15] protocols: use tablet-v2 xml from stable/
-
-Signed-off-by: Ismael Luceno <ismael AT iodev.co.uk>
----
- protocols/meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/protocols/meson.build b/protocols/meson.build
-index 81edb5841b23..6eac8542c000 100644
---- a/protocols/meson.build
-+++ b/protocols/meson.build
-@@ -7,10 +7,10 @@ wayland_scanner = find_program(
- )
-
- protocols = [
-+ wl_protocol_dir / 'stable/tablet/tablet-v2.xml',
- wl_protocol_dir / 'stable/xdg-shell/xdg-shell.xml',
- wl_protocol_dir / 'unstable/xdg-output/xdg-output-unstable-v1.xml',
- wl_protocol_dir /
'unstable/pointer-constraints/pointer-constraints-unstable-v1.xml',
-- wl_protocol_dir / 'unstable/tablet/tablet-unstable-v2.xml',
- wl_protocol_dir /
'unstable/linux-dmabuf/linux-dmabuf-unstable-v1.xml',
- wl_protocol_dir / 'staging/content-type/content-type-v1.xml',
- wl_protocol_dir / 'staging/cursor-shape/cursor-shape-v1.xml',
---
-2.46.0
-
diff --git
a/windowmanagers/sway/patches/0015-protocols-use-tablet-v2-xml-from-stable.patch
b/windowmanagers/sway/patches/0015-protocols-use-tablet-v2-xml-from-stable.patch
new file mode 100644
index 0000000..bbca57c
--- /dev/null
+++
b/windowmanagers/sway/patches/0015-protocols-use-tablet-v2-xml-from-stable.patch
@@ -0,0 +1,31 @@
+From c46fa5e2d3c55f4ca84c0d52189c26048e234930 Mon Sep 17 00:00:00 2001
+From: Kirill Primak <vyivel AT eclair.cafe>
+Date: Thu, 27 Jun 2024 21:01:19 +0300
+Subject: [PATCH 15/15] protocols: use tablet-v2 xml from stable/
+
+Origin: Upstream
+Upstream-Status: Backported [commit cdde0165dad94e4522f8f6f040e9d30145fbb14f]
+Signed-off-by: Ismael Luceno <ismael AT sourcemage.org>
+---
+ protocols/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/protocols/meson.build b/protocols/meson.build
+index 81edb5841b23..6eac8542c000 100644
+--- a/protocols/meson.build
++++ b/protocols/meson.build
+@@ -7,10 +7,10 @@ wayland_scanner = find_program(
+ )
+
+ protocols = [
++ wl_protocol_dir / 'stable/tablet/tablet-v2.xml',
+ wl_protocol_dir / 'stable/xdg-shell/xdg-shell.xml',
+ wl_protocol_dir / 'unstable/xdg-output/xdg-output-unstable-v1.xml',
+ wl_protocol_dir /
'unstable/pointer-constraints/pointer-constraints-unstable-v1.xml',
+- wl_protocol_dir / 'unstable/tablet/tablet-unstable-v2.xml',
+ wl_protocol_dir /
'unstable/linux-dmabuf/linux-dmabuf-unstable-v1.xml',
+ wl_protocol_dir / 'staging/content-type/content-type-v1.xml',
+ wl_protocol_dir / 'staging/cursor-shape/cursor-shape-v1.xml',
+--
+2.46.0
+
- [[SM-Commit] ] GIT changes to master grimoire by Ismael Luceno (fd7137af63a9937fc50954d3772bd56cb4b38420), Ismael Luceno, 09/11/2024
Archive powered by MHonArc 2.6.24.