1 files changed, 70 insertions, 63 deletions

diff --git a/src/interface-curses/interface.c b/src/interface-curses/interface.c
index 94501cb..45821f9 100644
--- a/src/interface-curses/interface.c
+++ b/src/interface-curses/interface.c
@@ -232,47 +232,19 @@ static struct {
  *
  * Scinterm no longer initializes all color pairs for all combinations of
  * the builtin foreground and background colors.
- * Since curses guarantees only 256 color pairs, we cannot do that either.
- * Instead we allocate color pairs beginnig at 128 on demand
- * (similar to what Scinterm does).
- *
- * @note Scinterm now also has scintilla_set_color_offsets(),
- * so we could use the lower 127 color pairs as well.
+ * Since curses does not guarantee any number of color pairs, we cannot do that either.
+ * Instead we allocate color pairs in the first half of
+ * color pair space on demand, while the second half is reserved to Scinterm.
  *
+ * @param attr attributes to modify (for supporting monochrome terminals)
  * @param fg curses foreground color
  * @param bg curses background color
  * @return curses color pair number
  */
 static gshort
-teco_color_pair(gshort fg, gshort bg)
+teco_color_pair(attr_t *attr, gshort fg, gshort bg)
 {
-	static gshort last_pair = 127;
-
-	G_STATIC_ASSERT(sizeof(gshort)*2 <= sizeof(guint));
-	gpointer key = GUINT_TO_POINTER(((guint)fg << 16) | bg);
-	gpointer value = g_hash_table_lookup(teco_interface.pair_table, key);
-	if (G_LIKELY(value != NULL))
-		return GPOINTER_TO_UINT(value);
-	init_pair(++last_pair, fg, bg);
-	g_hash_table_insert(teco_interface.pair_table, key, GUINT_TO_POINTER(last_pair));
-	return last_pair;
-}
-
-/**
- * Curses attribute for the color combination
- * according to the color pairs initialized by
- * Scinterm.
- * This is equivalent to Scinterm's internal term_color_attr().
- *
- * @param fg foreground color
- * @param bg background color
- * @return curses attribute
- */
-static inline attr_t
-teco_color_attr(gshort fg, gshort bg)
-{
-	if (has_colors())
-		return COLOR_PAIR(teco_color_pair(fg, bg));
+	static guint next_pair = 1;
 
 	/*
 	 * Basic support for monochrome terminals:
@@ -281,7 +253,29 @@ teco_color_attr(gshort fg, gshort bg)
 	 * This will at least work with the terminal.tes and contrast.tes
 	 * color schemes.
 	 */
-	return bg != COLOR_BLACK ? A_REVERSE : 0;
+	if (!has_colors()) {
+		if (bg != COLOR_BLACK)
+			*attr |= WA_REVERSE;
+		return 0;
+	}
+
+	G_STATIC_ASSERT(sizeof(gshort)*2 <= sizeof(guint));
+	gpointer key = GUINT_TO_POINTER(((guint)fg << 8*sizeof(bg)) | 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))
+		return 0;
+	init_pair(next_pair, fg, bg);
+	g_hash_table_insert(teco_interface.pair_table, key, GUINT_TO_POINTER(next_pair));
+	return next_pair++;
+}
+
+static inline gint
+teco_wattr_set(WINDOW *win, attr_t attr, gshort fg, gshort bg)
+{
+	gshort pair = teco_color_pair(&attr, fg, bg);
+	return wattr_set(win, attr, pair, NULL);
 }
 
 /**
@@ -435,7 +429,7 @@ static void teco_interface_set_window_title(const gchar *title);
 static void teco_interface_draw_info(void);
 
 void
-teco_interface_init(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;
@@ -449,7 +443,7 @@ teco_interface_init(void)
 	teco_cmdline_init();
 	/*
 	 * The default INDIC_STRIKE wouldn't be visible.
-	 * Instead we use INDIC_SQUIGGLE, which is rendered as A_UNDERLINE.
+	 * Instead we use INDIC_SQUIGGLE, which is rendered as WA_UNDERLINE.
 	 */
 	teco_cmdline_ssm(SCI_INDICSETSTYLE, INDICATOR_RUBBEDOUT, INDIC_SQUIGGLE);
 	/*
@@ -752,6 +746,12 @@ teco_interface_init_interactive(GError **error)
 
 	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);
 
 	/*
 	 * On UNIX terminals, the escape key is usually
@@ -942,7 +942,7 @@ teco_interface_msg_literal(teco_msg_t type, const gchar *str, gsize len)
 	teco_interface_stdio_msg(type, str, len);
 #endif
 
-	short fg, bg;
+	gshort fg, bg;
 
 	fg = teco_rgb2curses(teco_interface_ssm(SCI_STYLEGETBACK, STYLE_DEFAULT, 0));
 
@@ -964,7 +964,7 @@ teco_interface_msg_literal(teco_msg_t type, const gchar *str, gsize len)
 	}
 
 	wmove(teco_interface.msg_window, 0, 0);
-	wattrset(teco_interface.msg_window, teco_color_attr(fg, bg));
+	teco_wattr_set(teco_interface.msg_window, 0, fg, bg);
 	teco_curses_format_str(teco_interface.msg_window, str, len, -1);
 	teco_curses_clrtobot(teco_interface.msg_window);
 }
@@ -975,11 +975,11 @@ teco_interface_msg_clear(void)
 	if (!teco_interface.input_pad) /* batch mode */
 		return;
 
-	short fg = teco_rgb2curses(teco_interface_ssm(SCI_STYLEGETBACK, STYLE_DEFAULT, 0));
-	short bg = teco_rgb2curses(teco_interface_ssm(SCI_STYLEGETFORE, STYLE_DEFAULT, 0));
+	gshort fg = teco_rgb2curses(teco_interface_ssm(SCI_STYLEGETBACK, STYLE_DEFAULT, 0));
+	gshort bg = teco_rgb2curses(teco_interface_ssm(SCI_STYLEGETFORE, STYLE_DEFAULT, 0));
 
 	wmove(teco_interface.msg_window, 0, 0);
-	wattrset(teco_interface.msg_window, teco_color_attr(fg, bg));
+	teco_wattr_set(teco_interface.msg_window, 0, fg, bg);
 	teco_curses_clrtobot(teco_interface.msg_window);
 }
 
@@ -993,10 +993,11 @@ teco_interface_getch(gboolean widechar)
 
 	/*
 	 * Signal that we accept input by drawing a real cursor in the message bar.
+	 * FIXME: curs_set(2) would be better, but isn't always visible.
 	 */
 	wmove(teco_interface.msg_window, 0, 0);
-	curs_set(1);
 	wrefresh(teco_interface.msg_window);
+	curs_set(1);
 
 	gchar buf[4];
 	gint i = 0;
@@ -1023,7 +1024,6 @@ teco_interface_getch(gboolean widechar)
 			i = 0;
 	} while (cp < 0);
 
-	curs_set(0);
 	return cp;
 }
 
@@ -1153,11 +1153,11 @@ teco_interface_draw_info(void)
 	 * the current buffer's STYLE_DEFAULT.
 	 * The same style is used for MSG_USER messages.
 	 */
-	short fg = teco_rgb2curses(teco_interface_ssm(SCI_STYLEGETBACK, STYLE_DEFAULT, 0));
-	short bg = teco_rgb2curses(teco_interface_ssm(SCI_STYLEGETFORE, STYLE_DEFAULT, 0));
+	gshort fg = teco_rgb2curses(teco_interface_ssm(SCI_STYLEGETBACK, STYLE_DEFAULT, 0));
+	gshort bg = teco_rgb2curses(teco_interface_ssm(SCI_STYLEGETFORE, STYLE_DEFAULT, 0));
 
 	wmove(teco_interface.info_window, 0, 0);
-	wattrset(teco_interface.info_window, teco_color_attr(fg, bg));
+	teco_wattr_set(teco_interface.info_window, 0, fg, bg);
 
 	const gchar *info_type_str;
 
@@ -1726,11 +1726,13 @@ teco_interface_popup_show(gsize prefix_len)
 		/* batch mode */
 		return;
 
-	short fg = teco_rgb2curses(teco_interface_ssm(SCI_STYLEGETFORE, STYLE_CALLTIP, 0));
-	short bg = teco_rgb2curses(teco_interface_ssm(SCI_STYLEGETBACK, STYLE_CALLTIP, 0));
+	gshort fg = teco_rgb2curses(teco_interface_ssm(SCI_STYLEGETFORE, STYLE_CALLTIP, 0));
+	gshort bg = teco_rgb2curses(teco_interface_ssm(SCI_STYLEGETBACK, STYLE_CALLTIP, 0));
 
 	teco_interface.popup_prefix_len = prefix_len;
-	teco_curses_info_popup_show(&teco_interface.popup, teco_color_attr(fg, bg));
+	attr_t attr = 0;
+	gshort pair = teco_color_pair(&attr, fg, bg);
+	teco_curses_info_popup_show(&teco_interface.popup, attr, pair);
 }
 
 void
@@ -1837,16 +1839,6 @@ teco_interface_refresh(gboolean force)
 		clearok(curscr, TRUE);
 
 	/*
-	 * Let Scinterm enable/disable the hardware cursor
-	 * based on the CARETSTYLE_CURSES.
-	 * Doing this repeatedly ensures you can change the
-	 * caret style interactively.
-	 * Also, window resizes enable the cursor on PDCurses/wincon
-	 * sometimes (FIXME).
-	 */
-	curs_set(0);
-
-	/*
 	 * Info window is updated very often which is very
 	 * costly, especially when using PDC_set_title(),
 	 * so we redraw it here, where the overhead does
@@ -1870,6 +1862,19 @@ teco_interface_refresh(gboolean force)
 	 */
 	teco_view_update_cursor(teco_cmdline.view);
 	doupdate();
+
+	/*
+	 * Scinterm enables/disables the hardware cursor,
+	 * but only if CARETSTYLE_CURSES is used.
+	 * Disabling the cursor repeatedly ensures you can change
+	 * the caret style interactively.
+	 * It also makes sure the cursor is reset after
+	 * teco_interface_getch().
+	 * Also, window resizes sometimes enable the hardware cursor on
+	 * PDCurses/wincon (FIXME).
+	 */
+	if (!(teco_view_ssm(teco_cmdline.view, SCI_GETCARETSTYLE, 0, 0) & CARETSTYLE_CURSES))
+		curs_set(0);
 }
 
 #if NCURSES_MOUSE_VERSION >= 2
@@ -1927,9 +1932,11 @@ teco_interface_process_mevent(MEVENT *event, GError **error)
 		else if (event->bstate & BUTTON_NUM(5))
 			teco_curses_info_popup_scroll(&teco_interface.popup, +2);
 
-		short fg = teco_rgb2curses(teco_interface_ssm(SCI_STYLEGETFORE, STYLE_CALLTIP, 0));
-		short bg = teco_rgb2curses(teco_interface_ssm(SCI_STYLEGETBACK, STYLE_CALLTIP, 0));
-		teco_curses_info_popup_show(&teco_interface.popup, teco_color_attr(fg, bg));
+		gshort fg = teco_rgb2curses(teco_interface_ssm(SCI_STYLEGETFORE, STYLE_CALLTIP, 0));
+		gshort bg = teco_rgb2curses(teco_interface_ssm(SCI_STYLEGETBACK, STYLE_CALLTIP, 0));
+		attr_t attr = 0;
+		gshort pair = teco_color_pair(&attr, fg, bg);
+		teco_curses_info_popup_show(&teco_interface.popup, attr, pair);
 
 		return TRUE;
 	}