test using exec property

.github/workflows/build-helper.yml

@@ -27,7 +27,7 @@ jobs:
               if: matrix.platform == 'linux'
               run: |
                   sudo apt-get update
-                  sudo apt-get install --no-install-recommends -y libarchive-tools libopenjp2-tools rpm
+                  sudo apt-get install --no-install-recommends -y libarchive-tools libopenjp2-tools rpm snapcraft snapd
             - uses: actions/setup-go@v5
               with:
                   go-version: ${{env.GO_VERSION}}

electron-builder.config.js

@@ -56,6 +56,7 @@ const config = {
                 arch: "universal",
             },
         ],
+        appId: "dev.commandline.waveterm",
         icon: "public/waveterm.icns",
         category: "public.app-category.developer-tools",
         minimumSystemVersion: "10.15.0",
@@ -70,10 +71,11 @@ const config = {
             .map((f) => path.resolve(f.path, f.name)),
     },
     linux: {
+        appId: "dev.commandline.waveterm",
         executableName: pkg.productName,
         category: "TerminalEmulator",
         icon: "public/waveterm.icns",
-        target: ["zip", "deb", "rpm", "AppImage", "pacman"],
+        target: ["zip", "deb", "rpm", "AppImage", "pacman", "snap"],
         synopsis: pkg.description,
         description: null,
         desktop: {
@@ -86,6 +88,23 @@ const config = {
     appImage: {
         license: "LICENSE",
     },
+    snap: {
+        base: "core20",
+        grade: "stable",
+        confinement: "classic",
+        summary: pkg.productName,
+        title: pkg.productName,
+        description: null,
+        synopsis: pkg.description,
+        allowNativeWayland: true,
+        desktop: {
+            Name: pkg.productName,
+            Comment: pkg.description,
+            Keywords: "developer;terminal;emulator;",
+            category: "Development;Utility;",
+            exec: pkg.productName,
+        },
+    },
     publish: {
         provider: "generic",
         url: "https://dl.waveterm.dev/releases",

public/themes/term-default.css

@@ -3,7 +3,7 @@
 
 :root {
     /* 
-     * term colors (16 + 6) form the base terminal theme 
+     * term colors (16 + 5) form the base terminal theme 
      * for consistency these colors should be used by plugins/applications
      */
     --term-black: #000000;
@@ -27,6 +27,5 @@
     --term-cmdtext: #ffffff;
     --term-foreground: #d3d7cf;
     --term-background: #000000;
-    --term-selection-background: #ffffff90;
-    --term-cursor-accent: #000000;
+    --term-selection-background: #ffffff40;
 }

public/themes/term-light.css

@@ -6,6 +6,5 @@
     --term-foreground: #000000;
     --term-background: #fefefe;
     --term-cmdtext: #000000;
-    --term-selection-background: #00000040;
-    --term-cursor-accent: #000000;
+    --term-selection-background: #00000018;
 }

src/app/clientsettings/clientsettings.tsx

@@ -87,7 +87,6 @@ class ClientSettingsView extends React.Component<{ model: RemotesModel }, { hove
         const availableFontFamilies: DropdownItem[] = [];
         availableFontFamilies.push({ label: "JetBrains Mono", value: "JetBrains Mono" });
         availableFontFamilies.push({ label: "Hack", value: "Hack" });
-        availableFontFamilies.push({ label: "Fira Code", value: "Fira Code" });
         return availableFontFamilies;
     }
 

src/app/common/modals/alert.tsx

@@ -44,7 +44,7 @@ class AlertModal extends React.Component<{}, {}> {
                         <Markdown text={message?.message ?? ""} extraClassName="bottom-margin" />
                     </If>
                     <If condition={!message?.markdown}>{message?.message}</If>
-                    <If condition={message?.confirmflag}>
+                    <If condition={message.confirmflag}>
                         <Checkbox
                             onChange={this.handleDontShowAgain}
                             label={"Don't show me this again"}

src/models/bookmarks.ts

@@ -206,7 +206,7 @@ class BookmarksModel {
     }
 
     handleDocKeyDown(e: any): void {
-        const waveEvent = adaptFromReactOrNativeKeyEvent(e);
+        let waveEvent = adaptFromReactOrNativeKeyEvent(e);
         if (checkKeyPressed(waveEvent, "Escape")) {
             e.preventDefault();
             if (this.editingBookmark.get() != null) {

src/models/clientsettingsview.ts

@@ -3,7 +3,6 @@
 
 import * as mobx from "mobx";
 import { Model } from "./model";
-import { checkKeyPressed, adaptFromReactOrNativeKeyEvent } from "@/util/keyutil";
 
 class ClientSettingsViewModel {
     globalModel: Model;
@@ -22,15 +21,6 @@ class ClientSettingsViewModel {
             this.globalModel.activeMainView.set("clientsettings");
         })();
     }
-
-    handleDocKeyDown(e: any): void {
-        const waveEvent = adaptFromReactOrNativeKeyEvent(e);
-        if (checkKeyPressed(waveEvent, "Escape")) {
-            e.preventDefault();
-            this.closeView();
-            return;
-        }
-    }
 }
 
 export { ClientSettingsViewModel };

src/models/connectionsview.ts

@@ -3,7 +3,6 @@
 
 import * as mobx from "mobx";
 import { Model } from "./model";
-import { checkKeyPressed, adaptFromReactOrNativeKeyEvent } from "@/util/keyutil";
 
 class ConnectionsViewModel {
     globalModel: Model;
@@ -22,15 +21,6 @@ class ConnectionsViewModel {
             this.globalModel.activeMainView.set("connections");
         })();
     }
-
-    handleDocKeyDown(e: any): void {
-        const waveEvent = adaptFromReactOrNativeKeyEvent(e);
-        if (checkKeyPressed(waveEvent, "Escape")) {
-            e.preventDefault();
-            this.closeView();
-            return;
-        }
-    }
 }
 
 export { ConnectionsViewModel };

src/models/historyview.ts

@@ -291,7 +291,7 @@ class HistoryViewModel {
     }
 
     handleDocKeyDown(e: any): void {
-        const waveEvent = adaptFromReactOrNativeKeyEvent(e);
+        let waveEvent = adaptFromReactOrNativeKeyEvent(e);
         if (checkKeyPressed(waveEvent, "Escape")) {
             e.preventDefault();
             this.closeView();

src/models/modals.ts

@@ -18,11 +18,10 @@ class ModalsModel {
         }
     }
 
-    popModal(callback?: () => void) {
+    popModal() {
         mobx.action(() => {
             this.store.pop();
         })();
-        callback && callback();
     }
 }
 

src/models/model.ts

@@ -372,6 +372,7 @@ class Model {
     cancelAlert(): void {
         mobx.action(() => {
             this.alertMessage.set(null);
+            this.modalsModel.popModal();
         })();
         if (this.alertPromiseResolver != null) {
             this.alertPromiseResolver(false);
@@ -492,7 +493,7 @@ class Model {
         if (this.alertMessage.get() != null) {
             if (checkKeyPressed(waveEvent, "Escape")) {
                 e.preventDefault();
-                this.modalsModel.popModal(() => this.cancelAlert());
+                this.cancelAlert();
                 return;
             }
             if (checkKeyPressed(waveEvent, "Enter")) {
@@ -502,10 +503,6 @@ class Model {
             }
             return;
         }
-        if (checkKeyPressed(waveEvent, "Escape") && this.modalsModel.store.length > 0) {
-            this.modalsModel.popModal();
-            return;
-        }
         if (this.activeMainView.get() == "bookmarks") {
             this.bookmarksModel.handleDocKeyDown(e);
         }
@@ -513,10 +510,10 @@ class Model {
             this.historyViewModel.handleDocKeyDown(e);
         }
         if (this.activeMainView.get() == "connections") {
-            this.connectionViewModel.handleDocKeyDown(e);
+            this.historyViewModel.handleDocKeyDown(e);
         }
         if (this.activeMainView.get() == "clientsettings") {
-            this.clientSettingsViewModel.handleDocKeyDown(e);
+            this.historyViewModel.handleDocKeyDown(e);
         } else {
             if (checkKeyPressed(waveEvent, "Escape")) {
                 e.preventDefault();
@@ -524,6 +521,9 @@ class Model {
                     this.showSessionView();
                     return;
                 }
+                if (this.clearModals()) {
+                    return;
+                }
                 const inputModel = this.inputModel;
                 inputModel.toggleInfoMsg();
                 if (inputModel.inputMode.get() != null) {
@@ -643,6 +643,33 @@ class Model {
         return screen.getTermWrap(line.lineid);
     }
 
+    clearModals(): boolean {
+        let didSomething = false;
+        mobx.action(() => {
+            if (this.screenSettingsModal.get()) {
+                this.screenSettingsModal.set(null);
+                didSomething = true;
+            }
+            if (this.sessionSettingsModal.get()) {
+                this.sessionSettingsModal.set(null);
+                didSomething = true;
+            }
+            if (this.screenSettingsModal.get()) {
+                this.screenSettingsModal.set(null);
+                didSomething = true;
+            }
+            if (this.clientSettingsModal.get()) {
+                this.clientSettingsModal.set(false);
+                didSomething = true;
+            }
+            if (this.lineSettingsModal.get()) {
+                this.lineSettingsModal.set(null);
+                didSomething = true;
+            }
+        })();
+        return didSomething;
+    }
+
     restartWaveSrv(): void {
         getApi().restartWaveSrv();
     }

src/plugins/image/image.less

@@ -1,10 +1,4 @@
 .image-renderer {
-    display: flex;
-    flex-direction: row;
-    align-items: center;
-    justify-content: center;
-    padding-top: var(--termpad);
-
     img {
         display: block;
     }

src/plugins/terminal/term.ts

@@ -58,9 +58,6 @@ function getThemeFromCSSVars(): ITheme {
     theme.brightCyan = rootStyle.getPropertyValue("--term-bright-cyan");
     theme.brightWhite = rootStyle.getPropertyValue("--term-bright-white");
     theme.selectionBackground = rootStyle.getPropertyValue("--term-selection-background");
-    theme.selectionInactiveBackground = rootStyle.getPropertyValue("--term-selection-background");
-    theme.cursor = rootStyle.getPropertyValue("--term-selection-background");
-    theme.cursorAccent = rootStyle.getPropertyValue("--term-cursor-accent");
     return theme;
 }
 

src/util/fontutil.ts

@@ -5,7 +5,6 @@ let isJetBrainsMonoLoaded = false;
 let isLatoFontLoaded = false;
 let isHackFontLoaded = false;
 let isBaseFontsLoaded = false;
-let isFiraCodeLoaded = false;
 
 function addToFontFaceSet(fontFaceSet: FontFaceSet, fontFace: FontFace) {
     // any cast to work around typing issue
@@ -56,25 +55,6 @@ function loadLatoFont() {
     latoFontBold.load();
 }
 
-function loadFiraCodeFont() {
-    if (isFiraCodeLoaded) {
-        return;
-    }
-    isFiraCodeLoaded = true;
-    let firaCodeRegular = new FontFace("Fira Code", "url('public/fonts/firacode-regular.woff2')", {
-        style: "normal",
-        weight: "400",
-    });
-    let firaCodeBold = new FontFace("Fira Code", "url('public/fonts/firacode-bold.woff2')", {
-        style: "normal",
-        weight: "700",
-    });
-    addToFontFaceSet(document.fonts, firaCodeRegular);
-    addToFontFaceSet(document.fonts, firaCodeBold);
-    firaCodeRegular.load();
-    firaCodeBold.load();
-}
-
 function loadHackFont() {
     if (isHackFontLoaded) {
         return;
@@ -124,7 +104,6 @@ function loadFonts() {
     loadLatoFont();
     loadJetBrainsMonoFont();
     loadHackFont();
-    loadFiraCodeFont();
 }
 
 export { loadFonts };