NotAShelf/nyxexprs
1
0
Fork 0
mirror of https://github.com/NotAShelf/nyxexprs.git synced 2025-10-05 08:22:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

foot-git: rebase patches

Browse source 
ft. fazzi
This commit is contained in:
raf 2025-04-28 21:53:04 +03:00
commit 0603ed57cc
Signed by: NotAShelf
GPG key ID: 29D95B64378DB4BF
2 changed files with 16 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

10
pkgs/foot-git/package.nix
View file

@ -1,10 +1,11 @@
{ {
withAlphaPatch ? true,
lib, lib,
fetchFromGitea, fetchFromGitea,
foot, foot,
pins, pins,
date, date,
# Settings
withAlphaPatch ? true,
... ...
}: }:
foot.overrideAttrs (oldAttrs: let foot.overrideAttrs (oldAttrs: let
@ -23,14 +24,15 @@ in {
patches = patches =
(oldAttrs.patches or []) (oldAttrs.patches or [])
# Bring back fullscreen transparency (i.e., fullscreen alpha)
++ (lib.optionals withAlphaPatch [ ++ (lib.optionals withAlphaPatch [
# Thank you fazzi :) # Taken with the explicit permission of Fazzi, thank you :)
# <https://codeberg.org/fazzi/foot/commit/bebc6f0ffd0d767f560ee50825a0b0fba197c90f.patch> # <https://codeberg.org/fazzi/foot>
./patches/foot_fullscreen_alpha.patch ./patches/foot_fullscreen_alpha.patch
]); ]);
meta = { meta = {
description = "An auto-upgrading version of FOot to ensure we are always up to dates"; description = "An auto-upgrading version of Foot to ensure we are always up to dates";
mainProgram = "foot"; mainProgram = "foot";
maintainers = with lib.maintainers; [NotAShelf]; maintainers = with lib.maintainers; [NotAShelf];
}; };

20
pkgs/foot-git/patches/foot_fullscreen_alpha.patch
View file

@ -1,4 +1,4 @@
From bebc6f0ffd0d767f560ee50825a0b0fba197c90f Mon Sep 17 00:00:00 2001 From 977ea280367b796961676aa5f1387ab3afd77536 Mon Sep 17 00:00:00 2001
From: Fazzi <faaris.ansari@proton.me> From: Fazzi <faaris.ansari@proton.me>
Date: Fri, 18 Apr 2025 21:15:19 +0100 Date: Fri, 18 Apr 2025 21:15:19 +0100
Subject: [PATCH] config: add transparent_fullscreen option Subject: [PATCH] config: add transparent_fullscreen option
@ -10,11 +10,11 @@ Subject: [PATCH] config: add transparent_fullscreen option
3 files changed, 12 insertions(+), 3 deletions(-) 3 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/config.c b/config.c diff --git a/config.c b/config.c
index 347cc1ec..fa081ce7 100644 index 04a9c9d4..d5dca25d 100644
--- a/config.c --- a/config.c
+++ b/config.c +++ b/config.c
@@ -1095,6 +1095,10 @@ parse_section_main(struct context *ctx) @@ -1107,6 +1107,10 @@ parse_section_main(struct context *ctx)
return true; (int *)&conf->initial_color_theme);
} }
+ else if (streq(key, "transparent-fullscreen")) { + else if (streq(key, "transparent-fullscreen")) {
@ -24,7 +24,7 @@ index 347cc1ec..fa081ce7 100644
else { else {
LOG_CONTEXTUAL_ERR("not a valid option: %s", key); LOG_CONTEXTUAL_ERR("not a valid option: %s", key);
return false; return false;
@@ -3347,6 +3351,7 @@ config_load(struct config *conf, const char *conf_path, @@ -3391,6 +3395,7 @@ config_load(struct config *conf, const char *conf_path,
}, },
.multiplier = 3., .multiplier = 3.,
}, },
@ -33,10 +33,10 @@ index 347cc1ec..fa081ce7 100644
.fg = default_foreground, .fg = default_foreground,
.bg = default_background, .bg = default_background,
diff --git a/config.h b/config.h diff --git a/config.h b/config.h
index 2dec82c1..542e22e6 100644 index cbdf11b1..e92545e2 100644
--- a/config.h --- a/config.h
+++ b/config.h +++ b/config.h
@@ -167,6 +167,8 @@ struct config { @@ -231,6 +231,8 @@ struct config {
enum { STARTUP_WINDOWED, STARTUP_MAXIMIZED, STARTUP_FULLSCREEN } startup_mode; enum { STARTUP_WINDOWED, STARTUP_MAXIMIZED, STARTUP_FULLSCREEN } startup_mode;
@ -46,15 +46,15 @@ index 2dec82c1..542e22e6 100644
enum {GAMMA_CORRECT_DISABLED, enum {GAMMA_CORRECT_DISABLED,
GAMMA_CORRECT_ENABLED, GAMMA_CORRECT_ENABLED,
diff --git a/render.c b/render.c diff --git a/render.c b/render.c
index 0e403949..2040d5be 100644 index b0d21d18..709b5e4b 100644
--- a/render.c --- a/render.c
+++ b/render.c +++ b/render.c
@@ -744,7 +744,8 @@ render_cell(struct terminal *term, pixman_image_t *pix, @@ -744,7 +744,8 @@ render_cell(struct terminal *term, pixman_image_t *pix,
_bg = swap; _bg = swap;
} }
- if (!term->window->is_fullscreen && term->colors.alpha != 0xffff) { - else if (!term->window->is_fullscreen && term->colors.alpha != 0xffff) {
+ if ((!term->window->is_fullscreen || term->conf->transparent_fullscreen) + else if ((!term->window->is_fullscreen || term->conf->transparent_fullscreen)
+ && term->colors.alpha != 0xffff) { + && term->colors.alpha != 0xffff) {
switch (term->conf->colors.alpha_mode) { switch (term->conf->colors.alpha_mode) {
case ALPHA_MODE_DEFAULT: { case ALPHA_MODE_DEFAULT: {