Correctly apply cursor colors in new renderer

Tyriar · Tyriar · commit f64cb1566d69 · 2023-08-01T06:31:58.000-07:00
diff --git a/addons/xterm-addon-webgl/src/WebglRenderer.ts b/addons/xterm-addon-webgl/src/WebglRenderer.ts
@@ -471,9 +471,9 @@ export class WebglRenderer extends Disposable implements IRenderer {
               this._coreBrowserService.isFocused &&
               (terminal.options.cursorStyle || 'block') === 'block') {
             this._cellColorResolver.result.fg =
-              Attributes.CM_RGB | this._themeService.colors.cursorAccent.rgba & Attributes.RGB_MASK;
+              Attributes.CM_RGB | (this._themeService.colors.cursorAccent.rgba >> 8 & Attributes.RGB_MASK);
             this._cellColorResolver.result.bg =
-              Attributes.CM_RGB | this._themeService.colors.cursor.rgba & Attributes.RGB_MASK;
+              Attributes.CM_RGB | (this._themeService.colors.cursor.rgba >> 8 & Attributes.RGB_MASK);
           }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -471,9 +471,9 @@ export class WebglRenderer extends Disposable implements IRenderer {`
`471`	`471`	`this._coreBrowserService.isFocused &&`
`472`	`472`	`(terminal.options.cursorStyle \|\| 'block') === 'block') {`
`473`	`473`	`this._cellColorResolver.result.fg =`
`474`		`- Attributes.CM_RGB \| this._themeService.colors.cursorAccent.rgba & Attributes.RGB_MASK;`
	`474`	`+ Attributes.CM_RGB \| (this._themeService.colors.cursorAccent.rgba >> 8 & Attributes.RGB_MASK);`
`475`	`475`	`this._cellColorResolver.result.bg =`
`476`		`- Attributes.CM_RGB \| this._themeService.colors.cursor.rgba & Attributes.RGB_MASK;`
	`476`	`+ Attributes.CM_RGB \| (this._themeService.colors.cursor.rgba >> 8 & Attributes.RGB_MASK);`
`477`	`477`	`}`
`478`	`478`	`}`
`479`	`479`