From 25a78c77f24f130a5a7154855b4c3c783cfbd325 Mon Sep 17 00:00:00 2001 From: Daniel Imms <2193314+Tyriar@users.noreply.github.com> Date: Fri, 18 Aug 2023 14:11:17 -0700 Subject: [PATCH 01/18] Simplify cursor style types in webgl Fixes #4686 --- addons/xterm-addon-webgl/src/Types.d.ts | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/addons/xterm-addon-webgl/src/Types.d.ts b/addons/xterm-addon-webgl/src/Types.d.ts index 3eb3b300..fe6e10c7 100644 --- a/addons/xterm-addon-webgl/src/Types.d.ts +++ b/addons/xterm-addon-webgl/src/Types.d.ts @@ -4,6 +4,7 @@ */ import { ISelectionRenderModel } from 'browser/renderer/shared/Types'; +import { CursorInactiveStyle, CursorStyle } from 'common/Types'; export interface IRenderModel { cells: Uint32Array; @@ -16,13 +17,11 @@ export interface ICursorRenderModel { x: number; y: number; width: number; - style: CursorStyle; + style: CursorStyle | CursorInactiveStyle; cursorWidth: number; dpr: number; } -export type CursorStyle = 'outline' | 'block' | 'bar' | 'underline' | 'none'; - export interface IWebGL2RenderingContext extends WebGLRenderingContext { vertexAttribDivisor(index: number, divisor: number): void; createVertexArray(): IWebGLVertexArrayObject; From 6e39d03a5223916457e0f95123b2baebe37c917d Mon Sep 17 00:00:00 2001 From: Per Bothner Date: Fri, 18 Aug 2023 16:30:36 -0700 Subject: [PATCH 02/18] Some html/css cleanps in demo * id="grid" should be id="class" (since "grid" is not unique in the document). * Remove space after 'id=' (multiple places). * Group 3 texture-atlas elements in new
. --- demo/index.html | 22 ++++++++++++---------- demo/style.css | 2 +- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/demo/index.html b/demo/index.html index 0e22d2d2..a3e28200 100644 --- a/demo/index.html +++ b/demo/index.html @@ -14,16 +14,16 @@

xterm.js: A terminal for the web

-
+
-
+
- - - - - + + + + +

Options

@@ -118,9 +118,11 @@
- - -
+
+ + +
+