summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ui.c58
1 files changed, 33 insertions, 25 deletions
diff --git a/ui.c b/ui.c
index 9f0bb88..96f722a 100644
--- a/ui.c
+++ b/ui.c
@@ -474,36 +474,44 @@ static void inputAdd(struct Style *style, const char *str) {
 }
 
 static void inputUpdate(void) {
-	wmove(input, 0, 0);
-	wattr_set(
-		input,
-		colorAttr(mapColor(self.color)),
-		colorPair(mapColor(self.color), -1),
-		NULL
-	);
+	size_t id = windows.active->id;
+	const char *nick = self.nick;
 	const char *head = editHead();
 	const char *skip = NULL;
-	if (self.nick) {
-		size_t id = windows.active->id;
-		if (NULL != (skip = commandIsPrivmsg(id, head))) {
-			waddch(input, '<');
-			waddstr(input, self.nick);
-			waddstr(input, "> ");
-		} else if (NULL != (skip = commandIsNotice(id, head))) {
-			waddch(input, '-');
-			waddstr(input, self.nick);
-			waddstr(input, "- ");
-		} else if (NULL != (skip = commandIsAction(id, head))) {
-			waddstr(input, "* ");
-			waddstr(input, self.nick);
-			waddch(input, ' ');
-		}
+	const char *pre = "";
+	const char *suf = " ";
+	struct Style style = { .fg = self.color, .bg = Default };
+	if (NULL != (skip = commandIsPrivmsg(id, head))) {
+		pre = "<";
+		suf = "> ";
+	} else if (NULL != (skip = commandIsNotice(id, head))) {
+		pre = "-";
+		suf = "- ";
+	} else if (NULL != (skip = commandIsAction(id, head))) {
+		style.attr |= A_ITALIC;
+		pre = "* ";
+	} else if (id == Debug) {
+		skip = head;
+		style.fg = Gray;
+		pre = "<<";
+		nick = NULL;
 	}
-	if (skip) head = skip;
 
 	int y, x;
-	struct Style style = Reset;
-	inputAdd(&style, head);
+	wmove(input, 0, 0);
+	if (skip) {
+		wattr_set(
+			input,
+			style.attr | colorAttr(mapColor(style.fg)),
+			colorPair(mapColor(style.fg), mapColor(style.bg)),
+			NULL
+		);
+		waddstr(input, pre);
+		if (nick) waddstr(input, nick);
+		waddstr(input, suf);
+	}
+	style.fg = Default;
+	inputAdd(&style, (skip ? skip : head));
 	getyx(input, y, x);
 	inputAdd(&style, editTail());
 	wclrtoeol(input);
ss='logmsg'> There were no objections (at the time of committing this): http://lists.zx2c4.com/pipermail/cgit/2013-May/001393.html http://lists.zx2c4.com/pipermail/cgit/2014-January/001904.html Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> 2014-01-17filter: don't forget to reap the auth filterJason A. Donenfeld Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> 2014-01-17cgit.c: free tmp variableJason A. Donenfeld Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> 2014-01-17Switch to exclusively using global ctxLukas Fleischer Drop the context parameter from the following functions (and all static helpers used by them) and use the global context instead: * cgit_print_http_headers() * cgit_print_docstart() * cgit_print_pageheader() Remove context parameter from all commands Drop the context parameter from the following functions (and all static helpers used by them) and use the global context instead: * cgit_get_cmd() * All cgit command functions. * cgit_clone_info() * cgit_clone_objects() * cgit_clone_head() * cgit_print_plain() * cgit_show_stats() In initialization routines, use the global context variable instead of passing a pointer around locally. Remove callback data parameter for cache slots This is no longer needed since the context is always read from the global context variable. Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de> 2014-01-16auth: have cgit calculate login addressJason A. Donenfeld This way we're sure to use virtual root, or any other strangeness encountered. Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> 2014-01-16auth: lua string comparisons are time invariantJason A. Donenfeld By default, strings are compared by hash, so we can remove this comment. Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> 2014-01-16authentication: use hidden form instead of refererJason A. Donenfeld This also gives us some CSRF protection. Note that we make use of the hmac to protect the redirect value. Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> 2014-01-16auth: add basic authentication filter frameworkJason A. Donenfeld This leverages the new lua support. See filters/simple-authentication.lua for explaination of how this works. There is also additional documentation in cgitrc.5.txt. Though this is a cookie-based approach, cgit's caching mechanism is preserved for authenticated pages. Very plugable and extendable depending on user needs. The sample script uses an HMAC-SHA1 based cookie to store the currently logged in user, with an expiration date. Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> 2014-01-16t0111: Additions and fixesLukas Fleischer * Rename the capitalize-* filters to dump.* since they also dump the arguments. * Add full argument validation to the email filters. Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de> 2014-01-16parsing.c: Remove leading space from committerLukas Fleischer