summary refs log tree commit diff
diff options
context:
space:
mode:
authorJune McEnroe <june@causal.agency>2021-01-16 13:09:55 -0500
committerJune McEnroe <june@causal.agency>2021-01-16 13:09:55 -0500
commit1a1fe1fb7a724bcd965846c8c9a9150b810f09ba (patch)
tree41c91e7323a71df81d9eeb58c65b3bce10ab2f5a
parentRestore toggling ignore with M-- (diff)
downloadcatgirl-1a1fe1fb7a724bcd965846c8c9a9150b810f09ba.tar.gz
catgirl-1a1fe1fb7a724bcd965846c8c9a9150b810f09ba.zip
Save and load window visibility thresholds
Diffstat (limited to '')
-rw-r--r--ui.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/ui.c b/ui.c
index c787b3c..d1fc6f7 100644
--- a/ui.c
+++ b/ui.c
@@ -955,7 +955,8 @@ static const time_t Signatures[] = {
 	0x6C72696774616303, // no buffer line heat
 	0x6C72696774616304, // no mute
 	0x6C72696774616305, // no URLs
-	0x6C72696774616306,
+	0x6C72696774616306, // no thresh
+	0x6C72696774616307,
 };
 
 static size_t signatureVersion(time_t signature) {
@@ -977,7 +978,7 @@ int uiSave(const char *name) {
 	if (!file) return -1;
 
 	int error = 0
-		|| writeTime(file, Signatures[5])
+		|| writeTime(file, Signatures[6])
 		|| writeTime(file, self.pos);
 	if (error) return error;
 	for (uint num = 0; num < windows.len; ++num) {
@@ -985,6 +986,7 @@ int uiSave(const char *name) {
 		error = 0
 			|| writeString(file, idNames[window->id])
 			|| writeTime(file, window->mute)
+			|| writeTime(file, window->thresh)
 			|| writeTime(file, window->heat)
 			|| writeTime(file, window->unreadSoft)
 			|| writeTime(file, window->unreadWarm);
@@ -1048,6 +1050,7 @@ void uiLoad(const char *name) {
 	while (0 < readString(file, &buf, &cap) && buf[0]) {
 		struct Window *window = windows.ptrs[windowFor(idFor(buf))];
 		if (version > 3) window->mute = readTime(file);
+		if (version > 5) window->thresh = readTime(file);
 		if (version > 0) {
 			window->heat = readTime(file);
 			window->unreadSoft = readTime(file);
a null pointer. Fix this. This error was introduced by commit c1633c6 (Update git to v1.7.6.5 - 2013-03-02). Signed-off-by: John Keeping <john@keeping.me.uk> 2013-03-20Convert pager navigation into a unordered listLukas Fleischer It is common practice and semantically appropriate to use unordered lists for long navigation lists. This also fixes the layout of very long pager navigations in Webkit-based browsers. Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de> 2013-03-20Makefile: remove CGIT-CFLAGS files in clean stageJason A. Donenfeld 2013-03-20ui-summary.c: Move urls variable into print_urls()Lukas Fleischer There's no need for this variable to be global. Printing the header in print_urls() instead of print_url() allows for moving this variable into print_urls() without having to pass any status to print_url(). Note that this only works as long as we don't call print_urls() more than once. Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de> 2013-03-20Fix colspan valuesLukas Fleischer This fixes a couple of minor oversights in previous commits and adjusts all cells using colspan to use the correct width. Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de> 2013-03-20html: check return value of writeJason A. Donenfeld This squelches a gcc warning. It's also correct that we check to see if there are any partial or failed writes. For now, we just print a warning to stderr. In the future, perhaps it will prove wise to exit(1) on partial writes. 2013-03-20ui-shared: squelch compiler warning.Jason A. Donenfeld Since tail is initialized to 0, we will never get a warning on the last if statement, but recent gcc complains anyway. So, we initialize len as well. Future gcc versions should be able to optimize this out anyway. 2013-03-20cgit.mk: Use SHELL_PATH_SQ to run gen-version.shJohn Keeping On some platforms (notably Solaris) /bin/sh doesn't support enough of POSIX for gen-version.sh to run. Git's Makefile provides SHELL_PATH_SQ to address this issue so we just have to use it. Signed-off-by: John Keeping <john@keeping.me.uk> 2013-03-20cgit.mk: don't rebuild everything if CGIT_VERSION changesJohn Keeping If CGIT_VERSION is in CGIT_CFLAGS then a change in version (for example because you have committed your changes) causes all of the CGit objects to be rebuilt. Avoid this by using EXTRA_CPPFLAGS to add the version for only those files that are affected and make them depend on VERSION. Signed-off-by: John Keeping <john@keeping.me.uk> 2013-03-20ui-patch: use cgit_version not CGIT_VERSIONJohn Keeping We already have a global cgit_version which is set from the #define'd CGIT_VERSION in cgit.c. Change ui-patch.c to use this so that we only need to rebuild cgit.o when the version changes. Signed-off-by: John Keeping <john@keeping.me.uk> 2013-03-20Makefile: re-use Git's Makefile where possibleJohn Keeping