linux-qubasis

commit 68c9740757d94f21a68597d866100224fae12628
parent 2fd3093c744ec54c2d7a7ff019ee61301f6d50fd
Author: Jul <jul@9o.is>
Date:   Thu, 31 Jul 2025 23:26:56 -0400

inline fzy info

Diffstat:
M
pkg/fzy/patches/0001-add-carriage-return-to-tty_clearline.patch
 | 
2
+-
M
pkg/fzy/patches/0002-Reduce-screen-and-cursor-flickering.patch
 | 
2
+-
M
pkg/fzy/patches/0003-add-multi-selection.patch
 | 
2
+-
M
pkg/fzy/patches/0004-truncate-entries-to-terminal-width.patch
 | 
2
+-
M
pkg/fzy/patches/0005-add-half-page-up-down-vi-actions.patch
 | 
2
+-
A
pkg/fzy/patches/0006-inline-info-data.patch
 | 
52
++++++++++++++++++++++++++++++++++++++++++++++++++++

6 files changed, 57 insertions(+), 5 deletions(-)
diff --git a/pkg/fzy/patches/0001-add-carriage-return-to-tty_clearline.patch b/pkg/fzy/patches/0001-add-carriage-return-to-tty_clearline.patch
@@ -1,7 +1,7 @@
 From a7f705a08f5a10b0cdb76ffddd1dee0e3d06ea48 Mon Sep 17 00:00:00 2001
 From: Jul <jul@qh.is>
 Date: Thu, 31 Jul 2025 00:13:39 -0400
-Subject: [PATCH 1/5] add carriage return to tty_clearline
+Subject: [PATCH 1/6] add carriage return to tty_clearline
 
 ---
  src/tty.c | 2 +-
diff --git a/pkg/fzy/patches/0002-Reduce-screen-and-cursor-flickering.patch b/pkg/fzy/patches/0002-Reduce-screen-and-cursor-flickering.patch
@@ -1,7 +1,7 @@
 From 03c3ef3fd9e0638331453db4bbdec091f61c1572 Mon Sep 17 00:00:00 2001
 From: leo-arch <leonardoabramovich2@gmail.com>
 Date: Fri, 18 Jul 2025 21:39:07 -0300
-Subject: [PATCH 2/5] Reduce screen and cursor flickering
+Subject: [PATCH 2/6] Reduce screen and cursor flickering
 
 ---
  src/tty.c           |  8 ++++++++
diff --git a/pkg/fzy/patches/0003-add-multi-selection.patch b/pkg/fzy/patches/0003-add-multi-selection.patch
@@ -1,7 +1,7 @@
 From d8f69837fff03162e77c7eabacc39fbb4d139f15 Mon Sep 17 00:00:00 2001
 From: Jul <jul@qh.is>
 Date: Thu, 31 Jul 2025 03:34:16 -0400
-Subject: [PATCH 3/5] add multi-selection
+Subject: [PATCH 3/6] add multi-selection
 
 ---
  src/config.def.h    |   1 +
diff --git a/pkg/fzy/patches/0004-truncate-entries-to-terminal-width.patch b/pkg/fzy/patches/0004-truncate-entries-to-terminal-width.patch
@@ -1,7 +1,7 @@
 From 9de07c643f5b9efc5d9e69a2ccbfb8500486543a Mon Sep 17 00:00:00 2001
 From: Jul <jul@qh.is>
 Date: Thu, 31 Jul 2025 05:34:48 -0400
-Subject: [PATCH 4/5] truncate entries to terminal width
+Subject: [PATCH 4/6] truncate entries to terminal width
 
 ---
  src/tty_interface.c | 4 ++++
diff --git a/pkg/fzy/patches/0005-add-half-page-up-down-vi-actions.patch b/pkg/fzy/patches/0005-add-half-page-up-down-vi-actions.patch
@@ -1,7 +1,7 @@
 From af3bd5f0af329439923fa98f1398583ae859dfac Mon Sep 17 00:00:00 2001
 From: Jul <jul@qh.is>
 Date: Thu, 31 Jul 2025 22:37:31 -0400
-Subject: [PATCH 5/5] add half page up down vi actions
+Subject: [PATCH 5/6] add half page up down vi actions
 
 ---
  src/tty_interface.c | 21 ++++++++++++++-------
diff --git a/pkg/fzy/patches/0006-inline-info-data.patch b/pkg/fzy/patches/0006-inline-info-data.patch
@@ -0,0 +1,52 @@
+From c1ee71ca445906dafee4e4f640f0c6b99bf98a01 Mon Sep 17 00:00:00 2001
+From: Jul <jul@qh.is>
+Date: Thu, 31 Jul 2025 23:25:23 -0400
+Subject: [PATCH 6/6] inline info data
+
+---
+ src/tty_interface.c | 11 +++++------
+ 1 file changed, 5 insertions(+), 6 deletions(-)
+
+diff --git a/src/tty_interface.c b/src/tty_interface.c
+index 3dc00f0..67a859e 100644
+--- a/src/tty_interface.c
++++ b/src/tty_interface.c
+@@ -140,7 +140,7 @@ static void clear(tty_interface_t *state) {
+ 
+ 	tty_setcol(tty, DEFAULT_MULTI ? 2 : 0);
+ 	size_t line = 0;
+-	while (line++ < state->options->num_lines + (state->options->show_info ? 1 : 0)) {
++	while (line++ < state->options->num_lines) {
+ 		tty_newline(tty);
+ 	}
+ 	tty_clearline(tty);
+@@ -218,13 +218,12 @@ static void draw(tty_interface_t *state) {
+ 	tty_hide_cursor(tty);
+ 	tty_setcol(tty, DEFAULT_MULTI ? 2 : 0);
+ 	tty_printf(tty, "%s%s", options->prompt, state->search);
+-	tty_clearline(tty);
+ 
+ 	if (options->show_info && DEFAULT_MULTI) {
+-		tty_printf(tty, "\n[%lu/%lu/%lu]", count_selections(state), choices->available, choices->size);
++		tty_printf(tty, "  [%lu/%lu/%lu]", count_selections(state), choices->available, choices->size);
+ 		tty_clearline(tty);
+ 	} else if (options->show_info) {
+-		tty_printf(tty, "\n[%lu/%lu]", choices->available, choices->size);
++		tty_printf(tty, "  [%lu/%lu]", choices->available, choices->size);
+ 		tty_clearline(tty);
+ 	}
+ 
+@@ -242,8 +241,8 @@ static void draw(tty_interface_t *state) {
+ 		}
+ 	}
+ 
+-	if (num_lines + options->show_info)
+-		tty_moveup(tty, num_lines + options->show_info);
++	if (num_lines)
++		tty_moveup(tty, num_lines);
+ 
+ 	tty_setcol(tty, DEFAULT_MULTI ? 2 : 0);
+ 	fputs(options->prompt, tty->fout);
+-- 
+2.50.1
+