Merge pull request #8 from realandygithub/wrap

prompt

Author: realandygithub

.eslintrc.js

@@ -0,0 +1,14 @@
+module.exports = {
+    "env": {
+        "browser": true,
+        "es2021": true,
+        "node": true
+    },
+    "extends": "eslint:recommended",
+    "parserOptions": {
+        "ecmaVersion": "latest",
+        "sourceType": "module"
+    },
+    "rules": {
+    }
+}

package.json

@@ -94,6 +94,7 @@
     "electron": "^17.0.0",
     "electron-packager": "^15.4.0",
     "electron-reloader": "^1.2.3",
+    "eslint": "^8.15.0",
     "mocha": "^9.2.0",
     "rollup": "^2.67.0",
     "rollup-plugin-babel": "^4.4.0",

src/XTerm.svelte

@@ -2,11 +2,14 @@
     import { onMount } from "svelte";
     import { FitAddon } from "xterm-addon-fit";
     import "./xterm.css";
+
     const { remote, ipcRenderer, BrowserWindow } = require("electron");
     const Terminal = require("xterm").Terminal;
 
     const fitAddon = new FitAddon();
-    const term = new Terminal({ convertEol: true });
+    const term = new Terminal({
+        fontFamily: "Fira Code, courier-new, courier, monospace",
+    });
 
     const fitOnTheGo = () => {
         fitAddon.fit();
@@ -15,26 +18,36 @@
     onMount(() => {
         term.options.cursorStyle = "block";
         term.options.cursorBlink = true;
-        term.options.fontSize = 14;
+        term.options.fontSize = 12;
 
         term.loadAddon(fitAddon);
         term.open(document.getElementById("xterm"));
         fitAddon.fit();
 
         //2022-ST-AJ prompt appears after welcome message
+        //2022-ST-AJ immediately call resize to have proper prompt in, and have node-pty adjust to correct size.
+
         term.prompt = () => {
-            term.write("\r\n$ ");
+            //TODO: to get the cwd showing. pass it from ipcMain
+
+            ipcRenderer.send("terminal-into", "\r");
         };
 
         term.writeln("Welcome to SvelteStorm");
-        term.write("\b \b");
+        // term.writeln("\b \b");
 
         term.prompt();
+        term.focus();
 
         term.onData((e) => {
             ipcRenderer.send("terminal-into", e);
         });
 
+        term.onResize((size) => {
+            // console.log("terminal resized. size:", size);
+            ipcRenderer.send("terminal-resize", size);
+        });
+
         ipcRenderer.on("terminal-incData", (event, data) => {
             term.write(data);
         });

src/index.js

@@ -21,7 +21,7 @@ require('@electron/remote/main').enable(webContents);
 //hot reload for electron development
 try {
   require('electron-reloader')(module);
-} catch (_) {}
+} catch (err) {console.log(err) }
 
 let userFile = '';
 
@@ -101,10 +101,12 @@ const createWindow = (exports.createWindow = () => {
   //loading index.html into the app
   newWindow.loadURL(`file://${path.join(__dirname, '../public/index.html')}`);
 
+  //show window by calling the listener once
   newWindow.once('ready-to-show', () => {
     newWindow.show();
   });
 
+  
   newWindow.on('focus', createApplicationMenu);
 
   //save changes dialog modal message
@@ -147,22 +149,38 @@ const createWindow = (exports.createWindow = () => {
   });
 
   var shell = os.platform() === 'win32' ? 'powershell.exe' : 'bash';
+
   var ptyProcess = pty.spawn(shell, [], {
     name: 'xterm-color',
     cols: 80,
     rows: 24,
     cwd: process.env.HOME,
     env: process.env,
   });
+  
+  //2022-ST-AJ sends to renderer cwd for it to display on prompt
+  ipcMain.on('cwd',(event,data) => {
+    event.reply('cwdreply',process.env.HOME);
+  });
 
+  //2022-ST-AJ node-pty listens to data and send whatever it receives back to xterm to render
   ptyProcess.onData((data) => {
     newWindow.webContents.send('terminal-incData', data);
   });
-
+  
+  //2022-ST-AJ ipcMain listens on data passed from xterm to write to shell  
   ipcMain.on('terminal-into', (event, data) => {
     ptyProcess.write(data);
   });
 
+  //2022-ST-AJ ipcMain listens to resizing event from renderer and calls resize on node-pty to align size between node-pty and xterm. They need to align otherwise there are wierd bugs everywhere.
+  ipcMain.on('terminal-resize', (event,size) => {
+    const cols = size.cols;
+    const rows = size.rows;
+    console.log('pty resizing to cols and rows', cols,rows);
+    ptyProcess.resize(cols, rows);
+  })
+
   require('electron-reload')(__dirname, {
     electron: path.join(__dirname, '../node_modules', '.bin', 'electron'),
     awaitWriteFinish: true,

src/svelte.js

@@ -2,7 +2,7 @@ import App from './App.svelte';
 
 const app = new App({
     target: document.body,
-	  props: {},
+    props: {},
 });
 
 export default app;