Curses: support arbitrary RGB colorsHEADmaster-fmsbw-cimaster

* Instead of supporting only 16 predefined RGB placeholder
  values in Scintilla messages and styles, you can now use
  arbitrary RGB values and colors are allocated via the terminal
  on the fly.
  You no longer need to call 3EJ to change the default color
  palette.
* The placeholder RGB values are still available.
  Since you will usually want exact RGB values when using
  anything outside of the range of 16 default colors
  and the RGB placeholders will not always exactly correspond
  to their RGB value, you can now call `0,3EJ` to ignore
  the default palette and allocate all colors dynamically.
* Allows for more than 16 colors on the screen simultaneously.
  Also simplifies the solarized.tes color scheme.
  Since both Scinterm and SciTECO try not to touch the 16
  default colors, you also no longer have to deal with
  restoring the palette after program termination
  (which was never reliable anyway).
* Color schemes with non-default colors (solarized.tes)
  may now be broken on TERM=linux-16color (Linux VT)
  since Scinterm will get only 8 colors, but solarized.tes
  needs 16.

8 files changed, 154 insertions, 293 deletions

diff --git a/.gitmodules b/.gitmodules
index 841ce77..af9fd68 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,7 +4,7 @@
 	ignore = untracked
 [submodule "scinterm"]
 	path = contrib/scinterm
-	url = https://github.com/orbitalquark/scinterm.git
+	url = https://github.com/rhaberkorn/scinterm.git
 [submodule "lexilla"]
 	path = contrib/lexilla
 	url = https://github.com/ScintillaOrg/lexilla.git
diff --git a/TODO b/TODO
index 6d6c581..678121d 100644
--- a/TODO
+++ b/TODO
@@ -769,14 +769,6 @@ Features:
    To format a hex byte, you would write 16^R 2,Qa\ ^D.
    The same extension might not be desirable for =/==/===, unless
    they are colon-modified?.
- * Curses: allow freely using RGB colors instead of only the constants
-   corresponding with the 16 default curses colors.
-   Scinterm v5.5 supports that. This means we also need a hash map for
-   mapping RGB color values to curses color numbers, analoguous to what
-   Scinterm does.
-   The problem of Scinterm reusing the same color namespace both for
-   arbitrary RGB values and for predefined special constants however
-   hasn't been solved yet.
  * Scinterm: INDIC_PLAIN and INDIC_STRIKE could theoretically be supported.
    PDCurses has A_STRIKETHROUGH. This would require Scintilla API
    changes, though, as it currently calls SurfaceImpl::FillRectangle(),
diff --git a/contrib/scinterm b/contrib/scinterm
-Subproject 5499991f775d5fdd9d5558ef339788b66e99712
+Subproject 274656ad8fd7478ff7ed7fc4e04eedb7863b2f9
diff --git a/lib/colors/solarized.tes b/lib/colors/solarized.tes
index 11567d9..91b2718 100644
--- a/lib/colors/solarized.tes
+++ b/lib/colors/solarized.tes
@@ -17,41 +17,24 @@
  * `solarized.toggle` will be mapped to the F5 function key.
  * F5 will also automatically terminate the command line.
  *!
-0EJ-1"=
-  000,043,054:M[color.rgb],08,3EJ Q[color.lblack]  U[color.base03]
-  007,054,066:M[color.rgb],00,3EJ Q[color.black]   U[color.base02]
-  088,110,117:M[color.rgb],10,3EJ Q[color.lgreen]  U[color.base01]
-  101,123,131:M[color.rgb],11,3EJ Q[color.lyellow] U[color.base00]
-  131,148,150:M[color.rgb],12,3EJ Q[color.lblue]   U[color.base0]
-  147,161,161:M[color.rgb],14,3EJ Q[color.lcyan]   U[color.base1]
-  238,232,213:M[color.rgb],07,3EJ Q[color.white]   U[color.base2]
-  253,246,227:M[color.rgb],15,3EJ Q[color.lwhite]  U[color.base3]
-  181,137,000:M[color.rgb],03,3EJ !* yellow *!
-  203,075,022:M[color.rgb],09,3EJ Q[color.lred]    U[color.orange]
-  220,050,047:M[color.rgb],01,3EJ !* red *!
-  211,054,130:M[color.rgb],05,3EJ !* magenta *!
-  108,113,196:M[color.rgb],13,3EJ Q[color.lmagenta]U[color.violet]
-  038,139,210:M[color.rgb],04,3EJ !* blue *!
-  042,161,152:M[color.rgb],06,3EJ !* cyan *!
-  133,153,000:M[color.rgb],02,3EJ !* green *!
-|
-  000,043,054:M[color.rgb]U[color.base03]
-  007,054,066:M[color.rgb]U[color.base02]
-  088,110,117:M[color.rgb]U[color.base01]
-  101,123,131:M[color.rgb]U[color.base00]
-  131,148,150:M[color.rgb]U[color.base0]
-  147,161,161:M[color.rgb]U[color.base1]
-  238,232,213:M[color.rgb]U[color.base2]
-  253,246,227:M[color.rgb]U[color.base3]
-  181,137,000:M[color.rgb]U[color.yellow]
-  203,075,022:M[color.rgb]U[color.orange]
-  220,050,047:M[color.rgb]U[color.red]
-  211,054,130:M[color.rgb]U[color.magenta]
-  108,113,196:M[color.rgb]U[color.violet]
-  038,139,210:M[color.rgb]U[color.blue]
-  042,161,152:M[color.rgb]U[color.cyan]
-  133,153,000:M[color.rgb]U[color.green]
-'
+0,3EJ
+
+000,043,054:M[color.rgb]U[color.base03]
+007,054,066:M[color.rgb]U[color.base02]
+088,110,117:M[color.rgb]U[color.base01]
+101,123,131:M[color.rgb]U[color.base00]
+131,148,150:M[color.rgb]U[color.base0]
+147,161,161:M[color.rgb]U[color.base1]
+238,232,213:M[color.rgb]U[color.base2]
+253,246,227:M[color.rgb]U[color.base3]
+181,137,000:M[color.rgb]U[color.yellow]
+203,075,022:M[color.rgb]U[color.orange]
+220,050,047:M[color.rgb]U[color.red]
+211,054,130:M[color.rgb]U[color.magenta]
+108,113,196:M[color.rgb]U[color.violet]
+038,139,210:M[color.rgb]U[color.blue]
+042,161,152:M[color.rgb]U[color.cyan]
+133,153,000:M[color.rgb]U[color.green]
 
 :Q[solarized.light]"< 0U[solarized.light] '
 @[solarized.light]{
diff --git a/src/core-commands.c b/src/core-commands.c
index 2dc1da7..d2c8b9d 100644
--- a/src/core-commands.c
+++ b/src/core-commands.c
@@ -2136,46 +2136,35 @@ teco_state_ecommand_flags(teco_machine_main_t *ctx, GError **error)
  * first.
  * Memory limiting is enabled by default.
  * .IP 3:
- * This \fBwrite-only\fP property allows redefining the
- * first 16 entries of the terminal color palette \(em a
- * feature required by some
- * color schemes when using the Curses user interface.
- * When setting this property, you are making a request
- * to define the terminal \fIcolor\fP as the Scintilla-compatible
- * RGB color value given in the \fIrgb\fP parameter.
- * \fIcolor\fP must be a value between 0 and 15
- * corresponding to black, red, green, yellow, blue, magenta,
- * cyan, white, bright black, bright red, etc. in that order.
- * The \fIrgb\fP value has the format 0xBBGGRR, i.e. the red
- * component is the least-significant byte and all other bytes
- * are ignored.
- * Note that on curses, RGB color values sent to Scintilla
- * are actually mapped to these 16 colors by the Scinterm port
- * and may represent colors with no resemblance to the \(lqRGB\(rq
- * value used (depending on the current palette) \(em they should
- * instead be viewed as placeholders for 16 standard terminal
- * color codes.
- * Please refer to the Scinterm manual for details on the allowed
- * \(lqRGB\(rq values and how they map to terminal colors.
- * This command provides a crude way to request exact RGB colors
- * for the first 16 terminal colors.
- * The color definition may be queued or be completely ignored
- * on other user interfaces and no feedback is given
- * if it fails. In fact feedback cannot be given reliably anyway.
- * Note that on 8 color terminals, only the first 8 colors
- * can be redefined (if you are lucky).
- * Note that due to restrictions of most terminal emulators
- * and some curses implementations, this command simply will not
- * restore the original palette entry or request
- * when rubbed out and should generally only be used in
- * \fIbatch-mode\fP \(em typically when loading a color scheme.
- * For the same reasons \(em even though \*(ST tries hard to
- * restore the original palette on exit \(em palette changes may
- * persist after \*(ST terminates on most terminal emulators on Unix.
- * The only emulator which will restore their default palette
- * on exit the author is aware of is \fBxterm\fP(1) and
- * the Linux console driver.
- * You have been warned. Good luck.
+ * This \fBwrite-only\fP property allows disabling use of
+ * the 16 color palette of default colors when using
+ * the Curses user interface.
+ * By default, when working with RGB values in Scintilla
+ * messages (and \*(ST color schemes for that matter)
+ * the 16 \(lqdefault\(rq colors are represented by
+ * special RGB placeholders (e.g. 0x000080 for \fICOLOR_RED\fP)
+ * as documented in the Scinterm manual.
+ * Any other RGB values will be automatically allocated
+ * in the terminal emulator if supported, giving the illusion
+ * of true color support, even though the actual number of
+ * concurrent colors on screen may be limited by the terminal
+ * emulator (see \fImax_colors\fP and \fImax_pairs\fP
+ * .B terminfo (1)
+ * capabilities) and other factors.
+ * \*(ST tries to avoid the first 16 color ids so as not to
+ * interfer with other terminal-based applications.
+ * The default palette however may be overwritten when requesting
+ * new colors in terminals restricted to 16 colors.
+ * In this case the original palette might not be restored properly on
+ * program termination and affect other terminal applications.
+ * The 16 predefined colors do not map to exact RGB values,
+ * though, but point into a palette at the terminal emulator.
+ * \*(ST therefore allows you to disable the 16 RGB placeholders
+ * by calling \(lq0,3EJ\(rq so that all colors are freshly initialized
+ * and will represent their exact RGB values.
+ * It has no effect when using the GTK interface.
+ * You are recommended to add \(lq0,3EJ\(rq to all color
+ * schemes that rely on exact RGB values.
  * .IP 4:
  * The column after the last horizontal movement.
  * This is only used by \fBfnkeys.tes\fP and is similar to the Scintilla-internal
@@ -2250,7 +2239,7 @@ teco_state_ecommand_properties(teco_machine_main_t *ctx, GError **error)
 		EJ_USER_INTERFACE = 0,
 		EJ_BUFFERS,
 		EJ_MEMORY_LIMIT,
-		EJ_INIT_COLOR,
+		EJ_PALETTE,
 		EJ_CARETX,
 		EJ_CMDLINE_HEIGHT,
 		EJ_RECOVERY_INTERVAL
@@ -2274,19 +2263,13 @@ teco_state_ecommand_properties(teco_machine_main_t *ctx, GError **error)
 				return;
 			break;
 
-		case EJ_INIT_COLOR:
-			if (value < 0 || value >= 16) {
-				g_set_error(error, TECO_ERROR, TECO_ERROR_FAILED,
-				            "Invalid color code %" TECO_INT_FORMAT " "
-				            "specified for <EJ>", value);
-				return;
-			}
-			if (!teco_expressions_args()) {
-				teco_error_argexpected_set(error, "EJ");
+		case EJ_PALETTE:
+			if (teco_is_success(value)) {
+				g_set_error_literal(error, TECO_ERROR, TECO_ERROR_FAILED,
+				                    "Default color palette can only be disabled");
 				return;
 			}
-			teco_interface_init_color((guint)value,
-			                          (guint32)teco_expressions_pop_num(0));
+			teco_interface_disable_palette();
 			break;
 
 		case EJ_CARETX:
diff --git a/src/interface-curses/interface.c b/src/interface-curses/interface.c
index b30e5dc..21e728f 100644
--- a/src/interface-curses/interface.c
+++ b/src/interface-curses/interface.c
@@ -140,6 +140,16 @@ static gint teco_xterm_version(void) G_GNUC_UNUSED;
 static gint teco_interface_blocking_getch(void);
 static inline gboolean teco_interface_check_key(gint key);
 
+#define MAX_COLORS (MIN(COLORS, G_MAXSHORT)/2)
+/**
+ * Maximum effective number of color pairs.
+ * Scinterm uses shorts for color pairs, so G_MAXSHORT is the maximum.
+ * Some Curses implementations (NetBSD, PDCurses) may support less,
+ * but set COLOR_PAIRS accordingly.
+ * Half of the range is reserved to Scinterm.
+ */
+#define MAX_PAIRS (MIN(COLOR_PAIRS, G_MAXSHORT)/2)
+
 /**
  * Get bright variant of one of the 8 standard
  * curses colors.
@@ -174,30 +184,22 @@ static inline gboolean teco_interface_check_key(gint key);
 
 static struct {
 	/**
+	 * Mapping of RGB codes (encoded into a pointer)
+	 * to a curses color number.
+	 */
+	GHashTable *color_table;
+	/**
 	 * Mapping of foreground and background curses color tuples
 	 * (encoded into a pointer) to a color pair number.
 	 */
 	GHashTable *pair_table;
-
 	/**
-	 * Mapping of the first 16 curses color codes (that may or may not
-	 * correspond with the standard terminal color codes) to
-	 * Scintilla-compatible RGB values (red is LSB) to initialize after
-	 * Curses startup.
-	 * Negative values mean no color redefinition (keep the original
-	 * palette entry).
+	 * Whether to map the 16 standard palettized colors
+	 * in color_table.
+	 * Should be disabled when using arbitrary RGB values,
+	 * so every color is initialized to exact RGB values.
 	 */
-	gint32 color_table[16];
-
-	/**
-	 * Mapping of the first 16 curses color codes to their
-	 * original values for restoring them on shutdown.
-	 * Unfortunately, this may not be supported on all
-	 * curses ports, so this array may be unused.
-	 */
-	struct {
-		gshort r, g, b;
-	} orig_color_table[16];
+	gboolean use_palette;
 
 	int stdin_orig, stdout_orig, stderr_orig;
 	SCREEN *screen;
@@ -272,7 +274,7 @@ teco_color_pair(attr_t *attr, gshort fg, gshort bg)
 	gpointer value = g_hash_table_lookup(teco_interface.pair_table, key);
 	if (G_LIKELY(value != NULL))
 		return GPOINTER_TO_UINT(value);
-	if (G_UNLIKELY(next_pair >= COLOR_PAIRS || next_pair > G_MAXSHORT))
+	if (G_UNLIKELY(next_pair >= MAX_PAIRS))
 		return 0;
 	init_pair(next_pair, fg, bg);
 	g_hash_table_insert(teco_interface.pair_table, key, GUINT_TO_POINTER(next_pair));
@@ -300,38 +302,60 @@ teco_rgb2curses_triple(guint32 rgb, gshort *r, gshort *g, gshort *b)
 	*b = ((rgb & 0xFF0000) >> 16)*1000/0xFF;
 }
 
+static inline void
+teco_interface_insert_color(guint32 rgb, gshort color)
+{
+	/*
+	 * Color ids are stored one-offset, so that COLOR_BLACK
+	 * can be discerned from a missing entry.
+	 */
+	g_hash_table_insert(teco_interface.color_table,
+	                    GUINT_TO_POINTER(rgb), GUINT_TO_POINTER(color)+1);
+}
+
 /**
  * Convert a Scintilla-compatible RGB color value
  * (0xBBGGRR) to a Curses color code (e.g. COLOR_BLACK).
- * This does not work with arbitrary RGB values but
- * only the 16 RGB color values defined by Scinterm
- * corresponding to the 16 terminal colors.
- * It is equivalent to Scinterm's internal `term_color`
- * function.
+ *
+ * This will automatically initialize new curses colors
+ * when necessary.
+ * Unless the palette is disabled with
+ * teco_interface_disable_palette(), this will return
+ * the 16 "standard" colors for a predefined list of
+ * RGB values (just like defined by Scinterm).
  */
 static gshort
 teco_rgb2curses(guint32 rgb)
 {
-	switch (rgb) {
-	case 0x000000: return COLOR_BLACK;
-	case 0x000080: return COLOR_RED;
-	case 0x008000: return COLOR_GREEN;
-	case 0x008080: return COLOR_YELLOW;
-	case 0x800000: return COLOR_BLUE;
-	case 0x800080: return COLOR_MAGENTA;
-	case 0x808000: return COLOR_CYAN;
-	case 0xC0C0C0: return COLOR_WHITE;
-	case 0x404040: return COLOR_LBLACK;
-	case 0x0000FF: return COLOR_LRED;
-	case 0x00FF00: return COLOR_LGREEN;
-	case 0x00FFFF: return COLOR_LYELLOW;
-	case 0xFF0000: return COLOR_LBLUE;
-	case 0xFF00FF: return COLOR_LMAGENTA;
-	case 0xFFFF00: return COLOR_LCYAN;
-	case 0xFFFFFF: return COLOR_LWHITE;
-	}
+	static guint colors = 0;
+
+	if (!has_colors())
+		return COLOR_WHITE;
+
+	gpointer value = g_hash_table_lookup(teco_interface.color_table,
+	                                     GUINT_TO_POINTER(rgb));
+	if (G_LIKELY(value != NULL))
+		return GPOINTER_TO_UINT(value)-1;
+
+	/*
+	 * Even when initializing new colors, we will __try__ not to
+	 * touch the 16 palettized colors.
+	 * First of all, we might still need them and secondly,
+	 * this ensures we don't have to reset them on exit
+	 * (which is not always possible anyway).
+	 * There can still be 16 color terminals with
+	 * can_change_color() == TRUE, though.
+	 */
+	guint next_color = colors + (COLORS > 16 ? 16 : 0);
 
-	return COLOR_WHITE;
+	if (G_UNLIKELY(next_color >= MAX_COLORS) || !can_change_color())
+		return COLOR_WHITE;
+	gshort r, g, b;
+	teco_rgb2curses_triple(rgb, &r, &g, &b);
+	init_color(next_color, r, g, b);
+	teco_interface_insert_color(rgb, next_color);
+	colors++;
+	return next_color;
 }
 
 static gint
@@ -422,9 +446,6 @@ teco_view_free(teco_view_t *ctx)
 	scintilla_delete(ctx);
 }
 
-static void teco_interface_init_color_safe(guint color, guint32 rgb);
-static void teco_interface_restore_colors(void);
-
 static void teco_interface_init_screen(void);
 static gboolean teco_interface_init_interactive(GError **error);
 static void teco_interface_restore_batch(void);
@@ -439,10 +460,7 @@ static void teco_interface_draw_info(void);
 void
 teco_interface_init(gint argc, gchar **argv)
 {
-	for (guint i = 0; i < G_N_ELEMENTS(teco_interface.color_table); i++)
-		teco_interface.color_table[i] = -1;
-	for (guint i = 0; i < G_N_ELEMENTS(teco_interface.orig_color_table); i++)
-		teco_interface.orig_color_table[i].r = -1;
+	teco_interface.use_palette = TRUE;
 
 	teco_interface.stdin_orig = teco_interface.stdout_orig = teco_interface.stderr_orig = -1;
 
@@ -484,133 +502,11 @@ teco_interface_get_options(void)
 	return NULL;
 }
 
-static void
-teco_interface_init_color_safe(guint color, guint32 rgb)
-{
-#if defined(__PDCURSES__) && !defined(PDCURSES_GUI)
-	if (teco_interface.orig_color_table[color].r < 0) {
-		color_content((short)color,
-		              &teco_interface.orig_color_table[color].r,
-		              &teco_interface.orig_color_table[color].g,
-		              &teco_interface.orig_color_table[color].b);
-	}
-#endif
-
-	gshort r, g, b;
-	teco_rgb2curses_triple(rgb, &r, &g, &b);
-	init_color((short)color, r, g, b);
-}
-
-#if defined(__PDCURSES__) && !defined(PDCURSES_GUI)
-
-/*
- * On PDCurses/WinCon, color_content() will actually return
- * the real console color palette - or at least the default
- * palette when the console started.
- */
-static void
-teco_interface_restore_colors(void)
-{
-	if (!can_change_color())
-		return;
-
-	for (guint i = 0; i < G_N_ELEMENTS(teco_interface.orig_color_table); i++) {
-		if (teco_interface.orig_color_table[i].r < 0)
-			continue;
-
-		init_color((short)i,
-		           teco_interface.orig_color_table[i].r,
-		           teco_interface.orig_color_table[i].g,
-		           teco_interface.orig_color_table[i].b);
-	}
-}
-
-#elif defined(CURSES_TTY)
-
-/*
- * FIXME: On UNIX/ncurses teco_interface_init_color_safe() __may__
- * change the terminal's palette permanently and there does not
- * appear to be any portable way of restoring the original one.
- * Curses has color_content(), but there is actually no terminal
- * that allows querying the current palette and so color_content()
- * will return bogus "default" values and only for the first 8 colors.
- * It would do more damage to restore the palette returned by
- * color_content() than it helps.
- * xterm has the escape sequence "\e]104\a" which restores
- * the palette from Xdefaults but not all terminal emulators
- * claiming to be "xterm" via $TERM support this escape sequence.
- * lxterminal for instance will print gibberish instead.
- * So we try to look whether $XTERM_VERSION is set.
- * There are hardly any other terminal emulators that support palette
- * resets.
- * The only emulator I'm aware of which can be identified reliably
- * by $TERM supporting a palette reset is the Linux console
- * (see console_codes(4)). The escape sequence "\e]R" is already
- * part of its terminfo description (orig_colors capability)
- * which is apparently sent by endwin(), so the palette is
- * already properly restored on endwin().
- * Welcome in Curses hell.
- */
-static void
-teco_interface_restore_colors(void)
-{
-	if (teco_xterm_version() < 0)
-		return;
-
-	/*
-	 * Looks like a real XTerm
-	 */
-	fputs("\e]104\a", teco_interface.screen_tty);
-	fflush(teco_interface.screen_tty);
-}
-
-#else /* (!__PDCURSES__ || PDCURSES_GUI) && !CURSES_TTY */
-
-static void
-teco_interface_restore_colors(void)
-{
-	/*
-	 * No way to restore the palette, or it's
-	 * unnecessary (e.g. XCurses)
-	 */
-}
-
-#endif
-
 void
-teco_interface_init_color(guint color, guint32 rgb)
+teco_interface_disable_palette(void)
 {
-	if (color >= G_N_ELEMENTS(teco_interface.color_table))
-		return;
-
-#if defined(__PDCURSES__) && !defined(PDC_RGB)
-	/*
-	 * PDCurses will usually number color codes differently
-	 * (least significant bit is the blue component) while
-	 * SciTECO macros will assume a standard terminal color
-	 * code numbering with red as the LSB.
-	 * Therefore we have to swap the bit order of the least
-	 * significant 3 bits here.
-	 */
-	color = (color & ~0x5) |
-	        ((color & 0x1) << 2) | ((color & 0x4) >> 2);
-#endif
-
-	if (teco_interface.input_pad) {
-		/* interactive mode */
-		if (!can_change_color())
-			return;
-
-		teco_interface_init_color_safe(color, rgb);
-	} else {
-		/*
-		 * batch mode: store colors,
-		 * they can only be initialized after start_color()
-		 * which is called by Scinterm when interactive
-		 * mode is initialized
-		 */
-		teco_interface.color_table[color] = (gint32)rgb;
-	}
+	teco_interface.use_palette = FALSE;
+	scintilla_disable_color_palette();
 }
 
 #ifdef CURSES_TTY
@@ -752,14 +648,33 @@ teco_interface_init_interactive(GError **error)
 
 	teco_interface_init_screen();
 
+	teco_interface.color_table = g_hash_table_new(g_direct_hash, g_direct_equal);
 	teco_interface.pair_table = g_hash_table_new(g_direct_hash, g_direct_equal);
 	start_color();
-	/*
-	 * Scinterm uses shorts for color pairs, so G_MAXSHORT is the maximum.
-	 * Some Curses implementations (NetBSD, PDCurses) may support less,
-	 * but set COLOR_PAIRS accordingly.
-	 */
-	scintilla_set_color_offsets(0, MIN(COLOR_PAIRS, G_MAXSHORT)/2);
+	scintilla_set_color_offsets(MAX_COLORS, MAX_PAIRS);
+
+	if (teco_interface.use_palette && has_colors()) {
+		teco_interface_insert_color(0x000000, COLOR_BLACK);
+		teco_interface_insert_color(0x000080, COLOR_RED);
+		teco_interface_insert_color(0x008000, COLOR_GREEN);
+		teco_interface_insert_color(0x008080, COLOR_YELLOW);
+		teco_interface_insert_color(0x800000, COLOR_BLUE);
+		teco_interface_insert_color(0x800080, COLOR_MAGENTA);
+		teco_interface_insert_color(0x808000, COLOR_CYAN);
+		teco_interface_insert_color(0xC0C0C0, COLOR_WHITE);
+		/*
+		 * On 8-color terminals, we still support the
+		 * higher (light) colors, but map them to the lower codes as well.
+		 */
+		teco_interface_insert_color(0x404040, COLOR_LBLACK);
+		teco_interface_insert_color(0x0000FF, COLOR_LRED);
+		teco_interface_insert_color(0x00FF00, COLOR_LGREEN);
+		teco_interface_insert_color(0x00FFFF, COLOR_LYELLOW);
+		teco_interface_insert_color(0xFF0000, COLOR_LBLUE);
+		teco_interface_insert_color(0xFF00FF, COLOR_LMAGENTA);
+		teco_interface_insert_color(0xFFFF00, COLOR_LCYAN);
+		teco_interface_insert_color(0xFFFFFF, COLOR_LWHITE);
+	}
 
 	/*
 	 * On UNIX terminals, the escape key is usually
@@ -841,19 +756,6 @@ teco_interface_init_interactive(GError **error)
 		teco_interface_show_view(teco_interface_current_view);
 
 	/*
-	 * Only now it's safe to redefine the 16 default colors.
-	 */
-	if (can_change_color()) {
-		for (guint i = 0; i < G_N_ELEMENTS(teco_interface.color_table); i++) {
-			/*
-			 * init_color() may still fail if COLORS < 16
-			 */
-			if (teco_interface.color_table[i] >= 0)
-				teco_interface_init_color_safe(i, (guint32)teco_interface.color_table[i]);
-		}
-	}
-
-	/*
 	 * Only now (in interactive mode), it's safe to initialize
 	 * the clipboard Q-Registers on ncurses with a compatible terminal
 	 * emulator since clipboard operations will no longer interfer
@@ -885,7 +787,6 @@ teco_interface_restore_batch(void)
 	 * (i.e. return to batch mode)
 	 */
 	endwin();
-	teco_interface_restore_colors();
 
 	/*
 	 * Restore stdin, stdout and stderr, so output goes to
@@ -2409,6 +2310,8 @@ teco_interface_cleanup(void)
 	if (teco_interface.stdout_orig >= 0)
 		close(teco_interface.stdout_orig);
 
+	if (teco_interface.color_table)
+		g_hash_table_destroy(teco_interface.color_table);
 	if (teco_interface.pair_table)
 		g_hash_table_destroy(teco_interface.pair_table);
 
diff --git a/src/interface-gtk/interface.c b/src/interface-gtk/interface.c
index a31790f..9ef86a1 100644
--- a/src/interface-gtk/interface.c
+++ b/src/interface-gtk/interface.c
@@ -404,7 +404,7 @@ teco_interface_get_options(void)
 	return group;
 }
 
-void teco_interface_init_color(guint color, guint32 rgb) {}
+void teco_interface_disable_palette(void) {}
 
 void
 teco_interface_msg_literal(teco_msg_t type, const gchar *str, gsize len)
diff --git a/src/interface.h b/src/interface.h
index 3ee8742..ace0e3d 100644
--- a/src/interface.h
+++ b/src/interface.h
@@ -57,7 +57,7 @@ void teco_interface_init(gint argc, gchar **argv);
 GOptionGroup *teco_interface_get_options(void);
 
 /** @pure makes sense only on Curses */
-void teco_interface_init_color(guint color, guint32 rgb);
+void teco_interface_disable_palette(void);
 
 typedef enum {
 	TECO_MSG_USER = 0,