console_patches_73��0040755�0000000�0000000�00000000000�14420265734�0013353�5��ustar�00root��wheel��console_patches_73/part_1.sig��0100644�0000000�0000000�00000031152�14420264207�0015315�0��ustar�00root��wheel��untrusted comment: verify with signify key from research.exoticsilicon.com

RWRn5d3Yx35u0+EjnJhojEI4EXC4GSzOzGXHWH2Ki9/PzoobmYCdnHfG/jnJsrRMXtuI7lm27GMro7lwvgE9tI3ti7Fbxy2XuAQ=

This patch is patch 1 of a set of 4 patches, intended to be applied to OpenBSD 7.3-release.

For more information about this patchset, and to download the accompanying userland utilities, please visit:

https://research.exoticsilicon.com/articles/console_enhancement_patchset_73

THIS PATCH IS PROVIDED 'AS IS' AND ANY EXPRESS OR IMPLIED WARRANTIES,

INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY

AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL

EXOTIC SILICON BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,

EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,

PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA OR PROFITS;

OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,

WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR

OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS PATCH, EVEN IF

ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

--- sys/dev/rasops/rasops.c

+++ sys/dev/rasops/rasops.c

@@ -446,6 +446,10 @@

	    WSSCREEN_WSCOLORS | WSSCREEN_REVERSE;

if (ri->ri_depth == 32) {

```
  ri->ri_caps |= WSSCREEN_256COL ;
```

}

switch (ri->ri_depth) {

#if NRASOPS1 > 0

case 1:

@@ -557,7 +561,7 @@

if ((flg & WSATTR_HILIT) != 0 && fg < 8)

	fg += 8;

*attr = (bg << 16) | (fg << 24) | (flg & WSATTR_UNDERLINE);

*attr = (bg << 16) | (fg << 24) | flg;

return (0);

}

@@ -581,7 +585,7 @@

	bg = swap;

*attr = (bg << 16) | (fg << 24) | (flg & WSATTR_UNDERLINE);

*attr = (bg << 16) | (fg << 24) | flg;

return (0);

}

@@ -863,6 +867,24 @@

	ri->ri_devcmap[i] = c;

#endif

/* Define colours 16-255 if we are running in 32bpp */

#define EBCOL_BLUE(x) ((48*((x-16)%6) >> (8 - ri->ri_bnum)) << ri->ri_bpos)

#define EBCOL_GREEN(x) (((48*(((x-16)/6)%6)) >> (8 - ri->ri_gnum)) << ri->ri_gpos)

#define EBCOL_RED(x) (((48*(((x-16)/36)%6)) >> (8 - ri->ri_rnum)) << ri->ri_rpos)

#define EBCOL(x) EBCOL_RED(x) | EBCOL_GREEN(x) | EBCOL_BLUE(x)

#define EBGREY_CHANNEL(x) (int)(1+((i-232)*11))

#define EBGREY_R(x)(( EBGREY_CHANNEL(x) >> (8 - ri->ri_rnum)) << ri->ri_rpos)

#define EBGREY_G(x)(( EBGREY_CHANNEL(x) >> (8 - ri->ri_gnum)) << ri->ri_gpos)

#define EBGREY_B(x)(( EBGREY_CHANNEL(x) >> (8 - ri->ri_bnum)) << ri->ri_bpos)

#define EBGREY(x) EBGREY_R(x) | EBGREY_G(x) | EBGREY_B(x)

if (ri->ri_depth == 32) {

```
  for (i=16 ; i<256; i++) {
```

  	c = (i < 232 ? EBCOL(i) : EBGREY(i));

```
  	if (ri->ri_flg & RI_BSWAP)
```

  		c = (ri->ri_depth==16 ? swap16(c) : swap32(c));

```
  	ri->ri_devcmap[i] = c;
```

```
  }
```

}

#endif

}

@@ -872,8 +894,8 @@

void

rasops_unpack_attr(void *cookie, uint32_t attr, int *fg, int *bg, int *underline)

{

*fg = ((u_int)attr >> 24) & 0xf;

*bg = ((u_int)attr >> 16) & 0xf;

*fg = ((u_int)attr >> 24) & 0xff;

*bg = ((u_int)attr >> 16) & 0xff;

if (underline != NULL)

	*underline = (u_int)attr & WSATTR_UNDERLINE;

}

@@ -903,7 +925,7 @@

	return 0;

#endif

clr = ri->ri_devcmap[(attr >> 16) & 0xf];

clr = ri->ri_devcmap[(attr >> 16) & 0xff];

/*

 * XXX The wsdisplay_emulops interface seems a little deficient in

@@ -1245,9 +1267,20 @@

else

	col = ri->ri_cols - col - 1;

/* Do rotated char sans (side)underline */

rc = ri->ri_real_ops.putchar(cookie, col, row, uc,

```
  attr & ~WSATTR_UNDERLINE);
```

- For rotated characters, attributes such as underline and double

- underline need to be painted in a different way. The generic putchar

- routines know nothing about this, so we clear the corresponding bits

- of attr before calling putchar, then deal with painting the

- missing attributes the required custom way here instead.

- Not all attributes are affected. Dim can be passed through and

- handled as normal by putchar, since the placement of individual

- pixels does not change the way that the effect is applied.

+#define BITMASK_UNSAFE_FOR_ROTATION (WSATTR_UNDERLINE | WSATTR_DOUBLE_UNDERLINE | WSATTR_STRIKE | WSATTR_ITALIC)

rc = ri->ri_real_ops.putchar(cookie, col, row, uc, attr & ~(BITMASK_UNSAFE_FOR_ROTATION));

if (rc != 0)

	return rc;

@@ -1259,7 +1292,7 @@

/* XXX this assumes 16-bit color depth */

if ((attr & WSATTR_UNDERLINE) != 0) {

  int16_t c = (int16_t)ri->ri_devcmap[((u_int)attr >> 24) & 0xf];

  int16_t c = (int16_t)ri->ri_devcmap[((u_int)attr >> 24) & 0xff];

	while (height--) {

		*(int16_t *)rp = c;

@@ -1787,8 +1820,8 @@

attr = ri->ri_bs[off].attr;

if ((ri->ri_flg & RI_CURSOR) == 0) {

```
  fg = ((u_int)attr >> 24) & 0xf;
```

```
  bg = ((u_int)attr >> 16) & 0xf;
```

```
  fg = ((u_int)attr >> 24) & 0xff;
```

```
  bg = ((u_int)attr >> 16) & 0xff;
```

	attr &= ~0x0ffff0000;

	attr |= (fg << 16) | (bg << 24);

--- sys/dev/rasops/rasops.h

+++ sys/dev/rasops/rasops.h

@@ -106,7 +106,7 @@

u_char  *ri_origbits;	/* where screen bits actually start */

int	ri_xorigin;	/* where ri_bits begins (x) */

int	ri_yorigin;	/* where ri_bits begins (y) */

int32_t ri_devcmap[16]; /* color -> framebuffer data */

int32_t ri_devcmap[256];/* color -> framebuffer data */

/* The emulops you need to use, and the screen caps for wscons */

struct	wsdisplay_emulops ri_ops;

--- sys/dev/rasops/rasops32.c

+++ sys/dev/rasops/rasops32.c

@@ -91,13 +91,46 @@

width = ri->ri_font->fontwidth;

step = ri->ri_stride >> 3;

b = ri->ri_devcmap[(attr >> 16) & 0xf];

f = ri->ri_devcmap[(attr >> 24) & 0xf];

b = ri->ri_devcmap[(attr >> 16) & 0xff];

f = ri->ri_devcmap[(attr >> 24) & 0xff];

- Implement dim by shifting each of the red, green and blue values by

- one bit.

- Since we are shifting each channel equally, this works for both RGB

- and byte-swapped BGR formats with exactly 8 bits per channel,

- I.E. 0xXXRRGGBB, and 0xBBGGRRXX.

- The unused byte is always set to 0x00 for 32bpp in

- rasops_init_devcmap, so will be unaffected by the shift.

- XXX If we ever support 32-bit devices that are not 8 bits per channel

- then this code will need to change.

if ((attr & WSATTR_DIM)!=0) {

```
  f=(f>>1) & 0x7F7F7F7F;
```

```
  }
```

u.d[0][0] = b; u.d[0][1] = b;

u.d[1][0] = b; u.d[1][1] = f;

u.d[2][0] = f; u.d[2][1] = b;

u.d[3][0] = f; u.d[3][1] = f;

- Implement 'invisible' attribute by changing the character to a space.

- We need to do this rather than just ignoring the character or filling

- the bits with 0x00 and returning as a special case, because effects

- such as underline and strikethrough are still rendered on invisible

- characters, (at least they are in xterm).

if ((attr & WSATTR_INVISIBLE)!=0) {

```
  uc=' ';
```

```
  }
```

if (uc == ' ') {

	while (height--) {

		/* the general, pixel-at-a-time case is fast enough */

@@ -203,11 +236,46 @@

/* Do underline a pixel at a time */

if ((attr & WSATTR_UNDERLINE) != 0) {

if ((attr & (WSATTR_UNDERLINE | WSATTR_DOUBLE_UNDERLINE)) != 0) {

	rp -= step;

	for (cnt = 0; cnt < width; cnt++)

		((int *)rp)[cnt] = f;

- Double underline now just needs to paint the second underline a few

- rows up. The exact height is relative to the font height, to create

- a visually pleasing effect regardless of display resolution.

+#define FONT_HEIGHT ri->ri_font->fontheight

+#define DOUBLE_UL_SHIFT (FONT_HEIGHT < 12 ? 0 : (FONT_HEIGHT <= 32 ? 1 : 2))

if ((attr & WSATTR_DOUBLE_UNDERLINE)!=0) {

```
  rp-=(step << DOUBLE_UL_SHIFT);
```

```
  for (cnt=0; cnt< width; cnt++)
```

```
  	((int *)rp)[cnt]=f;
```

```
  /*
```

   * Reset row pointer to ensure that strikethough appears at a

   * consistent height if combined with double underlining.

```
   */
```

```
  rp+=(step << DOUBLE_UL_SHIFT);
```

```
  }
```

- Reset pointer to ensure that strikethough appears at a consistent

- height if combined with single underlining.

if ((attr & WSATTR_STRIKE)!=0) {

  if ((attr & WSATTR_UNDERLINE) != 0) {

```
  	rp+=step ;
```

```
  	}
```

  rp -= (1+ri->ri_font->fontheight/2)*step;

```
  for (cnt=0; cnt< width; cnt++)
```

```
  	((int *)rp)[cnt]=f;
```

```
  }
```

return 0;

}

--- sys/dev/wscons/wsdisplayvar.h

+++ sys/dev/wscons/wsdisplayvar.h

@@ -94,11 +94,16 @@

#define WSCOL_CYAN 6

#define WSCOL_WHITE 7

/* flag values: */

-#define WSATTR_REVERSE 1

-#define WSATTR_HILIT 2

-#define WSATTR_BLINK 4

-#define WSATTR_UNDERLINE 8

-#define WSATTR_WSCOLORS 16

+#define WSATTR_REVERSE 1

+#define WSATTR_HILIT 2

+#define WSATTR_BLINK 4

+#define WSATTR_UNDERLINE 8

+#define WSATTR_WSCOLORS 16

+#define WSATTR_DIM 32

+#define WSATTR_STRIKE 64

+#define WSATTR_DOUBLE_UNDERLINE 128

+#define WSATTR_INVISIBLE 256

+#define WSATTR_ITALIC 512

};

#define WSSCREEN_NAME_SIZE 16

@@ -114,6 +119,7 @@

#define WSSCREEN_HILIT 4 /* can highlight (however) */

#define WSSCREEN_BLINK 8 /* can blink */

#define WSSCREEN_UNDERLINE 16 /* can underline */

+#define WSSCREEN_256COL 32 /* supports 256 colours */

};

--- sys/dev/wscons/wsemul_vt100_subr.c

+++ sys/dev/wscons/wsemul_vt100_subr.c

@@ -593,6 +593,9 @@

		case 1: /* bold */

			flags |= WSATTR_HILIT;

			break;

```
  	case 2: /* dim */
```

```
  		flags |= WSATTR_DIM;
```

```
  		break;
```

		case 4: /* underline */

			flags |= WSATTR_UNDERLINE;

			break;

@@ -602,11 +605,28 @@

		case 7: /* reverse */

			flags |= WSATTR_REVERSE;

			break;

```
  	case 22: /* ~bold VT300 only */
```

```
  	/*
```

  	 * Invisible text only makes the _glyph_ invisible.

```
  	 *
```

  	 * Other active attributes such as underlining and

  	 * strikeout are still displayed in the character cell.

```
  	 */
```

```
  	case 8: /* invisible */
```

```
  		flags |= WSATTR_INVISIBLE;
```

```
  		break;
```

```
  	case 9: /* strike */
```

```
  		flags |= WSATTR_STRIKE;
```

```
  		break;
```

```
  	case 21: /* double underline */
```

```
  		flags |= WSATTR_DOUBLE_UNDERLINE;
```

```
  		break;
```

  	case 22: /* ~bold ~dim VT300 only */

			flags &= ~WSATTR_HILIT;

```
  		flags &= ~WSATTR_DIM;
```

			break;

		case 24: /* ~underline VT300 only */

			flags &= ~WSATTR_UNDERLINE;

```
  		flags &= ~WSATTR_DOUBLE_UNDERLINE;
```

			break;

		case 25: /* ~blink VT300 only */

			flags &= ~WSATTR_BLINK;

@@ -614,12 +634,76 @@

		case 27: /* ~reverse VT300 only */

			flags &= ~WSATTR_REVERSE;

			break;

```
  	case 28: /* ~invisible */
```

```
  		flags &= ~WSATTR_INVISIBLE;
```

```
  		break;
```

```
  	case 29: /* ~strike */
```

```
  		flags &= ~WSATTR_STRIKE;
```

```
  		break;
```

		case 30: case 31: case 32: case 33:

		case 34: case 35: case 36: case 37:

			/* fg color */

			flags |= WSATTR_WSCOLORS;

			fgcol = ARG(n) - 30;

			break;

```
  	/*
```

  	 * Sequences starting CSI 38 escape to a larger

  	 * colourspace, typically either 256 colours or 24-bit.

```
  	 *
```

  	 * We support CSI 38;5;X;m to set colour X from a

```
  	 * palette of 256.
```

```
  	 */
```

+#define EXIST_ARG2(i) ((edp->nargs-n)>=3)

+#define ARG2_OR_DEF(i) (EXIST_ARG2(i) ? ARG(i+2) : 0)

```
  	case 38:
```

```
  		/*
```

  		 * 38 followed by zero arguments is meaningless.

```
  		 */
```

```
  		if (edp->nargs == n+1) {
```

```
  			break ;
```

```
  		}
```

```
  		/*
```

  		 * 5 should normally be followed by a single

  		 * argument, but zero arguments is also valid to

```
  		 * set colour zero.
```

```
  		 */
```

```
  		if (ARG(n+1)==5) {
```

```
  			flags |= WSATTR_WSCOLORS;
```

```
  			if (edp->scrcapabilities &
```

```
  			    WSSCREEN_256COL) {
```

```
  				fgcol = ARG2_OR_DEF(n);
```

```
  				} else {
```

  				fgcol = (ARG2_OR_DEF(n) < 8 ? ARG2_OR_DEF(n)

```
  				    : fgcol );
```

```
  				}
```

```
  			n+=(EXIST_ARG2(n) ? 2 : 1);
```

```
  			break;
```

```
  		}
```

```
  		/*
```

  		 * 2 should introduce a sequence of three

```
  		 * arguments, specifying RGB.
```

```
  		 *
```

  		 * We don't, (yet!), support setting colours by

  		 * 24-bit RGB arguments and don't want to

  		 * interpret these as regular SGR codes.

```
  		 *
```

  		 * If there are more then three, skip just

  		 * three, otherwise skip all of them.

```
  		 */
```

```
  		if (ARG(n+1)==2) {
```

```
  			n=(edp->nargs-n > 5 ? n+4 :
```

```
  			    edp->nargs);
```

```
  			break;
```

```
  		}
```

```
  		/*
```

```
  		 * Invalid code, I.E. not 2 or 5.
```

```
  		 *
```

  		 * We do what xterm does and just skip the

  		 * single unrecognised argument, then allow any

  		 * following arguments to be interpreted as SGR.

```
  		 */
```

```
  		n++;
```

```
  		break;
```

		case 39:

			/* reset fg color */

			fgcol = WSCOL_WHITE;

@@ -631,6 +715,29 @@

			/* bg color */

			flags |= WSATTR_WSCOLORS;

			bgcol = ARG(n) - 40;

```
  		break;
```

  	case 48: /* set 8-bit background colour */

```
  		if (edp->nargs == n+1) {
```

```
  			break ;
```

```
  		}
```

```
  		if (ARG(n+1)==5) {
```

```
  			flags |= WSATTR_WSCOLORS;
```

```
  			if (edp->scrcapabilities &
```

```
  			    WSSCREEN_256COL) {
```

```
  				bgcol = ARG2_OR_DEF(n);
```

```
  				} else {
```

  				bgcol = (ARG2_OR_DEF(n) < 8 ? ARG2_OR_DEF(n)

```
  				    : bgcol );
```

```
  				}
```

```
  			n+=(EXIST_ARG2(n) ? 2 : 1);
```

```
  			break;
```

```
  		}
```

```
  		if (ARG(n+1)==2) {
```

```
  			n=(edp->nargs-n > 5 ? n+4 :
```

```
  			    edp->nargs);
```

```
  			break;
```

```
  		}
```

```
  		n++;
```

			break;

		case 49:

			/* reset bg color */

��console_patches_73/part_2.sig��0100644�0000000�0000000�00000010357�14420264221�0015316�0��ustar�00root��wheel��untrusted comment: verify with signify key from research.exoticsilicon.com

RWRn5d3Yx35u05UIOxPBA6FziK3xdoX/HPFewiWL8tLSTpbIggRwXek4QaEReIrU8pimxGczen9vtPbGLKFX0quYuo02yn1ncwA=

This patch is patch 2 of a set of 4 patches, intended to be applied to OpenBSD 7.3-release.