New template support for (some) settings.

Author: PerBothner

configure.ac

@@ -328,6 +328,7 @@ HLIB_FIXED_FILES_OUTER="\
   hlib/screenfull.js"
 HLIB_FIXED_FILES_MISC="\
   hlib/domterm.js \
+  hlib/settings-manager.js \
   hlib/domterm-client.js \
   hlib/domterm-core.css \
   hlib/domterm-default.css \

hlib/domterm-parser.js

@@ -1,6 +1,7 @@
 export { DTParser };
 import { Terminal } from './terminal.js';
 import * as DtUtil from './domterm-utils.js';
+import { Setting, EvalContext } from './settings-manager.js';
 
 class DTParser {
     constructor(term) {
@@ -2260,6 +2261,28 @@ class DTParser {
             case 'fullscreen toggle':
                 DomTerm.windowOp('fullscreen', command.substring(11));
                 break;
+            case 'set-settings': {
+                let wnum = options.wnumber;
+                let pane = wnum !== undefined ? DomTerm.paneMap[wnum]
+                    : DomTerm.mainTerm.paneInfo;
+                let errmsg = '';
+                const context = new EvalContext(term);
+                context.reportError = (context, message) => {
+                    if (errmsg)
+                        errmsg += '\n';
+                    errmsg += `setting '${context?.curSetting?.name}': ${message}`;
+                };
+                try {
+                    pane.setOptions(options.settings, context);
+                } catch (e) {
+                    errmsg = "caught "+e;
+                }
+                let r = {};
+                if (errmsg)
+                    r.err = errmsg;
+                term.sendResponse(r, options);
+                break;
+            }
             }
             break;
         }

hlib/domterm.js

@@ -368,7 +368,7 @@ DomTerm.setOptions = function(jtext) {
             : DomTerm.mainTerm.paneInfo;
         pane.setOptions(obj);
     } catch(e) {
-        console.log("error handling local settings");
+        console.log("error handling local settings "+e);
     }
 }
 
@@ -613,9 +613,9 @@ DomTerm.updateZoom = function() {
     }
 }
 
-DomTerm.updateSettings = function(pane) {
+DomTerm.updateSettings = function(pane, context) {
     if (pane.terminal && pane.kind !== "xterminal")
-        pane.terminal.updateSettings();
+        pane.terminal.updateSettings(context);
     else if (pane.layoutItem) {
         const componentType = pane.layoutItem.toConfig().componentType;
         if (componentType === "domterm" || componentType === "view-saved")
@@ -845,9 +845,7 @@ class PaneInfo {
          * as DomTerm.zoomMainBase and DomTerm.zoomMainAdjust. */
         this.zoomAdjust = 1.0;
 
-        // Table of named options local to this pane or terminal.
-        // Maybe set from command-line or UI
-        this.termOptions = {};
+        DomTerm.initSettings(this);
     }
 
     paneZoom() { return this.zoomSetting * this.zoomAdjust; }
@@ -863,27 +861,15 @@ class PaneInfo {
         opt = DomTerm.globalSettings[name];
         return opt === undefined ? dflt : opt;
     }
-    setOptions(options) {
+    setOptions(options, context) {
         for (const prop in options) {
             if (options[prop] == null)
                 delete this.termOptions[prop];
             else
                 this.termOptions[prop] = options[prop];
         }
-        DomTerm.updateSettings(this);
-    }
-    /*
-        try {
-            // Handle '{SETTINGS}' or 'WNUM,{OPTIONS}'/
-            var obj2 = JSON.parse("["+joptions+"]");
-            let obj = obj2[options.length-1];
-            let pane = obj2.length >= 2 ? DomTerm.paneMap[obj2[0]]
-                : DomTerm.mainTerm.paneInfo;
-        } catch(e) {
-            console.log("error handling local settings");
-        }
-        }
-    */
+        DomTerm.updateSettings(this, context);
+    }
 }
 
 PaneInfo.create = function(windowNumber, kind) {