runtimepy 5.14.2__py3-none-any.whl → 5.15.1__py3-none-any.whl

runtimepy/data/css/main.css

@@ -1,6 +1,8 @@
 html {
   height: 100%;
+  max-height: 100%;
   width: 100%;
+  max-width: 100%;
   position: fixed;
 }
 
@@ -15,10 +17,6 @@ body > :first-child {
   height: 100%;
 }
 
-#runtimepy {
-  height: 100%;
-}
-
 #runtimepy-tabs {
   width: min-content;
 }
@@ -46,12 +44,33 @@ body > :first-child {
 
 .toggle-value {
   /* placeholder */
+  background-color: var(--bs-body-bg);
 }
 
 .window-button {
   border-right: var(--bs-border-width) var(--bs-border-style) var(--bs-link-hover-color) !important;
 }
 
+.logo-outline-background {
+  background-position: center;
+  background-repeat: no-repeat;
+  background-size: auto 66.67%;
+}
+[data-bs-theme=dark] .logo-outline-background {
+  background-image: url(/static/svg/outline-dark.svg);
+}
+[data-bs-theme=light] .logo-outline-background {
+  background-image: url(/static/svg/outline-light.svg);
+}
+
 :focus {
   outline: none;
 }
+
+.overscroll-behavior-x-none {
+  overscroll-behavior-x: none;
+}
+
+.overscroll-behavior-none {
+  overscroll-behavior: none;
+}

runtimepy/data/dummy_load.yaml

@@ -75,7 +75,7 @@ structs:
 
         Should be shown for peer process as well?
 
-  - name: struct2
+  - name: example.struct2
     factory: sample_struct
     config:
       markdown: |
@@ -83,8 +83,11 @@ structs:
 
         One of the structs of all time.
 
-  - name: struct3
+  - name: example.struct3
     factory: sample_struct
+    config:
+      js_uris:
+        - package://runtimepy/js/sample.js
 
 # Sample peer processes.
 processes:

runtimepy/data/factories.yaml

@@ -37,6 +37,7 @@ factories:
   - {name: runtimepy.control.step.StepperToggler}
 
   # Useful structs.
+  - {name: runtimepy.net.arbiter.info.RuntimeStruct}
   - {name: runtimepy.net.arbiter.info.TrigStruct}
   - {name: runtimepy.net.arbiter.info.SampleStruct}
   - {name: runtimepy.net.server.struct.UiState}

runtimepy/data/js/classes/App.js

@@ -20,7 +20,7 @@ class App {
     worker.addEventListener("message", async (event) => {
       if (event.data == 0) {
         /* Manage settings modal. */
-        let _modal = document.getElementById("runtimepy-plot");
+        let _modal = document.getElementById("runtimepy-settings");
         if (_modal) {
           modalManager = new PlotModalManager(_modal);
         }
@@ -53,12 +53,64 @@ class App {
           this.switchTab(hash.tab);
         }
 
+        hash.updateTabFilter(hash.tabFilter);
+
         /* Handle settings controls. */
         loadSettings();
 
         /* Handle individual settings. */
         this.handleInitialMinTxPeriod();
 
+        /* Handle channel-table expand button. */
+        let _button = document.getElementById("open-channels-button");
+        if (_button) {
+          _button.onclick = () => {
+            /* Ensure channel table is visible. */
+            if (!hash.channelsShown && hash.channelsButton) {
+              hash.channelsButton.click();
+            }
+
+            /* Ensure channel table is at maximum width. */
+            if (shown_tab in tabs) {
+              let elem = tabs[shown_tab].query(".channel-column");
+              if (elem) {
+                elem.style.width = window.innerWidth + "px";
+                tabs[shown_tab].correctVerticalBarPosition();
+                tabs[shown_tab].focus();
+              }
+            }
+          };
+        }
+        _button = document.getElementById("dedent-channels-button");
+        if (_button) {
+          _button.onclick = () => {
+            if (!hash.channelsShown) {
+              return;
+            }
+
+            /* Reduce channel table width. */
+            if (shown_tab in tabs) {
+              let elem = tabs[shown_tab].query(".channel-column");
+              if (elem) {
+                let newWidth = elem.getBoundingClientRect().width - 50;
+                if (newWidth > 0) {
+                  elem.style.width = newWidth + "px";
+                  tabs[shown_tab].focus();
+                } else {
+                  hash.channelsButton.click();
+                }
+              }
+            }
+          };
+        }
+
+        /* Set initial focus. */
+        if (hash.tabsShown && tabFilter) {
+          tabFilter.input.focus();
+        } else if (hash.channelsShown && shown_tab in tabs) {
+          tabs[shown_tab].focus();
+        }
+
         startMainLoop();
       }
     }, {once : true});
@@ -110,7 +162,7 @@ function startMainLoop() {
     if (splash) {
       let curr = window.getComputedStyle(splash).getPropertyValue("opacity");
       if (curr > 0) {
-        splash.style.opacity = curr - Math.min(0.05, deltaT / 2000);
+        splash.style.opacity = curr - Math.min(0.05, deltaT / 1000);
       } else {
         splash.style.display = "none";
         splash = undefined;

runtimepy/data/js/classes/ChannelTable.js

@@ -20,14 +20,12 @@ class ChannelTable {
     for (let input of table.querySelectorAll("input.channel-value-input")) {
       this.channelInputs[input.id] = input;
 
-      let cmd =
-
-          /* Register handler for pressing enter. */
-          input.onkeypress = (event) => {
-            if (event.key == "Enter") {
-              this.worker.command(`set ${input.id} ${input.value}`);
-            }
-          };
+      /* Register handler for pressing enter. */
+      input.onkeypress = (event) => {
+        if (event.key == "Enter") {
+          this.worker.command(`set ${input.id} ${input.value}`);
+        }
+      };
 
       /* Register handler for pressing send button. */
       input.nextElementSibling.onclick =

runtimepy/data/js/classes/Plot.js

@@ -20,11 +20,16 @@ class Plot {
     /* Handle overlay events. */
     if (this.overlay) {
       /* Scroll, click and keyboard. */
-      this.overlay.onwheel = this.createEventSender(scrollEventKeys);
-      this.overlay.onclick = this.createEventSender(pointerEventKeys);
+      const options = {passive : true};
+
+      this.overlay.addEventListener(
+          "wheel", this.createEventSender(scrollEventKeys), options);
+      this.overlay.addEventListener(
+          "click", this.createEventSender(pointerEventKeys), options);
+
       let eventHandler = this.createEventSender(keyboardEventKeys);
-      this.overlay.addEventListener("keydown", eventHandler);
-      this.overlay.addEventListener("keyup", eventHandler);
+      this.overlay.addEventListener("keydown", eventHandler, options);
+      this.overlay.addEventListener("keyup", eventHandler, options);
 
       /* Should there be a keybind that opens this? */
       // let plotButton = document.getElementById("runtimepy-plot-button");

runtimepy/data/js/classes/TabFilter.js

@@ -15,34 +15,72 @@ class TabFilter {
   }
 
   updateStyles(pattern) {
+    pattern = pattern.trim();
     hash.setTabFilter(pattern);
 
     if (!pattern) {
       pattern = ".*";
     }
-    const re = new RegExp(pattern);
+
+    let parts = pattern.split(/(\s+)/)
+                    .filter((x) => x.trim().length > 0)
+                    .map((x) => new RegExp(x));
 
     for (let [name, elem] of Object.entries(this.buttons)) {
-      if (re.test(name)) {
-        elem.style.display = "block";
-      } else if (!elem.classList.contains("active")) {
-        elem.style.display = "none";
+      let found = elem.classList.contains("active");
+
+      if (!found) {
+        for (const re of parts) {
+          if (re.test(name)) {
+            found = true;
+            break;
+          }
+        }
+      }
+
+      if (found) {
+        for (const child of elem.parentElement.children) {
+          child.style.display = "block";
+        }
+      } else {
+        for (const child of elem.parentElement.children) {
+          child.style.display = "none";
+        }
       }
     }
   }
 
   keydown(event) {
+    // ctrl-l - go to channel table (open if needed) then close tabs
+
+    if (globalKeyEvent(event) || ignoreFilterKeyEvent(event)) {
+      return;
+    }
+
+    let curr = this.input.value;
+
+    // new features: make '$' either auto-complete (one character per press)
+    // to the first non-selected tab currently appearing in filter and presses
+    // the nav button when it's the only button left
+    //
+    // tbd need another button for opening new tab, '@'?
     if (event.key == "Enter") {
-      this.input.value = "";
-      this.updateStyles(this.input.value);
+      curr = "";
+      event.preventDefault();
     } else {
-      let curr = this.input.value;
       if (event.key == "Backspace") {
         curr = curr.slice(0, -1);
       } else {
         curr += event.key;
       }
-      this.updateStyles(curr);
     }
+
+    if (!curr) {
+      this.input.value = curr;
+    }
+
+    this.updateStyles(curr);
+
+    this.input.focus();
   }
 }

runtimepy/data/js/classes/TabInterface.js

@@ -28,6 +28,8 @@ class TabInterface {
     this.time = 0;
     this.channelTimestamps = {};
     this.channelColorButtons = {};
+    this.commandShown = true;
+    this.regularShown = true;
 
     let table = this.query("tbody");
     if (table) {
@@ -46,6 +48,9 @@ class TabInterface {
 
         /* Audit vertical bar position. */
         this.correctVerticalBarPosition();
+
+        /* Focus channel filter if it exists. */
+        this.focus();
       }
       this.worker.send({kind : msg});
     } ];
@@ -61,6 +66,12 @@ class TabInterface {
         ((event) => { this.correctVerticalBarPosition(); }).bind(this));
   }
 
+  focus() {
+    if (this.channelFilter) {
+      this.channelFilter.focus();
+    }
+  }
+
   initCommand() {
     let command = this.query(`#${this.queryName}-command`);
     if (command) {
@@ -82,15 +93,41 @@ class TabInterface {
   }
 
   updateChannelStyles(pattern) {
+    pattern = pattern.trim();
     hash.handleChannelFilter(this.name, pattern);
 
-    if (!pattern) {
-      pattern = ".*";
+    let parts = pattern.split(/(\s+)/).filter((x) => x.trim().length > 0);
+
+    let showRegular = this.regularShown;
+    let special = "!";
+    if (parts.includes(special)) {
+      showRegular = false;
+      parts = parts.filter(e => e != special);
+    }
+    let showCommand = this.commandShown;
+    special = "@";
+    if (parts.includes(special)) {
+      showCommand = false;
+      parts = parts.filter(e => e != special);
+    }
+
+    if (!parts.length) {
+      parts.push(".*");
     }
-    const re = new RegExp(pattern);
 
     for (let [name, elem] of Object.entries(this.channelRows)) {
-      if (re.test(name)) {
+      let found = false;
+      if ((showRegular && elem.classList.contains("channel-regular")) ||
+          (showCommand && elem.classList.contains("channel-commandable"))) {
+        for (const re of parts.map((x) => new RegExp(x))) {
+          if (re.test(name)) {
+            found = true;
+            break;
+          }
+        }
+      }
+
+      if (found) {
         elem.style.display = "table-row";
       } else {
         elem.style.display = "none";
@@ -99,19 +136,34 @@ class TabInterface {
   }
 
   channelKeydown(event) {
+    // ctrl-h - go to tabs (open if necessary)
+
+    if (globalKeyEvent(event) || ignoreFilterKeyEvent(event)) {
+      return;
+    }
+
+    let curr = this.channelFilter.value;
+
+    // new feature: make '$' toggle the state of all telemetry channels visible
+    // if any are already selected, enable all, if they're all already enabled
+    // disable them
     if (event.key == "Enter") {
-      this.channelFilter.value = "";
-      this.updateChannelStyles(this.channelFilter.value);
+      curr = "";
     } else {
-      let curr = this.channelFilter.value;
       if (event.key == "Backspace") {
         curr = curr.slice(0, -1);
       } else {
         curr += event.key;
       }
+    }
 
-      this.updateChannelStyles(curr);
+    if (!curr) {
+      this.channelFilter.value = curr;
     }
+
+    this.updateChannelStyles(curr);
+
+    this.focus();
   }
 
   initControls() {
@@ -175,6 +227,42 @@ class TabInterface {
     if (selector && send) {
       send.onclick = () => { this.worker.command(`custom ${selector.value}`); };
     }
+
+    /* Initialize commandable/regular channel visibility toggle. */
+    let commandToggle = this.query("#toggle-command-channels");
+    if (commandToggle) {
+      commandToggle.onclick = () => {
+        this.commandShown = !this.commandShown;
+        let classes = commandToggle.children[0].classList;
+        if (this.commandShown) {
+          classes.toggle("bi-eye-slash");
+          classes.toggle("bi-eye");
+          classes.toggle("stale");
+        } else {
+          classes.toggle("bi-eye");
+          classes.toggle("bi-eye-slash");
+          classes.toggle("stale");
+        }
+        this.updateChannelStyles(this.channelFilter.value);
+      };
+    }
+    let regularToggle = this.query("#toggle-regular-channels");
+    if (regularToggle) {
+      regularToggle.onclick = () => {
+        this.regularShown = !this.regularShown;
+        let classes = regularToggle.children[0].classList;
+        if (this.regularShown) {
+          classes.toggle("bi-eye-slash-fill");
+          classes.toggle("bi-eye-fill");
+          classes.toggle("stale");
+        } else {
+          classes.toggle("bi-eye-slash-fill");
+          classes.toggle("bi-eye-fill");
+          classes.toggle("stale");
+        }
+        this.updateChannelStyles(this.channelFilter.value);
+      };
+    }
   }
 
   setHandler(elem) {
@@ -217,14 +305,14 @@ class TabInterface {
       document.addEventListener(
           up, (event) => { document.removeEventListener(move, handleMouse); },
           {once : true});
-    });
+    }, {passive : true});
   }
 
   setupVerticalDivider(elem) {
     setupCursorContext(elem, this.setupVerticalDividerEvents.bind(this));
   }
 
-  correctVerticalBarPosition(elem) {
+  correctVerticalBarPosition() {
     if (shown_tab == this.name && this.divider) {
       let margin =
           window.innerWidth - this.divider.getBoundingClientRect().right;
@@ -331,6 +419,13 @@ class TabInterface {
   log(message) {
     if (this.logs) {
       this.logs.value += message + "\n";
+
+      const max_length = 4096;
+      if (this.logs.value.length > max_length) {
+        this.logs.value =
+            this.logs.value.substr(this.logs.value.length - max_length);
+      }
+
       if (this.isShown()) {
         this.logs.scrollTo(0, this.logs.scrollHeight);
       }
@@ -384,7 +479,7 @@ class TabInterface {
           this.clearPlotPoints();
           break;
         default:
-          console.log(`Action '${action}' not hangled!`);
+          console.log(`Action '${action}' not handled!`);
           break;
         }
       }

runtimepy/data/js/classes/WindowHashManager.js

@@ -16,6 +16,13 @@ class WindowHashManager {
   tabClick(event) {
     this.tabsShown = !this.tabsShown;
     this.update();
+
+    /* Handle focus. */
+    if (!this.tabsShown && this.channelsShown && shown_tab in tabs) {
+      tabs[shown_tab].focus();
+    } else if (this.tabsShown && tabFilter) {
+      tabFilter.input.focus();
+    }
   }
 
   lightDarkClick(event) {
@@ -40,6 +47,13 @@ class WindowHashManager {
     }
 
     this.update();
+
+    /* Handle focus. */
+    if (this.channelsShown && shown_tab in tabs) {
+      tabs[shown_tab].focus();
+    } else if (this.tabsShown && tabFilter) {
+      tabFilter.input.focus();
+    }
   }
 
   handleChannelFilter(tabName, value) {
@@ -111,9 +125,10 @@ class WindowHashManager {
     }
 
     /* Click handler for channels hide/show. */
-    let channelsButton = document.getElementById("channels-button");
-    if (channelsButton) {
-      channelsButton.addEventListener("click", this.channelClick.bind(this));
+    this.channelsButton = document.getElementById("channels-button");
+    if (this.channelsButton) {
+      this.channelsButton.addEventListener("click",
+                                           this.channelClick.bind(this));
     }
 
     /* Click handler for light/dark toggle. */
@@ -147,7 +162,7 @@ class WindowHashManager {
     if (this.original) {
       let boolsChannels = this.original.split("/");
       let split = boolsChannels[0].split(",");
-      this.tab = split[0];
+      this.tab = decodeURI(split[0]);
 
       /* Toggle plot-channel check boxes. */
       for (let i = 1; i < boolsChannels.length; i++) {
@@ -155,12 +170,12 @@ class WindowHashManager {
         for (let chan of nameChannels[1].split(",")) {
           if (!chan.includes("=")) {
             /* Handle regular channel names. */
-            this.togglePlotChannel(nameChannels[0], chan);
+            this.togglePlotChannel(nameChannels[0], decodeURI(chan));
           } else {
             /* Handle key-value pairs. */
             let keyVal = chan.split("=");
             if (keyVal.length == 2 && keyVal[0] == "filter" && keyVal[1]) {
-              this.setTabChannelFilter(nameChannels[0], keyVal[1]);
+              this.setTabChannelFilter(nameChannels[0], decodeURI(keyVal[1]));
             }
           }
         }
@@ -172,7 +187,7 @@ class WindowHashManager {
           let keyVal = item.split("=");
           if (keyVal.length == 2) {
             if (keyVal[0] == "filter" && keyVal[1]) {
-              this.updateTabFilter(keyVal[1]);
+              this.updateTabFilter(decodeURI(keyVal[1]));
             }
             if (keyVal[0] == "min-tx-period-ms") {
               this.minTxPeriod = Number(keyVal[1]);
@@ -181,13 +196,13 @@ class WindowHashManager {
         }
       }
 
-      if (split.includes("hide-tabs")) {
+      if (tabButton && split.includes("hide-tabs")) {
         tabButton.click();
       }
-      if (split.includes("hide-channels")) {
-        channelsButton.click();
+      if (this.channelsButton && split.includes("hide-channels")) {
+        this.channelsButton.click();
       }
-      if (split.includes("light-mode")) {
+      if (lightDarkButton && split.includes("light-mode")) {
         lightDarkButton.click();
       }
     }
@@ -210,7 +225,7 @@ class WindowHashManager {
     let hash = this.tab;
 
     if (this.tabFilter) {
-      hash += ",filter=" + this.tabFilter;
+      hash += ",filter=" + encodeURI(this.tabFilter);
     }
     if (!this.tabsShown) {
       hash += ",hide-tabs"
@@ -236,14 +251,14 @@ class WindowHashManager {
         for (let name in channels) {
           if (channels[name]) {
             if (firstChan) {
-              hash += "/" + tab + ":"
+              hash += "/" + encodeURI(tab) + ":"
               firstChan = false;
             }
 
             if (hash.slice(-1) != ":") {
               hash += ",";
             }
-            hash += name;
+            hash += encodeURI(name);
           }
         }
       }
@@ -258,7 +273,7 @@ class WindowHashManager {
         if (hash.slice(-1) != ":") {
           hash += ",";
         }
-        hash += "filter=" + this.filters[tab];
+        hash += "filter=" + encodeURI(this.filters[tab]);
       }
     }
 

runtimepy/data/js/init.js

@@ -40,13 +40,30 @@ function setupCursorMove(elem, down, move, up, handleMove) {
       document.removeEventListener(move, handleMove);
       elem.classList.remove("moving");
     }, {once : true});
-  });
+  }, {passive : true});
 }
 
 function randomHexColor() {
   return "#" + (Math.random() * 0xFFFFFF << 0).toString(16).padStart(6, "0");
 }
 
+function isModifierKeyEvent(event) {
+  return event.key == "Shift" || event.key == "Control" ||
+         event.key == "Meta" || event.key == "Alt";
+}
+
+function ignoreFilterKeyEvent(event) {
+  // home end pg up pg down delete f keys
+  return isModifierKeyEvent(event) || event.key == "Tab";
+}
+
+function globalKeyEvent(event) {
+  // (common)
+  // keybind for dedent (ctrl-d?) + expand (ctrl-e?)
+  // toggle tabs + toggle channel table
+  return false;
+}
+
 /* Load settings control mappings. */
 let settings = {};
 

runtimepy/data/js/markdown_page.js

@@ -25,4 +25,14 @@ window.onload = () => {
   }
 
   bootstrap_init();
+
+  /* Hide button column for print mode. */
+  const params = new URLSearchParams(window.location.search);
+  if (params.get("print") == "true") {
+    const elem = document.getElementById("button-column");
+    if (elem) {
+      elem.classList.remove("d-flex");
+      elem.style.display = "none";
+    }
+  }
 };

runtimepy/data/js/sample.js

@@ -0,0 +1 @@
+console.log(`sample.js included (${tab.name})`);

runtimepy/data/schemas/BitFields.yaml

@@ -33,6 +33,15 @@ properties:
         description:
           type: string
 
+        default:
+          oneOf:
+            - type: string
+            - type: integer
+            - type: boolean
+
+        controls:
+          type: object
+
         index:
           type: integer
           minimum: 0