Author: bde
Date: Fri Aug 18 15:40:40 2017
New Revision: 322662
URL: https://svnweb.freebsd.org/changeset/base/322662
Log:
Fix syscons escape sequence for setting the local cursor type. This sequence
was aliased to a vt sequence, causing and fixing various bugs.
For syscons, this restores support for arg 2 which sets blinking block
too forcefully, and restores bugs for arg 0 and 1. Arg 2 is used for
vs in the cons25 entry in termcap, but I've never noticed an application
that uses this. The bugs involve replacing local settings by global
ones and need better handling of defaults to fix.
For vt, this requires moving the aliasing code from teken to vt where
it belongs. This sequences is very important for cons25 compatibility
in vt since it is used by the cons25 termcap entries for ve, vi and
vs. vt can't properly support vs for either cons25 or xterm since it
doesn't support blinking. For xterm, the termcap entry for vs asks
for something different using 12;25h instead of 25h.
Rename C25CURS for this to C25LCT and change its description to be closer
to echoing the old comment about it. CURS is too generic.
Fix missing syscons escape sequence for setting the global cursor shape
(and type). Only support this in syscons since vt can't emulate anything
in it.
Modified:
head/sys/dev/syscons/scterm-teken.c
head/sys/dev/vt/vt_core.c
head/sys/teken/sequences
head/sys/teken/teken.h
head/sys/teken/teken_subr_compat.h
Modified: head/sys/dev/syscons/scterm-teken.c
==============================================================================
--- head/sys/dev/syscons/scterm-teken.c Fri Aug 18 15:38:08 2017
(r322661)
+++ head/sys/dev/syscons/scterm-teken.c Fri Aug 18 15:40:40 2017
(r322662)
@@ -673,14 +673,60 @@ scteken_copy(void *arg, const teken_rect_t *r, const t
static void
scteken_param(void *arg, int cmd, unsigned int value)
{
+ static int cattrs[] = {
+ 0, /* block */
+ CONS_BLINK_CURSOR, /* blinking block */
+ CONS_CHAR_CURSOR, /* underline */
+ CONS_CHAR_CURSOR | CONS_BLINK_CURSOR, /* blinking underline */
+ CONS_RESET_CURSOR, /* reset to default */
+ CONS_HIDDEN_CURSOR, /* hide cursor */
+ };
+ static int tcattrs[] = {
+ CONS_RESET_CURSOR | CONS_LOCAL_CURSOR, /* normal */
+ CONS_HIDDEN_CURSOR | CONS_LOCAL_CURSOR, /* invisible */
+ CONS_BLINK_CURSOR | CONS_LOCAL_CURSOR, /* very visible */
+ };
scr_stat *scp = arg;
- int flags;
+ int flags, n, v0, v1, v2;
switch (cmd) {
case TP_SETBORDER:
scp->border = value & 0xff;
if (scp == scp->sc->cur_scp)
sc_set_border(scp, scp->border);
+ break;
+ case TP_SETGLOBALCURSOR:
+ n = value & 0xff;
+ v0 = (value >> 8) & 0xff;
+ v1 = (value >> 16) & 0xff;
+ v2 = (value >> 24) & 0xff;
+ switch (n) {
+ case 1: /* flags only */
+ if (v0 < sizeof(cattrs) / sizeof(cattrs[0]))
+ v0 = cattrs[v0];
+ else /* backward compatibility */
+ v0 = cattrs[v0 & 0x3];
+ sc_change_cursor_shape(scp, v0, -1, -1);
+ break;
+ case 2:
+ v2 = 0;
+ v0 &= 0x1f; /* backward compatibility */
+ v1 &= 0x1f;
+ /* FALL THROUGH */
+ case 3: /* base and height */
+ if (v2 == 0) /* count from top */
+ sc_change_cursor_shape(scp, -1,
+ scp->font_size - v1 - 1,
+ v1 - v0 + 1);
+ else if (v2 == 1) /* count from bottom */
+ sc_change_cursor_shape(scp, -1,
+ v0, v1 - v0 + 1);
+ break;
+ }
+ break;
+ case TP_SETLOCALCURSOR:
+ if (value < sizeof(tcattrs) / sizeof(tcattrs[0]))
+ sc_change_cursor_shape(scp, tcattrs[value], -1, -1);
break;
case TP_SHOWCURSOR:
if (value != 0)
Modified: head/sys/dev/vt/vt_core.c
==============================================================================
--- head/sys/dev/vt/vt_core.c Fri Aug 18 15:38:08 2017 (r322661)
+++ head/sys/dev/vt/vt_core.c Fri Aug 18 15:40:40 2017 (r322662)
@@ -1052,6 +1052,15 @@ vtterm_param(struct terminal *tm, int cmd, unsigned in
struct vt_window *vw = tm->tm_softc;
switch (cmd) {
+ case TP_SETLOCALCURSOR:
+ /*
+ * 0 means normal (usually block), 1 means hidden, and
+ * 2 means blinking (always block) for compatibility with
+ * syscons. We don't support any changes except hiding,
+ * so must map 2 to 0.
+ */
+ arg = (arg == 1) ? 0 : 1;
+ /* FALLTHROUGH */
case TP_SHOWCURSOR:
vtbuf_cursor_visibility(&vw->vw_buf, arg);
vt_resume_flush_timer(vw->vw_device, 0);
Modified: head/sys/teken/sequences
==============================================================================
--- head/sys/teken/sequences Fri Aug 18 15:38:08 2017 (r322661)
+++ head/sys/teken/sequences Fri Aug 18 15:40:40 2017 (r322662)
@@ -103,9 +103,10 @@ VPA Vertical Position Absolute ^[ [ d
n
# Cons25 compatibility sequences
C25BLPD Cons25 set bell pitch duration ^[ [ = B r r
C25BORD Cons25 set border ^[ [ = A r
-C25CURS Cons25 set cursor type ^[ [ = S r
C25DBG Cons25 set default background ^[ [ = G r
C25DFG Cons25 set default foreground ^[ [ = F r
+C25GCS Cons25 set global cursor shape ^[ [ = C v
+C25LCT Cons25 set local cursor type ^[ [ = S r
C25MODE Cons25 set terminal mode ^[ [ = T r
C25SGR Cons25 set graphic rendition ^[ [ x r r
C25VTSW Cons25 switch virtual terminal ^[ [ z r
Modified: head/sys/teken/teken.h
==============================================================================
--- head/sys/teken/teken.h Fri Aug 18 15:38:08 2017 (r322661)
+++ head/sys/teken/teken.h Fri Aug 18 15:40:40 2017 (r322662)
@@ -102,6 +102,8 @@ typedef void tf_param_t(void *, int, unsigned int);
#define TP_SETBELLPD_DURATION(pd) ((pd) & 0xffff)
#define TP_MOUSE 6
#define TP_SETBORDER 7
+#define TP_SETLOCALCURSOR 8
+#define TP_SETGLOBALCURSOR 9
typedef void tf_respond_t(void *, const void *, size_t);
typedef struct {
Modified: head/sys/teken/teken_subr_compat.h
==============================================================================
--- head/sys/teken/teken_subr_compat.h Fri Aug 18 15:38:08 2017
(r322661)
+++ head/sys/teken/teken_subr_compat.h Fri Aug 18 15:40:40 2017
(r322662)
@@ -34,10 +34,32 @@ teken_subr_cons25_set_border(teken_t *t, unsigned int
}
static void
-teken_subr_cons25_set_cursor_type(teken_t *t, unsigned int type)
+teken_subr_cons25_set_global_cursor_shape(teken_t *t, unsigned int ncmds,
+ unsigned int cmds[])
{
+ unsigned int code, i;
- teken_funcs_param(t, TP_SHOWCURSOR, type != 1);
+ /*
+ * Pack the args to work around API deficiencies. This requires
+ * knowing too much about the low level to be fully compatible.
+ * Returning when ncmds > 3 is necessary and happens to be
+ * compatible. Discarding high bits is necessary and happens to
+ * be incompatible only for invalid args when ncmds == 3.
+ */
+ if (ncmds > 3)
+ return;
+ code = 0;
+ for (i = ncmds; i > 0; i--)
+ code = (code << 8) | (cmds[i - 1] & 0xff);
+ code = (code << 8) | ncmds;
+ teken_funcs_param(t, TP_SETGLOBALCURSOR, code);
+}
+
+static void
+teken_subr_cons25_set_local_cursor_type(teken_t *t, unsigned int type)
+{
+
+ teken_funcs_param(t, TP_SETLOCALCURSOR, type);
}
static const teken_color_t cons25_colors[8] = { TC_BLACK, TC_BLUE,
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
