Merge pull request #4950 from Tyriar/tyriar/blending

Fix background selection blending for true color
xtermjs · Jan 30, 2024 · 8e015eb · 8e015eb
2 parents 99df13b + 3c88c76
commit 8e015eb
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 11 deletions.
diff --git a/src/browser/renderer/shared/CellColorResolver.ts b/src/browser/renderer/shared/CellColorResolver.ts
@@ -92,7 +92,7 @@ export class CellColorResolver {
               $bg = this._themeService.colors.ansi[this.result.fg & Attributes.PCOLOR_MASK].rgba;
               break;
             case Attributes.CM_RGB:
-              $bg = (this.result.fg & Attributes.RGB_MASK) << 8 | 0xFF;
+              $bg = ((this.result.fg & Attributes.RGB_MASK) << 8) | 0xFF;
               break;
             case Attributes.CM_DEFAULT:
             default:
@@ -105,7 +105,7 @@ export class CellColorResolver {
               $bg = this._themeService.colors.ansi[this.result.bg & Attributes.PCOLOR_MASK].rgba;
               break;
             case Attributes.CM_RGB:
-              $bg = this.result.bg & Attributes.RGB_MASK << 8 | 0xFF;
+              $bg = ((this.result.bg & Attributes.RGB_MASK) << 8) | 0xFF;
               break;
             // No need to consider default bg color here as it's not possible
           }
@@ -143,7 +143,7 @@ export class CellColorResolver {
                 $fg = this._themeService.colors.ansi[this.result.bg & Attributes.PCOLOR_MASK].rgba;
                 break;
               case Attributes.CM_RGB:
-                $fg = this.result.bg & Attributes.RGB_MASK << 8 | 0xFF;
+                $fg = ((this.result.bg & Attributes.RGB_MASK) << 8) | 0xFF;
                 break;
               // No need to consider default bg color here as it's not possible
             }
@@ -154,7 +154,7 @@ export class CellColorResolver {
                 $fg = this._themeService.colors.ansi[this.result.fg & Attributes.PCOLOR_MASK].rgba;
                 break;
               case Attributes.CM_RGB:
-                $fg = (this.result.fg & Attributes.RGB_MASK) << 8 | 0xFF;
+                $fg = ((this.result.fg & Attributes.RGB_MASK) << 8) | 0xFF;
                 break;
               case Attributes.CM_DEFAULT:
               default:

diff --git a/test/playwright/SharedRendererTests.ts b/test/playwright/SharedRendererTests.ts
@@ -6,7 +6,7 @@
 import { IImage32, decodePng } from '@lunapaint/png-codec';
 import { LocatorScreenshotOptions, test } from '@playwright/test';
 import { ITheme } from '@xterm/xterm';
-import { ITestContext, MaybeAsync, openTerminal, pollFor, pollForApproximate } from './TestUtils';
+import { ITestContext, MaybeAsync, openTerminal, pollFor, pollForApproximate, timeout } from './TestUtils';
 
 export interface ISharedRendererTestContext {
   value: ITestContext;
@@ -989,13 +989,15 @@ export function injectSharedRendererTests(ctx: ISharedRendererTestContext): void
       };
       await ctx.value.page.evaluate(`window.term.options.theme = ${JSON.stringify(theme)};`);
       await ctx.value.proxy.focus();
-      await ctx.value.proxy.writeln('\x1b[41m red bg');
-      await ctx.value.proxy.writeln('\x1b[7m inverse');
-      await ctx.value.proxy.writeln('\x1b[31;7m red fg inverse');
+      await ctx.value.proxy.writeln('\x1b[41m red bg\x1b[0m');
+      await ctx.value.proxy.writeln('\x1b[7m inverse\x1b[0m');
+      await ctx.value.proxy.writeln('\x1b[31;7m red fg inverse\x1b[0m');
+      await ctx.value.proxy.writeln('\x1b[48:2:0:204:0:0m red truecolor bg\x1b[0m');
       await ctx.value.proxy.selectAll();
-      await pollFor(ctx.value.page, () => getCellColor(ctx.value, 1, 1), [230,128,128,255]);
-      await pollFor(ctx.value.page, () => getCellColor(ctx.value, 1, 2), [255,255,255,255]);
-      await pollFor(ctx.value.page, () => getCellColor(ctx.value, 1, 3), [230,128,128,255]);
+      await pollFor(ctx.value.page, () => getCellColor(ctx.value, 1, 1), [230, 128, 128, 255]);
+      await pollFor(ctx.value.page, () => getCellColor(ctx.value, 1, 2), [255, 255, 255, 255]);
+      await pollFor(ctx.value.page, () => getCellColor(ctx.value, 1, 3), [230, 128, 128, 255]);
+      await pollFor(ctx.value.page, () => getCellColor(ctx.value, 1, 4), [230, 128, 128, 255]);
     });
     test('powerline decorative symbols', async () => {
       const theme: ITheme = {