Implemented keyboard shortcuts.

Signed-off-by: ubi de feo <[email protected]>

Author: ubidefeo

backend/ipc.js

@@ -129,9 +129,15 @@ module.exports = function registerIPCHandlers(win, ipcMain, app, dialog) {
     return response != opt.cancelId
   })
 
+  ipcMain.handle('reload', (event, message = 'ciao, cane') => {
+    console.log('reload?')
+    win.webContents.send('reload', message)
+  })
+
   win.on('close', (event) => {
     console.log('BrowserWindow', 'close')
     event.preventDefault()
     win.webContents.send('check-before-close')
   })
+  
 }

index.js

@@ -1,4 +1,4 @@
-const { app, BrowserWindow, ipcMain, dialog } = require('electron')
+const { app, BrowserWindow, ipcMain, dialog, globalShortcut } = require('electron')
 const path = require('path')
 const fs = require('fs')
 
@@ -57,4 +57,48 @@ function createWindow () {
   })
 }
 
-app.on('ready', createWindow)
+function shortcutAction(key) {
+  win.webContents.send('shortcut-cmd', key);
+}
+
+// Shortcuts
+function registerShortcuts() {
+  globalShortcut.register('CommandOrControl+R', () => {
+    console.log('Running Program')
+    shortcutAction('r')
+  })
+  globalShortcut.register('CommandOrControl+H', () => {
+    console.log('Stopping Program (Halt)')
+    shortcutAction('h')
+  })
+  globalShortcut.register('CommandOrControl+S', () => {
+    console.log('Saving File')
+    shortcutAction('s')
+  })
+  
+  globalShortcut.register('CommandOrControl+Shift+R', () => {
+    console.log('Resetting Board')
+    shortcutAction('R')
+  })
+  globalShortcut.register('CommandOrControl+Shift+C', () => {
+    console.log('Connect to Board')
+    shortcutAction('C')
+  })
+  globalShortcut.register('CommandOrControl+Shift+D', () => {
+    console.log('Disconnect from Board')
+    shortcutAction('D')
+  })
+}
+
+app.on('ready', () => {
+  createWindow()
+  registerShortcuts()
+
+  win.on('focus', () => {
+    registerShortcuts()
+  })
+  win.on('blur', () => {
+    globalShortcut.unregisterAll()
+  })
+  
+})

preload.js

@@ -3,6 +3,8 @@ const { contextBridge, ipcRenderer } = require('electron')
 const path = require('path')
 
 const MicroPython = require('micropython.js')
+const { emit, platform } = require('process')
+// const { platform } = requireprocess.platform
 const board = new MicroPython()
 board.chunk_size = 192
 board.chunk_sleep = 200
@@ -155,12 +157,31 @@ const Window = {
   setWindowSize: (minWidth, minHeight) => {
     ipcRenderer.invoke('set-window-size', minWidth, minHeight)
   },
+  anyShortcut: (callback, key) => {
+    ipcRenderer.on('shortcut-cmd', (event, k) => {
+      // Get the active element
+      const activeElement = document.activeElement;
+      // Check if the active element is the terminal
+      const isTerminalFocused = activeElement.classList.contains('xterm-helper-textarea');
+      // Only trigger callback if terminal is not focused AND we're in editor view
+      if (!isTerminalFocused) {
+        console.log('shortcut-cmd-r executed')
+        callback(k);
+      }
+    })
+  },
+
+
   beforeClose: (callback) => ipcRenderer.on('check-before-close', callback),
   confirmClose: () => ipcRenderer.invoke('confirm-close'),
   isPackaged: () => ipcRenderer.invoke('is-packaged'),
-  openDialog: (opt) => ipcRenderer.invoke('open-dialog', opt)
-}
+  openDialog: (opt) => ipcRenderer.invoke('open-dialog', opt),
 
+  getOS: () => platform,
+  isWindows: () => platform === 'win32',
+  isMac: () => platform === 'darwin',
+  isLinux: () => platform === 'linux'
+}
 
 contextBridge.exposeInMainWorld('BridgeSerial', Serial)
 contextBridge.exposeInMainWorld('BridgeDisk', Disk)

ui/arduino/main.js

@@ -46,11 +46,15 @@ window.addEventListener('load', () => {
   app.use(store);
   app.route('*', App)
   app.mount('#app')
-
   app.emitter.on('DOMContentLoaded', () => {
     if (app.state.diskNavigationRoot) {
       app.emitter.emit('refresh-files')
     }
   })
+  app.emitter.on('', () => {
+    if (app.state.diskNavigationRoot) {
+      app.emitter.emit('refresh-files')
+    }
+  })
 
 })

ui/arduino/store.js

@@ -24,6 +24,7 @@ async function confirm(msg, cancelMsg, confirmMsg) {
 async function store(state, emitter) {
   win.setWindowSize(720, 640)
 
+  state.platform = window.BridgeWindow.getOS()
   state.view = 'editor'
   state.diskNavigationPath = '/'
   state.diskNavigationRoot = getDiskNavigationRootFromStorage()
@@ -57,6 +58,8 @@ async function store(state, emitter) {
 
   state.isTerminalBound = false
 
+  state.shortcutsContext = 'editor'
+
   const newFile = createEmptyFile({
     parentFolder: null, // Null parent folder means not saved?
     source: 'disk'
@@ -1360,6 +1363,47 @@ async function store(state, emitter) {
     await win.confirmClose()
   })
 
+  // win.shortcutCmdR(() => {
+  //   // Only run if we can execute
+    
+  // })
+
+  win.anyShortcut((key) => {
+    if (key === 'C') {
+      emitter.emit('open-connection-dialog')
+    }
+    if (key === 'D') {
+      emitter.emit('disconnect')
+    }
+    if (key === 'R') {
+      if (state.view != 'editor') return
+      emitter.emit('reset')
+    }
+    if (key === 'r') {
+      if (state.view != 'editor') return
+      runCode()
+    }
+    if (key === 'h') {
+      if (state.view != 'editor') return
+      stopCode()
+    }
+    if (key === 's') {
+      if (state.view != 'editor') return
+      emitter.emit('save')
+    }
+
+  })
+
+  function runCode() {
+    if (canExecute({ view: state.view, isConnected: state.isConnected })) {
+      emitter.emit('run')
+    }
+  }
+  function stopCode() {
+    if (canExecute({ view: state.view, isConnected: state.isConnected })) {
+      emitter.emit('stop')
+    }
+  }
   function createFile(args) {
     const {
       source,

ui/arduino/views/components/toolbar.js

@@ -9,12 +9,13 @@ function Toolbar(state, emit) {
     view: state.view,
     isConnected: state.isConnected
   })
-
+  const metaKeyString = state.platform === 'darwin' ? 'Cmd' : 'Ctrl'
+  
   return html`
     <div id="toolbar">
       ${Button({
         icon: state.isConnected ? 'connect.svg' : 'disconnect.svg',
-        tooltip: state.isConnected ? 'Disconnect' : 'Connect',
+        tooltip: state.isConnected ? `Disconnect (${metaKeyString}+Shift+D)` : `Connect (${metaKeyString}+Shift+C)`,
         onClick: () => emit('open-connection-dialog'),
         active: state.isConnected
       })}
@@ -23,19 +24,19 @@ function Toolbar(state, emit) {
 
       ${Button({
         icon: 'run.svg',
-        tooltip: 'Run',
+        tooltip: `Run (${metaKeyString}+r)`,
         disabled: !_canExecute,
         onClick: () => emit('run')
       })}
       ${Button({
         icon: 'stop.svg',
-        tooltip: 'Stop',
+        tooltip: `Stop (${metaKeyString}+h)`,
         disabled: !_canExecute,
         onClick: () => emit('stop')
       })}
       ${Button({
         icon: 'reboot.svg',
-        tooltip: 'Reset',
+        tooltip: `Reset (${metaKeyString}+Shift+r)`,
         disabled: !_canExecute,
         onClick: () => emit('reset')
       })}
@@ -44,7 +45,7 @@ function Toolbar(state, emit) {
 
       ${Button({
         icon: 'save.svg',
-        tooltip: 'Save',
+        tooltip: `Save (${metaKeyString}+s)`,
         disabled: !_canSave,
         onClick: () => emit('save')
       })}