xkeyboard-config-ducky, mako

mako/393.patch

@@ -0,0 +1,257 @@
+From c8fc55b5dc5e4b3f3431e0c5786be94213f698a2 Mon Sep 17 00:00:00 2001
+From: lilydjwg <lilydjwg@gmail.com>
+Date: Tue, 23 Nov 2021 14:30:32 +0800
+Subject: [PATCH 1/5] scale cursor too so the mouse pointer doesn't change
+ above notification
+
+---
+ include/mako.h |  1 +
+ wayland.c      | 33 +++++++++++++++++++++++++++------
+ 2 files changed, 28 insertions(+), 6 deletions(-)
+
+diff --git a/include/mako.h b/include/mako.h
+index 9117011..b35bc74 100644
+--- a/include/mako.h
++++ b/include/mako.h
+@@ -63,6 +63,7 @@ struct mako_state {
+ 	struct wl_cursor_theme *cursor_theme;
+ 	const struct wl_cursor_image *cursor_image;
+ 	struct wl_surface *cursor_surface;
++	int32_t cursor_scale;
+ 
+ 	struct wl_list surfaces; // mako_surface::link
+ 
+diff --git a/wayland.c b/wayland.c
+index eacdc50..81e5b10 100644
+--- a/wayland.c
++++ b/wayland.c
+@@ -176,7 +176,8 @@ static void pointer_handle_enter(void *data, struct wl_pointer *wl_pointer,
+ 	// Change the mouse cursor to "left_ptr"
+ 	if (state->cursor_theme != NULL) {
+ 		wl_pointer_set_cursor(wl_pointer, serial, state->cursor_surface,
+-			state->cursor_image->hotspot_x, state->cursor_image->hotspot_y);
++			state->cursor_image->hotspot_x / state->cursor_scale,
++			state->cursor_image->hotspot_y / state->cursor_scale);
+ 	}
+ }
+ 
+@@ -307,6 +308,7 @@ static const struct wl_surface_listener surface_listener = {
+ 
+ static void schedule_frame_and_commit(struct mako_surface *state);
+ static void send_frame(struct mako_surface *surface);
++void setup_cursor(struct mako_state *state, int scale);
+ 
+ static void layer_surface_handle_configure(void *data,
+ 		struct zwlr_layer_surface_v1 *surface,
+@@ -452,6 +454,10 @@ bool init_wayland(struct mako_state *state) {
+ 		}
+ 	}
+ 
++	return true;
++}
++
++void setup_cursor(struct mako_state *state, int scale) {
+ 	// Set up the cursor. It needs a wl_surface with the cursor loaded into it.
+ 	// If one of these fail, mako will work fine without the cursor being able to change.
+ 	const char *cursor_size_env = getenv("XCURSOR_SIZE");
+@@ -467,10 +473,13 @@ bool init_wayland(struct mako_state *state) {
+			fprintf(stderr, "Error: XCURSOR_SIZE is invalid\n");
+ 		}
+ 	}
+-	state->cursor_theme = wl_cursor_theme_load(NULL, cursor_size, state->shm);
++	if (state->cursor_theme) {
++		wl_cursor_theme_destroy(state->cursor_theme);
++	}
++	state->cursor_theme = wl_cursor_theme_load(NULL, cursor_size * scale, state->shm);
+ 	if (state->cursor_theme == NULL) {
+ 		fprintf(stderr, "couldn't find a cursor theme\n");
+-		return true;
++		return;
+ 	}
+ 	struct wl_cursor *cursor = wl_cursor_theme_get_cursor(state->cursor_theme, "left_ptr");
+ 	if (cursor == NULL) {
+@@ -478,15 +487,15 @@ bool init_wayland(struct mako_state *state) {
+ 		wl_cursor_theme_destroy(state->cursor_theme);
+ 		// Set to NULL so it doesn't get free'd again
+ 		state->cursor_theme = NULL;
+-		return true;
++		return;
+ 	}
+ 	state->cursor_image = cursor->images[0];
+ 	struct wl_buffer *cursor_buffer = wl_cursor_image_get_buffer(cursor->images[0]);
+ 	state->cursor_surface = wl_compositor_create_surface(state->compositor);
+ 	wl_surface_attach(state->cursor_surface, cursor_buffer, 0, 0);
++	wl_surface_set_buffer_scale(state->cursor_surface, scale);
+ 	wl_surface_commit(state->cursor_surface);
+-
+-	return true;
++	state->cursor_scale = scale;
+ }
+ 
+ void finish_wayland(struct mako_state *state) {
+@@ -645,6 +654,9 @@ static void send_frame(struct mako_surface *surface) {
+ 		zwlr_layer_surface_v1_set_anchor(surface->layer_surface,
+ 				surface->anchor);
+ 		wl_surface_commit(surface->surface);
++		if (state->cursor_scale != scale) {
++			setup_cursor(state, scale);
++		}
+ 
+ 		// Now we're going to bail without drawing anything. This gives the
+ 		// compositor a chance to create the surface and tell us what size we
+@@ -708,6 +720,15 @@ static void schedule_frame_and_commit(struct mako_surface *surface) {
+ 	surface->frame_callback = wl_surface_frame(surface->surface);
+ 	wl_callback_add_listener(surface->frame_callback, &frame_listener, surface);
+ 	wl_surface_commit(surface->surface);
++
++	struct mako_state *state = surface->state;
++	if (surface->surface_output != NULL) {
++		int scale = surface->surface_output->scale;
++		if (state->cursor_scale != scale) {
++			// output or output scale changed, update cursor
++			setup_cursor(state, scale);
++		}
++	}
+ }
+ 
+ void set_dirty(struct mako_surface *surface) {
+
+From 47ac373d567a834fa92dc0e4d02be1b637a8ce0a Mon Sep 17 00:00:00 2001
+From: lilydjwg <lilydjwg@gmail.com>
+Date: Tue, 23 Nov 2021 14:12:08 +0800
+Subject: [PATCH 2/5] make_surface.scale is unused
+
+---
+ include/mako.h | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/include/mako.h b/include/mako.h
+index b35bc74..9a08bc1 100644
+--- a/include/mako.h
++++ b/include/mako.h
+@@ -33,7 +33,6 @@ struct mako_surface {
+ 	struct wl_callback *frame_callback;
+ 	bool configured;
+ 	bool dirty; // Do we need to redraw?
+-	int32_t scale;
+ 
+ 	char *configured_output;
+ 	enum zwlr_layer_shell_v1_layer layer;
+
+From 80f98d2a8693ef02f8cecbe9316c6291e7109962 Mon Sep 17 00:00:00 2001
+From: lilydjwg <lilydjwg@gmail.com>
+Date: Tue, 23 Nov 2021 18:22:46 +0800
+Subject: [PATCH 3/5] use last_scale initially to avoid many redraws (which
+ cause flickering)
+
+---
+ include/mako.h | 1 +
+ main.c         | 1 +
+ wayland.c      | 3 ++-
+ 3 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/include/mako.h b/include/mako.h
+index 9a08bc1..ece4ea0 100644
+--- a/include/mako.h
++++ b/include/mako.h
+@@ -70,6 +70,7 @@ struct mako_state {
+ 	struct wl_list notifications; // mako_notification::link
+ 	struct wl_list history; // mako_notification::link
+ 	char *current_mode;
++	uint32_t last_scale;
+ 
+ 	int argc;
+ 	char **argv;
+diff --git a/main.c b/main.c
+index 44f2094..b93c5e5 100644
+--- a/main.c
++++ b/main.c
+@@ -70,6 +70,7 @@ static bool init(struct mako_state *state) {
+ 	wl_list_init(&state->notifications);
+ 	wl_list_init(&state->history);
+ 	state->current_mode = strdup("default");
++	state->last_scale = 1;
+ 	return true;
+ }
+ 
+diff --git a/wayland.c b/wayland.c
+index 81e5b10..7620c21 100644
+--- a/wayland.c
++++ b/wayland.c
+@@ -571,9 +571,10 @@ static void schedule_frame_and_commit(struct mako_surface *surface);
+ static void send_frame(struct mako_surface *surface) {
+ 	struct mako_state *state = surface->state;
+ 
+-	int scale = 1;
++	int scale = state->last_scale;
+ 	if (surface->surface_output != NULL) {
+ 		scale = surface->surface_output->scale;
++		state->last_scale = scale;
+ 	}
+ 
+ 	surface->current_buffer =
+
+From a9f17443a43b33fcea99155c227cd8b0ce4c548a Mon Sep 17 00:00:00 2001
+From: lilydjwg <lilydjwg@gmail.com>
+Date: Tue, 23 Nov 2021 19:10:24 +0800
+Subject: [PATCH 4/5] don't redraw if the surface size isn't changed
+
+---
+ wayland.c | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/wayland.c b/wayland.c
+index 7620c21..e5e6534 100644
+--- a/wayland.c
++++ b/wayland.c
+@@ -315,11 +315,17 @@ static void layer_surface_handle_configure(void *data,
+ 		uint32_t serial, uint32_t width, uint32_t height) {
+ 	struct mako_surface *msurface = data;
+ 
++	zwlr_layer_surface_v1_ack_configure(surface, serial);
++
++	if (msurface->configured && msurface->width == (int)width
++		&& msurface->height == (int)height) {
++		return;
++	}
++
+ 	msurface->configured = true;
+ 	msurface->width = width;
+ 	msurface->height = height;
+ 
+-	zwlr_layer_surface_v1_ack_configure(surface, serial);
+ 	send_frame(msurface);
+ }
+ 
+
+From fe7f49463e29e3275f7183b5f8d44e080d9203a8 Mon Sep 17 00:00:00 2001
+From: lilydjwg <lilydjwg@gmail.com>
+Date: Tue, 23 Nov 2021 19:21:34 +0800
+Subject: [PATCH 5/5] fix schedule_frame_and_commit declaration
+
+---
+ wayland.c | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/wayland.c b/wayland.c
+index e5e6534..228a1fe 100644
+--- a/wayland.c
++++ b/wayland.c
+@@ -306,7 +306,7 @@ static const struct wl_surface_listener surface_listener = {
+ };
+ 
+ 
+-static void schedule_frame_and_commit(struct mako_surface *state);
++static void schedule_frame_and_commit(struct mako_surface *surface);
+ static void send_frame(struct mako_surface *surface);
+ void setup_cursor(struct mako_state *state, int scale);
+ 
+@@ -571,8 +571,6 @@ static struct mako_output *get_configured_output(struct mako_surface *surface) {
+ 	return NULL;
+ }
+ 
+-static void schedule_frame_and_commit(struct mako_surface *surface);
+-
+ // Draw and commit a new frame.
+ static void send_frame(struct mako_surface *surface) {
+ 	struct mako_state *state = surface->state;

mako/PKGBUILD

@@ -0,0 +1,44 @@
+# Maintainer: Brett Cornwall <ainola@archlinux.org>
+# Maintainer: Maxim Baz <$pkgname at maximbaz dot com>
+# Contributor: Drew DeVault
+
+pkgname=mako
+pkgver=1.6
+pkgrel=4
+license=('MIT')
+pkgdesc='Lightweight notification daemon for Wayland'
+makedepends=("meson" "scdoc" "systemd" "wayland-protocols")
+depends=(
+	"gdk-pixbuf2"
+	"pango"
+	"systemd-libs"
+	"wayland"
+)
+optdepends=("jq: support for 'makoctl menu'")
+arch=("x86_64")
+url='https://mako-project.org'
+options=(debug)
+source=(
+	"$pkgname-$pkgver.tar.gz::https://github.com/emersion/mako/releases/download/v$pkgver/mako-$pkgver.tar.gz"
+	"systemd-dbus-activation.patch"
+	"https://patch-diff.githubusercontent.com/raw/emersion/mako/pull/393.patch"
+)
+sha256sums=('9f43cba9e1b43c69be8c9e4a79c358b3cd22153ca3ffb8bf0ee7aa30c59b2fc2'
+            '4579a2673dcf2114779e10ed52d771f3930c2192e8e35d3e145163d9e0b45c20'
+            'SKIP')
+
+prepare() {
+	patch -Np1 -i "$srcdir/systemd-dbus-activation.patch" -d "$pkgname-$pkgver"
+	patch -Np1 -i "$srcdir/393.patch" -d "$pkgname-$pkgver"
+}
+
+build() {
+	arch-meson -Dzsh-completions=true -Dsd-bus-provider=libsystemd "$pkgname-$pkgver" build
+	ninja -C build
+}
+
+package() {
+	DESTDIR="$pkgdir" ninja -C build install
+	install -Dm644 -t "$pkgdir/usr/share/licenses/$pkgname/" "$pkgname-$pkgver/LICENSE"
+	install -Dm644 -t "$pkgdir/usr/lib/systemd/user/" "$pkgname-$pkgver/contrib/systemd/mako.service"
+}

mako/systemd-dbus-activation.patch

@@ -0,0 +1,7 @@
+--- a/fr.emersion.mako.service.in
++++ b/fr.emersion.mako.service.in
+@@ -1,3 +1,4 @@
+ [D-BUS Service]
+ Name=org.freedesktop.Notifications
+ Exec=@bindir@/mako
++SystemdService=mako.service

xkeyboard-config-ducky/PKGBUILD

@@ -25,7 +25,7 @@ source=(https://xorg.freedesktop.org/archive/individual/data/${_pkgname}/${_pkgn
         base.xml.patch
         evdev.xml.patch)
 sha512sums=('c082a86efcf69ab50454875686b9b4c388cf48002de3728331de3c09c1349a38c9b9ad8ecace2215061c0c775e59c3dd230fffe3f24db63790aa71dc8eff8dea'
-            'ac79eb7fb16f517cf1178bcbfe83f708741feb950ee1e1c92fcea2b1e10ceae6d9f90ad860440f64da6759c843bcc10f4ac2479d323c450aeaf323bf37722257'
+            'cff98ba768a9fcb1f811c43978aa6e971f4582722994450581a83051f5c023ea5abf57bdf6f3fa9f95e905b89d83764694e3867886ffb3251d3e47d6b55d1dc7'
             '854c52d168837a5c72559498d10dff7843275323c4082d1c741c832d068108be3a51e823c98a27ea47c5fe4f335499fdbcaa3698117740ef24c07c41161ad59b'
             '7d9c692980c77a3b0658a5dd707ecdcd1e3fe47c2958f539f1f81dd04d5f204f779569d6b880c3f12872397d6171b2ec2caab9a4e79461c9f5828ca1c45acb08'
             'fc7e4bce201538c828e44136ae2d3c39c4066a6d56413b229ad453eadd1d459aae22f218dde6f0e1afbddf3ebf995e6f8f56fd6406eff4ef6fa196207da9adb7'

xkeyboard-config-ducky/ducky_mini

@@ -89,5 +89,5 @@ partial modifier_keys
 xkb_symbols "common" {
 	name[Group1] = "Common (layout mimicking the Ducky Shine Mini fn functionality)";
 
-	replace key <LCTL> { [ ISO_Level3_Shift ] };
+	replace key <RWIN> { [ ISO_Level3_Shift ] };
 };