1 files changed, 51 insertions, 10 deletions

diff --git a/src/interface-curses/interface.c b/src/interface-curses/interface.c
index 0764db3..94501cb 100644
--- a/src/interface-curses/interface.c
+++ b/src/interface-curses/interface.c
@@ -278,8 +278,8 @@ teco_color_attr(gshort fg, gshort bg)
 	 * Basic support for monochrome terminals:
 	 * Every background, that is not black is assumed to be a
 	 * dark-on-bright area, rendered in reverse.
-	 * This will at least work with the terminal.tes
-	 * color scheme.
+	 * This will at least work with the terminal.tes and contrast.tes
+	 * color schemes.
 	 */
 	return bg != COLOR_BLACK ? A_REVERSE : 0;
 }
@@ -395,6 +395,13 @@ teco_view_noutrefresh(teco_view_t *ctx)
 	scintilla_noutrefresh(ctx);
 }
 
+static inline void
+teco_view_update_cursor(teco_view_t *ctx)
+{
+	if (teco_view_ssm(ctx, SCI_GETCARETSTYLE, 0, 0) & CARETSTYLE_CURSES)
+		scintilla_update_cursor(ctx);
+}
+
 static inline WINDOW *
 teco_view_get_window(teco_view_t *ctx)
 {
@@ -445,6 +452,10 @@ teco_interface_init(void)
 	 * Instead we use INDIC_SQUIGGLE, which is rendered as A_UNDERLINE.
 	 */
 	teco_cmdline_ssm(SCI_INDICSETSTYLE, INDICATOR_RUBBEDOUT, INDIC_SQUIGGLE);
+	/*
+	 * Enable hardware cursor by default.
+	 */
+	teco_cmdline_ssm(SCI_SETCARETSTYLE, CARETSTYLE_CURSES, 0);
 
 	/*
 	 * On all platforms except Curses/XTerm, it's
@@ -784,8 +795,6 @@ teco_interface_init_interactive(GError **error)
 
 	cbreak();
 	noecho();
-	/* Scintilla draws its own cursor */
-	curs_set(0);
 	/*
 	 * This has also been observed to reduce flickering
 	 * in teco_interface_refresh().
@@ -1229,7 +1238,20 @@ teco_interface_info_update_buffer(const teco_buffer_t *buffer)
  * default clipboard ("~") as we do not know whether
  * it corresponds to the X11 PRIMARY, SECONDARY or
  * CLIPBOARD selections.
+ *
+ * On XCurses we must not (and don't have to) probe
+ * the clipboard as it would be before Xinitscr().
  */
+#ifdef XCURSES
+
+static void
+teco_interface_init_clipboard(void)
+{
+	teco_qreg_table_replace(&teco_qreg_table_globals, teco_qreg_clipboard_new(""));
+}
+
+#else /* XCURSES */
+
 static void
 teco_interface_init_clipboard(void)
 {
@@ -1254,6 +1276,8 @@ teco_interface_init_clipboard(void)
 	teco_qreg_table_replace(&teco_qreg_table_globals, teco_qreg_clipboard_new(""));
 }
 
+#endif /* !XCURSES */
+
 gboolean
 teco_interface_set_clipboard(const gchar *name, const gchar *str, gsize str_len, GError **error)
 {
@@ -1813,6 +1837,16 @@ 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
@@ -1824,6 +1858,17 @@ teco_interface_refresh(gboolean force)
 	wnoutrefresh(teco_interface.msg_window);
 	teco_view_noutrefresh(teco_cmdline.view);
 	teco_curses_info_popup_noutrefresh(&teco_interface.popup);
+	/*
+	 * If hardware cursors (CARETSTYLE_CURSES) are enabled on the
+	 * command-line view, make sure that the cursor is left
+	 * in the correct position.
+	 *
+	 * FIXME: This shouldn't be necessary if we refreshed the command-line
+	 * view last. Also, if we wanted to support the hardware cursor
+	 * in the main view as well, we'd have to handle a possibly
+	 * overlappig info popup.
+	 */
+	teco_view_update_cursor(teco_cmdline.view);
 	doupdate();
 }
 
@@ -2016,7 +2061,8 @@ teco_interface_blocking_getch(void)
 	gboolean new_mousekey = (teco_ed & TECO_ED_MOUSEKEY) != 0;
 	if (new_mousekey != old_mousekey) {
 		old_mousekey = new_mousekey;
-		mmask_t mmask = BUTTON_EVENT(PRESSED) | BUTTON_EVENT(RELEASED);
+		mmask_t mmask = BUTTON_EVENT(PRESSED) | BUTTON_EVENT(RELEASED) |
+		                BUTTON_SHIFT | BUTTON_CTRL | BUTTON_ALT;
 #ifdef __PDCURSES__
 		/*
 		 * On PDCurses it's crucial NOT to mask for BUTTONX_CLICKED.
@@ -2099,11 +2145,6 @@ teco_interface_event_loop_iter(void)
 		return;
 #ifdef KEY_RESIZE
 	case KEY_RESIZE:
-		/*
-		 * At least on PDCurses/Wincon, the hardware cursor is sometimes
-		 * reactivated.
-		 */
-		curs_set(0);
 		teco_interface_resize_all_windows();
 		break;
 #endif