Retro/pcjs
Watch
1
0
Fork
You've already forked pcjs
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added PCx86 support for autoType as a URL parameter

Browse source
This commit is contained in:
Jeff Parsons 2017-09-25 11:21:37 -07:00 • committed by Jeff Parsons
commit 601a6fa4a0
23 changed files with 659 additions and 505 deletions
Download patch file Download diff file Expand all files Collapse all files

79
modules/pcx86/lib/computer.js
View file

@ -259,7 +259,9 @@ class Computer extends Component {
* This timer replaces the CPU's old dedicated STATUS_UPDATES_PER_SECOND logic; periodic updateStatus()
* calls are now our own responsibility.
*/
this.cpu.addTimer(this.id, function() { cmp.updateStatus(); }, 1000 / Computer.UPDATES_PER_SECOND);
this.cpu.addTimer(this.id, function() {
cmp.updateStatus(false);
}, 1000 / Computer.UPDATES_PER_SECOND);
var sStatePath = null;
var sResume = this.getMachineParm('resume');
@ -328,7 +330,7 @@ class Computer extends Component {
Web.getResource(this.sStateURL, null, true, function(sURL, sResource, nErrorCode) {
cmp.doneLoad(sURL, sResource, nErrorCode);
}, function(nState) {
cmp.println(sProgress, Component.TYPE.PROGRESS);
cmp.println(sProgress, Component.PRINT.PROGRESS);
});
}
@ -437,7 +439,7 @@ class Computer extends Component {
if (video) {
var control = video.getTextArea();
if (control) {
if (sType != Component.TYPE.PROGRESS || sMessage.slice(-3) != "...") {
if (sType != Component.PRINT.PROGRESS || sMessage.slice(-3) != "...") {
Component.appendControl(control, sMessage + '\n');
} else {
Component.replaceControl(control, sMessage, sMessage + '.');
@ -494,7 +496,7 @@ class Computer extends Component {
var sParms;
if (typeof resources == 'object' && (sParms = resources['parms'])) {
try {
parmsMachine = /** @type {Object} */ (eval("(" + sParms + ")"));
parmsMachine = /** @type {Object} */ (eval("(" + sParms + ")")); // jshint ignore:line
} catch(e) {
Component.error(e.message + " (" + sParms + ")");
}
@ -506,22 +508,64 @@ class Computer extends Component {
/**
* getMachineParm(sParm, parmsComponent)
*
* If the machine parameter doesn't exist, we check for a matching component parameter (if parmsComponent is provided),
* and failing that, we check the bundled resources (if any).
* If the machine parameter doesn't exist, we check for a matching component parameter (if parmsComponent
* is provided), and failing that, we check the bundled resources (if any).
*
* At the moment, the only bundled resource request we expect to encounter is 'state'; if it exists, then we return
* 'state' back to the caller (ie, the name of the resource), so that the caller will then attempt to load the 'state'
* resource to obtain the actual state.
* At the moment, the only bundled resource request we expect to encounter is 'state'; if it exists, then
* we return 'state' back to the caller (ie, the name of the resource), so that the caller will then attempt
* to load the 'state' resource to obtain the actual state.
*
* TODO: This function could (and perhaps should) be modified to accept an optional type parameter (ie,
* one of the values in Component.TYPE), so that parms like autoMount could be eval'ed here rather than by
* the caller (eg, FDC.parseConfig()). The downside is that this function would have to return multiple types,
* so every call would have to be cast to the expected type.
*
* @this {Computer}
* @param {string} sParm
* @param {Object} [parmsComponent]
* @param {Object} [parmsComponent] (eg, this.parms)
* @return {string|undefined}
*/
getMachineParm(sParm, parmsComponent)
{
var value = Web.getURLParm(sParm);
if (value) {
try {
/*
* Ideally, we could simply use strings as-is, but unfortunately, we need to convert all
* supported escape sequences to their underlying characters, and using eval() is the simplest
* way to deal with them; eg:
*
* \', \", \r, \n, \t, and \xNN
*
* When a string containing the above sequences is passed as a machine or component parameter
* (ie, as an embedPC() machine parameter or as XML component attribute), that conversion happens
* automatically, either by virtue of implicit script evaluation, or by explicit eval() in
* getComponentParms(). But when they're passed as a URL parameter, any backslashes are passed
* through as-is.
*
* The complete list of backslash sequences supported by JavaScript:
*
* \0 \' \" \\ \n \r \v \t \b \f \uXXXX \xXX
* ^J ^M ^K ^I ^H ^L
*
* and of course, eval() will convert them all, but there's no expectation of any but those I've
* listed above, in part because of Jekyll limitations in some of our templates; eg:
*
* https://github.com/jeffpar/pcjs/blob/jekyll/_includes/machine-engines.html
*
* which could be overcome, but there's really no need to support more, since \xNN can be used to
* represent anything else.
*
* Finally, while the user should escape any quotation characters, just to be safe, we will try to
* choose the safest quoting character for the overall string.
*/
var ch = value.indexOf("'") >= 0? '"' : "'";
value = /** @type {string} */ (eval(ch + value + ch)); // jshint ignore:line
} catch(e) {
Component.error(e.message + " (" + value + ")");
value = undefined;
}
}
if (value === undefined && this.parmsMachine) {
value = this.parmsMachine[sParm];
}
@ -1404,7 +1448,7 @@ class Computer extends Component {
var sResponse = response[1];
if (!nErrorCode && sResponse) {
try {
response = eval("(" + sResponse + ")");
response = eval("(" + sResponse + ")"); // jshint ignore:line
if (response.code && response.code == UserAPI.CODE.OK) {
Web.setLocalStorageItem(Computer.STATE_USERID, response.data);
if (fMessages) this.printMessage(Computer.STATE_USERID + " updated: " + response.data);
@ -1699,8 +1743,15 @@ class Computer extends Component {
*/
if (this.cpu) this.cpu.updateStatus(fForce);
if (this.panel) this.panel.updateStatus(fForce);
for (var i = 0; i < this.aVideo.length; i++) {
this.aVideo[i].updateScreen(fForce);
/*
* When called by our own timer for relatively infrequent DOM (see Computer.UPDATES_PER_SECOND), fForce is
* explicitly set to false, and in those cases, we should avoid performing screen updates, because it may
* subtly interfere with the Video component's normal refresh rate.
*/
if (fForce !== false) {
for (var i = 0; i < this.aVideo.length; i++) {
this.aVideo[i].updateScreen(fForce);
}
}
}

6
modules/pcx86/lib/cpu.js
View file

@ -173,7 +173,7 @@ class CPU extends Component {
this.timerYield = cpu.addTimer(this.id, function() {
cpu.flags.yield = true;
}, 1000 / CPU.YIELDS_PER_SECOND);
}, this.counts.msPerYield);
this.setReady();
}
@ -1330,9 +1330,7 @@ class CPU extends Component {
*/
updateCPU(fForce)
{
if (this.cmp) {
this.cmp.updateStatus(fForce);
}
if (this.cmp) this.cmp.updateStatus(fForce);
}
/**

2
modules/pcx86/lib/disk.js
View file

@ -535,7 +535,7 @@ class Disk extends Component {
return !!Web.getResource(sDiskURL, null, true, function loadDone(sURL, sResponse, nErrorCode) {
disk.doneLoad(sURL, sResponse, nErrorCode);
}, function(nState) {
disk.println(sProgress, Component.TYPE.PROGRESS);
disk.println(sProgress, Component.PRINT.PROGRESS);
});
}

2
modules/pcx86/lib/rom.js
View file

@ -146,7 +146,7 @@ class ROM extends Component {
Web.getResource(this.sFileURL, null, true, function(sURL, sResponse, nErrorCode) {
rom.doneLoad(sURL, sResponse, nErrorCode);
}, function(nState) {
rom.println(sProgress, Component.TYPE.PROGRESS);
rom.println(sProgress, Component.PRINT.PROGRESS);
});
}
}

2
modules/pcx86/lib/video.js
View file

@ -2517,7 +2517,7 @@ class Video extends Component {
Web.getResource(this.sFileURL, null, true, function(sURL, sResponse, nErrorCode) {
video.doneLoad(sURL, sResponse, nErrorCode);
}, function(nState) {
video.println(sProgress, Component.TYPE.PROGRESS);
video.println(sProgress, Component.PRINT.PROGRESS);
});
}