Bump version to 0.9

Now the user can at least toggle them from the help tab,
or even bind them as necessary.

CMakeLists.txt

@@ -9,7 +9,7 @@ endif ("${CMAKE_C_COMPILER_ID}" MATCHES "GNU" OR CMAKE_COMPILER_IS_GNUCC)
 
 # Version
 set (project_VERSION_MAJOR "0")
-set (project_VERSION_MINOR "1")
+set (project_VERSION_MINOR "9")
 set (project_VERSION_PATCH "0")
 
 set (project_VERSION "${project_VERSION_MAJOR}")

NEWS

@@ -0,0 +1,4 @@
+0.9.0 (2018-11-02)
+
+ * Initial release
+

README.adoc

@@ -11,9 +11,9 @@ names, and should be pronounced as "nincompoop".
 
 Features
 --------
-Currently it's still under development but it's already useful enough for me
+Most things are there.  Enough for me to use it exclusively.  Note that since I
-to use it exclusively.  Note that since I only use the filesystem browsing mode,
+only use the filesystem browsing mode, that's also the only thing I care to
-that's also the only thing I care to implement for the time being.
+implement for the time being.
 
 image::nncmpp.png[align="center"]
 
@@ -59,16 +59,17 @@ settings = {
 	root       = "~/Music"
 }
 colors = {
-	normal     = ""
+	normal      = ""
-	highlight  = "bold"
+	highlight   = "bold"
-	elapsed    = "reverse"
+	elapsed     = "reverse"
-	remains    = "ul"
+	remains     = "ul"
-	tab_bar    = "reverse"
+	tab_bar     = "reverse"
-	tab_active = "ul"
+	tab_active  = "ul"
-	even       = ""
+	even        = ""
-	odd        = ""
+	odd         = ""
-	selection  = "reverse"
+	selection   = "reverse"
-	scrollbar  = ""
+	multiselect = "-1 6"
+	scrollbar   = ""
 }
 streams = {
 	"dnbradio.com" = "http://www.dnbradio.com/hi.m3u"

contrib/dark-theme-16.conf

@@ -0,0 +1,51 @@
+# Contributed by vifino
+
+# Best enjoyed with the following softer terminal color theme:
+#! special
+#*.foreground:   #d5d5d5
+#*.background:   #1d2021
+#*.cursorColor:  #d5d5d5
+#! black
+#*.color0:       #101010
+#*.color8:       #6f6f6f
+#! red
+#*.color1:       #ff6878
+#*.color9:       #ff778b
+#! green
+#*.color2:       #b4fb73
+#*.color10:      #d0ffa0
+#! yellow
+#*.color3:       #fff090
+#*.color11:      #fffeb0
+#! blue
+#*.color4:       #6095ff
+#*.color12:      #80c0ff
+#! magenta
+#*.color5:       #ff90fe
+#*.color13:      #f0a9ff
+#! cyan
+#*.color6:       #45e1f8
+#*.color14:      #90e9ff
+#! white
+#*.color7:       #f1f1f1
+#*.color15:      #ffffff
+
+colors = {
+	normal = "1 0"
+	highlight = "12 0 bold"
+	elapsed = "4 4"
+	remains = "4 8"
+
+	tab_bar = "8 0"
+	tab_active = "6 8 bold"
+	even = "11 0"
+	odd = "11 0"
+	scrollbar = "8 0"
+
+	selection = "0 4"
+	multiselect = "0 3"
+	directory = "15 0"
+
+	incoming = "2"
+	outgoing = "4"
+}

contrib/light-theme-256.conf

@@ -0,0 +1,19 @@
+colors = {
+	normal = "237 255"
+	highlight = "16 255 bold"
+	elapsed = "231 250"
+	remains = "250 231"
+
+	tab_bar = "252 16"
+	tab_active = "231 237 bold"
+	even = "16 231"
+	odd = "16 231"
+	scrollbar = "250 231"
+
+	selection = "231 202"
+	multiselect = "231 88"
+	directory = "16 231 bold"
+
+	incoming = "28"
+	outgoing = "19"
+}

line-editor.c

@@ -0,0 +1,288 @@
+/*
+ * line-editor.c: a line editor component for the TUI part of liberty
+ *
+ * Copyright (c) 2017 - 2018, Přemysl Janouch <p@janouch.name>
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
+ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ */
+
+// This is here just for IDE code model reasons
+#ifndef HAVE_LIBERTY
+#include "liberty/liberty.c"
+#include "liberty/liberty-tui.c"
+#endif
+
+static void
+row_buffer_append_c (struct row_buffer *self, ucs4_t c, chtype attrs)
+{
+	struct row_char current = { .attrs = attrs, .c = c };
+	struct row_char invalid = { .attrs = attrs, .c = '?', .width = 1 };
+
+	current.width = uc_width (current.c, locale_charset ());
+	if (current.width < 0 || !app_is_character_in_locale (current.c))
+		current = invalid;
+
+	ARRAY_RESERVE (self->chars, 1);
+	self->chars[self->chars_len++] = current;
+	self->total_width += current.width;
+}
+
+// --- Line editor -------------------------------------------------------------
+
+enum line_editor_action
+{
+	LINE_EDITOR_B_CHAR,                 ///< Go back a character
+	LINE_EDITOR_F_CHAR,                 ///< Go forward a character
+	LINE_EDITOR_B_WORD,                 ///< Go back a word
+	LINE_EDITOR_F_WORD,                 ///< Go forward a word
+	LINE_EDITOR_HOME,                   ///< Go to start of line
+	LINE_EDITOR_END,                    ///< Go to end of line
+
+	LINE_EDITOR_B_DELETE,               ///< Delete last character
+	LINE_EDITOR_F_DELETE,               ///< Delete next character
+	LINE_EDITOR_B_KILL_WORD,            ///< Delete last word
+	LINE_EDITOR_B_KILL_LINE,            ///< Delete everything up to BOL
+	LINE_EDITOR_F_KILL_LINE,            ///< Delete everything up to EOL
+};
+
+struct line_editor
+{
+	int point;                          ///< Caret index into line data
+	ucs4_t *line;                       ///< Line data, 0-terminated
+	int *w;                             ///< Codepoint widths, 0-terminated
+	size_t len;                         ///< Editor length
+	size_t alloc;                       ///< Editor allocated
+	char prompt;                        ///< Prompt character
+
+	void (*on_changed) (void);          ///< Callback on text change
+	void (*on_end) (bool);              ///< Callback on abort
+};
+
+static void
+line_editor_free (struct line_editor *self)
+{
+	free (self->line);
+	free (self->w);
+}
+
+/// Notify whomever invoked the editor that it's been either confirmed or
+/// cancelled and clean up editor state
+static void
+line_editor_abort (struct line_editor *self, bool status)
+{
+	self->on_end (status);
+	self->on_changed = NULL;
+
+	free (self->line);
+	self->line = NULL;
+	free (self->w);
+	self->w = NULL;
+	self->alloc = 0;
+	self->len = 0;
+	self->point = 0;
+	self->prompt = 0;
+}
+
+/// Start the line editor; remember to fill in "change" and "end" callbacks
+static void
+line_editor_start (struct line_editor *self, char prompt)
+{
+	self->alloc = 16;
+	self->line = xcalloc (sizeof *self->line, self->alloc);
+	self->w = xcalloc (sizeof *self->w, self->alloc);
+	self->len = 0;
+	self->point = 0;
+	self->prompt = prompt;
+}
+
+static void
+line_editor_changed (struct line_editor *self)
+{
+	self->line[self->len] = 0;
+	self->w[self->len] = 0;
+
+	if (self->on_changed)
+		self->on_changed ();
+}
+
+static void
+line_editor_move (struct line_editor *self, int to, int from, int len)
+{
+	memmove (self->line + to, self->line + from,
+		sizeof *self->line * len);
+	memmove (self->w + to, self->w + from,
+		sizeof *self->w * len);
+}
+
+static void
+line_editor_insert (struct line_editor *self, ucs4_t codepoint)
+{
+	while (self->alloc - self->len < 2 /* inserted + sentinel */)
+	{
+		self->alloc <<= 1;
+		self->line = xreallocarray
+			(self->line, sizeof *self->line, self->alloc);
+		self->w = xreallocarray
+			(self->w, sizeof *self->w, self->alloc);
+	}
+
+	line_editor_move (self, self->point + 1, self->point,
+		self->len - self->point);
+	self->line[self->point] = codepoint;
+	self->w[self->point] = app_is_character_in_locale (codepoint)
+		? uc_width (codepoint, locale_charset ())
+		: 1 /* the replacement question mark */;
+
+	self->point++;
+	self->len++;
+	line_editor_changed (self);
+}
+
+static bool
+line_editor_action (struct line_editor *self, enum line_editor_action action)
+{
+	switch (action)
+	{
+	default:
+		return soft_assert (!"unknown line editor action");
+
+	case LINE_EDITOR_B_CHAR:
+		if (self->point < 1)
+			return false;
+		do self->point--;
+		while (self->point > 0
+			&& !self->w[self->point]);
+		return true;
+	case LINE_EDITOR_F_CHAR:
+		if (self->point + 1 > (int) self->len)
+			return false;
+		do self->point++;
+		while (self->point < (int) self->len
+			&& !self->w[self->point]);
+		return true;
+	case LINE_EDITOR_B_WORD:
+	{
+		if (self->point < 1)
+			return false;
+		int i = self->point;
+		while (i && self->line[--i] == ' ');
+		while (i-- && self->line[i] != ' ');
+		self->point = ++i;
+		return true;
+	}
+	case LINE_EDITOR_F_WORD:
+	{
+		if (self->point + 1 > (int) self->len)
+			return false;
+		int i = self->point;
+		while (i < (int) self->len && self->line[i] != ' ') i++;
+		while (i < (int) self->len && self->line[i] == ' ') i++;
+		self->point = i;
+		return true;
+	}
+	case LINE_EDITOR_HOME:
+		self->point = 0;
+		return true;
+	case LINE_EDITOR_END:
+		self->point = self->len;
+		return true;
+
+	case LINE_EDITOR_B_DELETE:
+	{
+		if (self->point < 1)
+			return false;
+		int len = 1;
+		while (self->point - len > 0
+			&& !self->w[self->point - len])
+			len++;
+		line_editor_move (self, self->point - len, self->point,
+			self->len - self->point);
+		self->len -= len;
+		self->point -= len;
+		line_editor_changed (self);
+		return true;
+	}
+	case LINE_EDITOR_F_DELETE:
+	{
+		if (self->point + 1 > (int) self->len)
+			return false;
+		int len = 1;
+		while (self->point + len < (int) self->len
+			&& !self->w[self->point + len])
+			len++;
+		self->len -= len;
+		line_editor_move (self, self->point, self->point + len,
+			self->len - self->point);
+		line_editor_changed (self);
+		return true;
+	}
+	case LINE_EDITOR_B_KILL_WORD:
+	{
+		if (self->point < 1)
+			return false;
+
+		int i = self->point;
+		while (i && self->line[--i] == ' ');
+		while (i-- && self->line[i] != ' ');
+		i++;
+
+		line_editor_move (self, i, self->point, (self->len - self->point));
+		self->len -= self->point - i;
+		self->point = i;
+		line_editor_changed (self);
+		return true;
+	}
+	case LINE_EDITOR_B_KILL_LINE:
+		self->len -= self->point;
+		line_editor_move (self, 0, self->point, self->len);
+		self->point = 0;
+		line_editor_changed (self);
+		return true;
+	case LINE_EDITOR_F_KILL_LINE:
+		self->len = self->point;
+		line_editor_changed (self);
+		return true;
+	}
+}
+
+static int
+line_editor_write (const struct line_editor *self, struct row_buffer *row,
+	int width, chtype attrs)
+{
+	if (self->prompt)
+	{
+		hard_assert (self->prompt < 127);
+		row_buffer_append_c (row, self->prompt, attrs);
+		width--;
+	}
+
+	int following = 0;
+	for (size_t i = self->point; i < self->len; i++)
+		following += self->w[i];
+
+	int preceding = 0;
+	size_t start = self->point;
+	while (start && preceding < width / 2)
+		preceding += self->w[--start];
+
+	// There can be one extra space at the end of the line but this way we
+	// don't need to care about non-spacing marks following full-width chars
+	while (start && width - preceding - following > 2 /* widest char */)
+		preceding += self->w[--start];
+
+	// XXX: we should also show < > indicators for overflow but it'd probably
+	//   considerably complicate this algorithm
+	for (; start < self->len; start++)
+		row_buffer_append_c (row, self->line[start], attrs);
+	return !!self->prompt + preceding;
+}