Update for noice-0.8 - pkgsrc-localpatches - leot's pkgsrc LOCALPATCHES
(HTM) hg clone https://bitbucket.org/iamleot/pkgsrc-localpatches
(DIR) Log
(DIR) Files
(DIR) Refs
---
(DIR) changeset fcd1226269822e13ff38e03be34a8993ea63e872
(DIR) parent abf562f7afdcd1c64e36b878c8be15d367760846
(HTM) Author: Leonardo Taccari <iamleot@gmail.com>
Date: Mon, 8 Apr 2019 23:22:59
Update for noice-0.8
Diffstat:
sysutils/noice/patch-config.h | 28 +++++++++++-----------------
sysutils/noice/patch-noice.c | 12 ++++++------
2 files changed, 17 insertions(+), 23 deletions(-)
---
diff -r abf562f7afdc -r fcd122626982 sysutils/noice/patch-config.h
--- a/sysutils/noice/patch-config.h Sat Apr 06 22:19:30 2019 +0200
+++ b/sysutils/noice/patch-config.h Mon Apr 08 23:22:59 2019 +0200
@@ -1,6 +1,6 @@
--- /dev/null 2019-01-30 12:37:45.330275625 +0100
+++ config.h 2019-01-30 12:37:25.854965000 +0100
-@@ -0,0 +1,112 @@
+@@ -0,0 +1,106 @@
+/* See LICENSE file for copyright and license details. */
+#define CWD "cwd: "
+#define CURSR " > "
@@ -11,33 +11,27 @@
+int icaseorder = 0; /* Set to 1 to sort by ignoring case */
+int idletimeout = 0; /* Screensaver timeout in seconds, 0 to disable */
+int showhidden = 0; /* Set to 1 to show hidden files by default */
++int usecolor = 0; /* Set to 1 to enable color attributes */
+char *idlecmd = "rain"; /* The screensaver program */
++/* See curs_attr(3) for valid video attributes */
+
-+#ifdef USE_COLOR
-+#define CURSR_ATTR A_REVERSE
-+#define DIR_ATTR A_BOLD | COLOR_PAIR(4)
-+#define LINK_ATTR A_BOLD | COLOR_PAIR(6)
-+#define SOCK_ATTR A_BOLD | COLOR_PAIR(1)
-+#define FIFO_ATTR A_BOLD | COLOR_PAIR(5)
-+#define EXEC_ATTR A_BOLD | COLOR_PAIR(2)
-+#else
-+#define CURSR_ATTR A_REVERSE
++#define CURSR_ATTR A_NORMAL
+#define DIR_ATTR A_BOLD
+#define LINK_ATTR A_BOLD
+#define SOCK_ATTR A_BOLD
+#define FIFO_ATTR A_BOLD
++/* Colors to use with COLOR_PAIR(n) as attributes */
+#define EXEC_ATTR A_BOLD
-+#endif
+
+struct cpair pairs[] = {
+ { .fg = 0, .bg = 0 },
+ /* pairs start at 1 */
-+ { COLOR_RED, 0 },
-+ { COLOR_GREEN, 0 },
-+ { COLOR_YELLOW, 0 },
-+ { COLOR_BLUE, 0 },
-+ { COLOR_MAGENTA, 0 },
-+ { COLOR_CYAN, 0 },
++ { COLOR_RED, -1 },
++ { COLOR_GREEN, -1 },
++ { COLOR_YELLOW, -1 },
++ { COLOR_BLUE, -1 },
++ { COLOR_MAGENTA, -1 },
++ { COLOR_CYAN, -1 },
+};
+
+struct assoc assocs[] = {
diff -r abf562f7afdc -r fcd122626982 sysutils/noice/patch-noice.c
--- a/sysutils/noice/patch-noice.c Sat Apr 06 22:19:30 2019 +0200
+++ b/sysutils/noice/patch-noice.c Mon Apr 08 23:22:59 2019 +0200
@@ -4,9 +4,9 @@
bytes without any transformation (and hence also correctly displaying
Unicode characters).
---- noice.c.orig 2019-01-20 12:19:46.000000000 +0000
+--- noice.c.orig 2019-03-09 18:53:18.000000000 +0000
+++ noice.c
-@@ -342,7 +342,8 @@ void
+@@ -343,7 +343,8 @@ void
printmsg(char *msg)
{
move(LINES - 1, 0);
@@ -16,7 +16,7 @@
}
/* Display warning as a message */
-@@ -373,7 +374,7 @@ void
+@@ -374,7 +375,7 @@ void
printprompt(char *str)
{
clearprompt();
@@ -24,8 +24,8 @@
+ addstr(str);
}
- int xgetch(void)
-@@ -497,7 +498,9 @@ printent(struct entry *ent, int active)
+ int
+@@ -499,7 +500,9 @@ printent(struct entry *ent, int active)
}
attron(attr);
@@ -36,7 +36,7 @@
attroff(attr);
}
-@@ -629,7 +632,9 @@ redraw(char *path)
+@@ -631,7 +634,9 @@ redraw(char *path)
cwd[ncols - strlen(CWD) - 1] = '\0';
realpath(cwd, cwdresolved);